.editorconfig

@@ -1,7 +0,0 @@
-root = true
-
-[*]
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-charset = utf-8

.github/.release-please-manifest.json

@@ -1,3 +0,0 @@
-{
-  ".": "16.0.0"
-}

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,10 +6,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        **Before** reporting an issue, make sure to read the [documentation](https://github.com/LazyVim/LazyVim)
-        and search [existing issues](https://github.com/LazyVim/LazyVim/issues).
-
-        Usage questions such as ***"How do I...?"*** belong in [Discussions](https://github.com/LazyVim/LazyVim/discussions) and will be closed.
+        **Before** reporting an issue, make sure to read the [documentation](https://github.com/folke/LazyVim) and search [existing issues](https://github.com/folke/LazyVim/issues). Usage questions such as ***"How do I...?"*** belong in [Discussions](https://github.com/folke/LazyVim/discussions) and will be closed.
   - type: checkboxes
     attributes:
       label: Did you check docs and existing issues?
@@ -17,11 +14,9 @@ body:
       options:
         - label: I have read all the LazyVim docs
           required: true
-        - label: I have updated the plugin to the latest version before submitting this issue
-          required: true
         - label: I have searched the existing issues of LazyVim
           required: true
-        - label: I have searched the existing issues of plugins related to this issue
+        - label: I have searched the exsiting issues of plugins related to this issue
           required: true
   - type: input
     attributes:
@@ -62,15 +57,32 @@ body:
       label: Repro
       description: Minimal `init.lua` to reproduce this issue. Save as `repro.lua` and run with `nvim -u repro.lua`
       value: |
-        vim.env.LAZY_STDPATH = ".repro"
-        load(vim.fn.system("curl -s https://raw.githubusercontent.com/folke/lazy.nvim/main/bootstrap.lua"))()
+        -- DO NOT change the paths and don't remove the colorscheme
+        local root = vim.fn.fnamemodify("./.repro", ":p")
+        -- set stdpaths to use .repro
+        for _, name in ipairs({ "config", "data", "state", "cache" }) do
+          vim.env[("XDG_%s_HOME"):format(name:upper())] = root .. "/" .. name
+        end
 
-        require("lazy.minit").repro({
-          spec = {
-            { "LazyVim/LazyVim", import = "lazyvim.plugins" },
-            -- add any other plugins here
-          },
+        -- bootstrap lazy
+        local lazypath = root .. "/plugins/lazy.nvim"
+        if not vim.loop.fs_stat(lazypath) then
+          vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", lazypath, })
+        end
+        vim.opt.runtimepath:prepend(lazypath)
+
+        -- install plugins
+        local plugins = {
+          "folke/tokyonight.nvim",
+          "folke/LazyVim",
+          -- add any other plugins here
+        }
+        require("lazy").setup(plugins, {
+          root = root .. "/plugins",
         })
-      render: lua
+
+        vim.cmd.colorscheme("tokyonight")
+        -- add anything else here
+      render: Lua
     validations:
       required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Ask a question
-    url: https://github.com/LazyVim/LazyVim/discussions
-    about: Use Github discussions instead

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -3,11 +3,6 @@ description: Suggest a new feature
 title: "feature: "
 labels: [enhancement]
 body:
-  - type: markdown
-    attributes:
-      value: |
-        **IMPORTANT:** ideas or requests related to extras, should go in the [Extra Requests](https://github.com/LazyVim/LazyVim/discussions/categories/extra-requests)
-        discussion forum.
   - type: checkboxes
     attributes:
       label: Did you check the docs?
@@ -15,8 +10,6 @@ body:
       options:
         - label: I have read all the LazyVim docs
           required: true
-        - label: This is not a request for a new or existing extra (see above)
-          required: true
   - type: textarea
     validations:
       required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,19 +0,0 @@
-## Description
-
-<!-- Describe the big picture of your changes to communicate to the maintainers
-  why we should accept this pull request. -->
-
-## Related Issue(s)
-
-<!--
-  If this PR fixes any issues, please link to the issue here.
-  - Fixes #<issue_number>
--->
-
-## Screenshots
-
-<!-- Add screenshots of the changes if applicable. -->
-
-## Checklist
-
-- [ ] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines.

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/labeler.yml

@@ -1,19 +0,0 @@
-core:
-  - all:
-      - changed-files:
-          - any-glob-to-any-file: "lua/lazyvim/**"
-          - all-globs-to-all-files: "!lua/lazyvim/plugins/**"
-
-core-plugins:
-  - all:
-      - changed-files:
-          - any-glob-to-any-file: "lua/lazyvim/plugins/**"
-          - all-globs-to-all-files: "!lua/lazyvim/plugins/extras/**"
-
-extras:
-  - changed-files:
-      - any-glob-to-any-file: "lua/lazyvim/plugins/extras/**"
-
-extras-lang:
-  - changed-files:
-      - any-glob-to-any-file: "lua/lazyvim/plugins/extras/lang/**"

.github/release-please-config.json

@@ -1,9 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
-  "packages": {
-    ".": {
-      "release-type": "simple",
-      "extra-files": ["lua/lazyvim/config/init.lua"]
-    }
-  }
-}

.github/workflows/ci.yml

@@ -1,14 +1,68 @@
 name: CI
-
 on:
   push:
-    branches: [main, master]
   pull_request:
 
 jobs:
-  ci:
-    uses: folke/github/.github/workflows/ci.yml@main
-    secrets: inherit
-    with:
-      plugin: LazyVim
-      repo: LazyVim/LazyVim
+  tests:
+    strategy:
+      matrix:
+        # os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Neovim
+        shell: bash
+        run: |
+            wget -q https://github.com/neovim/neovim/releases/download/nightly/nvim-linux64.deb -O /tmp/nvim.deb
+            sudo dpkg -i /tmp/nvim.deb
+      - name: Run Tests
+        run: |
+          nvim --version
+          [ ! -d tests ] && exit 0
+          nvim --headless -u tests/init.lua -c "PlenaryBustedDirectory tests/ {minimal_init = 'tests/init.lua', sequential = true}"
+  docs:
+    runs-on: ubuntu-latest
+    needs: tests
+    if: ${{ github.ref == 'refs/heads/main' }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: panvimdoc
+        uses: kdheepak/panvimdoc@main
+        with:
+          vimdoc: LazyVim
+          version: "Neovim >= 0.8.0"
+          demojify: true
+          treesitter: true
+      - name: Push changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: "chore(build): auto-generate vimdoc"
+          commit_user_name: "github-actions[bot]"
+          commit_user_email: "github-actions[bot]@users.noreply.github.com"
+          commit_author: "github-actions[bot] <github-actions[bot]@users.noreply.github.com>"
+  release:
+    name: release
+    if: ${{ github.ref == 'refs/heads/main' }}
+    needs:
+      - docs
+      - tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: google-github-actions/release-please-action@v3
+        id: release
+        with:
+          release-type: simple
+          package-name: LazyVim
+      - uses: actions/checkout@v2
+      - name: tag stable versions
+        if: ${{ steps.release.outputs.release_created }}
+        run: |
+          git config user.name github-actions[bot]
+          git config user.email github-actions[bot]@users.noreply.github.com
+          git remote add gh-token "https://${{ secrets.GITHUB_TOKEN }}@github.com/google-github-actions/release-please-action.git"
+          git tag -d stable || true
+          git push origin :stable || true
+          git tag -a stable -m "Last Stable Release"
+          git push origin stable

.github/workflows/labeler.yml

@@ -1,8 +0,0 @@
-name: "PR Labeler"
-on:
-  - pull_request_target
-
-jobs:
-  labeler:
-    uses: folke/github/.github/workflows/labeler.yml@main
-    secrets: inherit

.github/workflows/pr.yml

@@ -1,18 +0,0 @@
-name: PR Title
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - edited
-      - synchronize
-      - reopened
-      - ready_for_review
-
-permissions:
-  pull-requests: read
-
-jobs:
-  pr-title:
-    uses: folke/github/.github/workflows/pr.yml@main
-    secrets: inherit

.github/workflows/stale.yml

@@ -1,11 +0,0 @@
-name: Stale Issues & PRs
-
-on:
-  schedule:
-    - cron: "30 1 * * *"
-
-jobs:
-  stale:
-    if: contains(fromJSON('["folke", "LazyVim"]'), github.repository_owner)
-    uses: folke/github/.github/workflows/stale.yml@main
-    secrets: inherit

.github/workflows/update.yml

@@ -1,13 +0,0 @@
-name: Update Repo
-
-on:
-  workflow_dispatch:
-  schedule:
-    # Run every hour
-    - cron: "0 * * * *"
-
-jobs:
-  update:
-    if: contains(fromJSON('["folke", "LazyVim"]'), github.repository_owner)
-    uses: folke/github/.github/workflows/update.yml@main
-    secrets: inherit

.gitignore

@@ -1,9 +1,8 @@
-*.log
-/.repro
-/.tests
-/build
-/debug
-/doc/tags
-foo.*
-node_modules
 tt.*
+.tests
+doc/tags
+debug
+.repro
+foo.*
+*.log
+data

.markdownlint-cli2.yaml

@@ -1,3 +0,0 @@
-config:
-  MD013: false
-  MD033: false

CONTRIBUTING.md

@@ -1,49 +0,0 @@
-# Contributing to LazyVim
-
-## General Guidelines
-
-- Avoid using Vim plugins whenever possible.
-- If an extra requires a Vim plugin, explain why in the PR description.
-- Ensure all configurations are overridable by the user, using Lazy's specs.
-- Tag specs as `optional` if they should only be enabled when the user has them installed.
-- Implement proper lazy-loading for every plugin added in an extra.
-- Understand how Lazy's dependencies work. For Lua dependencies, do not specify
-  them in the `dependencies` field. Instead, add them as a separate spec with `lazy=true`.
-
-## Contributing an Extra Plugin
-
-- The plugin should be well-known and require significant configuration.
-- Simple specs containing just the plugin with some options will not be accepted.
-
-## Contributing an Extra Language
-
-- You should be familiar with the language you are adding.
-- You should have experience with the language's ecosystem, including formatters,
-  linters, and LSP servers.
-- The extra should include the setup most widely used by the community.
-- Include Tree-sitter parsers that are not yet the default.
-- Include the most widely used LSP server setup.
-- Avoid the need for LSP wrapper packages whenever possible.
-- Only add a formatter if it is typically used by the community instead of the LSP formatter.
-- Only add extra linters if the community typically uses them instead of just the LSP linters.
-- Every language extra requires a `recommended` section as part of the extra.
-  Check lspconfig server configurations for the proper filetypes and root directories.
-  Refer to other extras for creating the `recommended` section.
-
-### Language-Specific Keymaps
-
-- Use `<localleader>` for language-specific keymaps (follows Vim/Neovim convention for filetype-specific mappings).
-- For LSP servers, define keymaps in the server's `keys` field, not in `on_attach`:
-  ```lua
-  servers = {
-    rust_analyzer = {
-      keys = {
-        { "<localleader>e", function() vim.cmd.RustLsp("expandMacro") end, desc = "Expand Macro" },
-      }
-    }
-  }
-  ```
-- LazyVim's LSP system will automatically resolve and apply these keymaps (see `lua/lazyvim/plugins/lsp/keymaps.lua`).
-- Don't override standard LSP keymaps (like `K` for hover, `gd` for definition) unless absolutely necessary.
-- Use standard `<leader>c*` keymaps where they make sense (e.g., `<leader>co` for organize imports).
-- Refer to the R and Haskell extras for examples of proper `<localleader>` usage.

NEWS.md

@@ -1,278 +0,0 @@
-# What's new?
-
-## 15.x
-
-**Neovim** `>= 0.11.2` includes a lot of changes to the underlying LSP implementation.
-
-Going forward, **LazyVim** requires **Neovim** `>= 0.11.2`, and drops support for older versions.
-
-### Changes
-
-- removed compatibility code for Neovim `< 0.11.2`
-- configure **LSP** with the native `vim.lsp.config`
-- migrated **mason.nvim** and **mason-lspconfig.nvim** to `v2.x`
-- migrated to [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter/tree/main) **main** branch
-  - with the new version, the `tree-sitter` cli is **required** to install parsers
-  - best to run `:checkhealth nvim-treesitter` after updating
-- replace `nvim-treesitter` incremental selection with `flash.nvim`, since it is no longer supported
-- enabled [blink.cmp](https://github.com/saghen/blink.cmp) **cmdline** completions
-- use **LSP** based folding when available (disable with `nvim-lspconfig.folds.enabled = false`)
-
-## 14.x
-
-Big new release with a lot of changes and improvements!
-Two new plugins have been added, and a lot of plugins have been replaced.
-With these changes, default **LazyVim** is now just `34` plugins.
-
-### Added Plugins
-
-- [fzf-lua](https://github.com/ibhagwan/fzf-lua) as a replacement for [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim)
-  - to use **telescope.nvim** instead, enable the `editor.telescope` extra
-- [blink.cmp](https://github.com/saghen/blink.cmp) as a replacement for [nvim-cmp](https://github.com/hrsh7th/nvim-cmp)
-  - to use **nvim-cmp** instead, enable the `coding.nvim-cmp` extra
-
-### Removed Plugins
-
-- [dressing.nvim](https://github.com/stevearc/dressing.nvim) (replaced with [fzf-lua](https://github.com/ibhagwan/fzf-lua) and [snacks.input](https://github.com/folke/snacks.nvim))
-- [telescope-fzf-native.nvim](https://github.com/nvim-telescope/telescope-fzf-native.nvim) (replaced with [fzf-lua](https://github.com/ibhagwan/fzf-lua))
-- [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim) (replaced with [fzf-lua](https://github.com/ibhagwan/fzf-lua))
-- [indent-blankline.nvim](https://github.com/lukas-reineke/indent-blankline.nvim) (replaced with [snacks.indent](https://github.com/Folke/snacks.nvim))
-  - to use **indent-blankline.nvim** instead, enable the `indent-blankline` extra
-- [nvim-cmp](https://github.com/hrsh7th/nvim-cmp) (replaced with [blink](https://github.com/Saghen/blink.cmp))
-- [nvim-snippets](https://github.com/hrsh7th/vim-vsnip) (replaced with [blink](https://github.com/Saghen/blink.cmp))
-- [cmp-buffer](https://github.com/hrsh7th/cmp-buffer) (replaced with [blink](https://github.com/Saghen/blink.cmp))
-- [cmp-nvim-lsp](https://github.com/hrsh7th/cmp-nvim-lsp) (replaced with [blink](https://github.com/Saghen/blink.cmp))
-- [cmp-path](https://github.com/hrsh7th/cmp-path) (replaced with [blink](https://github.com/Saghen/blink.cmp))
-
-### Changes
-
-- added [`snacks.input`](https://github.com/folke/snacks.nvim/blob/main/docs/input.md)
-- added [`snacks.scroll`](https://github.com/folke/snacks.nvim/blob/main/docs/scroll.md)
-- added [`snacks.indent`](https://github.com/folke/snacks.nvim/blob/main/docs/indent.md)
-- added [`snacks.scope`](https://github.com/folke/snacks.nvim/blob/main/docs/scope.md)
-- added [`snacks.dim`](https://github.com/folke/snacks.nvim/blob/main/docs/dim.md)
-- added [`snacks.zen`](https://github.com/folke/snacks.nvim/blob/main/docs/zen.md)
-- changed default [`which-key`](https://github.com/folke/which-key.nvim) preset to `helix`
-- drop `LazyVim.ui.fg` in favor of [`Snacks.util.color`](https://github.com/folke/snacks.nvim/blob/main/docs/util.md)
-
-To disable **all animations**, add the following to your `options.lua`:
-
-```lua
-vim.g.snacks_animate = false
-```
-
-### Keymaps
-
-- `<leader>uz` to toggle [zen mode](https://github.com/folke/snacks.nvim/blob/main/docs/zen.md)
-- `<leader>uZ` & `<leader>wm` to toggle [zoom mode](https://github.com/folke/snacks.nvim/blob/main/docs/zen.md)
-- `<leader>uD` to toggle [dimming](https://github.com/folke/snacks.nvim/blob/main/docs/dim.md)
-- `<leader>ua` to toggle [animations](https://github.com/folke/snacks.nvim/blob/main/docs/animate.md)
-- `<leader>uS` to toggle [scroll](https://github.com/folke/snacks.nvim/blob/main/docs/scroll.md)
-- `<leader>ug` to toggle [indent guides](https://github.com/folke/snacks.nvim/blob/main/docs/indent.md)
-- [`snacks.profiler`](https://github.com/folke/snacks.nvim/blob/main/docs/profiler.md) keymaps under `<leader>dp`
-
----
-
-## 13.x
-
-- **LazyVim** now uses `Snacks.dashboard` as the default dashboard.
-  Check the [docs](https://github.com/folke/snacks.nvim/blob/main/docs/dashboard.md),
-  for more information and examples.
-
-- A new [dashboard-nvim](https://github.com/nvimdev/dashboard-nvim) extra
-  is available for those who prefer the old dashboard.
-
-- Big new release with a lot of changes and improvements!
-
-- The biggest change is the move of a bunch of core features to
-  [snacks.nvim](https://github.com/folke/snacks.nvim) and fully
-  integrating it into **LazyVim**.
-
-- I highly suggest having a look at the **snacks.nvim** documentation
-  to see all the new features and improvements. Most important changes:
-  - `Snacks.notifier` for notifications instead of `nvim-notify`
-  - `Snacks.terminal` is similar to `lazyterm`, but has more features
-    and creates bottom splits by default (similar to the `edgy` integrating)
-
----
-
-## 12.x
-
-- **Markdown Extra**: [headlines.nvim](https://github.com/lukas-reineke/headlines.nvim) has been removed in favor of [markdown.nvim](https://github.com/MeanderingProgrammer/markdown.nvim)
-  to spice up your markdown files.
-
-- [nvim-spectre](https://github.com/nvim-pack/nvim-spectre) has been removed in favor of [grug-far.nvim](https://github.com/MagicDuck/grug-far.nvim).
-  **grug-far.nvim** has a great UI and feels more intuitive to use.
-
-- This **news** is now also available on the website at [https://www.lazyvim.org/news](https://www.lazyvim.org/news)
-
-- **prettier** extra now works for all prettier supported filetypes
-  and will be enabled for astro/svelte extra if you have a proper
-  config file with the correct prettier plugin
-
-- **New Language Support:** SQL, Clojure, Thrift, Elm, Gleam, Angular,
-  NuShell, Svelte, Kotlin, Astro, Toml and PHP
-
-- **New Extras:** `copilot-chat`, `git`, `octo`, `inc-rename` and `neogen`
-
-- The **typescript** extra now uses `vtsls` instead of `tsserver`
-
-- **Neovim >= 0.10** now uses the much faster [lazydev.nvim](https://github.com/folke/lazydev.nvim)
-  instead of `neodev.nvim`
-
-- moved `neoconf.nvim` to extras. Project specific LSP settings
-  can be done with a `.lazy.lua` file instead.
-
----
-
-## 11.x
-
-- **Keymaps:**
-  - `<leader>gB` to open the current repo in the browser
-  - `gco` and `gcO` to add a comment below or above the current line
-  - `<leader>wm` to toggle window maximize
-
-- **lazydev.nvim:** faster alternative to `neodev.nvim`
-
-- **Options:** Added `linebreak=true` to default options.
-
-- `mini.ai` is back as a default plugin! Removing it was a mistake.
-  It's a great plugin that enhances the native text objects.
-
-- `:LazyExtras` now has multiple new sections:
-  - **Enabled**: extras that are currently enabled
-  - **Recommended Languages**: language extras recommended for the current buffer / directory
-  - **Recommended Plugins**: extras that are recommended for most users
-  - **Plugins**: other plugin extras
-  - **Languages**: other language extras
-
-- new option `vim.g.deprecation_warnings` to disable deprecation warnings
-  Defaults to `false`. To enable deprecation warnings, set it to `true` in your `options.lua`
-
-- `vim-illuminate` move to extras
-  Document highlights now use native lsp functionality by default
-
-Since Neovim 0.10 has been released, I've been working on a new version of **LazyVim**
-that is fully compatible with all the latest Neovim features.
-
-Additionally, some core plugins have been moved to extras.
-
-- `native snippets` are now the default on Neovim 0.10
-  Older versions of Neovim will use the new `luasnip` extra.
-
-- `native comments` are now the default on Neovim 0.10
-  Older versions of Neovim will use the new `mini-comment` extra.
-  `nvim-ts-context-commentstring` has been integrated in the native comments.
-
-- `inlay hints` have been in **LazyVim** for a while, but are now
-  enabled by default. To disable them:
-
-  ```lua
-  {
-    "nvim-lspconfig",
-    opts = {
-      inlay_hints = { enabled = false },
-    }
-  }
-  ```
-
-- plugins moved to extras:
-  - `mini.surround`
-  - `mini.indentscope` scopes are now also highlighted with `indent-blankline`
-  - `nvim-treesitter-context`
-
----
-
-## 10.x
-
-- added new extra for [mini.diff](https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-diff.md)
-  This is a plugin similar to gitsigns but with a neat diff overlay
-  that can be toggled with `<leader>go`.
-
-- **trouble.nvim** has been rewritten from scratch and is now in beta.
-  I've added a new extra for it (`trouble-v3`) for those of you who want to try it out.
-  You can find the updated docs [here](https://github.com/folke/trouble.nvim/tree/dev)
-
-- The **lazygit** integration now configures:
-  - the theme based on the colorscheme
-  - nerd font icons (v3)
-  - editor preset is set to `nvim-remote` for better interop with Neovim
-
-- The option `vim.g.lazygit_theme` was renamed to `vim.g.lazygit_config`
-
-- **lazygit** now automatically uses the colors of your current colorscheme.
-  This is enabled by default. To disable, add the below to your `options.lua`:
-
-  ```lua
-  vim.g.lazygit_config = false
-  ```
-
-- Added support for `basedpyright` to the **python** extra.
-  Enable in your `options.lua` with:
-
-  ```lua
-  vim.g.lazyvim_python_lsp = "basedpyright"
-  ```
-
-  Be aware that `basedpyright` is still in development and
-  may not work exactly the same as `pyright`.
-
-- User extras under `lua/plugins/extras` can now also be managed
-  with **LazyExtras**
-
-- `nvim-ts-autotag` is now included by default
-
-- `nvim-treesitter-context` is now included by default
-
-- Added extra for `symbols-outline.nvim`
-
-- Added extra for `aerial.nvim`
-
-- `nvim-navic` has been removed. If you want to keep using `nvim-navic`,
-  you can enable the **editor.navic** extra
-
-- New `:LazyExtras` command for managing **LazyVim** extras
-
-- Improved **formatting**:
-  - **LazyVim** can now work with multiple formatters. Types:
-    - **primary**: only one primary formatter can be active at a time.
-      _(conform, none-ls, LSP)_
-    - **secondary**: multiple secondary formatters can be active _(eslint, ...)_
-
-  - **LazyVim** automatically selects the primary formatter based on the
-    current available sources and priorities.
-
-  - New `:LazyFormat` command for formatting the current selection or buffer
-  - New `:LazyFormatInfo` command for displaying the active formatters
-    for the current buffer
-  - Auto-formatting can be disabled with:
-
-    ```lua
-    vim.g.autoformat = false -- globally
-    vim.b.autoformat = false -- buffer-local
-    ```
-
-- `none-ls.nvim` is no longer installed by default
-  - `conform.nvim` is now the default formatter
-  - `nvim-lint` is now the default linter
-  - If you want to keep using `none-ls.nvim`,
-    you can enable the **lsp.none-ls** extra
-
-- `dashboard.nvim` is the new default dashboard plugin
-  - If you want to keep using `alpha.nvim`, you can enable the **ui.alpha** extra
-
-- Improved **root detection**:
-  - New `:LazyRoot` command that shows info about the root dir detection
-  - Configurable with `vim.g.root_spec`
-
-    ```lua
-    -- LazyVim root dir detection
-    -- Each entry can be:
-    -- * the name of a detector function like `lsp` or `cwd`
-    -- * a pattern or array of patterns like `.git` or `lua`.
-    -- * a function with signature `function(buf) -> string|string[]`
-    vim.g.root_spec = { "lsp", { ".git", "lua" }, "cwd" }
-
-    -- To disable root detection set to just "cwd"
-    vim.g.root_spec = { "cwd" }
-    ```

README-CN.md

@@ -36,9 +36,9 @@
     </a>
 </div>
 
-LazyVim 是一个基于 [💤 lazy.nvim](https://github.com/folke/lazy.nvim) 的 Neovim 配置方案，让定制和扩展变得简单直观。
-您不必再在“从零配置”和“使用预制发行版”之间做选择，LazyVim
-提供了一个两全其美的方式——既可以享受默认配置带来的便利，又能根据个人需求来灵活调整各项设置。
+LazyVim 是由 [💤 lazy.nvim](https://github.com/folke/lazy.nvim) 驱动的一套 Neovim 配置，可以轻松自定义和扩展您的配置。
+不必在从头开始或使用预制发行版之间做选择，
+LazyVim 提供了两全其美的方式 - 根据需要调整配置的灵活性，以及默认预配置的便利性。
 
 ![image](https://user-images.githubusercontent.com/292349/211285846-0b7bb3bf-0462-4029-b64c-4ee1d037fc1c.png)
 
@@ -46,28 +46,27 @@ LazyVim 是一个基于 [💤 lazy.nvim](https://github.com/folke/lazy.nvim) 的
 
 ## ✨ 特性
 
-- 🔥 将你的 Neovim 打造为一个功能完备的 IDE
-- 💤 使用 [lazy.nvim](https://github.com/folke/lazy.nvim) 轻松自定义和扩展您的设置
+- 🔥 将你的 Neovim 变成一个成熟的 IDE
+- 💤 使用 [lazy.nvim](https://github.com/folke/lazy.nvim) 轻松自定义和扩展您的配置
 - 🚀 快如闪电
 - 🧹 选项、自动命令和键盘映射的合理预设
-- 📦 内置大量精心优化的预配置插件，开箱即用
+- 📦 预配置了大量插件，随时可用
 
-## ⚡️ 环境要求
+## ⚡️ 要求
 
-- Neovim >= **0.11.2** (需要用 **LuaJIT** 构建)
+- Neovim >= **0.8.0** (需要用 **LuaJIT** 构建)
 - Git >= **2.19.0** (用于部分克隆支持)
 - 一个 [Nerd Font](https://www.nerdfonts.com/) 字体 **_(可选)_**
-- 一个用于 `nvim-treesitter` 的 **C** 编译器。看 [这里](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
 
-## 🚀 开始使用
+## 🚀 入门
 
-您可以在 [此处](https://github.com/LazyVim/starter) 找到 **LazyVim** 的初始模板
+您可以在 [此处](https://github.com/LazyVim/starter) 找到 **LazyVim** 的入门模板
 
-<details><summary>在 Docker 中尝鲜</summary>
+<details><summary>在 Docker 中尝试</summary>
 
 ```sh
 docker run -w /root -it --rm alpine:edge sh -uelic '
-  apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
+  apk add git lazygit neovim ripgrep alpine-sdk --update
   git clone https://github.com/LazyVim/starter ~/.config/nvim
   cd ~/.config/nvim
   nvim
@@ -91,7 +90,7 @@ docker run -w /root -it --rm alpine:edge sh -uelic '
   git clone https://github.com/LazyVim/starter ~/.config/nvim
   ```
 
-- 删除 `.git` 文件夹，以便稍后将其添加到您自己的仓库
+- 删除 `.git` 文件夹，以便稍后将其添加到您自己的存储库
 
   ```sh
   rm -rf ~/.config/nvim/.git
@@ -109,23 +108,18 @@ docker run -w /root -it --rm alpine:edge sh -uelic '
 
 ---
 
-[@elijahmanor](https://github.com/elijahmanor) 制作了一个很棒的视频，可以带领你快速入门。
+[@elijahmanor](https://github.com/elijahmanor) 制作了一段很棒的视频，其中包含入门演练。
 
-[![查看这个视频](https://img.youtube.com/vi/N93cTbtLCIM/hqdefault.jpg)](https://www.youtube.com/watch?v=N93cTbtLCIM)
-
-[@dusty-phillips](https://github.com/dusty-phillips) 为 LazyVim 编写了一本全面的书籍
-[《LazyVim for Ambitious Developers》](https://lazyvim-ambitious-devs.phillips.codes)
-，可在线上免费阅读。
+[![Watch the video](https://img.youtube.com/vi/N93cTbtLCIM/hqdefault.jpg)](https://www.youtube.com/watch?v=N93cTbtLCIM)
 
 ## 📂 文件结构
 
-config 下的文件会在适当的时候被自动加载，所以你不需要手动引入这些文件。
+config 下的文件会在适当的时候自动加载，所以你不需要手动引入这些文件。
+**LazyVim** 带有一组默认配置文件，这些文件将在您的配置**之前**加载。
+看[这里](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config)
 
-**LazyVim** 带有一组默认配置文件，这些文件会在您的配置**之前**被加载。
-请看[这里](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config)
-
-您可以在 `lua/plugins/` 下添加自定义插件配置。
-[lazy.nvim](https://github.com/folke/lazy.nvim) 会自动加载此目录中的全部文件。
+您可以在 `lua/plugins/` 下添加自定义插件配置(specs)。
+[lazy.nvim](https://github.com/folke/lazy.nvim) 会自动加载这些文件。
 
 <pre>
 ~/.config/nvim
@@ -142,6 +136,6 @@ config 下的文件会在适当的时候被自动加载，所以你不需要手
 └── init.lua
 </pre>
 
-## ⚙️ 设置
+## ⚙️ Configuration
 
-请参阅[官方文档](https://lazyvim.github.io/)
+参考[文档](https://lazyvim.github.io/)

README-DE.md.txt

@@ -1,138 +1,138 @@
-<div align="center">
-  <img src="https://user-images.githubusercontent.com/292349/213446185-2db63fd5-8c84-459c-9f04-e286382d6e80.png">
-</div>
-
-<hr>
-
-<h4 align="center">
-  <a href="https://lazyvim.github.io/installation">Installieren</a>
-  ·
-  <a href="https://lazyvim.github.io/configuration">Konfigurieren</a>
-  ·
-  <a href="https://lazyvim.github.io">Dokumentation</a>
-</h4>
-
-<div align="center"><p>
-    <a href="https://github.com/LazyVim/LazyVim/releases/latest">
-      <img alt="Latest release" src="https://img.shields.io/github/v/release/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=C9CBFF&logoColor=D9E0EE&labelColor=302D41&include_prerelease&sort=semver" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/pulse">
-      <img alt="Last commit" src="https://img.shields.io/github/last-commit/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=8bd5ca&logoColor=D9E0EE&labelColor=302D41"/>
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/blob/main/LICENSE">
-      <img alt="License" src="https://img.shields.io/github/license/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=ee999f&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/stargazers">
-      <img alt="Stars" src="https://img.shields.io/github/stars/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=c69ff5&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/issues">
-      <img alt="Issues" src="https://img.shields.io/github/issues/LazyVim/LazyVim?style=for-the-badge&logo=bilibili&color=F5E0DC&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim">
-      <img alt="Repo Size" src="https://img.shields.io/github/repo-size/LazyVim/LazyVim?color=%23DDB6F2&label=SIZE&logo=codesandbox&style=for-the-badge&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://twitter.com/intent/follow?screen_name=folke">
-      <img alt="follow on Twitter" src="https://img.shields.io/twitter/follow/folke?style=for-the-badge&logo=twitter&color=8aadf3&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-</div>
-
-LazyVim ist ein Neovim-Setup aufgebaut auf [💤 lazy.nvim](https://github.com/folke/lazy.nvim).
-Es erleichtert das Anpassen und Erweitern von Ihrer Konfiguration.
-Anstatt von vorne anzufangen oder eine vorgefertigte Distro zu verwenden, gibt LazyVim das beste aus
-beiden Welten - die Flexibilität Ihre Konfiguration zu verändern und einzustellen wie Sie es wollen
-und die Einfachheit von einem vorgefertigten Setup.
-
-![image](https://user-images.githubusercontent.com/292349/213447056-92290767-ea16-430c-8727-ce994c93e9cc.png)
-
-![image](https://user-images.githubusercontent.com/292349/211285846-0b7bb3bf-0462-4029-b64c-4ee1d037fc1c.png)
-
-## ✨ Features
-
-- 🔥 Transformiere dein Neovim in eine komplette IDE
-- 💤 Passe deine Konfiguration einfach an und erweitere diese mit [lazy.nvim](https://github.com/folke/lazy.nvim)
-- 🚀 Extrem schnell
-- 🧹 Logische Voreinstellungen für optionen, autocmds und keymaps
-- 📦 Kommt mit einem Haufen vorkonfigurierter, ready-to-use Plugins
-
-## ⚡️ Vorraussetzungen
-
-- Neovim >= **0.11.2** (gebraucht um mit **LuaJIT** zu bauen)
-- Git >= **2.19.0** (um Teil-Klone zu unterstützen)
-- eine [Nerd Font](https://www.nerdfonts.com/) **_(optional)_**
-
-## 🚀 Einstieg
-
-Sie können eine Startvorlage für **LazyVim** [hier](https://github.com/LazyVim/starter) finden
-
-<details><summary>Versuchen Sie's mit Docker</summary>
-
-```sh
-docker run -w /root -it --rm alpine:edge sh -uelic '
-  apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  cd ~/.config/nvim
-  nvim
-'
-```
-
-</details>
-
-<details><summary>Installieren von <a href="https://github.com/LazyVim/starter">LazyVim Starter</a></summary>
-
-- Neovim Files sichern:
-
-  ```sh
-  mv ~/.config/nvim ~/.config/nvim.bak
-  mv ~/.local/share/nvim ~/.local/share/nvim.bak
-  ```
-
-- Den Starter Klonen:
-
-  ```sh
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  ```
-
-- Den `.git` Folder löschen, um die Konfiguration zu einer eigenen distro hinzuzufügen:
-
-  ```sh
-  rm -rf ~/.config/nvim/.git
-  ```
-
-- Neovim starten!
-
-  ```sh
-  nvim
-  ```
-
-  Refer to the comments in the files on how to customize **LazyVim**.
-
-</details>
-
-## 📂 Dateistruktur
-
-Die Dateien unter `config` werden automatisch und zur richtigen Zeit geladen,
-sodass ein manuelles `require` nicht nötig ist.
-**LazyVim** bringt Konfigurationsdatein mit, die **_vor_** Ihren eigenen geladen werden -
-siehe [hier](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config)
-Sie können eigene Plugins unter `lua/plugins/` hinzufügen. Alle Dateien innerhalb
-dieses Ordners werden automatisch mit [lazy.nvim](https://github.com/folke/lazy.nvim)
-geladen.
-
-<pre>
-~/.config/nvim
-├── lua
-│   ├── config
-│   │   ├── autocmds.lua
-│   │   ├── keymaps.lua
-│   │   ├── lazy.lua
-│   │   └── options.lua
-│   └── plugins
-│       ├── spec1.lua
-│       ├── **
-│       └── spec2.lua
-└── init.toml
-</pre>
-
-## ⚙️ Konfiguration
-
-Siehe [Dokumentation](https://lazyvim.github.io).
+<div align="center">
+  <img src="https://user-images.githubusercontent.com/292349/213446185-2db63fd5-8c84-459c-9f04-e286382d6e80.png">
+</div>
+
+<hr>
+
+<h4 align="center">
+  <a href="https://lazyvim.github.io/installation">Install</a>
+  ·
+  <a href="https://lazyvim.github.io/configuration">Configure</a>
+  ·
+  <a href="https://lazyvim.github.io">Docs</a>
+</h4>
+
+<div align="center"><p>
+    <a href="https://github.com/LazyVim/LazyVim/releases/latest">
+      <img alt="Latest release" src="https://img.shields.io/github/v/release/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=C9CBFF&logoColor=D9E0EE&labelColor=302D41&include_prerelease&sort=semver" />
+    </a>
+    <a href="https://github.com/LazyVim/LazyVim/pulse">
+      <img alt="Last commit" src="https://img.shields.io/github/last-commit/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=8bd5ca&logoColor=D9E0EE&labelColor=302D41"/>
+    </a>
+    <a href="https://github.com/LazyVim/LazyVim/blob/main/LICENSE">
+      <img alt="License" src="https://img.shields.io/github/license/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=ee999f&logoColor=D9E0EE&labelColor=302D41" />
+    </a>
+    <a href="https://github.com/LazyVim/LazyVim/stargazers">
+      <img alt="Stars" src="https://img.shields.io/github/stars/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=c69ff5&logoColor=D9E0EE&labelColor=302D41" />
+    </a>
+    <a href="https://github.com/LazyVim/LazyVim/issues">
+      <img alt="Issues" src="https://img.shields.io/github/issues/LazyVim/LazyVim?style=for-the-badge&logo=bilibili&color=F5E0DC&logoColor=D9E0EE&labelColor=302D41" />
+    </a>
+    <a href="https://github.com/LazyVim/LazyVim">
+      <img alt="Repo Size" src="https://img.shields.io/github/repo-size/LazyVim/LazyVim?color=%23DDB6F2&label=SIZE&logo=codesandbox&style=for-the-badge&logoColor=D9E0EE&labelColor=302D41" />
+    </a>
+    <a href="https://twitter.com/intent/follow?screen_name=folke">
+      <img alt="follow on Twitter" src="https://img.shields.io/twitter/follow/folke?style=for-the-badge&logo=twitter&color=8aadf3&logoColor=D9E0EE&labelColor=302D41" />
+    </a>
+</div>
+
+LazyVim ist ein Neovim setup aufgebaut auf [💤 lazy.nvim](https://github.com/folke/lazy.nvim). 
+Es erleichter das Anpassen und erweitern von Ihrer Konfiguration.
+Anstatt von vorne anzufangen oder eine vorgefertigte Distro zu verwenden, gibt LazyVim das beste aus 
+beiden Welten - die Flexibilität Ihre Konfiguration zu verändern und einzustellen wie Sie es wollen
+und die Einfachheit von einem vorgefertigten Setup.
+
+![image](https://user-images.githubusercontent.com/292349/213447056-92290767-ea16-430c-8727-ce994c93e9cc.png)
+
+![image](https://user-images.githubusercontent.com/292349/211285846-0b7bb3bf-0462-4029-b64c-4ee1d037fc1c.png)
+
+## ✨ Features
+
+- 🔥 Transformiere dein Neovim in eine komplette IDE
+- 💤 Passe deine Konfiguration einfach an und erweitere diese mit [lazy.nvim](https://github.com/folke/lazy.nvim)
+- 🚀 Extrem schnell
+- 🧹 Logische Voreinstellungen für optionen, autocmds und keymaps
+- 📦 Kommt mit einem Haufen vor Konfigurierten, ready to use Plugins
+
+## ⚡️ Vorraussetzungen
+
+- Neovim >= **0.8.0** (gebraucht um mit **LuaJIT** zu bauen)
+- Git >= **2.19.0** (um Teil-Klone zu unterstützen)
+- eine [Nerd Font](https://www.nerdfonts.com/) **_(optional)_**
+
+## 🚀 Einstieg
+
+Sie können eine Startvorlage für **LazyVim** [hier](https://github.com/LazyVim/starter) finden
+
+<details><summary>Versuchen Sie's mit Docker</summary>
+
+```sh
+docker run -w /root -it --rm alpine:edge sh -uelic '
+  apk add git lazygit neovim ripgrep alpine-sdk --update
+  git clone https://github.com/LazyVim/starter ~/.config/nvim
+  cd ~/.config/nvim
+  nvim
+'
+```
+
+</details>
+
+<details><summary>Installieren von <a href="https://github.com/LazyVim/starter">LazyVim Starter</a></summary>
+
+- Neovim Files sichern:
+
+  ```sh
+  mv ~/.config/nvim ~/.config/nvim.bak
+  mv ~/.local/share/nvim ~/.local/share/nvim.bak
+  ```
+
+- Den Starter Klonen:
+
+  ```sh
+  git clone https://github.com/LazyVim/starter ~/.config/nvim
+  ```
+
+- Den `.git` Folder löschen, um die Konfiguration zu einer eigenen distro hinzuzufügen:
+
+  ```sh
+  rm -rf ~/.config/nvim/.git
+  ```
+
+- Neovim starten!
+
+  ```sh
+  nvim
+  ```
+
+  Refer to the comments in the files on how to customize **LazyVim**.
+
+</details>
+
+## 📂 File Structure
+
+The files under config will be automatically loaded at the appropriate time,
+so you don't need to require those files manually.
+**LazyVim** comes with a set of default config files that will be loaded
+**_before_** your own. See [here](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config)
+
+You can add your custom plugin specs under `lua/plugins/`. All files there
+will be automatically loaded by [lazy.nvim](https://github.com/folke/lazy.nvim)
+
+<pre>
+~/.config/nvim
+├── lua
+│   ├── config
+│   │   ├── autocmds.lua
+│   │   ├── keymaps.lua
+│   │   ├── lazy.lua
+│   │   └── options.lua
+│   └── plugins
+│       ├── spec1.lua
+│       ├── **
+│       └── spec2.lua
+└── init.toml
+</pre>
+
+## ⚙️ Configuration
+
+Refer to the [docs](https://lazyvim.github.io)

README-ES.md

@@ -1,145 +0,0 @@
-<div align="center">
-  <img src="https://user-images.githubusercontent.com/292349/213446185-2db63fd5-8c84-459c-9f04-e286382d6e80.png">
-</div>
-
-<hr>
-
-<h4 align="center">
-  <a href="https://lazyvim.github.io/installation">Instalar</a>
-  ·
-  <a href="https://lazyvim.github.io/configuration">Configurar</a>
-  ·
-  <a href="https://lazyvim.github.io">Documentación</a>
-</h4>
-
-<div align="center"><p>
-    <a href="https://github.com/LazyVim/LazyVim/releases/latest">
-      <img alt="Última versión" src="https://img.shields.io/github/v/release/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=C9CBFF&logoColor=D9E0EE&labelColor=302D41&include_prerelease&sort=semver" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/pulse">
-      <img alt="Último commit" src="https://img.shields.io/github/last-commit/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=8bd5ca&logoColor=D9E0EE&labelColor=302D41"/>
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/blob/main/LICENSE">
-      <img alt="Licencia" src="https://img.shields.io/github/license/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=ee999f&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/stargazers">
-      <img alt="Estrellas" src="https://img.shields.io/github/stars/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=c69ff5&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/issues">
-      <img alt="Problemas" src="https://img.shields.io/github/issues/LazyVim/LazyVim?style=for-the-badge&logo=bilibili&color=F5E0DC&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim">
-      <img alt="Tamaño del repositorio" src="https://img.shields.io/github/repo-size/LazyVim/LazyVim?color=%23DDB6F2&label=SIZE&logo=codesandbox&style=for-the-badge&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://twitter.com/intent/follow?screen_name=folke">
-      <img alt="seguir en Twitter" src="https://img.shields.io/twitter/follow/folke?style=for-the-badge&logo=twitter&color=8aadf3&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-</div>
-
-LazyVim es una configuración de Neovim impulsada por [💤 lazy.nvim](https://github.com/folke/lazy.nvim) que facilita la personalización y extensión de tu configuración. En lugar de tener que elegir entre comenzar desde cero o usar una distribución predefinida, LazyVim ofrece lo mejor de ambos mundos: la flexibilidad para ajustar tu configuración según sea necesario, junto con la conveniencia de una configuración preconfigurada.
-
-![image](https://user-images.githubusercontent.com/292349/211285846-0b7bb3bf-0462-4029-b64c-4ee1d037fc1c.png)
-
-![image](https://user-images.githubusercontent.com/292349/213447056-92290767-ea16-430c-8727-ce994c93e9cc.png)
-
-## ✨ Características
-
-- 🔥 Convierte tu Neovim en un IDE completo
-- 💤 Personaliza y extiende fácilmente tu configuración con [lazy.nvim](https://github.com/folke/lazy.nvim)
-- 🚀 Extremadamente rápido
-- 🧹 Ajustes predeterminados sensatos para opciones, autocmds y combinaciones de teclas
-- 📦 Viene con una gran cantidad de plugins preconfigurados y listos para usar
-
-## ⚡️ Requisitos
-
-- Neovim >= **0.11.2** (debe ser compilado con **LuaJIT**)
-- Git >= **2.19.0** (para soporte de clones parciales)
-- una [Fuente Nerd](https://www.nerdfonts.com/) **_(opcional)_**
-- un compilador **C** para `nvim-treesitter`. Consulta [aquí](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
-
-## 🚀 Empezando
-
-Puedes encontrar una plantilla de inicio para **LazyVim** [aquí](https://github.com/LazyVim/starter)
-
-<details><summary>Probarlo con Docker</summary>
-
-```sh
-docker run -w /root -it --rm alpine:edge sh -uelic '
-  apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  cd ~/.config/nvim
-  nvim
-'
-```
-
-</details>
-
-<details><summary>Instalar el <a href="https://github.com/LazyVim/starter">LazyVim Starter</a></summary>
-
-- Haz una copia de seguridad de tus archivos actuales de Neovim:
-
-  ```sh
-  mv ~/.config/nvim ~/.config/nvim.bak
-  mv ~/.local/share/nvim ~/.local/share/nvim.bak
-  ```
-
-- Clona el starter
-
-  ```sh
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  ```
-
-- Elimina la carpeta `.git`, para que puedas agregarla a tu propio repositorio más tarde
-
-  ```sh
-  rm -rf ~/.config/nvim/.git
-  ```
-
-- ¡Inicia Neovim!
-
-  ```sh
-  nvim
-  ```
-
-  Consulta los comentarios en los archivos sobre cómo personalizar **LazyVim**.
-
-</details>
-
----
-
-Hay un excelente video creado por [@elijahmanor](https://github.com/elijahmanor) con una guía para empezar.
-
-[![Ver el video](https://img.youtube.com/vi/N93cTbtLCIM/hqdefault.jpg)](https://www.youtube.com/watch?v=N93cTbtLCIM)
-
-[@dusty-phillips](https://github.com/dusty-phillips) escribió un libro completo llamado
-[LazyVim para Desarrolladores Ambiciosos](https://lazyvim-ambitious-devs.phillips.codes)
-disponible de forma gratuita en línea.
-
-## 📂 Estructura de Archivos
-
-Los archivos dentro de la configuración se cargarán automáticamente en el momento adecuado,
-por lo que no necesitas requerir esos archivos manualmente.
-**LazyVim** viene con un conjunto de archivos de configuración predeterminados que se cargarán
-**_antes_** que los tuyos. Consulta [aquí](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config)
-
-Puedes agregar tus especificaciones de plugins personalizadas en `lua/plugins/`. Todos los archivos allí
-serán cargados automáticamente por [lazy.nvim](https://github.com/folke/lazy.nvim)
-
-<pre>
-~/.config/nvim
-├── lua
-│   ├── config
-│   │   ├── autocmds.lua
-│   │   ├── keymaps.lua
-│   │   ├── lazy.lua
-│   │   └── options.lua
-│   └── plugins
-│       ├── spec1.lua
-│       ├── **
-│       └── spec2.lua
-└── init.lua
-</pre>
-
-## ⚙️ Configuración
-
-Consulta la [documentación](https://lazyvim.github.io)

README-FR.md

@@ -1,151 +0,0 @@
-<div align="center">
-  <img src="https://user-images.githubusercontent.com/292349/213446185-2db63fd5-8c84-459c-9f04-e286382d6e80.png">
-</div>
-
-<hr>
-
-<h4 align="center">
-  <a href="https://lazyvim.github.io/installation">Install</a>
-  ·
-  <a href="https://lazyvim.github.io/configuration">Configure</a>
-  ·
-  <a href="https://lazyvim.github.io">Docs</a>
-</h4>
-
-<div align="center"><p>
-    <a href="https://github.com/LazyVim/LazyVim/releases/latest">
-      <img alt="Latest release" src="https://img.shields.io/github/v/release/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=C9CBFF&logoColor=D9E0EE&labelColor=302D41&include_prerelease&sort=semver" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/pulse">
-      <img alt="Last commit" src="https://img.shields.io/github/last-commit/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=8bd5ca&logoColor=D9E0EE&labelColor=302D41"/>
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/blob/main/LICENSE">
-      <img alt="License" src="https://img.shields.io/github/license/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=ee999f&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/stargazers">
-      <img alt="Stars" src="https://img.shields.io/github/stars/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=c69ff5&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/issues">
-      <img alt="Issues" src="https://img.shields.io/github/issues/LazyVim/LazyVim?style=for-the-badge&logo=bilibili&color=F5E0DC&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim">
-      <img alt="Repo Size" src="https://img.shields.io/github/repo-size/LazyVim/LazyVim?color=%23DDB6F2&label=SIZE&logo=codesandbox&style=for-the-badge&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://twitter.com/intent/follow?screen_name=folke">
-      <img alt="follow on Twitter" src="https://img.shields.io/twitter/follow/folke?style=for-the-badge&logo=twitter&color=8aadf3&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-</div>
-
-LazyVim est une configuration Neovim basée sur [💤 lazy.nvim](https://github.com/folke/lazy.nvim)
-facilitant la personnalisation et l'ajout d'extensions.
-Plutôt que d'imposer le choix entre partir de rien et utiliser
-une distribution toute faite, LazyVim offre le meilleur des deux mondes
-: la flexibilité d'une config ajustable selon vos besoins, et le confort
-d'une configuration pensée et peaufinée à l'avance.
-
-![image](https://user-images.githubusercontent.com/292349/211285846-0b7bb3bf-0462-4029-b64c-4ee1d037fc1c.png)
-
-![image](https://user-images.githubusercontent.com/292349/213447056-92290767-ea16-430c-8727-ce994c93e9cc.png)
-
-## ✨ Fonctionnalités
-
-- 🔥 Transforme Neovim en un environnement de développement complet
-- 💤 Customise et étends ta config sans effort grâce à [lazy.nvim](https://github.com/folke/lazy.nvim)
-- 🚀 Rapide comme l'éclair !
-- 🧹 Configuration par défaut propre et intuitive pour les options, les autocmds, et les keymaps 
-- 📦 Livré avec une variété de plugins pre-configurés et prêts à être utilisés
-
-## ⚡️ Pré-requis
-
-- Neovim >= **0.9.0** (doit être compilé avec **LuaJIT**)
-- Git >= **2.19.0** (pour supporter le clonage partiel)
-- Un [Nerd Font](https://www.nerdfonts.com/) **_(optionel)_**
-- Un compileur **C** pour `nvim-treesitter`. Voir [ici](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
-
-## 🚀 Comment commencer
-
-Un template pour **LazyVim** peut être trouvé [ici](https://github.com/LazyVim/starter)
-
-<details><summary>Essayer avec Docker</summary>
-
-```sh
-docker run -w /root -it --rm alpine:edge sh -uelic '
-  apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  cd ~/.config/nvim
-  nvim
-'
-```
-
-</details>
-
-<details><summary>Installer le <a href="https://github.com/LazyVim/starter">LazyVim Starter</a></summary>
-
-- Sauvegardez votre configuration Neovim :
-
-  ```sh
-  mv ~/.config/nvim ~/.config/nvim.bak
-  mv ~/.local/share/nvim ~/.local/share/nvim.bak
-  ```
-
-- Clonez le starter
-
-  ```sh
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  ```
-
-- Supprimez le dossier `.git`, afin que vous puissiez l'ajouter à votre repo plus tard
-
-  ```sh
-  rm -rf ~/.config/nvim/.git
-  ```
-
-- Lancez Neovim !
-
-  ```sh
-  nvim
-  ```
-
-  Consultez les commentaires dans les fichiers pour savoir comment personnaliser **LazyVim**.
-
-</details>
-
----
-
-Il y a une superbe vidéo (en anglais) de [@elijahmanor](https://github.com/elijahmanor)
-qui vous guide pas-à-pas pour commencer.
-
-[![Watch the video](https://img.youtube.com/vi/N93cTbtLCIM/hqdefault.jpg)](https://www.youtube.com/watch?v=N93cTbtLCIM)
-
-[@dusty-phillips](https://github.com/dusty-phillips) a écrit un livre exhaustif
-sur LazyVim, nommé [LazyVim for Ambitious Developers](https://lazyvim-ambitious-devs.phillips.codes)
-disponible gratuitement en ligne.
-
-## 📂 Structure de fichier
-
-Les fichiers dans le dossier config vont être chargés automatiquement en temps voulu,
-donc pas besoin de `require` ces fichiers manuellement.
-**LazyVim** vient avec un ensemble de fichiers de configuration par défaut qui seront chargés
-**_avant_** les vôtres. Voir [ici](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config)
-
-Vous pouvez ajouter vos configurations de plugins sous `lua/plugins/`.
-Ici, tous les fichiers seront automatiquement chargés par [lazy.nvim](https://github.com/folke/lazy.nvim)
-
-<pre>
-~/.config/nvim
-├── lua
-│   ├── config
-│   │   ├── autocmds.lua
-│   │   ├── keymaps.lua
-│   │   ├── lazy.lua
-│   │   └── options.lua
-│   └── plugins
-│       ├── spec1.lua
-│       ├── **
-│       └── spec2.lua
-└── init.lua
-</pre>
-
-## ⚙️ Configuration
-
-Veuillez vous référer à la [documentation](https://lazyvim.github.io)

README-IT.md

@@ -1,150 +0,0 @@
-<div align="center">
-  <img src="https://user-images.githubusercontent.com/292349/213446185-2db63fd5-8c84-459c-9f04-e286382d6e80.png">
-</div>
-
-<hr>
-
-<h4 align="center">
-  <a href="https://lazyvim.github.io/installation">Installazione</a>
-  ·
-  <a href="https://lazyvim.github.io/configuration">Configurazione</a>
-  ·
-  <a href="https://lazyvim.github.io">Documentazione</a>
-</h4>
-
-<div align="center"><p>
-    <a href="https://github.com/LazyVim/LazyVim/releases/latest">
-      <img alt="Latest release" src="https://img.shields.io/github/v/release/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=C9CBFF&logoColor=D9E0EE&labelColor=302D41&include_prerelease&sort=semver" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/pulse">
-      <img alt="Last commit" src="https://img.shields.io/github/last-commit/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=8bd5ca&logoColor=D9E0EE&labelColor=302D41"/>
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/blob/main/LICENSE">
-      <img alt="License" src="https://img.shields.io/github/license/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=ee999f&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/stargazers">
-      <img alt="Stars" src="https://img.shields.io/github/stars/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=c69ff5&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/issues">
-      <img alt="Issues" src="https://img.shields.io/github/issues/LazyVim/LazyVim?style=for-the-badge&logo=bilibili&color=F5E0DC&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim">
-      <img alt="Repo Size" src="https://img.shields.io/github/repo-size/LazyVim/LazyVim?color=%23DDB6F2&label=SIZE&logo=codesandbox&style=for-the-badge&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://twitter.com/intent/follow?screen_name=folke">
-      <img alt="follow on Twitter" src="https://img.shields.io/twitter/follow/folke?style=for-the-badge&logo=twitter&color=8aadf3&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-</div>
-
-LazyVim è una configurazione di Neovim basata su [💤 lazy.nvim](https://github.com/folke/lazy.nvim)
-che rende semplice personalizzare ed estendere la tua configurazione.
-Piuttosto che dover scegliere tra partire da zero o utilizzare una
-distribuzione preconfigurata, LazyVim offre il meglio di entrambi i mondi:
-la flessibilità di modificare la tua configurazione come necessario,
-insieme alla comodità di un setup preconfigurato.
-
-![image](https://user-images.githubusercontent.com/292349/211285846-0b7bb3bf-0462-4029-b64c-4ee1d037fc1c.png)
-
-![image](https://user-images.githubusercontent.com/292349/213447056-92290767-ea16-430c-8727-ce994c93e9cc.png)
-
-## ✨ Caratteristiche
-
-- 🔥 Trasforma il tuo Neovim in un IDE completo
-- 💤 Personalizza ed estendi facilmente la tua configurazione con [lazy.nvim](https://github.com/folke/lazy.nvim)
-- 🚀 Estremamente veloce
-- 🧹 Impostazioni di default ottimizzate per opzioni, AutoCmd e scorciatoie da tastiera
-- 📦 Distribuito con una vasta gamma di plugin preconfigurati e pronti all'uso
-
-## ⚡️ Requisiti
-
-- Neovim >= **0.11.2** (deve essere compilato con **LuaJIT**)
-- Git >= **2.19.0** (per supportare cloni parziali)
-- a [Nerd Font](https://www.nerdfonts.com/) **_(opzionale)_**
-- un compilatore **C** per `nvim-treesitter`. Leggi [qui](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
-
-## 🚀 Per iniziare
-
-Puoi trovare un template per **LazyVim** [qui](https://github.com/LazyVim/starter)
-
-<details><summary>Provalo con Docker</summary>
-
-```sh
-docker run -w /root -it --rm alpine:edge sh -uelic '
-  apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  cd ~/.config/nvim
-  nvim
-'
-```
-
-</details>
-
-<details><summary>Installa il <a href="https://github.com/LazyVim/starter">LazyVim Starter</a></summary>
-
-- Fai un backup dei tuoi file di Neovim attuali:
-
-  ```sh
-  mv ~/.config/nvim ~/.config/nvim.bak
-  mv ~/.local/share/nvim ~/.local/share/nvim.bak
-  ```
-
-- Clona lo Starter
-
-  ```sh
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  ```
-
-- Rimuovi la cartella `.git`, così puoi aggiungerla al tuo repo in seguito
-
-  ```sh
-  rm -rf ~/.config/nvim/.git
-  ```
-
-- Avvia Neovim!
-
-  ```sh
-  nvim
-  ```
-
-  Consulta i commenti nei file su come personalizzare **LazyVim**.
-
-</details>
-
----
-
-Qui un video creato da [@elijahmanor](https://github.com/elijahmanor) con una guida per iniziare.
-
-[![Guarda il video](https://img.youtube.com/vi/N93cTbtLCIM/hqdefault.jpg)](https://www.youtube.com/watch?v=N93cTbtLCIM)
-
-[@dusty-phillips](https://github.com/dusty-phillips) ha scritto un libro comprensivo chiamato
-[LazyVim per Sviluppatori Ambiziosi](https://lazyvim-ambitious-devs.phillips.codes)
-che è disponibile gratuitamente online.
-
-## 📂 Struttura dei file
-
-I file presenti nella configurazione verranno caricati automaticamente al momento
-più opportuno, quindi non è necessario richiamare manualmente quei file.
-**LazyVim** ha un set di configurazioni predefinite che verranno caricate
-prima delle tue. Vedi [qui](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config)
-
-Puoi aggiungere i tuoi plugin personalizzati sotto `lua/plugins/`. Tutti
-i file presenti verranno automaticamente caricati da [lazy.nvim](https://github.com/folke/lazy.nvim)
-
-<pre>
-~/.config/nvim
-├── lua
-│   ├── config
-│   │   ├── autocmds.lua
-│   │   ├── keymaps.lua
-│   │   ├── lazy.lua
-│   │   └── options.lua
-│   └── plugins
-│       ├── spec1.lua
-│       ├── **
-│       └── spec2.lua
-└── init.lua
-</pre>
-
-## ⚙️ Configurazione
-
-Consulta la [documentazione](https://lazyvim.github.io)

README-JP.md

@@ -1,139 +0,0 @@
-<div align="center">
-  <img src="https://user-images.githubusercontent.com/292349/213446185-2db63fd5-8c84-459c-9f04-e286382d6e80.png">
-</div>
-
-<hr>
-
-<h4 align="center">
-  <a href="https://lazyvim.github.io/installation">インストール</a>
-  ·
-  <a href="https://lazyvim.github.io/configuration">設定</a>
-  ·
-  <a href="https://lazyvim.github.io">ドキュメント</a>
-</h4>
-
-<div align="center"><p>
-    <a href="https://github.com/LazyVim/LazyVim/releases/latest">
-      <img alt="Latest release" src="https://img.shields.io/github/v/release/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=C9CBFF&logoColor=D9E0EE&labelColor=302D41&include_prerelease&sort=semver" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/pulse">
-      <img alt="Last commit" src="https://img.shields.io/github/last-commit/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=8bd5ca&logoColor=D9E0EE&labelColor=302D41"/>
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/blob/main/LICENSE">
-      <img alt="License" src="https://img.shields.io/github/license/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=ee999f&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/stargazers">
-      <img alt="Stars" src="https://img.shields.io/github/stars/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=c69ff5&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/issues">
-      <img alt="Issues" src="https://img.shields.io/github/issues/LazyVim/LazyVim?style=for-the-badge&logo=bilibili&color=F5E0DC&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim">
-      <img alt="Repo Size" src="https://img.shields.io/github/repo-size/LazyVim/LazyVim?color=%23DDB6F2&label=SIZE&logo=codesandbox&style=for-the-badge&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://twitter.com/intent/follow?screen_name=folke">
-      <img alt="follow on Twitter" src="https://img.shields.io/twitter/follow/folke?style=for-the-badge&logo=twitter&color=8aadf3&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-</div>
-
-LazyVimは、設定の拡張と変更を容易にするために[💤 lazy.nvim](https://github.com/folke/lazy.nvim)によって提供されるNeovimセットアップです。
-LazyVimは、ゼロから始めるか、あらかじめ作成されたディストリビューションを使用するかの選択を迫ることなく、
-必要に応じて設定を調整する柔軟性と、事前に設定されたセットアップの利便性を両方叶える最高の世界を提供します。
-
-![image](https://user-images.githubusercontent.com/292349/211285846-0b7bb3bf-0462-4029-b64c-4ee1d037fc1c.png)
-
-![image](https://user-images.githubusercontent.com/292349/213447056-92290767-ea16-430c-8727-ce994c93e9cc.png)
-
-## ✨ 機能
-
-- 🔥 Neovimを本格的なIDEへと変身させます
-- 💤 [lazy.nvim](https://github.com/folke/lazy.nvim)で簡単にカスタマイズと拡張が可能
-- 🚀 驚くほどの高速さ
-- 🧹 Options, autocmds, そしてkeymapsのための合理的なデフォルト設定
-- 📦 事前に設定がされ、使用可能なプラグインが豊富についてきます
-
-## ⚡️ 必要要件
-
-- Neovim >= **0.11.2** (**LuaJIT**でビルドされている必要があります)
-- Git >= **2.19.0** (部分的なcloneサポートのため)
-- [Nerd Font](https://www.nerdfonts.com/) **_(任意)_**
-- `nvim-treesitter`用の**C**コンパイラ。詳細は[こちら](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
-
-## 🚀 Getting Started
-
-**lazyvim**のスターターテンプレートは[こちら](https://github.com/lazyvim/starter)。
-
-<details><summary>Dockerで試す</summary>
-
-```sh
-docker run -w /root -it --rm alpine:edge sh -uelic '
-  apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  cd ~/.config/nvim
-  nvim
-'
-```
-
-</details>
-
-<details><summary><a href="https://github.com/LazyVim/starter">LazyVim Starter</a>をインストール</summary>
-
-- 既存のNeovimファイルのバックアップを作成します。
-
-  ```sh
-  mv ~/.config/nvim ~/.config/nvim.bak
-  mv ~/.local/share/nvim ~/.local/share/nvim.bak
-  ```
-
-- スターターをcloneします。
-
-  ```sh
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  ```
-
-- 後ほど自分のリポジトリに加えられるように、`.git`フォルダを削除します。
-  ```sh
-  rm -rf ~/.config/nvim/.git
-  ```
-
-- Neovimを起動します!
-
-  ```sh
-  nvim
-  ```
-
-  **LazyVim**をカスタマイズするために、ファイルのコメントを参照してください。
-
-</details>
-
----
-
-[@elijahmanor](https://github.com/elijahmanor)氏によって作成された始めるにあたっての概要動画があります。
-
-[![動画を見る](https://img.youtube.com/vi/N93cTbtLCIM/hqdefault.jpg)](https://www.youtube.com/watch?v=N93cTbtLCIM)
-
-## 📂 ファイル構造
-
-config配下にあるファイルは適切なタイミングで自動的にロードされる為、
-手動でそれらのファイルをrequireする必要はありません。
-LazyVimには、自分で設定したものより先にロードされるデフォルトの設定ファイルが付属しています。詳しくは[こちら](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config)。
-カスタムプラグインをlua/plugins/の下に追加することができます。lua/plugins/配下の全てのファイルは[lazy.nvim](https://github.com/folke/lazy.nvim)によって自動的にロードされます。
-
-<pre>
-~/.config/nvim
-├── lua
-│   ├── config
-│   │   ├── autocmds.lua
-│   │   ├── keymaps.lua
-│   │   ├── lazy.lua
-│   │   └── options.lua
-│   └── plugins
-│       ├── spec1.lua
-│       ├── **
-│       └── spec2.lua
-└── init.lua
-</pre>
-
-## ⚙️ 設定
-
-こちらの[ドキュメント](https://lazyvim.github.io)を参照してください。

README-KO.md

@@ -1,139 +0,0 @@
-<div align="center">
-  <img src="https://user-images.githubusercontent.com/292349/213446185-2db63fd5-8c84-459c-9f04-e286382d6e80.png">
-</div>
-
-<hr>
-
-<h4 align="center">
-  <a href="https://lazyvim.github.io/installation">설치하기</a>
-  ·
-  <a href="https://lazyvim.github.io/configuration">설정하기</a>
-  ·
-  <a href="https://lazyvim.github.io">문서</a>
-</h4>
-
-<div align="center"><p>
-    <a href="https://github.com/LazyVim/LazyVim/releases/latest">
-      <img alt="최신 업데이트" src="https://img.shields.io/github/v/release/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=C9CBFF&logoColor=D9E0EE&labelColor=302D41&include_prerelease&sort=semver" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/pulse">
-      <img alt="마지막 커밋" src="https://img.shields.io/github/last-commit/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=8bd5ca&logoColor=D9E0EE&labelColor=302D41"/>
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/blob/main/LICENSE">
-      <img alt="라이센스" src="https://img.shields.io/github/license/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=ee999f&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/stargazers">
-      <img alt="스타" src="https://img.shields.io/github/stars/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=c69ff5&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/issues">
-      <img alt="이슈" src="https://img.shields.io/github/issues/LazyVim/LazyVim?style=for-the-badge&logo=bilibili&color=F5E0DC&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim">
-      <img alt="레파지토리 크기" src="https://img.shields.io/github/repo-size/LazyVim/LazyVim?color=%23DDB6F2&label=SIZE&logo=codesandbox&style=for-the-badge&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://twitter.com/intent/follow?screen_name=folke">
-      <img alt="트위터" src="https://img.shields.io/twitter/follow/folke?style=for-the-badge&logo=twitter&color=8aadf3&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-</div>
-
-LazyVim은 [💤 lazy.nvim](https://github.com/folke/lazy.nvim)를 기반으로 작동하는 Neovim 셋업입니다. 더 커스터마이징 가능하고, 설정들을 바꾸는 것을 쉽게 만들기위해 시작되었죠. 그저 처음부터 모든 설정들을 만지고 시작하는 방법, 또는 이미 만들어진 배포용 설정을 사용하는 방법이 있지만, LazyVIM은 이미 잘 설정된 환경과, 필요에 따라 쉽게 바꿀 수 있는 유연성을 모두 포괄합니다. 이를 통해 훨신 쉽고 편리한, 전에는 만나보실 수 없었던 새로운 Nvim의 세계를 경험하실 수 있으실 겁니다.
-
-![image](https://user-images.githubusercontent.com/292349/211285846-0b7bb3bf-0462-4029-b64c-4ee1d037fc1c.png)
-
-![image](https://user-images.githubusercontent.com/292349/213447056-92290767-ea16-430c-8727-ce994c93e9cc.png)
-
-## ✨ 기능
-
-- 🔥 Neovim을 완벽한 IDE로 바꾸어보세요.
-- 💤 lazy.vim과 함께 쉽게 커스터마이징하고, 확장하세요.
-- 🚀 완전히 빠른 속도를 경험해보세요.
-- 🧹 기본적으로 만져져있는 옵션, 자동커멘드, 그리고 단축키들을 아무런 추가적인 설정없이 사용해보세요.
-- 📦 안정적이고 미리 설정되어져있는 플러그인들과 함게 코딩하세요.
-
-## ⚡️ 요구사항
-
-- **0.11.2**이상의 Neovim (LuaJIT과 함께 개발이 되어져있어야함니다.)
-- **2.19.0**이상의 Git (이것은 부분적인 클론기능을 지원하기 위함입니다.)
-- [Nerd Font](https://www.nerdfonts.com/) **_(옵션)_**
-- `nvim-treesitter`를 위한 **C** 컴파일러. [이 문서](https://github.com/nvim-treesitter/nvim-treesitter#requirements)를 확인해주시기바랍니다.
-
-## 🚀 시작하기
-
-[이 깃헙 레파지토리](https://github.com/LazyVim/starter)에서 스타터 템플릿을 찾으실 수 있습니다.
-
-<details><summary>도커와 함께 시작해보기</summary>
-
-```sh
-docker run -w /root -it --rm alpine:edge sh -uelic '
-  apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  cd ~/.config/nvim
-  nvim
-'
-```
-
-</details>
-
-<details><summary><a href="https://github.com/LazyVim/starter">LazyVim 스타터</a>와 함께 시작해보기</summary>
-
-- 현재 Neovim 파일들을 미리 백업:
-
-  ```sh
-  mv ~/.config/nvim ~/.config/nvim.bak
-  mv ~/.local/share/nvim ~/.local/share/nvim.bak
-  ```
-
-- Lazyvim 스타터 깃헙 레파지토리 복제:
-
-  ```sh
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  ```
-
-- 나중에 본인의 레파지토리에 저장할 경우를 대비해 .git 폴더 지우기
-
-  ```sh
-  rm -rf ~/.config/nvim/.git
-  ```
-
-- Neovim!
-
-  ```sh
-  nvim
-  ```
-
-  LazyVim를 커스터마이징 하는 법에 대해 다룬 설명을 참조해주시기 바랍니다.
-
-</details>
-
----
-
-유튜브에 LazyVim시작하기에 대해 [@elijahmanor](https://github.com/elijahmanor)에 의해 만들어진 영상이 있으니, 시청해 보시는 것을 추천드립니다.
-
-[![Watch the video](https://img.youtube.com/vi/N93cTbtLCIM/hqdefault.jpg)](https://www.youtube.com/watch?v=N93cTbtLCIM)
-
-## 📂 파일 구조
-
-config 폴더 안에 있는 모든 파일들은 적절한 시간내에 자동으로 로드가 되기에, 아무 파일도 require를 하지 않아도 됩니다. **LazyVim**은 config폴더 안에 있는 모든 기본 파일들을 당신의 config 파일들 **전**에 불어옵니다. 이것에 대해서는, [이 문서](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config)를 확인해 보시기 바랍니다.
-
-추가적인 플러그인을 설치하시거나, 미리 설치되고 설정된 플러그인들을 또 덮어서 설정을 바꾸거나, 지우거나, 추가하고 싶으실 경우에는, 그에 해당하는 lua 파일들을 `lua/plugins` 폴더 안에 추가하시면, lazy.nvim이 자동적으로 그 파일들을 로드 할 것입니다.
-
-<pre>
-~/.config/nvim
-├── lua
-│   ├── config
-│   │   ├── autocmds.lua
-│   │   ├── keymaps.lua
-│   │   ├── lazy.lua
-│   │   └── options.lua
-│   └── plugins
-│       ├── spec1.lua
-│       ├── **
-│       └── spec2.lua
-└── init.lua
-</pre>
-
-## ⚙️ 설정
-
-[Lazyvim 공식문서](https://lazyvim.github.io)를 확인해 주시기 바랍니다.
-
-LazyVim 공식문서의 한국어 지원은 현재 번역 중에 있습니다.

README-PL.md

@@ -1,147 +0,0 @@
-<div align="center">
-  <img src="https://user-images.githubusercontent.com/292349/213446185-2db63fd5-8c84-459c-9f04-e286382d6e80.png">
-</div>
-
-<hr>
-
-<h4 align="center">
-  <a href="https://lazyvim.github.io/installation">Install</a>
-  ·
-  <a href="https://lazyvim.github.io/configuration">Configure</a>
-  ·
-  <a href="https://lazyvim.github.io">Docs</a>
-</h4>
-
-<div align="center"><p>
-    <a href="https://github.com/LazyVim/LazyVim/releases/latest">
-      <img alt="Latest release" src="https://img.shields.io/github/v/release/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=C9CBFF&logoColor=D9E0EE&labelColor=302D41&include_prerelease&sort=semver" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/pulse">
-      <img alt="Last commit" src="https://img.shields.io/github/last-commit/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=8bd5ca&logoColor=D9E0EE&labelColor=302D41"/>
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/blob/main/LICENSE">
-      <img alt="License" src="https://img.shields.io/github/license/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=ee999f&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/stargazers">
-      <img alt="Stars" src="https://img.shields.io/github/stars/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=c69ff5&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/issues">
-      <img alt="Issues" src="https://img.shields.io/github/issues/LazyVim/LazyVim?style=for-the-badge&logo=bilibili&color=F5E0DC&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim">
-      <img alt="Repo Size" src="https://img.shields.io/github/repo-size/LazyVim/LazyVim?color=%23DDB6F2&label=SIZE&logo=codesandbox&style=for-the-badge&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://twitter.com/intent/follow?screen_name=folke">
-      <img alt="follow on Twitter" src="https://img.shields.io/twitter/follow/folke?style=for-the-badge&logo=twitter&color=8aadf3&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-</div>
-
-LazyVim to konfiguracja Neovim oparta na [💤 lazy.nvim](https://github.com/folke/lazy.nvim)
-która ułatwia dostosowywanie i rozszerzanie konfiguracji.
-Zamiast wybierać między rozpoczynaniem od zera a używaniem gotowej dystrybucji, LazyVim oferuje najlepsze z obu światów – elastyczność pozwalającą na dostosowanie konfiguracji do własnych potrzeb oraz wygodę wstępnie skonfigurowanego środowiska.
-
-![image](https://user-images.githubusercontent.com/292349/211285846-0b7bb3bf-0462-4029-b64c-4ee1d037fc1c.png)
-
-![image](https://user-images.githubusercontent.com/292349/213447056-92290767-ea16-430c-8727-ce994c93e9cc.png)
-
-## ✨ Funkcje
-
-- 🔥 Przekształć Neovim w pełnoprawne IDE
-- 💤 Łatwo dostosowuj i rozszerzaj swoją konfigurację dzięki [lazy.nvim](https://github.com/folke/lazy.nvim)
-- 🚀 Niezwykle szybkie działanie
-- 🧹 Przemyślane domyślne ustawienia opcji, autocmd i skrótów klawiszowych
-- 📦 Zawiera bogaty zestaw wstępnie skonfigurowanych wtyczek gotowych do użycia
-
-## ⚡️ Wymagania
-
-- Neovim >= **0.9.0** (musi być skompilowany z **LuaJIT**)
-- Git >= **2.19.0** (dla obsługi częściowego klonowania repozytoriów)
-- [Nerd Font](https://www.nerdfonts.com/) **_(opcjonalnie)_**
-- Kompilator **C** wymagany dla `nvim-treesitter`. Szczegóły [tutaj](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
-
-## 🚀 Pierwsze kroki
-
-Szablon startowy dla **LazyVim** znajdziesz [tutaj](https://github.com/LazyVim/starter)
-
-<details><summary>Wypróbuj z Dockerem</summary>
-
-```sh
-docker run -w /root -it --rm alpine:edge sh -uelic '
-  apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  cd ~/.config/nvim
-  nvim
-'
-```
-
-</details>
-
-<details><summary>Zainstaluj <a href="https://github.com/LazyVim/starter">Starter LazyVim</a></summary>
-
-- Wykonaj kopię zapasową swoich obecnych plików Neovim:
-
-  ```sh
-  mv ~/.config/nvim ~/.config/nvim.bak
-  mv ~/.local/share/nvim ~/.local/share/nvim.bak
-  ```
-
-- Sklonuj repozytorium startowe:
-
-  ```sh
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  ```
-
-- Usuń folder `.git`, aby później móc dodać własne repozytorium:
-
-  ```sh
-  rm -rf ~/.config/nvim/.git
-  ```
-
-- Uruchom Neovim!
-
-  ```sh
-  nvim
-  ```
-
-  W plikach znajdziesz komentarze, które pomogą Ci dostosować **LazyVim**.
-
-</details>
-
----
-
-[@elijahmanor](https://github.com/elijahmanor) stworzył świetne wideo z przewodnikiem, jak zacząć.
-
-[![Obejrzyj wideo](https://img.youtube.com/vi/N93cTbtLCIM/hqdefault.jpg)](https://www.youtube.com/watch?v=N93cTbtLCIM)
-
-[@dusty-phillips](https://github.com/dusty-phillips) napisał obszerną książkę
-[LazyVim for Ambitious Developers](https://lazyvim-ambitious-devs.phillips.codes),
-która jest dostępna za darmo online.
-
-## 📂 Struktura plików
-
-Pliki w katalogu `config` są automatycznie ładowane w odpowiednim momencie,
-więc nie musisz ich ręcznie dołączać.
-**LazyVim** zawiera zestaw domyślnych plików konfiguracyjnych,
-które zostaną załadowane **_przed_** Twoimi własnymi. Szczegóły znajdziesz [tutaj](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config).
-
-Możesz dodać własne specyfikacje wtyczek w katalogu `lua/plugins/`.
-Wszystkie pliki w tym folderze zostaną automatycznie załadowane przez [lazy.nvim](https://github.com/folke/lazy.nvim).
-
-<pre>
-~/.config/nvim
-├── lua
-│   ├── config
-│   │   ├── autocmds.lua
-│   │   ├── keymaps.lua
-│   │   ├── lazy.lua
-│   │   └── options.lua
-│   └── plugins
-│       ├── spec1.lua
-│       ├── **
-│       └── spec2.lua
-└── init.lua
-</pre>
-
-## ⚙️ Konfiguracja
-
-Zapoznaj się z [dokumentacją](https://lazyvim.github.io).

README-PT.md

@@ -1,146 +0,0 @@
-<div align="center">
-  <img src="https://user-images.githubusercontent.com/292349/213446185-2db63fd5-8c84-459c-9f04-e286382d6e80.png">
-</div>
-
-<hr>
-
-<h4 align="center">
-  <a href="https://lazyvim.github.io/installation">Instalar</a>
-  ·
-  <a href="https://lazyvim.github.io/configuration">Configurar</a>
-  ·
-  <a href="https://lazyvim.github.io">Documentação</a>
-</h4>
-
-<div align="center"><p>
-    <a href="https://github.com/LazyVim/LazyVim/releases/latest">
-      <img alt="Latest release" src="https://img.shields.io/github/v/release/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=C9CBFF&logoColor=D9E0EE&labelColor=302D41&include_prerelease&sort=semver" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/pulse">
-      <img alt="Last commit" src="https://img.shields.io/github/last-commit/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=8bd5ca&logoColor=D9E0EE&labelColor=302D41"/>
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/blob/main/LICENSE">
-      <img alt="License" src="https://img.shields.io/github/license/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=ee999f&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/stargazers">
-      <img alt="Stars" src="https://img.shields.io/github/stars/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=c69ff5&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim/issues">
-      <img alt="Issues" src="https://img.shields.io/github/issues/LazyVim/LazyVim?style=for-the-badge&logo=bilibili&color=F5E0DC&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://github.com/LazyVim/LazyVim">
-      <img alt="Repo Size" src="https://img.shields.io/github/repo-size/LazyVim/LazyVim?color=%23DDB6F2&label=SIZE&logo=codesandbox&style=for-the-badge&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-    <a href="https://twitter.com/intent/follow?screen_name=folke">
-      <img alt="follow on Twitter" src="https://img.shields.io/twitter/follow/folke?style=for-the-badge&logo=twitter&color=8aadf3&logoColor=D9E0EE&labelColor=302D41" />
-    </a>
-</div>
-
-LazyVim é uma configuração de Neovim potenciada por [💤 lazy.nvim](https://github.com/folke/lazy.nvim)
-para tornar fácil customizar e extender a tua configuração.
-Em vez de ter de escolher entre começar de raiz ou usar
-uma distribuição pré-feita, LazyVim oferece o melhor
-dos dois mundos - a flexibilidade de alterar a tua configuração
-como necessário, junto com a conveniência de um setup pré-configurado.
-
-![imagem](https://user-images.githubusercontent.com/292349/211285846-0b7bb3bf-0462-4029-b64c-4ee1d037fc1c.png)
-
-![imagem](https://user-images.githubusercontent.com/292349/213447056-92290767-ea16-430c-8727-ce994c93e9cc.png)
-
-## ✨ Características
-
-- 🔥 Transforma o teu Neovim num IDE completo.
-- 💤 Customiza e extende a tua configuração facilmente com [lazy.nvim](https://github.com/folke/lazy.nvim)
-- 🚀 Super rápido
-- 🧹 Definições comuns para options, autocms e keymaps
-- 📦 Contém uma variedade de plugins pré-configurados e preparados a usar
-
-## ⚡️ Requesitos
-
-- Neovim >= **0.11.2** (preciso fazer build com **LuaJIT**)
-- Git >= **2.19.0** (para suporte parcial de clones)
-- uma [Nerd Font](https://www.nerdfonts.com/) **_(opcional)_**
-- um compilador de **C** para `nvim-treesitter`. Mais informações [aqui](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
-
-## 🚀 Como Começar
-
-Podes encontrar uma template **LazyVim** starter para começar, [aqui](https://github.com/LazyVim/starter)
-
-<details><summary>Experimenta com docker</summary>
-
-```sh
-docker run -w /root -it --rm alpine:edge sh -uelic '
-  apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  cd ~/.config/nvim
-  nvim
-'
-```
-
-</details>
-
-<details><summary>Instala a template <a href="https://github.com/LazyVim/starter">LazyVim Starter</a></summary>
-
-- Faz um backup da tua configuração atual de Neovim:
-
-  ```sh
-  mv ~/.config/nvim ~/.config/nvim.bak
-  mv ~/.local/share/nvim ~/.local/share/nvim.bak
-  ```
-
-- Clona a template
-
-  ```sh
-  git clone https://github.com/LazyVim/starter ~/.config/nvim
-  ```
-
-- Remove o diretório `.git`, para poderes adicionar ao teu próprio repositório mais tarde
-
-  ```sh
-  rm -rf ~/.config/nvim/.git
-  ```
-
-- Inicia o Neovim!
-
-  ```sh
-  nvim
-  ```
-
-  Consulta os comentários nos ficheiros sobre como customizar **LazyVim**.
-
-</details>
-
----
-
-Existe um excelente video criado por [@elijahmanor](https://github.com/elijahmanor) com um passo a passo para começar.
-
-[![Vê o video](https://img.youtube.com/vi/N93cTbtLCIM/hqdefault.jpg)](https://www.youtube.com/watch?v=N93cTbtLCIM)
-
-## 📂 Extrutura de ficheiros
-
-Os ficheiros no diretório **config** serão carregados automaticamente
-no momento apropriado, por isso não é necessário carregar os plugins manualmente.
-**LazyVim** vem com um conjunto de ficheiros
-que serão carregados **_antes_** dos teus. Lẽ mais [aqui](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config)
-
-Tu podes acrescentar a tua configuração em `lua/plugins`. Todos os ficheiros
-neste diretório serão carregados automaticamente por [lazy.nvim](https://github.com/folke/lazy.nvim)
-
-<pre>
-~/.config/nvim
-├── lua
-│   ├── config
-│   │   ├── autocmds.lua
-│   │   ├── keymaps.lua
-│   │   ├── lazy.lua
-│   │   └── options.lua
-│   └── plugins
-│       ├── spec1.lua
-│       ├── **
-│       └── spec2.lua
-└── init.lua
-</pre>
-
-## ⚙️ Configuração
-
-Consulta a [documentação](https://lazyvim.github.io)

README.md

@@ -56,10 +56,9 @@ to tweak your config as needed, along with the convenience of a pre-configured s
 
 ## ⚡️ Requirements
 
-- Neovim >= **0.11.2** (needs to be built with **LuaJIT**)
+- Neovim >= **0.8.0** (needs to be built with **LuaJIT**)
 - Git >= **2.19.0** (for partial clones support)
 - a [Nerd Font](https://www.nerdfonts.com/) **_(optional)_**
-- a **C** compiler for `nvim-treesitter`. See [here](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
 
 ## 🚀 Getting Started
 
@@ -69,7 +68,7 @@ You can find a starter template for **LazyVim** [here](https://github.com/LazyVi
 
 ```sh
 docker run -w /root -it --rm alpine:edge sh -uelic '
-  apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
+  apk add git lazygit neovim ripgrep alpine-sdk --update
   git clone https://github.com/LazyVim/starter ~/.config/nvim
   cd ~/.config/nvim
   nvim
@@ -111,9 +110,9 @@ docker run -w /root -it --rm alpine:edge sh -uelic '
 
 ---
 
-[@dusty-phillips](https://github.com/dusty-phillips) wrote a comprehensive book called
-[LazyVim for Ambitious Developers](https://lazyvim-ambitious-devs.phillips.codes)
-available for free online.
+There's a great video created by [@elijahmanor](https://github.com/elijahmanor) with a walkthrough to get started.
+
+[![Watch the video](https://img.youtube.com/vi/N93cTbtLCIM/hqdefault.jpg)](https://www.youtube.com/watch?v=N93cTbtLCIM)
 
 ## 📂 File Structure
 

doc/LazyVim.txt

@@ -1,5 +1,4 @@
-*LazyVim.txt*                                                     LazyVim docs
-                                       For Neovim    Last change: 2026 June 02
+*LazyVim.txt*          For Neovim >= 0.8.0          Last change: 2023 March 17
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*
@@ -9,7 +8,6 @@ Table of Contents                                  *LazyVim-table-of-contents*
   - Getting Started                                  |LazyVim-getting-started|
   - File Structure                                    |LazyVim-file-structure|
   - Configuration                                      |LazyVim-configuration|
-1. Links                                                       |LazyVim-links|
 
 Install
 ·
@@ -45,6 +43,7 @@ pre-configured setup.
 
 FEATURES                                                    *LazyVim-features*
 
+
 - Transform your Neovim into a full-fledged IDE
 - Easily customize and extend your config with lazy.nvim <https://github.com/folke/lazy.nvim>
 - Blazingly fast
@@ -54,10 +53,10 @@ FEATURES                                                    *LazyVim-features*
 
 REQUIREMENTS                                            *LazyVim-requirements*
 
-- Neovim >= **0.11.2** (needs to be built with **LuaJIT**)
+
+- Neovim >= **0.8.0** (needs to be built with **LuaJIT**)
 - Git >= **2.19.0** (for partial clones support)
 - a Nerd Font <https://www.nerdfonts.com/> **(optional)**
-- a **C** compiler for `nvim-treesitter`. See here <https://github.com/nvim-treesitter/nvim-treesitter#requirements>
 
 
 GETTING STARTED                                      *LazyVim-getting-started*
@@ -69,7 +68,7 @@ Try it with Docker ~
 
 >sh
     docker run -w /root -it --rm alpine:edge sh -uelic '
-      apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
+      apk add git lazygit neovim ripgrep alpine-sdk --update
       git clone https://github.com/LazyVim/starter ~/.config/nvim
       cd ~/.config/nvim
       nvim
@@ -78,33 +77,31 @@ Try it with Docker ~
 
 Install the LazyVim Starter ~
 
-- Make a backup of your current Neovim files:
 
->sh
+- Make a backup of your current Neovim files:
+    >sh
         mv ~/.config/nvim ~/.config/nvim.bak
         mv ~/.local/share/nvim ~/.local/share/nvim.bak
-<
+    <
 - Clone the starter
-
->sh
+    >sh
         git clone https://github.com/LazyVim/starter ~/.config/nvim
-<
+    <
 - Remove the `.git` folder, so you can add it to your own repo later
-
->sh
+    >sh
         rm -rf ~/.config/nvim/.git
-<
+    <
 - Start Neovim!
-
->sh
+    >sh
         nvim
-<
+    <
     Refer to the comments in the files on how to customize **LazyVim**.
 
 ------------------------------------------------------------------------------
-@dusty-phillips <https://github.com/dusty-phillips> wrote a comprehensive book
-called LazyVim for Ambitious Developers
-<https://lazyvim-ambitious-devs.phillips.codes> available for free online.
+There’s a great video created by @elijahmanor
+<https://github.com/elijahmanor> with a walkthrough to get started.
+
+<https://www.youtube.com/watch?v=N93cTbtLCIM>
 
 
 FILE STRUCTURE                                        *LazyVim-file-structure*
@@ -127,7 +124,8 @@ Refer to the docs <https://lazyvim.github.io>
 
 1. *image*: https://user-images.githubusercontent.com/292349/211285846-0b7bb3bf-0462-4029-b64c-4ee1d037fc1c.png
 2. *image*: https://user-images.githubusercontent.com/292349/213447056-92290767-ea16-430c-8727-ce994c93e9cc.png
-3. *@dusty-phillips*: 
+3. *@elijahmanor*: 
+4. *Watch the video*: https://img.youtube.com/vi/N93cTbtLCIM/hqdefault.jpg
 
 Generated by panvimdoc <https://github.com/kdheepak/panvimdoc>
 

lua/lazyvim/config/autocmds.lua

@@ -1,4 +1,4 @@
--- This file is automatically loaded by lazyvim.config.init.
+-- This file is automatically loaded by plugins.init
 
 local function augroup(name)
   return vim.api.nvim_create_augroup("lazyvim_" .. name, { clear = true })
@@ -7,22 +7,14 @@ end
 -- Check if we need to reload the file when it changed
 vim.api.nvim_create_autocmd({ "FocusGained", "TermClose", "TermLeave" }, {
   group = augroup("checktime"),
-  callback = function()
-    if vim.o.buftype ~= "nofile" then
-      vim.cmd("checktime")
-    end
-  end,
+  command = "checktime",
 })
 
 -- Highlight on yank
 vim.api.nvim_create_autocmd("TextYankPost", {
   group = augroup("highlight_yank"),
   callback = function()
-    if vim.fn.has("nvim-0.13") == 1 then
-      vim.hl.hl_op()
-    else
-      (vim.hl or vim.highlight).on_yank()
-    end
+    vim.highlight.on_yank()
   end,
 })
 
@@ -30,24 +22,16 @@ vim.api.nvim_create_autocmd("TextYankPost", {
 vim.api.nvim_create_autocmd({ "VimResized" }, {
   group = augroup("resize_splits"),
   callback = function()
-    local current_tab = vim.fn.tabpagenr()
     vim.cmd("tabdo wincmd =")
-    vim.cmd("tabnext " .. current_tab)
   end,
 })
 
 -- go to last loc when opening a buffer
 vim.api.nvim_create_autocmd("BufReadPost", {
   group = augroup("last_loc"),
-  callback = function(event)
-    local exclude = { "gitcommit" }
-    local buf = event.buf
-    if vim.tbl_contains(exclude, vim.bo[buf].filetype) or vim.b[buf].lazyvim_last_loc then
-      return
-    end
-    vim.b[buf].lazyvim_last_loc = true
-    local mark = vim.api.nvim_buf_get_mark(buf, '"')
-    local lcount = vim.api.nvim_buf_line_count(buf)
+  callback = function()
+    local mark = vim.api.nvim_buf_get_mark(0, '"')
+    local lcount = vim.api.nvim_buf_line_count(0)
     if mark[1] > 0 and mark[1] <= lcount then
       pcall(vim.api.nvim_win_set_cursor, 0, mark)
     end
@@ -59,73 +43,28 @@ vim.api.nvim_create_autocmd("FileType", {
   group = augroup("close_with_q"),
   pattern = {
     "PlenaryTestPopup",
-    "checkhealth",
-    "dap-float",
-    "dbout",
-    "gitsigns-blame",
-    "grug-far",
     "help",
     "lspinfo",
-    "neotest-output",
-    "neotest-output-panel",
-    "neotest-summary",
+    "man",
     "notify",
     "qf",
+    "query", -- :InspectTree
     "spectre_panel",
     "startuptime",
     "tsplayground",
   },
   callback = function(event)
     vim.bo[event.buf].buflisted = false
-    vim.schedule(function()
-      vim.keymap.set("n", "q", function()
-        vim.cmd("close")
-        pcall(vim.api.nvim_buf_delete, event.buf, { force = true })
-      end, {
-        buffer = event.buf,
-        silent = true,
-        desc = "Quit buffer",
-      })
-    end)
-  end,
-})
-
--- make it easier to close man-files when opened inline
-vim.api.nvim_create_autocmd("FileType", {
-  group = augroup("man_unlisted"),
-  pattern = { "man" },
-  callback = function(event)
-    vim.bo[event.buf].buflisted = false
+    vim.keymap.set("n", "q", "<cmd>close<cr>", { buffer = event.buf, silent = true })
   end,
 })
 
 -- wrap and check for spell in text filetypes
 vim.api.nvim_create_autocmd("FileType", {
   group = augroup("wrap_spell"),
-  pattern = { "text", "plaintex", "typst", "gitcommit", "markdown" },
+  pattern = { "gitcommit", "markdown" },
   callback = function()
     vim.opt_local.wrap = true
     vim.opt_local.spell = true
   end,
 })
-
--- Fix conceallevel for json files
-vim.api.nvim_create_autocmd({ "FileType" }, {
-  group = augroup("json_conceal"),
-  pattern = { "json", "jsonc", "json5" },
-  callback = function()
-    vim.opt_local.conceallevel = 0
-  end,
-})
-
--- Auto create dir when saving a file, in case some intermediate directory does not exist
-vim.api.nvim_create_autocmd({ "BufWritePre" }, {
-  group = augroup("auto_create_dir"),
-  callback = function(event)
-    if event.match:match("^%w%w+:[\\/][\\/]") then
-      return
-    end
-    local file = vim.uv.fs_realpath(event.match) or event.match
-    vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p")
-  end,
-})

lua/lazyvim/config/init.lua

@@ -1,12 +1,9 @@
-_G.LazyVim = require("lazyvim.util")
-
----@class LazyVimConfig: LazyVimOptions
+---@type LazyVimConfig
 local M = {}
 
-M.version = "16.0.0" -- x-release-please-version
-LazyVim.config = M
+M.lazy_version = ">=9.1.0"
 
----@class LazyVimOptions
+---@class LazyVimConfig
 local defaults = {
   -- colorscheme can be a string like `catppuccin` or a function that will load the colorscheme
   ---@type string|fun()
@@ -17,238 +14,95 @@ local defaults = {
   defaults = {
     autocmds = true, -- lazyvim.config.autocmds
     keymaps = true, -- lazyvim.config.keymaps
-    -- lazyvim.config.options can't be configured here since that's loaded before lazyvim setup
-    -- if you want to disable loading options, add `package.loaded["lazyvim.config.options"] = true` to the top of your init.lua
-  },
-  news = {
-    -- When enabled, NEWS.md will be shown when changed.
-    -- This only contains big new features and breaking changes.
-    lazyvim = true,
-    -- Same but for Neovim's news.txt
-    neovim = false,
+    options = true, -- lazyvim.config.options
   },
   -- icons used by other plugins
-  -- stylua: ignore
   icons = {
-    misc = {
-      dots = "󰇘",
-    },
-    ft = {
-      octo = " ",
-      gh = " ",
-      ["markdown.gh"] = " ",
-    },
-    dap = {
-      Stopped             = { "󰁕 ", "DiagnosticWarn", "DapStoppedLine" },
-      Breakpoint          = " ",
-      BreakpointCondition = " ",
-      BreakpointRejected  = { " ", "DiagnosticError" },
-      LogPoint            = ".>",
-    },
     diagnostics = {
       Error = " ",
-      Warn  = " ",
-      Hint  = " ",
-      Info  = " ",
+      Warn = " ",
+      Hint = " ",
+      Info = " ",
     },
     git = {
-      added    = " ",
+      added = " ",
       modified = " ",
-      removed  = " ",
+      removed = " ",
     },
     kinds = {
-      Array         = " ",
-      Boolean       = "󰨙 ",
-      Class         = " ",
-      Codeium       = "󰘦 ",
-      Color         = " ",
-      Control       = " ",
-      Collapsed     = " ",
-      Constant      = "󰏿 ",
-      Constructor   = " ",
-      Copilot       = " ",
-      Enum          = " ",
-      EnumMember    = " ",
-      Event         = " ",
-      Field         = " ",
-      File          = " ",
-      Folder        = " ",
-      Function      = "󰊕 ",
-      Interface     = " ",
-      Key           = " ",
-      Keyword       = " ",
-      Method        = "󰊕 ",
-      Module        = " ",
-      Namespace     = "󰦮 ",
-      Null          = " ",
-      Number        = "󰎠 ",
-      Object        = " ",
-      Operator      = " ",
-      Package       = " ",
-      Property      = " ",
-      Reference     = " ",
-      Snippet       = "󱄽 ",
-      String        = " ",
-      Struct        = "󰆼 ",
-      Supermaven    = " ",
-      TabNine       = "󰏚 ",
-      Text          = " ",
+      Array = " ",
+      Boolean = " ",
+      Class = " ",
+      Color = " ",
+      Constant = " ",
+      Constructor = " ",
+      Copilot = " ",
+      Enum = " ",
+      EnumMember = " ",
+      Event = " ",
+      Field = " ",
+      File = " ",
+      Folder = " ",
+      Function = " ",
+      Interface = " ",
+      Key = " ",
+      Keyword = " ",
+      Method = " ",
+      Module = " ",
+      Namespace = " ",
+      Null = " ",
+      Number = " ",
+      Object = " ",
+      Operator = " ",
+      Package = " ",
+      Property = " ",
+      Reference = " ",
+      Snippet = " ",
+      String = " ",
+      Struct = " ",
+      Text = " ",
       TypeParameter = " ",
-      Unit          = " ",
-      Value         = " ",
-      Variable      = "󰀫 ",
-    },
-  },
-  ---@type table<string, string[]|boolean>?
-  kind_filter = {
-    default = {
-      "Class",
-      "Constructor",
-      "Enum",
-      "Field",
-      "Function",
-      "Interface",
-      "Method",
-      "Module",
-      "Namespace",
-      "Package",
-      "Property",
-      "Struct",
-      "Trait",
-    },
-    markdown = false,
-    help = false,
-    -- you can specify a different filter for each filetype
-    lua = {
-      "Class",
-      "Constructor",
-      "Enum",
-      "Field",
-      "Function",
-      "Interface",
-      "Method",
-      "Module",
-      "Namespace",
-      -- "Package", -- remove package since luals uses it for control flow structures
-      "Property",
-      "Struct",
-      "Trait",
+      Unit = " ",
+      Value = " ",
+      Variable = " ",
     },
   },
 }
 
-M.json = {
-  version = 8,
-  loaded = false,
-  path = vim.g.lazyvim_json or vim.fn.stdpath("config") .. "/lazyvim.json",
-  data = {
-    version = nil, ---@type number?
-    install_version = nil, ---@type number?
-    news = {}, ---@type table<string, string>
-    extras = {}, ---@type string[]
-  },
-}
-
-function M.json.load()
-  M.json.loaded = true
-  local f = io.open(M.json.path, "r")
-  if f then
-    local data = f:read("*a")
-    f:close()
-    local ok, json = pcall(vim.json.decode, data, { luanil = { object = true, array = true } })
-    if ok then
-      M.json.data = vim.tbl_deep_extend("force", M.json.data, json or {})
-      if M.json.data.version ~= M.json.version then
-        LazyVim.json.migrate()
-      end
-    end
-  else
-    M.json.data.install_version = M.json.version
-  end
-end
-
----@type LazyVimOptions
+---@type LazyVimConfig
 local options
-local lazy_clipboard
 
----@param opts? LazyVimOptions
+---@param opts? LazyVimConfig
 function M.setup(opts)
-  options = vim.tbl_deep_extend("force", defaults, opts or {}) or {}
-
-  -- autocmds can be loaded lazily when not opening a file
-  local lazy_autocmds = vim.fn.argc(-1) == 0
-  if not lazy_autocmds then
-    M.load("autocmds")
+  options = vim.tbl_deep_extend("force", defaults, opts or {})
+  if not M.has() then
+    require("lazy.core.util").error(
+      "**LazyVim** needs **lazy.nvim** version "
+        .. M.lazy_version
+        .. " to work properly.\n"
+        .. "Please upgrade **lazy.nvim**",
+      { title = "LazyVim" }
+    )
+    error("Exiting")
   end
 
-  local group = vim.api.nvim_create_augroup("LazyVim", { clear = true })
-  vim.api.nvim_create_autocmd("User", {
-    group = group,
-    pattern = "VeryLazy",
-    callback = function()
-      if lazy_autocmds then
+  if vim.fn.argc(-1) == 0 then
+    -- autocmds and keymaps can wait to load
+    vim.api.nvim_create_autocmd("User", {
+      group = vim.api.nvim_create_augroup("LazyVim", { clear = true }),
+      pattern = "VeryLazy",
+      callback = function()
         M.load("autocmds")
-      end
-      M.load("keymaps")
-      if lazy_clipboard ~= nil then
-        vim.opt.clipboard = lazy_clipboard
-      end
+        M.load("keymaps")
+      end,
+    })
+  else
+    -- load them now so they affect the opened buffers
+    M.load("autocmds")
+    M.load("keymaps")
+  end
 
-      LazyVim.format.setup()
-      LazyVim.news.setup()
-      LazyVim.root.setup()
-
-      vim.api.nvim_create_user_command("LazyExtras", function()
-        LazyVim.extras.show()
-      end, { desc = "Manage LazyVim extras" })
-
-      vim.api.nvim_create_user_command("LazyHealth", function()
-        vim.cmd([[Lazy! load all]])
-        vim.cmd([[checkhealth]])
-      end, { desc = "Load all plugins and run :checkhealth" })
-
-      local health = require("lazy.health")
-      vim.list_extend(health.valid, {
-        "recommended",
-        "desc",
-        "vscode",
-      })
-
-      if vim.g.lazyvim_check_order == false then
-        return
-      end
-
-      -- Check lazy.nvim import order
-      local imports = require("lazy.core.config").spec.modules
-      local function find(pat, last)
-        for i = last and #imports or 1, last and 1 or #imports, last and -1 or 1 do
-          if imports[i]:find(pat) then
-            return i
-          end
-        end
-      end
-      local lazyvim_plugins = find("^lazyvim%.plugins$")
-      local extras = find("^lazyvim%.plugins%.extras%.", true) or lazyvim_plugins
-      local plugins = find("^plugins$") or math.huge
-      if lazyvim_plugins ~= 1 or extras > plugins then
-        local msg = {
-          "The order of your `lazy.nvim` imports is incorrect:",
-          "- `lazyvim.plugins` should be first",
-          "- followed by any `lazyvim.plugins.extras`",
-          "- and finally your own `plugins`",
-          "",
-          "If you think you know what you're doing, you can disable this check with:",
-          "```lua",
-          "vim.g.lazyvim_check_order = false",
-          "```",
-        }
-        vim.notify(table.concat(msg, "\n"), "warn", { title = "LazyVim" })
-      end
-    end,
-  })
-
-  LazyVim.track("colorscheme")
-  LazyVim.try(function()
+  require("lazy.core.util").try(function()
     if type(M.colorscheme) == "function" then
       M.colorscheme()
     else
@@ -257,200 +111,58 @@ function M.setup(opts)
   end, {
     msg = "Could not load your colorscheme",
     on_error = function(msg)
-      LazyVim.error(msg)
+      require("lazy.core.util").error(msg)
       vim.cmd.colorscheme("habamax")
     end,
   })
-  LazyVim.track()
 end
 
----@param buf? number
----@return string[]?
-function M.get_kind_filter(buf)
-  buf = (buf == nil or buf == 0) and vim.api.nvim_get_current_buf() or buf
-  local ft = vim.bo[buf].filetype
-  if M.kind_filter == false then
-    return
-  end
-  if M.kind_filter[ft] == false then
-    return
-  end
-  if type(M.kind_filter[ft]) == "table" then
-    return M.kind_filter[ft]
-  end
-  ---@diagnostic disable-next-line: return-type-mismatch
-  return type(M.kind_filter) == "table" and type(M.kind_filter.default) == "table" and M.kind_filter.default or nil
+---@param range? string
+function M.has(range)
+  local Semver = require("lazy.manage.semver")
+  return Semver.range(range or M.lazy_version):matches(require("lazy.core.config").version or "0.0.0")
 end
 
 ---@param name "autocmds" | "options" | "keymaps"
 function M.load(name)
+  local Util = require("lazy.core.util")
   local function _load(mod)
-    if require("lazy.core.cache").find(mod)[1] then
-      LazyVim.try(function()
-        require(mod)
-      end, { msg = "Failed loading " .. mod })
-    end
+    Util.try(function()
+      require(mod)
+    end, {
+      msg = "Failed loading " .. mod,
+      on_error = function(msg)
+        local info = require("lazy.core.cache").find(mod)
+        if info == nil or (type(info) == "table" and #info == 0) then
+          return
+        end
+        Util.error(msg)
+      end,
+    })
   end
-  local pattern = "LazyVim" .. name:sub(1, 1):upper() .. name:sub(2)
   -- always load lazyvim, then user file
-  if M.defaults[name] or name == "options" then
+  if M.defaults[name] then
     _load("lazyvim.config." .. name)
-    vim.api.nvim_exec_autocmds("User", { pattern = pattern .. "Defaults", modeline = false })
   end
   _load("config." .. name)
   if vim.bo.filetype == "lazy" then
     -- HACK: LazyVim may have overwritten options of the Lazy ui, so reset this here
     vim.cmd([[do VimResized]])
   end
-  vim.api.nvim_exec_autocmds("User", { pattern = pattern, modeline = false })
 end
 
 M.did_init = false
-M._options = {} ---@type vim.wo|vim.bo
-
 function M.init()
-  if M.did_init then
-    return
+  if not M.did_init then
+    M.did_init = true
+    -- delay notifications till vim.notify was replaced or after 500ms
+    require("lazyvim.util").lazy_notify()
+
+    -- load options here, before lazy init while sourcing plugin modules
+    -- this is needed to make sure options will be correctly applied
+    -- after installing missing plugins
+    require("lazyvim.config").load("options")
   end
-  M.did_init = true
-  local plugin = require("lazy.core.config").spec.plugins.LazyVim
-  if plugin then
-    vim.opt.rtp:append(plugin.dir)
-  end
-
-  package.preload["lazyvim.plugins.lsp.format"] = function()
-    LazyVim.deprecate([[require("lazyvim.plugins.lsp.format")]], [[LazyVim.format]])
-    return LazyVim.format
-  end
-
-  -- delay notifications till vim.notify was replaced or after 500ms
-  LazyVim.lazy_notify()
-
-  -- load options here, before lazy init while sourcing plugin modules
-  -- this is needed to make sure options will be correctly applied
-  -- after installing missing plugins
-  M.load("options")
-
-  -- save some options to track defaults
-  M._options.indentexpr = vim.o.indentexpr
-  M._options.foldmethod = vim.o.foldmethod
-  M._options.foldexpr = vim.o.foldexpr
-
-  -- defer built-in clipboard handling: "xsel" and "pbcopy" can be slow
-  lazy_clipboard = vim.opt.clipboard:get()
-  vim.opt.clipboard = ""
-
-  if vim.g.deprecation_warnings == false then
-    vim.deprecate = function() end
-  end
-
-  LazyVim.plugin.setup()
-  M.json.load()
-end
-
----@alias LazyVimDefault {name: string, group: string, extra: string, import: string, enabled?: boolean, origin?: "global" | "default" | "extra" }
----
-local default_extras ---@type table<string, LazyVimDefault>
-
----@param name string
----@param extras LazyVimDefault[]
-function M.register_defaults(name, extras)
-  assert(default_extras, "defaults should be loaded by now, this should never happen")
-  local valid = vim.tbl_map(function(extra)
-    return extra.name
-  end, extras) --[[@as string[] ]]
-
-  local origin = "default"
-  local ret ---@type LazyVimDefault?
-  local use ---@type string?
-
-  local global = vim.g["lazyvim_" .. name]
-  if vim.tbl_contains(valid, global) then
-    origin = "global" -- was set by the user in their config
-    use = global
-  else
-    if global and global ~= "auto" then
-      vim.notify(
-        ("Invalid value for `vim.g.lazyvim_%s`: `%s`\nValid options are: %s"):format(
-          name,
-          global,
-          table.concat(valid, ", ")
-        ),
-        vim.log.levels.ERROR,
-        { title = "LazyVim" }
-      )
-    end
-    for _, extra in ipairs(extras) do
-      if LazyVim.has_extra(extra.extra) then
-        use = extra.name -- was imported by the user in their lazy spec or added by LazyExtras
-        origin = "extra"
-        break
-      end
-    end
-  end
-
-  use = use or valid[1] -- fallback to the first one if nothing was set
-
-  for _, extra in ipairs(extras) do
-    local import = "lazyvim.plugins.extras." .. extra.extra
-    extra = vim.deepcopy(extra)
-    extra.enabled = extra.name == use
-    extra.import = import
-    extra.group = name
-    if extra.enabled then
-      extra.origin = origin
-      ret = extra
-    end
-    default_extras[import] = extra
-  end
-
-  return assert(ret, "One of the extras should be enabled, this should never happen")
-end
-
----@param group string
----@return LazyVimDefault?
-function M.get_default(group)
-  for _, extra in pairs(M.get_defaults()) do
-    if extra.group == group and extra.enabled then
-      return extra
-    end
-  end
-end
-
-function M.get_defaults()
-  if default_extras then
-    return default_extras
-  end
-  default_extras = {}
-
-  ---@type table<string, LazyVimDefault[]>
-  local checks = {
-    picker = {
-      { name = "snacks", extra = "editor.snacks_picker" },
-      { name = "fzf", extra = "editor.fzf" },
-      { name = "telescope", extra = "editor.telescope" },
-    },
-    cmp = {
-      { name = "blink.cmp", extra = "coding.blink" },
-      { name = "nvim-cmp", extra = "coding.nvim-cmp" },
-    },
-    explorer = {
-      { name = "snacks", extra = "editor.snacks_explorer" },
-      { name = "neo-tree", extra = "editor.neo-tree" },
-    },
-  }
-
-  -- existing installs keep their defaults
-  if (LazyVim.config.json.data.install_version or 7) < 8 then
-    table.insert(checks.picker, 1, table.remove(checks.picker, 2))
-    table.insert(checks.explorer, 1, table.remove(checks.explorer, 2))
-  end
-
-  for name, extras in pairs(checks) do
-    M.register_defaults(name, extras)
-  end
-
-  return default_extras
 end
 
 setmetatable(M, {

lua/lazyvim/config/keymaps.lua

@@ -1,59 +1,59 @@
--- This file is automatically loaded by lazyvim.config.init
+-- This file is automatically loaded by lazyvim.plugins.config
 
--- DO NOT USE `LazyVim.safe_keymap_set` IN YOUR OWN CONFIG!!
--- use `vim.keymap.set` instead
-local map = LazyVim.safe_keymap_set
+local Util = require("lazyvim.util")
+
+local function map(mode, lhs, rhs, opts)
+  local keys = require("lazy.core.handler").handlers.keys
+  ---@cast keys LazyKeysHandler
+  -- do not create the keymap if a lazy keys handler exists
+  if not keys.active[keys.parse({ lhs, mode = mode }).id] then
+    opts = opts or {}
+    opts.silent = opts.silent ~= false
+    vim.keymap.set(mode, lhs, rhs, opts)
+  end
+end
 
 -- better up/down
-map({ "n", "x" }, "j", "v:count == 0 ? 'gj' : 'j'", { desc = "Down", expr = true, silent = true })
-map({ "n", "x" }, "<Down>", "v:count == 0 ? 'gj' : 'j'", { desc = "Down", expr = true, silent = true })
-map({ "n", "x" }, "k", "v:count == 0 ? 'gk' : 'k'", { desc = "Up", expr = true, silent = true })
-map({ "n", "x" }, "<Up>", "v:count == 0 ? 'gk' : 'k'", { desc = "Up", expr = true, silent = true })
+map("n", "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
+map("n", "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
 
 -- Move to window using the <ctrl> hjkl keys
-map("n", "<C-h>", "<C-w>h", { desc = "Go to Left Window", remap = true })
-map("n", "<C-j>", "<C-w>j", { desc = "Go to Lower Window", remap = true })
-map("n", "<C-k>", "<C-w>k", { desc = "Go to Upper Window", remap = true })
-map("n", "<C-l>", "<C-w>l", { desc = "Go to Right Window", remap = true })
+map("n", "<C-h>", "<C-w>h", { desc = "Go to left window" })
+map("n", "<C-j>", "<C-w>j", { desc = "Go to lower window" })
+map("n", "<C-k>", "<C-w>k", { desc = "Go to upper window" })
+map("n", "<C-l>", "<C-w>l", { desc = "Go to right window" })
 
 -- Resize window using <ctrl> arrow keys
-map("n", "<C-Up>", "<cmd>resize +2<cr>", { desc = "Increase Window Height" })
-map("n", "<C-Down>", "<cmd>resize -2<cr>", { desc = "Decrease Window Height" })
-map("n", "<C-Left>", "<cmd>vertical resize -2<cr>", { desc = "Decrease Window Width" })
-map("n", "<C-Right>", "<cmd>vertical resize +2<cr>", { desc = "Increase Window Width" })
+map("n", "<C-Up>", "<cmd>resize +2<cr>", { desc = "Increase window height" })
+map("n", "<C-Down>", "<cmd>resize -2<cr>", { desc = "Decrease window height" })
+map("n", "<C-Left>", "<cmd>vertical resize -2<cr>", { desc = "Decrease window width" })
+map("n", "<C-Right>", "<cmd>vertical resize +2<cr>", { desc = "Increase window width" })
 
 -- Move Lines
-map("n", "<A-j>", "<cmd>execute 'move .+' . v:count1<cr>==", { desc = "Move Down" })
-map("n", "<A-k>", "<cmd>execute 'move .-' . (v:count1 + 1)<cr>==", { desc = "Move Up" })
-map("i", "<A-j>", "<esc><cmd>m .+1<cr>==gi", { desc = "Move Down" })
-map("i", "<A-k>", "<esc><cmd>m .-2<cr>==gi", { desc = "Move Up" })
-map("v", "<A-j>", ":<C-u>execute \"'<,'>move '>+\" . v:count1<cr>gv=gv", { desc = "Move Down" })
-map("v", "<A-k>", ":<C-u>execute \"'<,'>move '<-\" . (v:count1 + 1)<cr>gv=gv", { desc = "Move Up" })
+map("n", "<A-j>", "<cmd>m .+1<cr>==", { desc = "Move down" })
+map("n", "<A-k>", "<cmd>m .-2<cr>==", { desc = "Move up" })
+map("i", "<A-j>", "<esc><cmd>m .+1<cr>==gi", { desc = "Move down" })
+map("i", "<A-k>", "<esc><cmd>m .-2<cr>==gi", { desc = "Move up" })
+map("v", "<A-j>", ":m '>+1<cr>gv=gv", { desc = "Move down" })
+map("v", "<A-k>", ":m '<-2<cr>gv=gv", { desc = "Move up" })
 
 -- buffers
-map("n", "<S-h>", "<cmd>bprevious<cr>", { desc = "Prev Buffer" })
-map("n", "<S-l>", "<cmd>bnext<cr>", { desc = "Next Buffer" })
-map("n", "[b", "<cmd>bprevious<cr>", { desc = "Prev Buffer" })
-map("n", "]b", "<cmd>bnext<cr>", { desc = "Next Buffer" })
+if Util.has("bufferline.nvim") then
+  map("n", "<S-h>", "<cmd>BufferLineCyclePrev<cr>", { desc = "Prev buffer" })
+  map("n", "<S-l>", "<cmd>BufferLineCycleNext<cr>", { desc = "Next buffer" })
+  map("n", "[b", "<cmd>BufferLineCyclePrev<cr>", { desc = "Prev buffer" })
+  map("n", "]b", "<cmd>BufferLineCycleNext<cr>", { desc = "Next buffer" })
+else
+  map("n", "<S-h>", "<cmd>bprevious<cr>", { desc = "Prev buffer" })
+  map("n", "<S-l>", "<cmd>bnext<cr>", { desc = "Next buffer" })
+  map("n", "[b", "<cmd>bprevious<cr>", { desc = "Prev buffer" })
+  map("n", "]b", "<cmd>bnext<cr>", { desc = "Next buffer" })
+end
 map("n", "<leader>bb", "<cmd>e #<cr>", { desc = "Switch to Other Buffer" })
 map("n", "<leader>`", "<cmd>e #<cr>", { desc = "Switch to Other Buffer" })
-map("n", "<leader>bd", function()
-  Snacks.bufdelete()
-end, { desc = "Delete Buffer" })
-map("n", "<leader>bo", function()
-  Snacks.bufdelete.other()
-end, { desc = "Delete Other Buffers" })
-map("n", "<leader>bi", function()
-  Snacks.bufdelete.invisible()
-end, { desc = "Delete Invisible Buffers" })
-map("n", "<leader>bD", "<cmd>:bd<cr>", { desc = "Delete Buffer and Window" })
 
--- Clear search and stop snippet on escape
-map({ "i", "n", "s" }, "<esc>", function()
-  vim.cmd("noh")
-  LazyVim.cmp.actions.snippet_stop()
-  return "<esc>"
-end, { expr = true, desc = "Escape and Clear hlsearch" })
+-- Clear search with <esc>
+map({ "i", "n" }, "<esc>", "<cmd>noh<cr><esc>", { desc = "Escape and clear hlsearch" })
 
 -- Clear search, diff update and redraw
 -- taken from runtime/lua/_editor.lua
@@ -61,16 +61,18 @@ map(
   "n",
   "<leader>ur",
   "<Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>",
-  { desc = "Redraw / Clear hlsearch / Diff Update" }
+  { desc = "Redraw / clear hlsearch / diff update" }
 )
 
+map({ "n", "x" }, "gw", "*N", { desc = "Search word under cursor" })
+
 -- https://github.com/mhinz/vim-galore#saner-behavior-of-n-and-n
-map("n", "n", "'Nn'[v:searchforward].'zv'", { expr = true, desc = "Next Search Result" })
-map("x", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next Search Result" })
-map("o", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next Search Result" })
-map("n", "N", "'nN'[v:searchforward].'zv'", { expr = true, desc = "Prev Search Result" })
-map("x", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev Search Result" })
-map("o", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev Search Result" })
+map("n", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
+map("x", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
+map("o", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
+map("n", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
+map("x", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
+map("o", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
 
 -- Add undo break-points
 map("i", ",", ",<c-g>u")
@@ -78,138 +80,66 @@ map("i", ".", ".<c-g>u")
 map("i", ";", ";<c-g>u")
 
 -- save file
-map({ "i", "x", "n", "s" }, "<C-s>", "<cmd>w<cr><esc>", { desc = "Save File" })
-
---keywordprg
-map("n", "<leader>K", "<cmd>norm! K<cr>", { desc = "Keywordprg" })
+map({ "i", "v", "n", "s" }, "<C-s>", "<cmd>w<cr><esc>", { desc = "Save file" })
 
 -- better indenting
-map("x", "<", "<gv")
-map("x", ">", ">gv")
-
--- commenting
-map("n", "gco", "o<esc>Vcx<esc><cmd>normal gcc<cr>fxa<bs>", { desc = "Add Comment Below" })
-map("n", "gcO", "O<esc>Vcx<esc><cmd>normal gcc<cr>fxa<bs>", { desc = "Add Comment Above" })
+map("v", "<", "<gv")
+map("v", ">", ">gv")
 
 -- lazy
-map("n", "<leader>l", "<cmd>Lazy<cr>", { desc = "Lazy" })
+map("n", "<leader>l", "<cmd>:Lazy<cr>", { desc = "Lazy" })
 
 -- new file
 map("n", "<leader>fn", "<cmd>enew<cr>", { desc = "New File" })
 
--- location list
-map("n", "<leader>xl", function()
-  local success, err = pcall(vim.fn.getloclist(0, { winid = 0 }).winid ~= 0 and vim.cmd.lclose or vim.cmd.lopen)
-  if not success and err then
-    vim.notify(err, vim.log.levels.ERROR)
-  end
-end, { desc = "Location List" })
+map("n", "<leader>xl", "<cmd>lopen<cr>", { desc = "Location List" })
+map("n", "<leader>xq", "<cmd>copen<cr>", { desc = "Quickfix List" })
 
--- quickfix list
-map("n", "<leader>xq", function()
-  local success, err = pcall(vim.fn.getqflist({ winid = 0 }).winid ~= 0 and vim.cmd.cclose or vim.cmd.copen)
-  if not success and err then
-    vim.notify(err, vim.log.levels.ERROR)
-  end
-end, { desc = "Quickfix List" })
-
-map("n", "[q", vim.cmd.cprev, { desc = "Previous Quickfix" })
-map("n", "]q", vim.cmd.cnext, { desc = "Next Quickfix" })
-
--- formatting
-map({ "n", "x" }, "<leader>cf", function()
-  LazyVim.format({ force = true })
-end, { desc = "Format" })
-
--- diagnostic
-local diagnostic_goto = function(next, severity)
-  return function()
-    vim.diagnostic.jump({
-      count = (next and 1 or -1) * vim.v.count1,
-      severity = severity and vim.diagnostic.severity[severity] or nil,
-      float = true,
-    })
-  end
+if not Util.has("trouble.nvim") then
+  map("n", "[q", vim.cmd.cprev, { desc = "Previous quickfix" })
+  map("n", "]q", vim.cmd.cnext, { desc = "Next quickfix" })
 end
-map("n", "<leader>cd", vim.diagnostic.open_float, { desc = "Line Diagnostics" })
-map("n", "]d", diagnostic_goto(true), { desc = "Next Diagnostic" })
-map("n", "[d", diagnostic_goto(false), { desc = "Prev Diagnostic" })
-map("n", "]e", diagnostic_goto(true, "ERROR"), { desc = "Next Error" })
-map("n", "[e", diagnostic_goto(false, "ERROR"), { desc = "Prev Error" })
-map("n", "]w", diagnostic_goto(true, "WARN"), { desc = "Next Warning" })
-map("n", "[w", diagnostic_goto(false, "WARN"), { desc = "Prev Warning" })
 
 -- stylua: ignore start
 
 -- toggle options
-LazyVim.format.snacks_toggle():map("<leader>uf")
-LazyVim.format.snacks_toggle(true):map("<leader>uF")
-Snacks.toggle.option("spell", { name = "Spelling" }):map("<leader>us")
-Snacks.toggle.option("wrap", { name = "Wrap" }):map("<leader>uw")
-Snacks.toggle.option("relativenumber", { name = "Relative Number" }):map("<leader>uL")
-Snacks.toggle.diagnostics():map("<leader>ud")
-Snacks.toggle.line_number():map("<leader>ul")
-Snacks.toggle.option("conceallevel", { off = 0, on = vim.o.conceallevel > 0 and vim.o.conceallevel or 2, name = "Conceal Level" }):map("<leader>uc")
-Snacks.toggle.option("showtabline", { off = 0, on = vim.o.showtabline > 0 and vim.o.showtabline or 2, name = "Tabline" }):map("<leader>uA")
-Snacks.toggle.treesitter():map("<leader>uT")
-Snacks.toggle.option("background", { off = "light", on = "dark" , name = "Dark Background" }):map("<leader>ub")
-Snacks.toggle.dim():map("<leader>uD")
-Snacks.toggle.animate():map("<leader>ua")
-Snacks.toggle.indent():map("<leader>ug")
-Snacks.toggle.scroll():map("<leader>uS")
-Snacks.toggle.profiler():map("<leader>dpp")
-Snacks.toggle.profiler_highlights():map("<leader>dph")
-
-if vim.lsp.inlay_hint then
-  Snacks.toggle.inlay_hints():map("<leader>uh")
-end
+map("n", "<leader>uf", require("lazyvim.plugins.lsp.format").toggle, { desc = "Toggle format on Save" })
+map("n", "<leader>us", function() Util.toggle("spell") end, { desc = "Toggle Spelling" })
+map("n", "<leader>uw", function() Util.toggle("wrap") end, { desc = "Toggle Word Wrap" })
+map("n", "<leader>ul", function() Util.toggle("relativenumber", true) Util.toggle("number") end, { desc = "Toggle Line Numbers" })
+map("n", "<leader>ud", Util.toggle_diagnostics, { desc = "Toggle Diagnostics" })
+local conceallevel = vim.o.conceallevel > 0 and vim.o.conceallevel or 3
+map("n", "<leader>uc", function() Util.toggle("conceallevel", false, {0, conceallevel}) end, { desc = "Toggle Conceal" })
 
 -- lazygit
-if vim.fn.executable("lazygit") == 1 then
-  map("n", "<leader>gg", function() Snacks.lazygit( { cwd = LazyVim.root.git() }) end, { desc = "Lazygit (Root Dir)" })
-  map("n", "<leader>gG", function() Snacks.lazygit() end, { desc = "Lazygit (cwd)" })
-end
-
-map("n", "<leader>gL", function() Snacks.picker.git_log() end, { desc = "Git Log (cwd)" })
-map("n", "<leader>gb", function() Snacks.picker.git_log_line() end, { desc = "Git Blame Line" })
-map("n", "<leader>gf", function() Snacks.picker.git_log_file() end, { desc = "Git Current File History" })
-map("n", "<leader>gl", function() Snacks.picker.git_log({ cwd = LazyVim.root.git() }) end, { desc = "Git Log" })
-map({ "n", "x" }, "<leader>gB", function() Snacks.gitbrowse() end, { desc = "Git Browse (open)" })
-map({"n", "x" }, "<leader>gY", function()
-  Snacks.gitbrowse({ open = function(url) vim.fn.setreg("+", url) end, notify = false })
-end, { desc = "Git Browse (copy)" })
+map("n", "<leader>gg", function() Util.float_term({ "lazygit" }, { cwd = Util.get_root() }) end, { desc = "Lazygit (root dir)" })
+map("n", "<leader>gG", function() Util.float_term({ "lazygit" }) end, { desc = "Lazygit (cwd)" })
 
 -- quit
-map("n", "<leader>qq", "<cmd>qa<cr>", { desc = "Quit All" })
+map("n", "<leader>qq", "<cmd>qa<cr>", { desc = "Quit all" })
 
 -- highlights under cursor
-map("n", "<leader>ui", vim.show_pos, { desc = "Inspect Pos" })
-map("n", "<leader>uI", function() vim.treesitter.inspect_tree() vim.api.nvim_input("I") end, { desc = "Inspect Tree" })
-
--- LazyVim Changelog
-map("n", "<leader>L", function() LazyVim.news.changelog() end, { desc = "LazyVim Changelog" })
+if vim.fn.has("nvim-0.9.0") == 1 then
+  map("n", "<leader>ui", vim.show_pos, { desc = "Inspect Pos" })
+end
 
 -- floating terminal
-map("n", "<leader>fT", function() Snacks.terminal() end, { desc = "Terminal (cwd)" })
-map("n", "<leader>ft", function() Snacks.terminal(nil, { cwd = LazyVim.root() }) end, { desc = "Terminal (Root Dir)" })
-map({"n","t"}, "<c-/>",function() Snacks.terminal.focus(nil, { cwd = LazyVim.root() }) end, { desc = "Terminal (Root Dir)" })
-map({"n","t"}, "<c-_>",function() Snacks.terminal.focus(nil, { cwd = LazyVim.root() }) end, { desc = "which_key_ignore" })
+map("n", "<leader>ft", function() Util.float_term(nil, { cwd = Util.get_root() }) end, { desc = "Terminal (root dir)" })
+map("n", "<leader>fT", function() Util.float_term() end, { desc = "Terminal (cwd)" })
+map("t", "<esc><esc>", "<c-\\><c-n>", {desc = "Enter Normal Mode"})
 
 -- windows
-map("n", "<leader>-", "<C-W>s", { desc = "Split Window Below", remap = true })
-map("n", "<leader>|", "<C-W>v", { desc = "Split Window Right", remap = true })
-map("n", "<leader>wd", "<C-W>c", { desc = "Delete Window", remap = true })
-Snacks.toggle.zoom():map("<leader>wm"):map("<leader>uZ")
-Snacks.toggle.zen():map("<leader>uz")
+map("n", "<leader>ww", "<C-W>p", { desc = "Other window" })
+map("n", "<leader>wd", "<C-W>c", { desc = "Delete window" })
+map("n", "<leader>w-", "<C-W>s", { desc = "Split window below" })
+map("n", "<leader>w|", "<C-W>v", { desc = "Split window right" })
+map("n", "<leader>-", "<C-W>s", { desc = "Split window below" })
+map("n", "<leader>|", "<C-W>v", { desc = "Split window right" })
 
 -- tabs
 map("n", "<leader><tab>l", "<cmd>tablast<cr>", { desc = "Last Tab" })
-map("n", "<leader><tab>o", "<cmd>tabonly<cr>", { desc = "Close Other Tabs" })
 map("n", "<leader><tab>f", "<cmd>tabfirst<cr>", { desc = "First Tab" })
 map("n", "<leader><tab><tab>", "<cmd>tabnew<cr>", { desc = "New Tab" })
 map("n", "<leader><tab>]", "<cmd>tabnext<cr>", { desc = "Next Tab" })
 map("n", "<leader><tab>d", "<cmd>tabclose<cr>", { desc = "Close Tab" })
 map("n", "<leader><tab>[", "<cmd>tabprevious<cr>", { desc = "Previous Tab" })
-
--- lua
-map({"n", "x"}, "<localleader>r", function() Snacks.debug.run() end, { desc = "Run Lua", ft = "lua" })

lua/lazyvim/config/options.lua

@@ -1,118 +1,56 @@
--- This file is automatically loaded by plugins.core
+-- This file is automatically loaded by plugins.config
+
 vim.g.mapleader = " "
-vim.g.maplocalleader = "\\"
-
--- LazyVim auto format
-vim.g.autoformat = true
-
--- Snacks animations
--- Set to `false` to globally disable all snacks animations
-vim.g.snacks_animate = true
-
--- LazyVim picker to use.
--- Can be one of: telescope, fzf
--- Leave it to "auto" to automatically use the picker
--- enabled with `:LazyExtras`
-vim.g.lazyvim_picker = "auto"
-
--- LazyVim completion engine to use.
--- Can be one of: nvim-cmp, blink.cmp
--- Leave it to "auto" to automatically use the completion engine
--- enabled with `:LazyExtras`
-vim.g.lazyvim_cmp = "auto"
-
--- if the completion engine supports the AI source,
--- use that instead of inline suggestions
-vim.g.ai_cmp = true
-
--- LazyVim root dir detection
--- Each entry can be:
--- * the name of a detector function like `lsp` or `cwd`
--- * a pattern or array of patterns like `.git` or `lua`.
--- * a function with signature `function(buf) -> string|string[]`
-vim.g.root_spec = { "lsp", { ".git", "lua" }, "cwd" }
-
--- Optionally setup the terminal to use
--- This sets `vim.o.shell` and does some additional configuration for:
--- * pwsh
--- * powershell
--- LazyVim.terminal.setup("pwsh")
-
--- Set LSP servers to be ignored when used with `util.root.detectors.lsp`
--- for detecting the LSP root
-vim.g.root_lsp_ignore = { "copilot" }
-
--- Hide deprecation warnings
-vim.g.deprecation_warnings = false
-
--- Show the current document symbols location from Trouble in lualine
--- You can disable this for a buffer by setting `vim.b.trouble_lualine = false`
-vim.g.trouble_lualine = true
+vim.g.maplocalleader = " "
 
 local opt = vim.opt
 
 opt.autowrite = true -- Enable auto write
--- only set clipboard if not in ssh, to make sure the OSC 52
--- integration works automatically.
-opt.clipboard = vim.env.SSH_CONNECTION and "" or "unnamedplus" -- Sync with system clipboard
+opt.clipboard = "unnamedplus" -- Sync with system clipboard
 opt.completeopt = "menu,menuone,noselect"
-opt.conceallevel = 2 -- Hide * markup for bold and italic, but not markers with substitutions
+opt.conceallevel = 3 -- Hide * markup for bold and italic
 opt.confirm = true -- Confirm to save changes before exiting modified buffer
 opt.cursorline = true -- Enable highlighting of the current line
 opt.expandtab = true -- Use spaces instead of tabs
-opt.fillchars = {
-  foldopen = "",
-  foldclose = "",
-  fold = " ",
-  foldsep = " ",
-  diff = "╱",
-  eob = " ",
-}
-opt.foldlevel = 99
-opt.foldmethod = "indent"
-opt.foldtext = ""
-opt.formatexpr = "v:lua.LazyVim.format.formatexpr()"
 opt.formatoptions = "jcroqlnt" -- tcqj
 opt.grepformat = "%f:%l:%c:%m"
 opt.grepprg = "rg --vimgrep"
 opt.ignorecase = true -- Ignore case
 opt.inccommand = "nosplit" -- preview incremental substitute
-opt.jumpoptions = "view"
-opt.laststatus = 3 -- global statusline
-opt.linebreak = true -- Wrap lines at convenient points
+opt.laststatus = 0
 opt.list = true -- Show some invisible characters (tabs...
 opt.mouse = "a" -- Enable mouse mode
 opt.number = true -- Print line number
 opt.pumblend = 10 -- Popup blend
 opt.pumheight = 10 -- Maximum number of entries in a popup
 opt.relativenumber = true -- Relative line numbers
-opt.ruler = false -- Disable the default ruler
 opt.scrolloff = 4 -- Lines of context
-opt.sessionoptions = { "buffers", "curdir", "tabpages", "winsize", "help", "globals", "skiprtp", "folds" }
+opt.sessionoptions = { "buffers", "curdir", "tabpages", "winsize" }
 opt.shiftround = true -- Round indent
 opt.shiftwidth = 2 -- Size of an indent
-opt.shortmess:append({ W = true, I = true, c = true, C = true })
+opt.shortmess:append { W = true, I = true, c = true }
 opt.showmode = false -- Dont show mode since we have a statusline
 opt.sidescrolloff = 8 -- Columns of context
 opt.signcolumn = "yes" -- Always show the signcolumn, otherwise it would shift the text each time
 opt.smartcase = true -- Don't ignore case with capitals
 opt.smartindent = true -- Insert indents automatically
-opt.smoothscroll = true
 opt.spelllang = { "en" }
 opt.splitbelow = true -- Put new windows below current
-opt.splitkeep = "screen"
 opt.splitright = true -- Put new windows right of current
-opt.statuscolumn = [[%!v:lua.LazyVim.statuscolumn()]]
 opt.tabstop = 2 -- Number of spaces tabs count for
 opt.termguicolors = true -- True color support
-opt.timeoutlen = vim.g.vscode and 1000 or 300 -- Lower than default (1000) to quickly trigger which-key
+opt.timeoutlen = 300
 opt.undofile = true
 opt.undolevels = 10000
 opt.updatetime = 200 -- Save swap file and trigger CursorHold
-opt.virtualedit = "block" -- Allow cursor to move where there is no text in visual block mode
 opt.wildmode = "longest:full,full" -- Command-line completion mode
 opt.winminwidth = 5 -- Minimum window width
 opt.wrap = false -- Disable line wrap
 
+if vim.fn.has("nvim-0.9.0") == 1 then
+  opt.splitkeep = "screen"
+  opt.shortmess:append { C = true }
+end
+
 -- Fix markdown indentation settings
 vim.g.markdown_recommended_style = 0

lua/lazyvim/health.lua

@@ -1,21 +1,15 @@
 local M = {}
 
-local start = vim.health.start or vim.health.report_start
-local ok = vim.health.ok or vim.health.report_ok
-local warn = vim.health.warn or vim.health.report_warn
-local error = vim.health.error or vim.health.report_error
-local info = vim.health.info or vim.health.report_info
-
 function M.check()
-  start("LazyVim")
+  vim.health.report_start("LazyVim")
 
-  if vim.fn.has("nvim-0.11.2") == 1 then
-    ok("Using Neovim >= 0.11.2")
+  if vim.fn.has("nvim-0.8.0") == 1 then
+    vim.health.report_ok("Using Neovim >= 0.8.0")
   else
-    error("Neovim >= 0.11.2 is required")
+    vim.health.report_error("Neovim >= 0.8.0 is required")
   end
 
-  for _, cmd in ipairs({ "git", "rg", { "fd", "fdfind" }, "lazygit", "fzf", "curl" }) do
+  for _, cmd in ipairs({ "git", "rg", { "fd", "fdfind" }, "lazygit" }) do
     local name = type(cmd) == "string" and cmd or vim.inspect(cmd)
     local commands = type(cmd) == "string" and { cmd } or cmd
     ---@cast commands string[]
@@ -29,26 +23,9 @@ function M.check()
     end
 
     if found then
-      ok(("`%s` is installed"):format(name))
+      vim.health.report_ok(("`%s` is installed"):format(name))
     else
-      warn(("`%s` is not installed"):format(name))
-    end
-  end
-
-  start("LazyVim nvim-treesitter")
-  local tsok, health = LazyVim.treesitter.check()
-  local keys = vim.tbl_keys(health) ---@type string[]
-  table.sort(keys)
-  for _, k in pairs(keys) do
-    (health[k] and ok or error)(("`%s` is %s"):format(k, health[k] and "installed" or "not installed"))
-  end
-  if not tsok then
-    info(
-      "See the requirements at [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter/tree/main?tab=readme-ov-file#requirements)"
-    )
-    info("Run `:checkhealth nvim-treesitter` for more information.")
-    if vim.fn.has("win32") == 1 and not health["C compiler"] then
-      info("Install a C compiler with `winget install --id=BrechtSanders.WinLibs.POSIX.UCRT -e`")
+      vim.health.report_warn(("`%s` is not installed"):format(name))
     end
   end
 end

lua/lazyvim/init.lua

@@ -1,5 +1,3 @@
-vim.uv = vim.uv or vim.loop
-
 local M = {}
 
 ---@param opts? LazyVimConfig

lua/lazyvim/plugins/coding.lua

@@ -1,89 +1,226 @@
 return {
-  -- Auto pairs
-  -- Automatically inserts a matching closing character
-  -- when you type an opening character like `"`, `[`, or `(`.
+
+  -- snippets
   {
-    "nvim-mini/mini.pairs",
-    event = "VeryLazy",
-    opts = {
-      modes = { insert = true, command = true, terminal = false },
-      -- skip autopair when next character is one of these
-      skip_next = [=[[%w%%%'%[%"%.%`%$]]=],
-      -- skip autopair when the cursor is inside these treesitter nodes
-      skip_ts = { "string" },
-      -- skip autopair when next character is closing pair
-      -- and there are more closing pairs than opening pairs
-      skip_unbalanced = true,
-      -- better deal with markdown code blocks
-      markdown = true,
+    "L3MON4D3/LuaSnip",
+    build = (not jit.os:find("Windows"))
+        and "echo -e 'NOTE: jsregexp is optional, so not a big deal if it fails to build\n'; make install_jsregexp"
+      or nil,
+    dependencies = {
+      "rafamadriz/friendly-snippets",
+      config = function()
+        require("luasnip.loaders.from_vscode").lazy_load()
+      end,
     },
-    config = function(_, opts)
-      LazyVim.mini.pairs(opts)
+    opts = {
+      history = true,
+      delete_check_events = "TextChanged",
+    },
+    -- stylua: ignore
+    keys = {
+      {
+        "<tab>",
+        function()
+          return require("luasnip").jumpable(1) and "<Plug>luasnip-jump-next" or "<tab>"
+        end,
+        expr = true, silent = true, mode = "i",
+      },
+      { "<tab>", function() require("luasnip").jump(1) end, mode = "s" },
+      { "<s-tab>", function() require("luasnip").jump(-1) end, mode = { "i", "s" } },
+    },
+  },
+
+  -- auto completion
+  {
+    "hrsh7th/nvim-cmp",
+    version = false, -- last release is way too old
+    event = "InsertEnter",
+    dependencies = {
+      "hrsh7th/cmp-nvim-lsp",
+      "hrsh7th/cmp-buffer",
+      "hrsh7th/cmp-path",
+      "saadparwaiz1/cmp_luasnip",
+    },
+    opts = function()
+      local cmp = require("cmp")
+      return {
+        completion = {
+          completeopt = "menu,menuone,noinsert",
+        },
+        snippet = {
+          expand = function(args)
+            require("luasnip").lsp_expand(args.body)
+          end,
+        },
+        mapping = cmp.mapping.preset.insert({
+          ["<C-n>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
+          ["<C-p>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
+          ["<C-b>"] = cmp.mapping.scroll_docs(-4),
+          ["<C-f>"] = cmp.mapping.scroll_docs(4),
+          ["<C-Space>"] = cmp.mapping.complete(),
+          ["<C-e>"] = cmp.mapping.abort(),
+          ["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+          ["<S-CR>"] = cmp.mapping.confirm({
+            behavior = cmp.ConfirmBehavior.Replace,
+            select = true,
+          }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+        }),
+        sources = cmp.config.sources({
+          { name = "nvim_lsp" },
+          { name = "luasnip" },
+          { name = "buffer" },
+          { name = "path" },
+        }),
+        formatting = {
+          format = function(_, item)
+            local icons = require("lazyvim.config").icons.kinds
+            if icons[item.kind] then
+              item.kind = icons[item.kind] .. item.kind
+            end
+            return item
+          end,
+        },
+        experimental = {
+          ghost_text = {
+            hl_group = "LspCodeLens",
+          },
+        },
+      }
     end,
   },
 
-  -- Improves comment syntax, lets Neovim handle multiple
-  -- types of comments for a single language, and relaxes rules
-  -- for uncommenting.
+  -- auto pairs
   {
-    "folke/ts-comments.nvim",
+    "echasnovski/mini.pairs",
     event = "VeryLazy",
-    opts = {},
+    config = function(_, opts)
+      require("mini.pairs").setup(opts)
+    end,
   },
 
-  -- Extends the a & i text objects, this adds the ability to select
-  -- arguments, function calls, text within quotes and brackets, and to
-  -- repeat those selections to select an outer text object.
+  -- surround
   {
-    "nvim-mini/mini.ai",
+    "echasnovski/mini.surround",
+    keys = function(_, keys)
+      -- Populate the keys based on the user's options
+      local plugin = require("lazy.core.config").spec.plugins["mini.surround"]
+      local opts = require("lazy.core.plugin").values(plugin, "opts", false)
+      local mappings = {
+        { opts.mappings.add, desc = "Add surrounding", mode = { "n", "v" } },
+        { opts.mappings.delete, desc = "Delete surrounding" },
+        { opts.mappings.find, desc = "Find right surrounding" },
+        { opts.mappings.find_left, desc = "Find left surrounding" },
+        { opts.mappings.highlight, desc = "Highlight surrounding" },
+        { opts.mappings.replace, desc = "Replace surrounding" },
+        { opts.mappings.update_n_lines, desc = "Update `MiniSurround.config.n_lines`" },
+      }
+      mappings = vim.tbl_filter(function(m)
+        return m[1] and #m[1] > 0
+      end, mappings)
+      return vim.list_extend(mappings, keys)
+    end,
+    opts = {
+      mappings = {
+        add = "gza", -- Add surrounding in Normal and Visual modes
+        delete = "gzd", -- Delete surrounding
+        find = "gzf", -- Find surrounding (to the right)
+        find_left = "gzF", -- Find surrounding (to the left)
+        highlight = "gzh", -- Highlight surrounding
+        replace = "gzr", -- Replace surrounding
+        update_n_lines = "gzn", -- Update `n_lines`
+      },
+    },
+    config = function(_, opts)
+      -- use gz mappings instead of s to prevent conflict with leap
+      require("mini.surround").setup(opts)
+    end,
+  },
+
+  -- comments
+  { "JoosepAlviste/nvim-ts-context-commentstring", lazy = true },
+  {
+    "echasnovski/mini.comment",
     event = "VeryLazy",
+    opts = {
+      hooks = {
+        pre = function()
+          require("ts_context_commentstring.internal").update_commentstring({})
+        end,
+      },
+    },
+    config = function(_, opts)
+      require("mini.comment").setup(opts)
+    end,
+  },
+
+  -- better text-objects
+  {
+    "echasnovski/mini.ai",
+    -- keys = {
+    --   { "a", mode = { "x", "o" } },
+    --   { "i", mode = { "x", "o" } },
+    -- },
+    event = "VeryLazy",
+    dependencies = { "nvim-treesitter-textobjects" },
     opts = function()
       local ai = require("mini.ai")
       return {
         n_lines = 500,
         custom_textobjects = {
-          o = ai.gen_spec.treesitter({ -- code block
+          o = ai.gen_spec.treesitter({
             a = { "@block.outer", "@conditional.outer", "@loop.outer" },
             i = { "@block.inner", "@conditional.inner", "@loop.inner" },
-          }),
-          f = ai.gen_spec.treesitter({ a = "@function.outer", i = "@function.inner" }), -- function
-          c = ai.gen_spec.treesitter({ a = "@class.outer", i = "@class.inner" }), -- class
-          t = { "<([%p%w]-)%f[^<%w][^<>]->.-</%1>", "^<.->().*()</[^/]->$" }, -- tags
-          d = { "%f[%d]%d+" }, -- digits
-          e = { -- Word with case
-            { "%u[%l%d]+%f[^%l%d]", "%f[%S][%l%d]+%f[^%l%d]", "%f[%P][%l%d]+%f[^%l%d]", "^[%l%d]+%f[^%l%d]" },
-            "^().*()$",
-          },
-          g = LazyVim.mini.ai_buffer, -- buffer
-          u = ai.gen_spec.function_call(), -- u for "Usage"
-          U = ai.gen_spec.function_call({ name_pattern = "[%w_]" }), -- without dot in function name
+          }, {}),
+          f = ai.gen_spec.treesitter({ a = "@function.outer", i = "@function.inner" }, {}),
+          c = ai.gen_spec.treesitter({ a = "@class.outer", i = "@class.inner" }, {}),
         },
       }
     end,
     config = function(_, opts)
       require("mini.ai").setup(opts)
-      LazyVim.on_load("which-key.nvim", function()
-        vim.schedule(function()
-          LazyVim.mini.ai_whichkey(opts)
-        end)
-      end)
+      -- register all text objects with which-key
+      if require("lazyvim.util").has("which-key.nvim") then
+        ---@type table<string, string|table>
+        local i = {
+          [" "] = "Whitespace",
+          ['"'] = 'Balanced "',
+          ["'"] = "Balanced '",
+          ["`"] = "Balanced `",
+          ["("] = "Balanced (",
+          [")"] = "Balanced ) including white-space",
+          [">"] = "Balanced > including white-space",
+          ["<lt>"] = "Balanced <",
+          ["]"] = "Balanced ] including white-space",
+          ["["] = "Balanced [",
+          ["}"] = "Balanced } including white-space",
+          ["{"] = "Balanced {",
+          ["?"] = "User Prompt",
+          _ = "Underscore",
+          a = "Argument",
+          b = "Balanced ), ], }",
+          c = "Class",
+          f = "Function",
+          o = "Block, conditional, loop",
+          q = "Quote `, \", '",
+          t = "Tag",
+        }
+        local a = vim.deepcopy(i)
+        for k, v in pairs(a) do
+          a[k] = v:gsub(" including.*", "")
+        end
+
+        local ic = vim.deepcopy(i)
+        local ac = vim.deepcopy(a)
+        for key, name in pairs({ n = "Next", l = "Last" }) do
+          i[key] = vim.tbl_extend("force", { name = "Inside " .. name .. " textobject" }, ic)
+          a[key] = vim.tbl_extend("force", { name = "Around " .. name .. " textobject" }, ac)
+        end
+        require("which-key").register({
+          mode = { "o", "x" },
+          i = i,
+          a = a,
+        })
+      end
     end,
   },
-
-  -- Configures LuaLS to support auto-completion and type checking
-  -- while editing your Neovim configuration.
-  {
-    "folke/lazydev.nvim",
-    ft = "lua",
-    cmd = "LazyDev",
-    opts = {
-      library = {
-        { path = "${3rd}/luv/library", words = { "vim%.uv" } },
-        { path = "LazyVim", words = { "LazyVim" } },
-        { path = "snacks.nvim", words = { "Snacks" } },
-        { path = "lazy.nvim", words = { "LazyVim" } },
-        { path = "nvim-lspconfig", words = { "lspconfig.settings" } },
-      },
-    },
-  },
 }

lua/lazyvim/plugins/colorscheme.lua

@@ -12,52 +12,5 @@ return {
     "catppuccin/nvim",
     lazy = true,
     name = "catppuccin",
-    opts = {
-      lsp_styles = {
-        underlines = {
-          errors = { "undercurl" },
-          hints = { "undercurl" },
-          warnings = { "undercurl" },
-          information = { "undercurl" },
-        },
-      },
-      integrations = {
-        aerial = true,
-        alpha = true,
-        cmp = true,
-        dashboard = true,
-        flash = true,
-        fzf = true,
-        grug_far = true,
-        gitsigns = true,
-        headlines = true,
-        illuminate = true,
-        indent_blankline = { enabled = true },
-        leap = true,
-        lsp_trouble = true,
-        mason = true,
-        mini = true,
-        navic = { enabled = true, custom_bg = "lualine" },
-        neotest = true,
-        neotree = true,
-        noice = true,
-        notify = true,
-        snacks = true,
-        telescope = true,
-        treesitter_context = true,
-        which_key = true,
-      },
-    },
-    specs = {
-      {
-        "akinsho/bufferline.nvim",
-        optional = true,
-        opts = function(_, opts)
-          if (vim.g.colors_name or ""):find("catppuccin") then
-            opts.highlights = require("catppuccin.special.bufferline").get_theme()
-          end
-        end,
-      },
-    },
   },
 }

lua/lazyvim/plugins/core.lua

@@ -0,0 +1,6 @@
+require("lazyvim.config").init()
+
+return {
+  { "folke/lazy.nvim", version = "*" },
+  { "LazyVim/LazyVim", priority = 10000, lazy = false, config = true, cond = true, version = "*" },
+}

lua/lazyvim/plugins/editor.lua

@@ -1,138 +1,255 @@
+local Util = require("lazyvim.util")
+
 return {
 
-  -- search/replace in multiple files
+  -- file explorer
   {
-    "MagicDuck/grug-far.nvim",
-    opts = { headerMaxWidth = 80 },
-    cmd = { "GrugFar", "GrugFarWithin" },
+    "nvim-neo-tree/neo-tree.nvim",
+    cmd = "Neotree",
     keys = {
       {
-        "<leader>sr",
+        "<leader>fe",
         function()
-          local grug = require("grug-far")
-          local ext = vim.bo.buftype == "" and vim.fn.expand("%:e")
-          grug.open({
-            transient = true,
-            prefills = {
-              filesFilter = ext and ext ~= "" and "*." .. ext or nil,
-            },
-          })
+          require("neo-tree.command").execute({ toggle = true, dir = require("lazyvim.util").get_root() })
         end,
-        mode = { "n", "x" },
-        desc = "Search and Replace",
+        desc = "Explorer NeoTree (root dir)",
       },
-    },
-  },
-
-  -- Flash enhances the built-in search functionality by showing labels
-  -- at the end of each match, letting you quickly jump to a specific
-  -- location.
-  {
-    "folke/flash.nvim",
-    event = "VeryLazy",
-    vscode = true,
-    ---@type Flash.Config
-    opts = {},
-    -- stylua: ignore
-    keys = {
-      { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
-      { "S", mode = { "n", "o", "x" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
-      { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
-      { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
-      { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
-      -- Simulate nvim-treesitter incremental selection
-      { "<c-space>", mode = { "n", "o", "x" },
+      {
+        "<leader>fE",
         function()
-          require("flash").treesitter({
-            actions = {
-              ["<c-space>"] = "next",
-              ["<BS>"] = "prev"
-            }
-          }) 
-        end, desc = "Treesitter Incremental Selection" },
+          require("neo-tree.command").execute({ toggle = true, dir = vim.loop.cwd() })
+        end,
+        desc = "Explorer NeoTree (cwd)",
+      },
+      { "<leader>e", "<leader>fe", desc = "Explorer NeoTree (root dir)", remap = true },
+      { "<leader>E", "<leader>fE", desc = "Explorer NeoTree (cwd)", remap = true },
     },
-  },
-
-  -- which-key helps you remember key bindings by showing a popup
-  -- with the active keybindings of the command you started typing.
-  {
-    "folke/which-key.nvim",
-    event = "VeryLazy",
-    opts_extend = { "spec" },
+    deactivate = function()
+      vim.cmd([[Neotree close]])
+    end,
+    init = function()
+      vim.g.neo_tree_remove_legacy_commands = 1
+      if vim.fn.argc() == 1 then
+        local stat = vim.loop.fs_stat(vim.fn.argv(0))
+        if stat and stat.type == "directory" then
+          require("neo-tree")
+        end
+      end
+    end,
     opts = {
-      preset = "helix",
-      defaults = {},
-      spec = {
-        {
-          mode = { "n", "x" },
-          { "<leader><tab>", group = "tabs" },
-          { "<leader>c", group = "code" },
-          { "<leader>d", group = "debug" },
-          { "<leader>dp", group = "profiler" },
-          { "<leader>f", group = "file/find" },
-          { "<leader>g", group = "git" },
-          { "<leader>gh", group = "hunks" },
-          { "<leader>q", group = "quit/session" },
-          { "<leader>s", group = "search" },
-          { "<leader>u", group = "ui" },
-          { "<leader>x", group = "diagnostics/quickfix" },
-          { "[", group = "prev" },
-          { "]", group = "next" },
-          { "g", group = "goto" },
-          { "gs", group = "surround" },
-          { "z", group = "fold" },
-          {
-            "<leader>b",
-            group = "buffer",
-            expand = function()
-              return require("which-key.extras").expand.buf()
-            end,
-          },
-          {
-            "<leader>w",
-            group = "windows",
-            proxy = "<c-w>",
-            expand = function()
-              return require("which-key.extras").expand.win()
-            end,
-          },
-          -- better descriptions
-          { "gx", desc = "Open with system app" },
+      filesystem = {
+        bind_to_cwd = false,
+        follow_current_file = true,
+      },
+      window = {
+        mappings = {
+          ["<space>"] = "none",
+        },
+      },
+      default_component_configs = {
+        indent = {
+          with_expanders = true, -- if nil and file nesting is enabled, will enable expanders
+          expander_collapsed = "",
+          expander_expanded = "",
+          expander_highlight = "NeoTreeExpander",
         },
       },
     },
+  },
+
+  -- search/replace in multiple files
+  {
+    "windwp/nvim-spectre",
+    -- stylua: ignore
     keys = {
+      { "<leader>sr", function() require("spectre").open() end, desc = "Replace in files (Spectre)" },
+    },
+  },
+
+  -- fuzzy finder
+  {
+    "nvim-telescope/telescope.nvim",
+    cmd = "Telescope",
+    version = false, -- telescope did only one release, so use HEAD for now
+    keys = {
+      { "<leader>,", "<cmd>Telescope buffers show_all_buffers=true<cr>", desc = "Switch Buffer" },
+      { "<leader>/", Util.telescope("live_grep"), desc = "Find in Files (Grep)" },
+      { "<leader>:", "<cmd>Telescope command_history<cr>", desc = "Command History" },
+      { "<leader><space>", Util.telescope("files"), desc = "Find Files (root dir)" },
+      -- find
+      { "<leader>fb", "<cmd>Telescope buffers<cr>", desc = "Buffers" },
+      { "<leader>ff", Util.telescope("files"), desc = "Find Files (root dir)" },
+      { "<leader>fF", Util.telescope("files", { cwd = false }), desc = "Find Files (cwd)" },
+      { "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Recent" },
+      -- git
+      { "<leader>gc", "<cmd>Telescope git_commits<CR>", desc = "commits" },
+      { "<leader>gs", "<cmd>Telescope git_status<CR>", desc = "status" },
+      -- search
+      { "<leader>sa", "<cmd>Telescope autocommands<cr>", desc = "Auto Commands" },
+      { "<leader>sb", "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Buffer" },
+      { "<leader>sc", "<cmd>Telescope command_history<cr>", desc = "Command History" },
+      { "<leader>sC", "<cmd>Telescope commands<cr>", desc = "Commands" },
+      { "<leader>sd", "<cmd>Telescope diagnostics<cr>", desc = "Diagnostics" },
+      { "<leader>sg", Util.telescope("live_grep"), desc = "Grep (root dir)" },
+      { "<leader>sG", Util.telescope("live_grep", { cwd = false }), desc = "Grep (cwd)" },
+      { "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help Pages" },
+      { "<leader>sH", "<cmd>Telescope highlights<cr>", desc = "Search Highlight Groups" },
+      { "<leader>sk", "<cmd>Telescope keymaps<cr>", desc = "Key Maps" },
+      { "<leader>sM", "<cmd>Telescope man_pages<cr>", desc = "Man Pages" },
+      { "<leader>sm", "<cmd>Telescope marks<cr>", desc = "Jump to Mark" },
+      { "<leader>so", "<cmd>Telescope vim_options<cr>", desc = "Options" },
+      { "<leader>sR", "<cmd>Telescope resume<cr>", desc = "Resume" },
+      { "<leader>sw", Util.telescope("grep_string"), desc = "Word (root dir)" },
+      { "<leader>sW", Util.telescope("grep_string", { cwd = false }), desc = "Word (cwd)" },
+      { "<leader>uC", Util.telescope("colorscheme", { enable_preview = true }), desc = "Colorscheme with preview" },
       {
-        "<leader>?",
-        function()
-          require("which-key").show({ global = false })
-        end,
-        desc = "Buffer Keymaps (which-key)",
+        "<leader>ss",
+        Util.telescope("lsp_document_symbols", {
+          symbols = {
+            "Class",
+            "Function",
+            "Method",
+            "Constructor",
+            "Interface",
+            "Module",
+            "Struct",
+            "Trait",
+            "Field",
+            "Property",
+          },
+        }),
+        desc = "Goto Symbol",
       },
       {
-        "<c-w><space>",
-        function()
-          require("which-key").show({ keys = "<c-w>", loop = true })
-        end,
-        desc = "Window Hydra Mode (which-key)",
+        "<leader>sS",
+        Util.telescope("lsp_workspace_symbols", {
+          symbols = {
+            "Class",
+            "Function",
+            "Method",
+            "Constructor",
+            "Interface",
+            "Module",
+            "Struct",
+            "Trait",
+            "Field",
+            "Property",
+          },
+        }),
+        desc = "Goto Symbol (Workspace)",
       },
     },
+    opts = {
+      defaults = {
+        prompt_prefix = " ",
+        selection_caret = " ",
+        mappings = {
+          i = {
+            ["<c-t>"] = function(...)
+              return require("trouble.providers.telescope").open_with_trouble(...)
+            end,
+            ["<a-t>"] = function(...)
+              return require("trouble.providers.telescope").open_selected_with_trouble(...)
+            end,
+            ["<a-i>"] = function()
+              Util.telescope("find_files", { no_ignore = true })()
+            end,
+            ["<a-h>"] = function()
+              Util.telescope("find_files", { hidden = true })()
+            end,
+            ["<C-Down>"] = function(...)
+              return require("telescope.actions").cycle_history_next(...)
+            end,
+            ["<C-Up>"] = function(...)
+              return require("telescope.actions").cycle_history_prev(...)
+            end,
+            ["<C-f>"] = function(...)
+              return require("telescope.actions").preview_scrolling_down(...)
+            end,
+            ["<C-b>"] = function(...)
+              return require("telescope.actions").preview_scrolling_up(...)
+            end,
+          },
+          n = {
+            ["q"] = function(...)
+              return require("telescope.actions").close(...)
+            end,
+          },
+        },
+      },
+    },
+  },
+
+  -- easily jump to any location and enhanced f/t motions for Leap
+  {
+    "ggandor/flit.nvim",
+    keys = function()
+      ---@type LazyKeys[]
+      local ret = {}
+      for _, key in ipairs({ "f", "F", "t", "T" }) do
+        ret[#ret + 1] = { key, mode = { "n", "x", "o" }, desc = key }
+      end
+      return ret
+    end,
+    opts = { labeled_modes = "nx" },
+  },
+  {
+    "ggandor/leap.nvim",
+    keys = {
+      { "s", mode = { "n", "x", "o" }, desc = "Leap forward to" },
+      { "S", mode = { "n", "x", "o" }, desc = "Leap backward to" },
+      { "gs", mode = { "n", "x", "o" }, desc = "Leap from windows" },
+    },
+    config = function(_, opts)
+      local leap = require("leap")
+      for k, v in pairs(opts) do
+        leap.opts[k] = v
+      end
+      leap.add_default_mappings(true)
+      vim.keymap.del({ "x", "o" }, "x")
+      vim.keymap.del({ "x", "o" }, "X")
+    end,
+  },
+
+  -- which-key
+  {
+    "folke/which-key.nvim",
+    event = "VeryLazy",
+    opts = {
+      plugins = { spelling = true },
+    },
     config = function(_, opts)
       local wk = require("which-key")
       wk.setup(opts)
-      if not vim.tbl_isempty(opts.defaults) then
-        LazyVim.warn("which-key: opts.defaults is deprecated. Please use opts.spec instead.")
-        wk.register(opts.defaults)
+      local keymaps = {
+        mode = { "n", "v" },
+        ["g"] = { name = "+goto" },
+        ["gz"] = { name = "+surround" },
+        ["]"] = { name = "+next" },
+        ["["] = { name = "+prev" },
+        ["<leader><tab>"] = { name = "+tabs" },
+        ["<leader>b"] = { name = "+buffer" },
+        ["<leader>c"] = { name = "+code" },
+        ["<leader>f"] = { name = "+file/find" },
+        ["<leader>g"] = { name = "+git" },
+        ["<leader>gh"] = { name = "+hunks" },
+        ["<leader>q"] = { name = "+quit/session" },
+        ["<leader>s"] = { name = "+search" },
+        ["<leader>u"] = { name = "+ui" },
+        ["<leader>w"] = { name = "+windows" },
+        ["<leader>x"] = { name = "+diagnostics/quickfix" },
+      }
+      if Util.has("noice.nvim") then
+        keymaps["<leader>sn"] = { name = "+noice" }
       end
+      wk.register(keymaps)
     end,
   },
 
-  -- git signs highlights text that has changed since the list
-  -- git commit, and also lets you interactively stage & unstage
-  -- hunks in a commit.
+  -- git signs
   {
     "lewis6991/gitsigns.nvim",
-    event = "LazyFile",
+    event = { "BufReadPre", "BufNewFile" },
     opts = {
       signs = {
         add = { text = "▎" },
@@ -142,97 +259,92 @@ return {
         changedelete = { text = "▎" },
         untracked = { text = "▎" },
       },
-      signs_staged = {
-        add = { text = "▎" },
-        change = { text = "▎" },
-        delete = { text = "" },
-        topdelete = { text = "" },
-        changedelete = { text = "▎" },
-      },
       on_attach = function(buffer)
         local gs = package.loaded.gitsigns
 
         local function map(mode, l, r, desc)
-          vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc, silent = true })
+          vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc })
         end
 
         -- stylua: ignore start
-        map("n", "]h", function()
-          if vim.wo.diff then
-            vim.cmd.normal({ "]c", bang = true })
-          else
-            gs.nav_hunk("next")
-          end
-        end, "Next Hunk")
-        map("n", "[h", function()
-          if vim.wo.diff then
-            vim.cmd.normal({ "[c", bang = true })
-          else
-            gs.nav_hunk("prev")
-          end
-        end, "Prev Hunk")
-        map("n", "]H", function() gs.nav_hunk("last") end, "Last Hunk")
-        map("n", "[H", function() gs.nav_hunk("first") end, "First Hunk")
-        map({ "n", "x" }, "<leader>ghs", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
-        map({ "n", "x" }, "<leader>ghr", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
+        map("n", "]h", gs.next_hunk, "Next Hunk")
+        map("n", "[h", gs.prev_hunk, "Prev Hunk")
+        map({ "n", "v" }, "<leader>ghs", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
+        map({ "n", "v" }, "<leader>ghr", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
         map("n", "<leader>ghS", gs.stage_buffer, "Stage Buffer")
         map("n", "<leader>ghu", gs.undo_stage_hunk, "Undo Stage Hunk")
         map("n", "<leader>ghR", gs.reset_buffer, "Reset Buffer")
-        map("n", "<leader>ghp", gs.preview_hunk_inline, "Preview Hunk Inline")
+        map("n", "<leader>ghp", gs.preview_hunk, "Preview Hunk")
         map("n", "<leader>ghb", function() gs.blame_line({ full = true }) end, "Blame Line")
-        map("n", "<leader>ghB", function() gs.blame() end, "Blame Buffer")
         map("n", "<leader>ghd", gs.diffthis, "Diff This")
         map("n", "<leader>ghD", function() gs.diffthis("~") end, "Diff This ~")
         map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>", "GitSigns Select Hunk")
       end,
     },
   },
+
+  -- references
   {
-    "gitsigns.nvim",
-    opts = function()
-      Snacks.toggle({
-        name = "Git Signs",
-        get = function()
-          return require("gitsigns.config").config.signcolumn
+    "RRethy/vim-illuminate",
+    event = { "BufReadPost", "BufNewFile" },
+    opts = { delay = 200 },
+    config = function(_, opts)
+      require("illuminate").configure(opts)
+
+      local function map(key, dir, buffer)
+        vim.keymap.set("n", key, function()
+          require("illuminate")["goto_" .. dir .. "_reference"](false)
+        end, { desc = dir:sub(1, 1):upper() .. dir:sub(2) .. " Reference", buffer = buffer })
+      end
+
+      map("]]", "next")
+      map("[[", "prev")
+
+      -- also set it after loading ftplugins, since a lot overwrite [[ and ]]
+      vim.api.nvim_create_autocmd("FileType", {
+        callback = function()
+          local buffer = vim.api.nvim_get_current_buf()
+          map("]]", "next", buffer)
+          map("[[", "prev", buffer)
         end,
-        set = function(state)
-          require("gitsigns").toggle_signs(state)
-        end,
-      }):map("<leader>uG")
+      })
     end,
+    keys = {
+      { "]]", desc = "Next Reference" },
+      { "[[", desc = "Prev Reference" },
+    },
+  },
+
+  -- buffer remove
+  {
+    "echasnovski/mini.bufremove",
+    -- stylua: ignore
+    keys = {
+      { "<leader>bd", function() require("mini.bufremove").delete(0, false) end, desc = "Delete Buffer" },
+      { "<leader>bD", function() require("mini.bufremove").delete(0, true) end, desc = "Delete Buffer (Force)" },
+    },
   },
 
   -- better diagnostics list and others
   {
     "folke/trouble.nvim",
-    cmd = { "Trouble" },
-    opts = {
-      modes = {
-        lsp = {
-          win = { position = "right" },
-        },
-      },
-    },
+    cmd = { "TroubleToggle", "Trouble" },
+    opts = { use_diagnostic_signs = true },
     keys = {
-      { "<leader>xx", "<cmd>Trouble diagnostics toggle<cr>", desc = "Diagnostics (Trouble)" },
-      { "<leader>xX", "<cmd>Trouble diagnostics toggle filter.buf=0<cr>", desc = "Buffer Diagnostics (Trouble)" },
-      { "<leader>cs", "<cmd>Trouble symbols toggle<cr>", desc = "Symbols (Trouble)" },
-      { "<leader>cS", "<cmd>Trouble lsp toggle<cr>", desc = "LSP references/definitions/... (Trouble)" },
-      { "<leader>xL", "<cmd>Trouble loclist toggle<cr>", desc = "Location List (Trouble)" },
-      { "<leader>xQ", "<cmd>Trouble qflist toggle<cr>", desc = "Quickfix List (Trouble)" },
+      { "<leader>xx", "<cmd>TroubleToggle document_diagnostics<cr>", desc = "Document Diagnostics (Trouble)" },
+      { "<leader>xX", "<cmd>TroubleToggle workspace_diagnostics<cr>", desc = "Workspace Diagnostics (Trouble)" },
+      { "<leader>xL", "<cmd>TroubleToggle loclist<cr>", desc = "Location List (Trouble)" },
+      { "<leader>xQ", "<cmd>TroubleToggle quickfix<cr>", desc = "Quickfix List (Trouble)" },
       {
         "[q",
         function()
           if require("trouble").is_open() then
-            require("trouble").prev({ skip_groups = true, jump = true })
+            require("trouble").previous({ skip_groups = true, jump = true })
           else
-            local ok, err = pcall(vim.cmd.cprev)
-            if not ok then
-              vim.notify(err, vim.log.levels.ERROR)
-            end
+            vim.cmd.cprev()
           end
         end,
-        desc = "Previous Trouble/Quickfix Item",
+        desc = "Previous trouble/quickfix item",
       },
       {
         "]q",
@@ -240,32 +352,27 @@ return {
           if require("trouble").is_open() then
             require("trouble").next({ skip_groups = true, jump = true })
           else
-            local ok, err = pcall(vim.cmd.cnext)
-            if not ok then
-              vim.notify(err, vim.log.levels.ERROR)
-            end
+            vim.cmd.cnext()
           end
         end,
-        desc = "Next Trouble/Quickfix Item",
+        desc = "Next trouble/quickfix item",
       },
     },
   },
 
-  -- Finds and lists all of the TODO, HACK, BUG, etc comment
-  -- in your project and loads them into a browsable list.
+  -- todo comments
   {
     "folke/todo-comments.nvim",
     cmd = { "TodoTrouble", "TodoTelescope" },
-    event = "LazyFile",
-    opts = {},
+    event = { "BufReadPost", "BufNewFile" },
+    config = true,
     -- stylua: ignore
     keys = {
-      { "]t", function() require("todo-comments").jump_next() end, desc = "Next Todo Comment" },
-      { "[t", function() require("todo-comments").jump_prev() end, desc = "Previous Todo Comment" },
-      { "<leader>xt", "<cmd>Trouble todo toggle<cr>", desc = "Todo (Trouble)" },
-      { "<leader>xT", "<cmd>Trouble todo toggle filter = {tag = {TODO,FIX,FIXME}}<cr>", desc = "Todo/Fix/Fixme (Trouble)" },
+      { "]t", function() require("todo-comments").jump_next() end, desc = "Next todo comment" },
+      { "[t", function() require("todo-comments").jump_prev() end, desc = "Previous todo comment" },
+      { "<leader>xt", "<cmd>TodoTrouble<cr>", desc = "Todo (Trouble)" },
+      { "<leader>xT", "<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>", desc = "Todo/Fix/Fixme (Trouble)" },
       { "<leader>st", "<cmd>TodoTelescope<cr>", desc = "Todo" },
-      { "<leader>sT", "<cmd>TodoTelescope keywords=TODO,FIX,FIXME<cr>", desc = "Todo/Fix/Fixme" },
     },
   },
 }

lua/lazyvim/plugins/extras/ai/avante.lua

@@ -1,89 +0,0 @@
-return {
-  { "MunifTanjim/nui.nvim", lazy = true },
-
-  {
-    "yetone/avante.nvim",
-    build = vim.fn.has("win32") ~= 0 and "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false"
-      or "make",
-    event = "VeryLazy",
-    opts = {
-      provider = "copilot",
-      selection = {
-        hint_display = "none",
-      },
-      behaviour = {
-        auto_set_keymaps = false,
-      },
-    },
-    cmd = {
-      "AvanteAsk",
-      "AvanteBuild",
-      "AvanteChat",
-      "AvanteClear",
-      "AvanteEdit",
-      "AvanteFocus",
-      "AvanteHistory",
-      "AvanteModels",
-      "AvanteRefresh",
-      "AvanteShowRepoMap",
-      "AvanteStop",
-      "AvanteSwitchProvider",
-      "AvanteToggle",
-    },
-    keys = {
-      { "<leader>aa", "<cmd>AvanteAsk<CR>", desc = "Ask Avante" },
-      { "<leader>ac", "<cmd>AvanteChat<CR>", desc = "Chat with Avante" },
-      { "<leader>ae", "<cmd>AvanteEdit<CR>", desc = "Edit Avante" },
-      { "<leader>af", "<cmd>AvanteFocus<CR>", desc = "Focus Avante" },
-      { "<leader>ah", "<cmd>AvanteHistory<CR>", desc = "Avante History" },
-      { "<leader>am", "<cmd>AvanteModels<CR>", desc = "Select Avante Model" },
-      { "<leader>an", "<cmd>AvanteChatNew<CR>", desc = "New Avante Chat" },
-      { "<leader>ap", "<cmd>AvanteSwitchProvider<CR>", desc = "Switch Avante Provider" },
-      { "<leader>ar", "<cmd>AvanteRefresh<CR>", desc = "Refresh Avante" },
-      { "<leader>as", "<cmd>AvanteStop<CR>", desc = "Stop Avante" },
-      { "<leader>at", "<cmd>AvanteToggle<CR>", desc = "Toggle Avante" },
-    },
-  },
-
-  -- support for image pasting
-  {
-    "HakonHarnes/img-clip.nvim",
-    event = "VeryLazy",
-    optional = true,
-    opts = {
-      -- recommended settings
-      default = {
-        embed_image_as_base64 = false,
-        prompt_for_file_name = false,
-        drag_and_drop = {
-          insert_mode = true,
-        },
-        -- required for Windows users
-        use_absolute_path = true,
-      },
-    },
-  },
-
-  -- Make sure to set this up properly if you have lazy=true
-  {
-    "MeanderingProgrammer/render-markdown.nvim",
-    optional = true,
-    opts = {
-      file_types = { "markdown", "Avante" },
-    },
-    ft = { "markdown", "Avante" },
-  },
-
-  -- blink.cmp source for avante.nvim
-  {
-    "saghen/blink.cmp",
-    optional = true,
-    specs = { "Kaiser-Yang/blink-cmp-avante" },
-    opts = {
-      sources = {
-        default = { "avante" },
-        providers = { avante = { module = "blink-cmp-avante", name = "Avante" } },
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/ai/claudecode.lua

@@ -1,22 +0,0 @@
-return {
-  "coder/claudecode.nvim",
-  opts = {},
-  keys = {
-    { "<leader>a", "", desc = "+ai", mode = { "n", "v" } },
-    { "<leader>ac", "<cmd>ClaudeCode<cr>", desc = "Toggle Claude" },
-    { "<leader>af", "<cmd>ClaudeCodeFocus<cr>", desc = "Focus Claude" },
-    { "<leader>ar", "<cmd>ClaudeCode --resume<cr>", desc = "Resume Claude" },
-    { "<leader>aC", "<cmd>ClaudeCode --continue<cr>", desc = "Continue Claude" },
-    { "<leader>ab", "<cmd>ClaudeCodeAdd %<cr>", desc = "Add current buffer" },
-    { "<leader>as", "<cmd>ClaudeCodeSend<cr>", mode = "v", desc = "Send to Claude" },
-    {
-      "<leader>as",
-      "<cmd>ClaudeCodeTreeAdd<cr>",
-      desc = "Add file",
-      ft = { "NvimTree", "neo-tree", "oil" },
-    },
-    -- Diff management
-    { "<leader>aa", "<cmd>ClaudeCodeDiffAccept<cr>", desc = "Accept diff" },
-    { "<leader>ad", "<cmd>ClaudeCodeDiffDeny<cr>", desc = "Deny diff" },
-  },
-}

lua/lazyvim/plugins/extras/ai/codeium.lua

@@ -1,76 +0,0 @@
-return {
-
-  -- codeium
-  {
-    "Exafunction/codeium.nvim",
-    cmd = "Codeium",
-    event = "InsertEnter",
-    build = ":Codeium Auth",
-    opts = {
-      enable_cmp_source = vim.g.ai_cmp,
-      virtual_text = {
-        enabled = not vim.g.ai_cmp,
-        key_bindings = {
-          accept = false, -- handled by nvim-cmp / blink.cmp
-          next = "<M-]>",
-          prev = "<M-[>",
-        },
-      },
-    },
-  },
-
-  -- add ai_accept action
-  {
-    "Exafunction/codeium.nvim",
-    opts = function()
-      LazyVim.cmp.actions.ai_accept = function()
-        if require("codeium.virtual_text").get_current_completion_item() then
-          LazyVim.create_undo()
-          vim.api.nvim_input(require("codeium.virtual_text").accept())
-          return true
-        end
-      end
-    end,
-  },
-
-  -- codeium cmp source
-  {
-    "hrsh7th/nvim-cmp",
-    optional = true,
-    dependencies = { "codeium.nvim" },
-    opts = function(_, opts)
-      table.insert(opts.sources, 1, {
-        name = "codeium",
-        group_index = 1,
-        priority = 100,
-      })
-    end,
-  },
-
-  {
-    "nvim-lualine/lualine.nvim",
-    optional = true,
-    event = "VeryLazy",
-    opts = function(_, opts)
-      table.insert(opts.sections.lualine_x, 2, LazyVim.lualine.cmp_source("codeium"))
-    end,
-  },
-
-  vim.g.ai_cmp and {
-    "saghen/blink.cmp",
-    optional = true,
-    dependencies = { "codeium.nvim", "saghen/blink.compat" },
-    opts = {
-      sources = {
-        compat = { "codeium" },
-        providers = {
-          codeium = {
-            kind = "Codeium",
-            score_offset = 100,
-            async = true,
-          },
-        },
-      },
-    },
-  } or nil,
-}

lua/lazyvim/plugins/extras/ai/copilot-chat.lua

@@ -1,111 +0,0 @@
-return {
-  {
-    "CopilotC-Nvim/CopilotChat.nvim",
-    branch = "main",
-    cmd = "CopilotChat",
-    opts = function()
-      local user = vim.env.USER or "User"
-      user = user:sub(1, 1):upper() .. user:sub(2)
-      return {
-        auto_insert_mode = true,
-        headers = {
-          user = "  " .. user .. " ",
-          assistant = "  Copilot ",
-          tool = "󰊳  Tool ",
-        },
-        window = {
-          width = 0.4,
-        },
-      }
-    end,
-    keys = {
-      { "<c-s>", "<CR>", ft = "copilot-chat", desc = "Submit Prompt", remap = true },
-      { "<leader>a", "", desc = "+ai", mode = { "n", "x" } },
-      {
-        "<leader>aa",
-        function()
-          return require("CopilotChat").toggle()
-        end,
-        desc = "Toggle (CopilotChat)",
-        mode = { "n", "x" },
-      },
-      {
-        "<leader>ax",
-        function()
-          return require("CopilotChat").reset()
-        end,
-        desc = "Clear (CopilotChat)",
-        mode = { "n", "x" },
-      },
-      {
-        "<leader>aq",
-        function()
-          vim.ui.input({
-            prompt = "Quick Chat: ",
-          }, function(input)
-            if input ~= "" then
-              require("CopilotChat").ask(input)
-            end
-          end)
-        end,
-        desc = "Quick Chat (CopilotChat)",
-        mode = { "n", "x" },
-      },
-      {
-        "<leader>ap",
-        function()
-          require("CopilotChat").select_prompt()
-        end,
-        desc = "Prompt Actions (CopilotChat)",
-        mode = { "n", "x" },
-      },
-    },
-    config = function(_, opts)
-      local chat = require("CopilotChat")
-
-      vim.api.nvim_create_autocmd("BufEnter", {
-        pattern = "copilot-chat",
-        callback = function()
-          vim.opt_local.relativenumber = false
-          vim.opt_local.number = false
-        end,
-      })
-
-      chat.setup(opts)
-    end,
-  },
-
-  -- Edgy integration
-  {
-    "folke/edgy.nvim",
-    optional = true,
-    opts = function(_, opts)
-      opts.right = opts.right or {}
-      table.insert(opts.right, {
-        ft = "copilot-chat",
-        title = "Copilot Chat",
-        size = { width = 50 },
-      })
-    end,
-  },
-
-  -- Blink integration
-  {
-    "saghen/blink.cmp",
-    optional = true,
-    ---@module 'blink.cmp'
-    ---@type blink.cmp.Config
-    opts = {
-      sources = {
-        providers = {
-          path = {
-            -- Path sources triggered by "/" interfere with CopilotChat commands
-            enabled = function()
-              return vim.bo.filetype ~= "copilot-chat"
-            end,
-          },
-        },
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/ai/copilot-native.lua

@@ -1,95 +0,0 @@
----@diagnostic disable: missing-fields
-if lazyvim_docs then
-  -- Native inline completions don't support being shown as regular completions
-  vim.g.ai_cmp = false
-end
-
-if LazyVim.has_extra("ai.copilot-native") then
-  if vim.fn.has("nvim-0.12") == 0 then
-    LazyVim.error("You need Neovim >= 0.12 to use the `ai.copilot-native` extra.")
-    return {}
-  end
-  if LazyVim.has_extra("ai.copilot") then
-    LazyVim.error("Please disable the `ai.copilot` extra if you want to use `ai.copilot-native`")
-    return {}
-  end
-end
-
-vim.g.ai_cmp = false
-local status = {} ---@type table<number, "ok" | "error" | "pending">
-
-return {
-  desc = "Native Copilot LSP integration. Requires Neovim >= 0.12",
-  -- copilot-language-server
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        copilot = {
-          -- stylua: ignore
-          keys = {
-            {
-              "<M-]>",
-              function() vim.lsp.inline_completion.select({ count = 1 }) end,
-              desc = "Next Copilot Suggestion",
-              mode = { "i", "n" },
-            },
-            {
-              "<M-[>",
-              function() vim.lsp.inline_completion.select({ count = -1 }) end,
-              desc = "Prev Copilot Suggestion",
-              mode = { "i", "n" },
-            },
-          },
-        },
-      },
-      setup = {
-        copilot = function()
-          vim.schedule(function()
-            vim.lsp.inline_completion.enable()
-          end)
-          -- Accept inline suggestions or next edits
-          LazyVim.cmp.actions.ai_accept = function()
-            return vim.lsp.inline_completion.get()
-          end
-
-          if not LazyVim.has_extra("ai.sidekick") then
-            vim.lsp.config("copilot", {
-              handlers = {
-                didChangeStatus = function(err, res, ctx)
-                  if err then
-                    return
-                  end
-                  status[ctx.client_id] = res.kind ~= "Normal" and "error" or res.busy and "pending" or "ok"
-                  if res.status == "Error" then
-                    LazyVim.error("Please use `:LspCopilotSignIn` to sign in to Copilot")
-                  end
-                end,
-              },
-            })
-          end
-        end,
-      },
-    },
-  },
-
-  -- lualine
-  {
-    "nvim-lualine/lualine.nvim",
-    optional = true,
-    event = "VeryLazy",
-    opts = function(_, opts)
-      if LazyVim.has_extra("ai.sidekick") then
-        return
-      end
-      table.insert(
-        opts.sections.lualine_x,
-        2,
-        LazyVim.lualine.status(LazyVim.config.icons.kinds.Copilot, function()
-          local clients = vim.lsp.get_clients({ name = "copilot", bufnr = 0 })
-          return #clients > 0 and status[clients[1].id] or nil
-        end)
-      )
-    end,
-  },
-}

lua/lazyvim/plugins/extras/ai/copilot.lua

@@ -1,127 +0,0 @@
-return {
-  recommended = true,
-  -- copilot
-  {
-    "zbirenbaum/copilot.lua",
-    cmd = "Copilot",
-    build = ":Copilot auth",
-    event = "BufReadPost",
-    opts = {
-      suggestion = {
-        enabled = not vim.g.ai_cmp,
-        auto_trigger = true,
-        hide_during_completion = vim.g.ai_cmp,
-        keymap = {
-          accept = false, -- handled by nvim-cmp / blink.cmp
-          next = "<M-]>",
-          prev = "<M-[>",
-        },
-      },
-      panel = { enabled = false },
-      filetypes = {
-        markdown = true,
-        help = true,
-      },
-    },
-  },
-
-  -- copilot-language-server
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        -- copilot.lua only works with its own copilot lsp server
-        copilot = { enabled = false },
-      },
-    },
-  },
-
-  -- add ai_accept action
-  {
-    "zbirenbaum/copilot.lua",
-    opts = function()
-      LazyVim.cmp.actions.ai_accept = function()
-        if require("copilot.suggestion").is_visible() then
-          LazyVim.create_undo()
-          require("copilot.suggestion").accept()
-          return true
-        end
-      end
-    end,
-  },
-
-  -- lualine
-  {
-    "nvim-lualine/lualine.nvim",
-    optional = true,
-    event = "VeryLazy",
-    opts = function(_, opts)
-      table.insert(
-        opts.sections.lualine_x,
-        2,
-        LazyVim.lualine.status(LazyVim.config.icons.kinds.Copilot, function()
-          local clients = package.loaded["copilot"] and vim.lsp.get_clients({ name = "copilot", bufnr = 0 }) or {}
-          if #clients > 0 then
-            local status = require("copilot.status").data.status
-            return (status == "InProgress" and "pending") or (status == "Warning" and "error") or "ok"
-          end
-        end)
-      )
-    end,
-  },
-
-  vim.g.ai_cmp and {
-    -- copilot cmp source
-    {
-      "hrsh7th/nvim-cmp",
-      optional = true,
-      dependencies = { -- this will only be evaluated if nvim-cmp is enabled
-        {
-          "zbirenbaum/copilot-cmp",
-          opts = {},
-          config = function(_, opts)
-            local copilot_cmp = require("copilot_cmp")
-            copilot_cmp.setup(opts)
-            -- attach cmp source whenever copilot attaches
-            -- fixes lazy-loading issues with the copilot cmp source
-            Snacks.util.lsp.on({ name = "copilot" }, function()
-              copilot_cmp._on_insert_enter({})
-            end)
-          end,
-          specs = {
-            {
-              "hrsh7th/nvim-cmp",
-              optional = true,
-              ---@param opts cmp.ConfigSchema
-              opts = function(_, opts)
-                table.insert(opts.sources, 1, {
-                  name = "copilot",
-                  group_index = 1,
-                  priority = 100,
-                })
-              end,
-            },
-          },
-        },
-      },
-    },
-    {
-      "saghen/blink.cmp",
-      optional = true,
-      dependencies = { "fang2hou/blink-copilot" },
-      opts = {
-        sources = {
-          default = { "copilot" },
-          providers = {
-            copilot = {
-              name = "copilot",
-              module = "blink-copilot",
-              score_offset = 100,
-              async = true,
-            },
-          },
-        },
-      },
-    },
-  } or nil,
-}

lua/lazyvim/plugins/extras/ai/sidekick.lua

@@ -1,155 +0,0 @@
-return {
-  desc = "Next edit suggestions with the Copilot LSP server",
-
-  -- copilot-language-server
-  {
-    "neovim/nvim-lspconfig",
-    opts = function(_, opts)
-      local sk = LazyVim.opts("sidekick.nvim") ---@type sidekick.Config|{}
-      if vim.tbl_get(sk, "nes", "enabled") ~= false then
-        opts.servers = opts.servers or {}
-        opts.servers.copilot = opts.servers.copilot or {}
-      end
-    end,
-  },
-
-  -- lualine
-  {
-    "nvim-lualine/lualine.nvim",
-    optional = true,
-    event = "VeryLazy",
-    opts = function(_, opts)
-      local icons = {
-        Error = { " ", "DiagnosticError" },
-        Inactive = { " ", "MsgArea" },
-        Warning = { " ", "DiagnosticWarn" },
-        Normal = { LazyVim.config.icons.kinds.Copilot, "Special" },
-      }
-      table.insert(opts.sections.lualine_x, 2, {
-        function()
-          local status = require("sidekick.status").get()
-          return status and vim.tbl_get(icons, status.kind, 1)
-        end,
-        cond = function()
-          return require("sidekick.status").get() ~= nil
-        end,
-        color = function()
-          local status = require("sidekick.status").get()
-          local hl = status and (status.busy and "DiagnosticWarn" or vim.tbl_get(icons, status.kind, 2))
-          return { fg = Snacks.util.color(hl) }
-        end,
-      })
-
-      table.insert(opts.sections.lualine_x, 2, {
-        function()
-          local status = require("sidekick.status").cli()
-          return " " .. (#status > 1 and #status or "")
-        end,
-        cond = function()
-          return #require("sidekick.status").cli() > 0
-        end,
-        color = function()
-          return { fg = Snacks.util.color("Special") }
-        end,
-      })
-    end,
-  },
-
-  {
-    "folke/sidekick.nvim",
-    opts = function()
-      -- Accept inline suggestions or next edits
-      LazyVim.cmp.actions.ai_nes = function()
-        local Nes = require("sidekick.nes")
-        if Nes.have() and (Nes.jump() or Nes.apply()) then
-          return true
-        end
-      end
-      Snacks.toggle({
-        name = "Sidekick NES",
-        get = function()
-          return require("sidekick.nes").enabled
-        end,
-        set = function(state)
-          require("sidekick.nes").enable(state)
-        end,
-      }):map("<leader>uN")
-    end,
-    -- stylua: ignore
-    keys = {
-      -- nes is also useful in normal mode
-      { "<tab>", LazyVim.cmp.map({ "ai_nes" }, "<tab>"), mode = { "n" }, expr = true },
-      { "<leader>a", "", desc = "+ai", mode = { "n", "v" } },
-      {
-        "<c-.>",
-        function() require("sidekick.cli").focus() end,
-        desc = "Sidekick Focus",
-        mode = { "n", "t", "i", "x" },
-      },
-      {
-        "<leader>aa",
-        function() require("sidekick.cli").toggle() end,
-        desc = "Sidekick Toggle CLI",
-      },
-      {
-        "<leader>as",
-        function() require("sidekick.cli").select() end,
-        -- Or to select only installed tools:
-        -- require("sidekick.cli").select({ filter = { installed = true } })
-        desc = "Select CLI",
-      },
-      {
-        "<leader>ad",
-        function() require("sidekick.cli").close() end,
-        desc = "Detach a CLI Session",
-      },
-      {
-        "<leader>at",
-        function() require("sidekick.cli").send({ msg = "{this}" }) end,
-        mode = { "x", "n" },
-        desc = "Send This",
-      },
-      {
-        "<leader>af",
-        function() require("sidekick.cli").send({ msg = "{file}" }) end,
-        desc = "Send File",
-      },
-      {
-        "<leader>av",
-        function() require("sidekick.cli").send({ msg = "{selection}" }) end,
-        mode = { "x" },
-        desc = "Send Visual Selection",
-      },
-      {
-        "<leader>ap",
-        function() require("sidekick.cli").prompt() end,
-        mode = { "n", "x" },
-        desc = "Sidekick Select Prompt",
-      },
-    },
-  },
-
-  {
-    "folke/snacks.nvim",
-    optional = true,
-    opts = {
-      picker = {
-        actions = {
-          sidekick_send = function(...)
-            return require("sidekick.cli.picker.snacks").send(...)
-          end,
-        },
-        win = {
-          input = {
-            keys = {
-              ["<a-a>"] = {
-                "sidekick_send",
-                mode = { "n", "i" },
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/ai/supermaven.lua

@@ -1,97 +0,0 @@
-return {
-  {
-    "supermaven-inc/supermaven-nvim",
-    event = "InsertEnter",
-    cmd = {
-      "SupermavenUseFree",
-      "SupermavenUsePro",
-    },
-    opts = {
-      keymaps = {
-        accept_suggestion = nil, -- handled by nvim-cmp / blink.cmp
-      },
-      disable_inline_completion = vim.g.ai_cmp,
-      ignore_filetypes = { "bigfile", "snacks_input", "snacks_notif" },
-    },
-  },
-
-  -- add ai_accept action
-  {
-    "supermaven-inc/supermaven-nvim",
-    opts = function()
-      require("supermaven-nvim.completion_preview").suggestion_group = "SupermavenSuggestion"
-      LazyVim.cmp.actions.ai_accept = function()
-        local suggestion = require("supermaven-nvim.completion_preview")
-        if suggestion.has_suggestion() then
-          LazyVim.create_undo()
-          vim.schedule(function()
-            suggestion.on_accept_suggestion()
-          end)
-          return true
-        end
-      end
-    end,
-  },
-
-  -- cmp integration
-  {
-    "hrsh7th/nvim-cmp",
-    optional = true,
-    dependencies = { "supermaven-nvim" },
-    opts = function(_, opts)
-      if vim.g.ai_cmp then
-        table.insert(opts.sources, 1, {
-          name = "supermaven",
-          group_index = 1,
-          priority = 100,
-        })
-      end
-    end,
-  },
-
-  vim.g.ai_cmp and {
-    "saghen/blink.cmp",
-    optional = true,
-    dependencies = { "supermaven-nvim", "saghen/blink.compat" },
-    opts = {
-      sources = {
-        compat = { "supermaven" },
-        providers = {
-          supermaven = {
-            kind = "Supermaven",
-            score_offset = 100,
-            async = true,
-          },
-        },
-      },
-    },
-  } or nil,
-
-  {
-    "nvim-lualine/lualine.nvim",
-    optional = true,
-    event = "VeryLazy",
-    opts = function(_, opts)
-      table.insert(opts.sections.lualine_x, 2, LazyVim.lualine.cmp_source("supermaven"))
-    end,
-  },
-
-  {
-    "folke/noice.nvim",
-    optional = true,
-    opts = function(_, opts)
-      vim.list_extend(opts.routes, {
-        {
-          filter = {
-            event = "msg_show",
-            any = {
-              { find = "Starting Supermaven" },
-              { find = "Supermaven Free Tier" },
-            },
-          },
-          skip = true,
-        },
-      })
-    end,
-  },
-}

lua/lazyvim/plugins/extras/ai/tabnine.lua

@@ -1,65 +0,0 @@
-return {
-  -- Tabnine cmp source
-  {
-    "tzachar/cmp-tabnine",
-    build = LazyVim.is_win() and "pwsh -noni .\\install.ps1" or "./install.sh",
-    opts = {
-      max_lines = 1000,
-      max_num_results = 3,
-      sort = true,
-    },
-    config = function(_, opts)
-      require("cmp_tabnine.config"):setup(opts)
-    end,
-  },
-
-  {
-    "hrsh7th/nvim-cmp",
-    optional = true,
-    dependencies = { "tzachar/cmp-tabnine" },
-    ---@param opts cmp.ConfigSchema
-    opts = function(_, opts)
-      table.insert(opts.sources, 1, {
-        name = "cmp_tabnine",
-        group_index = 1,
-        priority = 100,
-      })
-
-      opts.formatting.format = LazyVim.inject.args(opts.formatting.format, function(entry, item)
-        -- Hide percentage in the menu
-        if entry.source.name == "cmp_tabnine" then
-          item.menu = ""
-        end
-      end)
-    end,
-  },
-
-  {
-    "saghen/blink.cmp",
-    optional = true,
-    dependencies = { "tzachar/cmp-tabnine", "saghen/blink.compat" },
-    opts = {
-      sources = {
-        compat = { "cmp_tabnine" },
-        providers = {
-          cmp_tabnine = {
-            kind = "TabNine",
-            score_offset = 100,
-            async = true,
-          },
-        },
-      },
-    },
-  },
-
-  -- Show TabNine status in lualine
-  {
-    "nvim-lualine/lualine.nvim",
-    optional = true,
-    event = "VeryLazy",
-    opts = function(_, opts)
-      local icon = LazyVim.config.icons.kinds.TabNine
-      table.insert(opts.sections.lualine_x, 2, LazyVim.lualine.cmp_source("cmp_tabnine", icon))
-    end,
-  },
-}

lua/lazyvim/plugins/extras/coding/blink.lua

@@ -1,212 +0,0 @@
----@diagnostic disable: missing-fields
-if lazyvim_docs then
-  -- set to `true` to follow the main branch
-  -- you need to have a working rust toolchain to build the plugin
-  -- in this case.
-  vim.g.lazyvim_blink_main = false
-end
-
-return {
-  {
-    "hrsh7th/nvim-cmp",
-    optional = true,
-    enabled = false,
-  },
-  {
-    "saghen/blink.cmp",
-    version = not vim.g.lazyvim_blink_main and "*",
-    build = vim.g.lazyvim_blink_main and "cargo build --release",
-    opts_extend = {
-      "sources.completion.enabled_providers",
-      "sources.compat",
-      "sources.default",
-    },
-    dependencies = {
-      "rafamadriz/friendly-snippets",
-      -- add blink.compat to dependencies
-      {
-        "saghen/blink.compat",
-        optional = true, -- make optional so it's only enabled if any extras need it
-        opts = {},
-        version = not vim.g.lazyvim_blink_main and "*",
-      },
-    },
-    event = { "InsertEnter", "CmdlineEnter" },
-
-    ---@module 'blink.cmp'
-    ---@type blink.cmp.Config
-    opts = {
-      snippets = {
-        preset = "default",
-      },
-
-      appearance = {
-        -- sets the fallback highlight groups to nvim-cmp's highlight groups
-        -- useful for when your theme doesn't support blink.cmp
-        -- will be removed in a future release, assuming themes add support
-        use_nvim_cmp_as_default = false,
-        -- set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
-        -- adjusts spacing to ensure icons are aligned
-        nerd_font_variant = "mono",
-      },
-
-      completion = {
-        accept = {
-          -- experimental auto-brackets support
-          auto_brackets = {
-            enabled = true,
-          },
-        },
-        menu = {
-          draw = {
-            treesitter = { "lsp" },
-          },
-        },
-        documentation = {
-          auto_show = true,
-          auto_show_delay_ms = 200,
-        },
-        ghost_text = {
-          enabled = vim.g.ai_cmp,
-        },
-      },
-
-      -- experimental signature help support
-      -- signature = { enabled = true },
-
-      sources = {
-        -- adding any nvim-cmp sources here will enable them
-        -- with blink.compat
-        compat = {},
-        default = { "lsp", "path", "snippets", "buffer" },
-      },
-
-      cmdline = {
-        enabled = true,
-        keymap = {
-          preset = "cmdline",
-          ["<Right>"] = false,
-          ["<Left>"] = false,
-        },
-        completion = {
-          list = { selection = { preselect = false } },
-          menu = {
-            auto_show = function(ctx)
-              return vim.fn.getcmdtype() == ":"
-            end,
-          },
-          ghost_text = { enabled = true },
-        },
-      },
-
-      keymap = {
-        preset = "enter",
-        ["<C-y>"] = { "select_and_accept" },
-      },
-    },
-    ---@param opts blink.cmp.Config | { sources: { compat: string[] } }
-    config = function(_, opts)
-      if opts.snippets and opts.snippets.preset == "default" then
-        opts.snippets.expand = LazyVim.cmp.expand
-      end
-      -- setup compat sources
-      local enabled = opts.sources.default
-      for _, source in ipairs(opts.sources.compat or {}) do
-        opts.sources.providers[source] = vim.tbl_deep_extend(
-          "force",
-          { name = source, module = "blink.compat.source" },
-          opts.sources.providers[source] or {}
-        )
-        if type(enabled) == "table" and not vim.tbl_contains(enabled, source) then
-          table.insert(enabled, source)
-        end
-      end
-
-      -- add ai_accept to <Tab> key
-      if not opts.keymap["<Tab>"] then
-        if opts.keymap.preset == "super-tab" then -- super-tab
-          opts.keymap["<Tab>"] = {
-            require("blink.cmp.keymap.presets").get("super-tab")["<Tab>"][1],
-            LazyVim.cmp.map({ "snippet_forward", "ai_nes", "ai_accept" }),
-            "fallback",
-          }
-        else -- other presets
-          opts.keymap["<Tab>"] = {
-            LazyVim.cmp.map({ "snippet_forward", "ai_nes", "ai_accept" }),
-            "fallback",
-          }
-        end
-      end
-
-      -- Unset custom prop to pass blink.cmp validation
-      opts.sources.compat = nil
-
-      -- check if we need to override symbol kinds
-      for _, provider in pairs(opts.sources.providers or {}) do
-        ---@cast provider blink.cmp.SourceProviderConfig|{kind?:string}
-        if provider.kind then
-          local CompletionItemKind = require("blink.cmp.types").CompletionItemKind
-          local kind_idx = #CompletionItemKind + 1
-
-          CompletionItemKind[kind_idx] = provider.kind
-          ---@diagnostic disable-next-line: no-unknown
-          CompletionItemKind[provider.kind] = kind_idx
-
-          ---@type fun(ctx: blink.cmp.Context, items: blink.cmp.CompletionItem[]): blink.cmp.CompletionItem[]
-          local transform_items = provider.transform_items
-          ---@param ctx blink.cmp.Context
-          ---@param items blink.cmp.CompletionItem[]
-          provider.transform_items = function(ctx, items)
-            items = transform_items and transform_items(ctx, items) or items
-            for _, item in ipairs(items) do
-              item.kind = kind_idx or item.kind
-              item.kind_icon = LazyVim.config.icons.kinds[item.kind_name] or item.kind_icon or nil
-            end
-            return items
-          end
-
-          -- Unset custom prop to pass blink.cmp validation
-          provider.kind = nil
-        end
-      end
-
-      require("blink.cmp").setup(opts)
-    end,
-  },
-
-  -- add icons
-  {
-    "saghen/blink.cmp",
-    opts = function(_, opts)
-      opts.appearance = opts.appearance or {}
-      opts.appearance.kind_icons = vim.tbl_extend("force", opts.appearance.kind_icons or {}, LazyVim.config.icons.kinds)
-    end,
-  },
-
-  -- lazydev
-  {
-    "saghen/blink.cmp",
-    opts = {
-      sources = {
-        per_filetype = {
-          lua = { inherit_defaults = true, "lazydev" },
-        },
-        providers = {
-          lazydev = {
-            name = "LazyDev",
-            module = "lazydev.integrations.blink",
-            score_offset = 100, -- show at a higher priority than lsp
-          },
-        },
-      },
-    },
-  },
-  -- catppuccin support
-  {
-    "catppuccin",
-    optional = true,
-    opts = {
-      integrations = { blink_cmp = true },
-    },
-  },
-}

lua/lazyvim/plugins/extras/coding/copilot.lua

@@ -0,0 +1,76 @@
+return {
+
+  -- copilot
+  {
+    "zbirenbaum/copilot.lua",
+    cmd = "Copilot",
+    build = ":Copilot auth",
+    opts = {
+      suggestion = { enabled = false },
+      panel = { enabled = false },
+    },
+  },
+
+  -- copilot cmp source
+  {
+    "nvim-cmp",
+    dependencies = {
+      {
+        "zbirenbaum/copilot-cmp",
+        dependencies = "copilot.lua",
+        opts = {},
+        config = function(_, opts)
+          local copilot_cmp = require("copilot_cmp")
+          copilot_cmp.setup(opts)
+          -- attach cmp source whenever copilot attaches
+          -- fixes lazy-loading issues with the copilot cmp source
+          require("lazyvim.util").on_attach(function(client)
+            if client.name == "copilot" then
+              copilot_cmp._on_insert_enter()
+            end
+          end)
+        end,
+      },
+    },
+    ---@param opts cmp.ConfigSchema
+    opts = function(_, opts)
+      local cmp = require("cmp")
+
+      table.insert(opts.sources, 1, { name = "copilot", group_index = 2 })
+
+      local confirm = opts.mapping["<CR>"]
+      local confirm_copilot = cmp.mapping.confirm({
+        select = true,
+        behavior = cmp.ConfirmBehavior.Replace,
+      })
+
+      opts.mapping = vim.tbl_extend("force", opts.mapping, {
+        ["<CR>"] = function(...)
+          local entry = cmp.get_selected_entry()
+          if entry and entry.source.name == "copilot" then
+            return confirm_copilot(...)
+          end
+          return confirm(...)
+        end,
+      })
+      opts.sorting = {
+        priority_weight = 2,
+        comparators = {
+          require("copilot_cmp.comparators").prioritize,
+
+          -- Below is the default comparitor list and order for nvim-cmp
+          cmp.config.compare.offset,
+          -- cmp.config.compare.scopes, --this is commented in nvim-cmp too
+          cmp.config.compare.exact,
+          cmp.config.compare.score,
+          cmp.config.compare.recently_used,
+          cmp.config.compare.locality,
+          cmp.config.compare.kind,
+          cmp.config.compare.sort_text,
+          cmp.config.compare.length,
+          cmp.config.compare.order,
+        },
+      }
+    end,
+  },
+}

lua/lazyvim/plugins/extras/coding/luasnip.lua

@@ -1,78 +0,0 @@
-return {
-  -- disable builtin snippet support
-  { "garymjr/nvim-snippets", optional = true, enabled = false },
-
-  -- add luasnip
-  {
-    "L3MON4D3/LuaSnip",
-    lazy = true,
-    build = (not LazyVim.is_win())
-        and "echo 'NOTE: jsregexp is optional, so not a big deal if it fails to build'; make install_jsregexp"
-      or nil,
-    dependencies = {
-      {
-        "rafamadriz/friendly-snippets",
-        config = function()
-          require("luasnip.loaders.from_vscode").lazy_load()
-          require("luasnip.loaders.from_vscode").lazy_load({ paths = { vim.fn.stdpath("config") .. "/snippets" } })
-        end,
-      },
-    },
-    opts = {
-      history = true,
-      delete_check_events = "TextChanged",
-    },
-  },
-
-  -- add snippet_forward action
-  {
-    "L3MON4D3/LuaSnip",
-    opts = function()
-      LazyVim.cmp.actions.snippet_forward = function()
-        if require("luasnip").jumpable(1) then
-          vim.schedule(function()
-            require("luasnip").jump(1)
-          end)
-          return true
-        end
-      end
-      LazyVim.cmp.actions.snippet_stop = function()
-        if require("luasnip").expand_or_jumpable() then -- or just jumpable(1) is fine?
-          require("luasnip").unlink_current()
-          return true
-        end
-      end
-    end,
-  },
-
-  -- nvim-cmp integration
-  {
-    "hrsh7th/nvim-cmp",
-    optional = true,
-    dependencies = { "saadparwaiz1/cmp_luasnip" },
-    opts = function(_, opts)
-      opts.snippet = {
-        expand = function(args)
-          require("luasnip").lsp_expand(args.body)
-        end,
-      }
-      table.insert(opts.sources, { name = "luasnip" })
-    end,
-    -- stylua: ignore
-    keys = {
-      { "<tab>", function() require("luasnip").jump(1) end, mode = "s" },
-      { "<s-tab>", function() require("luasnip").jump(-1) end, mode = { "i", "s" } },
-    },
-  },
-
-  -- blink.cmp integration
-  {
-    "saghen/blink.cmp",
-    optional = true,
-    opts = {
-      snippets = {
-        preset = "luasnip",
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/coding/mini-comment.lua

@@ -1,20 +0,0 @@
-return {
-  {
-    "nvim-mini/mini.comment",
-    event = "VeryLazy",
-    opts = {
-      options = {
-        custom_commentstring = function()
-          return require("ts_context_commentstring.internal").calculate_commentstring() or vim.bo.commentstring
-        end,
-      },
-    },
-  },
-  {
-    "JoosepAlviste/nvim-ts-context-commentstring",
-    lazy = true,
-    opts = {
-      enable_autocmd = false,
-    },
-  },
-}

lua/lazyvim/plugins/extras/coding/mini-snippets.lua

@@ -1,171 +0,0 @@
-if lazyvim_docs then
-  -- Set to `false` to prevent "non-lsp snippets"" from appearing inside completion windows
-  -- Motivation: Less clutter in completion windows and a more direct usage of snippets
-  vim.g.lazyvim_mini_snippets_in_completion = true
-
-  -- NOTE: Please also read:
-  -- https://github.com/nvim-mini/mini.nvim/blob/main/readmes/mini-snippets.md#expand
-  -- :h MiniSnippets-session
-
-  -- Example override for your own config:
-  --[[
-  return {
-    {
-      "nvim-mini/mini.snippets",
-      opts = function(_, opts)
-        -- By default, for opts.snippets, the extra for mini.snippets only adds gen_loader.from_lang()
-        -- This provides a sensible quickstart, integrating with friendly-snippets
-        -- and your own language-specific snippets
-        --
-        -- In order to change opts.snippets, replace the entire table inside your own opts
-
-        local snippets, config_path = require("mini.snippets"), vim.fn.stdpath("config")
-
-        opts.snippets = { -- override opts.snippets provided by extra...
-          -- Load custom file with global snippets first (order matters)
-          snippets.gen_loader.from_file(config_path .. "/snippets/global.json"),
-
-          -- Load snippets based on current language by reading files from
-          -- "snippets/" subdirectories from 'runtimepath' directories.
-          snippets.gen_loader.from_lang(), -- this is the default in the extra...
-        }
-      end,
-    },
-  }
---]]
-end
-
-local include_in_completion = vim.g.lazyvim_mini_snippets_in_completion == nil
-  or vim.g.lazyvim_mini_snippets_in_completion
-
-local function expand_from_lsp(snippet)
-  local insert = MiniSnippets.config.expand.insert or MiniSnippets.default_insert
-  insert({ body = snippet })
-end
-
-local function jump(direction)
-  local is_active = MiniSnippets.session.get(false) ~= nil
-  if is_active then
-    MiniSnippets.session.jump(direction)
-    return true
-  end
-end
-
----@type fun(snippets, insert) | nil
-local expand_select_override = nil
-
-return {
-  -- disable builtin snippet support:
-  { "garymjr/nvim-snippets", optional = true, enabled = false },
-  -- disable luasnip:
-  { "L3MON4D3/LuaSnip", optional = true, enabled = false },
-
-  -- add mini.snippets
-  desc = "Manage and expand snippets (alternative to Luasnip)",
-  {
-    "nvim-mini/mini.snippets",
-    event = "InsertEnter", -- don't depend on other plugins to load...
-    dependencies = "rafamadriz/friendly-snippets",
-    opts = function()
-      ---@diagnostic disable-next-line: duplicate-set-field
-      LazyVim.cmp.actions.snippet_stop = function() end -- by design, <esc> should not stop the session!
-      ---@diagnostic disable-next-line: duplicate-set-field
-      LazyVim.cmp.actions.snippet_forward = function()
-        return jump("next")
-      end
-
-      local mini_snippets = require("mini.snippets")
-      return {
-        snippets = { mini_snippets.gen_loader.from_lang() },
-
-        -- Following the behavior of vim.snippets,
-        -- the intended usage of <esc> is to be able to temporarily exit into normal mode for quick edits.
-        --
-        -- If you'd rather stop the snippet on <esc>, activate the line below in your own config:
-        -- mappings = { stop = "<esc>" }, -- <c-c> by default, see :h MiniSnippets-session
-
-        expand = {
-          select = function(snippets, insert)
-            -- Close completion window on snippet select - vim.ui.select
-            -- Needed to remove virtual text for fzf-lua and telescope, but not for mini.pick...
-            local select = expand_select_override or MiniSnippets.default_select
-            select(snippets, insert)
-          end,
-        },
-      }
-    end,
-  },
-
-  -- nvim-cmp integration
-  {
-    "hrsh7th/nvim-cmp",
-    optional = true,
-    dependencies = include_in_completion and { "abeldekat/cmp-mini-snippets" } or nil,
-    opts = function(_, opts)
-      local cmp = require("cmp")
-      local cmp_config = require("cmp.config")
-
-      opts.snippet = {
-        expand = function(args)
-          expand_from_lsp(args.body)
-          cmp.resubscribe({ "TextChangedI", "TextChangedP" })
-          cmp_config.set_onetime({ sources = {} })
-        end,
-      }
-
-      if include_in_completion then
-        table.insert(opts.sources, { name = "mini_snippets" })
-      else
-        expand_select_override = function(snippets, insert)
-          -- stylua: ignore
-          if cmp.visible() then cmp.close() end
-          MiniSnippets.default_select(snippets, insert)
-        end
-      end
-    end,
-    -- stylua: ignore
-    -- counterpart to <tab> defined in cmp.mappings
-    keys = include_in_completion and { { "<s-tab>", function() jump("prev") end, mode = "i" } } or nil,
-  },
-
-  -- blink.cmp integration
-  {
-    "saghen/blink.cmp",
-    optional = true,
-    opts = function(_, opts)
-      -- Return early
-      if include_in_completion then
-        opts.snippets = { preset = "mini_snippets" }
-        return
-      end
-
-      -- Standalone --
-      local blink = require("blink.cmp")
-      expand_select_override = function(snippets, insert)
-        -- Schedule, otherwise blink's virtual text is not removed on vim.ui.select
-        blink.cancel()
-        vim.schedule(function()
-          MiniSnippets.default_select(snippets, insert)
-        end)
-      end
-      --
-      -- Blink performs a require on blink.cmp.sources.snippets.default
-      -- By removing the source, that default engine will not be used
-      opts.sources.default = vim.tbl_filter(function(source)
-        return source ~= "snippets"
-      end, opts.sources.default)
-      opts.snippets = { -- need to repeat blink's preset here
-        expand = function(snippet)
-          expand_from_lsp(snippet)
-          blink.resubscribe()
-        end,
-        active = function()
-          return MiniSnippets.session.get(false) ~= nil
-        end,
-        jump = function(direction)
-          jump(direction == -1 and "prev" or "next")
-        end,
-      }
-    end,
-  },
-}

lua/lazyvim/plugins/extras/coding/mini-surround.lua

@@ -1,35 +0,0 @@
--- Fast and feature-rich surround actions. For text that includes
--- surrounding characters like brackets or quotes, this allows you
--- to select the text inside, change or modify the surrounding characters,
--- and more.
-return {
-  "nvim-mini/mini.surround",
-  keys = function(_, keys)
-    -- Populate the keys based on the user's options
-    local opts = LazyVim.opts("mini.surround")
-    local mappings = {
-      { opts.mappings.add, desc = "Add Surrounding", mode = { "n", "x" } },
-      { opts.mappings.delete, desc = "Delete Surrounding" },
-      { opts.mappings.find, desc = "Find Right Surrounding" },
-      { opts.mappings.find_left, desc = "Find Left Surrounding" },
-      { opts.mappings.highlight, desc = "Highlight Surrounding" },
-      { opts.mappings.replace, desc = "Replace Surrounding" },
-      { opts.mappings.update_n_lines, desc = "Update `MiniSurround.config.n_lines`" },
-    }
-    mappings = vim.tbl_filter(function(m)
-      return m[1] and #m[1] > 0
-    end, mappings)
-    return vim.list_extend(mappings, keys)
-  end,
-  opts = {
-    mappings = {
-      add = "gsa", -- Add surrounding in Normal and Visual modes
-      delete = "gsd", -- Delete surrounding
-      find = "gsf", -- Find surrounding (to the right)
-      find_left = "gsF", -- Find surrounding (to the left)
-      highlight = "gsh", -- Highlight surrounding
-      replace = "gsr", -- Replace surrounding
-      update_n_lines = "gsn", -- Update `n_lines`
-    },
-  },
-}

lua/lazyvim/plugins/extras/coding/neogen.lua

@@ -1,37 +0,0 @@
-return {
-  "danymat/neogen",
-  dependencies = LazyVim.has("mini.snippets") and { "mini.snippets" } or {},
-  cmd = "Neogen",
-  keys = {
-    {
-      "<leader>cn",
-      function()
-        require("neogen").generate()
-      end,
-      desc = "Generate Annotations (Neogen)",
-    },
-  },
-  opts = function(_, opts)
-    if opts.snippet_engine ~= nil then
-      return
-    end
-
-    local map = {
-      ["LuaSnip"] = "luasnip",
-      ["mini.snippets"] = "mini",
-      ["nvim-snippy"] = "snippy",
-      ["vim-vsnip"] = "vsnip",
-    }
-
-    for plugin, engine in pairs(map) do
-      if LazyVim.has(plugin) then
-        opts.snippet_engine = engine
-        return
-      end
-    end
-
-    if vim.snippet then
-      opts.snippet_engine = "nvim"
-    end
-  end,
-}

lua/lazyvim/plugins/extras/coding/nvim-cmp.lua

@@ -1,121 +0,0 @@
-return {
-  {
-    "saghen/blink.cmp",
-    enabled = false,
-    optional = true,
-  },
-
-  -- Setup nvim-cmp
-  {
-    "hrsh7th/nvim-cmp",
-    version = false, -- last release is way too old
-    event = "InsertEnter",
-    dependencies = {
-      "hrsh7th/cmp-nvim-lsp",
-      "hrsh7th/cmp-buffer",
-      "hrsh7th/cmp-path",
-    },
-    -- Not all LSP servers add brackets when completing a function.
-    -- To better deal with this, LazyVim adds a custom option to cmp,
-    -- that you can configure. For example:
-    --
-    -- ```lua
-    -- opts = {
-    --   auto_brackets = { "python" }
-    -- }
-    -- ```
-    opts = function()
-      -- Register nvim-cmp lsp capabilities
-      vim.lsp.config("*", { capabilities = require("cmp_nvim_lsp").default_capabilities() })
-
-      vim.api.nvim_set_hl(0, "CmpGhostText", { link = "Comment", default = true })
-      local cmp = require("cmp")
-      local defaults = require("cmp.config.default")()
-      local auto_select = true
-      return {
-        auto_brackets = {}, -- configure any filetype to auto add brackets
-        completion = {
-          completeopt = "menu,menuone,noinsert" .. (auto_select and "" or ",noselect"),
-        },
-        preselect = auto_select and cmp.PreselectMode.Item or cmp.PreselectMode.None,
-        mapping = cmp.mapping.preset.insert({
-          ["<C-b>"] = cmp.mapping.scroll_docs(-4),
-          ["<C-f>"] = cmp.mapping.scroll_docs(4),
-          ["<C-n>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
-          ["<C-p>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
-          ["<C-Space>"] = cmp.mapping.complete(),
-          ["<CR>"] = LazyVim.cmp.confirm({ select = auto_select }),
-          ["<C-y>"] = LazyVim.cmp.confirm({ select = true }),
-          ["<S-CR>"] = LazyVim.cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-          ["<C-CR>"] = function(fallback)
-            cmp.abort()
-            fallback()
-          end,
-          ["<tab>"] = function(fallback)
-            return LazyVim.cmp.map({ "snippet_forward", "ai_nes", "ai_accept" }, fallback)()
-          end,
-        }),
-        sources = cmp.config.sources({
-          { name = "lazydev" },
-          { name = "nvim_lsp" },
-          { name = "path" },
-        }, {
-          { name = "buffer" },
-        }),
-        formatting = {
-          format = function(entry, item)
-            local icons = LazyVim.config.icons.kinds
-            if icons[item.kind] then
-              item.kind = icons[item.kind] .. item.kind
-            end
-
-            local widths = {
-              abbr = vim.g.cmp_widths and vim.g.cmp_widths.abbr or 40,
-              menu = vim.g.cmp_widths and vim.g.cmp_widths.menu or 30,
-            }
-
-            for key, width in pairs(widths) do
-              if item[key] and vim.fn.strdisplaywidth(item[key]) > width then
-                item[key] = vim.fn.strcharpart(item[key], 0, width - 1) .. "…"
-              end
-            end
-
-            return item
-          end,
-        },
-        experimental = {
-          -- only show ghost text when we show ai completions
-          ghost_text = vim.g.ai_cmp and {
-            hl_group = "CmpGhostText",
-          } or false,
-        },
-        sorting = defaults.sorting,
-      }
-    end,
-    main = "lazyvim.util.cmp",
-  },
-
-  -- snippets
-  {
-    "hrsh7th/nvim-cmp",
-    dependencies = {
-      {
-        "garymjr/nvim-snippets",
-        opts = {
-          friendly_snippets = true,
-        },
-        dependencies = { "rafamadriz/friendly-snippets" },
-      },
-    },
-    opts = function(_, opts)
-      opts.snippet = {
-        expand = function(item)
-          return LazyVim.cmp.expand(item.body)
-        end,
-      }
-      if LazyVim.has("nvim-snippets") then
-        table.insert(opts.sources, { name = "snippets" })
-      end
-    end,
-  },
-}

lua/lazyvim/plugins/extras/coding/yanky.lua

@@ -1,47 +0,0 @@
--- better yank/paste
-return {
-  "gbprod/yanky.nvim",
-  recommended = true,
-  desc = "Better Yank/Paste",
-  event = "LazyFile",
-  opts = {
-    system_clipboard = {
-      sync_with_ring = not vim.env.SSH_CONNECTION,
-    },
-    highlight = { timer = 150 },
-  },
-  keys = {
-    {
-      "<leader>p",
-      function()
-        if LazyVim.pick.picker.name == "telescope" then
-          require("telescope").extensions.yank_history.yank_history({})
-        elseif LazyVim.pick.picker.name == "snacks" then
-          Snacks.picker.yanky()
-        else
-          vim.cmd([[YankyRingHistory]])
-        end
-      end,
-      mode = { "n", "x" },
-      desc = "Open Yank History",
-    },
-        -- stylua: ignore
-    { "y", "<Plug>(YankyYank)", mode = { "n", "x" }, desc = "Yank Text" },
-    { "p", "<Plug>(YankyPutAfter)", mode = { "n", "x" }, desc = "Put Text After Cursor" },
-    { "P", "<Plug>(YankyPutBefore)", mode = { "n", "x" }, desc = "Put Text Before Cursor" },
-    { "gp", "<Plug>(YankyGPutAfter)", mode = { "n", "x" }, desc = "Put Text After Selection" },
-    { "gP", "<Plug>(YankyGPutBefore)", mode = { "n", "x" }, desc = "Put Text Before Selection" },
-    { "[y", "<Plug>(YankyCycleForward)", desc = "Cycle Forward Through Yank History" },
-    { "]y", "<Plug>(YankyCycleBackward)", desc = "Cycle Backward Through Yank History" },
-    { "]p", "<Plug>(YankyPutIndentAfterLinewise)", desc = "Put Indented After Cursor (Linewise)" },
-    { "[p", "<Plug>(YankyPutIndentBeforeLinewise)", desc = "Put Indented Before Cursor (Linewise)" },
-    { "]P", "<Plug>(YankyPutIndentAfterLinewise)", desc = "Put Indented After Cursor (Linewise)" },
-    { "[P", "<Plug>(YankyPutIndentBeforeLinewise)", desc = "Put Indented Before Cursor (Linewise)" },
-    { ">p", "<Plug>(YankyPutIndentAfterShiftRight)", desc = "Put and Indent Right" },
-    { "<p", "<Plug>(YankyPutIndentAfterShiftLeft)", desc = "Put and Indent Left" },
-    { ">P", "<Plug>(YankyPutIndentBeforeShiftRight)", desc = "Put Before and Indent Right" },
-    { "<P", "<Plug>(YankyPutIndentBeforeShiftLeft)", desc = "Put Before and Indent Left" },
-    { "=p", "<Plug>(YankyPutAfterFilter)", desc = "Put After Applying a Filter" },
-    { "=P", "<Plug>(YankyPutBeforeFilter)", desc = "Put Before Applying a Filter" },
-  },
-}

lua/lazyvim/plugins/extras/dap/core.lua

@@ -1,129 +0,0 @@
----@param config {type?:string, args?:string[]|fun():string[]?}
-local function get_args(config)
-  local args = type(config.args) == "function" and (config.args() or {}) or config.args or {} --[[@as string[] | string ]]
-  local args_str = type(args) == "table" and table.concat(args, " ") or args --[[@as string]]
-
-  config = vim.deepcopy(config)
-  ---@cast args string[]
-  config.args = function()
-    local new_args = vim.fn.expand(vim.fn.input("Run with args: ", args_str)) --[[@as string]]
-    if config.type and config.type == "java" then
-      ---@diagnostic disable-next-line: return-type-mismatch
-      return new_args
-    end
-    return require("dap.utils").splitstr(new_args)
-  end
-  return config
-end
-
-return {
-  {
-    "mfussenegger/nvim-dap",
-    recommended = true,
-    desc = "Debugging support. Requires language specific adapters to be configured. (see lang extras)",
-
-    dependencies = {
-      "rcarriga/nvim-dap-ui",
-      -- virtual text for the debugger
-      {
-        "theHamsta/nvim-dap-virtual-text",
-        opts = {},
-      },
-    },
-
-    -- stylua: ignore
-    keys = {
-      { "<leader>dB", function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end, desc = "Breakpoint Condition" },
-      { "<leader>db", function() require("dap").toggle_breakpoint() end, desc = "Toggle Breakpoint" },
-      { "<leader>dc", function() require("dap").continue() end, desc = "Run/Continue" },
-      { "<leader>da", function() require("dap").continue({ before = get_args }) end, desc = "Run with Args" },
-      { "<leader>dC", function() require("dap").run_to_cursor() end, desc = "Run to Cursor" },
-      { "<leader>dg", function() require("dap").goto_() end, desc = "Go to Line (No Execute)" },
-      { "<leader>di", function() require("dap").step_into() end, desc = "Step Into" },
-      { "<leader>dj", function() require("dap").down() end, desc = "Down" },
-      { "<leader>dk", function() require("dap").up() end, desc = "Up" },
-      { "<leader>dl", function() require("dap").run_last() end, desc = "Run Last" },
-      { "<leader>do", function() require("dap").step_out() end, desc = "Step Out" },
-      { "<leader>dO", function() require("dap").step_over() end, desc = "Step Over" },
-      { "<leader>dP", function() require("dap").pause() end, desc = "Pause" },
-      { "<leader>dr", function() require("dap").repl.toggle() end, desc = "Toggle REPL" },
-      { "<leader>ds", function() require("dap").session() end, desc = "Session" },
-      { "<leader>dt", function() require("dap").terminate() end, desc = "Terminate" },
-      { "<leader>dw", function() require("dap.ui.widgets").hover() end, desc = "Widgets" },
-    },
-
-    config = function()
-      -- load mason-nvim-dap here, after all adapters have been setup
-      if LazyVim.has("mason-nvim-dap.nvim") then
-        require("mason-nvim-dap").setup(LazyVim.opts("mason-nvim-dap.nvim"))
-      end
-
-      vim.api.nvim_set_hl(0, "DapStoppedLine", { default = true, link = "Visual" })
-
-      for name, sign in pairs(LazyVim.config.icons.dap) do
-        sign = type(sign) == "table" and sign or { sign }
-        vim.fn.sign_define(
-          "Dap" .. name,
-          { text = sign[1], texthl = sign[2] or "DiagnosticInfo", linehl = sign[3], numhl = sign[3] }
-        )
-      end
-
-      -- setup dap config by VsCode launch.json file
-      local vscode = require("dap.ext.vscode")
-      local json = require("plenary.json")
-      vscode.json_decode = function(str)
-        return vim.json.decode(json.json_strip_comments(str))
-      end
-    end,
-  },
-
-  -- fancy UI for the debugger
-  {
-    "rcarriga/nvim-dap-ui",
-    dependencies = { "nvim-neotest/nvim-nio" },
-    -- stylua: ignore
-    keys = {
-      { "<leader>du", function() require("dapui").toggle({ }) end, desc = "Dap UI" },
-      { "<leader>de", function() require("dapui").eval() end, desc = "Eval", mode = {"n", "x"} },
-    },
-    opts = {},
-    config = function(_, opts)
-      local dap = require("dap")
-      local dapui = require("dapui")
-      dapui.setup(opts)
-      dap.listeners.after.event_initialized["dapui_config"] = function()
-        dapui.open({})
-      end
-      dap.listeners.before.event_terminated["dapui_config"] = function()
-        dapui.close({})
-      end
-      dap.listeners.before.event_exited["dapui_config"] = function()
-        dapui.close({})
-      end
-    end,
-  },
-
-  -- mason.nvim integration
-  {
-    "jay-babu/mason-nvim-dap.nvim",
-    dependencies = "mason.nvim",
-    cmd = { "DapInstall", "DapUninstall" },
-    opts = {
-      -- Makes a best effort to setup the various debuggers with
-      -- reasonable debug configurations
-      automatic_installation = true,
-
-      -- You can provide additional configuration to the handlers,
-      -- see mason-nvim-dap README for more information
-      handlers = {},
-
-      -- You'll need to check that you have the required things installed
-      -- online, please don't ask me how to install them :)
-      ensure_installed = {
-        -- Update this to ensure that you have the debuggers for the langs you want
-      },
-    },
-    -- mason-nvim-dap is loaded when nvim-dap loads
-    config = function() end,
-  },
-}

lua/lazyvim/plugins/extras/dap/nlua.lua

@@ -1,43 +0,0 @@
-return {
-  "mfussenegger/nvim-dap",
-  dependencies = {
-    {
-      "jbyuki/one-small-step-for-vimkind",
-      -- stylua: ignore
-      config = function()
-        local dap = require("dap")
-        dap.adapters.nlua = function(callback, conf)
-          local adapter = {
-            type = "server",
-            host = conf.host or "127.0.0.1",
-            port = conf.port or 8086,
-          }
-          if conf.start_neovim then
-            local dap_run = dap.run
-            dap.run = function(c)
-              adapter.port = c.port
-              adapter.host = c.host
-            end
-            require("osv").run_this()
-            dap.run = dap_run
-          end
-          callback(adapter)
-        end
-        dap.configurations.lua = {
-          {
-            type = "nlua",
-            request = "attach",
-            name = "Run this file",
-            start_neovim = {},
-          },
-          {
-            type = "nlua",
-            request = "attach",
-            name = "Attach to running Neovim instance (port = 8086)",
-            port = 8086,
-          },
-        }
-      end,
-    },
-  },
-}

lua/lazyvim/plugins/extras/editor/aerial.lua

@@ -1,130 +0,0 @@
-return {
-  desc = "Aerial Symbol Browser",
-  {
-    "stevearc/aerial.nvim",
-    event = "LazyFile",
-    opts = function()
-      local icons = vim.deepcopy(LazyVim.config.icons.kinds)
-
-      -- HACK: fix lua's weird choice for `Package` for control
-      -- structures like if/else/for/etc.
-      icons.lua = { Package = icons.Control }
-
-      ---@type table<string, string[]>|false
-      local filter_kind = false
-      if LazyVim.config.kind_filter then
-        filter_kind = assert(vim.deepcopy(LazyVim.config.kind_filter))
-        filter_kind._ = filter_kind.default
-        filter_kind.default = nil
-      end
-
-      local opts = {
-        attach_mode = "global",
-        backends = { "lsp", "treesitter", "markdown", "man" },
-        show_guides = true,
-        layout = {
-          resize_to_content = false,
-          win_opts = {
-            winhl = "Normal:NormalFloat,FloatBorder:NormalFloat,SignColumn:SignColumnSB",
-            signcolumn = "yes",
-            statuscolumn = " ",
-          },
-        },
-        icons = icons,
-        filter_kind = filter_kind,
-        -- stylua: ignore
-        guides = {
-          mid_item   = "├╴",
-          last_item  = "└╴",
-          nested_top = "│ ",
-          whitespace = "  ",
-        },
-      }
-      return opts
-    end,
-    keys = {
-      { "<leader>cs", "<cmd>AerialToggle<cr>", desc = "Aerial (Symbols)" },
-    },
-  },
-
-  {
-    "folke/trouble.nvim",
-    optional = true,
-    keys = {
-      { "<leader>cs", false },
-    },
-  },
-
-  -- Telescope integration
-  {
-    "nvim-telescope/telescope.nvim",
-    optional = true,
-    opts = function()
-      LazyVim.on_load("telescope.nvim", function()
-        require("telescope").load_extension("aerial")
-      end)
-    end,
-    keys = {
-      {
-        "<leader>ss",
-        "<cmd>Telescope aerial<cr>",
-        desc = "Goto Symbol (Aerial)",
-      },
-    },
-  },
-
-  -- edgy integration
-  {
-    "folke/edgy.nvim",
-    optional = true,
-    opts = function(_, opts)
-      local edgy_idx = LazyVim.plugin.extra_idx("ui.edgy")
-      local aerial_idx = LazyVim.plugin.extra_idx("editor.aerial")
-
-      if edgy_idx and edgy_idx > aerial_idx then
-        LazyVim.warn("The `edgy.nvim` extra must be **imported** before the `aerial.nvim` extra to work properly.", {
-          title = "LazyVim",
-        })
-      end
-
-      opts.right = opts.right or {}
-      table.insert(opts.right, {
-        title = "Aerial",
-        ft = "aerial",
-        pinned = true,
-        open = "AerialOpen",
-      })
-    end,
-  },
-
-  -- lualine integration
-  {
-    "nvim-lualine/lualine.nvim",
-    optional = true,
-    opts = function(_, opts)
-      if not vim.g.trouble_lualine then
-        table.insert(opts.sections.lualine_c, {
-          "aerial",
-          sep = " ", -- separator between symbols
-          sep_icon = "", -- separator between icon and symbol
-
-          -- The number of symbols to render top-down. In order to render only 'N' last
-          -- symbols, negative numbers may be supplied. For instance, 'depth = -1' can
-          -- be used in order to render only current symbol.
-          depth = 5,
-
-          -- When 'dense' mode is on, icons are not rendered near their symbols. Only
-          -- a single icon that represents the kind of current symbol is rendered at
-          -- the beginning of status line.
-          dense = false,
-
-          -- The separator to be used to separate symbols in dense mode.
-          dense_sep = ".",
-
-          -- Color the symbol icons.
-          colored = true,
-        })
-      end
-    end,
-  },
-}

lua/lazyvim/plugins/extras/editor/dial.lua

@@ -1,156 +0,0 @@
-local M = {}
-
----@param increment boolean
----@param g? boolean
-function M.dial(increment, g)
-  local mode = vim.fn.mode(true)
-  -- Use visual commands for VISUAL 'v', VISUAL LINE 'V' and VISUAL BLOCK '\22'
-  local is_visual = mode == "v" or mode == "V" or mode == "\22"
-  local func = (increment and "inc" or "dec") .. (g and "_g" or "_") .. (is_visual and "visual" or "normal")
-  local group = vim.g.dials_by_ft[vim.bo.filetype] or "default"
-  return require("dial.map")[func](group)
-end
-
-return {
-  "monaqa/dial.nvim",
-  recommended = true,
-  desc = "Increment and decrement numbers, dates, and more",
-  -- stylua: ignore
-  keys = {
-    { "<C-a>", function() return M.dial(true) end, expr = true, desc = "Increment", mode = {"n", "v"} },
-    { "<C-x>", function() return M.dial(false) end, expr = true, desc = "Decrement", mode = {"n", "v"} },
-    { "g<C-a>", function() return M.dial(true, true) end, expr = true, desc = "Increment", mode = {"n", "x"} },
-    { "g<C-x>", function() return M.dial(false, true) end, expr = true, desc = "Decrement", mode = {"n", "x"} },
-  },
-  opts = function()
-    local augend = require("dial.augend")
-
-    local logical_alias = augend.constant.new({
-      elements = { "&&", "||" },
-      word = false,
-      cyclic = true,
-    })
-
-    local ordinal_numbers = augend.constant.new({
-      -- elements through which we cycle. When we increment, we go down
-      -- On decrement we go up
-      elements = {
-        "first",
-        "second",
-        "third",
-        "fourth",
-        "fifth",
-        "sixth",
-        "seventh",
-        "eighth",
-        "ninth",
-        "tenth",
-      },
-      -- if true, it only matches strings with word boundary. firstDate wouldn't work for example
-      word = false,
-      -- do we cycle back and forth (tenth to first on increment, first to tenth on decrement).
-      -- Otherwise nothing will happen when there are no further values
-      cyclic = true,
-    })
-
-    local months = augend.constant.new({
-      elements = {
-        "January",
-        "February",
-        "March",
-        "April",
-        "May",
-        "June",
-        "July",
-        "August",
-        "September",
-        "October",
-        "November",
-        "December",
-      },
-      word = true,
-      cyclic = true,
-    })
-
-    return {
-      dials_by_ft = {
-        css = "css",
-        vue = "vue",
-        javascript = "typescript",
-        typescript = "typescript",
-        typescriptreact = "typescript",
-        javascriptreact = "typescript",
-        json = "json",
-        lua = "lua",
-        markdown = "markdown",
-        sass = "css",
-        scss = "css",
-        python = "python",
-      },
-      groups = {
-        default = {
-          augend.integer.alias.decimal, -- nonnegative decimal number (0, 1, 2, 3, ...)
-          augend.integer.alias.decimal_int, -- nonnegative and negative decimal number
-          augend.integer.alias.hex, -- nonnegative hex number  (0x01, 0x1a1f, etc.)
-          augend.date.alias["%Y/%m/%d"], -- date (2022/02/19, etc.)
-          augend.constant.alias.en_weekday, -- Mon, Tue, ..., Sat, Sun
-          augend.constant.alias.en_weekday_full, -- Monday, Tuesday, ..., Saturday, Sunday
-          ordinal_numbers,
-          months,
-          augend.constant.alias.bool, -- boolean value (true <-> false)
-          augend.constant.alias.Bool, -- boolean value (True <-> False)
-          logical_alias,
-        },
-        vue = {
-          augend.constant.new({ elements = { "let", "const" } }),
-          augend.hexcolor.new({ case = "lower" }),
-          augend.hexcolor.new({ case = "upper" }),
-        },
-        typescript = {
-          augend.constant.new({ elements = { "let", "const" } }),
-        },
-        css = {
-          augend.hexcolor.new({
-            case = "lower",
-          }),
-          augend.hexcolor.new({
-            case = "upper",
-          }),
-        },
-        markdown = {
-          augend.constant.new({
-            elements = { "[ ]", "[x]" },
-            word = false,
-            cyclic = true,
-          }),
-          augend.misc.alias.markdown_header,
-        },
-        json = {
-          augend.semver.alias.semver, -- versioning (v1.1.2)
-        },
-        lua = {
-          augend.constant.new({
-            elements = { "and", "or" },
-            word = true, -- if false, "sand" is incremented into "sor", "doctor" into "doctand", etc.
-            cyclic = true, -- "or" is incremented into "and".
-          }),
-        },
-        python = {
-          augend.constant.new({
-            elements = { "and", "or" },
-          }),
-        },
-      },
-    }
-  end,
-  config = function(_, opts)
-    -- copy defaults to each group
-    for name, group in pairs(opts.groups) do
-      if name ~= "default" then
-        vim.list_extend(group, opts.groups.default)
-      end
-    end
-    require("dial.config").augends:register_group(opts.groups)
-    vim.g.dials_by_ft = opts.dials_by_ft
-  end,
-}

lua/lazyvim/plugins/extras/editor/fzf.lua

@@ -1,306 +0,0 @@
-if lazyvim_docs then
-  -- In case you don't want to use `:LazyExtras`,
-  -- then you need to set the option below.
-  vim.g.lazyvim_picker = "fzf"
-end
-
----@class FzfLuaOpts: lazyvim.util.pick.Opts
----@field cmd string?
-
----@type LazyPicker
-local picker = {
-  name = "fzf",
-  commands = {
-    files = "files",
-  },
-
-  ---@param command string
-  ---@param opts? FzfLuaOpts
-  open = function(command, opts)
-    opts = opts or {}
-    if opts.cmd == nil and command == "git_files" and opts.show_untracked then
-      opts.cmd = "git ls-files --exclude-standard --cached --others"
-    end
-    return require("fzf-lua")[command](opts)
-  end,
-}
-if not LazyVim.pick.register(picker) then
-  return {}
-end
-
-local function symbols_filter(entry, ctx)
-  if ctx.symbols_filter == nil then
-    ctx.symbols_filter = LazyVim.config.get_kind_filter(ctx.bufnr) or false
-  end
-  if ctx.symbols_filter == false then
-    return true
-  end
-  return vim.tbl_contains(ctx.symbols_filter, entry.kind)
-end
-
-return {
-  desc = "Awesome picker for FZF (alternative to Telescope)",
-  {
-    "ibhagwan/fzf-lua",
-    cmd = "FzfLua",
-    opts = function(_, opts)
-      local fzf = require("fzf-lua")
-      local config = fzf.config
-      local actions = fzf.actions
-
-      -- Quickfix
-      config.defaults.keymap.fzf["ctrl-q"] = "select-all+accept"
-      config.defaults.keymap.fzf["ctrl-u"] = "half-page-up"
-      config.defaults.keymap.fzf["ctrl-d"] = "half-page-down"
-      config.defaults.keymap.fzf["ctrl-x"] = "jump"
-      config.defaults.keymap.fzf["ctrl-f"] = "preview-page-down"
-      config.defaults.keymap.fzf["ctrl-b"] = "preview-page-up"
-      config.defaults.keymap.builtin["<c-f>"] = "preview-page-down"
-      config.defaults.keymap.builtin["<c-b>"] = "preview-page-up"
-
-      -- Trouble
-      if LazyVim.has("trouble.nvim") then
-        config.defaults.actions.files["ctrl-t"] = require("trouble.sources.fzf").actions.open
-      end
-
-      -- Toggle root dir / cwd
-      config.defaults.actions.files["ctrl-r"] = function(_, ctx)
-        local o = vim.deepcopy(ctx.__call_opts)
-        o.root = o.root == false
-        o.cwd = nil
-        o.buf = ctx.__CTX.bufnr
-        LazyVim.pick.open(ctx.__INFO.cmd, o)
-      end
-      config.defaults.actions.files["alt-c"] = config.defaults.actions.files["ctrl-r"]
-      config.set_action_helpstr(config.defaults.actions.files["ctrl-r"], "toggle-root-dir")
-
-      local img_previewer ---@type string[]?
-      for _, v in ipairs({
-        { cmd = "ueberzug", args = {} },
-        { cmd = "chafa", args = { "{file}", "--format=symbols" } },
-        { cmd = "viu", args = { "-b" } },
-      }) do
-        if vim.fn.executable(v.cmd) == 1 then
-          img_previewer = vim.list_extend({ v.cmd }, v.args)
-          break
-        end
-      end
-
-      return {
-        "default-title",
-        fzf_colors = true,
-        fzf_opts = {
-          ["--no-scrollbar"] = true,
-        },
-        defaults = {
-          -- formatter = "path.filename_first",
-          formatter = "path.dirname_first",
-        },
-        previewers = {
-          builtin = {
-            extensions = {
-              ["png"] = img_previewer,
-              ["jpg"] = img_previewer,
-              ["jpeg"] = img_previewer,
-              ["gif"] = img_previewer,
-              ["webp"] = img_previewer,
-            },
-            ueberzug_scaler = "fit_contain",
-          },
-        },
-        -- Custom LazyVim option to configure vim.ui.select
-        ui_select = function(fzf_opts, items)
-          return vim.tbl_deep_extend("force", fzf_opts, {
-            prompt = " ",
-            winopts = {
-              title = " " .. vim.trim((fzf_opts.prompt or "Select"):gsub("%s*:%s*$", "")) .. " ",
-              title_pos = "center",
-            },
-          }, fzf_opts.kind == "codeaction" and {
-            winopts = {
-              layout = "vertical",
-              -- height is number of items minus 15 lines for the preview, with a max of 80% screen height
-              height = math.floor(math.min(vim.o.lines * 0.8 - 16, #items + 4) + 0.5) + 16,
-              width = 0.5,
-              preview = not vim.tbl_isempty(vim.lsp.get_clients({ bufnr = 0, name = "vtsls" })) and {
-                layout = "vertical",
-                vertical = "down:15,border-top",
-                hidden = "hidden",
-              } or {
-                layout = "vertical",
-                vertical = "down:15,border-top",
-              },
-            },
-          } or {
-            winopts = {
-              width = 0.5,
-              -- height is number of items, with a max of 80% screen height
-              height = math.floor(math.min(vim.o.lines * 0.8, #items + 4) + 0.5),
-            },
-          })
-        end,
-        winopts = {
-          width = 0.8,
-          height = 0.8,
-          row = 0.5,
-          col = 0.5,
-          preview = {
-            scrollchars = { "┃", "" },
-          },
-        },
-        files = {
-          cwd_prompt = false,
-          actions = {
-            ["alt-i"] = { actions.toggle_ignore },
-            ["alt-h"] = { actions.toggle_hidden },
-          },
-        },
-        grep = {
-          actions = {
-            ["alt-i"] = { actions.toggle_ignore },
-            ["alt-h"] = { actions.toggle_hidden },
-          },
-        },
-        lsp = {
-          symbols = {
-            symbol_hl = function(s)
-              return "TroubleIcon" .. s
-            end,
-            symbol_fmt = function(s)
-              return s:lower() .. "\t"
-            end,
-            child_prefix = false,
-          },
-          code_actions = {
-            previewer = vim.fn.executable("delta") == 1 and "codeaction_native" or nil,
-          },
-        },
-      }
-    end,
-    config = function(_, opts)
-      if opts[1] == "default-title" then
-        -- use the same prompt for all pickers for profile `default-title` and
-        -- profiles that use `default-title` as base profile
-        local function fix(t)
-          t.prompt = t.prompt ~= nil and " " or nil
-          for _, v in pairs(t) do
-            if type(v) == "table" then
-              fix(v)
-            end
-          end
-          return t
-        end
-        opts = vim.tbl_deep_extend("force", fix(require("fzf-lua.profiles.default-title")), opts)
-        opts[1] = nil
-      end
-      require("fzf-lua").setup(opts)
-    end,
-    init = function()
-      LazyVim.on_very_lazy(function()
-        vim.ui.select = function(...)
-          require("lazy").load({ plugins = { "fzf-lua" } })
-          local opts = LazyVim.opts("fzf-lua") or {}
-          require("fzf-lua").register_ui_select(opts.ui_select or nil)
-          return vim.ui.select(...)
-        end
-      end)
-    end,
-    keys = {
-      { "<c-j>", "<c-j>", ft = "fzf", mode = "t", nowait = true },
-      { "<c-k>", "<c-k>", ft = "fzf", mode = "t", nowait = true },
-      {
-        "<leader>,",
-        "<cmd>FzfLua buffers sort_mru=true sort_lastused=true<cr>",
-        desc = "Switch Buffer",
-      },
-      { "<leader>/", LazyVim.pick("live_grep"), desc = "Grep (Root Dir)" },
-      { "<leader>:", "<cmd>FzfLua command_history<cr>", desc = "Command History" },
-      { "<leader><space>", LazyVim.pick("files"), desc = "Find Files (Root Dir)" },
-      -- find
-      { "<leader>fb", "<cmd>FzfLua buffers sort_mru=true sort_lastused=true<cr>", desc = "Buffers" },
-      { "<leader>fB", "<cmd>FzfLua buffers<cr>", desc = "Buffers (all)" },
-      { "<leader>fc", LazyVim.pick.config_files(), desc = "Find Config File" },
-      { "<leader>ff", LazyVim.pick("files"), desc = "Find Files (Root Dir)" },
-      { "<leader>fF", LazyVim.pick("files", { root = false }), desc = "Find Files (cwd)" },
-      { "<leader>fg", "<cmd>FzfLua git_files<cr>", desc = "Find Files (git-files)" },
-      { "<leader>fr", "<cmd>FzfLua oldfiles<cr>", desc = "Recent" },
-      { "<leader>fR", LazyVim.pick("oldfiles", { cwd = vim.uv.cwd() }), desc = "Recent (cwd)" },
-      -- git
-      { "<leader>gc", "<cmd>FzfLua git_commits<CR>", desc = "Commits" },
-      { "<leader>gd", "<cmd>FzfLua git_diff<cr>", desc = "Git Diff (files)" },
-      { "<leader>gl", "<cmd>FzfLua git_commits<CR>", desc = "Commits" },
-      { "<leader>gs", "<cmd>FzfLua git_status<CR>", desc = "Status" },
-      { "<leader>gS", "<cmd>FzfLua git_stash<cr>", desc = "Git Stash" },
-      -- search
-      { '<leader>s"', "<cmd>FzfLua registers<cr>", desc = "Registers" },
-      { "<leader>s/", "<cmd>FzfLua search_history<cr>", desc = "Search History" },
-      { "<leader>sa", "<cmd>FzfLua autocmds<cr>", desc = "Auto Commands" },
-      { "<leader>sb", "<cmd>FzfLua lines<cr>", desc = "Buffer Lines" },
-      { "<leader>sc", "<cmd>FzfLua command_history<cr>", desc = "Command History" },
-      { "<leader>sC", "<cmd>FzfLua commands<cr>", desc = "Commands" },
-      { "<leader>sd", "<cmd>FzfLua diagnostics_workspace<cr>", desc = "Diagnostics" },
-      { "<leader>sD", "<cmd>FzfLua diagnostics_document<cr>", desc = "Buffer Diagnostics" },
-      { "<leader>sg", LazyVim.pick("live_grep"), desc = "Grep (Root Dir)" },
-      { "<leader>sG", LazyVim.pick("live_grep", { root = false }), desc = "Grep (cwd)" },
-      { "<leader>sh", "<cmd>FzfLua help_tags<cr>", desc = "Help Pages" },
-      { "<leader>sH", "<cmd>FzfLua highlights<cr>", desc = "Search Highlight Groups" },
-      { "<leader>sj", "<cmd>FzfLua jumps<cr>", desc = "Jumplist" },
-      { "<leader>sk", "<cmd>FzfLua keymaps<cr>", desc = "Key Maps" },
-      { "<leader>sl", "<cmd>FzfLua loclist<cr>", desc = "Location List" },
-      { "<leader>sM", "<cmd>FzfLua man_pages<cr>", desc = "Man Pages" },
-      { "<leader>sm", "<cmd>FzfLua marks<cr>", desc = "Jump to Mark" },
-      { "<leader>sR", "<cmd>FzfLua resume<cr>", desc = "Resume" },
-      { "<leader>sq", "<cmd>FzfLua quickfix<cr>", desc = "Quickfix List" },
-      { "<leader>sw", LazyVim.pick("grep_cword"), desc = "Word (Root Dir)" },
-      { "<leader>sW", LazyVim.pick("grep_cword", { root = false }), desc = "Word (cwd)" },
-      { "<leader>sw", LazyVim.pick("grep_visual"), mode = "x", desc = "Selection (Root Dir)" },
-      { "<leader>sW", LazyVim.pick("grep_visual", { root = false }), mode = "x", desc = "Selection (cwd)" },
-      { "<leader>uC", LazyVim.pick("colorschemes"), desc = "Colorscheme with Preview" },
-      {
-        "<leader>ss",
-        function()
-          require("fzf-lua").lsp_document_symbols({
-            regex_filter = symbols_filter,
-          })
-        end,
-        desc = "Goto Symbol",
-      },
-      {
-        "<leader>sS",
-        function()
-          require("fzf-lua").lsp_live_workspace_symbols({
-            regex_filter = symbols_filter,
-          })
-        end,
-        desc = "Goto Symbol (Workspace)",
-      },
-    },
-  },
-
-  {
-    "folke/todo-comments.nvim",
-    optional = true,
-    -- stylua: ignore
-    keys = {
-      { "<leader>st", function() require("todo-comments.fzf").todo() end, desc = "Todo" },
-      { "<leader>sT", function () require("todo-comments.fzf").todo({ keywords = { "TODO", "FIX", "FIXME" } }) end, desc = "Todo/Fix/Fixme" },
-    },
-  },
-
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        -- stylua: ignore
-        ["*"] = {
-          keys = {
-            { "gd", "<cmd>FzfLua lsp_definitions     jump1=true ignore_current_line=true<cr>", desc = "Goto Definition", has = "definition" },
-            { "gr", "<cmd>FzfLua lsp_references      jump1=true ignore_current_line=true<cr>", desc = "References", nowait = true },
-            { "gI", "<cmd>FzfLua lsp_implementations jump1=true ignore_current_line=true<cr>", desc = "Goto Implementation" },
-            { "gy", "<cmd>FzfLua lsp_typedefs        jump1=true ignore_current_line=true<cr>", desc = "Goto T[y]pe Definition" },
-          }
-        },
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/editor/harpoon2.lua

@@ -1,42 +0,0 @@
-return {
-  "ThePrimeagen/harpoon",
-  branch = "harpoon2",
-  opts = {
-    menu = {
-      width = vim.api.nvim_win_get_width(0) - 4,
-    },
-    settings = {
-      save_on_toggle = true,
-    },
-  },
-  keys = function()
-    local keys = {
-      {
-        "<leader>H",
-        function()
-          require("harpoon"):list():add()
-        end,
-        desc = "Harpoon File",
-      },
-      {
-        "<leader>h",
-        function()
-          local harpoon = require("harpoon")
-          harpoon.ui:toggle_quick_menu(harpoon:list())
-        end,
-        desc = "Harpoon Quick Menu",
-      },
-    }
-
-    for i = 1, 9 do
-      table.insert(keys, {
-        "<leader>" .. i,
-        function()
-          require("harpoon"):list():select(i)
-        end,
-        desc = "Harpoon to File " .. i,
-      })
-    end
-    return keys
-  end,
-}

lua/lazyvim/plugins/extras/editor/illuminate.lua

@@ -1,59 +0,0 @@
--- Automatically highlights other instances of the word under your cursor.
--- This works with LSP, Treesitter, and regexp matching to find the other
--- instances.
-return {
-  -- disable snacks words
-  { "snacks.nvim", opts = { words = { enabled = false } } },
-
-  {
-    "RRethy/vim-illuminate",
-    event = "LazyFile",
-    opts = {
-      delay = 200,
-      large_file_cutoff = 2000,
-      large_file_overrides = {
-        providers = { "lsp" },
-      },
-    },
-    config = function(_, opts)
-      require("illuminate").configure(opts)
-
-      Snacks.toggle({
-        name = "Illuminate",
-        get = function()
-          return not require("illuminate.engine").is_paused()
-        end,
-        set = function(enabled)
-          local m = require("illuminate")
-          if enabled then
-            m.resume()
-          else
-            m.pause()
-          end
-        end,
-      }):map("<leader>ux")
-
-      local function map(key, dir, buffer)
-        vim.keymap.set("n", key, function()
-          require("illuminate")["goto_" .. dir .. "_reference"](false)
-        end, { desc = dir:sub(1, 1):upper() .. dir:sub(2) .. " Reference", buffer = buffer })
-      end
-
-      map("]]", "next")
-      map("[[", "prev")
-
-      -- also set it after loading ftplugins, since a lot overwrite [[ and ]]
-      vim.api.nvim_create_autocmd("FileType", {
-        callback = function()
-          local buffer = vim.api.nvim_get_current_buf()
-          map("]]", "next", buffer)
-          map("[[", "prev", buffer)
-        end,
-      })
-    end,
-    keys = {
-      { "]]", desc = "Next Reference" },
-      { "[[", desc = "Prev Reference" },
-    },
-  },
-}

lua/lazyvim/plugins/extras/editor/inc-rename.lua

@@ -1,43 +0,0 @@
-return {
-
-  -- Rename with cmdpreview
-  recommended = true,
-  desc = "Incremental LSP renaming based on Neovim's command-preview feature",
-  {
-    "smjonas/inc-rename.nvim",
-    cmd = "IncRename",
-    opts = {},
-  },
-
-  -- LSP Keymaps
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        ["*"] = {
-          keys = {
-            {
-              "<leader>cr",
-              function()
-                local inc_rename = require("inc_rename")
-                return ":" .. inc_rename.config.cmd_name .. " " .. vim.fn.expand("<cword>")
-              end,
-              expr = true,
-              desc = "Rename (inc-rename.nvim)",
-              has = "rename",
-            },
-          },
-        },
-      },
-    },
-  },
-
-  --- Noice integration
-  {
-    "folke/noice.nvim",
-    optional = true,
-    opts = {
-      presets = { inc_rename = true },
-    },
-  },
-}

lua/lazyvim/plugins/extras/editor/leap.lua

@@ -1,60 +0,0 @@
-return {
-  -- disable flash
-  { "folke/flash.nvim", enabled = false, optional = true },
-
-  -- easily jump to any location and enhanced f/t motions for Leap
-  {
-    url = "https://codeberg.org/andyg/leap.nvim.git",
-    enabled = true,
-    keys = function()
-      ---@type LazyKeysSpec[]
-      local ret = {}
-      for _, key in ipairs({ "f", "F", "t", "T" }) do
-        ret[#ret + 1] = { key, mode = { "n", "x", "o" } }
-      end
-      return ret
-    end,
-    opts = { labeled_modes = "nx" },
-  },
-  {
-    url = "https://codeberg.org/andyg/leap.nvim.git",
-    enabled = true,
-    keys = {
-      { "s", mode = { "n", "x", "o" }, desc = "Leap Forward to" },
-      { "S", mode = { "n", "x", "o" }, desc = "Leap Backward to" },
-      { "gs", mode = { "n", "x", "o" }, desc = "Leap from Windows" },
-    },
-    config = function(_, opts)
-      local leap = require("leap")
-      for k, v in pairs(opts) do
-        leap.opts[k] = v
-      end
-      leap.add_default_mappings(true)
-      vim.keymap.del({ "x", "o" }, "x")
-      vim.keymap.del({ "x", "o" }, "X")
-    end,
-  },
-
-  -- rename surround mappings from gs to gz to prevent conflict with leap
-  {
-    "nvim-mini/mini.surround",
-    optional = true,
-    opts = {
-      mappings = {
-        add = "gza", -- Add surrounding in Normal and Visual modes
-        delete = "gzd", -- Delete surrounding
-        find = "gzf", -- Find surrounding (to the right)
-        find_left = "gzF", -- Find surrounding (to the left)
-        highlight = "gzh", -- Highlight surrounding
-        replace = "gzr", -- Replace surrounding
-        update_n_lines = "gzn", -- Update `n_lines`
-      },
-    },
-    keys = {
-      { "gz", "", desc = "+surround" },
-    },
-  },
-
-  -- makes some plugins dot-repeatable like leap
-  { "tpope/vim-repeat", event = "VeryLazy" },
-}

lua/lazyvim/plugins/extras/editor/mini-diff.lua

@@ -1,77 +0,0 @@
-return {
-  -- disable gitsigns.nvim
-  {
-    "lewis6991/gitsigns.nvim",
-    enabled = false,
-  },
-
-  -- setup mini.diff
-  {
-    "nvim-mini/mini.diff",
-    event = "VeryLazy",
-    keys = {
-      {
-        "<leader>go",
-        function()
-          require("mini.diff").toggle_overlay(0)
-        end,
-        desc = "Toggle mini.diff overlay",
-      },
-    },
-    opts = {
-      view = {
-        style = "sign",
-        signs = {
-          add = "▎",
-          change = "▎",
-          delete = "",
-        },
-      },
-    },
-  },
-  {
-    "mini.diff",
-    opts = function()
-      Snacks.toggle({
-        name = "Mini Diff Signs",
-        get = function()
-          return vim.g.minidiff_disable ~= true
-        end,
-        set = function(state)
-          vim.g.minidiff_disable = not state
-          if state then
-            require("mini.diff").enable(0)
-          else
-            require("mini.diff").disable(0)
-          end
-          -- HACK: redraw to update the signs
-          vim.defer_fn(function()
-            vim.cmd([[redraw!]])
-          end, 200)
-        end,
-      }):map("<leader>uG")
-    end,
-  },
-
-  -- lualine integration
-  {
-    "nvim-lualine/lualine.nvim",
-    opts = function(_, opts)
-      local x = opts.sections.lualine_x
-      for _, comp in ipairs(x) do
-        if comp[1] == "diff" then
-          comp.source = function()
-            local summary = vim.b.minidiff_summary
-            return summary
-              and {
-                added = summary.add,
-                modified = summary.change,
-                removed = summary.delete,
-              }
-          end
-          break
-        end
-      end
-    end,
-  },
-}

lua/lazyvim/plugins/extras/editor/mini-files.lua

@@ -1,111 +0,0 @@
-return {
-  "nvim-mini/mini.files",
-  opts = {
-    windows = {
-      preview = true,
-      width_focus = 30,
-      width_preview = 30,
-    },
-    options = {
-      -- Whether to use for editing directories
-      -- Disabled by default in LazyVim because neo-tree is used for that
-      use_as_default_explorer = false,
-    },
-  },
-  keys = {
-    {
-      "<leader>fm",
-      function()
-        require("mini.files").open(vim.api.nvim_buf_get_name(0), true)
-      end,
-      desc = "Open mini.files (Directory of Current File)",
-    },
-    {
-      "<leader>fM",
-      function()
-        require("mini.files").open(vim.uv.cwd(), true)
-      end,
-      desc = "Open mini.files (cwd)",
-    },
-  },
-  config = function(_, opts)
-    require("mini.files").setup(opts)
-
-    local show_dotfiles = true
-    local filter_show = function(fs_entry)
-      return true
-    end
-    local filter_hide = function(fs_entry)
-      return not vim.startswith(fs_entry.name, ".")
-    end
-
-    local toggle_dotfiles = function()
-      show_dotfiles = not show_dotfiles
-      local new_filter = show_dotfiles and filter_show or filter_hide
-      require("mini.files").refresh({ content = { filter = new_filter } })
-    end
-
-    local map_split = function(buf_id, lhs, direction, close_on_file)
-      local rhs = function()
-        local new_target_window
-        local cur_target_window = require("mini.files").get_explorer_state().target_window
-        if cur_target_window ~= nil then
-          vim.api.nvim_win_call(cur_target_window, function()
-            vim.cmd("belowright " .. direction .. " split")
-            new_target_window = vim.api.nvim_get_current_win()
-          end)
-
-          require("mini.files").set_target_window(new_target_window)
-          require("mini.files").go_in({ close_on_file = close_on_file })
-        end
-      end
-
-      local desc = "Open in " .. direction .. " split"
-      if close_on_file then
-        desc = desc .. " and close"
-      end
-      vim.keymap.set("n", lhs, rhs, { buffer = buf_id, desc = desc })
-    end
-
-    local files_set_cwd = function()
-      local cur_entry_path = MiniFiles.get_fs_entry().path
-      local cur_directory = vim.fs.dirname(cur_entry_path)
-      if cur_directory ~= nil then
-        vim.fn.chdir(cur_directory)
-      end
-    end
-
-    vim.api.nvim_create_autocmd("User", {
-      pattern = "MiniFilesBufferCreate",
-      callback = function(args)
-        local buf_id = args.data.buf_id
-
-        vim.keymap.set(
-          "n",
-          opts.mappings and opts.mappings.toggle_hidden or "g.",
-          toggle_dotfiles,
-          { buffer = buf_id, desc = "Toggle hidden files" }
-        )
-
-        vim.keymap.set(
-          "n",
-          opts.mappings and opts.mappings.change_cwd or "gc",
-          files_set_cwd,
-          { buffer = args.data.buf_id, desc = "Set cwd" }
-        )
-
-        map_split(buf_id, opts.mappings and opts.mappings.go_in_horizontal or "<C-w>s", "horizontal", false)
-        map_split(buf_id, opts.mappings and opts.mappings.go_in_vertical or "<C-w>v", "vertical", false)
-        map_split(buf_id, opts.mappings and opts.mappings.go_in_horizontal_plus or "<C-w>S", "horizontal", true)
-        map_split(buf_id, opts.mappings and opts.mappings.go_in_vertical_plus or "<C-w>V", "vertical", true)
-      end,
-    })
-
-    vim.api.nvim_create_autocmd("User", {
-      pattern = "MiniFilesActionRename",
-      callback = function(event)
-        Snacks.rename.on_rename_file(event.data.from, event.data.to)
-      end,
-    })
-  end,
-}

lua/lazyvim/plugins/extras/editor/mini-move.lua

@@ -1,7 +0,0 @@
-return {
-  {
-    "nvim-mini/mini.move",
-    event = "VeryLazy",
-    opts = {},
-  },
-}

lua/lazyvim/plugins/extras/editor/navic.lua

@@ -1,35 +0,0 @@
-return {
-  -- lsp symbol navigation for lualine. This shows where
-  -- in the code structure you are - within functions, classes,
-  -- etc - in the statusline.
-  {
-    "SmiteshP/nvim-navic",
-    lazy = true,
-    init = function()
-      vim.g.navic_silence = true
-    end,
-    opts = function()
-      Snacks.util.lsp.on({ method = "textDocument/documentSymbol" }, function(buffer, client)
-        require("nvim-navic").attach(client, buffer)
-      end)
-      return {
-        separator = " ",
-        highlight = true,
-        depth_limit = 5,
-        icons = LazyVim.config.icons.kinds,
-        lazy_update_context = true,
-      }
-    end,
-  },
-
-  -- lualine integration
-  {
-    "nvim-lualine/lualine.nvim",
-    optional = true,
-    opts = function(_, opts)
-      if not vim.g.trouble_lualine then
-        table.insert(opts.sections.lualine_c, { "navic", color_correction = "dynamic" })
-      end
-    end,
-  },
-}

lua/lazyvim/plugins/extras/editor/neo-tree.lua

@@ -1,128 +0,0 @@
-return {
-
-  -- file explorer
-  {
-    "nvim-neo-tree/neo-tree.nvim",
-    cmd = "Neotree",
-    keys = {
-      {
-        "<leader>fe",
-        function()
-          require("neo-tree.command").execute({ toggle = true, dir = LazyVim.root() })
-        end,
-        desc = "Explorer NeoTree (Root Dir)",
-      },
-      {
-        "<leader>fE",
-        function()
-          require("neo-tree.command").execute({ toggle = true, dir = vim.uv.cwd() })
-        end,
-        desc = "Explorer NeoTree (cwd)",
-      },
-      { "<leader>e", "<leader>fe", desc = "Explorer NeoTree (Root Dir)", remap = true },
-      { "<leader>E", "<leader>fE", desc = "Explorer NeoTree (cwd)", remap = true },
-      {
-        "<leader>ge",
-        function()
-          require("neo-tree.command").execute({ source = "git_status", toggle = true })
-        end,
-        desc = "Git Explorer",
-      },
-      {
-        "<leader>be",
-        function()
-          require("neo-tree.command").execute({ source = "buffers", toggle = true })
-        end,
-        desc = "Buffer Explorer",
-      },
-    },
-    deactivate = function()
-      vim.cmd([[Neotree close]])
-    end,
-    init = function()
-      -- FIX: use `autocmd` for lazy-loading neo-tree instead of directly requiring it,
-      -- because `cwd` is not set up properly.
-      vim.api.nvim_create_autocmd("BufEnter", {
-        group = vim.api.nvim_create_augroup("Neotree_start_directory", { clear = true }),
-        desc = "Start Neo-tree with directory",
-        once = true,
-        callback = function()
-          if package.loaded["neo-tree"] then
-            return
-          else
-            local stats = vim.uv.fs_stat(vim.fn.argv(0))
-            if stats and stats.type == "directory" then
-              require("neo-tree")
-            end
-          end
-        end,
-      })
-    end,
-    opts = {
-      sources = { "filesystem", "buffers", "git_status" },
-      open_files_do_not_replace_types = { "terminal", "Trouble", "trouble", "qf", "Outline" },
-      filesystem = {
-        bind_to_cwd = false,
-        follow_current_file = { enabled = true },
-        use_libuv_file_watcher = true,
-      },
-      window = {
-        mappings = {
-          ["l"] = "open",
-          ["h"] = "close_node",
-          ["<space>"] = "none",
-          ["Y"] = {
-            function(state)
-              local node = state.tree:get_node()
-              local path = node:get_id()
-              vim.fn.setreg("+", path, "c")
-            end,
-            desc = "Copy Path to Clipboard",
-          },
-          ["O"] = {
-            function(state)
-              require("lazy.util").open(state.tree:get_node().path, { system = true })
-            end,
-            desc = "Open with System Application",
-          },
-          ["P"] = { "toggle_preview", config = { use_float = false } },
-        },
-      },
-      default_component_configs = {
-        indent = {
-          with_expanders = true, -- if nil and file nesting is enabled, will enable expanders
-          expander_collapsed = "",
-          expander_expanded = "",
-          expander_highlight = "NeoTreeExpander",
-        },
-        git_status = {
-          symbols = {
-            unstaged = "󰄱",
-            staged = "󰱒",
-          },
-        },
-      },
-    },
-    config = function(_, opts)
-      local function on_move(data)
-        Snacks.rename.on_rename_file(data.source, data.destination)
-      end
-
-      local events = require("neo-tree.events")
-      opts.event_handlers = opts.event_handlers or {}
-      vim.list_extend(opts.event_handlers, {
-        { event = events.FILE_MOVED, handler = on_move },
-        { event = events.FILE_RENAMED, handler = on_move },
-      })
-      require("neo-tree").setup(opts)
-      vim.api.nvim_create_autocmd("TermClose", {
-        pattern = "*lazygit",
-        callback = function()
-          if package.loaded["neo-tree.sources.git_status"] then
-            require("neo-tree.sources.git_status").refresh()
-          end
-        end,
-      })
-    end,
-  },
-}

lua/lazyvim/plugins/extras/editor/outline.lua

@@ -1,61 +0,0 @@
-return {
-  -- Disable `<leader>cs` keymap so it doesn't conflict with `outline.nvim`
-  {
-    "folke/trouble.nvim",
-    optional = true,
-    keys = {
-      { "<leader>cs", false },
-    },
-  },
-  {
-    "hedyhli/outline.nvim",
-    keys = { { "<leader>cs", "<cmd>Outline<cr>", desc = "Toggle Outline" } },
-    cmd = "Outline",
-    opts = function()
-      local defaults = require("outline.config").defaults
-      local opts = {
-        symbols = {
-          icons = {},
-          filter = vim.deepcopy(LazyVim.config.kind_filter),
-        },
-        keymaps = {
-          up_and_jump = "<up>",
-          down_and_jump = "<down>",
-        },
-      }
-
-      for kind, symbol in pairs(defaults.symbols.icons) do
-        opts.symbols.icons[kind] = {
-          icon = LazyVim.config.icons.kinds[kind] or symbol.icon,
-          hl = symbol.hl,
-        }
-      end
-      return opts
-    end,
-  },
-
-  -- edgy integration
-  {
-    "folke/edgy.nvim",
-    optional = true,
-    opts = function(_, opts)
-      local edgy_idx = LazyVim.plugin.extra_idx("ui.edgy")
-      local symbols_idx = LazyVim.plugin.extra_idx("editor.outline")
-
-      if edgy_idx and edgy_idx > symbols_idx then
-        LazyVim.warn(
-          "The `edgy.nvim` extra must be **imported** before the `outline.nvim` extra to work properly.",
-          { title = "LazyVim" }
-        )
-      end
-
-      opts.right = opts.right or {}
-      table.insert(opts.right, {
-        title = "Outline",
-        ft = "Outline",
-        pinned = true,
-        open = "Outline",
-      })
-    end,
-  },
-}

lua/lazyvim/plugins/extras/editor/overseer.lua

@@ -1,84 +0,0 @@
-return {
-  {
-    "catppuccin",
-    optional = true,
-    opts = {
-      integrations = { overseer = true },
-    },
-  },
-  {
-    "stevearc/overseer.nvim",
-    lazy = false, -- plugin is self-lazy-loading
-    cmd = {
-      "OverseerOpen",
-      "OverseerClose",
-      "OverseerToggle",
-      "OverseerRun",
-      "OverseerTaskAction",
-    },
-    opts = {
-      dap = false,
-      task_list = {
-        keymaps = {
-          ["<C-j>"] = false,
-          ["<C-k>"] = false,
-        },
-      },
-      form = {
-        win_opts = {
-          winblend = 0,
-        },
-      },
-      task_win = {
-        win_opts = {
-          winblend = 0,
-        },
-      },
-    },
-    -- stylua: ignore
-    keys = {
-      { "<leader>ow", "<cmd>OverseerToggle!<cr>",    desc = "Task list" },
-      { "<leader>oo", "<cmd>OverseerRun<cr>",        desc = "Run task" },
-      { "<leader>ot", "<cmd>OverseerTaskAction<cr>", desc = "Task action" },
-    },
-  },
-  {
-    "folke/which-key.nvim",
-    optional = true,
-    opts = {
-      spec = {
-        { "<leader>o", group = "overseer" },
-      },
-    },
-  },
-  {
-    "folke/edgy.nvim",
-    optional = true,
-    opts = function(_, opts)
-      opts.right = opts.right or {}
-      table.insert(opts.right, {
-        title = "Overseer",
-        ft = "OverseerList",
-        open = function()
-          require("overseer").open()
-        end,
-      })
-    end,
-  },
-  {
-    "nvim-neotest/neotest",
-    optional = true,
-    opts = function(_, opts)
-      opts = opts or {}
-      opts.consumers = opts.consumers or {}
-      opts.consumers.overseer = require("neotest.consumers.overseer")
-    end,
-  },
-  {
-    "mfussenegger/nvim-dap",
-    optional = true,
-    opts = function()
-      require("overseer").enable_dap()
-    end,
-  },
-}

lua/lazyvim/plugins/extras/editor/refactoring.lua

@@ -1,88 +0,0 @@
-if LazyVim.has_extra("editor.refactoring") then
-  if vim.fn.has("nvim-0.12") == 0 then
-    LazyVim.error("refactoring.nvim requires Neovim 0.12 or higher", { title = "refactoring.nvim" })
-    return {}
-  end
-end
-
-return {
-  { "lewis6991/async.nvim", lazy = true },
-
-  {
-    "ThePrimeagen/refactoring.nvim",
-    event = { "BufReadPre", "BufNewFile" },
-    keys = {
-      { "<leader>r", "", desc = "+refactor", mode = { "n", "x" } },
-      {
-        "<leader>rs",
-        function()
-          return require("refactoring").select_refactor()
-        end,
-        mode = { "n", "x" },
-        desc = "Select Refactor",
-      },
-      {
-        "<leader>ri",
-        function()
-          return require("refactoring").inline_var()
-        end,
-        mode = { "n", "x" },
-        desc = "Inline Variable",
-        expr = true,
-      },
-      {
-        "<leader>rP",
-        function()
-          return require("refactoring.debug").print_loc({ output_location = "below" })
-        end,
-        desc = "Debug Print Location",
-        expr = true,
-      },
-      {
-        "<leader>rp",
-        function()
-          return require("refactoring.debug").print_var({ output_location = "below" }) .. "iw"
-        end,
-        mode = { "n", "x" },
-        desc = "Debug Print Variable",
-        expr = true,
-      },
-      {
-        "<leader>rc",
-        function()
-          return require("refactoring.debug").cleanup({ restore_view = true }) .. "ag"
-        end,
-        desc = "Debug Cleanup",
-        expr = true,
-      },
-      {
-        "<leader>rf",
-        function()
-          return require("refactoring").extract_func()
-        end,
-        mode = { "n", "x" },
-        desc = "Extract Function",
-        expr = true,
-      },
-      {
-        "<leader>rF",
-        function()
-          return require("refactoring").extract_func_to_file()
-        end,
-        mode = { "n", "x" },
-        desc = "Extract Function To File",
-        expr = true,
-      },
-      {
-        "<leader>rx",
-        function()
-          return require("refactoring").extract_var()
-        end,
-        mode = { "n", "x" },
-        desc = "Extract Variable",
-        expr = true,
-      },
-    },
-    opts = {},
-  },
-}

lua/lazyvim/plugins/extras/editor/snacks_explorer.lua

@@ -1,24 +0,0 @@
-return {
-  desc = "Snacks File Explorer",
-  recommended = true,
-  "folke/snacks.nvim",
-  opts = { explorer = {} },
-  keys = {
-    {
-      "<leader>fe",
-      function()
-        Snacks.explorer({ cwd = LazyVim.root() })
-      end,
-      desc = "Explorer Snacks (root dir)",
-    },
-    {
-      "<leader>fE",
-      function()
-        Snacks.explorer()
-      end,
-      desc = "Explorer Snacks (cwd)",
-    },
-    { "<leader>e", "<leader>fe", desc = "Explorer Snacks (root dir)", remap = true },
-    { "<leader>E", "<leader>fE", desc = "Explorer Snacks (cwd)", remap = true },
-  },
-}

lua/lazyvim/plugins/extras/editor/snacks_picker.lua

@@ -1,265 +0,0 @@
-if lazyvim_docs then
-  -- In case you don't want to use `:LazyExtras`,
-  -- then you need to set the option below.
-  vim.g.lazyvim_picker = "snacks"
-end
-
----@module 'snacks'
-
----@type LazyPicker
-local picker = {
-  name = "snacks",
-  commands = {
-    files = "files",
-    live_grep = "grep",
-    oldfiles = "recent",
-  },
-
-  ---@param source string
-  ---@param opts? snacks.picker.Config
-  open = function(source, opts)
-    return Snacks.picker.pick(source, opts)
-  end,
-}
-if not LazyVim.pick.register(picker) then
-  return {}
-end
-
-return {
-  desc = "Fast and modern file picker",
-  recommended = true,
-  {
-    "folke/snacks.nvim",
-    opts = {
-      picker = {
-        win = {
-          input = {
-            keys = {
-              ["<a-c>"] = {
-                "toggle_cwd",
-                mode = { "n", "i" },
-              },
-            },
-          },
-        },
-        actions = {
-          ---@param p snacks.Picker
-          toggle_cwd = function(p)
-            local root = LazyVim.root({ buf = p.input.filter.current_buf, normalize = true })
-            local cwd = vim.fs.normalize((vim.uv or vim.loop).cwd() or ".")
-            local current = p:cwd()
-            p:set_cwd(current == root and cwd or root)
-            p:find()
-          end,
-        },
-      },
-    },
-    -- stylua: ignore
-    keys = {
-      { "<leader>,", function() Snacks.picker.buffers() end, desc = "Buffers" },
-      { "<leader>/", LazyVim.pick("grep"), desc = "Grep (Root Dir)" },
-      { "<leader>:", function() Snacks.picker.command_history() end, desc = "Command History" },
-      { "<leader><space>", LazyVim.pick("files"), desc = "Find Files (Root Dir)" },
-      { "<leader>n", function() Snacks.picker.notifications() end, desc = "Notification History" },
-      -- find
-      { "<leader>fb", function() Snacks.picker.buffers() end, desc = "Buffers" },
-      { "<leader>fB", function() Snacks.picker.buffers({ hidden = true, nofile = true }) end, desc = "Buffers (all)" },
-      { "<leader>fc", LazyVim.pick.config_files(), desc = "Find Config File" },
-      { "<leader>ff", LazyVim.pick("files"), desc = "Find Files (Root Dir)" },
-      { "<leader>fF", LazyVim.pick("files", { root = false }), desc = "Find Files (cwd)" },
-      { "<leader>fg", function() Snacks.picker.git_files() end, desc = "Find Files (git-files)" },
-      { "<leader>fr", LazyVim.pick("oldfiles"), desc = "Recent" },
-      { "<leader>fR", function() Snacks.picker.recent({ filter = { cwd = true }}) end, desc = "Recent (cwd)" },
-      { "<leader>fp", function() Snacks.picker.projects() end, desc = "Projects" },
-      -- git
-      { "<leader>gd", function() Snacks.picker.git_diff() end, desc = "Git Diff (hunks)" },
-      { "<leader>gD", function() Snacks.picker.git_diff({ base = "origin", group = true }) end, desc = "Git Diff (origin)" },
-      { "<leader>gs", function() Snacks.picker.git_status() end, desc = "Git Status" },
-      { "<leader>gS", function() Snacks.picker.git_stash() end, desc = "Git Stash" },
-      { "<leader>gi", function() Snacks.picker.gh_issue() end, desc = "GitHub Issues (open)" },
-      { "<leader>gI", function() Snacks.picker.gh_issue({ state = "all" }) end, desc = "GitHub Issues (all)" },
-      { "<leader>gp", function() Snacks.picker.gh_pr() end, desc = "GitHub Pull Requests (open)" },
-      { "<leader>gP", function() Snacks.picker.gh_pr({ state = "all" }) end, desc = "GitHub Pull Requests (all)" },
-      -- Grep
-      { "<leader>sb", function() Snacks.picker.lines() end, desc = "Buffer Lines" },
-      { "<leader>sB", function() Snacks.picker.grep_buffers() end, desc = "Grep Open Buffers" },
-      { "<leader>sg", LazyVim.pick("live_grep"), desc = "Grep (Root Dir)" },
-      { "<leader>sG", LazyVim.pick("live_grep", { root = false }), desc = "Grep (cwd)" },
-      { "<leader>sp", function() Snacks.picker.lazy() end, desc = "Search for Plugin Spec" },
-      { "<leader>sw", LazyVim.pick("grep_word"), desc = "Visual selection or word (Root Dir)", mode = { "n", "x" } },
-      { "<leader>sW", LazyVim.pick("grep_word", { root = false }), desc = "Visual selection or word (cwd)", mode = { "n", "x" } },
-      -- search
-      { '<leader>s"', function() Snacks.picker.registers() end, desc = "Registers" },
-      { '<leader>s/', function() Snacks.picker.search_history() end, desc = "Search History" },
-      { "<leader>sa", function() Snacks.picker.autocmds() end, desc = "Autocmds" },
-      { "<leader>sc", function() Snacks.picker.command_history() end, desc = "Command History" },
-      { "<leader>sC", function() Snacks.picker.commands() end, desc = "Commands" },
-      { "<leader>sd", function() Snacks.picker.diagnostics() end, desc = "Diagnostics" },
-      { "<leader>sD", function() Snacks.picker.diagnostics_buffer() end, desc = "Buffer Diagnostics" },
-      { "<leader>sh", function() Snacks.picker.help() end, desc = "Help Pages" },
-      { "<leader>sH", function() Snacks.picker.highlights() end, desc = "Highlights" },
-      { "<leader>si", function() Snacks.picker.icons() end, desc = "Icons" },
-      { "<leader>sj", function() Snacks.picker.jumps() end, desc = "Jumps" },
-      { "<leader>sk", function() Snacks.picker.keymaps() end, desc = "Keymaps" },
-      { "<leader>sl", function() Snacks.picker.loclist() end, desc = "Location List" },
-      { "<leader>sM", function() Snacks.picker.man() end, desc = "Man Pages" },
-      { "<leader>sm", function() Snacks.picker.marks() end, desc = "Marks" },
-      { "<leader>sR", function() Snacks.picker.resume() end, desc = "Resume" },
-      { "<leader>sq", function() Snacks.picker.qflist() end, desc = "Quickfix List" },
-      { "<leader>su", function() Snacks.picker.undo() end, desc = "Undotree" },
-      -- ui
-      { "<leader>uC", function() Snacks.picker.colorschemes() end, desc = "Colorschemes" },
-    },
-  },
-  {
-    "folke/snacks.nvim",
-    opts = function(_, opts)
-      if LazyVim.has("trouble.nvim") then
-        return vim.tbl_deep_extend("force", opts or {}, {
-          picker = {
-            actions = {
-              trouble_open = function(...)
-                return require("trouble.sources.snacks").actions.trouble_open.action(...)
-              end,
-            },
-            win = {
-              input = {
-                keys = {
-                  ["<a-t>"] = {
-                    "trouble_open",
-                    mode = { "n", "i" },
-                  },
-                },
-              },
-            },
-          },
-        })
-      end
-    end,
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        ["*"] = {
-          -- stylua: ignore
-          keys = {
-            { "gd", function() Snacks.picker.lsp_definitions() end, desc = "Goto Definition", has = "definition" },
-            { "gr", function() Snacks.picker.lsp_references() end, nowait = true, desc = "References" },
-            { "gI", function() Snacks.picker.lsp_implementations() end, desc = "Goto Implementation" },
-            { "gy", function() Snacks.picker.lsp_type_definitions() end, desc = "Goto T[y]pe Definition" },
-            { "<leader>ss", function() Snacks.picker.lsp_symbols({ filter = LazyVim.config.kind_filter }) end, desc = "LSP Symbols", has = "documentSymbol" },
-            { "<leader>sS", function() Snacks.picker.lsp_workspace_symbols({ filter = LazyVim.config.kind_filter }) end, desc = "LSP Workspace Symbols", has = "workspace/symbols" },
-            { "gai", function() Snacks.picker.lsp_incoming_calls() end, desc = "C[a]lls Incoming", has = "callHierarchy/incomingCalls" },
-            { "gao", function() Snacks.picker.lsp_outgoing_calls() end, desc = "C[a]lls Outgoing", has = "callHierarchy/outgoingCalls" },
-          },
-        },
-      },
-    },
-  },
-  {
-    "folke/todo-comments.nvim",
-    optional = true,
-    -- stylua: ignore
-    keys = {
-      { "<leader>st", function() Snacks.picker.todo_comments() end, desc = "Todo" },
-      { "<leader>sT", function () Snacks.picker.todo_comments({ keywords = { "TODO", "FIX", "FIXME" } }) end, desc = "Todo/Fix/Fixme" },
-    },
-  },
-  {
-    "folke/snacks.nvim",
-    opts = function(_, opts)
-      table.insert(opts.dashboard.preset.keys, 3, {
-        icon = " ",
-        key = "p",
-        desc = "Projects",
-        action = ":lua Snacks.picker.projects()",
-      })
-    end,
-  },
-  {
-    "goolord/alpha-nvim",
-    optional = true,
-    opts = function(_, dashboard)
-      local button = dashboard.button("p", " " .. " Projects", [[<cmd> lua Snacks.picker.projects() <cr>]])
-      button.opts.hl = "AlphaButtons"
-      button.opts.hl_shortcut = "AlphaShortcut"
-      table.insert(dashboard.section.buttons.val, 4, button)
-    end,
-  },
-  {
-    "nvim-mini/mini.starter",
-    optional = true,
-    opts = function(_, opts)
-      local items = {
-        {
-          name = "Projects",
-          action = [[lua Snacks.picker.projects()]],
-          section = string.rep(" ", 22) .. "Telescope",
-        },
-      }
-      vim.list_extend(opts.items, items)
-    end,
-  },
-  {
-    "nvimdev/dashboard-nvim",
-    optional = true,
-    opts = function(_, opts)
-      if not vim.tbl_get(opts, "config", "center") then
-        return
-      end
-      local projects = {
-        action = "lua Snacks.picker.projects()",
-        desc = " Projects",
-        icon = " ",
-        key = "p",
-      }
-
-      projects.desc = projects.desc .. string.rep(" ", 43 - #projects.desc)
-      projects.key_format = "  %s"
-
-      table.insert(opts.config.center, 3, projects)
-    end,
-  },
-  {
-    "folke/flash.nvim",
-    optional = true,
-    specs = {
-      {
-        "folke/snacks.nvim",
-        opts = {
-          picker = {
-            win = {
-              input = {
-                keys = {
-                  ["<a-s>"] = { "flash", mode = { "n", "i" } },
-                  ["s"] = { "flash" },
-                },
-              },
-            },
-            actions = {
-              flash = function(picker)
-                require("flash").jump({
-                  pattern = "^",
-                  label = { after = { 0, 0 } },
-                  search = {
-                    mode = "search",
-                    exclude = {
-                      function(win)
-                        return vim.bo[vim.api.nvim_win_get_buf(win)].filetype ~= "snacks_picker_list"
-                      end,
-                    },
-                  },
-                  action = function(match)
-                    local idx = picker.list:row2idx(match.pos[1])
-                    picker.list:_move(idx, true, true)
-                  end,
-                })
-              end,
-            },
-          },
-        },
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/editor/telescope.lua

@@ -1,301 +0,0 @@
-if lazyvim_docs then
-  -- In case you don't want to use `:LazyExtras`,
-  -- then you need to set the option below.
-  vim.g.lazyvim_picker = "telescope"
-end
-
-local build_cmd ---@type string?
-for _, cmd in ipairs({ "make", "cmake", "gmake" }) do
-  if vim.fn.executable(cmd) == 1 then
-    build_cmd = cmd
-    break
-  end
-end
-
----@type LazyPicker
-local picker = {
-  name = "telescope",
-  commands = {
-    files = "find_files",
-  },
-  -- this will return a function that calls telescope.
-  -- cwd will default to lazyvim.util.get_root
-  -- for `files`, git_files or find_files will be chosen depending on .git
-  ---@param builtin string
-  ---@param opts? lazyvim.util.pick.Opts
-  open = function(builtin, opts)
-    opts = opts or {}
-    opts.follow = opts.follow ~= false
-    if opts.cwd and opts.cwd ~= vim.uv.cwd() then
-      local function open_cwd_dir()
-        local action_state = require("telescope.actions.state")
-        local line = action_state.get_current_line()
-        LazyVim.pick.open(
-          builtin,
-          vim.tbl_deep_extend("force", {}, opts or {}, {
-            root = false,
-            default_text = line,
-          })
-        )
-      end
-      ---@diagnostic disable-next-line: inject-field
-      opts.attach_mappings = function(_, map)
-        -- opts.desc is overridden by telescope, until it's changed there is this fix
-        map("i", "<a-c>", open_cwd_dir, { desc = "Open cwd Directory" })
-        return true
-      end
-    end
-
-    require("telescope.builtin")[builtin](opts)
-  end,
-}
-if not LazyVim.pick.register(picker) then
-  return {}
-end
-
-return {
-  -- Fuzzy finder.
-  -- The default key bindings to find files will use Telescope's
-  -- `find_files` or `git_files` depending on whether the
-  -- directory is a git repo.
-  {
-    "nvim-telescope/telescope.nvim",
-    cmd = "Telescope",
-    version = false, -- telescope did only one release, so use HEAD for now
-    dependencies = {
-      {
-        "nvim-telescope/telescope-fzf-native.nvim",
-        build = (build_cmd ~= "cmake") and "make"
-          or "cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build",
-        enabled = build_cmd ~= nil,
-        config = function(plugin)
-          LazyVim.on_load("telescope.nvim", function()
-            local ok, err = pcall(require("telescope").load_extension, "fzf")
-            if not ok then
-              local lib = plugin.dir .. "/build/libfzf." .. (LazyVim.is_win() and "dll" or "so")
-              if not vim.uv.fs_stat(lib) then
-                LazyVim.warn("`telescope-fzf-native.nvim` not built. Rebuilding...")
-                require("lazy").build({ plugins = { plugin }, show = false }):wait(function()
-                  LazyVim.info("Rebuilding `telescope-fzf-native.nvim` done.\nPlease restart Neovim.")
-                end)
-              else
-                LazyVim.error("Failed to load `telescope-fzf-native.nvim`:\n" .. err)
-              end
-            end
-          end)
-        end,
-      },
-    },
-    keys = {
-      {
-        "<leader>,",
-        "<cmd>Telescope buffers sort_mru=true sort_lastused=true<cr>",
-        desc = "Switch Buffer",
-      },
-      { "<leader>/", LazyVim.pick("live_grep"), desc = "Grep (Root Dir)" },
-      { "<leader>:", "<cmd>Telescope command_history<cr>", desc = "Command History" },
-      { "<leader><space>", LazyVim.pick("files"), desc = "Find Files (Root Dir)" },
-      -- find
-      {
-        "<leader>fb",
-        "<cmd>Telescope buffers sort_mru=true sort_lastused=true ignore_current_buffer=true<cr>",
-        desc = "Buffers",
-      },
-      { "<leader>fB", "<cmd>Telescope buffers<cr>", desc = "Buffers (all)" },
-      { "<leader>fc", LazyVim.pick.config_files(), desc = "Find Config File" },
-      { "<leader>ff", LazyVim.pick("files"), desc = "Find Files (Root Dir)" },
-      { "<leader>fF", LazyVim.pick("files", { root = false }), desc = "Find Files (cwd)" },
-      { "<leader>fg", "<cmd>Telescope git_files<cr>", desc = "Find Files (git-files)" },
-      { "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Recent" },
-      { "<leader>fR", LazyVim.pick("oldfiles", { cwd = vim.uv.cwd() }), desc = "Recent (cwd)" },
-      -- git
-      { "<leader>gc", "<cmd>Telescope git_commits<CR>", desc = "Commits" },
-      { "<leader>gl", "<cmd>Telescope git_commits<CR>", desc = "Commits" },
-      { "<leader>gs", "<cmd>Telescope git_status<CR>", desc = "Status" },
-      { "<leader>gS", "<cmd>Telescope git_stash<cr>", desc = "Git Stash" },
-      -- search
-      { '<leader>s"', "<cmd>Telescope registers<cr>", desc = "Registers" },
-      { "<leader>s/", "<cmd>Telescope search_history<cr>", desc = "Search History" },
-      { "<leader>sa", "<cmd>Telescope autocommands<cr>", desc = "Auto Commands" },
-      { "<leader>sb", "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Buffer Lines" },
-      { "<leader>sc", "<cmd>Telescope command_history<cr>", desc = "Command History" },
-      { "<leader>sC", "<cmd>Telescope commands<cr>", desc = "Commands" },
-      { "<leader>sd", "<cmd>Telescope diagnostics<cr>", desc = "Diagnostics" },
-      { "<leader>sD", "<cmd>Telescope diagnostics bufnr=0<cr>", desc = "Buffer Diagnostics" },
-      { "<leader>sg", LazyVim.pick("live_grep"), desc = "Grep (Root Dir)" },
-      { "<leader>sG", LazyVim.pick("live_grep", { root = false }), desc = "Grep (cwd)" },
-      { "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help Pages" },
-      { "<leader>sH", "<cmd>Telescope highlights<cr>", desc = "Search Highlight Groups" },
-      { "<leader>sj", "<cmd>Telescope jumplist<cr>", desc = "Jumplist" },
-      { "<leader>sk", "<cmd>Telescope keymaps<cr>", desc = "Key Maps" },
-      { "<leader>sl", "<cmd>Telescope loclist<cr>", desc = "Location List" },
-      { "<leader>sM", "<cmd>Telescope man_pages<cr>", desc = "Man Pages" },
-      { "<leader>sm", "<cmd>Telescope marks<cr>", desc = "Jump to Mark" },
-      { "<leader>so", "<cmd>Telescope vim_options<cr>", desc = "Options" },
-      { "<leader>sR", "<cmd>Telescope resume<cr>", desc = "Resume" },
-      { "<leader>sq", "<cmd>Telescope quickfix<cr>", desc = "Quickfix List" },
-      { "<leader>sw", LazyVim.pick("grep_string", { word_match = "-w" }), desc = "Word (Root Dir)" },
-      { "<leader>sW", LazyVim.pick("grep_string", { root = false, word_match = "-w" }), desc = "Word (cwd)" },
-      { "<leader>sw", LazyVim.pick("grep_string"), mode = "x", desc = "Selection (Root Dir)" },
-      { "<leader>sW", LazyVim.pick("grep_string", { root = false }), mode = "x", desc = "Selection (cwd)" },
-      { "<leader>uC", LazyVim.pick("colorscheme", { enable_preview = true }), desc = "Colorscheme with Preview" },
-      {
-        "<leader>ss",
-        function()
-          require("telescope.builtin").lsp_document_symbols({
-            symbols = LazyVim.config.get_kind_filter(),
-          })
-        end,
-        desc = "Goto Symbol",
-      },
-      {
-        "<leader>sS",
-        function()
-          require("telescope.builtin").lsp_dynamic_workspace_symbols({
-            symbols = LazyVim.config.get_kind_filter(),
-          })
-        end,
-        desc = "Goto Symbol (Workspace)",
-      },
-    },
-    opts = function()
-      local actions = require("telescope.actions")
-
-      local open_with_trouble = function(...)
-        return require("trouble.sources.telescope").open(...)
-      end
-      local find_files_no_ignore = function()
-        local action_state = require("telescope.actions.state")
-        local line = action_state.get_current_line()
-        LazyVim.pick("find_files", { no_ignore = true, default_text = line })()
-      end
-      local find_files_with_hidden = function()
-        local action_state = require("telescope.actions.state")
-        local line = action_state.get_current_line()
-        LazyVim.pick("find_files", { hidden = true, default_text = line })()
-      end
-
-      local function find_command()
-        if 1 == vim.fn.executable("rg") then
-          return { "rg", "--files", "--color", "never", "-g", "!.git" }
-        elseif 1 == vim.fn.executable("fd") then
-          return { "fd", "--type", "f", "--color", "never", "-E", ".git" }
-        elseif 1 == vim.fn.executable("fdfind") then
-          return { "fdfind", "--type", "f", "--color", "never", "-E", ".git" }
-        elseif 1 == vim.fn.executable("find") and vim.fn.has("win32") == 0 then
-          return { "find", ".", "-type", "f" }
-        elseif 1 == vim.fn.executable("where") then
-          return { "where", "/r", ".", "*" }
-        end
-      end
-
-      return {
-        defaults = {
-          prompt_prefix = " ",
-          selection_caret = " ",
-          -- open files in the first window that is an actual file.
-          -- use the current window if no other window is available.
-          get_selection_window = function()
-            local wins = vim.api.nvim_list_wins()
-            table.insert(wins, 1, vim.api.nvim_get_current_win())
-            for _, win in ipairs(wins) do
-              local buf = vim.api.nvim_win_get_buf(win)
-              if vim.bo[buf].buftype == "" then
-                return win
-              end
-            end
-            return 0
-          end,
-          mappings = {
-            i = {
-              ["<c-t>"] = open_with_trouble,
-              ["<a-t>"] = open_with_trouble,
-              ["<a-i>"] = find_files_no_ignore,
-              ["<a-h>"] = find_files_with_hidden,
-              ["<C-Down>"] = actions.cycle_history_next,
-              ["<C-Up>"] = actions.cycle_history_prev,
-              ["<C-f>"] = actions.preview_scrolling_down,
-              ["<C-b>"] = actions.preview_scrolling_up,
-            },
-            n = {
-              ["q"] = actions.close,
-            },
-          },
-        },
-        pickers = {
-          find_files = {
-            find_command = find_command,
-            hidden = true,
-          },
-        },
-      }
-    end,
-  },
-
-  -- Flash Telescope config
-  {
-    "nvim-telescope/telescope.nvim",
-    optional = true,
-    opts = function(_, opts)
-      if not LazyVim.has("flash.nvim") then
-        return
-      end
-      local function flash(prompt_bufnr)
-        require("flash").jump({
-          pattern = "^",
-          label = { after = { 0, 0 } },
-          search = {
-            mode = "search",
-            exclude = {
-              function(win)
-                return vim.bo[vim.api.nvim_win_get_buf(win)].filetype ~= "TelescopeResults"
-              end,
-            },
-          },
-          action = function(match)
-            local picker = require("telescope.actions.state").get_current_picker(prompt_bufnr)
-            picker:set_selection(match.pos[1] - 1)
-          end,
-        })
-      end
-      opts.defaults = vim.tbl_deep_extend("force", opts.defaults or {}, {
-        mappings = { n = { s = flash }, i = { ["<c-s>"] = flash } },
-      })
-    end,
-  },
-
-  -- better vim.ui with telescope
-  {
-    "stevearc/dressing.nvim",
-    lazy = true,
-    init = function()
-      ---@diagnostic disable-next-line: duplicate-set-field
-      vim.ui.select = function(...)
-        require("lazy").load({ plugins = { "dressing.nvim" } })
-        return vim.ui.select(...)
-      end
-      ---@diagnostic disable-next-line: duplicate-set-field
-      vim.ui.input = function(...)
-        require("lazy").load({ plugins = { "dressing.nvim" } })
-        return vim.ui.input(...)
-      end
-    end,
-  },
-
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        ["*"] = {
-          -- stylua: ignore
-          keys = {
-            { "gd", function() require("telescope.builtin").lsp_definitions({ reuse_win = true }) end, desc = "Goto Definition", has = "definition" },
-            { "gr", "<cmd>Telescope lsp_references<cr>", desc = "References", nowait = true },
-            { "gI", function() require("telescope.builtin").lsp_implementations({ reuse_win = true }) end, desc = "Goto Implementation" },
-            { "gy", function() require("telescope.builtin").lsp_type_definitions({ reuse_win = true }) end, desc = "Goto T[y]pe Definition" },
-          },
-        },
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/formatting/black.lua

@@ -1,26 +0,0 @@
-return {
-  {
-    "mason-org/mason.nvim",
-    opts = function(_, opts)
-      table.insert(opts.ensure_installed, "black")
-    end,
-  },
-  {
-    "nvimtools/none-ls.nvim",
-    optional = true,
-    opts = function(_, opts)
-      local nls = require("null-ls")
-      opts.sources = opts.sources or {}
-      table.insert(opts.sources, nls.builtins.formatting.black)
-    end,
-  },
-  {
-    "stevearc/conform.nvim",
-    optional = true,
-    opts = {
-      formatters_by_ft = {
-        ["python"] = { "black" },
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/formatting/prettier.lua

@@ -1,96 +1,15 @@
----@diagnostic disable: inject-field
-if lazyvim_docs then
-  -- Enable the option to require a Prettier config file
-  -- If no prettier config file is found, the formatter will not be used
-  vim.g.lazyvim_prettier_needs_config = false
-end
-
----@alias ConformCtx {buf: number, filename: string, dirname: string}
-local M = {}
-
-local supported = {
-  "css",
-  "graphql",
-  "handlebars",
-  "html",
-  "javascript",
-  "javascriptreact",
-  "json",
-  "jsonc",
-  "less",
-  "markdown",
-  "markdown.mdx",
-  "scss",
-  "typescript",
-  "typescriptreact",
-  "vue",
-  "yaml",
-}
-
---- Checks if a Prettier config file exists for the given context
----@param ctx ConformCtx
-function M.has_config(ctx)
-  vim.fn.system({ "prettier", "--find-config-path", ctx.filename })
-  return vim.v.shell_error == 0
-end
-
---- Checks if a parser can be inferred for the given context:
---- * If the filetype is in the supported list, return true
---- * Otherwise, check if a parser can be inferred
----@param ctx ConformCtx
-function M.has_parser(ctx)
-  local ft = vim.bo[ctx.buf].filetype --[[@as string]]
-  -- default filetypes are always supported
-  if vim.tbl_contains(supported, ft) then
-    return true
-  end
-  -- otherwise, check if a parser can be inferred
-  local ret = vim.fn.system({ "prettier", "--file-info", ctx.filename })
-  ---@type boolean, string?
-  local ok, parser = pcall(function()
-    return vim.fn.json_decode(ret).inferredParser
-  end)
-  return ok and parser and parser ~= vim.NIL
-end
-
-M.has_config = LazyVim.memoize(M.has_config)
-M.has_parser = LazyVim.memoize(M.has_parser)
-
 return {
   {
-    "mason-org/mason.nvim",
-    opts = { ensure_installed = { "prettier" } },
-  },
-
-  -- conform
-  {
-    "stevearc/conform.nvim",
-    optional = true,
-    ---@param opts ConformOpts
+    "williamboman/mason.nvim",
     opts = function(_, opts)
-      opts.formatters_by_ft = opts.formatters_by_ft or {}
-      for _, ft in ipairs(supported) do
-        opts.formatters_by_ft[ft] = opts.formatters_by_ft[ft] or {}
-        table.insert(opts.formatters_by_ft[ft], "prettier")
-      end
-
-      opts.formatters = opts.formatters or {}
-      opts.formatters.prettier = {
-        condition = function(_, ctx)
-          return M.has_parser(ctx) and (vim.g.lazyvim_prettier_needs_config ~= true or M.has_config(ctx))
-        end,
-      }
+      table.insert(opts.ensure_installed, "prettierd")
     end,
   },
-
-  -- none-ls support
   {
-    "nvimtools/none-ls.nvim",
-    optional = true,
+    "jose-elias-alvarez/null-ls.nvim",
     opts = function(_, opts)
       local nls = require("null-ls")
-      opts.sources = opts.sources or {}
-      table.insert(opts.sources, nls.builtins.formatting.prettier)
+      table.insert(opts.sources, nls.builtins.formatting.prettierd)
     end,
   },
 }

lua/lazyvim/plugins/extras/lang/angular.lua

@@ -1,71 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      root = {
-        "angular.json",
-        "nx.json", --support for nx workspace
-      },
-    })
-  end,
-
-  {
-    "nvim-treesitter",
-    opts = function(_, opts)
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "angular", "scss" })
-      end
-      vim.api.nvim_create_autocmd({ "BufReadPost", "BufNewFile" }, {
-        pattern = { "*.component.html", "*.container.html" },
-        callback = function()
-          vim.treesitter.start(nil, "angular")
-        end,
-      })
-    end,
-  },
-
-  -- angularls depends on typescript
-  { import = "lazyvim.plugins.extras.lang.typescript" },
-
-  -- LSP Servers
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        angularls = {},
-      },
-      setup = {
-        angularls = function()
-          Snacks.util.lsp.on({ name = "angularls" }, function(_, client)
-            --HACK: disable angular renaming capability due to duplicate rename popping up
-            client.server_capabilities.renameProvider = false
-          end)
-        end,
-      },
-    },
-  },
-
-  -- Configure tsserver plugin
-  {
-    "neovim/nvim-lspconfig",
-    opts = function(_, opts)
-      LazyVim.extend(opts.servers.vtsls, "settings.vtsls.tsserver.globalPlugins", {
-        {
-          name = "@angular/language-server",
-          location = LazyVim.get_pkg_path("angular-language-server", "/node_modules/@angular/language-server"),
-          enableForWorkspaceTypeScriptVersions = false,
-        },
-      })
-    end,
-  },
-
-  -- formatting
-  {
-    "conform.nvim",
-    opts = function(_, opts)
-      if LazyVim.has_extra("formatting.prettier") then
-        opts.formatters_by_ft = opts.formatters_by_ft or {}
-        opts.formatters_by_ft.htmlangular = { "prettier" }
-      end
-    end,
-  },
-}

lua/lazyvim/plugins/extras/lang/ansible.lua

@@ -1,35 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = "yaml.ansible",
-      root = { "ansible.cfg", ".ansible-lint" },
-    })
-  end,
-  {
-    "mason-org/mason.nvim",
-    opts = { ensure_installed = { "ansible-lint" } },
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        ansiblels = {},
-      },
-    },
-  },
-  {
-    "mfussenegger/nvim-ansible",
-    ft = { "yaml" },
-    keys = {
-      {
-        "<leader>ta",
-        function()
-          require("ansible").run()
-        end,
-        ft = "yaml.ansible",
-        desc = "Ansible Run Playbook/Role",
-        silent = true,
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/lang/astro.lua

@@ -1,56 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = "astro",
-      root = {
-        -- https://docs.astro.build/en/guides/configuring-astro/#supported-config-file-types
-        "astro.config.js",
-        "astro.config.mjs",
-        "astro.config.cjs",
-        "astro.config.ts",
-      },
-    })
-  end,
-
-  -- depends on the typescript extra
-  { import = "lazyvim.plugins.extras.lang.typescript" },
-
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "astro", "css" } },
-  },
-
-  -- LSP Servers
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        astro = {},
-      },
-    },
-  },
-
-  -- Configure tsserver plugin
-  {
-    "neovim/nvim-lspconfig",
-    opts = function(_, opts)
-      LazyVim.extend(opts.servers.vtsls, "settings.vtsls.tsserver.globalPlugins", {
-        {
-          name = "@astrojs/ts-plugin",
-          location = LazyVim.get_pkg_path("astro-language-server", "/node_modules/@astrojs/ts-plugin"),
-          enableForWorkspaceTypeScriptVersions = true,
-        },
-      })
-    end,
-  },
-
-  {
-    "conform.nvim",
-    opts = function(_, opts)
-      if LazyVim.has_extra("formatting.prettier") then
-        opts.formatters_by_ft = opts.formatters_by_ft or {}
-        opts.formatters_by_ft.astro = { "prettier" }
-      end
-    end,
-  },
-}

lua/lazyvim/plugins/extras/lang/clangd.lua

@@ -1,156 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = { "c", "cpp", "objc", "objcpp", "cuda", "proto" },
-      root = {
-        ".clangd",
-        ".clang-tidy",
-        ".clang-format",
-        "compile_commands.json",
-        "compile_flags.txt",
-        "configure.ac", -- AutoTools
-        "meson.build",
-        "build.ninja",
-      },
-    })
-  end,
-
-  -- Add C/C++ to treesitter
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "cpp" } },
-  },
-
-  {
-    "p00f/clangd_extensions.nvim",
-    ft = { "c", "cpp", "objc", "objcpp" },
-    opts = {
-      inlay_hints = {
-        inline = false,
-      },
-      ast = {
-        --These require codicons (https://github.com/microsoft/vscode-codicons)
-        role_icons = {
-          type = "",
-          declaration = "",
-          expression = "",
-          specifier = "",
-          statement = "",
-          ["template argument"] = "",
-        },
-        kind_icons = {
-          Compound = "",
-          Recovery = "",
-          TranslationUnit = "",
-          PackExpansion = "",
-          TemplateTypeParm = "",
-          TemplateTemplateParm = "",
-          TemplateParamObject = "",
-        },
-      },
-    },
-  },
-
-  -- Correctly setup lspconfig for clangd 🚀
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        -- Ensure mason installs the server
-        clangd = {
-          keys = {
-            { "<leader>ch", "<cmd>LspClangdSwitchSourceHeader<cr>", desc = "Switch Source/Header (C/C++)" },
-          },
-          root_markers = {
-            "compile_commands.json",
-            "compile_flags.txt",
-            "configure.ac", -- AutoTools
-            "Makefile",
-            "configure.ac",
-            "configure.in",
-            "config.h.in",
-            "meson.build",
-            "meson_options.txt",
-            "build.ninja",
-            ".git",
-          },
-          capabilities = {
-            offsetEncoding = { "utf-16" },
-          },
-          cmd = {
-            "clangd",
-            "--background-index",
-            "--clang-tidy",
-            "--header-insertion=iwyu",
-            "--completion-style=detailed",
-            "--function-arg-placeholders",
-            "--fallback-style=llvm",
-          },
-          init_options = {
-            usePlaceholders = true,
-            completeUnimported = true,
-            clangdFileStatus = true,
-          },
-        },
-      },
-    },
-  },
-
-  {
-    "hrsh7th/nvim-cmp",
-    optional = true,
-    opts = function(_, opts)
-      opts.sorting = opts.sorting or {}
-      opts.sorting.comparators = opts.sorting.comparators or {}
-      table.insert(opts.sorting.comparators, 1, require("clangd_extensions.cmp_scores"))
-    end,
-  },
-
-  {
-    "mfussenegger/nvim-dap",
-    optional = true,
-    dependencies = {
-      -- Ensure C/C++ debugger is installed
-      "mason-org/mason.nvim",
-      optional = true,
-      opts = { ensure_installed = { "codelldb" } },
-    },
-    opts = function()
-      local dap = require("dap")
-      if not dap.adapters["codelldb"] then
-        require("dap").adapters["codelldb"] = {
-          type = "server",
-          host = "localhost",
-          port = "${port}",
-          executable = {
-            command = "codelldb",
-            args = {
-              "--port",
-              "${port}",
-            },
-          },
-        }
-      end
-      for _, lang in ipairs({ "c", "cpp" }) do
-        dap.configurations[lang] = {
-          {
-            type = "codelldb",
-            request = "launch",
-            name = "Launch file",
-            program = function()
-              return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
-            end,
-            cwd = "${workspaceFolder}",
-          },
-          {
-            type = "codelldb",
-            request = "attach",
-            name = "Attach to process",
-            pid = require("dap.utils").pick_process,
-            cwd = "${workspaceFolder}",
-          },
-        }
-      end
-    end,
-  },
-}

lua/lazyvim/plugins/extras/lang/clojure.lua

@@ -1,98 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = { "clojure", "edn" },
-      root = { "project.clj", "deps.edn", "build.boot", "shadow-cljs.edn", "bb.edn" },
-    })
-  end,
-
-  -- Add Clojure & related to treesitter
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "clojure" } },
-  },
-
-  -- Extend auto completion
-  {
-    "hrsh7th/nvim-cmp",
-    optional = true,
-    dependencies = {
-      "PaterJason/cmp-conjure",
-    },
-    opts = function(_, opts)
-      if type(opts.sources) == "table" then
-        vim.list_extend(opts.sources, { name = "conjure" })
-      end
-    end,
-  },
-
-  -- Add s-exp mappings
-  { "julienvincent/nvim-paredit", opts = {}, event = "LazyFile" },
-
-  -- Colorize the output of the log buffer
-  {
-    "m00qek/baleia.nvim",
-    opts = {
-      line_starts_at = 3,
-    },
-    config = function(_, opts)
-      vim.g.conjure_baleia = require("baleia").setup(opts)
-
-      vim.api.nvim_create_user_command("BaleiaColorize", function()
-        vim.g.conjure_baleia.once(vim.api.nvim_get_current_buf())
-      end, { bang = true })
-
-      vim.api.nvim_create_user_command("BaleiaLogs", vim.g.conjure_baleia.logger.show, { bang = true })
-    end,
-  },
-
-  -- Use Clojure REPL
-  {
-    "Olical/conjure",
-    event = "LazyFile",
-    config = function(_, _)
-      require("conjure.main").main()
-    end,
-    init = function()
-      -- print color codes if baleia.nvim is available
-      local colorize = require("lazyvim.util").has("baleia.nvim")
-
-      if colorize then
-        vim.g["conjure#log#strip_ansi_escape_sequences_line_limit"] = 0
-      else
-        vim.g["conjure#log#strip_ansi_escape_sequences_line_limit"] = 1
-      end
-
-      -- disable diagnostics in log buffer and colorize it
-      vim.api.nvim_create_autocmd({ "BufWinEnter" }, {
-        pattern = "conjure-log-*",
-        callback = function()
-          local buffer = vim.api.nvim_get_current_buf()
-          vim.diagnostic.enable(false, { bufnr = buffer })
-
-          if colorize and vim.g.conjure_baleia then
-            vim.g.conjure_baleia.automatically(buffer)
-          end
-
-          vim.keymap.set(
-            { "n", "x" },
-            "[c",
-            "<CMD>call search('^; -\\+$', 'bw')<CR>",
-            { silent = true, buffer = true, desc = "Jumps to the begining of previous evaluation output." }
-          )
-          vim.keymap.set(
-            { "n", "x" },
-            "]c",
-            "<CMD>call search('^; -\\+$', 'w')<CR>",
-            { silent = true, buffer = true, desc = "Jumps to the begining of next evaluation output." }
-          )
-        end,
-      })
-
-      -- prefer LSP for jump-to-definition and symbol-doc, and use conjure
-      -- alternatives with <localleader>K and <localleader>gd
-      vim.g["conjure#mapping#doc_word"] = "K"
-      vim.g["conjure#mapping#def_word"] = "gd"
-    end,
-  },
-}

lua/lazyvim/plugins/extras/lang/cmake.lua

@@ -1,66 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = "cmake",
-      root = { "CMakePresets.json", "CTestConfig.cmake", "cmake" },
-    })
-  end,
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "cmake" } },
-  },
-  {
-    "nvimtools/none-ls.nvim",
-    optional = true,
-    opts = function(_, opts)
-      local nls = require("null-ls")
-      opts.sources = vim.list_extend(opts.sources or {}, {
-        nls.builtins.diagnostics.cmake_lint,
-      })
-    end,
-  },
-  {
-    "mfussenegger/nvim-lint",
-    optional = true,
-    opts = {
-      linters_by_ft = {
-        cmake = { "cmakelint" },
-      },
-    },
-  },
-  {
-    "mason.nvim",
-    opts = { ensure_installed = { "cmakelang", "cmakelint" } },
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        neocmake = {},
-      },
-    },
-  },
-  {
-    "Civitasv/cmake-tools.nvim",
-    lazy = true,
-    init = function()
-      local loaded = false
-      local function check()
-        local cwd = vim.uv.cwd()
-        if vim.fn.filereadable(cwd .. "/CMakeLists.txt") == 1 then
-          require("lazy").load({ plugins = { "cmake-tools.nvim" } })
-          loaded = true
-        end
-      end
-      check()
-      vim.api.nvim_create_autocmd("DirChanged", {
-        callback = function()
-          if not loaded then
-            check()
-          end
-        end,
-      })
-    end,
-    opts = {},
-  },
-}

lua/lazyvim/plugins/extras/lang/dart.lua

@@ -1,40 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = "dart",
-      root = { "pubspec.yaml" },
-    })
-  end,
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        dartls = {},
-      },
-    },
-  },
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "dart" } },
-  },
-  {
-    "stevearc/conform.nvim",
-    opts = {
-      formatters_by_ft = {
-        dart = { "dart_format" },
-      },
-    },
-  },
-  {
-    "nvim-neotest/neotest",
-    optional = true,
-    dependencies = {
-      "sidlatau/neotest-dart",
-    },
-    opts = {
-      adapters = {
-        ["neotest-dart"] = {},
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/lang/docker.lua

@@ -1,51 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = "dockerfile",
-      root = {
-        "Dockerfile",
-        "Containerfile",
-        "docker-compose.yml",
-        "compose.yml",
-        "docker-compose.yaml",
-        "compose.yaml",
-      },
-    })
-  end,
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "dockerfile" } },
-  },
-  {
-    "mason.nvim",
-    opts = { ensure_installed = { "hadolint" } },
-  },
-  {
-    "nvimtools/none-ls.nvim",
-    optional = true,
-    opts = function(_, opts)
-      local nls = require("null-ls")
-      opts.sources = vim.list_extend(opts.sources or {}, {
-        nls.builtins.diagnostics.hadolint,
-      })
-    end,
-  },
-  {
-    "mfussenegger/nvim-lint",
-    optional = true,
-    opts = {
-      linters_by_ft = {
-        dockerfile = { "hadolint" },
-      },
-    },
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        dockerls = {},
-        docker_compose_language_service = {},
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/lang/dotnet.lua

@@ -1,114 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = { "cs", "vb", "fsharp" },
-      root = { "*.sln", "*.csproj", "*.fsproj", "omnisharp.json", "function.json", "paket.dependencies", "paket.lock" },
-    })
-  end,
-
-  { "Hoffs/omnisharp-extended-lsp.nvim", lazy = true },
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "c_sharp", "fsharp" } },
-  },
-  {
-    "nvimtools/none-ls.nvim",
-    optional = true,
-    opts = function(_, opts)
-      local nls = require("null-ls")
-      opts.sources = opts.sources or {}
-      table.insert(opts.sources, nls.builtins.formatting.csharpier)
-      table.insert(opts.sources, nls.builtins.formatting.fantomas)
-    end,
-  },
-  {
-    "stevearc/conform.nvim",
-    optional = true,
-    opts = {
-      formatters_by_ft = {
-        cs = { "csharpier" },
-        fsharp = { "fantomas" },
-      },
-    },
-  },
-  {
-    "mason-org/mason.nvim",
-    opts = { ensure_installed = { "csharpier", "netcoredbg", "fantomas" } },
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        fsautocomplete = {},
-        omnisharp = {
-          handlers = {
-            ["textDocument/definition"] = function(...)
-              return require("omnisharp_extended").handler(...)
-            end,
-          },
-          keys = {
-            {
-              "gd",
-              LazyVim.has("telescope.nvim") and function()
-                require("omnisharp_extended").telescope_lsp_definitions()
-              end or function()
-                require("omnisharp_extended").lsp_definitions()
-              end,
-              desc = "Goto Definition",
-            },
-          },
-          enable_roslyn_analyzers = true,
-          organize_imports_on_format = true,
-          enable_import_completion = true,
-        },
-      },
-    },
-  },
-  {
-    "mfussenegger/nvim-dap",
-    optional = true,
-    opts = function()
-      local dap = require("dap")
-      if not dap.adapters["netcoredbg"] then
-        require("dap").adapters["netcoredbg"] = {
-          type = "executable",
-          command = vim.fn.exepath("netcoredbg"),
-          args = { "--interpreter=vscode" },
-          options = {
-            detached = false,
-          },
-        }
-      end
-      for _, lang in ipairs({ "cs", "fsharp", "vb" }) do
-        if not dap.configurations[lang] then
-          dap.configurations[lang] = {
-            {
-              type = "netcoredbg",
-              name = "Launch file",
-              request = "launch",
-              ---@diagnostic disable-next-line: redundant-parameter
-              program = function()
-                return vim.fn.input("Path to dll: ", vim.fn.getcwd() .. "/", "file")
-              end,
-              cwd = "${workspaceFolder}",
-            },
-          }
-        end
-      end
-    end,
-  },
-  {
-    "nvim-neotest/neotest",
-    optional = true,
-    dependencies = {
-      "Nsidorenco/neotest-vstest",
-    },
-    opts = {
-      adapters = {
-        ["neotest-vstest"] = {
-          -- Here we can set options for neotest-vstest
-        },
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/lang/elixir.lua

@@ -1,103 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = { "elixir", "eelixir", "heex", "surface", "livebook" },
-      root = "mix.exs",
-    })
-  end,
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        elixirls = {
-          keys = {
-            {
-              "<leader>cp",
-              function()
-                local params = vim.lsp.util.make_position_params()
-                LazyVim.lsp.execute({
-                  title = "toPipe",
-                  filter = "elixirls",
-                  command = "manipulatePipes:serverid",
-                  arguments = { "toPipe", params.textDocument.uri, params.position.line, params.position.character },
-                })
-              end,
-              desc = "To Pipe",
-            },
-            {
-              "<leader>cP",
-              function()
-                local params = vim.lsp.util.make_position_params()
-                LazyVim.lsp.execute({
-                  title = "fromPipe",
-                  filter = "elixirls",
-                  command = "manipulatePipes:serverid",
-                  arguments = { "fromPipe", params.textDocument.uri, params.position.line, params.position.character },
-                })
-              end,
-              desc = "From Pipe",
-            },
-          },
-        },
-      },
-    },
-  },
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "elixir", "heex", "eex" })
-      vim.treesitter.language.register("markdown", "livebook")
-    end,
-  },
-  {
-    "nvim-neotest/neotest",
-    optional = true,
-    dependencies = {
-      "jfpedroza/neotest-elixir",
-    },
-    opts = {
-      adapters = {
-        ["neotest-elixir"] = {},
-      },
-    },
-  },
-  {
-    "nvimtools/none-ls.nvim",
-    optional = true,
-    opts = function(_, opts)
-      local nls = require("null-ls")
-      opts.sources = vim.list_extend(opts.sources or {}, {
-        nls.builtins.diagnostics.credo.with({
-          condition = function(utils)
-            return utils.root_has_file(".credo.exs")
-          end,
-        }),
-      })
-    end,
-  },
-  {
-    "mfussenegger/nvim-lint",
-    optional = true,
-    opts = function(_, opts)
-      opts.linters_by_ft = {
-        elixir = { "credo" },
-      }
-
-      opts.linters = {
-        credo = {
-          condition = function(ctx)
-            return vim.fs.find({ ".credo.exs" }, { path = ctx.filename, upward = true })[1]
-          end,
-        },
-      }
-    end,
-  },
-  {
-    "MeanderingProgrammer/render-markdown.nvim",
-    optional = true,
-    ft = function(_, ft)
-      vim.list_extend(ft, { "livebook" })
-    end,
-  },
-}

lua/lazyvim/plugins/extras/lang/elm.lua

@@ -1,35 +0,0 @@
-return {
-  recommended = {
-    ft = { "elm" },
-    root = { "elm.json" },
-  },
-
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "elm" } },
-  },
-
-  {
-    "mason-org/mason.nvim",
-    opts = { ensure_installed = { "elm-format" } },
-  },
-
-  {
-    "stevearc/conform.nvim",
-    optional = true,
-    opts = {
-      formatters_by_ft = {
-        elm = { "elm_format" },
-      },
-    },
-  },
-
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        elmls = {},
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/lang/ember.lua

@@ -1,29 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = { "handlebars", "typescript", "javascript", "typescript.glimmer", "javascript.glimmer" },
-      root = { "ember-cli-build.js" },
-    })
-  end,
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "css", "glimmer", "glimmer_javascript", "glimmer_typescript" } },
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        ember = {},
-      },
-    },
-  },
-  {
-    "conform.nvim",
-    opts = function(_, opts)
-      if LazyVim.has_extra("formatting.prettier") then
-        opts.formatters_by_ft = opts.formatters_by_ft or {}
-        opts.formatters_by_ft.glimmer = { "prettier" }
-      end
-    end,
-  },
-}

lua/lazyvim/plugins/extras/lang/erlang.lua

@@ -1,20 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = { "erlang" },
-      root = { "rebar.config", "erlang.mk" },
-    })
-  end,
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        erlangls = {},
-      },
-    },
-  },
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "erlang" } },
-  },
-}

lua/lazyvim/plugins/extras/lang/git.lua

@@ -1,23 +0,0 @@
-return {
-  recommended = {
-    ft = { "gitcommit", "gitconfig", "gitrebase", "gitignore", "gitattributes" },
-  },
-  -- Treesitter git support
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "git_config", "gitcommit", "git_rebase", "gitignore", "gitattributes" } },
-  },
-
-  {
-    "hrsh7th/nvim-cmp",
-    optional = true,
-    dependencies = {
-      { "petertriho/cmp-git", opts = {} },
-    },
-    ---@module 'cmp'
-    ---@param opts cmp.ConfigSchema
-    opts = function(_, opts)
-      table.insert(opts.sources, { name = "git" })
-    end,
-  },
-}

lua/lazyvim/plugins/extras/lang/gleam.lua

@@ -1,29 +0,0 @@
-return {
-  recommended = {
-    ft = "gleam",
-    root = "gleam.toml",
-  },
-
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "gleam" } },
-  },
-
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        gleam = {},
-      },
-    },
-  },
-  {
-    "conform.nvim",
-    optional = true,
-    opts = {
-      formatters_by_ft = {
-        gleam = { "gleam" },
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/lang/go.lua

@@ -1,175 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = { "go", "gomod", "gowork", "gotmpl" },
-      root = { "go.work", "go.mod" },
-    })
-  end,
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "go", "gomod", "gowork", "gosum" } },
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        gopls = {
-          init_options = {
-            semanticTokens = true,
-          },
-          settings = {
-            gopls = {
-              gofumpt = true,
-              codelenses = {
-                gc_details = false,
-                generate = true,
-                regenerate_cgo = true,
-                run_govulncheck = true,
-                test = true,
-                tidy = true,
-                upgrade_dependency = true,
-                vendor = true,
-              },
-              hints = {
-                assignVariableTypes = true,
-                compositeLiteralFields = true,
-                compositeLiteralTypes = true,
-                constantValues = true,
-                functionTypeParameters = true,
-                parameterNames = true,
-                rangeVariableTypes = true,
-              },
-              analyses = {
-                nilness = true,
-                unusedparams = true,
-                unusedwrite = true,
-                useany = true,
-              },
-              usePlaceholders = true,
-              completeUnimported = true,
-              staticcheck = true,
-              directoryFilters = { "-.git", "-.vscode", "-.idea", "-.vscode-test", "-node_modules" },
-            },
-          },
-        },
-      },
-      setup = {
-        gopls = function(_, opts)
-          -- workaround for gopls not supporting semanticTokensProvider
-          -- https://github.com/golang/go/issues/54531#issuecomment-1464982242
-          Snacks.util.lsp.on({ name = "gopls" }, function(_, client)
-            if
-              client.config
-              and client.config.init_options
-              and client.config.init_options.semanticTokens
-              and not client.server_capabilities.semanticTokensProvider
-            then
-              local semantic = client.config.capabilities.textDocument.semanticTokens
-              client.server_capabilities.semanticTokensProvider = {
-                full = true,
-                legend = {
-                  tokenTypes = semantic.tokenTypes,
-                  tokenModifiers = semantic.tokenModifiers,
-                },
-                range = true,
-              }
-            end
-          end)
-          -- end workaround
-        end,
-      },
-    },
-  },
-  -- Ensure Go tools are installed
-  {
-    "mason-org/mason.nvim",
-    opts = { ensure_installed = { "goimports", "gofumpt" } },
-  },
-  {
-    "nvimtools/none-ls.nvim",
-    optional = true,
-    dependencies = {
-      {
-        "mason-org/mason.nvim",
-        opts = { ensure_installed = { "gomodifytags", "impl" } },
-      },
-    },
-    opts = function(_, opts)
-      local nls = require("null-ls")
-      opts.sources = vim.list_extend(opts.sources or {}, {
-        nls.builtins.code_actions.gomodifytags,
-        nls.builtins.code_actions.impl,
-        nls.builtins.formatting.goimports,
-        nls.builtins.formatting.gofumpt,
-      })
-    end,
-  },
-  -- Add linting
-  {
-    "mfussenegger/nvim-lint",
-    optional = true,
-    dependencies = {
-      {
-        "mason-org/mason.nvim",
-        opts = { ensure_installed = { "golangci-lint" } },
-      },
-    },
-    opts = {
-      linters_by_ft = {
-        go = { "golangcilint" },
-      },
-    },
-  },
-  {
-    "stevearc/conform.nvim",
-    optional = true,
-    opts = {
-      formatters_by_ft = {
-        go = { "goimports", "gofumpt" },
-      },
-    },
-  },
-  {
-    "mfussenegger/nvim-dap",
-    optional = true,
-    dependencies = {
-      {
-        "mason-org/mason.nvim",
-        opts = { ensure_installed = { "delve" } },
-      },
-      {
-        "leoluz/nvim-dap-go",
-        opts = {},
-      },
-    },
-  },
-  {
-    "nvim-neotest/neotest",
-    optional = true,
-    dependencies = {
-      "fredrikaverpil/neotest-golang",
-    },
-    opts = {
-      adapters = {
-        ["neotest-golang"] = {
-          -- Here we can set options for neotest-golang, e.g.
-          -- go_test_args = { "-v", "-race", "-count=1", "-timeout=60s" },
-          dap_go_enabled = true, -- requires leoluz/nvim-dap-go
-        },
-      },
-    },
-  },
-
-  -- Filetype icons
-  {
-    "nvim-mini/mini.icons",
-    opts = {
-      file = {
-        [".go-version"] = { glyph = "", hl = "MiniIconsBlue" },
-      },
-      filetype = {
-        gotmpl = { glyph = "󰟓", hl = "MiniIconsGrey" },
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/lang/haskell.lua

@@ -1,149 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = { "haskell", "lhaskell" },
-      root = { "hie.yaml", "stack.yaml", "cabal.project", "*.cabal", "package.yaml" },
-    })
-  end,
-
-  -- Add Haskell to treesitter
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "haskell" } },
-  },
-
-  {
-    "mrcjkb/haskell-tools.nvim",
-    version = false,
-    ft = { "haskell", "lhaskell", "cabal", "cabalproject" },
-    keys = {
-      {
-        "<localleader>e",
-        "<cmd>HlsEvalAll<cr>",
-        ft = "haskell",
-        desc = "Evaluate All",
-      },
-      {
-        "<localleader>h",
-        function()
-          require("haskell-tools").hoogle.hoogle_signature()
-        end,
-        ft = "haskell",
-        desc = "Hoogle Signature",
-      },
-      {
-        "<localleader>r",
-        function()
-          require("haskell-tools").repl.toggle()
-        end,
-        ft = "haskell",
-        desc = "REPL (Package)",
-      },
-      {
-        "<localleader>R",
-        function()
-          require("haskell-tools").repl.toggle(vim.api.nvim_buf_get_name(0))
-        end,
-        ft = "haskell",
-        desc = "REPL (Buffer)",
-      },
-    },
-  },
-
-  {
-    "mason-org/mason.nvim",
-    opts = { ensure_installed = { "haskell-language-server" } },
-  },
-
-  {
-    "mfussenegger/nvim-dap",
-    optional = true,
-    dependencies = {
-      {
-        "mason-org/mason.nvim",
-        opts = { ensure_installed = { "haskell-debug-adapter" } },
-      },
-    },
-  },
-
-  {
-    "nvim-neotest/neotest",
-    optional = true,
-    dependencies = {
-      { "mrcjkb/neotest-haskell" },
-    },
-    opts = {
-      adapters = {
-        ["neotest-haskell"] = {},
-      },
-    },
-  },
-
-  {
-    "mrcjkb/haskell-snippets.nvim",
-    dependencies = { "L3MON4D3/LuaSnip" },
-    ft = { "haskell", "lhaskell", "cabal", "cabalproject" },
-    config = function()
-      local haskell_snippets = require("haskell-snippets").all
-      require("luasnip").add_snippets("haskell", haskell_snippets, { key = "haskell" })
-    end,
-  },
-
-  {
-    "nvim-telescope/telescope.nvim",
-    optional = true,
-    specs = {
-      {
-        "luc-tielen/telescope_hoogle",
-        ft = { "haskell", "lhaskell", "cabal", "cabalproject" },
-        opts = function()
-          LazyVim.on_load("telescope.nvim", function()
-            require("telescope").load_extension("ht")
-          end)
-        end,
-        keys = {
-          {
-            "<localleader>H",
-            "<cmd>Telescope hoogle<cr>",
-            ft = "haskell",
-            desc = "Hoogle",
-          },
-        },
-      },
-    },
-  },
-
-  {
-    "stevearc/conform.nvim",
-    optional = true,
-    opts = {
-      formatters_by_ft = {
-        haskell = { "fourmolu" },
-        cabal = { "cabal_fmt" },
-      },
-    },
-  },
-
-  {
-    "mfussenegger/nvim-lint",
-    optional = true,
-    opts = {
-      linters_by_ft = {
-        haskell = { "hlint" },
-      },
-    },
-  },
-
-  -- Make sure lspconfig doesn't start hls,
-  -- as it conflicts with haskell-tools
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      setup = {
-        hls = function()
-          return true
-        end,
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/lang/helm.lua

@@ -1,24 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = "helm",
-      root = "Chart.yaml",
-    })
-  end,
-
-  { "qvalentin/helm-ls.nvim", ft = "helm" },
-
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "helm" } },
-  },
-
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        helm_ls = {},
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/lang/java.lua

@@ -1,287 +0,0 @@
--- This is the same as in lspconfig.configs.jdtls, but avoids
--- needing to require that when this module loads.
-local java_filetypes = { "java" }
-
--- Utility function to extend or override a config table, similar to the way
--- that Plugin.opts works.
----@param config table
----@param custom function | table | nil
-local function extend_or_override(config, custom, ...)
-  if type(custom) == "function" then
-    config = custom(config, ...) or config
-  elseif custom then
-    config = vim.tbl_deep_extend("force", config, custom) --[[@as table]]
-  end
-  return config
-end
-
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = "java",
-      root = {
-        "build.gradle",
-        "build.gradle.kts",
-        "build.xml", -- Ant
-        "pom.xml", -- Maven
-        "settings.gradle", -- Gradle
-        "settings.gradle.kts", -- Gradle
-      },
-    })
-  end,
-
-  -- Add java to treesitter.
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "java" } },
-  },
-
-  -- Ensure java debugger and test packages are installed.
-  {
-    "mfussenegger/nvim-dap",
-    optional = true,
-    opts = function()
-      -- Simple configuration to attach to remote java debug process
-      -- Taken directly from https://github.com/mfussenegger/nvim-dap/wiki/Java
-      local dap = require("dap")
-      dap.configurations.java = {
-        {
-          type = "java",
-          request = "attach",
-          name = "Debug (Attach) - Remote",
-          hostName = "127.0.0.1",
-          port = 5005,
-        },
-      }
-    end,
-    dependencies = {
-      {
-        "mason-org/mason.nvim",
-        opts = { ensure_installed = { "java-debug-adapter", "java-test" } },
-      },
-    },
-  },
-
-  -- Configure nvim-lspconfig to install the server automatically via mason, but
-  -- defer actually starting it to our configuration of nvim-jtdls below.
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      -- make sure mason installs the server
-      servers = {
-        jdtls = {},
-      },
-      setup = {
-        jdtls = function()
-          return true -- avoid duplicate servers
-        end,
-      },
-    },
-  },
-
-  -- Set up nvim-jdtls to attach to java files.
-  {
-    "mfussenegger/nvim-jdtls",
-    dependencies = { "folke/which-key.nvim" },
-    ft = java_filetypes,
-    opts = function()
-      local cmd = { vim.fn.exepath("jdtls") }
-      if LazyVim.has("mason.nvim") then
-        local lombok_jar = vim.fn.expand("$MASON/share/jdtls/lombok.jar")
-        table.insert(cmd, string.format("--jvm-arg=-javaagent:%s", lombok_jar))
-      end
-      return {
-        root_dir = function(path)
-          return vim.fs.root(path, vim.lsp.config.jdtls.root_markers)
-        end,
-
-        -- How to find the project name for a given root dir.
-        project_name = function(root_dir)
-          return root_dir and vim.fs.basename(root_dir)
-        end,
-
-        -- Where are the config and workspace dirs for a project?
-        jdtls_config_dir = function(project_name)
-          return vim.fn.stdpath("cache") .. "/jdtls/" .. project_name .. "/config"
-        end,
-        jdtls_workspace_dir = function(project_name)
-          return vim.fn.stdpath("cache") .. "/jdtls/" .. project_name .. "/workspace"
-        end,
-
-        -- How to run jdtls. This can be overridden to a full java command-line
-        -- if the Python wrapper script doesn't suffice.
-        cmd = cmd,
-        full_cmd = function(opts)
-          local fname = vim.api.nvim_buf_get_name(0)
-          local root_dir = opts.root_dir(fname)
-          local project_name = opts.project_name(root_dir)
-          local cmd = vim.deepcopy(opts.cmd)
-          if project_name then
-            vim.list_extend(cmd, {
-              "-configuration",
-              opts.jdtls_config_dir(project_name),
-              "-data",
-              opts.jdtls_workspace_dir(project_name),
-            })
-          end
-          return cmd
-        end,
-
-        -- These depend on nvim-dap, but can additionally be disabled by setting false here.
-        dap = { hotcodereplace = "auto", config_overrides = {} },
-        -- Can set this to false to disable main class scan, which is a performance killer for large project
-        dap_main = {},
-        test = true,
-        settings = {
-          java = {
-            inlayHints = {
-              parameterNames = {
-                enabled = "all",
-              },
-            },
-          },
-        },
-      }
-    end,
-    config = function(_, opts)
-      -- Find the extra bundles that should be passed on the jdtls command-line
-      -- if nvim-dap is enabled with java debug/test.
-      local bundles = {} ---@type string[]
-      if LazyVim.has("mason.nvim") then
-        local mason_registry = require("mason-registry")
-        if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
-          bundles = vim.fn.glob("$MASON/share/java-debug-adapter/com.microsoft.java.debug.plugin-*jar", false, true)
-          -- java-test also depends on java-debug-adapter.
-          if opts.test and mason_registry.is_installed("java-test") then
-            vim.list_extend(bundles, vim.fn.glob("$MASON/share/java-test/*.jar", false, true))
-          end
-        end
-      end
-      local function attach_jdtls()
-        local fname = vim.api.nvim_buf_get_name(0)
-
-        -- Configuration can be augmented and overridden by opts.jdtls
-        local config = extend_or_override({
-          cmd = opts.full_cmd(opts),
-          root_dir = opts.root_dir(fname),
-          init_options = {
-            bundles = bundles,
-          },
-          settings = opts.settings,
-          -- enable CMP capabilities
-          capabilities = LazyVim.has("blink.cmp") and require("blink.cmp").get_lsp_capabilities() or LazyVim.has(
-            "cmp-nvim-lsp"
-          ) and require("cmp_nvim_lsp").default_capabilities() or nil,
-        }, opts.jdtls)
-
-        -- Existing server will be reused if the root_dir matches.
-        require("jdtls").start_or_attach(config)
-        -- not need to require("jdtls.setup").add_commands(), start automatically adds commands
-      end
-
-      -- Attach the jdtls for each java buffer. HOWEVER, this plugin loads
-      -- depending on filetype, so this autocmd doesn't run for the first file.
-      -- For that, we call directly below.
-      vim.api.nvim_create_autocmd("FileType", {
-        pattern = java_filetypes,
-        callback = attach_jdtls,
-      })
-
-      -- Setup keymap and dap after the lsp is fully attached.
-      -- https://github.com/mfussenegger/nvim-jdtls#nvim-dap-configuration
-      -- https://neovim.io/doc/user/lsp.html#LspAttach
-      vim.api.nvim_create_autocmd("LspAttach", {
-        callback = function(args)
-          local client = vim.lsp.get_client_by_id(args.data.client_id)
-          if client and client.name == "jdtls" then
-            local wk = require("which-key")
-            wk.add({
-              {
-                mode = "n",
-                buffer = args.buf,
-                { "<leader>cx", group = "extract" },
-                { "<leader>cxv", require("jdtls").extract_variable_all, desc = "Extract Variable" },
-                { "<leader>cxc", require("jdtls").extract_constant, desc = "Extract Constant" },
-                { "<leader>cgs", require("jdtls").super_implementation, desc = "Goto Super" },
-                { "<leader>cgS", require("jdtls.tests").goto_subjects, desc = "Goto Subjects" },
-                { "<leader>co", require("jdtls").organize_imports, desc = "Organize Imports" },
-              },
-            })
-            wk.add({
-              {
-                mode = "x",
-                buffer = args.buf,
-                { "<leader>cx", group = "extract" },
-                {
-                  "<leader>cxm",
-                  [[<ESC><CMD>lua require('jdtls').extract_method(true)<CR>]],
-                  desc = "Extract Method",
-                },
-                {
-                  "<leader>cxv",
-                  [[<ESC><CMD>lua require('jdtls').extract_variable_all(true)<CR>]],
-                  desc = "Extract Variable",
-                },
-                {
-                  "<leader>cxc",
-                  [[<ESC><CMD>lua require('jdtls').extract_constant(true)<CR>]],
-                  desc = "Extract Constant",
-                },
-              },
-            })
-
-            if LazyVim.has("mason.nvim") then
-              local mason_registry = require("mason-registry")
-              if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
-                -- custom init for Java debugger
-                require("jdtls").setup_dap(opts.dap)
-                if opts.dap_main then
-                  require("jdtls.dap").setup_dap_main_class_configs(opts.dap_main)
-                end
-
-                -- Java Test require Java debugger to work
-                if opts.test and mason_registry.is_installed("java-test") then
-                  -- custom keymaps for Java test runner (not yet compatible with neotest)
-                  wk.add({
-                    {
-                      mode = "n",
-                      buffer = args.buf,
-                      { "<leader>t", group = "test" },
-                      {
-                        "<leader>tt",
-                        function()
-                          require("jdtls.dap").test_class({
-                            config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
-                          })
-                        end,
-                        desc = "Run All Test",
-                      },
-                      {
-                        "<leader>tr",
-                        function()
-                          require("jdtls.dap").test_nearest_method({
-                            config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
-                          })
-                        end,
-                        desc = "Run Nearest Test",
-                      },
-                      { "<leader>tT", require("jdtls.dap").pick_test, desc = "Run Test" },
-                    },
-                  })
-                end
-              end
-            end
-
-            -- User can set additional keymaps in opts.on_attach
-            if opts.on_attach then
-              opts.on_attach(args)
-            end
-          end
-        end,
-      })
-
-      -- Avoid race condition by calling attach the first time, since the autocmd won't fire.
-      attach_jdtls()
-    end,
-  },
-}

lua/lazyvim/plugins/extras/lang/json.lua

@@ -1,33 +1,28 @@
 return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = { "json", "jsonc", "json5" },
-      root = { "*.json" },
-    })
-  end,
 
   -- add json to treesitter
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "json5" } },
-  },
-
-  -- yaml schema support
-  {
-    "b0o/SchemaStore.nvim",
-    lazy = true,
-    version = false, -- last release is way too old
+    opts = function(_, opts)
+      if type(opts.ensure_installed) == "table" then
+        vim.list_extend(opts.ensure_installed, { "json", "json5", "jsonc" })
+      end
+    end,
   },
 
   -- correctly setup lspconfig
   {
     "neovim/nvim-lspconfig",
+    dependencies = {
+      "b0o/SchemaStore.nvim",
+      version = false, -- last release is way too old
+    },
     opts = {
       -- make sure mason installs the server
       servers = {
         jsonls = {
           -- lazy-load schemastore when needed
-          before_init = function(_, new_config)
+          on_new_config = function(new_config)
             new_config.settings.json.schemas = new_config.settings.json.schemas or {}
             vim.list_extend(new_config.settings.json.schemas, require("schemastore").json.schemas())
           end,