.github/.release-please-manifest.json

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

.markdownlint-cli2.yaml

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

CHANGELOG.md

@@ -1,338 +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)
 
 

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.

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

@@ -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: 2025 September 23
-                                       For Neovim    Last change: 2026 June 02
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*
@@ -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 = "15.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" },
@@ -337,7 +335,7 @@ function M.init()
   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,81 +346,13 @@ function M.init()
   M.json.load()
 end
 
----@alias LazyVimDefault {name: string, group: string, extra: string, import: string, enabled?: boolean, origin?: "global" | "default" | "extra" }
+---@alias LazyVimDefault {name: string, extra: 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 = {
@@ -446,10 +376,36 @@ function M.get_defaults()
     table.insert(checks.explorer, 1, table.remove(checks.explorer, 2))
   end
 
-  for name, extras in pairs(checks) do
+  default_extras = {}
-    M.register_defaults(name, extras)
+  for name, check in pairs(checks) do
+    local valid = {} ---@type string[]
+    for _, extra in ipairs(check) do
+      if extra.enabled ~= false then
+        valid[#valid + 1] = extra.name
+      end
+    end
+    local origin = "default"
+    local use = vim.g["lazyvim_" .. name]
+    use = vim.tbl_contains(valid, use or "auto") and use or nil
+    origin = use and "global" or origin
+    for _, extra in ipairs(use and {} or check) do
+      if extra.enabled ~= false and LazyVim.has_extra(extra.extra) then
+        use = extra.name
+        break
+      end
+    end
+    origin = use and "extra" or origin
+    use = use or valid[1]
+    for _, extra in ipairs(check) do
+      local import = "lazyvim.plugins.extras." .. extra.extra
+      extra = vim.deepcopy(extra)
+      extra.enabled = extra.name == use
+      if extra.enabled then
+        extra.origin = origin
+      end
+      default_extras[import] = extra
+    end
   end
-
   return default_extras
 end
 

lua/lazyvim/config/keymaps.lua

@@ -43,9 +43,6 @@ 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
@@ -84,8 +81,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" })
@@ -117,18 +114,16 @@ 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" })
@@ -192,8 +187,12 @@ 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>-", "<C-W>s", { desc = "Split Window Below", remap = true })
@@ -210,6 +209,3 @@ map("n", "<leader><tab><tab>", "<cmd>tabnew<cr>", { desc = "New Tab" })
 map("n", "<leader><tab>]", "<cmd>tabnext<cr>", { desc = "Next Tab" })
 map("n", "<leader><tab>d", "<cmd>tabclose<cr>", { desc = "Close Tab" })
 map("n", "<leader><tab>[", "<cmd>tabprevious<cr>", { desc = "Previous Tab" })
-
--- lua
-map({"n", "x"}, "<localleader>r", function() Snacks.debug.run() end, { desc = "Run Lua", ft = "lua" })

lua/lazyvim/config/options.lua

@@ -54,7 +54,7 @@ local opt = vim.opt
 opt.autowrite = true -- Enable auto write
 -- only set clipboard if not in ssh, to make sure the OSC 52
 -- integration works automatically.
-opt.clipboard = vim.env.SSH_CONNECTION and "" or "unnamedplus" -- Sync with system clipboard
+opt.clipboard = 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

lua/lazyvim/health.lua

@@ -4,7 +4,6 @@ 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")
@@ -34,23 +33,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

@@ -82,7 +82,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,14 +13,6 @@ return {
     lazy = true,
     name = "catppuccin",
     opts = {
-      lsp_styles = {
-        underlines = {
-          errors = { "undercurl" },
-          hints = { "undercurl" },
-          warnings = { "undercurl" },
-          information = { "undercurl" },
-        },
-      },
       integrations = {
         aerial = true,
         alpha = true,
@@ -36,14 +28,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 +58,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_theme()
           end
         end,
       },

lua/lazyvim/plugins/editor.lua

@@ -18,7 +18,7 @@ return {
             },
           })
         end,
-        mode = { "n", "x" },
+        mode = { "n", "v" },
         desc = "Search and Replace",
       },
     },
@@ -64,7 +64,7 @@ return {
       defaults = {},
       spec = {
         {
-          mode = { "n", "x" },
+          mode = { "n", "v" },
           { "<leader><tab>", group = "tabs" },
           { "<leader>c", group = "code" },
           { "<leader>d", group = "debug" },
@@ -173,8 +173,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")

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/copilot-chat.lua

@@ -8,11 +8,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 +17,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,7 +32,7 @@ return {
           return require("CopilotChat").reset()
         end,
         desc = "Clear (CopilotChat)",
-        mode = { "n", "x" },
+        mode = { "n", "v" },
       },
       {
         "<leader>aq",
@@ -49,7 +46,7 @@ return {
           end)
         end,
         desc = "Quick Chat (CopilotChat)",
-        mode = { "n", "x" },
+        mode = { "n", "v" },
       },
       {
         "<leader>ap",
@@ -57,7 +54,7 @@ return {
           require("CopilotChat").select_prompt()
         end,
         desc = "Prompt Actions (CopilotChat)",
-        mode = { "n", "x" },
+        mode = { "n", "v" },
       },
     },
     config = function(_, opts)

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

@@ -25,17 +25,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",
@@ -70,58 +59,60 @@ 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 = { "fang2hou/blink-copilot" },
-      optional = true,
+          opts = {
-      dependencies = { "fang2hou/blink-copilot" },
+            sources = {
-      opts = {
+              default = { "copilot" },
-        sources = {
+              providers = {
-          default = { "copilot" },
+                copilot = {
-          providers = {
+                  name = "copilot",
-            copilot = {
+                  module = "blink-copilot",
-              name = "copilot",
+                  score_offset = 100,
-              module = "blink-copilot",
+                  async = true,
-              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/coding/blink.lua

@@ -37,7 +37,9 @@ return {
     ---@type blink.cmp.Config
     opts = {
       snippets = {
-        preset = "default",
+        expand = function(snippet, _)
+          return LazyVim.cmp.expand(snippet)
+        end,
       },
 
       appearance = {
@@ -83,11 +85,7 @@ return {
 
       cmdline = {
         enabled = true,
-        keymap = {
+        keymap = { preset = "cmdline" },
-          preset = "cmdline",
-          ["<Right>"] = false,
-          ["<Left>"] = false,
-        },
         completion = {
           list = { selection = { preselect = false } },
           menu = {
@@ -106,9 +104,6 @@ return {
     },
     ---@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
@@ -127,12 +122,12 @@ return {
         if opts.keymap.preset == "super-tab" then -- super-tab
           opts.keymap["<Tab>"] = {
             require("blink.cmp.keymap.presets").get("super-tab")["<Tab>"][1],
-            LazyVim.cmp.map({ "snippet_forward", "ai_nes", "ai_accept" }),
+            LazyVim.cmp.map({ "snippet_forward", "ai_accept" }),
             "fallback",
           }
         else -- other presets
           opts.keymap["<Tab>"] = {
-            LazyVim.cmp.map({ "snippet_forward", "ai_nes", "ai_accept" }),
+            LazyVim.cmp.map({ "snippet_forward", "ai_accept" }),
             "fallback",
           }
         end

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

@@ -1,6 +1,6 @@
 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
+  -- Motivation: Less clutter in completion windows and a more direct usage of snippits
   vim.g.lazyvim_mini_snippets_in_completion = true
 
   -- NOTE: Please also read:

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

@@ -8,7 +8,7 @@ return {
     -- 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/nvim-cmp.lua

@@ -52,7 +52,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 = {

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 = {

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

@@ -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     jump1=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      jump1=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 jump1=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        jump1=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/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" },

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/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,64 +1,95 @@
-if LazyVim.has_extra("editor.refactoring") then
+local pick = function()
-  if vim.fn.has("nvim-0.12") == 0 then
+  local refactoring = require("refactoring")
-    LazyVim.error("refactoring.nvim requires Neovim 0.12 or higher", { title = "refactoring.nvim" })
+  if LazyVim.pick.picker.name == "telescope" then
-    return {}
+    return require("telescope").extensions.refactoring.refactors()
+  elseif LazyVim.pick.picker.name == "fzf" then
+    local fzf_lua = require("fzf-lua")
+    local results = refactoring.get_refactors()
+
+    local opts = {
+      fzf_opts = {},
+      fzf_colors = true,
+      actions = {
+        ["default"] = function(selected)
+          refactoring.refactor(selected[1])
+        end,
+      },
+    }
+    fzf_lua.fzf_exec(results, opts)
+  else
+    refactoring.select_refactor()
   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>rs",
-        function()
+        pick,
-          return require("refactoring").select_refactor()
-        end,
         mode = { "n", "x" },
-        desc = "Select Refactor",
+        desc = "Refactor",
       },
       {
         "<leader>ri",
         function()
-          return require("refactoring").inline_var()
+          return require("refactoring").refactor("Inline Variable")
         end,
         mode = { "n", "x" },
         desc = "Inline Variable",
         expr = true,
       },
       {
-        "<leader>rP",
+        "<leader>rb",
         function()
-          return require("refactoring.debug").print_loc({ output_location = "below" })
+          return require("refactoring").refactor("Extract Block")
-        end,
-        desc = "Debug Print Location",
-        expr = true,
-      },
-      {
-        "<leader>rp",
-        function()
-          return require("refactoring.debug").print_var({ output_location = "below" }) .. "iw"
         end,
         mode = { "n", "x" },
-        desc = "Debug Print Variable",
+        desc = "Extract Block",
-        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()
+          return require("refactoring").refactor("Extract Block To File")
+        end,
+        mode = { "n", "x" },
+        desc = "Extract Block To File",
+        expr = true,
+      },
+      {
+        "<leader>rP",
+        function()
+          require("refactoring").debug.printf({ below = false })
+        end,
+        desc = "Debug Print",
+      },
+      {
+        "<leader>rp",
+        function()
+          require("refactoring").debug.print_var({ normal = true })
+        end,
+        mode = { "n", "x" },
+        desc = "Debug Print Variable",
+      },
+      {
+        "<leader>rc",
+        function()
+          require("refactoring").debug.cleanup({})
+        end,
+        desc = "Debug Cleanup",
+      },
+      {
+        "<leader>rf",
+        function()
+          return require("refactoring").refactor("Extract Function")
         end,
         mode = { "n", "x" },
         desc = "Extract Function",
@@ -67,7 +98,7 @@ return {
       {
         "<leader>rF",
         function()
-          return require("refactoring").extract_func_to_file()
+          return require("refactoring").refactor("Extract Function To File")
         end,
         mode = { "n", "x" },
         desc = "Extract Function To File",
@@ -76,13 +107,52 @@ return {
       {
         "<leader>rx",
         function()
-          return require("refactoring").extract_var()
+          return require("refactoring").refactor("Extract Variable")
         end,
         mode = { "n", "x" },
         desc = "Extract Variable",
         expr = true,
       },
+      {
+        "<leader>rp",
+        function()
+          require("refactoring").debug.print_var()
+        end,
+        mode = { "n", "x" },
+        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_picker.lua

@@ -73,13 +73,8 @@ return {
       { "<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" },
@@ -139,23 +134,18 @@ 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", function() Snacks.picker.lsp_definitions() end, desc = "Goto Definition", has = "definition" },
-            { "gd", function() Snacks.picker.lsp_definitions() end, desc = "Goto Definition", has = "definition" },
+        { "gr", function() Snacks.picker.lsp_references() end, nowait = true, desc = "References" },
-            { "gr", function() Snacks.picker.lsp_references() end, nowait = true, desc = "References" },
+        { "gI", function() Snacks.picker.lsp_implementations() end, desc = "Goto Implementation" },
-            { "gI", function() Snacks.picker.lsp_implementations() end, desc = "Goto Implementation" },
+        { "gy", function() Snacks.picker.lsp_type_definitions() end, desc = "Goto T[y]pe Definition" },
-            { "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_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" },
-            { "<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" },
+    end,
-            { "gao", function() Snacks.picker.lsp_outgoing_calls() end, desc = "C[a]lls Outgoing", has = "callHierarchy/outgoingCalls" },
-          },
-        },
-      },
-    },
   },
   {
     "folke/todo-comments.nvim",

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

@@ -101,7 +101,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 +109,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 +132,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",
@@ -284,18 +280,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", function() require("telescope.builtin").lsp_definitions({ reuse_win = true }) end, desc = "Goto Definition", has = "definition" },
-            { "gd", function() require("telescope.builtin").lsp_definitions({ reuse_win = true }) end, desc = "Goto Definition", has = "definition" },
+        { "gr", "<cmd>Telescope lsp_references<cr>", desc = "References", nowait = true },
-            { "gr", "<cmd>Telescope lsp_references<cr>", desc = "References", nowait = true },
+        { "gI", function() require("telescope.builtin").lsp_implementations({ reuse_win = true }) end, desc = "Goto Implementation" },
-            { "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" },
-            { "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",
+    "mason-org/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/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

@@ -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

@@ -23,7 +23,8 @@ return {
 
   {
     "p00f/clangd_extensions.nvim",
-    ft = { "c", "cpp", "objc", "objcpp" },
+    lazy = true,
+    config = function() end,
     opts = {
       inlay_hints = {
         inline = false,
@@ -59,7 +60,7 @@ 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",
@@ -93,6 +94,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,
+      },
     },
   },
 

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

@@ -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/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,
@@ -49,6 +46,7 @@ return {
               completeUnimported = true,
               staticcheck = true,
               directoryFilters = { "-.git", "-.vscode", "-.idea", "-.vscode-test", "-node_modules" },
+              semanticTokens = true,
             },
           },
         },
@@ -57,13 +55,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 +67,7 @@ return {
                 range = true,
               }
             end
-          end)
+          end, "gopls")
           -- end workaround
         end,
       },
@@ -104,22 +97,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,

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

@@ -14,40 +14,17 @@ 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,
   },
 
   {
@@ -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", optional = true },
-        "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

@@ -169,9 +169,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 +207,7 @@ return {
             })
             wk.add({
               {
-                mode = "x",
+                mode = "v",
                 buffer = args.buf,
                 { "<leader>cx", group = "extract" },
                 {

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/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

@@ -113,8 +113,17 @@ return {
       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/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",
-    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

@@ -83,21 +83,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,7 +103,11 @@ 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,
     },
   },
@@ -99,7 +118,6 @@ return {
     opts = {
       options = {
         notify_user_on_venv_activation = true,
-        override_notify = false,
       },
     },
     --  Call config for Python files and load the cached venv automatically

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" },

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

@@ -85,12 +85,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 +103,6 @@ return {
                 "venv",
                 ".venv",
               },
-              -- Avoid Roots Scanned hanging, see https://github.com/rust-lang/rust-analyzer/issues/12613#issuecomment-2096386344
-              watcher = "client",
             },
           },
         },

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({

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

@@ -23,7 +23,15 @@ return {
     "neovim/nvim-lspconfig",
     opts = {
       servers = {
-        svelte = {},
+        svelte = {
+          keys = {
+            {
+              "<leader>co",
+              LazyVim.lsp.action["source.organizeImports"],
+              desc = "Organize Imports",
+            },
+          },
+        },
       },
     },
   },

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

@@ -24,20 +24,6 @@ return {
           filetypes_include = {},
           -- to fully override the default_config, change the below
           -- filetypes = {}
-
-          -- additional settings for the server, e.g:
-          -- tailwindCSS = { includeLanguages = { someLang = "html" } }
-          -- can be addeded to the settings table and will be merged with
-          -- this defaults for Phoenix projects
-          settings = {
-            tailwindCSS = {
-              includeLanguages = {
-                elixir = "html-eex",
-                eelixir = "html-eex",
-                heex = "html-eex",
-              },
-            },
-          },
         },
       },
       setup = {
@@ -53,6 +39,17 @@ return {
             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",
+                eelixir = "html-eex",
+                heex = "html-eex",
+              },
+            },
+          }
+
           -- Add additional filetypes
           vim.list_extend(opts.filetypes, opts.filetypes_include or {})
         end,

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,8 +120,40 @@ 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)
+          if vim.lsp.config.denols and vim.lsp.config.vtsls then
+            ---@param server string
+            local resolve = function(server)
+              local markers, root_dir = vim.lsp.config[server].root_markers, vim.lsp.config[server].root_dir
+              vim.lsp.config(server, {
+                root_dir = function(bufnr, on_dir)
+                  local is_deno = vim.fs.root(bufnr, { "deno.json", "deno.jsonc" }) ~= nil
+                  if is_deno == (server == "denols") then
+                    if root_dir then
+                      return root_dir(bufnr, on_dir)
+                    elseif type(markers) == "table" then
+                      local root = vim.fs.root(bufnr, markers)
+                      return root and on_dir(root)
+                    end
+                  end
+                end,
+              })
+            end
+            resolve("denols")
+            resolve("vtsls")
+          end
+
+          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)
@@ -157,7 +202,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 +211,93 @@ return {
     },
   },
 
-  -- correctly setup lspconfig
   {
-    "neovim/nvim-lspconfig",
+    "mfussenegger/nvim-dap",
-    opts = {},
+    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")
+      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
+  {
+    "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/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,
-  },
-}

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

@@ -1,58 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = {
-        "javascript",
-        "javascriptreact",
-        "javascript.jsx",
-        "typescript",
-        "typescriptreact",
-        "typescript.tsx",
-      },
-      root = { "tsconfig.json", "package.json", "jsconfig.json" },
-    })
-  end,
-
-  -- correctly setup lspconfig
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      -- make sure mason installs the server
-      servers = {
-        ---@type lspconfig.settings.tsgo
-        tsgo = {
-          -- explicitly add default filetypes, so that we can extend
-          -- them in related extras
-          filetypes = {
-            "javascript",
-            "javascriptreact",
-            "javascript.jsx",
-            "typescript",
-            "typescriptreact",
-            "typescript.tsx",
-          },
-          settings = {
-            typescript = {
-              inlayHints = {
-                enumMemberValues = { enabled = true },
-                functionLikeReturnTypes = { enabled = false },
-                parameterNames = {
-                  enabled = "literals",
-                  suppressWhenArgumentMatchesName = true,
-                },
-                parameterTypes = { enabled = true },
-                propertyDeclarationTypes = { enabled = true },
-                variableTypes = { enabled = false },
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-  -- correctly setup lspconfig
-  {
-    "neovim/nvim-lspconfig",
-    opts = {},
-  },
-}

lua/lazyvim/plugins/extras/lang/typst.lua

@@ -1,82 +0,0 @@
-return {
-  recommended = function()
-    return LazyVim.extras.wants({
-      ft = { "typst" },
-    })
-  end,
-
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = {
-      ensure_installed = { "typst" },
-    },
-  },
-
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        tinymist = {
-          keys = {
-            {
-              "<leader>cP",
-              function()
-                local buf_name = vim.api.nvim_buf_get_name(0)
-                local file_name = vim.fn.fnamemodify(buf_name, ":t")
-                LazyVim.lsp.execute({
-                  title = "Pin Main",
-                  filter = "tinymist",
-                  command = "tinymist.pinMain",
-                  arguments = { buf_name },
-                })
-                LazyVim.info("Tinymist: Pinned " .. file_name)
-              end,
-              desc = "Pin main file",
-            },
-          },
-          single_file_support = true, -- Fixes LSP attachment in non-Git directories
-          settings = {
-            formatterMode = "typstyle",
-          },
-        },
-      },
-    },
-  },
-
-  {
-    "stevearc/conform.nvim",
-    optional = true,
-    opts = {
-      formatters_by_ft = {
-        typst = { "typstyle", lsp_format = "prefer" },
-      },
-    },
-  },
-
-  {
-    "chomosuke/typst-preview.nvim",
-    cmd = { "TypstPreview", "TypstPreviewToggle", "TypstPreviewUpdate" },
-    keys = {
-      {
-        "<leader>cp",
-        ft = "typst",
-        "<cmd>TypstPreviewToggle<cr>",
-        desc = "Toggle Typst Preview",
-      },
-    },
-    opts = {
-      dependencies_bin = {
-        tinymist = "tinymist",
-      },
-    },
-  },
-
-  {
-    "folke/ts-comments.nvim",
-    opts = {
-      lang = {
-        typst = { "// %s", "/* %s */" },
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/test/core.lua

@@ -106,7 +106,6 @@ return {
     -- stylua: ignore
     keys = {
       {"<leader>t", "", desc = "+test"},
-      { "<leader>ta", function() require("neotest").run.attach() end, desc = "Attach to Test (Neotest)" },
       { "<leader>tt", function() require("neotest").run.run(vim.fn.expand("%")) end, desc = "Run File (Neotest)" },
       { "<leader>tT", function() require("neotest").run.run(vim.uv.cwd()) end, desc = "Run All Test Files (Neotest)" },
       { "<leader>tr", function() require("neotest").run.run() end, desc = "Run Nearest (Neotest)" },

lua/lazyvim/plugins/extras/ui/mini-animate.lua

@@ -32,19 +32,15 @@ return {
         end,
       })
 
-      -- schedule setting the mapping to override the default mapping from `keymaps.lua`
+      Snacks.toggle({
-      -- seems `keymaps.lua` is the last event to execute on `VeryLazy` and it overwrites it
+        name = "Mini Animate",
-      vim.schedule(function()
+        get = function()
-        Snacks.toggle({
+          return not vim.g.minianimate_disable
-          name = "Mini Animate",
+        end,
-          get = function()
+        set = function(state)
-            return not vim.g.minianimate_disable
+          vim.g.minianimate_disable = not state
-          end,
+        end,
-          set = function(state)
+      }):map("<leader>ua")
-            vim.g.minianimate_disable = not state
-          end,
-        }):map("<leader>ua")
-      end)
 
       local animate = require("mini.animate")
       return vim.tbl_deep_extend("force", opts, {

lua/lazyvim/plugins/extras/ui/mini-indentscope.lua

@@ -23,7 +23,6 @@ return {
           "mason",
           "neo-tree",
           "notify",
-          "sidekick_terminal",
           "snacks_dashboard",
           "snacks_notif",
           "snacks_terminal",
@@ -45,7 +44,7 @@ return {
     end,
   },
 
-  -- disable indent-blankline scope when mini-indentscope is enabled
+  -- disable inent-blankline scope when mini-indentscope is enabled
   {
     "lukas-reineke/indent-blankline.nvim",
     optional = true,
@@ -55,7 +54,7 @@ return {
     },
   },
 
-  -- disable snacks scope when mini-indentscope is enabled
+  -- disable snacks scroll when mini-indentscope is enabled
   {
     "snacks.nvim",
     opts = {

lua/lazyvim/plugins/extras/util/chezmoi.lua

@@ -5,15 +5,10 @@ local pick_chezmoi = function()
     local fzf_lua = require("fzf-lua")
     local actions = {
       ["enter"] = function(selected)
-        fzf_lua.actions.vimcmd_entry("ChezmoiEdit", selected, { cwd = vim.env.HOME })
+        fzf_lua.actions.vimcmd_entry("ChezmoiEdit", selected, { cwd = os.getenv("HOME") })
       end,
     }
-    fzf_lua.files({
+    fzf_lua.files({ cmd = "chezmoi managed --include=files,symlinks", actions = actions })
-      cmd = "chezmoi managed --include=files,symlinks",
-      actions = actions,
-      cwd = vim.env.HOME,
-      hidden = false,
-    })
   elseif LazyVim.pick.picker.name == "snacks" then
     local results = require("chezmoi.commands").list({
       args = {
@@ -55,7 +50,7 @@ return {
     "alker0/chezmoi.vim",
     init = function()
       vim.g["chezmoi#use_tmp_buffer"] = 1
-      vim.g["chezmoi#source_dir_path"] = vim.env.HOME .. "/.local/share/chezmoi"
+      vim.g["chezmoi#source_dir_path"] = os.getenv("HOME") .. "/.local/share/chezmoi"
     end,
   },
   {
@@ -85,7 +80,7 @@ return {
     init = function()
       -- run chezmoi edit on file enter
       vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
-        pattern = { vim.env.HOME .. "/.local/share/chezmoi/*" },
+        pattern = { os.getenv("HOME") .. "/.local/share/chezmoi/*" },
         callback = function()
           vim.schedule(require("chezmoi.commands.__edit").watch)
         end,

lua/lazyvim/plugins/extras/util/gh.lua

@@ -1,51 +0,0 @@
-return {
-
-  -- depends on the git extra for highlighting and auto-completion of github issues/prs
-  { import = "lazyvim.plugins.extras.lang.git" },
-
-  { "ldelossa/litee.nvim", lazy = true },
-
-  -- gh.nvim
-  {
-    "ldelossa/gh.nvim",
-    opts = {},
-    config = function(_, opts)
-      require("litee.lib").setup()
-      require("litee.gh").setup(opts)
-    end,
-    keys = {
-      { "<leader>G", "", desc = "+Github" },
-      { "<leader>Gc", "", desc = "+Commits" },
-      { "<leader>Gcc", "<cmd>GHCloseCommit<cr>", desc = "Close" },
-      { "<leader>Gce", "<cmd>GHExpandCommit<cr>", desc = "Expand" },
-      { "<leader>Gco", "<cmd>GHOpenToCommit<cr>", desc = "Open To" },
-      { "<leader>Gcp", "<cmd>GHPopOutCommit<cr>", desc = "Pop Out" },
-      { "<leader>Gcz", "<cmd>GHCollapseCommit<cr>", desc = "Collapse" },
-      { "<leader>Gi", "", desc = "+Issues" },
-      { "<leader>Gip", "<cmd>GHPreviewIssue<cr>", desc = "Preview" },
-      { "<leader>Gio", "<cmd>GHOpenIssue<cr>", desc = "Open" },
-      { "<leader>Gl", "", desc = "+Litee" },
-      { "<leader>Glt", "<cmd>LTPanel<cr>", desc = "Toggle Panel" },
-      { "<leader>Gp", "", desc = "+Pull Request" },
-      { "<leader>Gpc", "<cmd>GHClosePR<cr>", desc = "Close" },
-      { "<leader>Gpd", "<cmd>GHPRDetails<cr>", desc = "Details" },
-      { "<leader>Gpe", "<cmd>GHExpandPR<cr>", desc = "Expand" },
-      { "<leader>Gpo", "<cmd>GHOpenPR<cr>", desc = "Open" },
-      { "<leader>Gpp", "<cmd>GHPopOutPR<cr>", desc = "PopOut" },
-      { "<leader>Gpr", "<cmd>GHRefreshPR<cr>", desc = "Refresh" },
-      { "<leader>Gpt", "<cmd>GHOpenToPR<cr>", desc = "Open To" },
-      { "<leader>Gpz", "<cmd>GHCollapsePR<cr>", desc = "Collapse" },
-      { "<leader>Gr", "", desc = "+Review" },
-      { "<leader>Grb", "<cmd>GHStartReview<cr>", desc = "Begin" },
-      { "<leader>Grc", "<cmd>GHCloseReview<cr>", desc = "Close" },
-      { "<leader>Grd", "<cmd>GHDeleteReview<cr>", desc = "Delete" },
-      { "<leader>Gre", "<cmd>GHExpandReview<cr>", desc = "Expand" },
-      { "<leader>Grs", "<cmd>GHSubmitReview<cr>", desc = "Submit" },
-      { "<leader>Grz", "<cmd>GHCollapseReview<cr>", desc = "Collapse" },
-      { "<leader>Gt", "", desc = "+Threads" },
-      { "<leader>Gtc", "<cmd>GHCreateThread<cr>", desc = "Create" },
-      { "<leader>Gtn", "<cmd>GHNextThread<cr>", desc = "Next" },
-      { "<leader>Gtt", "<cmd>GHToggleThread<cr>", desc = "Toggle" },
-    },
-  },
-}

lua/lazyvim/plugins/extras/util/mini-hipatterns.lua

@@ -39,9 +39,6 @@ M.plugin = {
           group = function(_, _, data)
             ---@type string
             local match = data.full_match
-            if match == "#add" then
-              return
-            end
             local r, g, b = match:sub(2, 2), match:sub(3, 3), match:sub(4, 4)
             local hex_color = "#" .. r .. r .. g .. g .. b .. b
 

lua/lazyvim/plugins/extras/util/octo.lua

@@ -3,16 +3,6 @@ return {
   -- depends on the git extra for highlighting and auto-completion of github issues/prs
   { import = "lazyvim.plugins.extras.lang.git" },
 
-  {
-    "folke/snacks.nvim",
-    keys = { -- disable conflicting keymaps
-      { "<leader>gi", false },
-      { "<leader>gI", false },
-      { "<leader>gp", false },
-      { "<leader>gP", false },
-    },
-  },
-
   -- Octo
   {
     "pwntester/octo.nvim",

lua/lazyvim/plugins/extras/util/project.lua

@@ -126,7 +126,7 @@ return {
     "goolord/alpha-nvim",
     optional = true,
     opts = function(_, dashboard)
-      local button = dashboard.button("P", " " .. " Projects (util.project)", pick)
+      local button = dashboard.button("p", " " .. " Projects", pick)
       button.opts.hl = "AlphaButtons"
       button.opts.hl_shortcut = "AlphaShortcut"
       table.insert(dashboard.section.buttons.val, 4, button)
@@ -139,7 +139,7 @@ return {
     opts = function(_, opts)
       local items = {
         {
-          name = "Projects (util.project)",
+          name = "Projects",
           action = pick,
           section = string.rep(" ", 22) .. "Telescope",
         },
@@ -157,9 +157,9 @@ return {
       end
       local projects = {
         action = pick,
-        desc = " Projects (util.project)",
+        desc = " Projects",
         icon = " ",
-        key = "P",
+        key = "p",
       }
 
       projects.desc = projects.desc .. string.rep(" ", 43 - #projects.desc)
@@ -175,9 +175,9 @@ return {
     opts = function(_, opts)
       table.insert(opts.dashboard.preset.keys, 3, {
         action = pick,
-        desc = "Projects (util.project)",
+        desc = "Projects",
         icon = " ",
-        key = "P",
+        key = "p",
       })
     end,
   },

lua/lazyvim/plugins/extras/util/rest.lua

@@ -8,11 +8,10 @@ return {
     "mistweaverco/kulala.nvim",
     ft = "http",
     keys = {
-      { "<leader>R", "", desc = "+Rest" },
+      { "<leader>R", "", desc = "+Rest", ft = "http" },
-      { "<leader>Rb", "<cmd>lua require('kulala').scratchpad()<cr>", desc = "Open scratchpad" },
+      { "<leader>Rb", "<cmd>lua require('kulala').scratchpad()<cr>", desc = "Open scratchpad", ft = "http" },
       { "<leader>Rc", "<cmd>lua require('kulala').copy()<cr>", desc = "Copy as cURL", ft = "http" },
       { "<leader>RC", "<cmd>lua require('kulala').from_curl()<cr>", desc = "Paste from curl", ft = "http" },
-      { "<leader>Re", "<cmd>lua require('kulala').set_selected_env()<cr>", desc = "Set environment", ft = "http" },
       {
         "<leader>Rg",
         "<cmd>lua require('kulala').download_graphql_schema()<cr>",
@@ -23,7 +22,7 @@ return {
       { "<leader>Rn", "<cmd>lua require('kulala').jump_next()<cr>", desc = "Jump to next request", ft = "http" },
       { "<leader>Rp", "<cmd>lua require('kulala').jump_prev()<cr>", desc = "Jump to previous request", ft = "http" },
       { "<leader>Rq", "<cmd>lua require('kulala').close()<cr>", desc = "Close window", ft = "http" },
-      { "<leader>Rr", "<cmd>lua require('kulala').replay()<cr>", desc = "Replay the last request" },
+      { "<leader>Rr", "<cmd>lua require('kulala').replay()<cr>", desc = "Replay the last request", ft = "http" },
       { "<leader>Rs", "<cmd>lua require('kulala').run()<cr>", desc = "Send the request", ft = "http" },
       { "<leader>RS", "<cmd>lua require('kulala').show_stats()<cr>", desc = "Show stats", ft = "http" },
       { "<leader>Rt", "<cmd>lua require('kulala').toggle_view()<cr>", desc = "Toggle headers/body", ft = "http" },

lua/lazyvim/plugins/extras/vscode.lua

@@ -23,7 +23,6 @@ local enabled = {
 }
 
 local Config = require("lazy.core.config")
-local vscode = require("vscode")
 Config.options.checker.enabled = false
 Config.options.change_detection.enabled = false
 Config.options.defaults.cond = function(plugin)
@@ -37,30 +36,23 @@ vim.api.nvim_create_autocmd("User", {
   callback = function()
     -- VSCode-specific keymaps for search and navigation
     vim.keymap.set("n", "<leader><space>", "<cmd>Find<cr>")
-    vim.keymap.set("n", "<leader>/", function()
+    vim.keymap.set("n", "<leader>/", [[<cmd>lua require('vscode').action('workbench.action.findInFiles')<cr>]])
-      vscode.call("workbench.action.findInFiles")
+    vim.keymap.set("n", "<leader>ss", [[<cmd>lua require('vscode').action('workbench.action.gotoSymbol')<cr>]])
-    end)
-    vim.keymap.set("n", "<leader>ss", function()
-      vscode.call("workbench.action.gotoSymbol")
-    end)
 
-    -- Toggle VS Code integrated terminal
+    -- Keep undo/redo lists in sync with VsCode
-    for _, lhs in ipairs({ "<leader>ft", "<leader>fT", "<c-/>" }) do
+    vim.keymap.set("n", "u", "<Cmd>call VSCodeNotify('undo')<CR>")
-      vim.keymap.set("n", lhs, function()
+    vim.keymap.set("n", "<C-r>", "<Cmd>call VSCodeNotify('redo')<CR>")
-        vscode.call("workbench.action.terminal.toggleTerminal")
-      end)
-    end
 
     -- Navigate VSCode tabs like lazyvim buffers
-    vim.keymap.set("n", "<S-h>", function()
+    vim.keymap.set("n", "<S-h>", "<Cmd>call VSCodeNotify('workbench.action.previousEditor')<CR>")
-      vscode.call("workbench.action.previousEditor")
+    vim.keymap.set("n", "<S-l>", "<Cmd>call VSCodeNotify('workbench.action.nextEditor')<CR>")
-    end)
-    vim.keymap.set("n", "<S-l>", function()
-      vscode.call("workbench.action.nextEditor")
-    end)
   end,
 })
 
+function LazyVim.terminal()
+  require("vscode").action("workbench.action.terminal.toggleTerminal")
+end
+
 return {
   {
     "snacks.nvim",

lua/lazyvim/plugins/formatting.lua

@@ -29,7 +29,7 @@ return {
         function()
           require("conform").format({ formatters = { "injected" }, timeout_ms = 3000 })
         end,
-        mode = { "n", "x" },
+        mode = { "n", "v" },
         desc = "Format Injected Langs",
       },
     },

lua/lazyvim/plugins/init.lua

@@ -7,6 +7,14 @@ if vim.fn.has("nvim-0.11.2") == 0 then
   vim.fn.getchar()
   vim.cmd([[quit]])
   return {}
+elseif not vim.lsp.is_enabled then
+  vim.schedule(function()
+    LazyVim.warn({
+      "You're using an **old** `nightly` version of **Neovim**",
+      "Please update to a recent `nightly`,",
+      "or a stable version (`>= 0.11.2`).",
+    })
+  end)
 end
 
 require("lazyvim.config").init()

lua/lazyvim/plugins/lsp/init.lua

@@ -2,12 +2,11 @@ return {
   -- lspconfig
   {
     "neovim/nvim-lspconfig",
-    event = { "BufReadPre", "BufNewFile" },
+    event = "LazyFile",
     dependencies = {
       "mason.nvim",
       { "mason-org/mason-lspconfig.nvim", config = function() end },
     },
-    opts_extend = { "servers.*.keys" },
     opts = function()
       ---@class PluginLspOpts
       local ret = {
@@ -52,6 +51,15 @@ return {
         folds = {
           enabled = true,
         },
+        -- add any global capabilities here
+        capabilities = {
+          workspace = {
+            fileOperations = {
+              didRename = true,
+              willRename = true,
+            },
+          },
+        },
         -- options for vim.lsp.buf.format
         -- `bufnr` and `filter` is handled by the LazyVim formatter,
         -- but can be also overridden when specified
@@ -60,60 +68,9 @@ return {
           timeout_ms = nil,
         },
         -- LSP Server Settings
-        -- Sets the default configuration for an LSP client (or all clients if the special name "*" is used).
+        ---@alias lazyvim.lsp.Config vim.lsp.Config|{mason?:boolean, enabled?:boolean}
-        ---@alias lazyvim.lsp.Config vim.lsp.Config|{mason?:boolean, enabled?:boolean, keys?:LazyKeysLspSpec[]}
         ---@type table<string, lazyvim.lsp.Config|boolean>
         servers = {
-          -- configuration for all lsp servers
-          ["*"] = {
-            capabilities = {
-              workspace = {
-                fileOperations = {
-                  didRename = true,
-                  willRename = true,
-                },
-              },
-            },
-            -- stylua: ignore
-            keys = {
-              { "<leader>cl", function() Snacks.picker.lsp_config() end, desc = "Lsp Info" },
-              { "gd", vim.lsp.buf.definition, desc = "Goto Definition", has = "definition" },
-              { "gr", vim.lsp.buf.references, desc = "References", nowait = true },
-              { "gI", vim.lsp.buf.implementation, desc = "Goto Implementation" },
-              { "gy", vim.lsp.buf.type_definition, desc = "Goto T[y]pe Definition" },
-              { "gD", vim.lsp.buf.declaration, desc = "Goto Declaration" },
-              { "K", function() return vim.lsp.buf.hover() end, desc = "Hover" },
-              { "gK", function() return vim.lsp.buf.signature_help() end, desc = "Signature Help", has = "signatureHelp" },
-              { "<c-k>", function() return vim.lsp.buf.signature_help() end, mode = "i", desc = "Signature Help", has = "signatureHelp" },
-              { "<leader>ca", vim.lsp.buf.code_action, desc = "Code Action", mode = { "n", "x" }, has = "codeAction" },
-              { "<leader>cc", vim.lsp.codelens.run, desc = "Run Codelens", mode = { "n", "x" }, has = "codeLens" },
-              { "<leader>cC", vim.lsp.codelens.refresh, desc = "Refresh & Display Codelens", mode = { "n" }, has = "codeLens" },
-              { "<leader>cR", function() Snacks.rename.rename_file() end, desc = "Rename File", mode ={"n"}, has = { "workspace/didRenameFiles", "workspace/willRenameFiles" } },
-              { "<leader>cr", vim.lsp.buf.rename, desc = "Rename", has = "rename" },
-              { "<leader>cA", LazyVim.lsp.action.source, desc = "Source Action", has = "codeAction" },
-              { "]]", function() Snacks.words.jump(vim.v.count1) end, has = "documentHighlight",
-                desc = "Next Reference", enabled = function() return Snacks.words.is_enabled() end },
-              { "[[", function() Snacks.words.jump(-vim.v.count1) end, has = "documentHighlight",
-                desc = "Prev Reference", enabled = function() return Snacks.words.is_enabled() end },
-              { "<a-n>", function() Snacks.words.jump(vim.v.count1, true) end, has = "documentHighlight",
-                desc = "Next Reference", enabled = function() return Snacks.words.is_enabled() end },
-              { "<a-p>", function() Snacks.words.jump(-vim.v.count1, true) end, has = "documentHighlight",
-                desc = "Prev Reference", enabled = function() return Snacks.words.is_enabled() end },
-              {
-                "<leader>co",
-                LazyVim.lsp.action["source.organizeImports"],
-                desc = "Organize Imports",
-                has = "codeAction",
-                enabled = function(buf)
-                  local code_actions = vim.tbl_filter(function(action)
-                    return action:find("^source%.organizeImports%.?$")
-                  end, LazyVim.lsp.code_actions({ bufnr = buf }))
-                  return #code_actions > 0
-                end
-              },
-            },
-          },
-          stylua = { enabled = false },
           lua_ls = {
             -- mason = false, -- set to false if you don't want this server to be installed with mason
             -- Use this to add any additional keymaps
@@ -162,23 +119,21 @@ return {
       return ret
     end,
     ---@param opts PluginLspOpts
-    config = function(_, opts)
+    config = vim.schedule_wrap(function(_, opts)
       -- setup autoformat
       LazyVim.format.register(LazyVim.lsp.formatter())
 
       -- setup keymaps
-      local names = vim.tbl_keys(opts.servers) ---@type string[]
+      LazyVim.lsp.on_attach(function(client, buffer)
-      table.sort(names)
+        require("lazyvim.plugins.lsp.keymaps").on_attach(client, buffer)
-      for _, server in ipairs(names) do
+      end)
-        local server_opts = opts.servers[server]
+
-        if type(server_opts) == "table" and server_opts.keys then
+      LazyVim.lsp.setup()
-          require("lazyvim.plugins.lsp.keymaps").set({ name = server ~= "*" and server or nil }, server_opts.keys)
+      LazyVim.lsp.on_dynamic_capability(require("lazyvim.plugins.lsp.keymaps").on_attach)
-        end
-      end
 
       -- inlay hints
       if opts.inlay_hints.enabled then
-        Snacks.util.lsp.on({ method = "textDocument/inlayHint" }, function(buffer)
+        LazyVim.lsp.on_supports_method("textDocument/inlayHint", function(client, buffer)
           if
             vim.api.nvim_buf_is_valid(buffer)
             and vim.bo[buffer].buftype == ""
@@ -191,7 +146,7 @@ return {
 
       -- folds
       if opts.folds.enabled then
-        Snacks.util.lsp.on({ method = "textDocument/foldingRange" }, function()
+        LazyVim.lsp.on_supports_method("textDocument/foldingRange", function(client, buffer)
           if LazyVim.set_default("foldmethod", "expr") then
             LazyVim.set_default("foldexpr", "v:lua.vim.lsp.foldexpr()")
           end
@@ -200,7 +155,7 @@ return {
 
       -- code lens
       if opts.codelens.enabled and vim.lsp.codelens then
-        Snacks.util.lsp.on({ method = "textDocument/codeLens" }, function(buffer)
+        LazyVim.lsp.on_supports_method("textDocument/codeLens", function(client, buffer)
           vim.lsp.codelens.refresh()
           vim.api.nvim_create_autocmd({ "BufEnter", "CursorHold", "InsertLeave" }, {
             buffer = buffer,
@@ -224,14 +179,7 @@ return {
       vim.diagnostic.config(vim.deepcopy(opts.diagnostics))
 
       if opts.capabilities then
-        LazyVim.deprecate("lsp-config.opts.capabilities", "Use lsp-config.opts.servers['*'].capabilities instead")
+        vim.lsp.config("*", { capabilities = opts.capabilities })
-        opts.servers["*"] = vim.tbl_deep_extend("force", opts.servers["*"] or {}, {
-          capabilities = opts.capabilities,
-        })
-      end
-
-      if opts.servers["*"] then
-        vim.lsp.config("*", opts.servers["*"])
       end
 
       -- get all the servers that are available through mason-lspconfig
@@ -239,13 +187,10 @@ return {
       local mason_all = have_mason
           and vim.tbl_keys(require("mason-lspconfig.mappings").get_mason_map().lspconfig_to_package)
         or {} --[[ @as string[] ]]
-      local mason_exclude = {} ---@type string[]
+      local mason_exclude = {}, {} ---@type string[]
 
       ---@return boolean? exclude automatic setup
       local function configure(server)
-        if server == "*" then
-          return false
-        end
         local sopts = opts.servers[server]
         sopts = sopts == true and {} or (not sopts) and { enabled = false } or sopts --[[@as lazyvim.lsp.Config]]
 
@@ -274,7 +219,7 @@ return {
           automatic_enable = { exclude = mason_exclude },
         })
       end
-    end,
+    end),
   },
 
   -- cmdline tools and lsp servers

lua/lazyvim/plugins/lsp/keymaps.lua

@@ -1,65 +1,97 @@
 local M = {}
 
 ---@type LazyKeysLspSpec[]|nil
-M._keys = {}
+M._keys = nil
 
----@alias LazyKeysLspSpec LazyKeysSpec|{has?:string|string[], enabled?:(fun(buf:number):boolean)}
+---@alias LazyKeysLspSpec LazyKeysSpec|{has?:string|string[], cond?:fun():boolean}
----@alias LazyKeysLsp LazyKeys|{has?:string|string[], enabled?:fun(buf:number):boolean}
+---@alias LazyKeysLsp LazyKeys|{has?:string|string[], cond?:fun():boolean}
 
----@deprecated
 ---@return LazyKeysLspSpec[]
 function M.get()
-  LazyVim.warn({
+  if M._keys then
-    'Adding LSP keymaps via `require("lazyvim.plugins.lsp.keymaps").get()` is deprecated.',
+    return M._keys
-    "Please set keymaps via the `keys` field in the LSP server config.",
+  end
-    [[
+    -- stylua: ignore
-```lua
+    M._keys =  {
-{
+      { "<leader>cl", function() Snacks.picker.lsp_config() end, desc = "Lsp Info" },
-  "neovim/nvim-lspconfig",
+      { "gd", vim.lsp.buf.definition, desc = "Goto Definition", has = "definition" },
-  opts = {
+      { "gr", vim.lsp.buf.references, desc = "References", nowait = true },
-    servers = {
+      { "gI", vim.lsp.buf.implementation, desc = "Goto Implementation" },
-      ['*'] = {
+      { "gy", vim.lsp.buf.type_definition, desc = "Goto T[y]pe Definition" },
-        keys = {
+      { "gD", vim.lsp.buf.declaration, desc = "Goto Declaration" },
-          { "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", has = "definition"},
+      { "K", function() return vim.lsp.buf.hover() end, desc = "Hover" },
-        },
+      { "gK", function() return vim.lsp.buf.signature_help() end, desc = "Signature Help", has = "signatureHelp" },
-      },
+      { "<c-k>", function() return vim.lsp.buf.signature_help() end, mode = "i", desc = "Signature Help", has = "signatureHelp" },
-    },
+      { "<leader>ca", vim.lsp.buf.code_action, desc = "Code Action", mode = { "n", "v" }, has = "codeAction" },
-  },
+      { "<leader>cc", vim.lsp.codelens.run, desc = "Run Codelens", mode = { "n", "v" }, has = "codeLens" },
-}
+      { "<leader>cC", vim.lsp.codelens.refresh, desc = "Refresh & Display Codelens", mode = { "n" }, has = "codeLens" },
-```]],
+      { "<leader>cR", function() Snacks.rename.rename_file() end, desc = "Rename File", mode ={"n"}, has = { "workspace/didRenameFiles", "workspace/willRenameFiles" } },
-  }, { stacktrace = true })
+      { "<leader>cr", vim.lsp.buf.rename, desc = "Rename", has = "rename" },
-  vim.schedule(function()
+      { "<leader>cA", LazyVim.lsp.action.source, desc = "Source Action", has = "codeAction" },
-    if #M._keys > 0 then
+      { "]]", function() Snacks.words.jump(vim.v.count1) end, has = "documentHighlight",
-      M.set({}, M._keys)
+        desc = "Next Reference", cond = function() return Snacks.words.is_enabled() end },
-      M._keys = {}
+      { "[[", function() Snacks.words.jump(-vim.v.count1) end, has = "documentHighlight",
-    end
+        desc = "Prev Reference", cond = function() return Snacks.words.is_enabled() end },
-  end)
+      { "<a-n>", function() Snacks.words.jump(vim.v.count1, true) end, has = "documentHighlight",
+        desc = "Next Reference", cond = function() return Snacks.words.is_enabled() end },
+      { "<a-p>", function() Snacks.words.jump(-vim.v.count1, true) end, has = "documentHighlight",
+        desc = "Prev Reference", cond = function() return Snacks.words.is_enabled() end },
+    }
+
   return M._keys
 end
 
----@param filter vim.lsp.get_clients.Filter
+---@param method string|string[]
----@param spec LazyKeysLspSpec[]
+function M.has(buffer, method)
-function M.set(filter, spec)
+  if type(method) == "table" then
-  local Keys = require("lazy.core.handler.keys")
+    for _, m in ipairs(method) do
-  for _, keys in pairs(Keys.resolve(spec)) do
+      if M.has(buffer, m) then
-    ---@cast keys LazyKeysLsp
+        return true
-    local filters = {} ---@type vim.lsp.get_clients.Filter[]
-    if keys.has then
-      local methods = type(keys.has) == "string" and { keys.has } or keys.has --[[@as string[] ]]
-      for _, method in ipairs(methods) do
-        method = method:find("/") and method or ("textDocument/" .. method)
-        filters[#filters + 1] = vim.tbl_extend("force", vim.deepcopy(filter), { method = method })
       end
-    else
-      filters[#filters + 1] = filter
     end
+    return false
+  end
+  method = method:find("/") and method or "textDocument/" .. method
+  local clients = vim.lsp.get_clients({ bufnr = buffer })
+  for _, client in ipairs(clients) do
+    if client:supports_method(method) then
+      return true
+    end
+  end
+  return false
+end
 
-    for _, f in ipairs(filters) do
+---@return LazyKeysLsp[]
+function M.resolve(buffer)
+  local Keys = require("lazy.core.handler.keys")
+  if not Keys.resolve then
+    return {}
+  end
+  local spec = vim.tbl_extend("force", {}, M.get())
+  local opts = LazyVim.opts("nvim-lspconfig")
+  local clients = vim.lsp.get_clients({ bufnr = buffer })
+  for _, client in ipairs(clients) do
+    local maps = opts.servers[client.name] and opts.servers[client.name].keys or {}
+    vim.list_extend(spec, maps)
+  end
+  return Keys.resolve(spec)
+end
+
+function M.on_attach(_, buffer)
+  local Keys = require("lazy.core.handler.keys")
+  local keymaps = M.resolve(buffer)
+
+  for _, keys in pairs(keymaps) do
+    local has = not keys.has or M.has(buffer, keys.has)
+    local cond = not (keys.cond == false or ((type(keys.cond) == "function") and not keys.cond()))
+
+    if has and cond then
       local opts = Keys.opts(keys)
-      ---@cast opts snacks.keymap.set.Opts
+      opts.cond = nil
-      opts.lsp = f
+      opts.has = nil
-      opts.enabled = keys.enabled
+      opts.silent = opts.silent ~= false
-      Snacks.keymap.set(keys.mode or "n", keys.lhs, keys.rhs, opts)
+      opts.buffer = buffer
+      vim.keymap.set(keys.mode or "n", keys.lhs, keys.rhs, opts)
     end
   end
 end

lua/lazyvim/plugins/treesitter.lua

@@ -6,7 +6,6 @@ return {
   {
     "nvim-treesitter/nvim-treesitter",
     branch = "main",
-    commit = vim.fn.has("nvim-0.12") == 0 and "7caec274fd19c12b55902a5b795100d21531391f" or nil,
     version = false, -- last release is way too old and doesn't work on Windows
     build = function()
       local TS = require("nvim-treesitter")
@@ -14,22 +13,20 @@ return {
         LazyVim.error("Please restart Neovim and run `:TSUpdate` to use the `nvim-treesitter` **main** branch.")
         return
       end
-      -- make sure we're using the latest treesitter util
+      LazyVim.treesitter.ensure_treesitter_cli(function()
-      package.loaded["lazyvim.util.treesitter"] = nil
-      LazyVim.treesitter.build(function()
         TS.update(nil, { summary = true })
       end)
     end,
+    lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline
     event = { "LazyFile", "VeryLazy" },
     cmd = { "TSUpdate", "TSInstall", "TSLog", "TSUninstall" },
     opts_extend = { "ensure_installed" },
-    ---@alias lazyvim.TSFeat { enable?: boolean, disable?: string[] }
     ---@class lazyvim.TSConfig: TSConfig
     opts = {
       -- LazyVim config for treesitter
-      indent = { enable = true }, ---@type lazyvim.TSFeat
+      indent = { enable = true },
-      highlight = { enable = true }, ---@type lazyvim.TSFeat
+      highlight = { enable = true },
-      folds = { enable = true }, ---@type lazyvim.TSFeat
+      folds = { enable = true },
       ensure_installed = {
         "bash",
         "c",
@@ -38,6 +35,7 @@ return {
         "javascript",
         "jsdoc",
         "json",
+        "jsonc",
         "lua",
         "luadoc",
         "luap",
@@ -91,7 +89,7 @@ return {
         return not LazyVim.treesitter.have(lang)
       end, opts.ensure_installed or {})
       if #install > 0 then
-        LazyVim.treesitter.build(function()
+        LazyVim.treesitter.ensure_treesitter_cli(function()
           TS.install(install, { summary = true }):await(function()
             LazyVim.treesitter.get_installed(true) -- refresh the installed langs
           end)
@@ -101,32 +99,22 @@ return {
       vim.api.nvim_create_autocmd("FileType", {
         group = vim.api.nvim_create_augroup("lazyvim_treesitter", { clear = true }),
         callback = function(ev)
-          local ft, lang = ev.match, vim.treesitter.language.get_lang(ev.match)
+          if not LazyVim.treesitter.have(ev.match) then
-          if not LazyVim.treesitter.have(ft) then
             return
           end
 
-          ---@param feat string
-          ---@param query string
-          local function enabled(feat, query)
-            local f = opts[feat] or {} ---@type lazyvim.TSFeat
-            return f.enable ~= false
-              and not (type(f.disable) == "table" and vim.tbl_contains(f.disable, lang))
-              and LazyVim.treesitter.have(ft, query)
-          end
-
           -- highlighting
-          if enabled("highlight", "highlights") then
+          if vim.tbl_get(opts, "highlight", "enable") ~= false then
-            pcall(vim.treesitter.start, ev.buf)
+            pcall(vim.treesitter.start)
           end
 
           -- indents
-          if enabled("indent", "indents") then
+          if vim.tbl_get(opts, "indent", "enable") ~= false and LazyVim.treesitter.have(ev.match, "indents") then
             LazyVim.set_default("indentexpr", "v:lua.LazyVim.treesitter.indentexpr()")
           end
 
           -- folds
-          if enabled("folds", "folds") then
+          if vim.tbl_get(opts, "folds", "enable") ~= false and LazyVim.treesitter.have(ev.match, "folds") then
             if LazyVim.set_default("foldmethod", "expr") then
               LazyVim.set_default("foldexpr", "v:lua.LazyVim.treesitter.foldexpr()")
             end
@@ -140,19 +128,38 @@ return {
     "nvim-treesitter/nvim-treesitter-textobjects",
     branch = "main",
     event = "VeryLazy",
-    opts = {
+    opts = {},
-      move = {
+    keys = function()
-        enable = true,
+      local moves = {
-        set_jumps = true, -- whether to set jumps in the jumplist
+        goto_next_start = { ["]f"] = "@function.outer", ["]c"] = "@class.outer", ["]a"] = "@parameter.inner" },
-        -- LazyVim extention to create buffer-local keymaps
+        goto_next_end = { ["]F"] = "@function.outer", ["]C"] = "@class.outer", ["]A"] = "@parameter.inner" },
-        keys = {
+        goto_previous_start = { ["[f"] = "@function.outer", ["[c"] = "@class.outer", ["[a"] = "@parameter.inner" },
-          goto_next_start = { ["]f"] = "@function.outer", ["]c"] = "@class.outer", ["]a"] = "@parameter.inner" },
+        goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer", ["[A"] = "@parameter.inner" },
-          goto_next_end = { ["]F"] = "@function.outer", ["]C"] = "@class.outer", ["]A"] = "@parameter.inner" },
+      }
-          goto_previous_start = { ["[f"] = "@function.outer", ["[c"] = "@class.outer", ["[a"] = "@parameter.inner" },
+      local ret = {} ---@type LazyKeysSpec[]
-          goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer", ["[A"] = "@parameter.inner" },
+      for method, keymaps in pairs(moves) do
-        },
+        for key, query in pairs(keymaps) do
-      },
+          local desc = query:gsub("@", ""):gsub("%..*", "")
-    },
+          desc = desc:sub(1, 1):upper() .. desc:sub(2)
+          desc = (key:sub(1, 1) == "[" and "Prev " or "Next ") .. desc
+          desc = desc .. (key:sub(2, 2) == key:sub(2, 2):upper() and " End" or " Start")
+          ret[#ret + 1] = {
+            key,
+            function()
+              -- don't use treesitter if in diff mode and the key is one of the c/C keys
+              if vim.wo.diff and key:find("[cC]") then
+                return vim.cmd("normal! " .. key)
+              end
+              require("nvim-treesitter-textobjects.move")[method](query, "textobjects")
+            end,
+            desc = desc,
+            mode = { "n", "x", "o" },
+            silent = true,
+          }
+        end
+      end
+      return ret
+    end,
     config = function(_, opts)
       local TS = require("nvim-treesitter-textobjects")
       if not TS.setup then
@@ -160,48 +167,6 @@ return {
         return
       end
       TS.setup(opts)
-
-      local function attach(buf)
-        local ft = vim.bo[buf].filetype
-        if not (vim.tbl_get(opts, "move", "enable") and LazyVim.treesitter.have(ft, "textobjects")) then
-          return
-        end
-        ---@type table<string, table<string, string>>
-        local moves = vim.tbl_get(opts, "move", "keys") or {}
-
-        for method, keymaps in pairs(moves) do
-          for key, query in pairs(keymaps) do
-            local queries = type(query) == "table" and query or { query }
-            local parts = {}
-            for _, q in ipairs(queries) do
-              local part = q:gsub("@", ""):gsub("%..*", "")
-              part = part:sub(1, 1):upper() .. part:sub(2)
-              table.insert(parts, part)
-            end
-            local desc = table.concat(parts, " or ")
-            desc = (key:sub(1, 1) == "[" and "Prev " or "Next ") .. desc
-            desc = desc .. (key:sub(2, 2) == key:sub(2, 2):upper() and " End" or " Start")
-            vim.keymap.set({ "n", "x", "o" }, key, function()
-              if vim.wo.diff and key:find("[cC]") then
-                return vim.cmd("normal! " .. key)
-              end
-              require("nvim-treesitter-textobjects.move")[method](query, "textobjects")
-            end, {
-              buffer = buf,
-              desc = desc,
-              silent = true,
-            })
-          end
-        end
-      end
-
-      vim.api.nvim_create_autocmd("FileType", {
-        group = vim.api.nvim_create_augroup("lazyvim_treesitter_textobjects", { clear = true }),
-        callback = function(ev)
-          attach(ev.buf)
-        end,
-      })
-      vim.tbl_map(attach, vim.api.nvim_list_bufs())
     end,
   },
 

lua/lazyvim/plugins/ui.lua

@@ -15,7 +15,6 @@ return {
       { "]b", "<cmd>BufferLineCycleNext<cr>", desc = "Next Buffer" },
       { "[B", "<cmd>BufferLineMovePrev<cr>", desc = "Move buffer prev" },
       { "]B", "<cmd>BufferLineMoveNext<cr>", desc = "Move buffer next" },
-      { "<leader>bj", "<cmd>BufferLinePick<cr>", desc = "Pick Buffer" },
     },
     opts = {
       options = {

lua/lazyvim/plugins/util.lua

@@ -23,8 +23,6 @@ return {
             nav_j = { "<C-j>", term_nav("j"), desc = "Go to Lower Window", expr = true, mode = "t" },
             nav_k = { "<C-k>", term_nav("k"), desc = "Go to Upper Window", expr = true, mode = "t" },
             nav_l = { "<C-l>", term_nav("l"), desc = "Go to Right Window", expr = true, mode = "t" },
-            hide_slash = { "<C-/>", "hide", desc = "Hide Terminal", mode = "t" },
-            hide_underscore = { "<c-_>", "hide", desc = "which_key_ignore", mode = "t" },
           },
         },
       },

lua/lazyvim/plugins/xtras.lua

@@ -5,9 +5,8 @@ local prios = {
   ["lazyvim.plugins.extras.coding.nvim-cmp"] = 2,
   ["lazyvim.plugins.extras.editor.neo-tree"] = 2,
   ["lazyvim.plugins.extras.ui.edgy"] = 3,
-  ["lazyvim.plugins.extras.ai.copilot-native"] = 4,
-  ["lazyvim.plugins.extras.coding.blink"] = 5,
   ["lazyvim.plugins.extras.lang.typescript"] = 5,
+  ["lazyvim.plugins.extras.coding.blink"] = 5,
   ["lazyvim.plugins.extras.formatting.prettier"] = 10,
   -- default core extra priority is 20
   -- default priority is 50
@@ -25,29 +24,12 @@ end
 local extras = {} ---@type string[]
 local defaults = LazyVim.config.get_defaults()
 
-local changed = false
-local updated = {} ---@type string[]
-
 -- Add extras from LazyExtras that are not disabled
 for _, extra in ipairs(LazyVim.config.json.data.extras) do
-  if LazyVim.plugin.renamed_extras[extra] then
+  local def = defaults[extra]
-    extra = LazyVim.plugin.renamed_extras[extra]
+  if not (def and def.enabled == false) then
-    changed = true
+    extras[#extras + 1] = extra
   end
-  if LazyVim.plugin.deprecated_extras[extra] then
-    changed = true
-  else
-    updated[#updated + 1] = extra
-    local def = defaults[extra]
-    if not (def and def.enabled == false) then
-      extras[#extras + 1] = extra
-    end
-  end
-end
-
-if changed then
-  LazyVim.config.json.data.extras = updated
-  LazyVim.json.save()
 end
 
 -- Add default extras

lua/lazyvim/util/deprecated.lua

@@ -6,22 +6,6 @@ M.moved = {
     rename_file = { "Snacks.rename.rename_file" },
     on_rename = { "Snacks.rename.on_rename_file" },
     words = { "Snacks.words" },
-    on_supports_method = {
-      "Snacks.util.lsp.on",
-      fn = function(method, cb)
-        return Snacks.util.lsp.on({ method = method }, function(buffer, client)
-          cb(client, buffer)
-        end)
-      end,
-    },
-    on_attach = {
-      "Snacks.util.lsp.on",
-      fn = function(cb, name)
-        return Snacks.util.lsp.on({ name = name }, function(buffer, client)
-          cb(client, buffer)
-        end)
-      end,
-    },
   },
   terminal = {
     open = { "Snacks.terminal" },

lua/lazyvim/util/extras.lua

@@ -65,7 +65,7 @@ function M.get()
     if root then
       LazyVim.walk(root, function(path, name, type)
         if (type == "file" or type == "link") and name:match("%.lua$") then
-          name = path:sub(#root + 2, -5):gsub("/", "."):gsub("%.init$", "")
+          name = path:sub(#root + 2, -5):gsub("/", ".")
           local ok, extra = pcall(M.get_extra, source, source.module .. "." .. name)
           if ok then
             extras[#extras + 1] = extra
@@ -115,13 +115,6 @@ function M.get_extra(source, modname)
     recommended = M.wants(recommended)
   end
 
-  -- language extras that are disabled because a conflict with another extra is enabled are not recommended
-  local defaults = LazyVim.config.get_defaults()
-  local def = defaults[modname]
-  if def and def.enabled == false and vim.startswith(modname, "lazyvim.plugins.extras.lang.") then
-    recommended = false
-  end
-
   ---@type LazyExtra
   return {
     source = source,

lua/lazyvim/util/init.lua

@@ -221,7 +221,7 @@ function M.safe_keymap_set(mode, lhs, rhs, opts)
       ---@diagnostic disable-next-line: no-unknown
       opts.remap = nil
     end
-    Snacks.keymap.set(modes, lhs, rhs, opts)
+    vim.keymap.set(modes, lhs, rhs, opts)
   end
 end