From 4e746d0e5625662e1f121b39f63836b653ed728b Mon Sep 17 00:00:00 2001
From: William Heryanto <will.heryanto@gmail.com>
Date: Mon, 6 Jan 2025 11:52:36 +0700
Subject: [PATCH 001/341] fix(nlua): debugger not responding (#5319)

## Description

<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

Reference:
https://github.com/jbyuki/one-small-step-for-vimkind/issues/45#issuecomment-2125749906

Fix nlua debug adapter not responding, which for some reason because of
`fzf-lua`.

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

No screenshot instead I'm providing how to reproduce with assumption
`dap.nlua` extra is enabled. Steps:

1. Launch the nlua `:lua require'osv'.launch({port=8086})`

2. Attach from any neovim instance to the debugger

   1. Run the debugger
      - Can do `<leader>dc`; or
      - Can do `:lua require'dap'.continue()`
   2. Choose `Attach to running Neovim instance (port = 8086)`

3. Prior to this changes, debugger will got timeout like the following

   ```text
Debug adapter didn't respond. Either the adapter is slow (then wait and
ignore this) or there is a problem with your adapter or `nlua`
configuration. Check the logs for errors (:help dap.set_log_level)
   ```

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/editor/fzf.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/editor/fzf.lua b/lua/lazyvim/plugins/extras/editor/fzf.lua
index c70a6f14..aa26f6e1 100644
--- a/lua/lazyvim/plugins/extras/editor/fzf.lua
+++ b/lua/lazyvim/plugins/extras/editor/fzf.lua
@@ -45,8 +45,9 @@ return {
     "ibhagwan/fzf-lua",
     cmd = "FzfLua",
     opts = function(_, opts)
-      local config = require("fzf-lua.config")
-      local actions = require("fzf-lua.actions")
+      local fzf = require("fzf-lua")
+      local config = fzf.config
+      local actions = fzf.actions
 
       -- Quickfix
       config.defaults.keymap.fzf["ctrl-q"] = "select-all+accept"

From c8159b6abff959d1b029c87260edc05e8420a213 Mon Sep 17 00:00:00 2001
From: folke <folke@users.noreply.github.com>
Date: Mon, 6 Jan 2025 04:53:25 +0000
Subject: [PATCH 002/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index c584bc23..501d0fdc 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2024 December 20
+*LazyVim.txt*              For Neovim             Last change: 2025 January 06
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 05c3447558fa6eef7ae3c0d3e7ed1c281572274d Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Tue, 7 Jan 2025 13:04:17 +0200
Subject: [PATCH 003/341] fix(luasnip): correctly remove duplicate snippets
 (#5214)

## Description
Remove `snippets` from `opts.sources.default` when Luasnip is enabled to
not get duplicate snippets.
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
Fixes #5210
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/coding/luasnip.lua | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/coding/luasnip.lua b/lua/lazyvim/plugins/extras/coding/luasnip.lua
index 352bf659..54339e3e 100644
--- a/lua/lazyvim/plugins/extras/coding/luasnip.lua
+++ b/lua/lazyvim/plugins/extras/coding/luasnip.lua
@@ -68,7 +68,6 @@ return {
     "saghen/blink.cmp",
     optional = true,
     opts = {
-      sources = { default = { "luasnip" } },
       snippets = {
         expand = function(snippet)
           require("luasnip").lsp_expand(snippet)
@@ -85,4 +84,16 @@ return {
       },
     },
   },
+
+  -- Luasnip sources for blink
+  {
+    "saghen/blink.cmp",
+    optional = true,
+    opts = function(_, opts)
+      table.insert(opts.sources.default, "luasnip")
+      opts.sources.default = vim.tbl_filter(function(p)
+        return p ~= "snippets"
+      end, opts.sources.default)
+    end,
+  },
 }

From c1319cb7acfa4b9fb15121b5f6178eb4fb2db629 Mon Sep 17 00:00:00 2001
From: folke <folke@users.noreply.github.com>
Date: Tue, 7 Jan 2025 11:05:24 +0000
Subject: [PATCH 004/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 501d0fdc..87ede8e0 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 January 06
+*LazyVim.txt*              For Neovim             Last change: 2025 January 07
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 8d2d9a9bd965aab0a752f24ec327d2f391a8406b Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 8 Jan 2025 07:41:44 +0100
Subject: [PATCH 005/341] fix(blink): added new luasnip preset

---
 lua/lazyvim/plugins/extras/coding/luasnip.lua | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/coding/luasnip.lua b/lua/lazyvim/plugins/extras/coding/luasnip.lua
index 54339e3e..8b3daed7 100644
--- a/lua/lazyvim/plugins/extras/coding/luasnip.lua
+++ b/lua/lazyvim/plugins/extras/coding/luasnip.lua
@@ -69,31 +69,8 @@ return {
     optional = true,
     opts = {
       snippets = {
-        expand = function(snippet)
-          require("luasnip").lsp_expand(snippet)
-        end,
-        active = function(filter)
-          if filter and filter.direction then
-            return require("luasnip").jumpable(filter.direction)
-          end
-          return require("luasnip").in_snippet()
-        end,
-        jump = function(direction)
-          require("luasnip").jump(direction)
-        end,
+        preset = "luasnip",
       },
     },
   },
-
-  -- Luasnip sources for blink
-  {
-    "saghen/blink.cmp",
-    optional = true,
-    opts = function(_, opts)
-      table.insert(opts.sources.default, "luasnip")
-      opts.sources.default = vim.tbl_filter(function(p)
-        return p ~= "snippets"
-      end, opts.sources.default)
-    end,
-  },
 }

From 41f40b73d94f12cd6aa2d87bfee8808e76e80d5d Mon Sep 17 00:00:00 2001
From: folke <folke@users.noreply.github.com>
Date: Wed, 8 Jan 2025 06:42:41 +0000
Subject: [PATCH 006/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 87ede8e0..3d00d26d 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 January 07
+*LazyVim.txt*              For Neovim             Last change: 2025 January 08
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From d1529f650fdd89cb620258bdeca5ed7b558420c7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 8 Jan 2025 14:58:56 +0100
Subject: [PATCH 007/341] chore(main): release 14.6.1 (#5320)

:robot: I have created a release *beep* *boop*
---


##
[14.6.1](https://github.com/LazyVim/LazyVim/compare/v14.6.0...v14.6.1)
(2025-01-08)


### Bug Fixes

* **blink:** added new luasnip preset
([8d2d9a9](https://github.com/LazyVim/LazyVim/commit/8d2d9a9bd965aab0a752f24ec327d2f391a8406b))
* **luasnip:** correctly remove duplicate snippets
([#5214](https://github.com/LazyVim/LazyVim/issues/5214))
([05c3447](https://github.com/LazyVim/LazyVim/commit/05c3447558fa6eef7ae3c0d3e7ed1c281572274d))
* **nlua:** debugger not responding
([#5319](https://github.com/LazyVim/LazyVim/issues/5319))
([4e746d0](https://github.com/LazyVim/LazyVim/commit/4e746d0e5625662e1f121b39f63836b653ed728b))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 CHANGELOG.md                          | 9 +++++++++
 lua/lazyvim/config/init.lua           | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index a1d48029..114400ff 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "14.6.0"
+  ".": "14.6.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 429db78c..2ea4a272 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [14.6.1](https://github.com/LazyVim/LazyVim/compare/v14.6.0...v14.6.1) (2025-01-08)
+
+
+### Bug Fixes
+
+* **blink:** added new luasnip preset ([8d2d9a9](https://github.com/LazyVim/LazyVim/commit/8d2d9a9bd965aab0a752f24ec327d2f391a8406b))
+* **luasnip:** correctly remove duplicate snippets ([#5214](https://github.com/LazyVim/LazyVim/issues/5214)) ([05c3447](https://github.com/LazyVim/LazyVim/commit/05c3447558fa6eef7ae3c0d3e7ed1c281572274d))
+* **nlua:** debugger not responding ([#5319](https://github.com/LazyVim/LazyVim/issues/5319)) ([4e746d0](https://github.com/LazyVim/LazyVim/commit/4e746d0e5625662e1f121b39f63836b653ed728b))
+
 ## [14.6.0](https://github.com/LazyVim/LazyVim/compare/v14.5.0...v14.6.0) (2024-12-20)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 606ed797..fbe6b74c 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "14.6.0" -- x-release-please-version
+M.version = "14.6.1" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 13044c298ed1837a2d938b64710528d359dc8407 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 14 Jan 2025 22:54:12 +0100
Subject: [PATCH 008/341] feat(extras): added extra for snacks picker (#5368)

## Description

See https://github.com/folke/snacks.nvim/pull/445

NOTE: I'm **not** going to replace `fzf-lua` anytime soon. Learned my
lessons with that one :)

<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/config/keymaps.lua                |   8 +-
 lua/lazyvim/plugins/editor.lua                |   6 +
 lua/lazyvim/plugins/extras/editor/fzf.lua     |   3 +
 .../plugins/extras/editor/snacks_picker.lua   | 127 ++++++++++++++++++
 lua/lazyvim/plugins/ui.lua                    |   3 +
 lua/lazyvim/util/pick.lua                     |   6 +-
 6 files changed, 147 insertions(+), 6 deletions(-)
 create mode 100644 lua/lazyvim/plugins/extras/editor/snacks_picker.lua

diff --git a/lua/lazyvim/config/keymaps.lua b/lua/lazyvim/config/keymaps.lua
index c618578b..48726b02 100644
--- a/lua/lazyvim/config/keymaps.lua
+++ b/lua/lazyvim/config/keymaps.lua
@@ -150,12 +150,12 @@ end
 if vim.fn.executable("lazygit") == 1 then
   map("n", "<leader>gg", function() Snacks.lazygit( { cwd = LazyVim.root.git() }) end, { desc = "Lazygit (Root Dir)" })
   map("n", "<leader>gG", function() Snacks.lazygit() end, { desc = "Lazygit (cwd)" })
-  map("n", "<leader>gf", function() Snacks.lazygit.log_file() end, { desc = "Lazygit Current File History" })
-  map("n", "<leader>gl", function() Snacks.lazygit.log({ cwd = LazyVim.root.git() }) end, { desc = "Lazygit Log" })
-  map("n", "<leader>gL", function() Snacks.lazygit.log() end, { desc = "Lazygit Log (cwd)" })
+  map("n", "<leader>gf", function() Snacks.picker.git_log_file() end, { desc = "Git Current File History" })
+  map("n", "<leader>gl", function() Snacks.picker.git_log({ cwd = LazyVim.root.git() }) end, { desc = "Git Log" })
+  map("n", "<leader>gL", function() Snacks.picker.git_log() end, { desc = "Git Log (cwd)" })
 end
 
-map("n", "<leader>gb", function() Snacks.git.blame_line() end, { desc = "Git Blame Line" })
+map("n", "<leader>gb", function() Snacks.picker.git_log_line() end, { desc = "Git Blame Line" })
 map({ "n", "x" }, "<leader>gB", function() Snacks.gitbrowse() end, { desc = "Git Browse (open)" })
 map({"n", "x" }, "<leader>gY", function()
   Snacks.gitbrowse({ open = function(url) vim.fn.setreg("+", url) end, notify = false })
diff --git a/lua/lazyvim/plugins/editor.lua b/lua/lazyvim/plugins/editor.lua
index f6a98605..95a1f7b9 100644
--- a/lua/lazyvim/plugins/editor.lua
+++ b/lua/lazyvim/plugins/editor.lua
@@ -397,4 +397,10 @@ return {
       return LazyVim.pick.want() == "telescope"
     end,
   },
+  {
+    import = "lazyvim.plugins.extras.editor.snacks_picker",
+    enabled = function()
+      return LazyVim.pick.want() == "snacks"
+    end,
+  },
 }
diff --git a/lua/lazyvim/plugins/extras/editor/fzf.lua b/lua/lazyvim/plugins/extras/editor/fzf.lua
index aa26f6e1..d4cd4093 100644
--- a/lua/lazyvim/plugins/extras/editor/fzf.lua
+++ b/lua/lazyvim/plugins/extras/editor/fzf.lua
@@ -286,6 +286,9 @@ return {
   {
     "neovim/nvim-lspconfig",
     opts = function()
+      if LazyVim.pick.want() ~= "fzf" then
+        return
+      end
       local Keys = require("lazyvim.plugins.lsp.keymaps").get()
       -- stylua: ignore
       vim.list_extend(Keys, {
diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
new file mode 100644
index 00000000..c64775c2
--- /dev/null
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -0,0 +1,127 @@
+if lazyvim_docs then
+  -- In case you don't want to use `:LazyExtras`,
+  -- then you need to set the option below.
+  vim.g.lazyvim_picker = "snacks"
+end
+
+---@module 'snacks'
+
+---@type LazyPicker
+local picker = {
+  name = "snacks",
+  commands = {
+    files = "files",
+    live_grep = "grep",
+    oldfiles = "recent",
+  },
+
+  ---@param source string
+  ---@param opts? snacks.picker.Config
+  open = function(source, opts)
+    return Snacks.picker.pick(source, opts)
+  end,
+}
+if not LazyVim.pick.register(picker) then
+  return {}
+end
+
+return {
+  desc = "Fast and modern file picker",
+  -- recommended = true,
+  {
+    "folke/snacks.nvim",
+    opts = {
+      picker = {},
+    },
+    -- stylua: ignore
+    keys = {
+      { "<leader>,", function() Snacks.picker.buffers() end, desc = "Buffers" },
+      { "<leader>/", LazyVim.pick("grep"), desc = "Grep (Root Dir)" },
+      { "<leader>:", function() Snacks.picker.command_history() end, desc = "Command History" },
+      { "<leader><space>", LazyVim.pick("files"), desc = "Find Files (Root Dir)" },
+      -- find
+      { "<leader>fb", function() Snacks.picker.buffers() end, desc = "Buffers" },
+      { "<leader>fc", LazyVim.pick.config_files(), desc = "Find Config File" },
+      { "<leader>ff", LazyVim.pick("files"), desc = "Find Files (Root Dir)" },
+      { "<leader>fF", LazyVim.pick("files", { root = false }), desc = "Find Files (cwd)" },
+      { "<leader>fg", function() Snacks.picker.git_files() end, desc = "Find Files (git-files)" },
+      { "<leader>fr", LazyVim.pick("oldfiles"), desc = "Recent" },
+      { "<leader>fR", LazyVim.pick("oldfiles", { only_cwd = true }), desc = "Recent (cwd)" },
+      -- git
+      { "<leader>gc", function() Snacks.picker.git_log() end, desc = "Git Log" },
+      { "<leader>gs", function() Snacks.picker.git_status() end, desc = "Git Status" },
+      -- Grep
+      { "<leader>sb", function() Snacks.picker.lines() end, desc = "Buffer Lines" },
+      { "<leader>sB", function() Snacks.picker.grep_buffers() end, desc = "Grep Open Buffers" },
+      { "<leader>sg", LazyVim.pick("live_grep"), desc = "Grep (Root Dir)" },
+      { "<leader>sG", LazyVim.pick("live_grep", { root = false }), desc = "Grep (cwd)" },
+      { "<leader>sw", LazyVim.pick("grep_word"), desc = "Visual selection or word (Root Dir)", mode = { "n", "x" } },
+      { "<leader>sW", LazyVim.pick("grep_word", { root = false }), desc = "Visual selection or word (cwd)", mode = { "n", "x" } },
+      -- search
+      { '<leader>s"', function() Snacks.picker.registers() end, desc = "Registers" },
+      { "<leader>sa", function() Snacks.picker.autocmds() end, desc = "Autocmds" },
+      { "<leader>sc", function() Snacks.picker.command_history() end, desc = "Command History" },
+      { "<leader>sC", function() Snacks.picker.commands() end, desc = "Commands" },
+      { "<leader>sd", function() Snacks.picker.diagnostics() end, desc = "Diagnostics" },
+      { "<leader>sh", function() Snacks.picker.help() end, desc = "Help Pages" },
+      { "<leader>sH", function() Snacks.picker.highlights() end, desc = "Highlights" },
+      { "<leader>sj", function() Snacks.picker.jumps() end, desc = "Jumps" },
+      { "<leader>sk", function() Snacks.picker.keymaps() end, desc = "Keymaps" },
+      { "<leader>sl", function() Snacks.picker.loclist() end, desc = "Location List" },
+      { "<leader>sM", function() Snacks.picker.man() end, desc = "Man Pages" },
+      { "<leader>sm", function() Snacks.picker.marks() end, desc = "Marks" },
+      { "<leader>sR", function() Snacks.picker.resume() end, desc = "Resume" },
+      { "<leader>sq", function() Snacks.picker.qflist() end, desc = "Quickfix List" },
+      { "<leader>uC", function() Snacks.picker.colorschemes() end, desc = "Colorschemes" },
+      { "<leader>qp", function() Snacks.picker.projects() end, desc = "Projects" },
+    },
+  },
+  {
+    "folke/snacks.nvim",
+    opts = function(_, opts)
+      if LazyVim.has("trouble.nvim") then
+        return vim.tbl_deep_extend("force", opts or {}, {
+          picker = {
+            actions = require("trouble.sources.snacks").actions,
+            win = {
+              input = {
+                keys = {
+                  ["<c-t>"] = {
+                    "trouble_open",
+                    mode = { "n", "i" },
+                  },
+                },
+              },
+            },
+          },
+        })
+      end
+    end,
+  },
+  {
+    "neovim/nvim-lspconfig",
+    opts = function()
+      if LazyVim.pick.want() ~= "snacks" then
+        return
+      end
+      local Keys = require("lazyvim.plugins.lsp.keymaps").get()
+      -- stylua: ignore
+      vim.list_extend(Keys, {
+        { "gd", function() Snacks.picker.lsp_definitions() end, desc = "Goto Definition", has = "definition" },
+        { "gr", function() Snacks.picker.lsp_references() end, nowait = true, desc = "References" },
+        { "gI", function() Snacks.picker.lsp_implementations() end, desc = "Goto Implementation" },
+        { "gy", function() Snacks.picker.lsp_type_definitions() end, desc = "Goto T[y]pe Definition" },
+        { "<leader>ss", function() Snacks.picker.lsp_symbols() end, desc = "LSP Symbols", has = "documentSymbol" },
+      })
+    end,
+  },
+  {
+    "folke/todo-comments.nvim",
+    optional = true,
+    -- stylua: ignore
+    keys = {
+      { "<leader>st", function() Snacks.picker.todo_comments() end, desc = "Todo" },
+      { "<leader>sT", function () Snacks.picker.todo_comments({ keywords = { "TODO", "FIX", "FIXME" } }) end, desc = "Todo/Fix/Fixme" },
+    },
+  },
+}
diff --git a/lua/lazyvim/plugins/ui.lua b/lua/lazyvim/plugins/ui.lua
index c4cb2a7b..d556d1f1 100644
--- a/lua/lazyvim/plugins/ui.lua
+++ b/lua/lazyvim/plugins/ui.lua
@@ -288,6 +288,9 @@ return {
     opts = {
       dashboard = {
         preset = {
+          pick = function(cmd, opts)
+            return LazyVim.pick(cmd, opts)()
+          end,
           header = [[
           ██╗      █████╗ ███████╗██╗   ██╗██╗   ██╗██╗███╗   ███╗          Z
           ██║     ██╔══██╗╚══███╔╝╚██╗ ██╔╝██║   ██║██║████╗ ████║      Z    
diff --git a/lua/lazyvim/util/pick.lua b/lua/lazyvim/util/pick.lua
index 526025a3..2736d7a5 100644
--- a/lua/lazyvim/util/pick.lua
+++ b/lua/lazyvim/util/pick.lua
@@ -42,11 +42,13 @@ function M.register(picker)
   return true
 end
 
----@return "telescope" | "fzf"
+---@return "telescope" | "fzf" | "snacks"
 function M.want()
   vim.g.lazyvim_picker = vim.g.lazyvim_picker or "auto"
   if vim.g.lazyvim_picker == "auto" then
-    return LazyVim.has_extra("editor.telescope") and "telescope" or "fzf"
+    return LazyVim.has_extra("editor.snacks_picker") and "snacks"
+      or LazyVim.has_extra("editor.telescope") and "telescope"
+      or "fzf"
   end
   return vim.g.lazyvim_picker
 end

From 52dae02c436e03de721d73b81b671624f9414b8c Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Tue, 14 Jan 2025 21:55:09 +0000
Subject: [PATCH 009/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 3d00d26d..1ec65752 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 January 08
+*LazyVim.txt*              For Neovim             Last change: 2025 January 14
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 3660c52017462dfc472ff436261100a98ebea34d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 14 Jan 2025 23:44:06 +0100
Subject: [PATCH 010/341] chore(main): release 14.7.0 (#5398)

:robot: I have created a release *beep* *boop*
---


##
[14.7.0](https://github.com/LazyVim/LazyVim/compare/v14.6.1...v14.7.0)
(2025-01-14)


### Features

* **extras:** added extra for snacks picker
([#5368](https://github.com/LazyVim/LazyVim/issues/5368))
([13044c2](https://github.com/LazyVim/LazyVim/commit/13044c298ed1837a2d938b64710528d359dc8407))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 CHANGELOG.md                          | 7 +++++++
 lua/lazyvim/config/init.lua           | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 114400ff..7a337949 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "14.6.1"
+  ".": "14.7.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ea4a272..f48b40b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [14.7.0](https://github.com/LazyVim/LazyVim/compare/v14.6.1...v14.7.0) (2025-01-14)
+
+
+### Features
+
+* **extras:** added extra for snacks picker ([#5368](https://github.com/LazyVim/LazyVim/issues/5368)) ([13044c2](https://github.com/LazyVim/LazyVim/commit/13044c298ed1837a2d938b64710528d359dc8407))
+
 ## [14.6.1](https://github.com/LazyVim/LazyVim/compare/v14.6.0...v14.6.1) (2025-01-08)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index fbe6b74c..102ace9d 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "14.6.1" -- x-release-please-version
+M.version = "14.7.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 8307b0fe506a38417f3b7835e2c4b43d9a970946 Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Wed, 15 Jan 2025 20:53:56 +0200
Subject: [PATCH 011/341] fix(snacks.picker): fix mapping for `Recent (cwd)`
 (#5407)

## Description
The mapping `<leader>fR` was showing all recent files instead of the
ones in the `cwd` only.
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
None
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index c64775c2..522c4ce5 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -46,7 +46,7 @@ return {
       { "<leader>fF", LazyVim.pick("files", { root = false }), desc = "Find Files (cwd)" },
       { "<leader>fg", function() Snacks.picker.git_files() end, desc = "Find Files (git-files)" },
       { "<leader>fr", LazyVim.pick("oldfiles"), desc = "Recent" },
-      { "<leader>fR", LazyVim.pick("oldfiles", { only_cwd = true }), desc = "Recent (cwd)" },
+      { "<leader>fR", LazyVim.pick("oldfiles", { filter = { cwd = true }}), desc = "Recent (cwd)" },
       -- git
       { "<leader>gc", function() Snacks.picker.git_log() end, desc = "Git Log" },
       { "<leader>gs", function() Snacks.picker.git_status() end, desc = "Git Status" },

From 6aefa8ec3ea1918957dd7c30de4c8db18a34e0b4 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Wed, 15 Jan 2025 18:54:50 +0000
Subject: [PATCH 012/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 1ec65752..c5ca33d7 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 January 14
+*LazyVim.txt*              For Neovim             Last change: 2025 January 15
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 62cb4a465c490c7d41f7a3bf52fb0e222f2cf83b Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 16 Jan 2025 09:58:28 +0100
Subject: [PATCH 013/341] feat(snacks): added git diff keymap to pick hunks
 with leader-gd

---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index 522c4ce5..4036a4f0 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -49,6 +49,7 @@ return {
       { "<leader>fR", LazyVim.pick("oldfiles", { filter = { cwd = true }}), desc = "Recent (cwd)" },
       -- git
       { "<leader>gc", function() Snacks.picker.git_log() end, desc = "Git Log" },
+      { "<leader>gd", function() Snacks.picker.git_diff() end, desc = "Git Diff (hunks)" },
       { "<leader>gs", function() Snacks.picker.git_status() end, desc = "Git Status" },
       -- Grep
       { "<leader>sb", function() Snacks.picker.lines() end, desc = "Buffer Lines" },

From 915aab99ef950ae4a7d8b3f967de3412f366bfd9 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Thu, 16 Jan 2025 08:59:38 +0000
Subject: [PATCH 014/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index c5ca33d7..0e78cf3d 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 January 15
+*LazyVim.txt*              For Neovim             Last change: 2025 January 16
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From b19f2070b847a3067436f4d16a0cc5b84a9f9819 Mon Sep 17 00:00:00 2001
From: Yusuf Aktepe <yusuf@yusufaktepe.com>
Date: Thu, 16 Jan 2025 12:01:30 +0300
Subject: [PATCH 015/341] feat(dial): add checkbox augend for markdown (#5411)

## Description

Added support for markdown checkboxes. ( **[ ]** <-> **[x]** )

<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/editor/dial.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/editor/dial.lua b/lua/lazyvim/plugins/extras/editor/dial.lua
index a9f7bb26..602b747c 100644
--- a/lua/lazyvim/plugins/extras/editor/dial.lua
+++ b/lua/lazyvim/plugins/extras/editor/dial.lua
@@ -140,6 +140,11 @@ return {
           }),
         },
         markdown = {
+          augend.constant.new({
+            elements = { "[ ]", "[x]" },
+            word = false,
+            cyclic = true,
+          }),
           augend.misc.alias.markdown_header,
         },
         json = {

From 4f31bfab86402c819e5ea1e18b3c5d139628c864 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 16 Jan 2025 10:05:30 +0100
Subject: [PATCH 016/341] fix(markdown): disable checkbox rendering since it's
 annoying to edit

---
 lua/lazyvim/plugins/extras/lang/markdown.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/lang/markdown.lua b/lua/lazyvim/plugins/extras/lang/markdown.lua
index e7977cb5..a73fe114 100644
--- a/lua/lazyvim/plugins/extras/lang/markdown.lua
+++ b/lua/lazyvim/plugins/extras/lang/markdown.lua
@@ -104,6 +104,9 @@ return {
         sign = false,
         icons = {},
       },
+      checkbox = {
+        enabled = false,
+      },
     },
     ft = { "markdown", "norg", "rmd", "org" },
     config = function(_, opts)

From df7426eefa79d5dfa2fcbe2f381abfb2cca70bad Mon Sep 17 00:00:00 2001
From: Riri <Daydreamerriri@outlook.com>
Date: Thu, 16 Jan 2025 18:37:59 +0800
Subject: [PATCH 017/341] fix(snacks.picker): respect
 lazyvim.config.kind_filter (#5415)

## Description

Currently, snacks.picker does not filter symbols based on the
kind_filter configured in lazyvim.

This PR addresses that issue.

## Screenshots

nil

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

Co-authored-by: ding.zhao <ding.zhao@trip.com>
---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index 4036a4f0..601fcf1b 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -112,7 +112,7 @@ return {
         { "gr", function() Snacks.picker.lsp_references() end, nowait = true, desc = "References" },
         { "gI", function() Snacks.picker.lsp_implementations() end, desc = "Goto Implementation" },
         { "gy", function() Snacks.picker.lsp_type_definitions() end, desc = "Goto T[y]pe Definition" },
-        { "<leader>ss", function() Snacks.picker.lsp_symbols() end, desc = "LSP Symbols", has = "documentSymbol" },
+        { "<leader>ss", function() Snacks.picker.lsp_symbols({ filter = LazyVim.config.kind_filter }) end, desc = "LSP Symbols", has = "documentSymbol" },
       })
     end,
   },

From b729e653182abab3089903baf62a8d5b65bfe36d Mon Sep 17 00:00:00 2001
From: Jorge Villalobos <minusfive@users.noreply.github.com>
Date: Fri, 17 Jan 2025 04:00:30 -0500
Subject: [PATCH 018/341] refactor(blink): color swatch icon upstreamed (#5141)

## Description

I've upstreamed the block char vs. icon replacement for Tailwind colors
so we shouldn't need this here anymore. I've replaced it by extending
the default blink icons instead, just in case they introduce an icon
which isn't yet covered by Lazy's, it would still show up (unlikely, but
better, no?).

## Related Issue(s)

none

## Screenshots

none

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/coding/blink.lua | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua
index 81762b8d..45e393e1 100644
--- a/lua/lazyvim/plugins/extras/coding/blink.lua
+++ b/lua/lazyvim/plugins/extras/coding/blink.lua
@@ -158,9 +158,7 @@ return {
     "saghen/blink.cmp",
     opts = function(_, opts)
       opts.appearance = opts.appearance or {}
-      opts.appearance.kind_icons = vim.tbl_extend("keep", {
-        Color = "██", -- Use block instead of icon for color items to make swatches more usable
-      }, LazyVim.config.icons.kinds)
+      opts.appearance.kind_icons = vim.tbl_extend("force", opts.appearance.kind_icons or {}, LazyVim.config.icons.kinds)
     end,
   },
 

From b574f01af7ab5eaccdef16db60c1fdd94e8ff12d Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Fri, 17 Jan 2025 09:01:25 +0000
Subject: [PATCH 019/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 0e78cf3d..e076c4bf 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 January 16
+*LazyVim.txt*              For Neovim             Last change: 2025 January 17
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 970d1a05da37554aa17b671c869431a7b387d8be Mon Sep 17 00:00:00 2001
From: Imron Gamidli <36050790+gogamid@users.noreply.github.com>
Date: Sat, 18 Jan 2025 14:52:25 +0100
Subject: [PATCH 020/341] feat(chezmoi): add snacks picker integration for
 chezmoi files (#5429)

## Description

We have a new picker Snacks picker, it means telescope and fzf-lua can
be uninstalled. But chezmoi files still listed only with telescope and
fzf-lua. In this pr we add snacks.picker integration if the user has
chosen snacks.picker in the LazyVimExtras.
---
 lua/lazyvim/plugins/extras/util/chezmoi.lua | 32 +++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/util/chezmoi.lua b/lua/lazyvim/plugins/extras/util/chezmoi.lua
index 633f3008..cffa6749 100644
--- a/lua/lazyvim/plugins/extras/util/chezmoi.lua
+++ b/lua/lazyvim/plugins/extras/util/chezmoi.lua
@@ -19,6 +19,38 @@ local pick_chezmoi = function()
       },
     }
     fzf_lua.fzf_exec(results, opts)
+  elseif LazyVim.pick.picker.name == "snacks" then
+    local results = require("chezmoi.commands").list({
+      args = {
+        "--path-style",
+        "absolute",
+        "--include",
+        "files",
+        "--exclude",
+        "externals",
+      },
+    })
+    local items = {}
+
+    for _, czFile in ipairs(results) do
+      table.insert(items, {
+        text = czFile,
+        file = czFile,
+      })
+    end
+
+    ---@type snacks.picker.Config
+    local opts = {
+      items = items,
+      confirm = function(picker, item)
+        picker:close()
+        require("chezmoi.commands").edit({
+          targets = { item.text },
+          args = { "--watch" },
+        })
+      end,
+    }
+    Snacks.picker.pick(opts)
   end
 end
 

From 4e8d75144de92e62eb58c87f61938118d3b1e37c Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Sat, 18 Jan 2025 13:53:19 +0000
Subject: [PATCH 021/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index e076c4bf..d40afbc0 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 January 17
+*LazyVim.txt*              For Neovim             Last change: 2025 January 18
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 8787ec1227e10123ad7291cf916020d9a8626525 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 19 Jan 2025 18:33:47 +0100
Subject: [PATCH 022/341] feat(snacks.picker): added leader-sS to search lsp
 workspace symbols

---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index 601fcf1b..bd4d7677 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -113,6 +113,7 @@ return {
         { "gI", function() Snacks.picker.lsp_implementations() end, desc = "Goto Implementation" },
         { "gy", function() Snacks.picker.lsp_type_definitions() end, desc = "Goto T[y]pe Definition" },
         { "<leader>ss", function() Snacks.picker.lsp_symbols({ filter = LazyVim.config.kind_filter }) end, desc = "LSP Symbols", has = "documentSymbol" },
+        { "<leader>sS", function() Snacks.picker.lsp_workspace_symbols({ filter = LazyVim.config.kind_filter }) end, desc = "LSP Workspace Symbols", has = "workspace/symbols" },
       })
     end,
   },

From 8f58fe0b62ddd3ed23816ca7ae3b6d369a565dc5 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Sun, 19 Jan 2025 17:34:47 +0000
Subject: [PATCH 023/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index d40afbc0..bd9b385d 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 January 18
+*LazyVim.txt*              For Neovim             Last change: 2025 January 19
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From eb7b453b48ab7e3008013e0edf2822f622111e97 Mon Sep 17 00:00:00 2001
From: Daniel Chong <danielgq.chong@gmail.com>
Date: Mon, 20 Jan 2025 23:55:51 +1300
Subject: [PATCH 024/341] fix(snacks.picker): fix mapping for Projects for
 consistency (#5433)

## Description

`<leader>fp` is the mapping for Telescope and fzf for
[Projects](https://www.lazyvim.org/extras/util/project). This PR makes
this shortcut consistent for snacks picker.

## Related Issue(s)

## Screenshots

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index bd4d7677..e286dff3 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -74,7 +74,7 @@ return {
       { "<leader>sR", function() Snacks.picker.resume() end, desc = "Resume" },
       { "<leader>sq", function() Snacks.picker.qflist() end, desc = "Quickfix List" },
       { "<leader>uC", function() Snacks.picker.colorschemes() end, desc = "Colorschemes" },
-      { "<leader>qp", function() Snacks.picker.projects() end, desc = "Projects" },
+      { "<leader>fp", function() Snacks.picker.projects() end, desc = "Projects" },
     },
   },
   {

From 0e5d17537a433b0e8dc6d5e88eb4df4e69dbefc2 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Mon, 20 Jan 2025 10:56:42 +0000
Subject: [PATCH 025/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index bd9b385d..23f8a322 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 January 19
+*LazyVim.txt*              For Neovim             Last change: 2025 January 20
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 66c3577bc779d31a7c2addd47de7cc6d215795ba Mon Sep 17 00:00:00 2001
From: Junyi Liu <liu.joey@gmail.com>
Date: Mon, 20 Jan 2025 07:16:14 -0500
Subject: [PATCH 026/341] perf(java): setting opts.dap_main to false to disable
 main class scan (#5391)

## Description

For large Java project, calling
`require("jdtls.dap").setup_dap_main_class_configs(opts.dap_main)` has a
huge performance impact on the LSP. I tested on a Java project with 3.7K
java source files and 12K other files, a simple go_definition can take
about 20-30 seconds.

This change allow user to set the `opts.dap_main` to false so we can
skip the main class scan. By using the `.lazy.lua` project specific
setting, we can easily customize this option per project.

## Related Issue(s)

#5387

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/java.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua
index 520776fe..236c86c9 100644
--- a/lua/lazyvim/plugins/extras/lang/java.lua
+++ b/lua/lazyvim/plugins/extras/lang/java.lua
@@ -130,6 +130,7 @@ return {
 
         -- These depend on nvim-dap, but can additionally be disabled by setting false here.
         dap = { hotcodereplace = "auto", config_overrides = {} },
+        -- Can set this to false to disable main class scan, which is a performance killer for large project
         dap_main = {},
         test = true,
         settings = {
@@ -246,7 +247,9 @@ return {
               if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
                 -- custom init for Java debugger
                 require("jdtls").setup_dap(opts.dap)
-                require("jdtls.dap").setup_dap_main_class_configs(opts.dap_main)
+                if opts.dap_main then
+                  require("jdtls.dap").setup_dap_main_class_configs(opts.dap_main)
+                end
 
                 -- Java Test require Java debugger to work
                 if opts.test and mason_registry.is_installed("java-test") then

From 2bea40c447b72e54ffb2d5cddc98d7798990796f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 13:50:28 +0100
Subject: [PATCH 027/341] chore(main): release 14.8.0 (#5409)

:robot: I have created a release *beep* *boop*
---


##
[14.8.0](https://github.com/LazyVim/LazyVim/compare/v14.7.0...v14.8.0)
(2025-01-20)


### Features

* **chezmoi:** add snacks picker integration for chezmoi files
([#5429](https://github.com/LazyVim/LazyVim/issues/5429))
([970d1a0](https://github.com/LazyVim/LazyVim/commit/970d1a05da37554aa17b671c869431a7b387d8be))
* **dial:** add checkbox augend for markdown
([#5411](https://github.com/LazyVim/LazyVim/issues/5411))
([b19f207](https://github.com/LazyVim/LazyVim/commit/b19f2070b847a3067436f4d16a0cc5b84a9f9819))
* **snacks.picker:** added leader-sS to search lsp workspace symbols
([8787ec1](https://github.com/LazyVim/LazyVim/commit/8787ec1227e10123ad7291cf916020d9a8626525))
* **snacks:** added git diff keymap to pick hunks with leader-gd
([62cb4a4](https://github.com/LazyVim/LazyVim/commit/62cb4a465c490c7d41f7a3bf52fb0e222f2cf83b))


### Bug Fixes

* **markdown:** disable checkbox rendering since it's annoying to edit
([4f31bfa](https://github.com/LazyVim/LazyVim/commit/4f31bfab86402c819e5ea1e18b3c5d139628c864))
* **snacks.picker:** fix mapping for `Recent (cwd)`
([#5407](https://github.com/LazyVim/LazyVim/issues/5407))
([8307b0f](https://github.com/LazyVim/LazyVim/commit/8307b0fe506a38417f3b7835e2c4b43d9a970946))
* **snacks.picker:** fix mapping for Projects for consistency
([#5433](https://github.com/LazyVim/LazyVim/issues/5433))
([eb7b453](https://github.com/LazyVim/LazyVim/commit/eb7b453b48ab7e3008013e0edf2822f622111e97))
* **snacks.picker:** respect lazyvim.config.kind_filter
([#5415](https://github.com/LazyVim/LazyVim/issues/5415))
([df7426e](https://github.com/LazyVim/LazyVim/commit/df7426eefa79d5dfa2fcbe2f381abfb2cca70bad))


### Performance Improvements

* **java:** setting opts.dap_main to false to disable main class scan
([#5391](https://github.com/LazyVim/LazyVim/issues/5391))
([66c3577](https://github.com/LazyVim/LazyVim/commit/66c3577bc779d31a7c2addd47de7cc6d215795ba))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 23 +++++++++++++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 7a337949..b3c4f00b 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "14.7.0"
+  ".": "14.8.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f48b40b9..1057fb57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Changelog
 
+## [14.8.0](https://github.com/LazyVim/LazyVim/compare/v14.7.0...v14.8.0) (2025-01-20)
+
+
+### Features
+
+* **chezmoi:** add snacks picker integration for chezmoi files ([#5429](https://github.com/LazyVim/LazyVim/issues/5429)) ([970d1a0](https://github.com/LazyVim/LazyVim/commit/970d1a05da37554aa17b671c869431a7b387d8be))
+* **dial:** add checkbox augend for markdown ([#5411](https://github.com/LazyVim/LazyVim/issues/5411)) ([b19f207](https://github.com/LazyVim/LazyVim/commit/b19f2070b847a3067436f4d16a0cc5b84a9f9819))
+* **snacks.picker:** added leader-sS to search lsp workspace symbols ([8787ec1](https://github.com/LazyVim/LazyVim/commit/8787ec1227e10123ad7291cf916020d9a8626525))
+* **snacks:** added git diff keymap to pick hunks with leader-gd ([62cb4a4](https://github.com/LazyVim/LazyVim/commit/62cb4a465c490c7d41f7a3bf52fb0e222f2cf83b))
+
+
+### Bug Fixes
+
+* **markdown:** disable checkbox rendering since it's annoying to edit ([4f31bfa](https://github.com/LazyVim/LazyVim/commit/4f31bfab86402c819e5ea1e18b3c5d139628c864))
+* **snacks.picker:** fix mapping for `Recent (cwd)` ([#5407](https://github.com/LazyVim/LazyVim/issues/5407)) ([8307b0f](https://github.com/LazyVim/LazyVim/commit/8307b0fe506a38417f3b7835e2c4b43d9a970946))
+* **snacks.picker:** fix mapping for Projects for consistency ([#5433](https://github.com/LazyVim/LazyVim/issues/5433)) ([eb7b453](https://github.com/LazyVim/LazyVim/commit/eb7b453b48ab7e3008013e0edf2822f622111e97))
+* **snacks.picker:** respect lazyvim.config.kind_filter ([#5415](https://github.com/LazyVim/LazyVim/issues/5415)) ([df7426e](https://github.com/LazyVim/LazyVim/commit/df7426eefa79d5dfa2fcbe2f381abfb2cca70bad))
+
+
+### Performance Improvements
+
+* **java:** setting opts.dap_main to false to disable main class scan ([#5391](https://github.com/LazyVim/LazyVim/issues/5391)) ([66c3577](https://github.com/LazyVim/LazyVim/commit/66c3577bc779d31a7c2addd47de7cc6d215795ba))
+
 ## [14.7.0](https://github.com/LazyVim/LazyVim/compare/v14.6.1...v14.7.0) (2025-01-14)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 102ace9d..8a0b2ced 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "14.7.0" -- x-release-please-version
+M.version = "14.8.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From dc8512fce1ec1cd4b0ca52d1077b2ed3894d51c8 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 20 Jan 2025 20:21:01 +0100
Subject: [PATCH 028/341] fix(root): pass args to root.get

---
 lua/lazyvim/util/root.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/util/root.lua b/lua/lazyvim/util/root.lua
index b723b227..fc6d6d7d 100644
--- a/lua/lazyvim/util/root.lua
+++ b/lua/lazyvim/util/root.lua
@@ -1,8 +1,8 @@
 ---@class lazyvim.util.root
 ---@overload fun(): string
 local M = setmetatable({}, {
-  __call = function(m)
-    return m.get()
+  __call = function(m, ...)
+    return m.get(...)
   end,
 })
 

From 6be7c4fee4fb755ff07f7bcc13eac96e1d8c279a Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 20 Jan 2025 20:21:23 +0100
Subject: [PATCH 029/341] feat(snacks.picker): added alt-c to toggle between
 cwd/root dir

---
 .../plugins/extras/editor/snacks_picker.lua   | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index e286dff3..2b623179 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -27,11 +27,32 @@ end
 
 return {
   desc = "Fast and modern file picker",
-  -- recommended = true,
+  recommended = true,
   {
     "folke/snacks.nvim",
     opts = {
-      picker = {},
+      picker = {
+        win = {
+          input = {
+            keys = {
+              ["<a-c>"] = {
+                "toggle_cwd",
+                mode = { "n", "i" },
+              },
+            },
+          },
+        },
+        actions = {
+          ---@param p snacks.Picker
+          toggle_cwd = function(p)
+            local root = LazyVim.root({ buf = p.input.filter.current_buf, normalize = true })
+            local cwd = vim.fs.normalize((vim.uv or vim.loop).cwd() or ".")
+            local current = p:cwd()
+            p:set_cwd(current == root and cwd or root)
+            p:find()
+          end,
+        },
+      },
     },
     -- stylua: ignore
     keys = {

From c7a7ab51129692927ae47f4e57ce22d10d48467e Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 20 Jan 2025 20:30:39 +0100
Subject: [PATCH 030/341] fix(vscode): diabled some snacks plugins. Fixes #5364

---
 lua/lazyvim/plugins/extras/vscode.lua | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/vscode.lua b/lua/lazyvim/plugins/extras/vscode.lua
index b9b1e0b1..5115a2b4 100644
--- a/lua/lazyvim/plugins/extras/vscode.lua
+++ b/lua/lazyvim/plugins/extras/vscode.lua
@@ -57,9 +57,14 @@ return {
   {
     "snacks.nvim",
     opts = {
+      bigfile = { enabled = false },
+      dashboard = { enabled = false },
       indent = { enabled = false },
-      scroll = { enabled = false },
+      input = { enabled = false },
       notifier = { enabled = false },
+      picker = { enabled = false },
+      quickfile = { enabled = false },
+      scroll = { enabled = false },
       statuscolumn = { enabled = false },
     },
   },

From 1e83b4f843f88678189df81b1c88a400c53abdbc Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 20 Jan 2025 20:32:17 +0100
Subject: [PATCH 031/341] fix(sql): better nvim-cmp check. Closes #5188

---
 lua/lazyvim/plugins/extras/lang/sql.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/sql.lua b/lua/lazyvim/plugins/extras/lang/sql.lua
index 075182d6..83de5ee1 100644
--- a/lua/lazyvim/plugins/extras/lang/sql.lua
+++ b/lua/lazyvim/plugins/extras/lang/sql.lua
@@ -48,7 +48,7 @@ return {
       vim.api.nvim_create_autocmd("FileType", {
         pattern = sql_ft,
         callback = function()
-          if LazyVim.has("nvim-cmp") then
+          if LazyVim.cmp_engine() == "nvim-cmp" then
             local cmp = require("cmp")
 
             -- global sources

From 8b4e6ff70d682cad3b1f4999623c3f0ac639fa82 Mon Sep 17 00:00:00 2001
From: abeldekat <58370433+abeldekat@users.noreply.github.com>
Date: Thu, 23 Jan 2025 11:03:36 +0000
Subject: [PATCH 032/341] feat(snippets): an extra for mini.snippets (#5274)

## Description

Mini.snippets, a plugin to manage and expand snippets, is currently in
[beta](https://github.com/echasnovski/mini.nvim/issues/1428).

I think the plugin is a very interesting alternative to `luasnip`.

The following `lazydoc` will be added:

```lua
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 snippits
  vim.g.lazyvim_mini_snippets_in_completion = true

  -- Using default mini.snippets, completion suggestions might appear directly after inserting a snippet
  -- This extra prevents that from happening.
  -- Motivation: A better display of the current snippet.
  -- Also, those completions do not appear when using luasnip or native snippets
  --
  -- Set to `false` to enable completion suggestions directly after inserting a snippet
  vim.g.lazyvim_mini_snippets_override_expand_insert = true

  -- NOTE: Please also read:
  -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-snippets.md#expand
  -- :h MiniSnippets-session

  -- Example override for your own config:
  --[[
  return {
    {
      "echasnovski/mini.snippets",
      opts = function(_, opts)
        -- By default, for opts.snippets, the extra for mini.snippets only adds gen_loader.from_lang()
        -- This provides a sensible quickstart, integrating with friendly-snippets
        -- and your own language-specific snippets
        --
        -- In order to change opts.snippets, replace the entire table inside your own opts

        local snippets, config_path = require("mini.snippets"), vim.fn.stdpath("config")

        opts.snippets = { -- override opts.snippets provided by extra...
          -- Load custom file with global snippets first (order matters)
          snippets.gen_loader.from_file(config_path .. "/snippets/global.json"),

          -- Load snippets based on current language by reading files from
          -- "snippets/" subdirectories from 'runtimepath' directories.
          snippets.gen_loader.from_lang(), -- this is the default in the extra...
        }
      end,
    },
  }
--]]
end

```

It's possible to use the code from this PR directly in your own
configuration:

1. Copy the code to lua/extras/coding/mini_snippets.lua in your config
folder
2. Restart nvim and enable the "user" extra for `mini.snippets`
3. Restart nvim

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

---------

Co-authored-by: abeldekat <abel@nomail.com>
---
 .../plugins/extras/coding/mini-snippets.lua   | 167 ++++++++++++++++++
 1 file changed, 167 insertions(+)
 create mode 100644 lua/lazyvim/plugins/extras/coding/mini-snippets.lua

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

From 7fb320700ad0162be33ce816f2ba6f9dda41883f Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Thu, 23 Jan 2025 11:04:34 +0000
Subject: [PATCH 033/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 23f8a322..285451bb 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 January 20
+*LazyVim.txt*              For Neovim             Last change: 2025 January 23
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 332b32080c52727a16db90e06989caa0c378caa1 Mon Sep 17 00:00:00 2001
From: Jorge Villalobos <minusfive@users.noreply.github.com>
Date: Thu, 23 Jan 2025 10:51:36 -0500
Subject: [PATCH 034/341] feat(snacks.picker): added <leader>su to search
 undotree (#5447)

## Description

As it reads on the title ;)

## Related Issue(s)

None.

## Screenshots

![Screenshot 2025-01-22 at 14 02
30](https://github.com/user-attachments/assets/f8d2ba88-f279-4715-8120-7610c58bd269)
![Screenshot 2025-01-22 at 14 03
04](https://github.com/user-attachments/assets/08bc1b26-f49c-4f25-ad66-1166a3f72605)

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index 2b623179..f47a2b29 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -68,6 +68,7 @@ return {
       { "<leader>fg", function() Snacks.picker.git_files() end, desc = "Find Files (git-files)" },
       { "<leader>fr", LazyVim.pick("oldfiles"), desc = "Recent" },
       { "<leader>fR", LazyVim.pick("oldfiles", { filter = { cwd = true }}), desc = "Recent (cwd)" },
+      { "<leader>fp", function() Snacks.picker.projects() end, desc = "Projects" },
       -- git
       { "<leader>gc", function() Snacks.picker.git_log() end, desc = "Git Log" },
       { "<leader>gd", function() Snacks.picker.git_diff() end, desc = "Git Diff (hunks)" },
@@ -94,8 +95,9 @@ return {
       { "<leader>sm", function() Snacks.picker.marks() end, desc = "Marks" },
       { "<leader>sR", function() Snacks.picker.resume() end, desc = "Resume" },
       { "<leader>sq", function() Snacks.picker.qflist() end, desc = "Quickfix List" },
+      { "<leader>su", function() Snacks.picker.undo() end, desc = "Undotree" },
+      -- ui
       { "<leader>uC", function() Snacks.picker.colorschemes() end, desc = "Colorschemes" },
-      { "<leader>fp", function() Snacks.picker.projects() end, desc = "Projects" },
     },
   },
   {

From eea52be3447502dde77d9e6fa75fd597a0b5a86a Mon Sep 17 00:00:00 2001
From: Jorge Villalobos <minusfive@users.noreply.github.com>
Date: Thu, 23 Jan 2025 13:19:48 -0500
Subject: [PATCH 035/341] feat(snacks.picker): added <leader>si to search icons
 (#5460)

## Description

As it reads on the tin can.

## Related Issue(s)

N/A

## Screenshots

![Screenshot 2025-01-23 at 11 49
49](https://github.com/user-attachments/assets/6c4d0e9a-0a8e-4128-9ef1-b7954ece2bc7)

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index f47a2b29..fd08004b 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -88,6 +88,7 @@ return {
       { "<leader>sd", function() Snacks.picker.diagnostics() end, desc = "Diagnostics" },
       { "<leader>sh", function() Snacks.picker.help() end, desc = "Help Pages" },
       { "<leader>sH", function() Snacks.picker.highlights() end, desc = "Highlights" },
+      { "<leader>si", function() Snacks.picker.icons() end, desc = "Icons" },
       { "<leader>sj", function() Snacks.picker.jumps() end, desc = "Jumps" },
       { "<leader>sk", function() Snacks.picker.keymaps() end, desc = "Keymaps" },
       { "<leader>sl", function() Snacks.picker.loclist() end, desc = "Location List" },

From 7cf4185dc4d1fe49ad004d33a6703603fb4500ff Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 23 Jan 2025 19:22:19 +0100
Subject: [PATCH 036/341] feat(snacks.picker): added `leader-sp` to search for
 plugin spec

---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index fd08004b..e7a99239 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -78,6 +78,7 @@ return {
       { "<leader>sB", function() Snacks.picker.grep_buffers() end, desc = "Grep Open Buffers" },
       { "<leader>sg", LazyVim.pick("live_grep"), desc = "Grep (Root Dir)" },
       { "<leader>sG", LazyVim.pick("live_grep", { root = false }), desc = "Grep (cwd)" },
+      { "<leader>sp", function() Snacks.picker.lazy() end, desc = "Search for Plugin Spec" },
       { "<leader>sw", LazyVim.pick("grep_word"), desc = "Visual selection or word (Root Dir)", mode = { "n", "x" } },
       { "<leader>sW", LazyVim.pick("grep_word", { root = false }), desc = "Visual selection or word (cwd)", mode = { "n", "x" } },
       -- search

From 83bf6360a1f28a3fc1afe31ae300247fc01c7a90 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 23 Jan 2025 19:22:47 +0100
Subject: [PATCH 037/341] feat(snacks.picker): added `leader-fB` to find any
 buffer (including hidden & nofile)

---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index e7a99239..48bb7861 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -62,6 +62,7 @@ return {
       { "<leader><space>", LazyVim.pick("files"), desc = "Find Files (Root Dir)" },
       -- find
       { "<leader>fb", function() Snacks.picker.buffers() end, desc = "Buffers" },
+      { "<leader>fB", function() Snacks.picker.buffers({ hidden = true, nofile = true }) end, desc = "Buffers (all)" },
       { "<leader>fc", LazyVim.pick.config_files(), desc = "Find Config File" },
       { "<leader>ff", LazyVim.pick("files"), desc = "Find Files (Root Dir)" },
       { "<leader>fF", LazyVim.pick("files", { root = false }), desc = "Find Files (cwd)" },

From 0350934d56579f3e6a9d40fa47313b2970d74772 Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:19:01 +0200
Subject: [PATCH 038/341] fix(luasnip): schedule `jump` to be compatible with
 blink, nvim-cmp still works after change (#5470)

## Description
Schedule `jump` in Luasnip `snippet_forward`, so that it doesn't get
stuck before the last placeholder.
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
Fixes #5469
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/coding/luasnip.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/coding/luasnip.lua b/lua/lazyvim/plugins/extras/coding/luasnip.lua
index 8b3daed7..85ed2fd5 100644
--- a/lua/lazyvim/plugins/extras/coding/luasnip.lua
+++ b/lua/lazyvim/plugins/extras/coding/luasnip.lua
@@ -30,7 +30,9 @@ return {
     opts = function()
       LazyVim.cmp.actions.snippet_forward = function()
         if require("luasnip").jumpable(1) then
-          require("luasnip").jump(1)
+          vim.schedule(function()
+            require("luasnip").jump(1)
+          end)
           return true
         end
       end

From a3b459c1a58f6f8048f5259484e166090542400d Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Tue, 28 Jan 2025 08:20:18 +0000
Subject: [PATCH 039/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 285451bb..cc9c3d9d 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 January 23
+*LazyVim.txt*              For Neovim             Last change: 2025 January 28
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 132986a624b49bf740161d90ce94f16dd5ea5883 Mon Sep 17 00:00:00 2001
From: iniw <andrade.vinicius934@gmail.com>
Date: Tue, 28 Jan 2025 08:42:48 -0300
Subject: [PATCH 040/341] fix(keymaps): remove unneeded and ambiguous
 `<leader>w` keymap (#5459)

## Description

The `<leader>w` mapping, described as "Windows", was causing potentially
timeout-related bugs with many other mappings that also started with
`<leader>w`.

The problems caused by this are described in detail in issue #5456 and
in discussion #4157.

@dpetka2001 Suggested removing it as an experiment, which I tried and
found to work.

<!--
  - Fixes #5456
  - Fixes #4157
-->

## Checklist

- [X] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/config/keymaps.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lua/lazyvim/config/keymaps.lua b/lua/lazyvim/config/keymaps.lua
index 48726b02..3e3829d1 100644
--- a/lua/lazyvim/config/keymaps.lua
+++ b/lua/lazyvim/config/keymaps.lua
@@ -182,7 +182,6 @@ map("t", "<C-/>", "<cmd>close<cr>", { desc = "Hide Terminal" })
 map("t", "<c-_>", "<cmd>close<cr>", { desc = "which_key_ignore" })
 
 -- windows
-map("n", "<leader>w", "<c-w>", { desc = "Windows", remap = true })
 map("n", "<leader>-", "<C-W>s", { desc = "Split Window Below", remap = true })
 map("n", "<leader>|", "<C-W>v", { desc = "Split Window Right", remap = true })
 map("n", "<leader>wd", "<C-W>c", { desc = "Delete Window", remap = true })

From 01a70cc60ed2760afc819510177fb8d12a371b25 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 28 Jan 2025 17:22:17 +0100
Subject: [PATCH 041/341] feat(snacks.picker): use snacks picker for
 notifications when enabled

---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 1 +
 lua/lazyvim/plugins/ui.lua                          | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index 48bb7861..e6110175 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -60,6 +60,7 @@ return {
       { "<leader>/", LazyVim.pick("grep"), desc = "Grep (Root Dir)" },
       { "<leader>:", function() Snacks.picker.command_history() end, desc = "Command History" },
       { "<leader><space>", LazyVim.pick("files"), desc = "Find Files (Root Dir)" },
+      { "<leader>n", function() Snacks.picker.notifications() end, desc = "Notification History" },
       -- find
       { "<leader>fb", function() Snacks.picker.buffers() end, desc = "Buffers" },
       { "<leader>fB", function() Snacks.picker.buffers({ hidden = true, nofile = true }) end, desc = "Buffers (all)" },
diff --git a/lua/lazyvim/plugins/ui.lua b/lua/lazyvim/plugins/ui.lua
index d556d1f1..6e03a217 100644
--- a/lua/lazyvim/plugins/ui.lua
+++ b/lua/lazyvim/plugins/ui.lua
@@ -278,7 +278,13 @@ return {
     },
     -- stylua: ignore
     keys = {
-      { "<leader>n", function() Snacks.notifier.show_history() end, desc = "Notification History" },
+      { "<leader>n", function()
+        if Snacks.config.picker and Snacks.config.picker.enabled then
+          Snacks.picker.notifications()
+        else
+          Snacks.notifier.show_history()
+        end
+      end, desc = "Notification History" },
       { "<leader>un", function() Snacks.notifier.hide() end, desc = "Dismiss All Notifications" },
     },
   },

From f0d2629bd859eeac343999b0fe145f9beb227c4a Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Tue, 28 Jan 2025 19:55:02 +0200
Subject: [PATCH 042/341] fix(snacks): use `Snacks.picker` for recent files
 (#5485)

## Description
Use `Snacks.picker` for recent files instead of `LazyVim.pick`, because
`root_dir` is being propagated to `opts.cwd` and does not correctly
filter out recent files when inside nested directories.
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
None
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index e6110175..19a8faf3 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -69,7 +69,7 @@ return {
       { "<leader>fF", LazyVim.pick("files", { root = false }), desc = "Find Files (cwd)" },
       { "<leader>fg", function() Snacks.picker.git_files() end, desc = "Find Files (git-files)" },
       { "<leader>fr", LazyVim.pick("oldfiles"), desc = "Recent" },
-      { "<leader>fR", LazyVim.pick("oldfiles", { filter = { cwd = true }}), desc = "Recent (cwd)" },
+      { "<leader>fR", function() Snacks.picker.recent({ filter = { cwd = true }}) end, desc = "Recent (cwd)" },
       { "<leader>fp", function() Snacks.picker.projects() end, desc = "Projects" },
       -- git
       { "<leader>gc", function() Snacks.picker.git_log() end, desc = "Git Log" },

From 5d24aa63111af68fbada8c97fedb75b07b8c3c92 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 29 Jan 2025 20:18:43 +0100
Subject: [PATCH 043/341] feat(snacks.picker): flash.nvim integration

---
 .../plugins/extras/editor/snacks_picker.lua   | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index 19a8faf3..85e6fe72 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -153,4 +153,45 @@ return {
       { "<leader>sT", function () Snacks.picker.todo_comments({ keywords = { "TODO", "FIX", "FIXME" } }) end, desc = "Todo/Fix/Fixme" },
     },
   },
+  {
+    "folke/snacks.nvim",
+    optional = true,
+    specs = {
+      {
+        "folke/snacks.nvim",
+        opts = {
+          picker = {
+            win = {
+              input = {
+                keys = {
+                  ["<a-s>"] = { "flash", mode = { "n", "i" } },
+                  ["s"] = { "flash" },
+                },
+              },
+            },
+            actions = {
+              flash = function(picker)
+                require("flash").jump({
+                  pattern = "^",
+                  label = { after = { 0, 0 } },
+                  search = {
+                    mode = "search",
+                    exclude = {
+                      function(win)
+                        return vim.bo[vim.api.nvim_win_get_buf(win)].filetype ~= "snacks_picker_list"
+                      end,
+                    },
+                  },
+                  action = function(match)
+                    local idx = picker.list:row2idx(match.pos[1])
+                    picker.list:move(idx, true)
+                  end,
+                })
+              end,
+            },
+          },
+        },
+      },
+    },
+  },
 }

From 63a39ef8cfe9641f1e621473dfc859c8032a4169 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Wed, 29 Jan 2025 19:19:59 +0000
Subject: [PATCH 044/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index cc9c3d9d..ea390859 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 January 28
+*LazyVim.txt*              For Neovim             Last change: 2025 January 29
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 3de7b24cf6ed844772ea047476a400c56d5f4b42 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 29 Jan 2025 21:06:36 +0100
Subject: [PATCH 045/341] fix(snacks.picker): snacks => flash

---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index 85e6fe72..f6f16791 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -154,7 +154,7 @@ return {
     },
   },
   {
-    "folke/snacks.nvim",
+    "folke/flash.nvim",
     optional = true,
     specs = {
       {

From b5cd0d0e27081be3ef1905475a0fe541b7661870 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 29 Jan 2025 23:21:59 +0100
Subject: [PATCH 046/341] fix(snacks.picker): flash integration

---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index f6f16791..b6b6deee 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -184,7 +184,7 @@ return {
                   },
                   action = function(match)
                     local idx = picker.list:row2idx(match.pos[1])
-                    picker.list:move(idx, true)
+                    picker.list:_move(idx, true, true)
                   end,
                 })
               end,

From e20d9afcbc980510093a3753a3991d8c934cbb75 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 30 Jan 2025 15:21:01 +0100
Subject: [PATCH 047/341] feat(snacks): extra for snacks explorer (replacement
 for neo-tree)

---
 .../plugins/extras/editor/snacks_explorer.lua | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 lua/lazyvim/plugins/extras/editor/snacks_explorer.lua

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua b/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua
new file mode 100644
index 00000000..b45342f2
--- /dev/null
+++ b/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua
@@ -0,0 +1,37 @@
+return {
+  { "nvim-neo-tree/neo-tree.nvim", enabled = false },
+  {
+    "folke/snacks.nvim",
+    keys = {
+      {
+        "<leader>fe",
+        function()
+          Snacks.picker.explorer({ cwd = LazyVim.root() })
+        end,
+        desc = "Explorer Snacks (root dir)",
+      },
+      {
+        "<leader>fE",
+        function()
+          Snacks.picker.explorer()
+        end,
+        desc = "Explorer Snacks (cwd)",
+      },
+      { "<leader>e", "<leader>fe", desc = "Explorer Snacks (root dir)", remap = true },
+      { "<leader>E", "<leader>fE", desc = "Explorer Snacks (cwd)", remap = true },
+    },
+    init = function()
+      vim.api.nvim_create_autocmd("BufEnter", {
+        group = vim.api.nvim_create_augroup("snacks_explorer_start_directory", { clear = true }),
+        desc = "Start Snacks Explorer with directory",
+        once = true,
+        callback = function()
+          local dir = vim.fn.argv(0) --[[@as string]]
+          if dir ~= "" and vim.fn.isdirectory(dir) == 1 then
+            Snacks.picker.explorer({ cwd = dir })
+          end
+        end,
+      })
+    end,
+  },
+}

From e9db488acaa04f1a9eca6d022e57fed4271b8af8 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 30 Jan 2025 21:38:56 +0100
Subject: [PATCH 048/341] feat(markdown): added markdown support for
 codecompanion

---
 lua/lazyvim/plugins/extras/lang/markdown.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/markdown.lua b/lua/lazyvim/plugins/extras/lang/markdown.lua
index a73fe114..8b07985b 100644
--- a/lua/lazyvim/plugins/extras/lang/markdown.lua
+++ b/lua/lazyvim/plugins/extras/lang/markdown.lua
@@ -108,7 +108,7 @@ return {
         enabled = false,
       },
     },
-    ft = { "markdown", "norg", "rmd", "org" },
+    ft = { "markdown", "norg", "rmd", "org", "codecompanion" },
     config = function(_, opts)
       require("render-markdown").setup(opts)
       Snacks.toggle({

From 0dee310e90c5cedcb5b96f41acd8d4d3811d15df Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Thu, 30 Jan 2025 20:40:13 +0000
Subject: [PATCH 049/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index ea390859..5c0ff0a2 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 January 29
+*LazyVim.txt*              For Neovim             Last change: 2025 January 30
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From eb8ddea8c9438c34e71db097eb77a44185dd1093 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 30 Jan 2025 22:07:58 +0100
Subject: [PATCH 050/341] chore(main): release 14.9.0 (#5438)

:robot: I have created a release *beep* *boop*
---


##
[14.9.0](https://github.com/LazyVim/LazyVim/compare/v14.8.0...v14.9.0)
(2025-01-30)


### Features

* **markdown:** added markdown support for codecompanion
([e9db488](https://github.com/LazyVim/LazyVim/commit/e9db488acaa04f1a9eca6d022e57fed4271b8af8))
* **snacks.picker:** added &lt;leader&gt;si to search icons
([#5460](https://github.com/LazyVim/LazyVim/issues/5460))
([eea52be](https://github.com/LazyVim/LazyVim/commit/eea52be3447502dde77d9e6fa75fd597a0b5a86a))
* **snacks.picker:** added &lt;leader&gt;su to search undotree
([#5447](https://github.com/LazyVim/LazyVim/issues/5447))
([332b320](https://github.com/LazyVim/LazyVim/commit/332b32080c52727a16db90e06989caa0c378caa1))
* **snacks.picker:** added `leader-fB` to find any buffer (including
hidden & nofile)
([83bf636](https://github.com/LazyVim/LazyVim/commit/83bf6360a1f28a3fc1afe31ae300247fc01c7a90))
* **snacks.picker:** added `leader-sp` to search for plugin spec
([7cf4185](https://github.com/LazyVim/LazyVim/commit/7cf4185dc4d1fe49ad004d33a6703603fb4500ff))
* **snacks.picker:** added alt-c to toggle between cwd/root dir
([6be7c4f](https://github.com/LazyVim/LazyVim/commit/6be7c4fee4fb755ff07f7bcc13eac96e1d8c279a))
* **snacks.picker:** flash.nvim integration
([5d24aa6](https://github.com/LazyVim/LazyVim/commit/5d24aa63111af68fbada8c97fedb75b07b8c3c92))
* **snacks.picker:** use snacks picker for notifications when enabled
([01a70cc](https://github.com/LazyVim/LazyVim/commit/01a70cc60ed2760afc819510177fb8d12a371b25))
* **snacks:** extra for snacks explorer (replacement for neo-tree)
([e20d9af](https://github.com/LazyVim/LazyVim/commit/e20d9afcbc980510093a3753a3991d8c934cbb75))
* **snippets:** an extra for mini.snippets
([#5274](https://github.com/LazyVim/LazyVim/issues/5274))
([8b4e6ff](https://github.com/LazyVim/LazyVim/commit/8b4e6ff70d682cad3b1f4999623c3f0ac639fa82))


### Bug Fixes

* **keymaps:** remove unneeded and ambiguous `&lt;leader&gt;w` keymap
([#5459](https://github.com/LazyVim/LazyVim/issues/5459))
([132986a](https://github.com/LazyVim/LazyVim/commit/132986a624b49bf740161d90ce94f16dd5ea5883))
* **luasnip:** schedule `jump` to be compatible with blink, nvim-cmp
still works after change
([#5470](https://github.com/LazyVim/LazyVim/issues/5470))
([0350934](https://github.com/LazyVim/LazyVim/commit/0350934d56579f3e6a9d40fa47313b2970d74772))
* **root:** pass args to root.get
([dc8512f](https://github.com/LazyVim/LazyVim/commit/dc8512fce1ec1cd4b0ca52d1077b2ed3894d51c8))
* **snacks.picker:** flash integration
([b5cd0d0](https://github.com/LazyVim/LazyVim/commit/b5cd0d0e27081be3ef1905475a0fe541b7661870))
* **snacks.picker:** snacks =&gt; flash
([3de7b24](https://github.com/LazyVim/LazyVim/commit/3de7b24cf6ed844772ea047476a400c56d5f4b42))
* **snacks:** use `Snacks.picker` for recent files
([#5485](https://github.com/LazyVim/LazyVim/issues/5485))
([f0d2629](https://github.com/LazyVim/LazyVim/commit/f0d2629bd859eeac343999b0fe145f9beb227c4a))
* **sql:** better nvim-cmp check. Closes
[#5188](https://github.com/LazyVim/LazyVim/issues/5188)
([1e83b4f](https://github.com/LazyVim/LazyVim/commit/1e83b4f843f88678189df81b1c88a400c53abdbc))
* **vscode:** diabled some snacks plugins. Fixes
[#5364](https://github.com/LazyVim/LazyVim/issues/5364)
([c7a7ab5](https://github.com/LazyVim/LazyVim/commit/c7a7ab51129692927ae47f4e57ce22d10d48467e))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 28 +++++++++++++++++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index b3c4f00b..d1d210f5 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "14.8.0"
+  ".": "14.9.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1057fb57..7c9c762e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Changelog
 
+## [14.9.0](https://github.com/LazyVim/LazyVim/compare/v14.8.0...v14.9.0) (2025-01-30)
+
+
+### Features
+
+* **markdown:** added markdown support for codecompanion ([e9db488](https://github.com/LazyVim/LazyVim/commit/e9db488acaa04f1a9eca6d022e57fed4271b8af8))
+* **snacks.picker:** added &lt;leader&gt;si to search icons ([#5460](https://github.com/LazyVim/LazyVim/issues/5460)) ([eea52be](https://github.com/LazyVim/LazyVim/commit/eea52be3447502dde77d9e6fa75fd597a0b5a86a))
+* **snacks.picker:** added &lt;leader&gt;su to search undotree ([#5447](https://github.com/LazyVim/LazyVim/issues/5447)) ([332b320](https://github.com/LazyVim/LazyVim/commit/332b32080c52727a16db90e06989caa0c378caa1))
+* **snacks.picker:** added `leader-fB` to find any buffer (including hidden & nofile) ([83bf636](https://github.com/LazyVim/LazyVim/commit/83bf6360a1f28a3fc1afe31ae300247fc01c7a90))
+* **snacks.picker:** added `leader-sp` to search for plugin spec ([7cf4185](https://github.com/LazyVim/LazyVim/commit/7cf4185dc4d1fe49ad004d33a6703603fb4500ff))
+* **snacks.picker:** added alt-c to toggle between cwd/root dir ([6be7c4f](https://github.com/LazyVim/LazyVim/commit/6be7c4fee4fb755ff07f7bcc13eac96e1d8c279a))
+* **snacks.picker:** flash.nvim integration ([5d24aa6](https://github.com/LazyVim/LazyVim/commit/5d24aa63111af68fbada8c97fedb75b07b8c3c92))
+* **snacks.picker:** use snacks picker for notifications when enabled ([01a70cc](https://github.com/LazyVim/LazyVim/commit/01a70cc60ed2760afc819510177fb8d12a371b25))
+* **snacks:** extra for snacks explorer (replacement for neo-tree) ([e20d9af](https://github.com/LazyVim/LazyVim/commit/e20d9afcbc980510093a3753a3991d8c934cbb75))
+* **snippets:** an extra for mini.snippets ([#5274](https://github.com/LazyVim/LazyVim/issues/5274)) ([8b4e6ff](https://github.com/LazyVim/LazyVim/commit/8b4e6ff70d682cad3b1f4999623c3f0ac639fa82))
+
+
+### Bug Fixes
+
+* **keymaps:** remove unneeded and ambiguous `&lt;leader&gt;w` keymap ([#5459](https://github.com/LazyVim/LazyVim/issues/5459)) ([132986a](https://github.com/LazyVim/LazyVim/commit/132986a624b49bf740161d90ce94f16dd5ea5883))
+* **luasnip:** schedule `jump` to be compatible with blink, nvim-cmp still works after change ([#5470](https://github.com/LazyVim/LazyVim/issues/5470)) ([0350934](https://github.com/LazyVim/LazyVim/commit/0350934d56579f3e6a9d40fa47313b2970d74772))
+* **root:** pass args to root.get ([dc8512f](https://github.com/LazyVim/LazyVim/commit/dc8512fce1ec1cd4b0ca52d1077b2ed3894d51c8))
+* **snacks.picker:** flash integration ([b5cd0d0](https://github.com/LazyVim/LazyVim/commit/b5cd0d0e27081be3ef1905475a0fe541b7661870))
+* **snacks.picker:** snacks =&gt; flash ([3de7b24](https://github.com/LazyVim/LazyVim/commit/3de7b24cf6ed844772ea047476a400c56d5f4b42))
+* **snacks:** use `Snacks.picker` for recent files ([#5485](https://github.com/LazyVim/LazyVim/issues/5485)) ([f0d2629](https://github.com/LazyVim/LazyVim/commit/f0d2629bd859eeac343999b0fe145f9beb227c4a))
+* **sql:** better nvim-cmp check. Closes [#5188](https://github.com/LazyVim/LazyVim/issues/5188) ([1e83b4f](https://github.com/LazyVim/LazyVim/commit/1e83b4f843f88678189df81b1c88a400c53abdbc))
+* **vscode:** diabled some snacks plugins. Fixes [#5364](https://github.com/LazyVim/LazyVim/issues/5364) ([c7a7ab5](https://github.com/LazyVim/LazyVim/commit/c7a7ab51129692927ae47f4e57ce22d10d48467e))
+
 ## [14.8.0](https://github.com/LazyVim/LazyVim/compare/v14.7.0...v14.8.0) (2025-01-20)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 8a0b2ced..cbe0a571 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "14.8.0" -- x-release-please-version
+M.version = "14.9.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 4f006f1fba5fdaa0150c544ad7966b96ec9cb04a Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Fri, 31 Jan 2025 08:32:46 +0100
Subject: [PATCH 051/341] feat(snacks.explorer): enabled netrw integration

---
 .../plugins/extras/editor/snacks_explorer.lua      | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua b/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua
index b45342f2..27da61f8 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua
@@ -2,6 +2,7 @@ return {
   { "nvim-neo-tree/neo-tree.nvim", enabled = false },
   {
     "folke/snacks.nvim",
+    opts = { explorer = {} },
     keys = {
       {
         "<leader>fe",
@@ -20,18 +21,5 @@ return {
       { "<leader>e", "<leader>fe", desc = "Explorer Snacks (root dir)", remap = true },
       { "<leader>E", "<leader>fE", desc = "Explorer Snacks (cwd)", remap = true },
     },
-    init = function()
-      vim.api.nvim_create_autocmd("BufEnter", {
-        group = vim.api.nvim_create_augroup("snacks_explorer_start_directory", { clear = true }),
-        desc = "Start Snacks Explorer with directory",
-        once = true,
-        callback = function()
-          local dir = vim.fn.argv(0) --[[@as string]]
-          if dir ~= "" and vim.fn.isdirectory(dir) == 1 then
-            Snacks.picker.explorer({ cwd = dir })
-          end
-        end,
-      })
-    end,
   },
 }

From 0e94534dd93d4cb53006390e8a7548b9d6fa3146 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Fri, 31 Jan 2025 08:33:15 +0100
Subject: [PATCH 052/341] style(picker.explorer): use shortcut

---
 lua/lazyvim/plugins/extras/editor/snacks_explorer.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua b/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua
index 27da61f8..aa87e85c 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua
@@ -7,14 +7,14 @@ return {
       {
         "<leader>fe",
         function()
-          Snacks.picker.explorer({ cwd = LazyVim.root() })
+          Snacks.explorer({ cwd = LazyVim.root() })
         end,
         desc = "Explorer Snacks (root dir)",
       },
       {
         "<leader>fE",
         function()
-          Snacks.picker.explorer()
+          Snacks.explorer()
         end,
         desc = "Explorer Snacks (cwd)",
       },

From 3242ab8cff7d49e429320b9ec43c4be1f6e46dfe Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Fri, 31 Jan 2025 07:34:07 +0000
Subject: [PATCH 053/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 5c0ff0a2..fa81c82c 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 January 30
+*LazyVim.txt*              For Neovim             Last change: 2025 January 31
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 4a81a370d7868d7db32042f69b0fc5a6218059c5 Mon Sep 17 00:00:00 2001
From: abeldekat <58370433+abeldekat@users.noreply.github.com>
Date: Fri, 31 Jan 2025 16:11:26 +0000
Subject: [PATCH 054/341] feat(snippets): mini.snippets is out of beta (#5505)

## Description

mini.snippets is out of beta, so I adjusted the description for the
extra accordingly


## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

---------

Co-authored-by: abeldekat <abel@nomail.com>
---
 lua/lazyvim/plugins/extras/coding/mini-snippets.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/coding/mini-snippets.lua b/lua/lazyvim/plugins/extras/coding/mini-snippets.lua
index f68af110..5ce82c80 100644
--- a/lua/lazyvim/plugins/extras/coding/mini-snippets.lua
+++ b/lua/lazyvim/plugins/extras/coding/mini-snippets.lua
@@ -61,7 +61,7 @@ return {
   { "L3MON4D3/LuaSnip", optional = true, enabled = false },
 
   -- add mini.snippets
-  desc = "mini.snippets(beta), a plugin to manage and expand snippets (alternative for luasnip)",
+  desc = "Manage and expand snippets (alternative to Luasnip)",
   {
     "echasnovski/mini.snippets",
     event = "InsertEnter", -- don't depend on other plugins to load...

From 8f4e9b8c1e43e354d91529484aedca54f04bdcf6 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Fri, 31 Jan 2025 20:10:48 +0100
Subject: [PATCH 055/341] fix(copilot): remove load on BufReadPost instead of
 InsertEnter

---
 lua/lazyvim/plugins/extras/ai/copilot.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/ai/copilot.lua b/lua/lazyvim/plugins/extras/ai/copilot.lua
index 4651c689..4f1d54f2 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot.lua
@@ -5,11 +5,12 @@ return {
     "zbirenbaum/copilot.lua",
     cmd = "Copilot",
     build = ":Copilot auth",
-    event = "InsertEnter",
+    event = "BufReadPost",
     opts = {
       suggestion = {
         enabled = not vim.g.ai_cmp,
         auto_trigger = true,
+        hide_during_completion = vim.g.ai_cmp,
         keymap = {
           accept = false, -- handled by nvim-cmp / blink.cmp
           next = "<M-]>",

From 3500d6a826a32d06d921f3e22342734c61ef09fe Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Fri, 31 Jan 2025 20:33:15 +0100
Subject: [PATCH 056/341] feat(bufferline): support for snacks picker sidebars

---
 lua/lazyvim/plugins/ui.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lua/lazyvim/plugins/ui.lua b/lua/lazyvim/plugins/ui.lua
index 6e03a217..7985825a 100644
--- a/lua/lazyvim/plugins/ui.lua
+++ b/lua/lazyvim/plugins/ui.lua
@@ -37,6 +37,9 @@ return {
             highlight = "Directory",
             text_align = "left",
           },
+          {
+            filetype = "snacks_layout_box",
+          },
         },
         ---@param opts bufferline.IconFetcherOpts
         get_element_icon = function(opts)

From 1a4d948e0dae360836187be8c86283d7e814b7ef Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 2 Feb 2025 18:03:13 +0100
Subject: [PATCH 057/341] perf(snacks_picker): lazy-load trouble open action

---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index b6b6deee..9685c369 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -110,7 +110,11 @@ return {
       if LazyVim.has("trouble.nvim") then
         return vim.tbl_deep_extend("force", opts or {}, {
           picker = {
-            actions = require("trouble.sources.snacks").actions,
+            actions = {
+              trouble_open = function(...)
+                return require("trouble.sources.snacks").actions.trouble_open.action(...)
+              end,
+            },
             win = {
               input = {
                 keys = {

From 7f8e797d2b0adf1e17a6278957c68a910b01c846 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Sun, 2 Feb 2025 17:04:34 +0000
Subject: [PATCH 058/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index fa81c82c..50d40e8e 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 January 31
+*LazyVim.txt*             For Neovim             Last change: 2025 February 02
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From fb256f2b688cb7ac9875f704fe6c00f27efc2354 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 2 Feb 2025 23:34:05 +0100
Subject: [PATCH 059/341] feat(snacks.picker): add projects picker to dashboard
 if snacks picker is enabled

---
 lua/lazyvim/plugins/ui.lua | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lua/lazyvim/plugins/ui.lua b/lua/lazyvim/plugins/ui.lua
index 7985825a..0669054d 100644
--- a/lua/lazyvim/plugins/ui.lua
+++ b/lua/lazyvim/plugins/ui.lua
@@ -325,4 +325,18 @@ return {
       },
     },
   },
+  {
+    "folke/snacks.nvim",
+    opts = function(_, opts)
+      if not opts.picker then
+        return
+      end
+      table.insert(opts.dashboard.preset.keys, 3, {
+        icon = " ",
+        key = "p",
+        desc = "Projects",
+        action = ":lua Snacks.picker.projects()",
+      })
+    end,
+  },
 }

From ab304426527723e116742cd7862fc976f876107c Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 5 Feb 2025 08:00:58 +0100
Subject: [PATCH 060/341] feat(snacks.picker): some extra keymaps

---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index 9685c369..143d459a 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -75,6 +75,7 @@ return {
       { "<leader>gc", function() Snacks.picker.git_log() end, desc = "Git Log" },
       { "<leader>gd", function() Snacks.picker.git_diff() end, desc = "Git Diff (hunks)" },
       { "<leader>gs", function() Snacks.picker.git_status() end, desc = "Git Status" },
+      { "<leader>gS", function() Snacks.picker.git_stash() end, desc = "Git Stash" },
       -- Grep
       { "<leader>sb", function() Snacks.picker.lines() end, desc = "Buffer Lines" },
       { "<leader>sB", function() Snacks.picker.grep_buffers() end, desc = "Grep Open Buffers" },
@@ -85,10 +86,12 @@ return {
       { "<leader>sW", LazyVim.pick("grep_word", { root = false }), desc = "Visual selection or word (cwd)", mode = { "n", "x" } },
       -- search
       { '<leader>s"', function() Snacks.picker.registers() end, desc = "Registers" },
+      { '<leader>s/', function() Snacks.picker.search_history() end, desc = "Search History" },
       { "<leader>sa", function() Snacks.picker.autocmds() end, desc = "Autocmds" },
       { "<leader>sc", function() Snacks.picker.command_history() end, desc = "Command History" },
       { "<leader>sC", function() Snacks.picker.commands() end, desc = "Commands" },
       { "<leader>sd", function() Snacks.picker.diagnostics() end, desc = "Diagnostics" },
+      { "<leader>sD", function() Snacks.picker.diagnostics_buffer() end, desc = "Diagnostics" },
       { "<leader>sh", function() Snacks.picker.help() end, desc = "Help Pages" },
       { "<leader>sH", function() Snacks.picker.highlights() end, desc = "Highlights" },
       { "<leader>si", function() Snacks.picker.icons() end, desc = "Icons" },

From 634f3ea28f84ceaac76e8d2a827024e4beeaeaa4 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Wed, 5 Feb 2025 07:02:02 +0000
Subject: [PATCH 061/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 50d40e8e..b645e69e 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2025 February 02
+*LazyVim.txt*             For Neovim             Last change: 2025 February 05
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 3e8fddcd54ee57ab6c00353ff37a4e9d7df361bd Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 5 Feb 2025 14:41:29 +0100
Subject: [PATCH 062/341] style(snacks.picker): buffer diagnostics keymap desc

---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index 143d459a..bd160f26 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -91,7 +91,7 @@ return {
       { "<leader>sc", function() Snacks.picker.command_history() end, desc = "Command History" },
       { "<leader>sC", function() Snacks.picker.commands() end, desc = "Commands" },
       { "<leader>sd", function() Snacks.picker.diagnostics() end, desc = "Diagnostics" },
-      { "<leader>sD", function() Snacks.picker.diagnostics_buffer() end, desc = "Diagnostics" },
+      { "<leader>sD", function() Snacks.picker.diagnostics_buffer() end, desc = "Buffer Diagnostics" },
       { "<leader>sh", function() Snacks.picker.help() end, desc = "Help Pages" },
       { "<leader>sH", function() Snacks.picker.highlights() end, desc = "Highlights" },
       { "<leader>si", function() Snacks.picker.icons() end, desc = "Icons" },

From 23a1bbdae90f37aab4a86bfb4c113531a28e7f71 Mon Sep 17 00:00:00 2001
From: RohitB <19793591+rbhanot4739@users.noreply.github.com>
Date: Fri, 7 Feb 2025 02:09:37 +0530
Subject: [PATCH 063/341] feat(refactoring): fallback to using vim ui select
 for refactoring.nvim (#5540)

## Description

Fallback to using `require("refactoring").select_refactor()` if neither
of `telescope` or `fzf-lua` is installed. Since `select_refactor()` uses
`vim.ui.select` internally, it can use `snacks.picker` if it is enabled.
## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [ x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/editor/refactoring.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/editor/refactoring.lua b/lua/lazyvim/plugins/extras/editor/refactoring.lua
index 29920347..832940e9 100644
--- a/lua/lazyvim/plugins/extras/editor/refactoring.lua
+++ b/lua/lazyvim/plugins/extras/editor/refactoring.lua
@@ -1,10 +1,10 @@
 local pick = function()
+  local refactoring = require("refactoring")
   if LazyVim.pick.picker.name == "telescope" then
     return require("telescope").extensions.refactoring.refactors()
   elseif LazyVim.pick.picker.name == "fzf" then
     local fzf_lua = require("fzf-lua")
-    local results = require("refactoring").get_refactors()
-    local refactoring = require("refactoring")
+    local results = refactoring.get_refactors()
 
     local opts = {
       fzf_opts = {},
@@ -16,6 +16,8 @@ local pick = function()
       },
     }
     fzf_lua.fzf_exec(results, opts)
+  else
+    refactoring.select_refactor()
   end
 end
 

From 94d0ac0a0cae69ecdba4aebd062c18fee68ce5f2 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Thu, 6 Feb 2025 20:40:54 +0000
Subject: [PATCH 064/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index b645e69e..f2f14206 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2025 February 05
+*LazyVim.txt*             For Neovim             Last change: 2025 February 06
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 5c9732733de62a4e15988826f53d16a4dfdf960c Mon Sep 17 00:00:00 2001
From: cjon256 <3659487+cjon256@users.noreply.github.com>
Date: Fri, 7 Feb 2025 18:09:03 -0500
Subject: [PATCH 065/341] fix(go): update go.lua to eliminate fieldalignment
 from analyses (#5170)

## Description

Removed a setting from the go lang plugin. The setting now just causes
an error:
LSP[gopls] Invalid settings: setting option "analyses": this setting is
deprecated, use "the 'fieldalignment' analyzer was removed in
gopls/v0.17.0; instead, hover over struct fields to see size/offset
information (https://go.dev/issue/66861)" instead

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

Note: submitted similar request as f96aac6 but was rejected by CI/CD for
naming reasons. Changing the name did not help. Retrying.
---
 lua/lazyvim/plugins/extras/lang/go.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/go.lua b/lua/lazyvim/plugins/extras/lang/go.lua
index b9544cfd..bf3b22ee 100644
--- a/lua/lazyvim/plugins/extras/lang/go.lua
+++ b/lua/lazyvim/plugins/extras/lang/go.lua
@@ -37,7 +37,6 @@ return {
                 rangeVariableTypes = true,
               },
               analyses = {
-                fieldalignment = true,
                 nilness = true,
                 unusedparams = true,
                 unusedwrite = true,

From a10706e819b9f40bd3493304be4d75cd69fdf45a Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Fri, 7 Feb 2025 23:10:27 +0000
Subject: [PATCH 066/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index f2f14206..43127781 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2025 February 06
+*LazyVim.txt*             For Neovim             Last change: 2025 February 07
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 597cd8ffa3c54471df860c4036a8c20e123292b9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 8 Feb 2025 00:10:47 +0100
Subject: [PATCH 067/341] chore(main): release 14.10.0 (#5500)

:robot: I have created a release *beep* *boop*
---


##
[14.10.0](https://github.com/LazyVim/LazyVim/compare/v14.9.0...v14.10.0)
(2025-02-07)


### Features

* **bufferline:** support for snacks picker sidebars
([3500d6a](https://github.com/LazyVim/LazyVim/commit/3500d6a826a32d06d921f3e22342734c61ef09fe))
* **refactoring:** fallback to using vim ui select for refactoring.nvim
([#5540](https://github.com/LazyVim/LazyVim/issues/5540))
([23a1bbd](https://github.com/LazyVim/LazyVim/commit/23a1bbdae90f37aab4a86bfb4c113531a28e7f71))
* **snacks.explorer:** enabled netrw integration
([4f006f1](https://github.com/LazyVim/LazyVim/commit/4f006f1fba5fdaa0150c544ad7966b96ec9cb04a))
* **snacks.picker:** add projects picker to dashboard if snacks picker
is enabled
([fb256f2](https://github.com/LazyVim/LazyVim/commit/fb256f2b688cb7ac9875f704fe6c00f27efc2354))
* **snacks.picker:** some extra keymaps
([ab30442](https://github.com/LazyVim/LazyVim/commit/ab304426527723e116742cd7862fc976f876107c))
* **snippets:** mini.snippets is out of beta
([#5505](https://github.com/LazyVim/LazyVim/issues/5505))
([4a81a37](https://github.com/LazyVim/LazyVim/commit/4a81a370d7868d7db32042f69b0fc5a6218059c5))


### Bug Fixes

* **copilot:** remove load on BufReadPost instead of InsertEnter
([8f4e9b8](https://github.com/LazyVim/LazyVim/commit/8f4e9b8c1e43e354d91529484aedca54f04bdcf6))
* **go:** update go.lua to eliminate fieldalignment from analyses
([#5170](https://github.com/LazyVim/LazyVim/issues/5170))
([5c97327](https://github.com/LazyVim/LazyVim/commit/5c9732733de62a4e15988826f53d16a4dfdf960c))


### Performance Improvements

* **snacks_picker:** lazy-load trouble open action
([1a4d948](https://github.com/LazyVim/LazyVim/commit/1a4d948e0dae360836187be8c86283d7e814b7ef))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 23 +++++++++++++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index d1d210f5..8b4f0289 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "14.9.0"
+  ".": "14.10.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c9c762e..8117fbb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Changelog
 
+## [14.10.0](https://github.com/LazyVim/LazyVim/compare/v14.9.0...v14.10.0) (2025-02-07)
+
+
+### Features
+
+* **bufferline:** support for snacks picker sidebars ([3500d6a](https://github.com/LazyVim/LazyVim/commit/3500d6a826a32d06d921f3e22342734c61ef09fe))
+* **refactoring:** fallback to using vim ui select for refactoring.nvim ([#5540](https://github.com/LazyVim/LazyVim/issues/5540)) ([23a1bbd](https://github.com/LazyVim/LazyVim/commit/23a1bbdae90f37aab4a86bfb4c113531a28e7f71))
+* **snacks.explorer:** enabled netrw integration ([4f006f1](https://github.com/LazyVim/LazyVim/commit/4f006f1fba5fdaa0150c544ad7966b96ec9cb04a))
+* **snacks.picker:** add projects picker to dashboard if snacks picker is enabled ([fb256f2](https://github.com/LazyVim/LazyVim/commit/fb256f2b688cb7ac9875f704fe6c00f27efc2354))
+* **snacks.picker:** some extra keymaps ([ab30442](https://github.com/LazyVim/LazyVim/commit/ab304426527723e116742cd7862fc976f876107c))
+* **snippets:** mini.snippets is out of beta ([#5505](https://github.com/LazyVim/LazyVim/issues/5505)) ([4a81a37](https://github.com/LazyVim/LazyVim/commit/4a81a370d7868d7db32042f69b0fc5a6218059c5))
+
+
+### Bug Fixes
+
+* **copilot:** remove load on BufReadPost instead of InsertEnter ([8f4e9b8](https://github.com/LazyVim/LazyVim/commit/8f4e9b8c1e43e354d91529484aedca54f04bdcf6))
+* **go:** update go.lua to eliminate fieldalignment from analyses ([#5170](https://github.com/LazyVim/LazyVim/issues/5170)) ([5c97327](https://github.com/LazyVim/LazyVim/commit/5c9732733de62a4e15988826f53d16a4dfdf960c))
+
+
+### Performance Improvements
+
+* **snacks_picker:** lazy-load trouble open action ([1a4d948](https://github.com/LazyVim/LazyVim/commit/1a4d948e0dae360836187be8c86283d7e814b7ef))
+
 ## [14.9.0](https://github.com/LazyVim/LazyVim/compare/v14.8.0...v14.9.0) (2025-01-30)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index cbe0a571..e2bf10d9 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "14.9.0" -- x-release-please-version
+M.version = "14.10.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 83988ea46eccbe20953cd807984d2e89d679aa6e Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sat, 8 Feb 2025 12:47:41 +0100
Subject: [PATCH 068/341] feat(config): show a warning when lazy.nvim imports
 order is incorrect

---
 lua/lazyvim/config/init.lua | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index e2bf10d9..b826d2db 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -206,6 +206,26 @@ function M.setup(opts)
         "desc",
         "vscode",
       })
+
+      -- Check lazy.nvim import order
+      local imports = require("lazy.core.config").spec.modules
+      local function find(pat, last)
+        for i = last and #imports or 1, last and 1 or #imports, last and -1 or 1 do
+          if imports[i]:find(pat) then
+            return i
+          end
+        end
+      end
+      local lazyvim_plugins = find("^lazyvim%.plugins$")
+      local extras = find("^lazyvim%.plugins%.extras%.", true) or lazyvim_plugins
+      local plugins = find("^plugins$") or math.huge
+      if lazyvim_plugins ~= 1 or extras > plugins then
+        vim.notify(
+          "The order of your `lazy.nvim` imports is incorrect:\n- `lazyvim.plugins` should be first\n- followed by any `lazyvim.plugins.extras`\n- and finally your own `plugins`",
+          "warn",
+          { title = "LazyVim" }
+        )
+      end
     end,
   })
 

From 041637673371db7866f8bf00d77fc2fb6cc673c6 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sat, 8 Feb 2025 12:48:24 +0100
Subject: [PATCH 069/341] feat(util): `has_extra` now also checks for manual
 imports in `lazy.lua`

---
 lua/lazyvim/util/init.lua | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/util/init.lua b/lua/lazyvim/util/init.lua
index 188544c3..66e6e18b 100644
--- a/lua/lazyvim/util/init.lua
+++ b/lua/lazyvim/util/init.lua
@@ -55,12 +55,33 @@ function M.has(plugin)
   return M.get_plugin(plugin) ~= nil
 end
 
+--- Checks if the extras is enabled:
+--- * If the module was imported
+--- * If the module was added by LazyExtras
+--- * If the module is in the user's lazy imports
 ---@param extra string
 function M.has_extra(extra)
   local Config = require("lazyvim.config")
   local modname = "lazyvim.plugins.extras." .. extra
-  return vim.tbl_contains(require("lazy.core.config").spec.modules, modname)
-    or vim.tbl_contains(Config.json.data.extras, modname)
+  local LazyConfig = require("lazy.core.config")
+  -- check if it was imported already
+  if vim.tbl_contains(LazyConfig.spec.modules, modname) then
+    return true
+  end
+  -- check if it was added by LazyExtras
+  if vim.tbl_contains(Config.json.data.extras, modname) then
+    return true
+  end
+  -- check if it's in the imports
+  local spec = LazyConfig.options.spec
+  if type(spec) == "table" then
+    for _, s in ipairs(spec) do
+      if type(s) == "table" and s.import == modname then
+        return true
+      end
+    end
+  end
+  return false
 end
 
 ---@param fn fun()

From 525377dee9ac3d19f53e333538e4e85586163ad8 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sat, 8 Feb 2025 15:04:46 +0100
Subject: [PATCH 070/341] feat(extras): big rework of default extras

---
 lua/lazyvim/config/init.lua                   |  58 +++++++
 lua/lazyvim/plugins/coding.lua                |  13 --
 lua/lazyvim/plugins/editor.lua                | 145 ------------------
 lua/lazyvim/plugins/extras/editor/fzf.lua     |   3 -
 .../plugins/extras/editor/neo-tree.lua        | 128 ++++++++++++++++
 .../plugins/extras/editor/snacks_picker.lua   |   3 -
 .../plugins/extras/editor/telescope.lua       |   9 --
 lua/lazyvim/plugins/extras/lang/sql.lua       |   2 +-
 lua/lazyvim/plugins/xtras.lua                 |  22 ++-
 lua/lazyvim/util/extras.lua                   |   6 +-
 lua/lazyvim/util/init.lua                     |   9 --
 lua/lazyvim/util/pick.lua                     |  15 --
 lua/lazyvim/util/plugin.lua                   |   9 ++
 13 files changed, 222 insertions(+), 200 deletions(-)
 create mode 100644 lua/lazyvim/plugins/extras/editor/neo-tree.lua

diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index b826d2db..385d0b13 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -144,8 +144,10 @@ M.json = {
     extras = {}, ---@type string[]
   },
 }
+M.json_loaded = false
 
 function M.json.load()
+  M.json_loaded = true
   local f = io.open(M.json.path, "r")
   if f then
     local data = f:read("*a")
@@ -322,6 +324,62 @@ function M.init()
   M.json.load()
 end
 
+---@alias LazyVimDefault {name: string, extra: string, enabled?: boolean, origin?: "global" | "default" | "extra" }
+
+local default_extras ---@type table<string, LazyVimDefault>
+function M.get_defaults()
+  if default_extras then
+    return default_extras
+  end
+  ---@type table<string, LazyVimDefault[]>
+  local checks = {
+    picker = {
+      { name = "fzf", extra = "editor.fzf" },
+      { name = "snacks", extra = "editor.snacks_picker" },
+      { name = "telescope", extra = "editor.telescope" },
+    },
+    cmp = {
+      { name = "blink.cmp", extra = "coding.blink", enabled = vim.fn.has("nvim-0.10") == 1 },
+      { name = "nvim-cmp", extra = "coding.nvim-cmp" },
+    },
+    explorer = {
+      { name = "neo-tree", extra = "editor.neo-tree" },
+      { name = "snacks", extra = "editor.snacks_explorer" },
+    },
+  }
+  default_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
+
 setmetatable(M, {
   __index = function(_, key)
     if options == nil then
diff --git a/lua/lazyvim/plugins/coding.lua b/lua/lazyvim/plugins/coding.lua
index adc76177..0e614e48 100644
--- a/lua/lazyvim/plugins/coding.lua
+++ b/lua/lazyvim/plugins/coding.lua
@@ -1,17 +1,4 @@
 return {
-  {
-    import = "lazyvim.plugins.extras.coding.nvim-cmp",
-    enabled = function()
-      return LazyVim.cmp_engine() == "nvim-cmp"
-    end,
-  },
-  {
-    import = "lazyvim.plugins.extras.coding.blink",
-    enabled = function()
-      return LazyVim.cmp_engine() == "blink.cmp"
-    end,
-  },
-
   -- auto pairs
   {
     "echasnovski/mini.pairs",
diff --git a/lua/lazyvim/plugins/editor.lua b/lua/lazyvim/plugins/editor.lua
index 95a1f7b9..4aaf3d1f 100644
--- a/lua/lazyvim/plugins/editor.lua
+++ b/lua/lazyvim/plugins/editor.lua
@@ -1,131 +1,5 @@
 return {
 
-  -- file explorer
-  {
-    "nvim-neo-tree/neo-tree.nvim",
-    cmd = "Neotree",
-    keys = {
-      {
-        "<leader>fe",
-        function()
-          require("neo-tree.command").execute({ toggle = true, dir = LazyVim.root() })
-        end,
-        desc = "Explorer NeoTree (Root Dir)",
-      },
-      {
-        "<leader>fE",
-        function()
-          require("neo-tree.command").execute({ toggle = true, dir = vim.uv.cwd() })
-        end,
-        desc = "Explorer NeoTree (cwd)",
-      },
-      { "<leader>e", "<leader>fe", desc = "Explorer NeoTree (Root Dir)", remap = true },
-      { "<leader>E", "<leader>fE", desc = "Explorer NeoTree (cwd)", remap = true },
-      {
-        "<leader>ge",
-        function()
-          require("neo-tree.command").execute({ source = "git_status", toggle = true })
-        end,
-        desc = "Git Explorer",
-      },
-      {
-        "<leader>be",
-        function()
-          require("neo-tree.command").execute({ source = "buffers", toggle = true })
-        end,
-        desc = "Buffer Explorer",
-      },
-    },
-    deactivate = function()
-      vim.cmd([[Neotree close]])
-    end,
-    init = function()
-      -- FIX: use `autocmd` for lazy-loading neo-tree instead of directly requiring it,
-      -- because `cwd` is not set up properly.
-      vim.api.nvim_create_autocmd("BufEnter", {
-        group = vim.api.nvim_create_augroup("Neotree_start_directory", { clear = true }),
-        desc = "Start Neo-tree with directory",
-        once = true,
-        callback = function()
-          if package.loaded["neo-tree"] then
-            return
-          else
-            local stats = vim.uv.fs_stat(vim.fn.argv(0))
-            if stats and stats.type == "directory" then
-              require("neo-tree")
-            end
-          end
-        end,
-      })
-    end,
-    opts = {
-      sources = { "filesystem", "buffers", "git_status" },
-      open_files_do_not_replace_types = { "terminal", "Trouble", "trouble", "qf", "Outline" },
-      filesystem = {
-        bind_to_cwd = false,
-        follow_current_file = { enabled = true },
-        use_libuv_file_watcher = true,
-      },
-      window = {
-        mappings = {
-          ["l"] = "open",
-          ["h"] = "close_node",
-          ["<space>"] = "none",
-          ["Y"] = {
-            function(state)
-              local node = state.tree:get_node()
-              local path = node:get_id()
-              vim.fn.setreg("+", path, "c")
-            end,
-            desc = "Copy Path to Clipboard",
-          },
-          ["O"] = {
-            function(state)
-              require("lazy.util").open(state.tree:get_node().path, { system = true })
-            end,
-            desc = "Open with System Application",
-          },
-          ["P"] = { "toggle_preview", config = { use_float = false } },
-        },
-      },
-      default_component_configs = {
-        indent = {
-          with_expanders = true, -- if nil and file nesting is enabled, will enable expanders
-          expander_collapsed = "",
-          expander_expanded = "",
-          expander_highlight = "NeoTreeExpander",
-        },
-        git_status = {
-          symbols = {
-            unstaged = "󰄱",
-            staged = "󰱒",
-          },
-        },
-      },
-    },
-    config = function(_, opts)
-      local function on_move(data)
-        Snacks.rename.on_rename_file(data.source, data.destination)
-      end
-
-      local events = require("neo-tree.events")
-      opts.event_handlers = opts.event_handlers or {}
-      vim.list_extend(opts.event_handlers, {
-        { event = events.FILE_MOVED, handler = on_move },
-        { event = events.FILE_RENAMED, handler = on_move },
-      })
-      require("neo-tree").setup(opts)
-      vim.api.nvim_create_autocmd("TermClose", {
-        pattern = "*lazygit",
-        callback = function()
-          if package.loaded["neo-tree.sources.git_status"] then
-            require("neo-tree.sources.git_status").refresh()
-          end
-        end,
-      })
-    end,
-  },
-
   -- search/replace in multiple files
   {
     "MagicDuck/grug-far.nvim",
@@ -384,23 +258,4 @@ return {
       { "<leader>sT", "<cmd>TodoTelescope keywords=TODO,FIX,FIXME<cr>", desc = "Todo/Fix/Fixme" },
     },
   },
-
-  {
-    import = "lazyvim.plugins.extras.editor.fzf",
-    enabled = function()
-      return LazyVim.pick.want() == "fzf"
-    end,
-  },
-  {
-    import = "lazyvim.plugins.extras.editor.telescope",
-    enabled = function()
-      return LazyVim.pick.want() == "telescope"
-    end,
-  },
-  {
-    import = "lazyvim.plugins.extras.editor.snacks_picker",
-    enabled = function()
-      return LazyVim.pick.want() == "snacks"
-    end,
-  },
 }
diff --git a/lua/lazyvim/plugins/extras/editor/fzf.lua b/lua/lazyvim/plugins/extras/editor/fzf.lua
index d4cd4093..aa26f6e1 100644
--- a/lua/lazyvim/plugins/extras/editor/fzf.lua
+++ b/lua/lazyvim/plugins/extras/editor/fzf.lua
@@ -286,9 +286,6 @@ return {
   {
     "neovim/nvim-lspconfig",
     opts = function()
-      if LazyVim.pick.want() ~= "fzf" then
-        return
-      end
       local Keys = require("lazyvim.plugins.lsp.keymaps").get()
       -- stylua: ignore
       vim.list_extend(Keys, {
diff --git a/lua/lazyvim/plugins/extras/editor/neo-tree.lua b/lua/lazyvim/plugins/extras/editor/neo-tree.lua
new file mode 100644
index 00000000..4a3f99bf
--- /dev/null
+++ b/lua/lazyvim/plugins/extras/editor/neo-tree.lua
@@ -0,0 +1,128 @@
+return {
+
+  -- file explorer
+  {
+    "nvim-neo-tree/neo-tree.nvim",
+    cmd = "Neotree",
+    keys = {
+      {
+        "<leader>fe",
+        function()
+          require("neo-tree.command").execute({ toggle = true, dir = LazyVim.root() })
+        end,
+        desc = "Explorer NeoTree (Root Dir)",
+      },
+      {
+        "<leader>fE",
+        function()
+          require("neo-tree.command").execute({ toggle = true, dir = vim.uv.cwd() })
+        end,
+        desc = "Explorer NeoTree (cwd)",
+      },
+      { "<leader>e", "<leader>fe", desc = "Explorer NeoTree (Root Dir)", remap = true },
+      { "<leader>E", "<leader>fE", desc = "Explorer NeoTree (cwd)", remap = true },
+      {
+        "<leader>ge",
+        function()
+          require("neo-tree.command").execute({ source = "git_status", toggle = true })
+        end,
+        desc = "Git Explorer",
+      },
+      {
+        "<leader>be",
+        function()
+          require("neo-tree.command").execute({ source = "buffers", toggle = true })
+        end,
+        desc = "Buffer Explorer",
+      },
+    },
+    deactivate = function()
+      vim.cmd([[Neotree close]])
+    end,
+    init = function()
+      -- FIX: use `autocmd` for lazy-loading neo-tree instead of directly requiring it,
+      -- because `cwd` is not set up properly.
+      vim.api.nvim_create_autocmd("BufEnter", {
+        group = vim.api.nvim_create_augroup("Neotree_start_directory", { clear = true }),
+        desc = "Start Neo-tree with directory",
+        once = true,
+        callback = function()
+          if package.loaded["neo-tree"] then
+            return
+          else
+            local stats = vim.uv.fs_stat(vim.fn.argv(0))
+            if stats and stats.type == "directory" then
+              require("neo-tree")
+            end
+          end
+        end,
+      })
+    end,
+    opts = {
+      sources = { "filesystem", "buffers", "git_status" },
+      open_files_do_not_replace_types = { "terminal", "Trouble", "trouble", "qf", "Outline" },
+      filesystem = {
+        bind_to_cwd = false,
+        follow_current_file = { enabled = true },
+        use_libuv_file_watcher = true,
+      },
+      window = {
+        mappings = {
+          ["l"] = "open",
+          ["h"] = "close_node",
+          ["<space>"] = "none",
+          ["Y"] = {
+            function(state)
+              local node = state.tree:get_node()
+              local path = node:get_id()
+              vim.fn.setreg("+", path, "c")
+            end,
+            desc = "Copy Path to Clipboard",
+          },
+          ["O"] = {
+            function(state)
+              require("lazy.util").open(state.tree:get_node().path, { system = true })
+            end,
+            desc = "Open with System Application",
+          },
+          ["P"] = { "toggle_preview", config = { use_float = false } },
+        },
+      },
+      default_component_configs = {
+        indent = {
+          with_expanders = true, -- if nil and file nesting is enabled, will enable expanders
+          expander_collapsed = "",
+          expander_expanded = "",
+          expander_highlight = "NeoTreeExpander",
+        },
+        git_status = {
+          symbols = {
+            unstaged = "󰄱",
+            staged = "󰱒",
+          },
+        },
+      },
+    },
+    config = function(_, opts)
+      local function on_move(data)
+        Snacks.rename.on_rename_file(data.source, data.destination)
+      end
+
+      local events = require("neo-tree.events")
+      opts.event_handlers = opts.event_handlers or {}
+      vim.list_extend(opts.event_handlers, {
+        { event = events.FILE_MOVED, handler = on_move },
+        { event = events.FILE_RENAMED, handler = on_move },
+      })
+      require("neo-tree").setup(opts)
+      vim.api.nvim_create_autocmd("TermClose", {
+        pattern = "*lazygit",
+        callback = function()
+          if package.loaded["neo-tree.sources.git_status"] then
+            require("neo-tree.sources.git_status").refresh()
+          end
+        end,
+      })
+    end,
+  },
+}
diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index bd160f26..d77c0933 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -136,9 +136,6 @@ return {
   {
     "neovim/nvim-lspconfig",
     opts = function()
-      if LazyVim.pick.want() ~= "snacks" then
-        return
-      end
       local Keys = require("lazyvim.plugins.lsp.keymaps").get()
       -- stylua: ignore
       vim.list_extend(Keys, {
diff --git a/lua/lazyvim/plugins/extras/editor/telescope.lua b/lua/lazyvim/plugins/extras/editor/telescope.lua
index 55ccaceb..9fdf7e13 100644
--- a/lua/lazyvim/plugins/extras/editor/telescope.lua
+++ b/lua/lazyvim/plugins/extras/editor/telescope.lua
@@ -61,9 +61,6 @@ return {
   {
     "nvim-telescope/telescope.nvim",
     cmd = "Telescope",
-    enabled = function()
-      return LazyVim.pick.want() == "telescope"
-    end,
     version = false, -- telescope did only one release, so use HEAD for now
     dependencies = {
       {
@@ -267,9 +264,6 @@ return {
   {
     "stevearc/dressing.nvim",
     lazy = true,
-    enabled = function()
-      return LazyVim.pick.want() == "telescope"
-    end,
     init = function()
       ---@diagnostic disable-next-line: duplicate-set-field
       vim.ui.select = function(...)
@@ -287,9 +281,6 @@ return {
   {
     "neovim/nvim-lspconfig",
     opts = function()
-      if LazyVim.pick.want() ~= "telescope" then
-        return
-      end
       local Keys = require("lazyvim.plugins.lsp.keymaps").get()
       -- stylua: ignore
       vim.list_extend(Keys, {
diff --git a/lua/lazyvim/plugins/extras/lang/sql.lua b/lua/lazyvim/plugins/extras/lang/sql.lua
index 83de5ee1..8e69374c 100644
--- a/lua/lazyvim/plugins/extras/lang/sql.lua
+++ b/lua/lazyvim/plugins/extras/lang/sql.lua
@@ -48,7 +48,7 @@ return {
       vim.api.nvim_create_autocmd("FileType", {
         pattern = sql_ft,
         callback = function()
-          if LazyVim.cmp_engine() == "nvim-cmp" then
+          if LazyVim.has_extra("coding.nvim-cmp") then
             local cmp = require("cmp")
 
             -- global sources
diff --git a/lua/lazyvim/plugins/xtras.lua b/lua/lazyvim/plugins/xtras.lua
index ebb0dd89..30cab43f 100644
--- a/lua/lazyvim/plugins/xtras.lua
+++ b/lua/lazyvim/plugins/xtras.lua
@@ -7,6 +7,7 @@ local prios = {
   ["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
   ["lazyvim.plugins.extras.editor.aerial"] = 100,
   ["lazyvim.plugins.extras.editor.outline"] = 100,
@@ -16,8 +17,27 @@ if vim.g.xtras_prios then
   prios = vim.tbl_deep_extend("force", prios, vim.g.xtras_prios or {})
 end
 
+local extras = {} ---@type string[]
+local defaults = LazyVim.config.get_defaults()
+
+-- Add extras from LazyExtras that are not disabled
+for _, extra in ipairs(LazyVim.config.json.data.extras) do
+  local def = defaults[extra]
+  if not (def and def.enabled == false) then
+    extras[#extras + 1] = extra
+  end
+end
+
+-- Add default extras
+for name, extra in pairs(defaults) do
+  if extra.enabled then
+    prios[name] = prios[name] or 20
+    extras[#extras + 1] = name
+  end
+end
+
 ---@type string[]
-local extras = LazyVim.dedup(LazyVim.config.json.data.extras)
+extras = LazyVim.dedup(extras)
 
 local version = vim.version()
 local v = version.major .. "_" .. version.minor
diff --git a/lua/lazyvim/util/extras.lua b/lua/lazyvim/util/extras.lua
index bd5ca4f3..4984bf54 100644
--- a/lua/lazyvim/util/extras.lua
+++ b/lua/lazyvim/util/extras.lua
@@ -248,6 +248,9 @@ end
 
 ---@param extra LazyExtra
 function X:extra(extra)
+  local defaults = LazyVim.config.get_defaults()
+  local def = defaults[extra.module]
+  local origin = def and (def.origin or "user") or nil
   if not extra.managed then
     ---@type LazyExtra[]
     local parents = {}
@@ -263,11 +266,12 @@ function X:extra(extra)
       self:diagnostic({
         message = "Required by " .. table.concat(pp, ", "),
       })
-    elseif vim.tbl_contains(LazyVim.plugin.core_imports, extra.module) then
+    elseif vim.tbl_contains(LazyVim.plugin.core_imports, extra.module) or origin == "default" then
       self:diagnostic({
         message = "This extra is included by default",
       })
     else
+      dd(origin)
       self:diagnostic({
         message = "Not managed by LazyExtras (config)",
         severity = vim.diagnostic.severity.WARN,
diff --git a/lua/lazyvim/util/init.lua b/lua/lazyvim/util/init.lua
index 66e6e18b..4b49f539 100644
--- a/lua/lazyvim/util/init.lua
+++ b/lua/lazyvim/util/init.lua
@@ -286,13 +286,4 @@ function M.memoize(fn)
   end
 end
 
----@return "nvim-cmp" | "blink.cmp"
-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"
-  end
-  return vim.g.lazyvim_cmp
-end
-
 return M
diff --git a/lua/lazyvim/util/pick.lua b/lua/lazyvim/util/pick.lua
index 2736d7a5..e07150d1 100644
--- a/lua/lazyvim/util/pick.lua
+++ b/lua/lazyvim/util/pick.lua
@@ -28,10 +28,6 @@ function M.register(picker)
     return true
   end
 
-  if M.picker and M.picker.name ~= M.want() then
-    M.picker = nil
-  end
-
   if M.picker and M.picker.name ~= picker.name then
     LazyVim.warn(
       "`LazyVim.pick`: picker already set to `" .. M.picker.name .. "`,\nignoring new picker `" .. picker.name .. "`"
@@ -42,17 +38,6 @@ function M.register(picker)
   return true
 end
 
----@return "telescope" | "fzf" | "snacks"
-function M.want()
-  vim.g.lazyvim_picker = vim.g.lazyvim_picker or "auto"
-  if vim.g.lazyvim_picker == "auto" then
-    return LazyVim.has_extra("editor.snacks_picker") and "snacks"
-      or LazyVim.has_extra("editor.telescope") and "telescope"
-      or "fzf"
-  end
-  return vim.g.lazyvim_picker
-end
-
 ---@param command? string
 ---@param opts? lazyvim.util.pick.Opts
 function M.open(command, opts)
diff --git a/lua/lazyvim/util/plugin.lua b/lua/lazyvim/util/plugin.lua
index f4a933e9..5d9249fc 100644
--- a/lua/lazyvim/util/plugin.lua
+++ b/lua/lazyvim/util/plugin.lua
@@ -79,7 +79,16 @@ function M.lazy_file()
 end
 
 function M.fix_imports()
+  local defaults ---@type table<string, LazyVimDefault>
   Plugin.Spec.import = LazyVim.inject.args(Plugin.Spec.import, function(_, spec)
+    if LazyVim.config.json_loaded then
+      -- extra disabled by defaults?
+      defaults = defaults or LazyVim.config.get_defaults()
+      local def = defaults[spec.import]
+      if def and def.enabled == false then
+        return false
+      end
+    end
     local dep = M.deprecated_extras[spec and spec.import]
     if dep then
       dep = dep .. "\n" .. "Please remove the extra from `lazyvim.json` to hide this warning."

From d6829fb82cb2df7970d8312c2ed74d235b5760b9 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Sat, 8 Feb 2025 14:05:52 +0000
Subject: [PATCH 071/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 43127781..496f9713 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2025 February 07
+*LazyVim.txt*             For Neovim             Last change: 2025 February 08
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From b4c24a3fe882c21555e60a1ec44087526e856eb9 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sat, 8 Feb 2025 15:06:56 +0100
Subject: [PATCH 072/341] fix(extras): remove debug

---
 lua/lazyvim/util/extras.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lua/lazyvim/util/extras.lua b/lua/lazyvim/util/extras.lua
index 4984bf54..fa87e820 100644
--- a/lua/lazyvim/util/extras.lua
+++ b/lua/lazyvim/util/extras.lua
@@ -271,7 +271,6 @@ function X:extra(extra)
         message = "This extra is included by default",
       })
     else
-      dd(origin)
       self:diagnostic({
         message = "Not managed by LazyExtras (config)",
         severity = vim.diagnostic.severity.WARN,

From 25d90b54a3b1863cb4428fd309ab855732289710 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sat, 8 Feb 2025 15:23:30 +0100
Subject: [PATCH 073/341] feat(defaults): new installs now default to snacks
 picker/explorer. Existing installs don't change.

---
 lua/lazyvim/config/init.lua | 22 ++++++++++++++++------
 lua/lazyvim/util/json.lua   |  2 ++
 lua/lazyvim/util/plugin.lua |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 385d0b13..e585dd70 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -136,18 +136,19 @@ local defaults = {
 }
 
 M.json = {
-  version = 7,
+  version = 8,
+  loaded = false,
   path = vim.g.lazyvim_json or vim.fn.stdpath("config") .. "/lazyvim.json",
   data = {
-    version = nil, ---@type string?
+    version = nil, ---@type number?
+    install_version = nil, ---@type number?
     news = {}, ---@type table<string, string>
     extras = {}, ---@type string[]
   },
 }
-M.json_loaded = false
 
 function M.json.load()
-  M.json_loaded = true
+  M.json.loaded = true
   local f = io.open(M.json.path, "r")
   if f then
     local data = f:read("*a")
@@ -159,6 +160,8 @@ function M.json.load()
         LazyVim.json.migrate()
       end
     end
+  else
+    M.json.data.install_version = M.json.version
   end
 end
 
@@ -334,8 +337,8 @@ function M.get_defaults()
   ---@type table<string, LazyVimDefault[]>
   local checks = {
     picker = {
-      { name = "fzf", extra = "editor.fzf" },
       { name = "snacks", extra = "editor.snacks_picker" },
+      { name = "fzf", extra = "editor.fzf" },
       { name = "telescope", extra = "editor.telescope" },
     },
     cmp = {
@@ -343,10 +346,17 @@ function M.get_defaults()
       { name = "nvim-cmp", extra = "coding.nvim-cmp" },
     },
     explorer = {
-      { name = "neo-tree", extra = "editor.neo-tree" },
       { name = "snacks", extra = "editor.snacks_explorer" },
+      { name = "neo-tree", extra = "editor.neo-tree" },
     },
   }
+
+  -- existing installs keep their defaults
+  if (LazyVim.config.json.data.install_version or 7) < 8 then
+    table.insert(checks.picker, 1, table.remove(checks.picker, 2))
+    table.insert(checks.explorer, 1, table.remove(checks.explorer, 2))
+  end
+
   default_extras = {}
   for name, check in pairs(checks) do
     local valid = {} ---@type string[]
diff --git a/lua/lazyvim/util/json.lua b/lua/lazyvim/util/json.lua
index f3ca7fcf..ad843687 100644
--- a/lua/lazyvim/util/json.lua
+++ b/lua/lazyvim/util/json.lua
@@ -97,6 +97,8 @@ function M.migrate()
         return vim.tbl_contains(ai, name) and ("lazyvim.plugins.extras.ai." .. name) or extra
       end)
     end, json.data.extras or {})
+  elseif json.data.version == 7 then
+    json.data.install_version = 7
   end
 
   M.save()
diff --git a/lua/lazyvim/util/plugin.lua b/lua/lazyvim/util/plugin.lua
index 5d9249fc..c20a0fc8 100644
--- a/lua/lazyvim/util/plugin.lua
+++ b/lua/lazyvim/util/plugin.lua
@@ -81,7 +81,7 @@ end
 function M.fix_imports()
   local defaults ---@type table<string, LazyVimDefault>
   Plugin.Spec.import = LazyVim.inject.args(Plugin.Spec.import, function(_, spec)
-    if LazyVim.config.json_loaded then
+    if LazyVim.config.json.loaded then
       -- extra disabled by defaults?
       defaults = defaults or LazyVim.config.get_defaults()
       local def = defaults[spec.import]

From 2d6b49281d2550222be6aada0b7eeca07bb26e10 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sat, 8 Feb 2025 15:25:10 +0100
Subject: [PATCH 074/341] fix(snacks.explorer): no longer needed to disable
 neo-tree

---
 lua/lazyvim/plugins/extras/editor/snacks_explorer.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua b/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua
index aa87e85c..3e91f3ea 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua
@@ -1,5 +1,4 @@
 return {
-  { "nvim-neo-tree/neo-tree.nvim", enabled = false },
   {
     "folke/snacks.nvim",
     opts = { explorer = {} },

From 2b3bcf36b2392bef94afefc07e2fcf32960960d7 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sat, 8 Feb 2025 15:27:20 +0100
Subject: [PATCH 075/341] fix(snacks.picker): move dashboard shortcut to picker
 extra. Closes #5549

---
 .../plugins/extras/editor/snacks_picker.lua        | 11 +++++++++++
 lua/lazyvim/plugins/ui.lua                         | 14 --------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index d77c0933..e929ad50 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -157,6 +157,17 @@ return {
       { "<leader>sT", function () Snacks.picker.todo_comments({ keywords = { "TODO", "FIX", "FIXME" } }) end, desc = "Todo/Fix/Fixme" },
     },
   },
+  {
+    "folke/snacks.nvim",
+    opts = function(_, opts)
+      table.insert(opts.dashboard.preset.keys, 3, {
+        icon = " ",
+        key = "p",
+        desc = "Projects",
+        action = ":lua Snacks.picker.projects()",
+      })
+    end,
+  },
   {
     "folke/flash.nvim",
     optional = true,
diff --git a/lua/lazyvim/plugins/ui.lua b/lua/lazyvim/plugins/ui.lua
index 0669054d..7985825a 100644
--- a/lua/lazyvim/plugins/ui.lua
+++ b/lua/lazyvim/plugins/ui.lua
@@ -325,18 +325,4 @@ return {
       },
     },
   },
-  {
-    "folke/snacks.nvim",
-    opts = function(_, opts)
-      if not opts.picker then
-        return
-      end
-      table.insert(opts.dashboard.preset.keys, 3, {
-        icon = " ",
-        key = "p",
-        desc = "Projects",
-        action = ":lua Snacks.picker.projects()",
-      })
-    end,
-  },
 }

From 29829f7eb6e937f9fe43e9455e55704b3fac8794 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 8 Feb 2025 15:37:13 +0100
Subject: [PATCH 076/341] chore(main): release 14.11.0 (#5550)

:robot: I have created a release *beep* *boop*
---


##
[14.11.0](https://github.com/LazyVim/LazyVim/compare/v14.10.0...v14.11.0)
(2025-02-08)


### Features

* **config:** show a warning when lazy.nvim imports order is incorrect
([83988ea](https://github.com/LazyVim/LazyVim/commit/83988ea46eccbe20953cd807984d2e89d679aa6e))
* **defaults:** new installs now default to snacks picker/explorer.
Existing installs don't change.
([25d90b5](https://github.com/LazyVim/LazyVim/commit/25d90b54a3b1863cb4428fd309ab855732289710))
* **extras:** big rework of default extras
([525377d](https://github.com/LazyVim/LazyVim/commit/525377dee9ac3d19f53e333538e4e85586163ad8))
* **util:** `has_extra` now also checks for manual imports in `lazy.lua`
([0416376](https://github.com/LazyVim/LazyVim/commit/041637673371db7866f8bf00d77fc2fb6cc673c6))


### Bug Fixes

* **extras:** remove debug
([b4c24a3](https://github.com/LazyVim/LazyVim/commit/b4c24a3fe882c21555e60a1ec44087526e856eb9))
* **snacks.explorer:** no longer needed to disable neo-tree
([2d6b492](https://github.com/LazyVim/LazyVim/commit/2d6b49281d2550222be6aada0b7eeca07bb26e10))
* **snacks.picker:** move dashboard shortcut to picker extra. Closes
[#5549](https://github.com/LazyVim/LazyVim/issues/5549)
([2b3bcf3](https://github.com/LazyVim/LazyVim/commit/2b3bcf36b2392bef94afefc07e2fcf32960960d7))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 17 +++++++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 8b4f0289..c36e41c8 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "14.10.0"
+  ".": "14.11.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8117fbb6..06ba397f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [14.11.0](https://github.com/LazyVim/LazyVim/compare/v14.10.0...v14.11.0) (2025-02-08)
+
+
+### Features
+
+* **config:** show a warning when lazy.nvim imports order is incorrect ([83988ea](https://github.com/LazyVim/LazyVim/commit/83988ea46eccbe20953cd807984d2e89d679aa6e))
+* **defaults:** new installs now default to snacks picker/explorer. Existing installs don't change. ([25d90b5](https://github.com/LazyVim/LazyVim/commit/25d90b54a3b1863cb4428fd309ab855732289710))
+* **extras:** big rework of default extras ([525377d](https://github.com/LazyVim/LazyVim/commit/525377dee9ac3d19f53e333538e4e85586163ad8))
+* **util:** `has_extra` now also checks for manual imports in `lazy.lua` ([0416376](https://github.com/LazyVim/LazyVim/commit/041637673371db7866f8bf00d77fc2fb6cc673c6))
+
+
+### Bug Fixes
+
+* **extras:** remove debug ([b4c24a3](https://github.com/LazyVim/LazyVim/commit/b4c24a3fe882c21555e60a1ec44087526e856eb9))
+* **snacks.explorer:** no longer needed to disable neo-tree ([2d6b492](https://github.com/LazyVim/LazyVim/commit/2d6b49281d2550222be6aada0b7eeca07bb26e10))
+* **snacks.picker:** move dashboard shortcut to picker extra. Closes [#5549](https://github.com/LazyVim/LazyVim/issues/5549) ([2b3bcf3](https://github.com/LazyVim/LazyVim/commit/2b3bcf36b2392bef94afefc07e2fcf32960960d7))
+
 ## [14.10.0](https://github.com/LazyVim/LazyVim/compare/v14.9.0...v14.10.0) (2025-02-07)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index e585dd70..3ec3a62c 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "14.10.0" -- x-release-please-version
+M.version = "14.11.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 2a608f00d47bb6679a27a313fb0404e4d3a2196c Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sat, 8 Feb 2025 18:32:46 +0100
Subject: [PATCH 077/341] fix(copilot-chat): added support for snacks picker.
 Closes #5432. Closes #5552

---
 lua/lazyvim/plugins/extras/ai/copilot-chat.lua | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ai/copilot-chat.lua b/lua/lazyvim/plugins/extras/ai/copilot-chat.lua
index e71f4db1..d67da7b2 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot-chat.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot-chat.lua
@@ -9,8 +9,17 @@ function M.pick(kind)
       LazyVim.warn("No " .. kind .. " found on the current line")
       return
     end
-    local ok = pcall(require, "fzf-lua")
-    require("CopilotChat.integrations." .. (ok and "fzflua" or "telescope")).pick(items)
+    local map = {
+      telescope = "telescope",
+      fzf = "fzflua",
+      snacks = "snacks",
+    }
+    for _, def in pairs(LazyVim.config.get_defaults()) do
+      if def.enabled and map[def.name] then
+        return require("CopilotChat.integrations." .. map[def.name]).pick(items)
+      end
+    end
+    Snacks.notify.error("No picker found")
   end
 end
 

From 0bbce1775b7d6750d3c4d761f3ad1bcfb77fb805 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sat, 8 Feb 2025 20:34:17 +0100
Subject: [PATCH 078/341] feat(config): allow disabling the order check with
 `vim.g.lazyvim_check_order = false`

---
 lua/lazyvim/config/init.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 3ec3a62c..42afd66a 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -212,6 +212,10 @@ function M.setup(opts)
         "vscode",
       })
 
+      if vim.g.lazyvim_check_order == false then
+        return
+      end
+
       -- Check lazy.nvim import order
       local imports = require("lazy.core.config").spec.modules
       local function find(pat, last)

From da3b5159df326bc31d5a0ebdfa2c5cbbd32df9d2 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 10 Feb 2025 12:14:05 +0100
Subject: [PATCH 079/341] feat(config): add option to disable the order check
 to warning message

---
 lua/lazyvim/config/init.lua | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 42afd66a..5ef66fd8 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -229,11 +229,18 @@ function M.setup(opts)
       local extras = find("^lazyvim%.plugins%.extras%.", true) or lazyvim_plugins
       local plugins = find("^plugins$") or math.huge
       if lazyvim_plugins ~= 1 or extras > plugins then
-        vim.notify(
-          "The order of your `lazy.nvim` imports is incorrect:\n- `lazyvim.plugins` should be first\n- followed by any `lazyvim.plugins.extras`\n- and finally your own `plugins`",
-          "warn",
-          { title = "LazyVim" }
-        )
+        local msg = {
+          "The order of your `lazy.nvim` imports is incorrect:",
+          "- `lazyvim.plugins` should be first",
+          "- followed by any `lazyvim.plugins.extras`",
+          "- and finally your own `plugins`",
+          "",
+          "If you think you know what you're doing, you can disable this check with:",
+          "```lua",
+          "vim.g.lazyvim_check_order = false",
+          "```",
+        }
+        vim.notify(table.concat(msg, "\n"), "warn", { title = "LazyVim" })
       end
     end,
   })

From 66981fe5b2c220286a31292fce3cc82b0e17ae76 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Mon, 10 Feb 2025 11:15:22 +0000
Subject: [PATCH 080/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 496f9713..979ab2e6 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2025 February 08
+*LazyVim.txt*             For Neovim             Last change: 2025 February 10
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 121a2e27ef0f4d8ab64bf76768b9600c45fd2364 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 10 Feb 2025 23:27:24 +0100
Subject: [PATCH 081/341] fix(extras): disable import handling when loading
 `:LazyExtras` + changed some recommendations

---
 .../plugins/extras/coding/mini-surround.lua   |  1 -
 lua/lazyvim/plugins/extras/editor/fzf.lua     |  1 -
 .../plugins/extras/editor/snacks_explorer.lua | 40 +++++++++----------
 lua/lazyvim/util/extras.lua                   |  1 +
 lua/lazyvim/util/plugin.lua                   |  3 +-
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/coding/mini-surround.lua b/lua/lazyvim/plugins/extras/coding/mini-surround.lua
index 56d16a60..d8ff25c5 100644
--- a/lua/lazyvim/plugins/extras/coding/mini-surround.lua
+++ b/lua/lazyvim/plugins/extras/coding/mini-surround.lua
@@ -4,7 +4,6 @@
 -- and more.
 return {
   "echasnovski/mini.surround",
-  recommended = true,
   keys = function(_, keys)
     -- Populate the keys based on the user's options
     local opts = LazyVim.opts("mini.surround")
diff --git a/lua/lazyvim/plugins/extras/editor/fzf.lua b/lua/lazyvim/plugins/extras/editor/fzf.lua
index aa26f6e1..c1dd76fd 100644
--- a/lua/lazyvim/plugins/extras/editor/fzf.lua
+++ b/lua/lazyvim/plugins/extras/editor/fzf.lua
@@ -40,7 +40,6 @@ end
 
 return {
   desc = "Awesome picker for FZF (alternative to Telescope)",
-  recommended = true,
   {
     "ibhagwan/fzf-lua",
     cmd = "FzfLua",
diff --git a/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua b/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua
index 3e91f3ea..4163c799 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_explorer.lua
@@ -1,24 +1,24 @@
 return {
-  {
-    "folke/snacks.nvim",
-    opts = { explorer = {} },
-    keys = {
-      {
-        "<leader>fe",
-        function()
-          Snacks.explorer({ cwd = LazyVim.root() })
-        end,
-        desc = "Explorer Snacks (root dir)",
-      },
-      {
-        "<leader>fE",
-        function()
-          Snacks.explorer()
-        end,
-        desc = "Explorer Snacks (cwd)",
-      },
-      { "<leader>e", "<leader>fe", desc = "Explorer Snacks (root dir)", remap = true },
-      { "<leader>E", "<leader>fE", desc = "Explorer Snacks (cwd)", remap = true },
+  desc = "Snacks File Explorer",
+  recommended = true,
+  "folke/snacks.nvim",
+  opts = { explorer = {} },
+  keys = {
+    {
+      "<leader>fe",
+      function()
+        Snacks.explorer({ cwd = LazyVim.root() })
+      end,
+      desc = "Explorer Snacks (root dir)",
     },
+    {
+      "<leader>fE",
+      function()
+        Snacks.explorer()
+      end,
+      desc = "Explorer Snacks (cwd)",
+    },
+    { "<leader>e", "<leader>fe", desc = "Explorer Snacks (root dir)", remap = true },
+    { "<leader>E", "<leader>fE", desc = "Explorer Snacks (cwd)", remap = true },
   },
 }
diff --git a/lua/lazyvim/util/extras.lua b/lua/lazyvim/util/extras.lua
index fa87e820..6bc8eca2 100644
--- a/lua/lazyvim/util/extras.lua
+++ b/lua/lazyvim/util/extras.lua
@@ -83,6 +83,7 @@ end
 ---@param modname string
 ---@param source LazyExtraSource
 function M.get_extra(source, modname)
+  LazyVim.plugin.handle_defaults = false
   local enabled = vim.tbl_contains(M.state, modname)
   local spec = Plugin.Spec.new(nil, { optional = true, pkg = false })
   spec:parse({ import = modname })
diff --git a/lua/lazyvim/util/plugin.lua b/lua/lazyvim/util/plugin.lua
index c20a0fc8..e6cae997 100644
--- a/lua/lazyvim/util/plugin.lua
+++ b/lua/lazyvim/util/plugin.lua
@@ -5,6 +5,7 @@ local M = {}
 
 ---@type string[]
 M.core_imports = {}
+M.handle_defaults = true
 
 M.lazy_file_events = { "BufReadPost", "BufNewFile", "BufWritePre" }
 
@@ -81,7 +82,7 @@ end
 function M.fix_imports()
   local defaults ---@type table<string, LazyVimDefault>
   Plugin.Spec.import = LazyVim.inject.args(Plugin.Spec.import, function(_, spec)
-    if LazyVim.config.json.loaded then
+    if M.handle_defaults and LazyVim.config.json.loaded then
       -- extra disabled by defaults?
       defaults = defaults or LazyVim.config.get_defaults()
       local def = defaults[spec.import]

From 9d426ed7fc57b285e0a89e011f7a35bd99cdc7f8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 11 Feb 2025 11:53:22 +0100
Subject: [PATCH 082/341] chore(main): release 14.12.0 (#5553)

:robot: I have created a release *beep* *boop*
---


##
[14.12.0](https://github.com/LazyVim/LazyVim/compare/v14.11.0...v14.12.0)
(2025-02-10)


### Features

* **config:** add option to disable the order check to warning message
([da3b515](https://github.com/LazyVim/LazyVim/commit/da3b5159df326bc31d5a0ebdfa2c5cbbd32df9d2))
* **config:** allow disabling the order check with
`vim.g.lazyvim_check_order = false`
([0bbce17](https://github.com/LazyVim/LazyVim/commit/0bbce1775b7d6750d3c4d761f3ad1bcfb77fb805))


### Bug Fixes

* **copilot-chat:** added support for snacks picker. Closes
[#5432](https://github.com/LazyVim/LazyVim/issues/5432). Closes
[#5552](https://github.com/LazyVim/LazyVim/issues/5552)
([2a608f0](https://github.com/LazyVim/LazyVim/commit/2a608f00d47bb6679a27a313fb0404e4d3a2196c))
* **extras:** disable import handling when loading `:LazyExtras` +
changed some recommendations
([121a2e2](https://github.com/LazyVim/LazyVim/commit/121a2e27ef0f4d8ab64bf76768b9600c45fd2364))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 14 ++++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index c36e41c8..88facebb 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "14.11.0"
+  ".": "14.12.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06ba397f..2b7c403b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [14.12.0](https://github.com/LazyVim/LazyVim/compare/v14.11.0...v14.12.0) (2025-02-10)
+
+
+### Features
+
+* **config:** add option to disable the order check to warning message ([da3b515](https://github.com/LazyVim/LazyVim/commit/da3b5159df326bc31d5a0ebdfa2c5cbbd32df9d2))
+* **config:** allow disabling the order check with `vim.g.lazyvim_check_order = false` ([0bbce17](https://github.com/LazyVim/LazyVim/commit/0bbce1775b7d6750d3c4d761f3ad1bcfb77fb805))
+
+
+### Bug Fixes
+
+* **copilot-chat:** added support for snacks picker. Closes [#5432](https://github.com/LazyVim/LazyVim/issues/5432). Closes [#5552](https://github.com/LazyVim/LazyVim/issues/5552) ([2a608f0](https://github.com/LazyVim/LazyVim/commit/2a608f00d47bb6679a27a313fb0404e4d3a2196c))
+* **extras:** disable import handling when loading `:LazyExtras` + changed some recommendations ([121a2e2](https://github.com/LazyVim/LazyVim/commit/121a2e27ef0f4d8ab64bf76768b9600c45fd2364))
+
 ## [14.11.0](https://github.com/LazyVim/LazyVim/compare/v14.10.0...v14.11.0) (2025-02-08)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 5ef66fd8..521cb808 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "14.11.0" -- x-release-please-version
+M.version = "14.12.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 7fe0b47f177d1f47dd43dd44d9f267c4421a3684 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:54:30 +0000
Subject: [PATCH 083/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 979ab2e6..6a579c49 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2025 February 10
+*LazyVim.txt*             For Neovim             Last change: 2025 February 11
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 75297733710951e81b505d88b2d728a5b0a9b6ab Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 11 Feb 2025 14:00:01 +0100
Subject: [PATCH 084/341] feat(lsp): use lsp_config picker instead of `LspInfo`

---
 lua/lazyvim/plugins/lsp/keymaps.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/lsp/keymaps.lua b/lua/lazyvim/plugins/lsp/keymaps.lua
index 1b62a911..318ec911 100644
--- a/lua/lazyvim/plugins/lsp/keymaps.lua
+++ b/lua/lazyvim/plugins/lsp/keymaps.lua
@@ -13,7 +13,7 @@ function M.get()
   end
     -- stylua: ignore
     M._keys =  {
-      { "<leader>cl", "<cmd>LspInfo<cr>", desc = "Lsp Info" },
+      { "<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" },

From 0a5965b787e4d513b5a2e1182b35bd11ceafeeb3 Mon Sep 17 00:00:00 2001
From: Beartama <8091245+uyha@users.noreply.github.com>
Date: Wed, 12 Feb 2025 15:21:29 +0200
Subject: [PATCH 085/341] feat(editor): update parameter for fzf-lua (#5584)

## Description

`fzf-lua` renames their parameter in
https://github.com/ibhagwan/fzf-lua/commit/7cede182cf7463376669e102bd10d13f8ce05e52,
so this PR updates the parameter also to stop the deprecation warning.

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/editor/fzf.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/editor/fzf.lua b/lua/lazyvim/plugins/extras/editor/fzf.lua
index c1dd76fd..e9177457 100644
--- a/lua/lazyvim/plugins/extras/editor/fzf.lua
+++ b/lua/lazyvim/plugins/extras/editor/fzf.lua
@@ -288,10 +288,10 @@ return {
       local Keys = require("lazyvim.plugins.lsp.keymaps").get()
       -- stylua: ignore
       vim.list_extend(Keys, {
-        { "gd", "<cmd>FzfLua lsp_definitions     jump_to_single_result=true ignore_current_line=true<cr>", desc = "Goto Definition", has = "definition" },
-        { "gr", "<cmd>FzfLua lsp_references      jump_to_single_result=true ignore_current_line=true<cr>", desc = "References", nowait = true },
-        { "gI", "<cmd>FzfLua lsp_implementations jump_to_single_result=true ignore_current_line=true<cr>", desc = "Goto Implementation" },
-        { "gy", "<cmd>FzfLua lsp_typedefs        jump_to_single_result=true ignore_current_line=true<cr>", desc = "Goto T[y]pe Definition" },
+        { "gd", "<cmd>FzfLua lsp_definitions     jump1=true ignore_current_line=true<cr>", desc = "Goto Definition", has = "definition" },
+        { "gr", "<cmd>FzfLua lsp_references      jump1=true ignore_current_line=true<cr>", desc = "References", nowait = true },
+        { "gI", "<cmd>FzfLua lsp_implementations jump1=true ignore_current_line=true<cr>", desc = "Goto Implementation" },
+        { "gy", "<cmd>FzfLua lsp_typedefs        jump1=true ignore_current_line=true<cr>", desc = "Goto T[y]pe Definition" },
       })
     end,
   },

From 0db68916790808fd4eb284842c4d1a3d1c214e18 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Wed, 12 Feb 2025 13:22:29 +0000
Subject: [PATCH 086/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 6a579c49..6dd2917b 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2025 February 11
+*LazyVim.txt*             For Neovim             Last change: 2025 February 12
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 45d94b3197eaf3f35754b8ecb7adebfcebe5160d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2025 21:38:40 +0100
Subject: [PATCH 087/341] chore(main): release 14.13.0 (#5574)

:robot: I have created a release *beep* *boop*
---


##
[14.13.0](https://github.com/LazyVim/LazyVim/compare/v14.12.0...v14.13.0)
(2025-02-12)


### Features

* **editor:** update parameter for fzf-lua
([#5584](https://github.com/LazyVim/LazyVim/issues/5584))
([0a5965b](https://github.com/LazyVim/LazyVim/commit/0a5965b787e4d513b5a2e1182b35bd11ceafeeb3))
* **lsp:** use lsp_config picker instead of `LspInfo`
([7529773](https://github.com/LazyVim/LazyVim/commit/75297733710951e81b505d88b2d728a5b0a9b6ab))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 CHANGELOG.md                          | 8 ++++++++
 lua/lazyvim/config/init.lua           | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 88facebb..45cd5c1f 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "14.12.0"
+  ".": "14.13.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b7c403b..292053a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [14.13.0](https://github.com/LazyVim/LazyVim/compare/v14.12.0...v14.13.0) (2025-02-12)
+
+
+### Features
+
+* **editor:** update parameter for fzf-lua ([#5584](https://github.com/LazyVim/LazyVim/issues/5584)) ([0a5965b](https://github.com/LazyVim/LazyVim/commit/0a5965b787e4d513b5a2e1182b35bd11ceafeeb3))
+* **lsp:** use lsp_config picker instead of `LspInfo` ([7529773](https://github.com/LazyVim/LazyVim/commit/75297733710951e81b505d88b2d728a5b0a9b6ab))
+
 ## [14.12.0](https://github.com/LazyVim/LazyVim/compare/v14.11.0...v14.12.0) (2025-02-10)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 521cb808..586d1e7d 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "14.12.0" -- x-release-please-version
+M.version = "14.13.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 5788b9d1e06dfb5f99f92354dc550c9f2c5a6710 Mon Sep 17 00:00:00 2001
From: Roland Kaminski <rkaminsk@users.noreply.github.com>
Date: Fri, 14 Feb 2025 17:32:33 +0100
Subject: [PATCH 088/341] feat(extras): setup neogen and mini.snippets
 integration (#5594)

## Description

Configure neogen and mini.snippets integration.

See also #5593.

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/coding/neogen.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/coding/neogen.lua b/lua/lazyvim/plugins/extras/coding/neogen.lua
index 88f7dd54..c8916676 100644
--- a/lua/lazyvim/plugins/extras/coding/neogen.lua
+++ b/lua/lazyvim/plugins/extras/coding/neogen.lua
@@ -1,5 +1,6 @@
 return {
   "danymat/neogen",
+  dependencies = LazyVim.has("mini.snippets") and { "mini.snippets" } or {},
   cmd = "Neogen",
   keys = {
     {
@@ -17,6 +18,7 @@ return {
 
     local map = {
       ["LuaSnip"] = "luasnip",
+      ["mini.snippets"] = "mini",
       ["nvim-snippy"] = "snippy",
       ["vim-vsnip"] = "vsnip",
     }

From 98fca895e863b3e518d6154edd8cdbca35efef88 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Fri, 14 Feb 2025 16:33:36 +0000
Subject: [PATCH 089/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 6dd2917b..2d3af3d8 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2025 February 12
+*LazyVim.txt*             For Neovim             Last change: 2025 February 14
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 32e575aa75792c63f710f0bdc3e2fb5aa8ea75ad Mon Sep 17 00:00:00 2001
From: Zhou Fang <fang2hou@outlook.com>
Date: Sat, 15 Feb 2025 16:27:01 +0900
Subject: [PATCH 090/341] feat(keymaps): enable toggling in quickfix list and
 location list (#5608)

## Description

This PR addresses issue #5503 by modifying the behavior of `<leader>xq`
and `<leader>xl` so that they toggle the quickfix and location lists
rather than simply opening them.

To prevent the full Lua error stack from being printed when no list
exists prior to using `copen` or `lopen`, I've wrapped the commands in
`pcall` and used `vim.notify` to alert the user in the same manner as
before.

## Related Issue(s)

#5503

## Screenshots


https://github.com/user-attachments/assets/b22b1861-e6e5-4d8a-967e-f760cca15719

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/config/keymaps.lua | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/config/keymaps.lua b/lua/lazyvim/config/keymaps.lua
index 3e3829d1..031e7054 100644
--- a/lua/lazyvim/config/keymaps.lua
+++ b/lua/lazyvim/config/keymaps.lua
@@ -94,8 +94,21 @@ map("n", "<leader>l", "<cmd>Lazy<cr>", { desc = "Lazy" })
 -- new file
 map("n", "<leader>fn", "<cmd>enew<cr>", { desc = "New File" })
 
-map("n", "<leader>xl", "<cmd>lopen<cr>", { desc = "Location List" })
-map("n", "<leader>xq", "<cmd>copen<cr>", { desc = "Quickfix List" })
+-- location list
+map("n", "<leader>xl", function()
+  local success, err = pcall(vim.fn.getloclist(0, { winid = 0 }).winid ~= 0 and vim.cmd.lclose or vim.cmd.lopen)
+  if not success and err then
+    vim.notify(err, vim.log.levels.ERROR)
+  end
+end, { desc = "Location List" })
+
+-- quickfix list
+map("n", "<leader>xq", function()
+  local success, err = pcall(vim.fn.getqflist({ winid = 0 }).winid ~= 0 and vim.cmd.cclose or vim.cmd.copen)
+  if not success and err then
+    vim.notify(err, vim.log.levels.ERROR)
+  end
+end, { desc = "Quickfix List" })
 
 map("n", "[q", vim.cmd.cprev, { desc = "Previous Quickfix" })
 map("n", "]q", vim.cmd.cnext, { desc = "Next Quickfix" })

From e9dad45f934bca467a40d0bb68c84c0aca178b0a Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Sat, 15 Feb 2025 07:27:57 +0000
Subject: [PATCH 091/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 2d3af3d8..3c5a9ce0 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2025 February 14
+*LazyVim.txt*             For Neovim             Last change: 2025 February 15
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 401ef48fcd617534b017ef471309bb1bd6465131 Mon Sep 17 00:00:00 2001
From: Jinfeng Guo <chillywall@163.com>
Date: Sat, 15 Feb 2025 15:30:45 +0800
Subject: [PATCH 092/341] feat(snacks.picker): added support for Project
 shortcuts in other dashboards (#5607)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…shboard-nvim, and mini-starter

## Description

Though the snacks.picker extra provides a project picker, it only adds
the 'Projects' shortcut to snacks' dashboard, and no to the other three
dashboard extra: alpha, dashboard-nvim and mini-starter. In this PR, I
added the 'Projects' shortcuts to these three dashboard extras.

<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

- Fixes #5465

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

alpha


![image](https://github.com/user-attachments/assets/c050f260-8602-4660-a386-62ab8400ef87)

dashboard-nvim


![image](https://github.com/user-attachments/assets/8973cd62-ba97-4330-9462-74163b58dca9)

mini.starter


![image](https://github.com/user-attachments/assets/a31ec27d-7efb-4aa3-a136-2a4ffedf5ba1)

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 .../plugins/extras/editor/snacks_picker.lua   | 44 +++++++++++++++++++
 lua/lazyvim/plugins/xtras.lua                 |  3 ++
 2 files changed, 47 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index e929ad50..aee28d1d 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -168,6 +168,50 @@ return {
       })
     end,
   },
+  {
+    "goolord/alpha-nvim",
+    optional = true,
+    opts = function(_, dashboard)
+      local button = dashboard.button("p", " " .. " Projects", [[<cmd> lua Snacks.picker.projects() <cr>]])
+      button.opts.hl = "AlphaButtons"
+      button.opts.hl_shortcut = "AlphaShortcut"
+      table.insert(dashboard.section.buttons.val, 4, button)
+    end,
+  },
+  {
+    "echasnovski/mini.starter",
+    optional = true,
+    opts = function(_, opts)
+      local items = {
+        {
+          name = "Projects",
+          action = [[lua Snacks.picker.projects()]],
+          section = string.rep(" ", 22) .. "Telescope",
+        },
+      }
+      vim.list_extend(opts.items, items)
+    end,
+  },
+  {
+    "nvimdev/dashboard-nvim",
+    optional = true,
+    opts = function(_, opts)
+      if not vim.tbl_get(opts, "config", "center") then
+        return
+      end
+      local projects = {
+        action = "lua Snacks.picker.projects()",
+        desc = " Projects",
+        icon = " ",
+        key = "p",
+      }
+
+      projects.desc = projects.desc .. string.rep(" ", 43 - #projects.desc)
+      projects.key_format = "  %s"
+
+      table.insert(opts.config.center, 3, projects)
+    end,
+  },
   {
     "folke/flash.nvim",
     optional = true,
diff --git a/lua/lazyvim/plugins/xtras.lua b/lua/lazyvim/plugins/xtras.lua
index 30cab43f..bb061d80 100644
--- a/lua/lazyvim/plugins/xtras.lua
+++ b/lua/lazyvim/plugins/xtras.lua
@@ -11,6 +11,9 @@ local prios = {
   -- default priority is 50
   ["lazyvim.plugins.extras.editor.aerial"] = 100,
   ["lazyvim.plugins.extras.editor.outline"] = 100,
+  ["lazyvim.plugins.extras.ui.alpha"] = 19,
+  ["lazyvim.plugins.extras.ui.dashboard-nvim"] = 19,
+  ["lazyvim.plugins.extras.ui.mini-starter"] = 19,
 }
 
 if vim.g.xtras_prios then

From 4aff0063a42bbc499cfa03feb6e58d4339c0950d Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sat, 15 Feb 2025 15:46:51 +0100
Subject: [PATCH 093/341] feat(snacks.picker): move trouble keymap from
 `ctrl+t` -> `alt+t`

---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index aee28d1d..aad6287f 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -121,7 +121,7 @@ return {
             win = {
               input = {
                 keys = {
-                  ["<c-t>"] = {
+                  ["<a-t>"] = {
                     "trouble_open",
                     mode = { "n", "i" },
                   },

From 0458e46dcca49cc404062e04a9054a8bd058dcd3 Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Sat, 15 Feb 2025 22:57:48 +0200
Subject: [PATCH 094/341] fix(blink): `cmdline` is now top-level on main branch
 (#5615)

## Description
This `blink.cmp`
[commit](https://github.com/Saghen/blink.cmp/commit/93215d80346e14763a67d97785dccb1e1c3a6775)
introduced a breaking change on main branch. `cmdline` is now top-level
and the option is `opts.cmdline.sources = {}`.

I also added a note to remove this hack when the next blink stable
release comes out, which should be greater than current 0.11.0 and just
do it normally in `opts` instead.
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
None.
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/coding/blink.lua | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua
index 45e393e1..7cd67fc8 100644
--- a/lua/lazyvim/plugins/extras/coding/blink.lua
+++ b/lua/lazyvim/plugins/extras/coding/blink.lua
@@ -79,7 +79,6 @@ return {
         -- with blink.compat
         compat = {},
         default = { "lsp", "path", "snippets", "buffer" },
-        cmdline = {},
       },
 
       keymap = {
@@ -89,6 +88,15 @@ return {
     },
     ---@param opts blink.cmp.Config | { sources: { compat: string[] } }
     config = function(_, opts)
+      -- HACK: remove when next `blink.cmp` stable release is available
+      -- and just do `opts.cmdline.sources = {}` directly in `opts`
+      -- Should be greater than current 0.11.0
+      if not vim.g.lazyvim_blink_main then
+        opts.sources["cmdline"] = {}
+      else
+        opts.cmdline = opts.cmdline or {}
+        opts.cmdline.sources = {}
+      end
       -- setup compat sources
       local enabled = opts.sources.default
       for _, source in ipairs(opts.sources.compat or {}) do

From b35015ac59f0c630b2efe18ccf10d693397d0ca4 Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Sat, 15 Feb 2025 23:51:17 +0200
Subject: [PATCH 095/341] fix(blink): `blink` released new version, remove
 previous hack (#5616)

## Description
`blink.cmp` just made a new stable release. So, remove the hack and
define the option properly in `opts`.

If I knew it would make a release tonight, I'd definitely hold off my
recent PR.
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
None
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/coding/blink.lua | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua
index 7cd67fc8..f43be920 100644
--- a/lua/lazyvim/plugins/extras/coding/blink.lua
+++ b/lua/lazyvim/plugins/extras/coding/blink.lua
@@ -81,6 +81,10 @@ return {
         default = { "lsp", "path", "snippets", "buffer" },
       },
 
+      cmdline = {
+        sources = {},
+      },
+
       keymap = {
         preset = "enter",
         ["<C-y>"] = { "select_and_accept" },
@@ -88,15 +92,6 @@ return {
     },
     ---@param opts blink.cmp.Config | { sources: { compat: string[] } }
     config = function(_, opts)
-      -- HACK: remove when next `blink.cmp` stable release is available
-      -- and just do `opts.cmdline.sources = {}` directly in `opts`
-      -- Should be greater than current 0.11.0
-      if not vim.g.lazyvim_blink_main then
-        opts.sources["cmdline"] = {}
-      else
-        opts.cmdline = opts.cmdline or {}
-        opts.cmdline.sources = {}
-      end
       -- setup compat sources
       local enabled = opts.sources.default
       for _, source in ipairs(opts.sources.compat or {}) do

From e7f8e4faba0c6d397526238923f1aeff1740d09c Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Sun, 16 Feb 2025 00:47:17 +0200
Subject: [PATCH 096/341] fix(blink): enable Neovim native mapping with `<Tab>`
 (#5617)

## Description
Another blink fix unfortunately.

I noticed that native Neovim `<Tab>` completion didn't work after the
breaking commit.

I checked the commit and noticed it had a boolean `enabled` field, so I
thought maybe that would disable the blink cmdline since we already have
`sources = {}`, but it didn't work. Looking through the commit, I
stumbled upon this piece of
[code](https://github.com/Saghen/blink.cmp/commit/93215d80346e14763a67d97785dccb1e1c3a6775#diff-f313d6f0270f6fed848f1cb7e62c82d3cfaf9b6c7e0072266908eeaf202f11d5R66-R68)
and it seems that it's only checked for applying the blink cmdline
mappings.

So, it seems both `enabled = false` (for Neovim native cmdline mapping)
and `sources = {}` are needed to have default Neovim cmdline experience.

PS: Apparently I don't know how to link from the commit the necessary
part of the commit, so I'm just referencing here the part of the code
[directly in the
file](https://github.com/Saghen/blink.cmp/blob/426a605518f81ea7ba335ecca8df565637e7e259/lua/blink/cmp/keymap/init.lua#L66-L70).
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
None
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/coding/blink.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua
index f43be920..4488b721 100644
--- a/lua/lazyvim/plugins/extras/coding/blink.lua
+++ b/lua/lazyvim/plugins/extras/coding/blink.lua
@@ -82,6 +82,7 @@ return {
       },
 
       cmdline = {
+        enabled = false,
         sources = {},
       },
 

From 3f034d0a7f58031123300309f2efd3bb0356ee21 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 15 Feb 2025 23:51:07 +0100
Subject: [PATCH 097/341] chore(main): release 14.14.0 (#5603)

:robot: I have created a release *beep* *boop*
---


##
[14.14.0](https://github.com/LazyVim/LazyVim/compare/v14.13.0...v14.14.0)
(2025-02-15)


### Features

* **extras:** setup neogen and mini.snippets integration
([#5594](https://github.com/LazyVim/LazyVim/issues/5594))
([5788b9d](https://github.com/LazyVim/LazyVim/commit/5788b9d1e06dfb5f99f92354dc550c9f2c5a6710))
* **keymaps:** enable toggling in quickfix list and location list
([#5608](https://github.com/LazyVim/LazyVim/issues/5608))
([32e575a](https://github.com/LazyVim/LazyVim/commit/32e575aa75792c63f710f0bdc3e2fb5aa8ea75ad))
* **snacks.picker:** added support for Project shortcuts in other
dashboards ([#5607](https://github.com/LazyVim/LazyVim/issues/5607))
([401ef48](https://github.com/LazyVim/LazyVim/commit/401ef48fcd617534b017ef471309bb1bd6465131))
* **snacks.picker:** move trouble keymap from `ctrl+t` -&gt; `alt+t`
([4aff006](https://github.com/LazyVim/LazyVim/commit/4aff0063a42bbc499cfa03feb6e58d4339c0950d))


### Bug Fixes

* **blink:** `blink` released new version, remove previous hack
([#5616](https://github.com/LazyVim/LazyVim/issues/5616))
([b35015a](https://github.com/LazyVim/LazyVim/commit/b35015ac59f0c630b2efe18ccf10d693397d0ca4))
* **blink:** `cmdline` is now top-level on main branch
([#5615](https://github.com/LazyVim/LazyVim/issues/5615))
([0458e46](https://github.com/LazyVim/LazyVim/commit/0458e46dcca49cc404062e04a9054a8bd058dcd3))
* **blink:** enable Neovim native mapping with `&lt;Tab&gt;`
([#5617](https://github.com/LazyVim/LazyVim/issues/5617))
([e7f8e4f](https://github.com/LazyVim/LazyVim/commit/e7f8e4faba0c6d397526238923f1aeff1740d09c))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 17 +++++++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 45cd5c1f..926af9ee 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "14.13.0"
+  ".": "14.14.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 292053a3..90fbb7c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [14.14.0](https://github.com/LazyVim/LazyVim/compare/v14.13.0...v14.14.0) (2025-02-15)
+
+
+### Features
+
+* **extras:** setup neogen and mini.snippets integration ([#5594](https://github.com/LazyVim/LazyVim/issues/5594)) ([5788b9d](https://github.com/LazyVim/LazyVim/commit/5788b9d1e06dfb5f99f92354dc550c9f2c5a6710))
+* **keymaps:** enable toggling in quickfix list and location list ([#5608](https://github.com/LazyVim/LazyVim/issues/5608)) ([32e575a](https://github.com/LazyVim/LazyVim/commit/32e575aa75792c63f710f0bdc3e2fb5aa8ea75ad))
+* **snacks.picker:** added support for Project shortcuts in other dashboards ([#5607](https://github.com/LazyVim/LazyVim/issues/5607)) ([401ef48](https://github.com/LazyVim/LazyVim/commit/401ef48fcd617534b017ef471309bb1bd6465131))
+* **snacks.picker:** move trouble keymap from `ctrl+t` -&gt; `alt+t` ([4aff006](https://github.com/LazyVim/LazyVim/commit/4aff0063a42bbc499cfa03feb6e58d4339c0950d))
+
+
+### Bug Fixes
+
+* **blink:** `blink` released new version, remove previous hack ([#5616](https://github.com/LazyVim/LazyVim/issues/5616)) ([b35015a](https://github.com/LazyVim/LazyVim/commit/b35015ac59f0c630b2efe18ccf10d693397d0ca4))
+* **blink:** `cmdline` is now top-level on main branch ([#5615](https://github.com/LazyVim/LazyVim/issues/5615)) ([0458e46](https://github.com/LazyVim/LazyVim/commit/0458e46dcca49cc404062e04a9054a8bd058dcd3))
+* **blink:** enable Neovim native mapping with `&lt;Tab&gt;` ([#5617](https://github.com/LazyVim/LazyVim/issues/5617)) ([e7f8e4f](https://github.com/LazyVim/LazyVim/commit/e7f8e4faba0c6d397526238923f1aeff1740d09c))
+
 ## [14.13.0](https://github.com/LazyVim/LazyVim/compare/v14.12.0...v14.13.0) (2025-02-12)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 586d1e7d..56f2397e 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "14.13.0" -- x-release-please-version
+M.version = "14.14.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 5b94baa1d2e7d8ec7e9a9cab82fabd8c3655d369 Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Sun, 16 Feb 2025 09:05:52 +0200
Subject: [PATCH 098/341] fix(blink): remove unnecessary `sources` from
 `cmdline` (#5620)

## Description
Like Saghen already mentioned in the other PR, this
[commit](https://github.com/Saghen/blink.cmp/commit/19f60a675eaaf4b160bd6458bfd72fc005da5b3f)
does a check based on the `enabled` field before adding sources, so it's
no longer needed to define it.
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
None
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/coding/blink.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua
index 4488b721..99a2748e 100644
--- a/lua/lazyvim/plugins/extras/coding/blink.lua
+++ b/lua/lazyvim/plugins/extras/coding/blink.lua
@@ -83,7 +83,6 @@ return {
 
       cmdline = {
         enabled = false,
-        sources = {},
       },
 
       keymap = {

From 0ca49bcfed059516b5e860f6d6bc028dfe149b3f Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Sun, 16 Feb 2025 07:06:54 +0000
Subject: [PATCH 099/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 3c5a9ce0..5a16440c 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2025 February 15
+*LazyVim.txt*             For Neovim             Last change: 2025 February 16
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From f2f2aea6722b530281b476c08ec60f2d320f1c3d Mon Sep 17 00:00:00 2001
From: abeldekat <58370433+abeldekat@users.noreply.github.com>
Date: Sun, 16 Feb 2025 08:06:35 +0000
Subject: [PATCH 100/341] feat(snippets): mini.snippets standalone and
 blink.resubscribe (#5507)

## Description


When using blink.cmp and mini.snippets, the same problem regarding
outdated completion items as solved in
[nvim-cmp](https://github.com/hrsh7th/nvim-cmp/pull/2126) can arise.

[This](https://github.com/Saghen/blink.cmp/pull/1035) PR has been
included into main.
When the PR is included into the next stable release, this PR can be
merged.
Current blink release: 0.11.0


## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

Co-authored-by: abeldekat <abel@nomail.com>
---
 lua/lazyvim/plugins/extras/coding/mini-snippets.lua | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/coding/mini-snippets.lua b/lua/lazyvim/plugins/extras/coding/mini-snippets.lua
index 5ce82c80..d0a747a8 100644
--- a/lua/lazyvim/plugins/extras/coding/mini-snippets.lua
+++ b/lua/lazyvim/plugins/extras/coding/mini-snippets.lua
@@ -140,21 +140,25 @@ return {
       end
 
       -- Standalone --
+      local blink = require("blink.cmp")
       expand_select_override = function(snippets, insert)
         -- Schedule, otherwise blink's virtual text is not removed on vim.ui.select
-        require("blink.cmp").cancel()
+        blink.cancel()
         vim.schedule(function()
           MiniSnippets.default_select(snippets, insert)
         end)
       end
       --
       -- Blink performs a require on blink.cmp.sources.snippets.default
-      -- By removing the source, the default engine will not be used
+      -- By removing the source, that default engine will not be used
       opts.sources.default = vim.tbl_filter(function(source)
         return source ~= "snippets"
       end, opts.sources.default)
       opts.snippets = { -- need to repeat blink's preset here
-        expand = expand_from_lsp,
+        expand = function(snippet)
+          expand_from_lsp(snippet)
+          blink.resubscribe()
+        end,
         active = function()
           return MiniSnippets.session.get(false) ~= nil
         end,

From 16a772452a515790c3304b358dd66a618fda3260 Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Sun, 16 Feb 2025 13:20:06 +0200
Subject: [PATCH 101/341] feat(octo): add support for snacks picker (#5625)

## Description
A [PR](https://github.com/pwntester/octo.nvim/pull/858) has landed in
`octo.nvim` that adds initial support for `snacks.picker`. Enable it in
`octo.nvim` Extra if user uses `snacks.picker`.

I also changed the checks to use `has_extra`. This was needed for
`snacks.picker`, since `has("snacks.nvim")` doesn't ensure that user
also has `snacks.picker` enabled. For the others I just changed it for
conformity, but if you think there might be something wrong about that
(that I'm unable to think of), please feel free to change them back.
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
None
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/util/octo.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/util/octo.lua b/lua/lazyvim/plugins/extras/util/octo.lua
index 9412e54c..d3316f5e 100644
--- a/lua/lazyvim/plugins/extras/util/octo.lua
+++ b/lua/lazyvim/plugins/extras/util/octo.lua
@@ -42,12 +42,14 @@ return {
     "pwntester/octo.nvim",
     opts = function(_, opts)
       vim.treesitter.language.register("markdown", "octo")
-      if LazyVim.has("telescope.nvim") then
+      if LazyVim.has_extra("editor.telescope") then
         opts.picker = "telescope"
-      elseif LazyVim.has("fzf-lua") then
+      elseif LazyVim.has_extra("editor.fzf") then
         opts.picker = "fzf-lua"
+      elseif LazyVim.has_extra("editor.snacks_picker") then
+        opts.picker = "snacks"
       else
-        LazyVim.error("`octo.nvim` requires `telescope.nvim` or `fzf-lua`")
+        LazyVim.error("`octo.nvim` requires `telescope.nvim` or `fzf-lua` or `snacks.nvim`")
       end
 
       -- Keep some empty windows in sessions

From 606b96466eeb39b1c1bb576c9b99041b64705f43 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 18 Feb 2025 23:10:44 +0100
Subject: [PATCH 102/341] fix(snacks.picker): remove redundant leader-gc
 keymap. Closes #5646

---
 lua/lazyvim/plugins/extras/editor/snacks_picker.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index aad6287f..93f32fab 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -72,7 +72,6 @@ return {
       { "<leader>fR", function() Snacks.picker.recent({ filter = { cwd = true }}) end, desc = "Recent (cwd)" },
       { "<leader>fp", function() Snacks.picker.projects() end, desc = "Projects" },
       -- git
-      { "<leader>gc", function() Snacks.picker.git_log() end, desc = "Git Log" },
       { "<leader>gd", function() Snacks.picker.git_diff() end, desc = "Git Diff (hunks)" },
       { "<leader>gs", function() Snacks.picker.git_status() end, desc = "Git Status" },
       { "<leader>gS", function() Snacks.picker.git_stash() end, desc = "Git Stash" },

From 9c596681f684c549e69652a5c77a68bd5ecc93e3 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 18 Feb 2025 23:11:12 +0100
Subject: [PATCH 103/341] feat(keymaps): show lang when opening treesitter
 inspect

---
 lua/lazyvim/config/keymaps.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/config/keymaps.lua b/lua/lazyvim/config/keymaps.lua
index 031e7054..fbc7f5d1 100644
--- a/lua/lazyvim/config/keymaps.lua
+++ b/lua/lazyvim/config/keymaps.lua
@@ -179,7 +179,7 @@ map("n", "<leader>qq", "<cmd>qa<cr>", { desc = "Quit All" })
 
 -- highlights under cursor
 map("n", "<leader>ui", vim.show_pos, { desc = "Inspect Pos" })
-map("n", "<leader>uI", "<cmd>InspectTree<cr>", { desc = "Inspect Tree" })
+map("n", "<leader>uI", function() vim.treesitter.inspect_tree() vim.api.nvim_input("I") end, { desc = "Inspect Tree" })
 
 -- LazyVim Changelog
 map("n", "<leader>L", function() LazyVim.news.changelog() end, { desc = "LazyVim Changelog" })

From f3e37a1f836448772b3e63a3add542236f9e7375 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Tue, 18 Feb 2025 22:12:23 +0000
Subject: [PATCH 104/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 5a16440c..debec307 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2025 February 16
+*LazyVim.txt*             For Neovim             Last change: 2025 February 18
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 759a19e785735eb8513b4f8d4483ec5ab1b75307 Mon Sep 17 00:00:00 2001
From: Thomas Vandal <thomas.vandal@umontreal.ca>
Date: Fri, 21 Feb 2025 08:28:05 -0500
Subject: [PATCH 105/341] feat(chezmoi): enhance fzf-lua chezmoi picker and add
 snacks.dasbhoard entry (#5275)

## Description

<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

This PR enhances the fzf-lua picker for chezmoi by using the built-in
`files` picker and by opening the selected file with `ChezmoiEdit` and
`vimcmd_entry` to parse the entry. This simplifies the code and adds
icons and file preview.

The PR also replaces the config entry in snacks.dashboard with the
chezmoi picker, similar to what was already implemented for
dashboard-nvim

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

Current picker:


![image](https://github.com/user-attachments/assets/d0be9279-f199-4349-8055-04d8a351c6f9)


New picker:


![image](https://github.com/user-attachments/assets/c68fcb6a-79fa-4f65-8c48-60ce64450350)

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/util/chezmoi.lua | 42 +++++++++++++--------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/util/chezmoi.lua b/lua/lazyvim/plugins/extras/util/chezmoi.lua
index cffa6749..6c88fc45 100644
--- a/lua/lazyvim/plugins/extras/util/chezmoi.lua
+++ b/lua/lazyvim/plugins/extras/util/chezmoi.lua
@@ -3,22 +3,12 @@ local pick_chezmoi = function()
     require("telescope").extensions.chezmoi.find_files()
   elseif LazyVim.pick.picker.name == "fzf" then
     local fzf_lua = require("fzf-lua")
-    local results = require("chezmoi.commands").list()
-    local chezmoi = require("chezmoi.commands")
-
-    local opts = {
-      fzf_opts = {},
-      fzf_colors = true,
-      actions = {
-        ["default"] = function(selected)
-          chezmoi.edit({
-            targets = { "~/" .. selected[1] },
-            args = { "--watch" },
-          })
-        end,
-      },
+    local actions = {
+      ["enter"] = function(selected)
+        fzf_lua.actions.vimcmd_entry("ChezmoiEdit", selected, { cwd = os.getenv("HOME") })
+      end,
     }
-    fzf_lua.fzf_exec(results, opts)
+    fzf_lua.files({ cmd = "chezmoi managed --include=files,symlinks", actions = actions })
   elseif LazyVim.pick.picker.name == "snacks" then
     local results = require("chezmoi.commands").list({
       args = {
@@ -65,6 +55,7 @@ return {
   },
   {
     "xvzc/chezmoi.nvim",
+    cmd = { "ChezmoiEdit" },
     keys = {
       {
         "<leader>sz",
@@ -120,6 +111,27 @@ return {
       table.insert(opts.config.center, 5, projects)
     end,
   },
+  {
+    "folke/snacks.nvim",
+    optional = true,
+    opts = function(_, opts)
+      local chezmoi_entry = {
+        icon = " ",
+        key = "c",
+        desc = "Config",
+        action = pick_chezmoi,
+      }
+      local config_index
+      for i = #opts.dashboard.preset.keys, 1, -1 do
+        if opts.dashboard.preset.keys[i].key == "c" then
+          table.remove(opts.dashboard.preset.keys, i)
+          config_index = i
+          break
+        end
+      end
+      table.insert(opts.dashboard.preset.keys, config_index, chezmoi_entry)
+    end,
+  },
 
   -- Filetype icons
   {

From 541b83276e0fe92f7d0d6c9f283cd15ccba5a2fd Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Fri, 21 Feb 2025 13:29:08 +0000
Subject: [PATCH 106/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index debec307..447b9369 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2025 February 18
+*LazyVim.txt*             For Neovim             Last change: 2025 February 21
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 771089f6928512ab0f431e9db04e7dc802a5e1a5 Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Sat, 22 Feb 2025 08:47:27 +0200
Subject: [PATCH 107/341] fix(blink): make sure to use
 `LazyVim.config.icons.kinds` (#5668)

## Description
This blink
[commit](https://github.com/Saghen/blink.cmp/commit/010d939e7fd6cb8d8e4a9b1dec228b8405d15fb4)
made a change, so that third party sources can provide their own
`item.kind_icon` and `item.kind_name`. The problem is that these icons
will take precedence over `config.kind_icons[kind]`, which LazyVim sets
[here](https://github.com/LazyVim/LazyVim/blob/541b83276e0fe92f7d0d6c9f283cd15ccba5a2fd/lua/lazyvim/plugins/extras/coding/blink.lua#L164-L164).

I noticed that `blink-cmp-copilot` also started providing its own in the
items that it returns. I noticed this because I have the following in my
configuration `columns = { { "label", "label_description", gap = 1 }, {
"kind_icon", "kind" } }`. The icon that it uses is a smaller icon one
character long, which by default it will scale up and show normally like
the LazyVim icon. But when you put another component next to it (like
`kind`) in the `columns` field, then it shows the normal size of the
icon next to the `kind` and it looks kinda weird compared to the default
LazyVim icon.
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
None
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots
Before (the default icon provided by `blink-cmp-copilot`)

![2025-02-22_02-17](https://github.com/user-attachments/assets/aa7da566-a577-4d32-822c-f2d891b3c047)

After (the LazyVim icon)

![2025-02-22_02-18](https://github.com/user-attachments/assets/342580a9-5a36-47fa-aad7-c139f2765d74)

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/coding/blink.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua
index 99a2748e..10b2ee62 100644
--- a/lua/lazyvim/plugins/extras/coding/blink.lua
+++ b/lua/lazyvim/plugins/extras/coding/blink.lua
@@ -143,6 +143,7 @@ return {
             items = transform_items and transform_items(ctx, items) or items
             for _, item in ipairs(items) do
               item.kind = kind_idx or item.kind
+              item.kind_icon = LazyVim.config.icons.kinds[item.kind_name] or item.kind_icon or nil
             end
             return items
           end

From cb223553ff73eb2f37ffb5dc0bb75b76a4677faf Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Sat, 22 Feb 2025 06:48:29 +0000
Subject: [PATCH 108/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 447b9369..881984e8 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2025 February 21
+*LazyVim.txt*             For Neovim             Last change: 2025 February 22
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From b0334fd57cdb920e03afab3c1940114ad43e4fbe Mon Sep 17 00:00:00 2001
From: Tomas Slusny <slusnucky@gmail.com>
Date: Sat, 1 Mar 2025 15:21:12 +0100
Subject: [PATCH 109/341] fix(copilot-chat): switch from deprecated picker
 integrations (#5707)

- Instead of using picker integrations (that are now deprecated), switch
to using CopilotChat.select_prompt() that is using `vim.ui.select` which
brings the selector integration responsibility to pickers instead of
plugin
- Use vim.ui.input instead of vim.fn.input for consistency

Reason why this was deprecated in CopilotChat.nvim (by me) and will be
removed in future is because these integrations never made any sense
anyway when `vim.ui.select` overrides exist.

## Screenshots

Using fzf-lua in my config, outside of LazyNvim but same thing applies:


![image](https://github.com/user-attachments/assets/a5171ffe-63a6-4b79-9925-fd8bef52e52f)

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
---
 .../plugins/extras/ai/copilot-chat.lua        | 46 ++++++-------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ai/copilot-chat.lua b/lua/lazyvim/plugins/extras/ai/copilot-chat.lua
index d67da7b2..58169b1e 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot-chat.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot-chat.lua
@@ -1,28 +1,3 @@
-local M = {}
-
----@param kind string
-function M.pick(kind)
-  return function()
-    local actions = require("CopilotChat.actions")
-    local items = actions[kind .. "_actions"]()
-    if not items then
-      LazyVim.warn("No " .. kind .. " found on the current line")
-      return
-    end
-    local map = {
-      telescope = "telescope",
-      fzf = "fzflua",
-      snacks = "snacks",
-    }
-    for _, def in pairs(LazyVim.config.get_defaults()) do
-      if def.enabled and map[def.name] then
-        return require("CopilotChat.integrations." .. map[def.name]).pick(items)
-      end
-    end
-    Snacks.notify.error("No picker found")
-  end
-end
-
 return {
   {
     "CopilotC-Nvim/CopilotChat.nvim",
@@ -62,16 +37,25 @@ return {
       {
         "<leader>aq",
         function()
-          local input = vim.fn.input("Quick Chat: ")
-          if input ~= "" then
-            require("CopilotChat").ask(input)
-          end
+          vim.ui.input({
+            prompt = "Quick Chat: ",
+          }, function(input)
+            if input ~= "" then
+              require("CopilotChat").ask(input)
+            end
+          end)
         end,
         desc = "Quick Chat (CopilotChat)",
         mode = { "n", "v" },
       },
-      -- Show prompts actions with telescope
-      { "<leader>ap", M.pick("prompt"), desc = "Prompt Actions (CopilotChat)", mode = { "n", "v" } },
+      {
+        "<leader>ap",
+        function()
+          require("CopilotChat").select_prompt()
+        end,
+        desc = "Prompt Actions (CopilotChat)",
+        mode = { "n", "v" },
+      },
     },
     config = function(_, opts)
       local chat = require("CopilotChat")

From ec5981dfb1222c3bf246d9bcaa713d5cfa486fbd Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Sat, 1 Mar 2025 14:22:16 +0000
Subject: [PATCH 110/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 881984e8..b5d95b12 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2025 February 22
+*LazyVim.txt*               For Neovim              Last change: 2025 March 01
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From c20c4022958780617424a090eee2360d560eb939 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 12 May 2025 10:39:04 +0200
Subject: [PATCH 111/341] fix(mason): rename and pin to v1

---
 lua/lazyvim/plugins/extras/formatting/biome.lua    | 2 +-
 lua/lazyvim/plugins/extras/formatting/black.lua    | 2 +-
 lua/lazyvim/plugins/extras/formatting/prettier.lua | 2 +-
 lua/lazyvim/plugins/extras/lang/ansible.lua        | 2 +-
 lua/lazyvim/plugins/extras/lang/clangd.lua         | 2 +-
 lua/lazyvim/plugins/extras/lang/elm.lua            | 2 +-
 lua/lazyvim/plugins/extras/lang/go.lua             | 6 +++---
 lua/lazyvim/plugins/extras/lang/haskell.lua        | 4 ++--
 lua/lazyvim/plugins/extras/lang/java.lua           | 2 +-
 lua/lazyvim/plugins/extras/lang/kotlin.lua         | 6 +++---
 lua/lazyvim/plugins/extras/lang/markdown.lua       | 2 +-
 lua/lazyvim/plugins/extras/lang/omnisharp.lua      | 2 +-
 lua/lazyvim/plugins/extras/lang/php.lua            | 2 +-
 lua/lazyvim/plugins/extras/lang/ruby.lua           | 2 +-
 lua/lazyvim/plugins/extras/lang/rust.lua           | 2 +-
 lua/lazyvim/plugins/extras/lang/sql.lua            | 2 +-
 lua/lazyvim/plugins/extras/lang/terraform.lua      | 2 +-
 lua/lazyvim/plugins/extras/lang/typescript.lua     | 2 +-
 lua/lazyvim/plugins/extras/util/dot.lua            | 2 +-
 lua/lazyvim/plugins/extras/util/gitui.lua          | 2 +-
 lua/lazyvim/plugins/lsp/init.lua                   | 8 ++++++--
 lua/lazyvim/util/plugin.lua                        | 2 ++
 tests/extras/extra_spec.lua                        | 4 ++--
 tests/minit.lua                                    | 4 ++--
 24 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/formatting/biome.lua b/lua/lazyvim/plugins/extras/formatting/biome.lua
index 1a4e274c..91e488ca 100644
--- a/lua/lazyvim/plugins/extras/formatting/biome.lua
+++ b/lua/lazyvim/plugins/extras/formatting/biome.lua
@@ -24,7 +24,7 @@ local supported = {
 
 return {
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "biome" } },
   },
 
diff --git a/lua/lazyvim/plugins/extras/formatting/black.lua b/lua/lazyvim/plugins/extras/formatting/black.lua
index 769c3009..29289393 100644
--- a/lua/lazyvim/plugins/extras/formatting/black.lua
+++ b/lua/lazyvim/plugins/extras/formatting/black.lua
@@ -1,6 +1,6 @@
 return {
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = function(_, opts)
       table.insert(opts.ensure_installed, "black")
     end,
diff --git a/lua/lazyvim/plugins/extras/formatting/prettier.lua b/lua/lazyvim/plugins/extras/formatting/prettier.lua
index 855dc258..6edd414c 100644
--- a/lua/lazyvim/plugins/extras/formatting/prettier.lua
+++ b/lua/lazyvim/plugins/extras/formatting/prettier.lua
@@ -58,7 +58,7 @@ M.has_parser = LazyVim.memoize(M.has_parser)
 
 return {
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "prettier" } },
   },
 
diff --git a/lua/lazyvim/plugins/extras/lang/ansible.lua b/lua/lazyvim/plugins/extras/lang/ansible.lua
index 29d1711a..0d20b02a 100644
--- a/lua/lazyvim/plugins/extras/lang/ansible.lua
+++ b/lua/lazyvim/plugins/extras/lang/ansible.lua
@@ -6,7 +6,7 @@ return {
     })
   end,
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "ansible-lint" } },
   },
   {
diff --git a/lua/lazyvim/plugins/extras/lang/clangd.lua b/lua/lazyvim/plugins/extras/lang/clangd.lua
index ae245d54..33dc4ed4 100644
--- a/lua/lazyvim/plugins/extras/lang/clangd.lua
+++ b/lua/lazyvim/plugins/extras/lang/clangd.lua
@@ -117,7 +117,7 @@ return {
     optional = true,
     dependencies = {
       -- Ensure C/C++ debugger is installed
-      "williamboman/mason.nvim",
+      "mason-org/mason.nvim",
       optional = true,
       opts = { ensure_installed = { "codelldb" } },
     },
diff --git a/lua/lazyvim/plugins/extras/lang/elm.lua b/lua/lazyvim/plugins/extras/lang/elm.lua
index 9e21ab0a..81cc4de6 100644
--- a/lua/lazyvim/plugins/extras/lang/elm.lua
+++ b/lua/lazyvim/plugins/extras/lang/elm.lua
@@ -10,7 +10,7 @@ return {
   },
 
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "elm-format" } },
   },
 
diff --git a/lua/lazyvim/plugins/extras/lang/go.lua b/lua/lazyvim/plugins/extras/lang/go.lua
index bf3b22ee..ff8def2e 100644
--- a/lua/lazyvim/plugins/extras/lang/go.lua
+++ b/lua/lazyvim/plugins/extras/lang/go.lua
@@ -75,7 +75,7 @@ return {
   },
   -- Ensure Go tools are installed
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "goimports", "gofumpt" } },
   },
   {
@@ -83,7 +83,7 @@ return {
     optional = true,
     dependencies = {
       {
-        "williamboman/mason.nvim",
+        "mason-org/mason.nvim",
         opts = { ensure_installed = { "gomodifytags", "impl" } },
       },
     },
@@ -111,7 +111,7 @@ return {
     optional = true,
     dependencies = {
       {
-        "williamboman/mason.nvim",
+        "mason-org/mason.nvim",
         opts = { ensure_installed = { "delve" } },
       },
       {
diff --git a/lua/lazyvim/plugins/extras/lang/haskell.lua b/lua/lazyvim/plugins/extras/lang/haskell.lua
index 77b0413a..a599d310 100644
--- a/lua/lazyvim/plugins/extras/lang/haskell.lua
+++ b/lua/lazyvim/plugins/extras/lang/haskell.lua
@@ -28,7 +28,7 @@ return {
   },
 
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "haskell-language-server" } },
   },
 
@@ -37,7 +37,7 @@ return {
     optional = true,
     dependencies = {
       {
-        "williamboman/mason.nvim",
+        "mason-org/mason.nvim",
         opts = { ensure_installed = { "haskell-debug-adapter" } },
       },
     },
diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua
index 236c86c9..8098b6b3 100644
--- a/lua/lazyvim/plugins/extras/lang/java.lua
+++ b/lua/lazyvim/plugins/extras/lang/java.lua
@@ -56,7 +56,7 @@ return {
     end,
     dependencies = {
       {
-        "williamboman/mason.nvim",
+        "mason-org/mason.nvim",
         opts = { ensure_installed = { "java-debug-adapter", "java-test" } },
       },
     },
diff --git a/lua/lazyvim/plugins/extras/lang/kotlin.lua b/lua/lazyvim/plugins/extras/lang/kotlin.lua
index a15f3cc4..3c6be754 100644
--- a/lua/lazyvim/plugins/extras/lang/kotlin.lua
+++ b/lua/lazyvim/plugins/extras/lang/kotlin.lua
@@ -14,7 +14,7 @@ return {
   end,
   -- Add packages(linting, debug adapter)
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "ktlint" } },
   },
   -- Add syntax highlighting
@@ -35,7 +35,7 @@ return {
   {
     "mfussenegger/nvim-lint",
     optional = true,
-    dependencies = "williamboman/mason.nvim",
+    dependencies = "mason-org/mason.nvim",
     opts = {
       linters_by_ft = { kotlin = { "ktlint" } },
     },
@@ -64,7 +64,7 @@ return {
   {
     "mfussenegger/nvim-dap",
     optional = true,
-    dependencies = "williamboman/mason.nvim",
+    dependencies = "mason-org/mason.nvim",
     opts = function()
       local dap = require("dap")
       if not dap.adapters.kotlin then
diff --git a/lua/lazyvim/plugins/extras/lang/markdown.lua b/lua/lazyvim/plugins/extras/lang/markdown.lua
index 8b07985b..33e9e457 100644
--- a/lua/lazyvim/plugins/extras/lang/markdown.lua
+++ b/lua/lazyvim/plugins/extras/lang/markdown.lua
@@ -40,7 +40,7 @@ return {
     },
   },
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "markdownlint-cli2", "markdown-toc" } },
   },
   {
diff --git a/lua/lazyvim/plugins/extras/lang/omnisharp.lua b/lua/lazyvim/plugins/extras/lang/omnisharp.lua
index 3881e6a4..07ba0490 100644
--- a/lua/lazyvim/plugins/extras/lang/omnisharp.lua
+++ b/lua/lazyvim/plugins/extras/lang/omnisharp.lua
@@ -36,7 +36,7 @@ return {
     },
   },
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "csharpier", "netcoredbg" } },
   },
   {
diff --git a/lua/lazyvim/plugins/extras/lang/php.lua b/lua/lazyvim/plugins/extras/lang/php.lua
index 70814eae..5a2835aa 100644
--- a/lua/lazyvim/plugins/extras/lang/php.lua
+++ b/lua/lazyvim/plugins/extras/lang/php.lua
@@ -35,7 +35,7 @@ return {
   },
 
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = {
       ensure_installed = {
         "phpcs",
diff --git a/lua/lazyvim/plugins/extras/lang/ruby.lua b/lua/lazyvim/plugins/extras/lang/ruby.lua
index 9e21331e..4224e6d8 100644
--- a/lua/lazyvim/plugins/extras/lang/ruby.lua
+++ b/lua/lazyvim/plugins/extras/lang/ruby.lua
@@ -48,7 +48,7 @@ return {
     },
   },
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "erb-formatter", "erb-lint" } },
   },
   {
diff --git a/lua/lazyvim/plugins/extras/lang/rust.lua b/lua/lazyvim/plugins/extras/lang/rust.lua
index e5304b56..0adddf18 100644
--- a/lua/lazyvim/plugins/extras/lang/rust.lua
+++ b/lua/lazyvim/plugins/extras/lang/rust.lua
@@ -43,7 +43,7 @@ return {
 
   -- Ensure Rust debugger is installed
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     optional = true,
     opts = function(_, opts)
       opts.ensure_installed = opts.ensure_installed or {}
diff --git a/lua/lazyvim/plugins/extras/lang/sql.lua b/lua/lazyvim/plugins/extras/lang/sql.lua
index 8e69374c..070d26ff 100644
--- a/lua/lazyvim/plugins/extras/lang/sql.lua
+++ b/lua/lazyvim/plugins/extras/lang/sql.lua
@@ -143,7 +143,7 @@ return {
 
   -- Linters & formatters
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "sqlfluff" } },
   },
   {
diff --git a/lua/lazyvim/plugins/extras/lang/terraform.lua b/lua/lazyvim/plugins/extras/lang/terraform.lua
index 8ae3f843..362dfc53 100644
--- a/lua/lazyvim/plugins/extras/lang/terraform.lua
+++ b/lua/lazyvim/plugins/extras/lang/terraform.lua
@@ -20,7 +20,7 @@ return {
   },
   -- ensure terraform tools are installed
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "tflint" } },
   },
   {
diff --git a/lua/lazyvim/plugins/extras/lang/typescript.lua b/lua/lazyvim/plugins/extras/lang/typescript.lua
index 6d7ae673..f7cc3231 100644
--- a/lua/lazyvim/plugins/extras/lang/typescript.lua
+++ b/lua/lazyvim/plugins/extras/lang/typescript.lua
@@ -194,7 +194,7 @@ return {
     optional = true,
     dependencies = {
       {
-        "williamboman/mason.nvim",
+        "mason-org/mason.nvim",
         opts = function(_, opts)
           opts.ensure_installed = opts.ensure_installed or {}
           table.insert(opts.ensure_installed, "js-debug-adapter")
diff --git a/lua/lazyvim/plugins/extras/util/dot.lua b/lua/lazyvim/plugins/extras/util/dot.lua
index e24b9fe0..2c2a97a5 100644
--- a/lua/lazyvim/plugins/extras/util/dot.lua
+++ b/lua/lazyvim/plugins/extras/util/dot.lua
@@ -18,7 +18,7 @@ return {
     },
   },
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "shellcheck" } },
   },
   -- add some stuff to treesitter
diff --git a/lua/lazyvim/plugins/extras/util/gitui.lua b/lua/lazyvim/plugins/extras/util/gitui.lua
index e0dd6049..524812a4 100644
--- a/lua/lazyvim/plugins/extras/util/gitui.lua
+++ b/lua/lazyvim/plugins/extras/util/gitui.lua
@@ -2,7 +2,7 @@ return {
 
   -- Ensure GitUI tool is installed
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "gitui" } },
     keys = {
       {
diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index 6ba4597f..b5cba5f1 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -5,7 +5,7 @@ return {
     event = "LazyFile",
     dependencies = {
       "mason.nvim",
-      { "williamboman/mason-lspconfig.nvim", config = function() end },
+      { "mason-org/mason-lspconfig.nvim", config = function() end },
     },
     opts = function()
       ---@class PluginLspOpts
@@ -257,7 +257,7 @@ return {
   -- cmdline tools and lsp servers
   {
 
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     cmd = "Mason",
     keys = { { "<leader>cm", "<cmd>Mason<cr>", desc = "Mason" } },
     build = ":MasonUpdate",
@@ -292,4 +292,8 @@ return {
       end)
     end,
   },
+
+  -- pin to v1 for now
+  { "mason-org/mason.nvim", version = "^1.0.0" },
+  { "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
 }
diff --git a/lua/lazyvim/util/plugin.lua b/lua/lazyvim/util/plugin.lua
index e6cae997..9fede549 100644
--- a/lua/lazyvim/util/plugin.lua
+++ b/lua/lazyvim/util/plugin.lua
@@ -35,6 +35,8 @@ M.renames = {
   ["romgrk/nvim-treesitter-context"] = "nvim-treesitter/nvim-treesitter-context",
   ["glepnir/dashboard-nvim"] = "nvimdev/dashboard-nvim",
   ["markdown.nvim"] = "render-markdown.nvim",
+  ["williamboman/mason.nvim"] = "mason-org/mason.nvim",
+  ["williamboman/mason-lspconfig.nvim"] = "mason-org/mason-lspconfig.nvim",
 }
 
 function M.save_core()
diff --git a/tests/extras/extra_spec.lua b/tests/extras/extra_spec.lua
index fa2fc9de..2afb6b94 100644
--- a/tests/extras/extra_spec.lua
+++ b/tests/extras/extra_spec.lua
@@ -44,7 +44,7 @@ describe("Extra", function()
         local mod = require(extra.modname)
         assert.is_not_nil(mod)
         local spec = Plugin.Spec.new({
-          { "williamboman/mason.nvim", opts = { ensure_installed = {} } },
+          { "mason-org/mason.nvim", opts = { ensure_installed = {} } },
           { "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } },
           mod,
         }, { optional = true })
@@ -60,7 +60,7 @@ describe("Extra", function()
 
       local mod = require(extra.modname)
       local spec = Plugin.Spec.new({
-        { "williamboman/mason.nvim", opts = { ensure_installed = {} } },
+        { "mason-org/mason.nvim", opts = { ensure_installed = {} } },
         { "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } },
         mod,
       }, { optional = true })
diff --git a/tests/minit.lua b/tests/minit.lua
index 88cb4185..3eb3a8b4 100644
--- a/tests/minit.lua
+++ b/tests/minit.lua
@@ -8,8 +8,8 @@ require("lazy.minit").setup({
   spec = {
     { dir = vim.uv.cwd() },
     "LazyVim/starter",
-    "williamboman/mason-lspconfig.nvim",
-    "williamboman/mason.nvim",
+    "mason-org/mason-lspconfig.nvim",
+    "mason-org/mason.nvim",
     "nvim-treesitter/nvim-treesitter",
     { "echasnovski/mini.icons", opts = {} },
   },

From 70b4615cb242b2d53150b34181a5124d8088325f Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 12 May 2025 10:58:20 +0200
Subject: [PATCH 112/341] test(mason): fix tests

---
 tests/minit.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/minit.lua b/tests/minit.lua
index 3eb3a8b4..807a2ac5 100644
--- a/tests/minit.lua
+++ b/tests/minit.lua
@@ -7,10 +7,10 @@ load(vim.fn.system("curl -s https://raw.githubusercontent.com/folke/lazy.nvim/ma
 require("lazy.minit").setup({
   spec = {
     { dir = vim.uv.cwd() },
-    "LazyVim/starter",
-    "mason-org/mason-lspconfig.nvim",
-    "mason-org/mason.nvim",
-    "nvim-treesitter/nvim-treesitter",
+    { "LazyVim/starter" },
+    { "nvim-treesitter/nvim-treesitter" },
+    { "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
+    { "mason-org/mason.nvim", version = "^1.0.0" },
     { "echasnovski/mini.icons", opts = {} },
   },
 })

From 1b1c7d0f456bcfdcee838992572774b62e28b851 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Mon, 12 May 2025 08:59:27 +0000
Subject: [PATCH 113/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index b5d95b12..0e41c7bf 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*               For Neovim              Last change: 2025 March 01
+*LazyVim.txt*                For Neovim               Last change: 2025 May 12
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 25abbf546d564dc484cf903804661ba12de45507 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 12 May 2025 11:00:03 +0200
Subject: [PATCH 114/341] chore(main): release 14.15.0 (#5623)

:robot: I have created a release *beep* *boop*
---


##
[14.15.0](https://github.com/LazyVim/LazyVim/compare/v14.14.0...v14.15.0)
(2025-05-12)


### Features

* **chezmoi:** enhance fzf-lua chezmoi picker and add snacks.dasbhoard
entry ([#5275](https://github.com/LazyVim/LazyVim/issues/5275))
([759a19e](https://github.com/LazyVim/LazyVim/commit/759a19e785735eb8513b4f8d4483ec5ab1b75307))
* **keymaps:** show lang when opening treesitter inspect
([9c59668](https://github.com/LazyVim/LazyVim/commit/9c596681f684c549e69652a5c77a68bd5ecc93e3))
* **octo:** add support for snacks picker
([#5625](https://github.com/LazyVim/LazyVim/issues/5625))
([16a7724](https://github.com/LazyVim/LazyVim/commit/16a772452a515790c3304b358dd66a618fda3260))
* **snippets:** mini.snippets standalone and blink.resubscribe
([#5507](https://github.com/LazyVim/LazyVim/issues/5507))
([f2f2aea](https://github.com/LazyVim/LazyVim/commit/f2f2aea6722b530281b476c08ec60f2d320f1c3d))


### Bug Fixes

* **blink:** make sure to use `LazyVim.config.icons.kinds`
([#5668](https://github.com/LazyVim/LazyVim/issues/5668))
([771089f](https://github.com/LazyVim/LazyVim/commit/771089f6928512ab0f431e9db04e7dc802a5e1a5))
* **blink:** remove unnecessary `sources` from `cmdline`
([#5620](https://github.com/LazyVim/LazyVim/issues/5620))
([5b94baa](https://github.com/LazyVim/LazyVim/commit/5b94baa1d2e7d8ec7e9a9cab82fabd8c3655d369))
* **copilot-chat:** switch from deprecated picker integrations
([#5707](https://github.com/LazyVim/LazyVim/issues/5707))
([b0334fd](https://github.com/LazyVim/LazyVim/commit/b0334fd57cdb920e03afab3c1940114ad43e4fbe))
* **mason:** rename and pin to v1
([c20c402](https://github.com/LazyVim/LazyVim/commit/c20c4022958780617424a090eee2360d560eb939))
* **snacks.picker:** remove redundant leader-gc keymap. Closes
[#5646](https://github.com/LazyVim/LazyVim/issues/5646)
([606b964](https://github.com/LazyVim/LazyVim/commit/606b96466eeb39b1c1bb576c9b99041b64705f43))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 19 +++++++++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 926af9ee..5f6e5685 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "14.14.0"
+  ".": "14.15.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90fbb7c5..873ac748 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## [14.15.0](https://github.com/LazyVim/LazyVim/compare/v14.14.0...v14.15.0) (2025-05-12)
+
+
+### Features
+
+* **chezmoi:** enhance fzf-lua chezmoi picker and add snacks.dasbhoard entry ([#5275](https://github.com/LazyVim/LazyVim/issues/5275)) ([759a19e](https://github.com/LazyVim/LazyVim/commit/759a19e785735eb8513b4f8d4483ec5ab1b75307))
+* **keymaps:** show lang when opening treesitter inspect ([9c59668](https://github.com/LazyVim/LazyVim/commit/9c596681f684c549e69652a5c77a68bd5ecc93e3))
+* **octo:** add support for snacks picker ([#5625](https://github.com/LazyVim/LazyVim/issues/5625)) ([16a7724](https://github.com/LazyVim/LazyVim/commit/16a772452a515790c3304b358dd66a618fda3260))
+* **snippets:** mini.snippets standalone and blink.resubscribe ([#5507](https://github.com/LazyVim/LazyVim/issues/5507)) ([f2f2aea](https://github.com/LazyVim/LazyVim/commit/f2f2aea6722b530281b476c08ec60f2d320f1c3d))
+
+
+### Bug Fixes
+
+* **blink:** make sure to use `LazyVim.config.icons.kinds` ([#5668](https://github.com/LazyVim/LazyVim/issues/5668)) ([771089f](https://github.com/LazyVim/LazyVim/commit/771089f6928512ab0f431e9db04e7dc802a5e1a5))
+* **blink:** remove unnecessary `sources` from `cmdline` ([#5620](https://github.com/LazyVim/LazyVim/issues/5620)) ([5b94baa](https://github.com/LazyVim/LazyVim/commit/5b94baa1d2e7d8ec7e9a9cab82fabd8c3655d369))
+* **copilot-chat:** switch from deprecated picker integrations ([#5707](https://github.com/LazyVim/LazyVim/issues/5707)) ([b0334fd](https://github.com/LazyVim/LazyVim/commit/b0334fd57cdb920e03afab3c1940114ad43e4fbe))
+* **mason:** rename and pin to v1 ([c20c402](https://github.com/LazyVim/LazyVim/commit/c20c4022958780617424a090eee2360d560eb939))
+* **snacks.picker:** remove redundant leader-gc keymap. Closes [#5646](https://github.com/LazyVim/LazyVim/issues/5646) ([606b964](https://github.com/LazyVim/LazyVim/commit/606b96466eeb39b1c1bb576c9b99041b64705f43))
+
 ## [14.14.0](https://github.com/LazyVim/LazyVim/compare/v14.13.0...v14.14.0) (2025-02-15)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 56f2397e..73c35f1f 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "14.14.0" -- x-release-please-version
+M.version = "14.15.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 55e9944e2b1e152b5acdc9cc015978a905fc2966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Baptiste=20GAZ=C3=89?= <bpt.gaze@gmail.com>
Date: Mon, 15 Sep 2025 07:15:34 +0200
Subject: [PATCH 115/341] fix(extras.ai.copilot): update status retrieval for
 lualine (#5900)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description

Following copilot.lua refactoring in
https://github.com/zbirenbaum/copilot.lua/pull/431, lualine is unable to
refresh.

We face the following error

```
  Error  15:55:22 msg_show.lua_error Error executing vim.schedule lua callback: ...share/nvim/lazy/lualine.nvim/lua/lualine/utils/utils.lua:211: lualine: Failed to refresh statusline:
.../.local/share/nvim/lazy/lualine.nvim/lua/lualine.lua:415: Error executing lua: ...m/lazy/LazyVim/lua/lazyvim/plugins/extras/ai/copilot.lua:54: attempt to index field 'status' (a nil value)
stack traceback:
	...m/lazy/LazyVim/lua/lazyvim/plugins/extras/ai/copilot.lua:54: in function 'status'
	...cal/share/nvim/lazy/LazyVim/lua/lazyvim/util/lualine.lua:17: in function 'cond'
	...l/share/nvim/lazy/lualine.nvim/lua/lualine/component.lua:275: in function 'draw'
	...are/nvim/lazy/lualine.nvim/lua/lualine/utils/section.lua:26: in function 'draw_section'
	.../.local/share/nvim/lazy/lualine.nvim/lua/lualine.lua:167: in function 'statusline'
	.../.local/share/nvim/lazy/lualine.nvim/lua/lualine.lua:309: in function <...gaze/.local/share/nvim/lazy/lualine.nvim/lua/lualine.lua:290>
	[C]: in function 'nvim_win_call'
	.../.local/share/nvim/lazy/lualine.nvim/lua/lualine.lua:415: in function 'refresh'
	.../.local/share/nvim/lazy/lualine.nvim/lua/lualine.lua:491: in function <.../.local/share/nvim/lazy/lualine.nvim/lua/lualine.lua:490>
	[C]: in function 'pcall'
	...share/nvim/lazy/lualine.nvim/lua/lualine/utils/utils.lua:214: in function ''
	vim/_editor.lua: in function <vim/_editor.lua:0>
```

## Related Issue(s)

#5899

## Screenshots

![Screenshot 2025-04-05 at 16 16
56](https://github.com/user-attachments/assets/3dc28dc6-1622-41ef-9e70-380a37064da4)


## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/ai/copilot.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/ai/copilot.lua b/lua/lazyvim/plugins/extras/ai/copilot.lua
index 4f1d54f2..deebcd7d 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot.lua
@@ -51,7 +51,7 @@ return {
         LazyVim.lualine.status(LazyVim.config.icons.kinds.Copilot, function()
           local clients = package.loaded["copilot"] and LazyVim.lsp.get_clients({ name = "copilot", bufnr = 0 }) or {}
           if #clients > 0 then
-            local status = require("copilot.api").status.data.status
+            local status = require("copilot.status").data.status
             return (status == "InProgress" and "pending") or (status == "Warning" and "error") or "ok"
           end
         end)

From b68e478d2319adf32f72ddaa2a921ae5825790d4 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Mon, 15 Sep 2025 05:16:35 +0000
Subject: [PATCH 116/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 0e41c7bf..58aa462d 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*                For Neovim               Last change: 2025 May 12
+*LazyVim.txt*             For Neovim            Last change: 2025 September 15
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 1a729e2d4c4162501fe13224d669a654849deb36 Mon Sep 17 00:00:00 2001
From: Jorge Villalobos <minusfive@users.noreply.github.com>
Date: Mon, 15 Sep 2025 01:16:52 -0400
Subject: [PATCH 117/341] fix(blink): use .get method to access presets (#6183)

## Description

Latest version of blink.cmp renamed the keymap.presets table which
breaks LazyVim's access to presets. This fixes it by using the
`presets.get()` method instead, which internally resolves to the correct
table and looks like the right API.

## Related Issue(s)

N/A

## Screenshots

N/A

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/coding/blink.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua
index 10b2ee62..fe45b86b 100644
--- a/lua/lazyvim/plugins/extras/coding/blink.lua
+++ b/lua/lazyvim/plugins/extras/coding/blink.lua
@@ -109,7 +109,7 @@ return {
       if not opts.keymap["<Tab>"] then
         if opts.keymap.preset == "super-tab" then -- super-tab
           opts.keymap["<Tab>"] = {
-            require("blink.cmp.keymap.presets")["super-tab"]["<Tab>"][1],
+            require("blink.cmp.keymap.presets").get("super-tab")["<Tab>"][1],
             LazyVim.cmp.map({ "snippet_forward", "ai_accept" }),
             "fallback",
           }

From 10e5bf5c5b5fb4da0afbb2d4d2b75595502c9690 Mon Sep 17 00:00:00 2001
From: Rabin Adhikari <rabin.adk1@gmail.com>
Date: Mon, 15 Sep 2025 07:18:00 +0200
Subject: [PATCH 118/341] fix(lang.python): enable venv-selector even when
 telescope is not available (#5829)

## Description

Enable the `venv-selector` plugin even when the telescope plugin is not
available. Now the `venv-selector` plugin supports `fzf-lua` and native
selection, and by default, it chooses the previous, if available.

More on this PR:
https://github.com/linux-cultist/venv-selector.nvim/pull/188

Edit: Use the main branch of the repo since it is now the most updated
branch

## Related Issue(s)

None

## Screenshots

N/A

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/python.lua | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/python.lua b/lua/lazyvim/plugins/extras/lang/python.lua
index 4c098452..3298f6dd 100644
--- a/lua/lazyvim/plugins/extras/lang/python.lua
+++ b/lua/lazyvim/plugins/extras/lang/python.lua
@@ -114,11 +114,7 @@ return {
 
   {
     "linux-cultist/venv-selector.nvim",
-    branch = "regexp", -- Use this branch for the new version
     cmd = "VenvSelect",
-    enabled = function()
-      return LazyVim.has("telescope.nvim")
-    end,
     opts = {
       settings = {
         options = {
@@ -126,7 +122,7 @@ return {
         },
       },
     },
-    --  Call config for python files and load the cached venv automatically
+    --  Call config for Python files and load the cached venv automatically
     ft = "python",
     keys = { { "<leader>cv", "<cmd>:VenvSelect<cr>", desc = "Select VirtualEnv", ft = "python" } },
   },

From bed725a054ed3e8c8c56dce7e2100335e567cf01 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 15 Sep 2025 07:44:00 +0200
Subject: [PATCH 119/341] fix(lsp): fixed deprecated warnings

---
 lua/lazyvim/plugins/lsp/keymaps.lua |  2 +-
 lua/lazyvim/util/lsp.lua            | 41 ++++++++++++++++++++++++++---
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/lua/lazyvim/plugins/lsp/keymaps.lua b/lua/lazyvim/plugins/lsp/keymaps.lua
index 318ec911..748f5b29 100644
--- a/lua/lazyvim/plugins/lsp/keymaps.lua
+++ b/lua/lazyvim/plugins/lsp/keymaps.lua
@@ -54,7 +54,7 @@ function M.has(buffer, method)
   method = method:find("/") and method or "textDocument/" .. method
   local clients = LazyVim.lsp.get_clients({ bufnr = buffer })
   for _, client in ipairs(clients) do
-    if client.supports_method(method) then
+    if client:supports_method(method) then
       return true
     end
   end
diff --git a/lua/lazyvim/util/lsp.lua b/lua/lazyvim/util/lsp.lua
index e868dcf0..51aa471a 100644
--- a/lua/lazyvim/util/lsp.lua
+++ b/lua/lazyvim/util/lsp.lua
@@ -1,16 +1,51 @@
 ---@class lazyvim.util.lsp
 local M = {}
 
----@alias lsp.Client.filter {id?: number, bufnr?: number, name?: string, method?: string, filter?:fun(client: lsp.Client):boolean}
+---@alias lsp.Client.filter {id?: number, bufnr?: number, name?: string, method?: string, filter?:fun(client: vim.lsp.Client):boolean}
+
+--- Neovim 0.11 uses a lua class for clients, while older versions use a table.
+--- Wraps older style clients to be compatible with the new style.
+---@param client vim.lsp.Client
+---@return vim.lsp.Client
+local function wrap(client)
+  local meta = getmetatable(client)
+  if meta and meta.request then
+    return client
+  end
+  ---@diagnostic disable-next-line: undefined-field
+  if client.wrapped then
+    return client
+  end
+  local methods = { "request", "supports_method", "cancel_request", "notify" }
+  -- old style
+  return setmetatable({ wrapped = true }, {
+    __index = function(_, k)
+      if k == "supports_method" then
+        -- supports_method doesn't support the bufnr argument
+        return function(_, method)
+          return client[k](method)
+        end
+      end
+      if vim.tbl_contains(methods, k) then
+        return function(_, ...)
+          return client[k](...)
+        end
+      end
+      return client[k]
+    end,
+  })
+end
 
 ---@param opts? lsp.Client.filter
 function M.get_clients(opts)
   local ret = {} ---@type vim.lsp.Client[]
   if vim.lsp.get_clients then
     ret = vim.lsp.get_clients(opts)
+    ret = vim.tbl_map(wrap, ret)
   else
     ---@diagnostic disable-next-line: deprecated
     ret = vim.lsp.get_active_clients(opts)
+    ret = vim.tbl_map(wrap, ret)
     if opts and opts.method then
       ---@param client vim.lsp.Client
       ret = vim.tbl_filter(function(client)
@@ -29,7 +64,7 @@ function M.on_attach(on_attach, name)
       local buffer = args.buf ---@type number
       local client = vim.lsp.get_client_by_id(args.data.client_id)
       if client and (not name or client.name == name) then
-        return on_attach(client, buffer)
+        return on_attach(wrap(client), buffer)
       end
     end,
   })
@@ -75,7 +110,7 @@ function M._check_methods(client, buffer)
   for method, clients in pairs(M._supports_method) do
     clients[client] = clients[client] or {}
     if not clients[client][buffer] then
-      if client.supports_method and client.supports_method(method, { bufnr = buffer }) then
+      if client.supports_method and client:supports_method(method, { bufnr = buffer }) then
         clients[client][buffer] = true
         vim.api.nvim_exec_autocmds("User", {
           pattern = "LspSupportsMethod",

From 53a2de1c8b928655b50a6ecbbe28f53e42b14f82 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 15 Sep 2025 10:55:48 +0200
Subject: [PATCH 120/341] chore(main): release 14.15.1 (#6420)

:robot: I have created a release *beep* *boop*
---


##
[14.15.1](https://github.com/LazyVim/LazyVim/compare/v14.15.0...v14.15.1)
(2025-09-15)


### Bug Fixes

* **blink:** use .get method to access presets
([#6183](https://github.com/LazyVim/LazyVim/issues/6183))
([1a729e2](https://github.com/LazyVim/LazyVim/commit/1a729e2d4c4162501fe13224d669a654849deb36))
* **extras.ai.copilot:** update status retrieval for lualine
([#5900](https://github.com/LazyVim/LazyVim/issues/5900))
([55e9944](https://github.com/LazyVim/LazyVim/commit/55e9944e2b1e152b5acdc9cc015978a905fc2966))
* **lang.python:** enable venv-selector even when telescope is not
available ([#5829](https://github.com/LazyVim/LazyVim/issues/5829))
([10e5bf5](https://github.com/LazyVim/LazyVim/commit/10e5bf5c5b5fb4da0afbb2d4d2b75595502c9690))
* **lsp:** fixed deprecated warnings
([bed725a](https://github.com/LazyVim/LazyVim/commit/bed725a054ed3e8c8c56dce7e2100335e567cf01))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 10 ++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 5f6e5685..d4bbf7f7 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "14.15.0"
+  ".": "14.15.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 873ac748..3e2be0c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## [14.15.1](https://github.com/LazyVim/LazyVim/compare/v14.15.0...v14.15.1) (2025-09-15)
+
+
+### Bug Fixes
+
+* **blink:** use .get method to access presets ([#6183](https://github.com/LazyVim/LazyVim/issues/6183)) ([1a729e2](https://github.com/LazyVim/LazyVim/commit/1a729e2d4c4162501fe13224d669a654849deb36))
+* **extras.ai.copilot:** update status retrieval for lualine ([#5900](https://github.com/LazyVim/LazyVim/issues/5900)) ([55e9944](https://github.com/LazyVim/LazyVim/commit/55e9944e2b1e152b5acdc9cc015978a905fc2966))
+* **lang.python:** enable venv-selector even when telescope is not available ([#5829](https://github.com/LazyVim/LazyVim/issues/5829)) ([10e5bf5](https://github.com/LazyVim/LazyVim/commit/10e5bf5c5b5fb4da0afbb2d4d2b75595502c9690))
+* **lsp:** fixed deprecated warnings ([bed725a](https://github.com/LazyVim/LazyVim/commit/bed725a054ed3e8c8c56dce7e2100335e567cf01))
+
 ## [14.15.0](https://github.com/LazyVim/LazyVim/compare/v14.14.0...v14.15.0) (2025-05-12)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 73c35f1f..d622dfdf 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "14.15.0" -- x-release-please-version
+M.version = "14.15.1" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From e7ce65e1bb814f79ecb45bfeca934e997e0ee42c Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 15 Sep 2025 10:58:22 +0200
Subject: [PATCH 121/341] feat!: LazyVim now requires Neovim >= 0.11 See #6421
 for more info

---
 lua/lazyvim/plugins/init.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/plugins/init.lua b/lua/lazyvim/plugins/init.lua
index c06fa9bc..a0faebcd 100644
--- a/lua/lazyvim/plugins/init.lua
+++ b/lua/lazyvim/plugins/init.lua
@@ -1,6 +1,7 @@
-if vim.fn.has("nvim-0.9.0") == 0 then
+if vim.fn.has("nvim-0.11.0") == 0 then
   vim.api.nvim_echo({
-    { "LazyVim requires Neovim >= 0.9.0\n", "ErrorMsg" },
+    { "LazyVim requires Neovim >= 0.11.0\n", "ErrorMsg" },
+    { "For more info, see: https://github.com/LazyVim/LazyVim/issues/6421\n", "Comment" },
     { "Press any key to exit", "MoreMsg" },
   }, true, {})
   vim.fn.getchar()

From 0e56786aa4772c427375a1bb86dc27baf08ded7b Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 15 Sep 2025 10:59:26 +0200
Subject: [PATCH 122/341] docs: update required Neovim version

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4d379504..fd6a3fe0 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ to tweak your config as needed, along with the convenience of a pre-configured s
 
 ## ⚡️ Requirements
 
-- Neovim >= **0.9.0** (needs to be built with **LuaJIT**)
+- Neovim >= **0.11.0** (needs to be built with **LuaJIT**)
 - Git >= **2.19.0** (for partial clones support)
 - a [Nerd Font](https://www.nerdfonts.com/) **_(optional)_**
 - a **C** compiler for `nvim-treesitter`. See [here](https://github.com/nvim-treesitter/nvim-treesitter#requirements)

From 80573196a1e526d6906dfa7d1af2fcf71317c731 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Mon, 15 Sep 2025 09:00:43 +0000
Subject: [PATCH 123/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 58aa462d..0b861808 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -53,7 +53,7 @@ FEATURES                                                    *LazyVim-features*
 
 REQUIREMENTS                                            *LazyVim-requirements*
 
-- Neovim >= **0.9.0** (needs to be built with **LuaJIT**)
+- Neovim >= **0.11.0** (needs to be built with **LuaJIT**)
 - Git >= **2.19.0** (for partial clones support)
 - a Nerd Font <https://www.nerdfonts.com/> **(optional)**
 - a **C** compiler for `nvim-treesitter`. See here <https://github.com/nvim-treesitter/nvim-treesitter#requirements>

From 3516ae736a333185f6f17b70af20b088d04cbbb6 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 15 Sep 2025 11:04:50 +0200
Subject: [PATCH 124/341] fix: remove 0.9 compat

---
 lua/lazyvim/plugins/compat/nvim-0_9.lua | 41 -------------------------
 lua/lazyvim/plugins/xtras.lua           |  8 -----
 2 files changed, 49 deletions(-)
 delete mode 100644 lua/lazyvim/plugins/compat/nvim-0_9.lua

diff --git a/lua/lazyvim/plugins/compat/nvim-0_9.lua b/lua/lazyvim/plugins/compat/nvim-0_9.lua
deleted file mode 100644
index 81514ef8..00000000
--- a/lua/lazyvim/plugins/compat/nvim-0_9.lua
+++ /dev/null
@@ -1,41 +0,0 @@
--- Compatibility with Neovim 0.9
-return {
-  -- Use LuaSnip instead of native snippets
-  { "garymjr/nvim-snippets", enabled = false },
-  { import = "lazyvim.plugins.extras.coding.luasnip" },
-
-  -- Use nvim-cmp instead of blink.cmp
-  { import = "lazyvim.plugins.extras.coding.nvim-cmp" },
-
-  -- Use mini.comment instead of ts-comments
-  { "folke/ts-comments.nvim", enabled = false },
-  { import = "lazyvim.plugins.extras.coding.mini-comment" },
-
-  -- Use neodev-types with lazydev
-  { "folke/neodev.nvim", config = function() end },
-  {
-    "folke/lazydev.nvim",
-    opts = function(_, opts)
-      opts.library = opts.library or {}
-      table.insert(opts.library, { "neodev.nvim/types/stable" })
-    end,
-    config = function(_, opts)
-      -- force lazydev to load on Neovim 0.9
-      require("lazydev.config").have_0_10 = true
-      require("lazydev").setup(opts)
-    end,
-  },
-  {
-    "neovim/nvim-lspconfig",
-    dependencies = {},
-  },
-
-  -- dummy import to save core imports
-  {
-    import = "foobar",
-    enabled = function()
-      LazyVim.plugin.save_core()
-      return false
-    end,
-  },
-}
diff --git a/lua/lazyvim/plugins/xtras.lua b/lua/lazyvim/plugins/xtras.lua
index bb061d80..3f71b2aa 100644
--- a/lua/lazyvim/plugins/xtras.lua
+++ b/lua/lazyvim/plugins/xtras.lua
@@ -42,15 +42,7 @@ end
 ---@type string[]
 extras = LazyVim.dedup(extras)
 
-local version = vim.version()
-local v = version.major .. "_" .. version.minor
-
-local compat = { "0_9" }
-
 LazyVim.plugin.save_core()
-if vim.tbl_contains(compat, v) then
-  table.insert(extras, 1, "lazyvim.plugins.compat.nvim-" .. v)
-end
 if vim.g.vscode then
   table.insert(extras, 1, "lazyvim.plugins.extras.vscode")
 end

From a7a94c50ac1ae5e791ce88fab455d5c6edee385e Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 15 Sep 2025 11:16:51 +0200
Subject: [PATCH 125/341] refactor: remove all <0.11 compat code

---
 lua/lazyvim/config/init.lua                   |  2 +-
 lua/lazyvim/config/keymaps.lua                | 10 ---
 lua/lazyvim/config/options.lua                | 14 ++--
 lua/lazyvim/health.lua                        |  9 +--
 lua/lazyvim/plugins/extras/editor/navic.lua   |  2 +-
 lua/lazyvim/plugins/extras/lang/ruby.lua      |  4 --
 lua/lazyvim/plugins/extras/lang/rust.lua      |  1 -
 lua/lazyvim/plugins/extras/lang/svelte.lua    |  5 --
 .../plugins/extras/lang/typescript.lua        |  4 +-
 lua/lazyvim/plugins/extras/lang/yaml.lua      | 10 ---
 lua/lazyvim/plugins/lsp/init.lua              | 64 ++++++++-----------
 lua/lazyvim/util/lsp.lua                      | 54 ++--------------
 lua/lazyvim/util/ui.lua                       |  5 --
 13 files changed, 40 insertions(+), 144 deletions(-)

diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index d622dfdf..9e0903c2 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -353,7 +353,7 @@ function M.get_defaults()
       { name = "telescope", extra = "editor.telescope" },
     },
     cmp = {
-      { name = "blink.cmp", extra = "coding.blink", enabled = vim.fn.has("nvim-0.10") == 1 },
+      { name = "blink.cmp", extra = "coding.blink" },
       { name = "nvim-cmp", extra = "coding.nvim-cmp" },
     },
     explorer = {
diff --git a/lua/lazyvim/config/keymaps.lua b/lua/lazyvim/config/keymaps.lua
index fbc7f5d1..acaf44d9 100644
--- a/lua/lazyvim/config/keymaps.lua
+++ b/lua/lazyvim/config/keymaps.lua
@@ -209,13 +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" })
-
--- native snippets. only needed on < 0.11, as 0.11 creates these by default
-if vim.fn.has("nvim-0.11") == 0 then
-  map("s", "<Tab>", function()
-    return vim.snippet.active({ direction = 1 }) and "<cmd>lua vim.snippet.jump(1)<cr>" or "<Tab>"
-  end, { expr = true, desc = "Jump Next" })
-  map({ "i", "s" }, "<S-Tab>", function()
-    return vim.snippet.active({ direction = -1 }) and "<cmd>lua vim.snippet.jump(-1)<cr>" or "<S-Tab>"
-  end, { expr = true, desc = "Jump Previous" })
-end
diff --git a/lua/lazyvim/config/options.lua b/lua/lazyvim/config/options.lua
index 0bbaacba..b5d444d0 100644
--- a/lua/lazyvim/config/options.lua
+++ b/lua/lazyvim/config/options.lua
@@ -68,7 +68,10 @@ opt.fillchars = {
   diff = "╱",
   eob = " ",
 }
+opt.foldexpr = "v:lua.require'lazyvim.util'.ui.foldexpr()"
 opt.foldlevel = 99
+opt.foldmethod = "expr"
+opt.foldtext = ""
 opt.formatexpr = "v:lua.require'lazyvim.util'.format.formatexpr()"
 opt.formatoptions = "jcroqlnt" -- tcqj
 opt.grepformat = "%f:%l:%c:%m"
@@ -95,6 +98,7 @@ opt.sidescrolloff = 8 -- Columns of context
 opt.signcolumn = "yes" -- Always show the signcolumn, otherwise it would shift the text each time
 opt.smartcase = true -- Don't ignore case with capitals
 opt.smartindent = true -- Insert indents automatically
+opt.smoothscroll = true
 opt.spelllang = { "en" }
 opt.splitbelow = true -- Put new windows below current
 opt.splitkeep = "screen"
@@ -111,15 +115,5 @@ opt.wildmode = "longest:full,full" -- Command-line completion mode
 opt.winminwidth = 5 -- Minimum window width
 opt.wrap = false -- Disable line wrap
 
-if vim.fn.has("nvim-0.10") == 1 then
-  opt.smoothscroll = true
-  opt.foldexpr = "v:lua.require'lazyvim.util'.ui.foldexpr()"
-  opt.foldmethod = "expr"
-  opt.foldtext = ""
-else
-  opt.foldmethod = "indent"
-  opt.foldtext = "v:lua.require'lazyvim.util'.ui.foldtext()"
-end
-
 -- Fix markdown indentation settings
 vim.g.markdown_recommended_style = 0
diff --git a/lua/lazyvim/health.lua b/lua/lazyvim/health.lua
index 9fdc5a56..716c60a8 100644
--- a/lua/lazyvim/health.lua
+++ b/lua/lazyvim/health.lua
@@ -8,13 +8,10 @@ local error = vim.health.error or vim.health.report_error
 function M.check()
   start("LazyVim")
 
-  if vim.fn.has("nvim-0.9.0") == 1 then
-    ok("Using Neovim >= 0.9.0")
-    if vim.fn.has("nvim-0.10.0") == 0 then
-      warn("Use Neovim >= 0.10.0 for the best experience")
-    end
+  if vim.fn.has("nvim-0.11.0") == 1 then
+    ok("Using Neovim >= 0.11.0")
   else
-    error("Neovim >= 0.9.0 is required")
+    error("Neovim >= 0.11.0 is required")
   end
 
   for _, cmd in ipairs({ "git", "rg", { "fd", "fdfind" }, "lazygit", "fzf", "curl" }) do
diff --git a/lua/lazyvim/plugins/extras/editor/navic.lua b/lua/lazyvim/plugins/extras/editor/navic.lua
index e25d1b51..91ec203c 100644
--- a/lua/lazyvim/plugins/extras/editor/navic.lua
+++ b/lua/lazyvim/plugins/extras/editor/navic.lua
@@ -8,7 +8,7 @@ return {
     init = function()
       vim.g.navic_silence = true
       LazyVim.lsp.on_attach(function(client, buffer)
-        if client.supports_method("textDocument/documentSymbol") then
+        if client:supports_method("textDocument/documentSymbol") then
           require("nvim-navic").attach(client, buffer)
         end
       end)
diff --git a/lua/lazyvim/plugins/extras/lang/ruby.lua b/lua/lazyvim/plugins/extras/lang/ruby.lua
index 4224e6d8..65620f4e 100644
--- a/lua/lazyvim/plugins/extras/lang/ruby.lua
+++ b/lua/lazyvim/plugins/extras/lang/ruby.lua
@@ -6,10 +6,6 @@ if lazyvim_docs then
 end
 
 local lsp = vim.g.lazyvim_ruby_lsp or "ruby_lsp"
-if vim.fn.has("nvim-0.10") == 0 then
-  -- ruby_lsp does not work well with Neovim < 0.10
-  lsp = vim.g.lazyvim_ruby_lsp or "solargraph"
-end
 local formatter = vim.g.lazyvim_ruby_formatter or "rubocop"
 
 return {
diff --git a/lua/lazyvim/plugins/extras/lang/rust.lua b/lua/lazyvim/plugins/extras/lang/rust.lua
index 0adddf18..eca1b597 100644
--- a/lua/lazyvim/plugins/extras/lang/rust.lua
+++ b/lua/lazyvim/plugins/extras/lang/rust.lua
@@ -56,7 +56,6 @@ return {
 
   {
     "mrcjkb/rustaceanvim",
-    version = vim.fn.has("nvim-0.10.0") == 0 and "^4" or false,
     ft = { "rust" },
     opts = {
       server = {
diff --git a/lua/lazyvim/plugins/extras/lang/svelte.lua b/lua/lazyvim/plugins/extras/lang/svelte.lua
index 565e50e5..4060e2f3 100644
--- a/lua/lazyvim/plugins/extras/lang/svelte.lua
+++ b/lua/lazyvim/plugins/extras/lang/svelte.lua
@@ -31,11 +31,6 @@ return {
               desc = "Organize Imports",
             },
           },
-          capabilities = {
-            workspace = {
-              didChangeWatchedFiles = vim.fn.has("nvim-0.10") == 0 and { dynamicRegistration = true },
-            },
-          },
         },
       },
     },
diff --git a/lua/lazyvim/plugins/extras/lang/typescript.lua b/lua/lazyvim/plugins/extras/lang/typescript.lua
index f7cc3231..f9132807 100644
--- a/lua/lazyvim/plugins/extras/lang/typescript.lua
+++ b/lua/lazyvim/plugins/extras/lang/typescript.lua
@@ -137,14 +137,14 @@ return {
               local action, uri, range = unpack(command.arguments)
 
               local function move(newf)
-                client.request("workspace/executeCommand", {
+                client:request("workspace/executeCommand", {
                   command = command.command,
                   arguments = { action, uri, range, newf },
                 })
               end
 
               local fname = vim.uri_to_fname(uri)
-              client.request("workspace/executeCommand", {
+              client:request("workspace/executeCommand", {
                 command = "typescript.tsserverRequest",
                 arguments = {
                   "getMoveToRefactoringFileSuggestions",
diff --git a/lua/lazyvim/plugins/extras/lang/yaml.lua b/lua/lazyvim/plugins/extras/lang/yaml.lua
index 9a3aadb8..b460f3c5 100644
--- a/lua/lazyvim/plugins/extras/lang/yaml.lua
+++ b/lua/lazyvim/plugins/extras/lang/yaml.lua
@@ -55,16 +55,6 @@ return {
           },
         },
       },
-      setup = {
-        yamlls = function()
-          -- Neovim < 0.10 does not have dynamic registration for formatting
-          if vim.fn.has("nvim-0.10") == 0 then
-            LazyVim.lsp.on_attach(function(client, _)
-              client.server_capabilities.documentFormattingProvider = true
-            end, "yamlls")
-          end
-        end,
-      },
     },
   },
 }
diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index b5cba5f1..54f410fc 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -125,53 +125,39 @@ return {
       LazyVim.lsp.setup()
       LazyVim.lsp.on_dynamic_capability(require("lazyvim.plugins.lsp.keymaps").on_attach)
 
-      -- diagnostics signs
-      if vim.fn.has("nvim-0.10.0") == 0 then
-        if type(opts.diagnostics.signs) ~= "boolean" then
-          for severity, icon in pairs(opts.diagnostics.signs.text) do
-            local name = vim.diagnostic.severity[severity]:lower():gsub("^%l", string.upper)
-            name = "DiagnosticSign" .. name
-            vim.fn.sign_define(name, { text = icon, texthl = name, numhl = "" })
+      -- inlay hints
+      if opts.inlay_hints.enabled then
+        LazyVim.lsp.on_supports_method("textDocument/inlayHint", function(client, buffer)
+          if
+            vim.api.nvim_buf_is_valid(buffer)
+            and vim.bo[buffer].buftype == ""
+            and not vim.tbl_contains(opts.inlay_hints.exclude, vim.bo[buffer].filetype)
+          then
+            vim.lsp.inlay_hint.enable(true, { bufnr = buffer })
           end
-        end
+        end)
       end
 
-      if vim.fn.has("nvim-0.10") == 1 then
-        -- inlay hints
-        if opts.inlay_hints.enabled then
-          LazyVim.lsp.on_supports_method("textDocument/inlayHint", function(client, buffer)
-            if
-              vim.api.nvim_buf_is_valid(buffer)
-              and vim.bo[buffer].buftype == ""
-              and not vim.tbl_contains(opts.inlay_hints.exclude, vim.bo[buffer].filetype)
-            then
-              vim.lsp.inlay_hint.enable(true, { bufnr = buffer })
-            end
-          end)
-        end
-
-        -- code lens
-        if opts.codelens.enabled and vim.lsp.codelens then
-          LazyVim.lsp.on_supports_method("textDocument/codeLens", function(client, buffer)
-            vim.lsp.codelens.refresh()
-            vim.api.nvim_create_autocmd({ "BufEnter", "CursorHold", "InsertLeave" }, {
-              buffer = buffer,
-              callback = vim.lsp.codelens.refresh,
-            })
-          end)
-        end
+      -- code lens
+      if opts.codelens.enabled and vim.lsp.codelens then
+        LazyVim.lsp.on_supports_method("textDocument/codeLens", function(client, buffer)
+          vim.lsp.codelens.refresh()
+          vim.api.nvim_create_autocmd({ "BufEnter", "CursorHold", "InsertLeave" }, {
+            buffer = buffer,
+            callback = vim.lsp.codelens.refresh,
+          })
+        end)
       end
 
       if type(opts.diagnostics.virtual_text) == "table" and opts.diagnostics.virtual_text.prefix == "icons" then
-        opts.diagnostics.virtual_text.prefix = vim.fn.has("nvim-0.10.0") == 0 and "●"
-          or function(diagnostic)
-            local icons = LazyVim.config.icons.diagnostics
-            for d, icon in pairs(icons) do
-              if diagnostic.severity == vim.diagnostic.severity[d:upper()] then
-                return icon
-              end
+        opts.diagnostics.virtual_text.prefix = function(diagnostic)
+          local icons = LazyVim.config.icons.diagnostics
+          for d, icon in pairs(icons) do
+            if diagnostic.severity == vim.diagnostic.severity[d:upper()] then
+              return icon
             end
           end
+        end
       end
 
       vim.diagnostic.config(vim.deepcopy(opts.diagnostics))
diff --git a/lua/lazyvim/util/lsp.lua b/lua/lazyvim/util/lsp.lua
index 51aa471a..02ab8b6e 100644
--- a/lua/lazyvim/util/lsp.lua
+++ b/lua/lazyvim/util/lsp.lua
@@ -3,56 +3,10 @@ local M = {}
 
 ---@alias lsp.Client.filter {id?: number, bufnr?: number, name?: string, method?: string, filter?:fun(client: vim.lsp.Client):boolean}
 
---- Neovim 0.11 uses a lua class for clients, while older versions use a table.
---- Wraps older style clients to be compatible with the new style.
----@param client vim.lsp.Client
----@return vim.lsp.Client
-local function wrap(client)
-  local meta = getmetatable(client)
-  if meta and meta.request then
-    return client
-  end
-  ---@diagnostic disable-next-line: undefined-field
-  if client.wrapped then
-    return client
-  end
-  local methods = { "request", "supports_method", "cancel_request", "notify" }
-  -- old style
-  return setmetatable({ wrapped = true }, {
-    __index = function(_, k)
-      if k == "supports_method" then
-        -- supports_method doesn't support the bufnr argument
-        return function(_, method)
-          return client[k](method)
-        end
-      end
-      if vim.tbl_contains(methods, k) then
-        return function(_, ...)
-          return client[k](...)
-        end
-      end
-      return client[k]
-    end,
-  })
-end
-
 ---@param opts? lsp.Client.filter
 function M.get_clients(opts)
   local ret = {} ---@type vim.lsp.Client[]
-  if vim.lsp.get_clients then
-    ret = vim.lsp.get_clients(opts)
-    ret = vim.tbl_map(wrap, ret)
-  else
-    ---@diagnostic disable-next-line: deprecated
-    ret = vim.lsp.get_active_clients(opts)
-    ret = vim.tbl_map(wrap, ret)
-    if opts and opts.method then
-      ---@param client vim.lsp.Client
-      ret = vim.tbl_filter(function(client)
-        return client.supports_method(opts.method, { bufnr = opts.bufnr })
-      end, ret)
-    end
-  end
+  ret = vim.lsp.get_clients(opts)
   return opts and opts.filter and vim.tbl_filter(opts.filter, ret) or ret
 end
 
@@ -64,7 +18,7 @@ function M.on_attach(on_attach, name)
       local buffer = args.buf ---@type number
       local client = vim.lsp.get_client_by_id(args.data.client_id)
       if client and (not name or client.name == name) then
-        return on_attach(wrap(client), buffer)
+        return on_attach(client, buffer)
       end
     end,
   })
@@ -204,8 +158,8 @@ function M.formatter(opts)
       local clients = M.get_clients(LazyVim.merge({}, filter, { bufnr = buf }))
       ---@param client vim.lsp.Client
       local ret = vim.tbl_filter(function(client)
-        return client.supports_method("textDocument/formatting")
-          or client.supports_method("textDocument/rangeFormatting")
+        return client:supports_method("textDocument/formatting")
+          or client:supports_method("textDocument/rangeFormatting")
       end, clients)
       ---@param client vim.lsp.Client
       return vim.tbl_map(function(client)
diff --git a/lua/lazyvim/util/ui.lua b/lua/lazyvim/util/ui.lua
index 3460b0ab..c8c899d5 100644
--- a/lua/lazyvim/util/ui.lua
+++ b/lua/lazyvim/util/ui.lua
@@ -1,11 +1,6 @@
 ---@class lazyvim.util.ui
 local M = {}
 
--- foldtext for Neovim < 0.10.0
-function M.foldtext()
-  return vim.api.nvim_buf_get_lines(0, vim.v.lnum - 1, vim.v.lnum, false)[1]
-end
-
 -- optimized treesitter foldexpr for Neovim >= 0.10.0
 function M.foldexpr()
   local buf = vim.api.nvim_get_current_buf()

From 02d0c9aebddb902d9c974a38bb44db9bae4eac6d Mon Sep 17 00:00:00 2001
From: flippette <me@flippo.cc>
Date: Mon, 15 Sep 2025 12:21:32 +0300
Subject: [PATCH 126/341] fix(catppuccin): follow renamed integration (#6354)

## Description

[This
commit](https://github.com/catppuccin/nvim/commit/30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86)
renamed a Catppuccin integration; this PR follows the rename.

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/colorscheme.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/colorscheme.lua b/lua/lazyvim/plugins/colorscheme.lua
index fa611bf4..4c41d492 100644
--- a/lua/lazyvim/plugins/colorscheme.lua
+++ b/lua/lazyvim/plugins/colorscheme.lua
@@ -58,7 +58,7 @@ return {
         optional = true,
         opts = function(_, opts)
           if (vim.g.colors_name or ""):find("catppuccin") then
-            opts.highlights = require("catppuccin.groups.integrations.bufferline").get()
+            opts.highlights = require("catppuccin.groups.integrations.bufferline").get_theme()
           end
         end,
       },

From e2ba6bb51107cbd076b53b49ed7be99fc2fa3991 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 15 Sep 2025 11:24:41 +0200
Subject: [PATCH 127/341] fix(harpoon): keymaps for 1-9. Fixes #6319

---
 lua/lazyvim/plugins/extras/editor/harpoon2.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/editor/harpoon2.lua b/lua/lazyvim/plugins/extras/editor/harpoon2.lua
index 760d805a..699c2546 100644
--- a/lua/lazyvim/plugins/extras/editor/harpoon2.lua
+++ b/lua/lazyvim/plugins/extras/editor/harpoon2.lua
@@ -28,7 +28,7 @@ return {
       },
     }
 
-    for i = 1, 5 do
+    for i = 1, 9 do
       table.insert(keys, {
         "<leader>" .. i,
         function()

From 848dd3132af50f6d211d0c07166ea7c1a4259088 Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Mon, 15 Sep 2025 12:27:29 +0300
Subject: [PATCH 128/341] fix(neo-tree): import neo-tree Extra before edgy
 Extra (#5763)

## Description
Seems like since the move of `neo-tree` into Extras, its plugin spec is
loaded after edgy's and that causes problems. Give `neo-tree` Extra
higher prio than edgy Extra.
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
Fixes #5762
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/xtras.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/xtras.lua b/lua/lazyvim/plugins/xtras.lua
index 3f71b2aa..19a5c6da 100644
--- a/lua/lazyvim/plugins/xtras.lua
+++ b/lua/lazyvim/plugins/xtras.lua
@@ -3,7 +3,8 @@ 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.editor.neo-tree"] = 2,
+  ["lazyvim.plugins.extras.ui.edgy"] = 3,
   ["lazyvim.plugins.extras.lang.typescript"] = 5,
   ["lazyvim.plugins.extras.coding.blink"] = 5,
   ["lazyvim.plugins.extras.formatting.prettier"] = 10,

From ae3aaf2dd3a04eb5dbc5b1e34843558c85e45ac2 Mon Sep 17 00:00:00 2001
From: Sergey Kochetkov <skoch13@pm.me>
Date: Mon, 15 Sep 2025 11:45:00 +0200
Subject: [PATCH 129/341] fix(mini): update mini plugin references from
 echasnovski to nvim-mini (#6374)

Updates all `mini.nvim` plugin references to use the new `nvim-mini`
organization namespace instead of the legacy `echasnovski` namespace
across all LazyVim configuration files.

## Description

https://github.com/nvim-mini/mini.nvim/discussions/1970

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

---------

Co-authored-by: Folke Lemaitre <folke.lemaitre@gmail.com>
---
 lua/lazyvim/plugins/coding.lua                    |  4 ++--
 .../plugins/extras/coding/mini-comment.lua        |  2 +-
 .../plugins/extras/coding/mini-snippets.lua       |  6 +++---
 .../plugins/extras/coding/mini-surround.lua       |  2 +-
 lua/lazyvim/plugins/extras/editor/leap.lua        |  2 +-
 lua/lazyvim/plugins/extras/editor/mini-diff.lua   |  2 +-
 lua/lazyvim/plugins/extras/editor/mini-files.lua  |  2 +-
 lua/lazyvim/plugins/extras/editor/mini-move.lua   |  2 +-
 .../plugins/extras/editor/snacks_picker.lua       |  2 +-
 lua/lazyvim/plugins/extras/lang/go.lua            |  2 +-
 lua/lazyvim/plugins/extras/lang/typescript.lua    |  2 +-
 lua/lazyvim/plugins/extras/ui/mini-animate.lua    |  2 +-
 .../plugins/extras/ui/mini-indentscope.lua        |  2 +-
 lua/lazyvim/plugins/extras/ui/mini-starter.lua    |  4 ++--
 lua/lazyvim/plugins/extras/ui/smear-cursor.lua    |  2 +-
 lua/lazyvim/plugins/extras/util/chezmoi.lua       |  2 +-
 .../plugins/extras/util/mini-hipatterns.lua       |  2 +-
 lua/lazyvim/plugins/extras/util/project.lua       |  2 +-
 lua/lazyvim/plugins/ui.lua                        |  2 +-
 lua/lazyvim/util/plugin.lua                       | 15 ++++++++++++---
 tests/minit.lua                                   |  2 +-
 21 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/lua/lazyvim/plugins/coding.lua b/lua/lazyvim/plugins/coding.lua
index 0e614e48..8b242eb8 100644
--- a/lua/lazyvim/plugins/coding.lua
+++ b/lua/lazyvim/plugins/coding.lua
@@ -1,7 +1,7 @@
 return {
   -- auto pairs
   {
-    "echasnovski/mini.pairs",
+    "nvim-mini/mini.pairs",
     event = "VeryLazy",
     opts = {
       modes = { insert = true, command = true, terminal = false },
@@ -29,7 +29,7 @@ return {
 
   -- Better text-objects
   {
-    "echasnovski/mini.ai",
+    "nvim-mini/mini.ai",
     event = "VeryLazy",
     opts = function()
       local ai = require("mini.ai")
diff --git a/lua/lazyvim/plugins/extras/coding/mini-comment.lua b/lua/lazyvim/plugins/extras/coding/mini-comment.lua
index 457787ef..19113d67 100644
--- a/lua/lazyvim/plugins/extras/coding/mini-comment.lua
+++ b/lua/lazyvim/plugins/extras/coding/mini-comment.lua
@@ -1,6 +1,6 @@
 return {
   {
-    "echasnovski/mini.comment",
+    "nvim-mini/mini.comment",
     event = "VeryLazy",
     opts = {
       options = {
diff --git a/lua/lazyvim/plugins/extras/coding/mini-snippets.lua b/lua/lazyvim/plugins/extras/coding/mini-snippets.lua
index d0a747a8..714d867d 100644
--- a/lua/lazyvim/plugins/extras/coding/mini-snippets.lua
+++ b/lua/lazyvim/plugins/extras/coding/mini-snippets.lua
@@ -4,14 +4,14 @@ if lazyvim_docs then
   vim.g.lazyvim_mini_snippets_in_completion = true
 
   -- NOTE: Please also read:
-  -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-snippets.md#expand
+  -- https://github.com/nvim-mini/mini.nvim/blob/main/readmes/mini-snippets.md#expand
   -- :h MiniSnippets-session
 
   -- Example override for your own config:
   --[[
   return {
     {
-      "echasnovski/mini.snippets",
+      "nvim-mini/mini.snippets",
       opts = function(_, opts)
         -- By default, for opts.snippets, the extra for mini.snippets only adds gen_loader.from_lang()
         -- This provides a sensible quickstart, integrating with friendly-snippets
@@ -63,7 +63,7 @@ return {
   -- add mini.snippets
   desc = "Manage and expand snippets (alternative to Luasnip)",
   {
-    "echasnovski/mini.snippets",
+    "nvim-mini/mini.snippets",
     event = "InsertEnter", -- don't depend on other plugins to load...
     dependencies = "rafamadriz/friendly-snippets",
     opts = function()
diff --git a/lua/lazyvim/plugins/extras/coding/mini-surround.lua b/lua/lazyvim/plugins/extras/coding/mini-surround.lua
index d8ff25c5..19c5de8f 100644
--- a/lua/lazyvim/plugins/extras/coding/mini-surround.lua
+++ b/lua/lazyvim/plugins/extras/coding/mini-surround.lua
@@ -3,7 +3,7 @@
 -- to select the text inside, change or modify the surrounding characters,
 -- and more.
 return {
-  "echasnovski/mini.surround",
+  "nvim-mini/mini.surround",
   keys = function(_, keys)
     -- Populate the keys based on the user's options
     local opts = LazyVim.opts("mini.surround")
diff --git a/lua/lazyvim/plugins/extras/editor/leap.lua b/lua/lazyvim/plugins/extras/editor/leap.lua
index 19c8b331..3fe4c5e7 100644
--- a/lua/lazyvim/plugins/extras/editor/leap.lua
+++ b/lua/lazyvim/plugins/extras/editor/leap.lua
@@ -37,7 +37,7 @@ return {
 
   -- rename surround mappings from gs to gz to prevent conflict with leap
   {
-    "echasnovski/mini.surround",
+    "nvim-mini/mini.surround",
     optional = true,
     opts = {
       mappings = {
diff --git a/lua/lazyvim/plugins/extras/editor/mini-diff.lua b/lua/lazyvim/plugins/extras/editor/mini-diff.lua
index fe25c11e..ea2e216d 100644
--- a/lua/lazyvim/plugins/extras/editor/mini-diff.lua
+++ b/lua/lazyvim/plugins/extras/editor/mini-diff.lua
@@ -7,7 +7,7 @@ return {
 
   -- setup mini.diff
   {
-    "echasnovski/mini.diff",
+    "nvim-mini/mini.diff",
     event = "VeryLazy",
     keys = {
       {
diff --git a/lua/lazyvim/plugins/extras/editor/mini-files.lua b/lua/lazyvim/plugins/extras/editor/mini-files.lua
index 70a42940..30cc14fc 100644
--- a/lua/lazyvim/plugins/extras/editor/mini-files.lua
+++ b/lua/lazyvim/plugins/extras/editor/mini-files.lua
@@ -1,5 +1,5 @@
 return {
-  "echasnovski/mini.files",
+  "nvim-mini/mini.files",
   opts = {
     windows = {
       preview = true,
diff --git a/lua/lazyvim/plugins/extras/editor/mini-move.lua b/lua/lazyvim/plugins/extras/editor/mini-move.lua
index aa8823ef..26e977fd 100644
--- a/lua/lazyvim/plugins/extras/editor/mini-move.lua
+++ b/lua/lazyvim/plugins/extras/editor/mini-move.lua
@@ -1,6 +1,6 @@
 return {
   {
-    "echasnovski/mini.move",
+    "nvim-mini/mini.move",
     event = "VeryLazy",
     opts = {},
   },
diff --git a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
index 93f32fab..591da5ea 100644
--- a/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
+++ b/lua/lazyvim/plugins/extras/editor/snacks_picker.lua
@@ -178,7 +178,7 @@ return {
     end,
   },
   {
-    "echasnovski/mini.starter",
+    "nvim-mini/mini.starter",
     optional = true,
     opts = function(_, opts)
       local items = {
diff --git a/lua/lazyvim/plugins/extras/lang/go.lua b/lua/lazyvim/plugins/extras/lang/go.lua
index ff8def2e..77536fea 100644
--- a/lua/lazyvim/plugins/extras/lang/go.lua
+++ b/lua/lazyvim/plugins/extras/lang/go.lua
@@ -139,7 +139,7 @@ return {
 
   -- Filetype icons
   {
-    "echasnovski/mini.icons",
+    "nvim-mini/mini.icons",
     opts = {
       file = {
         [".go-version"] = { glyph = "", hl = "MiniIconsBlue" },
diff --git a/lua/lazyvim/plugins/extras/lang/typescript.lua b/lua/lazyvim/plugins/extras/lang/typescript.lua
index f9132807..3830f795 100644
--- a/lua/lazyvim/plugins/extras/lang/typescript.lua
+++ b/lua/lazyvim/plugins/extras/lang/typescript.lua
@@ -263,7 +263,7 @@ return {
 
   -- Filetype icons
   {
-    "echasnovski/mini.icons",
+    "nvim-mini/mini.icons",
     opts = {
       file = {
         [".eslintrc.js"] = { glyph = "󰱺", hl = "MiniIconsYellow" },
diff --git a/lua/lazyvim/plugins/extras/ui/mini-animate.lua b/lua/lazyvim/plugins/extras/ui/mini-animate.lua
index bbd3e587..5a3fdef6 100644
--- a/lua/lazyvim/plugins/extras/ui/mini-animate.lua
+++ b/lua/lazyvim/plugins/extras/ui/mini-animate.lua
@@ -10,7 +10,7 @@ return {
 
   -- setup animate
   {
-    "echasnovski/mini.animate",
+    "nvim-mini/mini.animate",
     event = "VeryLazy",
     cond = vim.g.neovide == nil,
     opts = function(_, opts)
diff --git a/lua/lazyvim/plugins/extras/ui/mini-indentscope.lua b/lua/lazyvim/plugins/extras/ui/mini-indentscope.lua
index 91ec1d45..ea266b24 100644
--- a/lua/lazyvim/plugins/extras/ui/mini-indentscope.lua
+++ b/lua/lazyvim/plugins/extras/ui/mini-indentscope.lua
@@ -3,7 +3,7 @@ return {
   -- code, this highlights the current level of indentation, and animates
   -- the highlighting.
   {
-    "echasnovski/mini.indentscope",
+    "nvim-mini/mini.indentscope",
     version = false, -- wait till new 0.7.0 release to put it back on semver
     event = "LazyFile",
     opts = {
diff --git a/lua/lazyvim/plugins/extras/ui/mini-starter.lua b/lua/lazyvim/plugins/extras/ui/mini-starter.lua
index c1bd7bc1..51444df5 100644
--- a/lua/lazyvim/plugins/extras/ui/mini-starter.lua
+++ b/lua/lazyvim/plugins/extras/ui/mini-starter.lua
@@ -5,7 +5,7 @@ return {
 
   -- enable mini.starter
   {
-    "echasnovski/mini.starter",
+    "nvim-mini/mini.starter",
     version = false, -- wait till new 0.7.0 release to put it back on semver
     event = "VimEnter",
     opts = function()
@@ -67,7 +67,7 @@ return {
           local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100)
           local pad_footer = string.rep(" ", 8)
           starter.config.footer = pad_footer .. "⚡ Neovim loaded " .. stats.count .. " plugins in " .. ms .. "ms"
-          -- INFO: based on @echasnovski's recommendation (thanks a lot!!!)
+          -- INFO: based on @nvim-mini's recommendation (thanks a lot!!!)
           if vim.bo[ev.buf].filetype == "ministarter" then
             pcall(starter.refresh)
           end
diff --git a/lua/lazyvim/plugins/extras/ui/smear-cursor.lua b/lua/lazyvim/plugins/extras/ui/smear-cursor.lua
index 070d2623..2ca27780 100644
--- a/lua/lazyvim/plugins/extras/ui/smear-cursor.lua
+++ b/lua/lazyvim/plugins/extras/ui/smear-cursor.lua
@@ -9,7 +9,7 @@ return {
   specs = {
     -- disable mini.animate cursor
     {
-      "echasnovski/mini.animate",
+      "nvim-mini/mini.animate",
       optional = true,
       opts = {
         cursor = { enable = false },
diff --git a/lua/lazyvim/plugins/extras/util/chezmoi.lua b/lua/lazyvim/plugins/extras/util/chezmoi.lua
index 6c88fc45..2c1b2f31 100644
--- a/lua/lazyvim/plugins/extras/util/chezmoi.lua
+++ b/lua/lazyvim/plugins/extras/util/chezmoi.lua
@@ -135,7 +135,7 @@ return {
 
   -- Filetype icons
   {
-    "echasnovski/mini.icons",
+    "nvim-mini/mini.icons",
     opts = {
       file = {
         [".chezmoiignore"] = { glyph = "", hl = "MiniIconsGrey" },
diff --git a/lua/lazyvim/plugins/extras/util/mini-hipatterns.lua b/lua/lazyvim/plugins/extras/util/mini-hipatterns.lua
index 287c0d77..b8fa4d1a 100644
--- a/lua/lazyvim/plugins/extras/util/mini-hipatterns.lua
+++ b/lua/lazyvim/plugins/extras/util/mini-hipatterns.lua
@@ -4,7 +4,7 @@ local M = {}
 M.hl = {}
 
 M.plugin = {
-  "echasnovski/mini.hipatterns",
+  "nvim-mini/mini.hipatterns",
   recommended = true,
   desc = "Highlight colors in your code. Also includes Tailwind CSS support.",
   event = "LazyFile",
diff --git a/lua/lazyvim/plugins/extras/util/project.lua b/lua/lazyvim/plugins/extras/util/project.lua
index 01a25bc2..dafaa594 100644
--- a/lua/lazyvim/plugins/extras/util/project.lua
+++ b/lua/lazyvim/plugins/extras/util/project.lua
@@ -134,7 +134,7 @@ return {
   },
 
   {
-    "echasnovski/mini.starter",
+    "nvim-mini/mini.starter",
     optional = true,
     opts = function(_, opts)
       local items = {
diff --git a/lua/lazyvim/plugins/ui.lua b/lua/lazyvim/plugins/ui.lua
index 7985825a..9dd7254b 100644
--- a/lua/lazyvim/plugins/ui.lua
+++ b/lua/lazyvim/plugins/ui.lua
@@ -245,7 +245,7 @@ return {
 
   -- icons
   {
-    "echasnovski/mini.icons",
+    "nvim-mini/mini.icons",
     lazy = true,
     opts = {
       file = {
diff --git a/lua/lazyvim/util/plugin.lua b/lua/lazyvim/util/plugin.lua
index 9fede549..ff3f3634 100644
--- a/lua/lazyvim/util/plugin.lua
+++ b/lua/lazyvim/util/plugin.lua
@@ -1,3 +1,4 @@
+local Meta = require("lazy.core.meta")
 local Plugin = require("lazy.core.plugin")
 
 ---@class lazyvim.util.plugin
@@ -102,9 +103,17 @@ function M.fix_imports()
 end
 
 function M.fix_renames()
-  Plugin.Spec.add = LazyVim.inject.args(Plugin.Spec.add, function(self, plugin)
+  ---@param plugin LazyPluginSpec
+  Meta.add = LazyVim.inject.args(Meta.add, function(self, plugin)
     if type(plugin) == "table" then
-      if M.renames[plugin[1]] then
+      local name = plugin[1]
+      if not name then
+        return
+      end
+      if name:find("echasnovski") then
+        M.renames[name] = name:gsub("echasnovski", "nvim-mini")
+      end
+      if M.renames[name] then
         LazyVim.warn(
           ("Plugin `%s` was renamed to `%s`.\nPlease update your config for `%s`"):format(
             plugin[1],
@@ -113,7 +122,7 @@ function M.fix_renames()
           ),
           { title = "LazyVim" }
         )
-        plugin[1] = M.renames[plugin[1]]
+        plugin[1] = M.renames[name]
       end
     end
   end)
diff --git a/tests/minit.lua b/tests/minit.lua
index 807a2ac5..c7240d96 100644
--- a/tests/minit.lua
+++ b/tests/minit.lua
@@ -11,6 +11,6 @@ require("lazy.minit").setup({
     { "nvim-treesitter/nvim-treesitter" },
     { "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
     { "mason-org/mason.nvim", version = "^1.0.0" },
-    { "echasnovski/mini.icons", opts = {} },
+    { "nvim-mini/mini.icons", opts = {} },
   },
 })

From 3aa2916569df2664cb68e1c7c38882868f36f8d0 Mon Sep 17 00:00:00 2001
From: S1M0N38 <bertolottosimone@gmail.com>
Date: Mon, 15 Sep 2025 11:49:11 +0200
Subject: [PATCH 130/341] fix(extras): disable blink path source in CopilotChat
 (#5666) (#5754)

Fix #5666 with the answer given in the discussion.

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

Co-authored-by: svirschevskiy <alexey.svirshchevskiy@sitoo.com>
---
 .../plugins/extras/ai/copilot-chat.lua        | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/ai/copilot-chat.lua b/lua/lazyvim/plugins/extras/ai/copilot-chat.lua
index 58169b1e..fbf4ee39 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot-chat.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot-chat.lua
@@ -85,4 +85,24 @@ return {
       })
     end,
   },
+
+  -- Blink integration
+  {
+    "saghen/blink.cmp",
+    optional = true,
+    ---@module 'blink.cmp'
+    ---@type blink.cmp.Config
+    opts = {
+      sources = {
+        providers = {
+          path = {
+            -- Path sources triggered by "/" interfere with CopilotChat commands
+            enabled = function()
+              return vim.bo.filetype ~= "copilot-chat"
+            end,
+          },
+        },
+      },
+    },
+  },
 }

From 773f28b4912d5505a21da9686d56ab7cf41a9be7 Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Mon, 15 Sep 2025 13:08:19 +0300
Subject: [PATCH 131/341] fix(mason): migrate to mason v2 (#6053)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description
`mason-lspconfig` v2 made changes to conform with latest Neovim
`vim.lsp.config`/`vim.lsp.enable` API.

- Lock `mason` and `mason-lspconfig` to v1 versions for Neovim <0.11 and
latest HEAD for Neovim >=0.11.
- Change `:get_install_path()` method in LazyVim to use
`LazyVim.get_pkg_path()` and also update name references to new ones.
- Change `nvim-lspconfig` from `LazyFile` to `{ "BufReadPre",
"BufNewFile", "BufWritePre" }` for Neovim >=0.11, since on `BufReadPost`
the LSP would not attach on the first buffer. Previously the
`setup.handlers()` function from `mason-lspconfig` would take care of
that, but that has been removed on v2. I fail to think if there's a
better way to handle this.

Most of the changes in `/lsp/init.lua` are thanks to @williamboman
comment
[here](https://github.com/LazyVim/LazyVim/pull/6041#issuecomment-2857266471).

I've also seen that both `mason-lspconfig` and `rustaceanvim` now have
as minimum requirements Neovim >=0.11.
As such I would suggest, instead of all the conditional checks for
Neovim versions to create a stable release where we pin `mason` and
`mason-lspconfig` to v1 versions and then only incorporate William's
suggestions in a new release and mention in the README that users who
are on Neovim <0.11 should use the stable release where the plugin
versions are pinned to v1. Not sure how you want to tackle this, so this
is merely just a suggestion from my part.

Both #6041 and #6045 tackle only with the new name references and the
offending line that was causing the error, but don't take into
consideration the LSP servers configurations. `opts.setup` would not
execute on both, since that was handled by `setup_handlers()` function
in the past. I checked with Typescript lang and with those PRs there are
no Javascript settings in `vtsls` (by checking with
`:=LazyVim.opts("nvim-lspconfig").servers.vtsls`).
#6045 also tried to change the method `:get_install_pkg()` by using
`vim.fn.exepath`, but to my understanding that only returns the binary
path not the package installation path and that is later concatenated to
find other paths, which I believe is not correct.

PS: There are 2 commits, because my LazyVim fork was not up to date and
updated it and then merged the branch I had into a new branch. Sorry if
that causes any inconvenience.
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
Fixes #6039
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

---------

Co-authored-by: Folke Lemaitre <folke.lemaitre@gmail.com>
Co-authored-by: William Boman <william@redwill.se>
Co-authored-by: Luis Durão <kpvrzlzzx@mozmail.com>
---
 lua/lazyvim/plugins/extras/lang/java.lua | 11 +---
 lua/lazyvim/plugins/extras/lang/php.lua  |  5 +-
 lua/lazyvim/plugins/extras/lang/rust.lua | 10 +---
 lua/lazyvim/plugins/lsp/init.lua         | 71 +++++++++++++-----------
 lua/lazyvim/util/init.lua                | 17 ++++--
 tests/extras/extra_spec.lua              |  3 +-
 tests/minit.lua                          |  4 +-
 7 files changed, 63 insertions(+), 58 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua
index 8098b6b3..9e5047cf 100644
--- a/lua/lazyvim/plugins/extras/lang/java.lua
+++ b/lua/lazyvim/plugins/extras/lang/java.lua
@@ -87,8 +87,7 @@ return {
     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"
+        local lombok_jar = vim.fn.expand("$MASON/share/jdtls/lombok.jar")
         table.insert(cmd, string.format("--jvm-arg=-javaagent:%s", lombok_jar))
       end
       return {
@@ -151,17 +150,13 @@ 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
-          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",
+            vim.fn.expand("$MASON/share/java-debug-adapter/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",
+              vim.fn.expand("$MASON/share/java-test/*.jar"),
             })
           end
           for _, jar_pattern in ipairs(jar_patterns) do
diff --git a/lua/lazyvim/plugins/extras/lang/php.lua b/lua/lazyvim/plugins/extras/lang/php.lua
index 5a2835aa..04469223 100644
--- a/lua/lazyvim/plugins/extras/lang/php.lua
+++ b/lua/lazyvim/plugins/extras/lang/php.lua
@@ -48,11 +48,10 @@ return {
     optional = true,
     opts = function()
       local dap = require("dap")
-      local path = require("mason-registry").get_package("php-debug-adapter"):get_install_path()
       dap.adapters.php = {
         type = "executable",
-        command = "node",
-        args = { path .. "/extension/out/phpDebug.js" },
+        command = "php-debug-adapter",
+        args = {},
       }
     end,
   },
diff --git a/lua/lazyvim/plugins/extras/lang/rust.lua b/lua/lazyvim/plugins/extras/lang/rust.lua
index eca1b597..b66dde9b 100644
--- a/lua/lazyvim/plugins/extras/lang/rust.lua
+++ b/lua/lazyvim/plugins/extras/lang/rust.lua
@@ -110,13 +110,9 @@ return {
     },
     config = function(_, opts)
       if LazyVim.has("mason.nvim") then
-        local package_path = require("mason-registry").get_package("codelldb"):get_install_path()
-        local codelldb = package_path .. "/extension/adapter/codelldb"
-        local library_path = package_path .. "/extension/lldb/lib/liblldb.dylib"
-        local uname = io.popen("uname"):read("*l")
-        if uname == "Linux" then
-          library_path = package_path .. "/extension/lldb/lib/liblldb.so"
-        end
+        local codelldb = vim.fn.exepath("codelldb")
+        local codelldb_lib_ext = io.popen("uname"):read("*l") == "Linux" and ".so" or ".dylib"
+        local library_path = vim.fn.expand("$MASON/opt/lldb/lib/liblldb" .. codelldb_lib_ext)
         opts.dap = {
           adapter = require("rustaceanvim.config").get_codelldb_adapter(codelldb, library_path),
         }
diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index 54f410fc..b1d6a23d 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -2,7 +2,7 @@ return {
   -- lspconfig
   {
     "neovim/nvim-lspconfig",
-    event = "LazyFile",
+    event = { "BufReadPre", "BufNewFile", "BufWritePre" },
     dependencies = {
       "mason.nvim",
       { "mason-org/mason-lspconfig.nvim", config = function() end },
@@ -174,31 +174,35 @@ return {
         opts.capabilities or {}
       )
 
-      local function setup(server)
-        local server_opts = vim.tbl_deep_extend("force", {
-          capabilities = vim.deepcopy(capabilities),
-        }, servers[server] or {})
-        if server_opts.enabled == false then
-          return
-        end
-
-        if opts.setup[server] then
-          if opts.setup[server](server, server_opts) then
-            return
-          end
-        elseif opts.setup["*"] then
-          if opts.setup["*"](server, server_opts) then
-            return
-          end
-        end
-        require("lspconfig")[server].setup(server_opts)
-      end
-
       -- get all the servers that are available through mason-lspconfig
       local have_mason, mlsp = pcall(require, "mason-lspconfig")
       local all_mslp_servers = {}
-      if have_mason then
-        all_mslp_servers = vim.tbl_keys(require("mason-lspconfig.mappings.server").lspconfig_to_package)
+      all_mslp_servers = vim.tbl_keys(require("mason-lspconfig.mappings").get_mason_map().lspconfig_to_package)
+
+      local exclude_automatic_enable = {} ---@type string[]
+
+      local function configure(server)
+        local server_opts = vim.tbl_deep_extend("force", {
+          capabilities = vim.deepcopy(capabilities),
+        }, servers[server] or {})
+
+        if opts.setup[server] then
+          if opts.setup[server](server, server_opts) then
+            return true
+          end
+        elseif opts.setup["*"] then
+          if opts.setup["*"](server, server_opts) then
+            return true
+          end
+        end
+        vim.lsp.config(server, server_opts)
+
+        -- manually enable if mason=false or if this is a server that cannot be installed with mason-lspconfig
+        if server_opts.mason == false or not vim.tbl_contains(all_mslp_servers, server) then
+          vim.lsp.enable(server)
+          return true
+        end
+        return false
       end
 
       local ensure_installed = {} ---@type string[]
@@ -207,24 +211,31 @@ return {
           server_opts = server_opts == true and {} or server_opts
           if server_opts.enabled ~= false then
             -- run manual setup if mason=false or if this is a server that cannot be installed with mason-lspconfig
-            if server_opts.mason == false or not vim.tbl_contains(all_mslp_servers, server) then
-              setup(server)
+            if configure(server) then
+              exclude_automatic_enable[#exclude_automatic_enable + 1] = server
             else
               ensure_installed[#ensure_installed + 1] = server
             end
+          else
+            exclude_automatic_enable[#exclude_automatic_enable + 1] = server
           end
         end
       end
 
       if have_mason then
-        mlsp.setup({
+        local setup_config = {
           ensure_installed = vim.tbl_deep_extend(
             "force",
             ensure_installed,
             LazyVim.opts("mason-lspconfig.nvim").ensure_installed or {}
           ),
-          handlers = { setup },
-        })
+        }
+
+        setup_config.automatic_enable = {
+          exclude = exclude_automatic_enable,
+        }
+
+        mlsp.setup(setup_config)
       end
 
       if LazyVim.lsp.is_enabled("denols") and LazyVim.lsp.is_enabled("vtsls") then
@@ -278,8 +289,4 @@ return {
       end)
     end,
   },
-
-  -- pin to v1 for now
-  { "mason-org/mason.nvim", version = "^1.0.0" },
-  { "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
 }
diff --git a/lua/lazyvim/util/init.lua b/lua/lazyvim/util/init.lua
index 4b49f539..339fdadb 100644
--- a/lua/lazyvim/util/init.lua
+++ b/lua/lazyvim/util/init.lua
@@ -253,11 +253,18 @@ function M.get_pkg_path(pkg, path, opts)
   opts = opts or {}
   opts.warn = opts.warn == nil and true or opts.warn
   path = path or ""
-  local ret = root .. "/packages/" .. pkg .. "/" .. path
-  if opts.warn and not vim.loop.fs_stat(ret) and not require("lazy.core.config").headless() then
-    M.warn(
-      ("Mason package path not found for **%s**:\n- `%s`\nYou may need to force update the package."):format(pkg, path)
-    )
+  local ret = vim.fs.normalize(root .. "/packages/" .. pkg .. "/" .. path)
+  if opts.warn then
+    vim.schedule(function()
+      if not require("lazy.core.config").headless() and not vim.loop.fs_stat(ret) then
+        M.warn(
+          ("Mason package path not found for **%s**:\n- `%s`\nYou may need to force update the package."):format(
+            pkg,
+            path
+          )
+        )
+      end
+    end)
   end
   return ret
 end
diff --git a/tests/extras/extra_spec.lua b/tests/extras/extra_spec.lua
index 2afb6b94..2a4a9bc8 100644
--- a/tests/extras/extra_spec.lua
+++ b/tests/extras/extra_spec.lua
@@ -26,7 +26,8 @@ describe("Extra", function()
     return not vim.tbl_contains(ignore, extra.modname)
   end, extras)
 
-  local lsp_to_pkg = require("mason-lspconfig.mappings.server").lspconfig_to_package
+  local lsp_to_pkg = {}
+  lsp_to_pkg = require("mason-lspconfig.mappings").get_mason_map().lspconfig_to_package
 
   local tsspec = Plugin.Spec.new({
     import = "lazyvim.plugins.treesitter",
diff --git a/tests/minit.lua b/tests/minit.lua
index c7240d96..41907e75 100644
--- a/tests/minit.lua
+++ b/tests/minit.lua
@@ -9,8 +9,8 @@ require("lazy.minit").setup({
     { dir = vim.uv.cwd() },
     { "LazyVim/starter" },
     { "nvim-treesitter/nvim-treesitter" },
-    { "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
-    { "mason-org/mason.nvim", version = "^1.0.0" },
+    { "mason-org/mason-lspconfig.nvim" },
+    { "mason-org/mason.nvim" },
     { "nvim-mini/mini.icons", opts = {} },
   },
 })

From 5e7da4384d2ebd1a5f48119d0793f54a447f2db9 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 15 Sep 2025 12:12:43 +0200
Subject: [PATCH 132/341] docs: updated news

---
 NEWS.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/NEWS.md b/NEWS.md
index 9d00ddd6..9fc3f95a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,17 @@
 # What's new?
 
+## 15.x
+
+**Neovim** `>= 0.11.0` includes a lot of changes to the underlying LSP implementation.
+
+Going forward, **LazyVim** requires **Neovim** `>= 0.11.0`, and drops support for older versions.
+
+### Changes
+
+- removed compatibility code for Neovim `< 0.11`
+- updated all LSP code to use the new LSP implementation
+- migrated **mason.nvim** and **mason-lspconfig.nvim** to `v2.x`
+
 ## 14.x
 
 Big new release with a lot of changes and improvements!

From 0d27e89a362d541fadc9713dbdcea86c124b93de Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 15 Sep 2025 16:28:46 +0200
Subject: [PATCH 133/341] refactor(lsp): cleanup lsp config

---
 lua/lazyvim/plugins/extras/lang/ruby.lua |  3 +-
 lua/lazyvim/plugins/lsp/init.lua         | 70 ++++++++++--------------
 2 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/ruby.lua b/lua/lazyvim/plugins/extras/lang/ruby.lua
index 65620f4e..e9c68d11 100644
--- a/lua/lazyvim/plugins/extras/lang/ruby.lua
+++ b/lua/lazyvim/plugins/extras/lang/ruby.lua
@@ -21,9 +21,8 @@ return {
   },
   {
     "neovim/nvim-lspconfig",
-    ---@class PluginLspOpts
+    ---@type PluginLspOpts
     opts = {
-      ---@type lspconfig.options
       servers = {
         ruby_lsp = {
           enabled = lsp == "ruby_lsp",
diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index b1d6a23d..f4bdce22 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -63,7 +63,7 @@ return {
           timeout_ms = nil,
         },
         -- LSP Server Settings
-        ---@type lspconfig.options
+        ---@type table<string, vim.lsp.Config>
         servers = {
           lua_ls = {
             -- mason = false, -- set to false if you don't want this server to be installed with mason
@@ -99,7 +99,7 @@ return {
         },
         -- you can do any additional lsp server setup here
         -- return true if you don't want this server to be setup with lspconfig
-        ---@type table<string, fun(server:string, opts:_.lspconfig.options):boolean?>
+        ---@type table<string, fun(server:string, opts: vim.lsp.Config):boolean?>
         setup = {
           -- example to setup with typescript.nvim
           -- tsserver = function(_, opts)
@@ -149,6 +149,7 @@ return {
         end)
       end
 
+      -- diagnostics
       if type(opts.diagnostics.virtual_text) == "table" and opts.diagnostics.virtual_text.prefix == "icons" then
         opts.diagnostics.virtual_text.prefix = function(diagnostic)
           local icons = LazyVim.config.icons.diagnostics
@@ -157,48 +158,42 @@ return {
               return icon
             end
           end
+          return "●"
         end
       end
-
       vim.diagnostic.config(vim.deepcopy(opts.diagnostics))
 
-      local servers = opts.servers
-      local has_cmp, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
-      local has_blink, blink = pcall(require, "blink.cmp")
       local capabilities = vim.tbl_deep_extend(
         "force",
         {},
         vim.lsp.protocol.make_client_capabilities(),
-        has_cmp and cmp_nvim_lsp.default_capabilities() or {},
-        has_blink and blink.get_lsp_capabilities() or {},
+        LazyVim.has("nvim-cmp") and require("cmp_nvim_lsp").default_capabilities() or {},
+        LazyVim.has("blink.nvim") and require("blink.cmp").get_lsp_capabilities() or {},
         opts.capabilities or {}
       )
 
       -- get all the servers that are available through mason-lspconfig
-      local have_mason, mlsp = pcall(require, "mason-lspconfig")
-      local all_mslp_servers = {}
-      all_mslp_servers = vim.tbl_keys(require("mason-lspconfig.mappings").get_mason_map().lspconfig_to_package)
+      local have_mason = LazyVim.has("mason-lspconfig.nvim")
+      local mason_all = have_mason
+          and vim.tbl_keys(require("mason-lspconfig.mappings").get_mason_map().lspconfig_to_package)
+        or {} --[[ @as string[] ]]
 
       local exclude_automatic_enable = {} ---@type string[]
 
       local function configure(server)
         local server_opts = vim.tbl_deep_extend("force", {
           capabilities = vim.deepcopy(capabilities),
-        }, servers[server] or {})
+        }, opts.servers[server] or {})
 
-        if opts.setup[server] then
-          if opts.setup[server](server, server_opts) then
-            return true
-          end
-        elseif opts.setup["*"] then
-          if opts.setup["*"](server, server_opts) then
-            return true
-          end
+        local setup = opts.setup[server] or opts.setup["*"]
+        if setup and setup(server, server_opts) then
+          return true -- lsp will be setup by the setup function
         end
+
         vim.lsp.config(server, server_opts)
 
         -- manually enable if mason=false or if this is a server that cannot be installed with mason-lspconfig
-        if server_opts.mason == false or not vim.tbl_contains(all_mslp_servers, server) then
+        if server_opts.mason == false or not vim.tbl_contains(mason_all, server) then
           vim.lsp.enable(server)
           return true
         end
@@ -206,36 +201,31 @@ return {
       end
 
       local ensure_installed = {} ---@type string[]
-      for server, server_opts in pairs(servers) do
-        if server_opts then
-          server_opts = server_opts == true and {} or server_opts
-          if server_opts.enabled ~= false then
-            -- run manual setup if mason=false or if this is a server that cannot be installed with mason-lspconfig
-            if configure(server) then
-              exclude_automatic_enable[#exclude_automatic_enable + 1] = server
-            else
-              ensure_installed[#ensure_installed + 1] = server
-            end
-          else
+      for server, server_opts in pairs(opts.servers) do
+        server_opts = server_opts == true and {} or server_opts or false
+        if server_opts and server_opts.enabled ~= false then
+          -- run manual setup if mason=false or if this is a server that cannot be installed with mason-lspconfig
+          if configure(server) then
             exclude_automatic_enable[#exclude_automatic_enable + 1] = server
+          else
+            ensure_installed[#ensure_installed + 1] = server
           end
+        else
+          exclude_automatic_enable[#exclude_automatic_enable + 1] = server
         end
       end
 
       if have_mason then
-        local setup_config = {
+        require("mason-lspconfig").setup({
           ensure_installed = vim.tbl_deep_extend(
             "force",
             ensure_installed,
             LazyVim.opts("mason-lspconfig.nvim").ensure_installed or {}
           ),
-        }
-
-        setup_config.automatic_enable = {
-          exclude = exclude_automatic_enable,
-        }
-
-        mlsp.setup(setup_config)
+          automatic_enable = {
+            exclude = exclude_automatic_enable,
+          },
+        })
       end
 
       if LazyVim.lsp.is_enabled("denols") and LazyVim.lsp.is_enabled("vtsls") then

From 5668ad72ca806b3a7915bb7b35dcc5cccfe774f7 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 15 Sep 2025 17:13:40 +0200
Subject: [PATCH 134/341] feat(extras): added an experimental extra for the
 treesitter `main` branch

---
 NEWS.md                                       | 11 +--
 .../plugins/extras/ui/treesitter-main.lua     | 87 +++++++++++++++++++
 2 files changed, 89 insertions(+), 9 deletions(-)
 create mode 100644 lua/lazyvim/plugins/extras/ui/treesitter-main.lua

diff --git a/NEWS.md b/NEWS.md
index 9fc3f95a..37221e79 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -11,6 +11,8 @@ Going forward, **LazyVim** requires **Neovim** `>= 0.11.0`, and drops support fo
 - removed compatibility code for Neovim `< 0.11`
 - updated all LSP code to use the new LSP implementation
 - migrated **mason.nvim** and **mason-lspconfig.nvim** to `v2.x`
+- added new `treesitter-main` extra to test the new `main` branch of `nvim-treesitter`
+  - after enabling, you will get errors. Update with `:Lazy` and restart Neovim
 
 ## 14.x
 
@@ -122,7 +124,6 @@ vim.g.snacks_animate = false
 ## 11.x
 
 - **Keymaps:**
-
   - `<leader>gB` to open the current repo in the browser
   - `gco` and `gcO` to add a comment below or above the current line
   - `<leader>wm` to toggle window maximize
@@ -135,7 +136,6 @@ vim.g.snacks_animate = false
   It's a great plugin that enhances the native text objects.
 
 - `:LazyExtras` now has multiple new sections:
-
   - **Enabled**: extras that are currently enabled
   - **Recommended Languages**: language extras recommended for the current buffer / directory
   - **Recommended Plugins**: extras that are recommended for most users
@@ -173,7 +173,6 @@ Additionally, some core plugins have been moved to extras.
   ```
 
 - plugins moved to extras:
-
   - `mini.surround`
   - `mini.indentscope` scopes are now also highlighted with `indent-blankline`
   - `nvim-treesitter-context`
@@ -191,7 +190,6 @@ Additionally, some core plugins have been moved to extras.
   You can find the updated docs [here](https://github.com/folke/trouble.nvim/tree/dev)
 
 - The **lazygit** integration now configures:
-
   - the theme based on the colorscheme
   - nerd font icons (v3)
   - editor preset is set to `nvim-remote` for better interop with Neovim
@@ -232,9 +230,7 @@ Additionally, some core plugins have been moved to extras.
 - New `:LazyExtras` command for managing **LazyVim** extras
 
 - Improved **formatting**:
-
   - **LazyVim** can now work with multiple formatters. Types:
-
     - **primary**: only one primary formatter can be active at a time.
       _(conform, none-ls, LSP)_
     - **secondary**: multiple secondary formatters can be active _(eslint, ...)_
@@ -253,18 +249,15 @@ Additionally, some core plugins have been moved to extras.
     ```
 
 - `none-ls.nvim` is no longer installed by default
-
   - `conform.nvim` is now the default formatter
   - `nvim-lint` is now the default linter
   - If you want to keep using `none-ls.nvim`,
     you can enable the **lsp.none-ls** extra
 
 - `dashboard.nvim` is the new default dashboard plugin
-
   - If you want to keep using `alpha.nvim`, you can enable the **ui.alpha** extra
 
 - Improved **root detection**:
-
   - New `:LazyRoot` command that shows info about the root dir detection
   - Configurable with `vim.g.root_spec`
 
diff --git a/lua/lazyvim/plugins/extras/ui/treesitter-main.lua b/lua/lazyvim/plugins/extras/ui/treesitter-main.lua
new file mode 100644
index 00000000..934d311a
--- /dev/null
+++ b/lua/lazyvim/plugins/extras/ui/treesitter-main.lua
@@ -0,0 +1,87 @@
+return {
+  {
+    "nvim-treesitter/nvim-treesitter",
+    version = false, -- last release is way too old and doesn't work on Windows
+    branch = "main",
+    build = ":TSUpdate",
+    lazy = true,
+    cmd = { "TSUpdate", "TSInstall", "TSLog", "TSUninstall" },
+    enabled = function()
+      if vim.fn.executable("tree-sitter") == 0 then
+        LazyVim.error("**treesitter-main** requires the `tree-sitter` executable to be installed")
+        return false
+      end
+      return true
+    end,
+    init = function() end,
+    ---@param opts TSConfig
+    config = function(_, opts)
+      if type(opts.ensure_installed) ~= "table" then
+        error("opts.ensure_installed must be a table")
+      end
+
+      local TS = require("nvim-treesitter")
+      TS.setup(opts)
+
+      local needed = LazyVim.dedup(opts.ensure_installed --[[@as string[] ]])
+      local installed = TS.get_installed("parsers")
+      local install = vim.tbl_filter(function(lang)
+        return not vim.tbl_contains(installed, lang)
+      end, needed)
+
+      if #install > 0 then
+        TS.install(install, { summary = true })
+      end
+
+      -- backwards compatibility with the old treesitter config for indent
+      if vim.tbl_get(opts, "indent", "enable") then
+        vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+      end
+
+      -- backwards compatibility with the old treesitter config for highlight
+      if vim.tbl_get(opts, "highlight", "enable") then
+        vim.api.nvim_create_autocmd("FileType", {
+          callback = function()
+            pcall(vim.treesitter.start)
+          end,
+        })
+      end
+    end,
+  },
+  {
+    "nvim-treesitter/nvim-treesitter-textobjects",
+    branch = "main",
+    event = "VeryLazy",
+    opts = {},
+    keys = function()
+      local moves = {
+        goto_next_start = { ["]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" },
+        goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer", ["[A"] = "@parameter.inner" },
+      }
+      local ret = {} ---@type LazyKeysSpec[]
+      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()
+              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)
+      require("nvim-treesitter-textobjects").setup(opts)
+    end,
+  },
+}

From 44ade7fdea98a0356c64ff9edaf2534547b958bc Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 15 Sep 2025 17:15:51 +0200
Subject: [PATCH 135/341] fix(lsp): buffer should be second arg for
 supports_method

---
 lua/lazyvim/util/lsp.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/util/lsp.lua b/lua/lazyvim/util/lsp.lua
index 02ab8b6e..074346d3 100644
--- a/lua/lazyvim/util/lsp.lua
+++ b/lua/lazyvim/util/lsp.lua
@@ -64,7 +64,7 @@ function M._check_methods(client, buffer)
   for method, clients in pairs(M._supports_method) do
     clients[client] = clients[client] or {}
     if not clients[client][buffer] then
-      if client.supports_method and client:supports_method(method, { bufnr = buffer }) then
+      if client.supports_method and client:supports_method(method, buffer) then
         clients[client][buffer] = true
         vim.api.nvim_exec_autocmds("User", {
           pattern = "LspSupportsMethod",
@@ -107,7 +107,7 @@ function M.on_supports_method(method, fn)
   })
 end
 
----@return _.lspconfig.options
+---@return vim.lsp.Config
 function M.get_config(server)
   local configs = require("lspconfig.configs")
   return rawget(configs, server)

From 96316e5a69b4cc45311f5b7225e7d7bea1f977ee Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 15 Sep 2025 17:17:21 +0200
Subject: [PATCH 136/341] fix(treesitter-main): move exe check to config

---
 lua/lazyvim/plugins/extras/ui/treesitter-main.lua | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ui/treesitter-main.lua b/lua/lazyvim/plugins/extras/ui/treesitter-main.lua
index 934d311a..8987b732 100644
--- a/lua/lazyvim/plugins/extras/ui/treesitter-main.lua
+++ b/lua/lazyvim/plugins/extras/ui/treesitter-main.lua
@@ -6,16 +6,13 @@ return {
     build = ":TSUpdate",
     lazy = true,
     cmd = { "TSUpdate", "TSInstall", "TSLog", "TSUninstall" },
-    enabled = function()
-      if vim.fn.executable("tree-sitter") == 0 then
-        LazyVim.error("**treesitter-main** requires the `tree-sitter` executable to be installed")
-        return false
-      end
-      return true
-    end,
     init = function() end,
     ---@param opts TSConfig
     config = function(_, opts)
+      if vim.fn.executable("tree-sitter") == 0 then
+        LazyVim.error("**treesitter-main** requires the `tree-sitter` executable to be installed")
+        return
+      end
       if type(opts.ensure_installed) ~= "table" then
         error("opts.ensure_installed must be a table")
       end

From 167d39b2bef24024be1a48267e14cc6c82146462 Mon Sep 17 00:00:00 2001
From: Jinfeng Guo <chillywall@163.com>
Date: Mon, 15 Sep 2025 23:19:23 +0800
Subject: [PATCH 137/341] fix(clangd): rewrite the root_dir function (#6060)

## Description

<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

Nvim 0.11 had some breaking changes in lsp related parts. And one of
them is that if the root_dir field of lsp config is a function, the
bufnr and a function would be passed instead of the file name in nvim
0.10. As a result, the configurations of extra.lang.clangd broke.

However, before the breaking changes of mason and mason-lspconfig, the
configurations of clangd still worked. So maybe what really broke the
configurations is mason-lspconfig, which uses a new way to enable lsp in
v2.

I rewrite the root_dir function and make it work both on 0.11 and 0.10.

It would check whether the first argument is a string to decide whether
to adapt the new interface.

To test whether it works, you can just add a plugin/clangd.lua to you
personal config with the content below:

```lua
return {
  "neovim/nvim-lspconfig",
  opts = {
    servers = {
      clangd = {
        root_dir = function(bufnr, ondir)
          local root_directory = function(fname)
            return require("lspconfig.util").root_pattern(
              "Makefile",
              "configure.ac",
              "configure.in",
              "config.h.in",
              "meson.build",
              "meson_options.txt",
              "build.ninja"
            )(fname) or require("lspconfig.util").root_pattern("compile_commands.json", "compile_flags.txt")(
              fname
            ) or require("lspconfig.util").find_git_ancestor(fname)
          end
          if type(bufnr) == "string" then
            return root_directory(bufnr)
          else
            local fname = vim.api.nvim_buf_get_name(bufnr)
            ondir(root_directory(fname))
          end
        end,
      },
    },
  },
}
```

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/clangd.lua | 33 ++++++++++++++--------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/clangd.lua b/lua/lazyvim/plugins/extras/lang/clangd.lua
index 33dc4ed4..19f3d1c2 100644
--- a/lua/lazyvim/plugins/extras/lang/clangd.lua
+++ b/lua/lazyvim/plugins/extras/lang/clangd.lua
@@ -60,18 +60,27 @@ return {
           keys = {
             { "<leader>ch", "<cmd>ClangdSwitchSourceHeader<cr>", desc = "Switch Source/Header (C/C++)" },
           },
-          root_dir = function(fname)
-            return require("lspconfig.util").root_pattern(
-              "Makefile",
-              "configure.ac",
-              "configure.in",
-              "config.h.in",
-              "meson.build",
-              "meson_options.txt",
-              "build.ninja"
-            )(fname) or require("lspconfig.util").root_pattern("compile_commands.json", "compile_flags.txt")(
-              fname
-            ) or require("lspconfig.util").find_git_ancestor(fname)
+          root_dir = function(bufnr, ondir)
+            local root_directory = function(fname)
+              return require("lspconfig.util").root_pattern(
+                "Makefile",
+                "configure.ac",
+                "configure.in",
+                "config.h.in",
+                "meson.build",
+                "meson_options.txt",
+                "build.ninja"
+              )(fname) or require("lspconfig.util").root_pattern(
+                "compile_commands.json",
+                "compile_flags.txt"
+              )(fname) or require("lspconfig.util").find_git_ancestor(fname)
+            end
+            if type(bufnr) == "string" then
+              return root_directory(bufnr)
+            else
+              local fname = vim.api.nvim_buf_get_name(bufnr)
+              ondir(root_directory(fname))
+            end
           end,
           capabilities = {
             offsetEncoding = { "utf-16" },

From 23b9cdeb3471b655532e9884fa2dd36ee83062d5 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 15 Sep 2025 20:42:10 +0200
Subject: [PATCH 138/341] fix(lspconfig): remove all references to lspconfig.
 Closes #6426

---
 lua/lazyvim/plugins/extras/lang/clangd.lua   | 38 +++++++++-----------
 lua/lazyvim/plugins/extras/lang/java.lua     |  4 +--
 lua/lazyvim/plugins/extras/lang/ocaml.lua    | 20 +++++------
 lua/lazyvim/plugins/extras/lang/r.lua        |  6 +---
 lua/lazyvim/plugins/extras/lang/tailwind.lua |  3 +-
 lua/lazyvim/plugins/lsp/init.lua             | 25 ++++++++-----
 lua/lazyvim/util/lsp.lua                     | 33 -----------------
 7 files changed, 44 insertions(+), 85 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/clangd.lua b/lua/lazyvim/plugins/extras/lang/clangd.lua
index 19f3d1c2..9417b257 100644
--- a/lua/lazyvim/plugins/extras/lang/clangd.lua
+++ b/lua/lazyvim/plugins/extras/lang/clangd.lua
@@ -60,28 +60,22 @@ return {
           keys = {
             { "<leader>ch", "<cmd>ClangdSwitchSourceHeader<cr>", desc = "Switch Source/Header (C/C++)" },
           },
-          root_dir = function(bufnr, ondir)
-            local root_directory = function(fname)
-              return require("lspconfig.util").root_pattern(
-                "Makefile",
-                "configure.ac",
-                "configure.in",
-                "config.h.in",
-                "meson.build",
-                "meson_options.txt",
-                "build.ninja"
-              )(fname) or require("lspconfig.util").root_pattern(
-                "compile_commands.json",
-                "compile_flags.txt"
-              )(fname) or require("lspconfig.util").find_git_ancestor(fname)
-            end
-            if type(bufnr) == "string" then
-              return root_directory(bufnr)
-            else
-              local fname = vim.api.nvim_buf_get_name(bufnr)
-              ondir(root_directory(fname))
-            end
-          end,
+          root_markers = {
+            ".clangd",
+            ".clang-tidy",
+            ".clang-format",
+            "compile_commands.json",
+            "compile_flags.txt",
+            "configure.ac", -- AutoTools
+            "Makefile",
+            "configure.ac",
+            "configure.in",
+            "config.h.in",
+            "meson.build",
+            "meson_options.txt",
+            "build.ninja",
+            ".git",
+          },
           capabilities = {
             offsetEncoding = { "utf-16" },
           },
diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua
index 9e5047cf..43c9442f 100644
--- a/lua/lazyvim/plugins/extras/lang/java.lua
+++ b/lua/lazyvim/plugins/extras/lang/java.lua
@@ -91,9 +91,7 @@ return {
         table.insert(cmd, string.format("--jvm-arg=-javaagent:%s", lombok_jar))
       end
       return {
-        -- How to find the root dir for a given filename. The default comes from
-        -- lspconfig which provides a function specifically for java projects.
-        root_dir = LazyVim.lsp.get_raw_config("jdtls").default_config.root_dir,
+        root_dir = vim.fs.root(0, vim.lsp.config.jdtls.root_markers),
 
         -- How to find the project name for a given root dir.
         project_name = function(root_dir)
diff --git a/lua/lazyvim/plugins/extras/lang/ocaml.lua b/lua/lazyvim/plugins/extras/lang/ocaml.lua
index 83f72a72..a8de495c 100644
--- a/lua/lazyvim/plugins/extras/lang/ocaml.lua
+++ b/lua/lazyvim/plugins/extras/lang/ocaml.lua
@@ -26,17 +26,15 @@ return {
             "reason",
             "dune",
           },
-          root_dir = function(fname)
-            return require("lspconfig.util").root_pattern(
-              "*.opam",
-              "esy.json",
-              "package.json",
-              ".git",
-              "dune-project",
-              "dune-workspace",
-              "*.ml"
-            )(fname)
-          end,
+          root_markers = {
+            "*.opam",
+            "esy.json",
+            "package.json",
+            ".git",
+            "dune-project",
+            "dune-workspace",
+            "*.ml",
+          },
         },
       },
     },
diff --git a/lua/lazyvim/plugins/extras/lang/r.lua b/lua/lazyvim/plugins/extras/lang/r.lua
index 6320f624..f8feb0ea 100644
--- a/lua/lazyvim/plugins/extras/lang/r.lua
+++ b/lua/lazyvim/plugins/extras/lang/r.lua
@@ -65,11 +65,7 @@ return {
     opts = {
       servers = {
         r_language_server = {
-          root_dir = function(fname)
-            return require("lspconfig.util").root_pattern("DESCRIPTION", "NAMESPACE", ".Rbuildignore")(fname)
-              or require("lspconfig.util").find_git_ancestor(fname)
-              or vim.loop.os_homedir()
-          end,
+          root_markers = { "DESCRIPTION", "NAMESPACE", ".Rbuildignore" },
         },
       },
     },
diff --git a/lua/lazyvim/plugins/extras/lang/tailwind.lua b/lua/lazyvim/plugins/extras/lang/tailwind.lua
index cbdd612e..3c7b3fac 100644
--- a/lua/lazyvim/plugins/extras/lang/tailwind.lua
+++ b/lua/lazyvim/plugins/extras/lang/tailwind.lua
@@ -28,11 +28,10 @@ return {
       },
       setup = {
         tailwindcss = function(_, opts)
-          local tw = LazyVim.lsp.get_raw_config("tailwindcss")
           opts.filetypes = opts.filetypes or {}
 
           -- Add default filetypes
-          vim.list_extend(opts.filetypes, tw.default_config.filetypes)
+          vim.list_extend(opts.filetypes, vim.lsp.config.tailwindcss.filetypes)
 
           -- Remove excluded filetypes
           --- @param ft string
diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index f4bdce22..335da15e 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -228,15 +228,22 @@ return {
         })
       end
 
-      if LazyVim.lsp.is_enabled("denols") and LazyVim.lsp.is_enabled("vtsls") then
-        local is_deno = require("lspconfig.util").root_pattern("deno.json", "deno.jsonc")
-        LazyVim.lsp.disable("vtsls", is_deno)
-        LazyVim.lsp.disable("denols", function(root_dir, config)
-          if not is_deno(root_dir) then
-            config.settings.deno.enable = false
-          end
-          return false
-        end)
+      if vim.lsp.is_enabled("denols") and vim.lsp.is_enabled("vtsls") then
+        ---@param server string
+        ---@param markers string[]
+        local resolve = function(server, markers)
+          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
+                local root = vim.fs.root(bufnr, markers)
+                return root and on_dir(root)
+              end
+            end,
+          })
+        end
+        resolve("denols", vim.lsp.config.denols.root_markers)
+        resolve("vtsls", vim.lsp.config.vtsls.root_markers)
       end
     end,
   },
diff --git a/lua/lazyvim/util/lsp.lua b/lua/lazyvim/util/lsp.lua
index 074346d3..632a7b9f 100644
--- a/lua/lazyvim/util/lsp.lua
+++ b/lua/lazyvim/util/lsp.lua
@@ -107,39 +107,6 @@ function M.on_supports_method(method, fn)
   })
 end
 
----@return vim.lsp.Config
-function M.get_config(server)
-  local configs = require("lspconfig.configs")
-  return rawget(configs, server)
-end
-
----@return {default_config:lspconfig.Config}
-function M.get_raw_config(server)
-  local ok, ret = pcall(require, "lspconfig.configs." .. server)
-  if ok then
-    return ret
-  end
-  return require("lspconfig.server_configurations." .. server)
-end
-
-function M.is_enabled(server)
-  local c = M.get_config(server)
-  return c and c.enabled ~= false
-end
-
----@param server string
----@param cond fun( root_dir, config): boolean
-function M.disable(server, cond)
-  local util = require("lspconfig.util")
-  local def = M.get_config(server)
-  ---@diagnostic disable-next-line: undefined-field
-  def.document_config.on_new_config = util.add_hook_before(def.document_config.on_new_config, function(config, root_dir)
-    if cond(root_dir, config) then
-      config.enabled = false
-    end
-  end)
-end
-
 ---@param opts? LazyFormatter| {filter?: (string|lsp.Client.filter)}
 function M.formatter(opts)
   opts = opts or {}

From 271fecb067ec223a8eab90c1abd1162e9ebae5df Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 15 Sep 2025 20:44:14 +0200
Subject: [PATCH 139/341] fix(jdtls): root_dir

---
 lua/lazyvim/plugins/extras/lang/java.lua | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua
index 43c9442f..75971afb 100644
--- a/lua/lazyvim/plugins/extras/lang/java.lua
+++ b/lua/lazyvim/plugins/extras/lang/java.lua
@@ -91,7 +91,6 @@ return {
         table.insert(cmd, string.format("--jvm-arg=-javaagent:%s", lombok_jar))
       end
       return {
-        root_dir = vim.fs.root(0, vim.lsp.config.jdtls.root_markers),
 
         -- How to find the project name for a given root dir.
         project_name = function(root_dir)
@@ -165,12 +164,10 @@ return {
         end
       end
       local function attach_jdtls()
-        local fname = vim.api.nvim_buf_get_name(0)
-
         -- Configuration can be augmented and overridden by opts.jdtls
         local config = extend_or_override({
           cmd = opts.full_cmd(opts),
-          root_dir = opts.root_dir(fname),
+          root_dir = vim.fs.root(0, vim.lsp.config.jdtls.root_markers),
           init_options = {
             bundles = bundles,
           },

From 2f75d9a90fc9cf43f7ba2365dbb745e5595fc02e Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 15 Sep 2025 21:00:19 +0200
Subject: [PATCH 140/341] fix(lsp): properly ambiguate denols vs vtsls

---
 lua/lazyvim/plugins/lsp/init.lua | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index 335da15e..48c96059 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -230,20 +230,24 @@ return {
 
       if vim.lsp.is_enabled("denols") and vim.lsp.is_enabled("vtsls") then
         ---@param server string
-        ---@param markers string[]
-        local resolve = function(server, markers)
+        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
-                local root = vim.fs.root(bufnr, markers)
-                return root and on_dir(root)
+                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", vim.lsp.config.denols.root_markers)
-        resolve("vtsls", vim.lsp.config.vtsls.root_markers)
+        resolve("denols")
+        resolve("vtsls")
       end
     end,
   },

From 2f309fc8b5bf93af25293c1e4688d409de718a36 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 15 Sep 2025 21:14:42 +0200
Subject: [PATCH 141/341] perf(treesitter-main): only enable highlighting for
 installed treesitter langs

---
 lua/lazyvim/plugins/extras/ui/treesitter-main.lua | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ui/treesitter-main.lua b/lua/lazyvim/plugins/extras/ui/treesitter-main.lua
index 8987b732..1571cc03 100644
--- a/lua/lazyvim/plugins/extras/ui/treesitter-main.lua
+++ b/lua/lazyvim/plugins/extras/ui/treesitter-main.lua
@@ -28,6 +28,7 @@ return {
 
       if #install > 0 then
         TS.install(install, { summary = true })
+        vim.list_extend(installed, install)
       end
 
       -- backwards compatibility with the old treesitter config for indent
@@ -38,8 +39,11 @@ return {
       -- backwards compatibility with the old treesitter config for highlight
       if vim.tbl_get(opts, "highlight", "enable") then
         vim.api.nvim_create_autocmd("FileType", {
-          callback = function()
-            pcall(vim.treesitter.start)
+          callback = function(ev)
+            local lang = vim.treesitter.language.get_lang(ev.match)
+            if vim.tbl_contains(installed, lang) then
+              pcall(vim.treesitter.start)
+            end
           end,
         })
       end

From 14d2a9baa1306bd0969112fcf8f69a11840cc5e6 Mon Sep 17 00:00:00 2001
From: "Md. Iftakhar Awal Chowdhury"
 <42291930+AtifChy@users.noreply.github.com>
Date: Tue, 16 Sep 2025 01:17:45 +0600
Subject: [PATCH 142/341] fix(schemastore): use `before_init` instead of
 `on_new_config` to load schema store (#6427)

## Description

`vim.lsp.config` doesn't provide `on_new_config`, which is causing
`b0o/SchemaStore.nvim` fail to load.
This PR replaces `on_new_config` with `before_init` fixing the issue.

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/json.lua | 2 +-
 lua/lazyvim/plugins/extras/lang/yaml.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/json.lua b/lua/lazyvim/plugins/extras/lang/json.lua
index d51a6b19..453a6a77 100644
--- a/lua/lazyvim/plugins/extras/lang/json.lua
+++ b/lua/lazyvim/plugins/extras/lang/json.lua
@@ -27,7 +27,7 @@ return {
       servers = {
         jsonls = {
           -- lazy-load schemastore when needed
-          on_new_config = function(new_config)
+          before_init = function(_, new_config)
             new_config.settings.json.schemas = new_config.settings.json.schemas or {}
             vim.list_extend(new_config.settings.json.schemas, require("schemastore").json.schemas())
           end,
diff --git a/lua/lazyvim/plugins/extras/lang/yaml.lua b/lua/lazyvim/plugins/extras/lang/yaml.lua
index b460f3c5..9d8135e7 100644
--- a/lua/lazyvim/plugins/extras/lang/yaml.lua
+++ b/lua/lazyvim/plugins/extras/lang/yaml.lua
@@ -29,7 +29,7 @@ return {
             },
           },
           -- lazy-load schemastore when needed
-          on_new_config = function(new_config)
+          before_init = function(_, new_config)
             new_config.settings.yaml.schemas = vim.tbl_deep_extend(
               "force",
               new_config.settings.yaml.schemas or {},

From 011a35ccb810cbe5d25def9cc92271e8423feb74 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 16 Sep 2025 08:34:05 +0200
Subject: [PATCH 143/341] feat(blink): enable blink cmdline completions

---
 lua/lazyvim/plugins/extras/coding/blink.lua | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua
index fe45b86b..9f5b2588 100644
--- a/lua/lazyvim/plugins/extras/coding/blink.lua
+++ b/lua/lazyvim/plugins/extras/coding/blink.lua
@@ -31,7 +31,7 @@ return {
         version = not vim.g.lazyvim_blink_main and "*",
       },
     },
-    event = "InsertEnter",
+    event = { "InsertEnter", "CmdlineEnter" },
 
     ---@module 'blink.cmp'
     ---@type blink.cmp.Config
@@ -41,6 +41,7 @@ return {
           return LazyVim.cmp.expand(snippet)
         end,
       },
+
       appearance = {
         -- sets the fallback highlight groups to nvim-cmp's highlight groups
         -- useful for when your theme doesn't support blink.cmp
@@ -83,6 +84,19 @@ return {
 
       cmdline = {
         enabled = false,
+        keymap = {
+          preset = "cmdline",
+          -- ["<Tab>"] = { "show", "accept" },
+          -- ["<CR>"] = { "accept_and_enter", "fallback" },
+        },
+        completion = {
+          menu = {
+            auto_show = function(ctx)
+              return vim.fn.getcmdtype() == ":"
+            end,
+          },
+          ghost_text = { enabled = true },
+        },
       },
 
       keymap = {

From 4961b3d4d4b2999816e978c3ea4ef7c320e4206d Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 16 Sep 2025 08:34:20 +0200
Subject: [PATCH 144/341] perf(blink): only enable lazydev in lua files

---
 lua/lazyvim/plugins/extras/coding/blink.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua
index 9f5b2588..23ad6a80 100644
--- a/lua/lazyvim/plugins/extras/coding/blink.lua
+++ b/lua/lazyvim/plugins/extras/coding/blink.lua
@@ -51,6 +51,7 @@ return {
         -- adjusts spacing to ensure icons are aligned
         nerd_font_variant = "mono",
       },
+
       completion = {
         accept = {
           -- experimental auto-brackets support
@@ -185,8 +186,9 @@ return {
     "saghen/blink.cmp",
     opts = {
       sources = {
-        -- add lazydev to your completion providers
-        default = { "lazydev" },
+        per_filetype = {
+          lua = { inherit_defaults = true, "lazydev" },
+        },
         providers = {
           lazydev = {
             name = "LazyDev",

From ff7c12c48e23941ffd9a7bbe61857624929ae9da Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 16 Sep 2025 08:34:57 +0200
Subject: [PATCH 145/341] feat(blink): enable cmdline completions

---
 lua/lazyvim/plugins/extras/coding/blink.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua
index 23ad6a80..e8a4d9c5 100644
--- a/lua/lazyvim/plugins/extras/coding/blink.lua
+++ b/lua/lazyvim/plugins/extras/coding/blink.lua
@@ -84,7 +84,7 @@ return {
       },
 
       cmdline = {
-        enabled = false,
+        enabled = true,
         keymap = {
           preset = "cmdline",
           -- ["<Tab>"] = { "show", "accept" },

From 45181a76ddcd89da209d2260f29e6d87f7cea511 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Tue, 16 Sep 2025 06:35:28 +0000
Subject: [PATCH 146/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 0b861808..a2b1b64c 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim            Last change: 2025 September 15
+*LazyVim.txt*             For Neovim            Last change: 2025 September 16
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 44cc0635bc3d2ccc55eb76bc7668092befcf0536 Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Tue, 16 Sep 2025 12:45:46 +0300
Subject: [PATCH 147/341] fix(ocaml): use `root_dir` instead of `root_markers`
 for globs support (#6428)

## Description
As per
[comment](https://github.com/LazyVim/LazyVim/commit/23b9cdeb3471b655532e9884fa2dd36ee83062d5#r165830889),
use `root_dir` with `util.root_pattern` instead of `root_markers` for
globs support.

I don't actually do Ocaml to thoroughly test it, but it should work in
theory :stuck_out_tongue:
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
None
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/ocaml.lua | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/ocaml.lua b/lua/lazyvim/plugins/extras/lang/ocaml.lua
index a8de495c..0e733a4a 100644
--- a/lua/lazyvim/plugins/extras/lang/ocaml.lua
+++ b/lua/lazyvim/plugins/extras/lang/ocaml.lua
@@ -26,15 +26,12 @@ return {
             "reason",
             "dune",
           },
-          root_markers = {
-            "*.opam",
-            "esy.json",
-            "package.json",
-            ".git",
-            "dune-project",
-            "dune-workspace",
-            "*.ml",
-          },
+          root_dir = function(bufnr, on_dir)
+            local util = require("lspconfig.util")
+            local fname = vim.api.nvim_buf_get_name(bufnr)
+            --stylua: ignore
+            on_dir(util.root_pattern("*.opam", "esy.json", "package.json", ".git", "dune-project", "dune-workspace", "*.ml")( fname))
+          end,
         },
       },
     },

From c05392186e9e540d4af169922c333b5baa583cbe Mon Sep 17 00:00:00 2001
From: qw457812 <37494864+qw457812@users.noreply.github.com>
Date: Tue, 16 Sep 2025 17:46:26 +0800
Subject: [PATCH 148/341] fix(jdtls): root_dir (#6429)

Fix:

```
Failed to run `config` for nvim-jdtls

...im/lazy/LazyVim/lua/lazyvim/plugins/extras/lang/java.lua:113: attempt to call field 'root_dir' (a nil value)

  - /LazyVim/lua/lazyvim/plugins/extras/lang/java.lua:113 _in_ **full_cmd**
  - /LazyVim/lua/lazyvim/plugins/extras/lang/java.lua:169 _in_ **attach_jdtls**
  - /LazyVim/lua/lazyvim/plugins/extras/lang/java.lua:286 _in_ **config**
  - ~/.local/share/bob/nightly/share/nvim/runtime/filetype.lua:36
  - vim/shared.lua:0
  - ~/.local/share/bob/nightly/share/nvim/runtime/filetype.lua:35
  - vim/_editor.lua:0 _in_ **cmd**
  - /persistence.nvim/lua/persistence/init.lua:88 _in_ **load**
  - lua:1
  - vim/_editor.lua:0 _in_ **action**
  - /snacks.nvim/lua/snacks/dashboard.lua:693
```

## Description

<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/java.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua
index 75971afb..e4926521 100644
--- a/lua/lazyvim/plugins/extras/lang/java.lua
+++ b/lua/lazyvim/plugins/extras/lang/java.lua
@@ -91,6 +91,7 @@ return {
         table.insert(cmd, string.format("--jvm-arg=-javaagent:%s", lombok_jar))
       end
       return {
+        root_dir = require("lspconfig.util").root_pattern(vim.lsp.config.jdtls.root_markers),
 
         -- How to find the project name for a given root dir.
         project_name = function(root_dir)
@@ -164,10 +165,12 @@ return {
         end
       end
       local function attach_jdtls()
+        local fname = vim.api.nvim_buf_get_name(0)
+
         -- Configuration can be augmented and overridden by opts.jdtls
         local config = extend_or_override({
           cmd = opts.full_cmd(opts),
-          root_dir = vim.fs.root(0, vim.lsp.config.jdtls.root_markers),
+          root_dir = opts.root_dir(fname),
           init_options = {
             bundles = bundles,
           },

From cc4a3e556424dba784b41ec3bd92eeb7b62746bc Mon Sep 17 00:00:00 2001
From: Christoph Schmidpeter
 <3390179+ChristophSchmidpeter@users.noreply.github.com>
Date: Tue, 16 Sep 2025 11:47:05 +0200
Subject: [PATCH 149/341] fix(lang.haskell): prevent Haskell extras from
 installing telescope.nvim (#6419)

## Description
Installing the Haskell extras currently installs telescope.nvim as well,
since the dependency is not marked optional. This marks it optional so
telescope.nvim is no longer pulled in automatically.

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

Co-authored-by: Christoph Schmidpeter <christoph.schmidpeter@gmail.com>
---
 lua/lazyvim/plugins/extras/lang/haskell.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/haskell.lua b/lua/lazyvim/plugins/extras/lang/haskell.lua
index a599d310..48634f2d 100644
--- a/lua/lazyvim/plugins/extras/lang/haskell.lua
+++ b/lua/lazyvim/plugins/extras/lang/haskell.lua
@@ -70,7 +70,7 @@ return {
     "luc-tielen/telescope_hoogle",
     ft = { "haskell", "lhaskell", "cabal", "cabalproject" },
     dependencies = {
-      { "nvim-telescope/telescope.nvim" },
+      { "nvim-telescope/telescope.nvim", optional = true },
     },
     config = function()
       local ok, telescope = pcall(require, "telescope")

From b926e7db417bc7b0e80feb778bed7924ffe8e85d Mon Sep 17 00:00:00 2001
From: qw457812 <37494864+qw457812@users.noreply.github.com>
Date: Tue, 16 Sep 2025 17:58:24 +0800
Subject: [PATCH 150/341] fix(treesitter-main): set vim.bo.indentexpr in
 FileType autocmd (#6430)

## Description

Ref:
https://github.com/nvim-treesitter/nvim-treesitter/blob/7aa24acae3a288e442e06928171f360bbdf75ba4/scripts/minimal_init.lua#L19-L24

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 .../plugins/extras/ui/treesitter-main.lua      | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ui/treesitter-main.lua b/lua/lazyvim/plugins/extras/ui/treesitter-main.lua
index 1571cc03..bb22aabb 100644
--- a/lua/lazyvim/plugins/extras/ui/treesitter-main.lua
+++ b/lua/lazyvim/plugins/extras/ui/treesitter-main.lua
@@ -31,19 +31,21 @@ return {
         vim.list_extend(installed, install)
       end
 
-      -- backwards compatibility with the old treesitter config for indent
-      if vim.tbl_get(opts, "indent", "enable") then
-        vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
-      end
-
-      -- backwards compatibility with the old treesitter config for highlight
-      if vim.tbl_get(opts, "highlight", "enable") then
+      -- backwards compatibility with the old treesitter config for highlight and indent
+      local highlight, indent = vim.tbl_get(opts, "highlight", "enable"), vim.tbl_get(opts, "indent", "enable")
+      if highlight or indent then
         vim.api.nvim_create_autocmd("FileType", {
           callback = function(ev)
             local lang = vim.treesitter.language.get_lang(ev.match)
-            if vim.tbl_contains(installed, lang) then
+            if not vim.tbl_contains(installed, lang) then
+              return
+            end
+            if highlight then
               pcall(vim.treesitter.start)
             end
+            if indent then
+              vim.bo[ev.buf].indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+            end
           end,
         })
       end

From 6e1de74597fa07ea805920da370f9d998740bc5e Mon Sep 17 00:00:00 2001
From: EJ <8498296+maddawik@users.noreply.github.com>
Date: Tue, 16 Sep 2025 06:47:51 -0400
Subject: [PATCH 151/341] fix(refactoring): update funcs to return, add
 `expr=true`, operator mode (#5882)

## Description

This fixes the keymaps for `refactoring.nvim` to work with the latest
version (see issue linked below)

## Related Issue(s)

- #5881

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 .../plugins/extras/editor/refactoring.lua     | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/editor/refactoring.lua b/lua/lazyvim/plugins/extras/editor/refactoring.lua
index 832940e9..11ab3786 100644
--- a/lua/lazyvim/plugins/extras/editor/refactoring.lua
+++ b/lua/lazyvim/plugins/extras/editor/refactoring.lua
@@ -30,34 +30,39 @@ return {
       "nvim-treesitter/nvim-treesitter",
     },
     keys = {
-      { "<leader>r", "", desc = "+refactor", mode = { "n", "v" } },
+      { "<leader>r", "", desc = "+refactor", mode = { "n", "x" } },
       {
         "<leader>rs",
         pick,
-        mode = "v",
+        mode = { "n", "x" },
         desc = "Refactor",
       },
       {
         "<leader>ri",
         function()
-          require("refactoring").refactor("Inline Variable")
+          return require("refactoring").refactor("Inline Variable")
         end,
-        mode = { "n", "v" },
+        mode = { "n", "x" },
         desc = "Inline Variable",
+        expr = true,
       },
       {
         "<leader>rb",
         function()
-          require("refactoring").refactor("Extract Block")
+          return require("refactoring").refactor("Extract Block")
         end,
+        mode = { "n", "x" },
         desc = "Extract Block",
+        expr = true,
       },
       {
         "<leader>rf",
         function()
-          require("refactoring").refactor("Extract Block To File")
+          return require("refactoring").refactor("Extract Block To File")
         end,
+        mode = { "n", "x" },
         desc = "Extract Block To File",
+        expr = true,
       },
       {
         "<leader>rP",
@@ -71,6 +76,7 @@ return {
         function()
           require("refactoring").debug.print_var({ normal = true })
         end,
+        mode = { "n", "x" },
         desc = "Debug Print Variable",
       },
       {
@@ -83,33 +89,36 @@ return {
       {
         "<leader>rf",
         function()
-          require("refactoring").refactor("Extract Function")
+          return require("refactoring").refactor("Extract Function")
         end,
-        mode = "v",
+        mode = { "n", "x" },
         desc = "Extract Function",
+        expr = true,
       },
       {
         "<leader>rF",
         function()
-          require("refactoring").refactor("Extract Function To File")
+          return require("refactoring").refactor("Extract Function To File")
         end,
-        mode = "v",
+        mode = { "n", "x" },
         desc = "Extract Function To File",
+        expr = true,
       },
       {
         "<leader>rx",
         function()
-          require("refactoring").refactor("Extract Variable")
+          return require("refactoring").refactor("Extract Variable")
         end,
-        mode = "v",
+        mode = { "n", "x" },
         desc = "Extract Variable",
+        expr = true,
       },
       {
         "<leader>rp",
         function()
           require("refactoring").debug.print_var()
         end,
-        mode = "v",
+        mode = { "n", "x" },
         desc = "Debug Print Variable",
       },
     },

From 9fa832dc95cb77a5551bbeff12b4520d8b7bdc2a Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 16 Sep 2025 15:41:20 +0200
Subject: [PATCH 152/341] fix(lsp): properly register capabilities with new
 vim.lsp.config. Not needed for blink

---
 lua/lazyvim/plugins/extras/coding/nvim-cmp.lua |  3 +++
 lua/lazyvim/plugins/lsp/init.lua               | 17 +++++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/coding/nvim-cmp.lua b/lua/lazyvim/plugins/extras/coding/nvim-cmp.lua
index cdada25a..54bfbf7c 100644
--- a/lua/lazyvim/plugins/extras/coding/nvim-cmp.lua
+++ b/lua/lazyvim/plugins/extras/coding/nvim-cmp.lua
@@ -25,6 +25,9 @@ return {
     -- }
     -- ```
     opts = function()
+      -- Register nvim-cmp lsp capabilities
+      vim.lsp.config("*", { capabilities = require("cmp_nvim_lsp").default_capabilities() })
+
       vim.api.nvim_set_hl(0, "CmpGhostText", { link = "Comment", default = true })
       local cmp = require("cmp")
       local defaults = require("cmp.config.default")()
diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index 48c96059..d0c9ced9 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -63,7 +63,7 @@ return {
           timeout_ms = nil,
         },
         -- LSP Server Settings
-        ---@type table<string, vim.lsp.Config>
+        ---@type table<string, vim.lsp.Config|{mason?:boolean, enabled?:boolean}|boolean>
         servers = {
           lua_ls = {
             -- mason = false, -- set to false if you don't want this server to be installed with mason
@@ -163,14 +163,9 @@ return {
       end
       vim.diagnostic.config(vim.deepcopy(opts.diagnostics))
 
-      local capabilities = vim.tbl_deep_extend(
-        "force",
-        {},
-        vim.lsp.protocol.make_client_capabilities(),
-        LazyVim.has("nvim-cmp") and require("cmp_nvim_lsp").default_capabilities() or {},
-        LazyVim.has("blink.nvim") and require("blink.cmp").get_lsp_capabilities() or {},
-        opts.capabilities or {}
-      )
+      if opts.capabilities then
+        vim.lsp.config("*", { capabilities = opts.capabilities })
+      end
 
       -- get all the servers that are available through mason-lspconfig
       local have_mason = LazyVim.has("mason-lspconfig.nvim")
@@ -181,9 +176,7 @@ return {
       local exclude_automatic_enable = {} ---@type string[]
 
       local function configure(server)
-        local server_opts = vim.tbl_deep_extend("force", {
-          capabilities = vim.deepcopy(capabilities),
-        }, opts.servers[server] or {})
+        local server_opts = opts.servers[server] or {}
 
         local setup = opts.setup[server] or opts.setup["*"]
         if setup and setup(server, server_opts) then

From f4e64eea45d9aa171e057ca328f2b9459c40404a Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 16 Sep 2025 17:34:17 +0200
Subject: [PATCH 153/341] refactor(lsp): remove `LazyVim.lsp.get_clients`

---
 lua/lazyvim/plugins/extras/ai/copilot.lua     |  2 +-
 lua/lazyvim/plugins/extras/editor/fzf.lua     |  2 +-
 lua/lazyvim/plugins/extras/linting/eslint.lua |  2 +-
 lua/lazyvim/plugins/lsp/keymaps.lua           |  4 ++--
 lua/lazyvim/util/lsp.lua                      | 17 ++++-------------
 lua/lazyvim/util/root.lua                     |  4 ++--
 6 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ai/copilot.lua b/lua/lazyvim/plugins/extras/ai/copilot.lua
index deebcd7d..48870743 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot.lua
@@ -49,7 +49,7 @@ return {
         opts.sections.lualine_x,
         2,
         LazyVim.lualine.status(LazyVim.config.icons.kinds.Copilot, function()
-          local clients = package.loaded["copilot"] and LazyVim.lsp.get_clients({ name = "copilot", bufnr = 0 }) or {}
+          local clients = package.loaded["copilot"] and vim.lsp.get_clients({ name = "copilot", bufnr = 0 }) or {}
           if #clients > 0 then
             local status = require("copilot.status").data.status
             return (status == "InProgress" and "pending") or (status == "Warning" and "error") or "ok"
diff --git a/lua/lazyvim/plugins/extras/editor/fzf.lua b/lua/lazyvim/plugins/extras/editor/fzf.lua
index e9177457..31297b94 100644
--- a/lua/lazyvim/plugins/extras/editor/fzf.lua
+++ b/lua/lazyvim/plugins/extras/editor/fzf.lua
@@ -122,7 +122,7 @@ return {
               -- height is number of items minus 15 lines for the preview, with a max of 80% screen height
               height = math.floor(math.min(vim.o.lines * 0.8 - 16, #items + 2) + 0.5) + 16,
               width = 0.5,
-              preview = not vim.tbl_isempty(LazyVim.lsp.get_clients({ bufnr = 0, name = "vtsls" })) and {
+              preview = not vim.tbl_isempty(vim.lsp.get_clients({ bufnr = 0, name = "vtsls" })) and {
                 layout = "vertical",
                 vertical = "down:15,border-top",
                 hidden = "hidden",
diff --git a/lua/lazyvim/plugins/extras/linting/eslint.lua b/lua/lazyvim/plugins/extras/linting/eslint.lua
index 01f134e2..92c670d4 100644
--- a/lua/lazyvim/plugins/extras/linting/eslint.lua
+++ b/lua/lazyvim/plugins/extras/linting/eslint.lua
@@ -27,7 +27,7 @@ return {
           end
 
           local function get_client(buf)
-            return LazyVim.lsp.get_clients({ name = "eslint", bufnr = buf })[1]
+            return vim.lsp.get_clients({ name = "eslint", bufnr = buf })[1]
           end
 
           local formatter = LazyVim.lsp.formatter({
diff --git a/lua/lazyvim/plugins/lsp/keymaps.lua b/lua/lazyvim/plugins/lsp/keymaps.lua
index 748f5b29..9cde08c1 100644
--- a/lua/lazyvim/plugins/lsp/keymaps.lua
+++ b/lua/lazyvim/plugins/lsp/keymaps.lua
@@ -52,7 +52,7 @@ function M.has(buffer, method)
     return false
   end
   method = method:find("/") and method or "textDocument/" .. method
-  local clients = LazyVim.lsp.get_clients({ bufnr = buffer })
+  local clients = vim.lsp.get_clients({ bufnr = buffer })
   for _, client in ipairs(clients) do
     if client:supports_method(method) then
       return true
@@ -69,7 +69,7 @@ function M.resolve(buffer)
   end
   local spec = vim.tbl_extend("force", {}, M.get())
   local opts = LazyVim.opts("nvim-lspconfig")
-  local clients = LazyVim.lsp.get_clients({ bufnr = buffer })
+  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)
diff --git a/lua/lazyvim/util/lsp.lua b/lua/lazyvim/util/lsp.lua
index 632a7b9f..a857422f 100644
--- a/lua/lazyvim/util/lsp.lua
+++ b/lua/lazyvim/util/lsp.lua
@@ -1,15 +1,6 @@
 ---@class lazyvim.util.lsp
 local M = {}
 
----@alias lsp.Client.filter {id?: number, bufnr?: number, name?: string, method?: string, filter?:fun(client: vim.lsp.Client):boolean}
-
----@param opts? lsp.Client.filter
-function M.get_clients(opts)
-  local ret = {} ---@type vim.lsp.Client[]
-  ret = vim.lsp.get_clients(opts)
-  return opts and opts.filter and vim.tbl_filter(opts.filter, ret) or ret
-end
-
 ---@param on_attach fun(client:vim.lsp.Client, buffer)
 ---@param name? string
 function M.on_attach(on_attach, name)
@@ -107,12 +98,12 @@ function M.on_supports_method(method, fn)
   })
 end
 
----@param opts? LazyFormatter| {filter?: (string|lsp.Client.filter)}
+---@param opts? LazyFormatter| {filter?: (string|vim.lsp.get_clients.Filter)}
 function M.formatter(opts)
   opts = opts or {}
   local filter = opts.filter or {}
   filter = type(filter) == "string" and { name = filter } or filter
-  ---@cast filter lsp.Client.filter
+  ---@cast filter vim.lsp.get_clients.Filter
   ---@type LazyFormatter
   local ret = {
     name = "LSP",
@@ -122,7 +113,7 @@ function M.formatter(opts)
       M.format(LazyVim.merge({}, filter, { bufnr = buf }))
     end,
     sources = function(buf)
-      local clients = M.get_clients(LazyVim.merge({}, filter, { bufnr = buf }))
+      local clients = vim.lsp.get_clients(LazyVim.merge({}, filter, { bufnr = buf }))
       ---@param client vim.lsp.Client
       local ret = vim.tbl_filter(function(client)
         return client:supports_method("textDocument/formatting")
@@ -137,7 +128,7 @@ function M.formatter(opts)
   return LazyVim.merge(ret, opts) --[[@as LazyFormatter]]
 end
 
----@alias lsp.Client.format {timeout_ms?: number, format_options?: table} | lsp.Client.filter
+---@alias lsp.Client.format {timeout_ms?: number, format_options?: table} | vim.lsp.get_clients.Filter
 
 ---@param opts? lsp.Client.format
 function M.format(opts)
diff --git a/lua/lazyvim/util/root.lua b/lua/lazyvim/util/root.lua
index fc6d6d7d..b3d68721 100644
--- a/lua/lazyvim/util/root.lua
+++ b/lua/lazyvim/util/root.lua
@@ -29,10 +29,10 @@ function M.detectors.lsp(buf)
     return {}
   end
   local roots = {} ---@type string[]
-  local clients = LazyVim.lsp.get_clients({ bufnr = buf })
+  local clients = vim.lsp.get_clients({ bufnr = buf })
   clients = vim.tbl_filter(function(client)
     return not vim.tbl_contains(vim.g.root_lsp_ignore or {}, client.name)
-  end, clients)
+  end, clients) --[[@as vim.lsp.Client[] ]]
   for _, client in pairs(clients) do
     local workspace = client.config.workspace_folders
     for _, ws in pairs(workspace or {}) do

From f54fd7f751e902e824c3a4c9d212a0d18387d0b6 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 16 Sep 2025 17:43:35 +0200
Subject: [PATCH 154/341] fix(blink): make blink completions in cmdline behave
 more like regular cmdline

---
 lua/lazyvim/plugins/extras/coding/blink.lua | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua
index e8a4d9c5..207b1940 100644
--- a/lua/lazyvim/plugins/extras/coding/blink.lua
+++ b/lua/lazyvim/plugins/extras/coding/blink.lua
@@ -85,12 +85,9 @@ return {
 
       cmdline = {
         enabled = true,
-        keymap = {
-          preset = "cmdline",
-          -- ["<Tab>"] = { "show", "accept" },
-          -- ["<CR>"] = { "accept_and_enter", "fallback" },
-        },
+        keymap = { preset = "cmdline" },
         completion = {
+          list = { selection = { preselect = false } },
           menu = {
             auto_show = function(ctx)
               return vim.fn.getcmdtype() == ":"

From cccfe70ea4390c1915f67ab7d2893971fba3f3fa Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 17 Sep 2025 07:01:08 +0200
Subject: [PATCH 155/341] feat!: bump Neovim requirement to 0.11.2

---
 NEWS.md                      | 6 +++---
 README.md                    | 2 +-
 lua/lazyvim/health.lua       | 6 +++---
 lua/lazyvim/plugins/init.lua | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 37221e79..1e5d991b 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,13 +2,13 @@
 
 ## 15.x
 
-**Neovim** `>= 0.11.0` includes a lot of changes to the underlying LSP implementation.
+**Neovim** `>= 0.11.2` includes a lot of changes to the underlying LSP implementation.
 
-Going forward, **LazyVim** requires **Neovim** `>= 0.11.0`, and drops support for older versions.
+Going forward, **LazyVim** requires **Neovim** `>= 0.11.2`, and drops support for older versions.
 
 ### Changes
 
-- removed compatibility code for Neovim `< 0.11`
+- removed compatibility code for Neovim `< 0.11.2`
 - updated all LSP code to use the new LSP implementation
 - migrated **mason.nvim** and **mason-lspconfig.nvim** to `v2.x`
 - added new `treesitter-main` extra to test the new `main` branch of `nvim-treesitter`
diff --git a/README.md b/README.md
index fd6a3fe0..1e7bb70d 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ to tweak your config as needed, along with the convenience of a pre-configured s
 
 ## ⚡️ Requirements
 
-- Neovim >= **0.11.0** (needs to be built with **LuaJIT**)
+- Neovim >= **0.11.2** (needs to be built with **LuaJIT**)
 - Git >= **2.19.0** (for partial clones support)
 - a [Nerd Font](https://www.nerdfonts.com/) **_(optional)_**
 - a **C** compiler for `nvim-treesitter`. See [here](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
diff --git a/lua/lazyvim/health.lua b/lua/lazyvim/health.lua
index 716c60a8..d1632e75 100644
--- a/lua/lazyvim/health.lua
+++ b/lua/lazyvim/health.lua
@@ -8,10 +8,10 @@ local error = vim.health.error or vim.health.report_error
 function M.check()
   start("LazyVim")
 
-  if vim.fn.has("nvim-0.11.0") == 1 then
-    ok("Using Neovim >= 0.11.0")
+  if vim.fn.has("nvim-0.11.2") == 1 then
+    ok("Using Neovim >= 0.11.2")
   else
-    error("Neovim >= 0.11.0 is required")
+    error("Neovim >= 0.11.2 is required")
   end
 
   for _, cmd in ipairs({ "git", "rg", { "fd", "fdfind" }, "lazygit", "fzf", "curl" }) do
diff --git a/lua/lazyvim/plugins/init.lua b/lua/lazyvim/plugins/init.lua
index a0faebcd..7797b047 100644
--- a/lua/lazyvim/plugins/init.lua
+++ b/lua/lazyvim/plugins/init.lua
@@ -1,6 +1,6 @@
-if vim.fn.has("nvim-0.11.0") == 0 then
+if vim.fn.has("nvim-0.11.2") == 0 then
   vim.api.nvim_echo({
-    { "LazyVim requires Neovim >= 0.11.0\n", "ErrorMsg" },
+    { "LazyVim requires Neovim >= 0.11.2\n", "ErrorMsg" },
     { "For more info, see: https://github.com/LazyVim/LazyVim/issues/6421\n", "Comment" },
     { "Press any key to exit", "MoreMsg" },
   }, true, {})

From f88f33c4c62272486c481589850019e8e4f4bd31 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Wed, 17 Sep 2025 05:01:57 +0000
Subject: [PATCH 156/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index a2b1b64c..9f4b59fd 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim            Last change: 2025 September 16
+*LazyVim.txt*             For Neovim            Last change: 2025 September 17
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*
@@ -53,7 +53,7 @@ FEATURES                                                    *LazyVim-features*
 
 REQUIREMENTS                                            *LazyVim-requirements*
 
-- Neovim >= **0.11.0** (needs to be built with **LuaJIT**)
+- Neovim >= **0.11.2** (needs to be built with **LuaJIT**)
 - Git >= **2.19.0** (for partial clones support)
 - a Nerd Font <https://www.nerdfonts.com/> **(optional)**
 - a **C** compiler for `nvim-treesitter`. See here <https://github.com/nvim-treesitter/nvim-treesitter#requirements>

From 732b063c30ff1167c470063a64a538e109914cad Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 17 Sep 2025 07:06:27 +0200
Subject: [PATCH 157/341] docs: more news

---
 NEWS.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index 1e5d991b..8f59998f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -9,10 +9,11 @@ Going forward, **LazyVim** requires **Neovim** `>= 0.11.2`, and drops support fo
 ### Changes
 
 - removed compatibility code for Neovim `< 0.11.2`
-- updated all LSP code to use the new LSP implementation
+- cconfigure **LSP** with the native `vim.lsp.config`
 - migrated **mason.nvim** and **mason-lspconfig.nvim** to `v2.x`
 - added new `treesitter-main` extra to test the new `main` branch of `nvim-treesitter`
   - after enabling, you will get errors. Update with `:Lazy` and restart Neovim
+- enabled [blink.cmp](https://github.com/saghen/blink.cmp) **cmdline** completions
 
 ## 14.x
 

From 919c9e5d091f11b2892c56825249fc4a495d3e8f Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 17 Sep 2025 07:14:22 +0200
Subject: [PATCH 158/341] fix(eslint): remove old 0.10 code

---
 lua/lazyvim/plugins/extras/linting/eslint.lua | 24 +------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/linting/eslint.lua b/lua/lazyvim/plugins/extras/linting/eslint.lua
index 92c670d4..fd860f9b 100644
--- a/lua/lazyvim/plugins/extras/linting/eslint.lua
+++ b/lua/lazyvim/plugins/extras/linting/eslint.lua
@@ -10,7 +10,7 @@ return {
     "neovim/nvim-lspconfig",
     -- other settings removed for brevity
     opts = {
-      ---@type lspconfig.options
+      ---@type table<string, vim.lsp.Config>
       servers = {
         eslint = {
           settings = {
@@ -26,10 +26,6 @@ return {
             return
           end
 
-          local function get_client(buf)
-            return vim.lsp.get_clients({ name = "eslint", bufnr = buf })[1]
-          end
-
           local formatter = LazyVim.lsp.formatter({
             name = "eslint: lsp",
             primary = false,
@@ -37,24 +33,6 @@ return {
             filter = "eslint",
           })
 
-          -- Use EslintFixAll on Neovim < 0.10.0
-          if not pcall(require, "vim.lsp._dynamic") then
-            formatter.name = "eslint: EslintFixAll"
-            formatter.sources = function(buf)
-              local client = get_client(buf)
-              return client and { "eslint" } or {}
-            end
-            formatter.format = function(buf)
-              local client = get_client(buf)
-              if client then
-                local diag = vim.diagnostic.get(buf, { namespace = vim.lsp.diagnostic.get_namespace(client.id) })
-                if #diag > 0 then
-                  vim.cmd("EslintFixAll")
-                end
-              end
-            end
-          end
-
           -- register the formatter with LazyVim
           LazyVim.format.register(formatter)
         end,

From 64ee23f38f9a29400673821a4adbbf058c428a5e Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 17 Sep 2025 07:14:37 +0200
Subject: [PATCH 159/341] style: remove references to Neovim 0.10

---
 lua/lazyvim/config/options.lua   | 2 +-
 lua/lazyvim/plugins/lsp/init.lua | 5 ++---
 lua/lazyvim/util/ui.lua          | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lua/lazyvim/config/options.lua b/lua/lazyvim/config/options.lua
index b5d444d0..fbbb208c 100644
--- a/lua/lazyvim/config/options.lua
+++ b/lua/lazyvim/config/options.lua
@@ -53,7 +53,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. Requires Neovim >= 0.10.0
+-- integration works automatically.
 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
diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index d0c9ced9..c50694d9 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -20,7 +20,6 @@ return {
             source = "if_many",
             prefix = "●",
             -- this will set set the prefix to a function that returns the diagnostics icon based on the severity
-            -- this only works on a recent 0.10.0 build. Will be set to "●" when not supported
             -- prefix = "icons",
           },
           severity_sort = true,
@@ -33,14 +32,14 @@ return {
             },
           },
         },
-        -- Enable this to enable the builtin LSP inlay hints on Neovim >= 0.10.0
+        -- Enable this to enable the builtin LSP inlay hints on Neovim.
         -- Be aware that you also will need to properly configure your LSP server to
         -- provide the inlay hints.
         inlay_hints = {
           enabled = true,
           exclude = { "vue" }, -- filetypes for which you don't want to enable inlay hints
         },
-        -- Enable this to enable the builtin LSP code lenses on Neovim >= 0.10.0
+        -- Enable this to enable the builtin LSP code lenses on Neovim.
         -- Be aware that you also will need to properly configure your LSP server to
         -- provide the code lenses.
         codelens = {
diff --git a/lua/lazyvim/util/ui.lua b/lua/lazyvim/util/ui.lua
index c8c899d5..f36897aa 100644
--- a/lua/lazyvim/util/ui.lua
+++ b/lua/lazyvim/util/ui.lua
@@ -1,7 +1,7 @@
 ---@class lazyvim.util.ui
 local M = {}
 
--- optimized treesitter foldexpr for Neovim >= 0.10.0
+-- optimized treesitter foldexpr
 function M.foldexpr()
   local buf = vim.api.nvim_get_current_buf()
   if vim.b[buf].ts_folds == nil then

From 4a3b4a80a89fe5a52d30fbe4afe85c152878ab1b Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 17 Sep 2025 07:30:27 +0200
Subject: [PATCH 160/341] fix(vue): `volar` -> `vua_ls`. Fixes #6236. Closes
 #6238. Closes #6174

---
 lua/lazyvim/plugins/extras/lang/vue.lua | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/vue.lua b/lua/lazyvim/plugins/extras/lang/vue.lua
index 85f47772..a45caee7 100644
--- a/lua/lazyvim/plugins/extras/lang/vue.lua
+++ b/lua/lazyvim/plugins/extras/lang/vue.lua
@@ -19,13 +19,7 @@ return {
     "neovim/nvim-lspconfig",
     opts = {
       servers = {
-        volar = {
-          init_options = {
-            vue = {
-              hybridMode = true,
-            },
-          },
-        },
+        vue_ls = {},
         vtsls = {},
       },
     },

From 5e2c4e62f28a85e0b27d5c97ea92af8c1ab74cef Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 17 Sep 2025 08:11:33 +0200
Subject: [PATCH 161/341] feat(lsp): enable LSP folds when available

---
 lua/lazyvim/plugins/lsp/init.lua | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index c50694d9..00a698fc 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -45,6 +45,12 @@ return {
         codelens = {
           enabled = false,
         },
+        -- Enable this to enable the builtin LSP folding on Neovim.
+        -- Be aware that you also will need to properly configure your LSP server to
+        -- provide the folds.
+        folds = {
+          enabled = true,
+        },
         -- add any global capabilities here
         capabilities = {
           workspace = {
@@ -137,6 +143,14 @@ return {
         end)
       end
 
+      -- folds
+      if opts.folds.enabled then
+        LazyVim.lsp.on_supports_method("textDocument/foldingRange", function(client, buffer)
+          local win = vim.api.nvim_get_current_win()
+          vim.wo[win][0].foldexpr = "v:lua.vim.lsp.foldexpr()"
+        end)
+      end
+
       -- code lens
       if opts.codelens.enabled and vim.lsp.codelens then
         LazyVim.lsp.on_supports_method("textDocument/codeLens", function(client, buffer)

From 32ef7a9d39b6fe13c81f9e3e56439bf69fa80805 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 17 Sep 2025 09:22:58 +0200
Subject: [PATCH 162/341] docs: typo

---
 NEWS.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index 8f59998f..567b75ed 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -9,11 +9,12 @@ Going forward, **LazyVim** requires **Neovim** `>= 0.11.2`, and drops support fo
 ### Changes
 
 - removed compatibility code for Neovim `< 0.11.2`
-- cconfigure **LSP** with the native `vim.lsp.config`
+- configure **LSP** with the native `vim.lsp.config`
 - migrated **mason.nvim** and **mason-lspconfig.nvim** to `v2.x`
 - added new `treesitter-main` extra to test the new `main` branch of `nvim-treesitter`
   - after enabling, you will get errors. Update with `:Lazy` and restart Neovim
 - enabled [blink.cmp](https://github.com/saghen/blink.cmp) **cmdline** completions
+- use **LSP** based folding when available (disable with `nvim-lspconfig.folds.enabled = false`)
 
 ## 14.x
 

From 5eac460c092103e5516bec345236853b9f35ec7c Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 17 Sep 2025 09:52:44 +0200
Subject: [PATCH 163/341] feat(treesitter)!: migrate to `nvim-treesitter`
 **main** branch

---
 NEWS.md                                       |   4 +-
 lua/lazyvim/config/options.lua                |   3 +-
 lua/lazyvim/plugins/editor.lua                |  10 ++
 .../plugins/extras/ui/treesitter-main.lua     |  90 ----------
 lua/lazyvim/plugins/treesitter.lua            | 160 +++++++++---------
 lua/lazyvim/util/plugin.lua                   |   1 +
 lua/lazyvim/util/ui.lua                       |  28 +--
 7 files changed, 113 insertions(+), 183 deletions(-)
 delete mode 100644 lua/lazyvim/plugins/extras/ui/treesitter-main.lua

diff --git a/NEWS.md b/NEWS.md
index 567b75ed..4f3a0d34 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -11,8 +11,8 @@ Going forward, **LazyVim** requires **Neovim** `>= 0.11.2`, and drops support fo
 - removed compatibility code for Neovim `< 0.11.2`
 - configure **LSP** with the native `vim.lsp.config`
 - migrated **mason.nvim** and **mason-lspconfig.nvim** to `v2.x`
-- added new `treesitter-main` extra to test the new `main` branch of `nvim-treesitter`
-  - after enabling, you will get errors. Update with `:Lazy` and restart Neovim
+- migrated to [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter/tree/main) **main** branch
+- replace `nvim-treesitter` incremental selection with `flash.nvim`, since it is no longer supported
 - enabled [blink.cmp](https://github.com/saghen/blink.cmp) **cmdline** completions
 - use **LSP** based folding when available (disable with `nvim-lspconfig.folds.enabled = false`)
 
diff --git a/lua/lazyvim/config/options.lua b/lua/lazyvim/config/options.lua
index fbbb208c..62c8242e 100644
--- a/lua/lazyvim/config/options.lua
+++ b/lua/lazyvim/config/options.lua
@@ -68,7 +68,7 @@ opt.fillchars = {
   diff = "╱",
   eob = " ",
 }
-opt.foldexpr = "v:lua.require'lazyvim.util'.ui.foldexpr()"
+opt.foldexpr = "v:lua.LazyVim.ui.foldexpr()" -- treesitter folds
 opt.foldlevel = 99
 opt.foldmethod = "expr"
 opt.foldtext = ""
@@ -78,6 +78,7 @@ opt.grepformat = "%f:%l:%c:%m"
 opt.grepprg = "rg --vimgrep"
 opt.ignorecase = true -- Ignore case
 opt.inccommand = "nosplit" -- preview incremental substitute
+opt.indentexpr = "v:lua.LazyVim.ui.indentexpr()" -- treesitter indents
 opt.jumpoptions = "view"
 opt.laststatus = 3 -- global statusline
 opt.linebreak = true -- Wrap lines at convenient points
diff --git a/lua/lazyvim/plugins/editor.lua b/lua/lazyvim/plugins/editor.lua
index 4aaf3d1f..9fdeffd9 100644
--- a/lua/lazyvim/plugins/editor.lua
+++ b/lua/lazyvim/plugins/editor.lua
@@ -40,6 +40,16 @@ return {
       { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
       { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
       { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
+      -- Simulate nvim-treesitter incremental selection
+      { "<c-space>", mode = { "n", "o", "x" },
+        function()
+          require("flash").treesitter({
+            actions = {
+              ["<c-space>"] = "next",
+              ["<BS>"] = "prev"
+            }
+          }) 
+        end, desc = "Treesitter Incremental Selection" },
     },
   },
 
diff --git a/lua/lazyvim/plugins/extras/ui/treesitter-main.lua b/lua/lazyvim/plugins/extras/ui/treesitter-main.lua
deleted file mode 100644
index bb22aabb..00000000
--- a/lua/lazyvim/plugins/extras/ui/treesitter-main.lua
+++ /dev/null
@@ -1,90 +0,0 @@
-return {
-  {
-    "nvim-treesitter/nvim-treesitter",
-    version = false, -- last release is way too old and doesn't work on Windows
-    branch = "main",
-    build = ":TSUpdate",
-    lazy = true,
-    cmd = { "TSUpdate", "TSInstall", "TSLog", "TSUninstall" },
-    init = function() end,
-    ---@param opts TSConfig
-    config = function(_, opts)
-      if vim.fn.executable("tree-sitter") == 0 then
-        LazyVim.error("**treesitter-main** requires the `tree-sitter` executable to be installed")
-        return
-      end
-      if type(opts.ensure_installed) ~= "table" then
-        error("opts.ensure_installed must be a table")
-      end
-
-      local TS = require("nvim-treesitter")
-      TS.setup(opts)
-
-      local needed = LazyVim.dedup(opts.ensure_installed --[[@as string[] ]])
-      local installed = TS.get_installed("parsers")
-      local install = vim.tbl_filter(function(lang)
-        return not vim.tbl_contains(installed, lang)
-      end, needed)
-
-      if #install > 0 then
-        TS.install(install, { summary = true })
-        vim.list_extend(installed, install)
-      end
-
-      -- backwards compatibility with the old treesitter config for highlight and indent
-      local highlight, indent = vim.tbl_get(opts, "highlight", "enable"), vim.tbl_get(opts, "indent", "enable")
-      if highlight or indent then
-        vim.api.nvim_create_autocmd("FileType", {
-          callback = function(ev)
-            local lang = vim.treesitter.language.get_lang(ev.match)
-            if not vim.tbl_contains(installed, lang) then
-              return
-            end
-            if highlight then
-              pcall(vim.treesitter.start)
-            end
-            if indent then
-              vim.bo[ev.buf].indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
-            end
-          end,
-        })
-      end
-    end,
-  },
-  {
-    "nvim-treesitter/nvim-treesitter-textobjects",
-    branch = "main",
-    event = "VeryLazy",
-    opts = {},
-    keys = function()
-      local moves = {
-        goto_next_start = { ["]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" },
-        goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer", ["[A"] = "@parameter.inner" },
-      }
-      local ret = {} ---@type LazyKeysSpec[]
-      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()
-              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)
-      require("nvim-treesitter-textobjects").setup(opts)
-    end,
-  },
-}
diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index 0f0c8fe8..4b15ab87 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -1,43 +1,25 @@
 return {
-  {
-    "folke/which-key.nvim",
-    opts = {
-      spec = {
-        { "<BS>", desc = "Decrement Selection", mode = "x" },
-        { "<c-space>", desc = "Increment Selection", mode = { "x", "n" } },
-      },
-    },
-  },
 
   -- Treesitter is a new parser generator tool that we can
   -- use in Neovim to power faster and more accurate
   -- syntax highlighting.
   {
     "nvim-treesitter/nvim-treesitter",
+    branch = "main",
     version = false, -- last release is way too old and doesn't work on Windows
-    build = ":TSUpdate",
-    event = { "LazyFile", "VeryLazy" },
-    lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline
-    init = function(plugin)
-      -- PERF: add nvim-treesitter queries to the rtp and it's custom query predicates early
-      -- This is needed because a bunch of plugins no longer `require("nvim-treesitter")`, which
-      -- no longer trigger the **nvim-treesitter** module to be loaded in time.
-      -- Luckily, the only things that those plugins need are the custom queries, which we make available
-      -- during startup.
-      require("lazy.core.loader").add_to_rtp(plugin)
-      require("nvim-treesitter.query_predicates")
+    build = function()
+      local TS = require("nvim-treesitter")
+      if not TS.get_installed then
+        LazyVim.error("Please restart Neovim and run `:TSUpdate` to use the `nvim-treesitter` **main** branch.")
+        return
+      end
+      vim.cmd.TSUpdate()
     end,
-    cmd = { "TSUpdateSync", "TSUpdate", "TSInstall" },
-    keys = {
-      { "<c-space>", desc = "Increment Selection" },
-      { "<bs>", desc = "Decrement Selection", mode = "x" },
-    },
+    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" },
-    ---@type TSConfig
-    ---@diagnostic disable-next-line: missing-fields
     opts = {
-      highlight = { enable = true },
-      indent = { enable = true },
       ensure_installed = {
         "bash",
         "c",
@@ -64,65 +46,91 @@ return {
         "xml",
         "yaml",
       },
-      incremental_selection = {
-        enable = true,
-        keymaps = {
-          init_selection = "<C-space>",
-          node_incremental = "<C-space>",
-          scope_incremental = false,
-          node_decremental = "<bs>",
-        },
-      },
-      textobjects = {
-        move = {
-          enable = true,
-          goto_next_start = { ["]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" },
-          goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer", ["[A"] = "@parameter.inner" },
-        },
-      },
     },
+    ---@param plugin LazyPlugin
     ---@param opts TSConfig
-    config = function(_, opts)
-      if type(opts.ensure_installed) == "table" then
-        opts.ensure_installed = LazyVim.dedup(opts.ensure_installed)
+    config = function(plugin, opts)
+      if vim.fn.executable("tree-sitter") == 0 then
+        LazyVim.error("**treesitter-main** requires the `tree-sitter` executable to be installed")
+        return
       end
-      require("nvim-treesitter.configs").setup(opts)
+      if type(opts.ensure_installed) ~= "table" then
+        LazyVim.error("`nvim-treesitter` opts.ensure_installed must be a table")
+      end
+
+      local TS = require("nvim-treesitter")
+      if not TS.get_installed then
+        LazyVim.error("Please use `:Lazy` and update `nvim-treesitter`")
+        return
+      end
+      TS.setup(opts)
+
+      local needed = LazyVim.dedup(opts.ensure_installed --[[@as string[] ]])
+      LazyVim.ui.installed = TS.get_installed("parsers")
+
+      local install = vim.tbl_filter(function(lang)
+        return not LazyVim.ui.have(lang)
+      end, needed)
+
+      if #install > 0 then
+        TS.install(install, { summary = true }):await(function()
+          LazyVim.ui.installed = TS.get_installed("parsers")
+        end)
+      end
+
+      vim.api.nvim_create_autocmd("FileType", {
+        callback = function(ev)
+          if LazyVim.ui.have(ev.match) then
+            pcall(vim.treesitter.start)
+          end
+        end,
+      })
     end,
   },
 
   {
     "nvim-treesitter/nvim-treesitter-textobjects",
+    branch = "main",
     event = "VeryLazy",
-    enabled = true,
-    config = function()
-      -- If treesitter is already loaded, we need to run config again for textobjects
-      if LazyVim.is_loaded("nvim-treesitter") then
-        local opts = LazyVim.opts("nvim-treesitter")
-        require("nvim-treesitter.configs").setup({ textobjects = opts.textobjects })
-      end
-
-      -- When in diff mode, we want to use the default
-      -- vim text objects c & C instead of the treesitter ones.
-      local move = require("nvim-treesitter.textobjects.move") ---@type table<string,fun(...)>
-      local configs = require("nvim-treesitter.configs")
-      for name, fn in pairs(move) do
-        if name:find("goto") == 1 then
-          move[name] = function(q, ...)
-            if vim.wo.diff then
-              local config = configs.get_module("textobjects.move")[name] ---@type table<string,string>
-              for key, query in pairs(config or {}) do
-                if q == query and key:find("[%]%[][cC]") then
-                  vim.cmd("normal! " .. key)
-                  return
-                end
+    opts = {},
+    keys = function()
+      local moves = {
+        goto_next_start = { ["]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" },
+        goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer", ["[A"] = "@parameter.inner" },
+      }
+      local ret = {} ---@type LazyKeysSpec[]
+      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
-            end
-            return fn(q, ...)
-          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
+        LazyVim.error("Please use `:Lazy` and update `nvim-treesitter`")
+        return
+      end
+      TS.setup(opts)
     end,
   },
 
diff --git a/lua/lazyvim/util/plugin.lua b/lua/lazyvim/util/plugin.lua
index ff3f3634..58063385 100644
--- a/lua/lazyvim/util/plugin.lua
+++ b/lua/lazyvim/util/plugin.lua
@@ -17,6 +17,7 @@ M.deprecated_extras = {
   ["lazyvim.plugins.extras.ui.dashboard"] = "`dashboard.nvim` is now the default **LazyVim** starter.",
   ["lazyvim.plugins.extras.coding.native_snippets"] = "Native snippets are now the default for **Neovim >= 0.10**",
   ["lazyvim.plugins.extras.ui.treesitter-rewrite"] = "Disabled `treesitter-rewrite` extra for now. Not ready yet.",
+  ["lazyvim.plugins.extras.ui.treesitter-main"] = "the `nvim-treesitter` main branch is now used by default",
   ["lazyvim.plugins.extras.coding.mini-ai"] = "`mini.ai` is now a core LazyVim plugin (again)",
   ["lazyvim.plugins.extras.lazyrc"] = "local spec files are now a lazy.nvim feature",
   ["lazyvim.plugins.extras.editor.trouble-v3"] = "Trouble v3 has been merged in main",
diff --git a/lua/lazyvim/util/ui.lua b/lua/lazyvim/util/ui.lua
index f36897aa..19d5642e 100644
--- a/lua/lazyvim/util/ui.lua
+++ b/lua/lazyvim/util/ui.lua
@@ -1,22 +1,22 @@
 ---@class lazyvim.util.ui
 local M = {}
 
--- optimized treesitter foldexpr
+M.installed = {} ---@type string[]
+
+---@param ft string
+function M.have(ft)
+  local lang = vim.treesitter.language.get_lang(ft)
+  return vim.tbl_contains(M.installed, lang)
+end
+
 function M.foldexpr()
   local buf = vim.api.nvim_get_current_buf()
-  if vim.b[buf].ts_folds == nil then
-    -- as long as we don't have a filetype, don't bother
-    -- checking if treesitter is available (it won't)
-    if vim.bo[buf].filetype == "" then
-      return "0"
-    end
-    if vim.bo[buf].filetype:find("dashboard") then
-      vim.b[buf].ts_folds = false
-    else
-      vim.b[buf].ts_folds = pcall(vim.treesitter.get_parser, buf)
-    end
-  end
-  return vim.b[buf].ts_folds and vim.treesitter.foldexpr() or "0"
+  return M.have(vim.b[buf].filetype) and vim.treesitter.foldexpr() or "0"
+end
+
+function M.indentexpr()
+  local buf = vim.api.nvim_get_current_buf()
+  return M.have(vim.b[buf].filetype) and require("nvim-treesitter").indentexpr() or -1
 end
 
 return M

From e9344e5319b712e90cfe36521d4682f36aaaf297 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 17 Sep 2025 10:10:34 +0200
Subject: [PATCH 164/341] docs: better error and ref to checkhealth for
 nvim-treesitter main

---
 NEWS.md                            | 2 ++
 lua/lazyvim/plugins/treesitter.lua | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index 4f3a0d34..050440b2 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -12,6 +12,8 @@ Going forward, **LazyVim** requires **Neovim** `>= 0.11.2`, and drops support fo
 - configure **LSP** with the native `vim.lsp.config`
 - migrated **mason.nvim** and **mason-lspconfig.nvim** to `v2.x`
 - migrated to [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter/tree/main) **main** branch
+  - with the new version, the `tree-sitter` cli is **required** to install parsers
+  - best to run `:checkhealth nvim_treesitter` after updating
 - replace `nvim-treesitter` incremental selection with `flash.nvim`, since it is no longer supported
 - enabled [blink.cmp](https://github.com/saghen/blink.cmp) **cmdline** completions
 - use **LSP** based folding when available (disable with `nvim-lspconfig.folds.enabled = false`)
diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index 4b15ab87..d65ce551 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -51,7 +51,10 @@ return {
     ---@param opts TSConfig
     config = function(plugin, opts)
       if vim.fn.executable("tree-sitter") == 0 then
-        LazyVim.error("**treesitter-main** requires the `tree-sitter` executable to be installed")
+        LazyVim.error({
+          "**treesitter-main** requires the `tree-sitter` CLI executable to be installed.",
+          "Run `:checkhealth nvim_treesitter` for more information.",
+        })
         return
       end
       if type(opts.ensure_installed) ~= "table" then

From 6eed1781c185ea6d1f313aee60a7097448f473cb Mon Sep 17 00:00:00 2001
From: EasonMo <moyicheng1990@gmail.com>
Date: Wed, 17 Sep 2025 16:13:36 +0800
Subject: [PATCH 165/341] fix(gitsigns): use silent for gitsigns keymaps
 (#5841)

## Description

When executing `<leader>ghs`, the command line window will flicker.
Therefore, it should be run silently.

## Related Issue(s)
None

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/editor.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/editor.lua b/lua/lazyvim/plugins/editor.lua
index 9fdeffd9..5abed1a3 100644
--- a/lua/lazyvim/plugins/editor.lua
+++ b/lua/lazyvim/plugins/editor.lua
@@ -153,7 +153,7 @@ return {
         local gs = package.loaded.gitsigns
 
         local function map(mode, l, r, desc)
-          vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc })
+          vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc, silent = true })
         end
 
         -- stylua: ignore start

From fd1b02ae5740dc651cc43291391084dbe7b1b3c4 Mon Sep 17 00:00:00 2001
From: Nick Janetakis <nick.janetakis@gmail.com>
Date: Wed, 17 Sep 2025 04:14:48 -0400
Subject: [PATCH 166/341] fix(grug-far): add support for GrugFarWithin so it
 gets loaded by default (#5772)

## Description

https://github.com/MagicDuck/grug-far.nvim is the default find and
replace plugin for LazyVim.

It recently added support for being able to do a find / replace within a
visual selection to limit the scope of a search.

It did that by introducing a new command called `:GrugFarWithin`. This
PR adds that as a `cmd` so it gets loaded by default. Without this PR,
you cannot call this command unless you first call `:GrugFar`. This was
identified by the author of Grug Far.

## Related Issue(s)

There is no issue in this repo, but this feature is related to:
https://github.com/MagicDuck/grug-far.nvim/issues/357

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

I also want to give a shout-out to @MagicDuck who is the author of the
plugin. He implemented this feature so fast and has been super helpful
in his repo's issue tracker.
---
 lua/lazyvim/plugins/editor.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/editor.lua b/lua/lazyvim/plugins/editor.lua
index 5abed1a3..8fef8e9e 100644
--- a/lua/lazyvim/plugins/editor.lua
+++ b/lua/lazyvim/plugins/editor.lua
@@ -4,7 +4,7 @@ return {
   {
     "MagicDuck/grug-far.nvim",
     opts = { headerMaxWidth = 80 },
-    cmd = "GrugFar",
+    cmd = { "GrugFar", "GrugFarWithin" },
     keys = {
       {
         "<leader>sr",

From 112b8848b55ba5161c6713219a200a51be67d859 Mon Sep 17 00:00:00 2001
From: Jorge Villalobos <minusfive@users.noreply.github.com>
Date: Wed, 17 Sep 2025 04:15:21 -0400
Subject: [PATCH 167/341] chore(which-key): remove unnecessary icons (#5461)

## Description

These are already handled by which-key exactly the same way, no need to
re-declare them here. Removing them from here has no effect.

## Related Issue(s)

N/A

## Screenshots

![Screenshot 2025-01-23 at 21 21
14](https://github.com/user-attachments/assets/d9f777e8-d514-4836-9314-03a66cc5a34b)

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/editor.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/plugins/editor.lua b/lua/lazyvim/plugins/editor.lua
index 8fef8e9e..6e2c894e 100644
--- a/lua/lazyvim/plugins/editor.lua
+++ b/lua/lazyvim/plugins/editor.lua
@@ -74,8 +74,8 @@ return {
           { "<leader>gh", group = "hunks" },
           { "<leader>q", group = "quit/session" },
           { "<leader>s", group = "search" },
-          { "<leader>u", group = "ui", icon = { icon = "󰙵 ", color = "cyan" } },
-          { "<leader>x", group = "diagnostics/quickfix", icon = { icon = "󱖫 ", color = "green" } },
+          { "<leader>u", group = "ui" },
+          { "<leader>x", group = "diagnostics/quickfix" },
           { "[", group = "prev" },
           { "]", group = "next" },
           { "g", group = "goto" },

From 014b5bf6ac9ec24c955d481882b5e8cb39846d97 Mon Sep 17 00:00:00 2001
From: Alexey Svirshchevskiy <svirshchevskiy@gmail.com>
Date: Wed, 17 Sep 2025 10:40:37 +0200
Subject: [PATCH 168/341] docs(treesitter): fix checkhealth command (#6433)

---
 NEWS.md                            | 2 +-
 lua/lazyvim/plugins/treesitter.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 050440b2..9342acb2 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -13,7 +13,7 @@ Going forward, **LazyVim** requires **Neovim** `>= 0.11.2`, and drops support fo
 - migrated **mason.nvim** and **mason-lspconfig.nvim** to `v2.x`
 - migrated to [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter/tree/main) **main** branch
   - with the new version, the `tree-sitter` cli is **required** to install parsers
-  - best to run `:checkhealth nvim_treesitter` after updating
+  - best to run `:checkhealth nvim-treesitter` after updating
 - replace `nvim-treesitter` incremental selection with `flash.nvim`, since it is no longer supported
 - enabled [blink.cmp](https://github.com/saghen/blink.cmp) **cmdline** completions
 - use **LSP** based folding when available (disable with `nvim-lspconfig.folds.enabled = false`)
diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index d65ce551..1d5abb2f 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -53,7 +53,7 @@ return {
       if vim.fn.executable("tree-sitter") == 0 then
         LazyVim.error({
           "**treesitter-main** requires the `tree-sitter` CLI executable to be installed.",
-          "Run `:checkhealth nvim_treesitter` for more information.",
+          "Run `:checkhealth nvim-treesitter` for more information.",
         })
         return
       end

From ab657e95898648bae210815bd641aa1a1fae5472 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tmcw@users.noreply.github.com>
Date: Wed, 17 Sep 2025 05:17:32 -0400
Subject: [PATCH 169/341] docs: improved plugin doc strings (#5657)

## Description

This improves the comment strings that produce documentation for
different plugins. I often look at the docs to learn what stuff is
already installed, and this would help people like me to quickly
understand what some of the plugins do.

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/coding.lua                 | 14 +++++++++++---
 lua/lazyvim/plugins/extras/ui/edgy.lua         |  2 +-
 lua/lazyvim/plugins/extras/ui/mini-animate.lua |  3 ++-
 lua/lazyvim/plugins/extras/ui/smear-cursor.lua |  1 +
 lua/lazyvim/plugins/linting.lua                |  2 ++
 lua/lazyvim/plugins/ui.lua                     |  3 ++-
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/lua/lazyvim/plugins/coding.lua b/lua/lazyvim/plugins/coding.lua
index 8b242eb8..7f6bb550 100644
--- a/lua/lazyvim/plugins/coding.lua
+++ b/lua/lazyvim/plugins/coding.lua
@@ -1,5 +1,7 @@
 return {
-  -- auto pairs
+  -- Auto pairs
+  -- Automatically inserts a matching closing character
+  -- when you type an opening character like `"`, `[`, or `(`.
   {
     "nvim-mini/mini.pairs",
     event = "VeryLazy",
@@ -20,14 +22,18 @@ return {
     end,
   },
 
-  -- comments
+  -- Improves comment syntax, lets Neovim handle multiple
+  -- types of comments for a single language, and relaxes rules
+  -- for uncommenting.
   {
     "folke/ts-comments.nvim",
     event = "VeryLazy",
     opts = {},
   },
 
-  -- Better text-objects
+  -- Extends the a & i text objects, this adds the ability to select
+  -- arguments, function calls, text within quotes and brackets, and to
+  -- repeat those selections to select an outer text object.
   {
     "nvim-mini/mini.ai",
     event = "VeryLazy",
@@ -64,6 +70,8 @@ return {
     end,
   },
 
+  -- Configures LuaLS to support auto-completion and type checking
+  -- while editing your Neovim configuration.
   {
     "folke/lazydev.nvim",
     ft = "lua",
diff --git a/lua/lazyvim/plugins/extras/ui/edgy.lua b/lua/lazyvim/plugins/extras/ui/edgy.lua
index dbe76d1b..bf522270 100644
--- a/lua/lazyvim/plugins/extras/ui/edgy.lua
+++ b/lua/lazyvim/plugins/extras/ui/edgy.lua
@@ -1,5 +1,5 @@
 return {
-  -- edgy
+  -- Create and display predefined window layouts.
   {
     "folke/edgy.nvim",
     event = "VeryLazy",
diff --git a/lua/lazyvim/plugins/extras/ui/mini-animate.lua b/lua/lazyvim/plugins/extras/ui/mini-animate.lua
index 5a3fdef6..b71c19a9 100644
--- a/lua/lazyvim/plugins/extras/ui/mini-animate.lua
+++ b/lua/lazyvim/plugins/extras/ui/mini-animate.lua
@@ -8,7 +8,8 @@ return {
     },
   },
 
-  -- setup animate
+  -- Animates many common Neovim actions, like scrolling,
+  -- moving the cursor, and resizing windows.
   {
     "nvim-mini/mini.animate",
     event = "VeryLazy",
diff --git a/lua/lazyvim/plugins/extras/ui/smear-cursor.lua b/lua/lazyvim/plugins/extras/ui/smear-cursor.lua
index 2ca27780..4ab6f03e 100644
--- a/lua/lazyvim/plugins/extras/ui/smear-cursor.lua
+++ b/lua/lazyvim/plugins/extras/ui/smear-cursor.lua
@@ -1,3 +1,4 @@
+-- Animates cursor movement with a smear effect.
 return {
   "sphamba/smear-cursor.nvim",
   event = "VeryLazy",
diff --git a/lua/lazyvim/plugins/linting.lua b/lua/lazyvim/plugins/linting.lua
index 46cf2898..9b1bed29 100644
--- a/lua/lazyvim/plugins/linting.lua
+++ b/lua/lazyvim/plugins/linting.lua
@@ -1,4 +1,6 @@
 return {
+  -- Asynchronously calls language-specific linter tools and reports
+  -- their results via the `vim.diagnostic` module.
   {
     "mfussenegger/nvim-lint",
     event = "LazyFile",
diff --git a/lua/lazyvim/plugins/ui.lua b/lua/lazyvim/plugins/ui.lua
index 9dd7254b..23afdc39 100644
--- a/lua/lazyvim/plugins/ui.lua
+++ b/lua/lazyvim/plugins/ui.lua
@@ -60,7 +60,8 @@ return {
     end,
   },
 
-  -- statusline
+  -- Displays a fancy status line with git status,
+  -- LSP diagnostics, filetype information, and more.
   {
     "nvim-lualine/lualine.nvim",
     event = "VeryLazy",

From aab503fda63f34cff6bce229f73ea5209e8afaf0 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <contact@amaanq.com>
Date: Wed, 17 Sep 2025 05:19:29 -0400
Subject: [PATCH 170/341] fix(clangd): file detection improvements (#6436)

## Description

As discussed in
https://github.com/LazyVim/LazyVim/commit/23b9cdeb3471b655532e9884fa2dd36ee83062d5#r165937336,
it'd be better to remove clang configuration files from influencing root
dir detection. I've also added meson and ninja files to the extra's
recommendation detection

## Related Issue(s)

## Screenshots

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/clangd.lua | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/clangd.lua b/lua/lazyvim/plugins/extras/lang/clangd.lua
index 9417b257..0ba58aca 100644
--- a/lua/lazyvim/plugins/extras/lang/clangd.lua
+++ b/lua/lazyvim/plugins/extras/lang/clangd.lua
@@ -9,6 +9,8 @@ return {
         "compile_commands.json",
         "compile_flags.txt",
         "configure.ac", -- AutoTools
+        "meson.build",
+        "build.ninja",
       },
     })
   end,
@@ -61,9 +63,6 @@ return {
             { "<leader>ch", "<cmd>ClangdSwitchSourceHeader<cr>", desc = "Switch Source/Header (C/C++)" },
           },
           root_markers = {
-            ".clangd",
-            ".clang-tidy",
-            ".clang-format",
             "compile_commands.json",
             "compile_flags.txt",
             "configure.ac", -- AutoTools

From 72e1ee5b0db02c5678e1ee1b82f720e4c32b0c74 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 17 Sep 2025 15:33:37 +0200
Subject: [PATCH 171/341] refactor(treesitter): cleanup

---
 lua/lazyvim/config/options.lua              |  4 +-
 lua/lazyvim/plugins/treesitter.lua          | 42 ++++++++++-----------
 lua/lazyvim/util/deprecated.lua             | 12 +++++-
 lua/lazyvim/util/init.lua                   | 24 +++++++-----
 lua/lazyvim/util/{ui.lua => treesitter.lua} | 17 +++++++--
 5 files changed, 61 insertions(+), 38 deletions(-)
 rename lua/lazyvim/util/{ui.lua => treesitter.lua} (51%)

diff --git a/lua/lazyvim/config/options.lua b/lua/lazyvim/config/options.lua
index 62c8242e..f71f96df 100644
--- a/lua/lazyvim/config/options.lua
+++ b/lua/lazyvim/config/options.lua
@@ -68,7 +68,7 @@ opt.fillchars = {
   diff = "╱",
   eob = " ",
 }
-opt.foldexpr = "v:lua.LazyVim.ui.foldexpr()" -- treesitter folds
+opt.foldexpr = "v:lua.LazyVim.treesitter.foldexpr()" -- treesitter folds
 opt.foldlevel = 99
 opt.foldmethod = "expr"
 opt.foldtext = ""
@@ -78,7 +78,7 @@ opt.grepformat = "%f:%l:%c:%m"
 opt.grepprg = "rg --vimgrep"
 opt.ignorecase = true -- Ignore case
 opt.inccommand = "nosplit" -- preview incremental substitute
-opt.indentexpr = "v:lua.LazyVim.ui.indentexpr()" -- treesitter indents
+opt.indentexpr = "v:lua.LazyVim.treesitter.indentexpr()" -- treesitter indents
 opt.jumpoptions = "view"
 opt.laststatus = 3 -- global statusline
 opt.linebreak = true -- Wrap lines at convenient points
diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index 1d5abb2f..5462149a 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -19,7 +19,9 @@ return {
     event = { "LazyFile", "VeryLazy" },
     cmd = { "TSUpdate", "TSInstall", "TSLog", "TSUninstall" },
     opts_extend = { "ensure_installed" },
+    ---@class lazyvim.TSConfig: TSConfig
     opts = {
+      -- LazyVim config for treesitter
       ensure_installed = {
         "bash",
         "c",
@@ -47,43 +49,39 @@ return {
         "yaml",
       },
     },
-    ---@param plugin LazyPlugin
-    ---@param opts TSConfig
-    config = function(plugin, opts)
-      if vim.fn.executable("tree-sitter") == 0 then
-        LazyVim.error({
+    ---@param opts lazyvim.TSConfig
+    config = function(_, opts)
+      local TS = require("nvim-treesitter")
+
+      -- some quick sanity checks
+      if not TS.get_installed then
+        return LazyVim.error("Please use `:Lazy` and update `nvim-treesitter`")
+      elseif vim.fn.executable("tree-sitter") == 0 then
+        return LazyVim.error({
           "**treesitter-main** requires the `tree-sitter` CLI executable to be installed.",
           "Run `:checkhealth nvim-treesitter` for more information.",
         })
-        return
-      end
-      if type(opts.ensure_installed) ~= "table" then
-        LazyVim.error("`nvim-treesitter` opts.ensure_installed must be a table")
+      elseif type(opts.ensure_installed) ~= "table" then
+        return LazyVim.error("`nvim-treesitter` opts.ensure_installed must be a table")
       end
 
-      local TS = require("nvim-treesitter")
-      if not TS.get_installed then
-        LazyVim.error("Please use `:Lazy` and update `nvim-treesitter`")
-        return
-      end
+      -- setup treesitter
       TS.setup(opts)
 
-      local needed = LazyVim.dedup(opts.ensure_installed --[[@as string[] ]])
-      LazyVim.ui.installed = TS.get_installed("parsers")
-
+      -- install missing parsers
       local install = vim.tbl_filter(function(lang)
-        return not LazyVim.ui.have(lang)
-      end, needed)
-
+        return not LazyVim.treesitter.have(lang)
+      end, opts.ensure_installed or {})
       if #install > 0 then
         TS.install(install, { summary = true }):await(function()
-          LazyVim.ui.installed = TS.get_installed("parsers")
+          LazyVim.treesitter.get_installed(true) -- refresh the installed langs
         end)
       end
 
+      -- treesitter highlighting
       vim.api.nvim_create_autocmd("FileType", {
         callback = function(ev)
-          if LazyVim.ui.have(ev.match) then
+          if LazyVim.treesitter.have(ev.match) then
             pcall(vim.treesitter.start)
           end
         end,
diff --git a/lua/lazyvim/util/deprecated.lua b/lua/lazyvim/util/deprecated.lua
index 375bc9ca..3aad7318 100644
--- a/lua/lazyvim/util/deprecated.lua
+++ b/lua/lazyvim/util/deprecated.lua
@@ -1,3 +1,4 @@
+---@class lazyvim.util.deprecated
 local M = {}
 
 M.moved = {
@@ -13,6 +14,7 @@ M.moved = {
   ui = {
     statuscolumn = { "Snacks.statuscolumn" },
     bufremove = { "Snacks.bufdelete" },
+    foldexpr = { "LazyVim.treesitter.foldexpr", stacktrace = false },
     fg = {
       "{ fg = Snacks.util.color(...) }",
       fn = function(...)
@@ -28,7 +30,7 @@ function M.decorate(name, mod)
   if not M.moved[name] then
     return mod
   end
-  setmetatable(mod, {
+  return setmetatable(mod, {
     __call = function(_, ...)
       local to = M.moved[name].__call[1]
       LazyVim.deprecate("LazyVim." .. name, to)
@@ -38,7 +40,9 @@ function M.decorate(name, mod)
     __index = function(_, k)
       if M.moved[name][k] then
         local to = M.moved[name][k][1]
-        LazyVim.deprecate("LazyVim." .. name .. "." .. k, to)
+        LazyVim.deprecate("LazyVim." .. name .. "." .. k, to, {
+          stacktrace = M.moved[name][k].stacktrace,
+        })
         if M.moved[name][k].fn then
           return M.moved[name][k].fn
         end
@@ -55,6 +59,10 @@ function M.lazygit()
   return Snacks.lazygit
 end
 
+function M.ui()
+  return M.decorate("ui", {})
+end
+
 function M.toggle()
   LazyVim.deprecate("LazyVim.toggle", "Snacks.toggle")
   return {
diff --git a/lua/lazyvim/util/init.lua b/lua/lazyvim/util/init.lua
index 339fdadb..7561b385 100644
--- a/lua/lazyvim/util/init.lua
+++ b/lua/lazyvim/util/init.lua
@@ -2,7 +2,7 @@ local LazyUtil = require("lazy.core.util")
 
 ---@class lazyvim.util: LazyUtilCore
 ---@field config LazyVimConfig
----@field ui lazyvim.util.ui
+---@field treesitter lazyvim.util.treesitter
 ---@field lsp lazyvim.util.lsp
 ---@field root lazyvim.util.root
 ---@field terminal lazyvim.util.terminal
@@ -16,14 +16,16 @@ local LazyUtil = require("lazy.core.util")
 ---@field mini lazyvim.util.mini
 ---@field pick lazyvim.util.pick
 ---@field cmp lazyvim.util.cmp
+---@field deprecated lazyvim.util.deprecated
 local M = {}
+M.deprecated = require("lazyvim.util.deprecated")
 
 setmetatable(M, {
   __index = function(t, k)
     if LazyUtil[k] then
       return LazyUtil[k]
     end
-    if k == "lazygit" or k == "toggle" then -- HACK: special case for lazygit
+    if M.deprecated[k] then
       return M.deprecated[k]()
     end
     ---@diagnostic disable-next-line: no-unknown
@@ -125,13 +127,17 @@ function M.opts(name)
   return Plugin.values(plugin, "opts", false)
 end
 
-function M.deprecate(old, new)
-  M.warn(("`%s` is deprecated. Please use `%s` instead"):format(old, new), {
-    title = "LazyVim",
-    once = true,
-    stacktrace = true,
-    stacklevel = 6,
-  })
+---@param opts? LazyNotifyOpts
+function M.deprecate(old, new, opts)
+  M.warn(
+    ("`%s` is deprecated. Please use `%s` instead"):format(old, new),
+    vim.tbl_extend("force", {
+      title = "LazyVim",
+      once = true,
+      stacktrace = true,
+      stacklevel = 6,
+    }, opts or {})
+  )
 end
 
 -- delay notifications till vim.notify was replaced or after 500ms
diff --git a/lua/lazyvim/util/ui.lua b/lua/lazyvim/util/treesitter.lua
similarity index 51%
rename from lua/lazyvim/util/ui.lua
rename to lua/lazyvim/util/treesitter.lua
index 19d5642e..84e279ce 100644
--- a/lua/lazyvim/util/ui.lua
+++ b/lua/lazyvim/util/treesitter.lua
@@ -1,12 +1,23 @@
----@class lazyvim.util.ui
+---@class lazyvim.util.treesitter
 local M = {}
 
-M.installed = {} ---@type string[]
+M._installed = nil ---@type table<string,string>?
+
+---@param force boolean?
+function M.get_installed(force)
+  if not M._installed or force then
+    M._installed = {}
+    for _, lang in ipairs(require("nvim-treesitter").get_installed("parsers")) do
+      M._installed[lang] = lang
+    end
+  end
+  return M._installed
+end
 
 ---@param ft string
 function M.have(ft)
   local lang = vim.treesitter.language.get_lang(ft)
-  return vim.tbl_contains(M.installed, lang)
+  return lang and M.get_installed()[lang]
 end
 
 function M.foldexpr()

From 2c44d3306398fc7ca1cc02c2e9466944a2725030 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Sep 2025 15:40:17 +0200
Subject: [PATCH 172/341] chore(main): release 15.0.0 (#6422)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

:robot: I have created a release *beep* *boop*
---


##
[15.0.0](https://github.com/LazyVim/LazyVim/compare/v14.15.1...v15.0.0)
(2025-09-17)


### ⚠ BREAKING CHANGES

* **treesitter:** migrate to `nvim-treesitter` **main** branch
* bump Neovim requirement to 0.11.2
* LazyVim now requires Neovim >= 0.11 See #6421 for more info

### Features

* **blink:** enable blink cmdline completions
([011a35c](https://github.com/LazyVim/LazyVim/commit/011a35ccb810cbe5d25def9cc92271e8423feb74))
* **blink:** enable cmdline completions
([ff7c12c](https://github.com/LazyVim/LazyVim/commit/ff7c12c48e23941ffd9a7bbe61857624929ae9da))
* bump Neovim requirement to 0.11.2
([cccfe70](https://github.com/LazyVim/LazyVim/commit/cccfe70ea4390c1915f67ab7d2893971fba3f3fa))
* **extras:** added an experimental extra for the treesitter `main`
branch
([5668ad7](https://github.com/LazyVim/LazyVim/commit/5668ad72ca806b3a7915bb7b35dcc5cccfe774f7))
* LazyVim now requires Neovim &gt;= 0.11 See
[#6421](https://github.com/LazyVim/LazyVim/issues/6421) for more info
([e7ce65e](https://github.com/LazyVim/LazyVim/commit/e7ce65e1bb814f79ecb45bfeca934e997e0ee42c))
* **lsp:** enable LSP folds when available
([5e2c4e6](https://github.com/LazyVim/LazyVim/commit/5e2c4e62f28a85e0b27d5c97ea92af8c1ab74cef))
* **treesitter:** migrate to `nvim-treesitter` **main** branch
([5eac460](https://github.com/LazyVim/LazyVim/commit/5eac460c092103e5516bec345236853b9f35ec7c))


### Bug Fixes

* **blink:** make blink completions in cmdline behave more like regular
cmdline
([f54fd7f](https://github.com/LazyVim/LazyVim/commit/f54fd7f751e902e824c3a4c9d212a0d18387d0b6))
* **catppuccin:** follow renamed integration
([#6354](https://github.com/LazyVim/LazyVim/issues/6354))
([02d0c9a](https://github.com/LazyVim/LazyVim/commit/02d0c9aebddb902d9c974a38bb44db9bae4eac6d))
* **clangd:** file detection improvements
([#6436](https://github.com/LazyVim/LazyVim/issues/6436))
([aab503f](https://github.com/LazyVim/LazyVim/commit/aab503fda63f34cff6bce229f73ea5209e8afaf0))
* **clangd:** rewrite the root_dir function
([#6060](https://github.com/LazyVim/LazyVim/issues/6060))
([167d39b](https://github.com/LazyVim/LazyVim/commit/167d39b2bef24024be1a48267e14cc6c82146462))
* **eslint:** remove old 0.10 code
([919c9e5](https://github.com/LazyVim/LazyVim/commit/919c9e5d091f11b2892c56825249fc4a495d3e8f))
* **extras:** disable blink path source in CopilotChat
([#5666](https://github.com/LazyVim/LazyVim/issues/5666))
([#5754](https://github.com/LazyVim/LazyVim/issues/5754))
([3aa2916](https://github.com/LazyVim/LazyVim/commit/3aa2916569df2664cb68e1c7c38882868f36f8d0))
* **gitsigns:** use silent for gitsigns keymaps
([#5841](https://github.com/LazyVim/LazyVim/issues/5841))
([6eed178](https://github.com/LazyVim/LazyVim/commit/6eed1781c185ea6d1f313aee60a7097448f473cb))
* **grug-far:** add support for GrugFarWithin so it gets loaded by
default ([#5772](https://github.com/LazyVim/LazyVim/issues/5772))
([fd1b02a](https://github.com/LazyVim/LazyVim/commit/fd1b02ae5740dc651cc43291391084dbe7b1b3c4))
* **harpoon:** keymaps for 1-9. Fixes
[#6319](https://github.com/LazyVim/LazyVim/issues/6319)
([e2ba6bb](https://github.com/LazyVim/LazyVim/commit/e2ba6bb51107cbd076b53b49ed7be99fc2fa3991))
* **jdtls:** root_dir
([271fecb](https://github.com/LazyVim/LazyVim/commit/271fecb067ec223a8eab90c1abd1162e9ebae5df))
* **jdtls:** root_dir
([#6429](https://github.com/LazyVim/LazyVim/issues/6429))
([c053921](https://github.com/LazyVim/LazyVim/commit/c05392186e9e540d4af169922c333b5baa583cbe))
* **lang.haskell:** prevent Haskell extras from installing
telescope.nvim ([#6419](https://github.com/LazyVim/LazyVim/issues/6419))
([cc4a3e5](https://github.com/LazyVim/LazyVim/commit/cc4a3e556424dba784b41ec3bd92eeb7b62746bc))
* **lsp:** buffer should be second arg for supports_method
([44ade7f](https://github.com/LazyVim/LazyVim/commit/44ade7fdea98a0356c64ff9edaf2534547b958bc))
* **lspconfig:** remove all references to lspconfig. Closes
[#6426](https://github.com/LazyVim/LazyVim/issues/6426)
([23b9cde](https://github.com/LazyVim/LazyVim/commit/23b9cdeb3471b655532e9884fa2dd36ee83062d5))
* **lsp:** properly ambiguate denols vs vtsls
([2f75d9a](https://github.com/LazyVim/LazyVim/commit/2f75d9a90fc9cf43f7ba2365dbb745e5595fc02e))
* **lsp:** properly register capabilities with new vim.lsp.config. Not
needed for blink
([9fa832d](https://github.com/LazyVim/LazyVim/commit/9fa832dc95cb77a5551bbeff12b4520d8b7bdc2a))
* **mason:** migrate to mason v2
([#6053](https://github.com/LazyVim/LazyVim/issues/6053))
([773f28b](https://github.com/LazyVim/LazyVim/commit/773f28b4912d5505a21da9686d56ab7cf41a9be7))
* **mini:** update mini plugin references from echasnovski to nvim-mini
([#6374](https://github.com/LazyVim/LazyVim/issues/6374))
([ae3aaf2](https://github.com/LazyVim/LazyVim/commit/ae3aaf2dd3a04eb5dbc5b1e34843558c85e45ac2))
* **neo-tree:** import neo-tree Extra before edgy Extra
([#5763](https://github.com/LazyVim/LazyVim/issues/5763))
([848dd31](https://github.com/LazyVim/LazyVim/commit/848dd3132af50f6d211d0c07166ea7c1a4259088))
* **ocaml:** use `root_dir` instead of `root_markers` for globs support
([#6428](https://github.com/LazyVim/LazyVim/issues/6428))
([44cc063](https://github.com/LazyVim/LazyVim/commit/44cc0635bc3d2ccc55eb76bc7668092befcf0536))
* **refactoring:** update funcs to return, add `expr=true`, operator
mode ([#5882](https://github.com/LazyVim/LazyVim/issues/5882))
([6e1de74](https://github.com/LazyVim/LazyVim/commit/6e1de74597fa07ea805920da370f9d998740bc5e))
* remove 0.9 compat
([3516ae7](https://github.com/LazyVim/LazyVim/commit/3516ae736a333185f6f17b70af20b088d04cbbb6))
* **schemastore:** use `before_init` instead of `on_new_config` to load
schema store ([#6427](https://github.com/LazyVim/LazyVim/issues/6427))
([14d2a9b](https://github.com/LazyVim/LazyVim/commit/14d2a9baa1306bd0969112fcf8f69a11840cc5e6))
* **treesitter-main:** move exe check to config
([96316e5](https://github.com/LazyVim/LazyVim/commit/96316e5a69b4cc45311f5b7225e7d7bea1f977ee))
* **treesitter-main:** set vim.bo.indentexpr in FileType autocmd
([#6430](https://github.com/LazyVim/LazyVim/issues/6430))
([b926e7d](https://github.com/LazyVim/LazyVim/commit/b926e7db417bc7b0e80feb778bed7924ffe8e85d))
* **vue:** `volar` -&gt; `vua_ls`. Fixes
[#6236](https://github.com/LazyVim/LazyVim/issues/6236). Closes
[#6238](https://github.com/LazyVim/LazyVim/issues/6238). Closes
[#6174](https://github.com/LazyVim/LazyVim/issues/6174)
([4a3b4a8](https://github.com/LazyVim/LazyVim/commit/4a3b4a80a89fe5a52d30fbe4afe85c152878ab1b))


### Performance Improvements

* **blink:** only enable lazydev in lua files
([4961b3d](https://github.com/LazyVim/LazyVim/commit/4961b3d4d4b2999816e978c3ea4ef7c320e4206d))
* **treesitter-main:** only enable highlighting for installed treesitter
langs
([2f309fc](https://github.com/LazyVim/LazyVim/commit/2f309fc8b5bf93af25293c1e4688d409de718a36))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 55 +++++++++++++++++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index d4bbf7f7..b87683f4 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "14.15.1"
+  ".": "15.0.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e2be0c4..0b1cf309 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,60 @@
 # Changelog
 
+## [15.0.0](https://github.com/LazyVim/LazyVim/compare/v14.15.1...v15.0.0) (2025-09-17)
+
+
+### ⚠ BREAKING CHANGES
+
+* **treesitter:** migrate to `nvim-treesitter` **main** branch
+* bump Neovim requirement to 0.11.2
+* LazyVim now requires Neovim >= 0.11 See #6421 for more info
+
+### Features
+
+* **blink:** enable blink cmdline completions ([011a35c](https://github.com/LazyVim/LazyVim/commit/011a35ccb810cbe5d25def9cc92271e8423feb74))
+* **blink:** enable cmdline completions ([ff7c12c](https://github.com/LazyVim/LazyVim/commit/ff7c12c48e23941ffd9a7bbe61857624929ae9da))
+* bump Neovim requirement to 0.11.2 ([cccfe70](https://github.com/LazyVim/LazyVim/commit/cccfe70ea4390c1915f67ab7d2893971fba3f3fa))
+* **extras:** added an experimental extra for the treesitter `main` branch ([5668ad7](https://github.com/LazyVim/LazyVim/commit/5668ad72ca806b3a7915bb7b35dcc5cccfe774f7))
+* LazyVim now requires Neovim &gt;= 0.11 See [#6421](https://github.com/LazyVim/LazyVim/issues/6421) for more info ([e7ce65e](https://github.com/LazyVim/LazyVim/commit/e7ce65e1bb814f79ecb45bfeca934e997e0ee42c))
+* **lsp:** enable LSP folds when available ([5e2c4e6](https://github.com/LazyVim/LazyVim/commit/5e2c4e62f28a85e0b27d5c97ea92af8c1ab74cef))
+* **treesitter:** migrate to `nvim-treesitter` **main** branch ([5eac460](https://github.com/LazyVim/LazyVim/commit/5eac460c092103e5516bec345236853b9f35ec7c))
+
+
+### Bug Fixes
+
+* **blink:** make blink completions in cmdline behave more like regular cmdline ([f54fd7f](https://github.com/LazyVim/LazyVim/commit/f54fd7f751e902e824c3a4c9d212a0d18387d0b6))
+* **catppuccin:** follow renamed integration ([#6354](https://github.com/LazyVim/LazyVim/issues/6354)) ([02d0c9a](https://github.com/LazyVim/LazyVim/commit/02d0c9aebddb902d9c974a38bb44db9bae4eac6d))
+* **clangd:** file detection improvements ([#6436](https://github.com/LazyVim/LazyVim/issues/6436)) ([aab503f](https://github.com/LazyVim/LazyVim/commit/aab503fda63f34cff6bce229f73ea5209e8afaf0))
+* **clangd:** rewrite the root_dir function ([#6060](https://github.com/LazyVim/LazyVim/issues/6060)) ([167d39b](https://github.com/LazyVim/LazyVim/commit/167d39b2bef24024be1a48267e14cc6c82146462))
+* **eslint:** remove old 0.10 code ([919c9e5](https://github.com/LazyVim/LazyVim/commit/919c9e5d091f11b2892c56825249fc4a495d3e8f))
+* **extras:** disable blink path source in CopilotChat ([#5666](https://github.com/LazyVim/LazyVim/issues/5666)) ([#5754](https://github.com/LazyVim/LazyVim/issues/5754)) ([3aa2916](https://github.com/LazyVim/LazyVim/commit/3aa2916569df2664cb68e1c7c38882868f36f8d0))
+* **gitsigns:** use silent for gitsigns keymaps ([#5841](https://github.com/LazyVim/LazyVim/issues/5841)) ([6eed178](https://github.com/LazyVim/LazyVim/commit/6eed1781c185ea6d1f313aee60a7097448f473cb))
+* **grug-far:** add support for GrugFarWithin so it gets loaded by default ([#5772](https://github.com/LazyVim/LazyVim/issues/5772)) ([fd1b02a](https://github.com/LazyVim/LazyVim/commit/fd1b02ae5740dc651cc43291391084dbe7b1b3c4))
+* **harpoon:** keymaps for 1-9. Fixes [#6319](https://github.com/LazyVim/LazyVim/issues/6319) ([e2ba6bb](https://github.com/LazyVim/LazyVim/commit/e2ba6bb51107cbd076b53b49ed7be99fc2fa3991))
+* **jdtls:** root_dir ([271fecb](https://github.com/LazyVim/LazyVim/commit/271fecb067ec223a8eab90c1abd1162e9ebae5df))
+* **jdtls:** root_dir ([#6429](https://github.com/LazyVim/LazyVim/issues/6429)) ([c053921](https://github.com/LazyVim/LazyVim/commit/c05392186e9e540d4af169922c333b5baa583cbe))
+* **lang.haskell:** prevent Haskell extras from installing telescope.nvim ([#6419](https://github.com/LazyVim/LazyVim/issues/6419)) ([cc4a3e5](https://github.com/LazyVim/LazyVim/commit/cc4a3e556424dba784b41ec3bd92eeb7b62746bc))
+* **lsp:** buffer should be second arg for supports_method ([44ade7f](https://github.com/LazyVim/LazyVim/commit/44ade7fdea98a0356c64ff9edaf2534547b958bc))
+* **lspconfig:** remove all references to lspconfig. Closes [#6426](https://github.com/LazyVim/LazyVim/issues/6426) ([23b9cde](https://github.com/LazyVim/LazyVim/commit/23b9cdeb3471b655532e9884fa2dd36ee83062d5))
+* **lsp:** properly ambiguate denols vs vtsls ([2f75d9a](https://github.com/LazyVim/LazyVim/commit/2f75d9a90fc9cf43f7ba2365dbb745e5595fc02e))
+* **lsp:** properly register capabilities with new vim.lsp.config. Not needed for blink ([9fa832d](https://github.com/LazyVim/LazyVim/commit/9fa832dc95cb77a5551bbeff12b4520d8b7bdc2a))
+* **mason:** migrate to mason v2 ([#6053](https://github.com/LazyVim/LazyVim/issues/6053)) ([773f28b](https://github.com/LazyVim/LazyVim/commit/773f28b4912d5505a21da9686d56ab7cf41a9be7))
+* **mini:** update mini plugin references from echasnovski to nvim-mini ([#6374](https://github.com/LazyVim/LazyVim/issues/6374)) ([ae3aaf2](https://github.com/LazyVim/LazyVim/commit/ae3aaf2dd3a04eb5dbc5b1e34843558c85e45ac2))
+* **neo-tree:** import neo-tree Extra before edgy Extra ([#5763](https://github.com/LazyVim/LazyVim/issues/5763)) ([848dd31](https://github.com/LazyVim/LazyVim/commit/848dd3132af50f6d211d0c07166ea7c1a4259088))
+* **ocaml:** use `root_dir` instead of `root_markers` for globs support ([#6428](https://github.com/LazyVim/LazyVim/issues/6428)) ([44cc063](https://github.com/LazyVim/LazyVim/commit/44cc0635bc3d2ccc55eb76bc7668092befcf0536))
+* **refactoring:** update funcs to return, add `expr=true`, operator mode ([#5882](https://github.com/LazyVim/LazyVim/issues/5882)) ([6e1de74](https://github.com/LazyVim/LazyVim/commit/6e1de74597fa07ea805920da370f9d998740bc5e))
+* remove 0.9 compat ([3516ae7](https://github.com/LazyVim/LazyVim/commit/3516ae736a333185f6f17b70af20b088d04cbbb6))
+* **schemastore:** use `before_init` instead of `on_new_config` to load schema store ([#6427](https://github.com/LazyVim/LazyVim/issues/6427)) ([14d2a9b](https://github.com/LazyVim/LazyVim/commit/14d2a9baa1306bd0969112fcf8f69a11840cc5e6))
+* **treesitter-main:** move exe check to config ([96316e5](https://github.com/LazyVim/LazyVim/commit/96316e5a69b4cc45311f5b7225e7d7bea1f977ee))
+* **treesitter-main:** set vim.bo.indentexpr in FileType autocmd ([#6430](https://github.com/LazyVim/LazyVim/issues/6430)) ([b926e7d](https://github.com/LazyVim/LazyVim/commit/b926e7db417bc7b0e80feb778bed7924ffe8e85d))
+* **vue:** `volar` -&gt; `vua_ls`. Fixes [#6236](https://github.com/LazyVim/LazyVim/issues/6236). Closes [#6238](https://github.com/LazyVim/LazyVim/issues/6238). Closes [#6174](https://github.com/LazyVim/LazyVim/issues/6174) ([4a3b4a8](https://github.com/LazyVim/LazyVim/commit/4a3b4a80a89fe5a52d30fbe4afe85c152878ab1b))
+
+
+### Performance Improvements
+
+* **blink:** only enable lazydev in lua files ([4961b3d](https://github.com/LazyVim/LazyVim/commit/4961b3d4d4b2999816e978c3ea4ef7c320e4206d))
+* **treesitter-main:** only enable highlighting for installed treesitter langs ([2f309fc](https://github.com/LazyVim/LazyVim/commit/2f309fc8b5bf93af25293c1e4688d409de718a36))
+
 ## [14.15.1](https://github.com/LazyVim/LazyVim/compare/v14.15.0...v14.15.1) (2025-09-15)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 9e0903c2..931ef9ff 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "14.15.1" -- x-release-please-version
+M.version = "15.0.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 2d56d3b37c275890a403845c00b5c8d38cb387e6 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 17 Sep 2025 16:54:34 +0200
Subject: [PATCH 173/341] fix(treesitter): TS update during inital build

---
 lua/lazyvim/plugins/treesitter.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index 5462149a..c9a6e094 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -13,7 +13,7 @@ return {
         LazyVim.error("Please restart Neovim and run `:TSUpdate` to use the `nvim-treesitter` **main** branch.")
         return
       end
-      vim.cmd.TSUpdate()
+      TS.update(nil, { summary = true })
     end,
     lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline
     event = { "LazyFile", "VeryLazy" },

From 9e58f05aae1bf521ce1ff5b6b3bd8c5bf88a6488 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Sep 2025 16:59:13 +0200
Subject: [PATCH 174/341] chore(main): release 15.0.1 (#6438)

:robot: I have created a release *beep* *boop*
---


##
[15.0.1](https://github.com/LazyVim/LazyVim/compare/v15.0.0...v15.0.1)
(2025-09-17)


### Bug Fixes

* **treesitter:** TS update during inital build
([2d56d3b](https://github.com/LazyVim/LazyVim/commit/2d56d3b37c275890a403845c00b5c8d38cb387e6))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 CHANGELOG.md                          | 7 +++++++
 lua/lazyvim/config/init.lua           | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index b87683f4..d09e9fe9 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "15.0.0"
+  ".": "15.0.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b1cf309..2aa0a8ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [15.0.1](https://github.com/LazyVim/LazyVim/compare/v15.0.0...v15.0.1) (2025-09-17)
+
+
+### Bug Fixes
+
+* **treesitter:** TS update during inital build ([2d56d3b](https://github.com/LazyVim/LazyVim/commit/2d56d3b37c275890a403845c00b5c8d38cb387e6))
+
 ## [15.0.0](https://github.com/LazyVim/LazyVim/compare/v14.15.1...v15.0.0) (2025-09-17)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 931ef9ff..4524969d 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "15.0.0" -- x-release-please-version
+M.version = "15.0.1" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From ed3aa74c107de7dc3e06367ce4afb20056710441 Mon Sep 17 00:00:00 2001
From: Zhizhen He <hezhizhen.yi@gmail.com>
Date: Wed, 17 Sep 2025 23:16:31 +0800
Subject: [PATCH 175/341] fix(python): remove the wrapping `settings` key from
 `setup()` options (#6069)

## Description

Remove the wrapping `settings` key from `setup()` options.

<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<img width="601" alt="image"
src="https://github.com/user-attachments/assets/92f3fc5a-9497-40c2-bc83-2a216cccb2f2"
/>

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/python.lua | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/python.lua b/lua/lazyvim/plugins/extras/lang/python.lua
index 3298f6dd..a02ded1f 100644
--- a/lua/lazyvim/plugins/extras/lang/python.lua
+++ b/lua/lazyvim/plugins/extras/lang/python.lua
@@ -116,10 +116,8 @@ return {
     "linux-cultist/venv-selector.nvim",
     cmd = "VenvSelect",
     opts = {
-      settings = {
-        options = {
-          notify_user_on_venv_activation = true,
-        },
+      options = {
+        notify_user_on_venv_activation = true,
       },
     },
     --  Call config for Python files and load the cached venv automatically

From a6b38de763addf2d22e8a43a1e679cc855dc376d Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 17 Sep 2025 22:46:14 +0200
Subject: [PATCH 176/341] fix(treesitter): indentexpr/foldexpr now work as
 intended and override ftplugin settings. Fixes #6447

---
 lua/lazyvim/config/options.lua     | 2 +-
 lua/lazyvim/plugins/treesitter.lua | 9 +++++++++
 lua/lazyvim/util/treesitter.lua    | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lua/lazyvim/config/options.lua b/lua/lazyvim/config/options.lua
index f71f96df..2872d2a4 100644
--- a/lua/lazyvim/config/options.lua
+++ b/lua/lazyvim/config/options.lua
@@ -72,7 +72,7 @@ opt.foldexpr = "v:lua.LazyVim.treesitter.foldexpr()" -- treesitter folds
 opt.foldlevel = 99
 opt.foldmethod = "expr"
 opt.foldtext = ""
-opt.formatexpr = "v:lua.require'lazyvim.util'.format.formatexpr()"
+opt.formatexpr = "v:lua.LazyVim.format.formatexpr()"
 opt.formatoptions = "jcroqlnt" -- tcqj
 opt.grepformat = "%f:%l:%c:%m"
 opt.grepprg = "rg --vimgrep"
diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index c9a6e094..327c13be 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -80,9 +80,18 @@ return {
 
       -- treesitter highlighting
       vim.api.nvim_create_autocmd("FileType", {
+        group = vim.api.nvim_create_augroup("lazyvim_treesitter", { clear = true }),
         callback = function(ev)
           if LazyVim.treesitter.have(ev.match) then
             pcall(vim.treesitter.start)
+
+            -- check if ftplugins changed foldexpr/indentexpr
+            for _, option in ipairs({ "foldexpr", "indentexpr" }) do
+              local expr = "v:lua.LazyVim.treesitter." .. option .. "()"
+              if vim.opt_global[option]:get() == expr then
+                vim.opt_local[option] = expr
+              end
+            end
           end
         end,
       })
diff --git a/lua/lazyvim/util/treesitter.lua b/lua/lazyvim/util/treesitter.lua
index 84e279ce..07e0e5eb 100644
--- a/lua/lazyvim/util/treesitter.lua
+++ b/lua/lazyvim/util/treesitter.lua
@@ -22,12 +22,12 @@ end
 
 function M.foldexpr()
   local buf = vim.api.nvim_get_current_buf()
-  return M.have(vim.b[buf].filetype) and vim.treesitter.foldexpr() or "0"
+  return M.have(vim.bo[buf].filetype) and vim.treesitter.foldexpr() or "0"
 end
 
 function M.indentexpr()
   local buf = vim.api.nvim_get_current_buf()
-  return M.have(vim.b[buf].filetype) and require("nvim-treesitter").indentexpr() or -1
+  return M.have(vim.bo[buf].filetype) and require("nvim-treesitter").indentexpr() or -1
 end
 
 return M

From 1c14d858e54e9bfed30007641135e555716519e8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Sep 2025 22:50:09 +0200
Subject: [PATCH 177/341] chore(main): release 15.0.2 (#6439)

:robot: I have created a release *beep* *boop*
---


##
[15.0.2](https://github.com/LazyVim/LazyVim/compare/v15.0.1...v15.0.2)
(2025-09-17)


### Bug Fixes

* **python:** remove the wrapping `settings` key from `setup()` options
([#6069](https://github.com/LazyVim/LazyVim/issues/6069))
([ed3aa74](https://github.com/LazyVim/LazyVim/commit/ed3aa74c107de7dc3e06367ce4afb20056710441))
* **treesitter:** indentexpr/foldexpr now work as intended and override
ftplugin settings. Fixes
[#6447](https://github.com/LazyVim/LazyVim/issues/6447)
([a6b38de](https://github.com/LazyVim/LazyVim/commit/a6b38de763addf2d22e8a43a1e679cc855dc376d))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 CHANGELOG.md                          | 8 ++++++++
 lua/lazyvim/config/init.lua           | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index d09e9fe9..3cc5db92 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "15.0.1"
+  ".": "15.0.2"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2aa0a8ad..541bf093 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [15.0.2](https://github.com/LazyVim/LazyVim/compare/v15.0.1...v15.0.2) (2025-09-17)
+
+
+### Bug Fixes
+
+* **python:** remove the wrapping `settings` key from `setup()` options ([#6069](https://github.com/LazyVim/LazyVim/issues/6069)) ([ed3aa74](https://github.com/LazyVim/LazyVim/commit/ed3aa74c107de7dc3e06367ce4afb20056710441))
+* **treesitter:** indentexpr/foldexpr now work as intended and override ftplugin settings. Fixes [#6447](https://github.com/LazyVim/LazyVim/issues/6447) ([a6b38de](https://github.com/LazyVim/LazyVim/commit/a6b38de763addf2d22e8a43a1e679cc855dc376d))
+
 ## [15.0.1](https://github.com/LazyVim/LazyVim/compare/v15.0.0...v15.0.1) (2025-09-17)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 4524969d..ae0b9bda 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "15.0.1" -- x-release-please-version
+M.version = "15.0.2" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From c28f599d4f5d175f3d259a621c4e7b5d0b2a0759 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 17 Sep 2025 23:39:19 +0200
Subject: [PATCH 178/341] fix(treesitter): properly update installedd languages
 after setup

---
 lua/lazyvim/plugins/treesitter.lua | 2 ++
 lua/lazyvim/util/treesitter.lua    | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index 327c13be..b36c24d3 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -68,6 +68,8 @@ return {
       -- setup treesitter
       TS.setup(opts)
 
+      LazyVim.treesitter.get_installed(true) -- initialize the installed langs
+
       -- install missing parsers
       local install = vim.tbl_filter(function(lang)
         return not LazyVim.treesitter.have(lang)
diff --git a/lua/lazyvim/util/treesitter.lua b/lua/lazyvim/util/treesitter.lua
index 07e0e5eb..bf7c12f8 100644
--- a/lua/lazyvim/util/treesitter.lua
+++ b/lua/lazyvim/util/treesitter.lua
@@ -3,15 +3,15 @@ local M = {}
 
 M._installed = nil ---@type table<string,string>?
 
----@param force boolean?
-function M.get_installed(force)
-  if not M._installed or force then
+---@param update boolean?
+function M.get_installed(update)
+  if update then
     M._installed = {}
     for _, lang in ipairs(require("nvim-treesitter").get_installed("parsers")) do
       M._installed[lang] = lang
     end
   end
-  return M._installed
+  return M._installed or {}
 end
 
 ---@param ft string

From bd1f523df58edd61eef10643ef9c42f9191ce617 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Sep 2025 23:41:10 +0200
Subject: [PATCH 179/341] chore(main): release 15.0.3 (#6448)

:robot: I have created a release *beep* *boop*
---


##
[15.0.3](https://github.com/LazyVim/LazyVim/compare/v15.0.2...v15.0.3)
(2025-09-17)


### Bug Fixes

* **treesitter:** properly update installedd languages after setup
([c28f599](https://github.com/LazyVim/LazyVim/commit/c28f599d4f5d175f3d259a621c4e7b5d0b2a0759))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 CHANGELOG.md                          | 7 +++++++
 lua/lazyvim/config/init.lua           | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 3cc5db92..fbbae712 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "15.0.2"
+  ".": "15.0.3"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 541bf093..b6be3e05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [15.0.3](https://github.com/LazyVim/LazyVim/compare/v15.0.2...v15.0.3) (2025-09-17)
+
+
+### Bug Fixes
+
+* **treesitter:** properly update installedd languages after setup ([c28f599](https://github.com/LazyVim/LazyVim/commit/c28f599d4f5d175f3d259a621c4e7b5d0b2a0759))
+
 ## [15.0.2](https://github.com/LazyVim/LazyVim/compare/v15.0.1...v15.0.2) (2025-09-17)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index ae0b9bda..baad77a5 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "15.0.2" -- x-release-please-version
+M.version = "15.0.3" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 5bf237820d7938b1b6490164fbd75e4117d341c1 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 18 Sep 2025 09:46:49 +0200
Subject: [PATCH 180/341] fix(snacks): safe wrapper around snacks statuscolumn
 to prevent errors when LazyVim is still installing

---
 lua/lazyvim/config/options.lua | 2 +-
 lua/lazyvim/util/init.lua      | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/config/options.lua b/lua/lazyvim/config/options.lua
index 2872d2a4..618d4e7e 100644
--- a/lua/lazyvim/config/options.lua
+++ b/lua/lazyvim/config/options.lua
@@ -104,7 +104,7 @@ opt.spelllang = { "en" }
 opt.splitbelow = true -- Put new windows below current
 opt.splitkeep = "screen"
 opt.splitright = true -- Put new windows right of current
-opt.statuscolumn = [[%!v:lua.require'snacks.statuscolumn'.get()]]
+opt.statuscolumn = [[%!v:lua.LazyVim.statuscolumn()]]
 opt.tabstop = 2 -- Number of spaces tabs count for
 opt.termguicolors = true -- True color support
 opt.timeoutlen = vim.g.vscode and 1000 or 300 -- Lower than default (1000) to quickly trigger which-key
diff --git a/lua/lazyvim/util/init.lua b/lua/lazyvim/util/init.lua
index 7561b385..44a135ad 100644
--- a/lua/lazyvim/util/init.lua
+++ b/lua/lazyvim/util/init.lua
@@ -299,4 +299,9 @@ function M.memoize(fn)
   end
 end
 
+-- Safe wrapper around snacks to prevent errors when LazyVim is still installing
+function M.statuscolumn()
+  return package.loaded.snacks and require("snacks.statuscolumn").get() or ""
+end
+
 return M

From b93303d2339b1117171780cebed1d710fd3805d5 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 18 Sep 2025 09:48:43 +0200
Subject: [PATCH 181/341] feat(treesitter): refactored setting up treesitter
 indent/highlight/folds

---
 lua/lazyvim/config/options.lua     |  4 +---
 lua/lazyvim/plugins/lsp/init.lua   |  1 +
 lua/lazyvim/plugins/treesitter.lua | 30 ++++++++++++++++++++----------
 lua/lazyvim/util/treesitter.lua    | 19 +++++++++++--------
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/lua/lazyvim/config/options.lua b/lua/lazyvim/config/options.lua
index 618d4e7e..2ae1b38d 100644
--- a/lua/lazyvim/config/options.lua
+++ b/lua/lazyvim/config/options.lua
@@ -68,9 +68,8 @@ opt.fillchars = {
   diff = "╱",
   eob = " ",
 }
-opt.foldexpr = "v:lua.LazyVim.treesitter.foldexpr()" -- treesitter folds
 opt.foldlevel = 99
-opt.foldmethod = "expr"
+opt.foldmethod = "indent"
 opt.foldtext = ""
 opt.formatexpr = "v:lua.LazyVim.format.formatexpr()"
 opt.formatoptions = "jcroqlnt" -- tcqj
@@ -78,7 +77,6 @@ opt.grepformat = "%f:%l:%c:%m"
 opt.grepprg = "rg --vimgrep"
 opt.ignorecase = true -- Ignore case
 opt.inccommand = "nosplit" -- preview incremental substitute
-opt.indentexpr = "v:lua.LazyVim.treesitter.indentexpr()" -- treesitter indents
 opt.jumpoptions = "view"
 opt.laststatus = 3 -- global statusline
 opt.linebreak = true -- Wrap lines at convenient points
diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index 00a698fc..1984c31b 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -148,6 +148,7 @@ return {
         LazyVim.lsp.on_supports_method("textDocument/foldingRange", function(client, buffer)
           local win = vim.api.nvim_get_current_win()
           vim.wo[win][0].foldexpr = "v:lua.vim.lsp.foldexpr()"
+          vim.wo[win][0].foldmethod = "expr"
         end)
       end
 
diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index b36c24d3..bb842763 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -22,6 +22,9 @@ return {
     ---@class lazyvim.TSConfig: TSConfig
     opts = {
       -- LazyVim config for treesitter
+      indent = { enable = true },
+      highlight = { enable = true },
+      folds = { enable = true },
       ensure_installed = {
         "bash",
         "c",
@@ -80,20 +83,27 @@ return {
         end)
       end
 
-      -- treesitter highlighting
       vim.api.nvim_create_autocmd("FileType", {
         group = vim.api.nvim_create_augroup("lazyvim_treesitter", { clear = true }),
         callback = function(ev)
-          if LazyVim.treesitter.have(ev.match) then
-            pcall(vim.treesitter.start)
+          if not LazyVim.treesitter.have(ev.match) then
+            return
+          end
 
-            -- check if ftplugins changed foldexpr/indentexpr
-            for _, option in ipairs({ "foldexpr", "indentexpr" }) do
-              local expr = "v:lua.LazyVim.treesitter." .. option .. "()"
-              if vim.opt_global[option]:get() == expr then
-                vim.opt_local[option] = expr
-              end
-            end
+          -- highlighting
+          if vim.tbl_get(opts, "highlight", "enable") ~= false then
+            pcall(vim.treesitter.start)
+          end
+
+          -- indents
+          if vim.tbl_get(opts, "indent", "enable") ~= false then
+            vim.bo[ev.buf].indentexpr = "v:lua.LazyVim.treesitter.indentexpr()"
+          end
+
+          -- folds
+          if vim.tbl_get(opts, "folds", "enable") ~= false then
+            vim.wo.foldmethod = "expr"
+            vim.wo.foldexpr = "v:lua.LazyVim.treesitter.foldexpr()"
           end
         end,
       })
diff --git a/lua/lazyvim/util/treesitter.lua b/lua/lazyvim/util/treesitter.lua
index bf7c12f8..73e925fc 100644
--- a/lua/lazyvim/util/treesitter.lua
+++ b/lua/lazyvim/util/treesitter.lua
@@ -14,20 +14,23 @@ function M.get_installed(update)
   return M._installed or {}
 end
 
----@param ft string
-function M.have(ft)
-  local lang = vim.treesitter.language.get_lang(ft)
-  return lang and M.get_installed()[lang]
+---@param what string|number|nil
+---@overload fun(buf?:number):boolean
+---@overload fun(ft:string):boolean
+---@return boolean
+function M.have(what)
+  what = what or vim.api.nvim_get_current_buf()
+  what = type(what) == "number" and vim.bo[what].filetype or what --[[@as string]]
+  local lang = vim.treesitter.language.get_lang(what)
+  return lang ~= nil and M.get_installed()[lang] ~= nil
 end
 
 function M.foldexpr()
-  local buf = vim.api.nvim_get_current_buf()
-  return M.have(vim.bo[buf].filetype) and vim.treesitter.foldexpr() or "0"
+  return M.have() and vim.treesitter.foldexpr() or "0"
 end
 
 function M.indentexpr()
-  local buf = vim.api.nvim_get_current_buf()
-  return M.have(vim.bo[buf].filetype) and require("nvim-treesitter").indentexpr() or -1
+  return M.have() and require("nvim-treesitter").indentexpr() or -1
 end
 
 return M

From 725d048e009b866425b2a0cc620ba2c413e8b65f Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 18 Sep 2025 09:49:20 +0200
Subject: [PATCH 182/341] feat(treesitter): automatically install and use
 mason's tree-sitter-cli if not installed on system

---
 lua/lazyvim/plugins/treesitter.lua | 16 +++++-----
 lua/lazyvim/util/treesitter.lua    | 47 ++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index bb842763..a7ef7ed8 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -13,7 +13,9 @@ return {
         LazyVim.error("Please restart Neovim and run `:TSUpdate` to use the `nvim-treesitter` **main** branch.")
         return
       end
-      TS.update(nil, { summary = true })
+      LazyVim.treesitter.ensure_treesitter_cli(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" },
@@ -59,18 +61,12 @@ return {
       -- some quick sanity checks
       if not TS.get_installed then
         return LazyVim.error("Please use `:Lazy` and update `nvim-treesitter`")
-      elseif vim.fn.executable("tree-sitter") == 0 then
-        return LazyVim.error({
-          "**treesitter-main** requires the `tree-sitter` CLI executable to be installed.",
-          "Run `:checkhealth nvim-treesitter` for more information.",
-        })
       elseif type(opts.ensure_installed) ~= "table" then
         return LazyVim.error("`nvim-treesitter` opts.ensure_installed must be a table")
       end
 
       -- setup treesitter
       TS.setup(opts)
-
       LazyVim.treesitter.get_installed(true) -- initialize the installed langs
 
       -- install missing parsers
@@ -78,8 +74,10 @@ return {
         return not LazyVim.treesitter.have(lang)
       end, opts.ensure_installed or {})
       if #install > 0 then
-        TS.install(install, { summary = true }):await(function()
-          LazyVim.treesitter.get_installed(true) -- refresh the installed langs
+        LazyVim.treesitter.ensure_treesitter_cli(function()
+          TS.install(install, { summary = true }):await(function()
+            LazyVim.treesitter.get_installed(true) -- refresh the installed langs
+          end)
         end)
       end
 
diff --git a/lua/lazyvim/util/treesitter.lua b/lua/lazyvim/util/treesitter.lua
index 73e925fc..5df6aa53 100644
--- a/lua/lazyvim/util/treesitter.lua
+++ b/lua/lazyvim/util/treesitter.lua
@@ -33,4 +33,51 @@ function M.indentexpr()
   return M.have() and require("nvim-treesitter").indentexpr() or -1
 end
 
+---@param cb fun()
+function M.ensure_treesitter_cli(cb)
+  if vim.fn.executable("tree-sitter") == 1 then
+    return cb()
+  end
+
+  ---@param msg? string
+  local function fail(msg)
+    return LazyVim.error({
+      "**treesitter-nvim** `main` requires the `tree-sitter` CLI executable to be installed.",
+      "Please install it manually from https://github.com/tree-sitter/tree-sitter/tree/master/crates/cli or",
+      "use your system package manager.",
+      "Run `:checkhealth nvim-treesitter` for more information.",
+      msg,
+    })
+  end
+
+  -- try installing with mason
+  if not pcall(require, "mason") then
+    return fail("`mason.nvim` is disabled in your config, so we cannot install it automatically.")
+  end
+
+  -- check again since we might have installed it already
+  if vim.fn.executable("tree-sitter") == 1 then
+    return cb()
+  end
+
+  local mr = require("mason-registry")
+  mr.refresh(function()
+    local p = mr.get_package("tree-sitter-cli")
+    if not p:is_installed() then
+      LazyVim.info("Installing `tree-sitter-cli` with `mason.nvim`...")
+      p:install(
+        nil,
+        vim.schedule_wrap(function(success)
+          if success then
+            LazyVim.info("Installed `tree-sitter-cli` with `mason.nvim`.")
+            cb()
+          else
+            fail("Failed to install `tree-sitter-cli` with `mason.nvim`.")
+          end
+        end)
+      )
+    end
+  end)
+end
+
 return M

From 1dece3be15bdd2e95e6997017b050fb08f01d143 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Thu, 18 Sep 2025 07:51:02 +0000
Subject: [PATCH 183/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 9f4b59fd..5c3e670d 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim            Last change: 2025 September 17
+*LazyVim.txt*             For Neovim            Last change: 2025 September 18
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From a467ce074f00edd1d2667e55afe72904c5aeaf24 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 18 Sep 2025 10:03:59 +0200
Subject: [PATCH 184/341] chore(main): release 15.1.0 (#6452)

:robot: I have created a release *beep* *boop*
---


##
[15.1.0](https://github.com/LazyVim/LazyVim/compare/v15.0.3...v15.1.0)
(2025-09-18)


### Features

* **treesitter:** automatically install and use mason's tree-sitter-cli
if not installed on system
([725d048](https://github.com/LazyVim/LazyVim/commit/725d048e009b866425b2a0cc620ba2c413e8b65f))
* **treesitter:** refactored setting up treesitter
indent/highlight/folds
([b93303d](https://github.com/LazyVim/LazyVim/commit/b93303d2339b1117171780cebed1d710fd3805d5))


### Bug Fixes

* **snacks:** safe wrapper around snacks statuscolumn to prevent errors
when LazyVim is still installing
([5bf2378](https://github.com/LazyVim/LazyVim/commit/5bf237820d7938b1b6490164fbd75e4117d341c1))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 13 +++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index fbbae712..9da34491 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "15.0.3"
+  ".": "15.1.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6be3e05..7b8723e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [15.1.0](https://github.com/LazyVim/LazyVim/compare/v15.0.3...v15.1.0) (2025-09-18)
+
+
+### Features
+
+* **treesitter:** automatically install and use mason's tree-sitter-cli if not installed on system ([725d048](https://github.com/LazyVim/LazyVim/commit/725d048e009b866425b2a0cc620ba2c413e8b65f))
+* **treesitter:** refactored setting up treesitter indent/highlight/folds ([b93303d](https://github.com/LazyVim/LazyVim/commit/b93303d2339b1117171780cebed1d710fd3805d5))
+
+
+### Bug Fixes
+
+* **snacks:** safe wrapper around snacks statuscolumn to prevent errors when LazyVim is still installing ([5bf2378](https://github.com/LazyVim/LazyVim/commit/5bf237820d7938b1b6490164fbd75e4117d341c1))
+
 ## [15.0.3](https://github.com/LazyVim/LazyVim/compare/v15.0.2...v15.0.3) (2025-09-17)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index baad77a5..d12f2ac0 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "15.0.3" -- x-release-please-version
+M.version = "15.1.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 36b41911ab90fe19505af306a31a5a699342d3c3 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 18 Sep 2025 13:06:46 +0200
Subject: [PATCH 185/341] fix(lspconfig): remove all usage of `lspconfig`

---
 lua/lazyvim/plugins/extras/lang/java.lua  |  4 +++-
 lua/lazyvim/plugins/extras/lang/ocaml.lua | 19 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua
index e4926521..d4eb5f6e 100644
--- a/lua/lazyvim/plugins/extras/lang/java.lua
+++ b/lua/lazyvim/plugins/extras/lang/java.lua
@@ -91,7 +91,9 @@ return {
         table.insert(cmd, string.format("--jvm-arg=-javaagent:%s", lombok_jar))
       end
       return {
-        root_dir = require("lspconfig.util").root_pattern(vim.lsp.config.jdtls.root_markers),
+        root_dir = function(path)
+          return vim.fs.root(path, vim.lsp.config.jdtls.root_markers)
+        end,
 
         -- How to find the project name for a given root dir.
         project_name = function(root_dir)
diff --git a/lua/lazyvim/plugins/extras/lang/ocaml.lua b/lua/lazyvim/plugins/extras/lang/ocaml.lua
index 0e733a4a..631223d4 100644
--- a/lua/lazyvim/plugins/extras/lang/ocaml.lua
+++ b/lua/lazyvim/plugins/extras/lang/ocaml.lua
@@ -26,12 +26,19 @@ return {
             "reason",
             "dune",
           },
-          root_dir = function(bufnr, on_dir)
-            local util = require("lspconfig.util")
-            local fname = vim.api.nvim_buf_get_name(bufnr)
-            --stylua: ignore
-            on_dir(util.root_pattern("*.opam", "esy.json", "package.json", ".git", "dune-project", "dune-workspace", "*.ml")( fname))
-          end,
+          root_markers = {
+            function(name)
+              return name:match(".*%.opam$")
+            end,
+            "esy.json",
+            "package.json",
+            ".git",
+            "dune-project",
+            "dune-workspace",
+            function(name)
+              return name:match(".*%.ml$")
+            end,
+          },
         },
       },
     },

From 75a3809e15a0ecff9adc46c6cd3aaac51d99b561 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 18 Sep 2025 13:52:07 +0200
Subject: [PATCH 186/341] fix(lsp): schedule_wrap setting up LSPs to work
 around root cause of #6456. Fixes #6456

---
 lua/lazyvim/plugins/lsp/init.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index 1984c31b..95b7385c 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -2,7 +2,7 @@ return {
   -- lspconfig
   {
     "neovim/nvim-lspconfig",
-    event = { "BufReadPre", "BufNewFile", "BufWritePre" },
+    event = "LazyFile",
     dependencies = {
       "mason.nvim",
       { "mason-org/mason-lspconfig.nvim", config = function() end },
@@ -118,7 +118,7 @@ return {
       return ret
     end,
     ---@param opts PluginLspOpts
-    config = function(_, opts)
+    config = vim.schedule_wrap(function(_, opts)
       -- setup autoformat
       LazyVim.format.register(LazyVim.lsp.formatter())
 
@@ -256,7 +256,7 @@ return {
         resolve("denols")
         resolve("vtsls")
       end
-    end,
+    end),
   },
 
   -- cmdline tools and lsp servers

From cfac3c9a85526ad7406f9b246097a1ec4fa1a2c3 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 18 Sep 2025 14:07:49 +0200
Subject: [PATCH 187/341] fix(core): check for outdated nightly. See #6458

---
 lua/lazyvim/plugins/init.lua | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/plugins/init.lua b/lua/lazyvim/plugins/init.lua
index 7797b047..4ba9b36d 100644
--- a/lua/lazyvim/plugins/init.lua
+++ b/lua/lazyvim/plugins/init.lua
@@ -1,9 +1,20 @@
+local fail = nil
 if vim.fn.has("nvim-0.11.2") == 0 then
-  vim.api.nvim_echo({
+  fail = {
     { "LazyVim requires Neovim >= 0.11.2\n", "ErrorMsg" },
     { "For more info, see: https://github.com/LazyVim/LazyVim/issues/6421\n", "Comment" },
     { "Press any key to exit", "MoreMsg" },
-  }, true, {})
+  }
+elseif vim.fn.has("nvim-0.12") == 1 and not vim.lsp.is_enabled then
+  fail = {
+    { "LazyVim requires Neovim >= 0.11.2 or a recent Nightly\n", "ErrorMsg" },
+    { "Your nightly is too old, please update to a more recent version.\n", "Comment" },
+    { "Press any key to exit", "MoreMsg" },
+  }
+end
+
+if fail then
+  vim.api.nvim_echo(fail, true, {})
   vim.fn.getchar()
   vim.cmd([[quit]])
   return {}

From 3a743f7f853bd90894259cd93432d77c688774b4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 18 Sep 2025 14:09:58 +0200
Subject: [PATCH 188/341] chore(main): release 15.1.1 (#6457)

:robot: I have created a release *beep* *boop*
---


##
[15.1.1](https://github.com/LazyVim/LazyVim/compare/v15.1.0...v15.1.1)
(2025-09-18)


### Bug Fixes

* **core:** check for outdated nightly. See
[#6458](https://github.com/LazyVim/LazyVim/issues/6458)
([cfac3c9](https://github.com/LazyVim/LazyVim/commit/cfac3c9a85526ad7406f9b246097a1ec4fa1a2c3))
* **lspconfig:** remove all usage of `lspconfig`
([36b4191](https://github.com/LazyVim/LazyVim/commit/36b41911ab90fe19505af306a31a5a699342d3c3))
* **lsp:** schedule_wrap setting up LSPs to work around root cause of
[#6456](https://github.com/LazyVim/LazyVim/issues/6456). Fixes
[#6456](https://github.com/LazyVim/LazyVim/issues/6456)
([75a3809](https://github.com/LazyVim/LazyVim/commit/75a3809e15a0ecff9adc46c6cd3aaac51d99b561))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 CHANGELOG.md                          | 9 +++++++++
 lua/lazyvim/config/init.lua           | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 9da34491..8e00e87c 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "15.1.0"
+  ".": "15.1.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b8723e8..c1b5e9ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [15.1.1](https://github.com/LazyVim/LazyVim/compare/v15.1.0...v15.1.1) (2025-09-18)
+
+
+### Bug Fixes
+
+* **core:** check for outdated nightly. See [#6458](https://github.com/LazyVim/LazyVim/issues/6458) ([cfac3c9](https://github.com/LazyVim/LazyVim/commit/cfac3c9a85526ad7406f9b246097a1ec4fa1a2c3))
+* **lspconfig:** remove all usage of `lspconfig` ([36b4191](https://github.com/LazyVim/LazyVim/commit/36b41911ab90fe19505af306a31a5a699342d3c3))
+* **lsp:** schedule_wrap setting up LSPs to work around root cause of [#6456](https://github.com/LazyVim/LazyVim/issues/6456). Fixes [#6456](https://github.com/LazyVim/LazyVim/issues/6456) ([75a3809](https://github.com/LazyVim/LazyVim/commit/75a3809e15a0ecff9adc46c6cd3aaac51d99b561))
+
 ## [15.1.0](https://github.com/LazyVim/LazyVim/compare/v15.0.3...v15.1.0) (2025-09-18)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index d12f2ac0..0df3885b 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "15.1.0" -- x-release-please-version
+M.version = "15.1.1" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From ccbaf55c2f8bc691f8f64fe40ce00a1abda4fbac Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 18 Sep 2025 22:19:03 +0200
Subject: [PATCH 189/341] feat(options): don't overwrite
 indentexpr/foldexpr/foldmethod when set by plugins. Fixes #6464

---
 lua/lazyvim/plugins/lsp/init.lua   |  6 ++--
 lua/lazyvim/plugins/treesitter.lua |  7 +++--
 lua/lazyvim/util/init.lua          | 47 ++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index 95b7385c..bc6a7f46 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -146,9 +146,9 @@ return {
       -- folds
       if opts.folds.enabled then
         LazyVim.lsp.on_supports_method("textDocument/foldingRange", function(client, buffer)
-          local win = vim.api.nvim_get_current_win()
-          vim.wo[win][0].foldexpr = "v:lua.vim.lsp.foldexpr()"
-          vim.wo[win][0].foldmethod = "expr"
+          if LazyVim.set_default("foldmethod", "expr") then
+            LazyVim.set_default("foldexpr", "v:lua.vim.lsp.foldexpr()")
+          end
         end)
       end
 
diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index a7ef7ed8..751a72f3 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -95,13 +95,14 @@ return {
 
           -- indents
           if vim.tbl_get(opts, "indent", "enable") ~= false then
-            vim.bo[ev.buf].indentexpr = "v:lua.LazyVim.treesitter.indentexpr()"
+            LazyVim.set_default("indentexpr", "v:lua.LazyVim.treesitter.indentexpr()")
           end
 
           -- folds
           if vim.tbl_get(opts, "folds", "enable") ~= false then
-            vim.wo.foldmethod = "expr"
-            vim.wo.foldexpr = "v:lua.LazyVim.treesitter.foldexpr()"
+            if LazyVim.set_default("foldmethod", "expr") then
+              LazyVim.set_default("foldexpr", "v:lua.LazyVim.treesitter.foldexpr()")
+            end
           end
         end,
       })
diff --git a/lua/lazyvim/util/init.lua b/lua/lazyvim/util/init.lua
index 44a135ad..a3349c8a 100644
--- a/lua/lazyvim/util/init.lua
+++ b/lua/lazyvim/util/init.lua
@@ -304,4 +304,51 @@ function M.statuscolumn()
   return package.loaded.snacks and require("snacks.statuscolumn").get() or ""
 end
 
+local _defaults = {} ---@type table<string, boolean>
+
+-- Determines whether it's safe to set an option to a default value.
+--
+-- It will only set the option if:
+-- * it is the same as the global value
+-- * it is the same as a previously set default value
+-- * it was last set by a script in $VIMRUNTIME
+---@param option string
+---@param value string|number|boolean
+---@return boolean was_set
+function M.set_default(option, value)
+  local key = ("%s=%s"):format(option, value)
+  _defaults[key] = true
+
+  if not _defaults[key] then
+    local l = vim.api.nvim_get_option_value(option, { scope = "local" })
+    local g = vim.api.nvim_get_option_value(option, { scope = "global" })
+
+    if l ~= g then
+      -- Option changed, so check if it was set by an ft plugin
+      local info = vim.api.nvim_get_option_info2(option, { scope = "local" })
+      ---@param e vim.fn.getscriptinfo.ret
+      local scriptinfo = vim.tbl_filter(function(e)
+        return e.sid == info.last_set_sid
+      end, vim.fn.getscriptinfo())
+      local by_rtp = #scriptinfo == 1 and vim.startswith(scriptinfo[1].name, vim.fn.expand("$VIMRUNTIME"))
+      if not by_rtp then
+        if vim.g.lazyvim_debug_set_default then
+          LazyVim.warn(
+            ("Not setting option `%s` to `%s` because it was changed by a filetype plugin."):format(option, value),
+            { title = "LazyVim", once = true }
+          )
+        end
+        return false
+      end
+    end
+  end
+
+  if vim.g.lazyvim_debug_set_default then
+    LazyVim.info(("Setting option `%s` to `%s`"):format(option, value), { title = "LazyVim", once = true })
+  end
+
+  vim.api.nvim_set_option_value(option, value, { scope = "local" })
+  return true
+end
+
 return M

From 2401d5fca6f2a2fcaca4f9c4c84c4b713c602352 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 18 Sep 2025 23:51:32 +0200
Subject: [PATCH 190/341] fix(options): set_default option

---
 lua/lazyvim/util/init.lua | 43 +++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/lua/lazyvim/util/init.lua b/lua/lazyvim/util/init.lua
index a3349c8a..ac3ffcec 100644
--- a/lua/lazyvim/util/init.lua
+++ b/lua/lazyvim/util/init.lua
@@ -310,36 +310,35 @@ local _defaults = {} ---@type table<string, boolean>
 --
 -- It will only set the option if:
 -- * it is the same as the global value
--- * it is the same as a previously set default value
+-- * it's current value is a default value
 -- * it was last set by a script in $VIMRUNTIME
 ---@param option string
 ---@param value string|number|boolean
 ---@return boolean was_set
 function M.set_default(option, value)
-  local key = ("%s=%s"):format(option, value)
-  _defaults[key] = true
+  local l = vim.api.nvim_get_option_value(option, { scope = "local" })
+  local g = vim.api.nvim_get_option_value(option, { scope = "global" })
 
-  if not _defaults[key] then
-    local l = vim.api.nvim_get_option_value(option, { scope = "local" })
-    local g = vim.api.nvim_get_option_value(option, { scope = "global" })
+  _defaults[("%s=%s"):format(option, value)] = true
+  local key = ("%s=%s"):format(option, l)
 
-    if l ~= g then
-      -- Option changed, so check if it was set by an ft plugin
-      local info = vim.api.nvim_get_option_info2(option, { scope = "local" })
-      ---@param e vim.fn.getscriptinfo.ret
-      local scriptinfo = vim.tbl_filter(function(e)
-        return e.sid == info.last_set_sid
-      end, vim.fn.getscriptinfo())
-      local by_rtp = #scriptinfo == 1 and vim.startswith(scriptinfo[1].name, vim.fn.expand("$VIMRUNTIME"))
-      if not by_rtp then
-        if vim.g.lazyvim_debug_set_default then
-          LazyVim.warn(
-            ("Not setting option `%s` to `%s` because it was changed by a filetype plugin."):format(option, value),
-            { title = "LazyVim", once = true }
-          )
-        end
-        return false
+  if l ~= g and not _defaults[key] then
+    -- Option does not match global and is not a default value
+    -- Check if it was set by a script in $VIMRUNTIME
+    local info = vim.api.nvim_get_option_info2(option, { scope = "local" })
+    ---@param e vim.fn.getscriptinfo.ret
+    local scriptinfo = vim.tbl_filter(function(e)
+      return e.sid == info.last_set_sid
+    end, vim.fn.getscriptinfo())
+    local by_rtp = #scriptinfo == 1 and vim.startswith(scriptinfo[1].name, vim.fn.expand("$VIMRUNTIME"))
+    if not by_rtp then
+      if vim.g.lazyvim_debug_set_default then
+        LazyVim.warn(
+          ("Not setting option `%s` to `%s` because it was changed by a filetype plugin."):format(option, value),
+          { title = "LazyVim", once = true }
+        )
       end
+      return false
     end
   end
 

From 3ca7b47365c85a07047e48cad450feff66c8bdd6 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Fri, 19 Sep 2025 08:11:38 +0200
Subject: [PATCH 191/341] feat(core): relax hard requirement for
 `vim.lsp.is_enabled`. Show warning instead

---
 lua/lazyvim/plugins/init.lua     | 23 ++++++++++-------------
 lua/lazyvim/plugins/lsp/init.lua |  2 +-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/lua/lazyvim/plugins/init.lua b/lua/lazyvim/plugins/init.lua
index 4ba9b36d..80394371 100644
--- a/lua/lazyvim/plugins/init.lua
+++ b/lua/lazyvim/plugins/init.lua
@@ -1,23 +1,20 @@
-local fail = nil
 if vim.fn.has("nvim-0.11.2") == 0 then
-  fail = {
+  vim.api.nvim_echo({
     { "LazyVim requires Neovim >= 0.11.2\n", "ErrorMsg" },
     { "For more info, see: https://github.com/LazyVim/LazyVim/issues/6421\n", "Comment" },
     { "Press any key to exit", "MoreMsg" },
-  }
-elseif vim.fn.has("nvim-0.12") == 1 and not vim.lsp.is_enabled then
-  fail = {
-    { "LazyVim requires Neovim >= 0.11.2 or a recent Nightly\n", "ErrorMsg" },
-    { "Your nightly is too old, please update to a more recent version.\n", "Comment" },
-    { "Press any key to exit", "MoreMsg" },
-  }
-end
-
-if fail then
-  vim.api.nvim_echo(fail, true, {})
+  }, true, {})
   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()
diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index bc6a7f46..51b6f022 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -235,7 +235,7 @@ return {
         })
       end
 
-      if vim.lsp.is_enabled("denols") and vim.lsp.is_enabled("vtsls") then
+      if vim.lsp.is_enabled and vim.lsp.is_enabled("denols") and vim.lsp.is_enabled("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

From cd7ae5bc74d7459170e39d8bf9c26ad3777d393f Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Fri, 19 Sep 2025 06:12:49 +0000
Subject: [PATCH 192/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 5c3e670d..906717b6 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim            Last change: 2025 September 18
+*LazyVim.txt*             For Neovim            Last change: 2025 September 19
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 26590285ead7a89bb45f309714f7f40136c89267 Mon Sep 17 00:00:00 2001
From: Wendel Macedo <wendelmacedooliveira@gmail.com>
Date: Fri, 19 Sep 2025 03:38:33 -0300
Subject: [PATCH 193/341] feat(clojure): use 'nvim-paredit' instead
 'nvim-treesitter-sexp' as clojure S-exp Plugin (#5876)

## Description

On [this bug](https://github.com/LazyVim/LazyVim/issues/5866) I told
about a plugin that was falty on clojure lang extra, with the goal to
have him removed but @mitchelkuijpers suggested a new one that I
implemented on this PR.

[The plugin](https://github.com/julienvincent/nvim-paredit) is 1:1 with
the keymaps of the older one.

## Related Issue(s)

https://github.com/LazyVim/LazyVim/issues/5866

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/clojure.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/clojure.lua b/lua/lazyvim/plugins/extras/lang/clojure.lua
index 7197aabd..06a7d141 100644
--- a/lua/lazyvim/plugins/extras/lang/clojure.lua
+++ b/lua/lazyvim/plugins/extras/lang/clojure.lua
@@ -27,7 +27,7 @@ return {
   },
 
   -- Add s-exp mappings
-  { "PaterJason/nvim-treesitter-sexp", opts = {}, event = "LazyFile" },
+  { "julienvincent/nvim-paredit", opts = {}, event = "LazyFile" },
 
   -- Colorize the output of the log buffer
   {

From 55e762a8888cd5f336e4e2d4b2cc6b8b1b950663 Mon Sep 17 00:00:00 2001
From: gbprod <contact@gb-prod.fr>
Date: Fri, 19 Sep 2025 11:29:07 +0200
Subject: [PATCH 194/341] feat(yanky): use snacks picker for improved yank
 history navigation (#5802)

## Description

I've introduce snacks picker support for [Yanky history
ring](https://github.com/gbprod/yanky.nvim/pull/215), I propose to use
it in LazyVim.

## Screenshots


![image](https://github.com/user-attachments/assets/0e11bab4-3060-418b-8fa1-33df6a4ee8c5)

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/coding/yanky.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/coding/yanky.lua b/lua/lazyvim/plugins/extras/coding/yanky.lua
index c880aceb..6285796d 100644
--- a/lua/lazyvim/plugins/extras/coding/yanky.lua
+++ b/lua/lazyvim/plugins/extras/coding/yanky.lua
@@ -13,6 +13,8 @@ return {
       function()
         if LazyVim.pick.picker.name == "telescope" then
           require("telescope").extensions.yank_history.yank_history({})
+        elseif LazyVim.pick.picker.name == "snacks" then
+          Snacks.picker.yanky()
         else
           vim.cmd([[YankyRingHistory]])
         end

From 5ce7cd650a5fffc257e0312b82fffd26abe2a1fa Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Fri, 19 Sep 2025 19:58:28 +0200
Subject: [PATCH 195/341] fix(treesitter): check if queries for indent/fold
 exists before enabling it. Fixes #6474

---
 lua/lazyvim/plugins/treesitter.lua |  4 ++--
 lua/lazyvim/util/treesitter.lua    | 32 +++++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index 751a72f3..5721979d 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -94,12 +94,12 @@ return {
           end
 
           -- indents
-          if vim.tbl_get(opts, "indent", "enable") ~= false 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 vim.tbl_get(opts, "folds", "enable") ~= false 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
diff --git a/lua/lazyvim/util/treesitter.lua b/lua/lazyvim/util/treesitter.lua
index 5df6aa53..b1d647e8 100644
--- a/lua/lazyvim/util/treesitter.lua
+++ b/lua/lazyvim/util/treesitter.lua
@@ -1,36 +1,54 @@
 ---@class lazyvim.util.treesitter
 local M = {}
 
-M._installed = nil ---@type table<string,string>?
+M._installed = nil ---@type table<string,boolean>?
+M._queries = {} ---@type table<string,boolean>
 
 ---@param update boolean?
 function M.get_installed(update)
   if update then
-    M._installed = {}
+    M._installed, M._queries = {}, {}
     for _, lang in ipairs(require("nvim-treesitter").get_installed("parsers")) do
-      M._installed[lang] = lang
+      M._installed[lang] = true
     end
   end
   return M._installed or {}
 end
 
+---@param lang string
+---@param query string
+function M.have_query(lang, query)
+  local key = lang .. ":" .. query
+  if M._queries[key] == nil then
+    M._queries[key] = vim.treesitter.query.get(lang, query) ~= nil
+  end
+  return M._queries[key]
+end
+
 ---@param what string|number|nil
+---@param query? string
 ---@overload fun(buf?:number):boolean
 ---@overload fun(ft:string):boolean
 ---@return boolean
-function M.have(what)
+function M.have(what, query)
   what = what or vim.api.nvim_get_current_buf()
   what = type(what) == "number" and vim.bo[what].filetype or what --[[@as string]]
   local lang = vim.treesitter.language.get_lang(what)
-  return lang ~= nil and M.get_installed()[lang] ~= nil
+  if lang == nil or M.get_installed()[lang] == nil then
+    return false
+  end
+  if query and not M.have_query(lang, query) then
+    return false
+  end
+  return true
 end
 
 function M.foldexpr()
-  return M.have() and vim.treesitter.foldexpr() or "0"
+  return M.have(nil, "folds") and vim.treesitter.foldexpr() or "0"
 end
 
 function M.indentexpr()
-  return M.have() and require("nvim-treesitter").indentexpr() or -1
+  return M.have(nil, "indents") and require("nvim-treesitter").indentexpr() or -1
 end
 
 ---@param cb fun()

From 9c611b0c5758d0d659e7fdb29119b7083a56f989 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Fri, 19 Sep 2025 20:26:36 +0200
Subject: [PATCH 196/341] fix(options): track some initial options right after
 loading `options.lua`. See #6463

---
 lua/lazyvim/config/init.lua |  8 ++++++++
 lua/lazyvim/util/init.lua   | 14 +++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 0df3885b..344bcb56 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -304,6 +304,8 @@ function M.load(name)
 end
 
 M.did_init = false
+M._options = {} ---@type vim.wo|vim.bo
+
 function M.init()
   if M.did_init then
     return
@@ -326,6 +328,12 @@ function M.init()
   -- this is needed to make sure options will be correctly applied
   -- after installing missing plugins
   M.load("options")
+
+  -- save some options to track defaults
+  M._options.indentexpr = vim.o.indentexpr
+  M._options.foldmethod = vim.o.foldmethod
+  M._options.foldexpr = vim.o.foldexpr
+
   -- defer built-in clipboard handling: "xsel" and "pbcopy" can be slow
   lazy_clipboard = vim.opt.clipboard
   vim.opt.clipboard = ""
diff --git a/lua/lazyvim/util/init.lua b/lua/lazyvim/util/init.lua
index ac3ffcec..812e6f22 100644
--- a/lua/lazyvim/util/init.lua
+++ b/lua/lazyvim/util/init.lua
@@ -317,11 +317,12 @@ local _defaults = {} ---@type table<string, boolean>
 ---@return boolean was_set
 function M.set_default(option, value)
   local l = vim.api.nvim_get_option_value(option, { scope = "local" })
-  local g = vim.api.nvim_get_option_value(option, { scope = "global" })
+  local g = LazyVim.config._options[option] or vim.api.nvim_get_option_value(option, { scope = "global" })
 
   _defaults[("%s=%s"):format(option, value)] = true
   local key = ("%s=%s"):format(option, l)
 
+  local source = ""
   if l ~= g and not _defaults[key] then
     -- Option does not match global and is not a default value
     -- Check if it was set by a script in $VIMRUNTIME
@@ -330,11 +331,12 @@ function M.set_default(option, value)
     local scriptinfo = vim.tbl_filter(function(e)
       return e.sid == info.last_set_sid
     end, vim.fn.getscriptinfo())
+    source = scriptinfo[1] and scriptinfo[1].name or ""
     local by_rtp = #scriptinfo == 1 and vim.startswith(scriptinfo[1].name, vim.fn.expand("$VIMRUNTIME"))
     if not by_rtp then
       if vim.g.lazyvim_debug_set_default then
         LazyVim.warn(
-          ("Not setting option `%s` to `%s` because it was changed by a filetype plugin."):format(option, value),
+          ("Not setting option `%s` to `%q` because it was changed by a plugin."):format(option, value),
           { title = "LazyVim", once = true }
         )
       end
@@ -343,7 +345,13 @@ function M.set_default(option, value)
   end
 
   if vim.g.lazyvim_debug_set_default then
-    LazyVim.info(("Setting option `%s` to `%s`"):format(option, value), { title = "LazyVim", once = true })
+    LazyVim.info({
+      ("Setting option `%s` to `%q`"):format(option, value),
+      ("Was: %q"):format(l),
+      ("Global: %q"):format(g),
+      source ~= "" and ("Last set by: %s"):format(source) or "",
+      "buf: " .. vim.api.nvim_buf_get_name(0),
+    }, { title = "LazyVim", once = true })
   end
 
   vim.api.nvim_set_option_value(option, value, { scope = "local" })

From 55b5c1fecb0b7e71c5eb40555b17d1e4820690f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frestein=20=E2=98=81=EF=B8=8F?= <Frestein@tuta.io>
Date: Sat, 20 Sep 2025 17:08:56 +0500
Subject: [PATCH 197/341] fix(lang.clojure): correct cmp-conjure source name
 (#6208)

## Description


https://github.com/PaterJason/cmp-conjure/blob/8c9a88efedc0e5bf3165baa6af8a407afe29daf6/README.md?plain=1#L10

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/clojure.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/clojure.lua b/lua/lazyvim/plugins/extras/lang/clojure.lua
index 06a7d141..c7af0b55 100644
--- a/lua/lazyvim/plugins/extras/lang/clojure.lua
+++ b/lua/lazyvim/plugins/extras/lang/clojure.lua
@@ -21,7 +21,7 @@ return {
     },
     opts = function(_, opts)
       if type(opts.sources) == "table" then
-        vim.list_extend(opts.sources, { name = "clojure" })
+        vim.list_extend(opts.sources, { name = "conjure" })
       end
     end,
   },

From c9efea84311f520cd58263dc7702870abfb5f20b Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Sat, 20 Sep 2025 12:10:18 +0000
Subject: [PATCH 198/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 906717b6..f7f29509 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim            Last change: 2025 September 19
+*LazyVim.txt*             For Neovim            Last change: 2025 September 20
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 65e38d3b34cab653a05318c1a9014df3c89fdb53 Mon Sep 17 00:00:00 2001
From: vector <zijiebing@gmail.com>
Date: Sat, 20 Sep 2025 21:48:35 +0800
Subject: [PATCH 199/341] fix(editor): calculate the height passed to the
 prompt of fzf-lua properly (#6481)

## Description

add two lines more to the height of prompt window.

## Related Issue(s)

  - Fixes #6480


## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/editor/fzf.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/editor/fzf.lua b/lua/lazyvim/plugins/extras/editor/fzf.lua
index 31297b94..9e7ef671 100644
--- a/lua/lazyvim/plugins/extras/editor/fzf.lua
+++ b/lua/lazyvim/plugins/extras/editor/fzf.lua
@@ -120,7 +120,7 @@ return {
             winopts = {
               layout = "vertical",
               -- height is number of items minus 15 lines for the preview, with a max of 80% screen height
-              height = math.floor(math.min(vim.o.lines * 0.8 - 16, #items + 2) + 0.5) + 16,
+              height = math.floor(math.min(vim.o.lines * 0.8 - 16, #items + 4) + 0.5) + 16,
               width = 0.5,
               preview = not vim.tbl_isempty(vim.lsp.get_clients({ bufnr = 0, name = "vtsls" })) and {
                 layout = "vertical",
@@ -135,7 +135,7 @@ return {
             winopts = {
               width = 0.5,
               -- height is number of items, with a max of 80% screen height
-              height = math.floor(math.min(vim.o.lines * 0.8, #items + 2) + 0.5),
+              height = math.floor(math.min(vim.o.lines * 0.8, #items + 4) + 0.5),
             },
           })
         end,

From b4606f9df3395a261bb6a09acc837993da5d8bfc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 20 Sep 2025 16:50:44 +0200
Subject: [PATCH 200/341] chore(main): release 15.2.0 (#6468)

:robot: I have created a release *beep* *boop*
---


##
[15.2.0](https://github.com/LazyVim/LazyVim/compare/v15.1.1...v15.2.0)
(2025-09-20)


### Features

* **clojure:** use 'nvim-paredit' instead 'nvim-treesitter-sexp' as
clojure S-exp Plugin
([#5876](https://github.com/LazyVim/LazyVim/issues/5876))
([2659028](https://github.com/LazyVim/LazyVim/commit/26590285ead7a89bb45f309714f7f40136c89267))
* **core:** relax hard requirement for `vim.lsp.is_enabled`. Show
warning instead
([3ca7b47](https://github.com/LazyVim/LazyVim/commit/3ca7b47365c85a07047e48cad450feff66c8bdd6))
* **options:** don't overwrite indentexpr/foldexpr/foldmethod when set
by plugins. Fixes
[#6464](https://github.com/LazyVim/LazyVim/issues/6464)
([ccbaf55](https://github.com/LazyVim/LazyVim/commit/ccbaf55c2f8bc691f8f64fe40ce00a1abda4fbac))
* **yanky:** use snacks picker for improved yank history navigation
([#5802](https://github.com/LazyVim/LazyVim/issues/5802))
([55e762a](https://github.com/LazyVim/LazyVim/commit/55e762a8888cd5f336e4e2d4b2cc6b8b1b950663))


### Bug Fixes

* **editor:** calculate the height passed to the prompt of fzf-lua
properly ([#6481](https://github.com/LazyVim/LazyVim/issues/6481))
([65e38d3](https://github.com/LazyVim/LazyVim/commit/65e38d3b34cab653a05318c1a9014df3c89fdb53))
* **lang.clojure:** correct cmp-conjure source name
([#6208](https://github.com/LazyVim/LazyVim/issues/6208))
([55b5c1f](https://github.com/LazyVim/LazyVim/commit/55b5c1fecb0b7e71c5eb40555b17d1e4820690f0))
* **options:** set_default option
([2401d5f](https://github.com/LazyVim/LazyVim/commit/2401d5fca6f2a2fcaca4f9c4c84c4b713c602352))
* **options:** track some initial options right after loading
`options.lua`. See
[#6463](https://github.com/LazyVim/LazyVim/issues/6463)
([9c611b0](https://github.com/LazyVim/LazyVim/commit/9c611b0c5758d0d659e7fdb29119b7083a56f989))
* **treesitter:** check if queries for indent/fold exists before
enabling it. Fixes
[#6474](https://github.com/LazyVim/LazyVim/issues/6474)
([5ce7cd6](https://github.com/LazyVim/LazyVim/commit/5ce7cd650a5fffc257e0312b82fffd26abe2a1fa))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 19 +++++++++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 8e00e87c..b25a6511 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "15.1.1"
+  ".": "15.2.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1b5e9ac..21249147 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## [15.2.0](https://github.com/LazyVim/LazyVim/compare/v15.1.1...v15.2.0) (2025-09-20)
+
+
+### Features
+
+* **clojure:** use 'nvim-paredit' instead 'nvim-treesitter-sexp' as clojure S-exp Plugin ([#5876](https://github.com/LazyVim/LazyVim/issues/5876)) ([2659028](https://github.com/LazyVim/LazyVim/commit/26590285ead7a89bb45f309714f7f40136c89267))
+* **core:** relax hard requirement for `vim.lsp.is_enabled`. Show warning instead ([3ca7b47](https://github.com/LazyVim/LazyVim/commit/3ca7b47365c85a07047e48cad450feff66c8bdd6))
+* **options:** don't overwrite indentexpr/foldexpr/foldmethod when set by plugins. Fixes [#6464](https://github.com/LazyVim/LazyVim/issues/6464) ([ccbaf55](https://github.com/LazyVim/LazyVim/commit/ccbaf55c2f8bc691f8f64fe40ce00a1abda4fbac))
+* **yanky:** use snacks picker for improved yank history navigation ([#5802](https://github.com/LazyVim/LazyVim/issues/5802)) ([55e762a](https://github.com/LazyVim/LazyVim/commit/55e762a8888cd5f336e4e2d4b2cc6b8b1b950663))
+
+
+### Bug Fixes
+
+* **editor:** calculate the height passed to the prompt of fzf-lua properly ([#6481](https://github.com/LazyVim/LazyVim/issues/6481)) ([65e38d3](https://github.com/LazyVim/LazyVim/commit/65e38d3b34cab653a05318c1a9014df3c89fdb53))
+* **lang.clojure:** correct cmp-conjure source name ([#6208](https://github.com/LazyVim/LazyVim/issues/6208)) ([55b5c1f](https://github.com/LazyVim/LazyVim/commit/55b5c1fecb0b7e71c5eb40555b17d1e4820690f0))
+* **options:** set_default option ([2401d5f](https://github.com/LazyVim/LazyVim/commit/2401d5fca6f2a2fcaca4f9c4c84c4b713c602352))
+* **options:** track some initial options right after loading `options.lua`. See [#6463](https://github.com/LazyVim/LazyVim/issues/6463) ([9c611b0](https://github.com/LazyVim/LazyVim/commit/9c611b0c5758d0d659e7fdb29119b7083a56f989))
+* **treesitter:** check if queries for indent/fold exists before enabling it. Fixes [#6474](https://github.com/LazyVim/LazyVim/issues/6474) ([5ce7cd6](https://github.com/LazyVim/LazyVim/commit/5ce7cd650a5fffc257e0312b82fffd26abe2a1fa))
+
 ## [15.1.1](https://github.com/LazyVim/LazyVim/compare/v15.1.0...v15.1.1) (2025-09-18)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 344bcb56..e85dbd63 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "15.1.1" -- x-release-please-version
+M.version = "15.2.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 89ff1fd600bb6ff4cf2c9edbc2217a40ecb8d160 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 21 Sep 2025 11:04:23 +0200
Subject: [PATCH 201/341] feat(treesitter): show an error if the user tries to
 set a custom treesitter compiler

---
 lua/lazyvim/plugins/treesitter.lua | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index 5721979d..8ad15924 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -58,6 +58,21 @@ return {
     config = function(_, opts)
       local TS = require("nvim-treesitter")
 
+      setmetatable(require("nvim-treesitter.install"), {
+        __newindex = function(_, k)
+          if k == "compilers" then
+            vim.schedule(function()
+              LazyVim.error({
+                "Setting custom compilers for `nvim-treesitter` is no longer supported.",
+                "",
+                "For more info, see:",
+                "- [compilers](https://docs.rs/cc/latest/cc/#compile-time-requirements)",
+              })
+            end)
+          end
+        end,
+      })
+
       -- some quick sanity checks
       if not TS.get_installed then
         return LazyVim.error("Please use `:Lazy` and update `nvim-treesitter`")

From 89ce0438d6e78fd589ac9f41ec7b366c6581eb3c Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Sun, 21 Sep 2025 09:05:18 +0000
Subject: [PATCH 202/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index f7f29509..054756aa 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim            Last change: 2025 September 20
+*LazyVim.txt*             For Neovim            Last change: 2025 September 21
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 775621ac0af42486ef1cd4254d1a6625a190040b Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 21 Sep 2025 11:58:57 +0200
Subject: [PATCH 203/341] fix(vtsls): fix and move denols/vtsls disambigutaion
 to typescript extra. Fixes #6476

---
 .../plugins/extras/lang/typescript.lua        | 22 +++++++++++++++++++
 lua/lazyvim/plugins/lsp/init.lua              | 22 -------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/typescript.lua b/lua/lazyvim/plugins/extras/lang/typescript.lua
index 3830f795..64dcd394 100644
--- a/lua/lazyvim/plugins/extras/lang/typescript.lua
+++ b/lua/lazyvim/plugins/extras/lang/typescript.lua
@@ -131,6 +131,28 @@ return {
           return true
         end,
         vtsls = function(_, opts)
+          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
diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index 51b6f022..3810cb8c 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -234,28 +234,6 @@ return {
           },
         })
       end
-
-      if vim.lsp.is_enabled and vim.lsp.is_enabled("denols") and vim.lsp.is_enabled("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
     end),
   },
 

From 16637dd655e3ed6b88d3fcd2ed8ed75420a89415 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 21 Sep 2025 12:34:27 +0200
Subject: [PATCH 204/341] refactor(lsp): cleanup lsp/mason-lspconfig code

---
 lua/lazyvim/plugins/lsp/init.lua | 60 ++++++++++++--------------------
 1 file changed, 23 insertions(+), 37 deletions(-)

diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index 3810cb8c..324777d8 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -68,7 +68,8 @@ return {
           timeout_ms = nil,
         },
         -- LSP Server Settings
-        ---@type table<string, vim.lsp.Config|{mason?:boolean, enabled?:boolean}|boolean>
+        ---@alias lazyvim.lsp.Config vim.lsp.Config|{mason?:boolean, enabled?:boolean}
+        ---@type table<string, lazyvim.lsp.Config|boolean>
         servers = {
           lua_ls = {
             -- mason = false, -- set to false if you don't want this server to be installed with mason
@@ -187,51 +188,36 @@ return {
           and vim.tbl_keys(require("mason-lspconfig.mappings").get_mason_map().lspconfig_to_package)
         or {} --[[ @as string[] ]]
 
-      local exclude_automatic_enable = {} ---@type string[]
-
+      ---@return boolean? exclude automatic setup
       local function configure(server)
-        local server_opts = opts.servers[server] or {}
-
-        local setup = opts.setup[server] or opts.setup["*"]
-        if setup and setup(server, server_opts) then
-          return true -- lsp will be setup by the setup function
-        end
-
-        vim.lsp.config(server, server_opts)
-
-        -- manually enable if mason=false or if this is a server that cannot be installed with mason-lspconfig
-        if server_opts.mason == false or not vim.tbl_contains(mason_all, server) then
-          vim.lsp.enable(server)
+        local sopts = opts.servers[server]
+        sopts = sopts == true and {} or (not sopts) and { enabled = false } or sopts --[[@as lazyvim.lsp.Config]]
+        if sopts.enabled == false then
           return true
         end
-        return false
-      end
 
-      local ensure_installed = {} ---@type string[]
-      for server, server_opts in pairs(opts.servers) do
-        server_opts = server_opts == true and {} or server_opts or false
-        if server_opts and server_opts.enabled ~= false then
-          -- run manual setup if mason=false or if this is a server that cannot be installed with mason-lspconfig
-          if configure(server) then
-            exclude_automatic_enable[#exclude_automatic_enable + 1] = server
-          else
-            ensure_installed[#ensure_installed + 1] = server
-          end
-        else
-          exclude_automatic_enable[#exclude_automatic_enable + 1] = server
+        local setup = opts.setup[server] or opts.setup["*"]
+        if setup and setup(server, sopts) then
+          return true -- lsp will be configured and enabled by the setup function
+        end
+
+        vim.lsp.config(server, sopts) -- configure the server
+
+        -- manually enable if mason=false or if this is a server that cannot be installed with mason-lspconfig
+        if sopts.mason == false or not vim.tbl_contains(mason_all, server) then
+          vim.lsp.enable(server)
+          return true
         end
       end
 
       if have_mason then
+        local servers = vim.tbl_keys(opts.servers)
+        local exclude = vim.tbl_filter(configure, servers)
         require("mason-lspconfig").setup({
-          ensure_installed = vim.tbl_deep_extend(
-            "force",
-            ensure_installed,
-            LazyVim.opts("mason-lspconfig.nvim").ensure_installed or {}
-          ),
-          automatic_enable = {
-            exclude = exclude_automatic_enable,
-          },
+          ensure_installed = vim.tbl_filter(function(server)
+            return not vim.tbl_contains(exclude, server)
+          end, vim.list_extend(servers, LazyVim.opts("mason-lspconfig.nvim").ensure_installed or {})),
+          automatic_enable = { exclude = exclude },
         })
       end
     end),

From a90b56518f4f2291985952d79472d4f935c0bad0 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 21 Sep 2025 12:35:17 +0200
Subject: [PATCH 205/341] fix(lsp): fixup for when not using mason

---
 lua/lazyvim/plugins/lsp/init.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index 324777d8..4be74c82 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -210,9 +210,9 @@ return {
         end
       end
 
+      local servers = vim.tbl_keys(opts.servers)
+      local exclude = vim.tbl_filter(configure, servers)
       if have_mason then
-        local servers = vim.tbl_keys(opts.servers)
-        local exclude = vim.tbl_filter(configure, servers)
         require("mason-lspconfig").setup({
           ensure_installed = vim.tbl_filter(function(server)
             return not vim.tbl_contains(exclude, server)

From 13069f20183655d8a02f3acbd21d0ac4c9ce811c Mon Sep 17 00:00:00 2001
From: Zhou Fang <fang2hou@outlook.com>
Date: Sun, 21 Sep 2025 21:40:15 +0900
Subject: [PATCH 206/341] feat(copilot): use `blink-copilot` as blink.cmp
 copilot source (#5551)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description

<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

After reviewing and fixing bugs in blink-cmp-copilot, I realized that
there is significant room for improvement in its codebase. So I created
a new copilot source `blink-copilot` for `blink.cmp` that introduces
many new features, enhanced performance, and official `copilot.vim`
backend support. (`copilot.lua` is supported by default)

The plugin has been starred by over 30 users, and it is growing faster
than blink-cmp-copilot. After more than two weeks of gathering feedback
and addressing bugs, the plugin has become very stable, and I believe
it’s time to share it with a broader audience.

`blink-copilot` register the kind `Copilot` by default, so there is no
need to do extra transforming on the completion items.

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/ai/copilot.lua | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ai/copilot.lua b/lua/lazyvim/plugins/extras/ai/copilot.lua
index 48870743..7c326499 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot.lua
@@ -98,15 +98,14 @@ return {
         {
           "saghen/blink.cmp",
           optional = true,
-          dependencies = { "giuxtaposition/blink-cmp-copilot" },
+          dependencies = { "fang2hou/blink-copilot" },
           opts = {
             sources = {
               default = { "copilot" },
               providers = {
                 copilot = {
                   name = "copilot",
-                  module = "blink-cmp-copilot",
-                  kind = "Copilot",
+                  module = "blink-copilot",
                   score_offset = 100,
                   async = true,
                 },

From 7d5365ad1463c61936f06ed4eeeefc819e36b3c3 Mon Sep 17 00:00:00 2001
From: Vladimir Shvets <stormherz@gmail.com>
Date: Sun, 21 Sep 2025 20:29:53 +0700
Subject: [PATCH 207/341] fix(lualine): pretty path fix for mixed case paths on
 Windows (#4911)

## Description

Here's an example of the issue:

```lua
local pretty_path = require('lazyvim.util').lualine.pretty_path({ relative = 'cwd' })

-- just a stub
local component = {
  create_hl = function() end,
  format_hl = function() return '' end,
  get_default_hl = function() return '' end
}

local cwd = vim.fn.getcwd()
vim.print('cwd: ' .. cwd)
vim.print('pretty path: ' .. pretty_path(component))

-- results if `cd d:\tmp` was called previously
-- cwd: d:\tmp
-- pretty path: d:\tmp\pretty_path_issue.lua
--
-- results if `cd D:\tmp` was called previously
-- cwd: D:\tmp
-- pretty path: pretty_path_issue.lua
```

Depending on the initial path of the `cd` we either get a pretty path or
we don't =)

I'm not sure if this should be fixed in the neovim itself (considering
windows paths as case-insensitive), but I would assume that would take a
lot longer to land there, if it's even considered a needed change

## Related Issue(s)

Somewhat related to #4763, where I've left a comment, but decided to
look a bit deeper

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/util/lualine.lua | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/util/lualine.lua b/lua/lazyvim/util/lualine.lua
index 5f4f1885..a6aa24f3 100644
--- a/lua/lazyvim/util/lualine.lua
+++ b/lua/lazyvim/util/lualine.lua
@@ -101,9 +101,20 @@ function M.pretty_path(opts)
     local root = LazyVim.root.get({ normalize = true })
     local cwd = LazyVim.root.cwd()
 
-    if opts.relative == "cwd" and path:find(cwd, 1, true) == 1 then
+    -- original path is preserved to provide user with expected result of pretty_path, not a normalized one,
+    -- which might be confusing
+    local norm_path = path
+
+    if LazyVim.is_win() then
+      -- in case any of the provided paths involved mixed case, an additional normalization step for windows
+      norm_path = norm_path:lower()
+      root = root:lower()
+      cwd = cwd:lower()
+    end
+
+    if opts.relative == "cwd" and norm_path:find(cwd, 1, true) == 1 then
       path = path:sub(#cwd + 2)
-    elseif path:find(root, 1, true) == 1 then
+    elseif norm_path:find(root, 1, true) == 1 then
       path = path:sub(#root + 2)
     end
 

From 720e06a908cbf6e3afb4eccc049d58df9ace770a Mon Sep 17 00:00:00 2001
From: filip <filipbachul@gmail.com>
Date: Sun, 21 Sep 2025 15:42:38 +0200
Subject: [PATCH 208/341] fix(keymaps): enable snacks git keybindings (#6323)

## Description
Enable snacks git keybindings even if `lazygit` is not installed
Related discussion: https://github.com/LazyVim/LazyVim/discussions/6322

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/config/keymaps.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/lazyvim/config/keymaps.lua b/lua/lazyvim/config/keymaps.lua
index acaf44d9..938a2333 100644
--- a/lua/lazyvim/config/keymaps.lua
+++ b/lua/lazyvim/config/keymaps.lua
@@ -163,12 +163,12 @@ end
 if vim.fn.executable("lazygit") == 1 then
   map("n", "<leader>gg", function() Snacks.lazygit( { cwd = LazyVim.root.git() }) end, { desc = "Lazygit (Root Dir)" })
   map("n", "<leader>gG", function() Snacks.lazygit() end, { desc = "Lazygit (cwd)" })
-  map("n", "<leader>gf", function() Snacks.picker.git_log_file() end, { desc = "Git Current File History" })
-  map("n", "<leader>gl", function() Snacks.picker.git_log({ cwd = LazyVim.root.git() }) end, { desc = "Git Log" })
-  map("n", "<leader>gL", function() Snacks.picker.git_log() end, { desc = "Git Log (cwd)" })
 end
 
+map("n", "<leader>gL", function() Snacks.picker.git_log() end, { desc = "Git Log (cwd)" })
 map("n", "<leader>gb", function() Snacks.picker.git_log_line() end, { desc = "Git Blame Line" })
+map("n", "<leader>gf", function() Snacks.picker.git_log_file() end, { desc = "Git Current File History" })
+map("n", "<leader>gl", function() Snacks.picker.git_log({ cwd = LazyVim.root.git() }) end, { desc = "Git Log" })
 map({ "n", "x" }, "<leader>gB", function() Snacks.gitbrowse() end, { desc = "Git Browse (open)" })
 map({"n", "x" }, "<leader>gY", function()
   Snacks.gitbrowse({ open = function(url) vim.fn.setreg("+", url) end, notify = false })

From 37a1c1af5dbbcf069bb94a71b4dda3626fbda77a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frestein=20=E2=98=81=EF=B8=8F?= <Frestein@tuta.io>
Date: Sun, 21 Sep 2025 18:51:56 +0500
Subject: [PATCH 209/341] fix(luasnip): add missing optional tag to
 garymjr/nvim-snippets (#5733)

## Description

This pull request fixes an issue where the `nvim-snippets` plugin was
incorrectly marked as disabled due to the missing optional tag in the
configuration. By adding the `optional = true` tag, the plugin will no
longer appear as disabled when it is not installed.

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

Before:

![image](https://github.com/user-attachments/assets/8391b047-22e6-416b-acb8-3b8af3932469)

After:

![image](https://github.com/user-attachments/assets/8c1775ce-8aa9-434e-986d-a1db3ac7bd56)


## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/coding/luasnip.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/coding/luasnip.lua b/lua/lazyvim/plugins/extras/coding/luasnip.lua
index 85ed2fd5..5b62113e 100644
--- a/lua/lazyvim/plugins/extras/coding/luasnip.lua
+++ b/lua/lazyvim/plugins/extras/coding/luasnip.lua
@@ -1,6 +1,6 @@
 return {
   -- disable builtin snippet support
-  { "garymjr/nvim-snippets", enabled = false },
+  { "garymjr/nvim-snippets", optional = true, enabled = false },
 
   -- add luasnip
   {

From 80990ec62fd36fc4b6b921a9041f55858e33e030 Mon Sep 17 00:00:00 2001
From: dareni <ikkyisaacs@gmail.com>
Date: Mon, 22 Sep 2025 21:55:56 +1000
Subject: [PATCH 210/341] fix(jdtls): allow mason jdtls installation (#6498)

Bug fix jdtls config for compatibility with last lsp refactor.
---
 lua/lazyvim/plugins/extras/lang/java.lua | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua
index d4eb5f6e..24a754df 100644
--- a/lua/lazyvim/plugins/extras/lang/java.lua
+++ b/lua/lazyvim/plugins/extras/lang/java.lua
@@ -71,11 +71,6 @@ return {
       servers = {
         jdtls = {},
       },
-      setup = {
-        jdtls = function()
-          return true -- avoid duplicate servers
-        end,
-      },
     },
   },
 

From c4237659621e406089f4d13d32192954d52c4924 Mon Sep 17 00:00:00 2001
From: dareni <ikkyisaacs@gmail.com>
Date: Mon, 22 Sep 2025 21:56:18 +1000
Subject: [PATCH 211/341] fix(jdtls): bundle configuration bug fix (#6499)

The jar for the debug adapter was included but the operation to append
the java-test jar files failed.
---
 lua/lazyvim/plugins/extras/lang/java.lua | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua
index 24a754df..28441c5c 100644
--- a/lua/lazyvim/plugins/extras/lang/java.lua
+++ b/lua/lazyvim/plugins/extras/lang/java.lua
@@ -145,19 +145,10 @@ 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
-          local jar_patterns = {
-            vim.fn.expand("$MASON/share/java-debug-adapter/com.microsoft.java.debug.plugin-*.jar"),
-          }
+          bundles = vim.fn.glob("$MASON/share/java-debug-adapter/com.microsoft.java.debug.plugin-*jar", false, true)
           -- java-test also depends on java-debug-adapter.
           if opts.test and mason_registry.is_installed("java-test") then
-            vim.list_extend(jar_patterns, {
-              vim.fn.expand("$MASON/share/java-test/*.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
+            vim.list_extend(bundles, vim.fn.glob("$MASON/share/java-test/*.jar", false, true))
           end
         end
       end

From 21518ae8a32cc56cfd8eefbbe33b8fe801d5bb3a Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Mon, 22 Sep 2025 11:57:00 +0000
Subject: [PATCH 212/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 054756aa..e454f9cf 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim            Last change: 2025 September 21
+*LazyVim.txt*             For Neovim            Last change: 2025 September 22
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 37b1ec41ae57e8396d5c923a4bfdf7050215b4d6 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 23 Sep 2025 12:58:45 +0200
Subject: [PATCH 213/341] fix(lsp): fix mason install/exclude. Closes #6504

---
 lua/lazyvim/plugins/lsp/init.lua | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index 4be74c82..35ff4505 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -187,37 +187,36 @@ 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[]
 
       ---@return boolean? exclude automatic setup
       local function configure(server)
         local sopts = opts.servers[server]
         sopts = sopts == true and {} or (not sopts) and { enabled = false } or sopts --[[@as lazyvim.lsp.Config]]
+
         if sopts.enabled == false then
-          return true
+          mason_exclude[#mason_exclude + 1] = server
+          return
         end
 
+        local use_mason = sopts.mason ~= false and vim.tbl_contains(mason_all, server)
         local setup = opts.setup[server] or opts.setup["*"]
         if setup and setup(server, sopts) then
-          return true -- lsp will be configured and enabled by the setup function
-        end
-
-        vim.lsp.config(server, sopts) -- configure the server
-
-        -- manually enable if mason=false or if this is a server that cannot be installed with mason-lspconfig
-        if sopts.mason == false or not vim.tbl_contains(mason_all, server) then
-          vim.lsp.enable(server)
-          return true
+          mason_exclude[#mason_exclude + 1] = server
+        else
+          vim.lsp.config(server, sopts) -- configure the server
+          if not use_mason then
+            vim.lsp.enable(server)
+          end
         end
+        return use_mason
       end
 
-      local servers = vim.tbl_keys(opts.servers)
-      local exclude = vim.tbl_filter(configure, servers)
+      local install = vim.tbl_filter(configure, vim.tbl_keys(opts.servers))
       if have_mason then
         require("mason-lspconfig").setup({
-          ensure_installed = vim.tbl_filter(function(server)
-            return not vim.tbl_contains(exclude, server)
-          end, vim.list_extend(servers, LazyVim.opts("mason-lspconfig.nvim").ensure_installed or {})),
-          automatic_enable = { exclude = exclude },
+          ensure_installed = vim.list_extend(install, LazyVim.opts("mason-lspconfig.nvim").ensure_installed or {}),
+          automatic_enable = { exclude = mason_exclude },
         })
       end
     end),

From 6229f5a2dda91da50b72d1bef973df4db8daac8d Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Tue, 23 Sep 2025 10:59:38 +0000
Subject: [PATCH 214/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index e454f9cf..dbeb4819 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim            Last change: 2025 September 22
+*LazyVim.txt*             For Neovim            Last change: 2025 September 23
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 67781bda04195e99d187dece5a27bf067bfb34cd Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 23 Sep 2025 13:00:13 +0200
Subject: [PATCH 215/341] Revert "fix(jdtls): allow mason jdtls installation
 (#6498)"

This reverts commit 80990ec62fd36fc4b6b921a9041f55858e33e030.
---
 lua/lazyvim/plugins/extras/lang/java.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua
index 28441c5c..4dd1d77f 100644
--- a/lua/lazyvim/plugins/extras/lang/java.lua
+++ b/lua/lazyvim/plugins/extras/lang/java.lua
@@ -71,6 +71,11 @@ return {
       servers = {
         jdtls = {},
       },
+      setup = {
+        jdtls = function()
+          return true -- avoid duplicate servers
+        end,
+      },
     },
   },
 

From 6e3a06306d72a7f7a401c007f56706023a6c00ea Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 23 Sep 2025 13:02:58 +0200
Subject: [PATCH 216/341] chore(main): release 15.3.0 (#6486)

:robot: I have created a release *beep* *boop*
---


##
[15.3.0](https://github.com/LazyVim/LazyVim/compare/v15.2.0...v15.3.0)
(2025-09-23)


### Features

* **copilot:** use `blink-copilot` as blink.cmp copilot source
([#5551](https://github.com/LazyVim/LazyVim/issues/5551))
([13069f2](https://github.com/LazyVim/LazyVim/commit/13069f20183655d8a02f3acbd21d0ac4c9ce811c))
* **treesitter:** show an error if the user tries to set a custom
treesitter compiler
([89ff1fd](https://github.com/LazyVim/LazyVim/commit/89ff1fd600bb6ff4cf2c9edbc2217a40ecb8d160))


### Bug Fixes

* **jdtls:** allow mason jdtls installation
([#6498](https://github.com/LazyVim/LazyVim/issues/6498))
([80990ec](https://github.com/LazyVim/LazyVim/commit/80990ec62fd36fc4b6b921a9041f55858e33e030))
* **jdtls:** bundle configuration bug fix
([#6499](https://github.com/LazyVim/LazyVim/issues/6499))
([c423765](https://github.com/LazyVim/LazyVim/commit/c4237659621e406089f4d13d32192954d52c4924))
* **keymaps:** enable snacks git keybindings
([#6323](https://github.com/LazyVim/LazyVim/issues/6323))
([720e06a](https://github.com/LazyVim/LazyVim/commit/720e06a908cbf6e3afb4eccc049d58df9ace770a))
* **lsp:** fix mason install/exclude. Closes
[#6504](https://github.com/LazyVim/LazyVim/issues/6504)
([37b1ec4](https://github.com/LazyVim/LazyVim/commit/37b1ec41ae57e8396d5c923a4bfdf7050215b4d6))
* **lsp:** fixup for when not using mason
([a90b565](https://github.com/LazyVim/LazyVim/commit/a90b56518f4f2291985952d79472d4f935c0bad0))
* **luasnip:** add missing optional tag to garymjr/nvim-snippets
([#5733](https://github.com/LazyVim/LazyVim/issues/5733))
([37a1c1a](https://github.com/LazyVim/LazyVim/commit/37a1c1af5dbbcf069bb94a71b4dda3626fbda77a))
* **vtsls:** fix and move denols/vtsls disambigutaion to typescript
extra. Fixes [#6476](https://github.com/LazyVim/LazyVim/issues/6476)
([775621a](https://github.com/LazyVim/LazyVim/commit/775621ac0af42486ef1cd4254d1a6625a190040b))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 19 +++++++++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index b25a6511..b0e2e610 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "15.2.0"
+  ".": "15.3.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21249147..5b8c6724 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## [15.3.0](https://github.com/LazyVim/LazyVim/compare/v15.2.0...v15.3.0) (2025-09-23)
+
+
+### Features
+
+* **copilot:** use `blink-copilot` as blink.cmp copilot source ([#5551](https://github.com/LazyVim/LazyVim/issues/5551)) ([13069f2](https://github.com/LazyVim/LazyVim/commit/13069f20183655d8a02f3acbd21d0ac4c9ce811c))
+* **treesitter:** show an error if the user tries to set a custom treesitter compiler ([89ff1fd](https://github.com/LazyVim/LazyVim/commit/89ff1fd600bb6ff4cf2c9edbc2217a40ecb8d160))
+
+
+### Bug Fixes
+
+* **jdtls:** allow mason jdtls installation ([#6498](https://github.com/LazyVim/LazyVim/issues/6498)) ([80990ec](https://github.com/LazyVim/LazyVim/commit/80990ec62fd36fc4b6b921a9041f55858e33e030))
+* **jdtls:** bundle configuration bug fix ([#6499](https://github.com/LazyVim/LazyVim/issues/6499)) ([c423765](https://github.com/LazyVim/LazyVim/commit/c4237659621e406089f4d13d32192954d52c4924))
+* **keymaps:** enable snacks git keybindings ([#6323](https://github.com/LazyVim/LazyVim/issues/6323)) ([720e06a](https://github.com/LazyVim/LazyVim/commit/720e06a908cbf6e3afb4eccc049d58df9ace770a))
+* **lsp:** fix mason install/exclude. Closes [#6504](https://github.com/LazyVim/LazyVim/issues/6504) ([37b1ec4](https://github.com/LazyVim/LazyVim/commit/37b1ec41ae57e8396d5c923a4bfdf7050215b4d6))
+* **lsp:** fixup for when not using mason ([a90b565](https://github.com/LazyVim/LazyVim/commit/a90b56518f4f2291985952d79472d4f935c0bad0))
+* **luasnip:** add missing optional tag to garymjr/nvim-snippets ([#5733](https://github.com/LazyVim/LazyVim/issues/5733)) ([37a1c1a](https://github.com/LazyVim/LazyVim/commit/37a1c1af5dbbcf069bb94a71b4dda3626fbda77a))
+* **vtsls:** fix and move denols/vtsls disambigutaion to typescript extra. Fixes [#6476](https://github.com/LazyVim/LazyVim/issues/6476) ([775621a](https://github.com/LazyVim/LazyVim/commit/775621ac0af42486ef1cd4254d1a6625a190040b))
+
 ## [15.2.0](https://github.com/LazyVim/LazyVim/compare/v15.1.1...v15.2.0) (2025-09-20)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index e85dbd63..1d288cd2 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "15.2.0" -- x-release-please-version
+M.version = "15.3.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 8a760984611cd9df0971a9f36a94838b9e32453f Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 23 Sep 2025 13:06:33 +0200
Subject: [PATCH 217/341] style(lsp): typo

---
 lua/lazyvim/plugins/lsp/init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index 35ff4505..2fe3ae97 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -187,7 +187,7 @@ 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)

From 5985ca0cf1a0c1ddee8b2b718c730f988cec7001 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 25 Sep 2025 07:35:59 +0200
Subject: [PATCH 218/341] fix(treesitter): create buffer-local textobjects
 keymaps only when available. Closes #6508

---
 lua/lazyvim/plugins/treesitter.lua | 74 +++++++++++++++++-------------
 1 file changed, 42 insertions(+), 32 deletions(-)

diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index 8ad15924..78f1b3b2 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -128,38 +128,19 @@ return {
     "nvim-treesitter/nvim-treesitter-textobjects",
     branch = "main",
     event = "VeryLazy",
-    opts = {},
-    keys = function()
-      local moves = {
-        goto_next_start = { ["]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" },
-        goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer", ["[A"] = "@parameter.inner" },
-      }
-      local ret = {} ---@type LazyKeysSpec[]
-      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,
+    opts = {
+      move = {
+        enable = true,
+        set_jumps = true, -- whether to set jumps in the jumplist
+        -- LazyVim extention to create buffer-local keymaps
+        keys = {
+          goto_next_start = { ["]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" },
+          goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer", ["[A"] = "@parameter.inner" },
+        },
+      },
+    },
     config = function(_, opts)
       local TS = require("nvim-treesitter-textobjects")
       if not TS.setup then
@@ -167,6 +148,35 @@ return {
         return
       end
       TS.setup(opts)
+
+      vim.api.nvim_create_autocmd("FileType", {
+        group = vim.api.nvim_create_augroup("lazyvim_treesitter_textobjects", { clear = true }),
+        callback = function(ev)
+          if not (vim.tbl_get(opts, "move", "enable") and LazyVim.treesitter.have(ev.match, "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 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")
+              if not (vim.wo.diff and key:find("[cC]")) then
+                vim.keymap.set({ "n", "x", "o" }, key, function()
+                  require("nvim-treesitter-textobjects.move")[method](query, "textobjects")
+                end, {
+                  buffer = ev.buf,
+                  desc = desc,
+                  silent = true,
+                })
+              end
+            end
+          end
+        end,
+      })
     end,
   },
 

From 1d404815f0600b841dcc0d19e0a2e46bb8156f6b Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Thu, 25 Sep 2025 05:37:13 +0000
Subject: [PATCH 219/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index dbeb4819..8e59c6cb 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim            Last change: 2025 September 23
+*LazyVim.txt*             For Neovim            Last change: 2025 September 25
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 3b0296358508da1eb258c8716df163dd04fa6449 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 25 Sep 2025 10:31:16 +0200
Subject: [PATCH 220/341] feat(copilot): added `copilot-native` extra to setup
 native inline completions in Neovim

---
 .../plugins/extras/ai/copilot-native.lua      | 49 +++++++++++++++++++
 lua/lazyvim/util/lualine.lua                  | 36 ++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 lua/lazyvim/plugins/extras/ai/copilot-native.lua

diff --git a/lua/lazyvim/plugins/extras/ai/copilot-native.lua b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
new file mode 100644
index 00000000..8bcb9bfe
--- /dev/null
+++ b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
@@ -0,0 +1,49 @@
+---@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 not vim.lsp.inline_completion 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
+
+return {
+  desc = "Native Copilot LSP integration. Requires Neovim >= 0.12",
+  -- copilot-language-server
+  {
+    "neovim/nvim-lspconfig",
+    opts = {
+      servers = {
+        copilot = {},
+      },
+      setup = {
+        copilot = function(_, opts)
+          vim.lsp.inline_completion.enable()
+          LazyVim.cmp.actions.ai_accept = function()
+            return vim.lsp.inline_completion.get()
+          end
+        end,
+      },
+    },
+  },
+
+  -- lualine
+  {
+    "nvim-lualine/lualine.nvim",
+    optional = true,
+    event = "VeryLazy",
+    opts = function(_, opts)
+      table.insert(opts.sections.lualine_x, 2, LazyVim.lualine.lsp("copilot"))
+    end,
+  },
+}
diff --git a/lua/lazyvim/util/lualine.lua b/lua/lazyvim/util/lualine.lua
index a6aa24f3..af4b55f7 100644
--- a/lua/lazyvim/util/lualine.lua
+++ b/lua/lazyvim/util/lualine.lua
@@ -22,6 +22,42 @@ function M.status(icon, status)
   }
 end
 
+--- Status indicator for LSP server activity
+---@param server string
+---@param opts? { methods?: string[], icon?: string }
+function M.lsp(server, opts)
+  opts = opts or {}
+  local methods = opts.methods or { "textDocument/completion", "textDocument/inlineCompletion" }
+  local pending = {} ---@type table<number,true>
+  vim.api.nvim_create_autocmd("LspRequest", {
+    group = vim.api.nvim_create_augroup("lazyvim.lualine.lsp." .. server, { clear = true }),
+    callback = function(args)
+      ---@class LspRequestData
+      ---@field client_id number
+      ---@field request { bufnr: number, method: string, type: "pending" | "cancel" | "complete" | string }
+      ---@field request_id number
+      local data = args.data
+      local client = vim.lsp.get_client_by_id(data.client_id)
+      if client and client.name == server and vim.tbl_contains(methods, data.request.method) then
+        pending[data.request_id] = data.request.type == "pending" or nil
+      end
+    end,
+  })
+  return {
+    function()
+      return opts.icon
+        or LazyVim.config.icons.kinds[server:sub(1, 1):upper() .. server:sub(2)]
+        or LazyVim.config.icons.diagnostics.Hint
+    end,
+    cond = function()
+      return #vim.lsp.get_clients({ name = server, bufnr = 0 }) > 0
+    end,
+    color = function()
+      return { fg = Snacks.util.color(vim.tbl_isempty(pending) and "Special" or "DiagnosticWarn") }
+    end,
+  }
+end
+
 ---@param name string
 ---@param icon? string
 function M.cmp_source(name, icon)

From 9913e1665d783d9c4407633bc33475d403aff433 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 25 Sep 2025 11:11:40 +0200
Subject: [PATCH 221/341] feat(copilot-native): better lualine status

---
 .../plugins/extras/ai/copilot-native.lua      | 26 ++++++++++++--
 lua/lazyvim/util/lualine.lua                  | 36 -------------------
 2 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ai/copilot-native.lua b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
index 8bcb9bfe..85cd0d30 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot-native.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
@@ -16,6 +16,7 @@ if LazyVim.has_extra("ai.copilot-native") then
 end
 
 vim.g.ai_cmp = false
+local status = {} ---@type table<number, "ok" | "error" | "pending">
 
 return {
   desc = "Native Copilot LSP integration. Requires Neovim >= 0.12",
@@ -24,10 +25,22 @@ return {
     "neovim/nvim-lspconfig",
     opts = {
       servers = {
-        copilot = {},
+        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,
+          },
+        },
       },
       setup = {
-        copilot = function(_, opts)
+        copilot = function()
           vim.lsp.inline_completion.enable()
           LazyVim.cmp.actions.ai_accept = function()
             return vim.lsp.inline_completion.get()
@@ -43,7 +56,14 @@ return {
     optional = true,
     event = "VeryLazy",
     opts = function(_, opts)
-      table.insert(opts.sections.lualine_x, 2, LazyVim.lualine.lsp("copilot"))
+      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,
   },
 }
diff --git a/lua/lazyvim/util/lualine.lua b/lua/lazyvim/util/lualine.lua
index af4b55f7..a6aa24f3 100644
--- a/lua/lazyvim/util/lualine.lua
+++ b/lua/lazyvim/util/lualine.lua
@@ -22,42 +22,6 @@ function M.status(icon, status)
   }
 end
 
---- Status indicator for LSP server activity
----@param server string
----@param opts? { methods?: string[], icon?: string }
-function M.lsp(server, opts)
-  opts = opts or {}
-  local methods = opts.methods or { "textDocument/completion", "textDocument/inlineCompletion" }
-  local pending = {} ---@type table<number,true>
-  vim.api.nvim_create_autocmd("LspRequest", {
-    group = vim.api.nvim_create_augroup("lazyvim.lualine.lsp." .. server, { clear = true }),
-    callback = function(args)
-      ---@class LspRequestData
-      ---@field client_id number
-      ---@field request { bufnr: number, method: string, type: "pending" | "cancel" | "complete" | string }
-      ---@field request_id number
-      local data = args.data
-      local client = vim.lsp.get_client_by_id(data.client_id)
-      if client and client.name == server and vim.tbl_contains(methods, data.request.method) then
-        pending[data.request_id] = data.request.type == "pending" or nil
-      end
-    end,
-  })
-  return {
-    function()
-      return opts.icon
-        or LazyVim.config.icons.kinds[server:sub(1, 1):upper() .. server:sub(2)]
-        or LazyVim.config.icons.diagnostics.Hint
-    end,
-    cond = function()
-      return #vim.lsp.get_clients({ name = server, bufnr = 0 }) > 0
-    end,
-    color = function()
-      return { fg = Snacks.util.color(vim.tbl_isempty(pending) and "Special" or "DiagnosticWarn") }
-    end,
-  }
-end
-
 ---@param name string
 ---@param icon? string
 function M.cmp_source(name, icon)

From 6bd630cec6f905665691d593dc5d0fb3d54f560c Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 25 Sep 2025 12:30:50 +0200
Subject: [PATCH 222/341] feat(copilot-native): added keymaps to cycle
 suggestions

---
 lua/lazyvim/plugins/extras/ai/copilot-native.lua | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/ai/copilot-native.lua b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
index 85cd0d30..a4c8005b 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot-native.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
@@ -37,6 +37,21 @@ return {
               end
             end,
           },
+          -- 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 = "Next Copilot Suggestion",
+              mode = { "i", "n" },
+            },
+          },
         },
       },
       setup = {

From c83df9e68dd41f5a3f7df5a7048169ee286a7da8 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 25 Sep 2025 15:30:28 +0200
Subject: [PATCH 223/341] feat(copilot-native): added experimental support for
 next edit suggestions. check the docs to enable

---
 lua/lazyvim/config/keymaps.lua                |  1 +
 .../plugins/extras/ai/copilot-native.lua      | 68 ++++++++++++++++++-
 lua/lazyvim/util/cmp.lua                      |  1 +
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/config/keymaps.lua b/lua/lazyvim/config/keymaps.lua
index 938a2333..752aa602 100644
--- a/lua/lazyvim/config/keymaps.lua
+++ b/lua/lazyvim/config/keymaps.lua
@@ -49,6 +49,7 @@ map("n", "<leader>bD", "<cmd>:bd<cr>", { desc = "Delete Buffer and Window" })
 map({ "i", "n", "s" }, "<esc>", function()
   vim.cmd("noh")
   LazyVim.cmp.actions.snippet_stop()
+  LazyVim.cmp.actions.ai_stop()
   return "<esc>"
 end, { expr = true, desc = "Escape and Clear hlsearch" })
 
diff --git a/lua/lazyvim/plugins/extras/ai/copilot-native.lua b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
index a4c8005b..b4a61b20 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot-native.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
@@ -2,6 +2,9 @@
 if lazyvim_docs then
   -- Native inline completions don't support being shown as regular completions
   vim.g.ai_cmp = false
+
+  -- Set to `true` in your `options.lua` to enable experimental support for Next Edit Suggestions
+  vim.g.copilot_nes = false
 end
 
 if LazyVim.has_extra("ai.copilot-native") then
@@ -57,8 +60,41 @@ return {
       setup = {
         copilot = function()
           vim.lsp.inline_completion.enable()
+
+          -- Only trigger NES updates:
+          -- * when leaving insert mode
+          -- * when text is changed (in normal mode)
+          -- * when accepting a next edit suggestion
+          local nes_update = Snacks.util.debounce(function()
+            return vim.g.copilot_nes and require("copilot-lsp.nes").request_nes("copilot")
+          end, { ms = 100 })
+
+          vim.api.nvim_create_autocmd({ "InsertLeave", "TextChanged" }, {
+            group = vim.api.nvim_create_augroup("lazyvim.copilot-native.complete", { clear = true }),
+            callback = nes_update,
+          })
+
+          -- Accept inline suggestions or next edits
           LazyVim.cmp.actions.ai_accept = function()
-            return vim.lsp.inline_completion.get()
+            if vim.b.nes_state then
+              local nes = require("copilot-lsp.nes")
+
+              -- Try to jump to the start of the suggestion edit.
+              if nes.walk_cursor_start_edit() then
+                return true
+              end
+
+              -- apply the pending suggestion and jump to the end of the edit.
+              if nes.apply_pending_nes() then
+                nes.walk_cursor_end_edit()
+                nes_update() -- trigger new nes update after accept
+                return true
+              end
+            end
+            if vim.lsp.inline_completion.get() then
+              -- nes_update() -- ensure nes update is triggered after inline completion
+              return true
+            end
           end
         end,
       },
@@ -81,4 +117,34 @@ return {
       )
     end,
   },
+
+  vim.g.copilot_nes
+      and {
+        "copilotlsp-nvim/copilot-lsp",
+        init = function()
+          vim.api.nvim_create_autocmd("BufEnter", {
+            callback = function(ev)
+              local buf = ev.buf
+              local client = vim.lsp.get_clients({ name = "copilot", bufnr = buf })[1]
+              if not client then
+                return
+              end
+              client:notify("textDocument/didFocus", {
+                textDocument = {
+                  uri = vim.uri_from_bufnr(buf),
+                },
+              })
+            end,
+          })
+
+          LazyVim.cmp.actions.ai_stop = function()
+            require("copilot-lsp.nes").clear()
+          end
+        end,
+        keys = {
+          -- nes is also useful in normal mode
+          { "<tab>", LazyVim.cmp.map({ "ai_accept" }, "<tab>"), mode = { "n" }, expr = true },
+        },
+      }
+    or nil,
 }
diff --git a/lua/lazyvim/util/cmp.lua b/lua/lazyvim/util/cmp.lua
index 0641c892..2637b0d3 100644
--- a/lua/lazyvim/util/cmp.lua
+++ b/lua/lazyvim/util/cmp.lua
@@ -18,6 +18,7 @@ M.actions = {
       vim.snippet.stop()
     end
   end,
+  ai_stop = function() end,
 }
 
 ---@param actions string[]

From af6e2505b54270c30145e8f4191b865870537287 Mon Sep 17 00:00:00 2001
From: robin <comfysage@isabelroses.com>
Date: Fri, 26 Sep 2025 06:36:14 +0200
Subject: [PATCH 224/341] fix(catppuccin): follow-up on api change (#6505)

## Description

https://github.com/catppuccin/nvim/pull/931 will change the api for
accessing the bufferline integration. im making this follow up pr so it
wont have to be done through a user :)
(sorry about https://github.com/LazyVim/LazyVim/pull/6354)

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/colorscheme.lua | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/lua/lazyvim/plugins/colorscheme.lua b/lua/lazyvim/plugins/colorscheme.lua
index 4c41d492..0e19c87f 100644
--- a/lua/lazyvim/plugins/colorscheme.lua
+++ b/lua/lazyvim/plugins/colorscheme.lua
@@ -13,6 +13,14 @@ return {
     lazy = true,
     name = "catppuccin",
     opts = {
+      lsp_styles = {
+        underlines = {
+          errors = { "undercurl" },
+          hints = { "undercurl" },
+          warnings = { "undercurl" },
+          information = { "undercurl" },
+        },
+      },
       integrations = {
         aerial = true,
         alpha = true,
@@ -28,26 +36,14 @@ 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,
       },
@@ -58,7 +54,7 @@ return {
         optional = true,
         opts = function(_, opts)
           if (vim.g.colors_name or ""):find("catppuccin") then
-            opts.highlights = require("catppuccin.groups.integrations.bufferline").get_theme()
+            opts.highlights = require("catppuccin.special.bufferline").get_theme()
           end
         end,
       },

From c467282a8352d9ec067b07a00463d850bb4146b3 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Fri, 26 Sep 2025 04:37:07 +0000
Subject: [PATCH 225/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 8e59c6cb..8d0a76e9 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim            Last change: 2025 September 25
+*LazyVim.txt*             For Neovim            Last change: 2025 September 26
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From ed637bb0f7f418de069a4d5a7ed8a7b3b93eb425 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Fri, 26 Sep 2025 12:14:33 +0200
Subject: [PATCH 226/341] feat(copilot-native): removed experimental **nes**
 support with `copilot_lsp` for now, since it's not the best experience right
 now

---
 .../plugins/extras/ai/copilot-native.lua      | 61 -------------------
 1 file changed, 61 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ai/copilot-native.lua b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
index b4a61b20..71a6a3ae 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot-native.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
@@ -2,9 +2,6 @@
 if lazyvim_docs then
   -- Native inline completions don't support being shown as regular completions
   vim.g.ai_cmp = false
-
-  -- Set to `true` in your `options.lua` to enable experimental support for Next Edit Suggestions
-  vim.g.copilot_nes = false
 end
 
 if LazyVim.has_extra("ai.copilot-native") then
@@ -61,36 +58,8 @@ return {
         copilot = function()
           vim.lsp.inline_completion.enable()
 
-          -- Only trigger NES updates:
-          -- * when leaving insert mode
-          -- * when text is changed (in normal mode)
-          -- * when accepting a next edit suggestion
-          local nes_update = Snacks.util.debounce(function()
-            return vim.g.copilot_nes and require("copilot-lsp.nes").request_nes("copilot")
-          end, { ms = 100 })
-
-          vim.api.nvim_create_autocmd({ "InsertLeave", "TextChanged" }, {
-            group = vim.api.nvim_create_augroup("lazyvim.copilot-native.complete", { clear = true }),
-            callback = nes_update,
-          })
-
           -- Accept inline suggestions or next edits
           LazyVim.cmp.actions.ai_accept = function()
-            if vim.b.nes_state then
-              local nes = require("copilot-lsp.nes")
-
-              -- Try to jump to the start of the suggestion edit.
-              if nes.walk_cursor_start_edit() then
-                return true
-              end
-
-              -- apply the pending suggestion and jump to the end of the edit.
-              if nes.apply_pending_nes() then
-                nes.walk_cursor_end_edit()
-                nes_update() -- trigger new nes update after accept
-                return true
-              end
-            end
             if vim.lsp.inline_completion.get() then
               -- nes_update() -- ensure nes update is triggered after inline completion
               return true
@@ -117,34 +86,4 @@ return {
       )
     end,
   },
-
-  vim.g.copilot_nes
-      and {
-        "copilotlsp-nvim/copilot-lsp",
-        init = function()
-          vim.api.nvim_create_autocmd("BufEnter", {
-            callback = function(ev)
-              local buf = ev.buf
-              local client = vim.lsp.get_clients({ name = "copilot", bufnr = buf })[1]
-              if not client then
-                return
-              end
-              client:notify("textDocument/didFocus", {
-                textDocument = {
-                  uri = vim.uri_from_bufnr(buf),
-                },
-              })
-            end,
-          })
-
-          LazyVim.cmp.actions.ai_stop = function()
-            require("copilot-lsp.nes").clear()
-          end
-        end,
-        keys = {
-          -- nes is also useful in normal mode
-          { "<tab>", LazyVim.cmp.map({ "ai_accept" }, "<tab>"), mode = { "n" }, expr = true },
-        },
-      }
-    or nil,
 }

From 92b7fcf7b156600b86952bf6f2c777adc68fd0b8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 26 Sep 2025 12:16:12 +0200
Subject: [PATCH 227/341] chore(main): release 15.4.0 (#6515)

:robot: I have created a release *beep* *boop*
---


##
[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))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 17 +++++++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index b0e2e610..8a820181 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "15.3.0"
+  ".": "15.4.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b8c6724..abe4b7c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [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)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 1d288cd2..39c719cf 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "15.3.0" -- x-release-please-version
+M.version = "15.4.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From e9bc6074d1ea69e921a6195d1dc34333eaa310f8 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Fri, 26 Sep 2025 15:55:32 +0200
Subject: [PATCH 228/341] fix(ai.copilot): disable copilot lsp if installed.
 copilot.lua needs its own version of the LSP

---
 lua/lazyvim/plugins/extras/ai/copilot.lua | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/ai/copilot.lua b/lua/lazyvim/plugins/extras/ai/copilot.lua
index 7c326499..3b5d2275 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot.lua
@@ -25,6 +25,17 @@ 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",

From b25ea9c153e76d11579731e1d5529f275a36f91d Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Fri, 26 Sep 2025 15:56:03 +0200
Subject: [PATCH 229/341] feat(ai.copilot-native): let sidekick.nvim handle
 some things if available

---
 .../plugins/extras/ai/copilot-native.lua      | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ai/copilot-native.lua b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
index 71a6a3ae..310fbd81 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot-native.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
@@ -26,17 +26,6 @@ return {
     opts = {
       servers = {
         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,
-          },
           -- stylua: ignore
           keys = {
             {
@@ -57,13 +46,25 @@ return {
       setup = {
         copilot = function()
           vim.lsp.inline_completion.enable()
-
           -- Accept inline suggestions or next edits
           LazyVim.cmp.actions.ai_accept = function()
-            if vim.lsp.inline_completion.get() then
-              -- nes_update() -- ensure nes update is triggered after inline completion
-              return true
-            end
+            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,
       },
@@ -76,6 +77,9 @@ return {
     optional = true,
     event = "VeryLazy",
     opts = function(_, opts)
+      if LazyVim.has_extra("ai.sidekick") then
+        return
+      end
       table.insert(
         opts.sections.lualine_x,
         2,

From 30a325d67184a80006dc55352d9663cdf01082d5 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Fri, 26 Sep 2025 15:57:00 +0200
Subject: [PATCH 230/341] feat(ai): added completion hooks for next edit
 suggestions

---
 lua/lazyvim/config/keymaps.lua                 | 1 -
 lua/lazyvim/plugins/extras/coding/blink.lua    | 4 ++--
 lua/lazyvim/plugins/extras/coding/nvim-cmp.lua | 2 +-
 lua/lazyvim/util/cmp.lua                       | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lua/lazyvim/config/keymaps.lua b/lua/lazyvim/config/keymaps.lua
index 752aa602..938a2333 100644
--- a/lua/lazyvim/config/keymaps.lua
+++ b/lua/lazyvim/config/keymaps.lua
@@ -49,7 +49,6 @@ map("n", "<leader>bD", "<cmd>:bd<cr>", { desc = "Delete Buffer and Window" })
 map({ "i", "n", "s" }, "<esc>", function()
   vim.cmd("noh")
   LazyVim.cmp.actions.snippet_stop()
-  LazyVim.cmp.actions.ai_stop()
   return "<esc>"
 end, { expr = true, desc = "Escape and Clear hlsearch" })
 
diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua
index 207b1940..790808b1 100644
--- a/lua/lazyvim/plugins/extras/coding/blink.lua
+++ b/lua/lazyvim/plugins/extras/coding/blink.lua
@@ -122,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_accept" }),
+            LazyVim.cmp.map({ "snippet_forward", "ai_nes", "ai_accept" }),
             "fallback",
           }
         else -- other presets
           opts.keymap["<Tab>"] = {
-            LazyVim.cmp.map({ "snippet_forward", "ai_accept" }),
+            LazyVim.cmp.map({ "snippet_forward", "ai_nes", "ai_accept" }),
             "fallback",
           }
         end
diff --git a/lua/lazyvim/plugins/extras/coding/nvim-cmp.lua b/lua/lazyvim/plugins/extras/coding/nvim-cmp.lua
index 54bfbf7c..fab56250 100644
--- a/lua/lazyvim/plugins/extras/coding/nvim-cmp.lua
+++ b/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_accept" }, fallback)()
+            return LazyVim.cmp.map({ "snippet_forward", "ai_nes", "ai_accept" }, fallback)()
           end,
         }),
         sources = cmp.config.sources({
diff --git a/lua/lazyvim/util/cmp.lua b/lua/lazyvim/util/cmp.lua
index 2637b0d3..0641c892 100644
--- a/lua/lazyvim/util/cmp.lua
+++ b/lua/lazyvim/util/cmp.lua
@@ -18,7 +18,6 @@ M.actions = {
       vim.snippet.stop()
     end
   end,
-  ai_stop = function() end,
 }
 
 ---@param actions string[]

From dbfe20996ce62d6b0048245ab4e304610548da04 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sat, 27 Sep 2025 18:41:34 +0200
Subject: [PATCH 231/341] feat(extras): added extra for `sidekick.nvim`
 (Copilot LSP integration)

---
 lua/lazyvim/plugins/extras/ai/sidekick.lua | 49 ++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 lua/lazyvim/plugins/extras/ai/sidekick.lua

diff --git a/lua/lazyvim/plugins/extras/ai/sidekick.lua b/lua/lazyvim/plugins/extras/ai/sidekick.lua
new file mode 100644
index 00000000..54974b6e
--- /dev/null
+++ b/lua/lazyvim/plugins/extras/ai/sidekick.lua
@@ -0,0 +1,49 @@
+return {
+  desc = "Next edit suggestions with the Copilot LSP server",
+
+  -- copilot-language-server
+  {
+    "neovim/nvim-lspconfig",
+    opts = {
+      servers = {
+        copilot = {},
+      },
+    },
+  },
+
+  -- lualine
+  {
+    "nvim-lualine/lualine.nvim",
+    optional = true,
+    event = "VeryLazy",
+    opts = function(_, opts)
+      table.insert(
+        opts.sections.lualine_x,
+        2,
+        LazyVim.lualine.status(LazyVim.config.icons.kinds.Copilot, function()
+          local status = require("sidekick.status").get()
+          if status then
+            return status.kind == "Error" and "error" or status.busy and "pending" or "ok"
+          end
+        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
+    end,
+    keys = {
+      -- nes is also useful in normal mode
+      { "<tab>", LazyVim.cmp.map({ "ai_nes" }, "<tab>"), mode = { "n" }, expr = true },
+    },
+  },
+}

From eee364552e8afb893f4b3f47b9c0582ca390878b Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Sat, 27 Sep 2025 16:42:47 +0000
Subject: [PATCH 232/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 8d0a76e9..a071f54a 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim            Last change: 2025 September 26
+*LazyVim.txt*             For Neovim            Last change: 2025 September 27
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 060e6dfaf7d4157b1a144df7d83179640dc52400 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 27 Sep 2025 18:54:19 +0200
Subject: [PATCH 233/341] chore(main): release 15.5.0 (#6533)

:robot: I have created a release *beep* *boop*
---


##
[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))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 14 ++++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 8a820181..46b8d23f 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "15.4.0"
+  ".": "15.5.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index abe4b7c0..1be2a770 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [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)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 39c719cf..fde5e4a6 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "15.4.0" -- x-release-please-version
+M.version = "15.5.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From b8899781516da71ba0f63afa93fb4a6b25dff144 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sat, 27 Sep 2025 19:53:14 +0200
Subject: [PATCH 234/341] feat(sidekick): fancier lualine component

---
 lua/lazyvim/plugins/extras/ai/sidekick.lua | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ai/sidekick.lua b/lua/lazyvim/plugins/extras/ai/sidekick.lua
index 54974b6e..574938f7 100644
--- a/lua/lazyvim/plugins/extras/ai/sidekick.lua
+++ b/lua/lazyvim/plugins/extras/ai/sidekick.lua
@@ -17,16 +17,26 @@ return {
     optional = true,
     event = "VeryLazy",
     opts = function(_, opts)
-      table.insert(
-        opts.sections.lualine_x,
-        2,
-        LazyVim.lualine.status(LazyVim.config.icons.kinds.Copilot, function()
+      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()
-          if status then
-            return status.kind == "Error" and "error" or status.busy and "pending" or "ok"
-          end
-        end)
-      )
+          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,
+      })
     end,
   },
 

From 5d18a46b6a7bb5b946a6c87b9a45a2738c9ec9c3 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 29 Sep 2025 23:12:20 +0200
Subject: [PATCH 235/341] feat(sidekick): added keymaps to work with AI cli
 tools

---
 lua/lazyvim/plugins/extras/ai/sidekick.lua | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/ai/sidekick.lua b/lua/lazyvim/plugins/extras/ai/sidekick.lua
index 574938f7..fbb9e446 100644
--- a/lua/lazyvim/plugins/extras/ai/sidekick.lua
+++ b/lua/lazyvim/plugins/extras/ai/sidekick.lua
@@ -54,6 +54,39 @@ return {
     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" } },
+      {
+        "<leader>aa",
+        function()
+          require("sidekick.cli").toggle()
+        end,
+        mode = { "n" },
+        desc = "Sidekick Toggle",
+      },
+      {
+        "<leader>as",
+        function()
+          require("sidekick.cli").select_tool()
+        end,
+        mode = { "n" },
+        desc = "Sidekick Select Tool",
+      },
+      {
+        "<c-.>",
+        function()
+          require("sidekick.cli").focus()
+        end,
+        mode = { "n", "x", "i", "t" },
+        desc = "Sidekick Switch Focus",
+      },
+      {
+        "<leader>ap",
+        function()
+          require("sidekick.cli").select_prompt()
+        end,
+        desc = "Sidekick Ask Prompt",
+        mode = { "n", "v" },
+      },
     },
   },
 }

From 44e37974164f52f718531ece7901f32f69a626e7 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Mon, 29 Sep 2025 21:13:28 +0000
Subject: [PATCH 236/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index a071f54a..cb52ac56 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim            Last change: 2025 September 27
+*LazyVim.txt*             For Neovim            Last change: 2025 September 29
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 3d3739b4b8943b5e7143d37f60bb0adbb6cf82f3 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 30 Sep 2025 00:03:40 +0200
Subject: [PATCH 237/341] fix(sidekick): changed keymap to open new tool

---
 lua/lazyvim/plugins/extras/ai/sidekick.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ai/sidekick.lua b/lua/lazyvim/plugins/extras/ai/sidekick.lua
index fbb9e446..5af64c63 100644
--- a/lua/lazyvim/plugins/extras/ai/sidekick.lua
+++ b/lua/lazyvim/plugins/extras/ai/sidekick.lua
@@ -64,12 +64,12 @@ return {
         desc = "Sidekick Toggle",
       },
       {
-        "<leader>as",
+        "<leader>an",
         function()
           require("sidekick.cli").select_tool()
         end,
         mode = { "n" },
-        desc = "Sidekick Select Tool",
+        desc = "Sidekick New Tool",
       },
       {
         "<c-.>",

From 089d0a5ac1ab85238804e017ac1ef0dc0a8341f0 Mon Sep 17 00:00:00 2001
From: Jonathan Pollak <tofu.hawks@gmail.com>
Date: Tue, 30 Sep 2025 07:48:46 +0300
Subject: [PATCH 238/341] fix(copilot-native): change  Copilot-native's `<M-[>`
 description to "Prev Suggestion" (#6553)

## Description

<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->
The description for both `<M-]>` and `<M-[>` in the `copilot-native`
extra are described as `Next Copilot Suggestion`. The PR changes the
description of `<M-[>` to be `Prev Copilot Suggestion`

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/ai/copilot-native.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/ai/copilot-native.lua b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
index 310fbd81..5b936885 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot-native.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
@@ -37,7 +37,7 @@ return {
             {
               "<M-[>",
               function() vim.lsp.inline_completion.select({ count = -1 }) end,
-              desc = "Next Copilot Suggestion",
+              desc = "Prev Copilot Suggestion",
               mode = { "i", "n" },
             },
           },

From aa8115848dd6a823162150f6170401a77a0f9262 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Tue, 30 Sep 2025 04:49:39 +0000
Subject: [PATCH 239/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index cb52ac56..f4206577 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim            Last change: 2025 September 29
+*LazyVim.txt*             For Neovim            Last change: 2025 September 30
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 22851dce979c4cac379c6795ca7885c83c1c7eaf Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 30 Sep 2025 15:42:15 +0200
Subject: [PATCH 240/341] fix(config): clipboard:get()

---
 lua/lazyvim/config/init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index fde5e4a6..96aa3246 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -335,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
+  lazy_clipboard = vim.opt.clipboard:get()
   vim.opt.clipboard = ""
 
   if vim.g.deprecation_warnings == false then

From 4ebcd611b2c81de9badba26146ee86ed4020cee5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 30 Sep 2025 16:43:00 +0200
Subject: [PATCH 241/341] chore(main): release 15.6.0 (#6536)

:robot: I have created a release *beep* *boop*
---


##
[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))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 15 +++++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 46b8d23f..e40520b5 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "15.5.0"
+  ".": "15.6.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1be2a770..48d578c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [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)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 96aa3246..4c04eb36 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "15.5.0" -- x-release-please-version
+M.version = "15.6.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 2f76d572a2b172e5e7e236d3e972443242c36b66 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 30 Sep 2025 18:10:36 +0200
Subject: [PATCH 242/341] fix(stylua): stylua is now also an LSP. Disable it
 since we use the CLI tool.

---
 lua/lazyvim/plugins/lsp/init.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index 2fe3ae97..5d93c399 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -71,6 +71,7 @@ return {
         ---@alias lazyvim.lsp.Config vim.lsp.Config|{mason?:boolean, enabled?:boolean}
         ---@type table<string, lazyvim.lsp.Config|boolean>
         servers = {
+          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

From 23b1da170f6367fafe0be47b9c141770ed75a78e Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 1 Oct 2025 19:04:14 +0200
Subject: [PATCH 243/341] fix(copilot-native): schedule
 inline_completion.enable

---
 lua/lazyvim/plugins/extras/ai/copilot-native.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/ai/copilot-native.lua b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
index 5b936885..a93e077a 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot-native.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
@@ -45,7 +45,9 @@ return {
       },
       setup = {
         copilot = function()
-          vim.lsp.inline_completion.enable()
+          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()

From 2df7988b1e9abcc2e3a882c38ea96b4da8b6edec Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Wed, 1 Oct 2025 17:05:13 +0000
Subject: [PATCH 244/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index f4206577..2b34a330 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim            Last change: 2025 September 30
+*LazyVim.txt*              For Neovim             Last change: 2025 October 01
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From aabc03f88d30b0424926d9d894adc5c91eb84ec2 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 1 Oct 2025 19:05:47 +0200
Subject: [PATCH 245/341] fix(sidekick): better keymaps

---
 lua/lazyvim/plugins/extras/ai/sidekick.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ai/sidekick.lua b/lua/lazyvim/plugins/extras/ai/sidekick.lua
index 5af64c63..ba8a3368 100644
--- a/lua/lazyvim/plugins/extras/ai/sidekick.lua
+++ b/lua/lazyvim/plugins/extras/ai/sidekick.lua
@@ -64,12 +64,12 @@ return {
         desc = "Sidekick Toggle",
       },
       {
-        "<leader>an",
+        "<leader>as",
         function()
-          require("sidekick.cli").select_tool()
+          require("sidekick.cli").select()
         end,
         mode = { "n" },
-        desc = "Sidekick New Tool",
+        desc = "Sidekick Select",
       },
       {
         "<c-.>",
@@ -82,9 +82,9 @@ return {
       {
         "<leader>ap",
         function()
-          require("sidekick.cli").select_prompt()
+          require("sidekick.cli").prompt()
         end,
-        desc = "Sidekick Ask Prompt",
+        desc = "Sidekick Prompt",
         mode = { "n", "v" },
       },
     },

From 2942bd4a0d738d693af51354e96aa7be5407d105 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 1 Oct 2025 22:18:05 +0200
Subject: [PATCH 246/341] feat(sidekick): updated keymaps for sidekick

---
 lua/lazyvim/plugins/extras/ai/sidekick.lua | 36 ++++++++++------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ai/sidekick.lua b/lua/lazyvim/plugins/extras/ai/sidekick.lua
index ba8a3368..e8e88c26 100644
--- a/lua/lazyvim/plugins/extras/ai/sidekick.lua
+++ b/lua/lazyvim/plugins/extras/ai/sidekick.lua
@@ -51,42 +51,40 @@ return {
         end
       end
     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" } },
       {
         "<leader>aa",
-        function()
-          require("sidekick.cli").toggle()
-        end,
-        mode = { "n" },
-        desc = "Sidekick Toggle",
+        function() require("sidekick.cli").toggle() end,
+        desc = "Sidekick Toggle CLI",
       },
       {
         "<leader>as",
-        function()
-          require("sidekick.cli").select()
-        end,
+        function() require("sidekick.cli").select() end,
         mode = { "n" },
-        desc = "Sidekick Select",
+        desc = "Sidekick Select CLI",
       },
       {
-        "<c-.>",
-        function()
-          require("sidekick.cli").focus()
-        end,
-        mode = { "n", "x", "i", "t" },
-        desc = "Sidekick Switch Focus",
+        "<leader>as",
+        function() require("sidekick.cli").send() end,
+        mode = { "v" },
+        desc = "Sidekick Send Visual Selection",
       },
       {
         "<leader>ap",
-        function()
-          require("sidekick.cli").prompt()
-        end,
-        desc = "Sidekick Prompt",
+        function() require("sidekick.cli").prompt() end,
+        desc = "Sidekick Select Prompt",
         mode = { "n", "v" },
       },
+      {
+        "<c-.>",
+        function() require("sidekick.cli").focus() end,
+        mode = { "n", "x", "i", "t" },
+        desc = "Sidekick Switch Focus",
+      },
     },
   },
 }

From fab399c90d10b5000dd19489a40d856fe3312edc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 07:22:59 +0200
Subject: [PATCH 247/341] chore(main): release 15.7.0 (#6556)

:robot: I have created a release *beep* *boop*
---


##
[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))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 14 ++++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index e40520b5..a54c61a0 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "15.6.0"
+  ".": "15.7.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48d578c9..92842c17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [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)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 4c04eb36..5a60a575 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "15.6.0" -- x-release-please-version
+M.version = "15.7.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 7fb57a7081b1647c4a92058ccae0a71b28d0b3c0 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Thu, 2 Oct 2025 05:24:03 +0000
Subject: [PATCH 248/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 2b34a330..091b0880 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 October 01
+*LazyVim.txt*              For Neovim             Last change: 2025 October 02
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 188b2886147acb4d9e2a5c8ae7b73770fd66a92c Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 2 Oct 2025 19:14:51 +0200
Subject: [PATCH 249/341] fix(sidekick): better keymaps

---
 lua/lazyvim/plugins/extras/ai/sidekick.lua | 27 ++++++++++++++++------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ai/sidekick.lua b/lua/lazyvim/plugins/extras/ai/sidekick.lua
index e8e88c26..6e80ba47 100644
--- a/lua/lazyvim/plugins/extras/ai/sidekick.lua
+++ b/lua/lazyvim/plugins/extras/ai/sidekick.lua
@@ -64,20 +64,27 @@ return {
       {
         "<leader>as",
         function() require("sidekick.cli").select() end,
-        mode = { "n" },
-        desc = "Sidekick Select CLI",
+        -- Or to select only installed tools:
+        -- require("sidekick.cli").select({ filter = { installed = true } })
+        desc = "Select CLI",
       },
       {
-        "<leader>as",
-        function() require("sidekick.cli").send() end,
-        mode = { "v" },
-        desc = "Sidekick Send Visual Selection",
+        "<leader>at",
+        function() require("sidekick.cli").send({ msg = "{this}" }) end,
+        mode = { "x", "n" },
+        desc = "Send This",
+      },
+      {
+        "<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",
-        mode = { "n", "v" },
       },
       {
         "<c-.>",
@@ -85,6 +92,12 @@ return {
         mode = { "n", "x", "i", "t" },
         desc = "Sidekick Switch Focus",
       },
+      -- Example of a keybinding to open Claude directly
+      {
+        "<leader>ac",
+        function() require("sidekick.cli").toggle({ name = "claude", focus = true }) end,
+        desc = "Sidekick Claude Toggle",
+      },
     },
   },
 }

From dc1ffa5bcb66f46284f91a8593dda5c7c54a1824 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:18:17 +0200
Subject: [PATCH 250/341] chore(main): release 15.7.1 (#6575)

:robot: I have created a release *beep* *boop*
---


##
[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))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 CHANGELOG.md                          | 7 +++++++
 lua/lazyvim/config/init.lua           | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index a54c61a0..6cc4959a 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "15.7.0"
+  ".": "15.7.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92842c17..1c7935c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [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)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 5a60a575..233328d5 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "15.7.0" -- x-release-please-version
+M.version = "15.7.1" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From b9d38f692015fecaa72d55282b74a3d601e4c9fa Mon Sep 17 00:00:00 2001
From: "Md. Iftakhar Awal Chowdhury"
 <42291930+AtifChy@users.noreply.github.com>
Date: Fri, 3 Oct 2025 00:52:41 +0600
Subject: [PATCH 251/341] fix(keymaps): update deprecated diagnostic keymap to
 latest api change (#6574)

## Description

refectors deprecated `diagnostic_goto` calls to newer
`vim.diagnostic.jump` API.

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/config/keymaps.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lua/lazyvim/config/keymaps.lua b/lua/lazyvim/config/keymaps.lua
index 938a2333..5709aa6f 100644
--- a/lua/lazyvim/config/keymaps.lua
+++ b/lua/lazyvim/config/keymaps.lua
@@ -120,10 +120,12 @@ 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()
-    go({ severity = severity })
+    vim.diagnostic.jump({
+      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" })

From c220e04cd65b56331622dcf0ddcc6fe9d104dce9 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 8 Oct 2025 21:26:13 +0200
Subject: [PATCH 252/341] ci: update test scripts

---
 scripts/test    |  4 ++--
 tests/minit.lua |  8 +++++++-
 vim.toml        | 21 ---------------------
 vim.yml         | 19 +++++++++++++++++++
 4 files changed, 28 insertions(+), 24 deletions(-)
 delete mode 100644 vim.toml
 create mode 100644 vim.yml

diff --git a/scripts/test b/scripts/test
index ffbb5405..354a1a1c 100755
--- a/scripts/test
+++ b/scripts/test
@@ -1,3 +1,3 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
-nvim -l tests/minit.lua --minitest
+nvim -l tests/minit.lua --minitest "$@"
diff --git a/tests/minit.lua b/tests/minit.lua
index 41907e75..c1d7c473 100644
--- a/tests/minit.lua
+++ b/tests/minit.lua
@@ -1,7 +1,13 @@
 #!/usr/bin/env -S nvim -l
 
 vim.env.LAZY_STDPATH = ".tests"
-load(vim.fn.system("curl -s https://raw.githubusercontent.com/folke/lazy.nvim/main/bootstrap.lua"))()
+vim.env.LAZY_PATH = vim.fs.normalize("~/projects/lazy.nvim")
+
+if vim.fn.isdirectory(vim.env.LAZY_PATH) then
+  loadfile(vim.env.LAZY_PATH .. "/bootstrap.lua")()
+else
+  load(vim.fn.system("curl -s https://raw.githubusercontent.com/folke/lazy.nvim/main/bootstrap.lua"), "bootstrap.lua")()
+end
 
 -- Setup lazy.nvim
 require("lazy.minit").setup({
diff --git a/vim.toml b/vim.toml
deleted file mode 100644
index df7e67e6..00000000
--- a/vim.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[selene]
-base = "lua51"
-name = "vim"
-
-[vim]
-any = true
-
-[jit]
-any = true
-
-[assert]
-any = true
-
-[describe]
-any = true
-
-[it]
-any = true
-
-[before_each.args]
-any = true
diff --git a/vim.yml b/vim.yml
new file mode 100644
index 00000000..eb58a874
--- /dev/null
+++ b/vim.yml
@@ -0,0 +1,19 @@
+base: lua51
+lua_versions:
+  - luajit
+
+globals:
+  Snacks:
+    any: true
+  vim:
+    any: true
+  jit:
+    any: true
+  assert:
+    any: true
+  describe:
+    any: true
+  it:
+    any: true
+  before_each:
+    any: true

From 8546f6232ecb1305a4ef9df281bad3512ba09da5 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 8 Oct 2025 21:32:23 +0200
Subject: [PATCH 253/341] ci: update minit.lua

---
 tests/minit.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/minit.lua b/tests/minit.lua
index c1d7c473..37d7e1c8 100644
--- a/tests/minit.lua
+++ b/tests/minit.lua
@@ -3,7 +3,7 @@
 vim.env.LAZY_STDPATH = ".tests"
 vim.env.LAZY_PATH = vim.fs.normalize("~/projects/lazy.nvim")
 
-if vim.fn.isdirectory(vim.env.LAZY_PATH) then
+if vim.fn.isdirectory(vim.env.LAZY_PATH) == 1 then
   loadfile(vim.env.LAZY_PATH .. "/bootstrap.lua")()
 else
   load(vim.fn.system("curl -s https://raw.githubusercontent.com/folke/lazy.nvim/main/bootstrap.lua"), "bootstrap.lua")()

From 74f3c7c36d5e46cc548e5a006b417653baf0a2ca Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Wed, 8 Oct 2025 19:33:56 +0000
Subject: [PATCH 254/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 091b0880..e55c8280 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 October 02
+*LazyVim.txt*              For Neovim             Last change: 2025 October 08
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From a3e52dd346ea35db5521b66e46dca95d32f00cb4 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 9 Oct 2025 00:12:43 +0200
Subject: [PATCH 255/341] feat(sidekick): changed default keymaps for sidekick.
 Please check updated docs at sidekick.nvim

---
 lua/lazyvim/plugins/extras/ai/sidekick.lua | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ai/sidekick.lua b/lua/lazyvim/plugins/extras/ai/sidekick.lua
index 6e80ba47..52597b0e 100644
--- a/lua/lazyvim/plugins/extras/ai/sidekick.lua
+++ b/lua/lazyvim/plugins/extras/ai/sidekick.lua
@@ -56,6 +56,12 @@ return {
       -- 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").toggle() end,
+        desc = "Sidekick Toggle",
+        mode = { "n", "t", "i", "x" },
+      },
       {
         "<leader>aa",
         function() require("sidekick.cli").toggle() end,
@@ -74,6 +80,11 @@ return {
         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,
@@ -86,18 +97,6 @@ return {
         mode = { "n", "x" },
         desc = "Sidekick Select Prompt",
       },
-      {
-        "<c-.>",
-        function() require("sidekick.cli").focus() end,
-        mode = { "n", "x", "i", "t" },
-        desc = "Sidekick Switch Focus",
-      },
-      -- Example of a keybinding to open Claude directly
-      {
-        "<leader>ac",
-        function() require("sidekick.cli").toggle({ name = "claude", focus = true }) end,
-        desc = "Sidekick Claude Toggle",
-      },
     },
   },
 }

From aa2c43633adee0f80faf8d743d6476ea4f8ba5ca Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Thu, 9 Oct 2025 14:46:25 +0300
Subject: [PATCH 256/341] fix(xtras): load `copilot-native` before `blink`
 (#6588)

## Description
`blink` Extra loads earlier than `copilot-native` Extra and that causes
`ghost_text.enabled = vim.g.ai_cmp` to wrongly evaluate to `true` even
though `copilot-native` explicitly sets `vim.g.ai_cmp = false`.

I also changed the order of `blink` and `typescript` so that `blink`
comes logically right after `copilot-native`, hope that is not a
problem. If it is, feel free to revert the order and just keep the
change about `copilot-native`.

<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
None, I was just trying to create a toggle mapping to disable/enable
both NES and inline_completion and even though they were disabled, I
could see ghost_text from blink.
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/xtras.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/xtras.lua b/lua/lazyvim/plugins/xtras.lua
index 19a5c6da..5db08ef1 100644
--- a/lua/lazyvim/plugins/xtras.lua
+++ b/lua/lazyvim/plugins/xtras.lua
@@ -5,8 +5,9 @@ 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.lang.typescript"] = 5,
+  ["lazyvim.plugins.extras.ai.copilot-native"] = 4,
   ["lazyvim.plugins.extras.coding.blink"] = 5,
+  ["lazyvim.plugins.extras.lang.typescript"] = 5,
   ["lazyvim.plugins.extras.formatting.prettier"] = 10,
   -- default core extra priority is 20
   -- default priority is 50

From 92ff787e739a17df6e5ba4c505d3e3521ad47e52 Mon Sep 17 00:00:00 2001
From: Vlad <52591095+MeanderingProgrammer@users.noreply.github.com>
Date: Thu, 9 Oct 2025 04:47:01 -0700
Subject: [PATCH 257/341] chore(render-markdown): use API to toggle (#6558)

## Description

The `state` module in `render-markdown` is not expected to be accessed
outside of the package and may be refactored in the future.

Prevent any breaking changes in LazyVim by using the public API which
was updated here:

https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/accaa600ba59022171275adf6640dda13004bd6f

## Related Issue(s)

None

## Screenshots

N/A

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/markdown.lua | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/markdown.lua b/lua/lazyvim/plugins/extras/lang/markdown.lua
index 33e9e457..ac5405e3 100644
--- a/lua/lazyvim/plugins/extras/lang/markdown.lua
+++ b/lua/lazyvim/plugins/extras/lang/markdown.lua
@@ -113,17 +113,8 @@ return {
       require("render-markdown").setup(opts)
       Snacks.toggle({
         name = "Render Markdown",
-        get = function()
-          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,
+        get = require("render-markdown").get,
+        set = require("render-markdown").set,
       }):map("<leader>um")
     end,
   },

From a205ef889f329172edba33960f77830c37088d2d Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Thu, 9 Oct 2025 11:47:28 +0000
Subject: [PATCH 258/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index e55c8280..4398c40a 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 October 08
+*LazyVim.txt*              For Neovim             Last change: 2025 October 09
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 94c4603b6838fbe75343b6e3342b4343744157dc Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 9 Oct 2025 18:08:27 +0200
Subject: [PATCH 259/341] fix(blink): disable blink left/right key in the
 cmdline

---
 lua/lazyvim/plugins/extras/coding/blink.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua
index 790808b1..d5b9a57b 100644
--- a/lua/lazyvim/plugins/extras/coding/blink.lua
+++ b/lua/lazyvim/plugins/extras/coding/blink.lua
@@ -85,7 +85,11 @@ return {
 
       cmdline = {
         enabled = true,
-        keymap = { preset = "cmdline" },
+        keymap = {
+          preset = "cmdline",
+          ["<Right>"] = false,
+          ["<Left>"] = false,
+        },
         completion = {
           list = { selection = { preselect = false } },
           menu = {

From 4efd0e2bea2a387d6fcdea8cf36a62049e8bafed Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 9 Oct 2025 22:08:13 +0200
Subject: [PATCH 260/341] fix(terminal): term toggle keymaps now only work for
 snacks terminals. Closes #6573

---
 lua/lazyvim/config/keymaps.lua | 8 ++------
 lua/lazyvim/plugins/util.lua   | 2 ++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lua/lazyvim/config/keymaps.lua b/lua/lazyvim/config/keymaps.lua
index 5709aa6f..d8d7a10f 100644
--- a/lua/lazyvim/config/keymaps.lua
+++ b/lua/lazyvim/config/keymaps.lua
@@ -189,12 +189,8 @@ 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", "<c-/>",      function() Snacks.terminal(nil, { cwd = LazyVim.root() }) end, { desc = "Terminal (Root Dir)" })
-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" })
+map({"n","t"}, "<c-/>",function() Snacks.terminal(nil, { cwd = LazyVim.root() }) end, { desc = "Terminal (Root Dir)" })
+map({"n","t"}, "<c-_>",function() Snacks.terminal(nil, { cwd = LazyVim.root() }) end, { desc = "which_key_ignore" })
 
 -- windows
 map("n", "<leader>-", "<C-W>s", { desc = "Split Window Below", remap = true })
diff --git a/lua/lazyvim/plugins/util.lua b/lua/lazyvim/plugins/util.lua
index 8d8aa220..0357c3fb 100644
--- a/lua/lazyvim/plugins/util.lua
+++ b/lua/lazyvim/plugins/util.lua
@@ -23,6 +23,8 @@ 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", "n" } },
+            hide_underscore = { "<c-_>", "hide", desc = "which_key_ignore", mode = { "t", "n" } },
           },
         },
       },

From 0e8069c78ee92279055236388df8c2019476767a Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Fri, 10 Oct 2025 06:45:12 +0200
Subject: [PATCH 261/341] feat(treesitter): added support for `disable` langs
 to indent/highlight/folds. Closes #6608

---
 lua/lazyvim/plugins/treesitter.lua | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index 78f1b3b2..b53e9c37 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -21,12 +21,13 @@ return {
     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 },
-      highlight = { enable = true },
-      folds = { enable = true },
+      indent = { enable = true }, ---@type lazyvim.TSFeat
+      highlight = { enable = true }, ---@type lazyvim.TSFeat
+      folds = { enable = true }, ---@type lazyvim.TSFeat
       ensure_installed = {
         "bash",
         "c",
@@ -99,22 +100,32 @@ return {
       vim.api.nvim_create_autocmd("FileType", {
         group = vim.api.nvim_create_augroup("lazyvim_treesitter", { clear = true }),
         callback = function(ev)
-          if not LazyVim.treesitter.have(ev.match) then
+          local ft, lang = ev.match, vim.treesitter.language.get_lang(ev.match)
+          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 vim.tbl_contains(f.disable or {}, lang)
+              and LazyVim.treesitter.have(ft, query)
+          end
+
           -- highlighting
-          if vim.tbl_get(opts, "highlight", "enable") ~= false then
+          if enabled("highlight", "highlights") then
             pcall(vim.treesitter.start)
           end
 
           -- indents
-          if vim.tbl_get(opts, "indent", "enable") ~= false and LazyVim.treesitter.have(ev.match, "indents") then
+          if enabled("indent", "indents") then
             LazyVim.set_default("indentexpr", "v:lua.LazyVim.treesitter.indentexpr()")
           end
 
           -- folds
-          if vim.tbl_get(opts, "folds", "enable") ~= false and LazyVim.treesitter.have(ev.match, "folds") then
+          if enabled("folds", "folds") then
             if LazyVim.set_default("foldmethod", "expr") then
               LazyVim.set_default("foldexpr", "v:lua.LazyVim.treesitter.foldexpr()")
             end

From c1aef3b62a21e0525c12681e28a64a2b7950d7d6 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Fri, 10 Oct 2025 04:46:21 +0000
Subject: [PATCH 262/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 4398c40a..ec2f0a19 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 October 09
+*LazyVim.txt*              For Neovim             Last change: 2025 October 10
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From e8c5fa7eae06539c883699507caeadb46d74f401 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Fri, 10 Oct 2025 20:57:42 +0200
Subject: [PATCH 263/341] fix(treesiter): check that `disable` options are
 tables

---
 lua/lazyvim/plugins/treesitter.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index b53e9c37..5106da4e 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -110,7 +110,7 @@ return {
           local function enabled(feat, query)
             local f = opts[feat] or {} ---@type lazyvim.TSFeat
             return f.enable ~= false
-              and not vim.tbl_contains(f.disable or {}, lang)
+              and not (type(f.disable) == "table" and vim.tbl_contains(f.disable, lang))
               and LazyVim.treesitter.have(ft, query)
           end
 

From f8b062b130177f07d3c1c13b642402d42e980df5 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sat, 11 Oct 2025 00:05:16 +0200
Subject: [PATCH 264/341] feat(sidekick): added `<leader>ad` to close/detach a
 terminal/session

---
 lua/lazyvim/plugins/extras/ai/sidekick.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/ai/sidekick.lua b/lua/lazyvim/plugins/extras/ai/sidekick.lua
index 52597b0e..5b2c0976 100644
--- a/lua/lazyvim/plugins/extras/ai/sidekick.lua
+++ b/lua/lazyvim/plugins/extras/ai/sidekick.lua
@@ -74,6 +74,11 @@ return {
         -- 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,

From 049db39de0f272e8368a4b3881ac5a13f0d04b09 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sat, 11 Oct 2025 08:16:17 +0200
Subject: [PATCH 265/341] fix(sidekick): only add copilot to lspconfig when
 `opts.nes.enabled ~= false`

---
 lua/lazyvim/plugins/extras/ai/sidekick.lua | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ai/sidekick.lua b/lua/lazyvim/plugins/extras/ai/sidekick.lua
index 5b2c0976..71e76eb4 100644
--- a/lua/lazyvim/plugins/extras/ai/sidekick.lua
+++ b/lua/lazyvim/plugins/extras/ai/sidekick.lua
@@ -4,11 +4,13 @@ return {
   -- copilot-language-server
   {
     "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        copilot = {},
-      },
-    },
+    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

From eaa3d4d428de8a78235515721dc200f8e98781e8 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Sat, 11 Oct 2025 06:17:37 +0000
Subject: [PATCH 266/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index ec2f0a19..c64778ca 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 October 10
+*LazyVim.txt*              For Neovim             Last change: 2025 October 11
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From c2aa088300d908398eeb357685e5f215b396381a Mon Sep 17 00:00:00 2001
From: Zhizhen He <hezhizhen.yi@gmail.com>
Date: Sat, 11 Oct 2025 14:48:48 +0800
Subject: [PATCH 267/341] docs(README): bump Neovim requirement to 0.11.2
 (#6611)

## Description

<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

Update neovim requirement in readme.

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 README-CN.md | 2 +-
 README-DE.md | 2 +-
 README-ES.md | 2 +-
 README-IT.md | 2 +-
 README-JP.md | 2 +-
 README-KO.md | 2 +-
 README-PT.md | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README-CN.md b/README-CN.md
index 83e5abfd..67132e59 100644
--- a/README-CN.md
+++ b/README-CN.md
@@ -54,7 +54,7 @@ LazyVim 是一个基于 [💤 lazy.nvim](https://github.com/folke/lazy.nvim) 的
 
 ## ⚡️ 环境要求
 
-- Neovim >= **0.9.0** (需要用 **LuaJIT** 构建)
+- Neovim >= **0.11.2** (需要用 **LuaJIT** 构建)
 - Git >= **2.19.0** (用于部分克隆支持)
 - 一个 [Nerd Font](https://www.nerdfonts.com/) 字体 **_(可选)_**
 - 一个用于 `nvim-treesitter` 的 **C** 编译器。看 [这里](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
diff --git a/README-DE.md b/README-DE.md
index c087d7c6..a46aba0a 100644
--- a/README-DE.md
+++ b/README-DE.md
@@ -56,7 +56,7 @@ und die Einfachheit von einem vorgefertigten Setup.
 
 ## ⚡️ Vorraussetzungen
 
-- Neovim >= **0.8.0** (gebraucht um mit **LuaJIT** zu bauen)
+- Neovim >= **0.11.2** (gebraucht um mit **LuaJIT** zu bauen)
 - Git >= **2.19.0** (um Teil-Klone zu unterstützen)
 - eine [Nerd Font](https://www.nerdfonts.com/) **_(optional)_**
 
diff --git a/README-ES.md b/README-ES.md
index 06e64f96..3dd7f108 100644
--- a/README-ES.md
+++ b/README-ES.md
@@ -52,7 +52,7 @@ LazyVim es una configuración de Neovim impulsada por [💤 lazy.nvim](https://g
 
 ## ⚡️ Requisitos
 
-- Neovim >= **0.9.0** (debe ser compilado con **LuaJIT**)
+- Neovim >= **0.11.2** (debe ser compilado con **LuaJIT**)
 - Git >= **2.19.0** (para soporte de clones parciales)
 - una [Fuente Nerd](https://www.nerdfonts.com/) **_(opcional)_**
 - un compilador **C** para `nvim-treesitter`. Consulta [aquí](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
diff --git a/README-IT.md b/README-IT.md
index 3ab7419a..3bf82a9c 100644
--- a/README-IT.md
+++ b/README-IT.md
@@ -57,7 +57,7 @@ insieme alla comodità di un setup preconfigurato.
 
 ## ⚡️ Requisiti
 
-- Neovim >= **0.9.0** (deve essere compilato con **LuaJIT**)
+- Neovim >= **0.11.2** (deve essere compilato con **LuaJIT**)
 - Git >= **2.19.0** (per supportare cloni parziali)
 - a [Nerd Font](https://www.nerdfonts.com/) **_(opzionale)_**
 - un compilatore **C** per `nvim-treesitter`. Leggi [qui](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
diff --git a/README-JP.md b/README-JP.md
index d81f2cb9..e7a2da3d 100644
--- a/README-JP.md
+++ b/README-JP.md
@@ -54,7 +54,7 @@ LazyVimは、ゼロから始めるか、あらかじめ作成されたディス
 
 ## ⚡️ 必要要件
 
-- Neovim >= **0.9.0** (**LuaJIT**でビルドされている必要があります)
+- Neovim >= **0.11.2** (**LuaJIT**でビルドされている必要があります)
 - Git >= **2.19.0** (部分的なcloneサポートのため)
 - [Nerd Font](https://www.nerdfonts.com/) **_(任意)_**
 - `nvim-treesitter`用の**C**コンパイラ。詳細は[こちら](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
diff --git a/README-KO.md b/README-KO.md
index 84d28017..25ac67ef 100644
--- a/README-KO.md
+++ b/README-KO.md
@@ -52,7 +52,7 @@ LazyVim은 [💤 lazy.nvim](https://github.com/folke/lazy.nvim)를 기반으로
 
 ## ⚡️ 요구사항
 
-- **0.9.0**이상의 Neovim (LuaJIT과 함께 개발이 되어져있어야함니다.)
+- **0.11.2**이상의 Neovim (LuaJIT과 함께 개발이 되어져있어야함니다.)
 - **2.19.0**이상의 Git (이것은 부분적인 클론기능을 지원하기 위함입니다.)
 - [Nerd Font](https://www.nerdfonts.com/) **_(옵션)_**
 - `nvim-treesitter`를 위한 **C** 컴파일러. [이 문서](https://github.com/nvim-treesitter/nvim-treesitter#requirements)를 확인해주시기바랍니다.
diff --git a/README-PT.md b/README-PT.md
index 65d8c625..67bd6fb1 100644
--- a/README-PT.md
+++ b/README-PT.md
@@ -57,7 +57,7 @@ como necessário, junto com a conveniência de um setup pré-configurado.
 
 ## ⚡️ Requesitos
 
-- Neovim >= **0.9.0** (preciso fazer build com **LuaJIT**)
+- Neovim >= **0.11.2** (preciso fazer build com **LuaJIT**)
 - Git >= **2.19.0** (para suporte parcial de clones)
 - uma [Nerd Font](https://www.nerdfonts.com/) **_(opcional)_**
 - um compilador de **C** para `nvim-treesitter`. Mais informações [aqui](https://github.com/nvim-treesitter/nvim-treesitter#requirements)

From ebdcf1ba7ef18daa8c897c8922a5ef770e8bcffb Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 12 Oct 2025 14:26:05 +0200
Subject: [PATCH 268/341] perf(ansible): load on ft=yaml and run should only be
 mapped on ft=yaml.ansible

---
 lua/lazyvim/plugins/extras/lang/ansible.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/ansible.lua b/lua/lazyvim/plugins/extras/lang/ansible.lua
index 0d20b02a..c093f278 100644
--- a/lua/lazyvim/plugins/extras/lang/ansible.lua
+++ b/lua/lazyvim/plugins/extras/lang/ansible.lua
@@ -19,13 +19,14 @@ return {
   },
   {
     "mfussenegger/nvim-ansible",
-    ft = {},
+    ft = { "yaml" },
     keys = {
       {
         "<leader>ta",
         function()
           require("ansible").run()
         end,
+        ft = "yaml.ansible",
         desc = "Ansible Run Playbook/Role",
         silent = true,
       },

From cfc0ae0184a96d1e69b0742c3db3075f7e0ecf2c Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Sun, 12 Oct 2025 12:27:10 +0000
Subject: [PATCH 269/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index c64778ca..3c713e16 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 October 11
+*LazyVim.txt*              For Neovim             Last change: 2025 October 12
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 02b8dd3f4bd55f06be133471fad027f3131238f4 Mon Sep 17 00:00:00 2001
From: Vu Nhat Chuong <ronnyvu321@gmail.com>
Date: Tue, 14 Oct 2025 18:17:22 +0700
Subject: [PATCH 270/341] feat(gleam): add conform (#5640)

## Description

Add conform.nvim formatter for gleam lanuage.

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/gleam.lua | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/lang/gleam.lua b/lua/lazyvim/plugins/extras/lang/gleam.lua
index 956d2882..a41a6054 100644
--- a/lua/lazyvim/plugins/extras/lang/gleam.lua
+++ b/lua/lazyvim/plugins/extras/lang/gleam.lua
@@ -17,4 +17,13 @@ return {
       },
     },
   },
+  {
+    "conform.nvim",
+    optional = true,
+    opts = {
+      formatters_by_ft = {
+        gleam = { "gleam" },
+      },
+    },
+  },
 }

From f8e8ea4b5e7f6d8db55f5c8dc223e0836beeeee6 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Tue, 14 Oct 2025 11:18:24 +0000
Subject: [PATCH 271/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 3c713e16..0b80e343 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 October 12
+*LazyVim.txt*              For Neovim             Last change: 2025 October 14
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 2a1f3c370145c3465c0142deade3e3b2660ce829 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 15 Oct 2025 08:36:32 +0200
Subject: [PATCH 272/341] feat(treesitter): on windows, use `gcc` if available
 and `cl.exe` is not available for building parsers

---
 lua/lazyvim/plugins/treesitter.lua | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index 5106da4e..6256904d 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -59,6 +59,16 @@ return {
     config = function(_, opts)
       local TS = require("nvim-treesitter")
 
+      -- On Windows, use `gcc` if `cl` is not available, and `gcc` is.
+      if
+        not vim.env.CC
+        and vim.fn.has("win32") == 1
+        and vim.fn.executable("cl") == 0
+        and vim.fn.executable("gcc") == 1
+      then
+        vim.env.CC = "gcc"
+      end
+
       setmetatable(require("nvim-treesitter.install"), {
         __newindex = function(_, k)
           if k == "compilers" then

From 413b9d5fa91c5bd5088b28c6d1764caa88542cb1 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 15 Oct 2025 08:37:11 +0200
Subject: [PATCH 273/341] feat(treesitter): better health checks for treesitter
 requirements

---
 lua/lazyvim/health.lua             | 15 +++++++
 lua/lazyvim/plugins/treesitter.lua |  4 +-
 lua/lazyvim/util/treesitter.lua    | 71 +++++++++++++++++++++++-------
 3 files changed, 71 insertions(+), 19 deletions(-)

diff --git a/lua/lazyvim/health.lua b/lua/lazyvim/health.lua
index d1632e75..7af6ad94 100644
--- a/lua/lazyvim/health.lua
+++ b/lua/lazyvim/health.lua
@@ -4,6 +4,7 @@ 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")
@@ -33,6 +34,20 @@ 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.")
+  end
 end
 
 return M
diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index 6256904d..5ab47721 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -13,7 +13,7 @@ return {
         LazyVim.error("Please restart Neovim and run `:TSUpdate` to use the `nvim-treesitter` **main** branch.")
         return
       end
-      LazyVim.treesitter.ensure_treesitter_cli(function()
+      LazyVim.treesitter.build(function()
         TS.update(nil, { summary = true })
       end)
     end,
@@ -100,7 +100,7 @@ return {
         return not LazyVim.treesitter.have(lang)
       end, opts.ensure_installed or {})
       if #install > 0 then
-        LazyVim.treesitter.ensure_treesitter_cli(function()
+        LazyVim.treesitter.build(function()
           TS.install(install, { summary = true }):await(function()
             LazyVim.treesitter.get_installed(true) -- refresh the installed langs
           end)
diff --git a/lua/lazyvim/util/treesitter.lua b/lua/lazyvim/util/treesitter.lua
index b1d647e8..d5c845fd 100644
--- a/lua/lazyvim/util/treesitter.lua
+++ b/lua/lazyvim/util/treesitter.lua
@@ -51,31 +51,68 @@ function M.indentexpr()
   return M.have(nil, "indents") and require("nvim-treesitter").indentexpr() or -1
 end
 
----@param cb fun()
-function M.ensure_treesitter_cli(cb)
-  if vim.fn.executable("tree-sitter") == 1 then
-    return cb()
+---@return boolean ok, lazyvim.util.treesitter.Health health
+function M.check()
+  local is_win = vim.fn.has("win32") == 1
+  ---@param tool string
+  ---@param win boolean?
+  local function have(tool, win)
+    return (win == nil or is_win == win) and vim.fn.executable(tool) == 1
   end
 
-  ---@param msg? string
-  local function fail(msg)
-    return LazyVim.error({
-      "**treesitter-nvim** `main` requires the `tree-sitter` CLI executable to be installed.",
-      "Please install it manually from https://github.com/tree-sitter/tree-sitter/tree/master/crates/cli or",
-      "use your system package manager.",
-      "Run `:checkhealth nvim-treesitter` for more information.",
-      msg,
-    })
+  ---@class lazyvim.util.treesitter.Health: table<string,boolean>
+  local ret = {
+    ["tree-sitter (CLI)"] = have("tree-sitter"),
+    ["C compiler"] = vim.env.CC or have("cc", false) or have("cl", true),
+    tar = have("tar"),
+    curl = have("curl"),
+    node = have("node"),
+  }
+  local ok = true
+  for _, v in pairs(ret) do
+    ok = ok and v
+  end
+  return ok, ret
+end
+
+---@param cb fun()
+function M.build(cb)
+  M.ensure_treesitter_cli(function(_, err)
+    local ok, health = M.check()
+    if ok then
+      return cb()
+    else
+      local lines = { "Unmet requirements for **nvim-treesitter** `main`:" }
+      local keys = vim.tbl_keys(health) ---@type string[]
+      table.sort(keys)
+      for _, k in pairs(keys) do
+        lines[#lines + 1] = ("- %s `%s`"):format(health[k] and "✅" or "❌", k)
+      end
+      vim.list_extend(lines, {
+        "",
+        "See the requirements at [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter/tree/main?tab=readme-ov-file#requirements)",
+        "Run `:checkhealth nvim-treesitter` for more information.",
+      })
+      vim.list_extend(lines, err and { "", err } or {})
+      LazyVim.error(lines, { title = "LazyVim Treesitter" })
+    end
+  end)
+end
+
+---@param cb fun(ok:boolean, err?:string)
+function M.ensure_treesitter_cli(cb)
+  if vim.fn.executable("tree-sitter") == 1 then
+    return cb(true)
   end
 
   -- try installing with mason
   if not pcall(require, "mason") then
-    return fail("`mason.nvim` is disabled in your config, so we cannot install it automatically.")
+    return cb(false, "`mason.nvim` is disabled in your config, so we cannot install it automatically.")
   end
 
   -- check again since we might have installed it already
   if vim.fn.executable("tree-sitter") == 1 then
-    return cb()
+    return cb(true)
   end
 
   local mr = require("mason-registry")
@@ -88,9 +125,9 @@ function M.ensure_treesitter_cli(cb)
         vim.schedule_wrap(function(success)
           if success then
             LazyVim.info("Installed `tree-sitter-cli` with `mason.nvim`.")
-            cb()
+            cb(true)
           else
-            fail("Failed to install `tree-sitter-cli` with `mason.nvim`.")
+            cb(false, "Failed to install `tree-sitter-cli` with `mason.nvim`.")
           end
         end)
       )

From 37032dabd657ae567011e7ab4f881ecbf476eb76 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 15 Oct 2025 08:41:55 +0200
Subject: [PATCH 274/341] feat(treesitter): add installation instructions to
 get a C compiler on windows

---
 lua/lazyvim/health.lua          | 3 +++
 lua/lazyvim/util/treesitter.lua | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/lua/lazyvim/health.lua b/lua/lazyvim/health.lua
index 7af6ad94..2542c150 100644
--- a/lua/lazyvim/health.lua
+++ b/lua/lazyvim/health.lua
@@ -47,6 +47,9 @@ function M.check()
       "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
 
diff --git a/lua/lazyvim/util/treesitter.lua b/lua/lazyvim/util/treesitter.lua
index d5c845fd..23795005 100644
--- a/lua/lazyvim/util/treesitter.lua
+++ b/lua/lazyvim/util/treesitter.lua
@@ -93,6 +93,9 @@ function M.build(cb)
         "See the requirements at [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter/tree/main?tab=readme-ov-file#requirements)",
         "Run `:checkhealth nvim-treesitter` for more information.",
       })
+      if vim.fn.has("win32") == 1 and not health["C compiler"] then
+        lines[#lines + 1] = "Install a C compiler with `winget install --id=BrechtSanders.WinLibs.POSIX.UCRT -e`"
+      end
       vim.list_extend(lines, err and { "", err } or {})
       LazyVim.error(lines, { title = "LazyVim Treesitter" })
     end

From 144fe24be15007de0db036ba145514011d4d55d6 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Wed, 15 Oct 2025 06:43:19 +0000
Subject: [PATCH 275/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 0b80e343..3da695fb 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 October 14
+*LazyVim.txt*              For Neovim             Last change: 2025 October 15
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 5effc77185f94f557809375b5650d427e7171c32 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Wed, 15 Oct 2025 19:43:42 +0200
Subject: [PATCH 276/341] fix(treesitter): better check on windows if microsoft
 build tools is installed

---
 lua/lazyvim/plugins/treesitter.lua | 10 ----------
 lua/lazyvim/util/treesitter.lua    | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index 5ab47721..25223725 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -59,16 +59,6 @@ return {
     config = function(_, opts)
       local TS = require("nvim-treesitter")
 
-      -- On Windows, use `gcc` if `cl` is not available, and `gcc` is.
-      if
-        not vim.env.CC
-        and vim.fn.has("win32") == 1
-        and vim.fn.executable("cl") == 0
-        and vim.fn.executable("gcc") == 1
-      then
-        vim.env.CC = "gcc"
-      end
-
       setmetatable(require("nvim-treesitter.install"), {
         __newindex = function(_, k)
           if k == "compilers" then
diff --git a/lua/lazyvim/util/treesitter.lua b/lua/lazyvim/util/treesitter.lua
index 23795005..e8688a6f 100644
--- a/lua/lazyvim/util/treesitter.lua
+++ b/lua/lazyvim/util/treesitter.lua
@@ -51,6 +51,13 @@ function M.indentexpr()
   return M.have(nil, "indents") and require("nvim-treesitter").indentexpr() or -1
 end
 
+---@return string?
+local function win_find_cl()
+  local path = "C:/Program Files (x86)/Microsoft Visual Studio"
+  local pattern = "*/*/VC/Tools/MSVC/*/bin/Hostx64/x64/cl.exe"
+  return vim.fn.globpath(path, pattern, true, true)[1]
+end
+
 ---@return boolean ok, lazyvim.util.treesitter.Health health
 function M.check()
   local is_win = vim.fn.has("win32") == 1
@@ -60,10 +67,17 @@ function M.check()
     return (win == nil or is_win == win) and vim.fn.executable(tool) == 1
   end
 
+  local have_cc = vim.env.CC ~= nil or have("cc", false) or have("cl", true) or (is_win and win_find_cl() ~= nil)
+
+  if not have_cc and is_win and vim.fn.executable("gcc") == 1 then
+    vim.env.CC = "gcc"
+    have_cc = true
+  end
+
   ---@class lazyvim.util.treesitter.Health: table<string,boolean>
   local ret = {
     ["tree-sitter (CLI)"] = have("tree-sitter"),
-    ["C compiler"] = vim.env.CC or have("cc", false) or have("cl", true),
+    ["C compiler"] = have_cc,
     tar = have("tar"),
     curl = have("curl"),
     node = have("node"),

From 26c43a9b931f3ab04a8c449671250182ac9ddca6 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Fri, 17 Oct 2025 19:18:28 +0200
Subject: [PATCH 277/341] feat(sidekick): use `<a-a>` in any snacks picker to
 send the (selected) results to an AI tool

---
 lua/lazyvim/plugins/extras/ai/sidekick.lua | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/ai/sidekick.lua b/lua/lazyvim/plugins/extras/ai/sidekick.lua
index 71e76eb4..d0451fce 100644
--- a/lua/lazyvim/plugins/extras/ai/sidekick.lua
+++ b/lua/lazyvim/plugins/extras/ai/sidekick.lua
@@ -106,4 +106,28 @@ return {
       },
     },
   },
+
+  {
+    "folke/snacks.nvim",
+    optional = true,
+    opts = {
+      picker = {
+        actions = {
+          sidekick_send = function(...)
+            return require("sidekick.cli.snacks").send(...)
+          end,
+        },
+        win = {
+          input = {
+            keys = {
+              ["<a-a>"] = {
+                "sidekick_send",
+                mode = { "n", "i" },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
 }

From b90e9cb73a2d47981d50322f2f98d5b3bb95fbce Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Fri, 17 Oct 2025 17:19:47 +0000
Subject: [PATCH 278/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 3da695fb..464d854a 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 October 15
+*LazyVim.txt*              For Neovim             Last change: 2025 October 17
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 048056e9523268d6086d537e578e84e27175051d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 17 Oct 2025 19:21:12 +0200
Subject: [PATCH 279/341] chore(main): release 15.8.0 (#6576)

:robot: I have created a release *beep* *boop*
---


##
[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))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 30 +++++++++++++++++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 6cc4959a..57dbcf9a 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "15.7.1"
+  ".": "15.8.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c7935c1..ad7d465c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # Changelog
 
+## [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)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 233328d5..8975fd79 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "15.7.1" -- x-release-please-version
+M.version = "15.8.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 62ce8a23d89fa766956447a3df01d9f3448e9a66 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sat, 18 Oct 2025 06:38:43 +0200
Subject: [PATCH 280/341] fix(treesitter): reload lazyvim.tresitter.util to
 prevent issues with stale modules when upgrading

---
 lua/lazyvim/plugins/treesitter.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index 25223725..20c383bd 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -13,6 +13,8 @@ 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
+      package.loaded["lazyvim.util.treesitter"] = nil
       LazyVim.treesitter.build(function()
         TS.update(nil, { summary = true })
       end)

From 23bdbc91ebd8737dae89d4a1a69c89f9195943a3 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Sat, 18 Oct 2025 04:39:45 +0000
Subject: [PATCH 281/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 464d854a..dd6610d3 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 October 17
+*LazyVim.txt*              For Neovim             Last change: 2025 October 18
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 561da43c435f330674c9b18bb335be7e1126d928 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 18 Oct 2025 08:34:17 +0200
Subject: [PATCH 282/341] chore(main): release 15.8.1 (#6641)

:robot: I have created a release *beep* *boop*
---


##
[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))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 CHANGELOG.md                          | 7 +++++++
 lua/lazyvim/config/init.lua           | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 57dbcf9a..cbea53b1 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "15.8.0"
+  ".": "15.8.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad7d465c..033109a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [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)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 8975fd79..ab41d775 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "15.8.0" -- x-release-please-version
+M.version = "15.8.1" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 92a77287321236f52ff38648a38cf314ab223137 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sat, 18 Oct 2025 15:26:38 +0200
Subject: [PATCH 283/341] fix(treesitter): attach textobject keymaps to
 existing buffers on load. Closes #6642. Closes #6639

---
 lua/lazyvim/plugins/treesitter.lua | 53 ++++++++++++++++--------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index 20c383bd..2a4fa567 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -19,7 +19,6 @@ return {
         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" },
@@ -162,34 +161,40 @@ 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 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")
+            if not (vim.wo.diff and key:find("[cC]")) then
+              vim.keymap.set({ "n", "x", "o" }, key, function()
+                require("nvim-treesitter-textobjects.move")[method](query, "textobjects")
+              end, {
+                buffer = buf,
+                desc = desc,
+                silent = true,
+              })
+            end
+          end
+        end
+      end
+
       vim.api.nvim_create_autocmd("FileType", {
         group = vim.api.nvim_create_augroup("lazyvim_treesitter_textobjects", { clear = true }),
         callback = function(ev)
-          if not (vim.tbl_get(opts, "move", "enable") and LazyVim.treesitter.have(ev.match, "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 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")
-              if not (vim.wo.diff and key:find("[cC]")) then
-                vim.keymap.set({ "n", "x", "o" }, key, function()
-                  require("nvim-treesitter-textobjects.move")[method](query, "textobjects")
-                end, {
-                  buffer = ev.buf,
-                  desc = desc,
-                  silent = true,
-                })
-              end
-            end
-          end
+          attach(ev.buf)
         end,
       })
+      vim.tbl_map(attach, vim.api.nvim_list_bufs())
     end,
   },
 

From bd233579a66018f526b6b0970e33afde4cde399e Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Sun, 19 Oct 2025 08:45:33 +0300
Subject: [PATCH 284/341] fix(mini.animate): schedule the toggle mapping to
 correctly take effect (#6483)

## Description
`mini.animate`'s toggle mapping didn't take effect, presumably because
`keymaps.lua` is the last one to execute on `VeryLazy`. Schedule it to
correctly overwrite the default from `keymaps.lua`.

I would also be interested if you don't mind to explain to me how can I
find out the order of the events execution if there are multiple
executions on the same event (i.e on `VeryLazy` what is the order of the
execution? Is it arbitrary?)
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
None. Saw a discussion on `snacks.nvim` and OP wanted to change the
mapping and when I tested with `mini.animate` Extra I noticed that its
mapping wasn't overriding the default one from `keymaps.lua`.
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 .../plugins/extras/ui/mini-animate.lua        | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

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

From 3d824e1162f7af16df091f833537a67fb659d59b Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Sun, 19 Oct 2025 05:46:27 +0000
Subject: [PATCH 285/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index dd6610d3..f8a92ea3 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 October 18
+*LazyVim.txt*              For Neovim             Last change: 2025 October 19
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 1da659db4a3fbcd6d171f3b38d0092ced0887e61 Mon Sep 17 00:00:00 2001
From: "Rico Sta. Cruz" <rstacruz@users.noreply.github.com>
Date: Sun, 19 Oct 2025 21:16:55 +1100
Subject: [PATCH 286/341] feat(extras.rest): add keymap for changing
 environment (#5678)

## Description

Context:

- kulala.nvim is an HTTP client, which is used in extras.rest
- The kulala [default
keymaps](https://neovim.getkulala.net/docs/getting-started/default-keymaps)
include a keymap to "set environment" (eg to change from production to
staging)
- This keymap is missing in extras/rest.lua

In this PR:

This adds a keymap for `<leader>Re` in extras.rest.lua.

## Screenshots

This adds `e` here:

<img width="595" alt="image"
src="https://github.com/user-attachments/assets/f06f527c-731c-4f81-ad17-0018de9e95d0"
/>

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/util/rest.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/lazyvim/plugins/extras/util/rest.lua b/lua/lazyvim/plugins/extras/util/rest.lua
index 9f2e6d67..6ae8424b 100644
--- a/lua/lazyvim/plugins/extras/util/rest.lua
+++ b/lua/lazyvim/plugins/extras/util/rest.lua
@@ -12,6 +12,7 @@ return {
       { "<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>",

From 1aa1b59a7ec7cab61fa7b096db53df15ec5008e7 Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Sun, 19 Oct 2025 13:19:30 +0300
Subject: [PATCH 287/341] fix(chezmoi): add `hidden=false` to fzf picker
 (#6095)

## Description
Since #5275, the fzf picker has changed to use the `files` picker
instead of `fzf_exec` like before.

That means it also inherits the options of `files` picker, where `hidden
= true`. Just the command had been changed to use the `chezmoi` command,
but it doesn't make sense to have `hidden = true`, since it just appends
`--hidden` to the command which was supposed to be `fzf`, but now with
`chezmoi` it's not recognized.

Add `hidden = false` to the `files` picker when the command is chezmoi.
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
Fixes #6094
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/util/chezmoi.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/util/chezmoi.lua b/lua/lazyvim/plugins/extras/util/chezmoi.lua
index 2c1b2f31..ff4501db 100644
--- a/lua/lazyvim/plugins/extras/util/chezmoi.lua
+++ b/lua/lazyvim/plugins/extras/util/chezmoi.lua
@@ -8,7 +8,7 @@ local pick_chezmoi = function()
         fzf_lua.actions.vimcmd_entry("ChezmoiEdit", selected, { cwd = os.getenv("HOME") })
       end,
     }
-    fzf_lua.files({ cmd = "chezmoi managed --include=files,symlinks", actions = actions })
+    fzf_lua.files({ cmd = "chezmoi managed --include=files,symlinks", actions = actions, hidden = false })
   elseif LazyVim.pick.picker.name == "snacks" then
     local results = require("chezmoi.commands").list({
       args = {

From dea0ae44bef99b3362056541ca8d27438e12cdf7 Mon Sep 17 00:00:00 2001
From: Zhizhen He <hezhizhen.yi@gmail.com>
Date: Sun, 19 Oct 2025 18:20:19 +0800
Subject: [PATCH 288/341] style(lean): fix typo (#6600)

## Description

Fix typo in comment for lean extra.

<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/lean.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/lean.lua b/lua/lazyvim/plugins/extras/lang/lean.lua
index 58488372..76db7ecb 100644
--- a/lua/lazyvim/plugins/extras/lang/lean.lua
+++ b/lua/lazyvim/plugins/extras/lang/lean.lua
@@ -108,7 +108,7 @@ return {
       priority = 10,
     },
 
-    -- Redirect Lean's stderr messages somehwere (to a buffer by default)
+    -- Redirect Lean's stderr messages somewhere (to a buffer by default)
     stderr = {
       enable = true,
       -- height of the window

From 98b97d7b00fd34a1c2cd9195647408f953e7a87b Mon Sep 17 00:00:00 2001
From: Anant Thazhemadam <47104651+thazhemadam@users.noreply.github.com>
Date: Sun, 19 Oct 2025 15:50:34 +0530
Subject: [PATCH 289/341] docs(ui): fix typo - `s/inent/indent/` (#6584)

## Description

This fixes a typo I noticed in the docs.

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/ui/mini-indentscope.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/ui/mini-indentscope.lua b/lua/lazyvim/plugins/extras/ui/mini-indentscope.lua
index ea266b24..19832196 100644
--- a/lua/lazyvim/plugins/extras/ui/mini-indentscope.lua
+++ b/lua/lazyvim/plugins/extras/ui/mini-indentscope.lua
@@ -44,7 +44,7 @@ return {
     end,
   },
 
-  -- disable inent-blankline scope when mini-indentscope is enabled
+  -- disable indent-blankline scope when mini-indentscope is enabled
   {
     "lukas-reineke/indent-blankline.nvim",
     optional = true,

From f0b32b5955889d4d2d3636a52d2ddf5d113646df Mon Sep 17 00:00:00 2001
From: Jackie Li <jackie.space@gmail.com>
Date: Sun, 19 Oct 2025 11:21:17 +0100
Subject: [PATCH 290/341] fix(ui): ignore sidekick_terminal in mini-indentscope
 (#6619)

---
 lua/lazyvim/plugins/extras/ui/mini-indentscope.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/lazyvim/plugins/extras/ui/mini-indentscope.lua b/lua/lazyvim/plugins/extras/ui/mini-indentscope.lua
index 19832196..e043432c 100644
--- a/lua/lazyvim/plugins/extras/ui/mini-indentscope.lua
+++ b/lua/lazyvim/plugins/extras/ui/mini-indentscope.lua
@@ -23,6 +23,7 @@ return {
           "mason",
           "neo-tree",
           "notify",
+          "sidekick_terminal",
           "snacks_dashboard",
           "snacks_notif",
           "snacks_terminal",

From ae74622e6666ea4c3e6c58c4ef2d3f313d8e8f20 Mon Sep 17 00:00:00 2001
From: Frankie Robertson <frankier@users.noreply.github.com>
Date: Sun, 19 Oct 2025 13:22:33 +0300
Subject: [PATCH 291/341] fix(latex): ensure tex extra installs latex
 tree-sitter parser (#6357)

## Description

Currently we don't ensure the latex treesitter is installed for latex.
Although it is not used for highlighting, it is used by default plugins
like flash, so this adds it to the list

## Related Issue(s)

https://github.com/LazyVim/LazyVim/pull/1156

Co-authored-by: Frankie Robertson <frankie@robertson.name>
---
 lua/lazyvim/plugins/extras/lang/tex.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/tex.lua b/lua/lazyvim/plugins/extras/lang/tex.lua
index 9ced69e1..7af026c2 100644
--- a/lua/lazyvim/plugins/extras/lang/tex.lua
+++ b/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" })
+        vim.list_extend(opts.ensure_installed, { "bibtex", "latex" })
       end
       if type(opts.highlight.disable) == "table" then
         vim.list_extend(opts.highlight.disable, { "latex" })

From 66e927fd9d0b0ff2886b9fe1465d9396461a2665 Mon Sep 17 00:00:00 2001
From: Jarryd Tilbrook <jarryd@tilbrooktech.com>
Date: Sun, 19 Oct 2025 18:23:23 +0800
Subject: [PATCH 292/341] feat(neotest): extra keymap to attach to a test
 (#6198)

## Description

An extra keymap useful when running tests to attach to the test.

## Related Issue(s)

N/A

## Screenshots

N/A

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/test/core.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/lazyvim/plugins/extras/test/core.lua b/lua/lazyvim/plugins/extras/test/core.lua
index 48f886ad..99d4969e 100644
--- a/lua/lazyvim/plugins/extras/test/core.lua
+++ b/lua/lazyvim/plugins/extras/test/core.lua
@@ -106,6 +106,7 @@ 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)" },

From 7bf8c22c56283fa6d5d35246dcd0f49d37a5c709 Mon Sep 17 00:00:00 2001
From: xusd320 <xusd320@gmail.com>
Date: Sun, 19 Oct 2025 18:26:20 +0800
Subject: [PATCH 293/341] fix(lang.rust): rust-analyzer hanging on root scanned
 (#6178)

## Description

I encounter the RA hanging problem when coding on next.js project, and
found the solution to fix this at here .
https://github.com/rust-lang/rust-analyzer/issues/12613#issuecomment-2096386344
---
 lua/lazyvim/plugins/extras/lang/rust.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/lang/rust.lua b/lua/lazyvim/plugins/extras/lang/rust.lua
index b66dde9b..048eadab 100644
--- a/lua/lazyvim/plugins/extras/lang/rust.lua
+++ b/lua/lazyvim/plugins/extras/lang/rust.lua
@@ -103,6 +103,8 @@ return {
                 "venv",
                 ".venv",
               },
+              -- Avoid Roots Scanned hanging, see https://github.com/rust-lang/rust-analyzer/issues/12613#issuecomment-2096386344
+              watcher = "client",
             },
           },
         },

From d14b7733e75c2cd2e6df5a21e8664d85aa420773 Mon Sep 17 00:00:00 2001
From: Lorenzo Bettini <lorenzo.bettini@gmail.com>
Date: Sun, 19 Oct 2025 12:26:42 +0200
Subject: [PATCH 294/341] docs(mini-snippets): fix typo in the documentation
 (#5953)

typo `snippits`

## Description

Just a fix for the typo `snippits`

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/coding/mini-snippets.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/coding/mini-snippets.lua b/lua/lazyvim/plugins/extras/coding/mini-snippets.lua
index 714d867d..0262c388 100644
--- a/lua/lazyvim/plugins/extras/coding/mini-snippets.lua
+++ b/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 snippits
+  -- Motivation: Less clutter in completion windows and a more direct usage of snippets
   vim.g.lazyvim_mini_snippets_in_completion = true
 
   -- NOTE: Please also read:

From b36b8589b62f55b181367afe954606c73233c0a1 Mon Sep 17 00:00:00 2001
From: Roland Kaminski <rkaminsk@users.noreply.github.com>
Date: Sun, 19 Oct 2025 12:27:42 +0200
Subject: [PATCH 295/341] fix(extras): adjust switch source/header shortcut
 (#6567)

The command to switch header and source is now called
`:LspClangdSwitchSourceHeader` and no longer
`:ClangdSwitchSourceHeader`.

## Description

This is just a small fix due to a command that has been renamed.

I did not find the documentation but the relevant line in the code where
the command is defined is here:
-
https://github.com/neovim/nvim-lspconfig/blob/e688b486fe9291f151eae7e5c0b5a5c4ef980847/lsp/clangd.lua#L92

## Related Issue(s)

I did not find any related issues.

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/clangd.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/clangd.lua b/lua/lazyvim/plugins/extras/lang/clangd.lua
index 0ba58aca..cac83194 100644
--- a/lua/lazyvim/plugins/extras/lang/clangd.lua
+++ b/lua/lazyvim/plugins/extras/lang/clangd.lua
@@ -60,7 +60,7 @@ return {
         -- Ensure mason installs the server
         clangd = {
           keys = {
-            { "<leader>ch", "<cmd>ClangdSwitchSourceHeader<cr>", desc = "Switch Source/Header (C/C++)" },
+            { "<leader>ch", "<cmd>LspClangdSwitchSourceHeader<cr>", desc = "Switch Source/Header (C/C++)" },
           },
           root_markers = {
             "compile_commands.json",

From 2c5eef7df7520fbc6fe0d90150cd26ac9e4f325b Mon Sep 17 00:00:00 2001
From: Tomas Slusny <slusnucky@gmail.com>
Date: Sun, 19 Oct 2025 12:28:25 +0200
Subject: [PATCH 296/341] fix(copilot-chat): use up to date config for chat
 headers (#6543)

The config format changed a while ago due to function calling support

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
---
 lua/lazyvim/plugins/extras/ai/copilot-chat.lua | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ai/copilot-chat.lua b/lua/lazyvim/plugins/extras/ai/copilot-chat.lua
index fbf4ee39..4c350b4e 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot-chat.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot-chat.lua
@@ -8,8 +8,11 @@ return {
       user = user:sub(1, 1):upper() .. user:sub(2)
       return {
         auto_insert_mode = true,
-        question_header = "  " .. user .. " ",
-        answer_header = "  Copilot ",
+        headers = {
+          user = "  " .. user .. " ",
+          assistant = "  Copilot ",
+          tool = "󰊳  Tool ",
+        },
         window = {
           width = 0.4,
         },

From 4086d44a0b5c576630c603c7b71c6be5198d9eaf Mon Sep 17 00:00:00 2001
From: Christoph Schmidpeter
 <3390179+ChristophSchmidpeter@users.noreply.github.com>
Date: Sun, 19 Oct 2025 12:29:00 +0200
Subject: [PATCH 297/341] feat(lang/omnisharp): switch neotest adapter to
 vstest (#6540)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description
Replace `neotest-dotnet` with `neotest-vstest` in the Omnisharp extras.

The maintainer of `neotest-dotnet` has announced possible archiving and
recommended moving toward a vstest-based approach
(see Issafalcon/neotest-dotnet#142).

In addition, `neotest-dotnet` often fails to reliably discover tests
(currently reproducible), while `neotest-vstest` works consistently in
those same scenarios.

`neotest-vstest` delegates to Microsoft’s VSTest engine, which provides:

- Framework-agnostic discovery and execution (xUnit, NUnit, MSTest,
etc.)
- Support for both C# and F#
- Parameterized test support
- Compatibility with Microsoft.Testing.Platform going forward

According to the `neotest-dotnet` maintainer, this vstest-based approach
is more reliable and maintainable than parser-based discovery and is the
recommended path going forward.
## Related Issue(s)
- Ref: Issafalcon/neotest-dotnet#142
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

Co-authored-by: Christoph Schmidpeter <christoph.schmidpeter@gmail.com>
---
 lua/lazyvim/plugins/extras/lang/omnisharp.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/omnisharp.lua b/lua/lazyvim/plugins/extras/lang/omnisharp.lua
index 07ba0490..e66304ac 100644
--- a/lua/lazyvim/plugins/extras/lang/omnisharp.lua
+++ b/lua/lazyvim/plugins/extras/lang/omnisharp.lua
@@ -104,12 +104,12 @@ return {
     "nvim-neotest/neotest",
     optional = true,
     dependencies = {
-      "Issafalcon/neotest-dotnet",
+      "Nsidorenco/neotest-vstest",
     },
     opts = {
       adapters = {
-        ["neotest-dotnet"] = {
-          -- Here we can set options for neotest-dotnet
+        ["neotest-vstest"] = {
+          -- Here we can set options for neotest-vstest
         },
       },
     },

From 22152e958f3f7c2b732cb6429ccc90541e0ad17f Mon Sep 17 00:00:00 2001
From: Nguyen Hoai Nam <55802579+namnh198@users.noreply.github.com>
Date: Sun, 19 Oct 2025 17:30:58 +0700
Subject: [PATCH 298/341] fix(typescript): make_position_params with offset
 encoding.  (#6277)

Fixed for issue https://github.com/LazyVim/LazyVim/issues/6276
---
 lua/lazyvim/plugins/extras/lang/typescript.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/typescript.lua b/lua/lazyvim/plugins/extras/lang/typescript.lua
index 64dcd394..ab66bea1 100644
--- a/lua/lazyvim/plugins/extras/lang/typescript.lua
+++ b/lua/lazyvim/plugins/extras/lang/typescript.lua
@@ -69,7 +69,8 @@ return {
             {
               "gD",
               function()
-                local params = vim.lsp.util.make_position_params()
+                local win = vim.api.nvim_get_current_win()
+                local params = vim.lsp.util.make_position_params(win, "utf-16")
                 LazyVim.lsp.execute({
                   command = "typescript.goToSourceDefinition",
                   arguments = { params.textDocument.uri, params.position },

From 706ec4443a33ec474f2329b5b806e9cdb85cce43 Mon Sep 17 00:00:00 2001
From: Theo Lemay <16546293+theol0403@users.noreply.github.com>
Date: Sun, 19 Oct 2025 06:31:48 -0400
Subject: [PATCH 299/341] fix(vscode): don't sync undo/redo with vscode (#5957)

## Description

Vscode-neovim maintainer here,
https://github.com/LazyVim/LazyVim/pull/4983 should not have been
merged, it creates more problems than it
solves. For the longest time I was trying to figure out why undo is
broken on my machine, didn't notice this slipped in.

The fundamental issue is that vscode's undo points are based on a
time-based heuristic, wheras neovim's undo points are based on atomic
actions (delete, insert, etc). Vscode doesn't understand the context of
what the user is doing, it just receives a stream of edits from neovim.

Ultimately this results in multiple unrelated edits being undone with a
single press of the u key, resulting in very confusing behavior.

## Related Issue(s)

https://github.com/LazyVim/LazyVim/pull/4983

## Screenshots

Current


https://github.com/user-attachments/assets/5ca33b0d-fe2e-49f9-aa17-66f3c42c0966

Expected


https://github.com/user-attachments/assets/d577a1f3-efb2-4725-be50-bd0cf691252d



## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

Co-authored-by: Theo Lemay <tlemay@tesla.com>
---
 lua/lazyvim/plugins/extras/vscode.lua | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/vscode.lua b/lua/lazyvim/plugins/extras/vscode.lua
index 5115a2b4..92b7f9f0 100644
--- a/lua/lazyvim/plugins/extras/vscode.lua
+++ b/lua/lazyvim/plugins/extras/vscode.lua
@@ -39,10 +39,6 @@ vim.api.nvim_create_autocmd("User", {
     vim.keymap.set("n", "<leader>/", [[<cmd>lua require('vscode').action('workbench.action.findInFiles')<cr>]])
     vim.keymap.set("n", "<leader>ss", [[<cmd>lua require('vscode').action('workbench.action.gotoSymbol')<cr>]])
 
-    -- Keep undo/redo lists in sync with VsCode
-    vim.keymap.set("n", "u", "<Cmd>call VSCodeNotify('undo')<CR>")
-    vim.keymap.set("n", "<C-r>", "<Cmd>call VSCodeNotify('redo')<CR>")
-
     -- Navigate VSCode tabs like lazyvim buffers
     vim.keymap.set("n", "<S-h>", "<Cmd>call VSCodeNotify('workbench.action.previousEditor')<CR>")
     vim.keymap.set("n", "<S-l>", "<Cmd>call VSCodeNotify('workbench.action.nextEditor')<CR>")

From 4a3702e050881fea262ccae980ae1ff9e849d275 Mon Sep 17 00:00:00 2001
From: Ethan <yuusheng7@gmail.com>
Date: Sun, 19 Oct 2025 18:36:04 +0800
Subject: [PATCH 300/341] fix(extras): remove procMacro ignored (#6117)

## Description
I think we should remove rust-analyzer procMacro.ignore because it will
cause some diagnostics which are not expected.
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
https://github.com/LazyVim/LazyVim/issues/6111

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/rust.lua | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/rust.lua b/lua/lazyvim/plugins/extras/lang/rust.lua
index 048eadab..155195ad 100644
--- a/lua/lazyvim/plugins/extras/lang/rust.lua
+++ b/lua/lazyvim/plugins/extras/lang/rust.lua
@@ -85,11 +85,6 @@ return {
             },
             procMacro = {
               enable = true,
-              ignored = {
-                ["async-trait"] = { "async_trait" },
-                ["napi-derive"] = { "napi" },
-                ["async-recursion"] = { "async_recursion" },
-              },
             },
             files = {
               excludeDirs = {

From 762a34d5ad95447b241287e8d540b657a699d141 Mon Sep 17 00:00:00 2001
From: Felix Rath <felixm.rath@gmail.com>
Date: Sun, 19 Oct 2025 12:37:57 +0200
Subject: [PATCH 301/341] fix(extras/rust): fix config key for files.exclude
 (#5664)

## Description

It seems like the key changed its name from `files.excludeDirs` to
`files.exclude` at some point. At least that is the (only) name that can
be found in the docs now:
https://rust-analyzer.github.io/book/configuration.html (ctrl+f for
"files.exclude")

Also add `".jj"` as an excluded directory, which is like `".git"` but
for jujutsu
(https://jj-vcs.github.io/jj/latest/cli-reference/#jj-git-init).

---

As an aside, `cargo.loadOutDirsFromCheck` also does not seem to exist
(anymore). But I don't know more about that option, so I haven't touched
it in this PR.

## Related Issue(s)

Not sure if any.

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/rust.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/rust.lua b/lua/lazyvim/plugins/extras/lang/rust.lua
index 155195ad..5586f9e2 100644
--- a/lua/lazyvim/plugins/extras/lang/rust.lua
+++ b/lua/lazyvim/plugins/extras/lang/rust.lua
@@ -87,9 +87,10 @@ return {
               enable = true,
             },
             files = {
-              excludeDirs = {
+              exclude = {
                 ".direnv",
                 ".git",
+                ".jj",
                 ".github",
                 ".gitlab",
                 "bin",

From 336e2c3ea67636c4eea3cf8f7538feb86b5a0610 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 19 Oct 2025 12:45:07 +0200
Subject: [PATCH 302/341] fix(blink): remove snippet expand override (no longer
 needed). Closes #6044

---
 lua/lazyvim/plugins/extras/coding/blink.lua | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua
index d5b9a57b..ccee9d79 100644
--- a/lua/lazyvim/plugins/extras/coding/blink.lua
+++ b/lua/lazyvim/plugins/extras/coding/blink.lua
@@ -37,9 +37,7 @@ return {
     ---@type blink.cmp.Config
     opts = {
       snippets = {
-        expand = function(snippet, _)
-          return LazyVim.cmp.expand(snippet)
-        end,
+        preset = "default",
       },
 
       appearance = {

From dfebe70b8d09514dd3ee85e12463f266f93c5dd7 Mon Sep 17 00:00:00 2001
From: CaueDosAnjos <141049846+CaueAnjos@users.noreply.github.com>
Date: Sun, 19 Oct 2025 10:46:46 +0000
Subject: [PATCH 303/341] fix(lang.omnisharp): update CSharpier command and
 arguments for Mason compatibility (#6156)

## Description
This PR updates the CSharpier integration in LazyVim to reflect changes
in how Mason installs the formatter.

Previously, Mason installed CSharpier as the `dotnet-csharpier` binary,
which allowed running it without additional arguments. Now, Mason
installs it simply as `csharpier`, requiring the explicit format
argument for it to work correctly.

This change updates the formatter command and arguments accordingly to
ensure compatibility with the latest Mason installation and CSharpier
CLI behavior.

## Changes
Replaced `dotnet-csharpier` with `csharpier` as the executable command.

Added the required `format` argument to the command invocation.

## Related Issue(s)
Fixes #6155

## Checklist
I have read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/omnisharp.lua | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/omnisharp.lua b/lua/lazyvim/plugins/extras/lang/omnisharp.lua
index e66304ac..63bbd486 100644
--- a/lua/lazyvim/plugins/extras/lang/omnisharp.lua
+++ b/lua/lazyvim/plugins/extras/lang/omnisharp.lua
@@ -27,12 +27,6 @@ return {
       formatters_by_ft = {
         cs = { "csharpier" },
       },
-      formatters = {
-        csharpier = {
-          command = "dotnet-csharpier",
-          args = { "--write-stdout" },
-        },
-      },
     },
   },
   {

From 7038687b2070f16cde1069f360be300203912527 Mon Sep 17 00:00:00 2001
From: Kian Kasad <kian@kasad.com>
Date: Sun, 19 Oct 2025 03:47:17 -0700
Subject: [PATCH 304/341] chore(python): use debugpy-adapter executable for
 nvim-dap-python (#6080)

## Description

Uses a less hacky and now officially-supported way of getting the
debugpy DAP adapter path for nvim-dap-python.

Since https://github.com/mfussenegger/nvim-dap-python/pull/184,
nvim-dap-python can start the debugpy adapter using the
`debugpy-adapter` executable. Since
[Mason](https://github.com/mason-org/mason-registry/blob/f7c1c2fde2d1c79f8892dafc9528da1b78b56b25/packages/debugpy/package.yaml#L17)
and [now debugpy itself](https://github.com/microsoft/debugpy/pull/1870)
provide this executable, there's no need to get the `python` executable
from debugpy's venv.

I've gone with just `"debugpy-adapter"` rather than
`LazyVim.get_pkg_path("debugpy", "debugpy-adapter")` so that a
system-wide installation of debugpy can also be used.

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/python.lua | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/python.lua b/lua/lazyvim/plugins/extras/lang/python.lua
index a02ded1f..7a77cbc6 100644
--- a/lua/lazyvim/plugins/extras/lang/python.lua
+++ b/lua/lazyvim/plugins/extras/lang/python.lua
@@ -103,11 +103,7 @@ return {
         { "<leader>dPc", function() require('dap-python').test_class() end, desc = "Debug Class", ft = "python" },
       },
       config = function()
-        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
+        require("dap-python").setup("debugpy-adapter")
       end,
     },
   },

From 97af4a23bccac85eb02e489f573db68863d6ed33 Mon Sep 17 00:00:00 2001
From: Michael Nikitochkin <michael.nikitochkin@gmx.net>
Date: Sun, 19 Oct 2025 12:47:59 +0200
Subject: [PATCH 305/341] feat(docker): associate 'Containerfile' with
 'dockerfile' filetype (#5974)

## Description

'Containerfile' [1] is a supported alternative name for container build
definitions. It is recognized by Docker and other container tools, and
can help clarify intent in multi-container repositories or
non-Docker-specific setups.

[1]:
https://github.com/containers/common/blob/main/docs/Containerfile.5.md

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/docker.lua | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/docker.lua b/lua/lazyvim/plugins/extras/lang/docker.lua
index ea26b013..ace79db8 100644
--- a/lua/lazyvim/plugins/extras/lang/docker.lua
+++ b/lua/lazyvim/plugins/extras/lang/docker.lua
@@ -2,7 +2,14 @@ return {
   recommended = function()
     return LazyVim.extras.wants({
       ft = "dockerfile",
-      root = { "Dockerfile", "docker-compose.yml", "compose.yml", "docker-compose.yaml", "compose.yaml" },
+      root = {
+        "Dockerfile",
+        "Containerfile",
+        "docker-compose.yml",
+        "compose.yml",
+        "docker-compose.yaml",
+        "compose.yaml"
+      },
     })
   end,
   {

From a16739e3328c2687d96f868839c575765c49baad Mon Sep 17 00:00:00 2001
From: Jarryd Tilbrook <jarryd@tilbrooktech.com>
Date: Sun, 19 Oct 2025 18:53:46 +0800
Subject: [PATCH 306/341] fix(util): add some kulala keymaps back to global
 (#5960)

## Description

Some kulala keymaps are useful to access globally, such as the
scratchpad. However, #4467 #4574 added all of them to http filetypes
only

This adds the scratchpad and replay last to global keymaps

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/util/rest.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/util/rest.lua b/lua/lazyvim/plugins/extras/util/rest.lua
index 6ae8424b..0fc08ced 100644
--- a/lua/lazyvim/plugins/extras/util/rest.lua
+++ b/lua/lazyvim/plugins/extras/util/rest.lua
@@ -8,8 +8,8 @@ return {
     "mistweaverco/kulala.nvim",
     ft = "http",
     keys = {
-      { "<leader>R", "", desc = "+Rest", ft = "http" },
-      { "<leader>Rb", "<cmd>lua require('kulala').scratchpad()<cr>", desc = "Open scratchpad", ft = "http" },
+      { "<leader>R", "", desc = "+Rest" },
+      { "<leader>Rb", "<cmd>lua require('kulala').scratchpad()<cr>", desc = "Open scratchpad" },
       { "<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" },
@@ -23,7 +23,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", ft = "http" },
+      { "<leader>Rr", "<cmd>lua require('kulala').replay()<cr>", desc = "Replay the last request" },
       { "<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" },

From f6f72b90d41d9347b93a07d0b680195541f64c55 Mon Sep 17 00:00:00 2001
From: Igor Guerrero <igorgue@protonmail.com>
Date: Sun, 19 Oct 2025 04:54:41 -0600
Subject: [PATCH 307/341] fix(sql): fix autocomplete when `omni` is used as a
 `blink.cmp` source (#5652)

## Description

I was trying the `omni` source with `blink.cmp` and I had an error which
you can read more about in this `nvim-compe` issue:
https://github.com/hrsh7th/nvim-compe/issues/286 but the message keeps
showing up after setting that to `syntax` so I mark the default plugin
as loaded, and it works as expected, I think there are more items
returned but I cannot confirm that :).

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/sql.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/lang/sql.lua b/lua/lazyvim/plugins/extras/lang/sql.lua
index 070d26ff..955e228c 100644
--- a/lua/lazyvim/plugins/extras/lang/sql.lua
+++ b/lua/lazyvim/plugins/extras/lang/sql.lua
@@ -28,6 +28,11 @@ 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({

From 9618e327edfb79d9cbb037a2039c4315a95df63f Mon Sep 17 00:00:00 2001
From: Lawrence Ho <203431+lawrenceho@users.noreply.github.com>
Date: Sun, 19 Oct 2025 18:55:38 +0800
Subject: [PATCH 308/341] feat(java): enable `blink.cmp` capabilities to show
 signature documentation (#5218)

## Description

Enable `blink.cmp` capabilities to show Java signature documentation
during completion.
See also: https://github.com/Saghen/blink.cmp/issues/151

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/java.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua
index 4dd1d77f..72f31a63 100644
--- a/lua/lazyvim/plugins/extras/lang/java.lua
+++ b/lua/lazyvim/plugins/extras/lang/java.lua
@@ -169,7 +169,9 @@ return {
           },
           settings = opts.settings,
           -- enable CMP capabilities
-          capabilities = LazyVim.has("cmp-nvim-lsp") and require("cmp_nvim_lsp").default_capabilities() or nil,
+          capabilities = LazyVim.has("blink.cmp") and require("blink.cmp").get_lsp_capabilities() or LazyVim.has(
+            "cmp-nvim-lsp"
+          ) and require("cmp_nvim_lsp").default_capabilities() or nil,
         }, opts.jdtls)
 
         -- Existing server will be reused if the root_dir matches.

From c460e97d2b42d1e6099cb84f24f427ef865c8d4f Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 19 Oct 2025 12:57:09 +0200
Subject: [PATCH 309/341] style: format

---
 lua/lazyvim/plugins/extras/lang/docker.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/docker.lua b/lua/lazyvim/plugins/extras/lang/docker.lua
index ace79db8..a3c48c10 100644
--- a/lua/lazyvim/plugins/extras/lang/docker.lua
+++ b/lua/lazyvim/plugins/extras/lang/docker.lua
@@ -8,7 +8,7 @@ return {
         "docker-compose.yml",
         "compose.yml",
         "docker-compose.yaml",
-        "compose.yaml"
+        "compose.yaml",
       },
     })
   end,

From 42840b2ffbfa9dd3c15e0ce7d1bec36d772a3ead Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 19 Oct 2025 13:00:52 +0200
Subject: [PATCH 310/341] chore(main): release 15.9.0 (#6643)

:robot: I have created a release *beep* *boop*
---


##
[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))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 CHANGELOG.md                          | 31 +++++++++++++++++++++++++++
 lua/lazyvim/config/init.lua           |  2 +-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index cbea53b1..67ff2e28 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "15.8.1"
+  ".": "15.9.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 033109a4..91539d23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,36 @@
 # Changelog
 
+## [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)
 
 
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index ab41d775..dc8972c7 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "15.8.1" -- x-release-please-version
+M.version = "15.9.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

From 16917db94a056fe01b3bac604bc89da4077bd9cd Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 19 Oct 2025 22:53:32 +0200
Subject: [PATCH 311/341] feat(sidekick): added sidekick cli status to lualine

---
 lua/lazyvim/plugins/extras/ai/sidekick.lua | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/ai/sidekick.lua b/lua/lazyvim/plugins/extras/ai/sidekick.lua
index d0451fce..c1c38c58 100644
--- a/lua/lazyvim/plugins/extras/ai/sidekick.lua
+++ b/lua/lazyvim/plugins/extras/ai/sidekick.lua
@@ -39,6 +39,19 @@ return {
           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,
   },
 
@@ -114,7 +127,7 @@ return {
       picker = {
         actions = {
           sidekick_send = function(...)
-            return require("sidekick.cli.snacks").send(...)
+            return require("sidekick.cli.picker.snacks").send(...)
           end,
         },
         win = {

From 69a57448032253ca086d999c0d53d6e33ad4e505 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 20 Oct 2025 07:01:27 +0200
Subject: [PATCH 312/341] fix(fzf-lua): added some missing keymaps similar to
 snacks picker. Closes #6036. Closes #5830

---
 lua/lazyvim/plugins/extras/editor/fzf.lua | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/editor/fzf.lua b/lua/lazyvim/plugins/extras/editor/fzf.lua
index 9e7ef671..513b8130 100644
--- a/lua/lazyvim/plugins/extras/editor/fzf.lua
+++ b/lua/lazyvim/plugins/extras/editor/fzf.lua
@@ -218,6 +218,7 @@ 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)" },
@@ -226,15 +227,19 @@ 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 (hunks)" },
+      { "<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 grep_curbuf<cr>", desc = "Buffer" },
+      { "<leader>sb", "<cmd>FzfLua lines<cr>", desc = "Buffer Lines" },
       { "<leader>sc", "<cmd>FzfLua command_history<cr>", desc = "Command History" },
       { "<leader>sC", "<cmd>FzfLua commands<cr>", desc = "Commands" },
-      { "<leader>sd", "<cmd>FzfLua diagnostics_document<cr>", desc = "Document Diagnostics" },
-      { "<leader>sD", "<cmd>FzfLua diagnostics_workspace<cr>", desc = "Workspace Diagnostics" },
+      { "<leader>sd", "<cmd>FzfLua diagnostics_workspace<cr>", desc = "Diagnostics" },
+      { "<leader>sD", "<cmd>FzfLua diagnostics_document<cr>", desc = "Buffer Diagnostics" },
       { "<leader>sg", LazyVim.pick("live_grep"), desc = "Grep (Root Dir)" },
       { "<leader>sG", LazyVim.pick("live_grep", { root = false }), desc = "Grep (cwd)" },
       { "<leader>sh", "<cmd>FzfLua help_tags<cr>", desc = "Help Pages" },

From c3c2ff465bcd58cdd1142ba6c9644603c431a406 Mon Sep 17 00:00:00 2001
From: folke <292349+folke@users.noreply.github.com>
Date: Mon, 20 Oct 2025 05:02:32 +0000
Subject: [PATCH 313/341] chore(build): auto-generate docs

---
 doc/LazyVim.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index f8a92ea3..a1d06f52 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*              For Neovim             Last change: 2025 October 19
+*LazyVim.txt*              For Neovim             Last change: 2025 October 20
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

From 1a08e9f50f8c11a329c3017c4bfdd4b96b7ec541 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 20 Oct 2025 07:04:53 +0200
Subject: [PATCH 314/341] fix(telescope): sync keymaps with snacks picker +
 added some that were missing

---
 lua/lazyvim/plugins/extras/editor/telescope.lua | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/editor/telescope.lua b/lua/lazyvim/plugins/extras/editor/telescope.lua
index 9fdf7e13..f40ccae6 100644
--- a/lua/lazyvim/plugins/extras/editor/telescope.lua
+++ b/lua/lazyvim/plugins/extras/editor/telescope.lua
@@ -101,6 +101,7 @@ 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)" },
@@ -109,15 +110,18 @@ 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" },
+      { "<leader>sb", "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Buffer Lines" },
       { "<leader>sc", "<cmd>Telescope command_history<cr>", desc = "Command History" },
       { "<leader>sC", "<cmd>Telescope commands<cr>", desc = "Commands" },
-      { "<leader>sd", "<cmd>Telescope diagnostics bufnr=0<cr>", desc = "Document Diagnostics" },
-      { "<leader>sD", "<cmd>Telescope diagnostics<cr>", desc = "Workspace Diagnostics" },
+      { "<leader>sd", "<cmd>Telescope diagnostics<cr>", desc = "Diagnostics" },
+      { "<leader>sD", "<cmd>Telescope diagnostics bufnr=0<cr>", desc = "Buffer Diagnostics" },
       { "<leader>sg", LazyVim.pick("live_grep"), desc = "Grep (Root Dir)" },
       { "<leader>sG", LazyVim.pick("live_grep", { root = false }), desc = "Grep (cwd)" },
       { "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help Pages" },

From e4d34328f244fc0c7f91587258e767bfb55d0648 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 20 Oct 2025 07:19:18 +0200
Subject: [PATCH 315/341] fix(typescript): better default pwa-node DAP config.
 Closes #6386

---
 .../plugins/extras/lang/typescript.lua        | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/lang/typescript.lua b/lua/lazyvim/plugins/extras/lang/typescript.lua
index ab66bea1..b79eb7e9 100644
--- a/lua/lazyvim/plugins/extras/lang/typescript.lua
+++ b/lua/lazyvim/plugins/extras/lang/typescript.lua
@@ -263,6 +263,10 @@ return {
 
       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",
@@ -270,6 +274,16 @@ return {
               name = "Launch file",
               program = "${file}",
               cwd = "${workspaceFolder}",
+              sourceMaps = true,
+              runtimeExecutable = runtimeExecutable,
+              skipFiles = {
+                "<node_internals>/**",
+                "node_modules/**",
+              },
+              resolveSourceMapLocations = {
+                "${workspaceFolder}/**",
+                "!**/node_modules/**",
+              },
             },
             {
               type = "pwa-node",
@@ -277,6 +291,16 @@ return {
               name = "Attach",
               processId = require("dap.utils").pick_process,
               cwd = "${workspaceFolder}",
+              sourceMaps = true,
+              runtimeExecutable = runtimeExecutable,
+              skipFiles = {
+                "<node_internals>/**",
+                "node_modules/**",
+              },
+              resolveSourceMapLocations = {
+                "${workspaceFolder}/**",
+                "!**/node_modules/**",
+              },
             },
           }
         end

From 2a866f6c8c974c88cb9c723560cbec4308d304a2 Mon Sep 17 00:00:00 2001
From: Jose Storopoli <jose@storopoli.com>
Date: Mon, 20 Oct 2025 00:20:47 -0500
Subject: [PATCH 316/341] feat(lang): nix add `statix` linter (#6244)

## Description

Adds [`statix`](https://github.com/oppiliappan/statix) linter to
`lang/nix.lua` using `nvim-lint`

## Related Issue(s)

None

## Screenshots


## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/nix.lua | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/lang/nix.lua b/lua/lazyvim/plugins/extras/lang/nix.lua
index 76a42ebe..79a2b71f 100644
--- a/lua/lazyvim/plugins/extras/lang/nix.lua
+++ b/lua/lazyvim/plugins/extras/lang/nix.lua
@@ -24,4 +24,13 @@ return {
       },
     },
   },
+  {
+    "mfussenegger/nvim-lint",
+    optional = true,
+    opts = {
+      linters_by_ft = {
+        nix = { "statix" },
+      },
+    },
+  },
 }

From 0dc41dfe9a4523ad3084f430019fc7782548021e Mon Sep 17 00:00:00 2001
From: XTY <xty@xty.io>
Date: Mon, 20 Oct 2025 13:36:15 +0800
Subject: [PATCH 317/341] refactor(vscode): reimplement terminal integration
 and unify calls to extension API (#6076)

## Description

This PR proposes the following changes to the VS Code extra:
- Re-implement the VS Code terminal integration (broken since
[`2f46974`](https://github.com/LazyVim/LazyVim/commit/2f4697443c0186663ba4421bd4b856e36c3bd7cc#diff-f878104b5415a79ed4bb9036974722cad911327fdd46994e04f5065ff90e9a55),
see comment referenced below)
- Unify calls to the [extension
API](https://github.com/vscode-neovim/vscode-neovim/tree/v1.18.21?tab=readme-ov-file#%EF%B8%8F-api)
- Fully adopt the Lua API in favour of the deprecated Vim script
functions (see [deprecation
notice](https://github.com/vscode-neovim/vscode-neovim/tree/v1.18.21?tab=readme-ov-file#vimscript))
  - Centralise `require("vscode")` calls

## Related Issue(s)

- Fixes
https://github.com/LazyVim/LazyVim/pull/4392#issuecomment-2881395017

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

---------

Co-authored-by: Folke Lemaitre <folke.lemaitre@gmail.com>
---
 lua/lazyvim/plugins/extras/vscode.lua | 28 +++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/vscode.lua b/lua/lazyvim/plugins/extras/vscode.lua
index 92b7f9f0..1ae459bb 100644
--- a/lua/lazyvim/plugins/extras/vscode.lua
+++ b/lua/lazyvim/plugins/extras/vscode.lua
@@ -23,6 +23,7 @@ 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)
@@ -36,19 +37,30 @@ 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>/", [[<cmd>lua require('vscode').action('workbench.action.findInFiles')<cr>]])
-    vim.keymap.set("n", "<leader>ss", [[<cmd>lua require('vscode').action('workbench.action.gotoSymbol')<cr>]])
+    vim.keymap.set("n", "<leader>/", function()
+      vscode.call("workbench.action.findInFiles")
+    end)
+    vim.keymap.set("n", "<leader>ss", function()
+      vscode.call("workbench.action.gotoSymbol")
+    end)
+
+    -- Toggle VS Code integrated terminal
+    for _, lhs in ipairs({ "<leader>ft", "<leader>fT", "<c-/>" }) do
+      vim.keymap.set("n", lhs, function()
+        vscode.call("workbench.action.terminal.toggleTerminal")
+      end)
+    end
 
     -- Navigate VSCode tabs like lazyvim buffers
-    vim.keymap.set("n", "<S-h>", "<Cmd>call VSCodeNotify('workbench.action.previousEditor')<CR>")
-    vim.keymap.set("n", "<S-l>", "<Cmd>call VSCodeNotify('workbench.action.nextEditor')<CR>")
+    vim.keymap.set("n", "<S-h>", function()
+      vscode.call("workbench.action.previousEditor")
+    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",

From 38df28f28c17a730889f0ad4431425b8253a7474 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 20 Oct 2025 07:53:39 +0200
Subject: [PATCH 318/341] style: formatting

---
 lua/lazyvim/plugins/extras/editor/fzf.lua       | 2 +-
 lua/lazyvim/plugins/extras/editor/telescope.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/editor/fzf.lua b/lua/lazyvim/plugins/extras/editor/fzf.lua
index 513b8130..5e10fc58 100644
--- a/lua/lazyvim/plugins/extras/editor/fzf.lua
+++ b/lua/lazyvim/plugins/extras/editor/fzf.lua
@@ -233,7 +233,7 @@ return {
       { "<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>s/", "<cmd>FzfLua search_history<cr>", desc = "Search History" },
       { "<leader>sa", "<cmd>FzfLua autocmds<cr>", desc = "Auto Commands" },
       { "<leader>sb", "<cmd>FzfLua lines<cr>", desc = "Buffer Lines" },
       { "<leader>sc", "<cmd>FzfLua command_history<cr>", desc = "Command History" },
diff --git a/lua/lazyvim/plugins/extras/editor/telescope.lua b/lua/lazyvim/plugins/extras/editor/telescope.lua
index f40ccae6..685f9ec5 100644
--- a/lua/lazyvim/plugins/extras/editor/telescope.lua
+++ b/lua/lazyvim/plugins/extras/editor/telescope.lua
@@ -115,7 +115,7 @@ return {
       { "<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>s/", "<cmd>Telescope search_history<cr>", desc = "Search History" },
       { "<leader>sa", "<cmd>Telescope autocommands<cr>", desc = "Auto Commands" },
       { "<leader>sb", "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Buffer Lines" },
       { "<leader>sc", "<cmd>Telescope command_history<cr>", desc = "Command History" },

From 80a980ab00a871777c37ec3f0db9c394509b2465 Mon Sep 17 00:00:00 2001
From: Christoph Schmidpeter
 <3390179+ChristophSchmidpeter@users.noreply.github.com>
Date: Mon, 20 Oct 2025 08:02:50 +0200
Subject: [PATCH 319/341] feat(lang/fsharp): add F# support to omnisharp extra
 (#6538)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description
Extend the existing C#/VB setup to support F# development with
formatting, LSP, and debugging integration.

- Extend recommended filetypes and roots to include F#
- Ensure Treesitter installs the `fsharp` parser
- Add Fantomas formatter in none-ls and Conform
- Ensure Mason installs fsautocomplete and fantomas
- Extend DAP configurations to include `fsharp`

⚠️ For debugging/neotest to work, this PR should be merged together with
[#6540](https://github.com/LazyVim/LazyVim/pull/6540),
which switches Omnisharp extras from `neotest-dotnet` to
`neotest-vstest`.

## Related Issue(s)

N/A

## Screenshots

### Without PR

Sample code:
<img width="1485" height="934" alt="2025-09-27-224704_hyprshot"
src="https://github.com/user-attachments/assets/40993ae2-c7eb-458a-bca9-6e77a1fad323"
/>

### With PR

`:ConformInfo`
<img width="1280" height="573" alt="image"
src="https://github.com/user-attachments/assets/b417fce7-8eb5-4ccc-8bd4-c554060bf9a0"
/>

`:NullLsInfo`
<img width="732" height="544" alt="image"
src="https://github.com/user-attachments/assets/5275e16b-353f-4776-b130-09ec27fde90b"
/>

Sample code before formatting:
<img width="1953" height="1228" alt="2025-09-27-224729_hyprshot"
src="https://github.com/user-attachments/assets/870b17c7-2473-4151-9ccc-23b70d9fbc42"
/>

Sample code after formatting (using Fantomas formatter):
<img width="1930" height="1216" alt="2025-09-27-224752_hyprshot"
src="https://github.com/user-attachments/assets/3b589c2e-b7b2-4fbf-bef7-0aabda586536"
/>

DAP/Neotest debugging the sample code:
<img width="2548" height="1461" alt="image"
src="https://github.com/user-attachments/assets/b70a9498-041e-48c8-8e7c-78a828d0e17d"
/>



## Attachments
[Sample Project ZIP
Archive](https://github.com/user-attachments/files/22576868/FsSample.zip)

```
sudo pacman -S --needed curl unzip dotnet-sdk # or whatever package manger is on system
curl -O -L "https://github.com/user-attachments/files/22576868/FsSample.zip"
unzip FsSample.zip
cd FsSample
dotnet build  # restoring/building fixes LSP errors
```

## Checklist

- [X] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

Co-authored-by: Christoph Schmidpeter <christoph.schmidpeter@gmail.com>
---
 lua/lazyvim/plugins/extras/lang/omnisharp.lua | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/omnisharp.lua b/lua/lazyvim/plugins/extras/lang/omnisharp.lua
index 63bbd486..af2daed6 100644
--- a/lua/lazyvim/plugins/extras/lang/omnisharp.lua
+++ b/lua/lazyvim/plugins/extras/lang/omnisharp.lua
@@ -1,15 +1,15 @@
 return {
   recommended = function()
     return LazyVim.extras.wants({
-      ft = { "cs", "vb" },
-      root = { "*.sln", "*.csproj", "omnisharp.json", "function.json" },
+      ft = { "cs", "vb", "fsharp" },
+      root = { "*.sln", "*.csproj", "*.fsproj", "omnisharp.json", "function.json", "paket.dependencies", "paket.lock" },
     })
   end,
 
   { "Hoffs/omnisharp-extended-lsp.nvim", lazy = true },
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = { ensure_installed = { "c_sharp" } },
+    opts = { ensure_installed = { "c_sharp", "fsharp" } },
   },
   {
     "nvimtools/none-ls.nvim",
@@ -18,6 +18,7 @@ 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,
   },
   {
@@ -26,12 +27,13 @@ return {
     opts = {
       formatters_by_ft = {
         cs = { "csharpier" },
+        fsharp = { "fantomas" },
       },
     },
   },
   {
     "mason-org/mason.nvim",
-    opts = { ensure_installed = { "csharpier", "netcoredbg" } },
+    opts = { ensure_installed = { "csharpier", "netcoredbg", "fsautocomplete", "fantomas" } },
   },
   {
     "neovim/nvim-lspconfig",

From d44f8bf317b59d10d22331d70fe25de379108b26 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 20 Oct 2025 08:36:01 +0200
Subject: [PATCH 320/341] test: fix mason in extra tests

---
 tests/extras/extra_spec.lua | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/extras/extra_spec.lua b/tests/extras/extra_spec.lua
index 2a4a9bc8..2aa30179 100644
--- a/tests/extras/extra_spec.lua
+++ b/tests/extras/extra_spec.lua
@@ -26,8 +26,15 @@ describe("Extra", function()
     return not vim.tbl_contains(ignore, extra.modname)
   end, extras)
 
+  require("mason").setup()
+  local mr = require("mason-registry")
+  mr.refresh()
+
   local lsp_to_pkg = {}
   lsp_to_pkg = require("mason-lspconfig.mappings").get_mason_map().lspconfig_to_package
+  it("can get lspconfig to package map", function()
+    assert(not vim.tbl_isempty(lsp_to_pkg), "Could not get lspconfig to package map")
+  end)
 
   local tsspec = Plugin.Spec.new({
     import = "lazyvim.plugins.treesitter",

From 37ecd06fad65d5c188ad2d2e55d47a8fd1594d16 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 20 Oct 2025 08:46:45 +0200
Subject: [PATCH 321/341] feat(extras): automatically update lazyvim.json for
 renamed or deprecated extras

---
 lua/lazyvim/plugins/xtras.lua | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/lua/lazyvim/plugins/xtras.lua b/lua/lazyvim/plugins/xtras.lua
index 5db08ef1..8f65f00a 100644
--- a/lua/lazyvim/plugins/xtras.lua
+++ b/lua/lazyvim/plugins/xtras.lua
@@ -25,12 +25,29 @@ 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
-  local def = defaults[extra]
-  if not (def and def.enabled == false) then
-    extras[#extras + 1] = extra
+  if LazyVim.plugin.renamed_extras[extra] then
+    extra = LazyVim.plugin.renamed_extras[extra]
+    changed = true
   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

From 1b2e6e8986b3cfee19635920129fc08df4f32b38 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 20 Oct 2025 08:47:38 +0200
Subject: [PATCH 322/341] feat(extras): renamed extra omnisharp -> dotnet +
 added fautocomplete to lspconfig

---
 .../extras/lang/{omnisharp.lua => dotnet.lua}     |  3 ++-
 lua/lazyvim/util/plugin.lua                       | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 rename lua/lazyvim/plugins/extras/lang/{omnisharp.lua => dotnet.lua} (96%)

diff --git a/lua/lazyvim/plugins/extras/lang/omnisharp.lua b/lua/lazyvim/plugins/extras/lang/dotnet.lua
similarity index 96%
rename from lua/lazyvim/plugins/extras/lang/omnisharp.lua
rename to lua/lazyvim/plugins/extras/lang/dotnet.lua
index af2daed6..433ab154 100644
--- a/lua/lazyvim/plugins/extras/lang/omnisharp.lua
+++ b/lua/lazyvim/plugins/extras/lang/dotnet.lua
@@ -33,12 +33,13 @@ return {
   },
   {
     "mason-org/mason.nvim",
-    opts = { ensure_installed = { "csharpier", "netcoredbg", "fsautocomplete", "fantomas" } },
+    opts = { ensure_installed = { "csharpier", "netcoredbg", "fantomas" } },
   },
   {
     "neovim/nvim-lspconfig",
     opts = {
       servers = {
+        fsautocomplete = {},
         omnisharp = {
           handlers = {
             ["textDocument/definition"] = function(...)
diff --git a/lua/lazyvim/util/plugin.lua b/lua/lazyvim/util/plugin.lua
index 58063385..02e6834f 100644
--- a/lua/lazyvim/util/plugin.lua
+++ b/lua/lazyvim/util/plugin.lua
@@ -26,6 +26,9 @@ M.deprecated_extras = {
   Either use `basedpyright`, or copy the [old extra](https://github.com/LazyVim/LazyVim/blob/c1f5fcf9c7ed2659c9d5ac41b3bb8a93e0a3c6a0/lua/lazyvim/plugins/extras/lang/python-semshi.lua#L1) to your own config.
   ]],
 }
+M.renamed_extras = {
+  ["lazyvim.plugins.extras.lang.omnisharp"] = "lazyvim.plugins.extras.lang.dotnet",
+}
 
 M.deprecated_modules = {}
 
@@ -94,6 +97,18 @@ function M.fix_imports()
         return false
       end
     end
+    local rename = M.renamed_extras[spec.import]
+    if rename then
+      LazyVim.warn(
+        ("The extra `%s` was renamed to `%s`.\nPlease update your config for `%s`"):format(
+          spec.import,
+          rename,
+          spec.importing or "LazyVim"
+        ),
+        { title = "LazyVim" }
+      )
+      spec.import = rename
+    end
     local dep = M.deprecated_extras[spec and spec.import]
     if dep then
       dep = dep .. "\n" .. "Please remove the extra from `lazyvim.json` to hide this warning."

From e38944799e7fc45baea0483f5c955472f3ffde27 Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Mon, 20 Oct 2025 09:52:12 +0300
Subject: [PATCH 323/341] fix(util.project): different mapping on dashboard
 than `snacks.projects` (#5737)

## Description
Different mapping and description to not be confused with
`snacks.projects`.
<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

## Related Issue(s)
Fixes #5736
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/util/project.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/util/project.lua b/lua/lazyvim/plugins/extras/util/project.lua
index dafaa594..f033bd1f 100644
--- a/lua/lazyvim/plugins/extras/util/project.lua
+++ b/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", pick)
+      local button = dashboard.button("P", " " .. " Projects (util.project)", 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",
+          name = "Projects (util.project)",
           action = pick,
           section = string.rep(" ", 22) .. "Telescope",
         },
@@ -157,9 +157,9 @@ return {
       end
       local projects = {
         action = pick,
-        desc = " Projects",
+        desc = " Projects (util.project)",
         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",
+        desc = "Projects (util.project)",
         icon = " ",
-        key = "p",
+        key = "P",
       })
     end,
   },

From d27e7adb535a2025a28082433f5740df7337e0de Mon Sep 17 00:00:00 2001
From: Grzegorz Aleksander Klementowski <grzegorz.aleksander@klementowski.pl>
Date: Mon, 20 Oct 2025 08:59:40 +0200
Subject: [PATCH 324/341] Added Polish translation of README (README-PL.md)
 (#5816)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added Polish translation of README (README-PL.md):

<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-PL.md | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 README-PL.md

diff --git a/README-PL.md b/README-PL.md
new file mode 100644
index 00000000..912e971e
--- /dev/null
+++ b/README-PL.md
@@ -0,0 +1,147 @@
+<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).

From 8c5cc771071d6134cd225c4d4f0897ca80a354b3 Mon Sep 17 00:00:00 2001
From: Thomas Ung <tomkimsour@hotmail.fr>
Date: Mon, 20 Oct 2025 09:01:17 +0200
Subject: [PATCH 325/341] docs(fr): add readme in french (#5300)

## Description

Contribution for https://github.com/LazyVim/LazyVim/discussions/506


## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 README-FR.md | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 151 insertions(+)
 create mode 100644 README-FR.md

diff --git a/README-FR.md b/README-FR.md
new file mode 100644
index 00000000..db06a251
--- /dev/null
+++ b/README-FR.md
@@ -0,0 +1,151 @@
+<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)

From f118dca334d40cf8e78e0f0d5aa3108b972e8d84 Mon Sep 17 00:00:00 2001
From: Watson Dinh <ping@w47s0n.com>
Date: Mon, 20 Oct 2025 02:04:35 -0500
Subject: [PATCH 326/341] fix(extras.lang): fix Scala extra by using nvimMetals
 only (#5726)

## Description
Scala lang Extra should NOT be configured via `neovim/nvim-lspconfig`.
This PR removes `neovim/nvim-lspconfig` config and replace it by
`nvim-metals` only. From [nvim-metals
README.md](https://github.com/scalameta/nvim-metals): _"NOTE: This
plugin works without needing to install neovim/nvim-lspconfig. If you
have it installed for other languages, that's not a problem, but make
sure you do not have Metals configured through nvim-lspconfig while
using this plugin"_

## Related Issue(s)

No specific issue, this is attempt to follow users guide of Scala nvim
plugin : https://github.com/scalameta/nvim-metals

## Screenshots

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/scala.lua | 116 +++++++++++-----------
 1 file changed, 60 insertions(+), 56 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/scala.lua b/lua/lazyvim/plugins/extras/lang/scala.lua
index 791b515a..3aed9b79 100644
--- a/lua/lazyvim/plugins/extras/lang/scala.lua
+++ b/lua/lazyvim/plugins/extras/lang/scala.lua
@@ -11,66 +11,70 @@ return {
   },
   {
     "scalameta/nvim-metals",
-    ft = { "scala", "sbt" },
-    config = function() 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
+    dependencies = {
+      "nvim-lua/plenary.nvim",
+    },
+    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,
+  },
   {
     "mfussenegger/nvim-dap",
     optional = true,

From 83468be35062d06896c233d90d2f1c1cd24d84f3 Mon Sep 17 00:00:00 2001
From: Yiqian Liu <yiqian0904@gmail.com>
Date: Mon, 20 Oct 2025 08:10:08 +0100
Subject: [PATCH 327/341] fix(keymap): remove select mode remaps of printable
 characters (#6296)

## Description

Most of the "visual mode" mappings use "v" instead of "x", and therefore
also affect select mode.
If the key is a printable character, it is now unusable in select mode.
This is most prominent with `<leader>`, which is space by default, a
printable character.

The most common use of select mode is when it is automatically triggered
by snippets. Currently, trying to type space, g, <, >, etc. as the first
character of a snippet field will trigger their bind instead of actually
inserting the character.

I cannot currently think of any good reason why anyone would rely on
using select mode to execute any of these mapped actions.

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/config/keymaps.lua                      |  6 +++---
 lua/lazyvim/plugins/editor.lua                      |  8 ++++----
 lua/lazyvim/plugins/extras/ai/copilot-chat.lua      | 10 +++++-----
 lua/lazyvim/plugins/extras/coding/mini-surround.lua |  2 +-
 lua/lazyvim/plugins/extras/dap/core.lua             |  2 +-
 lua/lazyvim/plugins/extras/editor/dial.lua          |  4 ++--
 lua/lazyvim/plugins/extras/editor/fzf.lua           |  4 ++--
 lua/lazyvim/plugins/extras/editor/telescope.lua     |  4 ++--
 lua/lazyvim/plugins/extras/lang/clojure.lua         |  4 ++--
 lua/lazyvim/plugins/extras/lang/java.lua            |  2 +-
 lua/lazyvim/plugins/extras/lang/r.lua               |  4 ++--
 lua/lazyvim/plugins/formatting.lua                  |  2 +-
 lua/lazyvim/plugins/lsp/keymaps.lua                 |  4 ++--
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/lua/lazyvim/config/keymaps.lua b/lua/lazyvim/config/keymaps.lua
index d8d7a10f..52bb9e9f 100644
--- a/lua/lazyvim/config/keymaps.lua
+++ b/lua/lazyvim/config/keymaps.lua
@@ -81,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("v", "<", "<gv")
-map("v", ">", ">gv")
+map("x", "<", "<gv")
+map("x", ">", ">gv")
 
 -- commenting
 map("n", "gco", "o<esc>Vcx<esc><cmd>normal gcc<cr>fxa<bs>", { desc = "Add Comment Below" })
@@ -114,7 +114,7 @@ map("n", "[q", vim.cmd.cprev, { desc = "Previous Quickfix" })
 map("n", "]q", vim.cmd.cnext, { desc = "Next Quickfix" })
 
 -- formatting
-map({ "n", "v" }, "<leader>cf", function()
+map({ "n", "x" }, "<leader>cf", function()
   LazyVim.format({ force = true })
 end, { desc = "Format" })
 
diff --git a/lua/lazyvim/plugins/editor.lua b/lua/lazyvim/plugins/editor.lua
index 6e2c894e..ce7a068c 100644
--- a/lua/lazyvim/plugins/editor.lua
+++ b/lua/lazyvim/plugins/editor.lua
@@ -18,7 +18,7 @@ return {
             },
           })
         end,
-        mode = { "n", "v" },
+        mode = { "n", "x" },
         desc = "Search and Replace",
       },
     },
@@ -64,7 +64,7 @@ return {
       defaults = {},
       spec = {
         {
-          mode = { "n", "v" },
+          mode = { "n", "x" },
           { "<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", "v" }, "<leader>ghs", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
-        map({ "n", "v" }, "<leader>ghr", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
+        map({ "n", "x" }, "<leader>ghs", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
+        map({ "n", "x" }, "<leader>ghr", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
         map("n", "<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")
diff --git a/lua/lazyvim/plugins/extras/ai/copilot-chat.lua b/lua/lazyvim/plugins/extras/ai/copilot-chat.lua
index 4c350b4e..536a4e62 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot-chat.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot-chat.lua
@@ -20,14 +20,14 @@ return {
     end,
     keys = {
       { "<c-s>", "<CR>", ft = "copilot-chat", desc = "Submit Prompt", remap = true },
-      { "<leader>a", "", desc = "+ai", mode = { "n", "v" } },
+      { "<leader>a", "", desc = "+ai", mode = { "n", "x" } },
       {
         "<leader>aa",
         function()
           return require("CopilotChat").toggle()
         end,
         desc = "Toggle (CopilotChat)",
-        mode = { "n", "v" },
+        mode = { "n", "x" },
       },
       {
         "<leader>ax",
@@ -35,7 +35,7 @@ return {
           return require("CopilotChat").reset()
         end,
         desc = "Clear (CopilotChat)",
-        mode = { "n", "v" },
+        mode = { "n", "x" },
       },
       {
         "<leader>aq",
@@ -49,7 +49,7 @@ return {
           end)
         end,
         desc = "Quick Chat (CopilotChat)",
-        mode = { "n", "v" },
+        mode = { "n", "x" },
       },
       {
         "<leader>ap",
@@ -57,7 +57,7 @@ return {
           require("CopilotChat").select_prompt()
         end,
         desc = "Prompt Actions (CopilotChat)",
-        mode = { "n", "v" },
+        mode = { "n", "x" },
       },
     },
     config = function(_, opts)
diff --git a/lua/lazyvim/plugins/extras/coding/mini-surround.lua b/lua/lazyvim/plugins/extras/coding/mini-surround.lua
index 19c5de8f..bea4ece7 100644
--- a/lua/lazyvim/plugins/extras/coding/mini-surround.lua
+++ b/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", "v" } },
+      { opts.mappings.add, desc = "Add Surrounding", mode = { "n", "x" } },
       { opts.mappings.delete, desc = "Delete Surrounding" },
       { opts.mappings.find, desc = "Find Right Surrounding" },
       { opts.mappings.find_left, desc = "Find Left Surrounding" },
diff --git a/lua/lazyvim/plugins/extras/dap/core.lua b/lua/lazyvim/plugins/extras/dap/core.lua
index d84b71bf..aaabce8d 100644
--- a/lua/lazyvim/plugins/extras/dap/core.lua
+++ b/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", "v"} },
+      { "<leader>de", function() require("dapui").eval() end, desc = "Eval", mode = {"n", "x"} },
     },
     opts = {},
     config = function(_, opts)
diff --git a/lua/lazyvim/plugins/extras/editor/dial.lua b/lua/lazyvim/plugins/extras/editor/dial.lua
index 602b747c..7a9a76ae 100644
--- a/lua/lazyvim/plugins/extras/editor/dial.lua
+++ b/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", "v"} },
-    { "g<C-x>", function() return M.dial(false, true) end, expr = true, desc = "Decrement", mode = {"n", "v"} },
+    { "g<C-a>", function() return M.dial(true, true) end, expr = true, desc = "Increment", mode = {"n", "x"} },
+    { "g<C-x>", function() return M.dial(false, true) end, expr = true, desc = "Decrement", mode = {"n", "x"} },
   },
   opts = function()
     local augend = require("dial.augend")
diff --git a/lua/lazyvim/plugins/extras/editor/fzf.lua b/lua/lazyvim/plugins/extras/editor/fzf.lua
index 5e10fc58..46e99ace 100644
--- a/lua/lazyvim/plugins/extras/editor/fzf.lua
+++ b/lua/lazyvim/plugins/extras/editor/fzf.lua
@@ -253,8 +253,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 = "v", desc = "Selection (Root Dir)" },
-      { "<leader>sW", LazyVim.pick("grep_visual", { root = false }), mode = "v", desc = "Selection (cwd)" },
+      { "<leader>sw", LazyVim.pick("grep_visual"), mode = "x", desc = "Selection (Root Dir)" },
+      { "<leader>sW", LazyVim.pick("grep_visual", { root = false }), mode = "x", desc = "Selection (cwd)" },
       { "<leader>uC", LazyVim.pick("colorschemes"), desc = "Colorscheme with Preview" },
       {
         "<leader>ss",
diff --git a/lua/lazyvim/plugins/extras/editor/telescope.lua b/lua/lazyvim/plugins/extras/editor/telescope.lua
index 685f9ec5..0f5ee474 100644
--- a/lua/lazyvim/plugins/extras/editor/telescope.lua
+++ b/lua/lazyvim/plugins/extras/editor/telescope.lua
@@ -136,8 +136,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 = "v", desc = "Selection (Root Dir)" },
-      { "<leader>sW", LazyVim.pick("grep_string", { root = false }), mode = "v", desc = "Selection (cwd)" },
+      { "<leader>sw", LazyVim.pick("grep_string"), mode = "x", desc = "Selection (Root Dir)" },
+      { "<leader>sW", LazyVim.pick("grep_string", { root = false }), mode = "x", desc = "Selection (cwd)" },
       { "<leader>uC", LazyVim.pick("colorscheme", { enable_preview = true }), desc = "Colorscheme with Preview" },
       {
         "<leader>ss",
diff --git a/lua/lazyvim/plugins/extras/lang/clojure.lua b/lua/lazyvim/plugins/extras/lang/clojure.lua
index c7af0b55..4c47c623 100644
--- a/lua/lazyvim/plugins/extras/lang/clojure.lua
+++ b/lua/lazyvim/plugins/extras/lang/clojure.lua
@@ -76,13 +76,13 @@ return {
           end
 
           vim.keymap.set(
-            { "n", "v" },
+            { "n", "x" },
             "[c",
             "<CMD>call search('^; -\\+$', 'bw')<CR>",
             { silent = true, buffer = true, desc = "Jumps to the begining of previous evaluation output." }
           )
           vim.keymap.set(
-            { "n", "v" },
+            { "n", "x" },
             "]c",
             "<CMD>call search('^; -\\+$', 'w')<CR>",
             { silent = true, buffer = true, desc = "Jumps to the begining of next evaluation output." }
diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua
index 72f31a63..b86688b1 100644
--- a/lua/lazyvim/plugins/extras/lang/java.lua
+++ b/lua/lazyvim/plugins/extras/lang/java.lua
@@ -209,7 +209,7 @@ return {
             })
             wk.add({
               {
-                mode = "v",
+                mode = "x",
                 buffer = args.buf,
                 { "<leader>cx", group = "extract" },
                 {
diff --git a/lua/lazyvim/plugins/extras/lang/r.lua b/lua/lazyvim/plugins/extras/lang/r.lua
index f8feb0ea..5890b415 100644
--- a/lua/lazyvim/plugins/extras/lang/r.lua
+++ b/lua/lazyvim/plugins/extras/lang/r.lua
@@ -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("v", "<Enter>", "<Plug>RSendSelection", { buffer = true })
+          vim.keymap.set("x", "<Enter>", "<Plug>RSendSelection", { buffer = true })
 
           local wk = require("which-key")
           wk.add({
             buffer = true,
-            mode = { "n", "v" },
+            mode = { "n", "x" },
             { "<localleader>a", group = "all" },
             { "<localleader>b", group = "between marks" },
             { "<localleader>c", group = "chunks" },
diff --git a/lua/lazyvim/plugins/formatting.lua b/lua/lazyvim/plugins/formatting.lua
index ae32c0ef..9aee291e 100644
--- a/lua/lazyvim/plugins/formatting.lua
+++ b/lua/lazyvim/plugins/formatting.lua
@@ -29,7 +29,7 @@ return {
         function()
           require("conform").format({ formatters = { "injected" }, timeout_ms = 3000 })
         end,
-        mode = { "n", "v" },
+        mode = { "n", "x" },
         desc = "Format Injected Langs",
       },
     },
diff --git a/lua/lazyvim/plugins/lsp/keymaps.lua b/lua/lazyvim/plugins/lsp/keymaps.lua
index 9cde08c1..63be2902 100644
--- a/lua/lazyvim/plugins/lsp/keymaps.lua
+++ b/lua/lazyvim/plugins/lsp/keymaps.lua
@@ -22,8 +22,8 @@ function M.get()
       { "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>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" },

From 8db9c75e8d3a8609926dcb868d2e462e0f0b1d3d Mon Sep 17 00:00:00 2001
From: Jose Storopoli <jose@storopoli.com>
Date: Mon, 20 Oct 2025 02:47:54 -0500
Subject: [PATCH 328/341] feat(extras): utils: add `gh.nvim` (#6250)

## Description

Adds [`gh.nvim`](https://github.com/ldelossa/gh.nvim) to the extras.

`gh.nvim` brings a way richer reviewer interface to NeoVim by supporting
LSP and treesitter natively in review diff buffers.
I've been using successfully for a couple weeks instead of `Octo.nvim`.

## Related Issue(s)

None

## Screenshots

<img width="580" height="760" alt="CleanShot 2025-07-13 at 08 02 10@2x"
src="https://github.com/user-attachments/assets/ebee1a54-1c3e-4248-8a09-eba65c838351"
/>


## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

---------

Co-authored-by: Folke Lemaitre <folke.lemaitre@gmail.com>
---
 lua/lazyvim/plugins/extras/util/gh.lua | 51 ++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 lua/lazyvim/plugins/extras/util/gh.lua

diff --git a/lua/lazyvim/plugins/extras/util/gh.lua b/lua/lazyvim/plugins/extras/util/gh.lua
new file mode 100644
index 00000000..a869227e
--- /dev/null
+++ b/lua/lazyvim/plugins/extras/util/gh.lua
@@ -0,0 +1,51 @@
+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" },
+    },
+  },
+}

From 82382f455ad37bc4fa928fe4a6fb9379a924fa3a Mon Sep 17 00:00:00 2001
From: Jose Storopoli <jose@storopoli.com>
Date: Mon, 20 Oct 2025 03:17:31 -0500
Subject: [PATCH 329/341] feat(haskell): update `haskell-tools` version and add
 formatters + linters (#6230)

## Description

- Updates `haskell-tools` to use the recommended version in the plugin's
README
- Adds `ormolu` as a formatter
- Adds keybindings for `haskell-tools` that does not conflict with
LazyVim's defaults.

## Related Issue(s)

-
https://github.com/LazyVim/LazyVim/discussions/3325#discussioncomment-9562683:
adds `ormolu` formatter.
- https://github.com/LazyVim/LazyVim/pull/2052#issuecomment-2881764491:
@mrcjkb keeps getting bug reports because the version is still in `3`
and should be updated to `6`.

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

---------

Co-authored-by: Folke Lemaitre <folke.lemaitre@gmail.com>
Co-authored-by: Claude <noreply@anthropic.com>
---
 lua/lazyvim/plugins/extras/lang/haskell.lua | 92 ++++++++++++++++-----
 1 file changed, 73 insertions(+), 19 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/haskell.lua b/lua/lazyvim/plugins/extras/lang/haskell.lua
index 48634f2d..cf4f3db6 100644
--- a/lua/lazyvim/plugins/extras/lang/haskell.lua
+++ b/lua/lazyvim/plugins/extras/lang/haskell.lua
@@ -14,17 +14,40 @@ return {
 
   {
     "mrcjkb/haskell-tools.nvim",
-    version = "^3",
+    version = false,
     ft = { "haskell", "lhaskell", "cabal", "cabalproject" },
-    dependencies = {
-      { "nvim-telescope/telescope.nvim", optional = true },
+    keys = {
+      {
+        "<localleader>e",
+        "<cmd>HlsEvalAll<cr>",
+        ft = "haskell",
+        desc = "Evaluate All",
+      },
+      {
+        "<localleader>h",
+        function()
+          require("haskell-tools").hoogle.hoogle_signature()
+        end,
+        ft = "haskell",
+        desc = "Hoogle Signature",
+      },
+      {
+        "<localleader>r",
+        function()
+          require("haskell-tools").repl.toggle()
+        end,
+        ft = "haskell",
+        desc = "REPL (Package)",
+      },
+      {
+        "<localleader>R",
+        function()
+          require("haskell-tools").repl.toggle(vim.api.nvim_buf_get_name(0))
+        end,
+        ft = "haskell",
+        desc = "REPL (Buffer)",
+      },
     },
-    config = function()
-      local ok, telescope = pcall(require, "telescope")
-      if ok then
-        telescope.load_extension("ht")
-      end
-    end,
   },
 
   {
@@ -67,17 +90,48 @@ return {
   },
 
   {
-    "luc-tielen/telescope_hoogle",
-    ft = { "haskell", "lhaskell", "cabal", "cabalproject" },
-    dependencies = {
-      { "nvim-telescope/telescope.nvim", optional = true },
+    "nvim-telescope/telescope.nvim",
+    optional = true,
+    specs = {
+      {
+        "luc-tielen/telescope_hoogle",
+        ft = { "haskell", "lhaskell", "cabal", "cabalproject" },
+        opts = function()
+          LazyVim.on_load("telescope.nvim", function()
+            require("telescope").load_extension("ht")
+          end)
+        end,
+        keys = {
+          {
+            "<localleader>H",
+            "<cmd>Telescope hoogle<cr>",
+            ft = "haskell",
+            desc = "Hoogle",
+          },
+        },
+      },
+    },
+  },
+
+  {
+    "stevearc/conform.nvim",
+    optional = true,
+    opts = {
+      formatters_by_ft = {
+        haskell = { "fourmolu" },
+        cabal = { "cabal_fmt" },
+      },
+    },
+  },
+
+  {
+    "mfussenegger/nvim-lint",
+    optional = true,
+    opts = {
+      linters_by_ft = {
+        haskell = { "hlint" },
+      },
     },
-    config = function()
-      local ok, telescope = pcall(require, "telescope")
-      if ok then
-        telescope.load_extension("hoogle")
-      end
-    end,
   },
 
   -- Make sure lspconfig doesn't start hls,

From a6eb51e5b5897749bed8721ce98cd2491b2ea8e2 Mon Sep 17 00:00:00 2001
From: Halibut Git Wiz <19535471+HalibutGitWiz@users.noreply.github.com>
Date: Mon, 20 Oct 2025 08:19:38 +0000
Subject: [PATCH 330/341] feat(extras): added twig language (#5464)

## Description

Adds Twig templates language support as en extra.

Explanation for the tools choices:
- Linter/formatter: Twigcs and Twig-cs-fixer both follow the [coding
standards](https://twig.symfony.com/doc/3.x/coding_standards.html)
recommended by the Symfony Project, maintainers of Twig.
- LSP: I don't know it Twiggy is considered a standard in the community.
I picked it because it's the only server specific to Twig. The other
options are HTML servers that also include support for several templates
languages. I've been using it for a while and it works fine. It adds
much needed snippets (Twig syntax involves tags that are difficult to
type on most keyboards) and does not conflict with Twigcs diagnostics.

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

---------

Co-authored-by: tw <tw@pretexx.fr>
---
 lua/lazyvim/plugins/extras/lang/twig.lua | 58 ++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 lua/lazyvim/plugins/extras/lang/twig.lua

diff --git a/lua/lazyvim/plugins/extras/lang/twig.lua b/lua/lazyvim/plugins/extras/lang/twig.lua
new file mode 100644
index 00000000..ad2f260f
--- /dev/null
+++ b/lua/lazyvim/plugins/extras/lang/twig.lua
@@ -0,0 +1,58 @@
+return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = "twig",
+    })
+  end,
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = { ensure_installed = { "twig" } },
+  },
+  {
+    "williamboman/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" },
+      },
+    },
+  },
+}

From 645846be5c7d798c7e87e61d00e8cae4fd3741c7 Mon Sep 17 00:00:00 2001
From: Vo Quang Chien <voquangchien.dev@proton.me>
Date: Mon, 20 Oct 2025 15:23:30 +0700
Subject: [PATCH 331/341] feat(lang): add Typst language support (#4042)

## Description

This pull request introduces robust support for the
[Typst](https://github.com/typst/typst) language in LazyVim, enhancing
the Typst editing experience with several integrated tools:

1. **LSP Support**: Integrate with
[tinymist](https://github.com/Myriad-Dreamin/tinymist) provides
comprehensive LSP support.
2. **Code Formatting**: Integrate with
[typstyle](https://github.com/Enter-tainer/typstyle) for code
formatting.
3. **Preview Support**: Added
[typst-preview.nvim](https://github.com/chomosuke/typst-preview.nvim)
for live preview of Typst documents.

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

---------

Co-authored-by: Jose Storopoli <jose@storopoli.io>
Co-authored-by: Stefan Boca <45266795+stefanboca@users.noreply.github.com>
Co-authored-by: Folke Lemaitre <folke.lemaitre@gmail.com>
---
 lua/lazyvim/plugins/extras/lang/typst.lua | 80 +++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 lua/lazyvim/plugins/extras/lang/typst.lua

diff --git a/lua/lazyvim/plugins/extras/lang/typst.lua b/lua/lazyvim/plugins/extras/lang/typst.lua
new file mode 100644
index 00000000..099a6861
--- /dev/null
+++ b/lua/lazyvim/plugins/extras/lang/typst.lua
@@ -0,0 +1,80 @@
+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({
+                  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 */" },
+      },
+    },
+  },
+}

From 5d186c009a85efbdad2b92115d4268c7c4a7aa18 Mon Sep 17 00:00:00 2001
From: Jose Storopoli <jose@storopoli.com>
Date: Mon, 20 Oct 2025 03:24:12 -0500
Subject: [PATCH 332/341] feat(lang): julia support (#6231)

## Description

- Another take on #4436.
- Adds LSP
- Adds cmp and blink.cmp for LaTeX symbols

## Related Issue(s)

#5455

## Screenshots

![CleanShot 2025-07-05 at 08 05
01@2x](https://github.com/user-attachments/assets/36a6e5ac-2632-4a33-af9e-674b7f1b750d)

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/julia.lua | 66 +++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 lua/lazyvim/plugins/extras/lang/julia.lua

diff --git a/lua/lazyvim/plugins/extras/lang/julia.lua b/lua/lazyvim/plugins/extras/lang/julia.lua
new file mode 100644
index 00000000..067be457
--- /dev/null
+++ b/lua/lazyvim/plugins/extras/lang/julia.lua
@@ -0,0 +1,66 @@
+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
+            },
+          },
+        },
+      },
+    },
+  },
+}

From 2682ce0ab95c0a88867855ada41948107db8232e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Guimar=C3=A3es?= <george.guimaraes@gmail.com>
Date: Mon, 20 Oct 2025 05:47:17 -0300
Subject: [PATCH 333/341] feat(ai): add avante.nvim for a better AI experience
 (#4440)

I switched over to https://github.com/yetone/avante.nvim and I think
this is the best experience in terms of UI and easiness to add patches
to your code.

I'm recommending it to everyone.

~~However, I couldn't make render-markdown to work on Avante. It seems
that my spec here is running before the one defined in
extras/lang/markdown.lua and getting overwritten even though I added
`optional = true`. I'll try to dig in deeper, but if someone has any
pointers, I'd appreciate it.~~

  - Fixes #4394

---------

Co-authored-by: PatMulligan <43773168+PatMulligan@users.noreply.github.com>
Co-authored-by: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Co-authored-by: Folke Lemaitre <folke.lemaitre@gmail.com>
Co-authored-by: Claude <noreply@anthropic.com>
---
 lua/lazyvim/plugins/extras/ai/avante.lua | 86 ++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 lua/lazyvim/plugins/extras/ai/avante.lua

diff --git a/lua/lazyvim/plugins/extras/ai/avante.lua b/lua/lazyvim/plugins/extras/ai/avante.lua
new file mode 100644
index 00000000..2a11c87d
--- /dev/null
+++ b/lua/lazyvim/plugins/extras/ai/avante.lua
@@ -0,0 +1,86 @@
+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",
+      },
+    },
+    cmd = {
+      "AvanteAsk",
+      "AvanteBuild",
+      "AvanteChat",
+      "AvanteClear",
+      "AvanteEdit",
+      "AvanteFocus",
+      "AvanteHistory",
+      "AvanteModels",
+      "AvanteRefresh",
+      "AvanteShowRepoMap",
+      "AvanteStop",
+      "AvanteSwitchProvider",
+      "AvanteToggle",
+    },
+    keys = {
+      { "n", "<leader>aa", "<cmd>AvanteAsk<CR>", desc = "Ask Avante" },
+      { "n", "<leader>ac", "<cmd>AvanteChat<CR>", desc = "Chat with Avante" },
+      { "n", "<leader>ae", "<cmd>AvanteEdit<CR>", desc = "Edit Avante" },
+      { "n", "<leader>af", "<cmd>AvanteFocus<CR>", desc = "Focus Avante" },
+      { "n", "<leader>ah", "<cmd>AvanteHistory<CR>", desc = "Avante History" },
+      { "n", "<leader>am", "<cmd>AvanteModels<CR>", desc = "Select Avante Model" },
+      { "n", "<leader>an", "<cmd>AvanteChatNew<CR>", desc = "New Avante Chat" },
+      { "n", "<leader>ap", "<cmd>AvanteSwitchProvider<CR>", desc = "Switch Avante Provider" },
+      { "n", "<leader>ar", "<cmd>AvanteRefresh<CR>", desc = "Refresh Avante" },
+      { "n", "<leader>as", "<cmd>AvanteStop<CR>", desc = "Stop Avante" },
+      { "n", "<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" } },
+      },
+    },
+  },
+}

From 64377ba4de92efe293b9cf1fd79eb73a021dc010 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 20 Oct 2025 10:55:05 +0200
Subject: [PATCH 334/341] test: detect old refs to plugins in extras

---
 tests/extras/extra_spec.lua | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/extras/extra_spec.lua b/tests/extras/extra_spec.lua
index 2aa30179..f383c4b9 100644
--- a/tests/extras/extra_spec.lua
+++ b/tests/extras/extra_spec.lua
@@ -1,4 +1,5 @@
 ---@module 'luassert'
+---@module 'lazy'
 
 local Icons = require("mini.icons")
 
@@ -72,6 +73,17 @@ describe("Extra", function()
         { "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } },
         mod,
       }, { optional = true })
+
+      it("it has no renamed plugins", function()
+        for _, p in pairs(spec.plugins) do
+          local short_url = p[1]
+          assert(
+            not LazyVim.plugin.renames[short_url],
+            "Plugin " .. short_url .. " has been renamed to " .. (LazyVim.plugin.renames[short_url] or "")
+          )
+        end
+      end)
+
       local lspconfig = spec.plugins["nvim-lspconfig"]
       if lspconfig then
         it("does not install LSP servers with mason.nvim", function()

From 9d345dec446f577f75d36a147164ae258ffc2d8c Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 20 Oct 2025 10:55:37 +0200
Subject: [PATCH 335/341] fix(twig): correct mason url

---
 lua/lazyvim/plugins/extras/lang/twig.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/twig.lua b/lua/lazyvim/plugins/extras/lang/twig.lua
index ad2f260f..b4643fb7 100644
--- a/lua/lazyvim/plugins/extras/lang/twig.lua
+++ b/lua/lazyvim/plugins/extras/lang/twig.lua
@@ -9,7 +9,7 @@ return {
     opts = { ensure_installed = { "twig" } },
   },
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = {
       ensure_installed = {
         "twigcs",

From d2f9885d6b8244818066cc16a5c72cb656748f6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B8rn=20Vatn?= <torbjorn@carrot.tech>
Date: Mon, 20 Oct 2025 11:07:12 +0200
Subject: [PATCH 336/341] fix(tailwind): additional settings (#5266)

Make it possible to define your own tailwind settings in opts, and merge
them with the default, additional Phoenix settings in tailwind.lua

## Description

Add the possibility to add your own tailwind settings in opts and have
them deep merged into the default `opts.settings`

I needed this for configuring support for tailwind when coding on a
[htmgo](https://htmgo.dev/docs/misc/tailwind-intellisense) project in
Neovim.

E.g.
```lua
return {
  "neovim/nvim-lspconfig",
  opts = {
    servers = {
      tailwindcss = {
        filetypes_include = { "go" },
        settings = {
          tailwindCSS = {
            includeLanguages = {
              go = "html",
            },
            experimental = {
              classRegex = {
                { "Class\\(([^)]*)\\)", '["`]([^"`]*)["`]' },
                { "ClassX\\(([^)]*)\\)", '["`]([^"`]*)["`]' },
                { "ClassIf\\(([^)]*)\\)", '["`]([^"`]*)["`]' },
                { "Classes\\(([^)]*)\\)", '["`]([^"`]*)["`]' },
              },
            },
          },
        },
      },
    },
  },
}
```

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/tailwind.lua | 25 +++++++++++---------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/tailwind.lua b/lua/lazyvim/plugins/extras/lang/tailwind.lua
index 3c7b3fac..f196983d 100644
--- a/lua/lazyvim/plugins/extras/lang/tailwind.lua
+++ b/lua/lazyvim/plugins/extras/lang/tailwind.lua
@@ -24,6 +24,20 @@ 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 = {
@@ -39,17 +53,6 @@ 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,

From 4d0d87f6268969987e5c58f59e086c886e77e1ae Mon Sep 17 00:00:00 2001
From: snailed <luca@bil.ke>
Date: Mon, 20 Oct 2025 11:09:29 +0200
Subject: [PATCH 337/341] fix(helm): broken helm highlighting (#5335)

## Description

This PR replaces the towolf/vim-helm plugin with a newer, lua
implementation of the plugin. This fixes syntax highlighting and makes
the workaround for the ftdetect/lsp load order superfluous.

## Related Issue(s)

  - Fixes #5334

## Checklist

- [X] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/helm.lua | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/helm.lua b/lua/lazyvim/plugins/extras/lang/helm.lua
index 58d8bdc8..5c85d191 100644
--- a/lua/lazyvim/plugins/extras/lang/helm.lua
+++ b/lua/lazyvim/plugins/extras/lang/helm.lua
@@ -6,7 +6,8 @@ return {
     })
   end,
 
-  { "towolf/vim-helm", ft = "helm" },
+  { "qvalentin/helm-ls.nvim", ft = "helm" },
+
   {
     "nvim-treesitter/nvim-treesitter",
     opts = { ensure_installed = { "helm" } },
@@ -18,17 +19,6 @@ 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,
-      },
     },
   },
 }

From 248876adb6b1f54031be350e45bbf0c7835d486f Mon Sep 17 00:00:00 2001
From: Bahaa Mohamed <107966806+Bahaaio@users.noreply.github.com>
Date: Mon, 20 Oct 2025 12:12:20 +0300
Subject: [PATCH 338/341] feat(go): add linting with golangci-lint (#6311)

## Description

<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

Add Go linting support using
[golangci-lint](https://github.com/golangci/golangci-lint) and
nvim-lint.

- Installs golangci-lint via Mason.
- Configures nvim-lint to run it on Go files.

This improves the Go development experience by running a fast, popular
linter automatically

## Related Issue(s)

<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

None

## Screenshots

<!-- Add screenshots of the changes if applicable. -->

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/go.lua | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lua/lazyvim/plugins/extras/lang/go.lua b/lua/lazyvim/plugins/extras/lang/go.lua
index 77536fea..86f984f5 100644
--- a/lua/lazyvim/plugins/extras/lang/go.lua
+++ b/lua/lazyvim/plugins/extras/lang/go.lua
@@ -97,6 +97,22 @@ 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,

From 2cd46d42ba357a42b11c5e4f5e16641bde0516d6 Mon Sep 17 00:00:00 2001
From: pugud <171756217+pugud@users.noreply.github.com>
Date: Mon, 20 Oct 2025 18:20:05 +0900
Subject: [PATCH 339/341] feat(lang): add solidity language support (#4742)

## Description

### Summary

This PR adds comprehensive support for Solidity development in Neovim
using LazyVim. The following updates were made to streamline Solidity
development:
### Changes

1. **Solidity File Type Detection**
- Configured LazyVim to recognize Solidity projects by detecting
`foundry.toml`, `hardhat.config.js`, and `hardhat.config.ts` files.
2. **Treesitter Support for Solidity**
- Added `solidity` to the list of languages ensured by
`nvim-treesitter`, providing syntax highlighting and better code
structure understanding.
3. **Language Server Protocol (LSP) Setup**
- Configured `nvim-lspconfig` to support `solidity_ls` as the LSP for
Solidity files.
- Set up `root_dir` detection based on project files or a `.git`
directory to enable proper LSP functioning in Solidity projects.
4. **Solidity Formatter**
- Integrated `forge_fmt` as a formatter for Solidity files using
`conform.nvim`, which utilizes `forge fmt` to format code.

### Why use `forge fmt` instead of Prettier?

- **Prettier's Solidity support requires extra plugins**: Prettier does
not have native Solidity support and depends on
`prettier-plugin-solidity`. Even with
`vim.g.lazyvim_prettier_needs_config = false`, formatting won't work
unless a `.prettierrc` file is configured, creating unnecessary
complexity.
- **`forge fmt` is the native tool for Solidity development**: `Forge`
is a widely used tool within the Solidity ecosystem, especially when
working with Foundry. It provides built-in formatting with no extra
dependencies, making it simpler and more efficient to integrate.
- **Hardhat uses `prettier-plugin-solidity`**: For users of Hardhat,
`prettier-plugin-solidity` is required for code formatting. However, the
integration with Prettier might add complexity, while `forge fmt`
simplifies the process.
- **Future customization**: We may allow users to choose between
`prettier-plugin-solidity` and `forge fmt` for formatting in the future,
depending on their preferred tools.


### Testing

- Confirmed that Solidity files are detected and syntax-highlighted by
Treesitter.
- Verified LSP functionality for Solidity, including code navigation and
error detection.
- Tested `forge_fmt` for automatic code formatting on Solidity files.
### Motivation

These changes provide a smoother and more robust Solidity development
experience in Lazyvim, including syntax highlighting, code navigation,
and automatic formatting.

## Related Issue(s)
https://github.com/LazyVim/LazyVim/issues/1901

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

---------

Co-authored-by: Folke Lemaitre <folke.lemaitre@gmail.com>
---
 lua/lazyvim/plugins/extras/lang/solidity.lua | 42 ++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 lua/lazyvim/plugins/extras/lang/solidity.lua

diff --git a/lua/lazyvim/plugins/extras/lang/solidity.lua b/lua/lazyvim/plugins/extras/lang/solidity.lua
new file mode 100644
index 00000000..cbbc7b83
--- /dev/null
+++ b/lua/lazyvim/plugins/extras/lang/solidity.lua
@@ -0,0 +1,42 @@
+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
+  {
+    "conform.nvim",
+    opts = function(_, opts)
+      opts.formatters_by_ft = opts.formatters_by_ft or {}
+      opts.formatters_by_ft.solidity = { "forge_fmt" }
+
+      opts.formatters = {
+        forge_fmt = {
+          command = "forge",
+          args = { "fmt" },
+        },
+      }
+    end,
+  },
+}

From f4b08bb6044f57164efa5052ef51ff958672f524 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 20 Oct 2025 11:24:28 +0200
Subject: [PATCH 340/341] refactor(solidity): no need for opts to be a function

---
 lua/lazyvim/plugins/extras/lang/solidity.lua | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/solidity.lua b/lua/lazyvim/plugins/extras/lang/solidity.lua
index cbbc7b83..898ac076 100644
--- a/lua/lazyvim/plugins/extras/lang/solidity.lua
+++ b/lua/lazyvim/plugins/extras/lang/solidity.lua
@@ -26,17 +26,18 @@ return {
   },
   -- Formatter for Solidity
   {
-    "conform.nvim",
-    opts = function(_, opts)
-      opts.formatters_by_ft = opts.formatters_by_ft or {}
-      opts.formatters_by_ft.solidity = { "forge_fmt" }
-
-      opts.formatters = {
+    "stevearc/conform.nvim",
+    optional = true,
+    opts = {
+      formatters_by_ft = {
+        solidity = { "forge_fmt" },
+      },
+      formatters = {
         forge_fmt = {
           command = "forge",
           args = { "fmt" },
         },
-      }
-    end,
+      },
+    },
   },
 }

From 90f84e7e755f72bb99dc8a9dedbfef05e58eb09d Mon Sep 17 00:00:00 2001
From: Stanislav Zeman <zeman@standa.dev>
Date: Mon, 20 Oct 2025 11:27:52 +0200
Subject: [PATCH 341/341] feat(extras): add Dart language (#4749)

## Description

This PR add Dart language support to **extras** section.

## Testing

I checked that:
- the LSP correctly loads on Dart files and provides suggestions and
highlights errors
- `treesitter` parses the Dart language tree and highlights the code
- `conform` correctly formats Dart files using the built-in formatter
- `neotest` is capable of running Dart tests

## Checklist

- [x] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.
---
 lua/lazyvim/plugins/extras/lang/dart.lua | 45 ++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 lua/lazyvim/plugins/extras/lang/dart.lua

diff --git a/lua/lazyvim/plugins/extras/lang/dart.lua b/lua/lazyvim/plugins/extras/lang/dart.lua
new file mode 100644
index 00000000..1a27ae33
--- /dev/null
+++ b/lua/lazyvim/plugins/extras/lang/dart.lua
@@ -0,0 +1,45 @@
+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 = {
+        dart_format = {
+          args = { "format", "--line-length", "120" },
+        },
+      },
+      formatters_by_ft = {
+        dart = { "dart_format" },
+      },
+    },
+  },
+  {
+    "nvim-neotest/neotest",
+    optional = true,
+    dependencies = {
+      "sidlatau/neotest-dart",
+    },
+    opts = {
+      adapters = {
+        ["neotest-dart"] = {},
+      },
+    },
+  },
+}