.github/.release-please-manifest.json

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

.markdownlint-cli2.yaml

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

CHANGELOG.md

@@ -1,707 +1,5 @@
 # Changelog
 
-## [16.0.0](https://github.com/LazyVim/LazyVim/compare/v15.15.0...v16.0.0) (2026-05-27)
-
-
-### ⚠ BREAKING CHANGES
-
-* **refactoring:** conform to upstream breaking changes on 2.0 branch ([#7124](https://github.com/LazyVim/LazyVim/issues/7124))
-
-### Features
-
-* **keymaps:** added leader+bi to delete invisible buffers ([58089db](https://github.com/LazyVim/LazyVim/commit/58089db8b198fc81f91789b6f12d0617cae21437))
-
-
-### Bug Fixes
-
-* **autocmds:** correct version check for nvim-0.13 ([#7184](https://github.com/LazyVim/LazyVim/issues/7184)) ([6eb16e7](https://github.com/LazyVim/LazyVim/commit/6eb16e730d1a686224dca41b05ba125cfd62c1bb))
-* **autocmds:** replace `vim.hl.on_yank` with `vim.hl.hl_op` for `nvim-0.13` and above ([#7171](https://github.com/LazyVim/LazyVim/issues/7171)) ([b30c031](https://github.com/LazyVim/LazyVim/commit/b30c0312ea1c5bed6b28e72d930059622b0525f8))
-* **go:** use semanticTokens if setup in gopls config init_options ([#7172](https://github.com/LazyVim/LazyVim/issues/7172)) ([b830a52](https://github.com/LazyVim/LazyVim/commit/b830a523b5973c300639d4d9c4fea7d92fa04dc3))
-* **hipatterns:** don't color #add (use it too often as a private function in TS) ([dc6240f](https://github.com/LazyVim/LazyVim/commit/dc6240f4d56ae0d40cd0e673ca740dda50c4bf3b))
-* **oxc:** prefer top-level oxlint root_dir in monorepos ([d840410](https://github.com/LazyVim/LazyVim/commit/d840410047d20a8f93fb8d473599209ebe95584e))
-* **refactoring:** conform to upstream breaking changes on 2.0 branch ([#7124](https://github.com/LazyVim/LazyVim/issues/7124)) ([d926923](https://github.com/LazyVim/LazyVim/commit/d92692309c41581e1f839033fbccd745be732c7e))
-
-## [15.15.0](https://github.com/LazyVim/LazyVim/compare/v15.14.0...v15.15.0) (2026-04-02)
-
-
-### Features
-
-* **biome:** enable biome lsp for linting ([b2830cf](https://github.com/LazyVim/LazyVim/commit/b2830cfcc5c9c09ebbf9545beb3947a55ce89dbd))
-* **biome:** move biome extra from formatting.biome -> lang.typescript.biome ([242f098](https://github.com/LazyVim/LazyVim/commit/242f0983de9fdb70f0d82057a8039e32bc171764))
-* **lazydev:** make lspconfig types available on word `lspconfig.settings` ([36f5947](https://github.com/LazyVim/LazyVim/commit/36f594716bcb0bec84a05a6c55f702134d2e89c3))
-* **lsp:** auto add organizeImport keymaps for LSPs that support it ([e54689e](https://github.com/LazyVim/LazyVim/commit/e54689ebdc5458cb30f4a48b954c710bb381cd01))
-* **oxc:** added oxc extra for oxfmt and oxlint ([4e9eac5](https://github.com/LazyVim/LazyVim/commit/4e9eac57aba1ea575ef008a503cba8327257e4a4))
-* **sidekick:** ctrl+. focuses sidekick, but when already inside sidekick, hides it ([50159fe](https://github.com/LazyVim/LazyVim/commit/50159fe344d93329a569cee136c0323e48b0d3da))
-* **typescript:** set `vim.g.lazyvim_ts_lsp = "tsgo"` to use the much faster experimental lsp server ([e6f26f0](https://github.com/LazyVim/LazyVim/commit/e6f26f0f23e9cb4c6bcc351b06474f4863319aff))
-* **typescript:** split typescript extra in main, vtsls and tsgo ([9029d92](https://github.com/LazyVim/LazyVim/commit/9029d928d2f7b7f76f132b618d2931499c9b6eb9))
-
-
-### Bug Fixes
-
-* **biome:** added recommendation when root has biome config file ([ad25b31](https://github.com/LazyVim/LazyVim/commit/ad25b31e512892ca51a1fa3ffa96d1375c391039))
-* **biome:** biome mason install is no longer needed ([5450006](https://github.com/LazyVim/LazyVim/commit/5450006ccdd7df341f7f60dded58ea4a87aa9c15))
-* **biome:** use biome-check in conform that also fixes linting issues and sorts imports ([954d874](https://github.com/LazyVim/LazyVim/commit/954d8746e5cf1266d93cf4210c00c1506f20423b))
-* **lsp:** sort server names before setting keymaps ([6d0da34](https://github.com/LazyVim/LazyVim/commit/6d0da34de9c4a82170e3359d4e7853bf89a557b3))
-* **oxc:** added `fixKind = "all"` ([85afbbc](https://github.com/LazyVim/LazyVim/commit/85afbbc94bb45891799a4851b2edf753b51f18b0))
-* **r:** recommend for *.qmd instead of *qmd files ([3b3d649](https://github.com/LazyVim/LazyVim/commit/3b3d6493332798674fb7b82aea600bab18eaf311))
-* **terminal:** use Snacks.terminal.focus() for <C-/> mapping ([96f4f18](https://github.com/LazyVim/LazyVim/commit/96f4f18d7d81c786ac0df5723bc7aca058bf2165)), closes [#7048](https://github.com/LazyVim/LazyVim/issues/7048)
-* **treesitter:** `nvim-treesitter` on longer support nvim-0.11, so pin when needed. Fixes [#7092](https://github.com/LazyVim/LazyVim/issues/7092) ([ef272ff](https://github.com/LazyVim/LazyVim/commit/ef272ff7cc9b53d48baf6544618b5923d65c0282))
-* **tsgo:** disable inlayHints.functionLikeReturnTypes by default. Too noisy ([8bcb620](https://github.com/LazyVim/LazyVim/commit/8bcb6208021bd4e4257de64c9598c6b78688be28))
-* **tsgo:** remove some noisy inlay hints ([d07070b](https://github.com/LazyVim/LazyVim/commit/d07070bf2ff83ae513097d02d71460920af85a91))
-* **typescript:** remove keymaps for non-existing code actions ([53f4eab](https://github.com/LazyVim/LazyVim/commit/53f4eabd7723faba2d7c14afe53226d8c18bf16c))
-* **util.plugin:** single imports for extras ([1b4be53](https://github.com/LazyVim/LazyVim/commit/1b4be534f1d8959480ba1f622a457654bd737ce5))
-
-
-### Performance Improvements
-
-* **extras:** never load nested extras ([8764dfb](https://github.com/LazyVim/LazyVim/commit/8764dfbc8fcb8923397153eb3a2cfcac7ea988f1))
-
-
-### Reverts
-
-* **lsp:** revert changes for [#6456](https://github.com/LazyVim/LazyVim/issues/6456). Closes [#6779](https://github.com/LazyVim/LazyVim/issues/6779) ([d0fe8c8](https://github.com/LazyVim/LazyVim/commit/d0fe8c896f4dca003e8d56e2091ee5ec7da7af75))
-
-## [15.14.0](https://github.com/LazyVim/LazyVim/compare/v15.13.0...v15.14.0) (2026-03-01)
-
-
-### Features
-
-* **bufferline:** add <leader>bj keymap for BufferLinePick ([#6968](https://github.com/LazyVim/LazyVim/issues/6968)) ([a50072f](https://github.com/LazyVim/LazyVim/commit/a50072fa16cfc1f00b1ae282150bc667f1d1e096))
-* **dap:** close dap-float window with `q`. ([#6884](https://github.com/LazyVim/LazyVim/issues/6884)) ([87c0027](https://github.com/LazyVim/LazyVim/commit/87c002789220d922bb94637c690b444bd1ba5611))
-* **treesitter:** support query table in treesitter-textobjects mappings ([#6736](https://github.com/LazyVim/LazyVim/issues/6736)) ([42c9f71](https://github.com/LazyVim/LazyVim/commit/42c9f7152b9bd1a4f739b115390370c208dc2a55))
-
-
-### Bug Fixes
-
-* **editor.overseer:** migrate to v2 ([#6907](https://github.com/LazyVim/LazyVim/issues/6907)) ([27824d7](https://github.com/LazyVim/LazyVim/commit/27824d79a952c54cd9d93c85a699543e4a031dd4))
-* **fzf:** correct git_diff description from 'hunks' to 'files' ([#6983](https://github.com/LazyVim/LazyVim/issues/6983)) ([e77d4ab](https://github.com/LazyVim/LazyVim/commit/e77d4ab0d6574efb7142ec40f4f5dcff750a3ee9))
-* **lang.clang:** fix `clangd_extensions.nvim` ([#6804](https://github.com/LazyVim/LazyVim/issues/6804)) ([730b691](https://github.com/LazyVim/LazyVim/commit/730b69114d56834f4499fd3e5aecf18920234c39))
-* **leap:** update urls to new leap.nvim repo. Fixes [#6958](https://github.com/LazyVim/LazyVim/issues/6958) ([244af66](https://github.com/LazyVim/LazyVim/commit/244af66f8b4e376d60c6604f9b3fd758165f5799))
-* **news:** resolve news.txt from $VIMRUNTIME first ([60fea62](https://github.com/LazyVim/LazyVim/commit/60fea6236e342e1f4aa34d078461746d5f587c74)), closes [#7019](https://github.com/LazyVim/LazyVim/issues/7019)
-* **python:** set venv-selector.nvim override_notify = false ([#6936](https://github.com/LazyVim/LazyVim/issues/6936)) ([b2917bd](https://github.com/LazyVim/LazyVim/commit/b2917bd3bfe61c40e686f5a2c20f540430945b73))
-* **terminal:** add -NoProfile to powershell shellcmdflag ([#6757](https://github.com/LazyVim/LazyVim/issues/6757)) ([a507822](https://github.com/LazyVim/LazyVim/commit/a507822c0f67df661d1411f9274a65ca9cc832f5))
-* **terminal:** partially revert previous mappings ([#6770](https://github.com/LazyVim/LazyVim/issues/6770)) ([c64a617](https://github.com/LazyVim/LazyVim/commit/c64a61734fc9d45470a72603395c02137802bc6f))
-* **treesitter:** fix `]c` textobject mappings when in diff mode ([#6911](https://github.com/LazyVim/LazyVim/issues/6911)) ([16713e6](https://github.com/LazyVim/LazyVim/commit/16713e6e1200eb90ad4b4a394bb7254fb5612484))
-* **treesitter:** remove deleted jsonc parser ([#6848](https://github.com/LazyVim/LazyVim/issues/6848)) ([92607e7](https://github.com/LazyVim/LazyVim/commit/92607e79e09a2761d930877a09edc00438b97fc3))
-* **util.lsp:** `LazyVim.lsp.execute` only request single client ([#6904](https://github.com/LazyVim/LazyVim/issues/6904)) ([a4e19e9](https://github.com/LazyVim/LazyVim/commit/a4e19e9c9c939c1a3fc2f30ffefe37311d3ecadf))
-* **util.lsp:** pass `formatters_by_ft` to `opts` ([#6894](https://github.com/LazyVim/LazyVim/issues/6894)) ([03f1293](https://github.com/LazyVim/LazyVim/commit/03f1293e33541073288f23abdaf581a8e0dec4c4))
-* **vtsls:** remove redundant deno logic, upstreamed in `nvim-lspconfig` ([#7011](https://github.com/LazyVim/LazyVim/issues/7011)) ([8652c95](https://github.com/LazyVim/LazyVim/commit/8652c9570377678a78ecb19dbd33695e0e4ec4fc))
-
-## [15.13.0](https://github.com/LazyVim/LazyVim/compare/v15.12.2...v15.13.0) (2025-11-01)
-
-
-### Features
-
-* **snacks:** `snacks.gh` integration. Enabled by default, unless the `util.octo` extra is enabled. ([5e981f9](https://github.com/LazyVim/LazyVim/commit/5e981f9a8cd75eb6f49756e188411037b82b8045))
-
-
-### Bug Fixes
-
-* **treesitter:** remove node requirement ([6b52a30](https://github.com/LazyVim/LazyVim/commit/6b52a3059e52eed062b6ff3f56e70cffcbf879fe))
-
-## [15.12.2](https://github.com/LazyVim/LazyVim/compare/v15.12.1...v15.12.2) (2025-10-26)
-
-
-### Bug Fixes
-
-* **lsp.keymaps:** make cond -> enabled work again. Closes [#6697](https://github.com/LazyVim/LazyVim/issues/6697) ([1a40162](https://github.com/LazyVim/LazyVim/commit/1a401627146c66beaeb213f66dd02662f1006e82))
-
-## [15.12.1](https://github.com/LazyVim/LazyVim/compare/v15.12.0...v15.12.1) (2025-10-26)
-
-
-### Bug Fixes
-
-* **fzf-lua:** LSP keymaps. Closes [#6698](https://github.com/LazyVim/LazyVim/issues/6698) ([b5ea1e9](https://github.com/LazyVim/LazyVim/commit/b5ea1e9d25202e38a47f0b03ac35cc587c80e6d7))
-* **navic:** navic attach. Closes [#6702](https://github.com/LazyVim/LazyVim/issues/6702) ([d2d0c64](https://github.com/LazyVim/LazyVim/commit/d2d0c641ed443f8d2ea9e131ec90df59ea149d0a))
-
-## [15.12.0](https://github.com/LazyVim/LazyVim/compare/v15.11.0...v15.12.0) (2025-10-25)
-
-
-### Features
-
-* **keymaps:** added `<localleader>r` to run the selection/file with lua ([acc3538](https://github.com/LazyVim/LazyVim/commit/acc35382294d91b279b319510b906249a03b2764))
-* **lsp:** lsp keymaps can now be configured with `lsp-config.opts.servers['*'].keys` like for lsp servers ([cd8c497](https://github.com/LazyVim/LazyVim/commit/cd8c4977a0a8e80750ed6a10992f988f811c6417))
-* **lsp:** refactor lsp code to use `Snacks.util.lsp.on` ([3964433](https://github.com/LazyVim/LazyVim/commit/39644330624139dddb857ed833987c1cfd8432cf))
-* **sidekick:** added NES toggle `<leader>uN`. Closes [#6692](https://github.com/LazyVim/LazyVim/issues/6692) ([84ca4df](https://github.com/LazyVim/LazyVim/commit/84ca4dffdbf175a5e7bc39904157700854d8b2ad))
-
-
-### Bug Fixes
-
-* **chezmoi:** use vim.env.HOME instead of os.getenv("HOME") for Windows compatibility ([231e476](https://github.com/LazyVim/LazyVim/commit/231e476ec9292b56258f86e28773843cddaf34b8))
-* **clipboard:** connecting via vscpde's remote-ssh extension causes severe lag during yank and copy operations.  ([#6664](https://github.com/LazyVim/LazyVim/issues/6664)) ([5098a69](https://github.com/LazyVim/LazyVim/commit/5098a6987009199d5a5c4bfb8086d0fe4a94e0bb))
-* **lang.ember:** remove '.git' lang.ember ([#6685](https://github.com/LazyVim/LazyVim/issues/6685)) ([4796fb4](https://github.com/LazyVim/LazyVim/commit/4796fb4ac54744b69a45a6044655543b1c4231f0))
-* **root:** don't use fs_realpath on windows ([46e419d](https://github.com/LazyVim/LazyVim/commit/46e419d27efb5b7282a5ab17a49f4745ce23b55a))
-
-## [15.11.0](https://github.com/LazyVim/LazyVim/compare/v15.10.1...v15.11.0) (2025-10-23)
-
-
-### Features
-
-* **snacks_picker:** added gai/gao keymaps for calls incoming/outgoing ([b6e48a5](https://github.com/LazyVim/LazyVim/commit/b6e48a57fb4ad7a79f24646016926eef68ce3002))
-* **snacks.picker:** added `<leader>gD` to diff against merge base of branch/PR ([f0a91d9](https://github.com/LazyVim/LazyVim/commit/f0a91d9fa5f0cf27d6ba5fac759fa1d4e0df97a3))
-
-
-### Bug Fixes
-
-* **avante:** unset default keymaps ([#6657](https://github.com/LazyVim/LazyVim/issues/6657)) ([e8a1d8b](https://github.com/LazyVim/LazyVim/commit/e8a1d8b6286f82d75e5830de5ea93bd7622cec8c))
-* **extras:** remove custom formatter opts for dart/solidity. Closes [#6665](https://github.com/LazyVim/LazyVim/issues/6665) ([b38de4e](https://github.com/LazyVim/LazyVim/commit/b38de4e2fe4ad887cae1604fd9f1fbd230e0118f))
-
-## [15.10.1](https://github.com/LazyVim/LazyVim/compare/v15.10.0...v15.10.1) (2025-10-20)
-
-
-### Bug Fixes
-
-* **avante:** correct key mapping declarations ([#6656](https://github.com/LazyVim/LazyVim/issues/6656)) ([41d1b8d](https://github.com/LazyVim/LazyVim/commit/41d1b8dc72d4270c49db3365edba670d9fa01fbd))
-* **blink:** added work-around back for unsupported native snippets ([899533a](https://github.com/LazyVim/LazyVim/commit/899533a101e4bacf35dadf091977b4d12875dbf6))
-* **treesitter:** added buf to treesitter start just to be sure ([3ffb471](https://github.com/LazyVim/LazyVim/commit/3ffb471c187a66562b19bdf68382be9f82ac670d))
-
-## [15.10.0](https://github.com/LazyVim/LazyVim/compare/v15.9.0...v15.10.0) (2025-10-20)
-
-
-### Features
-
-* **ai:** add avante.nvim for a better AI experience ([#4440](https://github.com/LazyVim/LazyVim/issues/4440)) ([2682ce0](https://github.com/LazyVim/LazyVim/commit/2682ce0ab95c0a88867855ada41948107db8232e))
-* **extra:** allow users to add custom bundles through opts.init_options.bundles to jdtls ([#6265](https://github.com/LazyVim/LazyVim/issues/6265)) ([faeb24b](https://github.com/LazyVim/LazyVim/commit/faeb24ba956f103c5551bde11506991d8b594bc5))
-* **extras:** add Dart language ([#4749](https://github.com/LazyVim/LazyVim/issues/4749)) ([90f84e7](https://github.com/LazyVim/LazyVim/commit/90f84e7e755f72bb99dc8a9dedbfef05e58eb09d))
-* **extras:** added ember lang support ([#6203](https://github.com/LazyVim/LazyVim/issues/6203)) ([ac4cce0](https://github.com/LazyVim/LazyVim/commit/ac4cce0f2f436b3e2dd93ad9179178436ab8c600))
-* **extras:** added twig language ([#5464](https://github.com/LazyVim/LazyVim/issues/5464)) ([a6eb51e](https://github.com/LazyVim/LazyVim/commit/a6eb51e5b5897749bed8721ce98cd2491b2ea8e2))
-* **extras:** ai: add `claudecode.nvim` ([#6229](https://github.com/LazyVim/LazyVim/issues/6229)) ([e7a3e80](https://github.com/LazyVim/LazyVim/commit/e7a3e80ee1327ac012c7bb7257bb2d49f9f2fd89))
-* **extras:** automatically update lazyvim.json for renamed or deprecated extras ([37ecd06](https://github.com/LazyVim/LazyVim/commit/37ecd06fad65d5c188ad2d2e55d47a8fd1594d16))
-* **extras:** renamed extra omnisharp -&gt; dotnet + added fautocomplete to lspconfig ([1b2e6e8](https://github.com/LazyVim/LazyVim/commit/1b2e6e8986b3cfee19635920129fc08df4f32b38))
-* **extras:** utils: add `gh.nvim` ([#6250](https://github.com/LazyVim/LazyVim/issues/6250)) ([8db9c75](https://github.com/LazyVim/LazyVim/commit/8db9c75e8d3a8609926dcb868d2e462e0f0b1d3d))
-* **go:** add linting with golangci-lint ([#6311](https://github.com/LazyVim/LazyVim/issues/6311)) ([248876a](https://github.com/LazyVim/LazyVim/commit/248876adb6b1f54031be350e45bbf0c7835d486f))
-* **haskell:** update `haskell-tools` version and add formatters + linters ([#6230](https://github.com/LazyVim/LazyVim/issues/6230)) ([82382f4](https://github.com/LazyVim/LazyVim/commit/82382f455ad37bc4fa928fe4a6fb9379a924fa3a))
-* **lang/fsharp:** add F# support to omnisharp extra ([#6538](https://github.com/LazyVim/LazyVim/issues/6538)) ([80a980a](https://github.com/LazyVim/LazyVim/commit/80a980ab00a871777c37ec3f0db9c394509b2465))
-* **lang:** add neotest config for PHP tests ([#5958](https://github.com/LazyVim/LazyVim/issues/5958)) ([9b077c7](https://github.com/LazyVim/LazyVim/commit/9b077c7a8ec96050f3a3b73219c8b904d3d83ab0))
-* **lang:** add solidity language support ([#4742](https://github.com/LazyVim/LazyVim/issues/4742)) ([2cd46d4](https://github.com/LazyVim/LazyVim/commit/2cd46d42ba357a42b11c5e4f5e16641bde0516d6))
-* **lang:** add Typst language support ([#4042](https://github.com/LazyVim/LazyVim/issues/4042)) ([645846b](https://github.com/LazyVim/LazyVim/commit/645846be5c7d798c7e87e61d00e8cae4fd3741c7))
-* **lang:** julia support ([#6231](https://github.com/LazyVim/LazyVim/issues/6231)) ([5d186c0](https://github.com/LazyVim/LazyVim/commit/5d186c009a85efbdad2b92115d4268c7c4a7aa18))
-* **lang:** nix add `statix` linter ([#6244](https://github.com/LazyVim/LazyVim/issues/6244)) ([2a866f6](https://github.com/LazyVim/LazyVim/commit/2a866f6c8c974c88cb9c723560cbec4308d304a2))
-* **sidekick:** added sidekick cli status to lualine ([16917db](https://github.com/LazyVim/LazyVim/commit/16917db94a056fe01b3bac604bc89da4077bd9cd))
-
-
-### Bug Fixes
-
-* **extras.lang:** fix Scala extra by using nvimMetals only ([#5726](https://github.com/LazyVim/LazyVim/issues/5726)) ([f118dca](https://github.com/LazyVim/LazyVim/commit/f118dca334d40cf8e78e0f0d5aa3108b972e8d84))
-* **fzf-lua:** added some missing keymaps similar to snacks picker. Closes [#6036](https://github.com/LazyVim/LazyVim/issues/6036). Closes [#5830](https://github.com/LazyVim/LazyVim/issues/5830) ([69a5744](https://github.com/LazyVim/LazyVim/commit/69a57448032253ca086d999c0d53d6e33ad4e505))
-* **helm:** broken helm highlighting ([#5335](https://github.com/LazyVim/LazyVim/issues/5335)) ([4d0d87f](https://github.com/LazyVim/LazyVim/commit/4d0d87f6268969987e5c58f59e086c886e77e1ae))
-* **keymap:** remove select mode remaps of printable characters ([#6296](https://github.com/LazyVim/LazyVim/issues/6296)) ([83468be](https://github.com/LazyVim/LazyVim/commit/83468be35062d06896c233d90d2f1c1cd24d84f3))
-* **tailwind:** additional settings ([#5266](https://github.com/LazyVim/LazyVim/issues/5266)) ([d2f9885](https://github.com/LazyVim/LazyVim/commit/d2f9885d6b8244818066cc16a5c72cb656748f6c))
-* **telescope:** sync keymaps with snacks picker + added some that were missing ([1a08e9f](https://github.com/LazyVim/LazyVim/commit/1a08e9f50f8c11a329c3017c4bfdd4b96b7ec541))
-* **twig:** correct mason url ([9d345de](https://github.com/LazyVim/LazyVim/commit/9d345dec446f577f75d36a147164ae258ffc2d8c))
-* **typescript:** better default pwa-node DAP config. Closes [#6386](https://github.com/LazyVim/LazyVim/issues/6386) ([e4d3432](https://github.com/LazyVim/LazyVim/commit/e4d34328f244fc0c7f91587258e767bfb55d0648))
-* **typescript:** support chrome, node and msedge dap adapters ([#6649](https://github.com/LazyVim/LazyVim/issues/6649)) ([0b65d33](https://github.com/LazyVim/LazyVim/commit/0b65d33d8545d179207c8827025f40764de61d06))
-* **util.project:** different mapping on dashboard than `snacks.projects` ([#5737](https://github.com/LazyVim/LazyVim/issues/5737)) ([e389447](https://github.com/LazyVim/LazyVim/commit/e38944799e7fc45baea0483f5c955472f3ffde27))
-
-
-### Reverts
-
-* "feat(extra): allow users to add custom bundles through opts.init_options.bundles to jdtls ([#6265](https://github.com/LazyVim/LazyVim/issues/6265))" ([#6650](https://github.com/LazyVim/LazyVim/issues/6650)) ([a582f00](https://github.com/LazyVim/LazyVim/commit/a582f004473a3bade99c19c62fea649fb0b1c20f))
-
-## [15.9.0](https://github.com/LazyVim/LazyVim/compare/v15.8.1...v15.9.0) (2025-10-19)
-
-
-### Features
-
-* **docker:** associate 'Containerfile' with 'dockerfile' filetype ([#5974](https://github.com/LazyVim/LazyVim/issues/5974)) ([97af4a2](https://github.com/LazyVim/LazyVim/commit/97af4a23bccac85eb02e489f573db68863d6ed33))
-* **extras.rest:** add keymap for changing environment ([#5678](https://github.com/LazyVim/LazyVim/issues/5678)) ([1da659d](https://github.com/LazyVim/LazyVim/commit/1da659db4a3fbcd6d171f3b38d0092ced0887e61))
-* **java:** enable `blink.cmp` capabilities to show signature documentation ([#5218](https://github.com/LazyVim/LazyVim/issues/5218)) ([9618e32](https://github.com/LazyVim/LazyVim/commit/9618e327edfb79d9cbb037a2039c4315a95df63f))
-* **lang/omnisharp:** switch neotest adapter to vstest ([#6540](https://github.com/LazyVim/LazyVim/issues/6540)) ([4086d44](https://github.com/LazyVim/LazyVim/commit/4086d44a0b5c576630c603c7b71c6be5198d9eaf))
-* **neotest:** extra keymap to attach to a test ([#6198](https://github.com/LazyVim/LazyVim/issues/6198)) ([66e927f](https://github.com/LazyVim/LazyVim/commit/66e927fd9d0b0ff2886b9fe1465d9396461a2665))
-
-
-### Bug Fixes
-
-* **blink:** remove snippet expand override (no longer needed). Closes [#6044](https://github.com/LazyVim/LazyVim/issues/6044) ([336e2c3](https://github.com/LazyVim/LazyVim/commit/336e2c3ea67636c4eea3cf8f7538feb86b5a0610))
-* **chezmoi:** add `hidden=false` to fzf picker ([#6095](https://github.com/LazyVim/LazyVim/issues/6095)) ([1aa1b59](https://github.com/LazyVim/LazyVim/commit/1aa1b59a7ec7cab61fa7b096db53df15ec5008e7))
-* **copilot-chat:** use up to date config for chat headers ([#6543](https://github.com/LazyVim/LazyVim/issues/6543)) ([2c5eef7](https://github.com/LazyVim/LazyVim/commit/2c5eef7df7520fbc6fe0d90150cd26ac9e4f325b))
-* **extras/rust:** fix config key for files.exclude ([#5664](https://github.com/LazyVim/LazyVim/issues/5664)) ([762a34d](https://github.com/LazyVim/LazyVim/commit/762a34d5ad95447b241287e8d540b657a699d141))
-* **extras:** adjust switch source/header shortcut ([#6567](https://github.com/LazyVim/LazyVim/issues/6567)) ([b36b858](https://github.com/LazyVim/LazyVim/commit/b36b8589b62f55b181367afe954606c73233c0a1))
-* **extras:** remove procMacro ignored ([#6117](https://github.com/LazyVim/LazyVim/issues/6117)) ([4a3702e](https://github.com/LazyVim/LazyVim/commit/4a3702e050881fea262ccae980ae1ff9e849d275))
-* **lang.omnisharp:** update CSharpier command and arguments for Mason compatibility ([#6156](https://github.com/LazyVim/LazyVim/issues/6156)) ([dfebe70](https://github.com/LazyVim/LazyVim/commit/dfebe70b8d09514dd3ee85e12463f266f93c5dd7))
-* **lang.rust:** rust-analyzer hanging on root scanned ([#6178](https://github.com/LazyVim/LazyVim/issues/6178)) ([7bf8c22](https://github.com/LazyVim/LazyVim/commit/7bf8c22c56283fa6d5d35246dcd0f49d37a5c709))
-* **latex:** ensure tex extra installs latex tree-sitter parser ([#6357](https://github.com/LazyVim/LazyVim/issues/6357)) ([ae74622](https://github.com/LazyVim/LazyVim/commit/ae74622e6666ea4c3e6c58c4ef2d3f313d8e8f20))
-* **mini.animate:** schedule the toggle mapping to correctly take effect ([#6483](https://github.com/LazyVim/LazyVim/issues/6483)) ([bd23357](https://github.com/LazyVim/LazyVim/commit/bd233579a66018f526b6b0970e33afde4cde399e))
-* **sql:** fix autocomplete when `omni` is used as a `blink.cmp` source ([#5652](https://github.com/LazyVim/LazyVim/issues/5652)) ([f6f72b9](https://github.com/LazyVim/LazyVim/commit/f6f72b90d41d9347b93a07d0b680195541f64c55))
-* **treesitter:** attach textobject keymaps to existing buffers on load. Closes [#6642](https://github.com/LazyVim/LazyVim/issues/6642). Closes [#6639](https://github.com/LazyVim/LazyVim/issues/6639) ([92a7728](https://github.com/LazyVim/LazyVim/commit/92a77287321236f52ff38648a38cf314ab223137))
-* **typescript:** make_position_params with offset encoding.  ([#6277](https://github.com/LazyVim/LazyVim/issues/6277)) ([22152e9](https://github.com/LazyVim/LazyVim/commit/22152e958f3f7c2b732cb6429ccc90541e0ad17f))
-* **ui:** ignore sidekick_terminal in mini-indentscope ([#6619](https://github.com/LazyVim/LazyVim/issues/6619)) ([f0b32b5](https://github.com/LazyVim/LazyVim/commit/f0b32b5955889d4d2d3636a52d2ddf5d113646df))
-* **util:** add some kulala keymaps back to global ([#5960](https://github.com/LazyVim/LazyVim/issues/5960)) ([a16739e](https://github.com/LazyVim/LazyVim/commit/a16739e3328c2687d96f868839c575765c49baad))
-* **vscode:** don't sync undo/redo with vscode ([#5957](https://github.com/LazyVim/LazyVim/issues/5957)) ([706ec44](https://github.com/LazyVim/LazyVim/commit/706ec4443a33ec474f2329b5b806e9cdb85cce43))
-
-## [15.8.1](https://github.com/LazyVim/LazyVim/compare/v15.8.0...v15.8.1) (2025-10-18)
-
-
-### Bug Fixes
-
-* **treesitter:** reload lazyvim.tresitter.util to prevent issues with stale modules when upgrading ([62ce8a2](https://github.com/LazyVim/LazyVim/commit/62ce8a23d89fa766956447a3df01d9f3448e9a66))
-
-## [15.8.0](https://github.com/LazyVim/LazyVim/compare/v15.7.1...v15.8.0) (2025-10-17)
-
-
-### Features
-
-* **gleam:** add conform ([#5640](https://github.com/LazyVim/LazyVim/issues/5640)) ([02b8dd3](https://github.com/LazyVim/LazyVim/commit/02b8dd3f4bd55f06be133471fad027f3131238f4))
-* **sidekick:** added `<leader>ad` to close/detach a terminal/session ([f8b062b](https://github.com/LazyVim/LazyVim/commit/f8b062b130177f07d3c1c13b642402d42e980df5))
-* **sidekick:** changed default keymaps for sidekick. Please check updated docs at sidekick.nvim ([a3e52dd](https://github.com/LazyVim/LazyVim/commit/a3e52dd346ea35db5521b66e46dca95d32f00cb4))
-* **sidekick:** use `<a-a>` in any snacks picker to send the (selected) results to an AI tool ([26c43a9](https://github.com/LazyVim/LazyVim/commit/26c43a9b931f3ab04a8c449671250182ac9ddca6))
-* **treesitter:** add installation instructions to get a C compiler on windows ([37032da](https://github.com/LazyVim/LazyVim/commit/37032dabd657ae567011e7ab4f881ecbf476eb76))
-* **treesitter:** added support for `disable` langs to indent/highlight/folds. Closes [#6608](https://github.com/LazyVim/LazyVim/issues/6608) ([0e8069c](https://github.com/LazyVim/LazyVim/commit/0e8069c78ee92279055236388df8c2019476767a))
-* **treesitter:** better health checks for treesitter requirements ([413b9d5](https://github.com/LazyVim/LazyVim/commit/413b9d5fa91c5bd5088b28c6d1764caa88542cb1))
-* **treesitter:** on windows, use `gcc` if available and `cl.exe` is not available for building parsers ([2a1f3c3](https://github.com/LazyVim/LazyVim/commit/2a1f3c370145c3465c0142deade3e3b2660ce829))
-
-
-### Bug Fixes
-
-* **blink:** disable blink left/right key in the cmdline ([94c4603](https://github.com/LazyVim/LazyVim/commit/94c4603b6838fbe75343b6e3342b4343744157dc))
-* **keymaps:** update deprecated diagnostic keymap to latest api change ([#6574](https://github.com/LazyVim/LazyVim/issues/6574)) ([b9d38f6](https://github.com/LazyVim/LazyVim/commit/b9d38f692015fecaa72d55282b74a3d601e4c9fa))
-* **sidekick:** only add copilot to lspconfig when `opts.nes.enabled ~= false` ([049db39](https://github.com/LazyVim/LazyVim/commit/049db39de0f272e8368a4b3881ac5a13f0d04b09))
-* **terminal:** term toggle keymaps now only work for snacks terminals. Closes [#6573](https://github.com/LazyVim/LazyVim/issues/6573) ([4efd0e2](https://github.com/LazyVim/LazyVim/commit/4efd0e2bea2a387d6fcdea8cf36a62049e8bafed))
-* **treesiter:** check that `disable` options are tables ([e8c5fa7](https://github.com/LazyVim/LazyVim/commit/e8c5fa7eae06539c883699507caeadb46d74f401))
-* **treesitter:** better check on windows if microsoft build tools is installed ([5effc77](https://github.com/LazyVim/LazyVim/commit/5effc77185f94f557809375b5650d427e7171c32))
-* **xtras:** load `copilot-native` before `blink` ([#6588](https://github.com/LazyVim/LazyVim/issues/6588)) ([aa2c436](https://github.com/LazyVim/LazyVim/commit/aa2c43633adee0f80faf8d743d6476ea4f8ba5ca))
-
-
-### Performance Improvements
-
-* **ansible:** load on ft=yaml and run should only be mapped on ft=yaml.ansible ([ebdcf1b](https://github.com/LazyVim/LazyVim/commit/ebdcf1ba7ef18daa8c897c8922a5ef770e8bcffb))
-
-## [15.7.1](https://github.com/LazyVim/LazyVim/compare/v15.7.0...v15.7.1) (2025-10-02)
-
-
-### Bug Fixes
-
-* **sidekick:** better keymaps ([188b288](https://github.com/LazyVim/LazyVim/commit/188b2886147acb4d9e2a5c8ae7b73770fd66a92c))
-
-## [15.7.0](https://github.com/LazyVim/LazyVim/compare/v15.6.0...v15.7.0) (2025-10-01)
-
-
-### Features
-
-* **sidekick:** updated keymaps for sidekick ([2942bd4](https://github.com/LazyVim/LazyVim/commit/2942bd4a0d738d693af51354e96aa7be5407d105))
-
-
-### Bug Fixes
-
-* **copilot-native:** schedule inline_completion.enable ([23b1da1](https://github.com/LazyVim/LazyVim/commit/23b1da170f6367fafe0be47b9c141770ed75a78e))
-* **sidekick:** better keymaps ([aabc03f](https://github.com/LazyVim/LazyVim/commit/aabc03f88d30b0424926d9d894adc5c91eb84ec2))
-* **stylua:** stylua is now also an LSP. Disable it since we use the CLI tool. ([2f76d57](https://github.com/LazyVim/LazyVim/commit/2f76d572a2b172e5e7e236d3e972443242c36b66))
-
-## [15.6.0](https://github.com/LazyVim/LazyVim/compare/v15.5.0...v15.6.0) (2025-09-30)
-
-
-### Features
-
-* **sidekick:** added keymaps to work with AI cli tools ([5d18a46](https://github.com/LazyVim/LazyVim/commit/5d18a46b6a7bb5b946a6c87b9a45a2738c9ec9c3))
-* **sidekick:** fancier lualine component ([b889978](https://github.com/LazyVim/LazyVim/commit/b8899781516da71ba0f63afa93fb4a6b25dff144))
-
-
-### Bug Fixes
-
-* **config:** clipboard:get() ([22851dc](https://github.com/LazyVim/LazyVim/commit/22851dce979c4cac379c6795ca7885c83c1c7eaf))
-* **copilot-native:** change  Copilot-native's `<M-[>` description to "Prev Suggestion" ([#6553](https://github.com/LazyVim/LazyVim/issues/6553)) ([089d0a5](https://github.com/LazyVim/LazyVim/commit/089d0a5ac1ab85238804e017ac1ef0dc0a8341f0))
-* **sidekick:** changed keymap to open new tool ([3d3739b](https://github.com/LazyVim/LazyVim/commit/3d3739b4b8943b5e7143d37f60bb0adbb6cf82f3))
-
-## [15.5.0](https://github.com/LazyVim/LazyVim/compare/v15.4.0...v15.5.0) (2025-09-27)
-
-
-### Features
-
-* **ai.copilot-native:** let sidekick.nvim handle some things if available ([b25ea9c](https://github.com/LazyVim/LazyVim/commit/b25ea9c153e76d11579731e1d5529f275a36f91d))
-* **ai:** added completion hooks for next edit suggestions ([30a325d](https://github.com/LazyVim/LazyVim/commit/30a325d67184a80006dc55352d9663cdf01082d5))
-* **extras:** added extra for `sidekick.nvim` (Copilot LSP integration) ([dbfe209](https://github.com/LazyVim/LazyVim/commit/dbfe20996ce62d6b0048245ab4e304610548da04))
-
-
-### Bug Fixes
-
-* **ai.copilot:** disable copilot lsp if installed. copilot.lua needs its own version of the LSP ([e9bc607](https://github.com/LazyVim/LazyVim/commit/e9bc6074d1ea69e921a6195d1dc34333eaa310f8))
-
-## [15.4.0](https://github.com/LazyVim/LazyVim/compare/v15.3.0...v15.4.0) (2025-09-26)
-
-
-### Features
-
-* **copilot-native:** added experimental support for next edit suggestions. check the docs to enable ([c83df9e](https://github.com/LazyVim/LazyVim/commit/c83df9e68dd41f5a3f7df5a7048169ee286a7da8))
-* **copilot-native:** added keymaps to cycle suggestions ([6bd630c](https://github.com/LazyVim/LazyVim/commit/6bd630cec6f905665691d593dc5d0fb3d54f560c))
-* **copilot-native:** better lualine status ([9913e16](https://github.com/LazyVim/LazyVim/commit/9913e1665d783d9c4407633bc33475d403aff433))
-* **copilot-native:** removed experimental **nes** support with `copilot_lsp` for now, since it's not the best experience right now ([ed637bb](https://github.com/LazyVim/LazyVim/commit/ed637bb0f7f418de069a4d5a7ed8a7b3b93eb425))
-* **copilot:** added `copilot-native` extra to setup native inline completions in Neovim ([3b02963](https://github.com/LazyVim/LazyVim/commit/3b0296358508da1eb258c8716df163dd04fa6449))
-
-
-### Bug Fixes
-
-* **catppuccin:** follow-up on api change ([#6505](https://github.com/LazyVim/LazyVim/issues/6505)) ([af6e250](https://github.com/LazyVim/LazyVim/commit/af6e2505b54270c30145e8f4191b865870537287))
-* **treesitter:** create buffer-local textobjects keymaps only when available. Closes [#6508](https://github.com/LazyVim/LazyVim/issues/6508) ([5985ca0](https://github.com/LazyVim/LazyVim/commit/5985ca0cf1a0c1ddee8b2b718c730f988cec7001))
-
-## [15.3.0](https://github.com/LazyVim/LazyVim/compare/v15.2.0...v15.3.0) (2025-09-23)
-
-
-### Features
-
-* **copilot:** use `blink-copilot` as blink.cmp copilot source ([#5551](https://github.com/LazyVim/LazyVim/issues/5551)) ([13069f2](https://github.com/LazyVim/LazyVim/commit/13069f20183655d8a02f3acbd21d0ac4c9ce811c))
-* **treesitter:** show an error if the user tries to set a custom treesitter compiler ([89ff1fd](https://github.com/LazyVim/LazyVim/commit/89ff1fd600bb6ff4cf2c9edbc2217a40ecb8d160))
-
-
-### Bug Fixes
-
-* **jdtls:** allow mason jdtls installation ([#6498](https://github.com/LazyVim/LazyVim/issues/6498)) ([80990ec](https://github.com/LazyVim/LazyVim/commit/80990ec62fd36fc4b6b921a9041f55858e33e030))
-* **jdtls:** bundle configuration bug fix ([#6499](https://github.com/LazyVim/LazyVim/issues/6499)) ([c423765](https://github.com/LazyVim/LazyVim/commit/c4237659621e406089f4d13d32192954d52c4924))
-* **keymaps:** enable snacks git keybindings ([#6323](https://github.com/LazyVim/LazyVim/issues/6323)) ([720e06a](https://github.com/LazyVim/LazyVim/commit/720e06a908cbf6e3afb4eccc049d58df9ace770a))
-* **lsp:** fix mason install/exclude. Closes [#6504](https://github.com/LazyVim/LazyVim/issues/6504) ([37b1ec4](https://github.com/LazyVim/LazyVim/commit/37b1ec41ae57e8396d5c923a4bfdf7050215b4d6))
-* **lsp:** fixup for when not using mason ([a90b565](https://github.com/LazyVim/LazyVim/commit/a90b56518f4f2291985952d79472d4f935c0bad0))
-* **luasnip:** add missing optional tag to garymjr/nvim-snippets ([#5733](https://github.com/LazyVim/LazyVim/issues/5733)) ([37a1c1a](https://github.com/LazyVim/LazyVim/commit/37a1c1af5dbbcf069bb94a71b4dda3626fbda77a))
-* **vtsls:** fix and move denols/vtsls disambigutaion to typescript extra. Fixes [#6476](https://github.com/LazyVim/LazyVim/issues/6476) ([775621a](https://github.com/LazyVim/LazyVim/commit/775621ac0af42486ef1cd4254d1a6625a190040b))
-
-## [15.2.0](https://github.com/LazyVim/LazyVim/compare/v15.1.1...v15.2.0) (2025-09-20)
-
-
-### Features
-
-* **clojure:** use 'nvim-paredit' instead 'nvim-treesitter-sexp' as clojure S-exp Plugin ([#5876](https://github.com/LazyVim/LazyVim/issues/5876)) ([2659028](https://github.com/LazyVim/LazyVim/commit/26590285ead7a89bb45f309714f7f40136c89267))
-* **core:** relax hard requirement for `vim.lsp.is_enabled`. Show warning instead ([3ca7b47](https://github.com/LazyVim/LazyVim/commit/3ca7b47365c85a07047e48cad450feff66c8bdd6))
-* **options:** don't overwrite indentexpr/foldexpr/foldmethod when set by plugins. Fixes [#6464](https://github.com/LazyVim/LazyVim/issues/6464) ([ccbaf55](https://github.com/LazyVim/LazyVim/commit/ccbaf55c2f8bc691f8f64fe40ce00a1abda4fbac))
-* **yanky:** use snacks picker for improved yank history navigation ([#5802](https://github.com/LazyVim/LazyVim/issues/5802)) ([55e762a](https://github.com/LazyVim/LazyVim/commit/55e762a8888cd5f336e4e2d4b2cc6b8b1b950663))
-
-
-### Bug Fixes
-
-* **editor:** calculate the height passed to the prompt of fzf-lua properly ([#6481](https://github.com/LazyVim/LazyVim/issues/6481)) ([65e38d3](https://github.com/LazyVim/LazyVim/commit/65e38d3b34cab653a05318c1a9014df3c89fdb53))
-* **lang.clojure:** correct cmp-conjure source name ([#6208](https://github.com/LazyVim/LazyVim/issues/6208)) ([55b5c1f](https://github.com/LazyVim/LazyVim/commit/55b5c1fecb0b7e71c5eb40555b17d1e4820690f0))
-* **options:** set_default option ([2401d5f](https://github.com/LazyVim/LazyVim/commit/2401d5fca6f2a2fcaca4f9c4c84c4b713c602352))
-* **options:** track some initial options right after loading `options.lua`. See [#6463](https://github.com/LazyVim/LazyVim/issues/6463) ([9c611b0](https://github.com/LazyVim/LazyVim/commit/9c611b0c5758d0d659e7fdb29119b7083a56f989))
-* **treesitter:** check if queries for indent/fold exists before enabling it. Fixes [#6474](https://github.com/LazyVim/LazyVim/issues/6474) ([5ce7cd6](https://github.com/LazyVim/LazyVim/commit/5ce7cd650a5fffc257e0312b82fffd26abe2a1fa))
-
-## [15.1.1](https://github.com/LazyVim/LazyVim/compare/v15.1.0...v15.1.1) (2025-09-18)
-
-
-### Bug Fixes
-
-* **core:** check for outdated nightly. See [#6458](https://github.com/LazyVim/LazyVim/issues/6458) ([cfac3c9](https://github.com/LazyVim/LazyVim/commit/cfac3c9a85526ad7406f9b246097a1ec4fa1a2c3))
-* **lspconfig:** remove all usage of `lspconfig` ([36b4191](https://github.com/LazyVim/LazyVim/commit/36b41911ab90fe19505af306a31a5a699342d3c3))
-* **lsp:** schedule_wrap setting up LSPs to work around root cause of [#6456](https://github.com/LazyVim/LazyVim/issues/6456). Fixes [#6456](https://github.com/LazyVim/LazyVim/issues/6456) ([75a3809](https://github.com/LazyVim/LazyVim/commit/75a3809e15a0ecff9adc46c6cd3aaac51d99b561))
-
-## [15.1.0](https://github.com/LazyVim/LazyVim/compare/v15.0.3...v15.1.0) (2025-09-18)
-
-
-### Features
-
-* **treesitter:** automatically install and use mason's tree-sitter-cli if not installed on system ([725d048](https://github.com/LazyVim/LazyVim/commit/725d048e009b866425b2a0cc620ba2c413e8b65f))
-* **treesitter:** refactored setting up treesitter indent/highlight/folds ([b93303d](https://github.com/LazyVim/LazyVim/commit/b93303d2339b1117171780cebed1d710fd3805d5))
-
-
-### Bug Fixes
-
-* **snacks:** safe wrapper around snacks statuscolumn to prevent errors when LazyVim is still installing ([5bf2378](https://github.com/LazyVim/LazyVim/commit/5bf237820d7938b1b6490164fbd75e4117d341c1))
-
-## [15.0.3](https://github.com/LazyVim/LazyVim/compare/v15.0.2...v15.0.3) (2025-09-17)
-
-
-### Bug Fixes
-
-* **treesitter:** properly update installedd languages after setup ([c28f599](https://github.com/LazyVim/LazyVim/commit/c28f599d4f5d175f3d259a621c4e7b5d0b2a0759))
-
-## [15.0.2](https://github.com/LazyVim/LazyVim/compare/v15.0.1...v15.0.2) (2025-09-17)
-
-
-### Bug Fixes
-
-* **python:** remove the wrapping `settings` key from `setup()` options ([#6069](https://github.com/LazyVim/LazyVim/issues/6069)) ([ed3aa74](https://github.com/LazyVim/LazyVim/commit/ed3aa74c107de7dc3e06367ce4afb20056710441))
-* **treesitter:** indentexpr/foldexpr now work as intended and override ftplugin settings. Fixes [#6447](https://github.com/LazyVim/LazyVim/issues/6447) ([a6b38de](https://github.com/LazyVim/LazyVim/commit/a6b38de763addf2d22e8a43a1e679cc855dc376d))
-
-## [15.0.1](https://github.com/LazyVim/LazyVim/compare/v15.0.0...v15.0.1) (2025-09-17)
-
-
-### Bug Fixes
-
-* **treesitter:** TS update during inital build ([2d56d3b](https://github.com/LazyVim/LazyVim/commit/2d56d3b37c275890a403845c00b5c8d38cb387e6))
-
-## [15.0.0](https://github.com/LazyVim/LazyVim/compare/v14.15.1...v15.0.0) (2025-09-17)
-
-
-### ⚠ BREAKING CHANGES
-
-* **treesitter:** migrate to `nvim-treesitter` **main** branch
-* bump Neovim requirement to 0.11.2
-* LazyVim now requires Neovim >= 0.11 See #6421 for more info
-
-### Features
-
-* **blink:** enable blink cmdline completions ([011a35c](https://github.com/LazyVim/LazyVim/commit/011a35ccb810cbe5d25def9cc92271e8423feb74))
-* **blink:** enable cmdline completions ([ff7c12c](https://github.com/LazyVim/LazyVim/commit/ff7c12c48e23941ffd9a7bbe61857624929ae9da))
-* bump Neovim requirement to 0.11.2 ([cccfe70](https://github.com/LazyVim/LazyVim/commit/cccfe70ea4390c1915f67ab7d2893971fba3f3fa))
-* **extras:** added an experimental extra for the treesitter `main` branch ([5668ad7](https://github.com/LazyVim/LazyVim/commit/5668ad72ca806b3a7915bb7b35dcc5cccfe774f7))
-* LazyVim now requires Neovim &gt;= 0.11 See [#6421](https://github.com/LazyVim/LazyVim/issues/6421) for more info ([e7ce65e](https://github.com/LazyVim/LazyVim/commit/e7ce65e1bb814f79ecb45bfeca934e997e0ee42c))
-* **lsp:** enable LSP folds when available ([5e2c4e6](https://github.com/LazyVim/LazyVim/commit/5e2c4e62f28a85e0b27d5c97ea92af8c1ab74cef))
-* **treesitter:** migrate to `nvim-treesitter` **main** branch ([5eac460](https://github.com/LazyVim/LazyVim/commit/5eac460c092103e5516bec345236853b9f35ec7c))
-
-
-### Bug Fixes
-
-* **blink:** make blink completions in cmdline behave more like regular cmdline ([f54fd7f](https://github.com/LazyVim/LazyVim/commit/f54fd7f751e902e824c3a4c9d212a0d18387d0b6))
-* **catppuccin:** follow renamed integration ([#6354](https://github.com/LazyVim/LazyVim/issues/6354)) ([02d0c9a](https://github.com/LazyVim/LazyVim/commit/02d0c9aebddb902d9c974a38bb44db9bae4eac6d))
-* **clangd:** file detection improvements ([#6436](https://github.com/LazyVim/LazyVim/issues/6436)) ([aab503f](https://github.com/LazyVim/LazyVim/commit/aab503fda63f34cff6bce229f73ea5209e8afaf0))
-* **clangd:** rewrite the root_dir function ([#6060](https://github.com/LazyVim/LazyVim/issues/6060)) ([167d39b](https://github.com/LazyVim/LazyVim/commit/167d39b2bef24024be1a48267e14cc6c82146462))
-* **eslint:** remove old 0.10 code ([919c9e5](https://github.com/LazyVim/LazyVim/commit/919c9e5d091f11b2892c56825249fc4a495d3e8f))
-* **extras:** disable blink path source in CopilotChat ([#5666](https://github.com/LazyVim/LazyVim/issues/5666)) ([#5754](https://github.com/LazyVim/LazyVim/issues/5754)) ([3aa2916](https://github.com/LazyVim/LazyVim/commit/3aa2916569df2664cb68e1c7c38882868f36f8d0))
-* **gitsigns:** use silent for gitsigns keymaps ([#5841](https://github.com/LazyVim/LazyVim/issues/5841)) ([6eed178](https://github.com/LazyVim/LazyVim/commit/6eed1781c185ea6d1f313aee60a7097448f473cb))
-* **grug-far:** add support for GrugFarWithin so it gets loaded by default ([#5772](https://github.com/LazyVim/LazyVim/issues/5772)) ([fd1b02a](https://github.com/LazyVim/LazyVim/commit/fd1b02ae5740dc651cc43291391084dbe7b1b3c4))
-* **harpoon:** keymaps for 1-9. Fixes [#6319](https://github.com/LazyVim/LazyVim/issues/6319) ([e2ba6bb](https://github.com/LazyVim/LazyVim/commit/e2ba6bb51107cbd076b53b49ed7be99fc2fa3991))
-* **jdtls:** root_dir ([271fecb](https://github.com/LazyVim/LazyVim/commit/271fecb067ec223a8eab90c1abd1162e9ebae5df))
-* **jdtls:** root_dir ([#6429](https://github.com/LazyVim/LazyVim/issues/6429)) ([c053921](https://github.com/LazyVim/LazyVim/commit/c05392186e9e540d4af169922c333b5baa583cbe))
-* **lang.haskell:** prevent Haskell extras from installing telescope.nvim ([#6419](https://github.com/LazyVim/LazyVim/issues/6419)) ([cc4a3e5](https://github.com/LazyVim/LazyVim/commit/cc4a3e556424dba784b41ec3bd92eeb7b62746bc))
-* **lsp:** buffer should be second arg for supports_method ([44ade7f](https://github.com/LazyVim/LazyVim/commit/44ade7fdea98a0356c64ff9edaf2534547b958bc))
-* **lspconfig:** remove all references to lspconfig. Closes [#6426](https://github.com/LazyVim/LazyVim/issues/6426) ([23b9cde](https://github.com/LazyVim/LazyVim/commit/23b9cdeb3471b655532e9884fa2dd36ee83062d5))
-* **lsp:** properly ambiguate denols vs vtsls ([2f75d9a](https://github.com/LazyVim/LazyVim/commit/2f75d9a90fc9cf43f7ba2365dbb745e5595fc02e))
-* **lsp:** properly register capabilities with new vim.lsp.config. Not needed for blink ([9fa832d](https://github.com/LazyVim/LazyVim/commit/9fa832dc95cb77a5551bbeff12b4520d8b7bdc2a))
-* **mason:** migrate to mason v2 ([#6053](https://github.com/LazyVim/LazyVim/issues/6053)) ([773f28b](https://github.com/LazyVim/LazyVim/commit/773f28b4912d5505a21da9686d56ab7cf41a9be7))
-* **mini:** update mini plugin references from echasnovski to nvim-mini ([#6374](https://github.com/LazyVim/LazyVim/issues/6374)) ([ae3aaf2](https://github.com/LazyVim/LazyVim/commit/ae3aaf2dd3a04eb5dbc5b1e34843558c85e45ac2))
-* **neo-tree:** import neo-tree Extra before edgy Extra ([#5763](https://github.com/LazyVim/LazyVim/issues/5763)) ([848dd31](https://github.com/LazyVim/LazyVim/commit/848dd3132af50f6d211d0c07166ea7c1a4259088))
-* **ocaml:** use `root_dir` instead of `root_markers` for globs support ([#6428](https://github.com/LazyVim/LazyVim/issues/6428)) ([44cc063](https://github.com/LazyVim/LazyVim/commit/44cc0635bc3d2ccc55eb76bc7668092befcf0536))
-* **refactoring:** update funcs to return, add `expr=true`, operator mode ([#5882](https://github.com/LazyVim/LazyVim/issues/5882)) ([6e1de74](https://github.com/LazyVim/LazyVim/commit/6e1de74597fa07ea805920da370f9d998740bc5e))
-* remove 0.9 compat ([3516ae7](https://github.com/LazyVim/LazyVim/commit/3516ae736a333185f6f17b70af20b088d04cbbb6))
-* **schemastore:** use `before_init` instead of `on_new_config` to load schema store ([#6427](https://github.com/LazyVim/LazyVim/issues/6427)) ([14d2a9b](https://github.com/LazyVim/LazyVim/commit/14d2a9baa1306bd0969112fcf8f69a11840cc5e6))
-* **treesitter-main:** move exe check to config ([96316e5](https://github.com/LazyVim/LazyVim/commit/96316e5a69b4cc45311f5b7225e7d7bea1f977ee))
-* **treesitter-main:** set vim.bo.indentexpr in FileType autocmd ([#6430](https://github.com/LazyVim/LazyVim/issues/6430)) ([b926e7d](https://github.com/LazyVim/LazyVim/commit/b926e7db417bc7b0e80feb778bed7924ffe8e85d))
-* **vue:** `volar` -&gt; `vua_ls`. Fixes [#6236](https://github.com/LazyVim/LazyVim/issues/6236). Closes [#6238](https://github.com/LazyVim/LazyVim/issues/6238). Closes [#6174](https://github.com/LazyVim/LazyVim/issues/6174) ([4a3b4a8](https://github.com/LazyVim/LazyVim/commit/4a3b4a80a89fe5a52d30fbe4afe85c152878ab1b))
-
-
-### Performance Improvements
-
-* **blink:** only enable lazydev in lua files ([4961b3d](https://github.com/LazyVim/LazyVim/commit/4961b3d4d4b2999816e978c3ea4ef7c320e4206d))
-* **treesitter-main:** only enable highlighting for installed treesitter langs ([2f309fc](https://github.com/LazyVim/LazyVim/commit/2f309fc8b5bf93af25293c1e4688d409de718a36))
-
-## [14.15.1](https://github.com/LazyVim/LazyVim/compare/v14.15.0...v14.15.1) (2025-09-15)
-
-
-### Bug Fixes
-
-* **blink:** use .get method to access presets ([#6183](https://github.com/LazyVim/LazyVim/issues/6183)) ([1a729e2](https://github.com/LazyVim/LazyVim/commit/1a729e2d4c4162501fe13224d669a654849deb36))
-* **extras.ai.copilot:** update status retrieval for lualine ([#5900](https://github.com/LazyVim/LazyVim/issues/5900)) ([55e9944](https://github.com/LazyVim/LazyVim/commit/55e9944e2b1e152b5acdc9cc015978a905fc2966))
-* **lang.python:** enable venv-selector even when telescope is not available ([#5829](https://github.com/LazyVim/LazyVim/issues/5829)) ([10e5bf5](https://github.com/LazyVim/LazyVim/commit/10e5bf5c5b5fb4da0afbb2d4d2b75595502c9690))
-* **lsp:** fixed deprecated warnings ([bed725a](https://github.com/LazyVim/LazyVim/commit/bed725a054ed3e8c8c56dce7e2100335e567cf01))
-
-## [14.15.0](https://github.com/LazyVim/LazyVim/compare/v14.14.0...v14.15.0) (2025-05-12)
-
-
-### Features
-
-* **chezmoi:** enhance fzf-lua chezmoi picker and add snacks.dasbhoard entry ([#5275](https://github.com/LazyVim/LazyVim/issues/5275)) ([759a19e](https://github.com/LazyVim/LazyVim/commit/759a19e785735eb8513b4f8d4483ec5ab1b75307))
-* **keymaps:** show lang when opening treesitter inspect ([9c59668](https://github.com/LazyVim/LazyVim/commit/9c596681f684c549e69652a5c77a68bd5ecc93e3))
-* **octo:** add support for snacks picker ([#5625](https://github.com/LazyVim/LazyVim/issues/5625)) ([16a7724](https://github.com/LazyVim/LazyVim/commit/16a772452a515790c3304b358dd66a618fda3260))
-* **snippets:** mini.snippets standalone and blink.resubscribe ([#5507](https://github.com/LazyVim/LazyVim/issues/5507)) ([f2f2aea](https://github.com/LazyVim/LazyVim/commit/f2f2aea6722b530281b476c08ec60f2d320f1c3d))
-
-
-### Bug Fixes
-
-* **blink:** make sure to use `LazyVim.config.icons.kinds` ([#5668](https://github.com/LazyVim/LazyVim/issues/5668)) ([771089f](https://github.com/LazyVim/LazyVim/commit/771089f6928512ab0f431e9db04e7dc802a5e1a5))
-* **blink:** remove unnecessary `sources` from `cmdline` ([#5620](https://github.com/LazyVim/LazyVim/issues/5620)) ([5b94baa](https://github.com/LazyVim/LazyVim/commit/5b94baa1d2e7d8ec7e9a9cab82fabd8c3655d369))
-* **copilot-chat:** switch from deprecated picker integrations ([#5707](https://github.com/LazyVim/LazyVim/issues/5707)) ([b0334fd](https://github.com/LazyVim/LazyVim/commit/b0334fd57cdb920e03afab3c1940114ad43e4fbe))
-* **mason:** rename and pin to v1 ([c20c402](https://github.com/LazyVim/LazyVim/commit/c20c4022958780617424a090eee2360d560eb939))
-* **snacks.picker:** remove redundant leader-gc keymap. Closes [#5646](https://github.com/LazyVim/LazyVim/issues/5646) ([606b964](https://github.com/LazyVim/LazyVim/commit/606b96466eeb39b1c1bb576c9b99041b64705f43))
-
-## [14.14.0](https://github.com/LazyVim/LazyVim/compare/v14.13.0...v14.14.0) (2025-02-15)
-
-
-### Features
-
-* **extras:** setup neogen and mini.snippets integration ([#5594](https://github.com/LazyVim/LazyVim/issues/5594)) ([5788b9d](https://github.com/LazyVim/LazyVim/commit/5788b9d1e06dfb5f99f92354dc550c9f2c5a6710))
-* **keymaps:** enable toggling in quickfix list and location list ([#5608](https://github.com/LazyVim/LazyVim/issues/5608)) ([32e575a](https://github.com/LazyVim/LazyVim/commit/32e575aa75792c63f710f0bdc3e2fb5aa8ea75ad))
-* **snacks.picker:** added support for Project shortcuts in other dashboards ([#5607](https://github.com/LazyVim/LazyVim/issues/5607)) ([401ef48](https://github.com/LazyVim/LazyVim/commit/401ef48fcd617534b017ef471309bb1bd6465131))
-* **snacks.picker:** move trouble keymap from `ctrl+t` -&gt; `alt+t` ([4aff006](https://github.com/LazyVim/LazyVim/commit/4aff0063a42bbc499cfa03feb6e58d4339c0950d))
-
-
-### Bug Fixes
-
-* **blink:** `blink` released new version, remove previous hack ([#5616](https://github.com/LazyVim/LazyVim/issues/5616)) ([b35015a](https://github.com/LazyVim/LazyVim/commit/b35015ac59f0c630b2efe18ccf10d693397d0ca4))
-* **blink:** `cmdline` is now top-level on main branch ([#5615](https://github.com/LazyVim/LazyVim/issues/5615)) ([0458e46](https://github.com/LazyVim/LazyVim/commit/0458e46dcca49cc404062e04a9054a8bd058dcd3))
-* **blink:** enable Neovim native mapping with `&lt;Tab&gt;` ([#5617](https://github.com/LazyVim/LazyVim/issues/5617)) ([e7f8e4f](https://github.com/LazyVim/LazyVim/commit/e7f8e4faba0c6d397526238923f1aeff1740d09c))
-
-## [14.13.0](https://github.com/LazyVim/LazyVim/compare/v14.12.0...v14.13.0) (2025-02-12)
-
-
-### Features
-
-* **editor:** update parameter for fzf-lua ([#5584](https://github.com/LazyVim/LazyVim/issues/5584)) ([0a5965b](https://github.com/LazyVim/LazyVim/commit/0a5965b787e4d513b5a2e1182b35bd11ceafeeb3))
-* **lsp:** use lsp_config picker instead of `LspInfo` ([7529773](https://github.com/LazyVim/LazyVim/commit/75297733710951e81b505d88b2d728a5b0a9b6ab))
-
-## [14.12.0](https://github.com/LazyVim/LazyVim/compare/v14.11.0...v14.12.0) (2025-02-10)
-
-
-### Features
-
-* **config:** add option to disable the order check to warning message ([da3b515](https://github.com/LazyVim/LazyVim/commit/da3b5159df326bc31d5a0ebdfa2c5cbbd32df9d2))
-* **config:** allow disabling the order check with `vim.g.lazyvim_check_order = false` ([0bbce17](https://github.com/LazyVim/LazyVim/commit/0bbce1775b7d6750d3c4d761f3ad1bcfb77fb805))
-
-
-### Bug Fixes
-
-* **copilot-chat:** added support for snacks picker. Closes [#5432](https://github.com/LazyVim/LazyVim/issues/5432). Closes [#5552](https://github.com/LazyVim/LazyVim/issues/5552) ([2a608f0](https://github.com/LazyVim/LazyVim/commit/2a608f00d47bb6679a27a313fb0404e4d3a2196c))
-* **extras:** disable import handling when loading `:LazyExtras` + changed some recommendations ([121a2e2](https://github.com/LazyVim/LazyVim/commit/121a2e27ef0f4d8ab64bf76768b9600c45fd2364))
-
-## [14.11.0](https://github.com/LazyVim/LazyVim/compare/v14.10.0...v14.11.0) (2025-02-08)
-
-
-### Features
-
-* **config:** show a warning when lazy.nvim imports order is incorrect ([83988ea](https://github.com/LazyVim/LazyVim/commit/83988ea46eccbe20953cd807984d2e89d679aa6e))
-* **defaults:** new installs now default to snacks picker/explorer. Existing installs don't change. ([25d90b5](https://github.com/LazyVim/LazyVim/commit/25d90b54a3b1863cb4428fd309ab855732289710))
-* **extras:** big rework of default extras ([525377d](https://github.com/LazyVim/LazyVim/commit/525377dee9ac3d19f53e333538e4e85586163ad8))
-* **util:** `has_extra` now also checks for manual imports in `lazy.lua` ([0416376](https://github.com/LazyVim/LazyVim/commit/041637673371db7866f8bf00d77fc2fb6cc673c6))
-
-
-### Bug Fixes
-
-* **extras:** remove debug ([b4c24a3](https://github.com/LazyVim/LazyVim/commit/b4c24a3fe882c21555e60a1ec44087526e856eb9))
-* **snacks.explorer:** no longer needed to disable neo-tree ([2d6b492](https://github.com/LazyVim/LazyVim/commit/2d6b49281d2550222be6aada0b7eeca07bb26e10))
-* **snacks.picker:** move dashboard shortcut to picker extra. Closes [#5549](https://github.com/LazyVim/LazyVim/issues/5549) ([2b3bcf3](https://github.com/LazyVim/LazyVim/commit/2b3bcf36b2392bef94afefc07e2fcf32960960d7))
-
-## [14.10.0](https://github.com/LazyVim/LazyVim/compare/v14.9.0...v14.10.0) (2025-02-07)
-
-
-### Features
-
-* **bufferline:** support for snacks picker sidebars ([3500d6a](https://github.com/LazyVim/LazyVim/commit/3500d6a826a32d06d921f3e22342734c61ef09fe))
-* **refactoring:** fallback to using vim ui select for refactoring.nvim ([#5540](https://github.com/LazyVim/LazyVim/issues/5540)) ([23a1bbd](https://github.com/LazyVim/LazyVim/commit/23a1bbdae90f37aab4a86bfb4c113531a28e7f71))
-* **snacks.explorer:** enabled netrw integration ([4f006f1](https://github.com/LazyVim/LazyVim/commit/4f006f1fba5fdaa0150c544ad7966b96ec9cb04a))
-* **snacks.picker:** add projects picker to dashboard if snacks picker is enabled ([fb256f2](https://github.com/LazyVim/LazyVim/commit/fb256f2b688cb7ac9875f704fe6c00f27efc2354))
-* **snacks.picker:** some extra keymaps ([ab30442](https://github.com/LazyVim/LazyVim/commit/ab304426527723e116742cd7862fc976f876107c))
-* **snippets:** mini.snippets is out of beta ([#5505](https://github.com/LazyVim/LazyVim/issues/5505)) ([4a81a37](https://github.com/LazyVim/LazyVim/commit/4a81a370d7868d7db32042f69b0fc5a6218059c5))
-
-
-### Bug Fixes
-
-* **copilot:** remove load on BufReadPost instead of InsertEnter ([8f4e9b8](https://github.com/LazyVim/LazyVim/commit/8f4e9b8c1e43e354d91529484aedca54f04bdcf6))
-* **go:** update go.lua to eliminate fieldalignment from analyses ([#5170](https://github.com/LazyVim/LazyVim/issues/5170)) ([5c97327](https://github.com/LazyVim/LazyVim/commit/5c9732733de62a4e15988826f53d16a4dfdf960c))
-
-
-### Performance Improvements
-
-* **snacks_picker:** lazy-load trouble open action ([1a4d948](https://github.com/LazyVim/LazyVim/commit/1a4d948e0dae360836187be8c86283d7e814b7ef))
-
-## [14.9.0](https://github.com/LazyVim/LazyVim/compare/v14.8.0...v14.9.0) (2025-01-30)
-
-
-### Features
-
-* **markdown:** added markdown support for codecompanion ([e9db488](https://github.com/LazyVim/LazyVim/commit/e9db488acaa04f1a9eca6d022e57fed4271b8af8))
-* **snacks.picker:** added &lt;leader&gt;si to search icons ([#5460](https://github.com/LazyVim/LazyVim/issues/5460)) ([eea52be](https://github.com/LazyVim/LazyVim/commit/eea52be3447502dde77d9e6fa75fd597a0b5a86a))
-* **snacks.picker:** added &lt;leader&gt;su to search undotree ([#5447](https://github.com/LazyVim/LazyVim/issues/5447)) ([332b320](https://github.com/LazyVim/LazyVim/commit/332b32080c52727a16db90e06989caa0c378caa1))
-* **snacks.picker:** added `leader-fB` to find any buffer (including hidden & nofile) ([83bf636](https://github.com/LazyVim/LazyVim/commit/83bf6360a1f28a3fc1afe31ae300247fc01c7a90))
-* **snacks.picker:** added `leader-sp` to search for plugin spec ([7cf4185](https://github.com/LazyVim/LazyVim/commit/7cf4185dc4d1fe49ad004d33a6703603fb4500ff))
-* **snacks.picker:** added alt-c to toggle between cwd/root dir ([6be7c4f](https://github.com/LazyVim/LazyVim/commit/6be7c4fee4fb755ff07f7bcc13eac96e1d8c279a))
-* **snacks.picker:** flash.nvim integration ([5d24aa6](https://github.com/LazyVim/LazyVim/commit/5d24aa63111af68fbada8c97fedb75b07b8c3c92))
-* **snacks.picker:** use snacks picker for notifications when enabled ([01a70cc](https://github.com/LazyVim/LazyVim/commit/01a70cc60ed2760afc819510177fb8d12a371b25))
-* **snacks:** extra for snacks explorer (replacement for neo-tree) ([e20d9af](https://github.com/LazyVim/LazyVim/commit/e20d9afcbc980510093a3753a3991d8c934cbb75))
-* **snippets:** an extra for mini.snippets ([#5274](https://github.com/LazyVim/LazyVim/issues/5274)) ([8b4e6ff](https://github.com/LazyVim/LazyVim/commit/8b4e6ff70d682cad3b1f4999623c3f0ac639fa82))
-
-
-### Bug Fixes
-
-* **keymaps:** remove unneeded and ambiguous `&lt;leader&gt;w` keymap ([#5459](https://github.com/LazyVim/LazyVim/issues/5459)) ([132986a](https://github.com/LazyVim/LazyVim/commit/132986a624b49bf740161d90ce94f16dd5ea5883))
-* **luasnip:** schedule `jump` to be compatible with blink, nvim-cmp still works after change ([#5470](https://github.com/LazyVim/LazyVim/issues/5470)) ([0350934](https://github.com/LazyVim/LazyVim/commit/0350934d56579f3e6a9d40fa47313b2970d74772))
-* **root:** pass args to root.get ([dc8512f](https://github.com/LazyVim/LazyVim/commit/dc8512fce1ec1cd4b0ca52d1077b2ed3894d51c8))
-* **snacks.picker:** flash integration ([b5cd0d0](https://github.com/LazyVim/LazyVim/commit/b5cd0d0e27081be3ef1905475a0fe541b7661870))
-* **snacks.picker:** snacks =&gt; flash ([3de7b24](https://github.com/LazyVim/LazyVim/commit/3de7b24cf6ed844772ea047476a400c56d5f4b42))
-* **snacks:** use `Snacks.picker` for recent files ([#5485](https://github.com/LazyVim/LazyVim/issues/5485)) ([f0d2629](https://github.com/LazyVim/LazyVim/commit/f0d2629bd859eeac343999b0fe145f9beb227c4a))
-* **sql:** better nvim-cmp check. Closes [#5188](https://github.com/LazyVim/LazyVim/issues/5188) ([1e83b4f](https://github.com/LazyVim/LazyVim/commit/1e83b4f843f88678189df81b1c88a400c53abdbc))
-* **vscode:** diabled some snacks plugins. Fixes [#5364](https://github.com/LazyVim/LazyVim/issues/5364) ([c7a7ab5](https://github.com/LazyVim/LazyVim/commit/c7a7ab51129692927ae47f4e57ce22d10d48467e))
-
-## [14.8.0](https://github.com/LazyVim/LazyVim/compare/v14.7.0...v14.8.0) (2025-01-20)
-
-
-### Features
-
-* **chezmoi:** add snacks picker integration for chezmoi files ([#5429](https://github.com/LazyVim/LazyVim/issues/5429)) ([970d1a0](https://github.com/LazyVim/LazyVim/commit/970d1a05da37554aa17b671c869431a7b387d8be))
-* **dial:** add checkbox augend for markdown ([#5411](https://github.com/LazyVim/LazyVim/issues/5411)) ([b19f207](https://github.com/LazyVim/LazyVim/commit/b19f2070b847a3067436f4d16a0cc5b84a9f9819))
-* **snacks.picker:** added leader-sS to search lsp workspace symbols ([8787ec1](https://github.com/LazyVim/LazyVim/commit/8787ec1227e10123ad7291cf916020d9a8626525))
-* **snacks:** added git diff keymap to pick hunks with leader-gd ([62cb4a4](https://github.com/LazyVim/LazyVim/commit/62cb4a465c490c7d41f7a3bf52fb0e222f2cf83b))
-
-
-### Bug Fixes
-
-* **markdown:** disable checkbox rendering since it's annoying to edit ([4f31bfa](https://github.com/LazyVim/LazyVim/commit/4f31bfab86402c819e5ea1e18b3c5d139628c864))
-* **snacks.picker:** fix mapping for `Recent (cwd)` ([#5407](https://github.com/LazyVim/LazyVim/issues/5407)) ([8307b0f](https://github.com/LazyVim/LazyVim/commit/8307b0fe506a38417f3b7835e2c4b43d9a970946))
-* **snacks.picker:** fix mapping for Projects for consistency ([#5433](https://github.com/LazyVim/LazyVim/issues/5433)) ([eb7b453](https://github.com/LazyVim/LazyVim/commit/eb7b453b48ab7e3008013e0edf2822f622111e97))
-* **snacks.picker:** respect lazyvim.config.kind_filter ([#5415](https://github.com/LazyVim/LazyVim/issues/5415)) ([df7426e](https://github.com/LazyVim/LazyVim/commit/df7426eefa79d5dfa2fcbe2f381abfb2cca70bad))
-
-
-### Performance Improvements
-
-* **java:** setting opts.dap_main to false to disable main class scan ([#5391](https://github.com/LazyVim/LazyVim/issues/5391)) ([66c3577](https://github.com/LazyVim/LazyVim/commit/66c3577bc779d31a7c2addd47de7cc6d215795ba))
-
-## [14.7.0](https://github.com/LazyVim/LazyVim/compare/v14.6.1...v14.7.0) (2025-01-14)
-
-
-### Features
-
-* **extras:** added extra for snacks picker ([#5368](https://github.com/LazyVim/LazyVim/issues/5368)) ([13044c2](https://github.com/LazyVim/LazyVim/commit/13044c298ed1837a2d938b64710528d359dc8407))
-
-## [14.6.1](https://github.com/LazyVim/LazyVim/compare/v14.6.0...v14.6.1) (2025-01-08)
-
-
-### Bug Fixes
-
-* **blink:** added new luasnip preset ([8d2d9a9](https://github.com/LazyVim/LazyVim/commit/8d2d9a9bd965aab0a752f24ec327d2f391a8406b))
-* **luasnip:** correctly remove duplicate snippets ([#5214](https://github.com/LazyVim/LazyVim/issues/5214)) ([05c3447](https://github.com/LazyVim/LazyVim/commit/05c3447558fa6eef7ae3c0d3e7ed1c281572274d))
-* **nlua:** debugger not responding ([#5319](https://github.com/LazyVim/LazyVim/issues/5319)) ([4e746d0](https://github.com/LazyVim/LazyVim/commit/4e746d0e5625662e1f121b39f63836b653ed728b))
-
-## [14.6.0](https://github.com/LazyVim/LazyVim/compare/v14.5.0...v14.6.0) (2024-12-20)
-
-
-### Features
-
-* **colorscheme:** add fzf integration to catppuccin ([#5175](https://github.com/LazyVim/LazyVim/issues/5175)) ([751803f](https://github.com/LazyVim/LazyVim/commit/751803f98bf3baaf7db1c1e2ddd28e082396124a))
-* **lualine:** add fzf extensions. ([#5203](https://github.com/LazyVim/LazyVim/issues/5203)) ([7a16a75](https://github.com/LazyVim/LazyVim/commit/7a16a752ba1fa535bb54d6492fb8df6c72ab8ba0))
-
-
-### Bug Fixes
-
-* **blink:** remove compatibility with 0.7.6 release ([#5212](https://github.com/LazyVim/LazyVim/issues/5212)) ([857f330](https://github.com/LazyVim/LazyVim/commit/857f330c2139c328cfce0251b11713dc179d6a81))
-* **codeium:** doesnt automatically load when `vim.g.ai_cmp` is set to false ([#5182](https://github.com/LazyVim/LazyVim/issues/5182)) ([b51279c](https://github.com/LazyVim/LazyVim/commit/b51279c6d727a09cd3d2bf3c9d0cf829810280bb))
-* **fzf:** fzf.lua compatible hidden scrollbar ([#5177](https://github.com/LazyVim/LazyVim/issues/5177)) ([3a79273](https://github.com/LazyVim/LazyVim/commit/3a79273f3c3bbd22bcdba795b7b8fe6a949db96e))
-* **luasnip:** use blink's luasnip source. Closes [#5211](https://github.com/LazyVim/LazyVim/issues/5211) ([86de9c9](https://github.com/LazyVim/LazyVim/commit/86de9c9e443572b0244ee9bbdcf5f10ecaabaf74))
-
-
-### Performance Improvements
-
-* **supermaven:** add lazy-loading ([#5183](https://github.com/LazyVim/LazyVim/issues/5183)) ([a3a28bf](https://github.com/LazyVim/LazyVim/commit/a3a28bf8e43f7239316942c2f2bac6e74b28586b))
-
-
-### Reverts
-
-* fix(fzf): fzf.lua compatible hidden scrollbar ([#5177](https://github.com/LazyVim/LazyVim/issues/5177)) ([c40692c](https://github.com/LazyVim/LazyVim/commit/c40692c1b0a95492eead8cc093972c634d54043b))
-
-## [14.5.0](https://github.com/LazyVim/LazyVim/compare/v14.4.0...v14.5.0) (2024-12-17)
-
-
-### Features
-
-* **blink:** increase lazydev scores ([22015e0](https://github.com/LazyVim/LazyVim/commit/22015e0b4835ae148c19b459bf494fe5f72b415b))
-
-
-### Bug Fixes
-
-* **blink:** add `vim.snippet` fixes to blink (was already added to cmp). Fixes [#5067](https://github.com/LazyVim/LazyVim/issues/5067) ([5ea3cfa](https://github.com/LazyVim/LazyVim/commit/5ea3cfa48e6ac88b90282da86dba7799f67b2e30))
-* **blink:** don't trigger automatically on insert ([2cf3d23](https://github.com/LazyVim/LazyVim/commit/2cf3d234bfc31a1a4eda282ddabc12987f762893))
-* **blink:** remove show_on_insert_on_trigger_character since this has been fixed for {} and others ([0f3a120](https://github.com/LazyVim/LazyVim/commit/0f3a1201861e6d6e8834aa8937dcf3e4a70a937a))
-* **illuminate:** disable snacks.words when illuminate extra is enabled. Fixes [#5125](https://github.com/LazyVim/LazyVim/issues/5125) ([d025115](https://github.com/LazyVim/LazyVim/commit/d0251155ab2a293136c933b4e925e1fa16d39a2d))
-* **supermaven:** don't attach to bigfile and some snacks ft. Fixes [#5139](https://github.com/LazyVim/LazyVim/issues/5139) ([25ee13c](https://github.com/LazyVim/LazyVim/commit/25ee13ce29ad8c4e10d677e641955cfd3c810fb5))
-* **vscode:** disable some snacks plugins in vscode. Closes [#5124](https://github.com/LazyVim/LazyVim/issues/5124) ([301135b](https://github.com/LazyVim/LazyVim/commit/301135b2749affe71645c610001c8253ae78c591))
-
-## [14.4.0](https://github.com/LazyVim/LazyVim/compare/v14.3.0...v14.4.0) (2024-12-15)
-
-
-### Features
-
-* **blink:** boost results from ai providers and enable async, to get much faster completions ([6bc56e4](https://github.com/LazyVim/LazyVim/commit/6bc56e4e8142e3d453f2fbfea8ace62fcfc3750f))
-* **keymaps:** unlink luasnip on `esc` ([ef91026](https://github.com/LazyVim/LazyVim/commit/ef9102677f9b7a31d0bb7cfcd76f24401a7385fc))
-
-
-### Bug Fixes
-
-* **blink:** allow overriding `&lt;Tab&gt;` key. Fixes [#5095](https://github.com/LazyVim/LazyVim/issues/5095). Closes [#5099](https://github.com/LazyVim/LazyVim/issues/5099) ([89314cb](https://github.com/LazyVim/LazyVim/commit/89314cb2aae76b434122592ac8da264fa689bdff))
-* **keymaps:** better escape ([8f113a5](https://github.com/LazyVim/LazyVim/commit/8f113a514c130cba8d0f79acdd091d18ef997829))
-
 ## [14.3.0](https://github.com/LazyVim/LazyVim/compare/v14.2.0...v14.3.0) (2024-12-15)
 
 

CONTRIBUTING.md

@@ -29,21 +29,3 @@
 - 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,23 +1,5 @@
 # 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!
@@ -128,6 +110,7 @@ vim.g.snacks_animate = false
 ## 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
@@ -140,6 +123,7 @@ vim.g.snacks_animate = false
   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
@@ -177,6 +161,7 @@ Additionally, some core plugins have been moved to extras.
   ```
 
 - plugins moved to extras:
+
   - `mini.surround`
   - `mini.indentscope` scopes are now also highlighted with `indent-blankline`
   - `nvim-treesitter-context`
@@ -194,6 +179,7 @@ Additionally, some core plugins have been moved to extras.
   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
@@ -234,7 +220,9 @@ Additionally, some core plugins have been moved to extras.
 - 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, ...)_
@@ -253,15 +241,18 @@ Additionally, some core plugins have been moved to extras.
     ```
 
 - `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`
 

README-CN.md

@@ -54,7 +54,7 @@ LazyVim 是一个基于 [💤 lazy.nvim](https://github.com/folke/lazy.nvim) 的
 
 ## ⚡️ 环境要求
 
-- Neovim >= **0.11.2** (需要用 **LuaJIT** 构建)
+- Neovim >= **0.9.0** (需要用 **LuaJIT** 构建)
 - Git >= **2.19.0** (用于部分克隆支持)
 - 一个 [Nerd Font](https://www.nerdfonts.com/) 字体 **_(可选)_**
 - 一个用于 `nvim-treesitter` 的 **C** 编译器。看 [这里](https://github.com/nvim-treesitter/nvim-treesitter#requirements)

README-DE.md

@@ -56,7 +56,7 @@ und die Einfachheit von einem vorgefertigten Setup.
 
 ## ⚡️ Vorraussetzungen
 
-- Neovim >= **0.11.2** (gebraucht um mit **LuaJIT** zu bauen)
+- 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)_**
 

README-ES.md

@@ -52,7 +52,7 @@ LazyVim es una configuración de Neovim impulsada por [💤 lazy.nvim](https://g
 
 ## ⚡️ Requisitos
 
-- Neovim >= **0.11.2** (debe ser compilado con **LuaJIT**)
+- Neovim >= **0.9.0** (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)

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

@@ -57,7 +57,7 @@ insieme alla comodità di un setup preconfigurato.
 
 ## ⚡️ Requisiti
 
-- Neovim >= **0.11.2** (deve essere compilato con **LuaJIT**)
+- Neovim >= **0.9.0** (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)

README-JP.md

@@ -54,7 +54,7 @@ LazyVimは、ゼロから始めるか、あらかじめ作成されたディス
 
 ## ⚡️ 必要要件
 
-- Neovim >= **0.11.2** (**LuaJIT**でビルドされている必要があります)
+- Neovim >= **0.9.0** (**LuaJIT**でビルドされている必要があります)
 - Git >= **2.19.0** (部分的なcloneサポートのため)
 - [Nerd Font](https://www.nerdfonts.com/) **_(任意)_**
 - `nvim-treesitter`用の**C**コンパイラ。詳細は[こちら](https://github.com/nvim-treesitter/nvim-treesitter#requirements)

README-KO.md

@@ -52,7 +52,7 @@ LazyVim은 [💤 lazy.nvim](https://github.com/folke/lazy.nvim)를 기반으로
 
 ## ⚡️ 요구사항
 
-- **0.11.2**이상의 Neovim (LuaJIT과 함께 개발이 되어져있어야함니다.)
+- **0.9.0**이상의 Neovim (LuaJIT과 함께 개발이 되어져있어야함니다.)
 - **2.19.0**이상의 Git (이것은 부분적인 클론기능을 지원하기 위함입니다.)
 - [Nerd Font](https://www.nerdfonts.com/) **_(옵션)_**
 - `nvim-treesitter`를 위한 **C** 컴파일러. [이 문서](https://github.com/nvim-treesitter/nvim-treesitter#requirements)를 확인해주시기바랍니다.

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

@@ -57,7 +57,7 @@ como necessário, junto com a conveniência de um setup pré-configurado.
 
 ## ⚡️ Requesitos
 
-- Neovim >= **0.11.2** (preciso fazer build com **LuaJIT**)
+- Neovim >= **0.9.0** (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)

README.md

@@ -56,7 +56,7 @@ 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.9.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)
@@ -111,6 +111,10 @@ docker run -w /root -it --rm alpine:edge sh -uelic '
 
 ---
 
+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)
+
 [@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.

doc/LazyVim.txt

@@ -1,5 +1,4 @@
-*LazyVim.txt*                                                     LazyVim docs
+*LazyVim.txt*             For Neovim             Last change: 2024 December 15
-                                       For Neovim    Last change: 2026 June 02
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*
@@ -54,7 +53,7 @@ FEATURES                                                    *LazyVim-features*
 
 REQUIREMENTS                                            *LazyVim-requirements*
 
-- Neovim >= **0.11.2** (needs to be built with **LuaJIT**)
+- Neovim >= **0.9.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>
@@ -79,29 +78,30 @@ Try it with Docker ~
 Install the LazyVim Starter ~
 
 - Make a backup of your current Neovim files:
-
+    >sh
->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**.
 
 ------------------------------------------------------------------------------
+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>
+
 @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.
@@ -127,7 +127,9 @@ 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
+5. *@dusty-phillips*: 
 
 Generated by panvimdoc <https://github.com/kdheepak/panvimdoc>
 

lua/lazyvim/config/autocmds.lua

@@ -18,11 +18,7 @@ vim.api.nvim_create_autocmd({ "FocusGained", "TermClose", "TermLeave" }, {
 vim.api.nvim_create_autocmd("TextYankPost", {
   group = augroup("highlight_yank"),
   callback = function()
-    if vim.fn.has("nvim-0.13") == 1 then
+    (vim.hl or vim.highlight).on_yank()
-      vim.hl.hl_op()
-    else
-      (vim.hl or vim.highlight).on_yank()
-    end
   end,
 })
 
@@ -60,7 +56,6 @@ vim.api.nvim_create_autocmd("FileType", {
   pattern = {
     "PlenaryTestPopup",
     "checkhealth",
-    "dap-float",
     "dbout",
     "gitsigns-blame",
     "grug-far",

lua/lazyvim/config/init.lua

@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "16.0.0" -- x-release-please-version
+M.version = "14.3.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions
@@ -34,9 +34,7 @@ local defaults = {
       dots = "󰇘",
     },
     ft = {
-      octo = " ",
+      octo = "",
-      gh = " ",
-      ["markdown.gh"] = " ",
     },
     dap = {
       Stopped             = { "󰁕 ", "DiagnosticWarn", "DapStoppedLine" },
@@ -138,19 +136,16 @@ local defaults = {
 }
 
 M.json = {
-  version = 8,
+  version = 7,
-  loaded = false,
   path = vim.g.lazyvim_json or vim.fn.stdpath("config") .. "/lazyvim.json",
   data = {
-    version = nil, ---@type number?
+    version = nil, ---@type string?
-    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")
@@ -162,8 +157,6 @@ function M.json.load()
         LazyVim.json.migrate()
       end
     end
-  else
-    M.json.data.install_version = M.json.version
   end
 end
 
@@ -213,37 +206,6 @@ function M.setup(opts)
         "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,
   })
 
@@ -306,8 +268,6 @@ function M.load(name)
 end
 
 M.did_init = false
-M._options = {} ---@type vim.wo|vim.bo
-
 function M.init()
   if M.did_init then
     return
@@ -330,14 +290,8 @@ function M.init()
   -- 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()
+  lazy_clipboard = vim.opt.clipboard
   vim.opt.clipboard = ""
 
   if vim.g.deprecation_warnings == false then
@@ -348,111 +302,6 @@ function M.init()
   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, {
   __index = function(_, key)
     if options == nil then

lua/lazyvim/config/keymaps.lua

@@ -4,6 +4,14 @@
 -- use `vim.keymap.set` instead
 local map = LazyVim.safe_keymap_set
 
+-- Clear search and stop snippet on escape
+Snacks.util.on_key("<esc>", function()
+  vim.cmd("noh")
+  if vim.snippet then
+    vim.snippet.stop()
+  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 })
@@ -43,18 +51,8 @@ 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, diff update and redraw
 -- taken from runtime/lua/_editor.lua
 map(
@@ -84,8 +82,8 @@ map({ "i", "x", "n", "s" }, "<C-s>", "<cmd>w<cr><esc>", { desc = "Save File" })
 map("n", "<leader>K", "<cmd>norm! K<cr>", { desc = "Keywordprg" })
 
 -- better indenting
-map("x", "<", "<gv")
+map("v", "<", "<gv")
-map("x", ">", ">gv")
+map("v", ">", ">gv")
 
 -- commenting
 map("n", "gco", "o<esc>Vcx<esc><cmd>normal gcc<cr>fxa<bs>", { desc = "Add Comment Below" })
@@ -97,38 +95,23 @@ 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", "<cmd>lopen<cr>", { desc = "Location List" })
-map("n", "<leader>xl", function()
+map("n", "<leader>xq", "<cmd>copen<cr>", { desc = "Quickfix List" })
-  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" })
-
--- 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()
+map({ "n", "v" }, "<leader>cf", function()
   LazyVim.format({ force = true })
 end, { desc = "Format" })
 
 -- diagnostic
 local diagnostic_goto = function(next, severity)
+  local go = next and vim.diagnostic.goto_next or vim.diagnostic.goto_prev
+  severity = severity and vim.diagnostic.severity[severity] or nil
   return function()
-    vim.diagnostic.jump({
+    go({ severity = severity })
-      count = (next and 1 or -1) * vim.v.count1,
-      severity = severity and vim.diagnostic.severity[severity] or nil,
-      float = true,
-    })
   end
 end
 map("n", "<leader>cd", vim.diagnostic.open_float, { desc = "Line Diagnostics" })
@@ -168,12 +151,12 @@ end
 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)" })
+  map("n", "<leader>gf", function() Snacks.lazygit.log_file() end, { desc = "Lazygit Current File History" })
+  map("n", "<leader>gl", function() Snacks.lazygit.log({ cwd = LazyVim.root.git() }) end, { desc = "Lazygit Log" })
+  map("n", "<leader>gL", function() Snacks.lazygit.log() end, { desc = "Lazygit Log (cwd)" })
 end
 
-map("n", "<leader>gL", function() Snacks.picker.git_log() end, { desc = "Git Log (cwd)" })
+map("n", "<leader>gb", function() Snacks.git.blame_line() end, { desc = "Git Blame Line" })
-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 })
@@ -184,7 +167,7 @@ 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" })
+map("n", "<leader>uI", "<cmd>InspectTree<cr>", { desc = "Inspect Tree" })
 
 -- LazyVim Changelog
 map("n", "<leader>L", function() LazyVim.news.changelog() end, { desc = "LazyVim Changelog" })
@@ -192,10 +175,15 @@ map("n", "<leader>L", function() LazyVim.news.changelog() end, { desc = "LazyVim
 -- 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", "<c-/>",      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 = "which_key_ignore" })
+map("n", "<c-_>",      function() Snacks.terminal(nil, { cwd = LazyVim.root() }) end, { desc = "which_key_ignore" })
+
+-- Terminal Mappings
+map("t", "<C-/>", "<cmd>close<cr>", { desc = "Hide Terminal" })
+map("t", "<c-_>", "<cmd>close<cr>", { desc = "which_key_ignore" })
 
 -- windows
+map("n", "<leader>w", "<c-w>", { desc = "Windows", remap = true })
 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 })
@@ -211,5 +199,12 @@ 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
+-- native snippets. only needed on < 0.11, as 0.11 creates these by default
-map({"n", "x"}, "<localleader>r", function() Snacks.debug.run() end, { desc = "Run Lua", ft = "lua" })
+if vim.fn.has("nvim-0.11") == 0 then
+  map("s", "<Tab>", function()
+    return vim.snippet.active({ direction = 1 }) and "<cmd>lua vim.snippet.jump(1)<cr>" or "<Tab>"
+  end, { expr = true, desc = "Jump Next" })
+  map({ "i", "s" }, "<S-Tab>", function()
+    return vim.snippet.active({ direction = -1 }) and "<cmd>lua vim.snippet.jump(-1)<cr>" or "<S-Tab>"
+  end, { expr = true, desc = "Jump Previous" })
+end

lua/lazyvim/config/options.lua

@@ -53,8 +53,8 @@ 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.
+-- integration works automatically. Requires Neovim >= 0.10.0
-opt.clipboard = vim.env.SSH_CONNECTION and "" or "unnamedplus" -- Sync with system clipboard
+opt.clipboard = vim.env.SSH_TTY and "" or "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.confirm = true -- Confirm to save changes before exiting modified buffer
@@ -69,9 +69,7 @@ opt.fillchars = {
   eob = " ",
 }
 opt.foldlevel = 99
-opt.foldmethod = "indent"
+opt.formatexpr = "v:lua.require'lazyvim.util'.format.formatexpr()"
-opt.foldtext = ""
-opt.formatexpr = "v:lua.LazyVim.format.formatexpr()"
 opt.formatoptions = "jcroqlnt" -- tcqj
 opt.grepformat = "%f:%l:%c:%m"
 opt.grepprg = "rg --vimgrep"
@@ -97,12 +95,11 @@ 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.statuscolumn = [[%!v:lua.require'snacks.statuscolumn'.get()]]
 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
@@ -114,5 +111,15 @@ 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.10") == 1 then
+  opt.smoothscroll = true
+  opt.foldexpr = "v:lua.require'lazyvim.util'.ui.foldexpr()"
+  opt.foldmethod = "expr"
+  opt.foldtext = ""
+else
+  opt.foldmethod = "indent"
+  opt.foldtext = "v:lua.require'lazyvim.util'.ui.foldtext()"
+end
+
 -- Fix markdown indentation settings
 vim.g.markdown_recommended_style = 0

lua/lazyvim/health.lua

@@ -4,15 +4,17 @@ 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")
 
-  if vim.fn.has("nvim-0.11.2") == 1 then
+  if vim.fn.has("nvim-0.9.0") == 1 then
-    ok("Using Neovim >= 0.11.2")
+    ok("Using Neovim >= 0.9.0")
+    if vim.fn.has("nvim-0.10.0") == 0 then
+      warn("Use Neovim >= 0.10.0 for the best experience")
+    end
   else
-    error("Neovim >= 0.11.2 is required")
+    error("Neovim >= 0.9.0 is required")
   end
 
   for _, cmd in ipairs({ "git", "rg", { "fd", "fdfind" }, "lazygit", "fzf", "curl" }) do
@@ -34,23 +36,6 @@ function M.check()
       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`")
-    end
-  end
 end
 
 return M

lua/lazyvim/plugins/coding.lua

@@ -1,9 +1,20 @@
 return {
-  -- Auto pairs
-  -- Automatically inserts a matching closing character
-  -- when you type an opening character like `"`, `[`, or `(`.
   {
-    "nvim-mini/mini.pairs",
+    import = "lazyvim.plugins.extras.coding.nvim-cmp",
+    enabled = function()
+      return LazyVim.cmp_engine() == "nvim-cmp"
+    end,
+  },
+  {
+    import = "lazyvim.plugins.extras.coding.blink",
+    enabled = function()
+      return LazyVim.cmp_engine() == "blink.cmp"
+    end,
+  },
+
+  -- auto pairs
+  {
+    "echasnovski/mini.pairs",
     event = "VeryLazy",
     opts = {
       modes = { insert = true, command = true, terminal = false },
@@ -22,20 +33,16 @@ return {
     end,
   },
 
-  -- Improves comment syntax, lets Neovim handle multiple
+  -- comments
-  -- types of comments for a single language, and relaxes rules
-  -- for uncommenting.
   {
     "folke/ts-comments.nvim",
     event = "VeryLazy",
     opts = {},
   },
 
-  -- Extends the a & i text objects, this adds the ability to select
+  -- Better text-objects
-  -- arguments, function calls, text within quotes and brackets, and to
-  -- repeat those selections to select an outer text object.
   {
-    "nvim-mini/mini.ai",
+    "echasnovski/mini.ai",
     event = "VeryLazy",
     opts = function()
       local ai = require("mini.ai")
@@ -70,8 +77,6 @@ return {
     end,
   },
 
-  -- Configures LuaLS to support auto-completion and type checking
-  -- while editing your Neovim configuration.
   {
     "folke/lazydev.nvim",
     ft = "lua",
@@ -82,7 +87,6 @@ return {
         { 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

@@ -13,21 +13,12 @@ return {
     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,
@@ -36,14 +27,26 @@ return {
         leap = true,
         lsp_trouble = true,
         mason = true,
+        markdown = true,
         mini = true,
+        native_lsp = {
+          enabled = true,
+          underlines = {
+            errors = { "undercurl" },
+            hints = { "undercurl" },
+            warnings = { "undercurl" },
+            information = { "undercurl" },
+          },
+        },
         navic = { enabled = true, custom_bg = "lualine" },
         neotest = true,
         neotree = true,
         noice = true,
         notify = true,
+        semantic_tokens = true,
         snacks = true,
         telescope = true,
+        treesitter = true,
         treesitter_context = true,
         which_key = true,
       },
@@ -54,7 +57,7 @@ return {
         optional = true,
         opts = function(_, opts)
           if (vim.g.colors_name or ""):find("catppuccin") then
-            opts.highlights = require("catppuccin.special.bufferline").get_theme()
+            opts.highlights = require("catppuccin.groups.integrations.bufferline").get()
           end
         end,
       },

lua/lazyvim/plugins/compat/nvim-0_9.lua

@@ -0,0 +1,41 @@
+-- Compatibility with Neovim 0.9
+return {
+  -- Use LuaSnip instead of native snippets
+  { "garymjr/nvim-snippets", enabled = false },
+  { import = "lazyvim.plugins.extras.coding.luasnip" },
+
+  -- Use nvim-cmp instead of blink.cmp
+  { import = "lazyvim.plugins.extras.coding.nvim-cmp" },
+
+  -- Use mini.comment instead of ts-comments
+  { "folke/ts-comments.nvim", enabled = false },
+  { import = "lazyvim.plugins.extras.coding.mini-comment" },
+
+  -- Use neodev-types with lazydev
+  { "folke/neodev.nvim", config = function() end },
+  {
+    "folke/lazydev.nvim",
+    opts = function(_, opts)
+      opts.library = opts.library or {}
+      table.insert(opts.library, { "neodev.nvim/types/stable" })
+    end,
+    config = function(_, opts)
+      -- force lazydev to load on Neovim 0.9
+      require("lazydev.config").have_0_10 = true
+      require("lazydev").setup(opts)
+    end,
+  },
+  {
+    "neovim/nvim-lspconfig",
+    dependencies = {},
+  },
+
+  -- dummy import to save core imports
+  {
+    import = "foobar",
+    enabled = function()
+      LazyVim.plugin.save_core()
+      return false
+    end,
+  },
+}

lua/lazyvim/plugins/editor.lua

@@ -1,10 +1,136 @@
 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,
+  },
+
   -- search/replace in multiple files
   {
     "MagicDuck/grug-far.nvim",
     opts = { headerMaxWidth = 80 },
-    cmd = { "GrugFar", "GrugFarWithin" },
+    cmd = "GrugFar",
     keys = {
       {
         "<leader>sr",
@@ -18,7 +144,7 @@ return {
             },
           })
         end,
-        mode = { "n", "x" },
+        mode = { "n", "v" },
         desc = "Search and Replace",
       },
     },
@@ -40,16 +166,6 @@ return {
       { "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" },
-        function()
-          require("flash").treesitter({
-            actions = {
-              ["<c-space>"] = "next",
-              ["<BS>"] = "prev"
-            }
-          }) 
-        end, desc = "Treesitter Incremental Selection" },
     },
   },
 
@@ -64,7 +180,7 @@ return {
       defaults = {},
       spec = {
         {
-          mode = { "n", "x" },
+          mode = { "n", "v" },
           { "<leader><tab>", group = "tabs" },
           { "<leader>c", group = "code" },
           { "<leader>d", group = "debug" },
@@ -74,8 +190,8 @@ return {
           { "<leader>gh", group = "hunks" },
           { "<leader>q", group = "quit/session" },
           { "<leader>s", group = "search" },
-          { "<leader>u", group = "ui" },
+          { "<leader>u", group = "ui", icon = { icon = "󰙵 ", color = "cyan" } },
-          { "<leader>x", group = "diagnostics/quickfix" },
+          { "<leader>x", group = "diagnostics/quickfix", icon = { icon = "󱖫 ", color = "green" } },
           { "[", group = "prev" },
           { "]", group = "next" },
           { "g", group = "goto" },
@@ -153,7 +269,7 @@ return {
         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
@@ -173,8 +289,8 @@ return {
         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", "v" }, "<leader>ghs", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
-        map({ "n", "x" }, "<leader>ghr", ":Gitsigns reset_hunk<CR>", "Reset 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")
@@ -268,4 +384,17 @@ return {
       { "<leader>sT", "<cmd>TodoTelescope keywords=TODO,FIX,FIXME<cr>", desc = "Todo/Fix/Fixme" },
     },
   },
+
+  {
+    import = "lazyvim.plugins.extras.editor.fzf",
+    enabled = function()
+      return LazyVim.pick.want() == "fzf"
+    end,
+  },
+  {
+    import = "lazyvim.plugins.extras.editor.telescope",
+    enabled = function()
+      return LazyVim.pick.want() == "telescope"
+    end,
+  },
 }

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

@@ -4,7 +4,6 @@ return {
   {
     "Exafunction/codeium.nvim",
     cmd = "Codeium",
-    event = "InsertEnter",
     build = ":Codeium Auth",
     opts = {
       enable_cmp_source = vim.g.ai_cmp,
@@ -63,13 +62,7 @@ return {
     opts = {
       sources = {
         compat = { "codeium" },
-        providers = {
+        providers = { codeium = { kind = "Codeium" } },
-          codeium = {
-            kind = "Codeium",
-            score_offset = 100,
-            async = true,
-          },
-        },
       },
     },
   } or nil,

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

@@ -1,3 +1,19 @@
+local M = {}
+
+---@param kind string
+function M.pick(kind)
+  return function()
+    local actions = require("CopilotChat.actions")
+    local items = actions[kind .. "_actions"]()
+    if not items then
+      LazyVim.warn("No " .. kind .. " found on the current line")
+      return
+    end
+    local ok = pcall(require, "fzf-lua")
+    require("CopilotChat.integrations." .. (ok and "fzflua" or "telescope")).pick(items)
+  end
+end
+
 return {
   {
     "CopilotC-Nvim/CopilotChat.nvim",
@@ -8,11 +24,8 @@ return {
       user = user:sub(1, 1):upper() .. user:sub(2)
       return {
         auto_insert_mode = true,
-        headers = {
+        question_header = "  " .. user .. " ",
-          user = "  " .. user .. " ",
+        answer_header = "  Copilot ",
-          assistant = "  Copilot ",
-          tool = "󰊳  Tool ",
-        },
         window = {
           width = 0.4,
         },
@@ -20,14 +33,14 @@ return {
     end,
     keys = {
       { "<c-s>", "<CR>", ft = "copilot-chat", desc = "Submit Prompt", remap = true },
-      { "<leader>a", "", desc = "+ai", mode = { "n", "x" } },
+      { "<leader>a", "", desc = "+ai", mode = { "n", "v" } },
       {
         "<leader>aa",
         function()
           return require("CopilotChat").toggle()
         end,
         desc = "Toggle (CopilotChat)",
-        mode = { "n", "x" },
+        mode = { "n", "v" },
       },
       {
         "<leader>ax",
@@ -35,30 +48,21 @@ return {
           return require("CopilotChat").reset()
         end,
         desc = "Clear (CopilotChat)",
-        mode = { "n", "x" },
+        mode = { "n", "v" },
       },
       {
         "<leader>aq",
         function()
-          vim.ui.input({
+          local input = vim.fn.input("Quick Chat: ")
-            prompt = "Quick Chat: ",
+          if input ~= "" then
-          }, function(input)
+            require("CopilotChat").ask(input)
-            if input ~= "" then
+          end
-              require("CopilotChat").ask(input)
-            end
-          end)
         end,
         desc = "Quick Chat (CopilotChat)",
-        mode = { "n", "x" },
+        mode = { "n", "v" },
-      },
-      {
-        "<leader>ap",
-        function()
-          require("CopilotChat").select_prompt()
-        end,
-        desc = "Prompt Actions (CopilotChat)",
-        mode = { "n", "x" },
       },
+      -- Show prompts actions with telescope
+      { "<leader>ap", M.pick("prompt"), desc = "Prompt Actions (CopilotChat)", mode = { "n", "v" } },
     },
     config = function(_, opts)
       local chat = require("CopilotChat")
@@ -88,24 +92,4 @@ return {
       })
     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

@@ -5,12 +5,11 @@ return {
     "zbirenbaum/copilot.lua",
     cmd = "Copilot",
     build = ":Copilot auth",
-    event = "BufReadPost",
+    event = "InsertEnter",
     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-]>",
@@ -25,17 +24,6 @@ return {
     },
   },
 
-  -- 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",
@@ -60,9 +48,9 @@ return {
         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 {}
+          local clients = package.loaded["copilot"] and LazyVim.lsp.get_clients({ name = "copilot", bufnr = 0 }) or {}
           if #clients > 0 then
-            local status = require("copilot.status").data.status
+            local status = require("copilot.api").status.data.status
             return (status == "InProgress" and "pending") or (status == "Warning" and "error") or "ok"
           end
         end)
@@ -70,58 +58,59 @@ return {
     end,
   },
 
-  vim.g.ai_cmp and {
+  vim.g.ai_cmp
-    -- copilot cmp source
+      and {
-    {
+        -- copilot cmp source
-      "hrsh7th/nvim-cmp",
-      optional = true,
-      dependencies = { -- this will only be evaluated if nvim-cmp is enabled
         {
-          "zbirenbaum/copilot-cmp",
+          "hrsh7th/nvim-cmp",
-          opts = {},
+          optional = true,
-          config = function(_, opts)
+          dependencies = { -- this will only be evaluated if nvim-cmp is enabled
-            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",
+              "zbirenbaum/copilot-cmp",
-              optional = true,
+              opts = {},
-              ---@param opts cmp.ConfigSchema
+              config = function(_, opts)
-              opts = function(_, opts)
+                local copilot_cmp = require("copilot_cmp")
-                table.insert(opts.sources, 1, {
+                copilot_cmp.setup(opts)
-                  name = "copilot",
+                -- attach cmp source whenever copilot attaches
-                  group_index = 1,
+                -- fixes lazy-loading issues with the copilot cmp source
-                  priority = 100,
+                LazyVim.lsp.on_attach(function()
-                })
+                  copilot_cmp._on_insert_enter({})
+                end, "copilot")
               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,
-      "saghen/blink.cmp",
+          dependencies = { "giuxtaposition/blink-cmp-copilot" },
-      optional = true,
+          opts = {
-      dependencies = { "fang2hou/blink-copilot" },
+            sources = {
-      opts = {
+              default = { "copilot" },
-        sources = {
+              providers = {
-          default = { "copilot" },
+                copilot = {
-          providers = {
+                  name = "copilot",
-            copilot = {
+                  module = "blink-cmp-copilot",
-              name = "copilot",
+                  kind = "Copilot",
-              module = "blink-copilot",
+                },
-              score_offset = 100,
+              },
-              async = true,
             },
           },
         },
-      },
+      }
-    },
+    or nil,
-  } 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,17 +1,11 @@
 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" },
     },
   },
 
@@ -56,13 +50,7 @@ return {
     opts = {
       sources = {
         compat = { "supermaven" },
-        providers = {
+        providers = { supermaven = { kind = "Supermaven" } },
-          supermaven = {
-            kind = "Supermaven",
-            score_offset = 100,
-            async = true,
-          },
-        },
       },
     },
   } or nil,

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

@@ -41,13 +41,7 @@ return {
     opts = {
       sources = {
         compat = { "cmp_tabnine" },
-        providers = {
+        providers = { cmp_tabnine = { kind = "TabNine" } },
-          cmp_tabnine = {
-            kind = "TabNine",
-            score_offset = 100,
-            async = true,
-          },
-        },
       },
     },
   },

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

@@ -31,15 +31,11 @@ return {
         version = not vim.g.lazyvim_blink_main and "*",
       },
     },
-    event = { "InsertEnter", "CmdlineEnter" },
+    event = "InsertEnter",
 
     ---@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
@@ -49,7 +45,6 @@ return {
         -- adjusts spacing to ensure icons are aligned
         nerd_font_variant = "mono",
       },
-
       completion = {
         accept = {
           -- experimental auto-brackets support
@@ -79,36 +74,20 @@ return {
         -- with blink.compat
         compat = {},
         default = { "lsp", "path", "snippets", "buffer" },
-      },
+        cmdline = {},
-
-      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" },
+        ["<Tab>"] = {
+          LazyVim.cmp.map({ "snippet_forward", "ai_accept" }),
+          "fallback",
+        },
       },
     },
     ---@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
@@ -122,19 +101,29 @@ return {
         end
       end
 
-      -- add ai_accept to <Tab> key
+      -- fix super-tab completion
-      if not opts.keymap["<Tab>"] then
+      if opts.keymap.preset == "super-tab" then
-        if opts.keymap.preset == "super-tab" then -- super-tab
+        opts.keymap["<Tab>"] = {
-          opts.keymap["<Tab>"] = {
+          function(cmp)
-            require("blink.cmp.keymap.presets").get("super-tab")["<Tab>"][1],
+            if cmp.snippet_active() then
-            LazyVim.cmp.map({ "snippet_forward", "ai_nes", "ai_accept" }),
+              return cmp.accept()
-            "fallback",
+            else
-          }
+              return cmp.select_and_accept()
-        else -- other presets
+            end
-          opts.keymap["<Tab>"] = {
+          end,
-            LazyVim.cmp.map({ "snippet_forward", "ai_nes", "ai_accept" }),
+          LazyVim.cmp.map({ "snippet_forward", "ai_accept" }),
-            "fallback",
+          "fallback",
-          }
+        }
+      end
+
+      ---  NOTE: compat with latest version. Currenlty 0.7.6
+      if not vim.g.lazyvim_blink_main then
+        ---@diagnostic disable-next-line: inject-field
+        opts.sources.completion = opts.sources.completion or {}
+        opts.sources.completion.enabled_providers = enabled
+        if vim.tbl_get(opts, "completion", "menu", "draw", "treesitter") then
+          ---@diagnostic disable-next-line: assign-type-mismatch
+          opts.completion.menu.draw.treesitter = true
         end
       end
 
@@ -160,7 +149,6 @@ return {
             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
@@ -179,7 +167,9 @@ return {
     "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)
+      opts.appearance.kind_icons = vim.tbl_extend("keep", {
+        Color = "██", -- Use block instead of icon for color items to make swatches more usable
+      }, LazyVim.config.icons.kinds)
     end,
   },
 
@@ -188,14 +178,12 @@ return {
     "saghen/blink.cmp",
     opts = {
       sources = {
-        per_filetype = {
+        -- add lazydev to your completion providers
-          lua = { inherit_defaults = true, "lazydev" },
+        default = { "lazydev" },
-        },
         providers = {
           lazydev = {
             name = "LazyDev",
             module = "lazydev.integrations.blink",
-            score_offset = 100, -- show at a higher priority than lsp
           },
         },
       },

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

@@ -1,6 +1,6 @@
 return {
   -- disable builtin snippet support
-  { "garymjr/nvim-snippets", optional = true, enabled = false },
+  { "garymjr/nvim-snippets", enabled = false },
 
   -- add luasnip
   {
@@ -30,15 +30,7 @@ return {
     opts = function()
       LazyVim.cmp.actions.snippet_forward = function()
         if require("luasnip").jumpable(1) then
-          vim.schedule(function()
+          require("luasnip").jump(1)
-            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
@@ -69,9 +61,25 @@ return {
   {
     "saghen/blink.cmp",
     optional = true,
+    dependencies = {
+      { "saghen/blink.compat", opts = { impersonate_nvim_cmp = true } },
+      { "saadparwaiz1/cmp_luasnip" },
+    },
     opts = {
+      sources = { compat = { "luasnip" } },
       snippets = {
-        preset = "luasnip",
+        expand = function(snippet)
+          require("luasnip").lsp_expand(snippet)
+        end,
+        active = function(filter)
+          if filter and filter.direction then
+            return require("luasnip").jumpable(filter.direction)
+          end
+          return require("luasnip").in_snippet()
+        end,
+        jump = function(direction)
+          require("luasnip").jump(direction)
+        end,
       },
     },
   },

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

@@ -1,6 +1,6 @@
 return {
   {
-    "nvim-mini/mini.comment",
+    "echasnovski/mini.comment",
     event = "VeryLazy",
     opts = {
       options = {

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

@@ -3,12 +3,13 @@
 -- to select the text inside, change or modify the surrounding characters,
 -- and more.
 return {
-  "nvim-mini/mini.surround",
+  "echasnovski/mini.surround",
+  recommended = true,
   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.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" },

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

@@ -1,6 +1,5 @@
 return {
   "danymat/neogen",
-  dependencies = LazyVim.has("mini.snippets") and { "mini.snippets" } or {},
   cmd = "Neogen",
   keys = {
     {
@@ -18,7 +17,6 @@ return {
 
     local map = {
       ["LuaSnip"] = "luasnip",
-      ["mini.snippets"] = "mini",
       ["nvim-snippy"] = "snippy",
       ["vim-vsnip"] = "vsnip",
     }

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

@@ -25,9 +25,6 @@ return {
     -- }
     -- ```
     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")()
@@ -52,7 +49,7 @@ return {
             fallback()
           end,
           ["<tab>"] = function(fallback)
-            return LazyVim.cmp.map({ "snippet_forward", "ai_nes", "ai_accept" }, fallback)()
+            return LazyVim.cmp.map({ "snippet_forward", "ai_accept" }, fallback)()
           end,
         }),
         sources = cmp.config.sources({

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

@@ -5,9 +5,6 @@ return {
   desc = "Better Yank/Paste",
   event = "LazyFile",
   opts = {
-    system_clipboard = {
-      sync_with_ring = not vim.env.SSH_CONNECTION,
-    },
     highlight = { timer = 150 },
   },
   keys = {
@@ -16,8 +13,6 @@ return {
       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

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

@@ -84,7 +84,7 @@ return {
     -- 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"} },
+      { "<leader>de", function() require("dapui").eval() end, desc = "Eval", mode = {"n", "v"} },
     },
     opts = {},
     config = function(_, opts)

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

@@ -19,8 +19,8 @@ return {
   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-a>", function() return M.dial(true, true) end, expr = true, desc = "Increment", mode = {"n", "v"} },
-    { "g<C-x>", function() return M.dial(false, true) end, expr = true, desc = "Decrement", mode = {"n", "x"} },
+    { "g<C-x>", function() return M.dial(false, true) end, expr = true, desc = "Decrement", mode = {"n", "v"} },
   },
   opts = function()
     local augend = require("dial.augend")
@@ -53,6 +53,20 @@ return {
       cyclic = true,
     })
 
+    local weekdays = augend.constant.new({
+      elements = {
+        "Monday",
+        "Tuesday",
+        "Wednesday",
+        "Thursday",
+        "Friday",
+        "Saturday",
+        "Sunday",
+      },
+      word = true,
+      cyclic = true,
+    })
+
     local months = augend.constant.new({
       elements = {
         "January",
@@ -72,6 +86,15 @@ return {
       cyclic = true,
     })
 
+    local capitalized_boolean = augend.constant.new({
+      elements = {
+        "True",
+        "False",
+      },
+      word = true,
+      cyclic = true,
+    })
+
     return {
       dials_by_ft = {
         css = "css",
@@ -93,12 +116,11 @@ return {
           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,
+          weekdays,
           months,
+          capitalized_boolean,
           augend.constant.alias.bool, -- boolean value (true <-> false)
-          augend.constant.alias.Bool, -- boolean value (True <-> False)
           logical_alias,
         },
         vue = {
@@ -118,11 +140,6 @@ return {
           }),
         },
         markdown = {
-          augend.constant.new({
-            elements = { "[ ]", "[x]" },
-            word = false,
-            cyclic = true,
-          }),
           augend.misc.alias.markdown_header,
         },
         json = {

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

@@ -40,13 +40,13 @@ end
 
 return {
   desc = "Awesome picker for FZF (alternative to Telescope)",
+  recommended = true,
   {
     "ibhagwan/fzf-lua",
     cmd = "FzfLua",
     opts = function(_, opts)
-      local fzf = require("fzf-lua")
+      local config = require("fzf-lua.config")
-      local config = fzf.config
+      local actions = require("fzf-lua.actions")
-      local actions = fzf.actions
 
       -- Quickfix
       config.defaults.keymap.fzf["ctrl-q"] = "select-all+accept"
@@ -120,9 +120,9 @@ return {
             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,
+              height = math.floor(math.min(vim.o.lines * 0.8 - 16, #items + 2) + 0.5) + 16,
               width = 0.5,
-              preview = not vim.tbl_isempty(vim.lsp.get_clients({ bufnr = 0, name = "vtsls" })) and {
+              preview = not vim.tbl_isempty(LazyVim.lsp.get_clients({ bufnr = 0, name = "vtsls" })) and {
                 layout = "vertical",
                 vertical = "down:15,border-top",
                 hidden = "hidden",
@@ -135,7 +135,7 @@ return {
             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),
+              height = math.floor(math.min(vim.o.lines * 0.8, #items + 2) + 0.5),
             },
           })
         end,
@@ -218,7 +218,6 @@ return {
       { "<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)" },
@@ -227,19 +226,15 @@ return {
       { "<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>sb", "<cmd>FzfLua grep_curbuf<cr>", desc = "Buffer" },
       { "<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 = "Document Diagnostics" },
-      { "<leader>sD", "<cmd>FzfLua diagnostics_document<cr>", desc = "Buffer Diagnostics" },
+      { "<leader>sD", "<cmd>FzfLua diagnostics_workspace<cr>", desc = "Workspace 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" },
@@ -253,8 +248,8 @@ return {
       { "<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"), mode = "v", desc = "Selection (Root Dir)" },
-      { "<leader>sW", LazyVim.pick("grep_visual", { root = false }), mode = "x", desc = "Selection (cwd)" },
+      { "<leader>sW", LazyVim.pick("grep_visual", { root = false }), mode = "v", desc = "Selection (cwd)" },
       { "<leader>uC", LazyVim.pick("colorschemes"), desc = "Colorscheme with Preview" },
       {
         "<leader>ss",
@@ -289,18 +284,15 @@ return {
 
   {
     "neovim/nvim-lspconfig",
-    opts = {
+    opts = function()
-      servers = {
+      local Keys = require("lazyvim.plugins.lsp.keymaps").get()
-        -- stylua: ignore
+      -- stylua: ignore
-        ["*"] = {
+      vim.list_extend(Keys, {
-          keys = {
+        { "gd", "<cmd>FzfLua lsp_definitions     jump_to_single_result=true ignore_current_line=true<cr>", desc = "Goto Definition", has = "definition" },
-            { "gd", "<cmd>FzfLua lsp_definitions     jump1=true ignore_current_line=true<cr>", desc = "Goto Definition", has = "definition" },
+        { "gr", "<cmd>FzfLua lsp_references      jump_to_single_result=true ignore_current_line=true<cr>", desc = "References", nowait = true },
-            { "gr", "<cmd>FzfLua lsp_references      jump1=true ignore_current_line=true<cr>", desc = "References", nowait = true },
+        { "gI", "<cmd>FzfLua lsp_implementations jump_to_single_result=true ignore_current_line=true<cr>", desc = "Goto Implementation" },
-            { "gI", "<cmd>FzfLua lsp_implementations jump1=true ignore_current_line=true<cr>", desc = "Goto Implementation" },
+        { "gy", "<cmd>FzfLua lsp_typedefs        jump_to_single_result=true ignore_current_line=true<cr>", desc = "Goto T[y]pe Definition" },
-            { "gy", "<cmd>FzfLua lsp_typedefs        jump1=true ignore_current_line=true<cr>", desc = "Goto T[y]pe Definition" },
+      })
-          }
+    end,
-        },
-      },
-    },
   },
 }

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

@@ -28,7 +28,7 @@ return {
       },
     }
 
-    for i = 1, 9 do
+    for i = 1, 5 do
       table.insert(keys, {
         "<leader>" .. i,
         function()

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

@@ -2,9 +2,6 @@
 -- 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",
@@ -56,4 +53,8 @@ return {
       { "[[", desc = "Prev Reference" },
     },
   },
+  {
+    "neovim/nvim-lspconfig",
+    opts = { document_highlight = { enabled = false } },
+  },
 }

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

@@ -12,24 +12,19 @@ return {
   -- LSP Keymaps
   {
     "neovim/nvim-lspconfig",
-    opts = {
+    opts = function()
-      servers = {
+      local keys = require("lazyvim.plugins.lsp.keymaps").get()
-        ["*"] = {
+      keys[#keys + 1] = {
-          keys = {
+        "<leader>cr",
-            {
+        function()
-              "<leader>cr",
+          local inc_rename = require("inc_rename")
-              function()
+          return ":" .. inc_rename.config.cmd_name .. " " .. vim.fn.expand("<cword>")
-                local inc_rename = require("inc_rename")
+        end,
-                return ":" .. inc_rename.config.cmd_name .. " " .. vim.fn.expand("<cword>")
+        expr = true,
-              end,
+        desc = "Rename (inc-rename.nvim)",
-              expr = true,
+        has = "rename",
-              desc = "Rename (inc-rename.nvim)",
+      }
-              has = "rename",
+    end,
-            },
-          },
-        },
-      },
-    },
   },
 
   --- Noice integration

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

@@ -4,7 +4,7 @@ return {
 
   -- easily jump to any location and enhanced f/t motions for Leap
   {
-    url = "https://codeberg.org/andyg/leap.nvim.git",
+    "ggandor/flit.nvim",
     enabled = true,
     keys = function()
       ---@type LazyKeysSpec[]
@@ -17,7 +17,7 @@ return {
     opts = { labeled_modes = "nx" },
   },
   {
-    url = "https://codeberg.org/andyg/leap.nvim.git",
+    "ggandor/leap.nvim",
     enabled = true,
     keys = {
       { "s", mode = { "n", "x", "o" }, desc = "Leap Forward to" },
@@ -37,7 +37,7 @@ return {
 
   -- rename surround mappings from gs to gz to prevent conflict with leap
   {
-    "nvim-mini/mini.surround",
+    "echasnovski/mini.surround",
     optional = true,
     opts = {
       mappings = {

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

@@ -7,7 +7,7 @@ return {
 
   -- setup mini.diff
   {
-    "nvim-mini/mini.diff",
+    "echasnovski/mini.diff",
     event = "VeryLazy",
     keys = {
       {

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

@@ -1,5 +1,5 @@
 return {
-  "nvim-mini/mini.files",
+  "echasnovski/mini.files",
   opts = {
     windows = {
       preview = true,

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

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

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

@@ -7,11 +7,13 @@ return {
     lazy = true,
     init = function()
       vim.g.navic_silence = true
+      LazyVim.lsp.on_attach(function(client, buffer)
+        if client.supports_method("textDocument/documentSymbol") then
+          require("nvim-navic").attach(client, buffer)
+        end
+      end)
     end,
     opts = function()
-      Snacks.util.lsp.on({ method = "textDocument/documentSymbol" }, function(buffer, client)
-        require("nvim-navic").attach(client, buffer)
-      end)
       return {
         separator = " ",
         highlight = true,

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/overseer.lua

@@ -8,20 +8,29 @@ return {
   },
   {
     "stevearc/overseer.nvim",
-    lazy = false, -- plugin is self-lazy-loading
     cmd = {
       "OverseerOpen",
       "OverseerClose",
       "OverseerToggle",
+      "OverseerSaveBundle",
+      "OverseerLoadBundle",
+      "OverseerDeleteBundle",
+      "OverseerRunCmd",
       "OverseerRun",
+      "OverseerInfo",
+      "OverseerBuild",
+      "OverseerQuickAction",
       "OverseerTaskAction",
+      "OverseerClearCache",
     },
     opts = {
       dap = false,
       task_list = {
-        keymaps = {
+        bindings = {
+          ["<C-h>"] = false,
           ["<C-j>"] = false,
           ["<C-k>"] = false,
+          ["<C-l>"] = false,
         },
       },
       form = {
@@ -29,6 +38,11 @@ return {
           winblend = 0,
         },
       },
+      confirm = {
+        win_opts = {
+          winblend = 0,
+        },
+      },
       task_win = {
         win_opts = {
           winblend = 0,
@@ -37,9 +51,13 @@ return {
     },
     -- stylua: ignore
     keys = {
-      { "<leader>ow", "<cmd>OverseerToggle!<cr>",    desc = "Task list" },
+      { "<leader>ow", "<cmd>OverseerToggle<cr>",      desc = "Task list" },
-      { "<leader>oo", "<cmd>OverseerRun<cr>",        desc = "Run task" },
+      { "<leader>oo", "<cmd>OverseerRun<cr>",         desc = "Run task" },
-      { "<leader>ot", "<cmd>OverseerTaskAction<cr>", desc = "Task action" },
+      { "<leader>oq", "<cmd>OverseerQuickAction<cr>", desc = "Action recent task" },
+      { "<leader>oi", "<cmd>OverseerInfo<cr>",        desc = "Overseer Info" },
+      { "<leader>ob", "<cmd>OverseerBuild<cr>",       desc = "Task builder" },
+      { "<leader>ot", "<cmd>OverseerTaskAction<cr>",  desc = "Task action" },
+      { "<leader>oc", "<cmd>OverseerClearCache<cr>",  desc = "Clear cache" },
     },
   },
   {

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

@@ -1,88 +1,147 @@
-if LazyVim.has_extra("editor.refactoring") then
+local pick = function()
-  if vim.fn.has("nvim-0.12") == 0 then
+  if LazyVim.pick.picker.name == "telescope" then
-    LazyVim.error("refactoring.nvim requires Neovim 0.12 or higher", { title = "refactoring.nvim" })
+    return require("telescope").extensions.refactoring.refactors()
-    return {}
+  elseif LazyVim.pick.picker.name == "fzf" then
+    local fzf_lua = require("fzf-lua")
+    local results = require("refactoring").get_refactors()
+    local refactoring = require("refactoring")
+
+    local opts = {
+      fzf_opts = {},
+      fzf_colors = true,
+      actions = {
+        ["default"] = function(selected)
+          refactoring.refactor(selected[1])
+        end,
+      },
+    }
+    fzf_lua.fzf_exec(results, opts)
   end
 end
 
 return {
-  { "lewis6991/async.nvim", lazy = true },
-
   {
     "ThePrimeagen/refactoring.nvim",
     event = { "BufReadPre", "BufNewFile" },
+    dependencies = {
+      "nvim-lua/plenary.nvim",
+      "nvim-treesitter/nvim-treesitter",
+    },
     keys = {
-      { "<leader>r", "", desc = "+refactor", mode = { "n", "x" } },
+      { "<leader>r", "", desc = "+refactor", mode = { "n", "v" } },
       {
         "<leader>rs",
-        function()
+        pick,
-          return require("refactoring").select_refactor()
+        mode = "v",
-        end,
+        desc = "Refactor",
-        mode = { "n", "x" },
-        desc = "Select Refactor",
       },
       {
         "<leader>ri",
         function()
-          return require("refactoring").inline_var()
+          require("refactoring").refactor("Inline Variable")
         end,
-        mode = { "n", "x" },
+        mode = { "n", "v" },
         desc = "Inline Variable",
-        expr = true,
       },
       {
-        "<leader>rP",
+        "<leader>rb",
         function()
-          return require("refactoring.debug").print_loc({ output_location = "below" })
+          require("refactoring").refactor("Extract Block")
         end,
-        desc = "Debug Print Location",
+        desc = "Extract Block",
-        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()
+          require("refactoring").refactor("Extract Block To File")
         end,
-        mode = { "n", "x" },
+        desc = "Extract Block To File",
+      },
+      {
+        "<leader>rP",
+        function()
+          require("refactoring").debug.printf({ below = false })
+        end,
+        desc = "Debug Print",
+      },
+      {
+        "<leader>rp",
+        function()
+          require("refactoring").debug.print_var({ normal = true })
+        end,
+        desc = "Debug Print Variable",
+      },
+      {
+        "<leader>rc",
+        function()
+          require("refactoring").debug.cleanup({})
+        end,
+        desc = "Debug Cleanup",
+      },
+      {
+        "<leader>rf",
+        function()
+          require("refactoring").refactor("Extract Function")
+        end,
+        mode = "v",
         desc = "Extract Function",
-        expr = true,
       },
       {
         "<leader>rF",
         function()
-          return require("refactoring").extract_func_to_file()
+          require("refactoring").refactor("Extract Function To File")
         end,
-        mode = { "n", "x" },
+        mode = "v",
         desc = "Extract Function To File",
-        expr = true,
       },
       {
         "<leader>rx",
         function()
-          return require("refactoring").extract_var()
+          require("refactoring").refactor("Extract Variable")
         end,
-        mode = { "n", "x" },
+        mode = "v",
         desc = "Extract Variable",
-        expr = true,
+      },
+      {
+        "<leader>rp",
+        function()
+          require("refactoring").debug.print_var()
+        end,
+        mode = "v",
+        desc = "Debug Print Variable",
       },
     },
-    opts = {},
+    opts = {
+      prompt_func_return_type = {
+        go = false,
+        java = false,
+        cpp = false,
+        c = false,
+        h = false,
+        hpp = false,
+        cxx = false,
+      },
+      prompt_func_param_type = {
+        go = false,
+        java = false,
+        cpp = false,
+        c = false,
+        h = false,
+        hpp = false,
+        cxx = false,
+      },
+      printf_statements = {},
+      print_var_statements = {},
+      show_success_message = true, -- shows a message with information about the refactor on success
+      -- i.e. [Refactor] Inlined 3 variable occurrences
+    },
+    config = function(_, opts)
+      require("refactoring").setup(opts)
+      if LazyVim.has("telescope.nvim") then
+        LazyVim.on_load("telescope.nvim", function()
+          require("telescope").load_extension("refactoring")
+        end)
+      end
+    end,
   },
 }

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

@@ -61,6 +61,9 @@ return {
   {
     "nvim-telescope/telescope.nvim",
     cmd = "Telescope",
+    enabled = function()
+      return LazyVim.pick.want() == "telescope"
+    end,
     version = false, -- telescope did only one release, so use HEAD for now
     dependencies = {
       {
@@ -101,7 +104,6 @@ return {
         "<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)" },
@@ -110,18 +112,15 @@ return {
       { "<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>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>sd", "<cmd>Telescope diagnostics bufnr=0<cr>", desc = "Document Diagnostics" },
-      { "<leader>sD", "<cmd>Telescope diagnostics bufnr=0<cr>", desc = "Buffer Diagnostics" },
+      { "<leader>sD", "<cmd>Telescope diagnostics<cr>", desc = "Workspace 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" },
@@ -136,8 +135,8 @@ return {
       { "<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"), mode = "v", desc = "Selection (Root Dir)" },
-      { "<leader>sW", LazyVim.pick("grep_string", { root = false }), mode = "x", desc = "Selection (cwd)" },
+      { "<leader>sW", LazyVim.pick("grep_string", { root = false }), mode = "v", desc = "Selection (cwd)" },
       { "<leader>uC", LazyVim.pick("colorscheme", { enable_preview = true }), desc = "Colorscheme with Preview" },
       {
         "<leader>ss",
@@ -268,6 +267,9 @@ return {
   {
     "stevearc/dressing.nvim",
     lazy = true,
+    enabled = function()
+      return LazyVim.pick.want() == "telescope"
+    end,
     init = function()
       ---@diagnostic disable-next-line: duplicate-set-field
       vim.ui.select = function(...)
@@ -284,18 +286,18 @@ return {
 
   {
     "neovim/nvim-lspconfig",
-    opts = {
+    opts = function()
-      servers = {
+      if LazyVim.pick.want() ~= "telescope" then
-        ["*"] = {
+        return
-          -- stylua: ignore
+      end
-          keys = {
+      local Keys = require("lazyvim.plugins.lsp.keymaps").get()
-            { "gd", function() require("telescope.builtin").lsp_definitions({ reuse_win = true }) end, desc = "Goto Definition", has = "definition" },
+      -- stylua: ignore
-            { "gr", "<cmd>Telescope lsp_references<cr>", desc = "References", nowait = true },
+      vim.list_extend(Keys, {
-            { "gI", function() require("telescope.builtin").lsp_implementations({ reuse_win = true }) end, desc = "Goto Implementation" },
+        { "gd", function() require("telescope.builtin").lsp_definitions({ reuse_win = true }) end, desc = "Goto Definition", has = "definition" },
-            { "gy", function() require("telescope.builtin").lsp_type_definitions({ reuse_win = true }) end, desc = "Goto T[y]pe 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" },
-      },
+      })
-    },
+    end,
   },
 }

lua/lazyvim/plugins/extras/formatting/biome.lua

@@ -1,5 +1,3 @@
----@module "conform"
-
 ---@diagnostic disable: inject-field
 if lazyvim_docs then
   -- Enable this option to avoid conflicts with Prettier.
@@ -10,7 +8,6 @@ end
 local supported = {
   "astro",
   "css",
-  "scss",
   "graphql",
   -- "html",
   "javascript",
@@ -26,35 +23,24 @@ local supported = {
 }
 
 return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      root = { "biome.json", "biome.jsonc" },
-    })
-  end,
-
   {
-    "neovim/nvim-lspconfig",
+    "williamboman/mason.nvim",
-    opts = {
+    opts = { ensure_installed = { "biome" } },
-      servers = {
-        ---@type lspconfig.settings.biome
-        biome = {},
-      },
-    },
   },
 
   {
     "stevearc/conform.nvim",
     optional = true,
-    ---@param opts conform.setupOpts
+    ---@param opts ConformOpts
     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], "biome-check")
+        table.insert(opts.formatters_by_ft[ft], "biome")
       end
 
       opts.formatters = opts.formatters or {}
-      opts.formatters["biome-check"] = {
+      opts.formatters.biome = {
         require_cwd = true,
       }
     end,

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

@@ -1,6 +1,6 @@
 return {
   {
-    "mason-org/mason.nvim",
+    "williamboman/mason.nvim",
     opts = function(_, opts)
       table.insert(opts.ensure_installed, "black")
     end,

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

@@ -58,7 +58,7 @@ M.has_parser = LazyVim.memoize(M.has_parser)
 
 return {
   {
-    "mason-org/mason.nvim",
+    "williamboman/mason.nvim",
     opts = { ensure_installed = { "prettier" } },
   },
 

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

@@ -35,10 +35,10 @@ return {
       },
       setup = {
         angularls = function()
-          Snacks.util.lsp.on({ name = "angularls" }, function(_, client)
+          LazyVim.lsp.on_attach(function(client)
             --HACK: disable angular renaming capability due to duplicate rename popping up
             client.server_capabilities.renameProvider = false
-          end)
+          end, "angularls")
         end,
       },
     },

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

@@ -6,7 +6,7 @@ return {
     })
   end,
   {
-    "mason-org/mason.nvim",
+    "williamboman/mason.nvim",
     opts = { ensure_installed = { "ansible-lint" } },
   },
   {
@@ -19,14 +19,13 @@ return {
   },
   {
     "mfussenegger/nvim-ansible",
-    ft = { "yaml" },
+    ft = {},
     keys = {
       {
         "<leader>ta",
         function()
           require("ansible").run()
         end,
-        ft = "yaml.ansible",
         desc = "Ansible Run Playbook/Role",
         silent = true,
       },

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

@@ -9,8 +9,6 @@ return {
         "compile_commands.json",
         "compile_flags.txt",
         "configure.ac", -- AutoTools
-        "meson.build",
-        "build.ninja",
       },
     })
   end,
@@ -23,7 +21,8 @@ return {
 
   {
     "p00f/clangd_extensions.nvim",
-    ft = { "c", "cpp", "objc", "objcpp" },
+    lazy = true,
+    config = function() end,
     opts = {
       inlay_hints = {
         inline = false,
@@ -59,21 +58,21 @@ return {
         -- Ensure mason installs the server
         clangd = {
           keys = {
-            { "<leader>ch", "<cmd>LspClangdSwitchSourceHeader<cr>", desc = "Switch Source/Header (C/C++)" },
+            { "<leader>ch", "<cmd>ClangdSwitchSourceHeader<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",
           },
+          root_dir = function(fname)
+            return require("lspconfig.util").root_pattern(
+              "Makefile",
+              "configure.ac",
+              "configure.in",
+              "config.h.in",
+              "meson.build",
+              "meson_options.txt",
+              "build.ninja"
+            )(fname) or require("lspconfig.util").root_pattern("compile_commands.json", "compile_flags.txt")(
+              fname
+            ) or require("lspconfig.util").find_git_ancestor(fname)
+          end,
           capabilities = {
             offsetEncoding = { "utf-16" },
           },
@@ -93,6 +92,13 @@ return {
           },
         },
       },
+      setup = {
+        clangd = function(_, opts)
+          local clangd_ext_opts = LazyVim.opts("clangd_extensions.nvim")
+          require("clangd_extensions").setup(vim.tbl_deep_extend("force", clangd_ext_opts or {}, { server = opts }))
+          return false
+        end,
+      },
     },
   },
 
@@ -111,7 +117,7 @@ return {
     optional = true,
     dependencies = {
       -- Ensure C/C++ debugger is installed
-      "mason-org/mason.nvim",
+      "williamboman/mason.nvim",
       optional = true,
       opts = { ensure_installed = { "codelldb" } },
     },

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

@@ -21,13 +21,13 @@ return {
     },
     opts = function(_, opts)
       if type(opts.sources) == "table" then
-        vim.list_extend(opts.sources, { name = "conjure" })
+        vim.list_extend(opts.sources, { name = "clojure" })
       end
     end,
   },
 
   -- Add s-exp mappings
-  { "julienvincent/nvim-paredit", opts = {}, event = "LazyFile" },
+  { "PaterJason/nvim-treesitter-sexp", opts = {}, event = "LazyFile" },
 
   -- Colorize the output of the log buffer
   {
@@ -52,6 +52,7 @@ return {
     event = "LazyFile",
     config = function(_, _)
       require("conjure.main").main()
+      require("conjure.mapping")["on-filetype"]()
     end,
     init = function()
       -- print color codes if baleia.nvim is available
@@ -75,13 +76,13 @@ return {
           end
 
           vim.keymap.set(
-            { "n", "x" },
+            { "n", "v" },
             "[c",
             "<CMD>call search('^; -\\+$', 'bw')<CR>",
             { silent = true, buffer = true, desc = "Jumps to the begining of previous evaluation output." }
           )
           vim.keymap.set(
-            { "n", "x" },
+            { "n", "v" },
             "]c",
             "<CMD>call search('^; -\\+$', 'w')<CR>",
             { silent = true, buffer = true, desc = "Jumps to the begining of next evaluation output." }

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

@@ -2,14 +2,7 @@ return {
   recommended = function()
     return LazyVim.extras.wants({
       ft = "dockerfile",
-      root = {
+      root = { "Dockerfile", "docker-compose.yml", "compose.yml", "docker-compose.yaml", "compose.yaml" },
-        "Dockerfile",
-        "Containerfile",
-        "docker-compose.yml",
-        "compose.yml",
-        "docker-compose.yaml",
-        "compose.yaml",
-      },
     })
   end,
   {

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

@@ -16,8 +16,6 @@ return {
               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 },
                 })
@@ -29,8 +27,6 @@ return {
               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 },
                 })

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

@@ -10,7 +10,7 @@ return {
   },
 
   {
-    "mason-org/mason.nvim",
+    "williamboman/mason.nvim",
     opts = { ensure_installed = { "elm-format" } },
   },
 

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/gleam.lua

@@ -17,13 +17,4 @@ return {
       },
     },
   },
-  {
-    "conform.nvim",
-    optional = true,
-    opts = {
-      formatters_by_ft = {
-        gleam = { "gleam" },
-      },
-    },
-  },
 }

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

@@ -14,9 +14,6 @@ return {
     opts = {
       servers = {
         gopls = {
-          init_options = {
-            semanticTokens = true,
-          },
           settings = {
             gopls = {
               gofumpt = true,
@@ -40,6 +37,7 @@ return {
                 rangeVariableTypes = true,
               },
               analyses = {
+                fieldalignment = true,
                 nilness = true,
                 unusedparams = true,
                 unusedwrite = true,
@@ -49,6 +47,7 @@ return {
               completeUnimported = true,
               staticcheck = true,
               directoryFilters = { "-.git", "-.vscode", "-.idea", "-.vscode-test", "-node_modules" },
+              semanticTokens = true,
             },
           },
         },
@@ -57,13 +56,8 @@ return {
         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)
+          LazyVim.lsp.on_attach(function(client, _)
-            if
+            if not client.server_capabilities.semanticTokensProvider then
-              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,
@@ -74,7 +68,7 @@ return {
                 range = true,
               }
             end
-          end)
+          end, "gopls")
           -- end workaround
         end,
       },
@@ -82,7 +76,7 @@ return {
   },
   -- Ensure Go tools are installed
   {
-    "mason-org/mason.nvim",
+    "williamboman/mason.nvim",
     opts = { ensure_installed = { "goimports", "gofumpt" } },
   },
   {
@@ -90,7 +84,7 @@ return {
     optional = true,
     dependencies = {
       {
-        "mason-org/mason.nvim",
+        "williamboman/mason.nvim",
         opts = { ensure_installed = { "gomodifytags", "impl" } },
       },
     },
@@ -104,22 +98,6 @@ return {
       })
     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,
@@ -134,7 +112,7 @@ return {
     optional = true,
     dependencies = {
       {
-        "mason-org/mason.nvim",
+        "williamboman/mason.nvim",
         opts = { ensure_installed = { "delve" } },
       },
       {
@@ -162,7 +140,7 @@ return {
 
   -- Filetype icons
   {
-    "nvim-mini/mini.icons",
+    "echasnovski/mini.icons",
     opts = {
       file = {
         [".go-version"] = { glyph = "", hl = "MiniIconsBlue" },

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

@@ -14,44 +14,21 @@ return {
 
   {
     "mrcjkb/haskell-tools.nvim",
-    version = false,
+    version = "^3",
     ft = { "haskell", "lhaskell", "cabal", "cabalproject" },
-    keys = {
+    dependencies = {
-      {
+      { "nvim-telescope/telescope.nvim", optional = true },
-        "<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)",
-      },
     },
+    config = function()
+      local ok, telescope = pcall(require, "telescope")
+      if ok then
+        telescope.load_extension("ht")
+      end
+    end,
   },
 
   {
-    "mason-org/mason.nvim",
+    "williamboman/mason.nvim",
     opts = { ensure_installed = { "haskell-language-server" } },
   },
 
@@ -60,7 +37,7 @@ return {
     optional = true,
     dependencies = {
       {
-        "mason-org/mason.nvim",
+        "williamboman/mason.nvim",
         opts = { ensure_installed = { "haskell-debug-adapter" } },
       },
     },
@@ -90,48 +67,17 @@ return {
   },
 
   {
-    "nvim-telescope/telescope.nvim",
+    "luc-tielen/telescope_hoogle",
-    optional = true,
+    ft = { "haskell", "lhaskell", "cabal", "cabalproject" },
-    specs = {
+    dependencies = {
-      {
+      { "nvim-telescope/telescope.nvim" },
-        "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" },
-      },
     },
+    config = function()
+      local ok, telescope = pcall(require, "telescope")
+      if ok then
+        telescope.load_extension("hoogle")
+      end
+    end,
   },
 
   -- Make sure lspconfig doesn't start hls,

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

@@ -6,8 +6,7 @@ return {
     })
   end,
 
-  { "qvalentin/helm-ls.nvim", ft = "helm" },
+  { "towolf/vim-helm", ft = "helm" },
-
   {
     "nvim-treesitter/nvim-treesitter",
     opts = { ensure_installed = { "helm" } },
@@ -19,6 +18,17 @@ return {
       servers = {
         helm_ls = {},
       },
+      setup = {
+        yamlls = function()
+          LazyVim.lsp.on_attach(function(client, buffer)
+            if vim.bo[buffer].filetype == "helm" then
+              vim.schedule(function()
+                vim.cmd("LspStop ++force yamlls")
+              end)
+            end
+          end, "yamlls")
+        end,
+      },
     },
   },
 }

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

@@ -56,7 +56,7 @@ return {
     end,
     dependencies = {
       {
-        "mason-org/mason.nvim",
+        "williamboman/mason.nvim",
         opts = { ensure_installed = { "java-debug-adapter", "java-test" } },
       },
     },
@@ -87,13 +87,14 @@ return {
     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")
+        local mason_registry = require("mason-registry")
+        local lombok_jar = mason_registry.get_package("jdtls"):get_install_path() .. "/lombok.jar"
         table.insert(cmd, string.format("--jvm-arg=-javaagent:%s", lombok_jar))
       end
       return {
-        root_dir = function(path)
+        -- How to find the root dir for a given filename. The default comes from
-          return vim.fs.root(path, vim.lsp.config.jdtls.root_markers)
+        -- lspconfig which provides a function specifically for java projects.
-        end,
+        root_dir = LazyVim.lsp.get_raw_config("jdtls").default_config.root_dir,
 
         -- How to find the project name for a given root dir.
         project_name = function(root_dir)
@@ -129,7 +130,6 @@ return {
 
         -- 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 = {
@@ -150,10 +150,23 @@ return {
       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)
+          local java_dbg_pkg = mason_registry.get_package("java-debug-adapter")
+          local java_dbg_path = java_dbg_pkg:get_install_path()
+          local jar_patterns = {
+            java_dbg_path .. "/extension/server/com.microsoft.java.debug.plugin-*.jar",
+          }
           -- 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))
+            local java_test_pkg = mason_registry.get_package("java-test")
+            local java_test_path = java_test_pkg:get_install_path()
+            vim.list_extend(jar_patterns, {
+              java_test_path .. "/extension/server/*.jar",
+            })
+          end
+          for _, jar_pattern in ipairs(jar_patterns) do
+            for _, bundle in ipairs(vim.split(vim.fn.glob(jar_pattern), "\n")) do
+              table.insert(bundles, bundle)
+            end
           end
         end
       end
@@ -169,9 +182,7 @@ return {
           },
           settings = opts.settings,
           -- enable CMP capabilities
-          capabilities = LazyVim.has("blink.cmp") and require("blink.cmp").get_lsp_capabilities() or LazyVim.has(
+          capabilities = LazyVim.has("cmp-nvim-lsp") and require("cmp_nvim_lsp").default_capabilities() or nil,
-            "cmp-nvim-lsp"
-          ) and require("cmp_nvim_lsp").default_capabilities() or nil,
         }, opts.jdtls)
 
         -- Existing server will be reused if the root_dir matches.
@@ -209,7 +220,7 @@ return {
             })
             wk.add({
               {
-                mode = "x",
+                mode = "v",
                 buffer = args.buf,
                 { "<leader>cx", group = "extract" },
                 {
@@ -235,9 +246,7 @@ return {
               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)
-                  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

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

@@ -27,7 +27,7 @@ return {
       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,

lua/lazyvim/plugins/extras/lang/julia.lua

@@ -1,66 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = { "julia" },
-      root = { "Project.toml" },
-    })
-  end,
-
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "julia" } },
-  },
-
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        julials = {
-          settings = {
-            -- use the same default settings as the Julia VS Code extension
-            julia = {
-              completionmode = "qualify",
-              lint = { missingrefs = "none" },
-            },
-          },
-        },
-      },
-    },
-  },
-
-  -- cmp integration
-  {
-    "hrsh7th/nvim-cmp",
-    optional = true,
-    dependencies = { "kdheepak/cmp-latex-symbols" },
-    opts = function(_, opts)
-      table.insert(opts.sources, {
-        name = "latex_symbols",
-        option = {
-          strategy = 0, -- mixed
-        },
-      })
-    end,
-  },
-
-  -- blink.cmp integration
-  {
-    "saghen/blink.cmp",
-    optional = true,
-    dependencies = { "kdheepak/cmp-latex-symbols", "saghen/blink.compat" },
-    opts = {
-      sources = {
-        compat = { "latex_symbols" },
-        providers = {
-          latex_symbols = {
-            kind = "LatexSymbols",
-            async = true,
-            opts = {
-              strategy = 0, -- mixed
-            },
-          },
-        },
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/lang/kotlin.lua

@@ -14,7 +14,7 @@ return {
   end,
   -- Add packages(linting, debug adapter)
   {
-    "mason-org/mason.nvim",
+    "williamboman/mason.nvim",
     opts = { ensure_installed = { "ktlint" } },
   },
   -- Add syntax highlighting
@@ -35,7 +35,7 @@ return {
   {
     "mfussenegger/nvim-lint",
     optional = true,
-    dependencies = "mason-org/mason.nvim",
+    dependencies = "williamboman/mason.nvim",
     opts = {
       linters_by_ft = { kotlin = { "ktlint" } },
     },
@@ -64,7 +64,7 @@ return {
   {
     "mfussenegger/nvim-dap",
     optional = true,
-    dependencies = "mason-org/mason.nvim",
+    dependencies = "williamboman/mason.nvim",
     opts = function()
       local dap = require("dap")
       if not dap.adapters.kotlin then

lua/lazyvim/plugins/extras/lang/lean.lua

@@ -108,7 +108,7 @@ return {
       priority = 10,
     },
 
-    -- Redirect Lean's stderr messages somewhere (to a buffer by default)
+    -- Redirect Lean's stderr messages somehwere (to a buffer by default)
     stderr = {
       enable = true,
       -- height of the window

lua/lazyvim/plugins/extras/lang/markdown.lua

@@ -40,7 +40,7 @@ return {
     },
   },
   {
-    "mason-org/mason.nvim",
+    "williamboman/mason.nvim",
     opts = { ensure_installed = { "markdownlint-cli2", "markdown-toc" } },
   },
   {
@@ -104,17 +104,23 @@ return {
         sign = false,
         icons = {},
       },
-      checkbox = {
-        enabled = false,
-      },
     },
-    ft = { "markdown", "norg", "rmd", "org", "codecompanion" },
+    ft = { "markdown", "norg", "rmd", "org" },
     config = function(_, opts)
       require("render-markdown").setup(opts)
       Snacks.toggle({
         name = "Render Markdown",
-        get = require("render-markdown").get,
+        get = function()
-        set = require("render-markdown").set,
+          return require("render-markdown.state").enabled
+        end,
+        set = function(enabled)
+          local m = require("render-markdown")
+          if enabled then
+            m.enable()
+          else
+            m.disable()
+          end
+        end,
       }):map("<leader>um")
     end,
   },

lua/lazyvim/plugins/extras/lang/nix.lua

@@ -24,13 +24,4 @@ return {
       },
     },
   },
-  {
-    "mfussenegger/nvim-lint",
-    optional = true,
-    opts = {
-      linters_by_ft = {
-        nix = { "statix" },
-      },
-    },
-  },
 }

lua/lazyvim/plugins/extras/lang/ocaml.lua

@@ -26,19 +26,17 @@ return {
             "reason",
             "dune",
           },
-          root_markers = {
+          root_dir = function(fname)
-            function(name)
+            return require("lspconfig.util").root_pattern(
-              return name:match(".*%.opam$")
+              "*.opam",
-            end,
+              "esy.json",
-            "esy.json",
+              "package.json",
-            "package.json",
+              ".git",
-            ".git",
+              "dune-project",
-            "dune-project",
+              "dune-workspace",
-            "dune-workspace",
+              "*.ml"
-            function(name)
+            )(fname)
-              return name:match(".*%.ml$")
+          end,
-            end,
-          },
         },
       },
     },

lua/lazyvim/plugins/extras/lang/omnisharp.lua

@@ -1,15 +1,15 @@
 return {
   recommended = function()
     return LazyVim.extras.wants({
-      ft = { "cs", "vb", "fsharp" },
+      ft = { "cs", "vb" },
-      root = { "*.sln", "*.csproj", "*.fsproj", "omnisharp.json", "function.json", "paket.dependencies", "paket.lock" },
+      root = { "*.sln", "*.csproj", "omnisharp.json", "function.json" },
     })
   end,
 
   { "Hoffs/omnisharp-extended-lsp.nvim", lazy = true },
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "c_sharp", "fsharp" } },
+    opts = { ensure_installed = { "c_sharp" } },
   },
   {
     "nvimtools/none-ls.nvim",
@@ -18,7 +18,6 @@ return {
       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,
   },
   {
@@ -27,19 +26,23 @@ return {
     opts = {
       formatters_by_ft = {
         cs = { "csharpier" },
-        fsharp = { "fantomas" },
+      },
+      formatters = {
+        csharpier = {
+          command = "dotnet-csharpier",
+          args = { "--write-stdout" },
+        },
       },
     },
   },
   {
-    "mason-org/mason.nvim",
+    "williamboman/mason.nvim",
-    opts = { ensure_installed = { "csharpier", "netcoredbg", "fantomas" } },
+    opts = { ensure_installed = { "csharpier", "netcoredbg" } },
   },
   {
     "neovim/nvim-lspconfig",
     opts = {
       servers = {
-        fsautocomplete = {},
         omnisharp = {
           handlers = {
             ["textDocument/definition"] = function(...)
@@ -101,12 +104,12 @@ return {
     "nvim-neotest/neotest",
     optional = true,
     dependencies = {
-      "Nsidorenco/neotest-vstest",
+      "Issafalcon/neotest-dotnet",
     },
     opts = {
       adapters = {
-        ["neotest-vstest"] = {
+        ["neotest-dotnet"] = {
-          -- Here we can set options for neotest-vstest
+          -- Here we can set options for neotest-dotnet
         },
       },
     },

lua/lazyvim/plugins/extras/lang/php.lua

@@ -35,7 +35,7 @@ return {
   },
 
   {
-    "mason-org/mason.nvim",
+    "williamboman/mason.nvim",
     opts = {
       ensure_installed = {
         "phpcs",
@@ -48,10 +48,11 @@ return {
     optional = true,
     opts = function()
       local dap = require("dap")
+      local path = require("mason-registry").get_package("php-debug-adapter"):get_install_path()
       dap.adapters.php = {
         type = "executable",
-        command = "php-debug-adapter",
+        command = "node",
-        args = {},
+        args = { path .. "/extension/out/phpDebug.js" },
       }
     end,
   },
@@ -83,21 +84,4 @@ return {
       },
     },
   },
-
-  {
-    "nvim-neotest/neotest",
-    optional = true,
-    dependencies = {
-      "V13Axel/neotest-pest",
-      "olimorris/neotest-phpunit",
-    },
-    opts = {
-      adapters = {
-        "neotest-pest",
-        ["neotest-phpunit"] = {
-          root_ignore_files = { "tests/Pest.php" },
-        },
-      },
-    },
-  },
 }

lua/lazyvim/plugins/extras/lang/python.lua

@@ -38,15 +38,30 @@ return {
               logLevel = "error",
             },
           },
+          keys = {
+            {
+              "<leader>co",
+              LazyVim.lsp.action["source.organizeImports"],
+              desc = "Organize Imports",
+            },
+          },
+        },
+        ruff_lsp = {
+          keys = {
+            {
+              "<leader>co",
+              LazyVim.lsp.action["source.organizeImports"],
+              desc = "Organize Imports",
+            },
+          },
         },
-        ruff_lsp = {},
       },
       setup = {
         [ruff] = function()
-          Snacks.util.lsp.on({ name = ruff }, function(_, client)
+          LazyVim.lsp.on_attach(function(client, _)
             -- Disable hover in favor of Pyright
             client.server_capabilities.hoverProvider = false
-          end)
+          end, ruff)
         end,
       },
     },
@@ -88,21 +103,30 @@ return {
         { "<leader>dPc", function() require('dap-python').test_class() end, desc = "Debug Class", ft = "python" },
       },
       config = function()
-        require("dap-python").setup("debugpy-adapter")
+        if vim.fn.has("win32") == 1 then
+          require("dap-python").setup(LazyVim.get_pkg_path("debugpy", "/venv/Scripts/pythonw.exe"))
+        else
+          require("dap-python").setup(LazyVim.get_pkg_path("debugpy", "/venv/bin/python"))
+        end
       end,
     },
   },
 
   {
     "linux-cultist/venv-selector.nvim",
+    branch = "regexp", -- Use this branch for the new version
     cmd = "VenvSelect",
+    enabled = function()
+      return LazyVim.has("telescope.nvim")
+    end,
     opts = {
-      options = {
+      settings = {
-        notify_user_on_venv_activation = true,
+        options = {
-        override_notify = false,
+          notify_user_on_venv_activation = true,
+        },
       },
     },
-    --  Call config for Python files and load the cached venv automatically
+    --  Call config for python files and load the cached venv automatically
     ft = "python",
     keys = { { "<leader>cv", "<cmd>:VenvSelect<cr>", desc = "Select VirtualEnv", ft = "python" } },
   },

lua/lazyvim/plugins/extras/lang/r.lua

@@ -2,7 +2,7 @@ return {
   recommended = function()
     return LazyVim.extras.wants({
       ft = "r",
-      root = { "*.R", "*.Rmd", "*.qmd" },
+      root = { "*.R", "*.Rmd", "*qmd" },
     })
   end,
   {
@@ -17,12 +17,12 @@ return {
           -- of files supported by R.nvim. This is an
           -- opportunity to create mappings local to buffers.
           vim.keymap.set("n", "<Enter>", "<Plug>RDSendLine", { buffer = true })
-          vim.keymap.set("x", "<Enter>", "<Plug>RSendSelection", { buffer = true })
+          vim.keymap.set("v", "<Enter>", "<Plug>RSendSelection", { buffer = true })
 
           local wk = require("which-key")
           wk.add({
             buffer = true,
-            mode = { "n", "x" },
+            mode = { "n", "v" },
             { "<localleader>a", group = "all" },
             { "<localleader>b", group = "between marks" },
             { "<localleader>c", group = "chunks" },
@@ -65,7 +65,11 @@ return {
     opts = {
       servers = {
         r_language_server = {
-          root_markers = { "DESCRIPTION", "NAMESPACE", ".Rbuildignore" },
+          root_dir = function(fname)
+            return require("lspconfig.util").root_pattern("DESCRIPTION", "NAMESPACE", ".Rbuildignore")(fname)
+              or require("lspconfig.util").find_git_ancestor(fname)
+              or vim.loop.os_homedir()
+          end,
         },
       },
     },

lua/lazyvim/plugins/extras/lang/ruby.lua

@@ -6,6 +6,10 @@ if lazyvim_docs then
 end
 
 local lsp = vim.g.lazyvim_ruby_lsp or "ruby_lsp"
+if vim.fn.has("nvim-0.10") == 0 then
+  -- ruby_lsp does not work well with Neovim < 0.10
+  lsp = vim.g.lazyvim_ruby_lsp or "solargraph"
+end
 local formatter = vim.g.lazyvim_ruby_formatter or "rubocop"
 
 return {
@@ -21,8 +25,9 @@ return {
   },
   {
     "neovim/nvim-lspconfig",
-    ---@type PluginLspOpts
+    ---@class PluginLspOpts
     opts = {
+      ---@type lspconfig.options
       servers = {
         ruby_lsp = {
           enabled = lsp == "ruby_lsp",
@@ -43,7 +48,7 @@ return {
     },
   },
   {
-    "mason-org/mason.nvim",
+    "williamboman/mason.nvim",
     opts = { ensure_installed = { "erb-formatter", "erb-lint" } },
   },
   {

lua/lazyvim/plugins/extras/lang/rust.lua

@@ -43,7 +43,7 @@ return {
 
   -- Ensure Rust debugger is installed
   {
-    "mason-org/mason.nvim",
+    "williamboman/mason.nvim",
     optional = true,
     opts = function(_, opts)
       opts.ensure_installed = opts.ensure_installed or {}
@@ -56,6 +56,7 @@ return {
 
   {
     "mrcjkb/rustaceanvim",
+    version = vim.fn.has("nvim-0.10.0") == 0 and "^4" or false,
     ft = { "rust" },
     opts = {
       server = {
@@ -85,12 +86,16 @@ return {
             },
             procMacro = {
               enable = true,
+              ignored = {
+                ["async-trait"] = { "async_trait" },
+                ["napi-derive"] = { "napi" },
+                ["async-recursion"] = { "async_recursion" },
+              },
             },
             files = {
-              exclude = {
+              excludeDirs = {
                 ".direnv",
                 ".git",
-                ".jj",
                 ".github",
                 ".gitlab",
                 "bin",
@@ -99,8 +104,6 @@ return {
                 "venv",
                 ".venv",
               },
-              -- Avoid Roots Scanned hanging, see https://github.com/rust-lang/rust-analyzer/issues/12613#issuecomment-2096386344
-              watcher = "client",
             },
           },
         },
@@ -108,9 +111,13 @@ return {
     },
     config = function(_, opts)
       if LazyVim.has("mason.nvim") then
-        local codelldb = vim.fn.exepath("codelldb")
+        local package_path = require("mason-registry").get_package("codelldb"):get_install_path()
-        local codelldb_lib_ext = io.popen("uname"):read("*l") == "Linux" and ".so" or ".dylib"
+        local codelldb = package_path .. "/extension/adapter/codelldb"
-        local library_path = vim.fn.expand("$MASON/opt/lldb/lib/liblldb" .. codelldb_lib_ext)
+        local library_path = package_path .. "/extension/lldb/lib/liblldb.dylib"
+        local uname = io.popen("uname"):read("*l")
+        if uname == "Linux" then
+          library_path = package_path .. "/extension/lldb/lib/liblldb.so"
+        end
         opts.dap = {
           adapter = require("rustaceanvim.config").get_codelldb_adapter(codelldb, library_path),
         }

lua/lazyvim/plugins/extras/lang/scala.lua

@@ -11,70 +11,66 @@ return {
   },
   {
     "scalameta/nvim-metals",
-    dependencies = {
+    ft = { "scala", "sbt" },
-      "nvim-lua/plenary.nvim",
+    config = function() end,
-    },
-    keys = {
-      {
-        "<leader>me",
-        function()
-          require("telescope").extensions.metals.commands()
-        end,
-        desc = "Metals commands",
-      },
-      {
-        "<leader>mc",
-        function()
-          require("metals").compile_cascade()
-        end,
-        desc = "Metals compile cascade",
-      },
-      {
-        "<leader>mh",
-        function()
-          require("metals").hover_worksheet()
-        end,
-        desc = "Metals hover worksheet",
-      },
-    },
-    ft = { "scala", "sbt", "java" },
-    opts = function()
-      local metals_config = require("metals").bare_config()
-
-      metals_config.init_options.statusBarProvider = "off"
-
-      metals_config.settings = {
-        verboseCompilation = true,
-        showImplicitArguments = true,
-        showImplicitConversionsAndClasses = true,
-        showInferredType = true,
-        superMethodLensesEnabled = true,
-        excludedPackages = {
-          "akka.actor.typed.javadsl",
-          "org.apache.pekko.actor.typed.javadsl",
-          "com.github.swagger.akka.javadsl",
-        },
-        testUserInterface = "Test Explorer",
-      }
-
-      metals_config.on_attach = function(client, bufnr)
-        -- your on_attach function
-        require("metals").setup_dap()
-      end
-
-      return metals_config
-    end,
-    config = function(self, metals_config)
-      local nvim_metals_group = vim.api.nvim_create_augroup("nvim-metals", { clear = true })
-      vim.api.nvim_create_autocmd("FileType", {
-        pattern = self.ft,
-        callback = function()
-          require("metals").initialize_or_attach(metals_config)
-        end,
-        group = nvim_metals_group,
-      })
-    end,
   },
+  {
+    "neovim/nvim-lspconfig",
+    opts = {
+      servers = {
+        metals = {
+          keys = {
+            {
+              "<leader>me",
+              function()
+                require("telescope").extensions.metals.commands()
+              end,
+              desc = "Metals commands",
+            },
+            {
+              "<leader>mc",
+              function()
+                require("metals").compile_cascade()
+              end,
+              desc = "Metals compile cascade",
+            },
+            {
+              "<leader>mh",
+              function()
+                require("metals").hover_worksheet()
+              end,
+              desc = "Metals hover worksheet",
+            },
+          },
+          init_options = {
+            statusBarProvider = "off",
+          },
+          settings = {
+            showImplicitArguments = true,
+            excludedPackages = { "akka.actor.typed.javadsl", "com.github.swagger.akka.javadsl" },
+          },
+        },
+      },
+      setup = {
+        metals = function(_, opts)
+          local metals = require("metals")
+          local metals_config = vim.tbl_deep_extend("force", metals.bare_config(), opts)
+          metals_config.on_attach = LazyVim.has("nvim-dap") and metals.setup_dap or nil
+
+          local nvim_metals_group = vim.api.nvim_create_augroup("nvim-metals", { clear = true })
+          vim.api.nvim_create_autocmd("FileType", {
+            pattern = { "scala", "sbt" },
+            callback = function()
+              metals.initialize_or_attach(metals_config)
+            end,
+            group = nvim_metals_group,
+          })
+          return true
+        end,
+      },
+    },
+  },
+
   {
     "mfussenegger/nvim-dap",
     optional = true,

lua/lazyvim/plugins/extras/lang/solidity.lua

@@ -1,37 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = "solidity",
-      root = {
-        "foundry.toml",
-        "hardhat.config.js",
-        "hardhat.config.ts",
-      },
-    })
-  end,
-  -- Add Solidity & related to treesitter
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "solidity" } },
-  },
-
-  -- Correctly setup lspconfig for Solidity
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        solidity_ls = {},
-      },
-    },
-  },
-  -- Formatter for Solidity
-  {
-    "stevearc/conform.nvim",
-    optional = true,
-    opts = {
-      formatters_by_ft = {
-        solidity = { "forge_fmt" },
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/lang/sql.lua

@@ -28,11 +28,6 @@ end
 
 local sql_ft = { "sql", "mysql", "plsql" }
 
--- disable nvim default `sql_completion` plugin to be compatible with blink.cmp's omni
--- while still showing some keywords from the syntax autocomplete sources
-vim.g.omni_sql_default_compl_type = "syntax"
-vim.g.loaded_sql_completion = true
-
 return {
   recommended = function()
     return LazyVim.extras.wants({
@@ -53,7 +48,7 @@ return {
       vim.api.nvim_create_autocmd("FileType", {
         pattern = sql_ft,
         callback = function()
-          if LazyVim.has_extra("coding.nvim-cmp") then
+          if LazyVim.has("nvim-cmp") then
             local cmp = require("cmp")
 
             -- global sources
@@ -148,7 +143,7 @@ return {
 
   -- Linters & formatters
   {
-    "mason-org/mason.nvim",
+    "williamboman/mason.nvim",
     opts = { ensure_installed = { "sqlfluff" } },
   },
   {

lua/lazyvim/plugins/extras/lang/svelte.lua

@@ -23,7 +23,20 @@ return {
     "neovim/nvim-lspconfig",
     opts = {
       servers = {
-        svelte = {},
+        svelte = {
+          keys = {
+            {
+              "<leader>co",
+              LazyVim.lsp.action["source.organizeImports"],
+              desc = "Organize Imports",
+            },
+          },
+          capabilities = {
+            workspace = {
+              didChangeWatchedFiles = vim.fn.has("nvim-0.10") == 0 and { dynamicRegistration = true },
+            },
+          },
+        },
       },
     },
   },

lua/lazyvim/plugins/extras/lang/tailwind.lua

@@ -24,12 +24,24 @@ return {
           filetypes_include = {},
           -- to fully override the default_config, change the below
           -- filetypes = {}
+        },
+      },
+      setup = {
+        tailwindcss = function(_, opts)
+          local tw = LazyVim.lsp.get_raw_config("tailwindcss")
+          opts.filetypes = opts.filetypes or {}
 
-          -- additional settings for the server, e.g:
+          -- Add default filetypes
-          -- tailwindCSS = { includeLanguages = { someLang = "html" } }
+          vim.list_extend(opts.filetypes, tw.default_config.filetypes)
-          -- can be addeded to the settings table and will be merged with
+
-          -- this defaults for Phoenix projects
+          -- Remove excluded filetypes
-          settings = {
+          --- @param ft string
+          opts.filetypes = vim.tbl_filter(function(ft)
+            return not vim.tbl_contains(opts.filetypes_exclude or {}, ft)
+          end, opts.filetypes)
+
+          -- Additional settings for Phoenix projects
+          opts.settings = {
             tailwindCSS = {
               includeLanguages = {
                 elixir = "html-eex",
@@ -37,21 +49,7 @@ return {
                 heex = "html-eex",
               },
             },
-          },
+          }
-        },
-      },
-      setup = {
-        tailwindcss = function(_, opts)
-          opts.filetypes = opts.filetypes or {}
-
-          -- Add default filetypes
-          vim.list_extend(opts.filetypes, vim.lsp.config.tailwindcss.filetypes)
-
-          -- Remove excluded filetypes
-          --- @param ft string
-          opts.filetypes = vim.tbl_filter(function(ft)
-            return not vim.tbl_contains(opts.filetypes_exclude or {}, ft)
-          end, opts.filetypes)
 
           -- Add additional filetypes
           vim.list_extend(opts.filetypes, opts.filetypes_include or {})

lua/lazyvim/plugins/extras/lang/terraform.lua

@@ -20,7 +20,7 @@ return {
   },
   -- ensure terraform tools are installed
   {
-    "mason-org/mason.nvim",
+    "williamboman/mason.nvim",
     opts = { ensure_installed = { "tflint" } },
   },
   {

lua/lazyvim/plugins/extras/lang/tex.lua

@@ -12,7 +12,7 @@ return {
     opts = function(_, opts)
       opts.highlight = opts.highlight or {}
       if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "bibtex", "latex" })
+        vim.list_extend(opts.ensure_installed, { "bibtex" })
       end
       if type(opts.highlight.disable) == "table" then
         vim.list_extend(opts.highlight.disable, { "latex" })

lua/lazyvim/plugins/extras/lang/twig.lua

@@ -1,58 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = "twig",
-    })
-  end,
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "twig" } },
-  },
-  {
-    "mason-org/mason.nvim",
-    opts = {
-      ensure_installed = {
-        "twigcs",
-        "twig-cs-fixer",
-      },
-    },
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        twiggy_language_server = {
-          enabled = true,
-        },
-      },
-    },
-  },
-  {
-    "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.diagnostics.twigcs)
-      -- Twig-CS-Fixer builtin not available in none-ls
-    end,
-  },
-  {
-    "mfussenegger/nvim-lint",
-    optional = true,
-    opts = {
-      linters_by_ft = {
-        twig = { "twigcs" },
-      },
-    },
-  },
-  {
-    "stevearc/conform.nvim",
-    optional = true,
-    opts = {
-      formatters_by_ft = {
-        twig = { "twig-cs-fixer" },
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/lang/typescript.lua

@@ -19,6 +19,14 @@ return {
     opts = {
       -- make sure mason installs the server
       servers = {
+        --- @deprecated -- tsserver renamed to ts_ls but not yet released, so keep this for now
+        --- the proper approach is to check the nvim-lspconfig release version when it's released to determine the server name dynamically
+        tsserver = {
+          enabled = false,
+        },
+        ts_ls = {
+          enabled = false,
+        },
         vtsls = {
           -- explicitly add default filetypes, so that we can extend
           -- them in related extras
@@ -61,8 +69,7 @@ return {
             {
               "gD",
               function()
-                local win = vim.api.nvim_get_current_win()
+                local params = vim.lsp.util.make_position_params()
-                local params = vim.lsp.util.make_position_params(win, "utf-16")
                 LazyVim.lsp.execute({
                   command = "typescript.goToSourceDefinition",
                   arguments = { params.textDocument.uri, params.position },
@@ -82,11 +89,21 @@ return {
               end,
               desc = "File References",
             },
+            {
+              "<leader>co",
+              LazyVim.lsp.action["source.organizeImports"],
+              desc = "Organize Imports",
+            },
             {
               "<leader>cM",
               LazyVim.lsp.action["source.addMissingImports.ts"],
               desc = "Add missing imports",
             },
+            {
+              "<leader>cu",
+              LazyVim.lsp.action["source.removeUnused.ts"],
+              desc = "Remove unused imports",
+            },
             {
               "<leader>cD",
               LazyVim.lsp.action["source.fixAll.ts"],
@@ -95,11 +112,7 @@ return {
             {
               "<leader>cV",
               function()
-                LazyVim.lsp.execute({
+                LazyVim.lsp.execute({ command = "typescript.selectTypeScriptVersion" })
-                  title = "Select TypeScript Version",
-                  filter = "vtsls",
-                  command = "typescript.selectTypeScriptVersion",
-                })
               end,
               desc = "Select TS workspace version",
             },
@@ -107,21 +120,31 @@ return {
         },
       },
       setup = {
+        --- @deprecated -- tsserver renamed to ts_ls but not yet released, so keep this for now
+        --- the proper approach is to check the nvim-lspconfig release version when it's released to determine the server name dynamically
+        tsserver = function()
+          -- disable tsserver
+          return true
+        end,
+        ts_ls = function()
+          -- disable tsserver
+          return true
+        end,
         vtsls = function(_, opts)
-          Snacks.util.lsp.on({ name = "vtsls" }, function(buffer, client)
+          LazyVim.lsp.on_attach(function(client, buffer)
             client.commands["_typescript.moveToFileRefactoring"] = function(command, ctx)
               ---@type string, string, lsp.Range
               local action, uri, range = unpack(command.arguments)
 
               local function move(newf)
-                client:request("workspace/executeCommand", {
+                client.request("workspace/executeCommand", {
                   command = command.command,
                   arguments = { action, uri, range, newf },
                 })
               end
 
               local fname = vim.uri_to_fname(uri)
-              client:request("workspace/executeCommand", {
+              client.request("workspace/executeCommand", {
                 command = "typescript.tsserverRequest",
                 arguments = {
                   "getMoveToRefactoringFileSuggestions",
@@ -157,7 +180,7 @@ return {
                 end)
               end)
             end
-          end)
+          end, "vtsls")
           -- copy typescript settings to javascript
           opts.settings.javascript =
             vim.tbl_deep_extend("force", {}, opts.settings.typescript, opts.settings.javascript or {})
@@ -166,9 +189,93 @@ return {
     },
   },
 
-  -- correctly setup lspconfig
   {
-    "neovim/nvim-lspconfig",
+    "mfussenegger/nvim-dap",
-    opts = {},
+    optional = true,
+    dependencies = {
+      {
+        "williamboman/mason.nvim",
+        opts = function(_, opts)
+          opts.ensure_installed = opts.ensure_installed or {}
+          table.insert(opts.ensure_installed, "js-debug-adapter")
+        end,
+      },
+    },
+    opts = function()
+      local dap = require("dap")
+      if not dap.adapters["pwa-node"] then
+        require("dap").adapters["pwa-node"] = {
+          type = "server",
+          host = "localhost",
+          port = "${port}",
+          executable = {
+            command = "node",
+            -- 💀 Make sure to update this path to point to your installation
+            args = {
+              LazyVim.get_pkg_path("js-debug-adapter", "/js-debug/src/dapDebugServer.js"),
+              "${port}",
+            },
+          },
+        }
+      end
+      if not dap.adapters["node"] then
+        dap.adapters["node"] = function(cb, config)
+          if config.type == "node" then
+            config.type = "pwa-node"
+          end
+          local nativeAdapter = dap.adapters["pwa-node"]
+          if type(nativeAdapter) == "function" then
+            nativeAdapter(cb, config)
+          else
+            cb(nativeAdapter)
+          end
+        end
+      end
+
+      local js_filetypes = { "typescript", "javascript", "typescriptreact", "javascriptreact" }
+
+      local vscode = require("dap.ext.vscode")
+      vscode.type_to_filetypes["node"] = js_filetypes
+      vscode.type_to_filetypes["pwa-node"] = js_filetypes
+
+      for _, language in ipairs(js_filetypes) do
+        if not dap.configurations[language] then
+          dap.configurations[language] = {
+            {
+              type = "pwa-node",
+              request = "launch",
+              name = "Launch file",
+              program = "${file}",
+              cwd = "${workspaceFolder}",
+            },
+            {
+              type = "pwa-node",
+              request = "attach",
+              name = "Attach",
+              processId = require("dap.utils").pick_process,
+              cwd = "${workspaceFolder}",
+            },
+          }
+        end
+      end
+    end,
+  },
+
+  -- Filetype icons
+  {
+    "echasnovski/mini.icons",
+    opts = {
+      file = {
+        [".eslintrc.js"] = { glyph = "󰱺", hl = "MiniIconsYellow" },
+        [".node-version"] = { glyph = "", hl = "MiniIconsGreen" },
+        [".prettierrc"] = { glyph = "", hl = "MiniIconsPurple" },
+        [".yarnrc.yml"] = { glyph = "", hl = "MiniIconsBlue" },
+        ["eslint.config.js"] = { glyph = "󰱺", hl = "MiniIconsYellow" },
+        ["package.json"] = { glyph = "", hl = "MiniIconsGreen" },
+        ["tsconfig.json"] = { glyph = "", hl = "MiniIconsAzure" },
+        ["tsconfig.build.json"] = { glyph = "", hl = "MiniIconsAzure" },
+        ["yarn.lock"] = { glyph = "", hl = "MiniIconsBlue" },
+      },
+    },
   },
 }

lua/lazyvim/plugins/extras/lang/typescript/init.lua

@@ -1,171 +0,0 @@
-if lazyvim_docs then
-  -- LSP Server to use for TypeScript.
-  ---@type "vtsls" | "tsgo"
-  vim.g.lazyvim_ts_lsp = "vtsls" -- currently the default
-
-  -- To use the newer, much faster `tsgo` LSP server, either:
-  -- * enable the `tsgo` extra, or
-  -- * set `vim.g.lazyvim_ts_lsp = "tsgo"` in your `options.lua`
-end
-
-local extra = LazyVim.config.register_defaults("ts_lsp", {
-  { name = "vtsls", extra = "lang.typescript.vtsls" },
-  { name = "tsgo", extra = "lang.typescript.tsgo" },
-})
-
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = {
-        "javascript",
-        "javascriptreact",
-        "javascript.jsx",
-        "typescript",
-        "typescriptreact",
-        "typescript.tsx",
-      },
-      root = { "tsconfig.json", "package.json", "jsconfig.json" },
-    })
-  end,
-
-  { import = extra.import },
-
-  -- correctly setup lspconfig
-  {
-    "neovim/nvim-lspconfig",
-    opts = function(_, opts)
-      local lsp = extra.name or "vtsls"
-      local servers = { "tsserver", "ts_ls", "vtsls", "tsgo", lsp }
-      for _, server in ipairs(servers) do
-        opts.servers[server] = opts.servers[server] or {}
-        opts.servers[server].enabled = server == lsp
-      end
-    end,
-  },
-
-  {
-    "mfussenegger/nvim-dap",
-    optional = true,
-    dependencies = {
-      {
-        "mason-org/mason.nvim",
-        opts = function(_, opts)
-          opts.ensure_installed = opts.ensure_installed or {}
-          table.insert(opts.ensure_installed, "js-debug-adapter")
-        end,
-      },
-    },
-    opts = function()
-      local dap = require("dap")
-
-      for _, adapterType in ipairs({ "node", "chrome", "msedge" }) do
-        local pwaType = "pwa-" .. adapterType
-
-        if not dap.adapters[pwaType] then
-          dap.adapters[pwaType] = {
-            type = "server",
-            host = "localhost",
-            port = "${port}",
-            executable = {
-              command = "js-debug-adapter",
-              args = { "${port}" },
-            },
-          }
-        end
-
-        -- Define adapters without the "pwa-" prefix for VSCode compatibility
-        if not dap.adapters[adapterType] then
-          dap.adapters[adapterType] = function(cb, config)
-            local nativeAdapter = dap.adapters[pwaType]
-
-            config.type = pwaType
-
-            if type(nativeAdapter) == "function" then
-              nativeAdapter(cb, config)
-            else
-              cb(nativeAdapter)
-            end
-          end
-        end
-      end
-
-      local js_filetypes = { "typescript", "javascript", "typescriptreact", "javascriptreact" }
-
-      local vscode = require("dap.ext.vscode")
-      vscode.type_to_filetypes["node"] = js_filetypes
-      vscode.type_to_filetypes["pwa-node"] = js_filetypes
-
-      for _, language in ipairs(js_filetypes) do
-        if not dap.configurations[language] then
-          local runtimeExecutable = nil
-          if language:find("typescript") then
-            runtimeExecutable = vim.fn.executable("tsx") == 1 and "tsx" or "ts-node"
-          end
-          dap.configurations[language] = {
-            {
-              type = "pwa-node",
-              request = "launch",
-              name = "Launch file",
-              program = "${file}",
-              cwd = "${workspaceFolder}",
-              sourceMaps = true,
-              runtimeExecutable = runtimeExecutable,
-              skipFiles = {
-                "<node_internals>/**",
-                "node_modules/**",
-              },
-              resolveSourceMapLocations = {
-                "${workspaceFolder}/**",
-                "!**/node_modules/**",
-              },
-            },
-            {
-              type = "pwa-node",
-              request = "attach",
-              name = "Attach",
-              processId = require("dap.utils").pick_process,
-              cwd = "${workspaceFolder}",
-              sourceMaps = true,
-              runtimeExecutable = runtimeExecutable,
-              skipFiles = {
-                "<node_internals>/**",
-                "node_modules/**",
-              },
-              resolveSourceMapLocations = {
-                "${workspaceFolder}/**",
-                "!**/node_modules/**",
-              },
-            },
-          }
-        end
-      end
-    end,
-  },
-
-  {
-    "jay-babu/mason-nvim-dap.nvim",
-    optional = true,
-    opts = {
-      -- chrome adapter is deprecated, use js-debug-adapter instead
-      automatic_installation = { exclude = { "chrome" } },
-    },
-  },
-
-  -- Filetype icons
-  {
-    "nvim-mini/mini.icons",
-    opts = {
-      file = {
-        [".eslintrc.js"] = { glyph = "󰱺", hl = "MiniIconsYellow" },
-        [".node-version"] = { glyph = "", hl = "MiniIconsGreen" },
-        [".prettierrc"] = { glyph = "", hl = "MiniIconsPurple" },
-        [".yarnrc.yml"] = { glyph = "", hl = "MiniIconsBlue" },
-        ["eslint.config.js"] = { glyph = "󰱺", hl = "MiniIconsYellow" },
-        ["package.json"] = { glyph = "", hl = "MiniIconsGreen" },
-        ["tsconfig.json"] = { glyph = "", hl = "MiniIconsAzure" },
-        ["tsconfig.build.json"] = { glyph = "", hl = "MiniIconsAzure" },
-        ["yarn.lock"] = { glyph = "", hl = "MiniIconsBlue" },
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/lang/typescript/oxc.lua

@@ -1,68 +0,0 @@
-local supported = {
-  "javascript",
-  "javascriptreact",
-  "typescript",
-  "typescriptreact",
-  "json",
-  "jsonc",
-  "vue",
-  "svelte",
-  "astro",
-}
-
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      root = {
-        ".oxlintrc.json",
-        ".oxlintrc.jsonc",
-        "oxlint.config.ts",
-        ".oxfmtrc.json",
-        ".oxfmtrc.jsonc",
-        "oxfmt.config.ts",
-      },
-    })
-  end,
-
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        ---@type lspconfig.settings.oxlint
-        oxlint = {
-          root_dir = function(bufnr, on_dir)
-            -- prefer the top-level oxlint config if it exists (monorepo support)
-            local git = vim.fs.root(bufnr, ".git")
-            local markers = { ".oxlintrc.json", ".oxlintrc.jsonc", "oxlint.config.ts" }
-            local root = git and vim.fs.root(git, markers) or vim.fs.root(bufnr, markers)
-            if root then
-              on_dir(root)
-            end
-          end,
-          settings = {
-            fixKind = "all",
-          },
-        },
-        --- disable the oxfmt lsp server since we use conform for formatting
-        oxfmt = { enabled = false },
-      },
-    },
-  },
-
-  {
-    "mason-org/mason.nvim",
-    opts = { ensure_installed = { "oxfmt" } },
-  },
-
-  {
-    "stevearc/conform.nvim",
-    optional = true,
-    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], "oxfmt")
-      end
-    end,
-  },
-}