docs: updated NEWS.md

.github/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "14.1.0"
+  ".": "13.9.0"
 }

CHANGELOG.md

@@ -1,93 +1,5 @@
 # Changelog
 
-## [14.1.0](https://github.com/LazyVim/LazyVim/compare/v14.0.2...v14.1.0) (2024-12-13)
-
-
-### Features
-
-* **blink:** use block vs. icon for colors ([#5037](https://github.com/LazyVim/LazyVim/issues/5037)) ([4488cb2](https://github.com/LazyVim/LazyVim/commit/4488cb24f72e04dd5adb2e7c0388a51c2b36f4f0))
-
-
-### Bug Fixes
-
-* **blink:** add backward compat for config ([1517ec9](https://github.com/LazyVim/LazyVim/commit/1517ec9bb46b454d253186aff5e5abd41e96d723))
-
-## [14.0.2](https://github.com/LazyVim/LazyVim/compare/v14.0.1...v14.0.2) (2024-12-13)
-
-
-### Bug Fixes
-
-* **cmp:** disable nvim-cmp/blink.cmp when needed ([60b7704](https://github.com/LazyVim/LazyVim/commit/60b77045d57d5473e50042b9b879c9c1054e6a10))
-* **cmp:** wrong extras check for nvim-cmp ([009e358](https://github.com/LazyVim/LazyVim/commit/009e3587be1badc04c9a8b8b459e8555b405509c))
-
-## [14.0.1](https://github.com/LazyVim/LazyVim/compare/v14.0.0...v14.0.1) (2024-12-13)
-
-
-### Bug Fixes
-
-* **NEWS:** typo ([0fd7140](https://github.com/LazyVim/LazyVim/commit/0fd7140a6de936edb27a4ba4f4825153ae801c21))
-
-## [14.0.0](https://github.com/LazyVim/LazyVim/compare/v13.9.1...v14.0.0) (2024-12-13)
-
-
-### ⚠ BREAKING CHANGES
-
-* **cmp:** moved `nvim-cmp` to extras and prefer `blink.cmp` on Neovim >= `0.10` as default completion engine
-* **cmp:** moved `nvim-cmp` to extras and prefer `blink.cmp` on Neovim >= `0.10` as default completion engine
-* **snacks:** use `snacks.scope` indent objects in favor of custom `mini.ai` indent objects
-* **snacks:** use `snacks.indent` and moved `indent-blankline` to extras
-* **pick:** make fzf the default picker for LazyVim
-
-### Features
-
-* **cmp:** moved `nvim-cmp` to extras and prefer `blink.cmp` on Neovim >= `0.10` as default completion engine ([152f9d1](https://github.com/LazyVim/LazyVim/commit/152f9d113fa2b4fc2af72d2846c4dd68c31b7596))
-* **cmp:** moved `nvim-cmp` to extras and prefer `blink.cmp` on Neovim >= `0.10` as default completion engine ([2cbfb9b](https://github.com/LazyVim/LazyVim/commit/2cbfb9b6b7b9b4bb1c9ce94ad02ab0a851310fc0))
-* **keymaps:** added leader-uD to toggle dim mode ([9b97388](https://github.com/LazyVim/LazyVim/commit/9b973882b8bcbab32f850da7c553cdc6388af4ad))
-* **keymaps:** added leader-z to toggle zen mode ([e6d6a09](https://github.com/LazyVim/LazyVim/commit/e6d6a096b34ad887b9f954a3f43bcc3fd7833f73))
-* **keymaps:** added leader-Z to toggle zoom ([f2e1cac](https://github.com/LazyVim/LazyVim/commit/f2e1cac965e41d7761073856b11bea223cac1e4d))
-* **lualine:** add snacks profiler status ([7bc8490](https://github.com/LazyVim/LazyVim/commit/7bc8490d46e002d624f45037fc507e8dd10d4b70))
-* **pick:** make fzf the default picker for LazyVim ([ae2340f](https://github.com/LazyVim/LazyVim/commit/ae2340f60a012df125c87fe46e6d98d0be04bd10))
-* **rust:** exclude bad directories from rust-analyzer ([#5021](https://github.com/LazyVim/LazyVim/issues/5021)) ([94f6df0](https://github.com/LazyVim/LazyVim/commit/94f6df048fbecfdf2f65ab96156b713555df40dc))
-* **snacks:** added `snacks.input` ([54bece1](https://github.com/LazyVim/LazyVim/commit/54bece17b390453ea0beac41e419394d5e0d69ff))
-* **snacks:** added leader-ua to toggle global animations ([303980d](https://github.com/LazyVim/LazyVim/commit/303980d267577972bb12e34ef152a0e8b9a953e2))
-* **snacks:** added leader-ug to toggle indent guides ([b3ac642](https://github.com/LazyVim/LazyVim/commit/b3ac642317cd60e9b35869068dd74fe779a22146))
-* **snacks:** added leader-uS to toggle scroll ([cded8d4](https://github.com/LazyVim/LazyVim/commit/cded8d4d2808250db5ea864fb8e479fd8b5a4a2c))
-* **snacks:** added profiler keymaps ([a8332c6](https://github.com/LazyVim/LazyVim/commit/a8332c6d50106cf35e45953cdaa463cbb6c5b085))
-* **snacks:** enable `snacks.scroll` ([1a1a484](https://github.com/LazyVim/LazyVim/commit/1a1a48497c53e232b0f525baab87d5f23a2205b2))
-* **snacks:** use `snacks.indent` and moved `indent-blankline` to extras ([94fdc42](https://github.com/LazyVim/LazyVim/commit/94fdc421a11b960e116888658dd9b2b85c3b58fc))
-* **snacks:** use `snacks.scope` indent objects in favor of custom `mini.ai` indent objects ([d904a1e](https://github.com/LazyVim/LazyVim/commit/d904a1ef47638e4defede775a7f0966fb8e0a2b4))
-* **snacks:** use `Snacks.zen.zoom()` instead of custom **maximize** ([e389a5a](https://github.com/LazyVim/LazyVim/commit/e389a5ada955c253771ff5c9f8301e2f17c206d2))
-* **which-key:** make `helix` the default which-key preset ([44c712a](https://github.com/LazyVim/LazyVim/commit/44c712aa31e7e05971259841e1f87c9f3d9c6cd5))
-* **zen:** zoom with leader-wm and leader-uZ. zen with leader-uz ([2acedaa](https://github.com/LazyVim/LazyVim/commit/2acedaa3a8312e53d84a299bd82d616e1c26328a))
-
-
-### Bug Fixes
-
-* **blink:** disable cmdline integration for now since it doesn't work well with the enter keymap ([20eff4f](https://github.com/LazyVim/LazyVim/commit/20eff4fc3f55fbeb1e415f0cc5a2d1f3019e5da6))
-* **blink:** remove unneeded code ([d95e530](https://github.com/LazyVim/LazyVim/commit/d95e530c02cbb2bcf36da5bb3e235780bdf6d239))
-* **blink:** unset provider.kind ([#5024](https://github.com/LazyVim/LazyVim/issues/5024)) ([29c4dea](https://github.com/LazyVim/LazyVim/commit/29c4dea4e75b82ad4b06c21e360eefa3951a3fba))
-* **blink:** unset sources.compat. Fixes [#5016](https://github.com/LazyVim/LazyVim/issues/5016). Closes [#5017](https://github.com/LazyVim/LazyVim/issues/5017) ([2946031](https://github.com/LazyVim/LazyVim/commit/29460318f302b6dceaf16bd06c45cb3ed58d5fd8))
-* **clangd:** avoid nil-indexing the completion sorting comparators ([#5011](https://github.com/LazyVim/LazyVim/issues/5011)) ([c4b0d6d](https://github.com/LazyVim/LazyVim/commit/c4b0d6d0d1ee11c07c0ab4ed3f87f97b76a6f592))
-* **clangd:** nvim-cmp optional ([94be6fb](https://github.com/LazyVim/LazyVim/commit/94be6fb78786e9a53e914db9d5cfab09b13225ba))
-* **copliot:** restructure copilot-cmp spec ([34d2bdc](https://github.com/LazyVim/LazyVim/commit/34d2bdcac6fabe5d02e157bffa3475391ca1f7ec))
-* fqn for nvim-cmp ([a9a273d](https://github.com/LazyVim/LazyVim/commit/a9a273d041e2dd0e5654b5b492fd29138259fe68))
-* **git:** make nvim-cmp optional for the git extra ([ec92fa8](https://github.com/LazyVim/LazyVim/commit/ec92fa85586b4082f04b30ad94cb98b24463665e))
-* **java:** only setup debug adapter config if mason is installed ([#5013](https://github.com/LazyVim/LazyVim/issues/5013)) ([aad0edb](https://github.com/LazyVim/LazyVim/commit/aad0edbf749bcbe16e9ef8d2a65a19dd3fe2bd87))
-* **java:** only setup debug adapter config if mason is installed (for real this time) ([#5014](https://github.com/LazyVim/LazyVim/issues/5014)) ([5b1b6b2](https://github.com/LazyVim/LazyVim/commit/5b1b6b29d717adeffb0528cffef9f1a3972d3701))
-* **java:** only use mason-registry if mason installed ([#4991](https://github.com/LazyVim/LazyVim/issues/4991)) ([21b02f0](https://github.com/LazyVim/LazyVim/commit/21b02f056d924d0a3cb3513b163e3dbdfa9c15ec))
-* **mini.animate:** disable `snacks.scroll` when `mini.animate` is enabled ([9b07544](https://github.com/LazyVim/LazyVim/commit/9b07544e89ecead354ef0f17ebc3127f3fa5bbd8))
-* **mini.indentscope:** disable snacks and indent-blankline scope ([98c77f1](https://github.com/LazyVim/LazyVim/commit/98c77f1de479b12bc29dc8339fbfe694959d99ed))
-* **nvim-cmp:** set high prio for loading the nvim-cmp extra to prevent issues with opts ([adf8db6](https://github.com/LazyVim/LazyVim/commit/adf8db69ed91f8c15fe3cf37df9dc0801dbaeb39))
-* **nvim-cmp:** specs ([88e77b0](https://github.com/LazyVim/LazyVim/commit/88e77b0e2439a27d06e95e89839227f1e9446c74))
-* **ui:** use `Snacks.util.color` instead of `LazyVim.ui.fg` ([6d774ba](https://github.com/LazyVim/LazyVim/commit/6d774ba8f21f87aaa8bf9dbeb0a84b747541b349))
-
-## [13.9.1](https://github.com/LazyVim/LazyVim/compare/v13.9.0...v13.9.1) (2024-12-12)
-
-
-### Bug Fixes
-
-* **blink:** set kind to int, not string, if overriding ([#4999](https://github.com/LazyVim/LazyVim/issues/4999)) ([cee60a6](https://github.com/LazyVim/LazyVim/commit/cee60a6d3040181ac9c5b709d79e80e180b34d48))
-
 ## [13.9.0](https://github.com/LazyVim/LazyVim/compare/v13.8.0...v13.9.0) (2024-12-11)
 
 

NEWS.md

@@ -9,9 +9,9 @@ With these changes, default **LazyVim** is now just `34` plugins.
 ### Added Plugins
 
 - [fzf-lua](https://github.com/ibhagwan/fzf-lua) as a replacement for [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim)
-  - to use **telescope.nvim** instead, enable the `editor.telescope` extra
-- [blink.cmp](https://github.com/saghen/blink.cmp) as a replacement for [nvim-cmp](https://github.com/hrsh7th/nvim-cmp)
-  - to use **nvim-cmp** instead, enable the `coding.nvim-cmp` extra
+  - to use **telescope.nvim** instead, enable the `ui.telescope` extra
+- [blink.cmp](https://github.com/saghm/blink.cmp) as a replacement for [nvim-cmp](https://github.com/hrsh7th/nvim-cmp)
+  - to use **nvim-cmp** instead, enable the `nvim-cmp` extra
 
 ### Removed Plugins
 
@@ -45,8 +45,8 @@ vim.g.snacks_animate = false
 
 ### Keymaps
 
-- `<leader>uz` to toggle [zen mode](https://github.com/folke/snacks.nvim/blob/main/docs/zen.md)
-- `<leader>uZ` & `<leader>wm` to toggle [zoom mode](https://github.com/folke/snacks.nvim/blob/main/docs/zen.md)
+- `<leader>z` to toggle [zen mode](https://github.com/folke/snacks.nvim/blob/main/docs/zen.md)
+- `<leader>Z` to toggle [zoom mode](https://github.com/folke/snacks.nvim/blob/main/docs/zen.md)
 - `<leader>uD` to toggle [dimming](https://github.com/folke/snacks.nvim/blob/main/docs/dim.md)
 - `<leader>ua` to toggle [animations](https://github.com/folke/snacks.nvim/blob/main/docs/animate.md)
 - `<leader>uS` to toggle [scroll](https://github.com/folke/snacks.nvim/blob/main/docs/scroll.md)

README-CN.md

@@ -67,7 +67,7 @@ LazyVim 是一个基于 [💤 lazy.nvim](https://github.com/folke/lazy.nvim) 的
 
 ```sh
 docker run -w /root -it --rm alpine:edge sh -uelic '
-  apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
+  apk add git lazygit neovim ripgrep alpine-sdk --update
   git clone https://github.com/LazyVim/starter ~/.config/nvim
   cd ~/.config/nvim
   nvim

README-DE.md

@@ -68,7 +68,7 @@ Sie können eine Startvorlage für **LazyVim** [hier](https://github.com/LazyVim
 
 ```sh
 docker run -w /root -it --rm alpine:edge sh -uelic '
-  apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
+  apk add git lazygit neovim ripgrep alpine-sdk --update
   git clone https://github.com/LazyVim/starter ~/.config/nvim
   cd ~/.config/nvim
   nvim

README-JP.md

@@ -67,7 +67,7 @@ LazyVimは、ゼロから始めるか、あらかじめ作成されたディス
 
 ```sh
 docker run -w /root -it --rm alpine:edge sh -uelic '
-  apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
+  apk add git lazygit neovim ripgrep alpine-sdk --update
   git clone https://github.com/LazyVim/starter ~/.config/nvim
   cd ~/.config/nvim
   nvim

README-KO.md

@@ -65,7 +65,7 @@ LazyVim은 [💤 lazy.nvim](https://github.com/folke/lazy.nvim)를 기반으로
 
 ```sh
 docker run -w /root -it --rm alpine:edge sh -uelic '
-  apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
+  apk add git lazygit neovim ripgrep alpine-sdk --update
   git clone https://github.com/LazyVim/starter ~/.config/nvim
   cd ~/.config/nvim
   nvim

README-PT.md

@@ -70,7 +70,7 @@ Podes encontrar uma template **LazyVim** starter para começar, [aqui](https://g
 
 ```sh
 docker run -w /root -it --rm alpine:edge sh -uelic '
-  apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
+  apk add git lazygit neovim ripgrep alpine-sdk --update
   git clone https://github.com/LazyVim/starter ~/.config/nvim
   cd ~/.config/nvim
   nvim

README.md

@@ -69,7 +69,7 @@ You can find a starter template for **LazyVim** [here](https://github.com/LazyVi
 
 ```sh
 docker run -w /root -it --rm alpine:edge sh -uelic '
-  apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
+  apk add git lazygit neovim ripgrep alpine-sdk --update
   git clone https://github.com/LazyVim/starter ~/.config/nvim
   cd ~/.config/nvim
   nvim

doc/LazyVim.txt

@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2024 December 13
+*LazyVim.txt*             For Neovim             Last change: 2024 December 12
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*
@@ -68,7 +68,7 @@ Try it with Docker ~
 
 >sh
     docker run -w /root -it --rm alpine:edge sh -uelic '
-      apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
+      apk add git lazygit neovim ripgrep alpine-sdk --update
       git clone https://github.com/LazyVim/starter ~/.config/nvim
       cd ~/.config/nvim
       nvim

lua/lazyvim/config/init.lua

@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "14.1.0" -- x-release-please-version
+M.version = "13.9.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

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

@@ -34,7 +34,7 @@ return {
 
   -- codeium cmp source
   {
-    "hrsh7th/nvim-cmp",
+    "nvim-cmp",
     optional = true,
     dependencies = { "codeium.nvim" },
     opts = function(_, opts)

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

@@ -62,7 +62,7 @@ return {
       and {
         -- copilot cmp source
         {
-          "hrsh7th/nvim-cmp",
+          "nvim-cmp",
           optional = true,
           dependencies = { -- this will only be evaluated if nvim-cmp is enabled
             {
@@ -79,7 +79,7 @@ return {
               end,
               specs = {
                 {
-                  "hrsh7th/nvim-cmp",
+                  "nvim-cmp",
                   optional = true,
                   ---@param opts cmp.ConfigSchema
                   opts = function(_, opts)

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

@@ -14,7 +14,7 @@ return {
   },
 
   {
-    "hrsh7th/nvim-cmp",
+    "nvim-cmp",
     optional = true,
     dependencies = { "tzachar/cmp-tabnine" },
     ---@param opts cmp.ConfigSchema

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

@@ -6,11 +6,6 @@ if lazyvim_docs then
 end
 
 return {
-  {
-    "hrsh7th/nvim-cmp",
-    optional = true,
-    enabled = false,
-  },
   {
     "saghen/blink.cmp",
     version = not vim.g.lazyvim_blink_main and "*",
@@ -73,7 +68,6 @@ return {
         -- with blink.compat
         compat = {},
         default = { "lsp", "path", "snippets", "buffer" },
-        cmdline = {},
       },
 
       keymap = {
@@ -105,9 +99,6 @@ return {
         opts.sources.completion.enabled_providers = enabled
       end
 
-      -- Unset custom prop to pass blink.cmp validation
-      opts.sources.compat = nil
-
       -- check if we need to override symbol kinds
       for _, provider in pairs(opts.sources.providers or {}) do
         ---@cast provider blink.cmp.SourceProviderConfig|{kind?:string}
@@ -129,9 +120,6 @@ return {
             end
             return items
           end
-
-          -- Unset custom prop to pass blink.cmp validation
-          provider.kind = nil
         end
       end
 
@@ -145,9 +133,6 @@ return {
     opts = function(_, opts)
       opts.appearance = opts.appearance or {}
       opts.appearance.kind_icons = LazyVim.config.icons.kinds
-
-      -- Use block instead of icon for color items to make swatches more usable
-      opts.appearance.kind_icons.Color = "██"
     end,
   },
 

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

@@ -39,7 +39,7 @@ return {
 
   -- nvim-cmp integration
   {
-    "hrsh7th/nvim-cmp",
+    "nvim-cmp",
     optional = true,
     dependencies = { "saadparwaiz1/cmp_luasnip" },
     opts = function(_, opts)

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

@@ -1,9 +1,4 @@
 return {
-  {
-    "saghen/blink.cmp",
-    enabled = false,
-    optional = true,
-  },
 
   -- Setup nvim-cmp
   {
@@ -94,7 +89,7 @@ return {
 
   -- snippets
   {
-    "hrsh7th/nvim-cmp",
+    "nvim-cmp",
     dependencies = {
       {
         "garymjr/nvim-snippets",

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

@@ -103,11 +103,8 @@ return {
   },
 
   {
-    "hrsh7th/nvim-cmp",
-    optional = true,
+    "nvim-cmp",
     opts = function(_, opts)
-      opts.sorting = opts.sorting or {}
-      opts.sorting.comparators = opts.sorting.comparators or {}
       table.insert(opts.sorting.comparators, 1, require("clangd_extensions.cmp_scores"))
     end,
   },

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

@@ -9,7 +9,7 @@ return {
   },
 
   {
-    "hrsh7th/nvim-cmp",
+    "nvim-cmp",
     optional = true,
     dependencies = {
       { "petertriho/cmp-git", opts = {} },

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

@@ -85,12 +85,8 @@ return {
     dependencies = { "folke/which-key.nvim" },
     ft = java_filetypes,
     opts = function()
-      local cmd = { vim.fn.exepath("jdtls") }
-      if LazyVim.has("mason.nvim") then
-        local mason_registry = require("mason-registry")
-        local lombok_jar = mason_registry.get_package("jdtls"):get_install_path() .. "/lombok.jar"
-        table.insert(cmd, string.format("--jvm-arg=-javaagent:%s", lombok_jar))
-      end
+      local mason_registry = require("mason-registry")
+      local lombok_jar = mason_registry.get_package("jdtls"):get_install_path() .. "/lombok.jar"
       return {
         -- How to find the root dir for a given filename. The default comes from
         -- lspconfig which provides a function specifically for java projects.
@@ -111,7 +107,10 @@ return {
 
         -- How to run jdtls. This can be overridden to a full java command-line
         -- if the Python wrapper script doesn't suffice.
-        cmd = cmd,
+        cmd = {
+          vim.fn.exepath("jdtls"),
+          string.format("--jvm-arg=-javaagent:%s", lombok_jar),
+        },
         full_cmd = function(opts)
           local fname = vim.api.nvim_buf_get_name(0)
           local root_dir = opts.root_dir(fname)
@@ -146,30 +145,29 @@ return {
     config = function(_, opts)
       -- Find the extra bundles that should be passed on the jdtls command-line
       -- if nvim-dap is enabled with java debug/test.
+      local mason_registry = require("mason-registry")
       local bundles = {} ---@type string[]
-      if LazyVim.has("mason.nvim") then
-        local mason_registry = require("mason-registry")
-        if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
-          local java_dbg_pkg = mason_registry.get_package("java-debug-adapter")
-          local java_dbg_path = java_dbg_pkg:get_install_path()
-          local jar_patterns = {
-            java_dbg_path .. "/extension/server/com.microsoft.java.debug.plugin-*.jar",
-          }
-          -- java-test also depends on java-debug-adapter.
-          if opts.test and mason_registry.is_installed("java-test") then
-            local java_test_pkg = mason_registry.get_package("java-test")
-            local java_test_path = java_test_pkg:get_install_path()
-            vim.list_extend(jar_patterns, {
-              java_test_path .. "/extension/server/*.jar",
-            })
-          end
-          for _, jar_pattern in ipairs(jar_patterns) do
-            for _, bundle in ipairs(vim.split(vim.fn.glob(jar_pattern), "\n")) do
-              table.insert(bundles, bundle)
-            end
+      if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
+        local java_dbg_pkg = mason_registry.get_package("java-debug-adapter")
+        local java_dbg_path = java_dbg_pkg:get_install_path()
+        local jar_patterns = {
+          java_dbg_path .. "/extension/server/com.microsoft.java.debug.plugin-*.jar",
+        }
+        -- java-test also depends on java-debug-adapter.
+        if opts.test and mason_registry.is_installed("java-test") then
+          local java_test_pkg = mason_registry.get_package("java-test")
+          local java_test_path = java_test_pkg:get_install_path()
+          vim.list_extend(jar_patterns, {
+            java_test_path .. "/extension/server/*.jar",
+          })
+        end
+        for _, jar_pattern in ipairs(jar_patterns) do
+          for _, bundle in ipairs(vim.split(vim.fn.glob(jar_pattern), "\n")) do
+            table.insert(bundles, bundle)
           end
         end
       end
+
       local function attach_jdtls()
         local fname = vim.api.nvim_buf_get_name(0)
 
@@ -241,43 +239,40 @@ return {
               },
             })
 
-            if LazyVim.has("mason.nvim") then
-              local mason_registry = require("mason-registry")
-              if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
-                -- custom init for Java debugger
-                require("jdtls").setup_dap(opts.dap)
-                require("jdtls.dap").setup_dap_main_class_configs(opts.dap_main)
+            if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
+              -- custom init for Java debugger
+              require("jdtls").setup_dap(opts.dap)
+              require("jdtls.dap").setup_dap_main_class_configs(opts.dap_main)
 
-                -- Java Test require Java debugger to work
-                if opts.test and mason_registry.is_installed("java-test") then
-                  -- custom keymaps for Java test runner (not yet compatible with neotest)
-                  wk.add({
+              -- Java Test require Java debugger to work
+              if opts.test and mason_registry.is_installed("java-test") then
+                -- custom keymaps for Java test runner (not yet compatible with neotest)
+                wk.add({
+                  {
+                    mode = "n",
+                    buffer = args.buf,
+                    { "<leader>t", group = "test" },
                     {
-                      mode = "n",
-                      buffer = args.buf,
-                      { "<leader>t", group = "test" },
-                      {
-                        "<leader>tt",
-                        function()
-                          require("jdtls.dap").test_class({
-                            config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
-                          })
-                        end,
-                        desc = "Run All Test",
-                      },
-                      {
-                        "<leader>tr",
-                        function()
-                          require("jdtls.dap").test_nearest_method({
-                            config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
-                          })
-                        end,
-                        desc = "Run Nearest Test",
-                      },
-                      { "<leader>tT", require("jdtls.dap").pick_test, desc = "Run Test" },
+                      "<leader>tt",
+                      function()
+                        require("jdtls.dap").test_class({
+                          config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
+                        })
+                      end,
+                      desc = "Run All Test",
                     },
-                  })
-                end
+                    {
+                      "<leader>tr",
+                      function()
+                        require("jdtls.dap").test_nearest_method({
+                          config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
+                        })
+                      end,
+                      desc = "Run Nearest Test",
+                    },
+                    { "<leader>tT", require("jdtls.dap").pick_test, desc = "Run Test" },
+                  },
+                })
               end
             end
 

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

@@ -92,19 +92,6 @@ return {
                 ["async-recursion"] = { "async_recursion" },
               },
             },
-            files = {
-              excludeDirs = {
-                ".direnv",
-                ".git",
-                ".github",
-                ".gitlab",
-                "bin",
-                "node_modules",
-                "target",
-                "venv",
-                ".venv",
-              },
-            },
           },
         },
       },

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

@@ -43,24 +43,11 @@ return {
       })
     end,
   },
-
-  -- disable inent-blankline scope when mini-indentscope is enabled
   {
     "lukas-reineke/indent-blankline.nvim",
-    optional = true,
     event = "LazyFile",
     opts = {
       scope = { enabled = false },
     },
   },
-
-  -- disable snacks scroll when mini-indentscope is enabled
-  {
-    "snacks.nvim",
-    opts = {
-      indent = {
-        scope = { enabled = false },
-      },
-    },
-  },
 }

lua/lazyvim/plugins/xtras.lua

@@ -2,7 +2,6 @@
 local prios = {
   ["lazyvim.plugins.extras.test.core"] = 1,
   ["lazyvim.plugins.extras.dap.core"] = 1,
-  ["lazyvim.plugins.extras.coding.nvim-cmp"] = 2,
   ["lazyvim.plugins.extras.ui.edgy"] = 2,
   ["lazyvim.plugins.extras.lang.typescript"] = 5,
   ["lazyvim.plugins.extras.coding.blink"] = 5,

lua/lazyvim/util/init.lua

@@ -269,7 +269,7 @@ end
 function M.cmp_engine()
   vim.g.lazyvim_cmp = vim.g.lazyvim_cmp or "auto"
   if vim.g.lazyvim_cmp == "auto" then
-    return LazyVim.has_extra("coding.nvim-cmp") and "nvim-cmp" or "blink.cmp"
+    return LazyVim.has_extra("nvim-cmp") and "nvim-cmp" or "blink.cmp"
   end
   return vim.g.lazyvim_cmp
 end