diff --git a/config/neovim/config.lua b/config/neovim/config.lua
index 0c8f31a7..a4637f61 100644
--- a/config/neovim/config.lua
+++ b/config/neovim/config.lua
@@ -1,6 +1,6 @@
 -- Set up globals {{{
 do
-    local nixvim_globals = { ["mallocalleader"] = " ", ["mapleader"] = " " }
+    local nixvim_globals = { mallocalleader = " ", mapleader = " " }
 
     for k, v in pairs(nixvim_globals) do
         vim.g[k] = v
@@ -11,52 +11,52 @@ end
 -- Set up options {{{
 do
     local nixvim_options = {
-        ["autoindent"] = false,
-        ["backspace"] = { "indent", "eol", "start" },
-        ["cindent"] = true,
-        ["cinkeys"] = "0{,0},0),0],:,!^F,o,O,e",
-        ["completeopt"] = { "menuone", "noselect", "noinsert" },
-        ["confirm"] = true,
-        ["cursorline"] = true,
-        ["encoding"] = "utf-8",
-        ["expandtab"] = true,
-        ["fileencoding"] = "utf-8",
-        ["foldcolumn"] = "0",
-        ["foldenable"] = true,
-        ["foldlevel"] = 99,
-        ["foldlevelstart"] = 99,
-        ["formatexpr"] = "v:lua.require('conform').formatexpr()",
-        ["grepformat"] = "%f:%l:%c:%m",
-        ["grepprg"] = "rg --vimgrep",
-        ["hidden"] = true,
-        ["hlsearch"] = true,
-        ["ignorecase"] = true,
-        ["incsearch"] = true,
-        ["laststatus"] = 3,
-        ["mouse"] = "a",
-        ["number"] = true,
-        ["pumheight"] = 0,
-        ["relativenumber"] = true,
-        ["ruler"] = true,
-        ["scrolloff"] = 10,
-        ["sessionoptions"] = { "buffers", "curdir", "tabpages", "winsize", "help", "globals", "skiprtp", "folds" },
-        ["shiftwidth"] = 4,
-        ["showmode"] = false,
-        ["showtabline"] = 0,
-        ["signcolumn"] = "yes",
-        ["smartcase"] = true,
-        ["smartindent"] = false,
-        ["smarttab"] = true,
-        ["softtabstop"] = 4,
-        ["splitbelow"] = true,
-        ["splitright"] = true,
-        ["tabstop"] = 4,
-        ["termguicolors"] = true,
-        ["timeoutlen"] = 50,
-        ["undodir"] = "/home/lab/smchurla/.vim/undo",
-        ["undofile"] = true,
-        ["undolevels"] = 10000,
-        ["winblend"] = 30,
+        autoindent = false,
+        backspace = { "indent", "eol", "start" },
+        cindent = true,
+        cinkeys = "0{,0},0),0],:,!^F,o,O,e",
+        completeopt = { "menuone", "noselect", "noinsert" },
+        confirm = true,
+        cursorline = true,
+        encoding = "utf-8",
+        expandtab = true,
+        fileencoding = "utf-8",
+        foldcolumn = "0",
+        foldenable = true,
+        foldlevel = 99,
+        foldlevelstart = 99,
+        formatexpr = "v:lua.require('conform').formatexpr()",
+        grepformat = "%f:%l:%c:%m",
+        grepprg = "rg --vimgrep",
+        hidden = true,
+        hlsearch = true,
+        ignorecase = true,
+        incsearch = true,
+        laststatus = 3,
+        mouse = "a",
+        number = true,
+        pumheight = 0,
+        relativenumber = true,
+        ruler = true,
+        scrolloff = 10,
+        sessionoptions = { "buffers", "curdir", "tabpages", "winsize", "help", "globals", "skiprtp", "folds" },
+        shiftwidth = 4,
+        showmode = false,
+        showtabline = 0,
+        signcolumn = "yes",
+        smartcase = true,
+        smartindent = false,
+        smarttab = true,
+        softtabstop = 4,
+        splitbelow = true,
+        splitright = true,
+        tabstop = 4,
+        termguicolors = true,
+        timeoutlen = 50,
+        undodir = "/home/lab/smchurla/.vim/undo",
+        undofile = true,
+        undolevels = 10000,
+        winblend = 30,
     }
 
     for k, v in pairs(nixvim_options) do
@@ -79,7 +79,7 @@ require("lazy").setup({
     spec = {
         {
             "catppuccin",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("catppuccin").setup(opts)
 
                 vim.cmd([[
@@ -87,116 +87,116 @@ require("lazy").setup({
     colorscheme catppuccin
   ]])
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/catppuccin-nvim",
-            ["lazy"] = false,
-            ["name"] = "catppuccin",
-            ["opts"] = { ["background"] = { ["dark"] = "mocha", ["light"] = "latte" }, ["flavour"] = "mocha" },
-            ["priority"] = 1000,
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/catppuccin-nvim",
+            lazy = false,
+            name = "catppuccin",
+            opts = { background = { dark = "mocha", light = "latte" }, flavour = "mocha" },
+            priority = 1000,
         },
         {
             "nvim-web-devicons",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("nvim-web-devicons").setup(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-web-devicons",
-            ["lazy"] = true,
-            ["name"] = "nvim-web-devicons",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-web-devicons",
+            lazy = true,
+            name = "nvim-web-devicons",
         },
         {
             "nvim-autopairs",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("nvim-autopairs").setup(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-autopairs",
-            ["event"] = { "InsertEnter" },
-            ["lazy"] = true,
-            ["name"] = "nvim-autopairs",
-            ["opts"] = { ["check_ts"] = true },
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-autopairs",
+            event = { "InsertEnter" },
+            lazy = true,
+            name = "nvim-autopairs",
+            opts = { check_ts = true },
         },
         {
             "vim-bbye",
-            ["cmd"] = { "Bdelete", "Bwipeout" },
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/vim-bbye",
-            ["lazy"] = true,
-            ["name"] = "vim-bbye",
+            cmd = { "Bdelete", "Bwipeout" },
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/vim-bbye",
+            lazy = true,
+            name = "vim-bbye",
         },
         {
             "better_escape",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("better_escape").setup(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/better-escape.nvim",
-            ["event"] = { "InsertEnter" },
-            ["lazy"] = true,
-            ["name"] = "better_escape",
-            ["opts"] = { ["mapping"] = { "jk" }, ["timeout"] = 200 },
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/better-escape.nvim",
+            event = { "InsertEnter" },
+            lazy = true,
+            name = "better_escape",
+            opts = { mapping = { "jk" }, timeout = 200 },
         },
         {
             "clangd_extensions",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("clangd_extensions").setup(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/clangd_extensions.nvim",
-            ["lazy"] = true,
-            ["name"] = "clangd_extensions",
-            ["opts"] = { ["inlay_hints"] = { ["inline"] = false } },
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/clangd_extensions.nvim",
+            lazy = true,
+            name = "clangd_extensions",
+            opts = { inlay_hints = { inline = false } },
         },
         {
             "cmp",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("cmp").setup(opts)
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "cmp-async-path",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/cmp-async-path",
-                    ["lazy"] = true,
-                    ["name"] = "cmp-async-path",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/cmp-async-path",
+                    lazy = true,
+                    name = "cmp-async-path",
                 },
                 {
                     "cmp-buffer",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/cmp-buffer",
-                    ["enabled"] = false,
-                    ["lazy"] = true,
-                    ["name"] = "cmp-buffer",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/cmp-buffer",
+                    enabled = false,
+                    lazy = true,
+                    name = "cmp-buffer",
                 },
                 {
                     "cmp-cmdline",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/cmp-cmdline",
-                    ["enabled"] = false,
-                    ["lazy"] = true,
-                    ["name"] = "cmp-cmdline",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/cmp-cmdline",
+                    enabled = false,
+                    lazy = true,
+                    name = "cmp-cmdline",
                 },
                 {
                     "cmp-emoji",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/cmp-emoji",
-                    ["lazy"] = true,
-                    ["name"] = "cmp-emoji",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/cmp-emoji",
+                    lazy = true,
+                    name = "cmp-emoji",
                 },
                 {
                     "cmp-nvim-lsp",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/cmp-nvim-lsp",
-                    ["lazy"] = true,
-                    ["name"] = "cmp-nvim-lsp",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/cmp-nvim-lsp",
+                    lazy = true,
+                    name = "cmp-nvim-lsp",
                 },
                 {
                     "cmp-nvim-lsp-signature-help",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/cmp-nvim-lsp-signature-help",
-                    ["lazy"] = true,
-                    ["name"] = "cmp-nvim-lsp-signature-help",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/cmp-nvim-lsp-signature-help",
+                    lazy = true,
+                    name = "cmp-nvim-lsp-signature-help",
                 },
                 {
                     "cmp_luasnip",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/cmp_luasnip",
-                    ["lazy"] = true,
-                    ["name"] = "cmp_luasnip",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/cmp_luasnip",
+                    lazy = true,
+                    name = "cmp_luasnip",
                 },
             },
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-cmp",
-            ["event"] = { "InsertEnter" },
-            ["lazy"] = true,
-            ["name"] = "cmp",
-            ["opts"] = function()
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-cmp",
+            event = { "InsertEnter" },
+            lazy = true,
+            name = "cmp",
+            opts = function()
                 local cmp = require("cmp")
                 local luasnip = require("luasnip")
 
@@ -264,98 +264,98 @@ require("lazy").setup({
         },
         {
             "Comment",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("Comment").setup(opts)
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "ts_context_commentstring",
-                    ["config"] = function(_, opts)
+                    config = function(_, opts)
                         require("ts_context_commentstring").setup(opts)
                     end,
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-ts-context-commentstring",
-                    ["init"] = function()
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-ts-context-commentstring",
+                    init = function()
                         -- Skip compatibility checks
                         vim.g.skip_ts_context_commentstring_module = true
                     end,
-                    ["lazy"] = true,
-                    ["name"] = "ts_context_commentstring",
+                    lazy = true,
+                    name = "ts_context_commentstring",
                 },
             },
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/comment.nvim",
-            ["lazy"] = false,
-            ["name"] = "Comment",
-            ["opts"] = {
-                ["mappings"] = { ["basic"] = true, ["extra"] = false },
-                ["opleader"] = { ["block"] = "<C-b>", ["line"] = "<C-c>" },
-                ["pre_hook"] = function()
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/comment.nvim",
+            lazy = false,
+            name = "Comment",
+            opts = {
+                mappings = { basic = true, extra = false },
+                opleader = { block = "<C-b>", line = "<C-c>" },
+                pre_hook = function()
                     require("ts_context_commentstring.integrations.comment_nvim").create_pre_hook()
                 end,
-                ["toggler"] = { ["block"] = "<C-b>", ["line"] = "<C-c>" },
+                toggler = { block = "<C-b>", line = "<C-c>" },
             },
         },
         {
             "conform",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("conform").setup(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/conform.nvim",
-            ["event"] = { "BufReadPost", "BufNewFile" },
-            ["lazy"] = true,
-            ["name"] = "conform",
-            ["opts"] = {
-                ["format_on_save"] = function(bufnr)
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/conform.nvim",
+            event = { "BufReadPost", "BufNewFile" },
+            lazy = true,
+            name = "conform",
+            opts = {
+                format_on_save = function(bufnr)
                     -- Disable with a global or buffer-local variable
                     if vim.g.disable_autoformat then
                         return
                     end
                     return { timeout_ms = 500, lsp_fallback = true }
                 end,
-                ["formatters_by_ft"] = {
-                    ["c"] = { "clang-format" },
-                    ["cpp"] = { "clang-format" },
-                    ["css"] = { { "prettierd", "prettier" } },
-                    ["h"] = { "clang-format" },
-                    ["hpp"] = { "clang-format" },
-                    ["html"] = { { "prettierd", "prettier" } },
-                    ["java"] = { "google-java-format" },
-                    ["javascript"] = { { "prettierd", "prettier" } },
-                    ["lua"] = { "stylua" },
-                    ["markdown"] = { { "prettierd", "prettier" } },
-                    ["nix"] = { "alejandra" },
-                    ["python"] = { "black" },
-                    ["rust"] = { "rustfmt" },
+                formatters_by_ft = {
+                    c = { "clang-format" },
+                    cpp = { "clang-format" },
+                    css = { { "prettierd", "prettier" } },
+                    h = { "clang-format" },
+                    hpp = { "clang-format" },
+                    html = { { "prettierd", "prettier" } },
+                    java = { "google-java-format" },
+                    javascript = { { "prettierd", "prettier" } },
+                    lua = { "stylua" },
+                    markdown = { { "prettierd", "prettier" } },
+                    nix = { "alejandra" },
+                    python = { "black" },
+                    rust = { "rustfmt" },
                 },
             },
         },
         {
             "dashboard",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("dashboard").setup(opts)
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "nvim-web-devicons",
-                    ["config"] = function(_, opts)
+                    config = function(_, opts)
                         require("nvim-web-devicons").setup(opts)
                     end,
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-web-devicons",
-                    ["lazy"] = true,
-                    ["name"] = "nvim-web-devicons",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-web-devicons",
+                    lazy = true,
+                    name = "nvim-web-devicons",
                 },
                 {
                     "persisted",
-                    ["cmd"] = { "SessionSave", "SessionDelete", "Telescope persisted" },
-                    ["config"] = function(_, opts)
+                    cmd = { "SessionSave", "SessionDelete", "Telescope persisted" },
+                    config = function(_, opts)
                         require("persisted").setup(opts)
 
                         require("telescope").load_extension("persisted")
                     end,
-                    ["dependencies"] = {
+                    dependencies = {
                         {
                             "telescope",
-                            ["cmd"] = { "Telescope" },
-                            ["config"] = function(_, opts)
+                            cmd = { "Telescope" },
+                            config = function(_, opts)
                                 local telescope = require("telescope")
                                 telescope.setup(opts)
 
@@ -363,39 +363,39 @@ require("lazy").setup({
                                     telescope.load_extension(extension)
                                 end
                             end,
-                            ["dependencies"] = {
+                            dependencies = {
                                 {
                                     "plenary",
-                                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/plenary.nvim",
-                                    ["lazy"] = true,
-                                    ["name"] = "plenary",
+                                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/plenary.nvim",
+                                    lazy = true,
+                                    name = "plenary",
                                 },
                                 {
                                     "telescope-fzf-native",
-                                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope-fzf-native.nvim",
-                                    ["lazy"] = true,
-                                    ["name"] = "telescope-fzf-native",
+                                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope-fzf-native.nvim",
+                                    lazy = true,
+                                    name = "telescope-fzf-native",
                                 },
                                 {
                                     "telescope-undo",
-                                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope-undo.nvim",
-                                    ["lazy"] = true,
-                                    ["name"] = "telescope-undo",
+                                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope-undo.nvim",
+                                    lazy = true,
+                                    name = "telescope-undo",
                                 },
                                 {
                                     "telescope-ui-select",
-                                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope-ui-select.nvim",
-                                    ["lazy"] = true,
-                                    ["name"] = "telescope-ui-select",
+                                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope-ui-select.nvim",
+                                    lazy = true,
+                                    name = "telescope-ui-select",
                                 },
                             },
-                            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope.nvim",
-                            ["lazy"] = true,
-                            ["name"] = "telescope",
-                            ["opts"] = {
-                                ["defaults"] = {
-                                    ["mappings"] = {
-                                        ["i"] = {
+                            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope.nvim",
+                            lazy = true,
+                            name = "telescope",
+                            opts = {
+                                defaults = {
+                                    mappings = {
+                                        i = {
                                             ["<Esc>"] = function(...)
                                                 return require("telescope.actions").close(...)
                                             end,
@@ -405,39 +405,34 @@ require("lazy").setup({
                             },
                         },
                     },
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/persisted.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "persisted",
-                    ["opts"] = {
-                        ["autoload"] = false,
-                        ["autosave"] = false,
-                        ["follow_cwd"] = true,
-                        ["ignored_dirs"] = { "/", "~/", "~/Projects/" },
-                        ["silent"] = false,
-                        ["use_git_branch"] = false,
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/persisted.nvim",
+                    lazy = true,
+                    name = "persisted",
+                    opts = {
+                        autoload = false,
+                        autosave = false,
+                        follow_cwd = true,
+                        ignored_dirs = { "/", "~/", "~/Projects/" },
+                        silent = false,
+                        use_git_branch = false,
                     },
                 },
             },
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/dashboard-nvim",
-            ["lazy"] = false,
-            ["name"] = "dashboard",
-            ["opts"] = {
-                ["config"] = {
-                    ["center"] = {
-                        {
-                            ["action"] = "Telescope persisted",
-                            ["desc"] = " Restore Session",
-                            ["icon"] = " ",
-                            ["key"] = "s",
-                        },
-                        { ["action"] = "Telescope find_files", ["desc"] = " Find File", ["icon"] = " ", ["key"] = "f" },
-                        { ["action"] = "Telescope oldfiles", ["desc"] = " Recent Files", ["icon"] = " ", ["key"] = "r" },
-                        { ["action"] = "ene | startinsert", ["desc"] = " New File", ["icon"] = " ", ["key"] = "n" },
-                        { ["action"] = "Telescope live_grep", ["desc"] = " Find Text", ["icon"] = " ", ["key"] = "g" },
-                        { ["action"] = "Lazy", ["desc"] = " Lazy", ["icon"] = "󰒲 ", ["key"] = "l" },
-                        { ["action"] = "quitall", ["desc"] = " Quit", ["icon"] = " ", ["key"] = "q" },
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/dashboard-nvim",
+            lazy = false,
+            name = "dashboard",
+            opts = {
+                config = {
+                    center = {
+                        { action = "Telescope persisted", desc = " Restore Session", icon = " ", key = "s" },
+                        { action = "Telescope find_files", desc = " Find File", icon = " ", key = "f" },
+                        { action = "Telescope oldfiles", desc = " Recent Files", icon = " ", key = "r" },
+                        { action = "ene | startinsert", desc = " New File", icon = " ", key = "n" },
+                        { action = "Telescope live_grep", desc = " Find Text", icon = " ", key = "g" },
+                        { action = "Lazy", desc = " Lazy", icon = "󰒲 ", key = "l" },
+                        { action = "quitall", desc = " Quit", icon = " ", key = "q" },
                     },
-                    ["footer"] = function()
+                    footer = function()
                         local stats = require("lazy").stats()
                         local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100)
                         return {
@@ -445,39 +440,39 @@ require("lazy").setup({
                         }
                     end,
                 },
-                ["disable_move"] = true,
-                ["shortcut_type"] = "number",
-                ["theme"] = "doom",
+                disable_move = true,
+                shortcut_type = "number",
+                theme = "doom",
             },
         },
         {
             "diffview",
-            ["cmd"] = { "DiffviewOpen" },
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/diffview.nvim",
-            ["lazy"] = true,
-            ["name"] = "diffview",
+            cmd = { "DiffviewOpen" },
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/diffview.nvim",
+            lazy = true,
+            name = "diffview",
         },
         {
             "direnv",
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/direnv.vim",
-            ["lazy"] = false,
-            ["name"] = "direnv",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/direnv.vim",
+            lazy = false,
+            name = "direnv",
         },
         {
             "flash",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("flash").setup(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/flash.nvim",
-            ["keys"] = { "s", "S", "f", "F", "t", "T" },
-            ["lazy"] = true,
-            ["name"] = "flash",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/flash.nvim",
+            keys = { "s", "S", "f", "F", "t", "T" },
+            lazy = true,
+            name = "flash",
         },
         {
             "gitmessenger",
-            ["cmd"] = { "GitMessenger" },
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/git-messenger.vim",
-            ["init"] = function()
+            cmd = { "GitMessenger" },
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/git-messenger.vim",
+            init = function()
                 for k, v in pairs({
                     ["git_messenger_floating_win_opts"] = { ["border"] = "rounded" },
                     ["git_messenger_no_default_mappings"] = true,
@@ -485,37 +480,37 @@ require("lazy").setup({
                     vim.g[k] = v
                 end
             end,
-            ["lazy"] = true,
-            ["name"] = "gitmessenger",
+            lazy = true,
+            name = "gitmessenger",
         },
         {
             "gitsigns",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("gitsigns").setup(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/gitsigns.nvim",
-            ["event"] = { "BufReadPost", "BufNewFile" },
-            ["lazy"] = true,
-            ["name"] = "gitsigns",
-            ["opts"] = { ["current_line_blame"] = false },
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/gitsigns.nvim",
+            event = { "BufReadPost", "BufNewFile" },
+            lazy = true,
+            name = "gitsigns",
+            opts = { current_line_blame = false },
         },
         {
             "haskell-tools",
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/haskell-tools.nvim",
-            ["lazy"] = false,
-            ["name"] = "haskell-tools",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/haskell-tools.nvim",
+            lazy = false,
+            name = "haskell-tools",
         },
         {
             "illuminate",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("illuminate").configure(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/vim-illuminate",
-            ["event"] = { "BufreadPost", "BufNewFile" },
-            ["lazy"] = true,
-            ["name"] = "illuminate",
-            ["opts"] = {
-                ["filetypesDenylist"] = {
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/vim-illuminate",
+            event = { "BufreadPost", "BufNewFile" },
+            lazy = true,
+            name = "illuminate",
+            opts = {
+                filetypesDenylist = {
                     "DressingSelect",
                     "Outline",
                     "TelescopePrompt",
@@ -530,69 +525,75 @@ require("lazy").setup({
         },
         {
             "intellitab",
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/intellitab.nvim",
-            ["event"] = { "InsertEnter" },
-            ["lazy"] = true,
-            ["name"] = "intellitab",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/intellitab.nvim",
+            event = { "InsertEnter" },
+            lazy = true,
+            name = "intellitab",
+        },
+        {
+            "jdtls",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-jdtls",
+            lazy = false,
+            name = "jdtls",
         },
         {
             "nvim-lastplace",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("nvim-lastplace").setup(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-lastplace",
-            ["lazy"] = false,
-            ["name"] = "nvim-lastplace",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-lastplace",
+            lazy = false,
+            name = "nvim-lastplace",
         },
         {
             "lazygit",
-            ["cmd"] = { "LazyGit", "LazyGitConfig", "LazyGitCurrentFile", "LazyGitFilter", "LazyGitFilterCurrentFile" },
-            ["dependencies"] = {
+            cmd = { "LazyGit", "LazyGitConfig", "LazyGitCurrentFile", "LazyGitFilter", "LazyGitFilterCurrentFile" },
+            dependencies = {
                 {
                     "plenary",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/plenary.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "plenary",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/plenary.nvim",
+                    lazy = true,
+                    name = "plenary",
                 },
             },
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/lazygit.nvim",
-            ["lazy"] = true,
-            ["name"] = "lazygit",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/lazygit.nvim",
+            lazy = true,
+            name = "lazygit",
         },
         {
             "lint",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 local lint = require("lint")
 
                 for k, v in pairs(opts) do
                     lint[k] = v
                 end
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-lint",
-            ["event"] = { "BufReadPost", "BufNewFile" },
-            ["lazy"] = true,
-            ["name"] = "lint",
-            ["opts"] = {
-                ["linters_by_ft"] = {
-                    ["c"] = { "clangtidy" },
-                    ["clojure"] = { "clj-kondo" },
-                    ["cpp"] = { "clangtidy" },
-                    ["h"] = { "clangtidy" },
-                    ["hpp"] = { "clangtidy" },
-                    ["java"] = { "checkstyle" },
-                    ["javascript"] = { "eslint_d" },
-                    ["lua"] = { "luacheck" },
-                    ["markdown"] = { "vale" },
-                    ["nix"] = { "statix" },
-                    ["python"] = { "flake8" },
-                    ["text"] = { "vale" },
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-lint",
+            event = { "BufReadPost", "BufNewFile" },
+            lazy = true,
+            name = "lint",
+            opts = {
+                linters_by_ft = {
+                    c = { "clangtidy" },
+                    clojure = { "clj-kondo" },
+                    cpp = { "clangtidy" },
+                    h = { "clangtidy" },
+                    hpp = { "clangtidy" },
+                    java = { "checkstyle" },
+                    javascript = { "eslint_d" },
+                    lua = { "luacheck" },
+                    markdown = { "vale" },
+                    nix = { "statix" },
+                    python = { "flake8" },
+                    text = { "vale" },
                 },
             },
         },
         {
             "lspconfig",
-            ["cmd"] = { "LspInfo" },
-            ["config"] = function(_, opts)
+            cmd = { "LspInfo" },
+            config = function(_, opts)
                 -- Make LspInfo window border rounded
                 require("lspconfig.ui.windows").default_options.border = "rounded"
 
@@ -647,6 +648,16 @@ require("lazy").setup({
                     { ["name"] = "cmake" },
                     { ["name"] = "lua_ls" },
                     { ["name"] = "nil_ls" },
+                    {
+                        ["extraOptions"] = {
+                            ["nixd"] = {
+                                ["diagnostic"] = {
+                                    ["suppress"] = { "sema-escaping-with", "var-bind-to-this", "escaping-this-with" },
+                                },
+                            },
+                        },
+                        ["name"] = "nixd",
+                    },
                     { ["name"] = "pyright" },
                     { ["name"] = "texlab" },
                 }) do
@@ -665,25 +676,25 @@ require("lazy").setup({
                     end
                 end
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "lazydev",
-                    ["config"] = function(_, opts)
+                    config = function(_, opts)
                         require("lazydev").setup(opts)
                     end,
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/vimplugin-nvim-lazydev",
-                    ["ft"] = { "lua" },
-                    ["name"] = "lazydev",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/vimplugin-nvim-lazydev",
+                    ft = { "lua" },
+                    name = "lazydev",
                 },
             },
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-lspconfig",
-            ["event"] = { "BufReadPost", "BufNewFile" },
-            ["lazy"] = true,
-            ["name"] = "lspconfig",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-lspconfig",
+            event = { "BufReadPost", "BufNewFile" },
+            lazy = true,
+            name = "lspconfig",
         },
         {
             "lualine",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 local lualine = require("lualine")
 
                 lualine.setup(opts)
@@ -694,61 +705,61 @@ require("lazy").setup({
                     unhide = false,
                 })
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/lualine.nvim",
-            ["event"] = { "BufReadPost", "BufNewFile" },
-            ["lazy"] = true,
-            ["name"] = "lualine",
-            ["opts"] = {
-                ["extensions"] = { "fzf", "chadtree", "neo-tree", "toggleterm", "trouble" },
-                ["options"] = {
-                    ["always_divide_middle"] = true,
-                    ["component_separators"] = { ["left"] = "", ["right"] = "" },
-                    ["globalstatus"] = true,
-                    ["ignore_focus"] = { "neo-tree", "chadtree" },
-                    ["section_separators"] = { ["left"] = "", ["right"] = "" },
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/lualine.nvim",
+            event = { "BufReadPost", "BufNewFile" },
+            lazy = true,
+            name = "lualine",
+            opts = {
+                extensions = { "fzf", "chadtree", "neo-tree", "toggleterm", "trouble" },
+                options = {
+                    always_divide_middle = true,
+                    component_separators = { left = "", right = "" },
+                    globalstatus = true,
+                    ignore_focus = { "neo-tree", "chadtree" },
+                    section_separators = { left = "", right = "" },
                 },
-                ["sections"] = {
-                    ["lualine_a"] = { "mode" },
-                    ["lualine_b"] = { "branch", "diff", "diagnostics" },
-                    ["lualine_c"] = { { "filename", path = 1 } },
-                    ["lualine_x"] = { "filetype", "encoding", "fileformat" },
-                    ["lualine_y"] = { "progress", "searchcount", "selectioncount" },
-                    ["lualine_z"] = { "location" },
+                sections = {
+                    lualine_a = { "mode" },
+                    lualine_b = { "branch", "diff", "diagnostics" },
+                    lualine_c = { { "filename", path = 1 } },
+                    lualine_x = { "filetype", "encoding", "fileformat" },
+                    lualine_y = { "progress", "searchcount", "selectioncount" },
+                    lualine_z = { "location" },
                 },
             },
         },
         {
             "luasnip",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("luasnip").config.set_config(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/luasnip",
-            ["lazy"] = false,
-            ["name"] = "luasnip",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/luasnip",
+            lazy = false,
+            name = "luasnip",
         },
         {
             "narrow-region",
-            ["cmd"] = { "NR" },
-            ["config"] = function(_, opts)
+            cmd = { "NR" },
+            config = function(_, opts)
                 vim.keymap.del("x", "<space>Nr")
                 vim.keymap.del("x", "<space>nr")
                 vim.keymap.del("n", "<space>nr")
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/NrrwRgn",
-            ["lazy"] = true,
-            ["name"] = "narrow-region",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/NrrwRgn",
+            lazy = true,
+            name = "narrow-region",
         },
         {
             "navbuddy",
-            ["cmd"] = { "Navbuddy" },
-            ["config"] = function(_, opts)
+            cmd = { "Navbuddy" },
+            config = function(_, opts)
                 local actions = require("nvim-navbuddy.actions") -- ?
                 require("nvim-navbuddy").setup(opts)
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "navic",
-                    ["config"] = function(_, opts)
+                    config = function(_, opts)
                         navic = require("nvim-navic")
                         navic.setup(opts)
 
@@ -771,163 +782,156 @@ require("lazy").setup({
                         --   }
                         -- })
                     end,
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-navic",
-                    ["lazy"] = true,
-                    ["name"] = "navic",
-                    ["opts"] = {
-                        ["click"] = true,
-                        ["depth_limit"] = 5,
-                        ["highlight"] = true,
-                        ["lsp"] = { ["auto_attach"] = true },
-                    },
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-navic",
+                    lazy = true,
+                    name = "navic",
+                    opts = { click = true, depth_limit = 5, highlight = true, lsp = { auto_attach = true } },
                 },
             },
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-navbuddy",
-            ["lazy"] = true,
-            ["name"] = "navbuddy",
-            ["opts"] = { ["lsp"] = { ["auto_attach"] = true }, ["window"] = { ["border"] = "rounded" } },
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-navbuddy",
+            lazy = true,
+            name = "navbuddy",
+            opts = { lsp = { auto_attach = true }, window = { border = "rounded" } },
         },
         {
             "neo-tree",
-            ["cmd"] = { "Neotree" },
-            ["config"] = function(_, opts)
+            cmd = { "Neotree" },
+            config = function(_, opts)
                 require("neo-tree").setup(opts)
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "plenary",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/plenary.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "plenary",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/plenary.nvim",
+                    lazy = true,
+                    name = "plenary",
                 },
                 {
                     "nvim-web-devicons",
-                    ["config"] = function(_, opts)
+                    config = function(_, opts)
                         require("nvim-web-devicons").setup(opts)
                     end,
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-web-devicons",
-                    ["lazy"] = true,
-                    ["name"] = "nvim-web-devicons",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-web-devicons",
+                    lazy = true,
+                    name = "nvim-web-devicons",
                 },
                 {
                     "nui",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nui.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "nui",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nui.nvim",
+                    lazy = true,
+                    name = "nui",
                 },
             },
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/neo-tree.nvim",
-            ["lazy"] = true,
-            ["name"] = "neo-tree",
-            ["opts"] = {
-                ["buffers"] = { ["follow_current_file"] = { ["enabled"] = true, ["leave_dirs_open"] = false } },
-                ["default_component_configs"] = { ["container"] = { ["enable_character_fade"] = true } },
-                ["enable_diagnostics"] = false,
-                ["enable_git_status"] = true,
-                ["filesystem"] = {
-                    ["bind_to_cwd"] = true,
-                    ["cwd_target"] = { ["sidebar"] = "global" },
-                    ["filtered_items"] = { ["visible"] = false },
-                    ["follow_current_file"] = { ["enabled"] = true, ["leave_dirs_open"] = false },
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/neo-tree.nvim",
+            lazy = true,
+            name = "neo-tree",
+            opts = {
+                buffers = { follow_current_file = { enabled = true, leave_dirs_open = false } },
+                default_component_configs = { container = { enable_character_fade = true } },
+                enable_diagnostics = false,
+                enable_git_status = true,
+                filesystem = {
+                    bind_to_cwd = true,
+                    cwd_target = { sidebar = "global" },
+                    filtered_items = { visible = false },
+                    follow_current_file = { enabled = true, leave_dirs_open = false },
                 },
-                ["open_files_do_not_replace_types"] = { "terminal", "trouble", "qf" },
-                ["popup_border_style"] = "rounded",
-                ["use_default_mappings"] = false,
-                ["window"] = {
-                    ["mappings"] = {
+                open_files_do_not_replace_types = { "terminal", "trouble", "qf" },
+                popup_border_style = "rounded",
+                use_default_mappings = false,
+                window = {
+                    mappings = {
                         ["."] = "set_root",
                         ["/"] = "fuzzy_finder",
                         ["<CR>"] = "open",
                         ["<Esc>"] = "cancel",
                         [">"] = "navigate_up",
                         ["?"] = "show_help",
-                        ["H"] = "toggle_hidden",
-                        ["R"] = "refresh",
-                        ["a"] = "add",
-                        ["c"] = "close_node",
-                        ["d"] = "delete",
-                        ["i"] = "show_file_details",
-                        ["p"] = "paste_from_clipboard",
-                        ["q"] = "close_window",
-                        ["r"] = "rename",
-                        ["x"] = "cut_to_clipboard",
-                        ["y"] = "copy_to_clipboard",
+                        H = "toggle_hidden",
+                        R = "refresh",
+                        a = "add",
+                        c = "close_node",
+                        d = "delete",
+                        i = "show_file_details",
+                        p = "paste_from_clipboard",
+                        q = "close_window",
+                        r = "rename",
+                        x = "cut_to_clipboard",
+                        y = "copy_to_clipboard",
                     },
-                    ["position"] = "left",
+                    position = "left",
                 },
             },
         },
         {
             "noice",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("noice").setup(opts)
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "notify",
-                    ["config"] = function(_, opts)
+                    config = function(_, opts)
                         local notify = require("notify")
 
                         notify.setup(opts)
                         vim.notify = notify -- Vim uses notify by default
                     end,
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-notify",
-                    ["lazy"] = true,
-                    ["name"] = "notify",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-notify",
+                    lazy = true,
+                    name = "notify",
                 },
                 {
                     "nui",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nui.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "nui",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nui.nvim",
+                    lazy = true,
+                    name = "nui",
                 },
             },
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/noice.nvim",
-            ["lazy"] = false,
-            ["name"] = "noice",
-            ["opts"] = {
-                ["lsp"] = {
-                    ["documentation"] = {
-                        ["opts"] = {
-                            ["border"] = "rounded",
-                            ["format"] = { "{message}" },
-                            ["lang"] = "markdown",
-                            ["render"] = "plain",
-                            ["replace"] = true,
-                            ["win_options"] = { ["concealcursor"] = "n", ["conceallevel"] = 3 },
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/noice.nvim",
+            lazy = false,
+            name = "noice",
+            opts = {
+                lsp = {
+                    documentation = {
+                        opts = {
+                            border = "rounded",
+                            format = { "{message}" },
+                            lang = "markdown",
+                            render = "plain",
+                            replace = true,
+                            win_options = { concealcursor = "n", conceallevel = 3 },
                         },
-                        ["view"] = "hover",
+                        view = "hover",
                     },
-                    ["override"] = {
+                    override = {
                         ["cmp.entry.get_documentation"] = true,
                         ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
                         ["vim.lsp.util.stylize_markdown"] = true,
                     },
                 },
-                ["notify"] = { ["enabled"] = true },
-                ["popupmenu"] = { ["backend"] = "nui", ["enabled"] = true },
-                ["presets"] = {
-                    ["bottom_search"] = false,
-                    ["command_palette"] = true,
-                    ["inc_rename"] = true,
-                    ["long_message_to_split"] = true,
-                    ["lsp_doc_border"] = true,
-                },
-                ["routes"] = {
-                    { ["filter"] = { ["event"] = "msg_show", ["kind"] = "search_count" }, ["opts"] = { ["skip"] = true } },
+                notify = { enabled = true },
+                popupmenu = { backend = "nui", enabled = true },
+                presets = {
+                    bottom_search = false,
+                    command_palette = true,
+                    inc_rename = true,
+                    long_message_to_split = true,
+                    lsp_doc_border = true,
                 },
+                routes = { { filter = { event = "msg_show", kind = "search_count" }, opts = { skip = true } } },
             },
         },
         {
             "rainbow-delimiters",
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim",
-            ["lazy"] = false,
-            ["name"] = "rainbow-delimiters",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim",
+            lazy = false,
+            name = "rainbow-delimiters",
         },
         {
             "rustaceanvim",
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/rustaceanvim",
-            ["init"] = function()
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/rustaceanvim",
+            init = function()
                 vim.g.rustaceanvim = {
                     tools = {
                         enable_clippy = true,
@@ -967,31 +971,31 @@ require("lazy").setup({
                     },
                 }
             end,
-            ["lazy"] = false,
-            ["name"] = "rustaceanvim",
+            lazy = false,
+            name = "rustaceanvim",
         },
         {
             "sandwich",
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/vim-sandwich",
-            ["init"] = function()
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/vim-sandwich",
+            init = function()
                 -- Disable default keymaps
                 vim.g.sandwich_no_default_key_mappings = 1
                 vim.g.operator_sandwich_no_default_key_mappings = 1
                 vim.g.textobj_sandwich_no_default_key_mappings = 1
             end,
-            ["lazy"] = false,
-            ["name"] = "sandwich",
+            lazy = false,
+            name = "sandwich",
         },
         {
             "sleuth",
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/vim-sleuth",
-            ["lazy"] = false,
-            ["name"] = "sleuth",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/vim-sleuth",
+            lazy = false,
+            name = "sleuth",
         },
         {
             "telescope",
-            ["cmd"] = { "Telescope" },
-            ["config"] = function(_, opts)
+            cmd = { "Telescope" },
+            config = function(_, opts)
                 local telescope = require("telescope")
                 telescope.setup(opts)
 
@@ -999,217 +1003,212 @@ require("lazy").setup({
                     telescope.load_extension(extension)
                 end
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "plenary",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/plenary.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "plenary",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/plenary.nvim",
+                    lazy = true,
+                    name = "plenary",
                 },
                 {
                     "telescope-fzf-native",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope-fzf-native.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "telescope-fzf-native",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope-fzf-native.nvim",
+                    lazy = true,
+                    name = "telescope-fzf-native",
                 },
                 {
                     "telescope-undo",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope-undo.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "telescope-undo",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope-undo.nvim",
+                    lazy = true,
+                    name = "telescope-undo",
                 },
                 {
                     "telescope-ui-select",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope-ui-select.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "telescope-ui-select",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope-ui-select.nvim",
+                    lazy = true,
+                    name = "telescope-ui-select",
                 },
             },
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope.nvim",
-            ["lazy"] = true,
-            ["name"] = "telescope",
-            ["opts"] = {
-                ["defaults"] = {
-                    ["mappings"] = {
-                        ["i"] = {
-                            ["<Esc>"] = function(...)
-                                return require("telescope.actions").close(...)
-                            end,
-                        },
-                    },
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/telescope.nvim",
+            lazy = true,
+            name = "telescope",
+            opts = {
+                defaults = {
+                    mappings = { i = {
+                        ["<Esc>"] = function(...)
+                            return require("telescope.actions").close(...)
+                        end,
+                    } },
                 },
             },
         },
         {
             "todo-comments",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("todo-comments").setup(opts)
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "plenary",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/plenary.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "plenary",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/plenary.nvim",
+                    lazy = true,
+                    name = "plenary",
                 },
             },
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/todo-comments.nvim",
-            ["event"] = { "BufReadPost", "BufNewFile" },
-            ["lazy"] = true,
-            ["name"] = "todo-comments",
-            ["opts"] = {
-                ["keywords"] = {
-                    ["FIX"] = { ["alt"] = { "FIXME", "BUG", "FIXIT", "ISSUE" }, ["color"] = "error", ["icon"] = " " },
-                    ["HACK"] = { ["color"] = "warning", ["icon"] = " " },
-                    ["NOTE"] = { ["alt"] = { "INFO" }, ["color"] = "hint", ["icon"] = " " },
-                    ["PERF"] = { ["alt"] = { "OPTIM", "PERFORMANCE", "OPTIMIZE" }, ["icon"] = " " },
-                    ["TEST"] = { ["alt"] = { "TESTING", "PASSED", "FAILED" }, ["color"] = "test", ["icon"] = "⏲ " },
-                    ["TODO"] = { ["color"] = "info", ["icon"] = " " },
-                    ["WARN"] = { ["alt"] = { "WARNING", "XXX" }, ["color"] = "warning", ["icon"] = " " },
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/todo-comments.nvim",
+            event = { "BufReadPost", "BufNewFile" },
+            lazy = true,
+            name = "todo-comments",
+            opts = {
+                keywords = {
+                    FIX = { alt = { "FIXME", "BUG", "FIXIT", "ISSUE" }, color = "error", icon = " " },
+                    HACK = { color = "warning", icon = " " },
+                    NOTE = { alt = { "INFO" }, color = "hint", icon = " " },
+                    PERF = { alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" }, icon = " " },
+                    TEST = { alt = { "TESTING", "PASSED", "FAILED" }, color = "test", icon = "⏲ " },
+                    TODO = { color = "info", icon = " " },
+                    WARN = { alt = { "WARNING", "XXX" }, color = "warning", icon = " " },
                 },
-                ["signs"] = true,
+                signs = true,
             },
         },
         {
             "toggleterm",
-            ["cmd"] = { "ToggleTerm" },
-            ["config"] = function(_, opts)
+            cmd = { "ToggleTerm" },
+            config = function(_, opts)
                 require("toggleterm").setup(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/toggleterm.nvim",
-            ["keys"] = { "<C-/>" },
-            ["lazy"] = true,
-            ["name"] = "toggleterm",
-            ["opts"] = {
-                ["auto_scroll"] = true,
-                ["autochdir"] = true,
-                ["close_on_exit"] = true,
-                ["direction"] = "horizontal",
-                ["float_opts"] = { ["border"] = "curved", ["height"] = 35, ["width"] = 80, ["winblend"] = 0 },
-                ["hide_numbers"] = true,
-                ["insert_mappings"] = true,
-                ["open_mapping"] = [[<C-/>]],
-                ["persist_mode"] = true,
-                ["shade_terminals"] = false,
-                ["shading_factor"] = 30,
-                ["shell"] = "fish",
-                ["start_in_insert"] = true,
-                ["terminal_mappings"] = true,
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/toggleterm.nvim",
+            keys = { "<C-/>" },
+            lazy = true,
+            name = "toggleterm",
+            opts = {
+                auto_scroll = true,
+                autochdir = true,
+                close_on_exit = true,
+                direction = "horizontal",
+                float_opts = { border = "curved", height = 35, width = 80, winblend = 0 },
+                hide_numbers = true,
+                insert_mappings = true,
+                open_mapping = [[<C-/>]],
+                persist_mode = true,
+                shade_terminals = false,
+                shading_factor = 30,
+                shell = "fish",
+                start_in_insert = true,
+                terminal_mappings = true,
             },
         },
         {
             "treesitter",
-            ["cmd"] = { "TSModuleInfo" },
-            ["config"] = function(_, opts)
+            cmd = { "TSModuleInfo" },
+            config = function(_, opts)
                 require("nvim-treesitter.configs").setup(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-treesitter",
-            ["event"] = { "BufReadPost", "BufNewFile" },
-            ["init"] = function()
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-treesitter",
+            event = { "BufReadPost", "BufNewFile" },
+            init = function()
                 -- Fix treesitter grammars/parsers on nix
                 vim.opt.runtimepath:append(
                     "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/nvim-treesitter"
                 )
                 vim.opt.runtimepath:append("/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/treesitter-parsers")
             end,
-            ["lazy"] = true,
-            ["name"] = "treesitter",
-            ["opts"] = {
-                ["auto_install"] = false,
-                ["highlight"] = { ["additional_vim_regex_highlighting"] = false, ["enable"] = true },
-                ["incremental_selection"] = {
-                    ["enable"] = true,
-                    ["keymaps"] = {
-                        ["init_selection"] = "gnn",
-                        ["node_decremental"] = "grm",
-                        ["node_incremental"] = "grn",
-                        ["scope_incremental"] = "grc",
+            lazy = true,
+            name = "treesitter",
+            opts = {
+                auto_install = false,
+                highlight = { additional_vim_regex_highlighting = false, enable = true },
+                incremental_selection = {
+                    enable = true,
+                    keymaps = {
+                        init_selection = "gnn",
+                        node_decremental = "grm",
+                        node_incremental = "grn",
+                        scope_incremental = "grc",
                     },
                 },
-                ["indent"] = { ["enable"] = true },
-                ["parser_install_dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/treesitter-parsers",
+                indent = { enable = true },
+                parser_install_dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/treesitter-parsers",
             },
         },
         {
             "trim",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("trim").setup(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/trim.nvim",
-            ["lazy"] = false,
-            ["name"] = "trim",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/trim.nvim",
+            lazy = false,
+            name = "trim",
         },
         {
             "trouble",
-            ["cmd"] = { "Trouble", "TroubleToggle" },
-            ["config"] = function(_, opts)
+            cmd = { "Trouble", "TroubleToggle" },
+            config = function(_, opts)
                 require("trouble").setup(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/trouble.nvim",
-            ["lazy"] = true,
-            ["name"] = "trouble",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/trouble.nvim",
+            lazy = true,
+            name = "trouble",
         },
         {
             "ufo",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("ufo").setup(opts)
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "promise",
-                    ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/promise-async",
-                    ["lazy"] = true,
-                    ["name"] = "promise",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/promise-async",
+                    lazy = true,
+                    name = "promise",
                 },
             },
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-ufo",
-            ["lazy"] = false,
-            ["name"] = "ufo",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/nvim-ufo",
+            lazy = false,
+            name = "ufo",
         },
         {
             "vimtex",
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/vimtex",
-            ["init"] = function()
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/vimtex",
+            init = function()
                 vim.g.vimtex_view_method = "zathura"
             end,
-            ["name"] = "vimtex",
+            name = "vimtex",
         },
         {
             "which-key",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("which-key").setup(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/which-key.nvim",
-            ["lazy"] = false,
-            ["name"] = "which-key",
-            ["priority"] = 500,
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/which-key.nvim",
+            lazy = false,
+            name = "which-key",
+            priority = 500,
         },
         {
             "winshift",
-            ["cmd"] = { "WinShift" },
-            ["config"] = function(_, opts)
+            cmd = { "WinShift" },
+            config = function(_, opts)
                 require("winshift").setup(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/winshift.nvim",
-            ["lazy"] = true,
-            ["name"] = "winshift",
-            ["opts"] = {
-                ["highlight_moving_win"] = true,
-                ["keymaps"] = {
-                    ["disable_defaults"] = true,
-                    ["win_move_mode"] = { ["h"] = "left", ["j"] = "down", ["k"] = "up", ["l"] = "right" },
-                },
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/winshift.nvim",
+            lazy = true,
+            name = "winshift",
+            opts = {
+                highlight_moving_win = true,
+                keymaps = { disable_defaults = true, win_move_mode = { h = "left", j = "down", k = "up", l = "right" } },
             },
         },
         {
             "yanky",
-            ["cmd"] = { "YankyClearHistory", "YankyRingHistory" },
-            ["config"] = function(_, opts)
+            cmd = { "YankyClearHistory", "YankyRingHistory" },
+            config = function(_, opts)
                 require("yanky").setup(opts)
             end,
-            ["dir"] = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/yanky.nvim",
-            ["lazy"] = true,
-            ["name"] = "yanky",
+            dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/yanky.nvim",
+            lazy = true,
+            name = "yanky",
         },
     },
 })
@@ -1218,498 +1217,322 @@ require("lazy").setup({
 do
     local __nixvim_binds = {
         {
-            ["action"] = "v:count == 0 ? 'gj' : 'j'",
-            ["key"] = "j",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Move cursor down", ["expr"] = true },
+            action = "v:count == 0 ? 'gj' : 'j'",
+            key = "j",
+            mode = "n",
+            options = { desc = "Move cursor down", expr = true },
+        },
+        {
+            action = "v:count == 0 ? 'gj' : 'j'",
+            key = "<Down>",
+            mode = "n",
+            options = { desc = "Move cursor down", expr = true },
+        },
+        {
+            action = "v:count == 0 ? 'gk' : 'k'",
+            key = "k",
+            mode = "n",
+            options = { desc = "Move cursor up", expr = true },
+        },
+        {
+            action = "v:count == 0 ? 'gk' : 'k'",
+            key = "<Up>",
+            mode = "n",
+            options = { desc = "Move cursor up", expr = true },
+        },
+        {
+            action = "<cmd>vertical resize -2<cr>",
+            key = "<C-h>",
+            mode = "n",
+            options = { desc = "Decrease window width" },
+        },
+        {
+            action = "<cmd>vertical resize +2<cr>",
+            key = "<C-l>",
+            mode = "n",
+            options = { desc = "Increase window width" },
+        },
+        { action = "<cmd>resize -2<cr>", key = "<C-j>", mode = "n", options = { desc = "Decrease window height" } },
+        { action = "<cmd>resize +2<cr>", key = "<C-k>", mode = "n", options = { desc = "Increase window height" } },
+        { action = "<cmd>m .+1<cr>==", key = "<M-j>", mode = "n", options = { desc = "Move line down" } },
+        { action = "<Esc><cmd>m .+1<cr>==gi", key = "<M-j>", mode = "i", options = { desc = "Move line down" } },
+        { action = ":m '>+1<cr>gv=gv", key = "<M-j>", mode = "v", options = { desc = "Move line down" } },
+        { action = "<cmd>m .-2<cr>==", key = "<M-k>", mode = "n", options = { desc = "Move line up" } },
+        { action = "<Esc><cmd>m .-2<cr>==gi", key = "<M-k>", mode = "i", options = { desc = "Move line up" } },
+        { action = ":m '<-2<cr>gv=gv", key = "<M-k>", mode = "v", options = { desc = "Move line up" } },
+        { action = "<cmd>w<cr>", key = "<C-s>", mode = { "n", "i", "v" }, options = { desc = "Save current buffer" } },
+        { action = "<cmd>wa<cr>", key = "<C-S-s>", mode = { "n", "i", "v" }, options = { desc = "Save all buffers" } },
+        { action = "<gv", key = "<", mode = "v", options = { desc = "Outdent" } },
+        { action = "v<<Esc>", key = "<", mode = "n", options = { desc = "Outdent" } },
+        { action = ">gv", key = ">", mode = "v", options = { desc = "Indent" } },
+        { action = "v><Esc>", key = ">", mode = "n", options = { desc = "Indent" } },
+        {
+            action = "<cmd>lua require('intellitab').indent()<cr>",
+            key = "<Tab>",
+            mode = "i",
+            options = { desc = "Indent (IntelliTab)" },
+        },
+        { action = "<C-d>zz", key = "<C-d>", mode = "n", options = { desc = "Jump down (centered)" } },
+        { action = "<C-u>zz", key = "<C-u>", mode = "n", options = { desc = "Jump up (centered)" } },
+        { action = "nzzzv", key = "n", mode = "n", options = { desc = "Next match (centered)" } },
+        { action = "Nzzzv", key = "N", mode = "n", options = { desc = "Previous match (centered)" } },
+        { action = "<C-w>", key = "<C-BS>", mode = "i", options = { desc = "Delete previous word" } },
+        { action = "<C-w>", key = "<M-BS>", mode = "i", options = { desc = "Delete previous word" } },
+        { action = '<Esc>"+pi', key = "<C-S-v>", mode = "i", options = { desc = "Paste from clipboard" } },
+        { action = '<Esc>"+pi', key = "<C-v>", mode = "i", options = { desc = "Paste from clipboard" } },
+        { action = '"+y', key = "<C-S-c>", mode = "v", options = { desc = "Copy to clipboard" } },
+        { action = "<cmd>lua require('flash').jump()<cr>", key = "s", mode = "n", options = { desc = "Flash jump" } },
+        {
+            action = "<cmd>lua require('flash').treesitter()<cr>",
+            key = "S",
+            mode = "n",
+            options = { desc = "Flash treesitter" },
+        },
+        { action = "<cmd>nohlsearch<cr>", key = "<C-S-h>", mode = "n", options = { desc = "Clear search highlights" } },
+        { action = "<cmd>lua vim.lsp.buf.hover()<cr>", key = "K", mode = "n", options = { desc = "Show LSP hover" } },
+        {
+            action = "<cmd>Telescope current_buffer_fuzzy_find<cr>",
+            key = "/",
+            mode = "n",
+            options = { desc = "Find in current buffer" },
+        },
+        { action = "<Esc>", key = ";", mode = "v", options = { desc = "Exit visual mode" } },
+        { action = "<cmd>Lazy<cr>", key = "<leader>L", mode = "n", options = { desc = "Show Lazy" } },
+        { action = "<cmd>edit!<cr>", key = "<leader>R", mode = "n", options = { desc = "Reload current buffer" } },
+        {
+            action = "<cmd>Telescope buffers<cr>",
+            key = "<leader><Space>",
+            mode = "n",
+            options = { desc = "Show open buffers" },
+        },
+        { action = "<cmd>Telescope find_files<cr>", key = "<leader>f", mode = "n", options = { desc = "Find file" } },
+        { action = "<cmd>Telescope projects<cr>", key = "<leader>p", mode = "n", options = { desc = "Open project" } },
+        {
+            action = "<cmd>Telescope vim_options<cr>",
+            key = "<leader>o",
+            mode = "n",
+            options = { desc = "Show Vim options" },
+        },
+        { action = "<cmd>Telescope undo<cr>", key = "<leader>u", mode = "n", options = { desc = "Show undo history" } },
+        {
+            action = "<cmd>Telescope live_grep<cr>",
+            key = "<leader>/",
+            mode = "n",
+            options = { desc = "Find in working directory" },
+        },
+        { action = ":NR!<cr>", key = "<leader>n", mode = "v", options = { desc = "Narrow region" } },
+        {
+            action = "<cmd>Telescope notify<cr>",
+            key = "<leader>N",
+            mode = "n",
+            options = { desc = "Show notify history" },
+        },
+        {
+            action = "<cmd>Telescope resume<cr>",
+            key = "<leader>r",
+            mode = "n",
+            options = { desc = "Show last telescope picker" },
+        },
+        { action = "<cmd>Telescope keymaps<cr>", key = "<leader>?", mode = "n", options = { desc = "Show keymaps" } },
+        {
+            action = "<cmd>Telescope commands<cr>",
+            key = "<leader>:",
+            mode = "n",
+            options = { desc = "Execute command" },
+        },
+        { action = "<cmd>Telescope marks<cr>", key = "<leader>M", mode = "n", options = { desc = "Show marks" } },
+        { action = "<cmd>Telescope jumplist<cr>", key = "<leader>J", mode = "n", options = { desc = "Show jumplist" } },
+        { action = "<cmd>Telescope man_pages<cr>", key = "<leader>m", mode = "n", options = { desc = "Show manpages" } },
+        {
+            action = "<cmd>Telescope help_tags<cr>",
+            key = "<leader>h",
+            mode = "n",
+            options = { desc = "Show help tags" },
+        },
+        { action = "<cmd>TodoTelescope<cr>", key = "<leader>T", mode = "n", options = { desc = "Show TODOs" } },
+        { action = "+quit", key = "<leader>q", mode = "n" },
+        { action = "<cmd>quitall<cr>", key = "<leader>qq", mode = "n", options = { desc = "Quit" } },
+        { action = "<cmd>quitall!<cr>", key = "<leader>q!", mode = "n", options = { desc = "Quit forcefully" } },
+        { action = "+session", key = "<leader>s", mode = "n" },
+        {
+            action = "<cmd>Telescope persisted<cr>",
+            key = "<leader>sl",
+            mode = "n",
+            options = { desc = "Restore session" },
+        },
+        { action = "<cmd>SessionSave<cr>", key = "<leader>ss", mode = "n", options = { desc = "Save session" } },
+        {
+            action = "<cmd>SessionDelete<cr>",
+            key = "<leader>sd",
+            mode = "n",
+            options = { desc = "Delete current session" },
         },
+        { action = "+buffers", key = "<leader>b", mode = "n" },
         {
-            ["action"] = "v:count == 0 ? 'gj' : 'j'",
-            ["key"] = "<Down>",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Move cursor down", ["expr"] = true },
+            action = "<cmd>Telescope buffers<cr>",
+            key = "<leader>bb",
+            mode = "n",
+            options = { desc = "Show open buffers" },
         },
+        { action = "<cmd>bnext<cr>", key = "<leader>bn", mode = "n", options = { desc = "Goto next buffer" } },
+        { action = "<cmd>bprevious<cr>", key = "<leader>bp", mode = "n", options = { desc = "Goto previous buffer" } },
+        { action = "<cmd>Bdelete<cr>", key = "<leader>bd", mode = "n", options = { desc = "Close current buffer" } },
+        { action = "+windows", key = "<leader>w", mode = "n" },
+        { action = "<C-w>c", key = "<leader>wd", mode = "n", options = { desc = "Close current window" } },
+        { action = "<C-w>s", key = "<leader>ws", mode = "n", options = { desc = "Split window horizontally" } },
+        { action = "<C-w>v", key = "<leader>wv", mode = "n", options = { desc = "Split window vertically" } },
+        { action = "<C-w>=", key = "<leader>w=", mode = "n", options = { desc = "Balance windows" } },
+        { action = "<C-w>h", key = "<leader>wh", mode = "n", options = { desc = "Goto left window" } },
+        { action = "<C-w>l", key = "<leader>wl", mode = "n", options = { desc = "Goto right window" } },
+        { action = "<C-w>j", key = "<leader>wj", mode = "n", options = { desc = "Goto bottom window" } },
+        { action = "<C-w>k", key = "<leader>wk", mode = "n", options = { desc = "Goto top window" } },
+        { action = "<C-w>p", key = "<leader>ww", mode = "n", options = { desc = "Goto other window" } },
+        { action = "<cmd>WinShift<cr>", key = "<leader>wm", mode = "n", options = { desc = "Move window" } },
+        { action = "+toggle", key = "<leader>t", mode = "n" },
         {
-            ["action"] = "v:count == 0 ? 'gk' : 'k'",
-            ["key"] = "k",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Move cursor up", ["expr"] = true },
+            action = "<cmd>Neotree action=show toggle=true<cr><C-w>=",
+            key = "<leader>tt",
+            mode = "n",
+            options = { desc = "Toggle NeoTree" },
         },
+        { action = "<cmd>Navbuddy<cr>", key = "<leader>tn", mode = "n", options = { desc = "Toggle NavBuddy" } },
         {
-            ["action"] = "v:count == 0 ? 'gk' : 'k'",
-            ["key"] = "<Up>",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Move cursor up", ["expr"] = true },
+            action = "<cmd>TroubleToggle workspace_diagnostics focus=false<cr>",
+            key = "<leader>td",
+            mode = "n",
+            options = { desc = "Toggle Trouble diagnostics" },
         },
         {
-            ["action"] = "<cmd>vertical resize -2<cr>",
-            ["key"] = "<C-h>",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Decrease window width" },
+            action = "<cmd>TroubleToggle todo focus=false<cr>",
+            key = "<leader>tT",
+            mode = "n",
+            options = { desc = "Toggle Trouble TODOs" },
         },
         {
-            ["action"] = "<cmd>vertical resize +2<cr>",
-            ["key"] = "<C-l>",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Increase window width" },
+            action = "<cmd>ToggleAutoformat<cr>",
+            key = "<leader>tf",
+            mode = "n",
+            options = { desc = "Toggle autoformat-on-save" },
         },
         {
-            ["action"] = "<cmd>resize -2<cr>",
-            ["key"] = "<C-j>",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Decrease window height" },
+            action = "<cmd>ToggleAutoLint<cr>",
+            key = "<leader>tl",
+            mode = "n",
+            options = { desc = "Toggle autolint-on-save" },
         },
         {
-            ["action"] = "<cmd>resize +2<cr>",
-            ["key"] = "<C-k>",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Increase window height" },
+            action = "<cmd>ToggleInlineDiagnostics<cr>",
+            key = "<leader>tD",
+            mode = "n",
+            options = { desc = "Toggle inline diagnostics" },
         },
-        { ["action"] = "<cmd>m .+1<cr>==", ["key"] = "<M-j>", ["mode"] = "n", ["options"] = {
-            ["desc"] = "Move line down",
-        } },
+        { action = "<cmd>:set wrap!<cr>", key = "<leader>tw", mode = "n", options = { desc = "Toggle word-wrap" } },
+        { action = "+git", key = "<leader>g", mode = "n" },
+        { action = "<cmd>LazyGit<cr>", key = "<leader>gg", mode = "n", options = { desc = "Show LazyGit" } },
+        { action = "<cmd>GitMessenger<cr>", key = "<leader>gm", mode = "n", options = { desc = "Show GitMessenger" } },
         {
-            ["action"] = "<Esc><cmd>m .+1<cr>==gi",
-            ["key"] = "<M-j>",
-            ["mode"] = "i",
-            ["options"] = { ["desc"] = "Move line down" },
+            action = "<cmd>Telescope git_status<cr>",
+            key = "<leader>gs",
+            mode = "n",
+            options = { desc = "Show Git status" },
         },
-        { ["action"] = ":m '>+1<cr>gv=gv", ["key"] = "<M-j>", ["mode"] = "v", ["options"] = {
-            ["desc"] = "Move line down",
-        } },
-        { ["action"] = "<cmd>m .-2<cr>==", ["key"] = "<M-k>", ["mode"] = "n", ["options"] = {
-            ["desc"] = "Move line up",
-        } },
         {
-            ["action"] = "<Esc><cmd>m .-2<cr>==gi",
-            ["key"] = "<M-k>",
-            ["mode"] = "i",
-            ["options"] = { ["desc"] = "Move line up" },
+            action = "<cmd>Telescope git_commits<cr>",
+            key = "<leader>gc",
+            mode = "n",
+            options = { desc = "Show Git log" },
         },
-        { ["action"] = ":m '<-2<cr>gv=gv", ["key"] = "<M-k>", ["mode"] = "v", ["options"] = {
-            ["desc"] = "Move line up",
-        } },
         {
-            ["action"] = "<cmd>w<cr>",
-            ["key"] = "<C-s>",
-            ["mode"] = { "n", "i", "v" },
-            ["options"] = { ["desc"] = "Save current buffer" },
+            action = "<cmd>Telescope git_branches<cr>",
+            key = "<leader>gb",
+            mode = "n",
+            options = { desc = "Show Git branches" },
         },
         {
-            ["action"] = "<cmd>wa<cr>",
-            ["key"] = "<C-S-s>",
-            ["mode"] = { "n", "i", "v" },
-            ["options"] = { ["desc"] = "Save all buffers" },
+            action = "<cmd>Telescope git_bcommits<cr>",
+            key = "<leader>gf",
+            mode = "n",
+            options = { desc = "Show Git log for current file" },
         },
-        { ["action"] = "<gv", ["key"] = "<", ["mode"] = "v", ["options"] = { ["desc"] = "Outdent" } },
-        { ["action"] = "v<<Esc>", ["key"] = "<", ["mode"] = "n", ["options"] = { ["desc"] = "Outdent" } },
-        { ["action"] = ">gv", ["key"] = ">", ["mode"] = "v", ["options"] = { ["desc"] = "Indent" } },
-        { ["action"] = "v><Esc>", ["key"] = ">", ["mode"] = "n", ["options"] = { ["desc"] = "Indent" } },
         {
-            ["action"] = "<cmd>lua require('intellitab').indent()<cr>",
-            ["key"] = "<Tab>",
-            ["mode"] = "i",
-            ["options"] = { ["desc"] = "Indent (IntelliTab)" },
+            action = "<cmd>DiffviewOpen<cr>",
+            key = "<leader>gd",
+            mode = "n",
+            options = { desc = "Show Git diff for current worktree" },
         },
-        { ["action"] = "<C-d>zz", ["key"] = "<C-d>", ["mode"] = "n", ["options"] = { ["desc"] = "Jump down (centered)" } },
-        { ["action"] = "<C-u>zz", ["key"] = "<C-u>", ["mode"] = "n", ["options"] = { ["desc"] = "Jump up (centered)" } },
-        { ["action"] = "nzzzv", ["key"] = "n", ["mode"] = "n", ["options"] = { ["desc"] = "Next match (centered)" } },
-        { ["action"] = "Nzzzv", ["key"] = "N", ["mode"] = "n", ["options"] = { ["desc"] = "Previous match (centered)" } },
-        { ["action"] = "<C-w>", ["key"] = "<C-BS>", ["mode"] = "i", ["options"] = { ["desc"] = "Delete previous word" } },
-        { ["action"] = "<C-w>", ["key"] = "<M-BS>", ["mode"] = "i", ["options"] = { ["desc"] = "Delete previous word" } },
+        { action = "+lsp", key = "<leader>l", mode = "n" },
         {
-            ["action"] = '<Esc>"+pi',
-            ["key"] = "<C-S-v>",
-            ["mode"] = "i",
-            ["options"] = { ["desc"] = "Paste from clipboard" },
+            action = "<cmd>Telescope lsp_references<cr>",
+            key = "<leader>lr",
+            mode = "n",
+            options = { desc = "Goto references" },
         },
-        { ["action"] = '<Esc>"+pi', ["key"] = "<C-v>", ["mode"] = "i", ["options"] = {
-            ["desc"] = "Paste from clipboard",
-        } },
-        { ["action"] = '"+y', ["key"] = "<C-S-c>", ["mode"] = "v", ["options"] = { ["desc"] = "Copy to clipboard" } },
         {
-            ["action"] = "<cmd>lua require('flash').jump()<cr>",
-            ["key"] = "s",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Flash jump" },
+            action = "<cmd>Telescope lsp_definitions<cr>",
+            key = "<leader>ld",
+            mode = "n",
+            options = { desc = "Goto definition" },
         },
         {
-            ["action"] = "<cmd>lua require('flash').treesitter()<cr>",
-            ["key"] = "S",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Flash treesitter" },
+            action = "<cmd>Telescope lsp_implementations<cr>",
+            key = "<leader>li",
+            mode = "n",
+            options = { desc = "Goto implementation" },
         },
         {
-            ["action"] = "<cmd>nohlsearch<cr>",
-            ["key"] = "<C-S-h>",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Clear search highlights" },
+            action = "<cmd>Telescope lsp_type_definitions<cr>",
+            key = "<leader>lt",
+            mode = "n",
+            options = { desc = "Goto type definition" },
         },
         {
-            ["action"] = "<cmd>lua vim.lsp.buf.hover()<cr>",
-            ["key"] = "K",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show LSP hover" },
+            action = "<cmd>Telescope lsp_incoming_calls<cr>",
+            key = "<leader>lI",
+            mode = "n",
+            options = { desc = "Show incoming calls" },
         },
         {
-            ["action"] = "<cmd>Telescope current_buffer_fuzzy_find<cr>",
-            ["key"] = "/",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Find in current buffer" },
+            action = "<cmd>Telescope lsp_outgoing_calls<cr>",
+            key = "<leader>lO",
+            mode = "n",
+            options = { desc = "Show outgoing calls" },
         },
-        { ["action"] = "<Esc>", ["key"] = ";", ["mode"] = "v", ["options"] = { ["desc"] = "Exit visual mode" } },
-        { ["action"] = "<cmd>Lazy<cr>", ["key"] = "<leader>L", ["mode"] = "n", ["options"] = { ["desc"] = "Show Lazy" } },
+        { action = "+code", key = "<leader>c", mode = "n" },
         {
-            ["action"] = "<cmd>edit!<cr>",
-            ["key"] = "<leader>R",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Reload current buffer" },
+            action = "<cmd>lua require('conform').format()<cr>",
+            key = "<leader>cf",
+            mode = "n",
+            options = { desc = "Format current buffer" },
         },
         {
-            ["action"] = "<cmd>Telescope buffers<cr>",
-            ["key"] = "<leader><Space>",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show open buffers" },
+            action = "<cmd>lua vim.diagnostic.open_float()<cr>",
+            key = "<leader>cd",
+            mode = "n",
+            options = { desc = "Show LSP line diagnostics" },
         },
         {
-            ["action"] = "<cmd>Telescope find_files<cr>",
-            ["key"] = "<leader>f",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Find file" },
+            action = "<cmd>Telescope diagnostics<cr>",
+            key = "<leader>cD",
+            mode = "n",
+            options = { desc = "Show diagnostics" },
         },
         {
-            ["action"] = "<cmd>Telescope projects<cr>",
-            ["key"] = "<leader>p",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Open project" },
+            action = "<cmd>lua vim.lsp.buf.rename()<cr>",
+            key = "<leader>cr",
+            mode = "n",
+            options = { desc = "Rename LSP symbol" },
         },
         {
-            ["action"] = "<cmd>Telescope vim_options<cr>",
-            ["key"] = "<leader>o",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show Vim options" },
+            action = "<cmd>lua vim.lsp.buf.code_action()<cr>",
+            key = "<leader>ca",
+            mode = "n",
+            options = { desc = "Show LSP code actions" },
         },
         {
-            ["action"] = "<cmd>Telescope undo<cr>",
-            ["key"] = "<leader>u",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show undo history" },
-        },
-        {
-            ["action"] = "<cmd>Telescope live_grep<cr>",
-            ["key"] = "<leader>/",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Find in working directory" },
-        },
-        { ["action"] = ":NR!<cr>", ["key"] = "<leader>n", ["mode"] = "v", ["options"] = { ["desc"] = "Narrow region" } },
-        {
-            ["action"] = "<cmd>Telescope notify<cr>",
-            ["key"] = "<leader>N",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show notify history" },
-        },
-        {
-            ["action"] = "<cmd>Telescope resume<cr>",
-            ["key"] = "<leader>r",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show last telescope picker" },
-        },
-        {
-            ["action"] = "<cmd>Telescope keymaps<cr>",
-            ["key"] = "<leader>?",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show keymaps" },
-        },
-        {
-            ["action"] = "<cmd>Telescope commands<cr>",
-            ["key"] = "<leader>:",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Execute command" },
-        },
-        {
-            ["action"] = "<cmd>Telescope marks<cr>",
-            ["key"] = "<leader>M",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show marks" },
-        },
-        {
-            ["action"] = "<cmd>Telescope jumplist<cr>",
-            ["key"] = "<leader>J",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show jumplist" },
-        },
-        {
-            ["action"] = "<cmd>Telescope man_pages<cr>",
-            ["key"] = "<leader>m",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show manpages" },
-        },
-        {
-            ["action"] = "<cmd>Telescope help_tags<cr>",
-            ["key"] = "<leader>h",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show help tags" },
-        },
-        {
-            ["action"] = "<cmd>TodoTelescope<cr>",
-            ["key"] = "<leader>T",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show TODOs" },
-        },
-        { ["action"] = "+quit", ["key"] = "<leader>q", ["mode"] = "n" },
-        { ["action"] = "<cmd>quitall<cr>", ["key"] = "<leader>qq", ["mode"] = "n", ["options"] = { ["desc"] = "Quit" } },
-        {
-            ["action"] = "<cmd>quitall!<cr>",
-            ["key"] = "<leader>q!",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Quit forcefully" },
-        },
-        { ["action"] = "+session", ["key"] = "<leader>s", ["mode"] = "n" },
-        {
-            ["action"] = "<cmd>Telescope persisted<cr>",
-            ["key"] = "<leader>sl",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Restore session" },
-        },
-        {
-            ["action"] = "<cmd>SessionSave<cr>",
-            ["key"] = "<leader>ss",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Save session" },
-        },
-        {
-            ["action"] = "<cmd>SessionDelete<cr>",
-            ["key"] = "<leader>sd",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Delete current session" },
-        },
-        { ["action"] = "+buffers", ["key"] = "<leader>b", ["mode"] = "n" },
-        {
-            ["action"] = "<cmd>Telescope buffers<cr>",
-            ["key"] = "<leader>bb",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show open buffers" },
-        },
-        {
-            ["action"] = "<cmd>bnext<cr>",
-            ["key"] = "<leader>bn",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Goto next buffer" },
-        },
-        {
-            ["action"] = "<cmd>bprevious<cr>",
-            ["key"] = "<leader>bp",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Goto previous buffer" },
-        },
-        {
-            ["action"] = "<cmd>Bdelete<cr>",
-            ["key"] = "<leader>bd",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Close current buffer" },
-        },
-        { ["action"] = "+windows", ["key"] = "<leader>w", ["mode"] = "n" },
-        {
-            ["action"] = "<C-w>c",
-            ["key"] = "<leader>wd",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Close current window" },
-        },
-        {
-            ["action"] = "<C-w>s",
-            ["key"] = "<leader>ws",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Split window horizontally" },
-        },
-        {
-            ["action"] = "<C-w>v",
-            ["key"] = "<leader>wv",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Split window vertically" },
-        },
-        { ["action"] = "<C-w>=", ["key"] = "<leader>w=", ["mode"] = "n", ["options"] = { ["desc"] = "Balance windows" } },
-        { ["action"] = "<C-w>h", ["key"] = "<leader>wh", ["mode"] = "n", ["options"] = { ["desc"] = "Goto left window" } },
-        { ["action"] = "<C-w>l", ["key"] = "<leader>wl", ["mode"] = "n", ["options"] = {
-            ["desc"] = "Goto right window",
-        } },
-        { ["action"] = "<C-w>j", ["key"] = "<leader>wj", ["mode"] = "n", ["options"] = {
-            ["desc"] = "Goto bottom window",
-        } },
-        { ["action"] = "<C-w>k", ["key"] = "<leader>wk", ["mode"] = "n", ["options"] = { ["desc"] = "Goto top window" } },
-        { ["action"] = "<C-w>p", ["key"] = "<leader>ww", ["mode"] = "n", ["options"] = {
-            ["desc"] = "Goto other window",
-        } },
-        {
-            ["action"] = "<cmd>WinShift<cr>",
-            ["key"] = "<leader>wm",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Move window" },
-        },
-        { ["action"] = "+toggle", ["key"] = "<leader>t", ["mode"] = "n" },
-        {
-            ["action"] = "<cmd>Neotree action=show toggle=true<cr><C-w>=",
-            ["key"] = "<leader>tt",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Toggle NeoTree" },
-        },
-        {
-            ["action"] = "<cmd>Navbuddy<cr>",
-            ["key"] = "<leader>tn",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Toggle NavBuddy" },
-        },
-        {
-            ["action"] = "<cmd>TroubleToggle workspace_diagnostics focus=false<cr>",
-            ["key"] = "<leader>td",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Toggle Trouble diagnostics" },
-        },
-        {
-            ["action"] = "<cmd>TroubleToggle todo focus=false<cr>",
-            ["key"] = "<leader>tT",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Toggle Trouble TODOs" },
-        },
-        {
-            ["action"] = "<cmd>ToggleAutoformat<cr>",
-            ["key"] = "<leader>tf",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Toggle autoformat-on-save" },
-        },
-        {
-            ["action"] = "<cmd>ToggleAutoLint<cr>",
-            ["key"] = "<leader>tl",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Toggle autolint-on-save" },
-        },
-        {
-            ["action"] = "<cmd>ToggleInlineDiagnostics<cr>",
-            ["key"] = "<leader>tD",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Toggle inline diagnostics" },
-        },
-        {
-            ["action"] = "<cmd>:set wrap!<cr>",
-            ["key"] = "<leader>tw",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Toggle word-wrap" },
-        },
-        { ["action"] = "+git", ["key"] = "<leader>g", ["mode"] = "n" },
-        {
-            ["action"] = "<cmd>LazyGit<cr>",
-            ["key"] = "<leader>gg",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show LazyGit" },
-        },
-        {
-            ["action"] = "<cmd>GitMessenger<cr>",
-            ["key"] = "<leader>gm",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show GitMessenger" },
-        },
-        {
-            ["action"] = "<cmd>Telescope git_status<cr>",
-            ["key"] = "<leader>gs",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show Git status" },
-        },
-        {
-            ["action"] = "<cmd>Telescope git_commits<cr>",
-            ["key"] = "<leader>gc",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show Git log" },
-        },
-        {
-            ["action"] = "<cmd>Telescope git_branches<cr>",
-            ["key"] = "<leader>gb",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show Git branches" },
-        },
-        {
-            ["action"] = "<cmd>Telescope git_bcommits<cr>",
-            ["key"] = "<leader>gf",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show Git log for current file" },
-        },
-        {
-            ["action"] = "<cmd>DiffviewOpen<cr>",
-            ["key"] = "<leader>gd",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show Git diff for current worktree" },
-        },
-        { ["action"] = "+lsp", ["key"] = "<leader>l", ["mode"] = "n" },
-        {
-            ["action"] = "<cmd>Telescope lsp_references<cr>",
-            ["key"] = "<leader>lr",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Goto references" },
-        },
-        {
-            ["action"] = "<cmd>Telescope lsp_definitions<cr>",
-            ["key"] = "<leader>ld",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Goto definition" },
-        },
-        {
-            ["action"] = "<cmd>Telescope lsp_implementations<cr>",
-            ["key"] = "<leader>li",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Goto implementation" },
-        },
-        {
-            ["action"] = "<cmd>Telescope lsp_type_definitions<cr>",
-            ["key"] = "<leader>lt",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Goto type definition" },
-        },
-        {
-            ["action"] = "<cmd>Telescope lsp_incoming_calls<cr>",
-            ["key"] = "<leader>lI",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show incoming calls" },
-        },
-        {
-            ["action"] = "<cmd>Telescope lsp_outgoing_calls<cr>",
-            ["key"] = "<leader>lO",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show outgoing calls" },
-        },
-        { ["action"] = "+code", ["key"] = "<leader>c", ["mode"] = "n" },
-        {
-            ["action"] = "<cmd>lua require('conform').format()<cr>",
-            ["key"] = "<leader>cf",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Format current buffer" },
-        },
-        {
-            ["action"] = "<cmd>lua vim.diagnostic.open_float()<cr>",
-            ["key"] = "<leader>cd",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show LSP line diagnostics" },
-        },
-        {
-            ["action"] = "<cmd>Telescope diagnostics<cr>",
-            ["key"] = "<leader>cD",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show diagnostics" },
-        },
-        {
-            ["action"] = "<cmd>lua vim.lsp.buf.rename()<cr>",
-            ["key"] = "<leader>cr",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Rename LSP symbol" },
-        },
-        {
-            ["action"] = "<cmd>lua vim.lsp.buf.code_action()<cr>",
-            ["key"] = "<leader>ca",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show LSP code actions" },
-        },
-        {
-            ["action"] = "<cmd>ClangdSwitchSourceHeader<cr>",
-            ["key"] = "<leader>ch",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Switch C/C++ source/header" },
+            action = "<cmd>ClangdSwitchSourceHeader<cr>",
+            key = "<leader>ch",
+            mode = "n",
+            options = { desc = "Switch C/C++ source/header" },
         },
     }
     for i, map in ipairs(__nixvim_binds) do
@@ -1718,7 +1541,7 @@ do
 end
 -- }}}
 
-vim.filetype.add({ ["extension"] = { ["v"] = "vlang" } })
+vim.filetype.add({ extension = { v = "vlang" } })
 
 -- Make Lazy window border rounded
 require("lazy.core.config").options.ui.border = "rounded"
@@ -1777,33 +1600,51 @@ end, {
 do
     local __nixvim_autocommands = {
         {
-            ["callback"] = function()
+            callback = function()
                 if not vim.g.disable_autolint then
                     require("lint").try_lint()
                 end
             end,
-            ["event"] = { "BufWritePost" },
+            event = { "BufWritePost" },
         },
         {
-            ["callback"] = function()
+            callback = function()
                 vim.highlight.on_yank()
             end,
-            ["event"] = { "TextYankPost" },
+            event = { "TextYankPost" },
         },
         {
-            ["callback"] = function()
+            callback = function()
                 local current_tab = vim.fn.tabpagenr()
                 vim.cmd("tabdo wincmd =")
                 vim.cmd("tabnext " .. current_tab)
             end,
-            ["event"] = { "VimResized" },
+            event = { "VimResized" },
         },
         {
-            ["callback"] = function()
+            callback = function()
                 vim.opt_local.conceallevel = 0
             end,
-            ["event"] = "FileType",
-            ["pattern"] = { "json", "jsonc", "json5" },
+            event = { "FileType" },
+            pattern = { "json", "jsonc", "json5" },
+        },
+        {
+            callback = function()
+                local workspace = vim.fs.dirname(vim.fs.find({ "gradlew", ".git", "mvnw" }, { upward = true })[1])
+
+                local opts = {
+                    root_dir = workspace,
+                    cmd = {
+                        "jdtls",
+                        "-data",
+                        "/home/lab/smchurla/.local/share/eclipse/" .. vim.fn.fnamemodify(workspace, ":p:h:t"),
+                    },
+                }
+
+                require("jdtls").start_or_attach(opts)
+            end,
+            event = { "FileType" },
+            pattern = { "Java", "java" },
         },
     }
 
diff --git a/config/neovim/config_nix.lua b/config/neovim/config_nix.lua
index 5770c0b4..55b86a5e 100644
--- a/config/neovim/config_nix.lua
+++ b/config/neovim/config_nix.lua
@@ -1,6 +1,6 @@
 -- Set up globals {{{
 do
-    local nixvim_globals = { ["mallocalleader"] = " ", ["mapleader"] = " " }
+    local nixvim_globals = { mallocalleader = " ", mapleader = " " }
 
     for k, v in pairs(nixvim_globals) do
         vim.g[k] = v
@@ -11,52 +11,52 @@ end
 -- Set up options {{{
 do
     local nixvim_options = {
-        ["autoindent"] = false,
-        ["backspace"] = { "indent", "eol", "start" },
-        ["cindent"] = true,
-        ["cinkeys"] = "0{,0},0),0],:,!^F,o,O,e",
-        ["completeopt"] = { "menuone", "noselect", "noinsert" },
-        ["confirm"] = true,
-        ["cursorline"] = true,
-        ["encoding"] = "utf-8",
-        ["expandtab"] = true,
-        ["fileencoding"] = "utf-8",
-        ["foldcolumn"] = "0",
-        ["foldenable"] = true,
-        ["foldlevel"] = 99,
-        ["foldlevelstart"] = 99,
-        ["formatexpr"] = "v:lua.require('conform').formatexpr()",
-        ["grepformat"] = "%f:%l:%c:%m",
-        ["grepprg"] = "rg --vimgrep",
-        ["hidden"] = true,
-        ["hlsearch"] = true,
-        ["ignorecase"] = true,
-        ["incsearch"] = true,
-        ["laststatus"] = 3,
-        ["mouse"] = "a",
-        ["number"] = true,
-        ["pumheight"] = 0,
-        ["relativenumber"] = true,
-        ["ruler"] = true,
-        ["scrolloff"] = 10,
-        ["sessionoptions"] = { "buffers", "curdir", "tabpages", "winsize", "help", "globals", "skiprtp", "folds" },
-        ["shiftwidth"] = 4,
-        ["showmode"] = false,
-        ["showtabline"] = 0,
-        ["signcolumn"] = "yes",
-        ["smartcase"] = true,
-        ["smartindent"] = false,
-        ["smarttab"] = true,
-        ["softtabstop"] = 4,
-        ["splitbelow"] = true,
-        ["splitright"] = true,
-        ["tabstop"] = 4,
-        ["termguicolors"] = true,
-        ["timeoutlen"] = 50,
-        ["undodir"] = "/home/christoph/.vim/undo",
-        ["undofile"] = true,
-        ["undolevels"] = 10000,
-        ["winblend"] = 30,
+        autoindent = false,
+        backspace = { "indent", "eol", "start" },
+        cindent = true,
+        cinkeys = "0{,0},0),0],:,!^F,o,O,e",
+        completeopt = { "menuone", "noselect", "noinsert" },
+        confirm = true,
+        cursorline = true,
+        encoding = "utf-8",
+        expandtab = true,
+        fileencoding = "utf-8",
+        foldcolumn = "0",
+        foldenable = true,
+        foldlevel = 99,
+        foldlevelstart = 99,
+        formatexpr = "v:lua.require('conform').formatexpr()",
+        grepformat = "%f:%l:%c:%m",
+        grepprg = "rg --vimgrep",
+        hidden = true,
+        hlsearch = true,
+        ignorecase = true,
+        incsearch = true,
+        laststatus = 3,
+        mouse = "a",
+        number = true,
+        pumheight = 0,
+        relativenumber = true,
+        ruler = true,
+        scrolloff = 10,
+        sessionoptions = { "buffers", "curdir", "tabpages", "winsize", "help", "globals", "skiprtp", "folds" },
+        shiftwidth = 4,
+        showmode = false,
+        showtabline = 0,
+        signcolumn = "yes",
+        smartcase = true,
+        smartindent = false,
+        smarttab = true,
+        softtabstop = 4,
+        splitbelow = true,
+        splitright = true,
+        tabstop = 4,
+        termguicolors = true,
+        timeoutlen = 50,
+        undodir = "/home/christoph/.vim/undo",
+        undofile = true,
+        undolevels = 10000,
+        winblend = 30,
     }
 
     for k, v in pairs(nixvim_options) do
@@ -72,14 +72,14 @@ vim.cmd([[
 ]])
 require("lazy").setup({
     dev = {
-        path = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins",
+        path = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins",
         patterns = { "." },
         fallback = false,
     },
     spec = {
         {
             "catppuccin",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("catppuccin").setup(opts)
 
                 vim.cmd([[
@@ -87,116 +87,116 @@ require("lazy").setup({
     colorscheme catppuccin
   ]])
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/catppuccin-nvim",
-            ["lazy"] = false,
-            ["name"] = "catppuccin",
-            ["opts"] = { ["background"] = { ["dark"] = "mocha", ["light"] = "latte" }, ["flavour"] = "mocha" },
-            ["priority"] = 1000,
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/catppuccin-nvim",
+            lazy = false,
+            name = "catppuccin",
+            opts = { background = { dark = "mocha", light = "latte" }, flavour = "mocha" },
+            priority = 1000,
         },
         {
             "nvim-web-devicons",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("nvim-web-devicons").setup(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/nvim-web-devicons",
-            ["lazy"] = true,
-            ["name"] = "nvim-web-devicons",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nvim-web-devicons",
+            lazy = true,
+            name = "nvim-web-devicons",
         },
         {
             "nvim-autopairs",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("nvim-autopairs").setup(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/nvim-autopairs",
-            ["event"] = { "InsertEnter" },
-            ["lazy"] = true,
-            ["name"] = "nvim-autopairs",
-            ["opts"] = { ["check_ts"] = true },
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nvim-autopairs",
+            event = { "InsertEnter" },
+            lazy = true,
+            name = "nvim-autopairs",
+            opts = { check_ts = true },
         },
         {
             "vim-bbye",
-            ["cmd"] = { "Bdelete", "Bwipeout" },
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/vim-bbye",
-            ["lazy"] = true,
-            ["name"] = "vim-bbye",
+            cmd = { "Bdelete", "Bwipeout" },
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/vim-bbye",
+            lazy = true,
+            name = "vim-bbye",
         },
         {
             "better_escape",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("better_escape").setup(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/better-escape.nvim",
-            ["event"] = { "InsertEnter" },
-            ["lazy"] = true,
-            ["name"] = "better_escape",
-            ["opts"] = { ["mapping"] = { "jk" }, ["timeout"] = 200 },
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/better-escape.nvim",
+            event = { "InsertEnter" },
+            lazy = true,
+            name = "better_escape",
+            opts = { mapping = { "jk" }, timeout = 200 },
         },
         {
             "clangd_extensions",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("clangd_extensions").setup(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/clangd_extensions.nvim",
-            ["lazy"] = true,
-            ["name"] = "clangd_extensions",
-            ["opts"] = { ["inlay_hints"] = { ["inline"] = false } },
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/clangd_extensions.nvim",
+            lazy = true,
+            name = "clangd_extensions",
+            opts = { inlay_hints = { inline = false } },
         },
         {
             "cmp",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("cmp").setup(opts)
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "cmp-async-path",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/cmp-async-path",
-                    ["lazy"] = true,
-                    ["name"] = "cmp-async-path",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/cmp-async-path",
+                    lazy = true,
+                    name = "cmp-async-path",
                 },
                 {
                     "cmp-buffer",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/cmp-buffer",
-                    ["enabled"] = false,
-                    ["lazy"] = true,
-                    ["name"] = "cmp-buffer",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/cmp-buffer",
+                    enabled = false,
+                    lazy = true,
+                    name = "cmp-buffer",
                 },
                 {
                     "cmp-cmdline",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/cmp-cmdline",
-                    ["enabled"] = false,
-                    ["lazy"] = true,
-                    ["name"] = "cmp-cmdline",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/cmp-cmdline",
+                    enabled = false,
+                    lazy = true,
+                    name = "cmp-cmdline",
                 },
                 {
                     "cmp-emoji",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/cmp-emoji",
-                    ["lazy"] = true,
-                    ["name"] = "cmp-emoji",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/cmp-emoji",
+                    lazy = true,
+                    name = "cmp-emoji",
                 },
                 {
                     "cmp-nvim-lsp",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/cmp-nvim-lsp",
-                    ["lazy"] = true,
-                    ["name"] = "cmp-nvim-lsp",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/cmp-nvim-lsp",
+                    lazy = true,
+                    name = "cmp-nvim-lsp",
                 },
                 {
                     "cmp-nvim-lsp-signature-help",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/cmp-nvim-lsp-signature-help",
-                    ["lazy"] = true,
-                    ["name"] = "cmp-nvim-lsp-signature-help",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/cmp-nvim-lsp-signature-help",
+                    lazy = true,
+                    name = "cmp-nvim-lsp-signature-help",
                 },
                 {
                     "cmp_luasnip",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/cmp_luasnip",
-                    ["lazy"] = true,
-                    ["name"] = "cmp_luasnip",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/cmp_luasnip",
+                    lazy = true,
+                    name = "cmp_luasnip",
                 },
             },
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/nvim-cmp",
-            ["event"] = { "InsertEnter" },
-            ["lazy"] = true,
-            ["name"] = "cmp",
-            ["opts"] = function()
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nvim-cmp",
+            event = { "InsertEnter" },
+            lazy = true,
+            name = "cmp",
+            opts = function()
                 local cmp = require("cmp")
                 local luasnip = require("luasnip")
 
@@ -264,98 +264,98 @@ require("lazy").setup({
         },
         {
             "Comment",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("Comment").setup(opts)
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "ts_context_commentstring",
-                    ["config"] = function(_, opts)
+                    config = function(_, opts)
                         require("ts_context_commentstring").setup(opts)
                     end,
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/nvim-ts-context-commentstring",
-                    ["init"] = function()
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nvim-ts-context-commentstring",
+                    init = function()
                         -- Skip compatibility checks
                         vim.g.skip_ts_context_commentstring_module = true
                     end,
-                    ["lazy"] = true,
-                    ["name"] = "ts_context_commentstring",
+                    lazy = true,
+                    name = "ts_context_commentstring",
                 },
             },
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/comment.nvim",
-            ["lazy"] = false,
-            ["name"] = "Comment",
-            ["opts"] = {
-                ["mappings"] = { ["basic"] = true, ["extra"] = false },
-                ["opleader"] = { ["block"] = "<C-b>", ["line"] = "<C-c>" },
-                ["pre_hook"] = function()
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/comment.nvim",
+            lazy = false,
+            name = "Comment",
+            opts = {
+                mappings = { basic = true, extra = false },
+                opleader = { block = "<C-b>", line = "<C-c>" },
+                pre_hook = function()
                     require("ts_context_commentstring.integrations.comment_nvim").create_pre_hook()
                 end,
-                ["toggler"] = { ["block"] = "<C-b>", ["line"] = "<C-c>" },
+                toggler = { block = "<C-b>", line = "<C-c>" },
             },
         },
         {
             "conform",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("conform").setup(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/conform.nvim",
-            ["event"] = { "BufReadPost", "BufNewFile" },
-            ["lazy"] = true,
-            ["name"] = "conform",
-            ["opts"] = {
-                ["format_on_save"] = function(bufnr)
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/conform.nvim",
+            event = { "BufReadPost", "BufNewFile" },
+            lazy = true,
+            name = "conform",
+            opts = {
+                format_on_save = function(bufnr)
                     -- Disable with a global or buffer-local variable
                     if vim.g.disable_autoformat then
                         return
                     end
                     return { timeout_ms = 500, lsp_fallback = true }
                 end,
-                ["formatters_by_ft"] = {
-                    ["c"] = { "clang-format" },
-                    ["cpp"] = { "clang-format" },
-                    ["css"] = { { "prettierd", "prettier" } },
-                    ["h"] = { "clang-format" },
-                    ["hpp"] = { "clang-format" },
-                    ["html"] = { { "prettierd", "prettier" } },
-                    ["java"] = { "google-java-format" },
-                    ["javascript"] = { { "prettierd", "prettier" } },
-                    ["lua"] = { "stylua" },
-                    ["markdown"] = { { "prettierd", "prettier" } },
-                    ["nix"] = { "alejandra" },
-                    ["python"] = { "black" },
-                    ["rust"] = { "rustfmt" },
+                formatters_by_ft = {
+                    c = { "clang-format" },
+                    cpp = { "clang-format" },
+                    css = { { "prettierd", "prettier" } },
+                    h = { "clang-format" },
+                    hpp = { "clang-format" },
+                    html = { { "prettierd", "prettier" } },
+                    java = { "google-java-format" },
+                    javascript = { { "prettierd", "prettier" } },
+                    lua = { "stylua" },
+                    markdown = { { "prettierd", "prettier" } },
+                    nix = { "alejandra" },
+                    python = { "black" },
+                    rust = { "rustfmt" },
                 },
             },
         },
         {
             "dashboard",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("dashboard").setup(opts)
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "nvim-web-devicons",
-                    ["config"] = function(_, opts)
+                    config = function(_, opts)
                         require("nvim-web-devicons").setup(opts)
                     end,
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/nvim-web-devicons",
-                    ["lazy"] = true,
-                    ["name"] = "nvim-web-devicons",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nvim-web-devicons",
+                    lazy = true,
+                    name = "nvim-web-devicons",
                 },
                 {
                     "persisted",
-                    ["cmd"] = { "SessionSave", "SessionDelete", "Telescope persisted" },
-                    ["config"] = function(_, opts)
+                    cmd = { "SessionSave", "SessionDelete", "Telescope persisted" },
+                    config = function(_, opts)
                         require("persisted").setup(opts)
 
                         require("telescope").load_extension("persisted")
                     end,
-                    ["dependencies"] = {
+                    dependencies = {
                         {
                             "telescope",
-                            ["cmd"] = { "Telescope" },
-                            ["config"] = function(_, opts)
+                            cmd = { "Telescope" },
+                            config = function(_, opts)
                                 local telescope = require("telescope")
                                 telescope.setup(opts)
 
@@ -363,39 +363,39 @@ require("lazy").setup({
                                     telescope.load_extension(extension)
                                 end
                             end,
-                            ["dependencies"] = {
+                            dependencies = {
                                 {
                                     "plenary",
-                                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/plenary.nvim",
-                                    ["lazy"] = true,
-                                    ["name"] = "plenary",
+                                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/plenary.nvim",
+                                    lazy = true,
+                                    name = "plenary",
                                 },
                                 {
                                     "telescope-fzf-native",
-                                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/telescope-fzf-native.nvim",
-                                    ["lazy"] = true,
-                                    ["name"] = "telescope-fzf-native",
+                                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/telescope-fzf-native.nvim",
+                                    lazy = true,
+                                    name = "telescope-fzf-native",
                                 },
                                 {
                                     "telescope-undo",
-                                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/telescope-undo.nvim",
-                                    ["lazy"] = true,
-                                    ["name"] = "telescope-undo",
+                                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/telescope-undo.nvim",
+                                    lazy = true,
+                                    name = "telescope-undo",
                                 },
                                 {
                                     "telescope-ui-select",
-                                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/telescope-ui-select.nvim",
-                                    ["lazy"] = true,
-                                    ["name"] = "telescope-ui-select",
+                                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/telescope-ui-select.nvim",
+                                    lazy = true,
+                                    name = "telescope-ui-select",
                                 },
                             },
-                            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/telescope.nvim",
-                            ["lazy"] = true,
-                            ["name"] = "telescope",
-                            ["opts"] = {
-                                ["defaults"] = {
-                                    ["mappings"] = {
-                                        ["i"] = {
+                            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/telescope.nvim",
+                            lazy = true,
+                            name = "telescope",
+                            opts = {
+                                defaults = {
+                                    mappings = {
+                                        i = {
                                             ["<Esc>"] = function(...)
                                                 return require("telescope.actions").close(...)
                                             end,
@@ -405,39 +405,34 @@ require("lazy").setup({
                             },
                         },
                     },
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/persisted.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "persisted",
-                    ["opts"] = {
-                        ["autoload"] = false,
-                        ["autosave"] = false,
-                        ["follow_cwd"] = true,
-                        ["ignored_dirs"] = { "/", "~/", "~/Projects/" },
-                        ["silent"] = false,
-                        ["use_git_branch"] = false,
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/persisted.nvim",
+                    lazy = true,
+                    name = "persisted",
+                    opts = {
+                        autoload = false,
+                        autosave = false,
+                        follow_cwd = true,
+                        ignored_dirs = { "/", "~/", "~/Projects/" },
+                        silent = false,
+                        use_git_branch = false,
                     },
                 },
             },
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/dashboard-nvim",
-            ["lazy"] = false,
-            ["name"] = "dashboard",
-            ["opts"] = {
-                ["config"] = {
-                    ["center"] = {
-                        {
-                            ["action"] = "Telescope persisted",
-                            ["desc"] = " Restore Session",
-                            ["icon"] = " ",
-                            ["key"] = "s",
-                        },
-                        { ["action"] = "Telescope find_files", ["desc"] = " Find File", ["icon"] = " ", ["key"] = "f" },
-                        { ["action"] = "Telescope oldfiles", ["desc"] = " Recent Files", ["icon"] = " ", ["key"] = "r" },
-                        { ["action"] = "ene | startinsert", ["desc"] = " New File", ["icon"] = " ", ["key"] = "n" },
-                        { ["action"] = "Telescope live_grep", ["desc"] = " Find Text", ["icon"] = " ", ["key"] = "g" },
-                        { ["action"] = "Lazy", ["desc"] = " Lazy", ["icon"] = "󰒲 ", ["key"] = "l" },
-                        { ["action"] = "quitall", ["desc"] = " Quit", ["icon"] = " ", ["key"] = "q" },
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/dashboard-nvim",
+            lazy = false,
+            name = "dashboard",
+            opts = {
+                config = {
+                    center = {
+                        { action = "Telescope persisted", desc = " Restore Session", icon = " ", key = "s" },
+                        { action = "Telescope find_files", desc = " Find File", icon = " ", key = "f" },
+                        { action = "Telescope oldfiles", desc = " Recent Files", icon = " ", key = "r" },
+                        { action = "ene | startinsert", desc = " New File", icon = " ", key = "n" },
+                        { action = "Telescope live_grep", desc = " Find Text", icon = " ", key = "g" },
+                        { action = "Lazy", desc = " Lazy", icon = "󰒲 ", key = "l" },
+                        { action = "quitall", desc = " Quit", icon = " ", key = "q" },
                     },
-                    ["footer"] = function()
+                    footer = function()
                         local stats = require("lazy").stats()
                         local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100)
                         return {
@@ -445,39 +440,39 @@ require("lazy").setup({
                         }
                     end,
                 },
-                ["disable_move"] = true,
-                ["shortcut_type"] = "number",
-                ["theme"] = "doom",
+                disable_move = true,
+                shortcut_type = "number",
+                theme = "doom",
             },
         },
         {
             "diffview",
-            ["cmd"] = { "DiffviewOpen" },
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/diffview.nvim",
-            ["lazy"] = true,
-            ["name"] = "diffview",
+            cmd = { "DiffviewOpen" },
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/diffview.nvim",
+            lazy = true,
+            name = "diffview",
         },
         {
             "direnv",
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/direnv.vim",
-            ["lazy"] = false,
-            ["name"] = "direnv",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/direnv.vim",
+            lazy = false,
+            name = "direnv",
         },
         {
             "flash",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("flash").setup(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/flash.nvim",
-            ["keys"] = { "s", "S", "f", "F", "t", "T" },
-            ["lazy"] = true,
-            ["name"] = "flash",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/flash.nvim",
+            keys = { "s", "S", "f", "F", "t", "T" },
+            lazy = true,
+            name = "flash",
         },
         {
             "gitmessenger",
-            ["cmd"] = { "GitMessenger" },
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/git-messenger.vim",
-            ["init"] = function()
+            cmd = { "GitMessenger" },
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/git-messenger.vim",
+            init = function()
                 for k, v in pairs({
                     ["git_messenger_floating_win_opts"] = { ["border"] = "rounded" },
                     ["git_messenger_no_default_mappings"] = true,
@@ -485,37 +480,37 @@ require("lazy").setup({
                     vim.g[k] = v
                 end
             end,
-            ["lazy"] = true,
-            ["name"] = "gitmessenger",
+            lazy = true,
+            name = "gitmessenger",
         },
         {
             "gitsigns",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("gitsigns").setup(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/gitsigns.nvim",
-            ["event"] = { "BufReadPost", "BufNewFile" },
-            ["lazy"] = true,
-            ["name"] = "gitsigns",
-            ["opts"] = { ["current_line_blame"] = false },
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/gitsigns.nvim",
+            event = { "BufReadPost", "BufNewFile" },
+            lazy = true,
+            name = "gitsigns",
+            opts = { current_line_blame = false },
         },
         {
             "haskell-tools",
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/haskell-tools.nvim",
-            ["lazy"] = false,
-            ["name"] = "haskell-tools",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/haskell-tools.nvim",
+            lazy = false,
+            name = "haskell-tools",
         },
         {
             "illuminate",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("illuminate").configure(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/vim-illuminate",
-            ["event"] = { "BufreadPost", "BufNewFile" },
-            ["lazy"] = true,
-            ["name"] = "illuminate",
-            ["opts"] = {
-                ["filetypesDenylist"] = {
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/vim-illuminate",
+            event = { "BufreadPost", "BufNewFile" },
+            lazy = true,
+            name = "illuminate",
+            opts = {
+                filetypesDenylist = {
                     "DressingSelect",
                     "Outline",
                     "TelescopePrompt",
@@ -530,69 +525,75 @@ require("lazy").setup({
         },
         {
             "intellitab",
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/intellitab.nvim",
-            ["event"] = { "InsertEnter" },
-            ["lazy"] = true,
-            ["name"] = "intellitab",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/intellitab.nvim",
+            event = { "InsertEnter" },
+            lazy = true,
+            name = "intellitab",
+        },
+        {
+            "jdtls",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nvim-jdtls",
+            lazy = false,
+            name = "jdtls",
         },
         {
             "nvim-lastplace",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("nvim-lastplace").setup(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/nvim-lastplace",
-            ["lazy"] = false,
-            ["name"] = "nvim-lastplace",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nvim-lastplace",
+            lazy = false,
+            name = "nvim-lastplace",
         },
         {
             "lazygit",
-            ["cmd"] = { "LazyGit", "LazyGitConfig", "LazyGitCurrentFile", "LazyGitFilter", "LazyGitFilterCurrentFile" },
-            ["dependencies"] = {
+            cmd = { "LazyGit", "LazyGitConfig", "LazyGitCurrentFile", "LazyGitFilter", "LazyGitFilterCurrentFile" },
+            dependencies = {
                 {
                     "plenary",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/plenary.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "plenary",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/plenary.nvim",
+                    lazy = true,
+                    name = "plenary",
                 },
             },
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/lazygit.nvim",
-            ["lazy"] = true,
-            ["name"] = "lazygit",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/lazygit.nvim",
+            lazy = true,
+            name = "lazygit",
         },
         {
             "lint",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 local lint = require("lint")
 
                 for k, v in pairs(opts) do
                     lint[k] = v
                 end
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/nvim-lint",
-            ["event"] = { "BufReadPost", "BufNewFile" },
-            ["lazy"] = true,
-            ["name"] = "lint",
-            ["opts"] = {
-                ["linters_by_ft"] = {
-                    ["c"] = { "clangtidy" },
-                    ["clojure"] = { "clj-kondo" },
-                    ["cpp"] = { "clangtidy" },
-                    ["h"] = { "clangtidy" },
-                    ["hpp"] = { "clangtidy" },
-                    ["java"] = { "checkstyle" },
-                    ["javascript"] = { "eslint_d" },
-                    ["lua"] = { "luacheck" },
-                    ["markdown"] = { "vale" },
-                    ["nix"] = { "statix" },
-                    ["python"] = { "flake8" },
-                    ["text"] = { "vale" },
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nvim-lint",
+            event = { "BufReadPost", "BufNewFile" },
+            lazy = true,
+            name = "lint",
+            opts = {
+                linters_by_ft = {
+                    c = { "clangtidy" },
+                    clojure = { "clj-kondo" },
+                    cpp = { "clangtidy" },
+                    h = { "clangtidy" },
+                    hpp = { "clangtidy" },
+                    java = { "checkstyle" },
+                    javascript = { "eslint_d" },
+                    lua = { "luacheck" },
+                    markdown = { "vale" },
+                    nix = { "statix" },
+                    python = { "flake8" },
+                    text = { "vale" },
                 },
             },
         },
         {
             "lspconfig",
-            ["cmd"] = { "LspInfo" },
-            ["config"] = function(_, opts)
+            cmd = { "LspInfo" },
+            config = function(_, opts)
                 -- Make LspInfo window border rounded
                 require("lspconfig.ui.windows").default_options.border = "rounded"
 
@@ -647,6 +648,16 @@ require("lazy").setup({
                     { ["name"] = "cmake" },
                     { ["name"] = "lua_ls" },
                     { ["name"] = "nil_ls" },
+                    {
+                        ["extraOptions"] = {
+                            ["nixd"] = {
+                                ["diagnostic"] = {
+                                    ["suppress"] = { "sema-escaping-with", "var-bind-to-this", "escaping-this-with" },
+                                },
+                            },
+                        },
+                        ["name"] = "nixd",
+                    },
                     { ["name"] = "pyright" },
                     { ["name"] = "texlab" },
                 }) do
@@ -665,25 +676,25 @@ require("lazy").setup({
                     end
                 end
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "lazydev",
-                    ["config"] = function(_, opts)
+                    config = function(_, opts)
                         require("lazydev").setup(opts)
                     end,
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/vimplugin-nvim-lazydev",
-                    ["ft"] = { "lua" },
-                    ["name"] = "lazydev",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/vimplugin-nvim-lazydev",
+                    ft = { "lua" },
+                    name = "lazydev",
                 },
             },
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/nvim-lspconfig",
-            ["event"] = { "BufReadPost", "BufNewFile" },
-            ["lazy"] = true,
-            ["name"] = "lspconfig",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nvim-lspconfig",
+            event = { "BufReadPost", "BufNewFile" },
+            lazy = true,
+            name = "lspconfig",
         },
         {
             "lualine",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 local lualine = require("lualine")
 
                 lualine.setup(opts)
@@ -694,61 +705,61 @@ require("lazy").setup({
                     unhide = false,
                 })
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/lualine.nvim",
-            ["event"] = { "BufReadPost", "BufNewFile" },
-            ["lazy"] = true,
-            ["name"] = "lualine",
-            ["opts"] = {
-                ["extensions"] = { "fzf", "chadtree", "neo-tree", "toggleterm", "trouble" },
-                ["options"] = {
-                    ["always_divide_middle"] = true,
-                    ["component_separators"] = { ["left"] = "", ["right"] = "" },
-                    ["globalstatus"] = true,
-                    ["ignore_focus"] = { "neo-tree", "chadtree" },
-                    ["section_separators"] = { ["left"] = "", ["right"] = "" },
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/lualine.nvim",
+            event = { "BufReadPost", "BufNewFile" },
+            lazy = true,
+            name = "lualine",
+            opts = {
+                extensions = { "fzf", "chadtree", "neo-tree", "toggleterm", "trouble" },
+                options = {
+                    always_divide_middle = true,
+                    component_separators = { left = "", right = "" },
+                    globalstatus = true,
+                    ignore_focus = { "neo-tree", "chadtree" },
+                    section_separators = { left = "", right = "" },
                 },
-                ["sections"] = {
-                    ["lualine_a"] = { "mode" },
-                    ["lualine_b"] = { "branch", "diff", "diagnostics" },
-                    ["lualine_c"] = { { "filename", path = 1 } },
-                    ["lualine_x"] = { "filetype", "encoding", "fileformat" },
-                    ["lualine_y"] = { "progress", "searchcount", "selectioncount" },
-                    ["lualine_z"] = { "location" },
+                sections = {
+                    lualine_a = { "mode" },
+                    lualine_b = { "branch", "diff", "diagnostics" },
+                    lualine_c = { { "filename", path = 1 } },
+                    lualine_x = { "filetype", "encoding", "fileformat" },
+                    lualine_y = { "progress", "searchcount", "selectioncount" },
+                    lualine_z = { "location" },
                 },
             },
         },
         {
             "luasnip",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("luasnip").config.set_config(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/luasnip",
-            ["lazy"] = false,
-            ["name"] = "luasnip",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/luasnip",
+            lazy = false,
+            name = "luasnip",
         },
         {
             "narrow-region",
-            ["cmd"] = { "NR" },
-            ["config"] = function(_, opts)
+            cmd = { "NR" },
+            config = function(_, opts)
                 vim.keymap.del("x", "<space>Nr")
                 vim.keymap.del("x", "<space>nr")
                 vim.keymap.del("n", "<space>nr")
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/NrrwRgn",
-            ["lazy"] = true,
-            ["name"] = "narrow-region",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/NrrwRgn",
+            lazy = true,
+            name = "narrow-region",
         },
         {
             "navbuddy",
-            ["cmd"] = { "Navbuddy" },
-            ["config"] = function(_, opts)
+            cmd = { "Navbuddy" },
+            config = function(_, opts)
                 local actions = require("nvim-navbuddy.actions") -- ?
                 require("nvim-navbuddy").setup(opts)
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "navic",
-                    ["config"] = function(_, opts)
+                    config = function(_, opts)
                         navic = require("nvim-navic")
                         navic.setup(opts)
 
@@ -771,163 +782,156 @@ require("lazy").setup({
                         --   }
                         -- })
                     end,
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/nvim-navic",
-                    ["lazy"] = true,
-                    ["name"] = "navic",
-                    ["opts"] = {
-                        ["click"] = true,
-                        ["depth_limit"] = 5,
-                        ["highlight"] = true,
-                        ["lsp"] = { ["auto_attach"] = true },
-                    },
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nvim-navic",
+                    lazy = true,
+                    name = "navic",
+                    opts = { click = true, depth_limit = 5, highlight = true, lsp = { auto_attach = true } },
                 },
             },
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/nvim-navbuddy",
-            ["lazy"] = true,
-            ["name"] = "navbuddy",
-            ["opts"] = { ["lsp"] = { ["auto_attach"] = true }, ["window"] = { ["border"] = "rounded" } },
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nvim-navbuddy",
+            lazy = true,
+            name = "navbuddy",
+            opts = { lsp = { auto_attach = true }, window = { border = "rounded" } },
         },
         {
             "neo-tree",
-            ["cmd"] = { "Neotree" },
-            ["config"] = function(_, opts)
+            cmd = { "Neotree" },
+            config = function(_, opts)
                 require("neo-tree").setup(opts)
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "plenary",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/plenary.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "plenary",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/plenary.nvim",
+                    lazy = true,
+                    name = "plenary",
                 },
                 {
                     "nvim-web-devicons",
-                    ["config"] = function(_, opts)
+                    config = function(_, opts)
                         require("nvim-web-devicons").setup(opts)
                     end,
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/nvim-web-devicons",
-                    ["lazy"] = true,
-                    ["name"] = "nvim-web-devicons",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nvim-web-devicons",
+                    lazy = true,
+                    name = "nvim-web-devicons",
                 },
                 {
                     "nui",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/nui.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "nui",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nui.nvim",
+                    lazy = true,
+                    name = "nui",
                 },
             },
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/neo-tree.nvim",
-            ["lazy"] = true,
-            ["name"] = "neo-tree",
-            ["opts"] = {
-                ["buffers"] = { ["follow_current_file"] = { ["enabled"] = true, ["leave_dirs_open"] = false } },
-                ["default_component_configs"] = { ["container"] = { ["enable_character_fade"] = true } },
-                ["enable_diagnostics"] = false,
-                ["enable_git_status"] = true,
-                ["filesystem"] = {
-                    ["bind_to_cwd"] = true,
-                    ["cwd_target"] = { ["sidebar"] = "global" },
-                    ["filtered_items"] = { ["visible"] = false },
-                    ["follow_current_file"] = { ["enabled"] = true, ["leave_dirs_open"] = false },
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/neo-tree.nvim",
+            lazy = true,
+            name = "neo-tree",
+            opts = {
+                buffers = { follow_current_file = { enabled = true, leave_dirs_open = false } },
+                default_component_configs = { container = { enable_character_fade = true } },
+                enable_diagnostics = false,
+                enable_git_status = true,
+                filesystem = {
+                    bind_to_cwd = true,
+                    cwd_target = { sidebar = "global" },
+                    filtered_items = { visible = false },
+                    follow_current_file = { enabled = true, leave_dirs_open = false },
                 },
-                ["open_files_do_not_replace_types"] = { "terminal", "trouble", "qf" },
-                ["popup_border_style"] = "rounded",
-                ["use_default_mappings"] = false,
-                ["window"] = {
-                    ["mappings"] = {
+                open_files_do_not_replace_types = { "terminal", "trouble", "qf" },
+                popup_border_style = "rounded",
+                use_default_mappings = false,
+                window = {
+                    mappings = {
                         ["."] = "set_root",
                         ["/"] = "fuzzy_finder",
                         ["<CR>"] = "open",
                         ["<Esc>"] = "cancel",
                         [">"] = "navigate_up",
                         ["?"] = "show_help",
-                        ["H"] = "toggle_hidden",
-                        ["R"] = "refresh",
-                        ["a"] = "add",
-                        ["c"] = "close_node",
-                        ["d"] = "delete",
-                        ["i"] = "show_file_details",
-                        ["p"] = "paste_from_clipboard",
-                        ["q"] = "close_window",
-                        ["r"] = "rename",
-                        ["x"] = "cut_to_clipboard",
-                        ["y"] = "copy_to_clipboard",
+                        H = "toggle_hidden",
+                        R = "refresh",
+                        a = "add",
+                        c = "close_node",
+                        d = "delete",
+                        i = "show_file_details",
+                        p = "paste_from_clipboard",
+                        q = "close_window",
+                        r = "rename",
+                        x = "cut_to_clipboard",
+                        y = "copy_to_clipboard",
                     },
-                    ["position"] = "left",
+                    position = "left",
                 },
             },
         },
         {
             "noice",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("noice").setup(opts)
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "notify",
-                    ["config"] = function(_, opts)
+                    config = function(_, opts)
                         local notify = require("notify")
 
                         notify.setup(opts)
                         vim.notify = notify -- Vim uses notify by default
                     end,
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/nvim-notify",
-                    ["lazy"] = true,
-                    ["name"] = "notify",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nvim-notify",
+                    lazy = true,
+                    name = "notify",
                 },
                 {
                     "nui",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/nui.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "nui",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nui.nvim",
+                    lazy = true,
+                    name = "nui",
                 },
             },
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/noice.nvim",
-            ["lazy"] = false,
-            ["name"] = "noice",
-            ["opts"] = {
-                ["lsp"] = {
-                    ["documentation"] = {
-                        ["opts"] = {
-                            ["border"] = "rounded",
-                            ["format"] = { "{message}" },
-                            ["lang"] = "markdown",
-                            ["render"] = "plain",
-                            ["replace"] = true,
-                            ["win_options"] = { ["concealcursor"] = "n", ["conceallevel"] = 3 },
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/noice.nvim",
+            lazy = false,
+            name = "noice",
+            opts = {
+                lsp = {
+                    documentation = {
+                        opts = {
+                            border = "rounded",
+                            format = { "{message}" },
+                            lang = "markdown",
+                            render = "plain",
+                            replace = true,
+                            win_options = { concealcursor = "n", conceallevel = 3 },
                         },
-                        ["view"] = "hover",
+                        view = "hover",
                     },
-                    ["override"] = {
+                    override = {
                         ["cmp.entry.get_documentation"] = true,
                         ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
                         ["vim.lsp.util.stylize_markdown"] = true,
                     },
                 },
-                ["notify"] = { ["enabled"] = true },
-                ["popupmenu"] = { ["backend"] = "nui", ["enabled"] = true },
-                ["presets"] = {
-                    ["bottom_search"] = false,
-                    ["command_palette"] = true,
-                    ["inc_rename"] = true,
-                    ["long_message_to_split"] = true,
-                    ["lsp_doc_border"] = true,
-                },
-                ["routes"] = {
-                    { ["filter"] = { ["event"] = "msg_show", ["kind"] = "search_count" }, ["opts"] = { ["skip"] = true } },
+                notify = { enabled = true },
+                popupmenu = { backend = "nui", enabled = true },
+                presets = {
+                    bottom_search = false,
+                    command_palette = true,
+                    inc_rename = true,
+                    long_message_to_split = true,
+                    lsp_doc_border = true,
                 },
+                routes = { { filter = { event = "msg_show", kind = "search_count" }, opts = { skip = true } } },
             },
         },
         {
             "rainbow-delimiters",
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/rainbow-delimiters.nvim",
-            ["lazy"] = false,
-            ["name"] = "rainbow-delimiters",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/rainbow-delimiters.nvim",
+            lazy = false,
+            name = "rainbow-delimiters",
         },
         {
             "rustaceanvim",
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/rustaceanvim",
-            ["init"] = function()
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/rustaceanvim",
+            init = function()
                 vim.g.rustaceanvim = {
                     tools = {
                         enable_clippy = true,
@@ -967,31 +971,31 @@ require("lazy").setup({
                     },
                 }
             end,
-            ["lazy"] = false,
-            ["name"] = "rustaceanvim",
+            lazy = false,
+            name = "rustaceanvim",
         },
         {
             "sandwich",
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/vim-sandwich",
-            ["init"] = function()
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/vim-sandwich",
+            init = function()
                 -- Disable default keymaps
                 vim.g.sandwich_no_default_key_mappings = 1
                 vim.g.operator_sandwich_no_default_key_mappings = 1
                 vim.g.textobj_sandwich_no_default_key_mappings = 1
             end,
-            ["lazy"] = false,
-            ["name"] = "sandwich",
+            lazy = false,
+            name = "sandwich",
         },
         {
             "sleuth",
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/vim-sleuth",
-            ["lazy"] = false,
-            ["name"] = "sleuth",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/vim-sleuth",
+            lazy = false,
+            name = "sleuth",
         },
         {
             "telescope",
-            ["cmd"] = { "Telescope" },
-            ["config"] = function(_, opts)
+            cmd = { "Telescope" },
+            config = function(_, opts)
                 local telescope = require("telescope")
                 telescope.setup(opts)
 
@@ -999,217 +1003,212 @@ require("lazy").setup({
                     telescope.load_extension(extension)
                 end
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "plenary",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/plenary.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "plenary",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/plenary.nvim",
+                    lazy = true,
+                    name = "plenary",
                 },
                 {
                     "telescope-fzf-native",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/telescope-fzf-native.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "telescope-fzf-native",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/telescope-fzf-native.nvim",
+                    lazy = true,
+                    name = "telescope-fzf-native",
                 },
                 {
                     "telescope-undo",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/telescope-undo.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "telescope-undo",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/telescope-undo.nvim",
+                    lazy = true,
+                    name = "telescope-undo",
                 },
                 {
                     "telescope-ui-select",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/telescope-ui-select.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "telescope-ui-select",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/telescope-ui-select.nvim",
+                    lazy = true,
+                    name = "telescope-ui-select",
                 },
             },
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/telescope.nvim",
-            ["lazy"] = true,
-            ["name"] = "telescope",
-            ["opts"] = {
-                ["defaults"] = {
-                    ["mappings"] = {
-                        ["i"] = {
-                            ["<Esc>"] = function(...)
-                                return require("telescope.actions").close(...)
-                            end,
-                        },
-                    },
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/telescope.nvim",
+            lazy = true,
+            name = "telescope",
+            opts = {
+                defaults = {
+                    mappings = { i = {
+                        ["<Esc>"] = function(...)
+                            return require("telescope.actions").close(...)
+                        end,
+                    } },
                 },
             },
         },
         {
             "todo-comments",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("todo-comments").setup(opts)
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "plenary",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/plenary.nvim",
-                    ["lazy"] = true,
-                    ["name"] = "plenary",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/plenary.nvim",
+                    lazy = true,
+                    name = "plenary",
                 },
             },
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/todo-comments.nvim",
-            ["event"] = { "BufReadPost", "BufNewFile" },
-            ["lazy"] = true,
-            ["name"] = "todo-comments",
-            ["opts"] = {
-                ["keywords"] = {
-                    ["FIX"] = { ["alt"] = { "FIXME", "BUG", "FIXIT", "ISSUE" }, ["color"] = "error", ["icon"] = " " },
-                    ["HACK"] = { ["color"] = "warning", ["icon"] = " " },
-                    ["NOTE"] = { ["alt"] = { "INFO" }, ["color"] = "hint", ["icon"] = " " },
-                    ["PERF"] = { ["alt"] = { "OPTIM", "PERFORMANCE", "OPTIMIZE" }, ["icon"] = " " },
-                    ["TEST"] = { ["alt"] = { "TESTING", "PASSED", "FAILED" }, ["color"] = "test", ["icon"] = "⏲ " },
-                    ["TODO"] = { ["color"] = "info", ["icon"] = " " },
-                    ["WARN"] = { ["alt"] = { "WARNING", "XXX" }, ["color"] = "warning", ["icon"] = " " },
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/todo-comments.nvim",
+            event = { "BufReadPost", "BufNewFile" },
+            lazy = true,
+            name = "todo-comments",
+            opts = {
+                keywords = {
+                    FIX = { alt = { "FIXME", "BUG", "FIXIT", "ISSUE" }, color = "error", icon = " " },
+                    HACK = { color = "warning", icon = " " },
+                    NOTE = { alt = { "INFO" }, color = "hint", icon = " " },
+                    PERF = { alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" }, icon = " " },
+                    TEST = { alt = { "TESTING", "PASSED", "FAILED" }, color = "test", icon = "⏲ " },
+                    TODO = { color = "info", icon = " " },
+                    WARN = { alt = { "WARNING", "XXX" }, color = "warning", icon = " " },
                 },
-                ["signs"] = true,
+                signs = true,
             },
         },
         {
             "toggleterm",
-            ["cmd"] = { "ToggleTerm" },
-            ["config"] = function(_, opts)
+            cmd = { "ToggleTerm" },
+            config = function(_, opts)
                 require("toggleterm").setup(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/toggleterm.nvim",
-            ["keys"] = { "<C-/>" },
-            ["lazy"] = true,
-            ["name"] = "toggleterm",
-            ["opts"] = {
-                ["auto_scroll"] = true,
-                ["autochdir"] = true,
-                ["close_on_exit"] = true,
-                ["direction"] = "horizontal",
-                ["float_opts"] = { ["border"] = "curved", ["height"] = 35, ["width"] = 80, ["winblend"] = 0 },
-                ["hide_numbers"] = true,
-                ["insert_mappings"] = true,
-                ["open_mapping"] = [[<C-/>]],
-                ["persist_mode"] = true,
-                ["shade_terminals"] = false,
-                ["shading_factor"] = 30,
-                ["shell"] = "fish",
-                ["start_in_insert"] = true,
-                ["terminal_mappings"] = true,
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/toggleterm.nvim",
+            keys = { "<C-/>" },
+            lazy = true,
+            name = "toggleterm",
+            opts = {
+                auto_scroll = true,
+                autochdir = true,
+                close_on_exit = true,
+                direction = "horizontal",
+                float_opts = { border = "curved", height = 35, width = 80, winblend = 0 },
+                hide_numbers = true,
+                insert_mappings = true,
+                open_mapping = [[<C-/>]],
+                persist_mode = true,
+                shade_terminals = false,
+                shading_factor = 30,
+                shell = "fish",
+                start_in_insert = true,
+                terminal_mappings = true,
             },
         },
         {
             "treesitter",
-            ["cmd"] = { "TSModuleInfo" },
-            ["config"] = function(_, opts)
+            cmd = { "TSModuleInfo" },
+            config = function(_, opts)
                 require("nvim-treesitter.configs").setup(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/nvim-treesitter",
-            ["event"] = { "BufReadPost", "BufNewFile" },
-            ["init"] = function()
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nvim-treesitter",
+            event = { "BufReadPost", "BufNewFile" },
+            init = function()
                 -- Fix treesitter grammars/parsers on nix
                 vim.opt.runtimepath:append(
-                    "/nix/store/dks5shbpaksflcsig4dspi8vs9a06yqw-vimplugin-nvim-treesitter-2024-05-28"
+                    "/nix/store/mijdgvgykavkdkyfvhcrd5vh808ijmk0-vimplugin-nvim-treesitter-2024-06-19"
                 )
-                vim.opt.runtimepath:append("/nix/store/774ydms06ccrb8zybw2y045ajgs9l7jk-treesitter-parsers")
+                vim.opt.runtimepath:append("/nix/store/0h2cb1dzf10jm1m643k43xkk6lpl4vk6-treesitter-parsers")
             end,
-            ["lazy"] = true,
-            ["name"] = "treesitter",
-            ["opts"] = {
-                ["auto_install"] = false,
-                ["highlight"] = { ["additional_vim_regex_highlighting"] = false, ["enable"] = true },
-                ["incremental_selection"] = {
-                    ["enable"] = true,
-                    ["keymaps"] = {
-                        ["init_selection"] = "gnn",
-                        ["node_decremental"] = "grm",
-                        ["node_incremental"] = "grn",
-                        ["scope_incremental"] = "grc",
+            lazy = true,
+            name = "treesitter",
+            opts = {
+                auto_install = false,
+                highlight = { additional_vim_regex_highlighting = false, enable = true },
+                incremental_selection = {
+                    enable = true,
+                    keymaps = {
+                        init_selection = "gnn",
+                        node_decremental = "grm",
+                        node_incremental = "grn",
+                        scope_incremental = "grc",
                     },
                 },
-                ["indent"] = { ["enable"] = true },
-                ["parser_install_dir"] = "/nix/store/774ydms06ccrb8zybw2y045ajgs9l7jk-treesitter-parsers",
+                indent = { enable = true },
+                parser_install_dir = "/nix/store/0h2cb1dzf10jm1m643k43xkk6lpl4vk6-treesitter-parsers",
             },
         },
         {
             "trim",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("trim").setup(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/trim.nvim",
-            ["lazy"] = false,
-            ["name"] = "trim",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/trim.nvim",
+            lazy = false,
+            name = "trim",
         },
         {
             "trouble",
-            ["cmd"] = { "Trouble", "TroubleToggle" },
-            ["config"] = function(_, opts)
+            cmd = { "Trouble", "TroubleToggle" },
+            config = function(_, opts)
                 require("trouble").setup(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/trouble.nvim",
-            ["lazy"] = true,
-            ["name"] = "trouble",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/trouble.nvim",
+            lazy = true,
+            name = "trouble",
         },
         {
             "ufo",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("ufo").setup(opts)
             end,
-            ["dependencies"] = {
+            dependencies = {
                 {
                     "promise",
-                    ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/promise-async",
-                    ["lazy"] = true,
-                    ["name"] = "promise",
+                    dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/promise-async",
+                    lazy = true,
+                    name = "promise",
                 },
             },
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/nvim-ufo",
-            ["lazy"] = false,
-            ["name"] = "ufo",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/nvim-ufo",
+            lazy = false,
+            name = "ufo",
         },
         {
             "vimtex",
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/vimtex",
-            ["init"] = function()
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/vimtex",
+            init = function()
                 vim.g.vimtex_view_method = "zathura"
             end,
-            ["name"] = "vimtex",
+            name = "vimtex",
         },
         {
             "which-key",
-            ["config"] = function(_, opts)
+            config = function(_, opts)
                 require("which-key").setup(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/which-key.nvim",
-            ["lazy"] = false,
-            ["name"] = "which-key",
-            ["priority"] = 500,
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/which-key.nvim",
+            lazy = false,
+            name = "which-key",
+            priority = 500,
         },
         {
             "winshift",
-            ["cmd"] = { "WinShift" },
-            ["config"] = function(_, opts)
+            cmd = { "WinShift" },
+            config = function(_, opts)
                 require("winshift").setup(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/winshift.nvim",
-            ["lazy"] = true,
-            ["name"] = "winshift",
-            ["opts"] = {
-                ["highlight_moving_win"] = true,
-                ["keymaps"] = {
-                    ["disable_defaults"] = true,
-                    ["win_move_mode"] = { ["h"] = "left", ["j"] = "down", ["k"] = "up", ["l"] = "right" },
-                },
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/winshift.nvim",
+            lazy = true,
+            name = "winshift",
+            opts = {
+                highlight_moving_win = true,
+                keymaps = { disable_defaults = true, win_move_mode = { h = "left", j = "down", k = "up", l = "right" } },
             },
         },
         {
             "yanky",
-            ["cmd"] = { "YankyClearHistory", "YankyRingHistory" },
-            ["config"] = function(_, opts)
+            cmd = { "YankyClearHistory", "YankyRingHistory" },
+            config = function(_, opts)
                 require("yanky").setup(opts)
             end,
-            ["dir"] = "/nix/store/2yczanf6fxmgr08mnlm8ba0bafsyz3fa-lazy-plugins/yanky.nvim",
-            ["lazy"] = true,
-            ["name"] = "yanky",
+            dir = "/nix/store/qxjygssw1r6xbpsrk1fyk9f0qfp5nnsh-lazy-plugins/yanky.nvim",
+            lazy = true,
+            name = "yanky",
         },
     },
 })
@@ -1218,498 +1217,322 @@ require("lazy").setup({
 do
     local __nixvim_binds = {
         {
-            ["action"] = "v:count == 0 ? 'gj' : 'j'",
-            ["key"] = "j",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Move cursor down", ["expr"] = true },
+            action = "v:count == 0 ? 'gj' : 'j'",
+            key = "j",
+            mode = "n",
+            options = { desc = "Move cursor down", expr = true },
+        },
+        {
+            action = "v:count == 0 ? 'gj' : 'j'",
+            key = "<Down>",
+            mode = "n",
+            options = { desc = "Move cursor down", expr = true },
+        },
+        {
+            action = "v:count == 0 ? 'gk' : 'k'",
+            key = "k",
+            mode = "n",
+            options = { desc = "Move cursor up", expr = true },
+        },
+        {
+            action = "v:count == 0 ? 'gk' : 'k'",
+            key = "<Up>",
+            mode = "n",
+            options = { desc = "Move cursor up", expr = true },
+        },
+        {
+            action = "<cmd>vertical resize -2<cr>",
+            key = "<C-h>",
+            mode = "n",
+            options = { desc = "Decrease window width" },
+        },
+        {
+            action = "<cmd>vertical resize +2<cr>",
+            key = "<C-l>",
+            mode = "n",
+            options = { desc = "Increase window width" },
+        },
+        { action = "<cmd>resize -2<cr>", key = "<C-j>", mode = "n", options = { desc = "Decrease window height" } },
+        { action = "<cmd>resize +2<cr>", key = "<C-k>", mode = "n", options = { desc = "Increase window height" } },
+        { action = "<cmd>m .+1<cr>==", key = "<M-j>", mode = "n", options = { desc = "Move line down" } },
+        { action = "<Esc><cmd>m .+1<cr>==gi", key = "<M-j>", mode = "i", options = { desc = "Move line down" } },
+        { action = ":m '>+1<cr>gv=gv", key = "<M-j>", mode = "v", options = { desc = "Move line down" } },
+        { action = "<cmd>m .-2<cr>==", key = "<M-k>", mode = "n", options = { desc = "Move line up" } },
+        { action = "<Esc><cmd>m .-2<cr>==gi", key = "<M-k>", mode = "i", options = { desc = "Move line up" } },
+        { action = ":m '<-2<cr>gv=gv", key = "<M-k>", mode = "v", options = { desc = "Move line up" } },
+        { action = "<cmd>w<cr>", key = "<C-s>", mode = { "n", "i", "v" }, options = { desc = "Save current buffer" } },
+        { action = "<cmd>wa<cr>", key = "<C-S-s>", mode = { "n", "i", "v" }, options = { desc = "Save all buffers" } },
+        { action = "<gv", key = "<", mode = "v", options = { desc = "Outdent" } },
+        { action = "v<<Esc>", key = "<", mode = "n", options = { desc = "Outdent" } },
+        { action = ">gv", key = ">", mode = "v", options = { desc = "Indent" } },
+        { action = "v><Esc>", key = ">", mode = "n", options = { desc = "Indent" } },
+        {
+            action = "<cmd>lua require('intellitab').indent()<cr>",
+            key = "<Tab>",
+            mode = "i",
+            options = { desc = "Indent (IntelliTab)" },
+        },
+        { action = "<C-d>zz", key = "<C-d>", mode = "n", options = { desc = "Jump down (centered)" } },
+        { action = "<C-u>zz", key = "<C-u>", mode = "n", options = { desc = "Jump up (centered)" } },
+        { action = "nzzzv", key = "n", mode = "n", options = { desc = "Next match (centered)" } },
+        { action = "Nzzzv", key = "N", mode = "n", options = { desc = "Previous match (centered)" } },
+        { action = "<C-w>", key = "<C-BS>", mode = "i", options = { desc = "Delete previous word" } },
+        { action = "<C-w>", key = "<M-BS>", mode = "i", options = { desc = "Delete previous word" } },
+        { action = '<Esc>"+pi', key = "<C-S-v>", mode = "i", options = { desc = "Paste from clipboard" } },
+        { action = '<Esc>"+pi', key = "<C-v>", mode = "i", options = { desc = "Paste from clipboard" } },
+        { action = '"+y', key = "<C-S-c>", mode = "v", options = { desc = "Copy to clipboard" } },
+        { action = "<cmd>lua require('flash').jump()<cr>", key = "s", mode = "n", options = { desc = "Flash jump" } },
+        {
+            action = "<cmd>lua require('flash').treesitter()<cr>",
+            key = "S",
+            mode = "n",
+            options = { desc = "Flash treesitter" },
+        },
+        { action = "<cmd>nohlsearch<cr>", key = "<C-S-h>", mode = "n", options = { desc = "Clear search highlights" } },
+        { action = "<cmd>lua vim.lsp.buf.hover()<cr>", key = "K", mode = "n", options = { desc = "Show LSP hover" } },
+        {
+            action = "<cmd>Telescope current_buffer_fuzzy_find<cr>",
+            key = "/",
+            mode = "n",
+            options = { desc = "Find in current buffer" },
+        },
+        { action = "<Esc>", key = ";", mode = "v", options = { desc = "Exit visual mode" } },
+        { action = "<cmd>Lazy<cr>", key = "<leader>L", mode = "n", options = { desc = "Show Lazy" } },
+        { action = "<cmd>edit!<cr>", key = "<leader>R", mode = "n", options = { desc = "Reload current buffer" } },
+        {
+            action = "<cmd>Telescope buffers<cr>",
+            key = "<leader><Space>",
+            mode = "n",
+            options = { desc = "Show open buffers" },
+        },
+        { action = "<cmd>Telescope find_files<cr>", key = "<leader>f", mode = "n", options = { desc = "Find file" } },
+        { action = "<cmd>Telescope projects<cr>", key = "<leader>p", mode = "n", options = { desc = "Open project" } },
+        {
+            action = "<cmd>Telescope vim_options<cr>",
+            key = "<leader>o",
+            mode = "n",
+            options = { desc = "Show Vim options" },
+        },
+        { action = "<cmd>Telescope undo<cr>", key = "<leader>u", mode = "n", options = { desc = "Show undo history" } },
+        {
+            action = "<cmd>Telescope live_grep<cr>",
+            key = "<leader>/",
+            mode = "n",
+            options = { desc = "Find in working directory" },
+        },
+        { action = ":NR!<cr>", key = "<leader>n", mode = "v", options = { desc = "Narrow region" } },
+        {
+            action = "<cmd>Telescope notify<cr>",
+            key = "<leader>N",
+            mode = "n",
+            options = { desc = "Show notify history" },
+        },
+        {
+            action = "<cmd>Telescope resume<cr>",
+            key = "<leader>r",
+            mode = "n",
+            options = { desc = "Show last telescope picker" },
+        },
+        { action = "<cmd>Telescope keymaps<cr>", key = "<leader>?", mode = "n", options = { desc = "Show keymaps" } },
+        {
+            action = "<cmd>Telescope commands<cr>",
+            key = "<leader>:",
+            mode = "n",
+            options = { desc = "Execute command" },
+        },
+        { action = "<cmd>Telescope marks<cr>", key = "<leader>M", mode = "n", options = { desc = "Show marks" } },
+        { action = "<cmd>Telescope jumplist<cr>", key = "<leader>J", mode = "n", options = { desc = "Show jumplist" } },
+        { action = "<cmd>Telescope man_pages<cr>", key = "<leader>m", mode = "n", options = { desc = "Show manpages" } },
+        {
+            action = "<cmd>Telescope help_tags<cr>",
+            key = "<leader>h",
+            mode = "n",
+            options = { desc = "Show help tags" },
+        },
+        { action = "<cmd>TodoTelescope<cr>", key = "<leader>T", mode = "n", options = { desc = "Show TODOs" } },
+        { action = "+quit", key = "<leader>q", mode = "n" },
+        { action = "<cmd>quitall<cr>", key = "<leader>qq", mode = "n", options = { desc = "Quit" } },
+        { action = "<cmd>quitall!<cr>", key = "<leader>q!", mode = "n", options = { desc = "Quit forcefully" } },
+        { action = "+session", key = "<leader>s", mode = "n" },
+        {
+            action = "<cmd>Telescope persisted<cr>",
+            key = "<leader>sl",
+            mode = "n",
+            options = { desc = "Restore session" },
+        },
+        { action = "<cmd>SessionSave<cr>", key = "<leader>ss", mode = "n", options = { desc = "Save session" } },
+        {
+            action = "<cmd>SessionDelete<cr>",
+            key = "<leader>sd",
+            mode = "n",
+            options = { desc = "Delete current session" },
         },
+        { action = "+buffers", key = "<leader>b", mode = "n" },
         {
-            ["action"] = "v:count == 0 ? 'gj' : 'j'",
-            ["key"] = "<Down>",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Move cursor down", ["expr"] = true },
+            action = "<cmd>Telescope buffers<cr>",
+            key = "<leader>bb",
+            mode = "n",
+            options = { desc = "Show open buffers" },
         },
+        { action = "<cmd>bnext<cr>", key = "<leader>bn", mode = "n", options = { desc = "Goto next buffer" } },
+        { action = "<cmd>bprevious<cr>", key = "<leader>bp", mode = "n", options = { desc = "Goto previous buffer" } },
+        { action = "<cmd>Bdelete<cr>", key = "<leader>bd", mode = "n", options = { desc = "Close current buffer" } },
+        { action = "+windows", key = "<leader>w", mode = "n" },
+        { action = "<C-w>c", key = "<leader>wd", mode = "n", options = { desc = "Close current window" } },
+        { action = "<C-w>s", key = "<leader>ws", mode = "n", options = { desc = "Split window horizontally" } },
+        { action = "<C-w>v", key = "<leader>wv", mode = "n", options = { desc = "Split window vertically" } },
+        { action = "<C-w>=", key = "<leader>w=", mode = "n", options = { desc = "Balance windows" } },
+        { action = "<C-w>h", key = "<leader>wh", mode = "n", options = { desc = "Goto left window" } },
+        { action = "<C-w>l", key = "<leader>wl", mode = "n", options = { desc = "Goto right window" } },
+        { action = "<C-w>j", key = "<leader>wj", mode = "n", options = { desc = "Goto bottom window" } },
+        { action = "<C-w>k", key = "<leader>wk", mode = "n", options = { desc = "Goto top window" } },
+        { action = "<C-w>p", key = "<leader>ww", mode = "n", options = { desc = "Goto other window" } },
+        { action = "<cmd>WinShift<cr>", key = "<leader>wm", mode = "n", options = { desc = "Move window" } },
+        { action = "+toggle", key = "<leader>t", mode = "n" },
         {
-            ["action"] = "v:count == 0 ? 'gk' : 'k'",
-            ["key"] = "k",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Move cursor up", ["expr"] = true },
+            action = "<cmd>Neotree action=show toggle=true<cr><C-w>=",
+            key = "<leader>tt",
+            mode = "n",
+            options = { desc = "Toggle NeoTree" },
         },
+        { action = "<cmd>Navbuddy<cr>", key = "<leader>tn", mode = "n", options = { desc = "Toggle NavBuddy" } },
         {
-            ["action"] = "v:count == 0 ? 'gk' : 'k'",
-            ["key"] = "<Up>",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Move cursor up", ["expr"] = true },
+            action = "<cmd>TroubleToggle workspace_diagnostics focus=false<cr>",
+            key = "<leader>td",
+            mode = "n",
+            options = { desc = "Toggle Trouble diagnostics" },
         },
         {
-            ["action"] = "<cmd>vertical resize -2<cr>",
-            ["key"] = "<C-h>",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Decrease window width" },
+            action = "<cmd>TroubleToggle todo focus=false<cr>",
+            key = "<leader>tT",
+            mode = "n",
+            options = { desc = "Toggle Trouble TODOs" },
         },
         {
-            ["action"] = "<cmd>vertical resize +2<cr>",
-            ["key"] = "<C-l>",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Increase window width" },
+            action = "<cmd>ToggleAutoformat<cr>",
+            key = "<leader>tf",
+            mode = "n",
+            options = { desc = "Toggle autoformat-on-save" },
         },
         {
-            ["action"] = "<cmd>resize -2<cr>",
-            ["key"] = "<C-j>",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Decrease window height" },
+            action = "<cmd>ToggleAutoLint<cr>",
+            key = "<leader>tl",
+            mode = "n",
+            options = { desc = "Toggle autolint-on-save" },
         },
         {
-            ["action"] = "<cmd>resize +2<cr>",
-            ["key"] = "<C-k>",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Increase window height" },
+            action = "<cmd>ToggleInlineDiagnostics<cr>",
+            key = "<leader>tD",
+            mode = "n",
+            options = { desc = "Toggle inline diagnostics" },
         },
-        { ["action"] = "<cmd>m .+1<cr>==", ["key"] = "<M-j>", ["mode"] = "n", ["options"] = {
-            ["desc"] = "Move line down",
-        } },
+        { action = "<cmd>:set wrap!<cr>", key = "<leader>tw", mode = "n", options = { desc = "Toggle word-wrap" } },
+        { action = "+git", key = "<leader>g", mode = "n" },
+        { action = "<cmd>LazyGit<cr>", key = "<leader>gg", mode = "n", options = { desc = "Show LazyGit" } },
+        { action = "<cmd>GitMessenger<cr>", key = "<leader>gm", mode = "n", options = { desc = "Show GitMessenger" } },
         {
-            ["action"] = "<Esc><cmd>m .+1<cr>==gi",
-            ["key"] = "<M-j>",
-            ["mode"] = "i",
-            ["options"] = { ["desc"] = "Move line down" },
+            action = "<cmd>Telescope git_status<cr>",
+            key = "<leader>gs",
+            mode = "n",
+            options = { desc = "Show Git status" },
         },
-        { ["action"] = ":m '>+1<cr>gv=gv", ["key"] = "<M-j>", ["mode"] = "v", ["options"] = {
-            ["desc"] = "Move line down",
-        } },
-        { ["action"] = "<cmd>m .-2<cr>==", ["key"] = "<M-k>", ["mode"] = "n", ["options"] = {
-            ["desc"] = "Move line up",
-        } },
         {
-            ["action"] = "<Esc><cmd>m .-2<cr>==gi",
-            ["key"] = "<M-k>",
-            ["mode"] = "i",
-            ["options"] = { ["desc"] = "Move line up" },
+            action = "<cmd>Telescope git_commits<cr>",
+            key = "<leader>gc",
+            mode = "n",
+            options = { desc = "Show Git log" },
         },
-        { ["action"] = ":m '<-2<cr>gv=gv", ["key"] = "<M-k>", ["mode"] = "v", ["options"] = {
-            ["desc"] = "Move line up",
-        } },
         {
-            ["action"] = "<cmd>w<cr>",
-            ["key"] = "<C-s>",
-            ["mode"] = { "n", "i", "v" },
-            ["options"] = { ["desc"] = "Save current buffer" },
+            action = "<cmd>Telescope git_branches<cr>",
+            key = "<leader>gb",
+            mode = "n",
+            options = { desc = "Show Git branches" },
         },
         {
-            ["action"] = "<cmd>wa<cr>",
-            ["key"] = "<C-S-s>",
-            ["mode"] = { "n", "i", "v" },
-            ["options"] = { ["desc"] = "Save all buffers" },
+            action = "<cmd>Telescope git_bcommits<cr>",
+            key = "<leader>gf",
+            mode = "n",
+            options = { desc = "Show Git log for current file" },
         },
-        { ["action"] = "<gv", ["key"] = "<", ["mode"] = "v", ["options"] = { ["desc"] = "Outdent" } },
-        { ["action"] = "v<<Esc>", ["key"] = "<", ["mode"] = "n", ["options"] = { ["desc"] = "Outdent" } },
-        { ["action"] = ">gv", ["key"] = ">", ["mode"] = "v", ["options"] = { ["desc"] = "Indent" } },
-        { ["action"] = "v><Esc>", ["key"] = ">", ["mode"] = "n", ["options"] = { ["desc"] = "Indent" } },
         {
-            ["action"] = "<cmd>lua require('intellitab').indent()<cr>",
-            ["key"] = "<Tab>",
-            ["mode"] = "i",
-            ["options"] = { ["desc"] = "Indent (IntelliTab)" },
+            action = "<cmd>DiffviewOpen<cr>",
+            key = "<leader>gd",
+            mode = "n",
+            options = { desc = "Show Git diff for current worktree" },
         },
-        { ["action"] = "<C-d>zz", ["key"] = "<C-d>", ["mode"] = "n", ["options"] = { ["desc"] = "Jump down (centered)" } },
-        { ["action"] = "<C-u>zz", ["key"] = "<C-u>", ["mode"] = "n", ["options"] = { ["desc"] = "Jump up (centered)" } },
-        { ["action"] = "nzzzv", ["key"] = "n", ["mode"] = "n", ["options"] = { ["desc"] = "Next match (centered)" } },
-        { ["action"] = "Nzzzv", ["key"] = "N", ["mode"] = "n", ["options"] = { ["desc"] = "Previous match (centered)" } },
-        { ["action"] = "<C-w>", ["key"] = "<C-BS>", ["mode"] = "i", ["options"] = { ["desc"] = "Delete previous word" } },
-        { ["action"] = "<C-w>", ["key"] = "<M-BS>", ["mode"] = "i", ["options"] = { ["desc"] = "Delete previous word" } },
+        { action = "+lsp", key = "<leader>l", mode = "n" },
         {
-            ["action"] = '<Esc>"+pi',
-            ["key"] = "<C-S-v>",
-            ["mode"] = "i",
-            ["options"] = { ["desc"] = "Paste from clipboard" },
+            action = "<cmd>Telescope lsp_references<cr>",
+            key = "<leader>lr",
+            mode = "n",
+            options = { desc = "Goto references" },
         },
-        { ["action"] = '<Esc>"+pi', ["key"] = "<C-v>", ["mode"] = "i", ["options"] = {
-            ["desc"] = "Paste from clipboard",
-        } },
-        { ["action"] = '"+y', ["key"] = "<C-S-c>", ["mode"] = "v", ["options"] = { ["desc"] = "Copy to clipboard" } },
         {
-            ["action"] = "<cmd>lua require('flash').jump()<cr>",
-            ["key"] = "s",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Flash jump" },
+            action = "<cmd>Telescope lsp_definitions<cr>",
+            key = "<leader>ld",
+            mode = "n",
+            options = { desc = "Goto definition" },
         },
         {
-            ["action"] = "<cmd>lua require('flash').treesitter()<cr>",
-            ["key"] = "S",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Flash treesitter" },
+            action = "<cmd>Telescope lsp_implementations<cr>",
+            key = "<leader>li",
+            mode = "n",
+            options = { desc = "Goto implementation" },
         },
         {
-            ["action"] = "<cmd>nohlsearch<cr>",
-            ["key"] = "<C-S-h>",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Clear search highlights" },
+            action = "<cmd>Telescope lsp_type_definitions<cr>",
+            key = "<leader>lt",
+            mode = "n",
+            options = { desc = "Goto type definition" },
         },
         {
-            ["action"] = "<cmd>lua vim.lsp.buf.hover()<cr>",
-            ["key"] = "K",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show LSP hover" },
+            action = "<cmd>Telescope lsp_incoming_calls<cr>",
+            key = "<leader>lI",
+            mode = "n",
+            options = { desc = "Show incoming calls" },
         },
         {
-            ["action"] = "<cmd>Telescope current_buffer_fuzzy_find<cr>",
-            ["key"] = "/",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Find in current buffer" },
+            action = "<cmd>Telescope lsp_outgoing_calls<cr>",
+            key = "<leader>lO",
+            mode = "n",
+            options = { desc = "Show outgoing calls" },
         },
-        { ["action"] = "<Esc>", ["key"] = ";", ["mode"] = "v", ["options"] = { ["desc"] = "Exit visual mode" } },
-        { ["action"] = "<cmd>Lazy<cr>", ["key"] = "<leader>L", ["mode"] = "n", ["options"] = { ["desc"] = "Show Lazy" } },
+        { action = "+code", key = "<leader>c", mode = "n" },
         {
-            ["action"] = "<cmd>edit!<cr>",
-            ["key"] = "<leader>R",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Reload current buffer" },
+            action = "<cmd>lua require('conform').format()<cr>",
+            key = "<leader>cf",
+            mode = "n",
+            options = { desc = "Format current buffer" },
         },
         {
-            ["action"] = "<cmd>Telescope buffers<cr>",
-            ["key"] = "<leader><Space>",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show open buffers" },
+            action = "<cmd>lua vim.diagnostic.open_float()<cr>",
+            key = "<leader>cd",
+            mode = "n",
+            options = { desc = "Show LSP line diagnostics" },
         },
         {
-            ["action"] = "<cmd>Telescope find_files<cr>",
-            ["key"] = "<leader>f",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Find file" },
+            action = "<cmd>Telescope diagnostics<cr>",
+            key = "<leader>cD",
+            mode = "n",
+            options = { desc = "Show diagnostics" },
         },
         {
-            ["action"] = "<cmd>Telescope projects<cr>",
-            ["key"] = "<leader>p",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Open project" },
+            action = "<cmd>lua vim.lsp.buf.rename()<cr>",
+            key = "<leader>cr",
+            mode = "n",
+            options = { desc = "Rename LSP symbol" },
         },
         {
-            ["action"] = "<cmd>Telescope vim_options<cr>",
-            ["key"] = "<leader>o",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show Vim options" },
+            action = "<cmd>lua vim.lsp.buf.code_action()<cr>",
+            key = "<leader>ca",
+            mode = "n",
+            options = { desc = "Show LSP code actions" },
         },
         {
-            ["action"] = "<cmd>Telescope undo<cr>",
-            ["key"] = "<leader>u",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show undo history" },
-        },
-        {
-            ["action"] = "<cmd>Telescope live_grep<cr>",
-            ["key"] = "<leader>/",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Find in working directory" },
-        },
-        { ["action"] = ":NR!<cr>", ["key"] = "<leader>n", ["mode"] = "v", ["options"] = { ["desc"] = "Narrow region" } },
-        {
-            ["action"] = "<cmd>Telescope notify<cr>",
-            ["key"] = "<leader>N",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show notify history" },
-        },
-        {
-            ["action"] = "<cmd>Telescope resume<cr>",
-            ["key"] = "<leader>r",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show last telescope picker" },
-        },
-        {
-            ["action"] = "<cmd>Telescope keymaps<cr>",
-            ["key"] = "<leader>?",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show keymaps" },
-        },
-        {
-            ["action"] = "<cmd>Telescope commands<cr>",
-            ["key"] = "<leader>:",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Execute command" },
-        },
-        {
-            ["action"] = "<cmd>Telescope marks<cr>",
-            ["key"] = "<leader>M",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show marks" },
-        },
-        {
-            ["action"] = "<cmd>Telescope jumplist<cr>",
-            ["key"] = "<leader>J",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show jumplist" },
-        },
-        {
-            ["action"] = "<cmd>Telescope man_pages<cr>",
-            ["key"] = "<leader>m",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show manpages" },
-        },
-        {
-            ["action"] = "<cmd>Telescope help_tags<cr>",
-            ["key"] = "<leader>h",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show help tags" },
-        },
-        {
-            ["action"] = "<cmd>TodoTelescope<cr>",
-            ["key"] = "<leader>T",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show TODOs" },
-        },
-        { ["action"] = "+quit", ["key"] = "<leader>q", ["mode"] = "n" },
-        { ["action"] = "<cmd>quitall<cr>", ["key"] = "<leader>qq", ["mode"] = "n", ["options"] = { ["desc"] = "Quit" } },
-        {
-            ["action"] = "<cmd>quitall!<cr>",
-            ["key"] = "<leader>q!",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Quit forcefully" },
-        },
-        { ["action"] = "+session", ["key"] = "<leader>s", ["mode"] = "n" },
-        {
-            ["action"] = "<cmd>Telescope persisted<cr>",
-            ["key"] = "<leader>sl",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Restore session" },
-        },
-        {
-            ["action"] = "<cmd>SessionSave<cr>",
-            ["key"] = "<leader>ss",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Save session" },
-        },
-        {
-            ["action"] = "<cmd>SessionDelete<cr>",
-            ["key"] = "<leader>sd",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Delete current session" },
-        },
-        { ["action"] = "+buffers", ["key"] = "<leader>b", ["mode"] = "n" },
-        {
-            ["action"] = "<cmd>Telescope buffers<cr>",
-            ["key"] = "<leader>bb",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show open buffers" },
-        },
-        {
-            ["action"] = "<cmd>bnext<cr>",
-            ["key"] = "<leader>bn",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Goto next buffer" },
-        },
-        {
-            ["action"] = "<cmd>bprevious<cr>",
-            ["key"] = "<leader>bp",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Goto previous buffer" },
-        },
-        {
-            ["action"] = "<cmd>Bdelete<cr>",
-            ["key"] = "<leader>bd",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Close current buffer" },
-        },
-        { ["action"] = "+windows", ["key"] = "<leader>w", ["mode"] = "n" },
-        {
-            ["action"] = "<C-w>c",
-            ["key"] = "<leader>wd",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Close current window" },
-        },
-        {
-            ["action"] = "<C-w>s",
-            ["key"] = "<leader>ws",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Split window horizontally" },
-        },
-        {
-            ["action"] = "<C-w>v",
-            ["key"] = "<leader>wv",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Split window vertically" },
-        },
-        { ["action"] = "<C-w>=", ["key"] = "<leader>w=", ["mode"] = "n", ["options"] = { ["desc"] = "Balance windows" } },
-        { ["action"] = "<C-w>h", ["key"] = "<leader>wh", ["mode"] = "n", ["options"] = { ["desc"] = "Goto left window" } },
-        { ["action"] = "<C-w>l", ["key"] = "<leader>wl", ["mode"] = "n", ["options"] = {
-            ["desc"] = "Goto right window",
-        } },
-        { ["action"] = "<C-w>j", ["key"] = "<leader>wj", ["mode"] = "n", ["options"] = {
-            ["desc"] = "Goto bottom window",
-        } },
-        { ["action"] = "<C-w>k", ["key"] = "<leader>wk", ["mode"] = "n", ["options"] = { ["desc"] = "Goto top window" } },
-        { ["action"] = "<C-w>p", ["key"] = "<leader>ww", ["mode"] = "n", ["options"] = {
-            ["desc"] = "Goto other window",
-        } },
-        {
-            ["action"] = "<cmd>WinShift<cr>",
-            ["key"] = "<leader>wm",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Move window" },
-        },
-        { ["action"] = "+toggle", ["key"] = "<leader>t", ["mode"] = "n" },
-        {
-            ["action"] = "<cmd>Neotree action=show toggle=true<cr><C-w>=",
-            ["key"] = "<leader>tt",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Toggle NeoTree" },
-        },
-        {
-            ["action"] = "<cmd>Navbuddy<cr>",
-            ["key"] = "<leader>tn",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Toggle NavBuddy" },
-        },
-        {
-            ["action"] = "<cmd>TroubleToggle workspace_diagnostics focus=false<cr>",
-            ["key"] = "<leader>td",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Toggle Trouble diagnostics" },
-        },
-        {
-            ["action"] = "<cmd>TroubleToggle todo focus=false<cr>",
-            ["key"] = "<leader>tT",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Toggle Trouble TODOs" },
-        },
-        {
-            ["action"] = "<cmd>ToggleAutoformat<cr>",
-            ["key"] = "<leader>tf",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Toggle autoformat-on-save" },
-        },
-        {
-            ["action"] = "<cmd>ToggleAutoLint<cr>",
-            ["key"] = "<leader>tl",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Toggle autolint-on-save" },
-        },
-        {
-            ["action"] = "<cmd>ToggleInlineDiagnostics<cr>",
-            ["key"] = "<leader>tD",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Toggle inline diagnostics" },
-        },
-        {
-            ["action"] = "<cmd>:set wrap!<cr>",
-            ["key"] = "<leader>tw",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Toggle word-wrap" },
-        },
-        { ["action"] = "+git", ["key"] = "<leader>g", ["mode"] = "n" },
-        {
-            ["action"] = "<cmd>LazyGit<cr>",
-            ["key"] = "<leader>gg",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show LazyGit" },
-        },
-        {
-            ["action"] = "<cmd>GitMessenger<cr>",
-            ["key"] = "<leader>gm",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show GitMessenger" },
-        },
-        {
-            ["action"] = "<cmd>Telescope git_status<cr>",
-            ["key"] = "<leader>gs",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show Git status" },
-        },
-        {
-            ["action"] = "<cmd>Telescope git_commits<cr>",
-            ["key"] = "<leader>gc",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show Git log" },
-        },
-        {
-            ["action"] = "<cmd>Telescope git_branches<cr>",
-            ["key"] = "<leader>gb",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show Git branches" },
-        },
-        {
-            ["action"] = "<cmd>Telescope git_bcommits<cr>",
-            ["key"] = "<leader>gf",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show Git log for current file" },
-        },
-        {
-            ["action"] = "<cmd>DiffviewOpen<cr>",
-            ["key"] = "<leader>gd",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show Git diff for current worktree" },
-        },
-        { ["action"] = "+lsp", ["key"] = "<leader>l", ["mode"] = "n" },
-        {
-            ["action"] = "<cmd>Telescope lsp_references<cr>",
-            ["key"] = "<leader>lr",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Goto references" },
-        },
-        {
-            ["action"] = "<cmd>Telescope lsp_definitions<cr>",
-            ["key"] = "<leader>ld",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Goto definition" },
-        },
-        {
-            ["action"] = "<cmd>Telescope lsp_implementations<cr>",
-            ["key"] = "<leader>li",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Goto implementation" },
-        },
-        {
-            ["action"] = "<cmd>Telescope lsp_type_definitions<cr>",
-            ["key"] = "<leader>lt",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Goto type definition" },
-        },
-        {
-            ["action"] = "<cmd>Telescope lsp_incoming_calls<cr>",
-            ["key"] = "<leader>lI",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show incoming calls" },
-        },
-        {
-            ["action"] = "<cmd>Telescope lsp_outgoing_calls<cr>",
-            ["key"] = "<leader>lO",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show outgoing calls" },
-        },
-        { ["action"] = "+code", ["key"] = "<leader>c", ["mode"] = "n" },
-        {
-            ["action"] = "<cmd>lua require('conform').format()<cr>",
-            ["key"] = "<leader>cf",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Format current buffer" },
-        },
-        {
-            ["action"] = "<cmd>lua vim.diagnostic.open_float()<cr>",
-            ["key"] = "<leader>cd",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show LSP line diagnostics" },
-        },
-        {
-            ["action"] = "<cmd>Telescope diagnostics<cr>",
-            ["key"] = "<leader>cD",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show diagnostics" },
-        },
-        {
-            ["action"] = "<cmd>lua vim.lsp.buf.rename()<cr>",
-            ["key"] = "<leader>cr",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Rename LSP symbol" },
-        },
-        {
-            ["action"] = "<cmd>lua vim.lsp.buf.code_action()<cr>",
-            ["key"] = "<leader>ca",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Show LSP code actions" },
-        },
-        {
-            ["action"] = "<cmd>ClangdSwitchSourceHeader<cr>",
-            ["key"] = "<leader>ch",
-            ["mode"] = "n",
-            ["options"] = { ["desc"] = "Switch C/C++ source/header" },
+            action = "<cmd>ClangdSwitchSourceHeader<cr>",
+            key = "<leader>ch",
+            mode = "n",
+            options = { desc = "Switch C/C++ source/header" },
         },
     }
     for i, map in ipairs(__nixvim_binds) do
@@ -1718,7 +1541,7 @@ do
 end
 -- }}}
 
-vim.filetype.add({ ["extension"] = { ["v"] = "vlang" } })
+vim.filetype.add({ extension = { v = "vlang" } })
 
 -- Make Lazy window border rounded
 require("lazy.core.config").options.ui.border = "rounded"
@@ -1777,33 +1600,51 @@ end, {
 do
     local __nixvim_autocommands = {
         {
-            ["callback"] = function()
+            callback = function()
                 if not vim.g.disable_autolint then
                     require("lint").try_lint()
                 end
             end,
-            ["event"] = { "BufWritePost" },
+            event = { "BufWritePost" },
         },
         {
-            ["callback"] = function()
+            callback = function()
                 vim.highlight.on_yank()
             end,
-            ["event"] = { "TextYankPost" },
+            event = { "TextYankPost" },
         },
         {
-            ["callback"] = function()
+            callback = function()
                 local current_tab = vim.fn.tabpagenr()
                 vim.cmd("tabdo wincmd =")
                 vim.cmd("tabnext " .. current_tab)
             end,
-            ["event"] = { "VimResized" },
+            event = { "VimResized" },
         },
         {
-            ["callback"] = function()
+            callback = function()
                 vim.opt_local.conceallevel = 0
             end,
-            ["event"] = "FileType",
-            ["pattern"] = { "json", "jsonc", "json5" },
+            event = { "FileType" },
+            pattern = { "json", "jsonc", "json5" },
+        },
+        {
+            callback = function()
+                local workspace = vim.fs.dirname(vim.fs.find({ "gradlew", ".git", "mvnw" }, { upward = true })[1])
+
+                local opts = {
+                    root_dir = workspace,
+                    cmd = {
+                        "jdtls",
+                        "-data",
+                        "/home/christoph/.local/share/eclipse/" .. vim.fn.fnamemodify(workspace, ":p:h:t"),
+                    },
+                }
+
+                require("jdtls").start_or_attach(opts)
+            end,
+            event = { "FileType" },
+            pattern = { "Java", "java" },
         },
     }
 
diff --git a/config/neovim/store/lazy-plugins/NrrwRgn/test/runtest.sh b/config/neovim/store/lazy-plugins/NrrwRgn/test/runtest.sh
index f6236f62..6c884a37 100755
--- a/config/neovim/store/lazy-plugins/NrrwRgn/test/runtest.sh
+++ b/config/neovim/store/lazy-plugins/NrrwRgn/test/runtest.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/sh
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/sh
 
 for i in */; do
     cd "$i"
diff --git a/config/neovim/store/lazy-plugins/NrrwRgn/test/test1/cmd.sh b/config/neovim/store/lazy-plugins/NrrwRgn/test/test1/cmd.sh
index 710ccd3a..def39893 100755
--- a/config/neovim/store/lazy-plugins/NrrwRgn/test/test1/cmd.sh
+++ b/config/neovim/store/lazy-plugins/NrrwRgn/test/test1/cmd.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 #set -x
 
 dir="$(realpath ../..)"
diff --git a/config/neovim/store/lazy-plugins/NrrwRgn/test/test2/cmd.sh b/config/neovim/store/lazy-plugins/NrrwRgn/test/test2/cmd.sh
index 2448887a..f74514b4 100755
--- a/config/neovim/store/lazy-plugins/NrrwRgn/test/test2/cmd.sh
+++ b/config/neovim/store/lazy-plugins/NrrwRgn/test/test2/cmd.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 #set -x
 
 Test="Test2"
diff --git a/config/neovim/store/lazy-plugins/NrrwRgn/test/test3/cmd.sh b/config/neovim/store/lazy-plugins/NrrwRgn/test/test3/cmd.sh
index de992091..b583154c 100755
--- a/config/neovim/store/lazy-plugins/NrrwRgn/test/test3/cmd.sh
+++ b/config/neovim/store/lazy-plugins/NrrwRgn/test/test3/cmd.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 #set -x
 
 Test="Test3"
diff --git a/config/neovim/store/lazy-plugins/NrrwRgn/test/test4/cmd.sh b/config/neovim/store/lazy-plugins/NrrwRgn/test/test4/cmd.sh
index 914caf06..c0a86951 100755
--- a/config/neovim/store/lazy-plugins/NrrwRgn/test/test4/cmd.sh
+++ b/config/neovim/store/lazy-plugins/NrrwRgn/test/test4/cmd.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 #set -x
 
 Test="Test4"
diff --git a/config/neovim/store/lazy-plugins/NrrwRgn/test/test5/cmd.sh b/config/neovim/store/lazy-plugins/NrrwRgn/test/test5/cmd.sh
index a2007054..3417cd7a 100755
--- a/config/neovim/store/lazy-plugins/NrrwRgn/test/test5/cmd.sh
+++ b/config/neovim/store/lazy-plugins/NrrwRgn/test/test5/cmd.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 #set -x
 
 Test=`basename $PWD`
diff --git a/config/neovim/store/lazy-plugins/NrrwRgn/test/test6/cmd.sh b/config/neovim/store/lazy-plugins/NrrwRgn/test/test6/cmd.sh
index c8335997..b1e3ecea 100755
--- a/config/neovim/store/lazy-plugins/NrrwRgn/test/test6/cmd.sh
+++ b/config/neovim/store/lazy-plugins/NrrwRgn/test/test6/cmd.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 #set -x
 
 Test=`basename $PWD`
diff --git a/config/neovim/store/lazy-plugins/NrrwRgn/test/test7/cmd.sh b/config/neovim/store/lazy-plugins/NrrwRgn/test/test7/cmd.sh
index 5dbc5a4d..68f3dcc9 100755
--- a/config/neovim/store/lazy-plugins/NrrwRgn/test/test7/cmd.sh
+++ b/config/neovim/store/lazy-plugins/NrrwRgn/test/test7/cmd.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 #set -x
 
 Test=`basename $PWD`
diff --git a/config/neovim/store/lazy-plugins/catppuccin-nvim/lua/catppuccin/groups/integrations/bufferline.lua b/config/neovim/store/lazy-plugins/catppuccin-nvim/lua/catppuccin/groups/integrations/bufferline.lua
index 454fe0d2..3ca9bf00 100644
--- a/config/neovim/store/lazy-plugins/catppuccin-nvim/lua/catppuccin/groups/integrations/bufferline.lua
+++ b/config/neovim/store/lazy-plugins/catppuccin-nvim/lua/catppuccin/groups/integrations/bufferline.lua
@@ -37,6 +37,7 @@ function M.get(user_config)
 			tab_separator_selected = { fg = separator_fg, bg = active_bg },
 
 			tab_close = { fg = C.red, bg = inactive_bg },
+			indicator_visible = { fg = C.peach, bg = inactive_bg, style = styles },
 			indicator_selected = { fg = C.peach, bg = active_bg, style = styles },
 			-- separators
 			separator = { fg = separator_fg, bg = inactive_bg },
@@ -87,6 +88,7 @@ function M.get(user_config)
 			diagnostic_selected = { fg = C.subtext0, bg = active_bg, style = styles },
 			-- Modified
 			modified = { fg = C.peach, bg = inactive_bg },
+			modified_visible = { fg = C.peach, bg = inactive_bg },
 			modified_selected = { fg = C.peach, bg = active_bg },
 		}
 
diff --git a/config/neovim/store/lazy-plugins/catppuccin-nvim/lua/catppuccin/groups/integrations/feline.lua b/config/neovim/store/lazy-plugins/catppuccin-nvim/lua/catppuccin/groups/integrations/feline.lua
index f0d9c024..afbbe351 100644
--- a/config/neovim/store/lazy-plugins/catppuccin-nvim/lua/catppuccin/groups/integrations/feline.lua
+++ b/config/neovim/store/lazy-plugins/catppuccin-nvim/lua/catppuccin/groups/integrations/feline.lua
@@ -417,7 +417,7 @@ function M.get()
 			-- show an indicator that we have running lsps
 			if view.lsp.name == false and next(active_clients) ~= nil then return assets.lsp.server .. " " .. "Lsp" end
 
-			-- show the actual name of the runing lsps
+			-- show the actual name of the running lsps
 			local index = 0
 			local lsp_names = ""
 			for _, lsp_config in ipairs(active_clients) do
diff --git a/config/neovim/store/lazy-plugins/catppuccin-nvim/lua/catppuccin/groups/integrations/neogit.lua b/config/neovim/store/lazy-plugins/catppuccin-nvim/lua/catppuccin/groups/integrations/neogit.lua
index b0499d60..eaf94364 100644
--- a/config/neovim/store/lazy-plugins/catppuccin-nvim/lua/catppuccin/groups/integrations/neogit.lua
+++ b/config/neovim/store/lazy-plugins/catppuccin-nvim/lua/catppuccin/groups/integrations/neogit.lua
@@ -238,6 +238,9 @@ function M.get()
 		NeogitTagDistance = {
 			fg = C.blue,
 		},
+		NeogitWinSeparator = {
+			link = "WinSeparator",
+		},
 	}
 end
 
diff --git a/config/neovim/store/lazy-plugins/clangd_extensions.nvim/lua/clangd_extensions/inlay_hints.lua b/config/neovim/store/lazy-plugins/clangd_extensions.nvim/lua/clangd_extensions/inlay_hints.lua
index e0ee08aa..2f70d044 100644
--- a/config/neovim/store/lazy-plugins/clangd_extensions.nvim/lua/clangd_extensions/inlay_hints.lua
+++ b/config/neovim/store/lazy-plugins/clangd_extensions.nvim/lua/clangd_extensions/inlay_hints.lua
@@ -234,7 +234,7 @@ local function handler(err, result, ctx)
 end
 
 local function inline_handler(err, result, ctx)
-    if err then return end
+    if err or not result then return end
     local bufnr = ctx.bufnr
 
     if vim.api.nvim_get_current_buf() ~= bufnr then return end
diff --git a/config/neovim/store/lazy-plugins/comment.nvim/README.md b/config/neovim/store/lazy-plugins/comment.nvim/README.md
index 0f8454cd..ae9ab64f 100644
--- a/config/neovim/store/lazy-plugins/comment.nvim/README.md
+++ b/config/neovim/store/lazy-plugins/comment.nvim/README.md
@@ -25,8 +25,7 @@
     'numToStr/Comment.nvim',
     opts = {
         -- add any options here
-    },
-    lazy = false,
+    }
 }
 
 ```
diff --git a/config/neovim/store/lazy-plugins/comment.nvim/lua/Comment/ft.lua b/config/neovim/store/lazy-plugins/comment.nvim/lua/Comment/ft.lua
index 812eacd2..34afffaf 100644
--- a/config/neovim/store/lazy-plugins/comment.nvim/lua/Comment/ft.lua
+++ b/config/neovim/store/lazy-plugins/comment.nvim/lua/Comment/ft.lua
@@ -32,6 +32,7 @@ local M = {
     twig = '{#%s#}',
     vim = '"%s',
     lean_b = '/-%s-/',
+    ruby_block = '=begin%s=end',
 }
 
 ---Lang table that contains commentstring (linewise/blockwise) for multiple filetypes
@@ -40,23 +41,28 @@ local M = {
 local L = setmetatable({
     arduino = { M.cxx_l, M.cxx_b },
     applescript = { M.hash },
+    asm = { M.hash },
     astro = { M.html },
     autohotkey = { M.semicolon, M.cxx_b },
     bash = { M.hash },
     beancount = { M.semicolon },
     bib = { M.latex },
+    blueprint = { M.cxx_l }, -- Blueprint doesn't have block comments
     c = { M.cxx_l, M.cxx_b },
     cabal = { M.dash },
+    cairo = { M.cxx_l },
     cmake = { M.hash, M.hash_bracket },
     conf = { M.hash },
     conkyrc = { M.dash, M.dash_bracket },
-    coq = { M.fsharp_b },
+    coq = { M.fsharp_b, M.fsharp_b },
     cpp = { M.cxx_l, M.cxx_b },
     cs = { M.cxx_l, M.cxx_b },
     css = { M.cxx_b, M.cxx_b },
     cuda = { M.cxx_l, M.cxx_b },
+    cue = { M.cxx_l },
     dart = { M.cxx_l, M.cxx_b },
     dhall = { M.dash, M.haskell_b },
+    dnsmasq = { M.hash },
     dosbatch = { 'REM%s' },
     dot = { M.cxx_l, M.cxx_b },
     dts = { M.cxx_l, M.cxx_b },
@@ -72,6 +78,7 @@ local L = setmetatable({
     fsharp = { M.cxx_l, M.fsharp_b },
     gdb = { M.hash },
     gdscript = { M.hash },
+    gdshader = { M.cxx_l, M.cxx_b },
     gitignore = { M.hash },
     gleam = { M.cxx_l },
     glsl = { M.cxx_l, M.cxx_b },
@@ -83,18 +90,23 @@ local L = setmetatable({
     handlebars = { M.handlebars, M.handlebars },
     haskell = { M.dash, M.haskell_b },
     haxe = { M.cxx_l, M.cxx_b },
+    hcl = { M.hash, M.cxx_b },
     heex = { M.html, M.html },
     html = { M.html, M.html },
     htmldjango = { M.html, M.html },
+    hyprlang = { M.hash },
     idris = { M.dash, M.haskell_b },
     idris2 = { M.dash, M.haskell_b },
     ini = { M.hash },
+    jai = { M.cxx_l, M.cxx_b },
     java = { M.cxx_l, M.cxx_b },
     javascript = { M.cxx_l, M.cxx_b },
     javascriptreact = { M.cxx_l, M.cxx_b },
+    jq = { M.hash },
     jsonc = { M.cxx_l },
     jsonnet = { M.cxx_l, M.cxx_b },
     julia = { M.hash, '#=%s=#' },
+    kdl = { M.cxx_l, M.cxx_b },
     kotlin = { M.cxx_l, M.cxx_b },
     lean = { M.dash, M.lean_b },
     lean3 = { M.dash, M.lean_b },
@@ -102,20 +114,26 @@ local L = setmetatable({
     lilypond = { M.latex, '%{%s%}' },
     lisp = { M.lisp_l, M.lisp_b },
     lua = { M.dash, M.dash_bracket },
+    metalua = { M.dash, M.dash_bracket },
     luau = { M.dash, M.dash_bracket },
     markdown = { M.html, M.html },
     make = { M.hash },
     mbsyncrc = { M.dbl_hash },
     mermaid = { '%%%s' },
     meson = { M.hash },
+    mojo = { M.hash },
     nextflow = { M.cxx_l, M.cxx_b },
     nim = { M.hash, '#[%s]#' },
     nix = { M.hash, M.cxx_b },
     nu = { M.hash },
+    objc = { M.cxx_l, M.cxx_b },
+    objcpp = { M.cxx_l, M.cxx_b },
     ocaml = { M.fsharp_b, M.fsharp_b },
     odin = { M.cxx_l, M.cxx_b },
+    openscad = { M.cxx_l, M.cxx_b },
     plantuml = { "'%s", "/'%s'/" },
     purescript = { M.dash, M.haskell_b },
+    puppet = { M.hash },
     python = { M.hash }, -- Python doesn't have block comments
     php = { M.cxx_l, M.cxx_b },
     prisma = { M.cxx_l },
@@ -125,15 +143,17 @@ local L = setmetatable({
     racket = { M.lisp_l, M.lisp_b },
     rasi = { M.cxx_l, M.cxx_b },
     readline = { M.hash },
+    reason = { M.cxx_l, M.cxx_b },
     rego = { M.hash },
     remind = { M.hash },
     rescript = { M.cxx_l, M.cxx_b },
     robot = { M.hash }, -- Robotframework doesn't have block comments
     ron = { M.cxx_l, M.cxx_b },
-    ruby = { M.hash },
+    ruby = { M.hash, M.ruby_block },
     rust = { M.cxx_l, M.cxx_b },
     sbt = { M.cxx_l, M.cxx_b },
     scala = { M.cxx_l, M.cxx_b },
+    scss = { M.cxx_b, M.cxx_b },
     scheme = { M.lisp_l, M.lisp_b },
     sh = { M.hash },
     solidity = { M.cxx_l, M.cxx_b },
@@ -143,11 +163,13 @@ local L = setmetatable({
     svelte = { M.html, M.html },
     swift = { M.cxx_l, M.cxx_b },
     sxhkdrc = { M.hash },
+    systemverilog = { M.cxx_l, M.cxx_b },
     tablegen = { M.cxx_l, M.cxx_b },
     teal = { M.dash, M.dash_bracket },
     terraform = { M.hash, M.cxx_b },
     tex = { M.latex },
     template = { M.dbl_hash },
+    tidal = { M.dash, M.haskell_b },
     tmux = { M.hash },
     toml = { M.hash },
     twig = { M.twig, M.twig },
@@ -155,11 +177,13 @@ local L = setmetatable({
     typescriptreact = { M.cxx_l, M.cxx_b },
     typst = { M.cxx_l, M.cxx_b },
     v = { M.cxx_l, M.cxx_b },
+    vala = { M.cxx_l, M.cxx_b },
     verilog = { M.cxx_l },
     vhdl = { M.dash },
     vim = { M.vim },
     vifm = { M.vim },
     vue = { M.html, M.html },
+    wgsl = { M.cxx_l, M.cxx_b },
     xdefaults = { '!%s' },
     xml = { M.html, M.html },
     xonsh = { M.hash }, -- Xonsh doesn't have block comments
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/.github/pre-commit b/config/neovim/store/lazy-plugins/conform.nvim/.github/pre-commit
index a9dca986..3a8cdd4f 100755
--- a/config/neovim/store/lazy-plugins/conform.nvim/.github/pre-commit
+++ b/config/neovim/store/lazy-plugins/conform.nvim/.github/pre-commit
@@ -1,3 +1,3 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 set -e
 make fastlint
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/.github/pre-push b/config/neovim/store/lazy-plugins/conform.nvim/.github/pre-push
index 084e2873..144b7472 100755
--- a/config/neovim/store/lazy-plugins/conform.nvim/.github/pre-push
+++ b/config/neovim/store/lazy-plugins/conform.nvim/.github/pre-push
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 set -e
 IFS=' '
 while read local_ref _local_sha _remote_ref _remote_sha; do
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/.github/workflows/tests.yml b/config/neovim/store/lazy-plugins/conform.nvim/.github/workflows/tests.yml
index 7e62300e..4a94fab4 100644
--- a/config/neovim/store/lazy-plugins/conform.nvim/.github/workflows/tests.yml
+++ b/config/neovim/store/lazy-plugins/conform.nvim/.github/workflows/tests.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - uses: stevearc/nvim-typecheck-action@v1
+      - uses: stevearc/nvim-typecheck-action@v2
         with:
           path: lua
 
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/CHANGELOG.md b/config/neovim/store/lazy-plugins/conform.nvim/CHANGELOG.md
index cde701cd..49fdaef8 100644
--- a/config/neovim/store/lazy-plugins/conform.nvim/CHANGELOG.md
+++ b/config/neovim/store/lazy-plugins/conform.nvim/CHANGELOG.md
@@ -1,5 +1,39 @@
 # Changelog
 
+## [5.9.0](https://github.com/stevearc/conform.nvim/compare/v5.8.0...v5.9.0) (2024-06-10)
+
+
+### Features
+
+* add support for d2 ([#445](https://github.com/stevearc/conform.nvim/issues/445)) ([5e7a000](https://github.com/stevearc/conform.nvim/commit/5e7a000e4f239b56077e5a38680c5e9a0bf60e6a))
+* add support for efmt ([#428](https://github.com/stevearc/conform.nvim/issues/428)) ([a1d3c0a](https://github.com/stevearc/conform.nvim/commit/a1d3c0aff306b974bc07b4cdf52f1766dd89fc90))
+* add support for for vsg ([#451](https://github.com/stevearc/conform.nvim/issues/451)) ([cf562dd](https://github.com/stevearc/conform.nvim/commit/cf562dd160c27a7fc5342dfce7e1227746dd3aaa))
+* add support for fprettify ([#429](https://github.com/stevearc/conform.nvim/issues/429)) ([7999faf](https://github.com/stevearc/conform.nvim/commit/7999faf7bbec7461f62dabd57cccb784c8d804b5))
+* add support for hindent ([#430](https://github.com/stevearc/conform.nvim/issues/430)) ([9f46982](https://github.com/stevearc/conform.nvim/commit/9f46982b8dc2bf1e267d386ccd096f896369e323))
+* add support for kcl fmt ([#431](https://github.com/stevearc/conform.nvim/issues/431)) ([03a07d5](https://github.com/stevearc/conform.nvim/commit/03a07d58be09a681ab162f3a069dc9e86589bacb))
+* add support for npm-groovy-lint ([#433](https://github.com/stevearc/conform.nvim/issues/433)) ([8fd894c](https://github.com/stevearc/conform.nvim/commit/8fd894cdc248cad64dbfeac6b89e03db9f737a35))
+* add treesitter query formatter ([#425](https://github.com/stevearc/conform.nvim/issues/425)) ([63e0a32](https://github.com/stevearc/conform.nvim/commit/63e0a32c85a39484813957dc480f171907aa90b9))
+* **erlang:** support erlfmt ([#436](https://github.com/stevearc/conform.nvim/issues/436)) ([948c83b](https://github.com/stevearc/conform.nvim/commit/948c83b00eb81bf16b54c6a092ddd88be46793cd))
+* formatter override can use  ([#453](https://github.com/stevearc/conform.nvim/issues/453)) ([a28a425](https://github.com/stevearc/conform.nvim/commit/a28a4255e5c5631ee9c58537592fca05447f0503))
+* **fortran:** support findent ([#426](https://github.com/stevearc/conform.nvim/issues/426)) ([969cdf5](https://github.com/stevearc/conform.nvim/commit/969cdf50b011bec08b4fb8bd3ea3031df183501b))
+* **haskell:** support stylish-haskell ([#435](https://github.com/stevearc/conform.nvim/issues/435)) ([dc612fb](https://github.com/stevearc/conform.nvim/commit/dc612fbf6194fcb3ef401871db1cae74134e9423))
+* **latex:** support llf ([#446](https://github.com/stevearc/conform.nvim/issues/446)) ([1743ee6](https://github.com/stevearc/conform.nvim/commit/1743ee6f9fc52825bdee9493e246876bed591bc1))
+* **lua:** support lua-format ([#432](https://github.com/stevearc/conform.nvim/issues/432)) ([b421e95](https://github.com/stevearc/conform.nvim/commit/b421e95a31e6c3b064a964292255e3b9c762fddd))
+* **python:** support pyink ([#427](https://github.com/stevearc/conform.nvim/issues/427)) ([8b147ca](https://github.com/stevearc/conform.nvim/commit/8b147ca7abccbb19dd952dbb7aeebcdd56b02aee))
+* **rst:** support rstfmt ([#434](https://github.com/stevearc/conform.nvim/issues/434)) ([294bd1d](https://github.com/stevearc/conform.nvim/commit/294bd1d4d32d4c4b797bfc997ea0e4c1a7019ce5))
+* support docstrfmt ([#441](https://github.com/stevearc/conform.nvim/issues/441)) ([c841697](https://github.com/stevearc/conform.nvim/commit/c84169717ee74698f9df20c6437fa06df03bf1fe))
+
+
+### Bug Fixes
+
+* always add cwd to debug logs ([44879ff](https://github.com/stevearc/conform.nvim/commit/44879ffd0268ba931532537b1ee44ed77cd90a5d))
+* **dprint:** add support for binary in node_modules ([#422](https://github.com/stevearc/conform.nvim/issues/422)) ([b1285c7](https://github.com/stevearc/conform.nvim/commit/b1285c7c24559688a9e02d3828d9b72f553b3549))
+* **format-queries:** update query formatter for breaking changes in nvim-treesitter ([7159a23](https://github.com/stevearc/conform.nvim/commit/7159a23d19fb982269dae2e8147ebbe34965095b))
+* improve error message when formatter config is missing ([3f61023](https://github.com/stevearc/conform.nvim/commit/3f610236caf3db6576a0dd7760e5b0731659db68))
+* **rustfmt:** add a default cwd when config file is detected ([#419](https://github.com/stevearc/conform.nvim/issues/419)) ([355049b](https://github.com/stevearc/conform.nvim/commit/355049bc318c3c968b2b434cea9a5bcdf6bf8ea7))
+* set correct file extension for unsaved buffer temp files ([#440](https://github.com/stevearc/conform.nvim/issues/440)) ([88b699b](https://github.com/stevearc/conform.nvim/commit/88b699b595703f1ae9d9061c050e52b1fe7c33f1))
+* use vim.fs.root in neovim 0.10 ([584adfe](https://github.com/stevearc/conform.nvim/commit/584adfe7c665827601f4245c0c40273e8bc9e7cb))
+
 ## [5.8.0](https://github.com/stevearc/conform.nvim/compare/v5.7.0...v5.8.0) (2024-05-22)
 
 
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/README.md b/config/neovim/store/lazy-plugins/conform.nvim/README.md
index 5b3f2cf6..3c551b8c 100644
--- a/config/neovim/store/lazy-plugins/conform.nvim/README.md
+++ b/config/neovim/store/lazy-plugins/conform.nvim/README.md
@@ -153,7 +153,7 @@ require("conform").setup({
   format_on_save = {
     -- These options will be passed to conform.format()
     timeout_ms = 500,
-    lsp_fallback = true,
+    lsp_format = "fallback",
   },
 })
 ```
@@ -207,22 +207,29 @@ You can view this list in vim with `:help conform-formatters`
 - [crystal](https://crystal-lang.org/) - Format Crystal code.
 - [csharpier](https://github.com/belav/csharpier) - The opinionated C# code formatter.
 - [cue_fmt](https://cuelang.org) - Format CUE files using `cue fmt` command.
+- [d2](https://github.com/terrastruct/d2) - D2 is a modern diagram scripting language that turns text to diagrams.
 - [darker](https://github.com/akaihola/darker) - Run black only on changed lines.
 - [dart_format](https://dart.dev/tools/dart-format) - Replace the whitespace in your program with formatting that follows Dart guidelines.
 - [deno_fmt](https://deno.land/manual/tools/formatter) - Use [Deno](https://deno.land/) to format TypeScript, JavaScript/JSON and markdown.
 - [dfmt](https://github.com/dlang-community/dfmt) - Formatter for D source code.
 - [djlint](https://github.com/Riverside-Healthcare/djLint) - ✨ HTML Template Linter and Formatter. Django - Jinja - Nunjucks - Handlebars - GoLang.
+- [docstrfmt](https://github.com/LilSpazJoekp/docstrfmt) - reStructuredText formatter.
 - [dprint](https://github.com/dprint/dprint) - Pluggable and configurable code formatting platform written in Rust.
 - [easy-coding-standard](https://github.com/easy-coding-standard/easy-coding-standard) - ecs - Use Coding Standard with 0-knowledge of PHP-CS-Fixer and PHP_CodeSniffer.
+- [efmt](https://github.com/sile/efmt) - Erlang code formatter.
 - [elm_format](https://github.com/avh4/elm-format) - elm-format formats Elm source code according to a standard set of rules based on the official [Elm Style Guide](https://elm-lang.org/docs/style-guide).
 - [erb_format](https://github.com/nebulab/erb-formatter) - Format ERB files with speed and precision.
+- [erlfmt](https://github.com/WhatsApp/erlfmt) - An automated code formatter for Erlang.
 - [eslint_d](https://github.com/mantoni/eslint_d.js/) - Like ESLint, but faster.
 - [fantomas](https://github.com/fsprojects/fantomas) - F# source code formatter.
+- [findent](https://github.com/wvermin/findent) - Indent, relabel and convert Fortran sources.
 - [fish_indent](https://fishshell.com/docs/current/cmds/fish_indent.html) - Indent or otherwise prettify a piece of fish code.
 - [fixjson](https://github.com/rhysd/fixjson) - JSON Fixer for Humans using (relaxed) JSON5.
 - [fnlfmt](https://git.sr.ht/~technomancy/fnlfmt) - A formatter for Fennel code.
 - [forge_fmt](https://github.com/foundry-rs/foundry) - Forge is a command-line tool that ships with Foundry. Forge tests, builds, and deploys your smart contracts.
+- [format-queries](https://github.com/nvim-treesitter/nvim-treesitter/blob/main/CONTRIBUTING.md#formatting) - Tree-sitter query formatter.
 - [fourmolu](https://hackage.haskell.org/package/fourmolu) - A fork of ormolu that uses four space indentation and allows arbitrary configuration.
+- [fprettify](https://github.com/fortran-lang/fprettify) - Auto-formatter for modern fortran source code.
 - [gci](https://github.com/daixiang0/gci) - GCI, a tool that controls Go package import order and makes it always deterministic.
 - [gdformat](https://github.com/Scony/godot-gdscript-toolkit) - A formatter for Godot's gdscript.
 - [gersemi](https://github.com/BlankSpruce/gersemi) - A formatter to make your CMake code the real treasure.
@@ -235,6 +242,7 @@ You can view this list in vim with `:help conform-formatters`
 - [golines](https://github.com/segmentio/golines) - A golang formatter that fixes long lines.
 - [google-java-format](https://github.com/google/google-java-format) - Reformats Java source code according to Google Java Style.
 - [hcl](https://github.com/hashicorp/hcl) - A formatter for HCL files.
+- [hindent](https://github.com/mihaimaruseac/hindent) - Haskell pretty printer.
 - [htmlbeautifier](https://github.com/threedaymonk/htmlbeautifier) - A normaliser/beautifier for HTML that also understands embedded Ruby. Ideal for tidying up Rails templates.
 - [indent](https://www.gnu.org/software/indent/) - GNU Indent.
 - [injected](doc/advanced_topics.md#injected-language-formatting-code-blocks) - Format treesitter injected languages.
@@ -244,11 +252,14 @@ You can view this list in vim with `:help conform-formatters`
 - [jq](https://github.com/stedolan/jq) - Command-line JSON processor.
 - [jsonnetfmt](https://github.com/google/go-jsonnet/tree/master/cmd/jsonnetfmt) - jsonnetfmt is a command line tool to format jsonnet files.
 - [just](https://github.com/casey/just) - Format Justfile.
+- [kcl](https://www.kcl-lang.io/docs/tools/cli/kcl/fmt) - The KCL Format tool modifies the files according to the KCL code style.
 - [ktfmt](https://github.com/facebook/ktfmt) - Reformats Kotlin source code to comply with the common community standard conventions.
 - [ktlint](https://ktlint.github.io/) - An anti-bikeshedding Kotlin linter with built-in formatter.
 - [latexindent](https://github.com/cmhughes/latexindent.pl) - A perl script for formatting LaTeX files that is generally included in major TeX distributions.
 - [leptosfmt](https://github.com/bram209/leptosfmt) - A formatter for the Leptos view! macro.
 - [liquidsoap-prettier](https://github.com/savonet/liquidsoap-prettier) - A binary to format Liquidsoap scripts
+- [llf](https://repo.or.cz/llf.git) - A LaTeX reformatter / beautifier.
+- [lua-format](https://github.com/Koihik/LuaFormatter) - Code formatter for Lua.
 - [markdown-toc](https://github.com/jonschlinkert/markdown-toc) - API and CLI for generating a markdown TOC (table of contents) for a README or any markdown files.
 - [markdownlint](https://github.com/DavidAnson/markdownlint) - A Node.js style checker and lint tool for Markdown/CommonMark files.
 - [markdownlint-cli2](https://github.com/DavidAnson/markdownlint-cli2) - A fast, flexible, configuration-based command-line interface for linting Markdown/CommonMark files with the markdownlint library.
@@ -259,6 +270,7 @@ You can view this list in vim with `:help conform-formatters`
 - [nimpretty](https://github.com/nim-lang/nim) - nimpretty is a Nim source code beautifier that follows the official style guide.
 - [nixfmt](https://github.com/serokell/nixfmt) - nixfmt is a formatter for Nix code, intended to apply a uniform style.
 - [nixpkgs_fmt](https://github.com/nix-community/nixpkgs-fmt) - nixpkgs-fmt is a Nix code formatter for nixpkgs.
+- [npm-groovy-lint](https://github.com/nvuillam/npm-groovy-lint) - Lint, format and auto-fix your Groovy / Jenkinsfile / Gradle files using command line.
 - [ocamlformat](https://github.com/ocaml-ppx/ocamlformat) - Auto-formatter for OCaml code.
 - [ocp-indent](https://github.com/OCamlPro/ocp-indent) - Automatic indentation of OCaml source files.
 - [opa_fmt](https://www.openpolicyagent.org/docs/latest/cli/#opa-fmt) - Format Rego files using `opa fmt` command.
@@ -277,9 +289,11 @@ You can view this list in vim with `:help conform-formatters`
 - [pretty-php](https://github.com/lkrms/pretty-php) - The opinionated PHP code formatter.
 - [puppet-lint](https://github.com/puppetlabs/puppet-lint) - Check that your Puppet manifests conform to the style guide.
 - [purs-tidy](https://github.com/natefaubion/purescript-tidy) - A syntax tidy-upper for PureScript.
+- [pyink](https://github.com/google/pyink) - A Python formatter, forked from Black with a few different formatting behaviors.
 - [reorder-python-imports](https://github.com/asottile/reorder-python-imports) - Rewrites source to reorder python imports
 - [rescript-format](https://rescript-lang.org/) - The built-in ReScript formatter.
 - [roc](https://github.com/roc-lang/roc) - A fast, friendly, functional language.
+- [rstfmt](https://github.com/dzhu/rstfmt) - A formatter for reStructuredText.
 - [rubocop](https://github.com/rubocop/rubocop) - Ruby static code analyzer and formatter, based on the community Ruby style guide.
 - [rubyfmt](https://github.com/fables-tales/rubyfmt) - Ruby Autoformatter! (Written in Rust)
 - [ruff_fix](https://docs.astral.sh/ruff/) - An extremely fast Python linter, written in Rust. Fix lint errors.
@@ -302,6 +316,7 @@ You can view this list in vim with `:help conform-formatters`
 - [standardrb](https://github.com/standardrb/standard) - Ruby's bikeshed-proof linter and formatter.
 - [stylelint](https://github.com/stylelint/stylelint) - A mighty CSS linter that helps you avoid errors and enforce conventions.
 - [styler](https://github.com/devOpifex/r.nvim) - R formatter and linter.
+- [stylish-haskell](https://github.com/haskell/stylish-haskell) - Haskell code prettifier.
 - [stylua](https://github.com/JohnnyMorganz/StyLua) - An opinionated code formatter for Lua.
 - [swift_format](https://github.com/apple/swift-format) - Swift formatter from apple. Requires building from source with `swift build`.
 - [swiftformat](https://github.com/nicklockwood/SwiftFormat) - SwiftFormat is a code library and command-line tool for reformatting `swift` code on macOS or Linux.
@@ -315,11 +330,11 @@ You can view this list in vim with `:help conform-formatters`
 - [trim_whitespace](https://www.gnu.org/software/gawk/manual/gawk.html) - Trim whitespaces with awk.
 - [twig-cs-fixer](https://github.com/VincentLanglet/Twig-CS-Fixer) - Automatically fix Twig Coding Standards issues
 - [typos](https://github.com/crate-ci/typos) - Source code spell checker
-- [typstfmt](https://github.com/astrale-sharp/typstfmt) - Basic formatter for the Typst language with a future!
 - [typstyle](https://github.com/Enter-tainer/typstyle) - Beautiful and reliable typst code formatter.
 - [uncrustify](https://github.com/uncrustify/uncrustify) - A source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and Vala.
 - [usort](https://github.com/facebook/usort) - Safe, minimal import sorting for Python projects.
 - [verible](https://github.com/chipsalliance/verible/blob/master/verilog/tools/formatter/README.md) - The SystemVerilog formatter.
+- [vsg](https://github.com/jeremiah-c-leary/vhdl-style-guide) - Style guide enforcement for VHDL.
 - [xmlformat](https://github.com/pamoller/xmlformatter) - xmlformatter is an Open Source Python package, which provides formatting of XML documents.
 - [xmllint](http://xmlsoft.org/xmllint.html) - Despite the name, xmllint can be used to format XML files as well as lint them.
 - [yamlfix](https://github.com/lyz-code/yamlfix) - A configurable YAML formatter that keeps comments.
@@ -451,14 +466,14 @@ require("conform").setup({
   -- This can also be a function that returns the table.
   format_on_save = {
     -- I recommend these options. See :help conform.format for details.
-    lsp_fallback = true,
+    lsp_format = "fallback",
     timeout_ms = 500,
   },
   -- If this is set, Conform will run the formatter asynchronously after save.
   -- It will pass the table to conform.format().
   -- This can also be a function that returns the table.
   format_after_save = {
-    lsp_fallback = true,
+    lsp_format = "fallback",
   },
   -- Set the log level. Use `:ConformInfo` to see the location of the log file.
   log_level = vim.log.levels.ERROR,
@@ -499,9 +514,13 @@ require("conform").setup({
       },
       -- Set to false to disable merging the config with the base definition
       inherit = true,
+      -- When inherit = true, add these additional arguments to the beginning of the command.
       -- When inherit = true, add these additional arguments to the command.
       -- This can also be a function, like args
       prepend_args = { "--use-tabs" },
+      -- When inherit = true, add these additional arguments to the end of the command.
+      -- This can also be a function, like args
+      append_args = { "--trailing-comma" },
     },
     -- These can also be a function that returns the formatter
     other_formatter = function(bufnr)
@@ -544,8 +563,8 @@ require("conform").formatters.my_formatter = {
 | ----- | ------------------------ | ---------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | opts  | `nil\|conform.setupOpts` |                                                                                                                  |                                                                                                                                                                           |
 |       | formatters_by_ft         | `nil\|table<string, conform.FiletypeFormatter>`                                                                  | Map of filetype to formatters                                                                                                                                             |
-|       | format_on_save           | `nil\|conform.FormatOpts\|fun(bufnr: integer): conform.FormatOpts`                                               | If this is set, Conform will run the formatter on save. It will pass the table to conform.format(). This can also be a function that returns the table.                   |
-|       | format_after_save        | `nil\|conform.FormatOpts\|fun(bufnr: integer): conform.FormatOpts`                                               | If this is set, Conform will run the formatter asynchronously after save. It will pass the table to conform.format(). This can also be a function that returns the table. |
+|       | format_on_save           | `nil\|conform.FormatOpts\|fun(bufnr: integer): nil\|conform.FormatOpts`                                          | If this is set, Conform will run the formatter on save. It will pass the table to conform.format(). This can also be a function that returns the table.                   |
+|       | format_after_save        | `nil\|conform.FormatOpts\|fun(bufnr: integer): nil\|conform.FormatOpts`                                          | If this is set, Conform will run the formatter asynchronously after save. It will pass the table to conform.format(). This can also be a function that returns the table. |
 |       | log_level                | `nil\|integer`                                                                                                   | Set the log level (e.g. `vim.log.levels.DEBUG`). Use `:ConformInfo` to see the location of the log file.                                                                  |
 |       | notify_on_error          | `nil\|boolean`                                                                                                   | Conform will notify you when a formatter errors (default true).                                                                                                           |
 |       | formatters               | `nil\|table<string, conform.FormatterConfigOverride\|fun(bufnr: integer): nil\|conform.FormatterConfigOverride>` | Custom formatters and overrides for built-in formatters.                                                                                                                  |
@@ -555,21 +574,21 @@ require("conform").formatters.my_formatter = {
 `format(opts, callback): boolean` \
 Format a buffer
 
-| Param    | Type                                                 | Desc                                 |                                                                                                                                                      |
-| -------- | ---------------------------------------------------- | ------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------- |
-| opts     | `nil\|conform.FormatOpts`                            |                                      |                                                                                                                                                      |
-|          | timeout_ms                                           | `nil\|integer`                       | Time in milliseconds to block for formatting. Defaults to 1000. No effect if async = true.                                                           |
-|          | bufnr                                                | `nil\|integer`                       | Format this buffer (default 0)                                                                                                                       |
-|          | async                                                | `nil\|boolean`                       | If true the method won't block. Defaults to false. If the buffer is modified before the formatter completes, the formatting will be discarded.       |
-|          | dry_run                                              | `nil\|boolean`                       | If true don't apply formatting changes to the buffer                                                                                                 |
-|          | formatters                                           | `nil\|string[]`                      | List of formatters to run. Defaults to all formatters for the buffer filetype.                                                                       |
-|          | lsp_fallback                                         | `nil\|boolean\|"always"`             | Attempt LSP formatting if no formatters are available. Defaults to false. If "always", will attempt LSP formatting even if formatters are available. |
-|          | quiet                                                | `nil\|boolean`                       | Don't show any notifications for warnings or failures. Defaults to false.                                                                            |
-|          | range                                                | `nil\|table`                         | Range to format. Table must contain `start` and `end` keys with {row, col} tuples using (1,0) indexing. Defaults to current selection in visual mode |
-|          | id                                                   | `nil\|integer`                       | Passed to vim.lsp.buf.format when lsp_fallback = true                                                                                                |
-|          | name                                                 | `nil\|string`                        | Passed to vim.lsp.buf.format when lsp_fallback = true                                                                                                |
-|          | filter                                               | `nil\|fun(client: table): boolean`   | Passed to vim.lsp.buf.format when lsp_fallback = true                                                                                                |
-| callback | `nil\|fun(err: nil\|string, did_edit: nil\|boolean)` | Called once formatting has completed |                                                                                                                                                      |
+| Param    | Type                                                 | Desc                                                  |                                                                                                                                                                                                |
+| -------- | ---------------------------------------------------- | ----------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| opts     | `nil\|conform.FormatOpts`                            |                                                       |                                                                                                                                                                                                |
+|          | timeout_ms                                           | `nil\|integer`                                        | Time in milliseconds to block for formatting. Defaults to 1000. No effect if async = true.                                                                                                     |
+|          | bufnr                                                | `nil\|integer`                                        | Format this buffer (default 0)                                                                                                                                                                 |
+|          | async                                                | `nil\|boolean`                                        | If true the method won't block. Defaults to false. If the buffer is modified before the formatter completes, the formatting will be discarded.                                                 |
+|          | dry_run                                              | `nil\|boolean`                                        | If true don't apply formatting changes to the buffer                                                                                                                                           |
+|          | formatters                                           | `nil\|string[]`                                       | List of formatters to run. Defaults to all formatters for the buffer filetype.                                                                                                                 |
+|          | lsp_format                                           | `nil\|"never"\|"fallback"\|"prefer"\|"first"\|"last"` | "fallback" LSP formatting when no other formatters are available, "prefer" only LSP formatting when available, "first" LSP formatting then other formatters, "last" other formatters then LSP. |
+|          | quiet                                                | `nil\|boolean`                                        | Don't show any notifications for warnings or failures. Defaults to false.                                                                                                                      |
+|          | range                                                | `nil\|table`                                          | Range to format. Table must contain `start` and `end` keys with {row, col} tuples using (1,0) indexing. Defaults to current selection in visual mode                                           |
+|          | id                                                   | `nil\|integer`                                        | Passed to vim.lsp.buf.format when using LSP formatting                                                                                                                                         |
+|          | name                                                 | `nil\|string`                                         | Passed to vim.lsp.buf.format when using LSP formatting                                                                                                                                         |
+|          | filter                                               | `nil\|fun(client: table): boolean`                    | Passed to vim.lsp.buf.format when using LSP formatting                                                                                                                                         |
+| callback | `nil\|fun(err: nil\|string, did_edit: nil\|boolean)` | Called once formatting has completed                  |                                                                                                                                                                                                |
 
 Returns:
 
@@ -605,7 +624,7 @@ Get information about a formatter (including availability)
 ### will_fallback_lsp(options)
 
 `will_fallback_lsp(options): boolean` \
-Check if the buffer will use LSP formatting when lsp_fallback = true
+Check if the buffer will use LSP formatting when lsp_format = "fallback"
 
 | Param   | Type         | Desc                                 |
 | ------- | ------------ | ------------------------------------ |
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/doc/conform.txt b/config/neovim/store/lazy-plugins/conform.nvim/doc/conform.txt
index 4271e950..a3d3c2e1 100644
--- a/config/neovim/store/lazy-plugins/conform.nvim/doc/conform.txt
+++ b/config/neovim/store/lazy-plugins/conform.nvim/doc/conform.txt
@@ -38,14 +38,14 @@ OPTIONS                                                          *conform-option
       -- This can also be a function that returns the table.
       format_on_save = {
         -- I recommend these options. See :help conform.format for details.
-        lsp_fallback = true,
+        lsp_format = "fallback",
         timeout_ms = 500,
       },
       -- If this is set, Conform will run the formatter asynchronously after save.
       -- It will pass the table to conform.format().
       -- This can also be a function that returns the table.
       format_after_save = {
-        lsp_fallback = true,
+        lsp_format = "fallback",
       },
       -- Set the log level. Use `:ConformInfo` to see the location of the log file.
       log_level = vim.log.levels.ERROR,
@@ -86,9 +86,13 @@ OPTIONS                                                          *conform-option
           },
           -- Set to false to disable merging the config with the base definition
           inherit = true,
+          -- When inherit = true, add these additional arguments to the beginning of the command.
           -- When inherit = true, add these additional arguments to the command.
           -- This can also be a function, like args
           prepend_args = { "--use-tabs" },
+          -- When inherit = true, add these additional arguments to the end of the command.
+          -- This can also be a function, like args
+          append_args = { "--trailing-comma" },
         },
         -- These can also be a function that returns the formatter
         other_formatter = function(bufnr)
@@ -115,11 +119,11 @@ setup({opts})                                                      *conform.setu
       {opts} `nil|conform.setupOpts`
           {formatters_by_ft} `nil|table<string, conform.FiletypeFormatter>` Map
                              of filetype to formatters
-          {format_on_save}   `nil|conform.FormatOpts|fun(bufnr: integer): conform.FormatOpts` I
+          {format_on_save}   `nil|conform.FormatOpts|fun(bufnr: integer): nil|conform.FormatOpts` I
                              f this is set, Conform will run the formatter on
                              save. It will pass the table to conform.format().
                              This can also be a function that returns the table.
-          {format_after_save} `nil|conform.FormatOpts|fun(bufnr: integer): conform.FormatOpts` I
+          {format_after_save} `nil|conform.FormatOpts|fun(bufnr: integer): nil|conform.FormatOpts` I
                              f this is set, Conform will run the formatter
                              asynchronously after save. It will pass the table
                              to conform.format(). This can also be a function
@@ -138,32 +142,32 @@ format({opts}, {callback}): boolean                               *conform.forma
 
     Parameters:
       {opts}     `nil|conform.FormatOpts`
-          {timeout_ms}   `nil|integer` Time in milliseconds to block for
-                         formatting. Defaults to 1000. No effect if async =
-                         true.
-          {bufnr}        `nil|integer` Format this buffer (default 0)
-          {async}        `nil|boolean` If true the method won't block. Defaults
-                         to false. If the buffer is modified before the
-                         formatter completes, the formatting will be discarded.
-          {dry_run}      `nil|boolean` If true don't apply formatting changes to
-                         the buffer
-          {formatters}   `nil|string[]` List of formatters to run. Defaults to
-                         all formatters for the buffer filetype.
-          {lsp_fallback} `nil|boolean|"always"` Attempt LSP formatting if no
-                         formatters are available. Defaults to false. If
-                         "always", will attempt LSP formatting even if
-                         formatters are available.
-          {quiet}        `nil|boolean` Don't show any notifications for warnings
-                         or failures. Defaults to false.
-          {range}        `nil|table` Range to format. Table must contain `start`
-                         and `end` keys with {row, col} tuples using (1,0)
-                         indexing. Defaults to current selection in visual mode
-          {id}           `nil|integer` Passed to |vim.lsp.buf.format| when
-                         lsp_fallback = true
-          {name}         `nil|string` Passed to |vim.lsp.buf.format| when
-                         lsp_fallback = true
-          {filter}       `nil|fun(client: table): boolean` Passed to
-                         |vim.lsp.buf.format| when lsp_fallback = true
+          {timeout_ms} `nil|integer` Time in milliseconds to block for
+                       formatting. Defaults to 1000. No effect if async = true.
+          {bufnr}      `nil|integer` Format this buffer (default 0)
+          {async}      `nil|boolean` If true the method won't block. Defaults to
+                       false. If the buffer is modified before the formatter
+                       completes, the formatting will be discarded.
+          {dry_run}    `nil|boolean` If true don't apply formatting changes to
+                       the buffer
+          {formatters} `nil|string[]` List of formatters to run. Defaults to all
+                       formatters for the buffer filetype.
+          {lsp_format} `nil|"never"|"fallback"|"prefer"|"first"|"last"` "fallbac
+                       k" LSP formatting when no other formatters are available,
+                       "prefer" only LSP formatting when available, "first" LSP
+                       formatting then other formatters, "last" other formatters
+                       then LSP.
+          {quiet}      `nil|boolean` Don't show any notifications for warnings
+                       or failures. Defaults to false.
+          {range}      `nil|table` Range to format. Table must contain `start`
+                       and `end` keys with {row, col} tuples using (1,0)
+                       indexing. Defaults to current selection in visual mode
+          {id}         `nil|integer` Passed to |vim.lsp.buf.format| when using
+                       LSP formatting
+          {name}       `nil|string` Passed to |vim.lsp.buf.format| when using
+                       LSP formatting
+          {filter}     `nil|fun(client: table): boolean` Passed to
+                       |vim.lsp.buf.format| when using LSP formatting
       {callback} `nil|fun(err: nil|string, did_edit: nil|boolean)` Called once
                  formatting has completed
     Returns:
@@ -187,7 +191,7 @@ get_formatter_info({formatter}, {bufnr}): conform.FormatterInfo *conform.get_for
       {bufnr}     `nil|integer`
 
 will_fallback_lsp({options}): boolean                  *conform.will_fallback_lsp*
-    Check if the buffer will use LSP formatting when lsp_fallback = true
+    Check if the buffer will use LSP formatting when lsp_format = "fallback"
 
     Parameters:
       {options} `nil|table` Options passed to |vim.lsp.buf.format|
@@ -238,6 +242,7 @@ FORMATTERS                                                    *conform-formatter
 `crystal` - Format Crystal code.
 `csharpier` - The opinionated C# code formatter.
 `cue_fmt` - Format CUE files using `cue fmt` command.
+`d2` - D2 is a modern diagram scripting language that turns text to diagrams.
 `darker` - Run black only on changed lines.
 `dart_format` - Replace the whitespace in your program with formatting that
               follows Dart guidelines.
@@ -246,22 +251,28 @@ FORMATTERS                                                    *conform-formatter
 `dfmt` - Formatter for D source code.
 `djlint` - ✨ HTML Template Linter and Formatter. Django - Jinja - Nunjucks -
          Handlebars - GoLang.
+`docstrfmt` - reStructuredText formatter.
 `dprint` - Pluggable and configurable code formatting platform written in Rust.
 `easy-coding-standard` - ecs - Use Coding Standard with 0-knowledge of PHP-CS-
                        Fixer and PHP_CodeSniffer.
+`efmt` - Erlang code formatter.
 `elm_format` - elm-format formats Elm source code according to a standard set of
              rules based on the official [Elm Style Guide](https://elm-
              lang.org/docs/style-guide).
 `erb_format` - Format ERB files with speed and precision.
+`erlfmt` - An automated code formatter for Erlang.
 `eslint_d` - Like ESLint, but faster.
 `fantomas` - F# source code formatter.
+`findent` - Indent, relabel and convert Fortran sources.
 `fish_indent` - Indent or otherwise prettify a piece of fish code.
 `fixjson` - JSON Fixer for Humans using (relaxed) JSON5.
 `fnlfmt` - A formatter for Fennel code.
 `forge_fmt` - Forge is a command-line tool that ships with Foundry. Forge tests,
             builds, and deploys your smart contracts.
+`format-queries` - Tree-sitter query formatter.
 `fourmolu` - A fork of ormolu that uses four space indentation and allows
            arbitrary configuration.
+`fprettify` - Auto-formatter for modern fortran source code.
 `gci` - GCI, a tool that controls Go package import order and makes it always
       deterministic.
 `gdformat` - A formatter for Godot's gdscript.
@@ -280,6 +291,7 @@ FORMATTERS                                                    *conform-formatter
 `google-java-format` - Reformats Java source code according to Google Java
                      Style.
 `hcl` - A formatter for HCL files.
+`hindent` - Haskell pretty printer.
 `htmlbeautifier` - A normaliser/beautifier for HTML that also understands
                  embedded Ruby. Ideal for tidying up Rails templates.
 `indent` - GNU Indent.
@@ -291,6 +303,7 @@ FORMATTERS                                                    *conform-formatter
 `jq` - Command-line JSON processor.
 `jsonnetfmt` - jsonnetfmt is a command line tool to format jsonnet files.
 `just` - Format Justfile.
+`kcl` - The KCL Format tool modifies the files according to the KCL code style.
 `ktfmt` - Reformats Kotlin source code to comply with the common community
         standard conventions.
 `ktlint` - An anti-bikeshedding Kotlin linter with built-in formatter.
@@ -298,6 +311,8 @@ FORMATTERS                                                    *conform-formatter
               included in major TeX distributions.
 `leptosfmt` - A formatter for the Leptos view! macro.
 `liquidsoap-prettier` - A binary to format Liquidsoap scripts
+`llf` - A LaTeX reformatter / beautifier.
+`lua-format` - Code formatter for Lua.
 `markdown-toc` - API and CLI for generating a markdown TOC (table of contents)
                for a README or any markdown files.
 `markdownlint` - A Node.js style checker and lint tool for Markdown/CommonMark
@@ -315,6 +330,8 @@ FORMATTERS                                                    *conform-formatter
 `nixfmt` - nixfmt is a formatter for Nix code, intended to apply a uniform
          style.
 `nixpkgs_fmt` - nixpkgs-fmt is a Nix code formatter for nixpkgs.
+`npm-groovy-lint` - Lint, format and auto-fix your Groovy / Jenkinsfile / Gradle
+                  files using command line.
 `ocamlformat` - Auto-formatter for OCaml code.
 `ocp-indent` - Automatic indentation of OCaml source files.
 `opa_fmt` - Format Rego files using `opa fmt` command.
@@ -339,9 +356,12 @@ FORMATTERS                                                    *conform-formatter
 `pretty-php` - The opinionated PHP code formatter.
 `puppet-lint` - Check that your Puppet manifests conform to the style guide.
 `purs-tidy` - A syntax tidy-upper for PureScript.
+`pyink` - A Python formatter, forked from Black with a few different formatting
+        behaviors.
 `reorder-python-imports` - Rewrites source to reorder python imports
 `rescript-format` - The built-in ReScript formatter.
 `roc` - A fast, friendly, functional language.
+`rstfmt` - A formatter for reStructuredText.
 `rubocop` - Ruby static code analyzer and formatter, based on the community Ruby
           style guide.
 `rubyfmt` - Ruby Autoformatter! (Written in Rust)
@@ -372,6 +392,7 @@ FORMATTERS                                                    *conform-formatter
 `stylelint` - A mighty CSS linter that helps you avoid errors and enforce
             conventions.
 `styler` - R formatter and linter.
+`stylish-haskell` - Haskell code prettifier.
 `stylua` - An opinionated code formatter for Lua.
 `swift_format` - Swift formatter from apple. Requires building from source with
                `swift build`.
@@ -390,12 +411,12 @@ FORMATTERS                                                    *conform-formatter
 `trim_whitespace` - Trim whitespaces with awk.
 `twig-cs-fixer` - Automatically fix Twig Coding Standards issues
 `typos` - Source code spell checker
-`typstfmt` - Basic formatter for the Typst language with a future!
 `typstyle` - Beautiful and reliable typst code formatter.
 `uncrustify` - A source code beautifier for C, C++, C#, ObjectiveC, D, Java,
              Pawn and Vala.
 `usort` - Safe, minimal import sorting for Python projects.
 `verible` - The SystemVerilog formatter.
+`vsg` - Style guide enforcement for VHDL.
 `xmlformat` - xmlformatter is an Open Source Python package, which provides
             formatting of XML documents.
 `xmllint` - Despite the name, xmllint can be used to format XML files as well as
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/doc/recipes.md b/config/neovim/store/lazy-plugins/conform.nvim/doc/recipes.md
index 97eaa16e..f5d6f99a 100644
--- a/config/neovim/store/lazy-plugins/conform.nvim/doc/recipes.md
+++ b/config/neovim/store/lazy-plugins/conform.nvim/doc/recipes.md
@@ -24,7 +24,7 @@ vim.api.nvim_create_user_command("Format", function(args)
       ["end"] = { args.line2, end_line:len() },
     }
   end
-  require("conform").format({ async = true, lsp_fallback = true, range = range })
+  require("conform").format({ async = true, lsp_format = "fallback", range = range })
 end, { range = true })
 ```
 
@@ -53,7 +53,7 @@ require("conform").setup({
       return
     end
     -- ...additional logic...
-    return { timeout_ms = 500, lsp_fallback = true }
+    return { timeout_ms = 500, lsp_format = "fallback" }
   end,
 })
 
@@ -65,7 +65,7 @@ require("conform").setup({
       return
     end
     -- ...additional logic...
-    return { lsp_fallback = true }
+    return { lsp_format = "fallback" }
   end,
 })
 ```
@@ -83,7 +83,7 @@ require("conform").setup({
     if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
       return
     end
-    return { timeout_ms = 500, lsp_fallback = true }
+    return { timeout_ms = 500, lsp_format = "fallback" }
   end,
 })
 
@@ -123,14 +123,14 @@ require("conform").setup({
       end
     end
 
-    return { timeout_ms = 200, lsp_fallback = true }, on_format
+    return { timeout_ms = 200, lsp_format = "fallback" }, on_format
   end,
 
   format_after_save = function(bufnr)
     if not slow_format_filetypes[vim.bo[bufnr].filetype] then
       return
     end
-    return { lsp_fallback = true }
+    return { lsp_format = "fallback" }
   end,
 })
 ```
@@ -149,7 +149,7 @@ return {
       -- Customize or remove this keymap to your liking
       "<leader>f",
       function()
-        require("conform").format({ async = true, lsp_fallback = true })
+        require("conform").format({ async = true, lsp_format = "fallback" })
       end,
       mode = "",
       desc = "Format buffer",
@@ -164,7 +164,7 @@ return {
       javascript = { { "prettierd", "prettier" } },
     },
     -- Set up format-on-save
-    format_on_save = { timeout_ms = 500, lsp_fallback = true },
+    format_on_save = { timeout_ms = 500, lsp_format = "fallback" },
     -- Customize formatters
     formatters = {
       shfmt = {
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/formatters/dprint.lua b/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/formatters/dprint.lua
index 8c792216..871c7ab0 100644
--- a/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/formatters/dprint.lua
+++ b/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/formatters/dprint.lua
@@ -5,7 +5,7 @@ return {
     url = "https://github.com/dprint/dprint",
     description = "Pluggable and configurable code formatting platform written in Rust.",
   },
-  command = "dprint",
+  command = util.from_node_modules("dprint"),
   args = { "fmt", "--stdin", "$FILENAME" },
   cwd = util.root_file({
     "dprint.json",
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/formatters/rustfmt.lua b/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/formatters/rustfmt.lua
index e33fb862..6978189b 100644
--- a/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/formatters/rustfmt.lua
+++ b/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/formatters/rustfmt.lua
@@ -18,4 +18,8 @@ return {
 
     return args
   end,
+  cwd = util.root_file({
+    "rustfmt.toml",
+    ".rustfmt.toml",
+  }),
 }
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/formatters/typstfmt.lua b/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/formatters/typstfmt.lua
index e5d0e5fd..6bca1ce5 100644
--- a/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/formatters/typstfmt.lua
+++ b/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/formatters/typstfmt.lua
@@ -3,6 +3,7 @@ return {
   meta = {
     url = "https://github.com/astrale-sharp/typstfmt",
     description = "Basic formatter for the Typst language with a future!",
+    deprecated = true,
   },
   command = "typstfmt",
   stdin = true,
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/formatters/yew-fmt.lua b/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/formatters/yew-fmt.lua
index f441fdff..cb94a56a 100644
--- a/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/formatters/yew-fmt.lua
+++ b/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/formatters/yew-fmt.lua
@@ -18,4 +18,8 @@ return {
 
     return args
   end,
+  cwd = util.root_file({
+    "rustfmt.toml",
+    ".rustfmt.toml",
+  }),
 }
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/init.lua b/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/init.lua
index 705cf6ab..0bab3470 100644
--- a/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/init.lua
+++ b/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/init.lua
@@ -166,6 +166,12 @@ M.setup = function(opts)
   end, { desc = "Show information about Conform formatters" })
 end
 
+---@param obj any
+---@return boolean
+local function is_empty_table(obj)
+  return type(obj) == "table" and vim.tbl_isempty(obj)
+end
+
 ---Get the configured formatter filetype for a buffer
 ---@param bufnr? integer
 ---@return nil|string filetype or nil if no formatter is configured
@@ -177,7 +183,9 @@ local function get_matching_filetype(bufnr)
   table.insert(filetypes, "_")
   for _, filetype in ipairs(filetypes) do
     local ft_formatters = M.formatters_by_ft[filetype]
-    if ft_formatters then
+    -- Sometimes people put an empty table here, and that should not count as configuring formatters
+    -- for a filetype.
+    if ft_formatters and not is_empty_table(ft_formatters) then
       return filetype
     end
   end
@@ -305,33 +313,58 @@ M.resolve_formatters = function(names, bufnr, warn_on_missing)
   return all_info
 end
 
+---Check if there are any formatters configured specifically for the buffer's filetype
+---@param bufnr integer
+---@return boolean
+local function has_filetype_formatters(bufnr)
+  local matching_filetype = get_matching_filetype(bufnr)
+  return matching_filetype ~= nil and matching_filetype ~= "_"
+end
+
+---@param opts table
+---@return boolean
+local function has_lsp_formatter(opts)
+  local lsp_format = require("conform.lsp_format")
+  return not vim.tbl_isempty(lsp_format.get_format_clients(opts))
+end
+
 ---@class conform.FormatOpts
 ---@field timeout_ms nil|integer Time in milliseconds to block for formatting. Defaults to 1000. No effect if async = true.
 ---@field bufnr nil|integer Format this buffer (default 0)
 ---@field async nil|boolean If true the method won't block. Defaults to false. If the buffer is modified before the formatter completes, the formatting will be discarded.
 ---@field dry_run nil|boolean If true don't apply formatting changes to the buffer
 ---@field formatters nil|string[] List of formatters to run. Defaults to all formatters for the buffer filetype.
----@field lsp_fallback nil|boolean|"always" Attempt LSP formatting if no formatters are available. Defaults to false. If "always", will attempt LSP formatting even if formatters are available.
+---@field lsp_format? "never"|"fallback"|"prefer"|"first"|"last" "fallback" LSP formatting when no other formatters are available, "prefer" only LSP formatting when available, "first" LSP formatting then other formatters, "last" other formatters then LSP.
 ---@field quiet nil|boolean Don't show any notifications for warnings or failures. Defaults to false.
 ---@field range nil|table Range to format. Table must contain `start` and `end` keys with {row, col} tuples using (1,0) indexing. Defaults to current selection in visual mode
----@field id nil|integer Passed to |vim.lsp.buf.format| when lsp_fallback = true
----@field name nil|string Passed to |vim.lsp.buf.format| when lsp_fallback = true
----@field filter nil|fun(client: table): boolean Passed to |vim.lsp.buf.format| when lsp_fallback = true
+---@field id nil|integer Passed to |vim.lsp.buf.format| when using LSP formatting
+---@field name nil|string Passed to |vim.lsp.buf.format| when using LSP formatting
+---@field filter nil|fun(client: table): boolean Passed to |vim.lsp.buf.format| when using LSP formatting
 
 ---Format a buffer
 ---@param opts? conform.FormatOpts
 ---@param callback? fun(err: nil|string, did_edit: nil|boolean) Called once formatting has completed
 ---@return boolean True if any formatters were attempted
 M.format = function(opts, callback)
-  ---@type {timeout_ms: integer, bufnr: integer, async: boolean, dry_run: boolean, lsp_fallback: boolean|"always", quiet: boolean, formatters?: string[], range?: conform.Range}
+  ---@type {timeout_ms: integer, bufnr: integer, async: boolean, dry_run: boolean, lsp_format: "never"|"first"|"last"|"prefer"|"fallback", quiet: boolean, formatters?: string[], range?: conform.Range}
   opts = vim.tbl_extend("keep", opts or {}, {
     timeout_ms = 1000,
     bufnr = 0,
     async = false,
     dry_run = false,
-    lsp_fallback = false,
+    lsp_format = "never",
     quiet = false,
   })
+
+  -- For backwards compatibility
+  ---@diagnostic disable-next-line: undefined-field
+  if opts.lsp_fallback == true then
+    opts.lsp_format = "fallback"
+    ---@diagnostic disable-next-line: undefined-field
+  elseif opts.lsp_fallback == "always" then
+    opts.lsp_format = "last"
+  end
+
   if opts.bufnr == 0 then
     opts.bufnr = vim.api.nvim_get_current_buf()
   end
@@ -349,71 +382,86 @@ M.format = function(opts, callback)
   local formatter_names = opts.formatters or M.list_formatters_for_buffer(opts.bufnr)
   local formatters =
     M.resolve_formatters(formatter_names, opts.bufnr, not opts.quiet and explicit_formatters)
+  local has_lsp = has_lsp_formatter(opts)
 
-  local any_formatters = not vim.tbl_isempty(formatters)
-  if not explicit_formatters and opts.lsp_fallback == true and M.will_fallback_lsp(opts) then
-    -- use the LSP formatter when the configured formatters are from the fallback "_" filetype
-    any_formatters = false
-  else
+  ---@param err? conform.Error
+  ---@param did_edit? boolean
+  local function handle_result(err, did_edit)
+    if err then
+      local level = errors.level_for_code(err.code)
+      log.log(level, err.message)
+      local should_notify = not opts.quiet and level >= vim.log.levels.WARN
+      -- Execution errors have special handling. Maybe should reconsider this.
+      local notify_msg = err.message
+      if errors.is_execution_error(err.code) then
+        should_notify = should_notify and M.notify_on_error and not err.debounce_message
+        notify_msg = "Formatter failed. See :ConformInfo for details"
+      end
+      if should_notify then
+        vim.notify(notify_msg, level)
+      end
+    end
+    local err_message = err and err.message
+    if not err_message and not vim.api.nvim_buf_is_valid(opts.bufnr) then
+      err_message = "buffer was deleted"
+    end
+    if err_message then
+      return callback(err_message)
+    end
+
+    if opts.dry_run and did_edit then
+      callback(nil, true)
+    elseif opts.lsp_format == "last" and has_lsp then
+      log.debug("Running LSP formatter on %s", vim.api.nvim_buf_get_name(opts.bufnr))
+      lsp_format.format(opts, callback)
+    else
+      callback(nil, did_edit)
+    end
+  end
+  local function run_cli_formatters(cb)
     local resolved_names = vim.tbl_map(function(f)
       return f.name
     end, formatters)
     log.debug("Running formatters on %s: %s", vim.api.nvim_buf_get_name(opts.bufnr), resolved_names)
-  end
-
-  if any_formatters then
-    ---@param err? conform.Error
-    ---@param did_edit? boolean
-    local function handle_result(err, did_edit)
-      if err then
-        local level = errors.level_for_code(err.code)
-        log.log(level, err.message)
-        local should_notify = not opts.quiet and level >= vim.log.levels.WARN
-        -- Execution errors have special handling. Maybe should reconsider this.
-        local notify_msg = err.message
-        if errors.is_execution_error(err.code) then
-          should_notify = should_notify and M.notify_on_error and not err.debounce_message
-          notify_msg = "Formatter failed. See :ConformInfo for details"
-        end
-        if should_notify then
-          vim.notify(notify_msg, level)
-        end
-      end
-      local err_message = err and err.message
-      if not err_message and not vim.api.nvim_buf_is_valid(opts.bufnr) then
-        err_message = "buffer was deleted"
-      end
-      if err_message then
-        return callback(err_message)
-      end
-
-      if opts.dry_run and did_edit then
-        callback(nil, true)
-      elseif
-        opts.lsp_fallback == "always" and not vim.tbl_isempty(lsp_format.get_format_clients(opts))
-      then
-        log.debug("Running LSP formatter on %s", vim.api.nvim_buf_get_name(opts.bufnr))
-        lsp_format.format(opts, callback)
-      else
-        callback(nil, did_edit)
-      end
-    end
-
     local run_opts = { exclusive = true, dry_run = opts.dry_run }
     if opts.async then
-      runner.format_async(opts.bufnr, formatters, opts.range, run_opts, handle_result)
+      runner.format_async(opts.bufnr, formatters, opts.range, run_opts, cb)
     else
       local err, did_edit =
         runner.format_sync(opts.bufnr, formatters, opts.timeout_ms, opts.range, run_opts)
-      handle_result(err, did_edit)
+      cb(err, did_edit)
     end
-    return true
-  elseif opts.lsp_fallback and not vim.tbl_isempty(lsp_format.get_format_clients(opts)) then
+  end
+
+  -- check if formatters were configured for this buffer's filetype specifically (i.e. not the "_"
+  -- or "*" formatters) AND that at least one of the configured formatters is available
+  local any_formatters = has_filetype_formatters(opts.bufnr) and not vim.tbl_isempty(formatters)
+
+  if
+    has_lsp
+    and (opts.lsp_format == "prefer" or (opts.lsp_format ~= "never" and not any_formatters))
+  then
+    -- LSP formatting only
     log.debug("Running LSP formatter on %s", vim.api.nvim_buf_get_name(opts.bufnr))
     lsp_format.format(opts, callback)
     return true
+  elseif has_lsp and opts.lsp_format == "first" then
+    -- LSP formatting, then other formatters
+    log.debug("Running LSP formatter on %s", vim.api.nvim_buf_get_name(opts.bufnr))
+    lsp_format.format(opts, function(err, did_edit)
+      if err or (did_edit and opts.dry_run) then
+        return callback(err, did_edit)
+      end
+      run_cli_formatters(function(err2, did_edit2)
+        handle_result(err2, did_edit or did_edit2)
+      end)
+    end)
+    return true
+  elseif not vim.tbl_isempty(formatters) then
+    run_cli_formatters(handle_result)
+    return true
   else
-    local level = vim.tbl_isempty(formatter_names) and "debug" or "warn"
+    local level = explicit_formatters and "warn" or "debug"
     log[level]("No formatters found for %s", vim.api.nvim_buf_get_name(opts.bufnr))
     callback("No formatters found for buffer")
     return false
@@ -592,7 +640,7 @@ M.get_formatter_info = function(formatter, bufnr)
       name = formatter,
       command = formatter,
       available = false,
-      available_msg = "No config found",
+      available_msg = "Formatter config missing or incomplete",
     }
   end
 
@@ -647,7 +695,7 @@ M.get_formatter_info = function(formatter, bufnr)
   }
 end
 
----Check if the buffer will use LSP formatting when lsp_fallback = true
+---Check if the buffer will use LSP formatting when lsp_format = "fallback"
 ---@param options? table Options passed to |vim.lsp.buf.format|
 ---@return boolean
 M.will_fallback_lsp = function(options)
@@ -657,18 +705,15 @@ M.will_fallback_lsp = function(options)
   if options.bufnr == 0 then
     options.bufnr = vim.api.nvim_get_current_buf()
   end
-  local matching_filetype = get_matching_filetype(options.bufnr)
-  local has_primary_formatters = matching_filetype and matching_filetype ~= "_"
-  local lsp_clients = require("conform.lsp_format").get_format_clients(options)
-  return not has_primary_formatters and not vim.tbl_isempty(lsp_clients)
+  return not has_filetype_formatters(options.bufnr) and has_lsp_formatter(options)
 end
 
 M.formatexpr = function(opts)
-  local lsp_format = require("conform.lsp_format")
   -- Change the defaults slightly from conform.format
   opts = vim.tbl_deep_extend("keep", opts or {}, {
     timeout_ms = 500,
-    lsp_fallback = true,
+    lsp_format = "fallback",
+    bufnr = vim.api.nvim_get_current_buf(),
   })
   -- Force async = false
   opts.async = false
@@ -697,15 +742,8 @@ M.formatexpr = function(opts)
     }
   end
 
-  if M.format(opts) then
-    return 0
-  elseif opts.lsp_fallback and not vim.tbl_isempty(lsp_format.get_format_clients(opts)) then
-    -- No formatters were available; fall back to lsp formatter
-    return vim.lsp.formatexpr({ timeout_ms = opts.timeout_ms })
-  else
-    -- Do not fallback to built-in formatter.
-    return 0
-  end
+  M.format(opts)
+  return 0
 end
 
 return M
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/runner.lua b/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/runner.lua
index fd998077..38311983 100644
--- a/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/runner.lua
+++ b/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/runner.lua
@@ -1,5 +1,6 @@
 local errors = require("conform.errors")
 local fs = require("conform.fs")
+local ft_to_ext = require("conform.ft_to_ext")
 local log = require("conform.log")
 local util = require("conform.util")
 local uv = vim.uv or vim.loop
@@ -196,6 +197,7 @@ M.apply_format = function(bufnr, original_lines, new_lines, range, only_apply_ra
   end
 
   log.trace("Comparing lines %s and %s", original_lines, new_lines)
+  ---@diagnostic disable-next-line: missing-fields
   local indices = vim.diff(original_text, new_text, {
     result_type = "indices",
     algorithm = "histogram",
@@ -328,6 +330,8 @@ local function run_formatter(bufnr, formatter, config, ctx, input_lines, opts, c
   log.debug("Run command: %s", cmd)
   if cwd then
     log.debug("Run CWD: %s", cwd)
+  else
+    log.debug("Run default CWD: %s", vim.fn.getcwd())
   end
   if env then
     log.debug("Run ENV: %s", env)
@@ -456,7 +460,7 @@ M.build_context = function(bufnr, config, range)
     filename = fs.join(dirname, "unnamed_temp")
     local ft = vim.bo[bufnr].filetype
     if ft and ft ~= "" then
-      filename = filename .. "." .. ft
+      filename = filename .. "." .. (ft_to_ext[ft] or ft)
     end
   else
     dirname = vim.fs.dirname(filename)
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/types.lua b/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/types.lua
index bd984269..b00c3f0b 100644
--- a/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/types.lua
+++ b/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/types.lua
@@ -35,6 +35,7 @@
 ---@field inherit? boolean
 ---@field command? string|fun(self: conform.FormatterConfig, ctx: conform.Context): string
 ---@field prepend_args? string|string[]|fun(self: conform.FormatterConfig, ctx: conform.Context): string|string[]
+---@field append_args? string|string[]|fun(self: conform.FormatterConfig, ctx: conform.Context): string|string[]
 ---@field format? fun(self: conform.LuaFormatterConfig, ctx: conform.Context, lines: string[], callback: fun(err: nil|string, new_lines: nil|string[])) Mutually exclusive with command
 ---@field options? table
 
@@ -61,8 +62,8 @@
 
 ---@class (exact) conform.setupOpts
 ---@field formatters_by_ft? table<string, conform.FiletypeFormatter> Map of filetype to formatters
----@field format_on_save? conform.FormatOpts|fun(bufnr: integer): conform.FormatOpts If this is set, Conform will run the formatter on save. It will pass the table to conform.format(). This can also be a function that returns the table.
----@field format_after_save? conform.FormatOpts|fun(bufnr: integer): conform.FormatOpts If this is set, Conform will run the formatter asynchronously after save. It will pass the table to conform.format(). This can also be a function that returns the table.
+---@field format_on_save? conform.FormatOpts|fun(bufnr: integer): nil|conform.FormatOpts If this is set, Conform will run the formatter on save. It will pass the table to conform.format(). This can also be a function that returns the table.
+---@field format_after_save? conform.FormatOpts|fun(bufnr: integer): nil|conform.FormatOpts If this is set, Conform will run the formatter asynchronously after save. It will pass the table to conform.format(). This can also be a function that returns the table.
 ---@field log_level? integer Set the log level (e.g. `vim.log.levels.DEBUG`). Use `:ConformInfo` to see the location of the log file.
 ---@field notify_on_error? boolean Conform will notify you when a formatter errors (default true).
 ---@field formatters? table<string, conform.FormatterConfigOverride|fun(bufnr: integer): nil|conform.FormatterConfigOverride> Custom formatters and overrides for built-in formatters.
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/util.lua b/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/util.lua
index fe2a306e..4f9b01b8 100644
--- a/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/util.lua
+++ b/config/neovim/store/lazy-plugins/conform.nvim/lua/conform/util.lua
@@ -49,6 +49,9 @@ end
 ---@return fun(self: conform.FormatterConfig, ctx: conform.Context): nil|string
 M.root_file = function(files)
   return function(self, ctx)
+    if vim.fn.has("nvim-0.10") == 1 then
+      return vim.fs.root(ctx.dirname, files)
+    end
     local found = vim.fs.find(files, { upward = true, path = ctx.dirname })[1]
     if found then
       return vim.fs.dirname(found)
@@ -167,6 +170,8 @@ M.merge_formatter_configs = function(config, override)
   local ret = vim.tbl_deep_extend("force", config, override)
   if override.prepend_args then
     M.add_formatter_args(ret, override.prepend_args, { append = false })
+  elseif override.append_args then
+    M.add_formatter_args(ret, override.append_args, { append = true })
   end
   return ret
 end
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/run_tests.sh b/config/neovim/store/lazy-plugins/conform.nvim/run_tests.sh
index b8ef9ed6..f00bbf98 100755
--- a/config/neovim/store/lazy-plugins/conform.nvim/run_tests.sh
+++ b/config/neovim/store/lazy-plugins/conform.nvim/run_tests.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 set -e
 
 mkdir -p ".testenv/config/nvim"
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/scripts/autoformat_doc.lua b/config/neovim/store/lazy-plugins/conform.nvim/scripts/autoformat_doc.lua
index f6476d47..45111ff3 100644
--- a/config/neovim/store/lazy-plugins/conform.nvim/scripts/autoformat_doc.lua
+++ b/config/neovim/store/lazy-plugins/conform.nvim/scripts/autoformat_doc.lua
@@ -16,7 +16,7 @@ require("conform").setup({
       return
     end
     -- ...additional logic...
-    return { timeout_ms = 500, lsp_fallback = true }
+    return { timeout_ms = 500, lsp_format = "fallback" }
   end,
 })
 
@@ -28,6 +28,6 @@ require("conform").setup({
       return
     end
     -- ...additional logic...
-    return { lsp_fallback = true }
+    return { lsp_format = "fallback" }
   end,
 })
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/scripts/options_doc.lua b/config/neovim/store/lazy-plugins/conform.nvim/scripts/options_doc.lua
index 238cd33f..193b462d 100644
--- a/config/neovim/store/lazy-plugins/conform.nvim/scripts/options_doc.lua
+++ b/config/neovim/store/lazy-plugins/conform.nvim/scripts/options_doc.lua
@@ -25,14 +25,14 @@ require("conform").setup({
   -- This can also be a function that returns the table.
   format_on_save = {
     -- I recommend these options. See :help conform.format for details.
-    lsp_fallback = true,
+    lsp_format = "fallback",
     timeout_ms = 500,
   },
   -- If this is set, Conform will run the formatter asynchronously after save.
   -- It will pass the table to conform.format().
   -- This can also be a function that returns the table.
   format_after_save = {
-    lsp_fallback = true,
+    lsp_format = "fallback",
   },
   -- Set the log level. Use `:ConformInfo` to see the location of the log file.
   log_level = vim.log.levels.ERROR,
@@ -73,9 +73,13 @@ require("conform").setup({
       },
       -- Set to false to disable merging the config with the base definition
       inherit = true,
+      -- When inherit = true, add these additional arguments to the beginning of the command.
       -- When inherit = true, add these additional arguments to the command.
       -- This can also be a function, like args
       prepend_args = { "--use-tabs" },
+      -- When inherit = true, add these additional arguments to the end of the command.
+      -- This can also be a function, like args
+      append_args = { "--trailing-comma" },
     },
     -- These can also be a function that returns the formatter
     other_formatter = function(bufnr)
diff --git a/config/neovim/store/lazy-plugins/conform.nvim/tests/fake_formatter.sh b/config/neovim/store/lazy-plugins/conform.nvim/tests/fake_formatter.sh
index 9179c9c4..3aef1fb1 100755
--- a/config/neovim/store/lazy-plugins/conform.nvim/tests/fake_formatter.sh
+++ b/config/neovim/store/lazy-plugins/conform.nvim/tests/fake_formatter.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 set -e
 
diff --git a/config/neovim/store/lazy-plugins/dashboard-nvim/doc/dashboard.txt b/config/neovim/store/lazy-plugins/dashboard-nvim/doc/dashboard.txt
index 5ec5de73..e35f4556 100644
--- a/config/neovim/store/lazy-plugins/dashboard-nvim/doc/dashboard.txt
+++ b/config/neovim/store/lazy-plugins/dashboard-nvim/doc/dashboard.txt
@@ -1,4 +1,4 @@
-*dashboard.txt*             For Nvim 0.8.0            Last change: 2024 May 17
+*dashboard.txt*            For Nvim 0.8.0            Last change: 2024 June 12
 
 ==============================================================================
 Table of Contents                                *dashboard-table-of-contents*
diff --git a/config/neovim/store/lazy-plugins/dashboard-nvim/lua/dashboard/init.lua b/config/neovim/store/lazy-plugins/dashboard-nvim/lua/dashboard/init.lua
index fdd3c426..7cb28233 100644
--- a/config/neovim/store/lazy-plugins/dashboard-nvim/lua/dashboard/init.lua
+++ b/config/neovim/store/lazy-plugins/dashboard-nvim/lua/dashboard/init.lua
@@ -88,46 +88,34 @@ end
 
 function db:new_file()
   vim.cmd('enew')
-  if self.user_laststatus_value then
-    vim.opt_local.laststatus = self.user_laststatus_value
-    self.user_laststatus_value = nil
-  end
-
-  if self.user_tabline_value then
-    vim.opt_local.showtabline = self.user_showtabline_value
-    self.user_showtabline_value = nil
-  end
 end
 
--- cache the user options value restore after leave the dahsboard buffer
--- or use DashboardNewFile command
-function db:cache_ui_options(opts)
+function db:save_user_options()
+  self.user_cursor_line = vim.opt.cursorline:get()
+  self.user_laststatus_value = vim.opt.laststatus:get()
+  self.user_tabline_value = vim.opt.showtabline:get()
+end
+
+function db:set_ui_options(opts)
   if opts.hide.statusline then
-    ---@diagnostic disable-next-line: param-type-mismatch
-    self.user_laststatus_value = vim.opt.laststatus:get()
     vim.opt.laststatus = 0
   end
   if opts.hide.tabline then
-    ---@diagnostic disable-next-line: param-type-mismatch
-    self.user_tabline_value = vim.opt.showtabline:get()
     vim.opt.showtabline = 0
   end
 end
 
-function db:restore_options()
+function db:restore_user_options(opts)
   if self.user_cursor_line then
     vim.opt.cursorline = self.user_cursor_line
-    self.user_cursor_line = nil
   end
 
-  if self.user_laststatus_value then
+  if opts.hide.statusline and self.user_laststatus_value then
     vim.opt.laststatus = tonumber(self.user_laststatus_value)
-    self.user_laststatus_value = nil
   end
 
-  if self.user_tabline_value then
+  if opts.hide.tabline and self.user_tabline_value then
     vim.opt.showtabline = tonumber(self.user_tabline_value)
-    self.user_tabline_value = nil
   end
 end
 
@@ -210,7 +198,8 @@ function db:load_theme(opts)
   end
 
   require('dashboard.theme.' .. opts.theme)(config)
-  self:cache_ui_options(opts)
+
+  self:set_ui_options(opts)
 
   api.nvim_create_autocmd('VimResized', {
     buffer = self.bufnr,
@@ -222,13 +211,30 @@ function db:load_theme(opts)
 
   api.nvim_create_autocmd('BufEnter', {
     callback = function(opt)
+      if vim.bo.filetype == 'dashboard' then
+        self:set_ui_options(opts)
+        return
+      end
+
       local bufs = api.nvim_list_bufs()
+
       bufs = vim.tbl_filter(function(k)
         return vim.bo[k].filetype == 'dashboard'
       end, bufs)
+
+      -- restore the user's UI settings is no dashboard buffers are visible
+      local wins = api.nvim_tabpage_list_wins(0)
+      wins = vim.tbl_filter(function(k)
+        return vim.tbl_contains(bufs, api.nvim_win_get_buf(k))
+      end, wins)
+
+      if #wins == 0 then
+        self:restore_user_options(opts)
+      end
+
+      -- clean up if there are no dashboard buffers at all
       if #bufs == 0 then
         self:cache_opts()
-        self:restore_options()
         clean_ctx()
         pcall(api.nvim_del_autocmd, opt.id)
       end
@@ -259,7 +265,8 @@ function db:instance()
   self.winid = api.nvim_get_current_win()
   api.nvim_win_set_buf(self.winid, self.bufnr)
 
-  self.user_cursor_line = vim.opt.cursorline:get()
+  self:save_user_options()
+
   buf_local()
   if self.opts then
     self:load_theme(self.opts)
diff --git a/config/neovim/store/lazy-plugins/dashboard-nvim/lua/dashboard/theme/doom.lua b/config/neovim/store/lazy-plugins/dashboard-nvim/lua/dashboard/theme/doom.lua
index 213d5c2a..fef3b035 100644
--- a/config/neovim/store/lazy-plugins/dashboard-nvim/lua/dashboard/theme/doom.lua
+++ b/config/neovim/store/lazy-plugins/dashboard-nvim/lua/dashboard/theme/doom.lua
@@ -118,7 +118,7 @@ local function generate_center(config)
       buffer = config.bufnr,
       callback = function()
         local buf = api.nvim_win_get_buf(0)
-        if vim.api.nvim_buf_get_option(buf, 'filetype') ~= 'dashboard' then
+        if vim.api.nvim_get_option_value('filetype', { buf = buf }) ~= 'dashboard' then
           return
         end
 
@@ -132,11 +132,14 @@ local function generate_center(config)
         end
         before = curline
 
-        -- FIX: #422: In Lua the length of a string is the numbers of bytes not
+        -- FIX: #422: In Lua the length of a string is the number of bytes not
         -- the number of characters.
         local curline_str = api.nvim_buf_get_lines(config.bufnr, curline - 1, curline, false)[1]
-        local delta = col_width - api.nvim_strwidth(curline_str:sub(1, col + 1))
-        api.nvim_win_set_cursor(config.winid, { curline, col + delta })
+        local offset = col_width - api.nvim_strwidth(curline_str:sub(1, col + 1))
+        if offset < 0 then
+          offset = 0
+        end
+        api.nvim_win_set_cursor(config.winid, { curline, col + offset })
       end,
     })
   end, 0)
diff --git a/config/neovim/store/lazy-plugins/dashboard-nvim/lua/dashboard/theme/hyper.lua b/config/neovim/store/lazy-plugins/dashboard-nvim/lua/dashboard/theme/hyper.lua
index 1e46b950..3f99f22c 100644
--- a/config/neovim/store/lazy-plugins/dashboard-nvim/lua/dashboard/theme/hyper.lua
+++ b/config/neovim/store/lazy-plugins/dashboard-nvim/lua/dashboard/theme/hyper.lua
@@ -175,10 +175,12 @@ local function mru_list(config)
 
   if config.mru.cwd_only then
     local cwd = uv.cwd()
+    local sep = utils.is_win and '\\' or '/'
+    local cwd_with_sep = cwd .. sep
     mlist = vim.tbl_filter(function(file)
-      local file_dir = vim.fn.fnamemodify(file, ':p:h')
+      local file_dir = vim.fn.fnamemodify(file, ':p:h') .. sep
       if file_dir and cwd then
-        return file_dir:find(cwd, 1, true) == 1
+        return file_dir:sub(1, #cwd_with_sep) == cwd_with_sep
       end
     end, mlist)
   end
diff --git a/config/neovim/store/lazy-plugins/diffview.nvim/README.md b/config/neovim/store/lazy-plugins/diffview.nvim/README.md
index f113226b..9298e1f5 100644
--- a/config/neovim/store/lazy-plugins/diffview.nvim/README.md
+++ b/config/neovim/store/lazy-plugins/diffview.nvim/README.md
@@ -276,6 +276,8 @@ require("diffview").setup({
       -- tabpage is a Diffview.
       { "n", "<tab>",       actions.select_next_entry,              { desc = "Open the diff for the next file" } },
       { "n", "<s-tab>",     actions.select_prev_entry,              { desc = "Open the diff for the previous file" } },
+      { "n", "[F",          actions.select_first_entry,             { desc = "Open the diff for the first file" } },
+      { "n", "]F",          actions.select_last_entry,              { desc = "Open the diff for the last file" } },
       { "n", "gf",          actions.goto_file_edit,                 { desc = "Open the file in the previous tabpage" } },
       { "n", "<C-w><C-f>",  actions.goto_file_split,                { desc = "Open the file in a new split" } },
       { "n", "<C-w>gf",     actions.goto_file_tab,                  { desc = "Open the file in a new tabpage" } },
@@ -341,6 +343,8 @@ require("diffview").setup({
       { "n", "<c-f>",          actions.scroll_view(0.25),              { desc = "Scroll the view down" } },
       { "n", "<tab>",          actions.select_next_entry,              { desc = "Open the diff for the next file" } },
       { "n", "<s-tab>",        actions.select_prev_entry,              { desc = "Open the diff for the previous file" } },
+      { "n", "[F",             actions.select_first_entry,             { desc = "Open the diff for the first file" } },
+      { "n", "]F",             actions.select_last_entry,              { desc = "Open the diff for the last file" } },
       { "n", "gf",             actions.goto_file_edit,                 { desc = "Open the file in the previous tabpage" } },
       { "n", "<C-w><C-f>",     actions.goto_file_split,                { desc = "Open the file in a new split" } },
       { "n", "<C-w>gf",        actions.goto_file_tab,                  { desc = "Open the file in a new tabpage" } },
@@ -365,9 +369,7 @@ require("diffview").setup({
       { "n", "y",             actions.copy_hash,                   { desc = "Copy the commit hash of the entry under the cursor" } },
       { "n", "L",             actions.open_commit_log,             { desc = "Show commit details" } },
       { "n", "X",             actions.restore_entry,               { desc = "Restore file to the state from the selected entry" } },
-      { "n", "zr",            actions.open_fold,                   { desc = "Expand fold" } },
       { "n", "zo",            actions.open_fold,                   { desc = "Expand fold" } },
-      { "n", "zm",            actions.close_fold,                  { desc = "Collapse fold" } },
       { "n", "zc",            actions.close_fold,                  { desc = "Collapse fold" } },
       { "n", "h",             actions.close_fold,                  { desc = "Collapse fold" } },
       { "n", "za",            actions.toggle_fold,                 { desc = "Toggle fold" } },
@@ -385,6 +387,8 @@ require("diffview").setup({
       { "n", "<c-f>",         actions.scroll_view(0.25),           { desc = "Scroll the view down" } },
       { "n", "<tab>",         actions.select_next_entry,           { desc = "Open the diff for the next file" } },
       { "n", "<s-tab>",       actions.select_prev_entry,           { desc = "Open the diff for the previous file" } },
+      { "n", "[F",            actions.select_first_entry,          { desc = "Open the diff for the first file" } },
+      { "n", "]F",            actions.select_last_entry,           { desc = "Open the diff for the last file" } },
       { "n", "gf",            actions.goto_file_edit,              { desc = "Open the file in the previous tabpage" } },
       { "n", "<C-w><C-f>",    actions.goto_file_split,             { desc = "Open the file in a new split" } },
       { "n", "<C-w>gf",       actions.goto_file_tab,               { desc = "Open the file in a new tabpage" } },
diff --git a/config/neovim/store/lazy-plugins/diffview.nvim/doc/diffview.txt b/config/neovim/store/lazy-plugins/diffview.nvim/doc/diffview.txt
index 12960569..3a564c12 100644
--- a/config/neovim/store/lazy-plugins/diffview.nvim/doc/diffview.txt
+++ b/config/neovim/store/lazy-plugins/diffview.nvim/doc/diffview.txt
@@ -1165,16 +1165,36 @@ select_entry                                    *diffview-actions-select_entry*
         multiple files, this will collapse or open the entry. In the option
         panel this will interact with the option under the cursor.
 
-select_next_entry                               *diffview-actions-select_next_entry*
+[count] select_next_entry                       *diffview-actions-select_next_entry*
         Contexts: `view`, `file_panel`, `file_history_panel`
 
         Select the entry following the subject.
 
-select_prev_entry                               *diffview-actions-select_prev_entry*
+[count] select_prev_entry                       *diffview-actions-select_prev_entry*
         Contexts: `view`, `file_panel`, `file_history_panel`
 
         Select the entry preceding the subject.
 
+select_first_entry                              *diffview-actions-select_first_entry*
+        Contexts: `view`, `file_panel`, `file_history_panel`
+
+        Select the first entry.
+
+select_last_entry                               *diffview-actions-select_last_entry*
+        Contexts: `view`, `file_panel`, `file_history_panel`
+
+        Select the last entry.
+
+[count] select_next_commit                      *diffview-actions-select_next_commit*
+        Contexts: `file_history_view`, `file_history_panel`
+
+        Select the commit following the subject.
+
+[count] select_prev_commit                      *diffview-actions-select_prev_commit*
+        Contexts: `file_history_view`, `file_history_panel`
+
+        Select the commit preceding the subject.
+
 stage_all                                       *diffview-actions-stage_all*
         Contexts: `diff_view`, `file_panel`
 
diff --git a/config/neovim/store/lazy-plugins/diffview.nvim/doc/diffview_defaults.txt b/config/neovim/store/lazy-plugins/diffview.nvim/doc/diffview_defaults.txt
index 50ee8a08..1ff1f7db 100644
--- a/config/neovim/store/lazy-plugins/diffview.nvim/doc/diffview_defaults.txt
+++ b/config/neovim/store/lazy-plugins/diffview.nvim/doc/diffview_defaults.txt
@@ -97,6 +97,8 @@ DEFAULT CONFIG                                  *diffview.defaults*
         -- tabpage is a Diffview.
         { "n", "<tab>",       actions.select_next_entry,              { desc = "Open the diff for the next file" } },
         { "n", "<s-tab>",     actions.select_prev_entry,              { desc = "Open the diff for the previous file" } },
+        { "n", "[F",          actions.select_first_entry,             { desc = "Open the diff for the first file" } },
+        { "n", "]F",          actions.select_last_entry,              { desc = "Open the diff for the last file" } },
         { "n", "gf",          actions.goto_file_edit,                 { desc = "Open the file in the previous tabpage" } },
         { "n", "<C-w><C-f>",  actions.goto_file_split,                { desc = "Open the file in a new split" } },
         { "n", "<C-w>gf",     actions.goto_file_tab,                  { desc = "Open the file in a new tabpage" } },
@@ -162,6 +164,8 @@ DEFAULT CONFIG                                  *diffview.defaults*
         { "n", "<c-f>",          actions.scroll_view(0.25),              { desc = "Scroll the view down" } },
         { "n", "<tab>",          actions.select_next_entry,              { desc = "Open the diff for the next file" } },
         { "n", "<s-tab>",        actions.select_prev_entry,              { desc = "Open the diff for the previous file" } },
+        { "n", "[F",             actions.select_first_entry,             { desc = "Open the diff for the first file" } },
+        { "n", "]F",             actions.select_last_entry,              { desc = "Open the diff for the last file" } },
         { "n", "gf",             actions.goto_file_edit,                 { desc = "Open the file in the previous tabpage" } },
         { "n", "<C-w><C-f>",     actions.goto_file_split,                { desc = "Open the file in a new split" } },
         { "n", "<C-w>gf",        actions.goto_file_tab,                  { desc = "Open the file in a new tabpage" } },
@@ -186,9 +190,7 @@ DEFAULT CONFIG                                  *diffview.defaults*
         { "n", "y",             actions.copy_hash,                   { desc = "Copy the commit hash of the entry under the cursor" } },
         { "n", "L",             actions.open_commit_log,             { desc = "Show commit details" } },
         { "n", "X",             actions.restore_entry,               { desc = "Restore file to the state from the selected entry" } },
-        { "n", "zr",            actions.open_fold,                   { desc = "Expand fold" } },
         { "n", "zo",            actions.open_fold,                   { desc = "Expand fold" } },
-        { "n", "zm",            actions.close_fold,                  { desc = "Collapse fold" } },
         { "n", "zc",            actions.close_fold,                  { desc = "Collapse fold" } },
         { "n", "h",             actions.close_fold,                  { desc = "Collapse fold" } },
         { "n", "za",            actions.toggle_fold,                 { desc = "Toggle fold" } },
@@ -206,6 +208,8 @@ DEFAULT CONFIG                                  *diffview.defaults*
         { "n", "<c-f>",         actions.scroll_view(0.25),           { desc = "Scroll the view down" } },
         { "n", "<tab>",         actions.select_next_entry,           { desc = "Open the diff for the next file" } },
         { "n", "<s-tab>",       actions.select_prev_entry,           { desc = "Open the diff for the previous file" } },
+        { "n", "[F",            actions.select_first_entry,          { desc = "Open the diff for the first file" } },
+        { "n", "]F",            actions.select_last_entry,           { desc = "Open the diff for the last file" } },
         { "n", "gf",            actions.goto_file_edit,              { desc = "Open the file in the previous tabpage" } },
         { "n", "<C-w><C-f>",    actions.goto_file_split,             { desc = "Open the file in a new split" } },
         { "n", "<C-w>gf",       actions.goto_file_tab,               { desc = "Open the file in a new tabpage" } },
diff --git a/config/neovim/store/lazy-plugins/diffview.nvim/doc/tags b/config/neovim/store/lazy-plugins/diffview.nvim/doc/tags
index f0b2602c..76c3a8e0 100644
--- a/config/neovim/store/lazy-plugins/diffview.nvim/doc/tags
+++ b/config/neovim/store/lazy-plugins/diffview.nvim/doc/tags
@@ -35,7 +35,11 @@ diffview-actions-refresh_files	diffview.txt	/*diffview-actions-refresh_files*
 diffview-actions-restore_entry	diffview.txt	/*diffview-actions-restore_entry*
 diffview-actions-scroll_view	diffview.txt	/*diffview-actions-scroll_view*
 diffview-actions-select_entry	diffview.txt	/*diffview-actions-select_entry*
+diffview-actions-select_first_entry	diffview.txt	/*diffview-actions-select_first_entry*
+diffview-actions-select_last_entry	diffview.txt	/*diffview-actions-select_last_entry*
+diffview-actions-select_next_commit	diffview.txt	/*diffview-actions-select_next_commit*
 diffview-actions-select_next_entry	diffview.txt	/*diffview-actions-select_next_entry*
+diffview-actions-select_prev_commit	diffview.txt	/*diffview-actions-select_prev_commit*
 diffview-actions-select_prev_entry	diffview.txt	/*diffview-actions-select_prev_entry*
 diffview-actions-stage_all	diffview.txt	/*diffview-actions-stage_all*
 diffview-actions-toggle_files	diffview.txt	/*diffview-actions-toggle_files*
diff --git a/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/actions.lua b/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/actions.lua
index 07e3c554..6b89e1fa 100644
--- a/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/actions.lua
+++ b/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/actions.lua
@@ -635,6 +635,10 @@ local action_names = {
   "select_entry",
   "select_next_entry",
   "select_prev_entry",
+  "select_first_entry",
+  "select_last_entry",
+  "select_next_commit",
+  "select_prev_commit",
   "stage_all",
   "toggle_files",
   "toggle_flatten_dirs",
diff --git a/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/config.lua b/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/config.lua
index 79db2e98..f1f6d0f1 100644
--- a/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/config.lua
+++ b/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/config.lua
@@ -124,6 +124,8 @@ M.defaults = {
       -- tabpage is a Diffview.
       { "n", "<tab>",       actions.select_next_entry,              { desc = "Open the diff for the next file" } },
       { "n", "<s-tab>",     actions.select_prev_entry,              { desc = "Open the diff for the previous file" } },
+      { "n", "[F",          actions.select_first_entry,             { desc = "Open the diff for the first file" } },
+      { "n", "]F",          actions.select_last_entry,              { desc = "Open the diff for the last file" } },
       { "n", "gf",          actions.goto_file_edit,                 { desc = "Open the file in the previous tabpage" } },
       { "n", "<C-w><C-f>",  actions.goto_file_split,                { desc = "Open the file in a new split" } },
       { "n", "<C-w>gf",     actions.goto_file_tab,                  { desc = "Open the file in a new tabpage" } },
@@ -190,6 +192,8 @@ M.defaults = {
       { "n", "<c-f>",          actions.scroll_view(0.25),              { desc = "Scroll the view down" } },
       { "n", "<tab>",          actions.select_next_entry,              { desc = "Open the diff for the next file" } },
       { "n", "<s-tab>",        actions.select_prev_entry,              { desc = "Open the diff for the previous file" } },
+      { "n", "[F",             actions.select_first_entry,             { desc = "Open the diff for the first file" } },
+      { "n", "]F",             actions.select_last_entry,              { desc = "Open the diff for the last file" } },
       { "n", "gf",             actions.goto_file_edit,                 { desc = "Open the file in the previous tabpage" } },
       { "n", "<C-w><C-f>",     actions.goto_file_split,                { desc = "Open the file in a new split" } },
       { "n", "<C-w>gf",        actions.goto_file_tab,                  { desc = "Open the file in a new tabpage" } },
@@ -232,6 +236,8 @@ M.defaults = {
       { "n", "<c-f>",         actions.scroll_view(0.25),           { desc = "Scroll the view down" } },
       { "n", "<tab>",         actions.select_next_entry,           { desc = "Open the diff for the next file" } },
       { "n", "<s-tab>",       actions.select_prev_entry,           { desc = "Open the diff for the previous file" } },
+      { "n", "[F",            actions.select_first_entry,          { desc = "Open the diff for the first file" } },
+      { "n", "]F",            actions.select_last_entry,           { desc = "Open the diff for the last file" } },
       { "n", "gf",            actions.goto_file_edit,              { desc = "Open the file in the previous tabpage" } },
       { "n", "<C-w><C-f>",    actions.goto_file_split,             { desc = "Open the file in a new split" } },
       { "n", "<C-w>gf",       actions.goto_file_tab,               { desc = "Open the file in a new tabpage" } },
diff --git a/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/scene/views/diff/listeners.lua b/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/scene/views/diff/listeners.lua
index e0876aa8..9e6d63b1 100644
--- a/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/scene/views/diff/listeners.lua
+++ b/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/scene/views/diff/listeners.lua
@@ -65,6 +65,18 @@ return function(view)
         view:close()
       end
     end,
+    select_first_entry = function()
+      local files = view.panel:ordered_file_list()
+      if files and #files > 0 then
+        view:set_file(files[1], false, true)
+      end
+    end,
+    select_last_entry = function()
+      local files = view.panel:ordered_file_list()
+      if files and #files > 0 then
+        view:set_file(files[#files], false, true)
+      end
+    end,
     select_next_entry = function()
       view:next_file(true)
     end,
diff --git a/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/scene/views/file_history/file_history_view.lua b/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/scene/views/file_history/file_history_view.lua
index baa86ece..1710b942 100644
--- a/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/scene/views/file_history/file_history_view.lua
+++ b/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/scene/views/file_history/file_history_view.lua
@@ -170,8 +170,13 @@ FileHistoryView.set_file = async.void(function(self, file, focus)
   if self:file_safeguard() or not file then return end
 
   local entry = self.panel:find_entry(file)
+  local cur_entry = self.panel.cur_item[1]
 
   if entry then
+    if cur_entry and entry ~= cur_entry then
+      self.panel:set_entry_fold(cur_entry, false)
+    end
+
     self.panel:set_cur_item({ entry, file })
     self.panel:highlight_item(file)
     self.nulled = false
diff --git a/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/scene/views/file_history/listeners.lua b/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/scene/views/file_history/listeners.lua
index 897f4c1f..c10a4ff3 100644
--- a/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/scene/views/file_history/listeners.lua
+++ b/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/scene/views/file_history/listeners.lua
@@ -59,6 +59,38 @@ return function(view)
     select_prev_entry = function()
       view:prev_item()
     end,
+    select_first_entry = function()
+      local entry = view.panel.entries[1]
+      if entry and #entry.files > 0 then
+        view:set_file(entry.files[1])
+      end
+    end,
+    select_last_entry = function()
+      local entry = view.panel.entries[#view.panel.entries]
+      if entry and #entry.files > 0 then
+        view:set_file(entry.files[#entry.files])
+      end
+    end,
+    select_next_commit = function()
+      local cur_entry = view.panel.cur_item[1]
+      if not cur_entry then return end
+      local entry_idx = utils.vec_indexof(view.panel.entries, cur_entry)
+      if entry_idx == -1 then return end
+
+      local next_idx = (entry_idx + vim.v.count1 - 1) % #view.panel.entries + 1
+      local next_entry = view.panel.entries[next_idx]
+      view:set_file(next_entry.files[1])
+    end,
+    select_prev_commit = function()
+      local cur_entry = view.panel.cur_item[1]
+      if not cur_entry then return end
+      local entry_idx = utils.vec_indexof(view.panel.entries, cur_entry)
+      if entry_idx == -1 then return end
+
+      local next_idx = (entry_idx - vim.v.count1 - 1) % #view.panel.entries + 1
+      local next_entry = view.panel.entries[next_idx]
+      view:set_file(next_entry.files[1])
+    end,
     next_entry = function()
       view.panel:highlight_next_file()
     end,
diff --git a/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/utils.lua b/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/utils.lua
index e0246d1a..4cbddcc8 100644
--- a/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/utils.lua
+++ b/config/neovim/store/lazy-plugins/diffview.nvim/lua/diffview/utils.lua
@@ -23,65 +23,44 @@ function M.now()
   return vim.loop.hrtime() / 1000000
 end
 
----Echo string with multiple lines.
 ---@param msg string|string[]
----@param hl? string Highlight group name.
 ---@param schedule? boolean Schedule the echo call.
-function M.echo_multiln(msg, hl, schedule)
+---@param level integer
+function M.notify(msg, level, schedule)
   if schedule then
-    vim.schedule(function() M.echo_multiln(msg, hl, false) end)
+    vim.schedule(function() M.notify(msg, level, false) end)
+    return
+  end
+  if type(msg) == "table" then
+    msg = table.concat(msg, "\n")
+  end
+  if msg == "" then
     return
   end
 
-  if type(msg) ~= "table" then msg = { msg } end
+  if level == vim.log.levels.ERROR then
+    logger:error(msg)
+  end
 
-  local text = table.concat(msg, "\n")
-  api.nvim_echo({ { text, hl } }, true, {})
+  vim.notify(msg, level, { title = "diffview.nvim" })
 end
 
 ---@param msg string|string[]
 ---@param schedule? boolean Schedule the echo call.
 function M.info(msg, schedule)
-  if type(msg) ~= "table" then
-    msg = { msg }
-  end
-  if not msg[1] or (msg[1] == "" and #msg == 1) then
-    return
-  end
-  msg = M.vec_slice(msg)
-  msg[1] = "[Diffview.nvim] " .. msg[1]
-  M.echo_multiln(msg, "DiagnosticInfo", schedule)
+  M.notify(msg, vim.log.levels.INFO, schedule)
 end
 
 ---@param msg string|string[]
 ---@param schedule? boolean Schedule the echo call.
 function M.warn(msg, schedule)
-  if type(msg) ~= "table" then
-    msg = { msg }
-  end
-  if not msg[1] or (msg[1] == "" and #msg == 1) then
-    return
-  end
-  msg = M.vec_slice(msg)
-  msg[1] = "[Diffview.nvim] " .. msg[1]
-  M.echo_multiln(msg, "WarningMsg", schedule)
+  M.notify(msg, vim.log.levels.WARN, schedule)
 end
 
 ---@param msg string|string[]
 ---@param schedule? boolean Schedule the echo call.
 function M.err(msg, schedule)
-  if type(msg) ~= "table" then
-    msg = { msg }
-  end
-  if not msg[1] or (msg[1] == "" and #msg == 1) then
-    return
-  end
-  msg = M.vec_slice(msg)
-
-  logger:error(table.concat(msg, "\n"))
-
-  msg[1] = "[Diffview.nvim] " .. msg[1]
-  M.echo_multiln(msg, "ErrorMsg", schedule)
+  M.notify(msg, vim.log.levels.ERROR, schedule)
 end
 
 ---Call the function `f`, ignoring most of the window and buffer related
diff --git a/config/neovim/store/lazy-plugins/flash.nvim/doc/flash.nvim.txt b/config/neovim/store/lazy-plugins/flash.nvim/doc/flash.nvim.txt
index 9692c2b2..c257de73 100644
--- a/config/neovim/store/lazy-plugins/flash.nvim/doc/flash.nvim.txt
+++ b/config/neovim/store/lazy-plugins/flash.nvim/doc/flash.nvim.txt
@@ -1,4 +1,4 @@
-*flash.nvim.txt*          For Neovim >= 0.8.0         Last change: 2024 May 14
+*flash.nvim.txt*         For Neovim >= 0.8.0         Last change: 2024 June 04
 
 ==============================================================================
 Table of Contents                               *flash.nvim-table-of-contents*
diff --git a/config/neovim/store/lazy-plugins/flash.nvim/lua/flash/config.lua b/config/neovim/store/lazy-plugins/flash.nvim/lua/flash/config.lua
index 06af1787..4c57e813 100644
--- a/config/neovim/store/lazy-plugins/flash.nvim/lua/flash/config.lua
+++ b/config/neovim/store/lazy-plugins/flash.nvim/lua/flash/config.lua
@@ -205,7 +205,12 @@ local defaults = {
       end,
       search = { wrap = false },
       highlight = { backdrop = true },
-      jump = { register = false },
+      jump = {
+        register = false,
+        -- when using jump labels, set to 'true' to automatically jump
+        -- or execute a motion when there is only one match
+        autojump = false,
+      },
     },
     -- options used for treesitter selections
     -- `require("flash").treesitter()`
diff --git a/config/neovim/store/lazy-plugins/flash.nvim/lua/flash/highlight.lua b/config/neovim/store/lazy-plugins/flash.nvim/lua/flash/highlight.lua
index a666f285..4bd40007 100644
--- a/config/neovim/store/lazy-plugins/flash.nvim/lua/flash/highlight.lua
+++ b/config/neovim/store/lazy-plugins/flash.nvim/lua/flash/highlight.lua
@@ -68,14 +68,18 @@ end
 ---@param state Flash.State
 function M.cursor(state)
   for _, win in ipairs(state.wins) do
-    local cursor = vim.api.nvim_win_get_cursor(win)
-    local buf = vim.api.nvim_win_get_buf(win)
-    vim.api.nvim_buf_set_extmark(buf, state.ns, cursor[1] - 1, cursor[2], {
-      hl_group = "FlashCursor",
-      end_col = cursor[2] + 1,
-      priority = state.opts.highlight.priority + 3,
-      strict = false,
-    })
+    if vim.api.nvim__redraw then
+      vim.api.nvim__redraw({ cursor = true, win = win })
+    else
+      local cursor = vim.api.nvim_win_get_cursor(win)
+      local buf = vim.api.nvim_win_get_buf(win)
+      vim.api.nvim_buf_set_extmark(buf, state.ns, cursor[1] - 1, cursor[2], {
+        hl_group = "FlashCursor",
+        end_col = cursor[2] + 1,
+        priority = state.opts.highlight.priority + 3,
+        strict = false,
+      })
+    end
   end
 end
 
diff --git a/config/neovim/store/lazy-plugins/flash.nvim/lua/flash/plugins/char.lua b/config/neovim/store/lazy-plugins/flash.nvim/lua/flash/plugins/char.lua
index 30e72097..39938bd8 100644
--- a/config/neovim/store/lazy-plugins/flash.nvim/lua/flash/plugins/char.lua
+++ b/config/neovim/store/lazy-plugins/flash.nvim/lua/flash/plugins/char.lua
@@ -241,6 +241,10 @@ function M.jump(key)
   M.state:update({ force = true })
 
   if M.jump_labels then
+    if (Config.get("char").jump.autojump and #M.state.results == 1) then
+      M.state:hide()
+      return M.state
+    end
     parsed.actions[Util.CR] = function()
       return false
     end
diff --git a/config/neovim/store/lazy-plugins/flash.nvim/tests/run b/config/neovim/store/lazy-plugins/flash.nvim/tests/run
index bec2227c..e1282a09 100755
--- a/config/neovim/store/lazy-plugins/flash.nvim/tests/run
+++ b/config/neovim/store/lazy-plugins/flash.nvim/tests/run
@@ -1,3 +1,3 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/sh
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/sh
 
 nvim --headless -u tests/init.lua -c "PlenaryBustedDirectory tests {minimal_init = 'tests//init.lua', sequential = true}"
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/doc/gitsigns.txt b/config/neovim/store/lazy-plugins/gitsigns.nvim/doc/gitsigns.txt
index abfc63e7..3e4ad069 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/doc/gitsigns.txt
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/doc/gitsigns.txt
@@ -2,7 +2,7 @@
 *gitsigns.nvim*
 
 Author:   Lewis Russell <lewis6991@gmail.com>
-Version:  v0.8.1
+Version:  v0.9.0
 Homepage: <https://github.com/lewis6991/gitsigns.nvim>
 License:  MIT license
 
@@ -59,10 +59,7 @@ of the default settings:
         ignore_whitespace = false,
         virt_text_priority = 100,
       },
-      current_line_blame_formatter = '<author>, <author_time:%Y-%m-%d> - <summary>',
-      current_line_blame_formatter_opts = {
-        relative_time = false,
-      },
+      current_line_blame_formatter = '<author>, <author_time:%R> - <summary>',
       sign_priority = 6,
       update_debounce = 100,
       status_formatter = nil, -- Use default
@@ -192,7 +189,7 @@ setqflist({target}, {opts}, {callback?})                *gitsigns.setqflist()*
                                Open the quickfix/location list viewer.
                                Defaults to `true`.
 
-show({revision})                                             *gitsigns.show()*
+show({revision}, {callback})                                 *gitsigns.show()*
                 Show revision {base} of the current file, if it is given, or
                 with the currently set base (index by default).
 
@@ -286,6 +283,17 @@ change_base({base}, {global}, {callback?})              *gitsigns.change_base()*
                     {base}   (string|nil): The object/revision to diff against.
                     {global} (boolean|nil): Change the base of all buffers.
 
+blame({callback?})                                          *gitsigns.blame()*
+                Run git-blame on the current file and open the results
+                in a scroll-bound vertical split.
+
+                <CR> is mapped to open a menu with the actions:
+                  - [Show commit] in a vertical split.
+                  - [Reblame at commit]
+
+                Attributes: ~
+                    {async}
+
 blame_line({opts}, {callback?})                        *gitsigns.blame_line()*
                 Run git blame on the current line and show the results in a
                 floating window. If already open, calling this will cause the
@@ -392,6 +400,8 @@ nav_hunk({direction}, {opts}, {callback?})                 *gitsigns.nav_hunk()*
                                 • {greedy}: (boolean)
                                   Only navigate between non-contiguous hunks. Only useful if
                                   'diff_opts' contains `linematch`. Defaults to `true`.
+                                • {target}: (`'unstaged'|'staged'|'all'`)
+                                  Which kinds of hunks to target. Defaults to `'unstaged'`.
                                 • {count}: (integer)
                                   Number of times to advance. Defaults to |v:count1|.
 
@@ -554,6 +564,28 @@ signs                                                  *gitsigns-config-signs*
 
       See |gitsigns-highlight-groups|.
 
+signs_staged                                    *gitsigns-config-signs_staged*
+      Type: `table[extended]`
+      Default: >
+        {
+          add          = { text = '┃' },
+          change       = { text = '┃' },
+          delete       = { text = '▁' },
+          topdelete    = { text = '▔' },
+          changedelete = { text = '~' },
+        }
+<
+    Configuration for signs of staged hunks.
+
+    See |gitsigns-config-signs|.
+
+signs_staged_enable                      *gitsigns-config-signs_staged_enable*
+      Type: `boolean`, Default: `true`
+
+    Show signs for staged hunks.
+
+    When enabled the signs defined in |git-config-signs_staged|` are used.
+
 worktrees                                          *gitsigns-config-worktrees*
       Type: `table`, Default: `nil`
 
@@ -793,23 +825,8 @@ current_line_blame_opts              *gitsigns-config-current_line_blame_opts*
         • extra_opts: string[]
           Extra options passed to `git-blame`.
 
-current_line_blame_formatter_opts
-                           *gitsigns-config-current_line_blame_formatter_opts*
-   DEPRECATED
-
-      Type: `table[extended]`
-      Default: >
-        `{
-          relative_time = false
-        }`
-<
-      Options for the current line blame annotation formatter.
-
-      Fields: ~
-        • relative_time: boolean
-
 current_line_blame_formatter    *gitsigns-config-current_line_blame_formatter*
-      Type: `string|function`, Default: `" <author>, <author_time> - <summary> "`
+      Type: `string|function`, Default: `" <author>, <author_time:%R> - <summary> "`
 
       String or function used to format the virtual text of
       |gitsigns-config-current_line_blame|.
@@ -878,9 +895,6 @@ current_line_blame_formatter    *gitsigns-config-current_line_blame_formatter*
                        Note that the keys map onto the output of:
                          `git blame --line-porcelain`
 
-          {opts}       Passed directly from
-                       |gitsigns-config-current_line_blame_formatter_opts|.
-
         Return: ~
           The result of this function is passed directly to the `opts.virt_text`
           field of |nvim_buf_set_extmark| and thus must be a list of
@@ -901,18 +915,6 @@ trouble                                              *gitsigns-config-trouble*
       When using setqflist() or setloclist(), open Trouble instead of the
       quickfix/location list window.
 
-yadm                                                    *gitsigns-config-yadm*
-   DEPRECATED
-      Please use |gitsigns-config-on_attach_pre| instead
-
-      Type: `table`
-      Default: >
-        `{
-          enable = false
-        }`
-<
-      yadm configuration.
-
 word_diff                                          *gitsigns-config-word_diff*
       Type: `boolean`, Default: `false`
 
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/doc/tags b/config/neovim/store/lazy-plugins/gitsigns.nvim/doc/tags
index 94e17ea6..5c64fd47 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/doc/tags
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/doc/tags
@@ -17,7 +17,6 @@ gitsigns-config-count_chars	gitsigns.txt	/*gitsigns-config-count_chars*
 gitsigns-config-current_line_blame	gitsigns.txt	/*gitsigns-config-current_line_blame*
 gitsigns-config-current_line_blame_formatter	gitsigns.txt	/*gitsigns-config-current_line_blame_formatter*
 gitsigns-config-current_line_blame_formatter_nc	gitsigns.txt	/*gitsigns-config-current_line_blame_formatter_nc*
-gitsigns-config-current_line_blame_formatter_opts	gitsigns.txt	/*gitsigns-config-current_line_blame_formatter_opts*
 gitsigns-config-current_line_blame_opts	gitsigns.txt	/*gitsigns-config-current_line_blame_opts*
 gitsigns-config-debug_mode	gitsigns.txt	/*gitsigns-config-debug_mode*
 gitsigns-config-diff_opts	gitsigns.txt	/*gitsigns-config-diff_opts*
@@ -30,13 +29,14 @@ gitsigns-config-show_deleted	gitsigns.txt	/*gitsigns-config-show_deleted*
 gitsigns-config-sign_priority	gitsigns.txt	/*gitsigns-config-sign_priority*
 gitsigns-config-signcolumn	gitsigns.txt	/*gitsigns-config-signcolumn*
 gitsigns-config-signs	gitsigns.txt	/*gitsigns-config-signs*
+gitsigns-config-signs_staged	gitsigns.txt	/*gitsigns-config-signs_staged*
+gitsigns-config-signs_staged_enable	gitsigns.txt	/*gitsigns-config-signs_staged_enable*
 gitsigns-config-status_formatter	gitsigns.txt	/*gitsigns-config-status_formatter*
 gitsigns-config-trouble	gitsigns.txt	/*gitsigns-config-trouble*
 gitsigns-config-update_debounce	gitsigns.txt	/*gitsigns-config-update_debounce*
 gitsigns-config-watch_gitdir	gitsigns.txt	/*gitsigns-config-watch_gitdir*
 gitsigns-config-word_diff	gitsigns.txt	/*gitsigns-config-word_diff*
 gitsigns-config-worktrees	gitsigns.txt	/*gitsigns-config-worktrees*
-gitsigns-config-yadm	gitsigns.txt	/*gitsigns-config-yadm*
 gitsigns-events	gitsigns.txt	/*gitsigns-events*
 gitsigns-functions	gitsigns.txt	/*gitsigns-functions*
 gitsigns-highlight-groups	gitsigns.txt	/*gitsigns-highlight-groups*
@@ -47,6 +47,7 @@ gitsigns-statusline	gitsigns.txt	/*gitsigns-statusline*
 gitsigns-textobject	gitsigns.txt	/*gitsigns-textobject*
 gitsigns-usage	gitsigns.txt	/*gitsigns-usage*
 gitsigns.attach()	gitsigns.txt	/*gitsigns.attach()*
+gitsigns.blame()	gitsigns.txt	/*gitsigns.blame()*
 gitsigns.blame_line()	gitsigns.txt	/*gitsigns.blame_line()*
 gitsigns.change_base()	gitsigns.txt	/*gitsigns.change_base()*
 gitsigns.detach()	gitsigns.txt	/*gitsigns.detach()*
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/gitsigns.nvim-scm-1-unstable-2024-05-28-rocks/gitsigns.nvim/scm-1/doc/gitsigns.txt b/config/neovim/store/lazy-plugins/gitsigns.nvim/gitsigns.nvim-scm-1-unstable-2024-05-28-rocks/gitsigns.nvim/scm-1/doc/gitsigns.txt
deleted file mode 100644
index abfc63e7..00000000
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/gitsigns.nvim-scm-1-unstable-2024-05-28-rocks/gitsigns.nvim/scm-1/doc/gitsigns.txt
+++ /dev/null
@@ -1,1203 +0,0 @@
-*gitsigns.txt* Gitsigns
-*gitsigns.nvim*
-
-Author:   Lewis Russell <lewis6991@gmail.com>
-Version:  v0.8.1
-Homepage: <https://github.com/lewis6991/gitsigns.nvim>
-License:  MIT license
-
-==============================================================================
-INTRODUCTION                                                        *gitsigns*
-
-Gitsigns is a plugin for Neovim that provides integration with Git via a
-feature set which includes (but not limited to):
-  • Provides signs in the |signcolumn| to show changed/added/removed lines.
-  • Mappings to operate on hunks to stage, undo or reset against Git's index.
-
-Gitsigns is implemented entirely in Lua which is built into Neovim and
-requires no external dependencies other than git. This is unlike other plugins
-that require python, node, etc, which need to communicate with Neovim using
-|RPC|.  By default, Gitsigns also uses Neovim's built-in diff library
-(`vim.diff`) unlike other similar plugins that need to run `git-diff` as an
-external process which is less efficient, has tighter bottlenecks and requires
-file IO.
-
-==============================================================================
-USAGE                                                         *gitsigns-usage*
-
-For basic setup with all batteries included:
->lua
-    require('gitsigns').setup()
-<
-
-Configuration can be passed to the setup function. Here is an example with most
-of the default settings:
->lua
-    require('gitsigns').setup {
-      signs = {
-        add          = { text = '┃' },
-        change       = { text = '┃' },
-        delete       = { text = '_' },
-        topdelete    = { text = '‾' },
-        changedelete = { text = '~' },
-        untracked    = { text = '┆' },
-      },
-      signcolumn = true,  -- Toggle with `:Gitsigns toggle_signs`
-      numhl      = false, -- Toggle with `:Gitsigns toggle_numhl`
-      linehl     = false, -- Toggle with `:Gitsigns toggle_linehl`
-      word_diff  = false, -- Toggle with `:Gitsigns toggle_word_diff`
-      watch_gitdir = {
-        follow_files = true
-      },
-      auto_attach = true,
-      attach_to_untracked = false,
-      current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
-      current_line_blame_opts = {
-        virt_text = true,
-        virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
-        delay = 1000,
-        ignore_whitespace = false,
-        virt_text_priority = 100,
-      },
-      current_line_blame_formatter = '<author>, <author_time:%Y-%m-%d> - <summary>',
-      current_line_blame_formatter_opts = {
-        relative_time = false,
-      },
-      sign_priority = 6,
-      update_debounce = 100,
-      status_formatter = nil, -- Use default
-      max_file_length = 40000, -- Disable if file is longer than this (in lines)
-      preview_config = {
-        -- Options passed to nvim_open_win
-        border = 'single',
-        style = 'minimal',
-        relative = 'cursor',
-        row = 0,
-        col = 1
-      },
-    }
-<
-
-==============================================================================
-MAPPINGS                                                   *gitsigns-mappings*
-
-Custom mappings can be defined in the `on_attach` callback in the config table
-passed to |gitsigns-setup()|. See |gitsigns-config-on_attach|.
-
-Most actions can be repeated with `.` if you have |vim-repeat| installed.
-
-==============================================================================
-FUNCTIONS                                                 *gitsigns-functions*
-
-Note functions with the {async} attribute are run asynchronously and accept
-an optional {callback} argument.
-
-
-setup({cfg})                                                *gitsigns.setup()*
-                Setup and start Gitsigns.
-
-                Parameters: ~
-                    {cfg} (table|nil): Configuration for Gitsigns.
-                          See |gitsigns-usage| for more details.
-
-attach({bufnr}, {ctx}, {callback?})                        *gitsigns.attach()*
-                Attach Gitsigns to the buffer.
-
-                Attributes: ~
-                    {async}
-
-                Parameters: ~
-                    {bufnr} (integer): Buffer number
-                    {ctx}   (table|nil):
-                            Git context data that may optionally be used to attach to any
-                            buffer that represents a real git object.
-                            • {file}: (string)
-                              Path to the file represented by the buffer, relative to the
-                              top-level.
-                            • {toplevel}: (string?)
-                              Path to the top-level of the parent git repository.
-                            • {gitdir}: (string?)
-                              Path to the git directory of the parent git repository
-                              (typically the ".git/" directory).
-                            • {commit}: (string?)
-                              The git revision that the file belongs to.
-                            • {base}: (string?)
-                              The git revision that the file should be compared to.
-
-detach({bufnr})                                            *gitsigns.detach()*
-                Detach Gitsigns from the buffer {bufnr}. If {bufnr} is not
-                provided then the current buffer is used.
-
-                Parameters: ~
-                    {bufnr} (integer): Buffer number
-
-detach_all()                                           *gitsigns.detach_all()*
-                Detach Gitsigns from all buffers it is attached to.
-
-refresh()                                                 *gitsigns.refresh()*
-                Refresh all buffers.
-
-                Attributes: ~
-                    {async}
-
-get_actions()                                         *gitsigns.get_actions()*
-                Get all the available line specific actions for the current
-                buffer at the cursor position.
-
-
-                Returns: ~
-                    (table|nil): Dictionary of action name to function which when called
-                    performs action.
-
-setloclist({nr}, {target})                             *gitsigns.setloclist()*
-                Populate the location list with hunks. Automatically opens the
-                location list window.
-
-                Alias for: `setqflist({target}, { use_location_list = true, nr = {nr} }`
-
-                Attributes: ~
-                    {async}
-
-                Parameters: ~
-                    {nr?}    (integer): Window number or the |window-ID|.
-                             `0` for the current window (default).
-                    {target} (integer|string): See |gitsigns.setqflist()|.
-
-setqflist({target}, {opts}, {callback?})                *gitsigns.setqflist()*
-                Populate the quickfix list with hunks. Automatically opens the
-                quickfix window.
-
-                Attributes: ~
-                    {async}
-
-                Parameters: ~
-                    {target} (integer|string):
-                             Specifies which files hunks are collected from.
-                             Possible values.
-                             • [integer]: The buffer with the matching buffer
-                               number. `0` for current buffer (default).
-                             • `"attached"`: All attached buffers.
-                             • `"all"`: All modified files for each git
-                               directory of all attached buffers in addition
-                               to the current working directory.
-                    {opts}   (table|nil): Additional options:
-                             • {use_location_list}: (boolean)
-                               Populate the location list instead of the
-                               quickfix list. Default to `false`.
-                             • {nr}: (integer)
-                               Window number or ID when using location list.
-                               Expand folds when navigating to a hunk which is
-                               inside a fold. Defaults to `0`.
-                             • {open}: (boolean)
-                               Open the quickfix/location list viewer.
-                               Defaults to `true`.
-
-show({revision})                                             *gitsigns.show()*
-                Show revision {base} of the current file, if it is given, or
-                with the currently set base (index by default).
-
-                If {base} is the index, then the opened buffer is editable and
-                any written changes will update the index accordingly.
-
-                Examples: >vim
-                  " View the index version of the file
-                  :Gitsigns show
-
-                  " View revision of file in the last commit
-                  :Gitsigns show ~1
-<
-
-                For a more complete list of ways to specify bases, see
-                |gitsigns-revision|.
-
-                Attributes: ~
-                    {async}
-
-diffthis({base}, {opts})                                 *gitsigns.diffthis()*
-                Perform a |vimdiff| on the given file with {base} if it is
-                given, or with the currently set base (index by default).
-
-                If {base} is the index, then the opened buffer is editable and
-                any written changes will update the index accordingly.
-
-                Examples: >vim
-                  " Diff against the index
-                  :Gitsigns diffthis
-
-                  " Diff against the last commit
-                  :Gitsigns diffthis ~1
-<
-
-                For a more complete list of ways to specify bases, see
-                |gitsigns-revision|.
-
-                Attributes: ~
-                    {async}
-
-                Parameters: ~
-                    {base} (string|nil): Revision to diff against. Defaults to index.
-                    {opts} (table|nil): Additional options:
-                           • {vertical}: {boolean}. Split window vertically. Defaults to
-                             config.diff_opts.vertical. If running via command line, then
-                             this is taken from the command modifiers.
-                           • {split}: {string}. One of: 'aboveleft', 'belowright',
-                             'botright', 'rightbelow', 'leftabove', 'topleft'. Defaults to
-                             'aboveleft'. If running via command line, then this is taken
-                             from the command modifiers.
-
-reset_base({global})                                   *gitsigns.reset_base()*
-                Reset the base revision to diff against back to the
-                index.
-
-                Alias for `change_base(nil, {global})` .
-
-change_base({base}, {global}, {callback?})              *gitsigns.change_base()*
-                Change the base revision to diff against. If {base} is not
-                given, then the original base is used. If {global} is given
-                and true, then change the base revision of all buffers,
-                including any new buffers.
-
-                Attributes: ~
-                    {async}
-
-                Examples: >vim
-                  " Change base to 1 commit behind head
-                  :lua require('gitsigns').change_base('HEAD~1')
-
-                  " Also works using the Gitsigns command
-                  :Gitsigns change_base HEAD~1
-
-                  " Other variations
-                  :Gitsigns change_base ~1
-                  :Gitsigns change_base ~
-                  :Gitsigns change_base ^
-
-                  " Commits work too
-                  :Gitsigns change_base 92eb3dd
-
-                  " Revert to original base
-                  :Gitsigns change_base
-<
-
-                For a more complete list of ways to specify bases, see
-                |gitsigns-revision|.
-
-                Parameters: ~
-                    {base}   (string|nil): The object/revision to diff against.
-                    {global} (boolean|nil): Change the base of all buffers.
-
-blame_line({opts}, {callback?})                        *gitsigns.blame_line()*
-                Run git blame on the current line and show the results in a
-                floating window. If already open, calling this will cause the
-                window to get focus.
-
-                Attributes: ~
-                    {async}
-
-                Parameters: ~
-                    {opts} (table|nil): Additional options:
-                           • {full}: (boolean)
-                             Display full commit message with hunk.
-                           • {ignore_whitespace}: (boolean)
-                             Ignore whitespace when running blame.
-                           • {rev}: (string)
-                             Revision to blame against.
-                           • {extra_opts}: (string[])
-                             Extra options passed to `git-blame`.
-
-get_hunks({bufnr})                                      *gitsigns.get_hunks()*
-                Get hunk array for specified buffer.
-
-                Parameters: ~
-                    {bufnr} (integer): Buffer number, if not provided (or 0)
-                            will use current buffer.
-
-                Returns: ~
-                    (table|nil): Array of hunk objects.
-                    Each hunk object has keys:
-                        • `"type"`: String with possible values: "add", "change",
-                          "delete"
-                        • `"head"`: Header that appears in the unified diff
-                          output.
-                        • `"lines"`: Line contents of the hunks prefixed with
-                          either `"-"` or `"+"`.
-                        • `"removed"`: Sub-table with fields:
-                          • `"start"`: Line number (1-based)
-                          • `"count"`: Line count
-                        • `"added"`: Sub-table with fields:
-                          • `"start"`: Line number (1-based)
-                          • `"count"`: Line count
-
-select_hunk()                                         *gitsigns.select_hunk()*
-                Select the hunk under the cursor.
-
-preview_hunk_inline()                         *gitsigns.preview_hunk_inline()*
-                Preview the hunk at the cursor position inline in the buffer.
-
-preview_hunk()                                       *gitsigns.preview_hunk()*
-                Preview the hunk at the cursor position in a floating
-                window. If the preview is already open, calling this
-                will cause the window to get focus.
-
-prev_hunk({opts}, {callback?})                          *gitsigns.prev_hunk()*
-                DEPRECATED: use |gitsigns.nav_hunk()|
-
-                Jump to the previous hunk in the current buffer. If a hunk preview
-                (popup or inline) was previously opened, it will be re-opened
-                at the previous hunk.
-
-                Attributes: ~
-                    {async}
-
-                Parameters: ~
-                    See |gitsigns.nav_hunk()|.
-
-next_hunk({opts}, {callback?})                          *gitsigns.next_hunk()*
-                DEPRECATED: use |gitsigns.nav_hunk()|
-
-                Jump to the next hunk in the current buffer. If a hunk preview
-                (popup or inline) was previously opened, it will be re-opened
-                at the next hunk.
-
-                Attributes: ~
-                    {async}
-
-                Parameters: ~
-                    See |gitsigns.nav_hunk()|.
-
-nav_hunk({direction}, {opts}, {callback?})                 *gitsigns.nav_hunk()*
-                Jump to hunk in the current buffer. If a hunk preview
-                (popup or inline) was previously opened, it will be re-opened
-                at the next hunk.
-
-                Attributes: ~
-                    {async}
-
-                Parameters: ~
-                    {direction} ('first'|'last'|'next'|'prev'):
-                    {opts}      (table|nil): Configuration table. Keys:
-                                • {wrap}: (boolean)
-                                  Whether to loop around file or not. Defaults
-                                  to the value 'wrapscan'
-                                • {navigation_message}: (boolean)
-                                  Whether to show navigation messages or not.
-                                  Looks at 'shortmess' for default behaviour.
-                                • {foldopen}: (boolean)
-                                  Expand folds when navigating to a hunk which is
-                                  inside a fold. Defaults to `true` if 'foldopen'
-                                  contains `search`.
-                                • {preview}: (boolean)
-                                  Automatically open preview_hunk() upon navigating
-                                  to a hunk.
-                                • {greedy}: (boolean)
-                                  Only navigate between non-contiguous hunks. Only useful if
-                                  'diff_opts' contains `linematch`. Defaults to `true`.
-                                • {count}: (integer)
-                                  Number of times to advance. Defaults to |v:count1|.
-
-reset_buffer_index()                           *gitsigns.reset_buffer_index()*
-                Unstage all hunks for current buffer in the index. Note:
-                Unlike |gitsigns.undo_stage_hunk()| this doesn't simply undo
-                stages, this runs an `git reset` on current buffers file.
-
-                Attributes: ~
-                    {async}
-
-stage_buffer()                                       *gitsigns.stage_buffer()*
-                Stage all hunks in current buffer.
-
-                Attributes: ~
-                    {async}
-
-undo_stage_hunk()                                 *gitsigns.undo_stage_hunk()*
-                Undo the last call of stage_hunk().
-
-                Note: only the calls to stage_hunk() performed in the current
-                session can be undone.
-
-                Attributes: ~
-                    {async}
-
-reset_buffer()                                       *gitsigns.reset_buffer()*
-                Reset the lines of all hunks in the buffer.
-
-reset_hunk({range}, {opts}, {callback?})               *gitsigns.reset_hunk()*
-                Reset the lines of the hunk at the cursor position, or all
-                lines in the given range. If {range} is provided, all lines in
-                the given range are reset. This supports partial-hunks,
-                meaning if a range only includes a portion of a particular
-                hunk, only the lines within the range will be reset.
-
-                Parameters: ~
-                    {range} (table|nil): List-like table of two integers making
-                            up the line range from which you want to reset the hunks.
-                            If running via command line, then this is taken from the
-                            command modifiers.
-                    {opts}  (table|nil): Additional options:
-                            • {greedy}: (boolean)
-                              Stage all contiguous hunks. Only useful if 'diff_opts'
-                              contains `linematch`. Defaults to `true`.
-
-stage_hunk({range}, {opts}, {callback?})               *gitsigns.stage_hunk()*
-                Stage the hunk at the cursor position, or all lines in the
-                given range. If {range} is provided, all lines in the given
-                range are staged. This supports partial-hunks, meaning if a
-                range only includes a portion of a particular hunk, only the
-                lines within the range will be staged.
-
-                Attributes: ~
-                    {async}
-
-                Parameters: ~
-                    {range} (table|nil): List-like table of two integers making
-                            up the line range from which you want to stage the hunks.
-                            If running via command line, then this is taken from the
-                            command modifiers.
-                    {opts}  (table|nil): Additional options:
-                            • {greedy}: (boolean)
-                              Stage all contiguous hunks. Only useful if 'diff_opts'
-                              contains `linematch`. Defaults to `true`.
-
-toggle_deleted({value})                            *gitsigns.toggle_deleted()*
-                Toggle |gitsigns-config-show_deleted|
-
-                Parameters: ~
-                    {value} (boolean|nil): Value to set toggle. If `nil`
-                            the toggle value is inverted.
-
-                Returns: ~
-                    (boolean): Current value of |gitsigns-config-show_deleted|
-
-toggle_current_line_blame({value})      *gitsigns.toggle_current_line_blame()*
-                Toggle |gitsigns-config-current_line_blame|
-
-                Parameters: ~
-                    {value} (boolean|nil): Value to set toggle. If `nil`
-                            the toggle value is inverted.
-
-                Returns: ~
-                    (boolean): Current value of |gitsigns-config-current_line_blame|
-
-toggle_word_diff({value})                        *gitsigns.toggle_word_diff()*
-                Toggle |gitsigns-config-word_diff|
-
-                Parameters: ~
-                    {value} (boolean|nil): Value to set toggle. If `nil`
-                            the toggle value is inverted.
-
-                Returns: ~
-                    (boolean): Current value of |gitsigns-config-word_diff|
-
-toggle_linehl({value})                              *gitsigns.toggle_linehl()*
-                Toggle |gitsigns-config-linehl|
-
-                Parameters: ~
-                    {value} (boolean|nil): Value to set toggle. If `nil`
-                            the toggle value is inverted.
-
-                Returns: ~
-                    (boolean): Current value of |gitsigns-config-linehl|
-
-toggle_numhl({value})                                *gitsigns.toggle_numhl()*
-                Toggle |gitsigns-config-numhl|
-
-                Parameters: ~
-                    {value} (boolean|nil): Value to set toggle. If `nil`
-                                the toggle value is inverted.
-
-
-                Returns: ~
-                    (boolean): Current value of |gitsigns-config-numhl|
-
-toggle_signs({value})                                *gitsigns.toggle_signs()*
-                Toggle |gitsigns-config-signbooleancolumn|
-
-                Parameters: ~
-                    {value} (boolean|nil): Value to set toggle. If `nil`
-                            the toggle value is inverted.
-
-                Returns: ~
-                    (boolean): Current value of |gitsigns-config-signcolumn|
-
-
-==============================================================================
-CONFIGURATION                                                *gitsigns-config*
-
-This section describes the configuration fields which can be passed to
-|gitsigns.setup()|. Note fields of type `table` may be marked with extended
-meaning the field is merged with the default, with the user value given higher
-precedence. This allows only specific sub-fields to be configured without
-having to redefine the whole field.
-
-signs                                                  *gitsigns-config-signs*
-      Type: `table[extended]`
-      Default: >
-        {
-          add          = { text = '┃' },
-          change       = { text = '┃' },
-          delete       = { text = '▁' },
-          topdelete    = { text = '▔' },
-          changedelete = { text = '~' },
-          untracked    = { text = '┆' },
-        }
-<
-      Configuration for signs:
-        • `text` specifies the character to use for the sign.
-        • `show_count` to enable showing count of hunk, e.g. number of deleted
-          lines.
-
-      The highlights `GitSigns[kind][type]` is used for each kind of sign. E.g.
-      'add' signs uses the highlights:
-        • `GitSignsAdd`   (for normal text signs)
-        • `GitSignsAddNr` (for signs when `config.numhl == true`)
-        • `GitSignsAddLn `(for signs when `config.linehl == true`)
-
-      See |gitsigns-highlight-groups|.
-
-worktrees                                          *gitsigns-config-worktrees*
-      Type: `table`, Default: `nil`
-
-      Detached working trees.
-
-      Array of tables with the keys `gitdir` and `toplevel`.
-
-      If normal attaching fails, then each entry in the table is attempted
-      with the work tree details set.
-
-      Example: >lua
-        worktrees = {
-          {
-            toplevel = vim.env.HOME,
-            gitdir = vim.env.HOME .. '/projects/dotfiles/.git'
-          }
-        }
-
-on_attach                                          *gitsigns-config-on_attach*
-      Type: `function`, Default: `nil`
-
-      Callback called when attaching to a buffer. Mainly used to setup keymaps.
-      The buffer number is passed as the first argument.
-
-      This callback can return `false` to prevent attaching to the buffer.
-
-      Example: >lua
-        on_attach = function(bufnr)
-          if vim.api.nvim_buf_get_name(bufnr):match(<PATTERN>) then
-            -- Don't attach to specific buffers whose name matches a pattern
-            return false
-          end
-
-          -- Setup keymaps
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', 'hs', '<cmd>lua require"gitsigns".stage_hunk()<CR>', {})
-          ... -- More keymaps
-        end
-<
-
-watch_gitdir                                    *gitsigns-config-watch_gitdir*
-      Type: `table[extended]`
-      Default: >
-        `{
-          enable = true,
-          follow_files = true
-        }`
-<
-      When opening a file, a libuv watcher is placed on the respective
-      `.git` directory to detect when changes happen to use as a trigger to
-      update signs.
-
-      Fields: ~
-        • `enable`:
-            Whether the watcher is enabled.
-
-        • `follow_files`:
-            If a file is moved with `git mv`, switch the buffer to the new location.
-
-sign_priority                                  *gitsigns-config-sign_priority*
-      Type: `number`, Default: `6`
-
-      Priority to use for signs.
-
-signcolumn                                        *gitsigns-config-signcolumn*
-      Type: `boolean`, Default: `true`
-
-      Enable/disable symbols in the sign column.
-
-      When enabled the highlights defined in `signs.*.hl` and symbols defined
-      in `signs.*.text` are used.
-
-numhl                                                  *gitsigns-config-numhl*
-      Type: `boolean`, Default: `false`
-
-      Enable/disable line number highlights.
-
-      When enabled the highlights defined in `signs.*.numhl` are used. If
-      the highlight group does not exist, then it is automatically defined
-      and linked to the corresponding highlight group in `signs.*.hl`.
-
-linehl                                                *gitsigns-config-linehl*
-      Type: `boolean`, Default: `false`
-
-      Enable/disable line highlights.
-
-      When enabled the highlights defined in `signs.*.linehl` are used. If
-      the highlight group does not exist, then it is automatically defined
-      and linked to the corresponding highlight group in `signs.*.hl`.
-
-show_deleted                                    *gitsigns-config-show_deleted*
-      Type: `boolean`, Default: `false`
-
-      Show the old version of hunks inline in the buffer (via virtual lines).
-
-      Note: Virtual lines currently use the highlight `GitSignsDeleteVirtLn`.
-
-diff_opts                                          *gitsigns-config-diff_opts*
-      Type: `table[extended]`, Default: derived from 'diffopt'
-
-      Diff options. If the default value is used, then changes to 'diffopt' are
-      automatically applied.
-
-      Fields: ~
-        • algorithm: string
-            Diff algorithm to use. Values:
-            • "myers"      the default algorithm
-            • "minimal"    spend extra time to generate the
-                           smallest possible diff
-            • "patience"   patience diff algorithm
-            • "histogram"  histogram diff algorithm
-        • internal: boolean
-            Use Neovim's built in xdiff library for running diffs.
-        • indent_heuristic: boolean
-            Use the indent heuristic for the internal
-            diff library.
-        • vertical: boolean
-            Start diff mode with vertical splits.
-        • linematch: integer
-            Enable second-stage diff on hunks to align lines.
-            Requires `internal=true`.
-       • ignore_blank_lines: boolean
-            Ignore changes where lines are blank.
-       • ignore_whitespace_change: boolean
-            Ignore changes in amount of white space.
-            It should ignore adding trailing white space,
-            but not leading white space.
-       • ignore_whitespace: boolean
-           Ignore all white space changes.
-       • ignore_whitespace_change_at_eol: boolean
-            Ignore white space changes at end of line.
-
-base                                                    *gitsigns-config-base*
-      Type: `string`, Default: index
-
-      The object/revision to diff against.
-      See |gitsigns-revision|.
-
-count_chars                                      *gitsigns-config-count_chars*
-      Type: `table`
-      Default: >
-        `{ "1", "2", "3", "4", "5", "6", "7", "8", "9",
-          ["+"] = ">"
-        }`
-<
-      The count characters used when `signs.*.show_count` is enabled. The
-      `+` entry is used as a fallback. With the default, any count outside
-      of 1-9 uses the `>` character in the sign.
-
-      Possible use cases for this field:
-        • to specify unicode characters for the counts instead of 1-9.
-        • to define characters to be used for counts greater than 9.
-
-status_formatter                            *gitsigns-config-status_formatter*
-      Type: `function`
-      Default: >
-        function(status)
-          local added, changed, removed = status.added, status.changed, status.removed
-          local status_txt = {}
-          if added   and added   > 0 then table.insert(status_txt, '+'..added  ) end
-          if changed and changed > 0 then table.insert(status_txt, '~'..changed) end
-          if removed and removed > 0 then table.insert(status_txt, '-'..removed) end
-          return table.concat(status_txt, ' ')
-        end
-<
-      Function used to format `b:gitsigns_status`.
-
-max_file_length                              *gitsigns-config-max_file_length*
-      Type: `number`, Default: `40000`
-
-      Max file length (in lines) to attach to.
-
-preview_config                                *gitsigns-config-preview_config*
-      Type: `table[extended]`
-      Default: >
-        `{
-          border = "single",
-          col = 1,
-          relative = "cursor",
-          row = 0,
-          style = "minimal"
-        }`
-<
-      Option overrides for the Gitsigns preview window. Table is passed directly
-      to `nvim_open_win`.
-
-auto_attach                                      *gitsigns-config-auto_attach*
-      Type: `boolean`, Default: `true`
-
-      Automatically attach to files.
-
-attach_to_untracked                      *gitsigns-config-attach_to_untracked*
-      Type: `boolean`, Default: `false`
-
-      Attach to untracked files.
-
-update_debounce                              *gitsigns-config-update_debounce*
-      Type: `number`, Default: `100`
-
-      Debounce time for updates (in milliseconds).
-
-current_line_blame                        *gitsigns-config-current_line_blame*
-      Type: `boolean`, Default: `false`
-
-      Adds an unobtrusive and customisable blame annotation at the end of
-      the current line.
-
-      The highlight group used for the text is `GitSignsCurrentLineBlame`.
-
-current_line_blame_opts              *gitsigns-config-current_line_blame_opts*
-      Type: `table[extended]`
-      Default: >
-        `{
-          delay = 1000,
-          virt_text = true,
-          virt_text_pos = "eol",
-          virt_text_priority = 100
-        }`
-<
-      Options for the current line blame annotation.
-
-      Fields: ~
-        • virt_text: boolean
-          Whether to show a virtual text blame annotation.
-        • virt_text_pos: string
-          Blame annotation position. Available values:
-            `eol`         Right after eol character.
-            `overlay`     Display over the specified column, without
-                          shifting the underlying text.
-            `right_align` Display right aligned in the window.
-        • delay: integer
-          Sets the delay (in milliseconds) before blame virtual text is
-          displayed.
-        • ignore_whitespace: boolean
-          Ignore whitespace when running blame.
-        • virt_text_priority: integer
-          Priority of virtual text.
-        • extra_opts: string[]
-          Extra options passed to `git-blame`.
-
-current_line_blame_formatter_opts
-                           *gitsigns-config-current_line_blame_formatter_opts*
-   DEPRECATED
-
-      Type: `table[extended]`
-      Default: >
-        `{
-          relative_time = false
-        }`
-<
-      Options for the current line blame annotation formatter.
-
-      Fields: ~
-        • relative_time: boolean
-
-current_line_blame_formatter    *gitsigns-config-current_line_blame_formatter*
-      Type: `string|function`, Default: `" <author>, <author_time> - <summary> "`
-
-      String or function used to format the virtual text of
-      |gitsigns-config-current_line_blame|.
-
-      When a string, accepts the following format specifiers:
-
-          • `<abbrev_sha>`
-          • `<orig_lnum>`
-          • `<final_lnum>`
-          • `<author>`
-          • `<author_mail>`
-          • `<author_time>` or `<author_time:FORMAT>`
-          • `<author_tz>`
-          • `<committer>`
-          • `<committer_mail>`
-          • `<committer_time>` or `<committer_time:FORMAT>`
-          • `<committer_tz>`
-          • `<summary>`
-          • `<previous>`
-          • `<filename>`
-
-        For `<author_time:FORMAT>` and `<committer_time:FORMAT>`, `FORMAT` can
-        be any valid date format that is accepted by `os.date()` with the
-        addition of `%R` (defaults to `%Y-%m-%d`):
-
-          • `%a`  abbreviated weekday name (e.g., Wed)
-          • `%A`  full weekday name (e.g., Wednesday)
-          • `%b`  abbreviated month name (e.g., Sep)
-          • `%B`  full month name (e.g., September)
-          • `%c`  date and time (e.g., 09/16/98 23:48:10)
-          • `%d`  day of the month (16) [01-31]
-          • `%H`  hour, using a 24-hour clock (23) [00-23]
-          • `%I`  hour, using a 12-hour clock (11) [01-12]
-          • `%M`  minute (48) [00-59]
-          • `%m`  month (09) [01-12]
-          • `%p`  either "am" or "pm" (pm)
-          • `%S`  second (10) [00-61]
-          • `%w`  weekday (3) [0-6 = Sunday-Saturday]
-          • `%x`  date (e.g., 09/16/98)
-          • `%X`  time (e.g., 23:48:10)
-          • `%Y`  full year (1998)
-          • `%y`  two-digit year (98) [00-99]
-          • `%%`  the character `%´
-          • `%R`  relative (e.g., 4 months ago)
-
-      When a function:
-        Parameters: ~
-          {name}       Git user name returned from `git config user.name` .
-          {blame_info} Table with the following keys:
-                         • `abbrev_sha`: string
-                         • `orig_lnum`: integer
-                         • `final_lnum`: integer
-                         • `author`: string
-                         • `author_mail`: string
-                         • `author_time`: integer
-                         • `author_tz`: string
-                         • `committer`: string
-                         • `committer_mail`: string
-                         • `committer_time`: integer
-                         • `committer_tz`: string
-                         • `summary`: string
-                         • `previous`: string
-                         • `filename`: string
-                         • `boundary`: true?
-
-                       Note that the keys map onto the output of:
-                         `git blame --line-porcelain`
-
-          {opts}       Passed directly from
-                       |gitsigns-config-current_line_blame_formatter_opts|.
-
-        Return: ~
-          The result of this function is passed directly to the `opts.virt_text`
-          field of |nvim_buf_set_extmark| and thus must be a list of
-          [text, highlight] tuples.
-
-current_line_blame_formatter_nc
-                             *gitsigns-config-current_line_blame_formatter_nc*
-      Type: `string|function`, Default: `" <author>"`
-
-      String or function used to format the virtual text of
-      |gitsigns-config-current_line_blame| for lines that aren't committed.
-
-      See |gitsigns-config-current_line_blame_formatter| for more information.
-
-trouble                                              *gitsigns-config-trouble*
-      Type: `boolean`, Default: true if installed
-
-      When using setqflist() or setloclist(), open Trouble instead of the
-      quickfix/location list window.
-
-yadm                                                    *gitsigns-config-yadm*
-   DEPRECATED
-      Please use |gitsigns-config-on_attach_pre| instead
-
-      Type: `table`
-      Default: >
-        `{
-          enable = false
-        }`
-<
-      yadm configuration.
-
-word_diff                                          *gitsigns-config-word_diff*
-      Type: `boolean`, Default: `false`
-
-      Highlight intra-line word differences in the buffer.
-      Requires `config.diff_opts.internal = true` .
-
-      Uses the highlights:
-        • For word diff in previews:
-          • `GitSignsAddInline`
-          • `GitSignsChangeInline`
-          • `GitSignsDeleteInline`
-        • For word diff in buffer:
-          • `GitSignsAddLnInline`
-          • `GitSignsChangeLnInline`
-          • `GitSignsDeleteLnInline`
-        • For word diff in virtual lines (e.g. show_deleted):
-          • `GitSignsAddVirtLnInline`
-          • `GitSignsChangeVirtLnInline`
-          • `GitSignsDeleteVirtLnInline`
-
-debug_mode                                        *gitsigns-config-debug_mode*
-      Type: `boolean`, Default: `false`
-
-      Enables debug logging and makes the following functions
-      available: `dump_cache`, `debug_messages`, `clear_debug`.
-
-
-==============================================================================
-HIGHLIGHT GROUPS                                   *gitsigns-highlight-groups*
-
-These are the highlights groups used by Gitsigns.
-
-Note if a highlight is not defined, it will be automatically derived by
-searching for other defined highlights in order.
-
-                                                        *hl-GitSignsAdd*
-GitSignsAdd
-        Used for the text of 'add' signs.
-
-        Fallbacks: `GitGutterAdd`, `SignifySignAdd`, `DiffAddedGutter`, `Added`, `DiffAdd`
-                                                        *hl-GitSignsChange*
-GitSignsChange
-        Used for the text of 'change' signs.
-
-        Fallbacks: `GitGutterChange`, `SignifySignChange`, `DiffModifiedGutter`, `Changed`, `DiffChange`
-                                                        *hl-GitSignsDelete*
-GitSignsDelete
-        Used for the text of 'delete' signs.
-
-        Fallbacks: `GitGutterDelete`, `SignifySignDelete`, `DiffRemovedGutter`, `Removed`, `DiffDelete`
-                                                        *hl-GitSignsChangedelete*
-GitSignsChangedelete
-        Used for the text of 'changedelete' signs.
-
-        Fallbacks: `GitSignsChange`
-                                                        *hl-GitSignsTopdelete*
-GitSignsTopdelete
-        Used for the text of 'topdelete' signs.
-
-        Fallbacks: `GitSignsDelete`
-                                                        *hl-GitSignsUntracked*
-GitSignsUntracked
-        Used for the text of 'untracked' signs.
-
-        Fallbacks: `GitSignsAdd`
-                                                        *hl-GitSignsAddNr*
-GitSignsAddNr
-        Used for number column (when `config.numhl == true`) of 'add' signs.
-
-        Fallbacks: `GitGutterAddLineNr`, `GitSignsAdd`
-                                                        *hl-GitSignsChangeNr*
-GitSignsChangeNr
-        Used for number column (when `config.numhl == true`) of 'change' signs.
-
-        Fallbacks: `GitGutterChangeLineNr`, `GitSignsChange`
-                                                        *hl-GitSignsDeleteNr*
-GitSignsDeleteNr
-        Used for number column (when `config.numhl == true`) of 'delete' signs.
-
-        Fallbacks: `GitGutterDeleteLineNr`, `GitSignsDelete`
-                                                        *hl-GitSignsChangedeleteNr*
-GitSignsChangedeleteNr
-        Used for number column (when `config.numhl == true`) of 'changedelete' signs.
-
-        Fallbacks: `GitSignsChangeNr`
-                                                        *hl-GitSignsTopdeleteNr*
-GitSignsTopdeleteNr
-        Used for number column (when `config.numhl == true`) of 'topdelete' signs.
-
-        Fallbacks: `GitSignsDeleteNr`
-                                                        *hl-GitSignsUntrackedNr*
-GitSignsUntrackedNr
-        Used for number column (when `config.numhl == true`) of 'untracked' signs.
-
-        Fallbacks: `GitSignsAddNr`
-                                                        *hl-GitSignsAddLn*
-GitSignsAddLn
-        Used for buffer line (when `config.linehl == true`) of 'add' signs.
-
-        Fallbacks: `GitGutterAddLine`, `SignifyLineAdd`, `DiffAdd`
-                                                        *hl-GitSignsChangeLn*
-GitSignsChangeLn
-        Used for buffer line (when `config.linehl == true`) of 'change' signs.
-
-        Fallbacks: `GitGutterChangeLine`, `SignifyLineChange`, `DiffChange`
-                                                        *hl-GitSignsChangedeleteLn*
-GitSignsChangedeleteLn
-        Used for buffer line (when `config.linehl == true`) of 'changedelete' signs.
-
-        Fallbacks: `GitSignsChangeLn`
-                                                        *hl-GitSignsUntrackedLn*
-GitSignsUntrackedLn
-        Used for buffer line (when `config.linehl == true`) of 'untracked' signs.
-
-        Fallbacks: `GitSignsAddLn`
-                                                        *hl-GitSignsAddPreview*
-GitSignsAddPreview
-        Used for added lines in previews.
-
-        Fallbacks: `GitGutterAddLine`, `SignifyLineAdd`, `DiffAdd`
-                                                        *hl-GitSignsDeletePreview*
-GitSignsDeletePreview
-        Used for deleted lines in previews.
-
-        Fallbacks: `GitGutterDeleteLine`, `SignifyLineDelete`, `DiffDelete`
-                                                        *hl-GitSignsCurrentLineBlame*
-GitSignsCurrentLineBlame
-        Used for current line blame.
-
-        Fallbacks: `NonText`
-                                                        *hl-GitSignsAddInline*
-GitSignsAddInline
-        Used for added word diff regions in inline previews.
-
-        Fallbacks: `TermCursor`
-                                                        *hl-GitSignsDeleteInline*
-GitSignsDeleteInline
-        Used for deleted word diff regions in inline previews.
-
-        Fallbacks: `TermCursor`
-                                                        *hl-GitSignsChangeInline*
-GitSignsChangeInline
-        Used for changed word diff regions in inline previews.
-
-        Fallbacks: `TermCursor`
-                                                        *hl-GitSignsAddLnInline*
-GitSignsAddLnInline
-        Used for added word diff regions when `config.word_diff == true`.
-
-        Fallbacks: `GitSignsAddInline`
-                                                        *hl-GitSignsChangeLnInline*
-GitSignsChangeLnInline
-        Used for changed word diff regions when `config.word_diff == true`.
-
-        Fallbacks: `GitSignsChangeInline`
-                                                        *hl-GitSignsDeleteLnInline*
-GitSignsDeleteLnInline
-        Used for deleted word diff regions when `config.word_diff == true`.
-
-        Fallbacks: `GitSignsDeleteInline`
-                                                        *hl-GitSignsDeleteVirtLn*
-GitSignsDeleteVirtLn
-        Used for deleted lines shown by inline `preview_hunk_inline()` or `show_deleted()`.
-
-        Fallbacks: `GitGutterDeleteLine`, `SignifyLineDelete`, `DiffDelete`
-                                                        *hl-GitSignsDeleteVirtLnInLine*
-GitSignsDeleteVirtLnInLine
-        Used for word diff regions in lines shown by inline `preview_hunk_inline()` or `show_deleted()`.
-
-        Fallbacks: `GitSignsDeleteLnInline`
-                                                        *hl-GitSignsVirtLnum*
-GitSignsVirtLnum
-        Used for line numbers in inline hunks previews.
-
-        Fallbacks: `GitSignsDeleteVirtLn`
-
-==============================================================================
-COMMAND                                                      *gitsigns-command*
-
-                                                                    *:Gitsigns*
-:Gitsigns {subcmd} {args}  Run a Gitsigns command. {subcmd} can be any
-                           function documented in |gitsigns-functions|.
-                           Each argument in {args} will be attempted to be
-                           parsed as a Lua value using `loadstring`, however
-                           if this fails the argument will remain as the
-                           string given by |<f-args>|.
-
-                           Note this command is equivalent to: >vim
-                             :lua require('gitsigns').{subcmd}({args})
-<
-                           Examples: >vim
-                             :Gitsigns diffthis HEAD~1
-                             :Gitsigns blame_line
-                             :Gitsigns toggle_signs
-                             :Gitsigns toggle_current_line_blame
-                             :Gitsigns change_base ~
-                             :Gitsigns reset_buffer
-                             :Gitsigns change_base nil true
-<
-
-==============================================================================
-SPECIFYING OBJECTS                          *gitsigns-object* *gitsigns-revision*
-
-Gitsigns objects are Git revisions as defined in the "SPECIFYING REVISIONS"
-section in the gitrevisions(7) man page. For commands that accept an optional
-base, the default is the file in the index. Examples:
-
-Additionally, Gitsigns also accepts the value `FILE` to specify the working
-version of a file.
-
-Object        Meaning ~
-@             Version of file in the commit referenced by @ aka HEAD
-main          Version of file in the commit referenced by main
-main^         Version of file in the parent of the commit referenced by main
-main~         "
-main~1        "
-main...other  Version of file in the merge base of main and other
-@^            Version of file in the parent of HEAD
-@~2           Version of file in the grandparent of HEAD
-92eb3dd       Version of file in the commit 92eb3dd
-:1            The file's common ancestor during a conflict
-:2            The alternate file in the target branch during a conflict
-
-==============================================================================
-STATUSLINE                                               *gitsigns-statusline*
-
-                                    *b:gitsigns_status* *b:gitsigns_status_dict*
-The buffer variables `b:gitsigns_status` and `b:gitsigns_status_dict` are
-provided. `b:gitsigns_status` is formatted using `config.status_formatter`
-. `b:gitsigns_status_dict` is a dictionary with the keys:
-
-        • `added` - Number of added lines.
-        • `changed` - Number of changed lines.
-        • `removed` - Number of removed lines.
-        • `head` - Name of current HEAD (branch or short commit hash).
-        • `root` - Top level directory of the working tree.
-        • `gitdir` - .git directory.
-
-Example:
->vim
-    set statusline+=%{get(b:,'gitsigns_status','')}
-<
-                                            *b:gitsigns_head* *g:gitsigns_head*
-Use `g:gitsigns_head` and `b:gitsigns_head` to return the name of the current
-HEAD (usually branch name). If the current HEAD is detached then this will be
-a short commit hash. `g:gitsigns_head` returns the current HEAD for the
-current working directory, whereas `b:gitsigns_head` returns the current HEAD
-for each buffer.
-
-                            *b:gitsigns_blame_line* *b:gitsigns_blame_line_dict*
-Provided if |gitsigns-config-current_line_blame| is enabled.
-`b:gitsigns_blame_line` if formatted using
-`config.current_line_blame_formatter`. `b:gitsigns_blame_line_dict` is a
-dictionary containing of the blame object for the current line. For complete
-list of keys, see the {blame_info} argument from
-|gitsigns-config-current_line_blame_formatter|.
-
-==============================================================================
-TEXT OBJECTS                                             *gitsigns-textobject*
-
-Since text objects are defined via keymaps, these are exposed and configurable
-via the config, see |gitsigns-config-keymaps|. The lua implementation is
-exposed through |gitsigns.select_hunk()|.
-
-==============================================================================
-EVENTS                                                       *gitsigns-events*
-
-|User| |autocommands| provided to allow extending behaviors.
-
-Example: >lua
-    vim.api.nvim_create_autocmd('User', {
-      pattern = 'GitSignsUpdate',
-      callback = function(args)
-        print(os.time(), ' Gitsigns made an update on ', args.data.buffer)
-      end
-    })
-<
-                                                       *User_GitSignsUpdate*
-GitSignsUpdate     After Gitsigns updates its knowledge about hunks.
-                   Provides `bufnr` in the autocmd user data.
-
-                                                      *User_GitSignsChanged*
-GitSignsChanged    After any event in which Gitsigns can potentially change
-                   the repository. Provides `file` in the autocmd user data.
-
-------------------------------------------------------------------------------
-vim:tw=78:ts=8:ft=help:norl:
-
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/gitsigns.nvim-scm-1-unstable-2024-05-28-rocks/gitsigns.nvim/scm-1/gitsigns.nvim-scm-1.rockspec b/config/neovim/store/lazy-plugins/gitsigns.nvim/gitsigns.nvim-scm-1-unstable-2024-05-28-rocks/gitsigns.nvim/scm-1/gitsigns.nvim-scm-1.rockspec
deleted file mode 100644
index 773609e3..00000000
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/gitsigns.nvim-scm-1-unstable-2024-05-28-rocks/gitsigns.nvim/scm-1/gitsigns.nvim-scm-1.rockspec
+++ /dev/null
@@ -1,37 +0,0 @@
-local _MODREV, _SPECREV = 'scm', '-1'
-
-rockspec_format = "3.0"
-package = 'gitsigns.nvim'
-version = _MODREV .. _SPECREV
-
-description = {
-  summary = 'Git signs written in pure lua',
-  detailed = [[
-    Super fast git decorations implemented purely in Lua.
-  ]],
-  homepage = 'http://github.com/lewis6991/gitsigns.nvim',
-  license = 'MIT/X11',
-  labels = { 'neovim' }
-}
-
-dependencies = {
-  'lua == 5.1',
-}
-
-source = {
-  url = 'http://github.com/lewis6991/gitsigns.nvim/archive/v' .. _MODREV .. '.zip',
-  dir = 'gitsigns.nvim-' .. _MODREV,
-}
-
-if _MODREV == 'scm' then
-  source = {
-    url = 'git://github.com/lewis6991/gitsigns.nvim',
-  }
-end
-
-build = {
-  type = 'builtin',
-  copy_directories = {
-    'doc'
-  }
-}
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/gitsigns.nvim-scm-1-unstable-2024-05-28-rocks/gitsigns.nvim/scm-1/rock_manifest b/config/neovim/store/lazy-plugins/gitsigns.nvim/gitsigns.nvim-scm-1-unstable-2024-05-28-rocks/gitsigns.nvim/scm-1/rock_manifest
deleted file mode 100644
index 5fa19114..00000000
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/gitsigns.nvim-scm-1-unstable-2024-05-28-rocks/gitsigns.nvim/scm-1/rock_manifest
+++ /dev/null
@@ -1,49 +0,0 @@
-rock_manifest = {
-   doc = {
-      ["gitsigns.txt"] = "a329a90ab3b49a53ea44d986cbde6885"
-   },
-   ["gitsigns.nvim-scm-1.rockspec"] = "a9b165d604ce401cfeea760a9366418d",
-   lua = {
-      gitsigns = {
-         ["actions.lua"] = "e1d7610fc1d5fc73cb891b286df0535e",
-         ["async.lua"] = "15f310cd469f5bfa46bb1e49e5a1d61c",
-         ["attach.lua"] = "097403415eba4dc5da07fdb948647841",
-         ["cache.lua"] = "909e8cdc787ca5e6d3ed62782dd5453b",
-         cli = {
-            ["argparse.lua"] = "fb6c9ffda01b2090f3c252ecaf00f68a"
-         },
-         ["cli.lua"] = "f00c3494d6be1b07c352c51132150586",
-         ["config.lua"] = "fa4a0f95747586aab60c9b848a72d9cf",
-         ["current_line_blame.lua"] = "bf5426f4569e207646c39f9d47a083af",
-         ["debounce.lua"] = "e0c1145a3dc341f46b36b43d814c1202",
-         debug = {
-            ["log.lua"] = "897a3bf45d0996b9517fa8c0a2ba1dac"
-         },
-         ["debug.lua"] = "ef5c8e3c1c9da306ed7b2eb33e657236",
-         ["diff.lua"] = "0c462ae71c77899e81da151dcfdf77eb",
-         ["diff_ext.lua"] = "04005195067132403fc336422e05c7d3",
-         ["diff_int.lua"] = "df447e56f11906998e81d5b94499e013",
-         ["diffthis.lua"] = "eb4ff5d430d2c4081f1fa9651d2768f7",
-         git = {
-            ["version.lua"] = "068a582ed4565978eb1f6eb089a6fa6c"
-         },
-         ["git.lua"] = "89ec79605c259e73ce8c19deb5b63194",
-         ["highlight.lua"] = "1d197d8f0f6f69a6455ac220a6890d80",
-         ["hunks.lua"] = "48fc2d8a9c89815e3c0521b1bb0788e9",
-         ["manager.lua"] = "af94331f013ed04d175e3c2b2d21c42b",
-         ["message.lua"] = "523ee4df9da4a7fa9b5ab2100eb27ac4",
-         ["popup.lua"] = "cbc11678e30094bff8ed54f0357e26f9",
-         ["repeat.lua"] = "798544de97c774bc8e10eecfd6479585",
-         ["signs.lua"] = "4c6533b4a406b049e68f49aee59417f6",
-         ["status.lua"] = "a229a7213a3fbecfcf2d98aaf587fcab",
-         system = {
-            ["compat.lua"] = "05d2b6d08602fba46be9b540288091e7"
-         },
-         ["system.lua"] = "d73fac4f6e734cc8ce9f13d6be027503",
-         ["test.lua"] = "082f7c7a556bf27352a378d047b8e79b",
-         ["util.lua"] = "e4c4d677e3ad296adee833318a5c5845",
-         ["watcher.lua"] = "ffcf36424ae17548bdc629cc2de3fcaa"
-      },
-      ["gitsigns.lua"] = "48654d8ca2059edb2b3a0bdd09f871e1"
-   }
-}
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/gitsigns.nvim-scm-1-unstable-2024-05-28-rocks/manifest b/config/neovim/store/lazy-plugins/gitsigns.nvim/gitsigns.nvim-scm-1-unstable-2024-05-28-rocks/manifest
deleted file mode 100644
index a65ff179..00000000
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/gitsigns.nvim-scm-1-unstable-2024-05-28-rocks/manifest
+++ /dev/null
@@ -1,157 +0,0 @@
-commands = {}
-dependencies = {
-   ["gitsigns.nvim"] = {
-      ["scm-1"] = {
-         {
-            constraints = {
-               {
-                  op = "==",
-                  version = {
-                     5, 1, string = "5.1"
-                  }
-               }
-            },
-            name = "lua"
-         }
-      }
-   }
-}
-modules = {
-   gitsigns = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.actions"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.async"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.attach"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.cache"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.cli"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.cli.argparse"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.config"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.current_line_blame"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.debounce"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.debug"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.debug.log"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.diff"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.diff_ext"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.diff_int"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.diffthis"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.git"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.git.version"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.highlight"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.hunks"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.manager"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.message"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.popup"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.repeat"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.signs"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.status"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.system"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.system.compat"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.test"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.util"] = {
-      "gitsigns.nvim/scm-1"
-   },
-   ["gitsigns.watcher"] = {
-      "gitsigns.nvim/scm-1"
-   }
-}
-repository = {
-   ["gitsigns.nvim"] = {
-      ["scm-1"] = {
-         {
-            arch = "installed",
-            commands = {},
-            dependencies = {},
-            modules = {
-               gitsigns = "gitsigns.lua",
-               ["gitsigns.actions"] = "gitsigns/actions.lua",
-               ["gitsigns.async"] = "gitsigns/async.lua",
-               ["gitsigns.attach"] = "gitsigns/attach.lua",
-               ["gitsigns.cache"] = "gitsigns/cache.lua",
-               ["gitsigns.cli"] = "gitsigns/cli.lua",
-               ["gitsigns.cli.argparse"] = "gitsigns/cli/argparse.lua",
-               ["gitsigns.config"] = "gitsigns/config.lua",
-               ["gitsigns.current_line_blame"] = "gitsigns/current_line_blame.lua",
-               ["gitsigns.debounce"] = "gitsigns/debounce.lua",
-               ["gitsigns.debug"] = "gitsigns/debug.lua",
-               ["gitsigns.debug.log"] = "gitsigns/debug/log.lua",
-               ["gitsigns.diff"] = "gitsigns/diff.lua",
-               ["gitsigns.diff_ext"] = "gitsigns/diff_ext.lua",
-               ["gitsigns.diff_int"] = "gitsigns/diff_int.lua",
-               ["gitsigns.diffthis"] = "gitsigns/diffthis.lua",
-               ["gitsigns.git"] = "gitsigns/git.lua",
-               ["gitsigns.git.version"] = "gitsigns/git/version.lua",
-               ["gitsigns.highlight"] = "gitsigns/highlight.lua",
-               ["gitsigns.hunks"] = "gitsigns/hunks.lua",
-               ["gitsigns.manager"] = "gitsigns/manager.lua",
-               ["gitsigns.message"] = "gitsigns/message.lua",
-               ["gitsigns.popup"] = "gitsigns/popup.lua",
-               ["gitsigns.repeat"] = "gitsigns/repeat.lua",
-               ["gitsigns.signs"] = "gitsigns/signs.lua",
-               ["gitsigns.status"] = "gitsigns/status.lua",
-               ["gitsigns.system"] = "gitsigns/system.lua",
-               ["gitsigns.system.compat"] = "gitsigns/system/compat.lua",
-               ["gitsigns.test"] = "gitsigns/test.lua",
-               ["gitsigns.util"] = "gitsigns/util.lua",
-               ["gitsigns.watcher"] = "gitsigns/watcher.lua"
-            }
-         }
-      }
-   }
-}
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns.lua b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns.lua
index 3573b42d..78a78622 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns.lua
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns.lua
@@ -17,6 +17,10 @@ local cwd_watcher ---@type uv.uv_fs_event_t?
 local function get_gitdir_and_head()
   local cwd = assert(uv.cwd())
 
+  -- Run on the main loop to avoid:
+  --   https://github.com/LazyVim/LazyVim/discussions/3407#discussioncomment-9622211
+  async.scheduler()
+
   -- Look in the cache first
   for _, bcache in pairs(require('gitsigns.cache').cache) do
     local repo = bcache.git_obj.repo
@@ -65,6 +69,11 @@ local update_cwd_head = async.create(function()
 
   if cwd_watcher then
     cwd_watcher:stop()
+    -- TODO(lewis6991): (#1027) Running `fs_event:stop()` -> `fs_event:start()`
+    -- in the same loop event, on Windows, causes Nvim to hang on quit.
+    if vim.fn.has('win32') then
+      async.scheduler()
+    end
   else
     cwd_watcher = assert(uv.new_fs_event())
   end
@@ -129,8 +138,10 @@ local function setup_attach()
 
   local attach_autocmd_disabled = false
 
-  api.nvim_create_autocmd({ 'BufRead', 'BufNewFile', 'BufWritePost' }, {
+  -- Need to attach in 'BufFilePost' since we always detach in 'BufFilePre'
+  api.nvim_create_autocmd({ 'BufFilePost', 'BufRead', 'BufNewFile', 'BufWritePost' }, {
     group = 'gitsigns',
+    desc = 'Gitsigns: attach',
     callback = function(args)
       local bufnr = args.buf --[[@as integer]]
       if attach_autocmd_disabled then
@@ -142,11 +153,21 @@ local function setup_attach()
     end,
   })
 
+  -- If the buffer name is about to change, then detach
+  api.nvim_create_autocmd('BufFilePre', {
+    group = 'gitsigns',
+    desc = 'Gitsigns: detach when changing buffer names',
+    callback = function(args)
+      require('gitsigns.attach').detach(args.buf)
+    end,
+  })
+
   --- vimpgrep creates and deletes lots of buffers so attaching to each one will
-  --- waste lots of resource and even slow down vimgrep.
+  --- waste lots of resource and slow down vimgrep.
   api.nvim_create_autocmd({ 'QuickFixCmdPre', 'QuickFixCmdPost' }, {
     group = 'gitsigns',
     pattern = '*vimgrep*',
+    desc = 'Gitsigns: disable attach during vimgrep',
     callback = function(args)
       attach_autocmd_disabled = args.event == 'QuickFixCmdPre'
     end,
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/actions.lua b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/actions.lua
index d9d2561b..ad36a155 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/actions.lua
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/actions.lua
@@ -215,10 +215,10 @@ local function get_hunks(bufnr, bcache, greedy, staged)
   end
 
   if staged then
-    return bcache.hunks_staged
+    return vim.deepcopy(bcache.hunks_staged)
   end
 
-  return bcache.hunks
+  return vim.deepcopy(bcache.hunks)
 end
 
 --- @param bufnr integer
@@ -478,6 +478,7 @@ end)
 --- @field greedy boolean
 --- @field preview boolean
 --- @field count integer
+--- @field target 'unstaged'|'staged'|'all'
 
 --- @param x string
 --- @param word string
@@ -513,6 +514,10 @@ local function process_nav_opts(opts)
     opts.count = vim.v.count1
   end
 
+  if opts.target == nil then
+    opts.target = 'unstaged'
+  end
+
   return opts
 end
 
@@ -532,6 +537,30 @@ local function has_preview_inline(bufnr)
   return #api.nvim_buf_get_extmarks(bufnr, ns_inline, 0, -1, { limit = 1 }) > 0
 end
 
+--- @param bufnr integer
+--- @param target 'unstaged'|'staged'|'all'
+--- @param greedy boolean
+--- @return Gitsigns.Hunk.Hunk[]
+local function get_nav_hunks(bufnr, target, greedy)
+  local bcache = assert(cache[bufnr])
+  local hunks_main = get_hunks(bufnr, bcache, greedy, false) or {}
+
+  local hunks --- @type Gitsigns.Hunk.Hunk[]
+  if target == 'unstaged' then
+    hunks = hunks_main
+  else
+    local hunks_head = get_hunks(bufnr, bcache, greedy, true) or {}
+    hunks_head = Hunks.filter_common(hunks_head, hunks_main) or {}
+    if target == 'all' then
+      hunks = hunks_main
+      vim.list_extend(hunks, hunks_head)
+    elseif target == 'staged' then
+      hunks = hunks_head
+    end
+  end
+  return hunks
+end
+
 --- @async
 --- @param direction 'first'|'last'|'next'|'prev'
 --- @param opts? Gitsigns.NavOpts
@@ -543,9 +572,7 @@ local function nav_hunk(direction, opts)
     return
   end
 
-  local hunks = get_hunks(bufnr, bcache, opts.greedy, false) or {}
-  local hunks_head = get_hunks(bufnr, bcache, opts.greedy, true) or {}
-  vim.list_extend(hunks, Hunks.filter_common(hunks_head, hunks) or {})
+  local hunks = get_nav_hunks(bufnr, opts.target, opts.greedy)
 
   if not hunks or vim.tbl_isempty(hunks) then
     if opts.navigation_message then
@@ -629,6 +656,8 @@ end
 ---     • {greedy}: (boolean)
 ---       Only navigate between non-contiguous hunks. Only useful if
 ---       'diff_opts' contains `linematch`. Defaults to `true`.
+---     • {target}: (`'unstaged'|'staged'|'all'`)
+---       Which kinds of hunks to target. Defaults to `'unstaged'`.
 ---     • {count}: (integer)
 ---       Number of times to advance. Defaults to |v:count1|.
 M.nav_hunk = async.create(2, function(direction, opts)
@@ -1023,6 +1052,19 @@ C.blame_line = function(args, _)
   M.blame_line(args)
 end
 
+--- Run git-blame on the current file and open the results
+--- in a scroll-bound vertical split.
+---
+--- <CR> is mapped to open a menu with the actions:
+---   - [Show commit] in a vertical split.
+---   - [Reblame at commit]
+---
+--- Attributes: ~
+---     {async}
+M.blame = async.create(0, function()
+  return require('gitsigns.blame').blame()
+end)
+
 --- @param bcache Gitsigns.CacheEntry
 --- @param base string?
 local function update_buf_base(bcache, base)
@@ -1191,14 +1233,14 @@ CP.diffthis = complete_heads
 ---
 --- Attributes: ~
 ---     {async}
-M.show = function(revision)
+M.show = function(revision, callback)
   local bufnr = api.nvim_get_current_buf()
   if not cache[bufnr] then
     print('Error: Buffer is not attached.')
     return
   end
   local diffthis = require('gitsigns.diffthis')
-  diffthis.show(bufnr, revision)
+  diffthis.show(bufnr, revision, callback)
 end
 
 CP.show = complete_heads
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/attach.lua b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/attach.lua
index fc3c2e51..0c70fffe 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/attach.lua
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/attach.lua
@@ -138,15 +138,16 @@ end
 
 --- @param _bufnr integer
 --- @param file string
+--- @param revision string?
 --- @param encoding string
 --- @return Gitsigns.GitObj?
-local function try_worktrees(_bufnr, file, encoding)
+local function try_worktrees(_bufnr, file, revision, encoding)
   if not config.worktrees then
     return
   end
 
   for _, wt in ipairs(config.worktrees) do
-    local git_obj = git.Obj.new(file, encoding, wt.gitdir, wt.toplevel)
+    local git_obj = git.Obj.new(file, revision, encoding, wt.gitdir, wt.toplevel)
     if git_obj and git_obj.object_name then
       dprintf('Using worktree %s', vim.inspect(wt))
       return git_obj
@@ -211,13 +212,12 @@ local function get_buf_context(bufnr)
     file = file,
     gitdir = gitdir,
     toplevel = toplevel,
-    -- Commit buffers have there base set back one revision with '^'
     -- Stage buffers always compare against the common ancestor (':1')
     -- :0: index
     -- :1: common ancestor
     -- :2: target commit (HEAD)
     -- :3: commit which is being merged
-    base = commit and (commit:match('^:[1-3]') and ':1' or commit .. '^') or nil,
+    base = commit and (commit:match('^:[1-3]') and ':1' or commit) or nil,
   }
 end
 
@@ -273,7 +273,7 @@ local attach_throttled = throttle_by_id(function(cbuf, ctx, aucmd)
   local git_obj = git.Obj.new(file, revision, encoding, ctx.gitdir, ctx.toplevel)
 
   if not git_obj and not passed_ctx then
-    git_obj = try_worktrees(cbuf, file, encoding)
+    git_obj = try_worktrees(cbuf, file, revision, encoding)
     async.scheduler()
     if not api.nvim_buf_is_valid(cbuf) then
       return
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/cache.lua b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/cache.lua
index 66be662c..818f747c 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/cache.lua
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/cache.lua
@@ -67,15 +67,15 @@ end
 -- at a time.
 local BLAME_THRESHOLD_LEN = 1000000
 
---- @private
---- @param lnum integer
+--- @async
+--- @param lnum? integer
 --- @param opts Gitsigns.BlameOpts
 --- @return table<integer,Gitsigns.BlameInfo?>?
 function CacheEntry:run_blame(lnum, opts)
   local bufnr = self.bufnr
   local blame_cache --- @type table<integer,Gitsigns.BlameInfo?>?
   repeat
-    local buftext = util.buf_lines(bufnr)
+    local buftext = util.buf_lines(bufnr, true)
     local tick = vim.b[bufnr].changedtick
     local lnum0 = #buftext > BLAME_THRESHOLD_LEN and lnum or nil
     -- TODO(lewis6991): Cancel blame on changedtick
@@ -97,7 +97,7 @@ local function get_blame_nc(file, lnum)
   return {
     orig_lnum = 0,
     final_lnum = lnum,
-    commit = Git.not_commited(file),
+    commit = Git.not_committed(file),
     filename = file,
   }
 end
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/config.lua b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/config.lua
index 1897771e..813e0b5a 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/config.lua
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/config.lua
@@ -1,21 +1,10 @@
---- @class (exact) Gitsigns.SchemaElem.Deprecated
----
---- Used for renaming fields.
---- @field new_field? string
----
---- Documentation for deprecation. Will be added to the help file and used in
---- the notification if `hard = true`.
---- @field message? string
----
---- Emit a message via vim.notify
---- @field hard? boolean
-
 --- @class (exact) Gitsigns.SchemaElem
---- @field type string|string[]
+--- @field type string|string[]|fun(x:any): boolean
+--- @field type_help? string
 --- @field refresh? fun(cb: fun()) Function to refresh the config value
 --- @field deep_extend? boolean
 --- @field default any
---- @field deprecated? boolean|Gitsigns.SchemaElem.Deprecated
+--- @field deprecated? boolean
 --- @field default_help? string
 --- @field description string
 
@@ -45,10 +34,7 @@
 --- | 'changedelete'
 --- | 'untracked'
 
---- @class (exact) Gitsigns.CurrentLineBlameFmtOpts
---- @field relative_time boolean
-
---- @alias Gitsigns.CurrentLineBlameFmtFun fun(user: string, info: table<string,any>, opts: Gitsigns.CurrentLineBlameFmtOpts): {[1]:string,[2]:string}[]
+--- @alias Gitsigns.CurrentLineBlameFmtFun fun(user: string, info: table<string,any>): {[1]:string,[2]:string}[]
 
 --- @class (exact) Gitsigns.CurrentLineBlameOpts : Gitsigns.BlameOpts
 --- @field virt_text? boolean
@@ -69,8 +55,8 @@
 --- @field diff_opts Gitsigns.DiffOpts
 --- @field base? string
 --- @field signs table<Gitsigns.SignType,Gitsigns.SignConfig>
---- @field _signs_staged table<Gitsigns.SignType,Gitsigns.SignConfig>
---- @field _signs_staged_enable boolean
+--- @field signs_staged table<Gitsigns.SignType,Gitsigns.SignConfig>
+--- @field signs_staged_enable boolean
 --- @field count_chars table<string|integer,string>
 --- @field signcolumn boolean
 --- @field numhl boolean
@@ -84,14 +70,12 @@
 --- @field update_debounce integer
 --- @field status_formatter fun(_: table<string,any>): string
 --- @field current_line_blame boolean
---- @field current_line_blame_formatter_opts { relative_time: boolean }
 --- @field current_line_blame_formatter string|Gitsigns.CurrentLineBlameFmtFun
 --- @field current_line_blame_formatter_nc string|Gitsigns.CurrentLineBlameFmtFun
 --- @field current_line_blame_opts Gitsigns.CurrentLineBlameOpts
 --- @field preview_config table<string,any>
 --- @field auto_attach boolean
 --- @field attach_to_untracked boolean
---- @field yadm { enable: boolean }
 --- @field worktrees {toplevel: string, gitdir: string}[]
 --- @field word_diff boolean
 --- @field trouble boolean
@@ -108,9 +92,7 @@ local M = {
     DiffOpts = {},
     SignConfig = {},
     watch_gitdir = {},
-    current_line_blame_formatter_opts = {},
     current_line_blame_opts = {},
-    yadm = {},
     Worktree = {},
   },
 }
@@ -182,10 +164,50 @@ M.config = setmetatable({}, {
   end,
 })
 
+local function warn(s, ...)
+  vim.notify_once(s:format(...), vim.log.levels.WARN, { title = 'gitsigns' })
+end
+
+--- @param x Gitsigns.SignConfig
+--- @return boolean
+local function validate_signs(x)
+  if type(x) ~= 'table' then
+    return false
+  end
+
+  local warnings --- @type table<string,true>?
+
+  --- @diagnostic disable-next-line:no-unknown
+  for kind, s in pairs(M.schema.signs.default) do
+    --- @diagnostic disable-next-line:no-unknown
+    for ty, v in pairs(s) do
+      if x[kind] and x[kind][ty] and vim.endswith(ty, 'hl') then
+        warnings = warnings or {}
+        local w = string.format(
+          "'signs.%s.%s' is now deprecated, please define highlight '%s'",
+          kind,
+          ty,
+          v
+        )
+        warnings[w] = true
+      end
+    end
+  end
+
+  if warnings then
+    for w in vim.spairs(warnings) do
+      warn(w)
+    end
+  end
+
+  return true
+end
+
 --- @type table<string,Gitsigns.SchemaElem>
 M.schema = {
   signs = {
-    type = 'table',
+    type_help = 'table',
+    type = validate_signs,
     deep_extend = true,
     default = {
       add = { hl = 'GitSignsAdd', text = '┃', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' },
@@ -244,7 +266,7 @@ M.schema = {
     ]],
   },
 
-  _signs_staged = {
+  signs_staged = {
     type = 'table',
     deep_extend = true,
     default = {
@@ -293,9 +315,9 @@ M.schema = {
     ]],
   },
 
-  _signs_staged_enable = {
+  signs_staged_enable = {
     type = 'boolean',
-    default = false,
+    default = true,
     description = [[
     Show signs for staged hunks.
 
@@ -649,24 +671,9 @@ M.schema = {
     ]],
   },
 
-  current_line_blame_formatter_opts = {
-    type = 'table',
-    deep_extend = true,
-    deprecated = true,
-    default = {
-      relative_time = false,
-    },
-    description = [[
-      Options for the current line blame annotation formatter.
-
-      Fields: ~
-        • relative_time: boolean
-    ]],
-  },
-
   current_line_blame_formatter = {
     type = { 'string', 'function' },
-    default = ' <author>, <author_time> - <summary> ',
+    default = ' <author>, <author_time:%R> - <summary> ',
     description = [[
       String or function used to format the virtual text of
       |gitsigns-config-current_line_blame|.
@@ -735,9 +742,6 @@ M.schema = {
                        Note that the keys map onto the output of:
                          `git blame --line-porcelain`
 
-          {opts}       Passed directly from
-                       |gitsigns-config-current_line_blame_formatter_opts|.
-
         Return: ~
           The result of this function is passed directly to the `opts.virt_text`
           field of |nvim_buf_set_extmark| and thus must be a list of
@@ -769,17 +773,6 @@ M.schema = {
     ]],
   },
 
-  yadm = {
-    type = 'table',
-    deprecated = {
-      message = 'Please use |gitsigns-config-on_attach_pre| instead',
-    },
-    default = { enable = false },
-    description = [[
-      yadm configuration.
-    ]],
-  },
-
   _git_version = {
     type = 'string',
     default = 'auto',
@@ -861,22 +854,18 @@ M.schema = {
   },
 }
 
-local function warn(s, ...)
-  vim.notify(s:format(...), vim.log.levels.WARN, { title = 'gitsigns' })
-end
-
 --- @param config Gitsigns.Config
 local function validate_config(config)
-  --- @diagnostic disable-next-line:no-unknown
-  for k, v in pairs(config) do
+  for k, v in
+    pairs(config --[[@as table<string,any>]])
+  do
     local kschema = M.schema[k]
     if kschema == nil then
       warn("gitsigns: Ignoring invalid configuration field '%s'", k)
-    elseif kschema.type then
-      if type(kschema.type) == 'string' then
-        vim.validate({
-          [k] = { v, kschema.type },
-        })
+    else
+      local ty = kschema.type
+      if type(ty) == 'string' or type(ty) == 'function' then
+        vim.validate({ [k] = { v, ty } })
       end
     end
   end
@@ -888,28 +877,15 @@ local function handle_deprecated(cfg)
     local dep = v.deprecated
     if dep and cfg[k] ~= nil then
       if type(dep) == 'table' then
-        if dep.new_field then
-          local opts_key, field = dep.new_field:match('(.*)%.(.*)')
-          if opts_key and field then
-            -- Field moved to an options table
-            local opts = (cfg[opts_key] or {}) --[[@as table<any,any>]]
-            opts[field] = cfg[k]
-            cfg[opts_key] = opts
-          else
-            -- Field renamed
-            cfg[dep.new_field] = cfg[k]
-          end
-        end
-
         if dep.hard then
           if dep.message then
             warn(dep.message)
-          elseif dep.new_field then
-            warn('%s is now deprecated, please use %s', k, dep.new_field)
           else
             warn('%s is now deprecated; ignoring', k)
           end
         end
+      else
+        warn('%s is now deprecated; ignoring', k)
       end
     end
   end
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/current_line_blame.lua b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/current_line_blame.lua
index 383a28fb..fb2b1864 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/current_line_blame.lua
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/current_line_blame.lua
@@ -28,7 +28,7 @@ local function expand_blame_format(fmt, name, info)
   if info.author == name then
     info.author = 'You'
   end
-  return util.expand_format(fmt, info, config.current_line_blame_formatter_opts.relative_time)
+  return util.expand_format(fmt, info)
 end
 
 --- @param virt_text {[1]: string, [2]: string}[]
@@ -41,7 +41,6 @@ local function flatten_virt_text(virt_text)
   return table.concat(res)
 end
 
---- @param winid integer
 --- @return integer
 local function win_width()
   local winid = api.nvim_get_current_win()
@@ -61,7 +60,7 @@ end
 --- @param fmt string
 --- @return Gitsigns.CurrentLineBlameFmtFun
 local function default_formatter(fmt)
-  return function(username, blame_info, _opts)
+  return function(username, blame_info)
     return {
       {
         expand_blame_format(fmt, username, blame_info),
@@ -85,7 +84,7 @@ local function get_blame_virt_text(bufnr, blame_info)
     clb_formatter = default_formatter(clb_formatter)
   end
 
-  return clb_formatter(git_obj.repo.username, blame_info, config.current_line_blame_formatter_opts)
+  return clb_formatter(git_obj.repo.username, blame_info)
 end
 
 --- @param bufnr integer
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/debug.lua b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/debug.lua
index 949e0120..a3d9669a 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/debug.lua
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/debug.lua
@@ -43,20 +43,7 @@ function M.dump_cache()
   vim.api.nvim_echo({ { text } }, false, {})
 end
 
---- @param noecho boolean
---- @return string[]?
-function M.debug_messages(noecho)
-  if noecho then
-    return log.messages
-  else
-    for _, m in ipairs(log.messages) do
-      vim.api.nvim_echo({ { m } }, false, {})
-    end
-  end
-end
-
-function M.clear_debug()
-  log.messages = {}
-end
+M.debug_messages = log.show
+M.clear_debug = log.clear
 
 return M
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/debug/log.lua b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/debug/log.lua
index cce8e4ff..c507a998 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/debug/log.lua
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/debug/log.lua
@@ -1,7 +1,9 @@
+local start_time = vim.loop.hrtime()
+
 local M = {
   debug_mode = false,
   verbose = false,
-  messages = {}, --- @type string[]
+  messages = {} --- @type [number, string, string, string][]
 }
 
 --- @param name string
@@ -44,7 +46,6 @@ local function getvarvalue(name, lvl)
   end
 
   -- not found; get global
-  --- @diagnostic disable-next-line:deprecated
   return getfenv(func)[name]
 end
 
@@ -52,71 +53,72 @@ end
 --- @return {name:string, bufnr: integer}
 local function get_context(lvl)
   lvl = lvl + 1
-  local ret = {} --- @type {name:string, bufnr: integer}
-  ret.name = getvarvalue('__FUNC__', lvl)
-  if not ret.name then
+
+  local name = getvarvalue('__FUNC__', lvl)
+  if not name then
     local name0 = debug.getinfo(lvl, 'n').name or ''
-    ret.name = name0:gsub('(.*)%d+$', '%1')
+    name = name0:gsub('(.*)%d+$', '%1')
   end
-  ret.bufnr = getvarvalue('bufnr', lvl)
+
+  local bufnr = getvarvalue('bufnr', lvl)
     or getvarvalue('_bufnr', lvl)
     or getvarvalue('cbuf', lvl)
     or getvarvalue('buf', lvl)
 
-  return ret
+  return {name=name, bufnr=bufnr}
 end
 
 -- If called in a callback then make sure the callback defines a __FUNC__
 -- variable which can be used to identify the name of the function.
+--- @param kind string
 --- @param obj any
 --- @param lvl integer
-local function cprint(obj, lvl)
+local function cprint(kind, obj, lvl)
   lvl = lvl + 1
+  --- @type string
   local msg = type(obj) == 'string' and obj or vim.inspect(obj)
   local ctx = get_context(lvl)
-  local msg2 --- @type string
+  local time = (vim.loop.hrtime() - start_time) / 1e6
+  local ctx1 = ctx.name
   if ctx.bufnr then
-    msg2 = string.format('%s(%s): %s', ctx.name, ctx.bufnr, msg)
-  else
-    msg2 = string.format('%s: %s', ctx.name, msg)
+    ctx1 = string.format('%s(%s)', ctx1, ctx.bufnr)
   end
-  table.insert(M.messages, msg2)
+  table.insert(M.messages, {time, kind, ctx1, msg})
 end
 
 function M.dprint(obj)
   if not M.debug_mode then
     return
   end
-  cprint(obj, 2)
+  cprint('debug', obj, 2)
 end
 
 function M.dprintf(obj, ...)
   if not M.debug_mode then
     return
   end
-  cprint(obj:format(...), 2)
+  cprint('debug', obj:format(...), 2)
 end
 
 function M.vprint(obj)
   if not (M.debug_mode and M.verbose) then
     return
   end
-  cprint(obj, 2)
+  cprint('info', obj, 2)
 end
 
 function M.vprintf(obj, ...)
   if not (M.debug_mode and M.verbose) then
     return
   end
-  cprint(obj:format(...), 2)
+  cprint('info', obj:format(...), 2)
 end
 
 local function eprint(msg, level)
   local info = debug.getinfo(level + 2, 'Sl')
-  if info then
-    msg = string.format('(ERROR) %s(%d): %s', info.short_src, info.currentline, msg)
-  end
-  M.messages[#M.messages + 1] = debug.traceback(msg)
+  local ctx = info and string.format('%s<%d>', info.short_src, info.currentline) or '???'
+  local time = (vim.loop.hrtime() - start_time) / 1e6
+  table.insert(M.messages, { time, 'error', ctx, debug.traceback(msg) })
   if M.debug_mode then
     error(msg, 3)
   end
@@ -141,4 +143,49 @@ function M.assert(cond, msg)
   return not cond
 end
 
+local sev_to_hl = {
+  debug = 'Title',
+  info = 'MoreMsg',
+  warn = 'WarningMsg',
+  error = 'ErrorMsg',
+}
+
+function M.clear()
+  M.messages = {}
+end
+
+--- @param m [number, string, string, string]
+--- @return [string,string][]
+local function build_msg(m)
+  local time, kind, ctx, msg = m[1], m[2], m[3], m[4]
+  local hl = sev_to_hl[kind]
+  return {
+    { string.format('%.2f ', time), 'Comment' },
+    { kind:upper():sub(1,1), hl },
+    { string.format(' %s:', ctx), 'Tag'},
+    { ' ' },
+    { msg }
+  }
+end
+
+function M.show()
+  for _, m in ipairs(M.messages) do
+    vim.api.nvim_echo(build_msg(m), false, {})
+  end
+end
+
+--- @return string[]?
+function M.get()
+  local r = {} --- @type string[]
+  for _, m in ipairs(M.messages) do
+    local e = build_msg(m)
+    local e1 = {} --- @type string[]
+    for _, x in ipairs(e) do
+      e1[#e1+1] = x[1]
+    end
+    r[#r+1] = table.concat(e1)
+  end
+  return r
+end
+
 return M
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/diffthis.lua b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/diffthis.lua
index 55e70bc8..286124ea 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/diffthis.lua
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/diffthis.lua
@@ -7,6 +7,7 @@ local manager = require('gitsigns.manager')
 local message = require('gitsigns.message')
 local Status = require('gitsigns.status')
 
+local dprint = require('gitsigns.debug.log').dprint
 local throttle_by_id = require('gitsigns.debounce').throttle_by_id
 
 local M = {}
@@ -176,11 +177,14 @@ end)
 --- @param bufnr integer
 --- @param base string
 M.show = async.create(2, function(bufnr, base)
+  __FUNC__ = 'show'
   local bufname = create_show_buf(bufnr, base)
   if not bufname then
+    dprint('No bufname for revision ' .. base)
     return
   end
 
+  dprint('bufname ' .. bufname)
   vim.cmd.edit(bufname)
 end)
 
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/git.lua b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/git.lua
index 34687d18..fcb1582b 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/git.lua
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/git.lua
@@ -327,35 +327,6 @@ function Repo:update_abbrev_head()
   self.abbrev_head = M.get_repo_info(self.toplevel).abbrev_head
 end
 
---- @private
---- @param dir string
---- @param gitdir? string
---- @param toplevel? string
-function Repo:try_yadm(dir, gitdir, toplevel)
-  if not config.yadm.enable or self.gitdir then
-    return
-  end
-
-  local home = os.getenv('HOME')
-
-  if not home or not vim.startswith(dir, home) then
-    return
-  end
-
-  if #git_command({ 'ls-files', dir }, { command = 'yadm' }) == 0 then
-    return
-  end
-
-  M.get_repo_info(dir, 'yadm', gitdir, toplevel)
-  local yadm_info = M.get_repo_info(dir, 'yadm', gitdir, toplevel)
-  for k, v in
-    pairs(yadm_info --[[@as table<string,any>]])
-  do
-    ---@diagnostic disable-next-line:no-unknown
-    self[k] = v
-  end
-end
-
 --- @async
 --- @param dir string
 --- @param gitdir? string
@@ -373,8 +344,6 @@ function Repo.new(dir, gitdir, toplevel)
     self[k] = v
   end
 
-  self:try_yadm(dir, gitdir, toplevel)
-
   return self
 end
 
@@ -424,11 +393,15 @@ end
 --- @field object_name? string
 --- @field has_conflicts? true
 
+function Obj:from_tree()
+  return self.revision and not vim.startswith(self.revision, ':')
+end
+
 --- @param file? string
 --- @param silent? boolean
 --- @return Gitsigns.FileInfo
 function Obj:file_info(file, silent)
-  if self.revision and not vim.startswith(self.revision, ':') then
+  if self:from_tree() then
     return self:file_info_tree(file, silent)
   else
     return self:file_info_index(file, silent)
@@ -436,12 +409,16 @@ function Obj:file_info(file, silent)
 end
 
 --- @private
+--- Get information about files in the index and the working tree
 --- @param file? string
 --- @param silent? boolean
 --- @return Gitsigns.FileInfo
 function Obj:file_info_index(file, silent)
   local has_eol = check_version({ 2, 9 })
 
+  -- --others + --exclude-standard means ignored files won't return info, but
+  -- untracked files will. Unlike file_info_tree which won't return untracked
+  -- files.
   local cmd = {
     '-c',
     'core.quotepath=off',
@@ -499,6 +476,7 @@ function Obj:file_info_index(file, silent)
 end
 
 --- @private
+--- Get information about files in a certain revision
 --- @param file? string
 --- @param silent? boolean
 --- @return Gitsigns.FileInfo
@@ -615,7 +593,7 @@ local NOT_COMMITTED = {
 
 --- @param file string
 --- @return Gitsigns.CommitInfo
-function M.not_commited(file)
+function M.not_committed(file)
   local time = os.time()
   return {
     sha = string.rep('0', 40),
@@ -649,7 +627,7 @@ function Obj:run_blame(lines, lnum, opts)
     -- As we support attaching to untracked files we need to return something if
     -- the file isn't isn't tracked in git.
     -- If abbrev_head is empty, then assume the repo has no commits
-    local commit = M.not_commited(self.file)
+    local commit = M.not_committed(self.file)
     for i in ipairs(lines) do
       ret[i] = {
         orig_lnum = 0,
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/highlight.lua b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/highlight.lua
index e4bf8cd1..136b2d42 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/highlight.lua
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/highlight.lua
@@ -283,7 +283,8 @@ local function cmul(x, factor)
 end
 
 local function dprintf(fmt, ...)
-  require('gitsigns.debug.log').dprintf(fmt, ...)
+  dprintf = require('gitsigns.debug.log').dprintf
+  dprintf(fmt, ...)
 end
 
 --- @param hl string
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/hunks.lua b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/hunks.lua
index a9fc7d25..6133b068 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/hunks.lua
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/hunks.lua
@@ -432,7 +432,6 @@ function M.filter_common(a, b)
   end
 
   a, b = a or {}, b or {}
-  local max_iter = math.max(#a, #b)
 
   local a_i = 1
   local b_i = 1
@@ -440,7 +439,9 @@ function M.filter_common(a, b)
   --- @type Gitsigns.Hunk.Hunk[]
   local ret = {}
 
-  for _ = 1, max_iter do
+  -- Need an offset of 1 in order to process when we hit the end of either
+  -- a or b
+  for _ = 1, math.max(#a, #b) + 1 do
     local a_h, b_h = a[a_i], b[b_i]
 
     if not a_h then
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/manager.lua b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/manager.lua
index 924ab30b..fda8ff53 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/manager.lua
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/manager.lua
@@ -488,9 +488,10 @@ M.update = throttle_by_id(function(bufnr)
     return
   end
 
-  if config._signs_staged_enable and not file_mode and not git_obj.revision then
+  if config.signs_staged_enable and not file_mode then
     if not bcache.compare_text_head or config._refresh_staged_on_update then
-      bcache.compare_text_head = git_obj:get_show_text('HEAD')
+      local staged_rev = git_obj:from_tree() and git_obj.revision .. '^' or 'HEAD'
+      bcache.compare_text_head = git_obj:get_show_text(staged_rev)
       if not M.schedule(bufnr, true) then
         return
       end
@@ -581,8 +582,8 @@ function M.setup()
   })
 
   signs_normal = Signs.new(config.signs)
-  if config._signs_staged_enable then
-    signs_staged = Signs.new(config._signs_staged, 'staged')
+  if config.signs_staged_enable then
+    signs_staged = Signs.new(config.signs_staged, 'staged')
   end
 
   M.update_debounced = debounce_trailing(config.update_debounce, async.create(1, M.update))
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/signs.lua b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/signs.lua
index d0f69e8b..f8ff6067 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/signs.lua
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/signs.lua
@@ -126,7 +126,7 @@ function M.new(cfg, name)
 
   local self = setmetatable({}, { __index = M })
   self.config = cfg
-  self.hls = name == 'staged' and config._signs_staged or config.signs
+  self.hls = name == 'staged' and config.signs_staged or config.signs
   self.group = 'gitsigns_signs_' .. (name or '')
   self.ns = api.nvim_create_namespace(self.group)
   return self
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/util.lua b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/util.lua
index 613c6679..a0425899 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/util.lua
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/util.lua
@@ -71,8 +71,9 @@ local function add_bom(x, encoding)
 end
 
 --- @param bufnr integer
+--- @param noendofline? boolean
 --- @return string[]
-function M.buf_lines(bufnr)
+function M.buf_lines(bufnr, noendofline)
   -- nvim_buf_get_lines strips carriage returns if fileformat==dos
   local buftext = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)
 
@@ -84,7 +85,7 @@ function M.buf_lines(bufnr)
     end
   end
 
-  if vim.bo[bufnr].endofline then
+  if not noendofline and vim.bo[bufnr].endofline then
     -- Add CR to the last line
     if dos then
       buftext[#buftext] = buftext[#buftext] .. '\r'
@@ -116,6 +117,15 @@ function M.buf_rename(bufnr, name)
   delete_alt(bufnr)
 end
 
+--- @param events string[]
+--- @param f fun()
+function M.noautocmd(events, f)
+  local ei = vim.o.eventignore
+  vim.o.eventignore = table.concat(events, ',')
+  f()
+  vim.o.eventignore = ei
+end
+
 --- @param bufnr integer
 --- @param start_row integer
 --- @param end_row integer
@@ -254,9 +264,8 @@ end
 
 ---@param fmt string
 ---@param info table<string,any>
----@param reltime? boolean Use relative time as the default date format
 ---@return string
-function M.expand_format(fmt, info, reltime)
+function M.expand_format(fmt, info)
   local ret = {} --- @type string[]
 
   for _ = 1, 20 do -- loop protection
@@ -277,7 +286,7 @@ function M.expand_format(fmt, info, reltime)
       end
       if vim.endswith(key, '_time') then
         if time_fmt == '' then
-          time_fmt = reltime and '%R' or '%Y-%m-%d'
+          time_fmt = '%Y-%m-%d'
         end
         v = expand_date(time_fmt, v)
       end
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/watcher.lua b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/watcher.lua
index 65218aa9..b7a03e97 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/watcher.lua
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/lua/gitsigns/watcher.lua
@@ -8,6 +8,7 @@ local util = require('gitsigns.util')
 
 local cache = require('gitsigns.cache').cache
 local config = require('gitsigns.config').config
+local throttle_by_id = require('gitsigns.debounce').throttle_by_id
 local debounce_trailing = require('gitsigns.debounce').debounce_trailing
 local manager = require('gitsigns.manager')
 
@@ -52,15 +53,21 @@ local function handle_moved(bufnr, old_relpath)
   local old_name = api.nvim_buf_get_name(bufnr)
 
   if not bufexists then
-    util.buf_rename(bufnr, bcache.file)
+    -- Do not trigger BufFilePre/Post
+    -- TODO(lewis6991): figure out how to avoid reattaching without
+    -- disabling all autocommands.
+    util.noautocmd({ 'BufFilePre', 'BufFilePost' }, function()
+      util.buf_rename(bufnr, bcache.file)
+    end)
   end
 
   local msg = bufexists and 'Cannot rename' or 'Renamed'
   dprintf('%s buffer %d from %s to %s', msg, bufnr, old_name, bcache.file)
 end
 
+--- @async
 --- @param bufnr integer
-local watcher_handler = async.create(1, function(bufnr)
+local function watcher_handler0(bufnr)
   local __FUNC__ = 'watcher_handler'
 
   -- Avoid cache hit for detached buffer
@@ -99,9 +106,13 @@ local watcher_handler = async.create(1, function(bufnr)
   cache[bufnr]:invalidate(true)
 
   require('gitsigns.manager').update(bufnr)
-end)
+end
 
-local watcher_handler_debounced = debounce_trailing(200, watcher_handler, 1)
+--- Debounce and throttle the handler.
+--- We also throttle in case the debounce delay is not enough and to prevent
+--- too many handlers from being launched (and interleaved).
+local watcher_handler =
+  debounce_trailing(200, async.create(1, throttle_by_id(watcher_handler0, true)), 1)
 
 --- vim.inspect but on one line
 --- @param x any
@@ -142,7 +153,7 @@ function M.watch_gitdir(bufnr, gitdir)
 
     dprint(info)
 
-    watcher_handler_debounced(bufnr)
+    watcher_handler(bufnr)
   end)
   return w
 end
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/nix-support/propagated-build-inputs b/config/neovim/store/lazy-plugins/gitsigns.nvim/nix-support/propagated-build-inputs
index b3b8c91f..169a165b 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/nix-support/propagated-build-inputs
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/nix-support/propagated-build-inputs
@@ -1 +1 @@
-/nix/store/mqbhz05llkddfb5wni0m48kw22ixxps4-lua-5.1.5 
\ No newline at end of file
+/nix/store/3czmrawji85vf8979kll2yx2f1kjkric-lua-5.1.5 
\ No newline at end of file
diff --git a/config/neovim/store/lazy-plugins/gitsigns.nvim/rock_manifest b/config/neovim/store/lazy-plugins/gitsigns.nvim/rock_manifest
index 5fa19114..3b012784 100644
--- a/config/neovim/store/lazy-plugins/gitsigns.nvim/rock_manifest
+++ b/config/neovim/store/lazy-plugins/gitsigns.nvim/rock_manifest
@@ -1,49 +1,50 @@
 rock_manifest = {
    doc = {
-      ["gitsigns.txt"] = "a329a90ab3b49a53ea44d986cbde6885"
+      ["gitsigns.txt"] = "e537e0db7825ce01a1c568a124432989"
    },
    ["gitsigns.nvim-scm-1.rockspec"] = "a9b165d604ce401cfeea760a9366418d",
    lua = {
       gitsigns = {
-         ["actions.lua"] = "e1d7610fc1d5fc73cb891b286df0535e",
+         ["actions.lua"] = "accecf1db114ace88739c40835cb5a77",
          ["async.lua"] = "15f310cd469f5bfa46bb1e49e5a1d61c",
-         ["attach.lua"] = "097403415eba4dc5da07fdb948647841",
-         ["cache.lua"] = "909e8cdc787ca5e6d3ed62782dd5453b",
+         ["attach.lua"] = "6f81186d03fbde2ddc631c46fea09315",
+         ["blame.lua"] = "e8388c8b29982475bfccec28ea4f72be",
+         ["cache.lua"] = "a084b897b3af2f3603a018f4c00c20fa",
          cli = {
             ["argparse.lua"] = "fb6c9ffda01b2090f3c252ecaf00f68a"
          },
          ["cli.lua"] = "f00c3494d6be1b07c352c51132150586",
-         ["config.lua"] = "fa4a0f95747586aab60c9b848a72d9cf",
-         ["current_line_blame.lua"] = "bf5426f4569e207646c39f9d47a083af",
+         ["config.lua"] = "ef58f99d7782297a32e3867634906738",
+         ["current_line_blame.lua"] = "b1e920875977e12bb4f9f6be08a92db8",
          ["debounce.lua"] = "e0c1145a3dc341f46b36b43d814c1202",
          debug = {
-            ["log.lua"] = "897a3bf45d0996b9517fa8c0a2ba1dac"
+            ["log.lua"] = "f7e994b68e9cbcf91adfeb5bc379d7b1"
          },
-         ["debug.lua"] = "ef5c8e3c1c9da306ed7b2eb33e657236",
+         ["debug.lua"] = "6a819b17a531b74ee11622145097afae",
          ["diff.lua"] = "0c462ae71c77899e81da151dcfdf77eb",
          ["diff_ext.lua"] = "04005195067132403fc336422e05c7d3",
          ["diff_int.lua"] = "df447e56f11906998e81d5b94499e013",
-         ["diffthis.lua"] = "eb4ff5d430d2c4081f1fa9651d2768f7",
+         ["diffthis.lua"] = "b91c6a177c0a80c5e611b8c09f6eb46e",
          git = {
             ["version.lua"] = "068a582ed4565978eb1f6eb089a6fa6c"
          },
-         ["git.lua"] = "89ec79605c259e73ce8c19deb5b63194",
-         ["highlight.lua"] = "1d197d8f0f6f69a6455ac220a6890d80",
-         ["hunks.lua"] = "48fc2d8a9c89815e3c0521b1bb0788e9",
-         ["manager.lua"] = "af94331f013ed04d175e3c2b2d21c42b",
+         ["git.lua"] = "8a216cac54214508e798c7f4b920dd36",
+         ["highlight.lua"] = "f1966ef758f9a0a86102a699ec7a1eca",
+         ["hunks.lua"] = "ee058ee8b056b055cd8404460ca6921f",
+         ["manager.lua"] = "527083250ad693ee4faa5e4dde47f275",
          ["message.lua"] = "523ee4df9da4a7fa9b5ab2100eb27ac4",
          ["popup.lua"] = "cbc11678e30094bff8ed54f0357e26f9",
          ["repeat.lua"] = "798544de97c774bc8e10eecfd6479585",
-         ["signs.lua"] = "4c6533b4a406b049e68f49aee59417f6",
+         ["signs.lua"] = "9224bcde01ebd0c320bcd678822fc799",
          ["status.lua"] = "a229a7213a3fbecfcf2d98aaf587fcab",
          system = {
             ["compat.lua"] = "05d2b6d08602fba46be9b540288091e7"
          },
          ["system.lua"] = "d73fac4f6e734cc8ce9f13d6be027503",
          ["test.lua"] = "082f7c7a556bf27352a378d047b8e79b",
-         ["util.lua"] = "e4c4d677e3ad296adee833318a5c5845",
-         ["watcher.lua"] = "ffcf36424ae17548bdc629cc2de3fcaa"
+         ["util.lua"] = "b24bac967bc60ba1434bf5cd7cf3fc98",
+         ["watcher.lua"] = "034303cfa063c77bb6628f1a55d559c4"
       },
-      ["gitsigns.lua"] = "48654d8ca2059edb2b3a0bdd09f871e1"
+      ["gitsigns.lua"] = "784d1b15d5970f0177fd19d163ea9dfb"
    }
 }
diff --git a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/doc/haskell-tools.txt b/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/doc/haskell-tools.txt
deleted file mode 100644
index d0334387..00000000
--- a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/doc/haskell-tools.txt
+++ /dev/null
@@ -1,519 +0,0 @@
-==============================================================================
-Table of Contents                                       *haskell-tools.contents*
-
-Introduction ··························································· |intro|
-The haskell-tools module ······································· |haskell-tools|
-plugin configuration ···································· |haskell-tools.config|
-haskell-language-server LSP client tools ··················· |haskell-tools.lsp|
-haskell-tools nvim-dap setup ······························· |haskell-tools.dap|
-haskell-tools Hoogle search ····························· |haskell-tools.hoogle|
-haskell-tools GHCi REPL module ···························· |haskell-tools.repl|
-haskell-tools Project module ··························· |haskell-tools.project|
-haskell-tools fast-tags module ···························· |haskell-tools.tags|
-haskell-tools Logging ······································ |haskell-tools.log|
-
-==============================================================================
-Introduction                                                             *intro*
-
-This plugin automatically configures the `haskell-language-server` builtin LSP client
-and integrates with other haskell tools.
-
-WARNING:
-Do not call the `lspconfig.hls` setup or set up the lsp manually,
-as doing so may cause conflicts.
-
-NOTE: This plugin is a filetype plugin.
-There is no need to call a `setup` function.
-
-==============================================================================
-The haskell-tools module                                         *haskell-tools*
-
-Entry-point into this plugin's public API.
-
-HaskellTools                                                      *HaskellTools*
-
-
-==============================================================================
-plugin configuration                                      *haskell-tools.config*
-
-To configure haskell-tools.nvim, set the variable `vim.g.haskell_tools`,
-which is a `HTOpts` table, in your neovim configuration.
-
-Example:
->
----@type HTOpts
-vim.g.haskell_tools = {
-   ---@type ToolsOpts
-   tools = {
-     -- ...
-   },
-   ---@type HaskellLspClientOpts
-   hls = {
-     on_attach = function(client, bufnr)
-       -- Set keybindings, etc. here.
-     end,
-     -- ...
-   },
-   ---@type HTDapOpts
-   dap = {
-     -- ...
-   },
- }
-<
-
-Note: `vim.g.haskell_tools` can also be a function that returns a 'HTOpts' table.
-
-
-HTOpts                                                                  *HTOpts*
-
-    Fields: ~
-        {tools?}  (ToolsOpts)             haskell-tools module options.
-        {hls?}    (HaskellLspClientOpts)  haskell-language-server client options.
-        {dap?}    (HTDapOpts)             debug adapter config for nvim-dap.
-
-
-ToolsOpts                                                            *ToolsOpts*
-
-    Fields: ~
-        {codeLens?}    (CodeLensOpts)    LSP codeLens options.
-        {hoogle?}      (HoogleOpts)      Hoogle type signature search options.
-        {hover?}       (HoverOpts)       LSP hover options.
-        {definition?}  (DefinitionOpts)  LSP go-to-definition options.
-        {repl?}        (ReplOpts)        GHCi repl options.
-        {tags?}        (FastTagsOpts)    fast-tags module options.
-        {log?}         (HTLogOpts)       haskell-tools logger options.
-
-
-CodeLensOpts                                                      *CodeLensOpts*
-
-    Fields: ~
-        {autoRefresh?}  (fun():boolean|boolean)  (default: `true`) Whether to auto-refresh code-lenses.
-
-
-HoogleOpts                                                          *HoogleOpts*
-
-    Fields: ~
-        {mode?}  (HoogleMode)  Use a telescope with a local hoogle installation or a web backend, or use the browser for hoogle signature search?
-
-
-HoogleMode                                                          *HoogleMode*
-
-    Type: ~
-        "auto"|"telescope-local"|"telescope-web"|"browser"
-
-
-HoverOpts                                                            *HoverOpts*
-
-    Fields: ~
-        {enable?}            (fun():boolean|boolean)  (default: `true`) Whether to enable haskell-tools hover.
-        {border?}            (string[][])             The hover window's border. Set to `nil` to disable.
-        {stylize_markdown?}  (boolean)                (default: `false`) The builtin LSP client's default behaviour is to stylize markdown. Setting this option to false sets the file type to markdown and enables treesitter syntax highligting for Haskell snippets if nvim-treesitter is installed.
-        {auto_focus?}        (boolean)                (default: `false`) Whether to automatically switch to the hover window.
-
-
-DefinitionOpts                                                  *DefinitionOpts*
-
-    Fields: ~
-        {hoogle_signature_fallback?}  (fun():boolean|boolean)  (default: `false`) Configure `vim.lsp.definition` to fall back to hoogle search (does not affect `vim.lsp.tagfunc`).
-
-
-ReplOpts                                                              *ReplOpts*
-
-    Fields: ~
-        {handler?}     (fun():ReplHandler|ReplHandler)    `'builtin'`: Use the simple builtin repl. `'toggleterm'`: Use akinsho/toggleterm.nvim.
-        {prefer?}      (fun():repl_backend|repl_backend)  Prefer cabal or stack when both stack and cabal project files are present?
-        {builtin?}     (BuiltinReplOpts)                  Configuration for the builtin repl.
-        {auto_focus?}  (boolean)                          Whether to auto-focus the repl on toggle or send. If unset, the handler decides.
-
-
-ReplHandler                                                        *ReplHandler*
-
-    Type: ~
-        "builtin"|"toggleterm"
-
-
-repl_backend                                                      *repl_backend*
-
-    Type: ~
-        "cabal"|"stack"
-
-
-BuiltinReplOpts                                                *BuiltinReplOpts*
-
-    Fields: ~
-        {create_repl_window?}  (fun(view:ReplView):fun(mk_repl_cmd:mk_repl_cmd_fun))
-
-
-ReplView                                                              *ReplView*
-
-    Fields: ~
-        {create_repl_split?}    (fun(opts:ReplViewOpts):mk_repl_cmd_fun)  Create the REPL in a horizontally split window.
-        {create_repl_vsplit?}   (fun(opts:ReplViewOpts):mk_repl_cmd_fun)  Create the REPL in a vertically split window.
-        {create_repl_tabnew?}   (fun(opts:ReplViewOpts):mk_repl_cmd_fun)  Create the REPL in a new tab.
-        {create_repl_cur_win?}  (fun(opts:ReplViewOpts):mk_repl_cmd_fun)  Create the REPL in the current window.
-
-
-ReplViewOpts                                                      *ReplViewOpts*
-
-    Fields: ~
-        {delete_buffer_on_exit?}  (boolean)              Whether to delete the buffer when the Repl quits.
-        {size?}                   (fun():number|number)  The size of the window or a function that determines it.
-
-
-mk_repl_cmd_fun                                                *mk_repl_cmd_fun*
-
-    Type: ~
-        fun():string[]|nil
-
-
-FastTagsOpts                                                      *FastTagsOpts*
-
-    Fields: ~
-        {enable?}  (boolean|fun():boolean)
-
-
-HTLogOpts                                                            *HTLogOpts*
-
-    Fields: ~
-        {level?}  (number|string)  The log level.
-
-    See: ~
-        |vim.log.levels|
-
-
-HaskellLspClientOpts                                      *HaskellLspClientOpts*
-
-    Fields: ~
-        {auto_attach?}       (fun():boolean|boolean)                            Whether to automatically attach the LSP client. Defaults to `true` if the haskell-language-server executable is found.
-        {debug?}             (boolean)                                          Whether to enable haskell-language-server debug logging.
-        {on_attach?}         (fun(client:number,bufnr:number,ht:HaskellTools))  Callback that is invoked when the client attaches to a buffer.
-        {cmd?}               (fun():string[]|string[])                          The command to start haskell-language-server with.
-        {capabilities?}      (lsp.ClientCapabilities)                           LSP client capabilities.
-        {settings?}          (fun(project_root:string|nil):table|table)         The haskell-language-server settings or a function that creates them. To view the default settings, run `haskell-language-server generate-default-config`.
-        {default_settings?}  (table)                                            The default haskell-language-server settings that will be used if no settings are specified or detected.
-        {logfile?}           (string)                                           The path to the haskell-language-server log file.
-
-
- To print all options that are available for your haskell-language-server version, run `haskell-language-server-wrapper generate-default-config`
-See: https://haskell-language-server.readthedocs.io/en/latest/configuration.html.
-
-HTDapOpts                                                            *HTDapOpts*
-
-    Fields: ~
-        {cmd?}            (string[])                     The command to start the debug adapter server with.
-        {logFile?}        (string)                       Log file path for detected configurations.
-        {logLevel?}       (HaskellDebugAdapterLogLevel)  The log level for detected configurations.
-        {auto_discover?}  (boolean|AddDapConfigOpts)     Set to `false` to disable auto-discovery of launch configurations. `true` uses the default configurations options`.
-
-
-HaskellDebugAdapterLogLevel                        *HaskellDebugAdapterLogLevel*
-
-    Type: ~
-        "Debug"|"Info"|"Warning"|"Error"
-
-
-==============================================================================
-haskell-language-server LSP client tools                     *haskell-tools.lsp*
-
- The following commands are available:
-
- * `:HlsStart` - Start the LSP client.
- * `:HlsStop` - Stop the LSP client.
- * `:HlsRestart` - Restart the LSP client.
- * `:HlsEvalAll` - Evaluate all code snippets in comments.
-
-LoadHlsSettingsOpts                                        *LoadHlsSettingsOpts*
-
-    Fields: ~
-        {settings_file_pattern}  (string|nil)  File name or pattern to search for. Defaults to 'hls.json'
-
-
-HlsTools                                                              *HlsTools*
-
-
-                                                    *HlsTools.load_hls_settings*
-HlsTools.load_hls_settings({project_root}, {opts})
-    Search the project root for a haskell-language-server settings JSON file and load it to a Lua table.
-    Falls back to the `hls.default_settings` if no file is found or file cannot be read or decoded.
-
-    Parameters: ~
-        {project_root}  (string|nil)               The project root
-        {opts}          (LoadHlsSettingsOpts|nil)
-
-    Returns: ~
-        (table)  hls_settings
-
-    See: ~
-        |https://haskell-language-server.readthedocs.io/en/latest/configuration.html|
-
-
-HlsTools.start({bufnr})                                         *HlsTools.start*
-    Start or attach the LSP client.
-    Fails silently if the buffer's filetype is not one of the filetypes specified in the config.
-
-    Parameters: ~
-        {bufnr}  (number|nil)  The buffer number (optional), defaults to the current buffer
-
-    Returns: ~
-        (number|nil)  The LSP client ID
-
-
-HlsTools.stop({bufnr})                                           *HlsTools.stop*
-    Stop the LSP client.
-
-    Parameters: ~
-        {bufnr}  (number|nil)  The buffer number (optional), defaults to the current buffer
-
-    Returns: ~
-        (table[])  A list of clients that will be stopped
-
-
-HlsTools.restart({bufnr})                                     *HlsTools.restart*
-    Restart the LSP client.
-    Fails silently if the buffer's filetype is not one of the filetypes specified in the config.
-
-    Parameters: ~
-        {bufnr}  (number|nil)  The buffer number (optional), defaults to the current buffer
-
-    Returns: ~
-        (number|nil)  The LSP client ID after restart
-
-
-HlsTools.buf_eval_all({bufnr})                           *HlsTools.buf_eval_all*
-    Evaluate all code snippets in comments.
-
-    Parameters: ~
-        {bufnr}  (number|nil)  Defaults to the current buffer.
-
-    Returns: ~
-        (nil)
-
-
-==============================================================================
-haskell-tools nvim-dap setup                                 *haskell-tools.dap*
-
-HsDapLaunchConfiguration                              *HsDapLaunchConfiguration*
-
-
-HsDapTools                                                          *HsDapTools*
-
-
-AddDapConfigOpts                                              *AddDapConfigOpts*
-
-
-                                            *HsDapTools.discover_configurations*
-HsDapTools.discover_configurations({bufnr}, {opts})
-    Discover nvim-dap launch configurations for haskell-debug-adapter.
-
-    Parameters: ~
-        {bufnr}  (number|nil)            The buffer number
-        {opts}   (AddDapConfigOpts|nil)
-
-    Returns: ~
-        (nil)
-
-
-==============================================================================
-haskell-tools Hoogle search                               *haskell-tools.hoogle*
-
-HoogleTools                                                        *HoogleTools*
-
-
-HoogleTools.hoogle_signature({options})           *HoogleTools.hoogle_signature*
-
-    Parameters: ~
-        {options}  (table<string,any>|nil)  Includes the `search_term` and options to pass to the telescope picker (if available)
-
-    Returns: ~
-        (nil)
-
-
-==============================================================================
-haskell-tools GHCi REPL module                              *haskell-tools.repl*
-
- The following commands are available:
-
- * `:HtReplToggle` - Toggle a GHCi repl.
- * `:HtReplQuit` - Quit the current repl.
- * `:HtReplLoad` - Load a Haskell file into the repl.
- * `:HtReplReload` - Reload the current repl.
-
-HsReplTools                                                        *HsReplTools*
-
-
-HsReplTools.buf_mk_repl_cmd()                      *HsReplTools.buf_mk_repl_cmd*
-    Create the command to create a repl for the current buffer.
-
-    Returns: ~
-        (table|nil)  command
-
-
-HsReplTools.operator()                                    *HsReplTools.operator*
-
-    See: ~
-        |operatorfunc|
-
-
-HsReplTools.paste({reg})                                     *HsReplTools.paste*
-    Paste from register `reg` to the REPL
-
-    Parameters: ~
-        {reg}  (string|nil)  register (defaults to '"')
-
-
-HsReplTools.paste_type({reg})                           *HsReplTools.paste_type*
-    Query the REPL for the type of register `reg`
-
-    Parameters: ~
-        {reg}  (string|nil)  register (defaults to '"')
-
-
-HsReplTools.cword_type()                                *HsReplTools.cword_type*
-    Query the REPL for the type of word under the cursor
-
-
-HsReplTools.paste_info({reg})                           *HsReplTools.paste_info*
-    Query the REPL for info on register `reg`
-
-    Parameters: ~
-        {reg}  (string|nil)  register (defaults to '"')
-
-
-HsReplTools.cword_info()                                *HsReplTools.cword_info*
-    Query the REPL for the type of word under the cursor
-
-
-HsReplTools.load_file({filepath})                        *HsReplTools.load_file*
-    Load a file into the REPL
-
-    Parameters: ~
-        {filepath}  (string)  The absolute file path
-
-
-HsReplTools.reload()                                        *HsReplTools.reload*
-    Reload the repl
-
-
-==============================================================================
-haskell-tools Project module                             *haskell-tools.project*
-
- The following commands are available:
-
- * `:HsProjectFile` - Open the project file for the current buffer (cabal.project or stack.yaml).
- * `:HsPackageYaml` - Open the package.yaml file for the current buffer.
- * `:HsPackageCabal` - Open the *.cabal file for the current buffer.
-
-HsProjectTools                                                  *HsProjectTools*
-
-
-HsProjectTools.root_dir({project_file})                *HsProjectTools.root_dir*
-    Get the project's root directory
-
-    Parameters: ~
-        {project_file}  (string)  The path to a project file
-
-    Returns: ~
-        (string|nil)
-
-
-HsProjectTools.open_package_yaml()            *HsProjectTools.open_package_yaml*
-    Open the package.yaml of the package containing the current buffer.
-
-    Returns: ~
-        (nil)
-
-
-HsProjectTools.open_package_cabal()          *HsProjectTools.open_package_cabal*
-    Open the *.cabal file of the package containing the current buffer.
-
-    Returns: ~
-        (nil)
-
-
-HsProjectTools.open_project_file()            *HsProjectTools.open_project_file*
-    Open the current buffer's project file (cabal.project or stack.yaml).
-
-    Returns: ~
-        (nil)
-
-
-==============================================================================
-haskell-tools fast-tags module                              *haskell-tools.tags*
-
-GenerateProjectTagsOpts                                *GenerateProjectTagsOpts*
-
-    Fields: ~
-        {refresh}  (boolean)  Whether to refresh the tags if they have already been generated
-
-
-FastTagsTools                                                    *FastTagsTools*
-     for the project (default: true)
-
-
-                                           *FastTagsTools.generate_project_tags*
-FastTagsTools.generate_project_tags({path}, {opts})
-    Generates tags for the current project
-
-    Parameters: ~
-        {path}  (string|nil)                   File path
-        {opts}  (GenerateProjectTagsOpts|nil)  Options
-
-
-                                           *FastTagsTools.generate_package_tags*
-FastTagsTools.generate_package_tags({path})
-    Generate tags for the package containing `path`
-
-    Parameters: ~
-        {path}  (string|nil)  File path
-
-
-==============================================================================
-haskell-tools Logging                                        *haskell-tools.log*
-
- The following commands are available:
-
- * `:HtLog` - Open the haskell-tools.nvim log file.
- * `:HlsLog` - Open the haskell-language-server log file.
- * `:HtSetLogLevel` - Set the haskell-tools.nvim and LSP client log level.
-
-HaskellToolsLog                                                *HaskellToolsLog*
-
-
-HaskellToolsLog.get_hls_logfile()              *HaskellToolsLog.get_hls_logfile*
-    Get the haskell-language-server log file
-
-    Returns: ~
-        (string)  filepath
-
-
-HaskellToolsLog.get_logfile()                      *HaskellToolsLog.get_logfile*
-    Get the haskell-tools.nvim log file path.
-
-    Returns: ~
-        (string)  filepath
-
-
-HaskellToolsLog.nvim_open_hls_logfile()  *HaskellToolsLog.nvim_open_hls_logfile*
-    Open the haskell-language-server log file
-
-    Returns: ~
-        (nil)
-
-
-HaskellToolsLog.nvim_open_logfile()          *HaskellToolsLog.nvim_open_logfile*
-    Open the haskell-tools.nvim log file.
-
-    Returns: ~
-        (nil)
-
-
-HaskellToolsLog.set_level()                          *HaskellToolsLog.set_level*
-
-    Returns: ~
-        (nil)
-
-    See: ~
-        |vim.log.levels|
-
-
-vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/ftplugin/cabal.lua b/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/ftplugin/cabal.lua
deleted file mode 100644
index 262f37c6..00000000
--- a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/ftplugin/cabal.lua
+++ /dev/null
@@ -1 +0,0 @@
-require('haskell-tools.internal').ftplugin()
diff --git a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/ftplugin/cabalproject.lua b/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/ftplugin/cabalproject.lua
deleted file mode 100644
index 262f37c6..00000000
--- a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/ftplugin/cabalproject.lua
+++ /dev/null
@@ -1 +0,0 @@
-require('haskell-tools.internal').ftplugin()
diff --git a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/ftplugin/haskell.lua b/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/ftplugin/haskell.lua
deleted file mode 100644
index 262f37c6..00000000
--- a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/ftplugin/haskell.lua
+++ /dev/null
@@ -1 +0,0 @@
-require('haskell-tools.internal').ftplugin()
diff --git a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/ftplugin/lhaskell.lua b/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/ftplugin/lhaskell.lua
deleted file mode 100644
index 262f37c6..00000000
--- a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/ftplugin/lhaskell.lua
+++ /dev/null
@@ -1 +0,0 @@
-require('haskell-tools.internal').ftplugin()
diff --git a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/haskell-tools.nvim-3.1.8-1.rockspec b/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/haskell-tools.nvim-3.1.8-1.rockspec
deleted file mode 100644
index f3383c0a..00000000
--- a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/haskell-tools.nvim-3.1.8-1.rockspec
+++ /dev/null
@@ -1,34 +0,0 @@
-local git_ref = '3.1.8'
-local modrev = '3.1.8'
-local specrev = '1'
-
-local repo_url = 'https://github.com/mrcjkb/haskell-tools.nvim'
-
-rockspec_format = '3.0'
-package = 'haskell-tools.nvim'
-version = modrev ..'-'.. specrev
-
-description = {
-  summary = 'Supercharge your Haskell experience in neovim!',
-  detailed = [[
-This plugin automatically configures the haskell-language-server builtin LSP client
-and integrates with other Haskell tools. See the README's #features section
-for more info.]],
-  labels = { 'dap', 'debug-adapter-protocol', 'fast-tags', 'haskell', 'hoogle', 'language-server', 'language-server-protocol', 'lsp', 'lsp-client', 'lua', 'neovim', 'neovim-plugin', 'nvim', 'plugin', 'repl', 'tagfunc', 'telescope', 'vim' } ,
-  homepage = 'https://github.com/mrcjkb/haskell-tools.nvim',
-  license = 'GPL-2.0'
-}
-
-dependencies = { 'lua >= 5.1' } 
-
-test_dependencies = { }
-
-source = {
-  url = repo_url .. '/archive/' .. git_ref .. '.zip',
-  dir = 'haskell-tools.nvim-' .. '3.1.8',
-}
-
-build = {
-  type = 'builtin',
-  copy_directories = { 'doc', 'ftplugin' } ,
-}
diff --git a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/rock_manifest b/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/rock_manifest
deleted file mode 100644
index 698d244b..00000000
--- a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/haskell-tools.nvim/3.1.8-1/rock_manifest
+++ /dev/null
@@ -1,73 +0,0 @@
-rock_manifest = {
-   doc = {
-      ["haskell-tools.txt"] = "dea283444425fa165997d28c1ac610c8"
-   },
-   ftplugin = {
-      ["cabal.lua"] = "4f72e96d3601fed58fd4a24e9633172d",
-      ["cabalproject.lua"] = "4f72e96d3601fed58fd4a24e9633172d",
-      ["haskell.lua"] = "4f72e96d3601fed58fd4a24e9633172d",
-      ["lhaskell.lua"] = "4f72e96d3601fed58fd4a24e9633172d"
-   },
-   ["haskell-tools.nvim-3.1.8-1.rockspec"] = "653d0f8f3d848afa2ac2e8d64e470886",
-   lua = {
-      ["haskell-tools"] = {
-         ["compat.lua"] = "1457323a47d791e5ff2393871a112357",
-         config = {
-            ["check.lua"] = "4c6c96c3b51efe53b54c8bc4f14d93d6",
-            ["init.lua"] = "e1f6bc006747eb79f131b527acb83b1f",
-            ["internal.lua"] = "373f754423a5786afbfcdea048d74bc7"
-         },
-         dap = {
-            ["init.lua"] = "007e49a6c0a33047d9dc3cc0c76474e7",
-            ["internal.lua"] = "f30905af3fdff69d13c20682767c44a2"
-         },
-         ["deps.lua"] = "ff7e0f06f003b497c958805a391c1eaf",
-         ["health.lua"] = "941c948e1667a8a532f2b93f59d0347b",
-         hoogle = {
-            ["helpers.lua"] = "e5428112e897aa06b0a76d186679b110",
-            ["init.lua"] = "5385afa48b78262001e50154b6f02ec3",
-            ["local.lua"] = "eca412a13b7a33cba0b2935c4024d864",
-            ["web.lua"] = "4ebe05b9a484b20e88ff51af76f6a88e"
-         },
-         ["init.lua"] = "81946a46a32bdc3066333f6cac348712",
-         ["internal.lua"] = "f149d8830ae8f0516393ffb31b573765",
-         log = {
-            ["init.lua"] = "c8b080a5a9701cb8ae3c526acd868964",
-            ["internal.lua"] = "ed9e8200543b60724d27d5a991191a3e"
-         },
-         lsp = {
-            ["definition.lua"] = "04348f8215b227a5da688b92e1cfe23b",
-            ["eval.lua"] = "69614508eab450ad811c9cbdd46130a9",
-            ["helpers.lua"] = "010ab78c87db24c8142c29ac35c218e8",
-            ["hover.lua"] = "9e03896e1877b06c98f11ce1b643343c",
-            ["init.lua"] = "44c4d7be0311e2d746e00308710345e9"
-         },
-         ["os.lua"] = "110cd7ec57e6587360092f8f78025783",
-         ["parser.lua"] = "402dc6ebad5cffbe6700e774ad64724a",
-         project = {
-            ["cabal.lua"] = "ef4d57f352f6f15cb21bc3dc72e37872",
-            ["helpers.lua"] = "c167cfdaca3d44feb95eb921470dbaf0",
-            ["init.lua"] = "eebdb000f25db6280299ccc89ee64fc6",
-            ["stack.lua"] = "71c00101f8004f9c905a9ddb33dc6889"
-         },
-         repl = {
-            ["builtin.lua"] = "c1b6210d95f533ec06bb3857f8d1dc7e",
-            ["init.lua"] = "3529ee48e2a8e39f962fd6d351ff6ee3",
-            ["toggleterm.lua"] = "f62892e49e2f5b25394f0c254a9cebb6"
-         },
-         ["strings.lua"] = "6429d6757a6c08856f425b72d7d8362c",
-         ["tags.lua"] = "b82dd1a468edfc13323b2f290f73dc24",
-         types = {
-            ["internal.lua"] = "a078237ae853c7f19c396a7d5001fa28"
-         }
-      },
-      telescope = {
-         _extensions = {
-            ht = {
-               ["extension.lua"] = "040c10b48645d3230bba5952281ea858"
-            },
-            ["ht.lua"] = "ebd1a0ec34353b6b42b5e6012ff69dd9"
-         }
-      }
-   }
-}
diff --git a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/manifest b/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/manifest
deleted file mode 100644
index 846cf9c4..00000000
--- a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1-unstable-2024-05-26-rocks/manifest
+++ /dev/null
@@ -1,173 +0,0 @@
-commands = {}
-dependencies = {
-   ["haskell-tools.nvim"] = {
-      ["3.1.8-1"] = {
-         {
-            constraints = {
-               {
-                  op = ">=",
-                  version = {
-                     5, 1, string = "5.1"
-                  }
-               }
-            },
-            name = "lua"
-         }
-      }
-   }
-}
-modules = {
-   ["haskell-tools.compat"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.config.check"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.config.init"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.config.internal"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.dap.init"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.dap.internal"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.deps"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.health"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.hoogle.helpers"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.hoogle.init"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.hoogle.local"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.hoogle.web"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.init"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.internal"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.log.init"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.log.internal"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.lsp.definition"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.lsp.eval"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.lsp.helpers"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.lsp.hover"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.lsp.init"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.os"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.parser"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.project.cabal"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.project.helpers"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.project.init"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.project.stack"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.repl.builtin"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.repl.init"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.repl.toggleterm"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.strings"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.tags"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["haskell-tools.types.internal"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["telescope._extensions.ht"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   },
-   ["telescope._extensions.ht.extension"] = {
-      "haskell-tools.nvim/3.1.8-1"
-   }
-}
-repository = {
-   ["haskell-tools.nvim"] = {
-      ["3.1.8-1"] = {
-         {
-            arch = "installed",
-            commands = {},
-            dependencies = {},
-            modules = {
-               ["haskell-tools.compat"] = "haskell-tools/compat.lua",
-               ["haskell-tools.config.check"] = "haskell-tools/config/check.lua",
-               ["haskell-tools.config.init"] = "haskell-tools/config/init.lua",
-               ["haskell-tools.config.internal"] = "haskell-tools/config/internal.lua",
-               ["haskell-tools.dap.init"] = "haskell-tools/dap/init.lua",
-               ["haskell-tools.dap.internal"] = "haskell-tools/dap/internal.lua",
-               ["haskell-tools.deps"] = "haskell-tools/deps.lua",
-               ["haskell-tools.health"] = "haskell-tools/health.lua",
-               ["haskell-tools.hoogle.helpers"] = "haskell-tools/hoogle/helpers.lua",
-               ["haskell-tools.hoogle.init"] = "haskell-tools/hoogle/init.lua",
-               ["haskell-tools.hoogle.local"] = "haskell-tools/hoogle/local.lua",
-               ["haskell-tools.hoogle.web"] = "haskell-tools/hoogle/web.lua",
-               ["haskell-tools.init"] = "haskell-tools/init.lua",
-               ["haskell-tools.internal"] = "haskell-tools/internal.lua",
-               ["haskell-tools.log.init"] = "haskell-tools/log/init.lua",
-               ["haskell-tools.log.internal"] = "haskell-tools/log/internal.lua",
-               ["haskell-tools.lsp.definition"] = "haskell-tools/lsp/definition.lua",
-               ["haskell-tools.lsp.eval"] = "haskell-tools/lsp/eval.lua",
-               ["haskell-tools.lsp.helpers"] = "haskell-tools/lsp/helpers.lua",
-               ["haskell-tools.lsp.hover"] = "haskell-tools/lsp/hover.lua",
-               ["haskell-tools.lsp.init"] = "haskell-tools/lsp/init.lua",
-               ["haskell-tools.os"] = "haskell-tools/os.lua",
-               ["haskell-tools.parser"] = "haskell-tools/parser.lua",
-               ["haskell-tools.project.cabal"] = "haskell-tools/project/cabal.lua",
-               ["haskell-tools.project.helpers"] = "haskell-tools/project/helpers.lua",
-               ["haskell-tools.project.init"] = "haskell-tools/project/init.lua",
-               ["haskell-tools.project.stack"] = "haskell-tools/project/stack.lua",
-               ["haskell-tools.repl.builtin"] = "haskell-tools/repl/builtin.lua",
-               ["haskell-tools.repl.init"] = "haskell-tools/repl/init.lua",
-               ["haskell-tools.repl.toggleterm"] = "haskell-tools/repl/toggleterm.lua",
-               ["haskell-tools.strings"] = "haskell-tools/strings.lua",
-               ["haskell-tools.tags"] = "haskell-tools/tags.lua",
-               ["haskell-tools.types.internal"] = "haskell-tools/types/internal.lua",
-               ["telescope._extensions.ht"] = "telescope/_extensions/ht.lua",
-               ["telescope._extensions.ht.extension"] = "telescope/_extensions/ht/extension.lua"
-            }
-         }
-      }
-   }
-}
diff --git a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1.rockspec b/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1.rockspec
deleted file mode 100644
index f3383c0a..00000000
--- a/config/neovim/store/lazy-plugins/haskell-tools.nvim/haskell-tools.nvim-3.1.8-1.rockspec
+++ /dev/null
@@ -1,34 +0,0 @@
-local git_ref = '3.1.8'
-local modrev = '3.1.8'
-local specrev = '1'
-
-local repo_url = 'https://github.com/mrcjkb/haskell-tools.nvim'
-
-rockspec_format = '3.0'
-package = 'haskell-tools.nvim'
-version = modrev ..'-'.. specrev
-
-description = {
-  summary = 'Supercharge your Haskell experience in neovim!',
-  detailed = [[
-This plugin automatically configures the haskell-language-server builtin LSP client
-and integrates with other Haskell tools. See the README's #features section
-for more info.]],
-  labels = { 'dap', 'debug-adapter-protocol', 'fast-tags', 'haskell', 'hoogle', 'language-server', 'language-server-protocol', 'lsp', 'lsp-client', 'lua', 'neovim', 'neovim-plugin', 'nvim', 'plugin', 'repl', 'tagfunc', 'telescope', 'vim' } ,
-  homepage = 'https://github.com/mrcjkb/haskell-tools.nvim',
-  license = 'GPL-2.0'
-}
-
-dependencies = { 'lua >= 5.1' } 
-
-test_dependencies = { }
-
-source = {
-  url = repo_url .. '/archive/' .. git_ref .. '.zip',
-  dir = 'haskell-tools.nvim-' .. '3.1.8',
-}
-
-build = {
-  type = 'builtin',
-  copy_directories = { 'doc', 'ftplugin' } ,
-}
diff --git a/config/neovim/store/lazy-plugins/haskell-tools.nvim/lua/haskell-tools/config/internal.lua b/config/neovim/store/lazy-plugins/haskell-tools.nvim/lua/haskell-tools/config/internal.lua
index f04a5013..fca1fc76 100644
--- a/config/neovim/store/lazy-plugins/haskell-tools.nvim/lua/haskell-tools/config/internal.lua
+++ b/config/neovim/store/lazy-plugins/haskell-tools.nvim/lua/haskell-tools/config/internal.lua
@@ -33,7 +33,7 @@ local folding_range_capabilities = deps.if_available('ufo', function(_)
   }
 end, {})
 local capabilities = vim.tbl_deep_extend(
-  'keep',
+  'force',
   ht_capabilities,
   cmp_capabilities,
   selection_range_capabilities,
diff --git a/config/neovim/store/lazy-plugins/haskell-tools.nvim/nix-support/propagated-build-inputs b/config/neovim/store/lazy-plugins/haskell-tools.nvim/nix-support/propagated-build-inputs
index b3b8c91f..169a165b 100644
--- a/config/neovim/store/lazy-plugins/haskell-tools.nvim/nix-support/propagated-build-inputs
+++ b/config/neovim/store/lazy-plugins/haskell-tools.nvim/nix-support/propagated-build-inputs
@@ -1 +1 @@
-/nix/store/mqbhz05llkddfb5wni0m48kw22ixxps4-lua-5.1.5 
\ No newline at end of file
+/nix/store/3czmrawji85vf8979kll2yx2f1kjkric-lua-5.1.5 
\ No newline at end of file
diff --git a/config/neovim/store/lazy-plugins/haskell-tools.nvim/rock_manifest b/config/neovim/store/lazy-plugins/haskell-tools.nvim/rock_manifest
index 698d244b..44dd08b0 100644
--- a/config/neovim/store/lazy-plugins/haskell-tools.nvim/rock_manifest
+++ b/config/neovim/store/lazy-plugins/haskell-tools.nvim/rock_manifest
@@ -8,14 +8,14 @@ rock_manifest = {
       ["haskell.lua"] = "4f72e96d3601fed58fd4a24e9633172d",
       ["lhaskell.lua"] = "4f72e96d3601fed58fd4a24e9633172d"
    },
-   ["haskell-tools.nvim-3.1.8-1.rockspec"] = "653d0f8f3d848afa2ac2e8d64e470886",
+   ["haskell-tools.nvim-3.1.10-1.rockspec"] = "18d77dcfb4eabe4ff073dfcdf377925d",
    lua = {
       ["haskell-tools"] = {
          ["compat.lua"] = "1457323a47d791e5ff2393871a112357",
          config = {
             ["check.lua"] = "4c6c96c3b51efe53b54c8bc4f14d93d6",
             ["init.lua"] = "e1f6bc006747eb79f131b527acb83b1f",
-            ["internal.lua"] = "373f754423a5786afbfcdea048d74bc7"
+            ["internal.lua"] = "471dfa798228e41621483c89212a7544"
          },
          dap = {
             ["init.lua"] = "007e49a6c0a33047d9dc3cc0c76474e7",
diff --git a/config/neovim/store/lazy-plugins/luasnip/doc/luasnip.txt b/config/neovim/store/lazy-plugins/luasnip/doc/luasnip.txt
index e0ce8a2a..274600f6 100644
--- a/config/neovim/store/lazy-plugins/luasnip/doc/luasnip.txt
+++ b/config/neovim/store/lazy-plugins/luasnip/doc/luasnip.txt
@@ -1,4 +1,4 @@
-*luasnip.txt*             For NVIM v0.8.0             Last change: 2024 May 24
+*luasnip.txt*             For NVIM v0.8.0            Last change: 2024 June 07
 
 ==============================================================================
 Table of Contents                                  *luasnip-table-of-contents*
@@ -241,7 +241,7 @@ Common opts:
 
 - `node_ext_opts` and `merge_node_ext_opts`: Control `ext_opts` (most likely
     highlighting) of the node. Described in detail in |luasnip-ext_opts|
-- `key`: The node can be reffered to by this key. Useful for either |luasnip-key-indexer| or for finding the node at runtime (See
+- `key`: The node can be referred to by this key. Useful for either |luasnip-key-indexer| or for finding the node at runtime (See
     |luasnip-snippets-api|), for example inside a `dynamicNode`. The keys
     do not have to be unique across the entire lifetime of the snippet, but at any
     point in time, the snippet may contain each key only once. This means it is
@@ -759,7 +759,7 @@ ChoiceNodes allow choosing between multiple nodes.
 
 - `jump_index`: `number`, since choiceNodes can be jumped to, they need a
     jump-index (Info in |luasnip-basics-jump-index|).
-- `choices`: `node[]|node`, the choices. The first will be initialliy active.
+- `choices`: `node[]|node`, the choices. The first will be initially active.
     A list of nodes will be turned into a `snippetNode`.
 - `node_opts`: `table`. `choiceNode` supports the keys common to all nodes
     described in |luasnip-node|, and one additional key:
@@ -897,7 +897,7 @@ All of these parameters except `indentstring` are exactly the same as in
 
 - `indentstring`: `string`, will be used to indent the nodes inside this
     `snippetNode`.
-    All occurences of `"$PARENT_INDENT"` are replaced with the actual indent of
+    All occurrences of `"$PARENT_INDENT"` are replaced with the actual indent of
     the parent.
 
 
@@ -1277,7 +1277,7 @@ A shortcut for `functionNode`s that only do very basic string manipulation.
 - `lambda`: An object created by applying string-operations to `l._n`, objects
     representing the `n`th argnode.
     For example:
-    - `l._1:gsub("a", "e")` replaces all occurences of "a" in the text of the
+    - `l._1:gsub("a", "e")` replaces all occurrences of "a" in the text of the
         first argnode with "e", or
     - `l._1 .. l._2` concatenates text of the first and second argnode.
         If an argnode contains multiple lines of text, they are concatenated with
@@ -1351,8 +1351,8 @@ Examples:
             m({ 1, 2 }, l._1:match("^" .. l._2 .. "$"), l._1:gsub("a", "e"))
           })
     <
-    This inserts the text of the node with jump-index 1, with all occurences of `a`
-    replaced with `e`, if the second insertNode matches the first exactly.
+    This inserts the text of the node with jump-index 1, with all occurrences of
+    `a` replaced with `e`, if the second insertNode matches the first exactly.
 
 
 REPEAT                                                 *luasnip-extras-repeat*
@@ -1466,7 +1466,7 @@ any way, correspond to the jump-index of the nodes!
 
 `fmt(format:string, nodes:table of nodes, opts:table|nil) -> table of nodes`
 
-- `format`: a string. Occurences of `{<somekey>}` ( `{}` are customizable; more
+- `format`: a string. Occurrences of `{<somekey>}` ( `{}` are customizable; more
     on that later) are replaced with `content[<somekey>]` (which should be a
     node), while surrounding text becomes `textNode`s.
     To escape a delimiter, repeat it (`"{{"`).
@@ -1476,7 +1476,7 @@ any way, correspond to the jump-index of the nodes!
     numbered placeholder).
     If a key appears more than once in `format`, the node in
     `content[<duplicate_key>]` is inserted for the first, and copies of it for
-    subsequent occurences.
+    subsequent occurrences.
 - `nodes`: just a table of nodes.
 - `opts`: optional arguments:
     - `delimiters`: string, two characters. Change `{}` to some other pair, e.g.
@@ -1589,7 +1589,7 @@ Here’s one set of example keybindings:
     inoremap <c-f>  <cmd>lua require('luasnip.extras.otf').on_the_fly("e")<cr>
 <
 
-Obviously, `<c-f>` is arbritary and can be changed to any other key combo.
+Obviously, `<c-f>` is arbitrary and can be changed to any other key combo.
 Another interesting application is allowing multiple on-the-fly snippets at the
 same time by retrieving snippets from multiple registers:
 
@@ -1629,7 +1629,7 @@ Contains some utility functions that can be passed to the `ft_func` or
     the buffer.
 - `from_cursor_pos`: uses treesitter to determine the filetype at the cursor.
     With that, it’s possible to expand snippets in injected regions, as long as
-    the treesitter parser supports them. If this is used in conjuction with
+    the treesitter parser supports them. If this is used in conjunction with
     `lazy_load`, extra care must be taken that all the filetypes that can be
     expanded in a given buffer are also returned by `load_ft_func` (otherwise their
     snippets may not be loaded). This can easily be achieved with `extend_load_ft`.
@@ -1637,7 +1637,7 @@ Contains some utility functions that can be passed to the `ft_func` or
     described above is loading more filetypes than just that of the target buffer
     when `lazy_load`ing. This can be done ergonomically via `extend_load_ft`:
     calling it with a table where the keys are filetypes, and the values are the
-    filetypes that should be loaded additionaly returns a function that can be
+    filetypes that should be loaded additionally returns a function that can be
     passed to `load_ft_func` and takes care of extending the filetypes properly.
     >lua
         ls.setup({
@@ -1661,7 +1661,7 @@ which alters text before the snippet’s trigger. While these can be
 implemented using regTrig snippets, this helper makes the process easier in
 most cases.
 
-The simplest example, which surrounds the text preceeding the `.br` with
+The simplest example, which surrounds the text preceding the `.br` with
 brackets `[]`, looks like:
 
 >lua
@@ -1709,7 +1709,7 @@ as the table in the same position for `s` except:
     against. The default match pattern is `"[%w%.%_%-]+$"`. Note the `$`. This
     matches since only the line _up until_ the beginning of the trigger is
     matched against the pattern, which makes the character immediately
-    preceeding the trigger match as the end of the string.
+    preceding the trigger match as the end of the string.
 
 Some other match strings, including the default, are available from the postfix
 module. `require("luasnip.extras.postfix).matches`:
@@ -1746,7 +1746,7 @@ TREESITTER-POSTFIX-SNIPPET         *luasnip-extras-treesitter-postfix-snippet*
 Instead of triggering a postfix-snippet when some pattern matches in front of
 the trigger, it might be useful to match if some specific treesitter-nodes
 surround/are in front of the trigger. While this functionality can also be
-implemented by a cusutom `resolveExpandParams`, this helper simplifies the
+implemented by a custom `resolveExpandParams`, this helper simplifies the
 common cases.
 
 This matching of treesitter-nodes can be done either
@@ -1757,7 +1757,7 @@ This matching of treesitter-nodes can be done either
 - by providing a function that manually walks the node-tree, and returns the
     node in front of the trigger on success (for increased flexibility).
 
-A simple example, which surrounds the previous node’s text preceeding the
+A simple example, which surrounds the previous node’s text preceding the
 `.mv` with `std::move()` in cpp files, looks like:
 
 >lua
@@ -2175,9 +2175,9 @@ although, for usage outside of LuaSnip, best copy the source file:
     - arg_indx, `number` (required): the position of the parameter to override.
     - extend, `fn(arg, extend_value) -> effective_arg` (optional): this function
         is used to extend the args passed to the decorated function.
-        It defaults to a function which just extends the the arg-table with the
+        It defaults to a function which just extends the arg-table with the
         extend table (accepts `nil`).
-        This extend behaviour is adaptable to accomodate `s`, where the first
+        This extend behaviour is adaptable to accommodate `s`, where the first
         argument may be string or table.
 
 `apply(fn, ...) -> decorated_fn`:
@@ -2394,7 +2394,7 @@ variable is unknown (that is, its name isn’t defined) the name of the
 variable is inserted and it is transformed into a placeholder.
 
 ------------------------------------------------------------------------------
-The above necessiates a differentiation between `unknown` and `unset`
+The above necessitates a differentiation between `unknown` and `unset`
 variables:
 
 For LuaSnip, a variable `VARNAME` is `unknown` when `env.VARNAME` returns `nil`
@@ -2439,7 +2439,7 @@ where `opts` can contain the following keys:
 - `include`: List of languages to include, includes everything by default.
 - `{override,default}_priority`: These keys are passed straight to the
     `add_snippets`-calls (documented in |luasnip-api|) and can therefore change the
-    priority of snippets loaded from some colletion (or, in combination with
+    priority of snippets loaded from some collection (or, in combination with
     `{in,ex}clude`, only some of its snippets).
 - `fs_event_providers`: `table<string, boolean>?`, specifies which mechanisms
     should be used to watch files for updates/creation.
diff --git a/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/doc/luasnip.txt b/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/doc/luasnip.txt
deleted file mode 100644
index e0ce8a2a..00000000
--- a/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/doc/luasnip.txt
+++ /dev/null
@@ -1,3709 +0,0 @@
-*luasnip.txt*             For NVIM v0.8.0             Last change: 2024 May 24
-
-==============================================================================
-Table of Contents                                  *luasnip-table-of-contents*
-
-1. Basics                                                     |luasnip-basics|
-  - Jump-Index                                     |luasnip-basics-jump-index|
-  - Adding Snippets                           |luasnip-basics-adding-snippets|
-  - Snippet Insertion                       |luasnip-basics-snippet-insertion|
-2. Node                                                         |luasnip-node|
-  - Api                                                     |luasnip-node-api|
-3. Snippets                                                 |luasnip-snippets|
-  - Data                                               |luasnip-snippets-data|
-4. TextNode                                                 |luasnip-textnode|
-5. InsertNode                                             |luasnip-insertnode|
-6. FunctionNode                                         |luasnip-functionnode|
-7. Node Reference                                     |luasnip-node-reference|
-8. ChoiceNode                                             |luasnip-choicenode|
-9. SnippetNode                                           |luasnip-snippetnode|
-10. IndentSnippetNode                              |luasnip-indentsnippetnode|
-11. DynamicNode                                          |luasnip-dynamicnode|
-12. RestoreNode                                          |luasnip-restorenode|
-13. Key Indexer                                          |luasnip-key-indexer|
-14. Absolute Indexer                                |luasnip-absolute-indexer|
-15. MultiSnippet                                        |luasnip-multisnippet|
-16. Extras                                                    |luasnip-extras|
-  - Lambda                                             |luasnip-extras-lambda|
-  - Match                                               |luasnip-extras-match|
-  - Repeat                                             |luasnip-extras-repeat|
-  - Partial                                           |luasnip-extras-partial|
-  - Nonempty                                         |luasnip-extras-nonempty|
-  - Dynamic Lambda                             |luasnip-extras-dynamic-lambda|
-  - FMT                                                   |luasnip-extras-fmt|
-  - Conditions                                     |luasnip-extras-conditions|
-  - On The Fly-Snippets                   |luasnip-extras-on-the-fly-snippets|
-  - select_choice                               |luasnip-extras-select_choice|
-  - Filetype-Functions                     |luasnip-extras-filetype-functions|
-  - Postfix-Snippet                           |luasnip-extras-postfix-snippet|
-  - Treesitter-Postfix-Snippet     |luasnip-extras-treesitter-postfix-snippet|
-  - Snippet List                                 |luasnip-extras-snippet-list|
-  - Snippet Location                         |luasnip-extras-snippet-location|
-17. Extend Decorator                                |luasnip-extend-decorator|
-18. LSP-Snippets                                        |luasnip-lsp-snippets|
-  - Snipmate Parser                     |luasnip-lsp-snippets-snipmate-parser|
-  - Transformations                     |luasnip-lsp-snippets-transformations|
-19. Variables                                              |luasnip-variables|
-  - Environment Namespaces          |luasnip-variables-environment-namespaces|
-  - LSP-Variables                            |luasnip-variables-lsp-variables|
-20. Loaders                                                  |luasnip-loaders|
-  - Snippet-specific filetypes    |luasnip-loaders-snippet-specific-filetypes|
-  - VS-Code                                          |luasnip-loaders-vs-code|
-  - SNIPMATE                                        |luasnip-loaders-snipmate|
-  - Lua                                                  |luasnip-loaders-lua|
-  - edit_snippets                              |luasnip-loaders-edit_snippets|
-21. SnippetProxy                                        |luasnip-snippetproxy|
-22. ext_opts                                                |luasnip-ext_opts|
-23. Docstrings                                            |luasnip-docstrings|
-24. Docstring-Cache                                  |luasnip-docstring-cache|
-25. Events                                                    |luasnip-events|
-26. Cleanup                                                  |luasnip-cleanup|
-27. Logging                                                  |luasnip-logging|
-28. Source                                                    |luasnip-source|
-29. Config-Options                                    |luasnip-config-options|
-30. Troubleshooting                                  |luasnip-troubleshooting|
-  - Adding Snippets                  |luasnip-troubleshooting-adding-snippets|
-31. API                                                          |luasnip-api|
->
-                __                       ____
-               /\ \                     /\  _`\           __
-               \ \ \      __  __     __ \ \,\L\_\    ___ /\_\  _____
-                \ \ \  __/\ \/\ \  /'__`\\/_\__ \  /' _ `\/\ \/\ '__`\
-                 \ \ \L\ \ \ \_\ \/\ \L\.\_/\ \L\ \/\ \/\ \ \ \ \ \L\ \
-                  \ \____/\ \____/\ \__/.\_\ `\____\ \_\ \_\ \_\ \ ,__/
-                   \/___/  \/___/  \/__/\/_/\/_____/\/_/\/_/\/_/\ \ \/
-                                                                 \ \_\
-                                                                  \/_/
-<
-
-LuaSnip is a snippet engine written entirely in Lua. It has some great features
-like inserting text (`luasnip-function-node`) or nodes (`luasnip-dynamic-node`)
-based on user input, parsing LSP syntax and switching nodes
-(`luasnip-choice-node`). For basic setup like mappings and installing, check
-the README.
-
-All code snippets in this help assume the following:
-
->lua
-    local ls = require("luasnip")
-    local s = ls.snippet
-    local sn = ls.snippet_node
-    local isn = ls.indent_snippet_node
-    local t = ls.text_node
-    local i = ls.insert_node
-    local f = ls.function_node
-    local c = ls.choice_node
-    local d = ls.dynamic_node
-    local r = ls.restore_node
-    local events = require("luasnip.util.events")
-    local ai = require("luasnip.nodes.absolute_indexer")
-    local extras = require("luasnip.extras")
-    local l = extras.lambda
-    local rep = extras.rep
-    local p = extras.partial
-    local m = extras.match
-    local n = extras.nonempty
-    local dl = extras.dynamic_lambda
-    local fmt = require("luasnip.extras.fmt").fmt
-    local fmta = require("luasnip.extras.fmt").fmta
-    local conds = require("luasnip.extras.expand_conditions")
-    local postfix = require("luasnip.extras.postfix").postfix
-    local types = require("luasnip.util.types")
-    local parse = require("luasnip.util.parser").parse_snippet
-    local ms = ls.multi_snippet
-    local k = require("luasnip.nodes.key_indexer").new_key
-<
-
-As noted in the |luasnip-loaders-lua|-section:
-
-
-  By default, the names from `luasnip.config.snip_env`
-  <https://github.com/L3MON4D3/LuaSnip/blob/master/lua/luasnip/config.lua#L22-L48>
-  will be used, but it’s possible to customize them by setting `snip_env` in
-  `setup`.
-Furthermore, note that while this document assumes you have defined `ls` to be
-`require("luasnip")`, it is **not** provided in the default set of variables.
-
-
-==============================================================================
-1. Basics                                                     *luasnip-basics*
-
-In LuaSnip, snippets are made up of `nodes`. These can contain either
-
-- static text (`textNode`)
-- text that can be edited (`insertNode`)
-- text that can be generated from the contents of other nodes (`functionNode`)
-- other nodes
-    - `choiceNode`: allows choosing between two nodes (which might contain more
-        nodes)
-    - `restoreNode`: store and restore input to nodes
-- or nodes that can be generated based on input (`dynamicNode`).
-
-Snippets are always created using the `s(trigger:string,
-nodes:table)`-function. It is explained in more detail in |luasnip-snippets|,
-but the gist is that it creates a snippet that contains the nodes specified in
-`nodes`, which will be inserted into a buffer if the text before the cursor
-matches `trigger` when `ls.expand` is called.
-
-
-JUMP-INDEX                                         *luasnip-basics-jump-index*
-
-Nodes that can be jumped to (`insertNode`, `choiceNode`, `dynamicNode`,
-`restoreNode`, `snippetNode`) all require a "jump-index" so luasnip knows the
-order in which these nodes are supposed to be visited ("jumped to").
-
->lua
-    s("trig", {
-        i(1), t"text", i(2), t"text again", i(3)
-    })
-<
-
-These indices don’t "run" through the entire snippet, like they do in
-textmate-snippets (`"$1 ${2: $3 $4}"`), they restart at 1 in each nested
-snippetNode:
-
->lua
-    s("trig", {
-        i(1), t" ", sn(2, {
-            t" ", i(1), t" ", i(2)
-        })
-    })
-<
-
-(roughly equivalent to the given textmate-snippet).
-
-
-ADDING SNIPPETS                               *luasnip-basics-adding-snippets*
-
-The snippets for a given filetype have to be added to luasnip via
-`ls.add_snippets(filetype, snippets)`. Snippets that should be accessible
-globally (in all filetypes) have to be added to the special filetype `all`.
-
->lua
-    ls.add_snippets("all", {
-        s("ternary", {
-            -- equivalent to "${1:cond} ? ${2:then} : ${3:else}"
-            i(1, "cond"), t(" ? "), i(2, "then"), t(" : "), i(3, "else")
-        })
-    })
-<
-
-It is possible to make snippets from one filetype available to another using
-`ls.filetype_extend`, more info on that in the section |luasnip-api|.
-
-
-SNIPPET INSERTION                           *luasnip-basics-snippet-insertion*
-
-When a new snippet is expanded, it can be connected with the snippets that have
-already been expanded in the buffer in various ways. First of all, Luasnip
-distinguishes between root-snippets and child-snippets. The latter are nested
-inside other snippets, so when jumping through a snippet, one may also traverse
-the child-snippets expanded inside it, more or less as if the child just
-contains more nodes of the parent. Root-snippets are of course characterised by
-not being child-snippets. When expanding a new snippet, it becomes a child of
-the snippet whose region it is expanded inside, and a root if it is not inside
-any snippet’s region. If it is inside another snippet, the specific node it
-is inside is determined, and the snippet then nested inside that node.
-
-- If that node is interactive (for example, an `insertNode`), the new snippet
-    will be traversed when the node is visited, as long as the
-    configuration-option `link_children` is enabled. If it is not enabled, it is
-    possible to jump from the snippet to the node, but not the other way around.
-- If that node is not interactive, the snippet will be linked to the currently
-    active node, also such that it will not be jumped to again once it is left.
-    This is to prevent jumping large distances across the buffer as much as
-    possible. There may still be one large jump from the snippet back to the
-    current node it is nested inside, but that seems hard to avoid.
-    Thus, one should design snippets such that the regions where other snippets
-    may be expanded are inside `insertNodes`.
-
-If the snippet is not a child, but a root, it can be linked up with the roots
-immediately adjacent to it by enabling `link_roots` in `setup`. Since by
-default only one root is remembered, one should also set `keep_roots` if
-`link_roots` is enabled. The two are separate options, since roots that are not
-linked can still be reached by `ls.activate_node()`. This setup (remember
-roots, but don’t jump to them) is useful for a super-tab like mapping
-(`<Tab>` and jump on the same key), where one would like to still enter
-previous roots. Since there would almost always be more jumps if the roots are
-linked, regular `<Tab>` would not work almost all the time, and thus
-`link_roots` has to stay disabled.
-
-
-==============================================================================
-2. Node                                                         *luasnip-node*
-
-Every node accepts, as its last parameter, an optional table of arguments.
-There are some common ones (which are listed here), and some that only apply to
-some nodes (`user_args` for function/dynamicNode). These `opts` are only
-mentioned if they accept options that are not common to all nodes.
-
-Common opts:
-
-- `node_ext_opts` and `merge_node_ext_opts`: Control `ext_opts` (most likely
-    highlighting) of the node. Described in detail in |luasnip-ext_opts|
-- `key`: The node can be reffered to by this key. Useful for either |luasnip-key-indexer| or for finding the node at runtime (See
-    |luasnip-snippets-api|), for example inside a `dynamicNode`. The keys
-    do not have to be unique across the entire lifetime of the snippet, but at any
-    point in time, the snippet may contain each key only once. This means it is
-    fine to return a keyed node from a `dynamicNode`, because even if it will be
-    generated multiple times, those will not be valid at the same time.
-- `node_callbacks`: Define event-callbacks for this node (see
-    |luasnip-events|).
-    Accepts a table that maps an event, e.g. `events.enter` to the callback
-    (essentially the same as `callbacks` passed to `s`, only that there is no
-    first mapping from jump-index to the table of callbacks).
-
-
-API                                                         *luasnip-node-api*
-
-- `get_jump_index()`: this method returns the jump-index of a node. If a node
-    doesn’t have a jump-index, this method returns `nil` instead.
-- `get_buf_position(opts) -> {from_position, to_position}`:
-    Determines the range of the buffer occupied by this node. `from`- and
-    `to_position` are `row,column`-tuples, `0,0`-indexed (first line is 0, first
-    column is 0) and end-inclusive (see |api-indexing|, this is extmarks
-    indexing).
-    - `opts`: `table|nil`, options, valid keys are:
-        - `raw`: `bool`, default `true`. This can be used to switch between
-            byte-columns (`raw=true`) and visual columns (`raw=false`). This makes a
-            difference if the line contains characters represented by multiple bytes
-            in UTF, for example `ÿ`.
-
-
-==============================================================================
-3. Snippets                                                 *luasnip-snippets*
-
-The most direct way to define snippets is `s`:
-
->lua
-    s({trig="trigger"}, {})
-<
-
-(This snippet is useless beyond serving as a minimal example)
-
-`s(context, nodes, opts) -> snippet`
-
-- `context`: Either table or a string. Passing a string is equivalent to passing
-    >lua
-        {
-          trig = context
-        }
-    <
-    The following keys are valid:
-    - `trig`: string, the trigger of the snippet. If the text in front of (to the
-        left of) the cursor when `ls.expand()` is called matches it, the snippet will
-        be expanded. By default, "matches" means the text in front of the cursor
-        matches the trigger exactly, this behaviour can be modified through
-        `trigEngine`
-    - `name`: string, can be used by e.g. `nvim-compe` to identify the snippet.
-    - `desc` (or `dscr`): string, description of the snippet, -separated or table for
-        multiple lines.
-    - `wordTrig`: boolean, if true, the snippet is only expanded if the word
-        (`[%w_]+`) before the cursor matches the trigger entirely. True by default.
-    - `regTrig`: boolean, whether the trigger should be interpreted as a lua pattern.
-        False by default. Consider setting `trigEngine` to `"pattern"` instead, it is
-        more expressive, and in line with other settings.
-    - `trigEngine`: (function|string), determines how `trig` is interpreted, and what
-        it means for it to "match" the text in front of the cursor. This behaviour can
-        be completely customized by passing a function, but the predefined ones, which
-        are accessible by passing their identifier, should suffice in most cases:
-        - `"plain"`: the default-behaviour, the trigger has to match the text before
-            the cursor exactly.
-        - `"pattern"`: the trigger is interpreted as a lua-pattern, and is a match if
-            `trig .. "$"` matches the line up to the cursor. Capture-groups will be
-            accessible as `snippet.captures`.
-        - `"ecma"`: the trigger is interpreted as an ECMAscript-regex, and is a
-            match if `trig .. "$"` matches the line up to the cursor. Capture-groups
-            will be accessible as `snippet.captures`.
-            This `trigEngine` requires `jsregexp` (see
-            |luasnip-lsp-snippets-transformations|) to be installed, if it
-            is not, this engine will behave like `"plain"`.
-        - `"vim"`: the trigger is interpreted as a vim-regex, and is a match if
-            `trig .. "$"` matches the line up to the cursor. As with the other
-            regex/pattern-engines, captures will be available as `snippet.captures`,
-            but there is one caveat: the matching is done using `matchlist`, so for
-            now empty-string submatches will be interpreted as unmatched, and the
-            corresponding `snippet.capture[i]` will be `nil` (this will most likely
-            change, don’t rely on this behavior).
-        Besides these predefined engines, it is also possible to create new ones:
-        Instead of a string, pass a function which satisfies `trigEngine(trigger, opts)
-        -> (matcher(line_to_cursor, trigger) -> whole_match, captures)` (ie. the
-        function receives `trig` and `trigEngineOpts` can, for example, precompile a
-        regex, and then returns a function responsible for determining whether the
-        current cursor-position (represented by the line up to the cursor) matches the
-        trigger (it is passed again here so engines which don’t do any
-        trigger-specific work (like compilation) can just return a static `matcher`),
-        and what the capture-groups are). The `lua`-engine, for example, can be
-        implemented like this:
-        >lua
-            local function matcher(line_to_cursor, trigger)
-                -- look for match which ends at the cursor.
-                -- put all results into a list, there might be many capture-groups.
-                local find_res = { line_to_cursor:find(trigger .. "$") }
-            
-                if #find_res > 0 then
-                    -- if there is a match, determine matching string, and the
-                    -- capture-groups.
-                    local captures = {}
-                    -- find_res[1] is `from`, find_res[2] is `to` (which we already know
-                    -- anyway).
-                    local from = find_res[1]
-                    local match = line_to_cursor:sub(from, #line_to_cursor)
-                    -- collect capture-groups.
-                    for i = 3, #find_res do
-                        captures[i - 2] = find_res[i]
-                    end
-                    return match, captures
-                else
-                    return nil
-                end
-            end
-            
-            local function engine(trigger)
-                -- don't do any special work here, can't precompile lua-pattern.
-                return matcher
-            end
-        <
-        The predefined engines are defined in `trig_engines.lua`
-        <https://github.com/L3MON4D3/LuaSnip/blob/master/lua/luasnip/nodes/util/trig_engines.lua>,
-        read it for more examples.
-    - `trigEngineOpts`: `table<string, any>`, options for the used trigEngine. The
-        valid options are:
-        - `max_len`: number, upper bound on the length of the trigger.
-            If this is set, the `line_to_cursor` will be truncated (from the cursor of
-            course) to `max_len` characters before performing the match.
-            This is implemented because feeding long `line_to_cursor` into eg. the
-            pattern-trigEngine will hurt performance quite a bit (see issue
-            Luasnip#1103).
-            This option is implemented for all `trigEngines`.
-    - `docstring`: string, textual representation of the snippet, specified like
-        `desc`. Overrides docstrings loaded from json.
-    - `docTrig`: string, used as `line_to_cursor` during docstring-generation. This
-        might be relevant if the snippet relies on specific values in the
-        capture-groups (for example, numbers, which won’t work with the default
-        `$CAPTURESN` used during docstring-generation)
-    - `hidden`: boolean, hint for completion-engines. If set, the snippet should not
-        show up when querying snippets.
-    - `priority`: positive number, Priority of the snippet, 1000 by default. Snippets
-        with high priority will be matched to a trigger before those with a lower one.
-        The priority for multiple snippets can also be set in `add_snippets`.
-    - `snippetType`: string, should be either `snippet` or `autosnippet` (ATTENTION:
-        singular form is used), decides whether this snippet has to be triggered by
-        `ls.expand()` or whether is triggered automatically (don’t forget to set
-        `ls.config.setup({ enable_autosnippets = true })` if you want to use this
-        feature). If unset it depends on how the snippet is added of which type the
-        snippet will be.
-    - `resolveExpandParams`: `fn(snippet, line_to_cursor, matched_trigger, captures)
-        -> table|nil`, where
-        - `snippet`: `Snippet`, the expanding snippet object
-        - `line_to_cursor`: `string`, the line up to the cursor.
-        - `matched_trigger`: `string`, the fully matched trigger (can be retrieved
-            from `line_to_cursor`, but we already have that info here :D)
-        - `captures`: `captures` as returned by `trigEngine`.
-        This function will be evaluated in `Snippet:matches()` to decide whether the
-        snippet can be expanded or not. Returns a table if the snippet can be expanded,
-        `nil` if can not. The returned table can contain any of these fields:
-        - `trigger`: `string`, the fully matched trigger.
-        - `captures`: `table`, this list could update the capture-groups from
-            parameter in snippet expansion.
-            Both `trigger` and `captures` can override the values returned via
-            `trigEngine`.
-        - `clear_region`: `{ "from": {<row>, <column>}, "to": {<row>, <column>} }`,
-            both (0, 0)-indexed, the region where text has to be cleared before
-            inserting the snippet.
-        - `env_override`: `map string->(string[]|string)`, override or extend
-            the snippet’s environment (`snip.env`)
-        If any of these is `nil`, the default is used (`trigger` and `captures` as
-        returned by `trigEngine`, `clear_region` such that exactly the trigger is
-        deleted, no overridden environment-variables).
-        A good example for the usage of `resolveExpandParams` can be found in the
-        implementation of `postfix`
-        <https://github.com/L3MON4D3/LuaSnip/blob/master/lua/luasnip/extras/postfix.lua>.
-    - `condition`: `fn(line_to_cursor, matched_trigger, captures) -> bool`, where
-        - `line_to_cursor`: `string`, the line up to the cursor.
-        - `matched_trigger`: `string`, the fully matched trigger (can be retrieved
-            from `line_to_cursor`, but we already have that info here :D)
-        - `captures`: if the trigger is pattern, this list contains the
-            capture-groups. Again, could be computed from `line_to_cursor`, but we
-            already did so.
-    - `show_condition`: `f(line_to_cursor) -> bool`.
-        - `line_to_cursor`: `string`, the line up to the cursor.
-        This function is (should be) evaluated by completion engines, indicating
-        whether the snippet should be included in current completion candidates.
-        Defaults to a function returning `true`. This is different from `condition`
-        because `condition` is evaluated by LuaSnip on snippet expansion (and thus has
-        access to the matched trigger and captures), while `show_condition` is (should
-        be) evaluated by the completion engines when scanning for available snippet
-        candidates.
-    - `filetype`: `string`, the filetype of the snippet. This overrides the filetype
-        the snippet is added (via `add_snippet`) as.
-- `nodes`: A single node or a list of nodes. The nodes that make up the snippet.
-- `opts`: A table with the following valid keys:
-    - `callbacks`: Contains functions that are called upon entering/leaving a node of
-        this snippet. For example: to print text upon entering the _second_ node of a
-        snippet, `callbacks` should be set as follows:
-        >lua
-            {
-                -- position of the node, not the jump-index!!
-                -- s("trig", {t"first node", t"second node", i(1, "third node")}).
-                [2] = {
-                    [events.enter] = function(node, _event_args) print("2!") end
-                }
-            }
-        <
-        To register a callback for the snippets’ own events, the key `[-1]` may be
-        used. More info on events in |luasnip-events|
-    - `child_ext_opts`, `merge_child_ext_opts`: Control `ext_opts` applied to the
-        children of this snippet. More info on those in the |luasnip-ext_opts|-section.
-
-The `opts`-table, as described here, can also be passed to e.g. `snippetNode`
-and `indentSnippetNode`. It is also possible to set `condition` and
-`show_condition` (described in the documentation of the `context`-table) from
-`opts`. They should, however, not be set from both.
-
-
-DATA                                                   *luasnip-snippets-data*
-
-Snippets contain some interesting tables during runtime:
-
-- `snippet.env`: Contains variables used in the LSP-protocol, for example
-    `TM_CURRENT_LINE` or `TM_FILENAME`. It’s possible to add customized variables
-    here too, check |luasnip-variables-environment-namespaces|
-- `snippet.captures`: If the snippet was triggered by a pattern (`regTrig`), and
-    the pattern contained capture-groups, they can be retrieved here.
-- `snippet.trigger`: The string that triggered this snippet. Again, only
-    interesting if the snippet was triggered through `regTrig`, for getting the
-    full match.
-
-These variables/tables primarily come in handy in `dynamic/functionNodes`,
-where the snippet can be accessed through the immediate parent
-(`parent.snippet`), which is passed to the function. (in most cases `parent ==
-parent.snippet`, but the `parent` of the dynamicNode is not always the
-surrounding snippet, it could be a `snippetNode`).
-
-## Api
-
-- `invalidate()`: call this method to effectively remove the snippet. The
-    snippet will no longer be able to expand via `expand` or `expand_auto`. It
-    will also be hidden from lists (at least if the plugin creating the list
-    respects the `hidden`-key), but it might be necessary to call
-    `ls.refresh_notify(ft)` after invalidating snippets.
-- `get_keyed_node(key)`: Returns the currently visible node associated with
-    `key`.
-
-
-==============================================================================
-4. TextNode                                                 *luasnip-textnode*
-
-The most simple kind of node; just text.
-
->lua
-    s("trigger", { t("Wow! Text!") })
-<
-
-This snippet expands to
-
->
-        Wow! Text!⎵
-<
-
-where ⎵ is the cursor.
-
-Multiline strings can be defined by passing a table of lines rather than a
-string:
-
->lua
-    s("trigger", {
-        t({"Wow! Text!", "And another line."})
-    })
-<
-
-`t(text, node_opts)`:
-
-- `text`: `string` or `string[]`
-- `node_opts`: `table`, see |luasnip-node|
-
-
-==============================================================================
-5. InsertNode                                             *luasnip-insertnode*
-
-These Nodes contain editable text and can be jumped to- and from (e.g.
-traditional placeholders and tabstops, like `$1` in textmate-snippets).
-
-The functionality is best demonstrated with an example:
-
->lua
-    s("trigger", {
-        t({"After expanding, the cursor is here ->"}), i(1),
-        t({"", "After jumping forward once, cursor is here ->"}), i(2),
-        t({"", "After jumping once more, the snippet is exited there ->"}), i(0),
-    })
-<
-
-The Insert Nodes are visited in order `1,2,3,..,n,0`. (The jump-index 0 also
-_has_ to belong to an `insertNode`!) So the order of InsertNode-jumps is as
-follows:
-
-1. After expansion, the cursor is at InsertNode 1,
-2. after jumping forward once at InsertNode 2,
-3. and after jumping forward again at InsertNode 0.
-
-If no 0-th InsertNode is found in a snippet, one is automatically inserted
-after all other nodes.
-
-The jump-order doesn’t have to follow the "textual" order of the nodes:
-
->lua
-    s("trigger", {
-        t({"After jumping forward once, cursor is here ->"}), i(2),
-        t({"", "After expanding, the cursor is here ->"}), i(1),
-        t({"", "After jumping once more, the snippet is exited there ->"}), i(0),
-    })
-<
-
-The above snippet will behave as follows:
-
-1. After expansion, we will be at InsertNode 1.
-2. After jumping forward, we will be at InsertNode 2.
-3. After jumping forward again, we will be at InsertNode 0.
-
-An **important** (because here Luasnip differs from other snippet engines)
-detail is that the jump-indices restart at 1 in nested snippets:
-
->lua
-    s("trigger", {
-        i(1, "First jump"),
-        t(" :: "),
-        sn(2, {
-            i(1, "Second jump"),
-            t" : ",
-            i(2, "Third jump")
-        })
-    })
-<
-
-as opposed to e.g. the textmate syntax, where tabstops are snippet-global:
-
->snippet
-    ${1:First jump} :: ${2: ${3:Third jump} : ${4:Fourth jump}}
-<
-
-(this is not exactly the same snippet of course, but as close as possible) (the
-restart-rule only applies when defining snippets in lua, the above
-textmate-snippet will expand correctly when parsed).
-
-`i(jump_index, text, node_opts)`
-
-- `jump_index`: `number`, this determines when this node will be jumped to (see
-    |luasnip-basics-jump-index|).
-- `text`: `string|string[]`, a single string for just one line, a list with >1
-    entries for multiple lines.
-    This text will be SELECTed when the `insertNode` is jumped into.
-- `node_opts`: `table`, described in |luasnip-node|
-
-If the `jump_index` is `0`, replacing its’ `text` will leave it outside the
-`insertNode` (for reasons, check out Luasnip#110).
-
-
-==============================================================================
-6. FunctionNode                                         *luasnip-functionnode*
-
-Function Nodes insert text based on the content of other nodes using a
-user-defined function:
-
->lua
-    local function fn(
-      args,     -- text from i(2) in this example i.e. { { "456" } }
-      parent,   -- parent snippet or parent node
-      user_args -- user_args from opts.user_args 
-    )
-       return '[' .. args[1][1] .. user_args .. ']'
-    end
-    
-    s("trig", {
-      i(1), t '<-i(1) ',
-      f(fn,  -- callback (args, parent, user_args) -> string
-        {2}, -- node indice(s) whose text is passed to fn, i.e. i(2)
-        { user_args = { "user_args_value" }} -- opts
-      ),
-      t ' i(2)->', i(2), t '<-i(2) i(0)->', i(0)
-    })
-<
-
-`f(fn, argnode_references, node_opts)`: - `fn`: `function(argnode_text, parent,
-user_args1,...,user_argsn) -> text` - `argnode_text`: `string[][]`, the text
-currently contained in the argnodes (e.g. `{{line1}, {line1, line2}}`). The
-snippet indent will be removed from all lines following the first.
-
-- `parent`: The immediate parent of the `functionNode`. It is included here as it
-    allows easy access to some information that could be useful in functionNodes
-    (see |luasnip-snippets-data| for some examples). Many snippets access the
-    surrounding snippet just as `parent`, but if the `functionNode` is nested
-    within a `snippetNode`, the immediate parent is a `snippetNode`, not the
-    surrounding snippet (only the surrounding snippet contains data like `env` or
-    `captures`).
-- `user_args`: The `user_args` passed in `opts`. Note that there may be multiple
-    user_args (e.g. `user_args1, ..., user_argsn`).
-
-`fn` shall return a string, which will be inserted as is, or a table of strings
-for multiline strings, where all lines following the first will be prefixed
-with the snippets’ indentation.
-
-- `argnode_references`: `node_reference[]|node_refernce|nil`. Either no, a
-    single, or multiple |luasnip-node-reference|s. Changing any of these will
-    trigger a re-evaluation of `fn`, and insertion of the updated text. If no node
-    reference is passed, the `functionNode` is evaluated once upon expansion.
-- `node_opts`: `table`, see |luasnip-node|. One additional key is supported:
-    - `user_args`: `any[]`, these will be passed to `fn` as `user_arg1`-`user_argn`.
-        These make it easier to reuse similar functions, for example a functionNode
-        that wraps some text in different delimiters (`()`, `[]`, …).
-        >lua
-            local function reused_func(_,_, user_arg1)
-                return user_arg1
-            end
-            
-            s("trig", {
-                f(reused_func, {}, {
-                    user_args = {"text"}
-                }),
-                f(reused_func, {}, {
-                    user_args = {"different text"}
-                }),
-            })
-        <
-
-**Examples**:
-
-- Use captures from the regex trigger using a functionNode:
-    >lua
-        s({trig = "b(%d)", regTrig = true},
-          f(function(args, snip) return
-              "Captured Text: " .. snip.captures[1] .. "." end, {})
-        )
-    <
-- `argnodes_text` during function evaluation:
-    >lua
-        s("trig", {
-          i(1, "text_of_first"),
-          i(2, {"first_line_of_second", "second_line_of_second"}),
-          f(function(args, snip)
-              --here
-          -- order is 2,1, not 1,2!!
-          end, {2, 1} )})
-    <
-    At `--here`, `args` would look as follows (provided no text was changed after
-    expansion):
-    >lua
-        args = {
-          {"first_line_of_second", "second_line_of_second"},
-          {"text_of_first"}
-        }
-    <
-- |luasnip-absolute-indexer|:
-    >lua
-        s("trig", {
-          i(1, "text_of_first"),
-          i(2, {"first_line_of_second", "second_line_of_second"}),
-          f(function(args, snip)
-              -- just concat first lines of both.
-              return args[1][1] .. args[2][1]
-          end, {ai[2], ai[1]} )})
-    <
-
-If the function only performs simple operations on text, consider using the
-`lambda` from `luasnip.extras` (See |luasnip-extras-lambda|)
-
-
-==============================================================================
-7. Node Reference                                     *luasnip-node-reference*
-
-Node references are used to refer to other nodes in various parts of
-luasnip’s API. For example, argnodes in functionNode, dynamicNode or lambda
-are node references. These references can be either of:
-
-- `number`: the jump-index of the node.
-    This will be resolved relative to the parent of the node this is passed to.
-    (So, only nodes with the same parent can be referenced. This is very easy to
-    grasp, but also limiting)
-- `key_indexer`: the key of the node, if it is present. This will come in
-    handy if the node that is being referred to is not in the same
-    snippet/snippetNode as the one the node reference is passed to.
-    Also, it is the proper way to refer to a non-interactive node (a
-    functionNode, for example)
-- `absolute_indexer`: the absolute position of the node. Just like
-    `key_indexer`, it allows addressing non-sibling nodes, but is a bit more
-    awkward to handle since a path from root to node has to be determined,
-    whereas `key_indexer` just needs the key to match.
-    Due to this, `key_indexer` should be generally preferred.
-    (More information in |luasnip-absolute-indexer|).
-- `node`: just the node. Usage of this is discouraged since it can lead to
-    subtle errors (for example, if the node passed here is captured in a closure
-    and therefore not copied with the remaining tables in the snippet; there’s a
-    big comment about just this in commit 8bfbd61).
-
-
-==============================================================================
-8. ChoiceNode                                             *luasnip-choicenode*
-
-ChoiceNodes allow choosing between multiple nodes.
-
->lua
-     s("trig", c(1, {
-        t("Ugh boring, a text node"),
-        i(nil, "At least I can edit something now..."),
-        f(function(args) return "Still only counts as text!!" end, {})
-     }))
-<
-
-`c(jump_index, choices, node_opts)`
-
-- `jump_index`: `number`, since choiceNodes can be jumped to, they need a
-    jump-index (Info in |luasnip-basics-jump-index|).
-- `choices`: `node[]|node`, the choices. The first will be initialliy active.
-    A list of nodes will be turned into a `snippetNode`.
-- `node_opts`: `table`. `choiceNode` supports the keys common to all nodes
-    described in |luasnip-node|, and one additional key:
-    - `restore_cursor`: `false` by default. If it is set, and the node that was being
-        edited also appears in the switched to choice (can be the case if a
-        `restoreNode` is present in both choice) the cursor is restored relative to
-        that node. The default is `false` as enabling might lead to decreased
-        performance. It’s possible to override the default by wrapping the
-        `choiceNode` constructor in another function that sets `opts.restore_cursor` to
-        `true` and then using that to construct `choiceNode`s:
-        >lua
-            local function restore_cursor_choice(pos, choices, opts)
-                if opts then
-                    opts.restore_cursor = true
-                else
-                    opts = {restore_cursor = true}
-                end
-                return c(pos, choices, opts)
-            end
-        <
-
-Jumpable nodes that normally expect an index as their first parameter don’t
-need one inside a choiceNode; their jump-index is the same as the
-choiceNodes’.
-
-As it is only possible (for now) to change choices from within the choiceNode,
-make sure that all of the choices have some place for the cursor to stop at!
-
-This means that in `sn(nil, {...nodes...})` `nodes` has to contain e.g. an
-`i(1)`, otherwise luasnip will just "jump through" the nodes, making it
-impossible to change the choice.
-
->lua
-    c(1, {
-        t"some text", -- textNodes are just stopped at.
-        i(nil, "some text"), -- likewise.
-        sn(nil, {t"some text"}) -- this will not work!
-        sn(nil, {i(1), t"some text"}) -- this will.
-    })
-<
-
-The active choice for a choiceNode can be changed by either calling one of
-`ls.change_choice(1)` (forwards) or `ls.change_choice(-1)` (backwards), or by
-calling `ls.set_choice(choice_indx)`.
-
-One way to easily interact with choiceNodes is binding `change_choice(1/-1)` to
-keys:
-
->lua
-    -- set keybinds for both INSERT and VISUAL.
-    vim.api.nvim_set_keymap("i", "<C-n>", "<Plug>luasnip-next-choice", {})
-    vim.api.nvim_set_keymap("s", "<C-n>", "<Plug>luasnip-next-choice", {})
-    vim.api.nvim_set_keymap("i", "<C-p>", "<Plug>luasnip-prev-choice", {})
-    vim.api.nvim_set_keymap("s", "<C-p>", "<Plug>luasnip-prev-choice", {})
-<
-
-Apart from this, there is also a picker (see |luasnip-select_choice| where no
-cycling is necessary and any choice can be selected right away, via
-`vim.ui.select`.
-
-
-==============================================================================
-9. SnippetNode                                           *luasnip-snippetnode*
-
-SnippetNodes directly insert their contents into the surrounding snippet. This
-is useful for `choiceNode`s, which only accept one child, or `dynamicNode`s,
-where nodes are created at runtime and inserted as a `snippetNode`.
-
-Their syntax is similar to `s`, however, where snippets require a table
-specifying when to expand, `snippetNode`s, similar to `insertNode`s, expect a
-jump-index.
-
->lua
-     s("trig", sn(1, {
-        t("basically just text "),
-        i(1, "And an insertNode.")
-     }))
-<
-
-`sn(jump_index, nodes, node_opts)`
-
-- `jump_index`: `number`, the usual |luasnip-jump-index|.
-- `nodes`: `node[]|node`, just like for `s`.
-    Note that `snippetNode`s don’t accept an `i(0)`, so the jump-indices of the nodes
-    inside them have to be in `1,2,...,n`.
-- `node_opts`: `table`: again, the keys common to all nodes (documented in
-    |luasnip-node|) are supported, but also
-    - `callbacks`,
-    - `child_ext_opts` and
-    - `merge_child_ext_opts`,
-    which are further explained in |luasnip-snippets|.
-
-
-==============================================================================
-10. IndentSnippetNode                              *luasnip-indentsnippetnode*
-
-By default, all nodes are indented at least as deep as the trigger. With these
-nodes it’s possible to override that behaviour:
-
->lua
-    s("isn", {
-        isn(1, {
-            t({"This is indented as deep as the trigger",
-            "and this is at the beginning of the next line"})
-        }, "")
-    })
-<
-
-(Note the empty string passed to isn).
-
-Indent is only applied after linebreaks, so it’s not possible to remove
-indent on the line where the snippet was triggered using `ISN` (That is
-possible via regex triggers where the entire line before the trigger is
-matched).
-
-Another nice use case for `ISN` is inserting text, e.g. `//` or some other
-comment string before the nodes of the snippet:
-
->lua
-    s("isn2", {
-        isn(1, t({"//This is", "A multiline", "comment"}), "$PARENT_INDENT//")
-    })
-<
-
-Here the `//` before `This is` is important, once again, because indent is only
-applied after linebreaks.
-
-To enable such usage, `$PARENT_INDENT` in the indentstring is replaced by the
-parent’s indent.
-
-`isn(jump_index, nodes, indentstring, node_opts)`
-
-All of these parameters except `indentstring` are exactly the same as in
-|luasnip-snippetnode|.
-
-- `indentstring`: `string`, will be used to indent the nodes inside this
-    `snippetNode`.
-    All occurences of `"$PARENT_INDENT"` are replaced with the actual indent of
-    the parent.
-
-
-==============================================================================
-11. DynamicNode                                          *luasnip-dynamicnode*
-
-Very similar to functionNode, but returns a snippetNode instead of just text,
-which makes them very powerful as parts of the snippet can be changed based on
-user input.
-
-`d(jump_index, function, node-references, opts)`:
-
-- `jump_index`: `number`, just like all jumpable nodes, its’ position in the
-    jump-list (|luasnip-basics-jump-index|).
-- `function`: `fn(args, parent, old_state, user_args) -> snippetNode` This
-    function is called when the argnodes’ text changes. It should generate and
-    return (wrapped inside a `snippetNode`) nodes, which will be inserted at the
-    dynamicNode’s place. `args`, `parent` and `user_args` are also explained in
-    |luasnip-functionnode|
-    - `args`: `table of text` (`{{"node1line1", "node1line2"}, {"node2line1"}}`)
-        from nodes the `dynamicNode` depends on.
-    - `parent`: the immediate parent of the `dynamicNode`.
-    - `old_state`: a user-defined table. This table may contain anything; its
-        intended usage is to preserve information from the previously generated
-        `snippetNode`. If the `dynamicNode` depends on other nodes, it may be
-        reconstructed, which means all user input (text inserted in `insertNodes`,
-        changed choices) to the previous `dynamicNode` is lost.
-        The `old_state` table must be stored in `snippetNode` returned by
-        the function (`snippetNode.old_state`).
-        The second example below illustrates the usage of `old_state`.
-    - `user_args`: passed through from `dynamicNode`-opts; may have more than one
-        argument.
-- `node_references`: `node_reference[]|node_references|nil`,
-    |luasnip-node-references| to the nodes the dynamicNode depends on: if any of
-    these trigger an update (for example, if the text inside them changes), the
-    `dynamicNode`s’ function will be executed, and the result inserted at the
-    `dynamicNode`s place. (`dynamicNode` behaves exactly the same as `functionNode`
-    in this regard).
-- `opts`: In addition to the common |luasnip-node|-keys, there is, again,
-    - `user_args`, which is described in |luasnip-functionnode|.
-
-**Examples**:
-
-This `dynamicNode` inserts an `insertNode` which copies the text inside the
-first `insertNode`.
-
->lua
-    s("trig", {
-        t"text: ", i(1), t{"", "copy: "},
-        d(2, function(args)
-                -- the returned snippetNode doesn't need a position; it's inserted
-                -- "inside" the dynamicNode.
-                return sn(nil, {
-                    -- jump-indices are local to each snippetNode, so restart at 1.
-                    i(1, args[1])
-                })
-            end,
-        {1})
-    })
-<
-
-This snippet makes use of `old_state` to count the number of updates.
-
-To store/restore values generated by the `dynamicNode` or entered into
-`insert/choiceNode`, consider using the shortly-introduced `restoreNode`
-instead of `old_state`.
-
->lua
-    local function count(_, _, old_state)
-        old_state = old_state or {
-            updates = 0
-        }
-    
-        old_state.updates = old_state.updates + 1
-    
-        local snip = sn(nil, {
-            t(tostring(old_state.updates))
-        })
-    
-        snip.old_state = old_state
-        return snip
-    end
-    
-    ls.add_snippets("all",
-        s("trig", {
-            i(1, "change to update"),
-            d(2, count, {1})
-        })
-    )
-<
-
-As with `functionNode`, `user_args` can be used to reuse similar `dynamicNode`-
-functions.
-
-
-==============================================================================
-12. RestoreNode                                          *luasnip-restorenode*
-
-This node can store and restore a snippetNode as is. This includes changed
-choices and changed text. Its’ usage is best demonstrated by an example:
-
->lua
-    s("paren_change", {
-        c(1, {
-            sn(nil, { t("("), r(1, "user_text"), t(")") }),
-            sn(nil, { t("["), r(1, "user_text"), t("]") }),
-            sn(nil, { t("{"), r(1, "user_text"), t("}") }),
-        }),
-    }, {
-        stored = {
-            -- key passed to restoreNodes.
-            ["user_text"] = i(1, "default_text")
-        }
-    })
-<
-
-Here the text entered into `user_text` is preserved upon changing choice.
-
-`r(jump_index, key, nodes, node_opts)`:
-
-- `jump_index`, when to jump to this node.
-- `key`, `string`: `restoreNode`s with the same key share their content.
-- `nodes`, `node[]|node`: the content of the `restoreNode`.
-    Can either be a single node, or a table of nodes (both of which will be
-    wrapped inside a `snippetNode`, except if the single node already is a
-    `snippetNode`).
-    The content for a given key may be defined multiple times, but if the
-    contents differ, it’s undefined which will actually be used.
-    If a key’s content is defined in a `dynamicNode`, it will not be initially
-    used for `restoreNodes` outside that `dynamicNode`. A way around this
-    limitation is defining the content in the `restoreNode` outside the
-    `dynamicNode`.
-
-The content for a key may also be defined in the `opts`-parameter of the
-snippet-constructor, as seen in the example above. The `stored`-table accepts
-the same values as the `nodes`-parameter passed to `r`. If no content is
-defined for a key, it defaults to the empty `insertNode`.
-
-An important-to-know limitation of `restoreNode` is that, for a given key, only
-one may be visible at a time. See this issue
-<https://github.com/L3MON4D3/LuaSnip/issues/234> for details.
-
-The `restoreNode` is especially useful for storing input across updates of a
-`dynamicNode`. Consider this:
-
->lua
-    local function simple_restore(args, _)
-        return sn(nil, {i(1, args[1]), i(2, "user_text")})
-    end
-    
-    s("rest", {
-        i(1, "preset"), t{"",""},
-        d(2, simple_restore, 1)
-    })
-<
-
-Every time the `i(1)` in the outer snippet is changed, the text inside the
-`dynamicNode` is reset to `"user_text"`. This can be prevented by using a
-`restoreNode`:
-
->lua
-    local function simple_restore(args, _)
-        return sn(nil, {i(1, args[1]), r(2, "dyn", i(nil, "user_text"))})
-    end
-    
-    s("rest", {
-        i(1, "preset"), t{"",""},
-        d(2, simple_restore, 1)
-    })
-<
-
-Now the entered text is stored.
-
-`restoreNode`s indent is not influenced by `indentSnippetNodes` right now. If
-that really bothers you feel free to open an issue.
-
-
-==============================================================================
-13. Key Indexer                                          *luasnip-key-indexer*
-
-A very flexible way of referencing nodes (|luasnip-node-reference|). While the
-straightforward way of addressing nodes via their |luasnip-jump-index| suffices
-in most cases, a `dynamic/functionNode` can only depend on nodes in the same
-snippet(Node), its siblings (since the index is interpreted as relative to
-their parent). Accessing a node with a different parent is thus not possible.
-Secondly, and less relevant, only nodes that actually have a jump-index can be
-referred to (a `functionNode`, for example, cannot be depended on). Both of
-these restrictions are lifted with `key_indexer`: It allows addressing nodes by
-their key, which can be set when the node is constructed, and is wholly
-independent of the nodes’ position in the snippet, thus enabling descriptive
-labeling.
-
-The following snippets demonstrate the issue and the solution by using
-`key_indexer`:
-
-First, the addressed problem of referring to nodes outside the `functionNode`s
-parent:
-
->lua
-    s("trig", {
-        i(1), c(2, {
-            sn(nil, {
-                t"cannot access the argnode :(",
-                f(function(args)
-                    return args[1]
-                end, {???}) -- can't refer to i(1), since it isn't a sibling of `f`.
-            }),
-            t"sample_text"
-        })
-    })
-<
-
-And the solution: first give the node we want to refer to a key, and then pass
-the same to the `functionNode`.
-
->lua
-    s("trig", {
-        i(1, "", {key = "i1-key"}), c(2, {
-            sn(nil, { i(1),
-                t"can access the argnode :)",
-                f(function(args)
-                    return args[1]
-                end, k("i1-key") )
-            }),
-            t"sample_text"
-        })
-    })
-<
-
-
-==============================================================================
-14. Absolute Indexer                                *luasnip-absolute-indexer*
-
-`absolute_indexer` allows accessing nodes by their unique jump-index path from
-the snippet-root. This makes it almost as powerful as |luasnip-key-indexer|,
-but again removes the possibility of referring to non-jumpable nodes and makes
-it all a bit more error-prone since the jump-index paths are hard to follow,
-and (unfortunately) have to be a bit verbose (see the long example of
-`absolute_indexer`-positions below). Consider just using |luasnip-key-indexer|
-instead.
-
-(The solution-snippet from |luasnip-key-indexer|, but using `ai` instead.)
-
->lua
-    s("trig", {
-        i(1), c(2, {
-            sn(nil, { i(1),
-                t"can access the argnode :)",
-                f(function(args)
-                    return args[1]
-                end, ai(1) )
-            }),
-            t"sample_text"
-        })
-    })
-<
-
-There are some quirks in addressing nodes:
-
->lua
-    s("trig", {
-        i(2), -- ai[2]: indices based on jump-index, not position.
-        sn(1, { -- ai[1]
-            i(1), -- ai[1][1]
-            t"lel", -- not addressable.
-            i(2) -- ai[1][2]
-        }),
-        c(3, { -- ai[3]
-            i(nil), -- ai[3][1]
-            t"lel", -- ai[3][2]: choices are always addressable.
-        }),
-        d(4, function() -- ai[4]
-            return sn(nil, { -- ai[4][0]
-                i(1), -- ai[4][0][1]
-            })
-        end, {}),
-        r(5, "restore_key", -- ai[5]
-            i(1) -- ai[5][0][1]: restoreNodes always store snippetNodes.
-        ),
-        r(6, "restore_key_2", -- ai[6]
-            sn(nil, { -- ai[6][0]
-                i(1) -- ai[6][0][1]
-            })
-        )
-    })
-<
-
-Note specifically that the index of a dynamicNode differs from that of the
-generated snippetNode, and that restoreNodes (internally) always store a
-snippetNode, so even if the restoreNode only contains one node, that node has
-to be accessed as `ai[restoreNodeIndx][0][1]`.
-
-`absolute_indexer`s’ can be constructed in different ways:
-
-- `ai[1][2][3]`
-- `ai(1, 2, 3)`
-- `ai{1, 2, 3}`
-
-are all the same node.
-
-
-==============================================================================
-15. MultiSnippet                                        *luasnip-multisnippet*
-
-There are situations where it might be comfortable to access a snippet in
-different ways. For example, one might want to enable auto-triggering in
-regions where the snippets usage is common, while leaving it manual-only in
-others. This is where `ms` should be used: A single snippet can be associated
-with multiple `context`s (the `context`-table determines the conditions under
-which a snippet may be triggered). This has the advantage (compared with just
-registering copies) that all `context`s are backed by a single snippet, and not
-multiple, and it’s (at least should be :D) more comfortable to use.
-
-`ms(contexts, nodes, opts) -> addable`:
-
-- `contexts`: table containing list of `contexts`, and some keywords.
-    `context` are described in |luasnip-snippets|, here they may also be tables
-    or strings.
-    So far, there is only one valid keyword:
-    - `common`: Accepts yet another context.
-        The options in `common` are applied to (but don’t override) the other
-        contexts specified in `contexts`.
-- `nodes`: List of nodes, exactly like in |luasnip-snippets|.
-- `opts`: Table, options for this function:
-    - `common_opts`: The snippet-options (see also |luasnip-snippets|) applied
-        to the snippet generated from `nodes`.
-
-The returned object is an `addable`, something which can be passed to
-`add_snippets`, or returned from the lua-loader.
-
-**Examples**:
-
->lua
-    ls.add_snippets("all", {
-        ms({"a", "b"}, {t"a or b"})
-    })
-<
-
->lua
-    ls.add_snippets("all", {
-        ms({
-            common = {snippetType = "autosnippet"},
-            "a",
-            "b"
-        }, {
-            t"a or b (but autotriggered!!)"
-        })
-    })
-<
-
->lua
-    ls.add_snippets("all", {
-        ms({
-            common = {snippetType = "autosnippet"},
-            {trig = "a", snippetType = "snippet"},
-            "b",
-            {trig = "c", condition = function(line_to_cursor)
-                return line_to_cursor == ""
-            end}
-        }, {
-            t"a or b (but autotriggered!!)"
-        })
-    })
-<
-
-
-==============================================================================
-16. Extras                                                    *luasnip-extras*
-
-
-LAMBDA                                                 *luasnip-extras-lambda*
-
-A shortcut for `functionNode`s that only do very basic string manipulation.
-
-`l(lambda, argnodes)`:
-
-- `lambda`: An object created by applying string-operations to `l._n`, objects
-    representing the `n`th argnode.
-    For example:
-    - `l._1:gsub("a", "e")` replaces all occurences of "a" in the text of the
-        first argnode with "e", or
-    - `l._1 .. l._2` concatenates text of the first and second argnode.
-        If an argnode contains multiple lines of text, they are concatenated with
-        `"\n"` prior to any operation.
-- `argnodes`, a |luasnip-node-reference|, just like in function- and
-    dynamicNode.
-
-There are many examples for `lambda` in `Examples/snippets.lua`
-
-
-MATCH                                                   *luasnip-extras-match*
-
-`match` can insert text based on a predicate (again, a shorthand for
-`functionNode`).
-
-`match(argnodes, condition, then, else)`:
-
-- `argnode`: A single |luasnip-node-reference|. May not be nil, or
-    a table.
-- `condition` may be either of
-    - `string`: interpreted as a lua pattern. Matched on the `\n`-joined (in case
-        it’s multiline) text of the first argnode (`args[1]:match(condition)`).
-    - `function`: `fn(args, snip) -> bool`: takes the same parameters as the
-        `functionNode`-function, any value other than nil or false is interpreted
-        as a match.
-    - `lambda`: `l._n` is the `\n`-joined text of the nth argnode.
-        Useful if string manipulations have to be performed before the string is matched.
-        Should end with `match`, but any other truthy result will be interpreted
-        as matching.
-- `then` is inserted if the condition matches,
-- `else` if it does not.
-
-Both `then` and `else` can be either text, lambda or function (with the same
-parameters as specified above). `then`’s default-value depends on the
-`condition`:
-
-- `pattern`: Simply the return value from the `match`, e.g. the entire match,
-    or, if there were capture groups, the first capture group.
-- `function`: the return value of the function if it is either a string, or a
-    table (if there is no `then`, the function cannot return a table containing
-    something other than strings).
-- `lambda`: Simply the first value returned by the lambda.
-
-Examples:
-
-- `match(n, "^ABC$", "A")`.
-- `match(n, lambda._1:match(lambda._1:reverse()), "PALINDROME")`
-    >lua
-        s("trig", {
-          i(1), t":",
-          i(2), t"::",
-          m({1, 2}, l._1:match("^"..l._2.."$"), l._1:gsub("a", "e"))
-        })
-    <
-- >lua
-            s("extras1", {
-              i(1), t { "", "" }, m(1, "^ABC$", "A")
-            })
-    <
-    Inserts "A" if the node with jump-index `n` matches "ABC" exactly, nothing
-    otherwise.
-- >lua
-          s("extras2", {
-            i(1, "INPUT"), t { "", "" }, m(1, l._1:match(l._1:reverse()), "PALINDROME")
-          })
-    <
-    Inserts `"PALINDROME"` if i(1) contains a palindrome.
-- >lua
-          s("extras3", {
-            i(1), t { "", "" }, i(2), t { "", "" },
-            m({ 1, 2 }, l._1:match("^" .. l._2 .. "$"), l._1:gsub("a", "e"))
-          })
-    <
-    This inserts the text of the node with jump-index 1, with all occurences of `a`
-    replaced with `e`, if the second insertNode matches the first exactly.
-
-
-REPEAT                                                 *luasnip-extras-repeat*
-
-Inserts the text of the passed node.
-
-`rep(node_reference)` - `node_reference`, a single |luasnip-node-reference|.
-
->lua
-    s("extras4", { i(1), t { "", "" }, extras.rep(1) })
-<
-
-
-PARTIAL                                               *luasnip-extras-partial*
-
-Evaluates a function on expand and inserts its value.
-
-`partial(fn, params...)` - `fn`: any function - `params`: varargs, any, will be
-passed to `fn`.
-
-For example `partial(os.date, "%Y")` inserts the current year on expansion.
-
->lua
-    s("extras5", { extras.partial(os.date, "%Y") })
-<
-
-
-NONEMPTY                                             *luasnip-extras-nonempty*
-
-Inserts text if the referenced node doesn’t contain any text.
-
-`nonempty(node_reference, not_empty, empty)`:
-
-- `node_reference`, a single |luasnip-node-reference|.
-- `not_empty`, `string`: inserted if the node is not empty.
-- `empty`, `string`: inserted if the node is empty.
-
->lua
-    s("extras6", { i(1, ""), t { "", "" }, extras.nonempty(1, "not empty!", "empty!") })
-<
-
-
-DYNAMIC LAMBDA                                 *luasnip-extras-dynamic-lambda*
-
-Pretty much the same as lambda, but it inserts the resulting text as an
-insertNode, and, as such, it can be quickly overridden.
-
-`dynamic_lambda(jump_indx, lambda, node_references)` - `jump_indx`, as usual,
-the jump-indx.
-
-The remaining arguments carry over from lambda.
-
->lua
-    s("extras7", { i(1), t { "", "" }, extras.dynamic_lambda(2, l._1 .. l._1, 1) })
-<
-
-
-FMT                                                       *luasnip-extras-fmt*
-
-Authoring snippets can be quite clunky, especially since every second node is
-probably a `textNode`, inserting a small number of characters between two more
-complicated nodes.
-
-`fmt` can be used to define snippets in a much more readable way. This is
-achieved by borrowing (as the name implies) from `format`-functionality (our
-syntax is very similar to python’s
-<https://docs.python.org/3/library/stdtypes.html#str.format>).
-
-`fmt` accepts a string and a table of nodes. Each occurrence of a delimiter
-pair in the string is replaced by one node from the table, while text outside
-the delimiters is turned into textNodes.
-
-Simple example:
-
->lua
-    ls.add_snippets("all", {
-      -- important! fmt does not return a snippet, it returns a table of nodes.
-      s("example1", fmt("just an {iNode1}", {
-        iNode1 = i(1, "example")
-      })),
-      s("example2", fmt([[
-      if {} then
-        {}
-      end
-      ]], {
-        -- i(1) is at nodes[1], i(2) at nodes[2].
-        i(1, "not now"), i(2, "when")
-      })),
-      s("example3", fmt([[
-      if <> then
-        <>
-      end
-      ]], {
-        -- i(1) is at nodes[1], i(2) at nodes[2].
-        i(1, "not now"), i(2, "when")
-      }, {
-        delimiters = "<>"
-      })),
-      s("example4", fmt([[
-      repeat {a} with the same key {a}
-      ]], {
-        a = i(1, "this will be repeat")
-      }, {
-        repeat_duplicates = true
-      }))
-    })
-<
-
-One important detail here is that the position of the delimiters does not, in
-any way, correspond to the jump-index of the nodes!
-
-`fmt(format:string, nodes:table of nodes, opts:table|nil) -> table of nodes`
-
-- `format`: a string. Occurences of `{<somekey>}` ( `{}` are customizable; more
-    on that later) are replaced with `content[<somekey>]` (which should be a
-    node), while surrounding text becomes `textNode`s.
-    To escape a delimiter, repeat it (`"{{"`).
-    If no key is given (`{}`) are numbered automatically:
-    `"{} ? {} : {}"` becomes `"{1} ? {2} : {3}"`, while
-    `"{} ? {3} : {}"` becomes `"{1} ? {3} : {4}"` (the count restarts at each
-    numbered placeholder).
-    If a key appears more than once in `format`, the node in
-    `content[<duplicate_key>]` is inserted for the first, and copies of it for
-    subsequent occurences.
-- `nodes`: just a table of nodes.
-- `opts`: optional arguments:
-    - `delimiters`: string, two characters. Change `{}` to some other pair, e.g.
-        `"<>"`.
-    - `strict`: Warn about unused nodes (default true).
-    - `trim_empty`: remove empty (`"%s*"`) first and last line in `format`. Useful
-        when passing multiline strings via `[[]]` (default true).
-    - `dedent`: remove indent common to all lines in `format`. Again, makes
-        passing multiline-strings a bit nicer (default true).
-    - `repeat_duplicates`: repeat nodes when a key is reused instead of copying
-        the node if it has a jump-index, refer to |luasnip-basics-jump-index| to
-        know which nodes have a jump-index (default false).
-
-There is also `require("luasnip.extras.fmt").fmta`. This only differs from
-`fmt` by using angle brackets (`<>`) as the default delimiter.
-
-
-CONDITIONS                                         *luasnip-extras-conditions*
-
-This module (`luasnip.extras.condition`) contains functions that can be passed
-to a snippet’s `condition` or `show_condition`. These are grouped accordingly
-into `luasnip.extras.conditions.expand` and `luasnip.extras.conditions.show`:
-
-**expand**:
-
-- `line_begin`: only expand if the cursor is at the beginning of the line.
-
-**show**:
-
-- `line_end`: only expand at the end of the line.
-- `has_selected_text`: only expand if there’s selected text stored after pressing
-    `store_selection_keys`.
-
-Additionally, `expand` contains all conditions provided by `show`.
-
-
-CONDITION OBJECTS ~
-
-`luasnip.extras.conditions` also contains condition objects. These can, just
-like functions, be passed to `condition` or `show_condition`, but can also be
-combined with each other into logical expressions:
-
-- `-c1 -> not c1`
-- `c1 * c2 -> c1 and c2`
-- `c1 + c2 -> c1 or c2`
-- `c1 - c2 -> c1 and not c2`: This is similar to set differences:
-    `A \ B = {a in A | a not in B}`. This makes `-(a + b) = -a - b` an identity
-    representing de Morgan’s law: `not (a or b) = not a and not b`. However,
-    since boolean algebra lacks an additive inverse, `a + (-b) = a - b` does not
-    hold. Thus, this is NOT the same as `c1 + (-c2)`.
-- `c1 ^ c2 -> c1 xor(!=) c2`
-- `c1 % c2 -> c1 xnor(==) c2`: This decision may seem weird, considering how
-    there is an overload for the `==`-operator. Unfortunately, it’s not possible
-    to use this for our purposes (some info
-    here <https://github.com/L3MON4D3/LuaSnip/pull/612#issuecomment-1264487743>),
-    so we decided to make use of a more obscure symbol (which will hopefully avoid
-    false assumptions about its meaning).
-
-This makes logical combinations of conditions very readable. Compare
-
->lua
-    condition = conditions.expand.line_end + conditions.expand.line_begin
-<
-
-with the more verbose
-
->lua
-    condition = function(...) return conditions.expand.line_end(...) or conditions.expand.line_begin(...) end
-<
-
-The conditions provided in `show` and `expand` are already condition objects.
-To create new ones, use
-`require("luasnip.extras.conditions").make_condition(condition_fn)`
-
-
-ON THE FLY-SNIPPETS                       *luasnip-extras-on-the-fly-snippets*
-
-Sometimes it’s desirable to create snippets tailored for exactly the current
-situation. For example inserting repetitive, but just slightly different
-invocations of some function, or supplying data in some schema.
-
-On-the-fly snippets enable exactly this use case: they can be quickly created
-and expanded with as little disruption as possible.
-
-Since they should mainly fast to write and don’t necessarily need all bells
-and whistles, they don’t make use of lsp/textmate-syntax, but a more
-simplistic one:
-
-- `$anytext` denotes a placeholder (`insertNode`) with text "anytext". The text
-    also serves as a unique key: if there are multiple placeholders with the same
-    key, only the first will be editable, the others will just mirror it.
-- … That’s it. `$` can be escaped by preceding it with a second `$`, all other
-    symbols will be interpreted literally.
-
-There is currently only one way to expand on-the-fly snippets:
-`require('luasnip.extras.otf').on_the_fly("<some-register>")` will interpret
-whatever text is in the register `<some-register>` as a snippet, and expand it
-immediately. The idea behind this mechanism is that it enables a very immediate
-way of supplying and retrieving (expanding) the snippet: write the snippet-body
-into the buffer, cut/yank it into some register, and call
-`on_the_fly("<register>")` to expand the snippet.
-
-Here’s one set of example keybindings:
-
->vim
-    " in the first call: passing the register is optional since `on_the_fly`
-    " defaults to the unnamed register, which will always contain the previously cut
-    " text.
-    vnoremap <c-f>  "ec<cmd>lua require('luasnip.extras.otf').on_the_fly("e")<cr>
-    inoremap <c-f>  <cmd>lua require('luasnip.extras.otf').on_the_fly("e")<cr>
-<
-
-Obviously, `<c-f>` is arbritary and can be changed to any other key combo.
-Another interesting application is allowing multiple on-the-fly snippets at the
-same time by retrieving snippets from multiple registers:
-
->vim
-    " For register a
-    vnoremap <c-f>a  "ac<cmd>lua require('luasnip.extras.otf').on_the_fly()<cr>
-    inoremap <c-f>a  <cmd>lua require('luasnip.extras.otf').on_the_fly("a")<cr>
-    
-    
-    " For register b
-    vnoremap <c-f>a  "bc<cmd>:lua require('luasnip.extras.otf').on_the_fly()<cr>
-    inoremap <c-f>b  <cmd>lua require('luasnip.extras.otf').on_the_fly("b")<cr>
-<
-
-
-SELECT_CHOICE                                   *luasnip-extras-select_choice*
-
-It’s possible to leverage `vim.ui.select` for selecting a choice directly,
-without cycling through the available choices. All that is needed for this is
-calling `require("luasnip.extras.select_choice")`, most likely via some
-keybind, e.g.
-
->vim
-    inoremap <c-u> <cmd>lua require("luasnip.extras.select_choice")()<cr>
-<
-
-while inside a choiceNode. The `opts.kind` hint for `vim.ui.select` will be set
-to `luasnip`.
-
-
-FILETYPE-FUNCTIONS                         *luasnip-extras-filetype-functions*
-
-Contains some utility functions that can be passed to the `ft_func` or
-`load_ft_func`-settings.
-
-- `from_filetype`: the default for `ft_func`. Simply returns the filetype(s) of
-    the buffer.
-- `from_cursor_pos`: uses treesitter to determine the filetype at the cursor.
-    With that, it’s possible to expand snippets in injected regions, as long as
-    the treesitter parser supports them. If this is used in conjuction with
-    `lazy_load`, extra care must be taken that all the filetypes that can be
-    expanded in a given buffer are also returned by `load_ft_func` (otherwise their
-    snippets may not be loaded). This can easily be achieved with `extend_load_ft`.
-- `extend_load_ft`: `fn(extend_ft:map) -> fn` A simple solution to the problem
-    described above is loading more filetypes than just that of the target buffer
-    when `lazy_load`ing. This can be done ergonomically via `extend_load_ft`:
-    calling it with a table where the keys are filetypes, and the values are the
-    filetypes that should be loaded additionaly returns a function that can be
-    passed to `load_ft_func` and takes care of extending the filetypes properly.
-    >lua
-        ls.setup({
-          load_ft_func =
-              -- Also load both lua and json when a markdown-file is opened,
-              -- javascript for html.
-              -- Other filetypes just load themselves.
-              require("luasnip.extras.filetype_functions").extend_load_ft({
-                  markdown = {"lua", "json"},
-                  html = {"javascript"}
-              })
-        })
-    <
-
-
-POSTFIX-SNIPPET                               *luasnip-extras-postfix-snippet*
-
-Postfix snippets, famously used in rust analyzer
-<https://rust-analyzer.github.io/> and various IDEs, are a type of snippet
-which alters text before the snippet’s trigger. While these can be
-implemented using regTrig snippets, this helper makes the process easier in
-most cases.
-
-The simplest example, which surrounds the text preceeding the `.br` with
-brackets `[]`, looks like:
-
->lua
-    postfix(".br", {
-        f(function(_, parent)
-            return "[" .. parent.snippet.env.POSTFIX_MATCH .. "]"
-        end, {}),
-    })
-<
-
-and is triggered with `xxx.br` and expands to `[xxx]`.
-
-Note the `parent.snippet.env.POSTFIX_MATCH` in the function node. This is
-additional field generated by the postfix snippet. This field is generated by
-extracting the text matched (using a configurable matching string, see below)
-from before the trigger. In the case above, the field would equal `"xxx"`. This
-is also usable within dynamic nodes.
-
-This field can also be used within lambdas and dynamic nodes.
-
->lua
-    postfix(".br", {
-        l("[" .. l.POSTFIX_MATCH .. "]"),
-    })
-<
-
->lua
-    postfix(".brd", {
-        d(1, function (_, parent)
-            return sn(nil, {t("[" .. parent.env.POSTFIX_MATCH .. "]")})
-        end)
-    })
-<
-
-The arguments to `postfix` are identical to the arguments to `s` but with a few
-extra options.
-
-The first argument can be either a string or a table. If it is a string, that
-string will act as the trigger, and if it is a table it has the same valid keys
-as the table in the same position for `s` except:
-
-- `wordTrig`: This key will be ignored if passed in, as it must always be
-    false for postfix snippets.
-- `match_pattern`: The pattern that the line before the trigger is matched
-    against. The default match pattern is `"[%w%.%_%-]+$"`. Note the `$`. This
-    matches since only the line _up until_ the beginning of the trigger is
-    matched against the pattern, which makes the character immediately
-    preceeding the trigger match as the end of the string.
-
-Some other match strings, including the default, are available from the postfix
-module. `require("luasnip.extras.postfix).matches`:
-
-- `default`: `[%w%.%_%-%"%']+$`
-- `line`: `^.+$`
-
-The second argument is identical to the second argument for `s`, that is, a
-table of nodes.
-
-The optional third argument is the same as the third (`opts`) argument to the
-`s` function, but with one difference:
-
-The postfix snippet works using a callback on the pre_expand event of the
-snippet. If you pass a callback on the pre_expand event (structure example
-below) it will get run after the builtin callback.
-
->lua
-    {
-        callbacks = {
-        [-1] = {
-            [events.pre_expand] = function(snippet, event_args)
-            -- function body to match before the dot
-            -- goes here
-            end
-            }
-        }
-    }
-<
-
-
-TREESITTER-POSTFIX-SNIPPET         *luasnip-extras-treesitter-postfix-snippet*
-
-Instead of triggering a postfix-snippet when some pattern matches in front of
-the trigger, it might be useful to match if some specific treesitter-nodes
-surround/are in front of the trigger. While this functionality can also be
-implemented by a cusutom `resolveExpandParams`, this helper simplifies the
-common cases.
-
-This matching of treesitter-nodes can be done either
-
-- by providing a query and the name of the capture that should be in front of
-    the trigger (in most cases, the complete match, but requiring specific nodes
-    before/after the matched node may be useful as well), or
-- by providing a function that manually walks the node-tree, and returns the
-    node in front of the trigger on success (for increased flexibility).
-
-A simple example, which surrounds the previous node’s text preceeding the
-`.mv` with `std::move()` in cpp files, looks like:
-
->lua
-    local treesitter_postfix = require("luasnip.extras.treesitter_postfix").treesitter_postfix
-    
-    treesitter_postfix({
-        trig = ".mv",
-        matchTSNode = {
-            query = [[
-                [
-                  (call_expression)
-                  (identifier)
-                  (template_function)
-                  (subscript_expression)
-                  (field_expression)
-                  (user_defined_literal)
-                ] @prefix
-            ]]
-            query_lang = "cpp"
-        },
-    },{
-        f(function(_, parent)
-            local node_content = table.concat(parent.snippet.env.LS_TSMATCH, '\n')
-            local replaced_content = ("std::move(%s)"):format(node_content)
-            return vim.split(ret_str, "\n", { trimempty = false })
-        end)
-    })
-<
-
-`LS_TSMATCH` is the treesitter-postfix equivalent to `POSTFIX_MATCH`, and is
-populated with the match (in this case the text of a treesitter-node) in front
-of the trigger.
-
-The arguments to `treesitter_postfix` are identical to the arguments to `s` but
-with a few extra options.
-
-The first argument has to be a table, which defines at least `trig` and
-`matchTSNode`. All keys from the regular `s` may be set here (except for
-`wordTrig`, which will be ignored), and additionally the following:
-
-- `reparseBuffer`, `string?`: Sometimes the trigger may interfere with
-    treesitter recognizing queries correctly. With this option, the trigger may
-    either be removed from the live-buffer (`"live"`), from a copy of the buffer
-    (`"copy"`), or not at all (`nil`).
-- `matchTSNode`: How to determine whether there is a matching node in front of
-    the cursor. There are two options:
-    - `fun(parser: LuaSnip.extra.TSParser, pos: { [1]: number, [2]: number }): LuaSnip.extra.NamedTSMatch?, TSNode?   Manually determine whether there is a matching node that ends just before`pos`(the beginning of the trigger).     Return`nil,nil`if there is no match, otherwise first return a table   mapping names to nodes (the text, position and type of these will be   provided via`snip.env`), and second the node that is the matched node.
-    - `LuaSnip.extra.MatchTSNodeOpts`, which represents a query and provides all
-        captures of the matched pattern in `NamedTSMatch`. It contains the following
-        options:
-        - `query`, `string`: The query, in textual form.
-        - `query_name`, `string`: The name of the runtime-query to be used (passed
-            to `query.get()`), defaults to `"luasnip"` (so one could create a
-            file which only contains queries used by luasnip, like
-            `$CONFDIR/queries/<lang>/luasnip.scm`, which might make sense to define
-            general concepts independent of a single snippet).
-            `query` and `query_name` are mutually exclusive, only one of both shall be
-            defined.
-        - `query_lang`, `string`: The language of the query. This is the only
-            required parameter to this function, since there’s no sufficiently
-            straightforward way to determine the language of the query for us.
-            Consider using `extend_override` to define a `ts_postfix`-function that
-            automatically fills in the language for the filetype of the snippet-file.
-        - `match_captures`, `string|string[]`: The capture(s) to use for determining
-            the actual prefix (so the node that should be immediately in front of the
-            trigger). This defaults to just `"prefix"`.
-        - `select`, `string?|fun(): LuaSnip.extra.MatchSelector`: Since there may be
-            multiple matching captures in front of the cursor, there has to be some
-            way to select the node that will actually be used.
-            If this is a string, it has to be one of "any", "shortest", or "longest",
-            which mean that any, the shortest, or the longest match is used.
-            If it is a function, it must return a table with two fields, `record` and
-            `retrieve`. `record` is called with a TSMatch and a potential node for the
-            ts-match, and may return `true` to abort the selection-procedure.
-            `retrieve` must return either a TSMatch-TSNode-tuple (which is used as the
-            match) or `nil`, to signify that there is no match.
-            `lua/luasnip/extras/_treesitter.lua` contains the table
-            `builtin_tsnode_selectors`, which contains the implementations for
-            any/shortest/longest, which can be used as examples for more complicated
-            custom-selectors.
-
-The text of the matched node can be accessed as `snip.env.LS_TSMATCH`. The text
-of the nodes returned as `NamedTSMatch` can be accessed as
-`snip.env.LS_TSCAPTURE_<node-name-in-caps>`, and their range and type as
-`snip.env.LS_TSDATA.<node-name-NOT-in-caps>.range/type` (where range is a tuple
-of row-col-tuples, both 0-indexed).
-
-For a query like
-
->scm
-    (function_declaration
-      name: (identifier) @fname
-      parameters: (parameters) @params
-      body: (block) @body
-    ) @prefix
-<
-
-matched against
-
->lua
-    function add(a, b)
-        return a + b
-    end
-<
-
-`snip.env` would contain:
-
-- `LS_TSMATCH`: `{ "function add(a, b)", "\treturn a + b", "end" }`
-- `LS_TSDATA`:
-    >lua
-        {
-          body = {
-            range = { { 1, 1 }, { 1, 13 } },
-            type = "block"
-          },
-          fname = {
-            range = { { 0, 9 }, { 0, 12 } },
-            type = "identifier"
-          },
-          params = {
-            range = { { 0, 12 }, { 0, 18 } },
-            type = "parameters"
-          },
-          prefix = {
-            range = { { 0, 0 }, { 2, 3 } },
-            type = "function_declaration"
-          }
-        }
-    <
-- `LS_TSCAPTURE_FNAME`: `{ "add" }`
-- `LS_TSCAPTURE_PARAMS`: `{ "(a, b)" }`
-- `LS_TSCAPTURE_BODY`: `{ "return a + b" }`
-- `LS_TSCAPTURE_PREFIX`: `{ "function add(a, b)", "\treturn a + b", "end" }`
-
-(note that all variables containing text of nodes are string-arrays, one entry
-for each line)
-
-There is one important caveat when accessing `LS_TSDATA` in
-function/dynamicNodes: It won’t contain the values as specified here while
-generating docstrings (in fact, it won’t even be a table). Since docstrings
-have to be generated without any runtime-information, we just have to provide
-dummy-data in `env`, which will be some kind of string related to the name of
-the env-variable. Since the structure of `LS_TSDATA` obviously does not fit
-that model, we can’t really handle it in a nice way (at least yet). So, for
-now, best include a check like `local static_evaluation = type(env.LS_TSDATA)
-== "string"`, and behave accordingly if `static_evaluation` is true (for
-example, return some value tailored for displaying it in a docstring).
-
-One more example, which actually uses a few captures:
-
->lua
-    ts_post({
-        matchTSNode = {
-            query = [[
-                (function_declaration
-                  name: (identifier) @fname
-                  parameters: (parameters) @params
-                  body: (block) @body
-                ) @prefix
-            ]],
-            query_lang = "lua",
-        },
-        trig = ".var"
-    }, fmt([[
-        local {} = function{}
-            {}
-        end
-    ]], {
-        l(l.LS_TSCAPTURE_FNAME),
-        l(l.LS_TSCAPTURE_PARAMS),
-        l(l.LS_TSCAPTURE_BODY),
-    }))
-<
-
-The module `luasnip.extras.treesitter_postfix` contains a few functions that
-may be useful for creating more efficient ts-postfix-snippets. Nested in
-`builtin.tsnode_matcher` are:
-
-- `fun find_topmost_types(types: string[]): MatchTSNodeFunc`: Generates
-    a `LuaSnip.extra.MatchTSNodeFunc` which returns the last parent whose type
-    is in `types`.
-- `fun find_first_types(types: string[]): MatchTSNodeFunc`: Similar to
-    `find_topmost_types`, only this one matches the first parent whose type is in
-    types.
-- `find_nth_parent(n: number): MatchTSNodeFunc`: Simply matches the `n`-th
-    parent of the innermost node infront of the trigger.
-
-With `find_topmost_types`, the first example can be implemented more
-efficiently (without needing a whole query):
-
->lua
-    local postfix_builtin = require("luasnip.extras.treesitter_postfix").builtin
-    
-    ls.add_snippets("all", {
-        ts_post({
-            matchTSNode = postfix_builtin.tsnode_matcher.find_topmost_types({
-                "call_expression",
-                "identifier",
-                "template_function",
-                "subscript_expression",
-                "field_expression",
-                "user_defined_literal"
-            }),
-            trig = ".mv"
-        }, {
-            l(l_str.format("std::move(%s)", l.LS_TSMATCH))
-        })
-    }, {key = "asdf"})
-<
-
-
-SNIPPET LIST                                     *luasnip-extras-snippet-list*
-
->lua
-    local sl = require("luasnip.extras.snippet_list")
-<
-
-Makes an `open` function available to use to open currently available snippets
-in a different buffer/window/tab.
-
-`sl.open(opts:table|nil)`
-
-- `opts`: optional arguments:
-    - `snip_info`: `snip_info(snippet) -> table representation of snippet`
-    - `printer`: `printer(snippets:table) -> any`
-    - `display`: `display(snippets:any)`
-
-Benefits include: syntax highlighting, searching, and customizability.
-
-Simple Example:
-
->lua
-    sl.open()
-<
-
-Customization Examples:
-
->lua
-    -- making our own snip_info
-    local function snip_info(snippet)
-        return { name = snippet.name }
-    end
-    
-    -- using it
-    sl.open({snip_info = snip_info})
-<
-
->lua
-    -- making our own printer
-    local function printer(snippets)
-        local res = ""
-    
-        for ft, snips in pairs(snippets) do
-            res = res .. ft .. "\n"
-            for _, snip in pairs(snips) do
-                res = res .. "    " .. "Name: " .. snip.name .. "\n"
-                res = res .. "    " .. "Desc: " .. snip.description[1] .. "\n"
-                res = res .. "    " .. "Trigger: " .. snip.trigger .. "\n"
-                res = res .. "    ----" .. "\n"
-            end
-        end
-    
-        return res
-    end
-    
-    
-    -- using it
-    sl.open({printer = printer})
-<
-
->lua
-    -- making our own display
-    local function display(printer_result)
-        -- right vertical split
-        vim.cmd("botright vnew")
-    
-        -- get buf and win handle
-        local buf = vim.api.nvim_get_current_buf()
-        local win = vim.api.nvim_get_current_win()
-    
-        -- setting window and buffer options
-        vim.api.nvim_win_set_option(win, "foldmethod", "manual")
-        vim.api.nvim_buf_set_option(buf, "filetype", "javascript")
-    
-        vim.api.nvim_buf_set_option(buf, "buftype", "nofile")
-        vim.api.nvim_buf_set_option(buf, "bufhidden", "wipe")
-        vim.api.nvim_buf_set_option(buf, "buflisted", false)
-    
-        vim.api.nvim_buf_set_name(buf, "Custom Display buf " .. buf)
-    
-        -- dump snippets
-        local replacement = vim.split(printer_result)
-        vim.api.nvim_buf_set_lines(buf, 0, 0, false, replacement)
-    end
-    
-    -- using it
-    sl.open({display = display})
-<
-
-There is a **caveat** with implementing your own printer and/or display
-function. The **default** behavior for the printer function is to return a
-string representation of the snippets. The display function uses the results
-from the printer function, therefore by **default** the display function is
-expecting that result to be a string.
-
-However, this doesn’t have to be the case. For example, you can implement
-your own printer function that returns a table representation of the snippets
-**but** you would have to then implement your own display function or some
-other function in order to return the result as a string.
-
-An `options` table, which has some core functionality that can be used to
-customize 'common' settings, is provided.
-
-- `sl.options`: options table:
-    - `display`: `display(opts:table|nil) -> function(printer_result:string)`
-
-You can see from the example above that making a custom display is a fairly
-involved process. What if you just wanted to change a buffer option like the
-name or just the filetype? This is where `sl.options.display` comes in. It
-allows you to customize buffer and window options while keeping the default
-behavior.
-
-`sl.options.display(opts:table|nil) -> function(printer_result:string)`
-
-- `opts`: optional arguments:
-    - `win_opts`: `table which has a {window_option = value} form`
-    - `buf_opts`: `table which has a {buffer_option = value} form`
-    - `get_name`: `get_name(buf) -> string`
-
-Let’s recreate the custom display example above:
-
->lua
-    -- keeping the default display behavior but modifying window/buffer
-    local modified_default_display = sl.options.display({
-            buf_opts = {filetype = "javascript"},
-            win_opts = {foldmethod = "manual"},
-            get_name = function(buf) return "Custom Display buf " .. buf end
-        })
-    
-    -- using it
-    sl.open({display = modified_default_display})
-<
-
-
-SNIPPET LOCATION                             *luasnip-extras-snippet-location*
-
-This module can consume a snippets |luasnip-source|, more specifically, jump to
-the location referred by it. This is primarily implemented for snippet which
-got their source from one of the loaders, but might also work for snippets
-where the source was set manually.
-
-`require("luasnip.extras.snip_location")`:
-
-- `snip_location.jump_to_snippet(snip, opts)`
-    Jump to the definition of `snip`.
-    - `snip`: a snippet with attached source-data.
-    - `opts`: `nil|table`, optional arguments, valid keys are:
-        - `hl_duration_ms`: `number`, duration for which the definition should be highlighted,
-            in milliseconds. 0 disables the highlight.
-        - `edit_fn`: `function(file)`, this function will be called with the file
-            the snippet is located in, and is responsible for jumping to it.
-            We assume that after it has returned, the current buffer contains `file`.
-- `snip_location.jump_to_active_snippet(opts)`
-    Jump to definition of active snippet.
-    - `opts`: `nil|table`, accepts the same keys as the `opts`-parameter of
-        `jump_to_snippet`.
-
-
-==============================================================================
-17. Extend Decorator                                *luasnip-extend-decorator*
-
-Most of luasnip’s functions have some arguments to control their behaviour.
-Examples include `s`, where `wordTrig`, `regTrig`, … can be set in the first
-argument to the function, or `fmt`, where the delimiter can be set in the third
-argument. This is all good and well, but if these functions are often used with
-non-default settings, it can become cumbersome to always explicitly set them.
-
-This is where the `extend_decorator` comes in: it can be used to create
-decorated functions which always extend the arguments passed directly with
-other previously defined ones.
-
-An example:
-
->lua
-    local fmt = require("luasnip.extras.fmt").fmt
-    
-    fmt("{}", {i(1)}) -- -> list of nodes, containing just the i(1).
-    
-    -- when authoring snippets for some filetype where `{` and `}` are common, they
-    -- would always have to be escaped in the format-string. It might be preferable
-    -- to use other delimiters, like `<` and `>`.
-    
-    fmt("<>", {i(1)}, {delimiters = "<>"}) -- -> same as above.
-    
-    -- but it's quite annoying to always pass the `{delimiters = "<>"}`.
-    
-    -- with extend_decorator:
-    local fmt_angle = ls.extend_decorator.apply(fmt, {delimiters = "<>"})
-    fmt_angle("<>", {i(1)}) -- -> same as above.
-    
-    -- the same also works with other functions provided by luasnip, for example all
-    -- node/snippet-constructors and `parse_snippet`.
-<
-
-`extend_decorator.apply(fn, ...)` requires that `fn` is previously registered
-via `extend_decorator.register`. (This is not limited to LuaSnip’s functions;
-although, for usage outside of LuaSnip, best copy the source file:
-`/lua/luasnip/util/extend_decorator.lua`).
-
-`register(fn, ...)`:
-
-- `fn`: the function.
-- `...`: any number of tables. Each specifies how to extend an argument of `fn`.
-    The tables accept:
-    - arg_indx, `number` (required): the position of the parameter to override.
-    - extend, `fn(arg, extend_value) -> effective_arg` (optional): this function
-        is used to extend the args passed to the decorated function.
-        It defaults to a function which just extends the the arg-table with the
-        extend table (accepts `nil`).
-        This extend behaviour is adaptable to accomodate `s`, where the first
-        argument may be string or table.
-
-`apply(fn, ...) -> decorated_fn`:
-
-- `fn`: the function to decorate.
-- `...`: The values to extend with. These should match the descriptions passed
-    in `register` (the argument first passed to `register` will be extended with
-    the first value passed here).
-
-One more example for registering a new function:
-
->lua
-    local function somefn(arg1, arg2, opts1, opts2)
-        -- not important
-    end
-    
-    -- note the reversed arg_indx!!
-    extend_decorator.register(somefn, {arg_indx=4}, {arg_indx=3})
-    local extended = extend_decorator.apply(somefn,
-        {key = "opts2 is extended with this"},
-        {key = "and opts1 with this"})
-    extended(...)
-<
-
-
-==============================================================================
-18. LSP-Snippets                                        *luasnip-lsp-snippets*
-
-LuaSnip is capable of parsing LSP-style snippets using
-`ls.parser.parse_snippet(context, snippet_string, opts)`:
-
->lua
-    ls.parser.parse_snippet({trig = "lsp"}, "$1 is ${2|hard,easy,challenging|}")
-<
-
-`context` can be: - `string|table`: treated like the first argument to `ls.s`,
-`parse_snippet` returns a snippet. - `number`: `parse_snippet` returns a
-snippetNode, with the position `context`. - `nil`: `parse_snippet` returns a
-flat table of nodes. This can be used like `fmt`.
-
-Nested placeholders(`"${1:this is ${2:nested}}"`) will be turned into
-choiceNodes with: - the given snippet(`"this is ${1:nested}"`) and - an empty
-insertNode
-
-This behaviour can be modified by changing `parser_nested_assembler` in
-`ls.setup()`.
-
-LuaSnip will also modify some snippets that it is incapable of representing
-accurately:
-
-- if the `$0` is a placeholder with something other than just text inside
-- if the `$0` is a choice
-- if the `$0` is not an immediate child of the snippet (it could be inside a
-    placeholder: `"${1: $0 }"`)
-
-To remedy those incompatibilities, the invalid `$0` will be replaced with a
-tabstop/placeholder/choice which will be visited just before the new `$0`. This
-new `$0` will be inserted at the (textually) earliest valid position behind the
-invalid `$0`.
-
-`opts` can contain the following keys: - `trim_empty`: boolean, remove empty
-lines from the snippet. Default true. - `dedent`: boolean, remove common indent
-from the snippet’s lines. Default true.
-
-Both `trim_empty` and `dedent` will be disabled for snippets parsed via
-`ls.lsp_expand`: it might prevent correct expansion of snippets sent by lsp.
-
-
-SNIPMATE PARSER                         *luasnip-lsp-snippets-snipmate-parser*
-
-It is furthermore possible to parse SnipMate snippets (this includes support
-for vimscript-evaluation!!)
-
-SnipMate snippets need to be parsed with a different function,
-`ls.parser.parse_snipmate`:
-
->lua
-    ls.parser.parse_snipmate("year", "The year is `strftime('%Y')`")
-<
-
-`parse_snipmate` accepts the same arguments as `parse_snippet`, only the
-snippet body is parsed differently.
-
-
-TRANSFORMATIONS                         *luasnip-lsp-snippets-transformations*
-
-To apply Variable/Placeholder-transformations
-<https://code.visualstudio.com/docs/editor/userdefinedsnippets#_variable-transforms>,
-luasnip needs to apply ECMAScript regexes. This is implemented by relying on
-`jsregexp` <https://github.com/kmarius/jsregexp>.
-
-The easiest (but potentially error-prone) way to install it is by calling `make
-install_jsregexp` in the repo root.
-
-This process can be automated by `packer.nvim`:
-
->lua
-    use { "L3MON4D3/LuaSnip", run = "make install_jsregexp" }
-<
-
-If this fails, first open an issue :P, and then try installing the
-`jsregexp`-luarock. This is also possible via `packer.nvim`, although actual
-usage may require a small workaround, see here
-<https://github.com/wbthomason/packer.nvim/issues/593> or here
-<https://github.com/wbthomason/packer.nvim/issues/358>.
-
-Alternatively, `jsregexp` can be cloned locally, `make`d, and the resulting
-`jsregexp.so` placed in some place where nvim can find it (probably
-`~/.config/nvim/lua/`).
-
-If `jsregexp` is not available, transformations are replaced by a simple copy.
-
-
-==============================================================================
-19. Variables                                              *luasnip-variables*
-
-All `TM_something`-variables are supported with two additions: `LS_SELECT_RAW`
-and `LS_SELECT_DEDENT`. These were introduced because `TM_SELECTED_TEXT` is
-designed to be compatible with VSCode’s behavior, which can be
-counterintuitive when the snippet can be expanded at places other than the
-point where selection started (or when doing transformations on selected text).
-Besides those we also provide `LS_TRIGGER` which contains the trigger of the
-snippet, and `LS_CAPTURE_n` (where n is a positive integer) that contains the
-n-th capture when using a regex with capture groups as `trig` in the snippet
-definition.
-
-All variables can be used outside of lsp-parsed snippets as their values are
-stored in a snippets’ `snip.env`-table:
-
->lua
-    s("selected_text", f(function(args, snip)
-      local res, env = {}, snip.env
-      table.insert(res, "Selected Text (current line is " .. env.TM_LINE_NUMBER .. "):")
-      for _, ele in ipairs(env.LS_SELECT_RAW) do table.insert(res, ele) end
-      return res
-    end, {}))
-<
-
-To use any `*SELECT*` variable, the `store_selection_keys` must be set via
-`require("luasnip").config.setup({store_selection_keys="<Tab>"})`. In this
-case, hitting `<Tab>` while in visual mode will populate the `*SELECT*`-vars
-for the next snippet and then clear them.
-
-
-ENVIRONMENT NAMESPACES              *luasnip-variables-environment-namespaces*
-
-You can also add your own variables by using the `ls.env_namespace(name, opts)`
-where:
-
-- `name`: `string` the names the namespace, can’t contain the character “_”
-- `opts` is a table containing (in every case `EnvVal` is the same as `string|list[string]`:
-    - `vars`: `(fn(name:string)->EnvVal) | map[string, EnvVal]`
-        Is a function that receives a string and returns a value for the var with that name
-        or a table from var name to a value
-        (in this case, if the value is a function it will be executed lazily once per snippet expansion).
-    - `init`: `fn(info: table)->map[string, EnvVal]` Returns
-        a table of variables that will set to the environment of the snippet on expansion,
-        use this for vars that have to be calculated in that moment or that depend on each other.
-        The `info` table argument contains `pos` (0-based position of the cursor on expansion),
-        the `trigger` of the snippet and the `captures` list.
-    - `eager`: `list[string]` names of variables that will be taken from `vars` and appended eagerly (like those in init)
-    - `multiline_vars`: `(fn(name:string)->bool)|map[sting, bool]|bool|string[]` Says if certain vars are a table or just a string,
-        can be a function that get’s the name of the var and returns true if the var is a key,
-        a list of vars that are tables or a boolean for the full namespace, it’s false by default. Refer to
-        issue#510 <https://github.com/L3MON4D3/LuaSnip/issues/510#issuecomment-1209333698> for more information.
-
-The four fields of `opts` are optional but you need to provide either `init` or
-`vars`, and `eager` can’t be without `vars`. Also, you can’t use namespaces
-that override default vars.
-
-A simple example to make it more clear:
-
->lua
-    local function random_lang()
-        return ({"LUA", "VIML", "VIML9"})[math.floor(math.random()/2 + 1.5)]
-    end
-    
-    ls.env_namespace("MY", {vars={ NAME="LuaSnip",  LANG=random_lang }})
-    
-    -- then you can use  $MY_NAME and $MY_LANG in your snippets
-    
-    ls.env_namespace("SYS", {vars=os.getenv, eager={"HOME"}})
-    
-    -- then you can use  $SYS_HOME which was eagerly initialized but also $SYS_USER (or any other system environment var) in your snippets
-    
-    lsp.env_namespace("POS", {init=function(info) return {VAL=vim.inspect(info.pos)} end})
-    
-    -- then you can use  $POS_VAL in your snippets
-    
-    s("custom_env", d(1, function(args, parent)
-      local env = parent.snippet.env
-      return sn(nil, t {
-        "NAME: " .. env.MY_NAME,
-        "LANG: " .. env.MY_LANG,
-        "HOME: " .. env.SYS_HOME,
-        "USER: " .. env.SYS_USER,
-        "VAL: " .. env.POS_VAL
-      })
-    end, {}))
-<
-
-
-LSP-VARIABLES                                *luasnip-variables-lsp-variables*
-
-All variables, even ones added via `env_namespace`, can be accessed in LSP
-snippets as `$VAR_NAME`.
-
-The lsp-spec states:
-
-------------------------------------------------------------------------------
-With `$name` or `${name:default}` you can insert the value of a variable. When
-a variable isn’t set, its default or the empty string is inserted. When a
-variable is unknown (that is, its name isn’t defined) the name of the
-variable is inserted and it is transformed into a placeholder.
-
-------------------------------------------------------------------------------
-The above necessiates a differentiation between `unknown` and `unset`
-variables:
-
-For LuaSnip, a variable `VARNAME` is `unknown` when `env.VARNAME` returns `nil`
-and `unset` if it returns an empty string.
-
-Consider this when adding env-variables which might be used in LSP snippets.
-
-
-==============================================================================
-20. Loaders                                                  *luasnip-loaders*
-
-Luasnip is capable of loading snippets from different formats, including both
-the well-established VSCode and SnipMate format, as well as plain Lua files for
-snippets written in Lua.
-
-All loaders (except the vscode-standalone-loader) share a similar interface:
-`require("luasnip.loaders.from_{vscode,snipmate,lua}").{lazy_,}load(opts:table|nil)`
-
-where `opts` can contain the following keys:
-
-- `paths`: List of paths to load. Can be a table, or a single
-    comma-separated string.
-    The paths may begin with `~/` or `./` to indicate that the path is
-    relative to your `$HOME` or to the directory where your `$MYVIMRC` resides
-    (useful to add your snippets).
-    If not set, `runtimepath` is searched for
-    directories that contain snippets. This procedure differs slightly for
-    each loader:
-    - `lua`: the snippet-library has to be in a directory named
-        `"luasnippets"`.
-    - `snipmate`: similar to lua, but the directory has to be `"snippets"`.
-    - `vscode`: any directory in `runtimepath` that contains a
-        `package.json` contributing snippets.
-- `lazy_paths`: behaves essentially like `paths`, with two exceptions: if it is
-    `nil`, it does not default to `runtimepath`, and the paths listed here do not
-    need to exist, and will be loaded on creation.
-    LuaSnip will do its best to determine the path that this should resolve to,
-    but since the resolving we do is not very sophisticated it may produce
-    incorrect paths. Definitely check the log if snippets are not loaded as
-    expected.
-- `exclude`: List of languages to exclude, empty by default.
-- `include`: List of languages to include, includes everything by default.
-- `{override,default}_priority`: These keys are passed straight to the
-    `add_snippets`-calls (documented in |luasnip-api|) and can therefore change the
-    priority of snippets loaded from some colletion (or, in combination with
-    `{in,ex}clude`, only some of its snippets).
-- `fs_event_providers`: `table<string, boolean>?`, specifies which mechanisms
-    should be used to watch files for updates/creation.
-    If `autocmd` is set to `true`, a `BufWritePost`-hook watches files of this
-    collection, if `libuv` is set, the file-watcher-api exposed by libuv is used
-    to watch for updates.
-    Use `libuv` if you want snippets to update from other neovim-instances, and
-    `autocmd` if the collection resides on a filesystem where the libuv-watchers
-    may not work correctly. Or, of course, just enable both :D
-    By default, only `autocmd` is enabled.
-
-While `load` will immediately load the snippets, `lazy_load` will defer loading
-until the snippets are actually needed (whenever a new buffer is created, or
-the filetype is changed luasnip actually loads `lazy_load`ed snippets for the
-filetypes associated with this buffer. This association can be changed by
-customizing `load_ft_func` in `setup`: the option takes a function that, passed
-a `bufnr`, returns the filetypes that should be loaded (`fn(bufnr) -> filetypes
-(string[])`)).
-
-All of the loaders support reloading, so simply editing any file contributing
-snippets will reload its snippets (according to `fs_event_providers` in the
-instance where the file was edited, or in other instances as well).
-
-As an alternative (or addition) to automatic reloading, luasnip can also
-process manual updates to files: Call
-`require("luasnip.loaders").reload_file(path)` to reload the file at `path`.
-This may be useful when the collection is controlled by some other plugin, or
-when enabling the other reload-mechanisms is for some reason undesirable
-(performance? minimalism?).
-
-For easy editing of these files, LuaSnip provides a `vim.ui.select`-based
-dialog (|luasnip-loaders-edit_snippets|) where first the filetype, and then the
-file can be selected.
-
-
-SNIPPET-SPECIFIC FILETYPES        *luasnip-loaders-snippet-specific-filetypes*
-
-Some loaders (vscode,lua) support giving snippets generated in some file their
-own filetype (vscode via `scope`, lua via the underlying `filetype`-option for
-snippets). These snippet-specific filetypes are not considered when determining
-which files to `lazy_load` for some filetype, this is exclusively determined by
-the `language` associated with a file in vscodes’ `package.json`, and the
-file/directory-name in lua.
-
-- This can be resolved relatively easily in vscode, where the `language`
-    advertised in `package.json` can just be a superset of the `scope`s in the file.
-- Another simplistic solution is to set the language to `all` (in lua, it might
-    make sense to create a directory `luasnippets/all/*.lua` to group these files
-    together).
-- Another approach is to modify `load_ft_func` to load a custom filetype if the
-    snippets should be activated, and store the snippets in a file for that
-    filetype. This can be used to group snippets by e.g. framework, and load them
-    once a file belonging to such a framework is edited.
-
-**Example**: `react.lua`
-
->lua
-    return {
-        s({filetype = "css", trig = ...}, ...),
-        s({filetype = "html", trig = ...}, ...),
-        s({filetype = "js", trig = ...}, ...),
-    }
-<
-
-`luasnip_config.lua`
-
->lua
-    load_ft_func = function(bufnr)
-        if "<bufnr-in-react-framework>" then
-            -- will load `react.lua` for this buffer
-            return {"react"}
-        else
-            return require("luasnip.extras.filetype_functions").from_filetype_load
-        end
-    end
-<
-
-See the |luasnip-troubleshooting-adding-snippets-loaders| section if one is
-having issues adding snippets via loaders.
-
-
-VS-CODE                                              *luasnip-loaders-vs-code*
-
-As a reference on the structure of these snippet libraries, see
-`friendly-snippets` <https://github.com/rafamadriz/friendly-snippets>.
-
-We support a small extension: snippets can contain LuaSnip-specific options in
-the `luasnip`-table:
-
->json
-    "example1": {
-        "prefix": "options",
-        "body": [
-            "whoa! :O"
-        ],
-        "luasnip": {
-            "priority": 2000,
-            "autotrigger": true,
-            "wordTrig": false
-        }
-    }
-<
-
-Files with the extension `jsonc` will be parsed as `jsonc`, json with comments
-<https://code.visualstudio.com/docs/languages/json#_json-with-comments>, while
-`*.json` are parsed with a regular `json` parser, where comments are
-disallowed. (the json-parser is a bit faster, so don’t default to `jsonc` if
-it’s not necessary).
-
-**Example**:
-
-`~/.config/nvim/my_snippets/package.json`:
-
->json
-    {
-        "name": "example-snippets",
-        "contributes": {
-            "snippets": [
-                {
-                    "language": [
-                        "all"
-                    ],
-                    "path": "./snippets/all.json"
-                },
-                {
-                    "language": [
-                        "lua"
-                    ],
-                    "path": "./lua.json"
-                }
-            ]
-        }
-    }
-<
-
-`~/.config/nvim/my_snippets/snippets/all.json`:
-
->json
-    {
-        "snip1": {
-            "prefix": "all1",
-            "body": [
-                "expands? jumps? $1 $2 !"
-            ]
-        },
-        "snip2": {
-            "prefix": "all2",
-            "body": [
-                "multi $1",
-                "line $2",
-                "snippet$0"
-            ]
-        }
-    }
-<
-
-`~/.config/nvim/my_snippets/lua.json`:
-
->json
-    {
-        "snip1": {
-            "prefix": "lua",
-            "body": [
-                "lualualua"
-            ]
-        }
-    }
-<
-
-This collection can be loaded with any of
-
->lua
-    -- don't pass any arguments, luasnip will find the collection because it is
-    -- (probably) in rtp.
-    require("luasnip.loaders.from_vscode").lazy_load()
-    -- specify the full path...
-    require("luasnip.loaders.from_vscode").lazy_load({paths = "~/.config/nvim/my_snippets"})
-    -- or relative to the directory of $MYVIMRC
-    require("luasnip.loaders.from_vscode").load({paths = "./my_snippets"})
-<
-
-
-STANDALONE ~
-
-Beside snippet-libraries provided by packages, vscode also supports another
-format which can be used for project-local snippets, or user-defined snippets,
-`.code-snippets`.
-
-The layout of these files is almost identical to that of the package-provided
-snippets, but there is one additional field supported in the
-snippet-definitions, `scope`, with which the filetype of the snippet can be
-set. If `scope` is not set, the snippet will be added to the global filetype
-(`all`).
-
-`require("luasnip.loaders.from_vscode").load_standalone(opts)`
-
-- `opts`: `table`, can contain the following keys:
-    - `path`: `string`, Path to the `*.code-snippets`-file that should be loaded.
-        Just like the paths in `load`, this one can begin with a `"~/"` to be
-        relative to `$HOME`, and a `"./"` to be relative to the
-        neovim-config-directory.
-    - `{override,default}_priority`: These keys are passed straight to the
-        `add_snippets`-calls (documented in |luasnip-api|) and can be used to change
-        the priority of the loaded snippets.
-    - `lazy`: `boolean`, if it is set, the file does not have to exist when
-        `load_standalone` is called, and it will be loaded on creation.
-        `false` by default.
-
-**Example**: `a.code-snippets`:
-
->jsonc
-    {
-        // a comment, since `.code-snippets` may contain jsonc.
-        "c/cpp-snippet": {
-            "prefix": [
-                "trigger1",
-                "trigger2"
-            ],
-            "body": [
-                "this is $1",
-                "my snippet $2"
-            ],
-            "description": "A description of the snippet.",
-            "scope": "c,cpp"
-        },
-        "python-snippet": {
-            "prefix": "trig",
-            "body": [
-                "this is $1",
-                "a different snippet $2"
-            ],
-            "description": "Another snippet-description.",
-            "scope": "python"
-        },
-        "global snippet": {
-            "prefix": "trigg",
-            "body": [
-                "this is $1",
-                "the last snippet $2"
-            ],
-            "description": "One last snippet-description.",
-        }
-    }
-<
-
-This file can be loaded by calling
-
->lua
-    require("luasnip.loaders.from_vscode").load_standalone({path = "a.code-snippets"})
-<
-
-
-SNIPMATE                                            *luasnip-loaders-snipmate*
-
-Luasnip does not support the full snipmate format: Only `./{ft}.snippets` and
-`./{ft}/*.snippets` will be loaded. See honza/vim-snippets
-<https://github.com/honza/vim-snippets> for lots of examples.
-
-Like VSCode, the SnipMate format is also extended to make use of some of
-LuaSnip’s more advanced capabilities:
-
->snippets
-    priority 2000
-    autosnippet options
-        whoa :O
-<
-
-**Example**:
-
-`~/.config/nvim/snippets/c.snippets`:
-
->snippets
-    # this is a comment
-    snippet c c-snippet
-        c!
-<
-
-`~/.config/nvim/snippets/cpp.snippets`:
-
->snippets
-    extends c
-    
-    snippet cpp cpp-snippet
-        cpp!
-<
-
-This can, again, be loaded with any of
-
->lua
-    require("luasnip.loaders.from_snipmate").load()
-    -- specify the full path...
-    require("luasnip.loaders.from_snipmate").lazy_load({paths = "~/.config/nvim/snippets"})
-    -- or relative to the directory of $MYVIMRC
-    require("luasnip.loaders.from_snipmate").lazy_load({paths = "./snippets"})
-<
-
-Stuff to watch out for:
-
-- Using both `extends <ft2>` in `<ft1>.snippets` and
-    `ls.filetype_extend("<ft1>", {"<ft2>"})` leads to duplicate snippets.
-- `${VISUAL}` will be replaced by `$TM_SELECTED_TEXT` to make the snippets
-    compatible with LuaSnip
-- We do not implement eval using ` (backtick). This may be implemented in the
-    future.
-
-
-LUA                                                      *luasnip-loaders-lua*
-
-Instead of adding all snippets via `add_snippets`, it’s possible to store
-them in separate files and load all of those. The file-structure here is
-exactly the supported snipmate-structure, e.g. `<ft>.lua` or `<ft>/*.lua` to
-add snippets for the filetype `<ft>`.
-
-There are two ways to add snippets:
-
-- the files may return two lists of snippets, the snippets in the first are all
-    added as regular snippets, while the snippets in the second will be added as
-    autosnippets (both are the defaults, if a snippet defines a different
-    `snippetType`, that will have preference)
-- snippets can also be appended to the global (only for these files - they are
-    not visible anywhere else) tables `ls_file_snippets` and
-    `ls_file_autosnippets`. This can be combined with a custom `snip_env` to define
-    and add snippets with one function call:
-    >lua
-        ls.setup({
-          snip_env = {
-              s = function(...)
-                  local snip = ls.s(...)
-                  -- we can't just access the global `ls_file_snippets`, since it will be
-                  -- resolved in the environment of the scope in which it was defined.
-                  table.insert(getfenv(2).ls_file_snippets, snip)
-              end,
-              parse = function(...)
-                  local snip = ls.parser.parse_snippet(...)
-                  table.insert(getfenv(2).ls_file_snippets, snip)
-              end,
-              -- remaining definitions.
-              ...
-          },
-          ...
-        })
-    <
-    This is more flexible than the previous approach since the snippets don’t
-    have to be collected; they just have to be defined using the above `s` and
-    `parse`.
-
-As defining all of the snippet constructors (`s`, `c`, `t`, …) in every file
-is rather cumbersome, LuaSnip will bring some globals into scope for executing
-these files. By default, the names from `luasnip.config.snip_env`
-<https://github.com/L3MON4D3/LuaSnip/blob/master/lua/luasnip/config.lua#L22-L48>
-will be used, but it’s possible to customize them by setting `snip_env` in
-`setup`.
-
-**Example**:
-
-`~/snippets/all.lua`:
-
->lua
-    return {
-        s("trig", t("loaded!!"))
-    }
-<
-
-`~/snippets/c.lua`:
-
->lua
-    return {
-        s("ctrig", t("also loaded!!"))
-    }, {
-        s("autotrig", t("autotriggered, if enabled"))
-    }
-<
-
-Load via
-
->lua
-    require("luasnip.loaders.from_lua").load({paths = "~/snippets"})
-<
-
-
-RELOADING WHEN EDITING REQUIRE’D FILES ~
-
-While the lua-snippet-files will be reloaded on edit, this does not
-automatically happen if a file the snippet-file depends on (eg. via `require`)
-is changed. Since this still may still be desirable, there are two functions
-exposed when a file is loaded by the lua-loader: `ls_tracked_dofile` and
-`ls_tracked_dopackage`. They perform like `dofile` and (almost like) `require`,
-but both register the loaded file internally as a dependency of the
-snippet-file, so it can be reloaded when the loaded file is edited. As stated,
-`ls_tracked_dofile` behaves exactly like `dofile`, but does the dependency-work
-as well. `ls_tracked_dopackage` mimics `require` in that it does not take a
-path, but a module-name like `"luasnip.loaders.from_lua"`, and then searches
-the `runtimepath/lua`-directories, and path and cpath for the module. Unlike
-`require`, the file will not be cached, since that would complicate the
-reload-on-edit-behaviour.
-
-
-EDIT_SNIPPETS                                  *luasnip-loaders-edit_snippets*
-
-To easily edit snippets for the current session, the files loaded by any loader
-can be quickly edited via
-`require("luasnip.loaders").edit_snippet_files(opts:table|nil)`
-
-When called, it will open a `vim.ui.select`-dialog to select first a filetype,
-and then (if there are multiple) the associated file to edit.
-
-`opts` contains four settings:
-
-- `ft_filter`: `fn(filetype:string) -> bool` Optionally filter initially listed
-    filetypes. `true` -> filetype will be listed, `false` -> not listed. Accepts
-    all filetypes by default.
-- `format`: `fn(file:string, source_name:string) -> string|nil` `file` is simply
-    the path to the file, `source_name` is one of `"lua"`, `"snipmate"` or
-    `"vscode"`. If a string is returned, it is used as the title of the item, `nil`
-    on the other hand will filter out this item. The default simply replaces some
-    long strings (packer-path and config-path) in `file` with shorter, symbolic
-    names (`"$PLUGINS"`, `"$CONFIG"`), but this can be extended to
-    - filter files from some specific source/path
-    - more aggressively shorten paths using symbolic names, e.g.
-        `"$FRIENDLY_SNIPPETS"`. Example: hide the `*.lua` snippet files, and shorten
-        the path with `$LuaSnip`:
-        >lua
-            require "luasnip.loaders" .edit_snippet_files {
-              format = function(file, source_name)
-                if source_name == "lua" then return nil
-                else return file:gsub("/root/.config/nvim/luasnippets", "$LuaSnip")
-                end
-              end
-            }
-        <
-- `edit`: `fn(file:string)` This function is supposed to open the file for
-    editing. The default is a simple `vim.cmd("edit " .. file)` (replace the
-    current buffer), but one could open the file in a split, a tab, or a floating
-    window, for example.
-- `extend`: `fn(ft:string, ft_paths:string[]) -> (string,string)[]` This function
-    can be used to create additional choices for the file-selection.
-    - `ft`: The filetype snippet-files are queried for.
-    - `ft_paths`: list of paths to the known snippet files.
-    The function should return a list of `(string,string)`-tuples. The first of
-    each pair is the label that will appear in the selection-prompt, and the second
-    is the path that will be passed to the `edit()` function if that item was
-    selected.
-    This can be used to create a new snippet file for the current filetype:
-    >lua
-        require("luasnip.loaders").edit_snippet_files {
-        extend = function(ft, paths)
-          if #paths == 0 then
-            return {
-              { "$CONFIG/" .. ft .. ".snippets",
-                string.format("%s/%s.snippets", <PERSONAL_SNIPPETS_FOLDER>, ft) }
-            }
-          end
-        
-          return {}
-        end
-        }
-    <
-
-One comfortable way to call this function is registering it as a command:
-
->vim
-    command! LuaSnipEdit :lua require("luasnip.loaders").edit_snippet_files()
-<
-
-
-==============================================================================
-21. SnippetProxy                                        *luasnip-snippetproxy*
-
-`SnippetProxy` is used internally to alleviate the upfront cost of loading
-snippets from e.g. a SnipMate library or a VSCode package. This is achieved by
-only parsing the snippet on expansion, not immediately after reading it from
-some file. `SnippetProxy` may also be used from Lua directly to get the same
-benefits:
-
-This will parse the snippet on startup:
-
->lua
-    ls.parser.parse_snippet("trig", "a snippet $1!")
-<
-
-while this will parse the snippet upon expansion:
-
->lua
-    local sp = require("luasnip.nodes.snippetProxy")
-    sp("trig", "a snippet $1")
-<
-
-`sp(context, body, opts) -> snippetProxy`
-
-- `context`: exactly the same as the first argument passed to `ls.s`.
-- `body`: the snippet body.
-- `opts`: accepts the same `opts` as `ls.s`, with some additions:
-    - `parse_fn`: the function for parsing the snippet. Defaults to
-        `ls.parser.parse_snippet` (the parser for LSP snippets), an alternative is
-        the parser for SnipMate snippets (`ls.parser.parse_snipmate`).
-
-
-==============================================================================
-22. ext_opts                                                *luasnip-ext_opts*
-
-`ext_opts` can be used to set the `opts` (see `nvim_buf_set_extmark`) of the
-extmarks used for marking node positions, either globally, per snippet or per
-node. This means that they allow highlighting the text inside of nodes, or
-adding virtual text to the line the node begins on.
-
-This is an example for the `node_ext_opts` used to set `ext_opts` of single
-nodes:
-
->lua
-    local ext_opts = {
-        -- these ext_opts are applied when the node is active (e.g. it has been
-        -- jumped into, and not out yet).
-        active = 
-        -- this is the table actually passed to `nvim_buf_set_extmark`.
-        {
-            -- highlight the text inside the node red.
-            hl_group = "GruvboxRed"
-        },
-        -- these ext_opts are applied when the node is not active, but
-        -- the snippet still is.
-        passive = {
-            -- add virtual text on the line of the node, behind all text.
-            virt_text = {{"virtual text!!", "GruvboxBlue"}}
-        },
-        -- visited or unvisited are applied when a node was/was not jumped into.
-        visited = {
-            hl_group = "GruvboxBlue"
-        },
-        unvisited = {
-            hl_group = "GruvboxGreen"
-        },
-        -- and these are applied when both the node and the snippet are inactive.
-        snippet_passive = {}
-    }
-    
-    s("trig", {
-        i(1, "text1", {
-            node_ext_opts = ext_opts
-        }),
-        i(2, "text2", {
-            node_ext_opts = ext_opts
-        })
-    })
-<
-
-In the above example, the text inside the insertNodes is higlighted in green if
-they were not yet visited, in blue once they were, and red while they are. The
-virtual text "virtual text!!" is visible as long as the snippet is active.
-
-To make defining `ext_opts` less verbose, more specific states inherit from
-less specific ones:
-
-- `passive` inherits from `snippet_passive`
-- `visited` and `unvisited` from `passive`
-- `active` from `visited`
-
-To disable a key from a less specific state, it has to be explicitly set to its
-default, e.g. to disable highlighting inherited from `passive` when the node
-is `active`, `hl_group` should be set to `None`.
-
-------------------------------------------------------------------------------
-As stated earlier, these `ext_opts` can also be applied globally or for an
-entire snippet. For this, it’s necessary to specify which kind of node a
-given set of `ext_opts` should be applied to:
-
->lua
-    local types = require("luasnip.util.types")
-    
-    ls.setup({
-        ext_opts = {
-            [types.insertNode] = {
-                active = {...},
-                visited = {...},
-                passive = {...},
-                snippet_passive = {...}
-            },
-            [types.choiceNode] = {
-                active = {...},
-                unvisited = {...}
-            },
-            [types.snippet] = {
-                passive = {...}
-            }
-        }
-    })
-<
-
-The above applies the given `ext_opts` to all nodes of these types, in all
-snippets.
-
->lua
-    local types = require("luasnip.util.types")
-    
-    s("trig", { i(1, "text1"), i(2, "text2") }, {
-        child_ext_opts = {
-            [types.insertNode] = {
-                passive = {
-                    hl_group = "GruvboxAqua"
-                }
-            }
-        }
-    })
-<
-
-However, the `ext_opts` here are only applied to the `insertNodes` inside this
-snippet.
-
-------------------------------------------------------------------------------
-By default, the `ext_opts` actually used for a node are created by extending
-the `node_ext_opts` with the `effective_child_ext_opts[node.type]` of the
-parent, which are in turn the parent’s `child_ext_opts` extended with the
-global `ext_opts` (those set `ls.setup`).
-
-It’s possible to prevent both of these merges by passing
-`merge_node/child_ext_opts=false` to the snippet/node-opts:
-
->lua
-    ls.setup({
-        ext_opts = {
-            [types.insertNode] = {
-                active = {...}
-            }
-        }
-    })
-    
-    s("trig", {
-        i(1, "text1", {
-            node_ext_opts = {
-                active = {...}
-            },
-            merge_node_ext_opts = false
-        }),
-        i(2, "text2")
-    }, {
-        child_ext_opts = {
-            [types.insertNode] = {
-                passive = {...}
-            }
-        },
-        merge_child_ext_opts = false
-    })
-<
-
-------------------------------------------------------------------------------
-The `hl_group` of the global `ext_opts` can also be set via standard highlight
-groups:
-
->lua
-    vim.cmd("hi link LuasnipInsertNodePassive GruvboxRed")
-    vim.cmd("hi link LuasnipSnippetPassive GruvboxBlue")
-    
-    -- needs to be called for resolving the effective ext_opts.
-    ls.setup({})
-<
-
-The names for the used highlight groups are
-`"Luasnip<node>{Passive,Active,SnippetPassive}"`, where `<node>` can be any
-kind of node in PascalCase (or "Snippet").
-
-------------------------------------------------------------------------------
-One problem that might arise when nested nodes are highlighted is that the
-highlight of inner nodes should be visible, e.g. above that of nodes they are
-nested inside.
-
-This can be controlled using the `priority`-key in `ext_opts`. In
-`nvim_buf_set_extmark`, that value is an absolute value, but here it is
-relative to some base-priority, which is increased for each nesting level of
-snippet(Nodes)s.
-
-Both the initial base-priority and its’ increase and can be controlled using
-`ext_base_prio` and `ext_prio_increase`:
-
->lua
-    ls.setup({
-        ext_opts = {
-            [types.insertNode] = {
-                active = {
-                    hl_group = "GruvboxBlue",
-                    -- the priorities should be \in [0, ext_prio_increase).
-                    priority = 1
-                }
-            },
-            [types.choiceNode] = {
-                active = {
-                    hl_group = "GruvboxRed"
-                    -- priority defaults to 0
-                }
-            }
-        }
-        ext_base_prio = 200,
-        ext_prio_increase = 2
-    })
-<
-
-Here the highlight of an insertNode nested directly inside a choiceNode is
-always visible on top of it.
-
-
-==============================================================================
-23. Docstrings                                            *luasnip-docstrings*
-
-Snippet docstrings can be queried using `snippet:get_docstring()`. The function
-evaluates the snippet as if it was expanded regularly, which can be problematic
-if e.g. a dynamicNode in the snippet relies on inputs other than the argument
-nodes. `snip.env` and `snip.captures` are populated with the names of the
-queried variable and the index of the capture respectively
-(`snip.env.TM_SELECTED_TEXT` -> `'$TM_SELECTED_TEXT'`, `snip.captures[1]` ->
-`'$CAPTURES1'`). Although this leads to more expressive docstrings, it can
-cause errors in functions that e.g. rely on a capture being a number:
-
->lua
-    s({trig = "(%d)", regTrig = true}, {
-        f(function(args, snip)
-            return string.rep("repeatme ", tonumber(snip.captures[1]))
-        end, {})
-    })
-<
-
-This snippet works fine because `snippet.captures[1]` is always a number.
-During docstring generation, however, `snippet.captures[1]` is `'$CAPTURES1'`,
-which will cause an error in the functionNode. Issues with `snippet.captures`
-can be prevented by specifying `docTrig` during snippet-definition:
-
->lua
-    s({trig = "(%d)", regTrig = true, docTrig = "3"}, {
-        f(function(args, snip)
-            return string.rep("repeatme ", tonumber(snip.captures[1]))
-        end, {})
-    })
-<
-
-`snippet.captures` and `snippet.trigger` will be populated as if actually
-triggered with `3`.
-
-Other issues will have to be handled manually by checking the contents of e.g.
-`snip.env` or predefining the docstring for the snippet:
-
->lua
-    s({trig = "(%d)", regTrig = true, docstring = "repeatmerepeatmerepeatme"}, {
-        f(function(args, snip)
-            return string.rep("repeatme ", tonumber(snip.captures[1]))
-        end, {})
-    })
-<
-
-Refer to #515 <https://github.com/L3MON4D3/LuaSnip/pull/515> for a better
-example to understand `docTrig` and `docstring`.
-
-
-==============================================================================
-24. Docstring-Cache                                  *luasnip-docstring-cache*
-
-Although generation of docstrings is pretty fast, it’s preferable to not redo
-it as long as the snippets haven’t changed. Using
-`ls.store_snippet_docstrings(snippets)` and its counterpart
-`ls.load_snippet_docstrings(snippets)`, they may be serialized from or
-deserialized into the snippets. Both functions accept a table structsured like
-this: `{ft1={snippets}, ft2={snippets}}`. Such a table containing all snippets
-can be obtained via `ls.get_snippets()`. `load` should be called before any of
-the `loader`-functions as snippets loaded from VSCode style packages already
-have their `docstring` set (`docstrings` wouldn’t be overwritten, but
-there’d be unnecessary calls).
-
-The cache is located at `stdpath("cache")/luasnip/docstrings.json` (probably
-`~/.cache/nvim/luasnip/docstrings.json`).
-
-
-==============================================================================
-25. Events                                                    *luasnip-events*
-
-Events can be used to react to some action inside snippets. These callbacks can
-be defined per snippet (`callbacks`-key in snippet constructor), per-node by
-passing them as `node_callbacks` in `node_opts`, or globally (autocommand).
-
-`callbacks`: `fn(node[, event_args]) -> event_res` All callbacks receive the
-`node` associated with the event and event-specific optional arguments,
-`event_args`. `event_res` is only used in one event, `pre_expand`, where some
-properties of the snippet can be changed. If multiple callbacks return
-`event_res`, we only guarantee that one of them will be effective, not all of
-them.
-
-`autocommand`: Luasnip uses `User`-events. Autocommands for these can be
-registered using
-
->vim
-    au User SomeUserEvent echom "SomeUserEvent was triggered"
-<
-
-or
-
->lua
-    vim.api.nvim_create_autocommand("User", {
-        patter = "SomeUserEvent",
-        command = "echom SomeUserEvent was triggered"
-    })
-<
-
-The node and `event_args` can be accessed through `require("luasnip").session`:
-
-- `node`: `session.event_node`
-- `event_args`: `session.event_args`
-
-**Events**:
-
-- `enter/leave`: Called when a node is entered/left (for example when jumping
-    around in a snippet).
-    `User-event`: `"Luasnip<Node>{Enter,Leave}"`, with `<Node>` in
-    PascalCase, e.g. `InsertNode` or `DynamicNode`.
-    `event_args`: none
-- `change_choice`: When the active choice in a choiceNode is changed.
-    `User-event`: `"LuasnipChangeChoice"`
-    `event_args`: none
-- `pre_expand`: Called before a snippet is expanded. Modifying text is allowed,
-    the expand-position will be adjusted so the snippet expands at the same
-    position relative to existing text.
-    `User-event`: `"LuasnipPreExpand"`
-    `event_args`:
-    - `expand_pos`: `{<row>, <column>}`, position at which the snippet will be
-        expanded. `<row>` and `<column>` are both 0-indexed.
-        `event_res`:
-    - `env_override`: `map string->(string[]|string)`, override or extend the
-        snippet’s environment (`snip.env`).
-
-A pretty useless, beyond serving as an example here, application of these would
-be printing e.g. the node’s text after entering:
-
->lua
-    vim.api.nvim_create_autocmd("User", {
-        pattern = "LuasnipInsertNodeEnter",
-        callback = function()
-            local node = require("luasnip").session.event_node
-            print(table.concat(node:get_text(), "\n"))
-        end
-    })
-<
-
-or some information about expansions:
-
->lua
-    vim.api.nvim_create_autocmd("User", {
-        pattern = "LuasnipPreExpand",
-        callback = function()
-            -- get event-parameters from `session`.
-            local snippet = require("luasnip").session.event_node
-            local expand_position =
-                require("luasnip").session.event_args.expand_pos
-    
-            print(string.format("expanding snippet %s at %s:%s",
-                table.concat(snippet:get_docstring(), "\n"),
-                expand_position[1],
-                expand_position[2]
-            ))
-        end
-    })
-<
-
-
-==============================================================================
-26. Cleanup                                                  *luasnip-cleanup*
-
-The function ls.cleanup() triggers the `LuasnipCleanup` user event, that you
-can listen to do some kind of cleaning in your own snippets; by default it will
-empty the snippets table and the caches of the lazy_load.
-
-
-==============================================================================
-27. Logging                                                  *luasnip-logging*
-
-Luasnip uses logging to report unexpected program states, and information on
-what’s going on in general. If something does not work as expected, taking a
-look at the log (and potentially increasing the loglevel) might give some good
-hints towards what is going wrong.
-
-The log is stored in `<vim.fn.stdpath("log")>/luasnip.log`
-(`<vim.fn.stdpath("cache")>/luasnip.log` for Neovim versions where
-`stdpath("log")` does not exist), and can be opened by calling `ls.log.open()`.
-The loglevel (granularity of reported events) can be adjusted by calling
-`ls.log.set_loglevel("error"|"warn"|"info"|"debug")`. `"debug"` has the highest
-granularity, `"error"` the lowest, the default is `"warn"`.
-
-Once this log grows too large (10MiB, currently not adjustable), it will be
-renamed to `luasnip.log.old`, and a new, empty log created in its place. If
-there already exists a `luasnip.log.old`, it will be deleted.
-
-`ls.log.ping()` can be used to verify the log is working correctly: it will
-print a short message to the log.
-
-
-==============================================================================
-28. Source                                                    *luasnip-source*
-
-It is possible to attach, to a snippet, information about its source. This can
-be done either by the various loaders (if it is enabled in `ls.setup`
-(|luasnip-config-options|, `loaders_store_source`)), or manually. The attached
-data can be used by |luasnip-extras-snippet-location| to jump to the definition
-of a snippet.
-
-It is also possible to get/set the source of a snippet via API:
-
-`ls.snippet_source`:
-
-- `get(snippet) -> source_data`:
-    Retrieve the source-data of `snippet`. `source_data` always contains the key
-    `file`, the file in which the snippet was defined, and may additionally
-    contain `line` or `line_end`, the first and last line of the definition.
-- `set(snippet, source)`:
-    Set the source of a snippet.
-    - `snippet`: a snippet which was added via `ls.add_snippets`.
-    - `source`: a `source`-object, obtained from either `from_debuginfo` or
-        `from_location`.
-- `from_location(file, opts) -> source`:
-    - `file`: `string`, The path to the file in which the snippet is defined.
-    - `opts`: `table|nil`, optional parameters for the source.
-        - `line`: `number`, the first line of the definition. 1-indexed.
-        - `line_end`: `number`, the final line of the definition. 1-indexed.
-- `from_debuginfo(debuginfo) -> source`:
-    Generates source from the table returned by `debug.getinfo` (from now on
-    referred to as `debuginfo`). `debuginfo` has to be of a frame of a function
-    which is backed by a file, and has to contain this information, ie. has to be
-    generated by `debug.get_info(*, "Sl")` (at least `"Sl"`, it may also contain
-    more info).
-
-
-==============================================================================
-29. Config-Options                                    *luasnip-config-options*
-
-These are the settings you can provide to `luasnip.setup()`:
-
-- `keep_roots`: Whether snippet-roots should be linked. See
-    |luasnip-basics-snippet-insertion| for more context.
-- `link_roots`: Whether snippet-roots should be linked. See
-    |luasnip-basics-snippet-insertion| for more context.
-- `exit_roots`: Whether snippet-roots should exit at reaching at their last node,
-    `$0`. This setting is only valid for root snippets, not child snippets. This
-    setting may avoid unexpected behavior by disallowing to jump earlier (finished)
-    snippets. Check |luasnip-basics-snippet-insertion| for more information on
-    snippet-roots.
-- `link_children`: Whether children should be linked. See
-    |luasnip-basics-snippet-insertion| for more context.
-- `history` (deprecated): if not nil, `keep_roots`, `link_roots`, and
-    `link_children` will be set to the value of `history`, and `exit_roots` will
-    set to inverse value of `history`. This is just to ensure
-    backwards-compatibility.
-- `update_events`: Choose which events trigger an update of the active nodes’
-    dependents. Default is just `'InsertLeave'`, `'TextChanged,TextChangedI'` would
-    update on every change. These, like all other `*_events` are passed to
-    `nvim_create_autocmd` as `events`, so they can be wrapped in a table, like
-    >lua
-        ls.setup({
-          update_events = {"TextChanged", "TextChangedI"}
-        })
-    <
-- `region_check_events`: Events on which to leave the current snippet-root if the
-    cursor is outside its’ 'region'. Disabled by default, `'CursorMoved'`,
-    `'CursorHold'` or `'InsertEnter'` seem reasonable.
-- `delete_check_events`: When to check if the current snippet was deleted, and if
-    so, remove it from the history. Off by default, `'TextChanged'` (perhaps
-    `'InsertLeave'`, to react to changes done in Insert mode) should work just fine
-    (alternatively, this can also be mapped using `<Plug>luasnip-delete-check`).
-- `store_selection_keys`: Mapping for populating `TM_SELECTED_TEXT` and related
-    variables (not set by default). If you want to set this mapping yourself, map
-    `ls.select_keys` (not a function, actually a string/key-combination) as a rhs.
-- `enable_autosnippets`: Autosnippets are disabled by default to minimize
-    performance penalty if unused. Set to `true` to enable.
-- `ext_opts`: Additional options passed to extmarks. Can be used to add
-    passive/active highlight on a per-node-basis (more info in DOC.md)
-- `parser_nested_assembler`: Override the default behaviour of inserting a
-    `choiceNode` containing the nested snippet and an empty `insertNode` for nested
-    placeholders (`"${1: ${2: this is nested}}"`). For an example (behaviour more
-    similar to vscode), check here
-    <https://github.com/L3MON4D3/LuaSnip/wiki/Nice-Configs#imitate-vscodes-behaviour-for-nested-placeholders>
-- `ft_func`: Source of possible filetypes for snippets. Defaults to a function,
-    which returns `vim.split(vim.bo.filetype, ".", true)`, but check
-    filetype_functions <lua/luasnip/extras/filetype_functions.lua> or the
-    |luasnip-extras-filetype-functions|-section for more options.
-- `load_ft_func`: Function to determine which filetypes belong to a given buffer
-    (used for `lazy_loading`). `fn(bufnr) -> filetypes (string[])`. Again, there
-    are some examples in filetype_functions
-    <lua/luasnip/extras/filetype_functions.lua>.
-- `snip_env`: The best way to author snippets in lua involves the lua-loader (see
-    |luasnip-loaders-lua|). Unfortunately, this requires that snippets are defined
-    in separate files, which means that common definitions like `s`, `i`, `sn`,
-    `t`, `fmt`, … have to be repeated in each of them, and that adding more
-    customized functions to ease writing snippets also requires some setup.
-    `snip_env` can be used to insert variables into exactly the places where
-    lua-snippets are defined (for now only the file loaded by the lua-loader).
-    Setting `snip_env` to `{ some_global = "a value" }` will add (amongst the
-    defaults stated at the beginning of this documentation) the global variable
-    `some_global` while evaluating these files. There are special keys which, when
-    set in `snip_env` change the behaviour of this option, and are not passed
-    through to the lua-files:
-    - `__snip_env_behaviour`, string: either `"set"` or `"extend"` (default
-        `"extend"`)
-        If this is `"extend"`, the variables defined in `snip_env` will complement (and
-        override) the defaults. If this is not desired, `"set"` will not include the
-        defaults, but only the variables set here.
-    One side-effect of this is that analysis-tools (most likely
-    `lua-language-server`) for lua will generate diagnostics for the usage of
-    undefined symbols. If you mind the (probably) large number of generated
-    warnings, consider adding the undefined globals to the globals recognized by
-    `lua-language-server` or add `---@diagnostic disable: undefined-global`
-    somewhere in the affected files.
-- `loaders_store_source`, boolean, whether loaders should store the source of the
-    loaded snippets. Enabling this means that the definition of any snippet can be
-    jumped to via |luasnip-extras-snippet-location|, but also entails slightly
-    increased memory consumption (and load-time, but it’s not really noticeable).
-
-
-==============================================================================
-30. Troubleshooting                                  *luasnip-troubleshooting*
-
-
-ADDING SNIPPETS                      *luasnip-troubleshooting-adding-snippets*
-
-### Loaders
-
-- **Filetypes**. LuaSnip uses `all` as the global filetype. As most snippet
-    collections don’t explicitly target LuaSnip, they may not provide global
-    snippets for this filetype, but another, like `_` (`honza/vim-snippets`). In
-    these cases, it’s necessary to extend LuaSnip’s global filetype with the
-    collection’s global filetype:
-    >lua
-        ls.filetype_extend("all", { "_" })
-    <
-    In general, if some snippets don’t show up when loading a collection, a good
-    first step is checking the filetype LuaSnip is actually looking into (print
-    them for the current buffer via `:lua
-    print(vim.inspect(require("luasnip").get_snippet_filetypes()))`), against the
-    one the missing snippet is provided for (in the collection). If there is indeed
-    a mismatch, `filetype_extend` can be used to also search the collection’s
-    filetype:
-    >lua
-        ls.filetype_extend("<luasnip-filetype>", { "<collection-filetype>" })
-    <
-- **Non-default ft_func loading**. As we only load `lazy_load`ed snippets on some
-    events, `lazy_load` will probably not play nice when a non-default `ft_func` is
-    used: if it depends on e.g. the cursor position, only the filetypes for the
-    cursor position when the `lazy_load` events are triggered will be loaded. Check
-    |luasnip-extras-filetype-function|’s `extend_load_ft` for a solution.
-
-
-GENERAL ~
-
-- **Snippets sharing triggers**. If multiple snippets could be triggered at the
-    current buffer-position, the snippet that was defined first in one’s
-    configuration will be expanded first. As a small, real-world LaTeX math
-    example, given the following two snippets with triggers `.ov` and `ov`:
-    >lua
-        postfix( -- Insert over-line command to text via post-fix
-            { trig = ".ov", snippetType = "autosnippet" },
-            {
-                f(function(_, parent)
-                    return "\\overline{" .. parent.snippet.env.POSTFIX_MATCH .. "}"
-                end, {}),
-            }
-        ),
-        s( -- Insert over-line command
-            { trig = "ov", snippetType="autosnippet" },
-            fmt(
-                [[\overline{<>}]],
-                { i(1) },
-                { delimiters = "<>" }
-            )
-        ),
-    <
-    If one types `x` followed by `.ov`, the postfix snippet expands producing
-    `\overline{x}`. However, if the `postfix` snippet above is defined _after_ the
-    normal snippet `s`, then the same key press sequence produces `x.\overline{}`.
-    This behaviour can be overridden by explicitly providing a priority to such
-    snippets. For example, in the above code, if the `postfix` snippet was defined
-    after the normal snippet `s`, then adding `priority=1001` to the `postfix`
-    snippet will cause it to expand as if it were defined before the normal snippet
-    `s`. Snippet `priority` is discussed in the Snippets section
-    <https://github.com/L3MON4D3/LuaSnip/blob/master/DOC.md#snippets> of the
-    documentation.
-
-
-==============================================================================
-31. API                                                          *luasnip-api*
-
-`require("luasnip")`:
-
-- `add_snippets(ft:string or nil, snippets:list or table, opts:table or nil)`:
-    Makes `snippets` (list of snippets) available in `ft`. If `ft` is `nil`,
-    `snippets` should be a table containing lists of snippets, the keys are
-    corresponding filetypes. `opts` may contain the following keys:
-    - `type`: type of `snippets`, `"snippets"` or `"autosnippets"` (ATTENTION:
-        plural form used here). This serves as default value for the `snippetType`
-        key of each snippet added by this call see |luasnip-snippets|.
-    - `key`: Key that identifies snippets added via this call.
-        If `add_snippets` is called with a key that was already used, the snippets
-        from that previous call will be removed.
-        This can be used to reload snippets: pass an unique key to each
-        `add_snippets` and just redo the `add_snippets`-call when the snippets have
-        changed.
-    - `override_priority`: set priority for all snippets.
-    - `default_priority`: set priority only for snippets without snippet priority.
-- `clean_invalidated(opts: table or nil) -> bool`: clean invalidated snippets
-    from internal snippet storage. Invalidated snippets are still stored; it might
-    be useful to actually remove them as they still have to be iterated during
-    expansion.
-    `opts` may contain:
-    - `inv_limit`: how many invalidated snippets are allowed. If the number of
-        invalid snippets doesn’t exceed this threshold, they are not yet cleaned up.
-        A small number of invalidated snippets (<100) probably doesn’t affect runtime
-        at all, whereas recreating the internal snippet storage might.
-- `get_id_snippet(id)`: returns snippet corresponding to id.
-- `in_snippet()`: returns true if the cursor is inside the current snippet.
-- `jumpable(direction)`: returns true if the current node has a next(`direction`
-    = 1) or previous(`direction` = -1), e.g. whether it’s possible to jump
-    forward or backward to another node.
-- `jump(direction)`: returns true if the jump was successful.
-- `expandable()`: true if a snippet can be expanded at the current cursor
-    position.
-- `expand(opts)`: expands the snippet at(before) the cursor. `opts` may contain:
-    - `jump_into_func` passed through to `ls.snip_expand`, check its’ doc for a
-        description.
-- `expand_or_jumpable()`: returns `expandable() or jumpable(1)` (exists only
-    because commonly, one key is used to both jump forward and expand).
-- `expand_or_locally_jumpable()`: same as `expand_or_jumpable()` except jumpable
-    is ignored if the cursor is not inside the current snippet.
-- `locally_jumpable(direction)`: same as `jumpable()` except it is ignored if the
-    cursor is not inside the current snippet.
-- `expand_or_jump()`: returns true if jump/expand was succesful.
-- `expand_auto()`: expands the autosnippets before the cursor (not necessary to
-    call manually, will be called via autocmd if `enable_autosnippets` is set in
-    the config).
-- `snip_expand(snip, opts)`: expand `snip` at the current cursor position. `opts`
-    may contain the following keys:
-    - `clear_region`: A region of text to clear after expanding (but before jumping
-        into) snip. It has to be at this point (and therefore passed to this function)
-        as clearing before expansion will populate `TM_CURRENT_LINE` and
-        `TM_CURRENT_WORD` with wrong values (they would miss the snippet trigger) and
-        clearing after expansion may move the text currently under the cursor and have
-        it end up not at the `i(1)`, but a `#trigger` chars to its right. The actual
-        values used for clearing are `from` and `to`, both (0,0)-indexed
-        byte-positions. If the variables don’t have to be populated with the correct
-        values, it’s safe to remove the text manually.
-    - `expand_params`: table, override `trigger`, `captures` or environment of the
-        snippet. This is useful for manually expanding snippets where the trigger
-        passed via `trig` is not the text triggering the snippet, or those which expect
-        `captures` (basically, snippets with a non-plaintext `trigEngine`).
-        One example: ```lua snip_expand(snip, { trigger = "override_trigger", captures
-        = {"first capture", "second capture"}, env_override = { this_key = "some
-        value", other_key = {"multiple", "lines"}, TM_FILENAME =
-        "some_other_filename.lua" } })
-    - `pos`: position (`{line, col}`), (0,0)-indexed (in bytes, as returned by
-        `nvim_win_get_cursor()`), where the snippet should be expanded. The snippet
-        will be put between `(line,col-1)` and `(line,col)`. The snippet will be
-        expanded at the current cursor if pos is nil.
-    - `jump_into_func`: fn(snippet) -> node: Callback responsible for jumping into
-        the snippet. The returned node is set as the new active node, ie. it is the
-        origin of the next jump. The default is basically this: `lua function(snip) --
-        jump_into set the placeholder of the snippet, 1 -- to jump forwards. return
-        snip:jump_into(1)` while this can be used to only insert the snippet: `lua
-        function(snip) return snip.insert_nodes[0] end`
-    - `indent`: bool?, defaults to `true`. Whether LuaSnip will try to add additional
-        indents to fit current indent level in snippet expanding. This option is useful
-        when some LSP server already take indents into consideration. In such cases,
-        LuaSnip should not try to add additional indents. If you are using `nvim-cmp`,
-        sample config:
-        >lua
-            require("cmp").setup {
-              snippet = {
-                expand = function(args)
-                  local indent_nodes = true
-                  if vim.api.nvim_get_option_value("filetype", { buf = 0 }) == "dart" then
-                    indent_nodes = false
-                  end
-                  require("luasnip").lsp_expand(args.body, {
-                    indent = indent_nodes,
-                  })
-                end,
-              },
-            }
-        <
-    `opts` and any of its parameters may be nil.
-- `get_active_snip()`: returns the currently active snippet (not node!).
-- `choice_active()`: true if inside a choiceNode.
-- `change_choice(direction)`: changes the choice in the innermost currently
-    active choiceNode forward (`direction` = 1) or backward (`direction` = -1).
-- `unlink_current()`: removes the current snippet from the jumplist (useful if
-    luasnip fails to automatically detect e.g. deletion of a snippet) and sets the
-    current node behind the snippet, or, if not possible, before it.
-- `lsp_expand(snip_string, opts)`: expands the LSP snippet defined via
-    `snip_string` at the cursor. `opts` can have the same options as `opts` in
-    `snip_expand`.
-- `active_update_dependents()`: update all function/dynamicNodes that have the
-    current node as an argnode (will actually only update them if the text in any
-    of the argnodes changed).
-- `available(snip_info)`: returns a table of all snippets defined for the current
-    filetypes(s) (`{ft1={snip1, snip2}, ft2={snip3, snip4}}`). The structure of the
-    snippet is defined by `snip_info` which is a function (`snip_info(snip)`) that
-    takes in a snippet (`snip`), finds the desired information on it, and returns
-    it. `snip_info` is an optional argument as a default has already been defined.
-    You can use it for more granular control over the table of snippets that is
-    returned.
-- `exit_out_of_region(node)`: checks whether the cursor is still within the range
-    of the root-snippet `node` belongs to. If yes, no change occurs; if no, the
-    root-snippet is exited and its `$0` will be the new active node. If a jump
-    causes an error (happens mostly because the text of a snippet was deleted), the
-    snippet is removed from the jumplist and the current node set to the
-    end/beginning of the next/previous snippet.
-- `store_snippet_docstrings(snippet_table)`: Stores the docstrings of all
-    snippets in `snippet_table` to a file
-    (`stdpath("cache")/luasnip/docstrings.json`). Calling
-    `store_snippet_docstrings(snippet_table)` after adding/modifying snippets and
-    `load_snippet_docstrings(snippet_table)` on startup after all snippets have
-    been added to `snippet_table` is a way to avoide regenerating the (unchanged)
-    docstrings on each startup. (Depending on when the docstrings are required and
-    how luasnip is loaded, it may be more sensible to let them load lazily,
-    e.g. just before they are required). `snippet_table` should be laid out just
-    like `luasnip.snippets` (it will most likely always _be_ `luasnip.snippets`).
-- `load_snippet_docstrings(snippet_table)`: Load docstrings for all snippets in
-    `snippet_table` from `stdpath("cache")/luasnip/docstrings.json`. The docstrings
-    are stored and restored via trigger, meaning if two snippets for one filetype
-    have the same (very unlikely to happen in actual usage), bugs could occur.
-    `snippet_table` should be laid out as described in `store_snippet_docstrings`.
-- `unlink_current_if_deleted()`: Checks if the current snippet was deleted; if
-    so, it is removed from the jumplist. This is not 100% reliable as LuaSnip only
-    sees the extmarks and their beginning/end may not be on the same position, even
-    if all the text between them was deleted.
-- `filetype_extend(filetype:string, extend_filetypes:table of string)`: Tells
-    luasnip that for a buffer with `ft=filetype`, snippets from `extend_filetypes`
-    should be searched as well. `extend_filetypes` is a lua-array (`{ft1, ft2,
-    ft3}`). `luasnip.filetype_extend("lua", {"c", "cpp"})` would search and expand
-    c and cpp snippets for lua files.
-- `filetype_set(filetype:string, replace_filetypes:table of string)`: Similar to
-    `filetype_extend`, but where _append_ appended filetypes, _set_ sets them:
-    `filetype_set("lua", {"c"})` causes only c snippets to be expanded in lua
-    files; lua snippets aren’t even searched.
-- `cleanup()`: clears all snippets. Not useful for regular usage, only when
-    authoring and testing snippets.
-- `refresh_notify(ft:string)`: Triggers an autocmd that other plugins can hook
-    into to perform various cleanup for the refreshed filetype. Useful for
-    signaling that new snippets were added for the filetype `ft`.
-- `set_choice(indx:number)`: Changes to the `indx`th choice. If no `choiceNode`
-    is active, an error is thrown. If the active `choiceNode` doesn’t have an
-    `indx`th choice, an error is thrown.
-- `get_current_choices() -> string[]`: Returns a list of multiline-strings
-    (themselves lists, even if they have only one line), the `i`th string
-    corresponding to the `i`th choice of the currently active `choiceNode`. If no
-    `choiceNode` is active, an error is thrown.
-- `setup_snip_env()`: Adds the variables defined (during `setup`) in `snip_env`
-    to the callers environment.
-- `get_snip_env()`: Returns `snip_env`.
-- `jump_destination(direction)`: Returns the node the next jump in `direction`
-    (either -1 or 1, for backwards, forwards respectively) leads to, or `nil` if
-    the destination could not be determined (most likely because there is no node
-    that can be jumped to in the given direction, or there is no active node).
-- `activate_node(opts)`: Activate a node in any snippet. `opts` contains the
-    following options:
-    - `pos`, `{[1]: row, [2]: byte-column}?`: The position at which a node should
-        be activated. Defaults to the position of the cursor.
-    - `strict`, `bool?`: If set, throw an error if the node under the cursor can’t
-        be jumped into. If not set, fall back to any node of the snippet and enter
-        that instead.
-    - `select`, `bool?`: Whether the text inside the node should be selected.
-        Defaults to true.
-
-Not covered in this section are the various node-constructors exposed by the
-module, their usage is shown either previously in this file or in
-`Examples/snippets.lua` (in the repo).
-
-Generated by panvimdoc <https://github.com/kdheepak/panvimdoc>
-
-vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/ftplugin/snippets.vim b/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/ftplugin/snippets.vim
deleted file mode 100644
index b13cc8af..00000000
--- a/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/ftplugin/snippets.vim
+++ /dev/null
@@ -1,14 +0,0 @@
-" Vim filetype plugin for SnipMate snippets (.snippets files)
-
-if exists("b:did_ftplugin")
-    finish
-endif
-let b:did_ftplugin = 1
-
-let b:undo_ftplugin = "setl et< sts< cms< fdm< fde<"
-
-" Use hard tabs
-setlocal noexpandtab softtabstop=0
-
-setlocal commentstring=#\ %s
-setlocal nospell
diff --git a/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/luasnip-2.3.0-1.rockspec b/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/luasnip-2.3.0-1.rockspec
deleted file mode 100644
index a392685b..00000000
--- a/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/luasnip-2.3.0-1.rockspec
+++ /dev/null
@@ -1,37 +0,0 @@
-local git_ref = 'v2.3.0'
-local modrev = '2.3.0'
-local specrev = '1'
-
-local repo_url = 'https://github.com/L3MON4D3/LuaSnip'
-
-rockspec_format = '3.0'
-package = 'luasnip'
-version = modrev ..'-'.. specrev
-
-description = {
-  summary = 'Snippet Engine for Neovim written in Lua.',
-  detailed = '',
-  labels = { 'lua', 'neovim', 'snippet-engine', 'snippets' } ,
-  homepage = 'https://github.com/L3MON4D3/LuaSnip',
-  license = 'Apache-2.0'
-}
-
-dependencies = { 'lua >= 5.1', 'jsregexp >= 0.0.5, <= 0.0.7' } 
-
-test_dependencies = { }
-
-source = {
-  url = repo_url .. '/archive/' .. git_ref .. '.zip',
-  dir = 'LuaSnip-' .. '2.3.0',
-}
-
-if modrev == 'scm' or modrev == 'dev' then
-  source = {
-    url = repo_url:gsub('https', 'git')
-  }
-end
-
-build = {
-  type = 'builtin',
-  copy_directories = { 'doc', 'ftplugin', 'plugin', 'syntax' } ,
-}
diff --git a/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/plugin/luasnip.lua b/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/plugin/luasnip.lua
deleted file mode 100644
index 420e4c0a..00000000
--- a/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/plugin/luasnip.lua
+++ /dev/null
@@ -1,90 +0,0 @@
-vim.filetype.add({
-	extension = { snippets = "snippets" },
-})
-
-local function silent_map(mode, lhs, rhs, desc)
-	vim.keymap.set(mode, lhs, rhs, { silent = true, desc = desc or "" })
-end
-
-silent_map("i", "<Plug>luasnip-expand-or-jump", function()
-	require("luasnip").expand_or_jump()
-end, "LuaSnip: Expand or jump in the current snippet")
-silent_map("i", "<Plug>luasnip-expand-snippet", function()
-	require("luasnip").expand()
-end, "LuaSnip: Expand the current snippet")
-silent_map("i", "<Plug>luasnip-next-choice", function()
-	require("luasnip").change_choice(1)
-end, "LuaSnip: Change to the next choice from the choiceNode")
-silent_map("i", "<Plug>luasnip-prev-choice", function()
-	require("luasnip").change_choice(-1)
-end, "LuaSnip: Change to the previous choice from the choiceNode")
-silent_map("i", "<Plug>luasnip-jump-next", function()
-	require("luasnip").jump(1)
-end, "LuaSnip: Jump to the next node")
-silent_map("i", "<Plug>luasnip-jump-prev", function()
-	require("luasnip").jump(-1)
-end, "LuaSnip: Jump to the previous node")
-
-silent_map("n", "<Plug>luasnip-delete-check", function()
-	require("luasnip").unlink_current_if_deleted()
-end, "LuaSnip: Removes current snippet from jumplist")
-silent_map("!", "<Plug>luasnip-delete-check", function()
-	require("luasnip").unlink_current_if_deleted()
-end, "LuaSnip: Removes current snippet from jumplist")
-
-silent_map("", "<Plug>luasnip-expand-repeat", function()
-	require("luasnip").expand_repeat()
-end, "LuaSnip: Repeat last node expansion")
-silent_map("!", "<Plug>luasnip-expand-repeat", function()
-	require("luasnip").expand_repeat()
-end, "LuaSnip: Repeat last node expansion")
-
-silent_map("s", "<Plug>luasnip-expand-or-jump", function()
-	require("luasnip").expand_or_jump()
-end, "LuaSnip: Expand or jump in the current snippet")
-silent_map("s", "<Plug>luasnip-expand-snippet", function()
-	require("luasnip").expand()
-end, "LuaSnip: Expand the current snippet")
-silent_map("s", "<Plug>luasnip-next-choice", function()
-	require("luasnip").change_choice(1)
-end, "LuaSnip: Change to the next choice from the choiceNode")
-silent_map("s", "<Plug>luasnip-prev-choice", function()
-	require("luasnip").change_choice(-1)
-end, "LuaSnip: Change to the previous choice from the choiceNode")
-silent_map("s", "<Plug>luasnip-jump-next", function()
-	require("luasnip").jump(1)
-end, "LuaSnip: Jump to the next node")
-silent_map("s", "<Plug>luasnip-jump-prev", function()
-	require("luasnip").jump(-1)
-end, "LuaSnip: Jump to the previous node")
-
-vim.api.nvim_create_user_command("LuaSnipUnlinkCurrent", function()
-	require("luasnip").unlink_current()
-end, { force = true })
-
---stylua: ignore
-vim.api.nvim_create_user_command("LuaSnipListAvailable", function()
-	(
-		(
-			vim.version
-			and type(vim.version) == "table"
-			and (
-				((vim.version().major == 0) and (vim.version().minor >= 9))
-				or (vim.version().major > 0) )
-		) and vim.print
-		  or vim.pretty_print
-	)(require("luasnip").available())
-end, { force = true })
-
-require("luasnip.config")._setup()
-
--- register these during startup so lazy_load will also load filetypes whose
--- events fired only before lazy_load is actually called.
--- (BufWinEnter -> lazy_load() wouldn't load any files without these).
-vim.api.nvim_create_augroup("_luasnip_lazy_load", {})
-vim.api.nvim_create_autocmd({ "BufWinEnter", "FileType" }, {
-	callback = function(event)
-		require("luasnip.loaders").load_lazy_loaded(tonumber(event.buf))
-	end,
-	group = "_luasnip_lazy_load",
-})
diff --git a/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/plugin/luasnip.vim b/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/plugin/luasnip.vim
deleted file mode 100644
index d8628ea7..00000000
--- a/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/plugin/luasnip.vim
+++ /dev/null
@@ -1,23 +0,0 @@
-function! luasnip#expandable()
-	return luaeval('require("luasnip").expandable()')
-endfunction
-
-function! luasnip#expand_or_jumpable()
-	return luaeval('require("luasnip").expand_or_jumpable()')
-endfunction
-
-function! luasnip#expand_or_locally_jumpable()
-	return luaeval('require("luasnip").expand_or_locally_jumpable()')
-endfunction
-
-function! luasnip#locally_jumpable(direction)
-	return luaeval('require("luasnip").locally_jumpable(_A)', a:direction)
-endfunction
-
-function! luasnip#jumpable(direction)
-	return luaeval('require("luasnip").jumpable(_A)', a:direction)
-endfunction
-
-function! luasnip#choice_active()
-	return luaeval('require("luasnip").choice_active()')
-endfunction
diff --git a/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/rock_manifest b/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/rock_manifest
deleted file mode 100644
index 2ed6b589..00000000
--- a/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/rock_manifest
+++ /dev/null
@@ -1,116 +0,0 @@
-rock_manifest = {
-   doc = {
-      ["luasnip.txt"] = "5014cf9a2bb7c7360fd34a1a02356207"
-   },
-   ftplugin = {
-      ["snippets.vim"] = "ecd77fcf256c792985acf12ea7603322"
-   },
-   lua = {
-      luasnip = {
-         ["_types.lua"] = "a1b1fc45d496f8ece3e17dc3541e5f93",
-         ["config.lua"] = "1bb0edf593b14b243b116d70cbb605c9",
-         ["default_config.lua"] = "51eea9c217eed18af81d580129c70461",
-         extras = {
-            ["_extra_types.lua"] = "b8f4a120d5abe22f0112efdcae358817",
-            ["_lambda.lua"] = "e94a2ad0606ed3c4276a573d4e7ab205",
-            ["_parser_combinator.lua"] = "bacc166557d1b5f9f03aff25a56bc801",
-            ["_treesitter.lua"] = "d9fb19599b9d95edab033fdda0684c32",
-            conditions = {
-               ["expand.lua"] = "35c3ab55ec8e9916ed7cde31cc807b08",
-               ["init.lua"] = "12f7e4b6fd6b5796c36ce61db5844efd",
-               ["show.lua"] = "0cd4059f6ba5582f409ced580e9fef13"
-            },
-            ["expand_conditions.lua"] = "6ea7479cea2e5fac95a2045a6a283d4b",
-            ["filetype_functions.lua"] = "bdab365ff7bd2d7d148fdc6b3b78d9b4",
-            ["fmt.lua"] = "014768af82d3e7e58437e41335553eb6",
-            ["init.lua"] = "560335e3043e97a826fc8aee4b250fbc",
-            ["otf.lua"] = "8a95cdb7b582497542069bdd0886776b",
-            ["postfix.lua"] = "5e94359e6642b52d8ef6c9df3a90e167",
-            ["select_choice.lua"] = "8c924f05ee0d55ab9b0d9e5c603e1a52",
-            ["snip_location.lua"] = "bd0f8a7f1c61f6a001fa5781c15839d5",
-            ["snippet_list.lua"] = "fe61183934e0bb966b83461febdd1dcb",
-            ["treesitter_postfix.lua"] = "42a5143ad3c647d292b2183566fd6776"
-         },
-         ["health.lua"] = "b6bd288f728f6897674347ad46917a5b",
-         ["init.lua"] = "96451aae98dbaf3ece53873298479172",
-         loaders = {
-            ["data.lua"] = "498490d7dfcf2f0374b0d20f429ba6fb",
-            ["from_lua.lua"] = "78d20ec3694e16581e21ed4948c26385",
-            ["from_snipmate.lua"] = "93e1cdc6e024549d9aa6bc917325de24",
-            ["from_vscode.lua"] = "0ff819764a09a735f9ea8ef51413ae83",
-            ["fs_watchers.lua"] = "b36b9f60988b568602350c41b032f9e6",
-            ["init.lua"] = "d470bc3c7bd4690199cf1c0d214782cf",
-            ["snippet_cache.lua"] = "e2b5cf9a46713fb3f108067100e77e0c",
-            ["types.lua"] = "89e18f0f21c1e77be74c1cbe85757d11",
-            ["util.lua"] = "77a85743643bf4d15cbe91af429908d5"
-         },
-         nodes = {
-            ["absolute_indexer.lua"] = "efa73978bd91f2d90f2fc9ef53a9c38c",
-            ["choiceNode.lua"] = "c63618056997ec5aec6524fffff7f2fb",
-            ["duplicate.lua"] = "454e20ad45dbf371aa7d09aa21861f1c",
-            ["dynamicNode.lua"] = "28f4e7a46281dc3a2af0875ffc5ff58c",
-            ["functionNode.lua"] = "cf7cb4efb677a139618fd9255734873e",
-            ["insertNode.lua"] = "a25a723746e7ab5973901855de1d1f11",
-            ["key_indexer.lua"] = "d1c4887dfc10501f09b7851aea25f842",
-            ["multiSnippet.lua"] = "2eab1e75c5ee87096f03db006da31844",
-            ["node.lua"] = "c1d2f45dd25dcf5c1574ff63e0f9e88c",
-            ["restoreNode.lua"] = "9613ce23458968aa12737365dd302be7",
-            ["snippet.lua"] = "d6a31a62f45a460bc642822b6d0244f7",
-            ["snippetProxy.lua"] = "68262858f0f9a20a41640d5a11c43481",
-            ["textNode.lua"] = "c22395ab8305a581f021982cd88e2931",
-            util = {
-               ["trig_engines.lua"] = "a023c5ca92103478cbf40b7ffe2de903"
-            },
-            ["util.lua"] = "a6be1172f1b37f2018460900b0ab987d"
-         },
-         session = {
-            ["enqueueable_operations.lua"] = "2e4f57314f0573601e35943f56e8d4d8",
-            ["init.lua"] = "213d2ea8110e267278d62f5853151ceb",
-            snippet_collection = {
-               ["init.lua"] = "2d5015eb7cb5717f5aa44fdeebffbe59",
-               ["source.lua"] = "17f2f0c590d4deb57ae0e7af20c153ec"
-            }
-         },
-         ["snippets.lua"] = "d41d8cd98f00b204e9800998ecf8427e",
-         util = {
-            ["_builtin_vars.lua"] = "cb7e73099c5711556f8df8821ca4a182",
-            ["auto_table.lua"] = "f9c5f84a99e71df229c4b6506a447727",
-            ["dict.lua"] = "83d98b784cfe6ab28c1d3727e7220110",
-            ["directed_graph.lua"] = "7eb06677cf726e6be7d64d470660677c",
-            ["environ.lua"] = "61b0b01947a335f749e854f039ec77ac",
-            ["events.lua"] = "cdac0c08202f1295a0bd9f5ee5909b3b",
-            ["ext_opts.lua"] = "55f3ee33870b070d50c3eae516b4724a",
-            ["extend_decorator.lua"] = "07576b8535b2729c9d70f5ba5b036a92",
-            ["functions.lua"] = "86ccff508ce6b6eeefc455308e7d4994",
-            ["jsonc.lua"] = "94fbde2a919a24f3957d004aaf7d136d",
-            ["jsregexp.lua"] = "59eb40a43fa328e82b086863dcbfa626",
-            ["lazy_table.lua"] = "7b0f31805982e74c3e693fd60ad42ec2",
-            ["log.lua"] = "ffe073da229ae489cc72e576c0ab6bee",
-            ["mark.lua"] = "135f7a32a6f1031ea0eb80688997f3d3",
-            parser = {
-               ["ast_parser.lua"] = "230087c74af6009d8a858259808f3e51",
-               ["ast_utils.lua"] = "7013bc099f5ed408c4cd49b29e4ce63c",
-               ["init.lua"] = "5ae80471a9893a45b12b77a35ecc8d81",
-               ["neovim_ast.lua"] = "08e136ffd26023ef3172ec2aed4ad2e9",
-               ["neovim_parser.lua"] = "c25f144947bceed6036e3d40b70bdef0"
-            },
-            ["path.lua"] = "3767ba134238fa42469cfcbcfdf16147",
-            ["pattern_tokenizer.lua"] = "f4f99d27e6a6fb5385f583abc70beaab",
-            ["select.lua"] = "b0a8180922f7995a86ea9df7eabb162e",
-            ["str.lua"] = "06645f5bc876c73af9c4fd3296d620e0",
-            ["table.lua"] = "f4a54a5775133c776d65643be728cfdb",
-            ["time.lua"] = "54483e160266c85209e4399fbfc43e1b",
-            ["types.lua"] = "6605cc2d2293f7080d104c63663c0dac",
-            ["util.lua"] = "ac9ec42f0d014d908ff24c5af8172335"
-         }
-      }
-   },
-   ["luasnip-2.3.0-1.rockspec"] = "51f9eecc66d3003eb668326f1e4a0e68",
-   plugin = {
-      ["luasnip.lua"] = "189a598faa80a372be83a52dc57fb491",
-      ["luasnip.vim"] = "e3d30107f8659679f6766d579ce5bf56"
-   },
-   syntax = {
-      ["snippets.vim"] = "5ea760f9406519fc824e2c941ef4d858"
-   }
-}
diff --git a/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/syntax/snippets.vim b/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/syntax/snippets.vim
deleted file mode 100644
index dcb39dd9..00000000
--- a/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/luasnip/2.3.0-1/syntax/snippets.vim
+++ /dev/null
@@ -1,29 +0,0 @@
-" Syntax highlighting for .snippets files
-" Hopefully this should make snippets a bit nicer to write!
-syn match snipComment '^#.*'
-syn match placeHolder '\${\d\+\(:.\{-}\)\=}' contains=snipCommand
-syn match tabStop '\$\d\+'
-syn match snipEscape '\\\\\|\\`'
-syn match snipCommand '\%(\\\@<!\%(\\\\\)*\)\@<=`.\{-}\%(\\\@<!\%(\\\\\)*\)\@<=`'
-syn match snippet '^snippet.*' contains=multiSnipText,snipKeyword
-syn match snippet '^autosnippet.*' contains=multiSnipText,snipKeyword
-syn match snippet '^extends.*' contains=snipKeyword
-syn match snippet '^version.*' contains=snipKeyword
-syn match snippet '^priority.*' contains=snipKeyword,priority
-syn match priority '\d\+' contained
-syn match multiSnipText '\S\+ \zs.*' contained
-syn match snipKeyword '^(snippet|extends|version|autosnippet|priority)'me=s+8 contained
-" normally we'd want a \s in that group, but that doesn't work => cover common
-" cases with \t and " ".
-syn match snipError "^[^#vsaep\t ].*$"
-
-hi link snippet       Identifier
-hi link snipComment   Comment
-hi link multiSnipText String
-hi link snipKeyword   Keyword
-hi link snipEscape    SpecialChar
-hi link placeHolder   Special
-hi link tabStop       Special
-hi link snipCommand   String
-hi link snipError     Error
-hi link priority      Number
diff --git a/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/manifest b/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/manifest
deleted file mode 100644
index b57e717f..00000000
--- a/config/neovim/store/lazy-plugins/luasnip/luasnip-2.3.0-1-unstable-2024-05-24-rocks/manifest
+++ /dev/null
@@ -1,363 +0,0 @@
-commands = {}
-dependencies = {
-   jsregexp = {},
-   luasnip = {
-      ["2.3.0-1"] = {
-         {
-            constraints = {
-               {
-                  op = ">=",
-                  version = {
-                     5, 1, string = "5.1"
-                  }
-               }
-            },
-            name = "lua"
-         },
-         {
-            constraints = {
-               {
-                  op = ">=",
-                  version = {
-                     0, 0, 5, string = "0.0.5"
-                  }
-               },
-               {
-                  op = "<=",
-                  version = {
-                     0, 0, 7, string = "0.0.7"
-                  }
-               }
-            },
-            name = "jsregexp"
-         }
-      }
-   }
-}
-modules = {
-   ["luasnip._types"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.config"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.default_config"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras._extra_types"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras._lambda"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras._parser_combinator"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras._treesitter"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras.conditions.expand"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras.conditions.init"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras.conditions.show"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras.expand_conditions"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras.filetype_functions"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras.fmt"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras.init"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras.otf"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras.postfix"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras.select_choice"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras.snip_location"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras.snippet_list"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.extras.treesitter_postfix"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.health"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.init"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.loaders.data"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.loaders.from_lua"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.loaders.from_snipmate"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.loaders.from_vscode"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.loaders.fs_watchers"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.loaders.init"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.loaders.snippet_cache"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.loaders.types"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.loaders.util"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.nodes.absolute_indexer"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.nodes.choiceNode"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.nodes.duplicate"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.nodes.dynamicNode"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.nodes.functionNode"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.nodes.insertNode"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.nodes.key_indexer"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.nodes.multiSnippet"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.nodes.node"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.nodes.restoreNode"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.nodes.snippet"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.nodes.snippetProxy"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.nodes.textNode"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.nodes.util"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.nodes.util.trig_engines"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.session.enqueueable_operations"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.session.init"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.session.snippet_collection.init"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.session.snippet_collection.source"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.snippets"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util._builtin_vars"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.auto_table"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.dict"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.directed_graph"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.environ"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.events"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.ext_opts"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.extend_decorator"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.functions"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.jsonc"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.jsregexp"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.lazy_table"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.log"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.mark"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.parser.ast_parser"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.parser.ast_utils"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.parser.init"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.parser.neovim_ast"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.parser.neovim_parser"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.path"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.pattern_tokenizer"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.select"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.str"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.table"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.time"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.types"] = {
-      "luasnip/2.3.0-1"
-   },
-   ["luasnip.util.util"] = {
-      "luasnip/2.3.0-1"
-   }
-}
-repository = {
-   luasnip = {
-      ["2.3.0-1"] = {
-         {
-            arch = "installed",
-            commands = {},
-            dependencies = {},
-            modules = {
-               ["luasnip._types"] = "luasnip/_types.lua",
-               ["luasnip.config"] = "luasnip/config.lua",
-               ["luasnip.default_config"] = "luasnip/default_config.lua",
-               ["luasnip.extras._extra_types"] = "luasnip/extras/_extra_types.lua",
-               ["luasnip.extras._lambda"] = "luasnip/extras/_lambda.lua",
-               ["luasnip.extras._parser_combinator"] = "luasnip/extras/_parser_combinator.lua",
-               ["luasnip.extras._treesitter"] = "luasnip/extras/_treesitter.lua",
-               ["luasnip.extras.conditions.expand"] = "luasnip/extras/conditions/expand.lua",
-               ["luasnip.extras.conditions.init"] = "luasnip/extras/conditions/init.lua",
-               ["luasnip.extras.conditions.show"] = "luasnip/extras/conditions/show.lua",
-               ["luasnip.extras.expand_conditions"] = "luasnip/extras/expand_conditions.lua",
-               ["luasnip.extras.filetype_functions"] = "luasnip/extras/filetype_functions.lua",
-               ["luasnip.extras.fmt"] = "luasnip/extras/fmt.lua",
-               ["luasnip.extras.init"] = "luasnip/extras/init.lua",
-               ["luasnip.extras.otf"] = "luasnip/extras/otf.lua",
-               ["luasnip.extras.postfix"] = "luasnip/extras/postfix.lua",
-               ["luasnip.extras.select_choice"] = "luasnip/extras/select_choice.lua",
-               ["luasnip.extras.snip_location"] = "luasnip/extras/snip_location.lua",
-               ["luasnip.extras.snippet_list"] = "luasnip/extras/snippet_list.lua",
-               ["luasnip.extras.treesitter_postfix"] = "luasnip/extras/treesitter_postfix.lua",
-               ["luasnip.health"] = "luasnip/health.lua",
-               ["luasnip.init"] = "luasnip/init.lua",
-               ["luasnip.loaders.data"] = "luasnip/loaders/data.lua",
-               ["luasnip.loaders.from_lua"] = "luasnip/loaders/from_lua.lua",
-               ["luasnip.loaders.from_snipmate"] = "luasnip/loaders/from_snipmate.lua",
-               ["luasnip.loaders.from_vscode"] = "luasnip/loaders/from_vscode.lua",
-               ["luasnip.loaders.fs_watchers"] = "luasnip/loaders/fs_watchers.lua",
-               ["luasnip.loaders.init"] = "luasnip/loaders/init.lua",
-               ["luasnip.loaders.snippet_cache"] = "luasnip/loaders/snippet_cache.lua",
-               ["luasnip.loaders.types"] = "luasnip/loaders/types.lua",
-               ["luasnip.loaders.util"] = "luasnip/loaders/util.lua",
-               ["luasnip.nodes.absolute_indexer"] = "luasnip/nodes/absolute_indexer.lua",
-               ["luasnip.nodes.choiceNode"] = "luasnip/nodes/choiceNode.lua",
-               ["luasnip.nodes.duplicate"] = "luasnip/nodes/duplicate.lua",
-               ["luasnip.nodes.dynamicNode"] = "luasnip/nodes/dynamicNode.lua",
-               ["luasnip.nodes.functionNode"] = "luasnip/nodes/functionNode.lua",
-               ["luasnip.nodes.insertNode"] = "luasnip/nodes/insertNode.lua",
-               ["luasnip.nodes.key_indexer"] = "luasnip/nodes/key_indexer.lua",
-               ["luasnip.nodes.multiSnippet"] = "luasnip/nodes/multiSnippet.lua",
-               ["luasnip.nodes.node"] = "luasnip/nodes/node.lua",
-               ["luasnip.nodes.restoreNode"] = "luasnip/nodes/restoreNode.lua",
-               ["luasnip.nodes.snippet"] = "luasnip/nodes/snippet.lua",
-               ["luasnip.nodes.snippetProxy"] = "luasnip/nodes/snippetProxy.lua",
-               ["luasnip.nodes.textNode"] = "luasnip/nodes/textNode.lua",
-               ["luasnip.nodes.util"] = "luasnip/nodes/util.lua",
-               ["luasnip.nodes.util.trig_engines"] = "luasnip/nodes/util/trig_engines.lua",
-               ["luasnip.session.enqueueable_operations"] = "luasnip/session/enqueueable_operations.lua",
-               ["luasnip.session.init"] = "luasnip/session/init.lua",
-               ["luasnip.session.snippet_collection.init"] = "luasnip/session/snippet_collection/init.lua",
-               ["luasnip.session.snippet_collection.source"] = "luasnip/session/snippet_collection/source.lua",
-               ["luasnip.snippets"] = "luasnip/snippets.lua",
-               ["luasnip.util._builtin_vars"] = "luasnip/util/_builtin_vars.lua",
-               ["luasnip.util.auto_table"] = "luasnip/util/auto_table.lua",
-               ["luasnip.util.dict"] = "luasnip/util/dict.lua",
-               ["luasnip.util.directed_graph"] = "luasnip/util/directed_graph.lua",
-               ["luasnip.util.environ"] = "luasnip/util/environ.lua",
-               ["luasnip.util.events"] = "luasnip/util/events.lua",
-               ["luasnip.util.ext_opts"] = "luasnip/util/ext_opts.lua",
-               ["luasnip.util.extend_decorator"] = "luasnip/util/extend_decorator.lua",
-               ["luasnip.util.functions"] = "luasnip/util/functions.lua",
-               ["luasnip.util.jsonc"] = "luasnip/util/jsonc.lua",
-               ["luasnip.util.jsregexp"] = "luasnip/util/jsregexp.lua",
-               ["luasnip.util.lazy_table"] = "luasnip/util/lazy_table.lua",
-               ["luasnip.util.log"] = "luasnip/util/log.lua",
-               ["luasnip.util.mark"] = "luasnip/util/mark.lua",
-               ["luasnip.util.parser.ast_parser"] = "luasnip/util/parser/ast_parser.lua",
-               ["luasnip.util.parser.ast_utils"] = "luasnip/util/parser/ast_utils.lua",
-               ["luasnip.util.parser.init"] = "luasnip/util/parser/init.lua",
-               ["luasnip.util.parser.neovim_ast"] = "luasnip/util/parser/neovim_ast.lua",
-               ["luasnip.util.parser.neovim_parser"] = "luasnip/util/parser/neovim_parser.lua",
-               ["luasnip.util.path"] = "luasnip/util/path.lua",
-               ["luasnip.util.pattern_tokenizer"] = "luasnip/util/pattern_tokenizer.lua",
-               ["luasnip.util.select"] = "luasnip/util/select.lua",
-               ["luasnip.util.str"] = "luasnip/util/str.lua",
-               ["luasnip.util.table"] = "luasnip/util/table.lua",
-               ["luasnip.util.time"] = "luasnip/util/time.lua",
-               ["luasnip.util.types"] = "luasnip/util/types.lua",
-               ["luasnip.util.util"] = "luasnip/util/util.lua"
-            }
-         }
-      }
-   }
-}
diff --git a/config/neovim/store/lazy-plugins/luasnip/nix-support/propagated-build-inputs b/config/neovim/store/lazy-plugins/luasnip/nix-support/propagated-build-inputs
index d8abd799..09187cac 100644
--- a/config/neovim/store/lazy-plugins/luasnip/nix-support/propagated-build-inputs
+++ b/config/neovim/store/lazy-plugins/luasnip/nix-support/propagated-build-inputs
@@ -1 +1 @@
-/nix/store/qhhsw7qjik5gh1wkai703p6dq0ydp15r-lua5.1-jsregexp-0.0.7-1 /nix/store/mqbhz05llkddfb5wni0m48kw22ixxps4-lua-5.1.5 
\ No newline at end of file
+/nix/store/49605i88r5g5idzd2cbzd9szhjkf65vj-lua5.1-jsregexp-0.0.7-1 /nix/store/3czmrawji85vf8979kll2yx2f1kjkric-lua-5.1.5 
\ No newline at end of file
diff --git a/config/neovim/store/lazy-plugins/luasnip/rock_manifest b/config/neovim/store/lazy-plugins/luasnip/rock_manifest
index 2ed6b589..71ab94b3 100644
--- a/config/neovim/store/lazy-plugins/luasnip/rock_manifest
+++ b/config/neovim/store/lazy-plugins/luasnip/rock_manifest
@@ -1,6 +1,6 @@
 rock_manifest = {
    doc = {
-      ["luasnip.txt"] = "5014cf9a2bb7c7360fd34a1a02356207"
+      ["luasnip.txt"] = "7e261d38c2e7f702be9f26b7b6bc2358"
    },
    ftplugin = {
       ["snippets.vim"] = "ecd77fcf256c792985acf12ea7603322"
diff --git a/config/neovim/store/lazy-plugins/neo-tree.nvim/README.md b/config/neovim/store/lazy-plugins/neo-tree.nvim/README.md
index d93515a8..ab5b4180 100644
--- a/config/neovim/store/lazy-plugins/neo-tree.nvim/README.md
+++ b/config/neovim/store/lazy-plugins/neo-tree.nvim/README.md
@@ -305,6 +305,9 @@ use {
             always_show = { -- remains visible even if other settings would normally hide it
               --".gitignored",
             },
+            always_show_by_pattern = { -- uses glob style patterns
+              --".env*",
+            },
             never_show = { -- remains hidden even if visible is toggled to true, this overrides always_show
               --".DS_Store",
               --"thumbs.db"
diff --git a/config/neovim/store/lazy-plugins/neo-tree.nvim/doc/neo-tree.txt b/config/neovim/store/lazy-plugins/neo-tree.nvim/doc/neo-tree.txt
index be49813b..e66325ce 100644
--- a/config/neovim/store/lazy-plugins/neo-tree.nvim/doc/neo-tree.txt
+++ b/config/neovim/store/lazy-plugins/neo-tree.nvim/doc/neo-tree.txt
@@ -940,6 +940,9 @@ highlight group which will be applied when they are visible, see
           always_show = { -- remains visible even if other settings would normally hide it
             --".gitignored",
           },
+          always_show_by_pattern = { -- uses glob style patterns
+            --".env*",
+          },
           never_show = { -- remains hidden even if visible is toggled to true, this overrides always_show
             --".DS_Store",
             --"thumbs.db",
@@ -973,6 +976,10 @@ The `always_show` option is a list of file/folder names that will always be
 visible, even if other settings would normally hide it. This section takes
 precedence over all other options except for `never_show`.
 
+the `always_show_by_pattern` option is a list of file/folder patterns that 
+always will be visible. This section takes precedence over all other options
+except `never_show`.
+
 The `never_show` option is the same as `hide_by_name`, except that those items
 will remain hidden even if you toggle `visible` to true. This section takes
 precedence over the others.
diff --git a/config/neovim/store/lazy-plugins/neo-tree.nvim/lua/neo-tree/defaults.lua b/config/neovim/store/lazy-plugins/neo-tree.nvim/lua/neo-tree/defaults.lua
index 733dcc07..61a195f7 100644
--- a/config/neovim/store/lazy-plugins/neo-tree.nvim/lua/neo-tree/defaults.lua
+++ b/config/neovim/store/lazy-plugins/neo-tree.nvim/lua/neo-tree/defaults.lua
@@ -477,6 +477,9 @@ local config = {
       always_show = { -- remains visible even if other settings would normally hide it
         --".gitignored",
       },
+      always_show_by_pattern = { -- uses glob style patterns
+        --".env*",
+      },
       never_show = { -- remains hidden even if visible is toggled to true, this overrides always_show
         --".DS_Store",
         --"thumbs.db"
diff --git a/config/neovim/store/lazy-plugins/neo-tree.nvim/lua/neo-tree/sources/common/file-items.lua b/config/neovim/store/lazy-plugins/neo-tree.nvim/lua/neo-tree/sources/common/file-items.lua
index 1d040421..3e4a7a75 100644
--- a/config/neovim/store/lazy-plugins/neo-tree.nvim/lua/neo-tree/sources/common/file-items.lua
+++ b/config/neovim/store/lazy-plugins/neo-tree.nvim/lua/neo-tree/sources/common/file-items.lua
@@ -167,6 +167,11 @@ function create_item(context, path, _type, bufnr)
     if f.always_show[name] then
       item.filtered_by = item.filtered_by or {}
       item.filtered_by.always_show = true
+    else
+      if utils.is_filtered_by_pattern(f.always_show_by_pattern, path, name) then
+        item.filtered_by = item.filtered_by or {}
+        item.filtered_by.always_show = true
+      end
     end
     if f.hide_by_name[name] then
       item.filtered_by = item.filtered_by or {}
diff --git a/config/neovim/store/lazy-plugins/neo-tree.nvim/lua/neo-tree/sources/filesystem/init.lua b/config/neovim/store/lazy-plugins/neo-tree.nvim/lua/neo-tree/sources/filesystem/init.lua
index a6a3e4b2..7101864c 100644
--- a/config/neovim/store/lazy-plugins/neo-tree.nvim/lua/neo-tree/sources/filesystem/init.lua
+++ b/config/neovim/store/lazy-plugins/neo-tree.nvim/lua/neo-tree/sources/filesystem/init.lua
@@ -260,7 +260,7 @@ M.setup = function(config, global_config)
   config.filtered_items = config.filtered_items or {}
   config.enable_git_status = global_config.enable_git_status
 
-  for _, key in ipairs({ "hide_by_pattern", "never_show_by_pattern" }) do
+  for _, key in ipairs({ "hide_by_pattern", "always_show_by_pattern", "never_show_by_pattern" }) do
     local list = config.filtered_items[key]
     if type(list) == "table" then
       for i, pattern in ipairs(list) do
diff --git a/config/neovim/store/lazy-plugins/neo-tree.nvim/lua/neo-tree/ui/popups.lua b/config/neovim/store/lazy-plugins/neo-tree.nvim/lua/neo-tree/ui/popups.lua
index 85362f36..2c15d00f 100644
--- a/config/neovim/store/lazy-plugins/neo-tree.nvim/lua/neo-tree/ui/popups.lua
+++ b/config/neovim/store/lazy-plugins/neo-tree.nvim/lua/neo-tree/ui/popups.lua
@@ -7,12 +7,15 @@ local log = require("neo-tree.log")
 local M = {}
 
 M.popup_options = function(title, min_width, override_options)
+  if string.len(title) ~= 0 then
+    title = " " .. title .. " "
+  end
   min_width = min_width or 30
   local width = string.len(title) + 2
 
   local nt = require("neo-tree")
   local popup_border_style = nt.config.popup_border_style
-  local popup_border_text = NuiText(" " .. title .. " ", highlights.FLOAT_TITLE)
+  local popup_border_text = NuiText(title, highlights.FLOAT_TITLE)
   local col = 0
   -- fix popup position when using multigrid
   local popup_last_col = vim.api.nvim_win_get_position(0)[2] + width + 2
@@ -49,7 +52,7 @@ M.popup_options = function(title, min_width, override_options)
 
   if popup_border_style == "NC" then
     local blank = NuiText(" ", highlights.TITLE_BAR)
-    popup_border_text = NuiText(" " .. title .. " ", highlights.TITLE_BAR)
+    popup_border_text = NuiText(title, highlights.TITLE_BAR)
     popup_options.border = {
       style = { "▕", blank, "▏", "▏", " ", "▔", " ", "▕" },
       highlight = highlights.FLOAT_BORDER,
diff --git a/config/neovim/store/lazy-plugins/neo-tree.nvim/scripts/test.sh b/config/neovim/store/lazy-plugins/neo-tree.nvim/scripts/test.sh
index 3e662e93..bef0a15f 100755
--- a/config/neovim/store/lazy-plugins/neo-tree.nvim/scripts/test.sh
+++ b/config/neovim/store/lazy-plugins/neo-tree.nvim/scripts/test.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 set -euo pipefail
 
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/CHANGELOG.md b/config/neovim/store/lazy-plugins/noice.nvim/CHANGELOG.md
index c25eb777..99ba1f42 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/CHANGELOG.md
+++ b/config/neovim/store/lazy-plugins/noice.nvim/CHANGELOG.md
@@ -1,5 +1,77 @@
 # Changelog
 
+## [4.2.2](https://github.com/folke/noice.nvim/compare/v4.2.1...v4.2.2) (2024-06-16)
+
+
+### Bug Fixes
+
+* **hover:** ignore invalid markup. Fixes [#819](https://github.com/folke/noice.nvim/issues/819) ([59e633f](https://github.com/folke/noice.nvim/commit/59e633ff95be85cf65ac5dc5ece2a89c2b6c403d))
+* **msg:** clear existing confirm messages. Fixes [#302](https://github.com/folke/noice.nvim/issues/302) ([d3d8329](https://github.com/folke/noice.nvim/commit/d3d83292c15cb8a72e1e421ddf5a0aac7812cb9c))
+
+## [4.2.1](https://github.com/folke/noice.nvim/compare/v4.2.0...v4.2.1) (2024-06-15)
+
+
+### Bug Fixes
+
+* **cmdline:** only use cmdline_input for short prompts without newline. Fixes [#856](https://github.com/folke/noice.nvim/issues/856) ([d46c4ba](https://github.com/folke/noice.nvim/commit/d46c4ba67670037bc67af843b95314749caeebf8))
+
+## [4.2.0](https://github.com/folke/noice.nvim/compare/v4.1.0...v4.2.0) (2024-06-13)
+
+
+### Features
+
+* **cmdline:** icon for cmdline input ([d21d1d6](https://github.com/folke/noice.nvim/commit/d21d1d633762fe51efb6521ddd19942d40911c12))
+* **cmdline:** use cmdline prompt as title. Noice is now great for vim.ui.input out of the box ([4c1efad](https://github.com/folke/noice.nvim/commit/4c1efadccc5d4568e3abf0afdd3ee0c5c27b4be9))
+
+
+### Bug Fixes
+
+* **cmdline_input:** put in same position as cmdline_popup ([e55ce94](https://github.com/folke/noice.nvim/commit/e55ce94a1e4b1b5388e11965072e0cde129604bd))
+* **cmdline:** allow overriding title hl ([a5aa639](https://github.com/folke/noice.nvim/commit/a5aa639fb802391293585fca81ac10ecacc5e646))
+* **cmdline:** do fix_cursor **after** calculating cmdline position ([ba79352](https://github.com/folke/noice.nvim/commit/ba79352af1527283682fe7b7b049e6c7967cd037))
+* **cmdline:** reset title when needed ([edd14df](https://github.com/folke/noice.nvim/commit/edd14df3515b106202fd0def749c3f1206c3bd8c))
+* **fzf:** message id ([a9fa1a2](https://github.com/folke/noice.nvim/commit/a9fa1a2ace124fcb752e356b3c52e962c3dcb8b8))
+* **nui:** redo layout when border changes ([0327de8](https://github.com/folke/noice.nvim/commit/0327de8b300d81f778b77f9178dec6ba41a0a4af))
+
+## [4.1.0](https://github.com/folke/noice.nvim/compare/v4.0.1...v4.1.0) (2024-06-12)
+
+
+### Features
+
+* added integrations for fzf-lua ([1605be3](https://github.com/folke/noice.nvim/commit/1605be38bdaa94bc6891e7d310585a9cb16b9dcb))
+
+
+### Bug Fixes
+
+* **cmdline:** make sure search always uses correct view. Fixes [#841](https://github.com/folke/noice.nvim/issues/841) ([6a8a6de](https://github.com/folke/noice.nvim/commit/6a8a6de79223ac15d8ff5477358e343ae6a6ee51))
+* **cmdline:** separate cmdline input view ([07e8f9c](https://github.com/folke/noice.nvim/commit/07e8f9c7dfb01405f8b1173f1d3939b41753779d))
+* **fzf:** use --with-nth and skip message id in the display ([ac01164](https://github.com/folke/noice.nvim/commit/ac0116435e53c586a23302650dca73862a251108))
+
+## [4.0.1](https://github.com/folke/noice.nvim/compare/v4.0.0...v4.0.1) (2024-06-04)
+
+
+### Bug Fixes
+
+* **cmdline:** use real cursors on Neovim &gt;= 0.10 ([5b5fa91](https://github.com/folke/noice.nvim/commit/5b5fa91be6848583cbf824c69e67e26acf609ada))
+* disable noice on VimLeavePre so that the user can see exit errors ([31ec80c](https://github.com/folke/noice.nvim/commit/31ec80c99ee699ea4e90248c2e87e5a669be5e93))
+* fixup ([cfd7aa4](https://github.com/folke/noice.nvim/commit/cfd7aa4617024a9bd4f6409463c73f91a7f411b8))
+* fixup ([2bf0429](https://github.com/folke/noice.nvim/commit/2bf04290b32dc5b1a002a4888c95147bb91ec6f2))
+* reduce flickering when searching. See [#679](https://github.com/folke/noice.nvim/issues/679) ([4e1f9f1](https://github.com/folke/noice.nvim/commit/4e1f9f198226aea5b82a6df75e9913b49796cdda))
+* remove smart_move ([b6ae820](https://github.com/folke/noice.nvim/commit/b6ae820190dd166d6ebae408d65f2551e37c7bf2))
+* search IS blocking, but shouldnt trigger redraw. Fixes [#345](https://github.com/folke/noice.nvim/issues/345) ([b3f08e6](https://github.com/folke/noice.nvim/commit/b3f08e6cf0fd30847f299cc94707563920fd2139))
+
+## [4.0.0](https://github.com/folke/noice.nvim/compare/v3.0.2...v4.0.0) (2024-05-29)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove cmdpreview hack for nigytly since it's no longer needed there. Update your Nightlies!!
+
+### Bug Fixes
+
+* **markdown:** ignore empty completion documentation tables ([#820](https://github.com/folke/noice.nvim/issues/820)) ([f119045](https://github.com/folke/noice.nvim/commit/f119045f38792ad5311e5f9be7a879e4c1a95fe0))
+* remove cmdpreview hack for nigytly since it's no longer needed there. Update your Nightlies!! ([49caf99](https://github.com/folke/noice.nvim/commit/49caf99d6253a43bf55ea055f7fba6c4eb78be20))
+
 ## [3.0.2](https://github.com/folke/noice.nvim/compare/v3.0.1...v3.0.2) (2024-05-22)
 
 
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/README.md b/config/neovim/store/lazy-plugins/noice.nvim/README.md
index fcb38db1..8dcc6cb3 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/README.md
+++ b/config/neovim/store/lazy-plugins/noice.nvim/README.md
@@ -17,7 +17,7 @@ Highly experimental plugin that completely replaces the UI for `messages`, `cmdl
 - 💻 fully customizable **cmdline** with icons
 - 💅 **syntax highlighting** for `vim` and `lua` on the **cmdline**
 - 🚥 **statusline** components
-- 🔭 open message history in [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim)
+- 🔭 open message history in [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim) or [fzf-lua](https://github.com/ibhagwan/fzf-lua)
 
 ## 🔥 Status
 
@@ -123,7 +123,7 @@ Check the [wiki](https://github.com/folke/noice.nvim/wiki/Configuration-Recipes)
       filter = { pattern = "^:%s*!", icon = "$", lang = "bash" },
       lua = { pattern = { "^:%s*lua%s+", "^:%s*lua%s*=%s*", "^:%s*=%s*" }, icon = "", lang = "lua" },
       help = { pattern = "^:%s*he?l?p?%s+", icon = "" },
-      input = {}, -- Used by input()
+      input = { view = "cmdline_input", icon = "󰥻 " }, -- Used by input()
       -- lua = false, -- to disable a format, set to `false`
     },
   },
@@ -283,12 +283,6 @@ Check the [wiki](https://github.com/folke/noice.nvim/wiki/Configuration-Recipes)
   health = {
     checker = true, -- Disable if you don't want health checks to run
   },
-  smart_move = {
-    -- noice tries to move out of the way of existing floating windows.
-    enabled = true, -- you can disable this behaviour here
-    -- add any filetypes here, that shouldn't trigger smart move.
-    excluded_filetypes = { "cmp_menu", "cmp_docs", "notify" },
-  },
   ---@type NoicePresets
   presets = {
     -- you can enable a preset by setting it to true, or a table that will override the preset config
@@ -530,6 +524,8 @@ Formatters are used in `format` definitions. **Noice** includes the following bu
   },
   telescope = ..., -- formatter used to display telescope results
   telescope_preview = ..., -- formatter used to preview telescope results
+  fzf = ..., -- formatter used to display fzf results
+  fzf_preview = ..., -- formatter used to preview fzf results
   lsp_progress = ..., -- formatter used by lsp progress
   lsp_progress_done = ..., -- formatter used by lsp progress
 }
@@ -640,6 +636,11 @@ require("lualine").setup({
 
 </details>
 
+## 🔭 Pickers
+
+For convenience, you can do `:Noice pick`, which will open a picker with all the messages in the history,
+either with `telescope` or `fzf-lua`.
+
 ## 🔭 Telescope
 
 In order to use **Noice** in **Telescope**, you can either do `:Noice telescope`,
@@ -650,6 +651,11 @@ The results panel is formatted using `config.format.formatters.telescope`. The p
 require("telescope").load_extension("noice")
 ```
 
+## 🔭 Fzf Lua
+
+In order to use **Noice** in **FzfLua**, you can do `:Noice fzf`.
+The results panel is formatted using `config.format.formatters.fzf`. The preview is formatted with `config.format.formatters.telescope_fzf`
+
 ## 🚀 Usage
 
 - `:Noice` or `:Noice history` shows the message history
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/doc/noice.nvim.txt b/config/neovim/store/lazy-plugins/noice.nvim/doc/noice.nvim.txt
index 5c118c78..14b6d821 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/doc/noice.nvim.txt
+++ b/config/neovim/store/lazy-plugins/noice.nvim/doc/noice.nvim.txt
@@ -1,4 +1,4 @@
-*noice.nvim.txt*          For Neovim >= 0.8.0         Last change: 2024 May 23
+*noice.nvim.txt*         For Neovim >= 0.8.0         Last change: 2024 June 18
 
 ==============================================================================
 Table of Contents                               *noice.nvim-table-of-contents*
@@ -14,7 +14,9 @@ Table of Contents                               *noice.nvim-table-of-contents*
   - Formatting             |noice.nvim-noice-(nice,-noise,-notice)-formatting|
   - Routes                     |noice.nvim-noice-(nice,-noise,-notice)-routes|
   - Statusline Components|noice.nvim-noice-(nice,-noise,-notice)-statusline-components|
+  - Pickers                   |noice.nvim-noice-(nice,-noise,-notice)-pickers|
   - Telescope               |noice.nvim-noice-(nice,-noise,-notice)-telescope|
+  - Fzf Lua                   |noice.nvim-noice-(nice,-noise,-notice)-fzf-lua|
   - Usage                       |noice.nvim-noice-(nice,-noise,-notice)-usage|
   - Highlight Groups |noice.nvim-noice-(nice,-noise,-notice)-highlight-groups|
 2. Links                                                    |noice.nvim-links|
@@ -39,7 +41,7 @@ FEATURES                     *noice.nvim-noice-(nice,-noise,-notice)-features*
 - fully customizable **cmdline** with icons
 - **syntax highlighting** for `vim` and `lua` on the **cmdline**
 - **statusline** components
-- open message history in telescope.nvim <https://github.com/nvim-telescope/telescope.nvim>
+- open message history in telescope.nvim <https://github.com/nvim-telescope/telescope.nvim> or fzf-lua <https://github.com/ibhagwan/fzf-lua>
 
 
 STATUS                         *noice.nvim-noice-(nice,-noise,-notice)-status*
@@ -149,7 +151,7 @@ for configuration recipes.
           filter = { pattern = "^:%s*!", icon = "$", lang = "bash" },
           lua = { pattern = { "^:%s*lua%s+", "^:%s*lua%s*=%s*", "^:%s*=%s*" }, icon = "", lang = "lua" },
           help = { pattern = "^:%s*he?l?p?%s+", icon = "" },
-          input = {}, -- Used by input()
+          input = { view = "cmdline_input", icon = "󰥻 " }, -- Used by input()
           -- lua = false, -- to disable a format, set to `false`
         },
       },
@@ -309,12 +311,6 @@ for configuration recipes.
       health = {
         checker = true, -- Disable if you don't want health checks to run
       },
-      smart_move = {
-        -- noice tries to move out of the way of existing floating windows.
-        enabled = true, -- you can disable this behaviour here
-        -- add any filetypes here, that shouldn't trigger smart move.
-        excluded_filetypes = { "cmp_menu", "cmp_docs", "notify" },
-      },
       ---@type NoicePresets
       presets = {
         -- you can enable a preset by setting it to true, or a table that will override the preset config
@@ -590,6 +586,8 @@ built-in formats:
       },
       telescope = ..., -- formatter used to display telescope results
       telescope_preview = ..., -- formatter used to preview telescope results
+      fzf = ..., -- formatter used to display fzf results
+      fzf_preview = ..., -- formatter used to preview fzf results
       lsp_progress = ..., -- formatter used by lsp progress
       lsp_progress_done = ..., -- formatter used by lsp progress
     }
@@ -708,6 +706,12 @@ Example of configuring lualine.nvim ~
 <
 
 
+PICKERS                       *noice.nvim-noice-(nice,-noise,-notice)-pickers*
+
+For convenience, you can do `:Noice pick`, which will open a picker with all
+the messages in the history, either with `telescope` or `fzf-lua`.
+
+
 TELESCOPE                   *noice.nvim-noice-(nice,-noise,-notice)-telescope*
 
 In order to use **Noice** in **Telescope**, you can either do `:Noice
@@ -720,6 +724,13 @@ formatted with `config.format.formatters.telescope_preview`
 <
 
 
+FZF LUA                       *noice.nvim-noice-(nice,-noise,-notice)-fzf-lua*
+
+In order to use **Noice** in **FzfLua**, you can do `:Noice fzf`. The results
+panel is formatted using `config.format.formatters.fzf`. The preview is
+formatted with `config.format.formatters.telescope_fzf`
+
+
 USAGE                           *noice.nvim-noice-(nice,-noise,-notice)-usage*
 
 - `:Noice` or `:Noice history` shows the message history
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/doc/tags b/config/neovim/store/lazy-plugins/noice.nvim/doc/tags
index e2b3a749..bb21848b 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/doc/tags
+++ b/config/neovim/store/lazy-plugins/noice.nvim/doc/tags
@@ -4,8 +4,10 @@ noice.nvim-noice-(nice,-noise,-notice)-configuration	noice.nvim.txt	/*noice.nvim
 noice.nvim-noice-(nice,-noise,-notice)-features	noice.nvim.txt	/*noice.nvim-noice-(nice,-noise,-notice)-features*
 noice.nvim-noice-(nice,-noise,-notice)-filters	noice.nvim.txt	/*noice.nvim-noice-(nice,-noise,-notice)-filters*
 noice.nvim-noice-(nice,-noise,-notice)-formatting	noice.nvim.txt	/*noice.nvim-noice-(nice,-noise,-notice)-formatting*
+noice.nvim-noice-(nice,-noise,-notice)-fzf-lua	noice.nvim.txt	/*noice.nvim-noice-(nice,-noise,-notice)-fzf-lua*
 noice.nvim-noice-(nice,-noise,-notice)-highlight-groups	noice.nvim.txt	/*noice.nvim-noice-(nice,-noise,-notice)-highlight-groups*
 noice.nvim-noice-(nice,-noise,-notice)-installation	noice.nvim.txt	/*noice.nvim-noice-(nice,-noise,-notice)-installation*
+noice.nvim-noice-(nice,-noise,-notice)-pickers	noice.nvim.txt	/*noice.nvim-noice-(nice,-noise,-notice)-pickers*
 noice.nvim-noice-(nice,-noise,-notice)-requirements	noice.nvim.txt	/*noice.nvim-noice-(nice,-noise,-notice)-requirements*
 noice.nvim-noice-(nice,-noise,-notice)-routes	noice.nvim.txt	/*noice.nvim-noice-(nice,-noise,-notice)-routes*
 noice.nvim-noice-(nice,-noise,-notice)-status	noice.nvim.txt	/*noice.nvim-noice-(nice,-noise,-notice)-status*
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/commands.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/commands.lua
index 6297b4c9..fa3db36f 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/commands.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/commands.lua
@@ -58,6 +58,18 @@ function M.setup()
     telescope = function()
       require("telescope").extensions.noice.noice({})
     end,
+    fzf = function()
+      require("noice.integrations.fzf").open({})
+    end,
+    pick = function()
+      if pcall(_G.require, "telescope.config") then
+        require("telescope").extensions.noice.noice({})
+      elseif pcall(_G.require, "fzf-lua") then
+        require("noice.integrations.fzf").open({})
+      else
+        Util.error("No picker available")
+      end
+    end,
     stats = function()
       Manager.add(Util.stats.message())
     end,
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/config/cmdline.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/config/cmdline.lua
index 4a64e701..e5d8596b 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/config/cmdline.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/config/cmdline.lua
@@ -20,9 +20,13 @@ function M.setup()
       local hl_group_border = "CmdlinePopupBorder" .. kind_cc
       Highlights.add(hl_group_border, "NoiceCmdlinePopupBorder")
 
+      local hl_group_title = "CmdlinePopupTitle" .. kind_cc
+      Highlights.add(hl_group_title, "Noice" .. hl_group_border)
+
       format = vim.tbl_deep_extend("force", {
+        name = name,
         conceal = format.conceal ~= false,
-        kind = kind,
+        kind = name,
         icon_hl_group = "Noice" .. hl_group_icon,
         view = Config.options.cmdline.view,
         lang = format.lang or format.ft,
@@ -36,6 +40,7 @@ function M.setup()
           win_options = {
             winhighlight = {
               FloatBorder = "Noice" .. hl_group_border,
+              FloatTitle = "Noice" .. hl_group_title,
             },
           },
         },
@@ -45,7 +50,7 @@ function M.setup()
       table.insert(Config.options.routes, {
         view = format.view,
         opts = format.opts,
-        filter = { event = "cmdline", kind = format.kind },
+        filter = { event = "cmdline", kind = name },
       })
     end
   end
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/config/format.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/config/format.lua
index be13c4c7..d99c0816 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/config/format.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/config/format.lua
@@ -30,6 +30,22 @@ M.builtin = {
     "\n",
     "{message}",
   },
+  fzf = {
+    "{level} ",
+    "{date} ",
+    "{title} ",
+    "{message}",
+  },
+  fzf_preview = {
+    "{level} ",
+    "{date} ",
+    "{event}",
+    { "{kind}", before = { ".", hl_group = "NoiceFormatKind" } },
+    "\n",
+    "{title}\n",
+    "\n",
+    "{message}",
+  },
   lsp_progress = {
     {
       "{progress} ",
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/config/init.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/config/init.lua
index fe855eb7..47f08399 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/config/init.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/config/init.lua
@@ -1,3 +1,4 @@
+---@diagnostic disable: missing-fields
 local require = require("noice.util.lazy")
 
 local Routes = require("noice.config.routes")
@@ -27,7 +28,7 @@ function M.defaults()
         lua = { pattern = { "^:%s*lua%s+", "^:%s*lua%s*=%s*", "^:%s*=%s*" }, icon = "", lang = "lua" },
         help = { pattern = "^:%s*he?l?p?%s+", icon = "" },
         calculator = { pattern = "^=", icon = "", lang = "vimnormal" },
-        input = {}, -- Used by input()
+        input = { view = "cmdline_input", icon = "󰥻 " }, -- Used by input()
         -- lua = false, -- to disable a format, set to `false`
       },
     },
@@ -186,12 +187,6 @@ function M.defaults()
     health = {
       checker = true, -- Disable if you don't want health checks to run
     },
-    smart_move = {
-      -- noice tries to move out of the way of existing floating windows.
-      enabled = true, -- you can disable this behaviour here
-      -- add any filetypes here, that shouldn't trigger smart move.
-      excluded_filetypes = { "cmp_menu", "cmp_docs", "notify" },
-    },
     ---@type NoicePresets
     presets = {
       -- you can enable a preset by setting it to true, or a table that will override the preset config
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/config/views.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/config/views.lua
index ced9c9da..629b66f8 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/config/views.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/config/views.lua
@@ -225,6 +225,13 @@ M.defaults = {
       cursorline = false,
     },
   },
+  cmdline_input = {
+    view = "cmdline_popup",
+    border = {
+      style = "rounded",
+      padding = { 0, 1 },
+    },
+  },
   confirm = {
     backend = "popup",
     relative = "editor",
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/init.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/init.lua
index 28faca60..0f6e4246 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/init.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/init.lua
@@ -53,6 +53,14 @@ function M.cmd(name)
 end
 
 function M.enable()
+  vim.api.nvim_create_autocmd("VimLeavePre", {
+    group = vim.api.nvim_create_augroup("NoiceVimLeavePre", { clear = true }),
+    callback = function()
+      if Config.is_running() then
+        pcall(M.disable)
+      end
+    end,
+  })
   Config._running = true
   if Config.options.notify.enabled then
     require("noice.source.notify").enable()
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/lsp/format.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/lsp/format.lua
index 9cfc0124..5a83bf3d 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/lsp/format.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/lsp/format.lua
@@ -29,12 +29,8 @@ function M.format_markdown(contents)
       table.insert(parts, ("```\n%s\n```"):format(content.value))
     elseif Util.islist(content) then
       vim.list_extend(parts, M.format_markdown(content))
-    elseif type(content) == "table" and next(content) == nil then
-      goto continue
-    else
-      error("Unknown markup " .. vim.inspect(content))
     end
-    ::continue::
+    -- ignore other types of content (invalid content)
   end
 
   return vim.split(table.concat(parts, "\n"), "\n")
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/message/init.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/message/init.lua
index 1bb9746a..d76476ec 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/message/init.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/message/init.lua
@@ -9,6 +9,7 @@ local _id = 0
 ---@field super NoiceBlock
 ---@field id number
 ---@field event NoiceEvent
+---@field title? string
 ---@field ctime number
 ---@field mtime number
 ---@field tick number
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/message/router.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/message/router.lua
index 388e8c57..dd8f1393 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/message/router.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/message/router.lua
@@ -109,9 +109,13 @@ end
 
 function M.check_redraw()
   if Util.is_blocking() and M._need_redraw then
-    -- NOTE: set to false before actually calling redraw to prevent a loop with ui
-    M._need_redraw = false
-    Util.redraw()
+    -- don't do full redraw during search
+    if not (Util.is_search() and require("noice.ui.cmdline").real_cursor) then
+      -- NOTE: set to false before actually calling redraw to prevent a loop with ui
+      M._need_redraw = false
+      Util.redraw()
+    end
+    require("noice.ui.cmdline").fix_cursor()
   end
 end
 
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/text/init.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/text/init.lua
index a289962a..ebc52ad6 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/text/init.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/text/init.lua
@@ -17,6 +17,7 @@ local Markdown = require("noice.text.markdown")
 
 ---@class NoiceText: NuiText
 ---@field super NuiText
+---@field enabled? boolean
 ---@field on_render? fun(text: NoiceText, buf:number, line: number, byte:number, col:number)
 ---@overload fun(content:string, highlight?:string|NoiceExtmark):NoiceText
 ---@diagnostic disable-next-line: undefined-field
@@ -111,7 +112,9 @@ function NoiceText:highlight(bufnr, ns_id, linenr, byte_start)
     extmark.col = nil
   end
 
-  NoiceText.super.highlight(self, bufnr, ns_id, linenr, byte_start)
+  if self.enabled ~= false then
+    NoiceText.super.highlight(self, bufnr, ns_id, linenr, byte_start)
+  end
 
   if self.on_render then
     self.on_render(self, bufnr, linenr, byte_start_orig, col_start)
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/ui/cmdline.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/ui/cmdline.lua
index 4b384eee..7ec4a17c 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/ui/cmdline.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/ui/cmdline.lua
@@ -24,6 +24,7 @@ M.events = {
 
 ---@type NoiceCmdline?
 M.active = nil
+M.real_cursor = vim.api.nvim__redraw ~= nil
 
 ---@alias NoiceCmdlineFormatter fun(cmdline: NoiceCmdline): {icon?:string, offset?:number, view?:NoiceViewOptions}
 
@@ -37,6 +38,7 @@ M.active = nil
 ---@field block table
 
 ---@class CmdlineFormat
+---@field name string
 ---@field kind string
 ---@field pattern? string|string[]
 ---@field view string
@@ -112,19 +114,28 @@ end
 function Cmdline:format(message, text_only)
   local format = self:get_format()
   message.fix_cr = false
+  message.title = nil
 
-  if format.icon then
+  local use_input = self.state.prompt ~= ""
+    and format.view == "cmdline_input"
+    and #self.state.prompt <= 60
+    and not self.state.prompt:find("\n")
+
+  if format.icon and (format.name ~= "input" or use_input) then
     message:append(NoiceText.virtual_text(format.icon, format.icon_hl_group))
     message:append(" ")
   end
 
   if not text_only then
-    message.kind = format.kind
+    message.kind = format.name
   end
 
-  -- FIXME: prompt
   if self.state.prompt ~= "" then
-    message:append(self.state.prompt, "NoiceCmdlinePrompt")
+    if use_input then
+      message.title = " " .. self.state.prompt:gsub("%s*:%s*$", "") .. " "
+    else
+      message:append(self.state.prompt, "NoiceCmdlinePrompt")
+    end
   end
 
   if not format.conceal then
@@ -142,6 +153,7 @@ function Cmdline:format(message, text_only)
   if not text_only then
     local cursor = NoiceText.cursor(-self:length() + self.state.pos)
     cursor.on_render = M.on_render
+    cursor.enabled = not M.real_cursor
     message:append(cursor)
   end
 end
@@ -211,10 +223,35 @@ end
 ---@class CmdlinePosition
 ---@field win number Window containing the cmdline
 ---@field buf number Buffer containing the cmdline
+---@field cursor number
 ---@field bufpos {row:number, col:number} (1-0)-indexed position of the cmdline in the buffer
 ---@field screenpos {row:number, col:number} (1-0)-indexed screen position of the cmdline
 M.position = nil
 
+function M.fix_cursor()
+  if not M.position then
+    return
+  end
+  local win = M.position.win
+  local cursor = M.position.cursor
+  if vim.api.nvim_win_is_valid(win) then
+    local height = vim.api.nvim_buf_line_count(M.position.buf)
+    vim.api.nvim_win_set_cursor(win, { height, cursor })
+    vim.api.nvim_win_call(win, function()
+      local width = vim.api.nvim_win_get_width(win)
+      local leftcol = math.max(cursor - width + 1, 0)
+      vim.fn.winrestview({ leftcol = leftcol })
+    end)
+    if M.real_cursor then
+      vim.cmd.redrawstatus()
+      vim.api.nvim__redraw({
+        cursor = true,
+        win = win,
+      })
+    end
+  end
+end
+
 ---@param buf number
 ---@param line number
 ---@param byte number
@@ -227,19 +264,10 @@ function M.on_render(_, buf, line, byte)
     local cmdline_start = byte - (M.last():length() - M.last().offset)
 
     local cursor = byte - M.last():length() + M.last().state.pos
-    vim.schedule(function()
-      if vim.api.nvim_win_is_valid(win) then
-        vim.api.nvim_win_set_cursor(win, { 1, cursor })
-        vim.api.nvim_win_call(win, function()
-          local width = vim.api.nvim_win_get_width(win)
-          local leftcol = math.max(cursor - width + 1, 0)
-          vim.fn.winrestview({ leftcol = leftcol })
-        end)
-      end
-    end)
 
     local pos = vim.fn.screenpos(win, line, cmdline_start)
     M.position = {
+      cursor = cursor,
       buf = buf,
       win = win,
       bufpos = {
@@ -251,6 +279,7 @@ function M.on_render(_, buf, line, byte)
         col = pos.col - 1,
       },
     }
+    pcall(M.fix_cursor)
   end
 end
 
@@ -265,11 +294,15 @@ function M.update()
 
   if cmdline then
     cmdline:format(M.message)
-    Hacks.hide_cursor()
+    if not M.real_cursor then
+      Hacks.hide_cursor()
+    end
     Manager.add(M.message)
   else
     Manager.remove(M.message)
-    Hacks.show_cursor()
+    if not M.real_cursor then
+      Hacks.show_cursor()
+    end
   end
 end
 
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/ui/msg.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/ui/msg.lua
index 91e2c1d5..0c1dae11 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/ui/msg.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/ui/msg.lua
@@ -153,6 +153,10 @@ function M.on_confirm(event, kind, content)
   if State.skip(event, kind, content) then
     return
   end
+  local prev = Manager.get({ event = event, kind = kind }, { history = true })[1]
+  if prev then
+    Manager.remove(prev)
+  end
   local message = Message(event, kind, content)
   if not message:content():find("%s+$") then
     message:append(" ")
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/util/hacks.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/util/hacks.lua
index edbea60c..5013eaaa 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/util/hacks.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/util/hacks.lua
@@ -256,6 +256,10 @@ end
 
 M.SPECIAL = "Þ"
 function M.cmdline_force_redraw()
+  if vim.fn.has("nvim-0.11") == 1 then
+    -- no longer needed on nightly
+    return
+  end
   if not require("noice.util.ffi").cmdpreview then
     return
   end
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/util/init.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/util/init.lua
index 72069eb4..5e719df3 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/util/init.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/util/init.lua
@@ -217,6 +217,14 @@ function M._diff(a, b)
   return false
 end
 
+function M.is_search()
+  local cmdline = require("noice.ui.cmdline")
+  local c = cmdline.active
+  if c and (c.state.firstc == "/" or c.state.firstc == "?") then
+    return true
+  end
+end
+
 ---@param opts? {blocking:boolean, mode:boolean, input:boolean, redraw:boolean}
 function M.is_blocking(opts)
   opts = vim.tbl_deep_extend("force", {
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/util/nui.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/util/nui.lua
index a01c21f9..dc0e0c04 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/util/nui.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/util/nui.lua
@@ -236,17 +236,17 @@ function M.anchor(width, height)
 end
 
 function M.scroll(win, delta)
-  local info = vim.fn.getwininfo(win)[1] or {}
-  local top = info.topline or 1
-  local buf = vim.api.nvim_win_get_buf(win)
+  Util.wo(win, { scrolloff = 0 })
+  local view = vim.api.nvim_win_call(win, vim.fn.winsaveview)
+  local height = vim.api.nvim_win_get_height(win)
+  local top = view.topline
   top = top + delta
   top = math.max(top, 1)
-  top = math.min(top, M.win_buf_height(win) - info.height + 1)
+  top = math.min(top, M.win_buf_height(win) - height + 1)
 
   vim.defer_fn(function()
-    vim.api.nvim_buf_call(buf, function()
-      vim.api.nvim_command("noautocmd silent! normal! " .. top .. "zt")
-      vim.api.nvim_exec_autocmds("WinScrolled", { modeline = false })
+    vim.api.nvim_win_call(win, function()
+      vim.fn.winrestview({ topline = top, lnum = top })
     end)
   end, 0)
 end
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/view/backend/mini.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/view/backend/mini.lua
index b8988757..8e82db68 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/view/backend/mini.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/view/backend/mini.lua
@@ -31,6 +31,9 @@ end
 
 function MiniView:update_options()
   self._opts = vim.tbl_deep_extend("force", defaults, self._opts)
+  if self.view then
+    self.view:update_options()
+  end
 end
 
 ---@param message NoiceMessage
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/view/nui.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/view/nui.lua
index 5de62d1a..243cd957 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/view/nui.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/view/nui.lua
@@ -3,21 +3,22 @@ local require = require("noice.util.lazy")
 local View = require("noice.view")
 local Util = require("noice.util")
 local Scrollbar = require("noice.view.scrollbar")
-local Config = require("noice.config")
+
+local uv = vim.uv or vim.loop
 
 ---@class NuiView: NoiceView
 ---@field _nui? NuiPopup|NuiSplit
 ---@field _loading? boolean
 ---@field super NoiceView
 ---@field _hider fun()
----@field _timeout_timer vim.loop.Timer
+---@field _timeout_timer uv_timer_t
 ---@field _scroll NoiceScrollbar
 ---@diagnostic disable-next-line: undefined-field
 local NuiView = View:extend("NuiView")
 
 function NuiView:init(opts)
   NuiView.super.init(self, opts)
-  self._timer = vim.loop.new_timer()
+  self._timer = uv.new_timer()
 end
 
 function NuiView:autohide()
@@ -47,7 +48,19 @@ function NuiView:update_options()
     },
   }, self._opts, self:get_layout())
 
+  local title = {} ---@type string[]
+  for _, m in ipairs(self._messages) do
+    if m.title then
+      title[#title + 1] = m.title
+    end
+  end
+
   self._opts = Util.nui.normalize(self._opts)
+  if #title > 0 then
+    self._opts.border = self._opts.border or {}
+    self._opts.border.text = self._opts.border.text or {}
+    self._opts.border.text.top = table.concat(title, " | ")
+  end
   if self._opts.anchor == "auto" then
     if self._opts.type == "popup" and self._opts.size then
       local width = self._opts.size.width
@@ -69,55 +82,6 @@ function NuiView:update_options()
   end
 end
 
--- Check if other floating windows are overlapping and move out of the way
-function NuiView:smart_move()
-  if not Config.options.smart_move.enabled then
-    return
-  end
-  if not (self._opts.type == "popup" and self._opts.relative and self._opts.relative.type == "editor") then
-    return
-  end
-  if not (self._nui.winid and vim.api.nvim_win_is_valid(self._nui.winid)) then
-    return
-  end
-  if not (self._nui.border.winid and vim.api.nvim_win_is_valid(self._nui.border.winid)) then
-    return
-  end
-
-  local nui_win = self._nui.border._.type == "complex" and self._nui.border.winid or self._nui.winid
-
-  local wins = vim.tbl_filter(function(win)
-    local ft = vim.bo[vim.api.nvim_win_get_buf(win)].filetype
-    return win ~= self._nui.winid
-      and ft ~= "noice"
-      and not vim.tbl_contains(Config.options.smart_move.excluded_filetypes, ft)
-      and not (self._nui.border and self._nui.border.winid == win)
-      and vim.api.nvim_win_is_valid(win)
-      and vim.api.nvim_win_get_config(win).relative == "editor"
-      and Util.nui.overlap(nui_win, win) > 0.3
-  end, vim.api.nvim_list_wins())
-
-  if #wins > 0 then
-    -- local info = vim.tbl_map(function(win)
-    --   local buf = vim.api.nvim_win_get_buf(win)
-    --   return {
-    --     win = win,
-    --     buftype = vim.bo[buf].buftype,
-    --     ft = vim.bo[buf].filetype,
-    --     syntax = vim.bo[buf].syntax,
-    --     text = table.concat(vim.api.nvim_buf_get_lines(buf, 0, -1, false), "\n"),
-    --     name = vim.api.nvim_buf_get_name(buf),
-    --     -- config = vim.api.nvim_win_get_config(win),
-    --     area = Util.nui.overlap(nui_win, win),
-    --   }
-    -- end, wins)
-    -- dumpp(info)
-    local layout = self:get_layout()
-    layout.position.row = 2
-    self._nui:update_layout(layout)
-  end
-end
-
 function NuiView:create()
   if self._loading then
     return
@@ -323,7 +287,6 @@ function NuiView:show()
   if not self._visible then
     self:set_win_options(self._nui.winid)
     self:update_layout()
-    self:smart_move()
   end
 
   if self._scroll then
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/view/scrollbar.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/view/scrollbar.lua
index 108fbdf3..aaa3ec7e 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/view/scrollbar.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/noice/view/scrollbar.lua
@@ -124,7 +124,9 @@ function Scrollbar:update()
   local thumb_height = math.floor(dim.height * dim.height / buf_height + 0.5)
   thumb_height = math.max(1, thumb_height)
 
-  local pct = vim.api.nvim_win_get_cursor(self.winnr)[1] / buf_height
+  local view = vim.api.nvim_win_call(self.winnr, vim.fn.winsaveview)
+
+  local pct = math.min(view.topline / (buf_height - dim.height + 1), 1)
 
   local thumb_offset = math.floor(pct * (dim.height - thumb_height) + 0.5)
 
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/lua/telescope/_extensions/noice.lua b/config/neovim/store/lazy-plugins/noice.nvim/lua/telescope/_extensions/noice.lua
index 14a197e3..427c69b2 100644
--- a/config/neovim/store/lazy-plugins/noice.nvim/lua/telescope/_extensions/noice.lua
+++ b/config/neovim/store/lazy-plugins/noice.nvim/lua/telescope/_extensions/noice.lua
@@ -7,6 +7,8 @@ local pickers = require("telescope.pickers")
 local finders = require("telescope.finders")
 local conf = require("telescope.config").values
 local previewers = require("telescope.previewers")
+local actions = require("telescope.actions")
+local action_state = require("telescope.actions.state")
 
 local M = {}
 
@@ -59,6 +61,45 @@ function M.previewer()
   })
 end
 
+function M.mappings()
+  return function(prompt_bufnr, map)
+    actions.select_default:replace(function()
+      actions.close(prompt_bufnr)
+      local selection = action_state.get_selected_entry()
+      if selection == nil then return end
+
+      local buf = vim.api.nvim_create_buf(false, true)
+      vim.api.nvim_buf_set_keymap(buf, 'n', 'q', ':q<CR>', { silent = true })
+
+      local message = Format.format(selection.message, "telescope_preview")
+      message:render(buf, Config.ns)
+
+      local lines = vim.opt.lines:get()
+      local cols = vim.opt.columns:get()
+      local width = math.ceil(cols * 0.8)
+      local height = math.ceil(lines * 0.8 - 4)
+      local left = math.ceil((cols - width) * 0.5)
+      local top = math.ceil((lines - height) * 0.5)
+
+
+      local win = vim.api.nvim_open_win(buf, true, {
+        relative = "editor",
+        style = "minimal",
+        width = width,
+        height = height,
+        col = left,
+        row = top,
+        border = "rounded",
+      })
+
+      vim.api.nvim_win_set_option(win, "wrap", true)
+      vim.api.nvim_buf_set_option(buf, 'modifiable', false)
+    end)
+
+    return true
+  end
+end
+
 function M.telescope(opts)
   pickers
     .new(opts, {
@@ -67,6 +108,7 @@ function M.telescope(opts)
       finder = M.finder(),
       sorter = conf.generic_sorter(opts),
       previewer = M.previewer(),
+      attach_mappings = M.mappings(),
     })
     :find()
 end
diff --git a/config/neovim/store/lazy-plugins/noice.nvim/tests/run b/config/neovim/store/lazy-plugins/noice.nvim/tests/run
index 5e95a141..e386362c 100755
--- a/config/neovim/store/lazy-plugins/noice.nvim/tests/run
+++ b/config/neovim/store/lazy-plugins/noice.nvim/tests/run
@@ -1,3 +1,3 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/sh
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/sh
 
 nvim --headless -u tests/init.lua -c "PlenaryBustedDirectory tests/ {minimal_init = 'tests/init.lua', sequential = true}"
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/lua/nui/input/init.lua b/config/neovim/store/lazy-plugins/nui.nvim/lua/nui/input/init.lua
index 712be70f..0a974ea5 100644
--- a/config/neovim/store/lazy-plugins/nui.nvim/lua/nui/input/init.lua
+++ b/config/neovim/store/lazy-plugins/nui.nvim/lua/nui/input/init.lua
@@ -92,19 +92,6 @@ function Input:mount()
     })
   end
 
-  if #self._.default_value then
-    self:on(event.InsertEnter, function()
-      vim.api.nvim_feedkeys(self._.default_value, "n", true)
-    end, { once = true })
-  end
-
-  vim.fn.prompt_setprompt(self.bufnr, self._.prompt:content())
-  if self._.prompt:length() > 0 then
-    vim.schedule(function()
-      self._.prompt:highlight(self.bufnr, self.ns_id, 1, 0)
-    end)
-  end
-
   ---@deprecated
   props.on_submit = function(value)
     self._.pending_submit_value = value
@@ -122,6 +109,20 @@ function Input:mount()
 
   vim.fn.prompt_setinterrupt(self.bufnr, props.on_close)
 
+  vim.fn.prompt_setprompt(self.bufnr, self._.prompt:content())
+
+  self:on(event.InsertEnter, function()
+    if #self._.default_value then
+      vim.api.nvim_feedkeys(self._.default_value, "n", true)
+    end
+
+    if self._.prompt:length() > 0 then
+      vim.schedule(function()
+        self._.prompt:highlight(self.bufnr, self.ns_id, 1, 0)
+      end)
+    end
+  end, { once = true })
+
   vim.api.nvim_command("startinsert!")
 end
 
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nix-support/propagated-build-inputs b/config/neovim/store/lazy-plugins/nui.nvim/nix-support/propagated-build-inputs
index b3b8c91f..169a165b 100644
--- a/config/neovim/store/lazy-plugins/nui.nvim/nix-support/propagated-build-inputs
+++ b/config/neovim/store/lazy-plugins/nui.nvim/nix-support/propagated-build-inputs
@@ -1 +1 @@
-/nix/store/mqbhz05llkddfb5wni0m48kw22ixxps4-lua-5.1.5 
\ No newline at end of file
+/nix/store/3czmrawji85vf8979kll2yx2f1kjkric-lua-5.1.5 
\ No newline at end of file
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/manifest b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/manifest
deleted file mode 100644
index 2a00fe14..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/manifest
+++ /dev/null
@@ -1,137 +0,0 @@
-commands = {}
-dependencies = {
-   ["nui.nvim"] = {
-      ["0.3.0-1"] = {}
-   }
-}
-modules = {
-   ["nui.input.init"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.layout.float"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.layout.init"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.layout.split"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.layout.utils"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.line.init"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.menu.init"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.object.init"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.popup.border"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.popup.init"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.split.init"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.split.utils"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.table.init"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.text.init"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.tree.init"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.tree.util"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.utils.autocmd"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.utils.buf_storage"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.utils.init"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui.utils.keymap"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui/input/README.md"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui/layout/README.md"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui/line/README.md"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui/menu/README.md"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui/popup/README.md"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui/split/README.md"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui/table/README.md"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui/text/README.md"] = {
-      "nui.nvim/0.3.0-1"
-   },
-   ["nui/tree/README.md"] = {
-      "nui.nvim/0.3.0-1"
-   }
-}
-repository = {
-   ["nui.nvim"] = {
-      ["0.3.0-1"] = {
-         {
-            arch = "installed",
-            commands = {},
-            dependencies = {},
-            modules = {
-               ["nui.input.init"] = "nui/input/init.lua",
-               ["nui.layout.float"] = "nui/layout/float.lua",
-               ["nui.layout.init"] = "nui/layout/init.lua",
-               ["nui.layout.split"] = "nui/layout/split.lua",
-               ["nui.layout.utils"] = "nui/layout/utils.lua",
-               ["nui.line.init"] = "nui/line/init.lua",
-               ["nui.menu.init"] = "nui/menu/init.lua",
-               ["nui.object.init"] = "nui/object/init.lua",
-               ["nui.popup.border"] = "nui/popup/border.lua",
-               ["nui.popup.init"] = "nui/popup/init.lua",
-               ["nui.split.init"] = "nui/split/init.lua",
-               ["nui.split.utils"] = "nui/split/utils.lua",
-               ["nui.table.init"] = "nui/table/init.lua",
-               ["nui.text.init"] = "nui/text/init.lua",
-               ["nui.tree.init"] = "nui/tree/init.lua",
-               ["nui.tree.util"] = "nui/tree/util.lua",
-               ["nui.utils.autocmd"] = "nui/utils/autocmd.lua",
-               ["nui.utils.buf_storage"] = "nui/utils/buf_storage.lua",
-               ["nui.utils.init"] = "nui/utils/init.lua",
-               ["nui.utils.keymap"] = "nui/utils/keymap.lua",
-               ["nui/input/README.md"] = "nui/input/README.md",
-               ["nui/layout/README.md"] = "nui/layout/README.md",
-               ["nui/line/README.md"] = "nui/line/README.md",
-               ["nui/menu/README.md"] = "nui/menu/README.md",
-               ["nui/popup/README.md"] = "nui/popup/README.md",
-               ["nui/split/README.md"] = "nui/split/README.md",
-               ["nui/table/README.md"] = "nui/table/README.md",
-               ["nui/text/README.md"] = "nui/text/README.md",
-               ["nui/tree/README.md"] = "nui/tree/README.md"
-            }
-         }
-      }
-   }
-}
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/nui.nvim-0.3.0-1.rockspec b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/nui.nvim-0.3.0-1.rockspec
deleted file mode 100644
index c46eca3c..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/nui.nvim-0.3.0-1.rockspec
+++ /dev/null
@@ -1,27 +0,0 @@
-rockspec_format = "3.0"
-package = "nui.nvim"
-version = "0.3.0-1"
-source = {
-  url = "git+https://github.com/MunifTanjim/nui.nvim.git",
-  tag = "0.3.0",
-}
-description = {
-  summary = "UI Component Library for Neovim.",
-  detailed = [[
-    UI Component Library for Neovim.
-  ]],
-  license = "MIT",
-  homepage = "https://github.com/MunifTanjim/nui.nvim",
-  issues_url = "https://github.com/MunifTanjim/nui.nvim/issues",
-  maintainer = "Munif Tanjim (https://muniftanjim.dev)",
-  labels = {
-    "neovim",
-  },
-}
-build = {
-  type = "builtin",
-}
-test = {
-  type = "command",
-  command = "scripts/test.sh",
-}
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/rock_manifest b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/rock_manifest
deleted file mode 100644
index d4dd3370..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/rock_manifest
+++ /dev/null
@@ -1,98 +0,0 @@
-rock_manifest = {
-   lua = {
-      nui = {
-         input = {
-            ["README.md"] = "832b4732e882a065c23f02536578b0cf",
-            ["init.lua"] = "802d2ababa19c92bbb20a63a06351e82"
-         },
-         layout = {
-            ["README.md"] = "cdd351f847db0d9e63ebceb0ada39115",
-            ["float.lua"] = "38bdadf586d846d8efa37b8c0c918875",
-            ["init.lua"] = "8666f900e2b378fd21a3b29794b2c025",
-            ["split.lua"] = "9853b5bb1c63e58b0008c366674614aa",
-            ["utils.lua"] = "929be3bbfe1837164b2ef864d780b2f6"
-         },
-         line = {
-            ["README.md"] = "b8296c09f393e9188acb62d4290c3d1f",
-            ["init.lua"] = "0d315b8ee6460a045069b0a0ca48e672"
-         },
-         menu = {
-            ["README.md"] = "fa66ab2637ad3b8cf028946083bfd846",
-            ["init.lua"] = "fe42edae4e918720a8cba636437ca045"
-         },
-         object = {
-            ["init.lua"] = "41fd0ddf9ef7f232cbf82e2cd5cb3414"
-         },
-         popup = {
-            ["README.md"] = "dbc4ec093f427ebee98ffa0b17045817",
-            ["border.lua"] = "ebe777b415171e0b1681ae23be67d051",
-            ["init.lua"] = "025311d292812d4c0f43d49d4112e40c"
-         },
-         split = {
-            ["README.md"] = "eb5e83052df720c5704dc1ce5249c21d",
-            ["init.lua"] = "03c4a20279798d074c35f5b170cb8a4d",
-            ["utils.lua"] = "b67aa70588de13c048e5e324d1357d94"
-         },
-         table = {
-            ["README.md"] = "08dfd8dc32600c5b2851487b6153e025",
-            ["init.lua"] = "e27823a8fc0082a54f69b69eb07fabb1"
-         },
-         text = {
-            ["README.md"] = "cc3887013d093c19f315565a88a97d66",
-            ["init.lua"] = "9dd10e41e2d2206e568e4d2f0e354bf9"
-         },
-         tree = {
-            ["README.md"] = "f493c8a177c3eccf9fe8e38a0c20b51b",
-            ["init.lua"] = "f4603f2e7c9551947755c06da0f70d4b",
-            ["util.lua"] = "a04600b78282ba91e8dfa671977033c0"
-         },
-         utils = {
-            ["autocmd.lua"] = "7f0494f2a2ed06dd4247e811306464d6",
-            ["buf_storage.lua"] = "4b2185adfee52329e8174527b69342e6",
-            ["init.lua"] = "0dce69906a083ee8365177bb920610dc",
-            ["keymap.lua"] = "e35ecc6c294836b7b5fde6a6adf32696"
-         }
-      }
-   },
-   ["nui.nvim-0.3.0-1.rockspec"] = "2ef6448d93fc7e0b890c68e71a6b0767",
-   tests = {
-      helpers = {
-         ["init.lua"] = "585ca0ddec006fc619c4c77b4725f4cc"
-      },
-      ["init.lua"] = "157b59cde3d9ce52873d584fbf4357ee",
-      nui = {
-         input = {
-            ["init_spec.lua"] = "1f8d79b288391b3452787a11e317e347"
-         },
-         layout = {
-            ["init_spec.lua"] = "74040ea45f937f0a0c66137563ad02a6",
-            ["utils_spec.lua"] = "595c80e6c8deea405dfe7afc999bdf89"
-         },
-         line = {
-            ["init_spec.lua"] = "d3cc98d867d0ebc0a7db151334d0930c"
-         },
-         menu = {
-            ["init_spec.lua"] = "3b2d70e12e00e47c3e04206a514e0449"
-         },
-         object = {
-            ["init_spec.lua"] = "f499f74b45d8646da1fd25f0a98799f7"
-         },
-         popup = {
-            ["border_spec.lua"] = "0496110c6cb5c0d8f616d22c9877b30d",
-            ["init_spec.lua"] = "92549c5c5450df2a8557a2b68cd70269"
-         },
-         split = {
-            ["init_spec.lua"] = "03fc8062592a8137860659426eaa7d6d"
-         },
-         table = {
-            ["init_spec.lua"] = "223de5324a6ddeb5e3541d6633d8a044"
-         },
-         text = {
-            ["init_spec.lua"] = "fc4a92bab680411b2985d2cea9b0ed82"
-         },
-         tree = {
-            ["init_spec.lua"] = "1b52b264c8cb7b94cc0420ca26a7cfe1"
-         }
-      }
-   }
-}
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/helpers/init.lua b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/helpers/init.lua
deleted file mode 100644
index e8a23fd6..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/helpers/init.lua
+++ /dev/null
@@ -1,312 +0,0 @@
-local function to_string(text)
-  if type(text) == "string" then
-    return text
-  end
-
-  if type(text) == "table" then
-    if text.content then
-      return text:content()
-    end
-
-    return text[1]
-  end
-
-  error("unsupported text")
-end
-
-local popup = {}
-
-local mod = {}
-
-mod.popup = popup
-
-function mod.eq(...)
-  return assert.are.same(...)
-end
-
-function mod.approx(...)
-  return assert.are.near(...)
-end
-
-function mod.neq(...)
-  return assert["not"].are.same(...)
-end
-
----@param fn fun(): nil
----@param error string
----@param is_plain boolean
-function mod.errors(fn, error, is_plain)
-  assert.matches_error(fn, error, 1, is_plain)
-end
-
----@param keys string
----@param mode string
-function mod.feedkeys(keys, mode)
-  vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(keys, true, false, true), mode or "", true)
-end
-
----@param tbl table
----@param keys string[]
-function mod.tbl_pick(tbl, keys)
-  if not keys or #keys == 0 then
-    return tbl
-  end
-
-  local new_tbl = {}
-  for _, key in ipairs(keys) do
-    new_tbl[key] = tbl[key]
-  end
-  return new_tbl
-end
-
----@param tbl table
----@param keys string[]
-function mod.tbl_omit(tbl, keys)
-  if not keys or #keys == 0 then
-    return tbl
-  end
-
-  local new_tbl = vim.deepcopy(tbl)
-  for _, key in ipairs(keys) do
-    rawset(new_tbl, key, nil)
-  end
-  return new_tbl
-end
-
----@param bufnr number
----@param ns_id integer
----@param linenr integer (1-indexed)
----@param byte_start? integer (0-indexed)
----@param byte_end? integer (0-indexed, inclusive)
-function mod.get_line_extmarks(bufnr, ns_id, linenr, byte_start, byte_end)
-  return vim.api.nvim_buf_get_extmarks(
-    bufnr,
-    ns_id,
-    { linenr - 1, byte_start or 0 },
-    { linenr - 1, byte_end and byte_end + 1 or -1 },
-    { details = true }
-  )
-end
-
----@param bufnr number
----@param ns_id integer
----@param linenr integer (1-indexed)
----@param text string
----@return table[]
----@return { byte_start: integer, byte_end: integer } info (byte range: 0-indexed, inclusive)
-function mod.get_text_extmarks(bufnr, ns_id, linenr, text)
-  local line = vim.api.nvim_buf_get_lines(bufnr, linenr - 1, linenr, false)[1]
-
-  local byte_start = string.find(line, text) -- 1-indexed
-  byte_start = byte_start - 1 -- 0-indexed
-  local byte_end = byte_start + #text - 1 -- inclusive
-
-  local extmarks = vim.api.nvim_buf_get_extmarks(
-    bufnr,
-    ns_id,
-    { linenr - 1, byte_start },
-    { linenr - 1, byte_end },
-    { details = true }
-  )
-
-  return extmarks, { byte_start = byte_start, byte_end = byte_end }
-end
-
----@param bufnr number
----@param lines string[]
----@param linenr_start? integer (1-indexed)
----@param linenr_end? integer (1-indexed, inclusive)
-function mod.assert_buf_lines(bufnr, lines, linenr_start, linenr_end)
-  mod.eq(vim.api.nvim_buf_get_lines(bufnr, linenr_start and linenr_start - 1 or 0, linenr_end or -1, false), lines)
-end
-
----@param bufnr number
----@param options table
-function mod.assert_buf_options(bufnr, options)
-  for name, value in pairs(options) do
-    mod.eq(vim.api.nvim_buf_get_option(bufnr, name), value)
-  end
-end
-
----@param winid number
----@param options table
-function mod.assert_win_options(winid, options)
-  for name, value in pairs(options) do
-    mod.eq(vim.api.nvim_win_get_option(winid, name), value)
-  end
-end
-
----@param extmark table
----@param linenr number (1-indexed)
----@param text string
----@param hl_group string
-function mod.assert_extmark(extmark, linenr, text, hl_group)
-  mod.eq(extmark[2], linenr - 1)
-
-  if text then
-    local start_col = extmark[3]
-    mod.eq(extmark[4].end_col - start_col, #text)
-  end
-
-  mod.eq(mod.tbl_pick(extmark[4], { "end_row", "hl_group" }), {
-    end_row = linenr - 1,
-    hl_group = hl_group,
-  })
-end
-
----@param bufnr number
----@param ns_id integer
----@param linenr integer (1-indexed)
----@param text string
----@param hl_group string
-function mod.assert_highlight(bufnr, ns_id, linenr, text, hl_group)
-  local extmarks, info = mod.get_text_extmarks(bufnr, ns_id, linenr, text)
-
-  mod.eq(#extmarks, 1)
-  mod.eq(extmarks[1][3], info.byte_start)
-  mod.assert_extmark(extmarks[1], linenr, text, hl_group)
-end
-
----@param feature_name string
----@param desc string
----@param func fun(is_available: boolean):nil
-function mod.describe_flipping_feature(feature_name, desc, func)
-  local initial_value = require("nui.utils")._.feature[feature_name]
-
-  describe(string.format("(w/ %s) %s", feature_name, desc), function()
-    require("nui.utils")._.feature[feature_name] = true
-    func(true)
-    require("nui.utils")._.feature[feature_name] = initial_value
-  end)
-
-  describe(string.format("(w/o %s) %s", feature_name, desc), function()
-    require("nui.utils")._.feature[feature_name] = false
-    func(false)
-    require("nui.utils")._.feature[feature_name] = initial_value
-  end)
-end
-
-function popup.create_border_style_list()
-  return { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }
-end
-
-function popup.create_border_style_map()
-  return {
-    top_left = "╭",
-    top = "─",
-    top_right = "╮",
-    left = "│",
-    right = "│",
-    bottom_left = "╰",
-    bottom = "─",
-    bottom_right = "╯",
-  }
-end
-
-function popup.create_border_style_map_with_tuple(hl_group)
-  local style = popup.create_border_style_map()
-  for k, v in pairs(style) do
-    style[k] = { v, hl_group .. "_" .. k }
-  end
-  return style
-end
-
-function popup.create_border_style_map_with_nui_text(hl_group)
-  local Text = require("nui.text")
-
-  local style = popup.create_border_style_map()
-  for k, v in pairs(style) do
-    style[k] = Text(v, hl_group .. "_" .. k)
-  end
-
-  return style
-end
-
-function popup.assert_border_lines(options, border_bufnr)
-  local size = { width = options.size.width, height = options.size.height }
-  -- `vim.tbl_islist` will be removed in the future
-  local islist = vim.islist or vim.tbl_islist
-
-  local style = vim.deepcopy(options.border.style)
-  if islist(style) then
-    style = {
-      top_left = style[1],
-      top = style[2],
-      top_right = style[3],
-      left = style[8],
-      right = style[4],
-      bottom_left = style[7],
-      bottom = style[6],
-      bottom_right = style[5],
-    }
-  end
-
-  local expected_lines = {}
-  table.insert(
-    expected_lines,
-    string.format(
-      "%s%s%s",
-      to_string(style.top_left),
-      string.rep(to_string(style.top), size.width),
-      to_string(style.top_right)
-    )
-  )
-  for _ = 1, size.height do
-    table.insert(
-      expected_lines,
-      string.format("%s%s%s", to_string(style.left), string.rep(" ", size.width), to_string(style.right))
-    )
-  end
-  table.insert(
-    expected_lines,
-    string.format(
-      "%s%s%s",
-      to_string(style.bottom_left),
-      string.rep(to_string(style.bottom), size.width),
-      to_string(style.bottom_right)
-    )
-  )
-
-  mod.assert_buf_lines(border_bufnr, expected_lines)
-end
-
-function popup.assert_border_highlight(options, border_bufnr, hl_group, no_hl_group_suffix)
-  local size = { width = options.size.width, height = options.size.height }
-
-  for linenr = 1, size.height + 2 do
-    local is_top_line = linenr == 1
-    local is_bottom_line = linenr == size.height + 2
-
-    local extmarks = mod.get_line_extmarks(border_bufnr, options.ns_id, linenr)
-
-    mod.eq(#extmarks, (is_top_line or is_bottom_line) and 4 or 2)
-
-    local function with_suffix(hl_group_name, suffix)
-      if no_hl_group_suffix then
-        return hl_group_name
-      end
-      return hl_group_name .. suffix
-    end
-
-    mod.assert_extmark(
-      extmarks[1],
-      linenr,
-      nil,
-      with_suffix(hl_group, (is_top_line and "_top_left" or is_bottom_line and "_bottom_left" or "_left"))
-    )
-
-    if is_top_line or is_bottom_line then
-      mod.assert_extmark(extmarks[2], linenr, nil, with_suffix(hl_group, (is_top_line and "_top" or "_bottom")))
-      mod.assert_extmark(extmarks[3], linenr, nil, with_suffix(hl_group, (is_top_line and "_top" or "_bottom")))
-    end
-
-    mod.assert_extmark(
-      extmarks[#extmarks],
-      linenr,
-      nil,
-      with_suffix(hl_group, (is_top_line and "_top_right" or is_bottom_line and "_bottom_right" or "_right"))
-    )
-  end
-end
-
-return mod
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/init.lua b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/init.lua
deleted file mode 100644
index 10e559fe..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/init.lua
+++ /dev/null
@@ -1,24 +0,0 @@
--- mimic startup option `--clean`
-local function clean_startup()
-  for _, path in ipairs(vim.split(vim.o.runtimepath, ",")) do
-    if
-      string.find(path, vim.fn.expand("~/.config/nvim"))
-      or string.find(path, vim.fn.expand("~/.local/share/nvim/site"))
-    then
-      vim.opt.packpath:remove(path)
-      vim.opt.runtimepath:remove(path)
-    end
-  end
-end
-
-clean_startup()
-
-local root_dir = vim.fn.fnamemodify(vim.trim(vim.fn.system("git rev-parse --show-toplevel")), ":p"):gsub("/$", "")
-
-package.path = string.format("%s;%s/?.lua;%s/?/init.lua", package.path, root_dir, root_dir)
-
-vim.opt.packpath:prepend(root_dir .. "/.tests/site")
-
-vim.cmd([[
-  packadd plenary.nvim
-]])
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/input/init_spec.lua b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/input/init_spec.lua
deleted file mode 100644
index 245f176e..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/input/init_spec.lua
+++ /dev/null
@@ -1,273 +0,0 @@
-pcall(require, "luacov")
-
-local Input = require("nui.input")
-local Text = require("nui.text")
-local h = require("tests.helpers")
-
-local eq, feedkeys = h.eq, h.feedkeys
-
--- Input's functionalities are not testable using headless nvim.
--- Not sure what to do about it.
-
-describe("nui.input", function()
-  local parent_winid, parent_bufnr
-  local popup_options
-  local input
-
-  before_each(function()
-    parent_winid = vim.api.nvim_get_current_win()
-    parent_bufnr = vim.api.nvim_get_current_buf()
-
-    popup_options = {
-      relative = "win",
-      position = "50%",
-      size = 20,
-    }
-  end)
-
-  after_each(function()
-    if input then
-      input:unmount()
-      input = nil
-    end
-  end)
-
-  pending("o.prompt", function()
-    it("supports NuiText", function()
-      local prompt_text = "> "
-      local hl_group = "NuiInputTest"
-
-      input = Input(popup_options, {
-        prompt = Text(prompt_text, hl_group),
-      })
-
-      input:mount()
-
-      h.assert_buf_lines(input.bufnr, {
-        prompt_text,
-      })
-
-      h.assert_highlight(input.bufnr, input.ns_id, 1, prompt_text, hl_group)
-    end)
-  end)
-
-  describe("o.on_change", function()
-    it("works", function()
-      local done = false
-      local values = {}
-
-      input = Input(popup_options, {
-        on_change = function(value)
-          values[#values + 1] = value
-        end,
-        on_close = function()
-          done = true
-        end,
-      })
-
-      input:mount()
-
-      feedkeys("aa", "x") -- append a
-      feedkeys("ab", "x") -- append b
-      feedkeys("ac", "x") -- append c
-
-      vim.fn.wait(100, function()
-        return done
-      end)
-
-      eq(values, { "a", "ab", "abc" })
-    end)
-  end)
-
-  describe("o.on_close", function()
-    it("is called on <C-c>", function()
-      local done = false
-
-      input = Input(popup_options, {
-        on_close = function()
-          done = true
-        end,
-      })
-
-      input:mount()
-
-      feedkeys("i<C-c>", "x")
-
-      vim.fn.wait(2000, function()
-        return done
-      end)
-
-      eq(done, true)
-    end)
-
-    it("is called on unmount", function()
-      local done = false
-
-      input = Input(popup_options, {
-        on_close = function()
-          done = true
-        end,
-      })
-
-      input:mount()
-      input:unmount()
-
-      vim.fn.wait(200, function()
-        return done
-      end)
-
-      eq(done, true)
-    end)
-  end)
-
-  describe("cursor_position_patch", function()
-    local initial_cursor
-
-    local function setup()
-      vim.api.nvim_buf_set_lines(parent_bufnr, 0, -1, false, {
-        "1 nui.nvim",
-        "2 nui.nvim",
-        "3 nui.nvim",
-      })
-      initial_cursor = { 2, 4 }
-      vim.api.nvim_win_set_cursor(parent_winid, initial_cursor)
-    end
-
-    it("works after submitting from insert mode", function()
-      setup()
-
-      local done = false
-      input = Input(popup_options, {
-        on_submit = function()
-          done = true
-        end,
-      })
-
-      input:mount()
-
-      feedkeys("<cr>", "x")
-
-      vim.fn.wait(1000, function()
-        return done
-      end)
-
-      eq(done, true)
-      eq(vim.api.nvim_win_get_cursor(parent_winid), initial_cursor)
-    end)
-
-    it("works after submitting from normal mode", function()
-      setup()
-
-      local done = false
-      input = Input(popup_options, {
-        on_submit = function()
-          done = true
-        end,
-      })
-
-      input:mount()
-
-      feedkeys("<esc><cr>", "x")
-
-      vim.fn.wait(1000, function()
-        return done
-      end)
-
-      eq(done, true)
-      eq(vim.api.nvim_win_get_cursor(parent_winid), initial_cursor)
-    end)
-
-    it("works after closing from insert mode", function()
-      setup()
-
-      local done = false
-      input = Input(popup_options, {
-        on_close = function()
-          done = true
-        end,
-      })
-
-      input:mount()
-
-      input:map("i", "<esc>", function()
-        input:unmount()
-      end, { nowait = true, noremap = true })
-
-      feedkeys("i<esc>", "x")
-
-      vim.fn.wait(1000, function()
-        return done
-      end)
-
-      eq(done, true)
-      eq(vim.api.nvim_win_get_cursor(parent_winid), initial_cursor)
-    end)
-
-    it("works after closing from normal mode", function()
-      setup()
-
-      local done = false
-      input = Input(popup_options, {
-        on_close = function()
-          done = true
-        end,
-      })
-
-      input:mount()
-
-      input:map("n", "<esc>", function()
-        input:unmount()
-      end, { nowait = true, noremap = true })
-
-      feedkeys("<esc>", "x")
-
-      vim.fn.wait(1000, function()
-        return done
-      end)
-
-      eq(done, true)
-      eq(vim.api.nvim_win_get_cursor(parent_winid), initial_cursor)
-    end)
-  end)
-
-  describe("method :mount", function()
-    it("is idempotent", function()
-      input = Input(popup_options, {})
-
-      input:mount()
-
-      local bufnr, winid = input.bufnr, input.winid
-
-      eq(type(bufnr), "number")
-      eq(type(winid), "number")
-
-      input:mount()
-
-      eq(bufnr, input.bufnr)
-      eq(winid, input.winid)
-    end)
-  end)
-
-  describe("method :unmount", function()
-    it("is idempotent", function()
-      local done = 0
-
-      input = Input(popup_options, {
-        on_close = function()
-          done = done + 1
-        end,
-      })
-
-      input:mount()
-      input:unmount()
-      input:unmount()
-      input:unmount()
-
-      vim.fn.wait(200, function()
-        return done > 1
-      end)
-
-      eq(done, 1)
-    end)
-  end)
-end)
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/layout/init_spec.lua b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/layout/init_spec.lua
deleted file mode 100644
index 4754365d..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/layout/init_spec.lua
+++ /dev/null
@@ -1,1974 +0,0 @@
-pcall(require, "luacov")
-
-local Layout = require("nui.layout")
-local Popup = require("nui.popup")
-local Split = require("nui.split")
-local h = require("tests.helpers")
-local spy = require("luassert.spy")
-
-local eq, tbl_pick = h.eq, h.tbl_pick
-
-local function create_popups(...)
-  local popups = {}
-  for _, popup_options in ipairs({ ... }) do
-    table.insert(popups, Popup(popup_options))
-  end
-  return popups
-end
-
-local function create_splits(...)
-  local splits = {}
-  for _, split_options in ipairs({ ... }) do
-    table.insert(splits, Split(split_options))
-  end
-  return splits
-end
-
-local function percent(number, percentage)
-  return math.floor(number * percentage / 100)
-end
-
-local function get_assert_component(layout)
-  local layout_winid = layout.winid
-  assert(layout_winid, "missing layout.winid, forgot to mount it?")
-
-  return function(component, expected)
-    eq(type(component.bufnr), "number")
-    eq(type(component.winid), "number")
-
-    local win_config, border_win_config =
-      vim.api.nvim_win_get_config(component.winid),
-      component.border.winid and vim.api.nvim_win_get_config(component.border.winid)
-    if border_win_config then
-      eq(border_win_config.relative, "win")
-      eq(border_win_config.win, layout_winid)
-
-      eq(win_config.relative, "win")
-      eq(win_config.win, component.border.winid)
-    else
-      eq(win_config.relative, "win")
-      eq(win_config.win, layout_winid)
-    end
-
-    if border_win_config then
-      local border_row, border_col = border_win_config.row, border_win_config.col
-      eq(border_row, expected.position.row)
-      eq(border_col, expected.position.col)
-
-      local row, col = win_config.row, win_config.col
-      eq(row, math.floor(component.border._.size_delta.width / 2 + 0.5))
-      eq(col, math.floor(component.border._.size_delta.height / 2 + 0.5))
-    else
-      local row, col = win_config.row, win_config.col
-      eq(row, expected.position.row)
-      eq(col, expected.position.col)
-    end
-
-    local expected_width, expected_height = expected.size.width, expected.size.height
-    if component.border then
-      expected_width = expected_width - component.border._.size_delta.width
-      expected_height = expected_height - component.border._.size_delta.height
-    end
-    eq(vim.api.nvim_win_get_width(component.winid), expected_width)
-    eq(vim.api.nvim_win_get_height(component.winid), expected_height)
-  end
-end
-
-describe("nui.layout", function()
-  local layout
-
-  after_each(function()
-    if layout then
-      layout:unmount()
-      layout = nil
-    end
-  end)
-
-  describe("param box", function()
-    it("throws if empty table", function()
-      local ok, err = pcall(function()
-        Layout({}, {})
-      end)
-
-      eq(ok, false)
-      eq(type(string.match(err, "unexpected empty box")), "string")
-    end)
-
-    it("throws if empty box", function()
-      local ok, err = pcall(function()
-        Layout(
-          {},
-          Layout.Box({
-            Layout.Box({
-              Layout.Box({}, { size = "50%" }),
-              Layout.Box({}, { size = "50%" }),
-            }, { size = "100%" }),
-          })
-        )
-      end)
-
-      eq(ok, false)
-      eq(type(string.match(err, "unexpected empty box")), "string")
-    end)
-
-    it("does not throw if non-empty", function()
-      local p1 = unpack(create_popups({}))
-
-      local ok, err = pcall(function()
-        Layout(
-          { position = "50%", size = "100%" },
-          Layout.Box({
-            Layout.Box({
-              Layout.Box(p1, { size = "50%" }),
-              Layout.Box({}, { size = "50%" }),
-            }, { size = "100%" }),
-          })
-        )
-      end)
-
-      eq(ok, true)
-      eq(err, nil)
-    end)
-  end)
-
-  describe("box", function()
-    it("throws if unknown component", function()
-      local unknown = require("nui.object")("Unknown")()
-      function unknown.mount() end
-
-      local ok, err = pcall(function()
-        Layout.Box({
-          Layout.Box(unknown, { size = "100%" }),
-        })
-      end)
-
-      eq(ok, false)
-      eq(type(string.match(err, "unsupported component")), "string")
-    end)
-
-    it("requires child.size if child.grow is missing", function()
-      local p1, p2 = unpack(create_popups({}, {}))
-
-      local ok, result = pcall(function()
-        Layout.Box({
-          Layout.Box(p1, { size = "50%" }),
-          Layout.Box(p2, {}),
-        })
-      end)
-
-      eq(ok, false)
-      eq(type(string.match(result, "missing child.size")), "string")
-    end)
-
-    it("does not require child.size if child.grow is present", function()
-      local p1, p2 = unpack(create_popups({}, {}))
-
-      local ok = pcall(function()
-        Layout.Box({
-          Layout.Box(p1, { size = "50%" }),
-          Layout.Box(p2, { grow = 1 }),
-        })
-      end)
-
-      eq(ok, true)
-    end)
-
-    describe("size (table)", function()
-      it("missing height is set to 100% if dir=row", function()
-        local p1, p2 = unpack(create_popups({}, {}))
-
-        local box = Layout.Box({
-          Layout.Box(p1, { size = { width = "40%" } }),
-          Layout.Box(p2, { size = { width = "60%", height = "80%" } }),
-        }, { dir = "row" })
-
-        eq(box.box[1].size, {
-          width = "40%",
-          height = "100%",
-        })
-        eq(box.box[2].size, {
-          width = "60%",
-          height = "80%",
-        })
-      end)
-
-      it("missing width is set to 100% if dir=col", function()
-        local p1, p2 = unpack(create_popups({}, {}))
-
-        local box = Layout.Box({
-          Layout.Box(p1, { size = { height = "40%" } }),
-          Layout.Box(p2, { size = { width = "60%", height = "80%" } }),
-        }, { dir = "col" })
-
-        eq(box.box[1].size, {
-          width = "100%",
-          height = "40%",
-        })
-        eq(box.box[2].size, {
-          width = "60%",
-          height = "80%",
-        })
-      end)
-    end)
-
-    describe("size (percentage string)", function()
-      it("is set to width if dir=row", function()
-        local p1, p2 = unpack(create_popups({}, {}))
-
-        local box = Layout.Box({
-          Layout.Box(p1, { size = "40%" }),
-          Layout.Box(p2, { size = "60%" }),
-        }, { dir = "row" })
-
-        eq(box.box[1].size, {
-          width = "40%",
-          height = "100%",
-        })
-        eq(box.box[2].size, {
-          width = "60%",
-          height = "100%",
-        })
-      end)
-
-      it("is set to height if dir=col", function()
-        local p1, p2 = unpack(create_popups({}, {}))
-
-        local box = Layout.Box({
-          Layout.Box(p1, { size = "40%" }),
-          Layout.Box(p2, { size = "60%" }),
-        }, { dir = "col" })
-
-        eq(box.box[1].size, {
-          width = "100%",
-          height = "40%",
-        })
-        eq(box.box[2].size, {
-          width = "100%",
-          height = "60%",
-        })
-      end)
-    end)
-  end)
-
-  describe("[float]", function()
-    describe("o.size", function()
-      local box
-
-      before_each(function()
-        local p1 = unpack(create_popups({}))
-        box = Layout.Box({ Layout.Box(p1, { size = "100%" }) })
-      end)
-
-      local function assert_size(size)
-        local win_config = vim.api.nvim_win_get_config(layout.winid)
-
-        eq(tbl_pick(win_config, { "width", "height" }), {
-          width = math.floor(size.width),
-          height = math.floor(size.height),
-        })
-      end
-
-      it("supports number", function()
-        local size = 20
-
-        layout = Layout({
-          position = "50%",
-          size = size,
-        }, box)
-
-        layout:mount()
-
-        assert_size({ width = size, height = size })
-      end)
-
-      it("supports percentage string", function()
-        local percentage = 50
-
-        layout = Layout({
-          position = "50%",
-          size = string.format("%s%%", percentage),
-        }, box)
-
-        local winid = vim.api.nvim_get_current_win()
-        local win_width = vim.api.nvim_win_get_width(winid)
-        local win_height = vim.api.nvim_win_get_height(winid)
-
-        layout:mount()
-
-        assert_size({
-          width = win_width * percentage / 100,
-          height = win_height * percentage / 100,
-        })
-      end)
-
-      it("supports table", function()
-        local width = 10
-        local height_percentage = 50
-
-        layout = Layout({
-          position = "50%",
-          size = {
-            width = width,
-            height = string.format("%s%%", height_percentage),
-          },
-        }, box)
-
-        local winid = vim.api.nvim_get_current_win()
-        local win_height = vim.api.nvim_win_get_height(winid)
-
-        layout:mount()
-
-        assert_size({
-          width = width,
-          height = win_height * height_percentage / 100,
-        })
-      end)
-    end)
-
-    describe("o.position", function()
-      local box
-
-      before_each(function()
-        local p1 = unpack(create_popups({}))
-        box = Layout.Box({ Layout.Box(p1, { size = "100%" }) })
-      end)
-
-      local function assert_position(position)
-        local row, col = unpack(vim.api.nvim_win_get_position(layout.winid))
-
-        eq(row, math.floor(position.row))
-        eq(col, math.floor(position.col))
-      end
-
-      it("supports number", function()
-        local position = 5
-
-        layout = Layout({
-          position = position,
-          size = 10,
-        }, box)
-
-        layout:mount()
-
-        assert_position({ row = position, col = position })
-      end)
-
-      it("supports percentage string", function()
-        local size = 10
-        local percentage = 50
-
-        layout = Layout({
-          position = string.format("%s%%", percentage),
-          size = size,
-        }, box)
-
-        layout:mount()
-
-        local winid = vim.api.nvim_get_current_win()
-        local win_width = vim.api.nvim_win_get_width(winid)
-        local win_height = vim.api.nvim_win_get_height(winid)
-
-        assert_position({
-          row = (win_height - size) * percentage / 100,
-          col = (win_width - size) * percentage / 100,
-        })
-      end)
-
-      it("supports table", function()
-        local size = 10
-        local row = 5
-        local col_percentage = 50
-
-        layout = Layout({
-          position = {
-            row = row,
-            col = string.format("%s%%", col_percentage),
-          },
-          size = size,
-        }, box)
-
-        layout:mount()
-
-        local winid = vim.api.nvim_get_current_win()
-        local win_width = vim.api.nvim_win_get_width(winid)
-
-        assert_position({
-          row = row,
-          col = (win_width - size) * col_percentage / 100,
-        })
-      end)
-    end)
-
-    describe("method :mount", function()
-      it("mounts all components", function()
-        local p1, p2 = unpack(create_popups({}, {}))
-
-        local p1_mount = spy.on(p1, "mount")
-        local p2_mount = spy.on(p2, "mount")
-
-        layout = Layout(
-          {
-            position = "50%",
-            size = {
-              height = 20,
-              width = 100,
-            },
-          },
-          Layout.Box({
-            Layout.Box(p1, { size = "50%" }),
-            Layout.Box(p2, { size = "50%" }),
-          })
-        )
-
-        layout:mount()
-
-        eq(type(layout.bufnr), "number")
-        eq(type(layout.winid), "number")
-
-        assert.spy(p1_mount).was_called()
-        assert.spy(p2_mount).was_called()
-      end)
-
-      it("is idempotent", function()
-        local p1, p2 = unpack(create_popups({}, {}))
-
-        local p1_mount = spy.on(p1, "mount")
-        local p2_mount = spy.on(p2, "mount")
-
-        layout = Layout(
-          {
-            position = "50%",
-            size = 20,
-          },
-          Layout.Box({
-            Layout.Box(p1, { size = "50%" }),
-            Layout.Box(p2, { size = "50%" }),
-          })
-        )
-
-        layout:mount()
-
-        assert.spy(p1_mount).was_called(1)
-        assert.spy(p2_mount).was_called(1)
-
-        layout:mount()
-
-        assert.spy(p1_mount).was_called(1)
-        assert.spy(p2_mount).was_called(1)
-      end)
-
-      it("supports container component", function()
-        local p1, p2 = unpack(create_popups({}, {}))
-
-        local split = Split({
-          relative = "editor",
-          position = "bottom",
-          size = 10,
-        })
-
-        local split_mount = spy.on(split, "mount")
-
-        layout = Layout(
-          split,
-          Layout.Box({
-            Layout.Box(p1, { size = "50%" }),
-            Layout.Box(p2, { size = "50%" }),
-          })
-        )
-
-        layout:mount()
-
-        assert.spy(split_mount).was_called(1)
-
-        local win_config = vim.api.nvim_win_get_config(layout.winid)
-        eq(win_config.relative, "win")
-        eq(win_config.row, 0)
-        eq(win_config.col, 0)
-        eq(win_config.width, vim.o.columns)
-        eq(win_config.height, 10)
-
-        split:unmount()
-      end)
-
-      it("throws if missing config 'size'", function()
-        local p1 = unpack(create_popups({}, {}))
-
-        local ok, result = pcall(function()
-          layout = Layout({}, { Layout.Box(p1, { size = "100%" }) })
-        end)
-
-        eq(ok, false)
-        eq(type(string.match(result, "missing layout config: size")), "string")
-      end)
-
-      it("throws if missing config 'position'", function()
-        local p1 = unpack(create_popups({}, {}))
-
-        local ok, result = pcall(function()
-          layout = Layout({
-            size = "50%",
-          }, { Layout.Box(p1, { size = "100%" }) })
-        end)
-
-        eq(ok, false)
-        eq(type(string.match(result, "missing layout config: position")), "string")
-      end)
-    end)
-
-    h.describe_flipping_feature("lua_autocmd", "method :unmount", function()
-      it("is called if any popup is unmounted", function()
-        local p1, p2 = unpack(create_popups({}, {}, {}))
-
-        layout = Layout(
-          {
-            position = "50%",
-            size = 10,
-          },
-          Layout.Box({
-            Layout.Box(p1, { size = "50%" }),
-            Layout.Box(p2, { size = "50%" }),
-          })
-        )
-
-        local layout_unmount = spy.on(layout, "unmount")
-
-        layout:mount()
-
-        p2:unmount()
-
-        vim.wait(100, function()
-          return not layout._.mounted
-        end, 10)
-
-        assert.spy(layout_unmount).was_called()
-      end)
-
-      it("is called if any popup is quitted", function()
-        local p1, p2 = unpack(create_popups({}, {}))
-
-        layout = Layout(
-          {
-            position = "50%",
-            size = 10,
-          },
-          Layout.Box({
-            Layout.Box(p1, { size = "50%" }),
-            Layout.Box(p2, { size = "50%" }),
-          })
-        )
-
-        local layout_unmount = spy.on(layout, "unmount")
-
-        layout:mount()
-
-        vim.api.nvim_buf_call(p2.bufnr, function()
-          vim.cmd([[quit]])
-        end)
-
-        vim.wait(100, function()
-          return not layout._.mounted
-        end, 10)
-
-        assert.spy(layout_unmount).was_called()
-      end)
-    end)
-
-    h.describe_flipping_feature("lua_autocmd", "method :hide", function()
-      it("does nothing if not mounted", function()
-        local p1 = unpack(create_popups({}))
-
-        local p1_hide = spy.on(p1, "hide")
-
-        layout = Layout(
-          {
-            position = "50%",
-            size = 10,
-          },
-          Layout.Box({
-            Layout.Box(p1, { size = "100%" }),
-          })
-        )
-
-        layout:hide()
-
-        assert.spy(p1_hide).was_not_called()
-      end)
-
-      it("hides all components", function()
-        local p1, p2, p3 = unpack(create_popups({}, {}, {}))
-
-        local p1_hide = spy.on(p1, "hide")
-        local p2_hide = spy.on(p2, "hide")
-        local p3_hide = spy.on(p3, "hide")
-
-        layout = Layout(
-          {
-            position = "50%",
-            size = 10,
-          },
-          Layout.Box({
-            Layout.Box(p1, { size = "50%" }),
-            Layout.Box({
-              Layout.Box(p2, { size = "50%" }),
-              Layout.Box({
-                Layout.Box(p3, { size = "100%" }),
-              }, { size = "50%" }),
-            }, { size = "50%" }),
-          })
-        )
-
-        layout:mount()
-
-        eq(type(layout.winid), "number")
-
-        layout:hide()
-
-        eq(type(layout.winid), "nil")
-
-        assert.spy(p1_hide).was_called()
-        assert.spy(p2_hide).was_called()
-        assert.spy(p3_hide).was_called()
-      end)
-
-      it("is called if any popup is hidden", function()
-        local p1, p2, p3 = unpack(create_popups({}, {}, {}))
-
-        layout = Layout(
-          {
-            position = "50%",
-            size = 10,
-          },
-          Layout.Box({
-            Layout.Box(p1, { size = "50%" }),
-            Layout.Box({
-              Layout.Box(p2, { size = "50%" }),
-              Layout.Box({
-                Layout.Box(p3, { size = "100%" }),
-              }, { size = "50%" }),
-            }, { size = "50%" }),
-          })
-        )
-
-        local layout_hide = spy.on(layout, "hide")
-
-        layout:mount()
-
-        p2:hide()
-
-        assert.spy(layout_hide).was_called()
-      end)
-    end)
-
-    describe("method :show", function()
-      it("mounts if not mounted", function()
-        local p1 = unpack(create_popups({}))
-
-        local p1_mount = spy.on(p1, "mount")
-        local p1_show = spy.on(p1, "show")
-
-        layout = Layout(
-          {
-            position = "50%",
-            size = 10,
-          },
-          Layout.Box({
-            Layout.Box(p1, { size = "100%" }),
-          })
-        )
-
-        layout:hide()
-        layout:show()
-
-        assert.spy(p1_mount).was_called()
-        assert.spy(p1_show).was_not_called()
-      end)
-
-      it("shows all components", function()
-        local p1, p2, p3 = unpack(create_popups({}, {}, {}))
-
-        local p1_show = spy.on(p1, "show")
-        local p2_show = spy.on(p2, "show")
-        local p3_show = spy.on(p3, "show")
-
-        layout = Layout(
-          {
-            position = "50%",
-            size = 10,
-          },
-          Layout.Box({
-            Layout.Box(p1, { size = "50%" }),
-            Layout.Box({
-              Layout.Box(p2, { size = "50%" }),
-              Layout.Box({
-                Layout.Box(p3, { size = "100%" }),
-              }, { size = "50%" }),
-            }, { size = "50%" }),
-          })
-        )
-
-        layout:mount()
-
-        layout:hide()
-        layout:show()
-
-        eq(type(layout.winid), "number")
-
-        assert.spy(p1_show).was_called()
-        assert.spy(p2_show).was_called()
-        assert.spy(p3_show).was_called()
-      end)
-    end)
-
-    describe("method :update", function()
-      local winid, win_width, win_height
-      local p1, p2, p3, p4
-      local assert_component
-
-      before_each(function()
-        winid = vim.api.nvim_get_current_win()
-        win_width = vim.api.nvim_win_get_width(winid)
-        win_height = vim.api.nvim_win_get_height(winid)
-
-        p1, p2, p3, p4 = unpack(create_popups({
-          border = { style = "single" },
-        }, {}, {
-          border = { style = "rounded", text = {} },
-        }, {}))
-      end)
-
-      local function get_initial_layout(config)
-        return Layout(
-          config,
-          Layout.Box({
-            Layout.Box(p1, { size = "20%" }),
-            Layout.Box({
-              Layout.Box(p3, { size = "50%" }),
-              Layout.Box(p4, { size = "50%" }),
-            }, { dir = "col", size = "60%" }),
-            Layout.Box(p2, { size = "20%" }),
-          }, { dir = "row" })
-        )
-      end
-
-      local function assert_layout_config(config)
-        local relative, position, size = config.relative, config.position, config.size
-
-        local win_config = vim.api.nvim_win_get_config(layout.winid)
-        eq(win_config.anchor, config.anchor or "NW")
-        eq(win_config.relative, relative.type)
-        eq(win_config.win, relative.winid)
-
-        local row, col = unpack(vim.api.nvim_win_get_position(layout.winid))
-        eq(row, position.row)
-        eq(col, position.col)
-
-        eq(vim.api.nvim_win_get_width(layout.winid), size.width)
-        eq(vim.api.nvim_win_get_height(layout.winid), size.height)
-      end
-
-      local function assert_initial_layout_components()
-        local size = {
-          width = vim.api.nvim_win_get_width(layout.winid),
-          height = vim.api.nvim_win_get_height(layout.winid),
-        }
-
-        assert_component(p1, {
-          position = {
-            row = 0,
-            col = 0,
-          },
-          size = {
-            width = percent(size.width, 20),
-            height = size.height,
-          },
-        })
-
-        assert_component(p3, {
-          position = {
-            row = 0,
-            col = percent(size.width, 20),
-          },
-          size = {
-            width = percent(size.width, 60),
-            height = percent(size.height, 50),
-          },
-        })
-
-        assert_component(p4, {
-          position = {
-            row = percent(size.height, 50),
-            col = percent(size.width, 20),
-          },
-          size = {
-            width = percent(size.width, 60),
-            height = percent(size.height, 50),
-          },
-        })
-
-        assert_component(p2, {
-          position = {
-            row = 0,
-            col = percent(size.width, 20) + percent(size.width, 60),
-          },
-          size = {
-            width = percent(size.width, 20),
-            height = size.height,
-          },
-        })
-      end
-
-      it("processes layout correctly on mount", function()
-        local layout_update_spy = spy.on(Layout, "update")
-
-        layout = get_initial_layout({ position = 0, size = "100%" })
-
-        layout:mount()
-
-        layout_update_spy:revert()
-        assert.spy(layout_update_spy).was_called(1)
-
-        local expected_layout_config = {
-          relative = {
-            type = "win",
-            winid = winid,
-          },
-          position = {
-            row = 0,
-            col = 0,
-          },
-          size = {
-            width = win_width,
-            height = win_height,
-          },
-        }
-
-        assert_layout_config(expected_layout_config)
-
-        assert_component = get_assert_component(layout)
-
-        assert_initial_layout_components()
-      end)
-
-      it("can update layout win_config w/o rearranging boxes", function()
-        layout = get_initial_layout({ position = 0, size = "100%" })
-
-        layout:mount()
-
-        layout:update({
-          position = {
-            row = 2,
-            col = 4,
-          },
-          size = "80%",
-        })
-
-        local expected_layout_config = {
-          relative = {
-            type = "win",
-            winid = winid,
-          },
-          position = {
-            row = 2,
-            col = 4,
-          },
-          size = {
-            width = percent(win_width, 80),
-            height = percent(win_height, 80),
-          },
-        }
-
-        assert_layout_config(expected_layout_config)
-
-        assert_component = get_assert_component(layout)
-
-        assert_initial_layout_components()
-      end)
-
-      it("can rearrange boxes w/o changing layout win_config", function()
-        layout = get_initial_layout({ position = 0, size = "100%" })
-
-        layout:mount()
-
-        layout:update(Layout.Box({
-          Layout.Box(p2, { size = "30%" }),
-          Layout.Box({
-            Layout.Box(p4, { size = "40%" }),
-            Layout.Box(p3, { size = "60%" }),
-          }, { dir = "row", size = "30%" }),
-          Layout.Box(p1, { size = "40%" }),
-        }, { dir = "col" }))
-
-        local expected_layout_config = {
-          relative = {
-            type = "win",
-            winid = winid,
-          },
-          position = {
-            row = 0,
-            col = 0,
-          },
-          size = {
-            width = win_width,
-            height = win_height,
-          },
-        }
-
-        assert_layout_config(expected_layout_config)
-
-        assert_component = get_assert_component(layout)
-
-        assert_component(p2, {
-          position = {
-            row = 0,
-            col = 0,
-          },
-          size = {
-            width = win_width,
-            height = percent(win_height, 30),
-          },
-        })
-
-        assert_component(p4, {
-          position = {
-            row = percent(win_height, 30),
-            col = 0,
-          },
-          size = {
-            width = percent(win_width, 40),
-            height = percent(win_height, 30),
-          },
-        })
-
-        assert_component(p3, {
-          position = {
-            row = percent(win_height, 30),
-            col = percent(win_width, 40),
-          },
-          size = {
-            width = percent(win_width, 60),
-            height = percent(win_height, 30),
-          },
-        })
-
-        assert_component(p1, {
-          position = {
-            row = percent(win_height, 30) + percent(win_height, 30),
-            col = 0,
-          },
-          size = {
-            width = win_width,
-            height = percent(win_height, 40),
-          },
-        })
-      end)
-
-      it("refreshes layout if container size changes", function()
-        local popup = Popup({
-          position = 0,
-          size = "100%",
-        })
-
-        popup:mount()
-
-        layout = get_initial_layout({
-          relative = {
-            type = "win",
-            winid = popup.winid,
-          },
-          position = 0,
-          size = "80%",
-        })
-
-        layout:mount()
-
-        local expected_layout_config = {
-          relative = {
-            type = "win",
-            winid = popup.winid,
-          },
-          position = {
-            row = 0,
-            col = 0,
-          },
-          size = {
-            width = percent(win_width, 80),
-            height = percent(win_height, 80),
-          },
-        }
-
-        assert_layout_config(expected_layout_config)
-
-        assert_component = get_assert_component(layout)
-
-        assert_initial_layout_components()
-
-        popup:update_layout({
-          size = "80%",
-        })
-
-        layout:update()
-
-        expected_layout_config.size = {
-          width = percent(percent(win_width, 80), 80),
-          height = percent(percent(win_height, 80), 80),
-        }
-
-        assert_layout_config(expected_layout_config)
-
-        assert_initial_layout_components()
-      end)
-
-      it("supports child with child.grow", function()
-        layout = get_initial_layout({ position = 0, size = "100%" })
-
-        layout:mount()
-
-        layout:update(Layout.Box({
-          Layout.Box(p1, { size = "20%" }),
-          Layout.Box({
-            Layout.Box({}, { size = 4 }),
-            Layout.Box(p3, { grow = 1 }),
-            Layout.Box({}, { size = 8 }),
-            Layout.Box(p4, { grow = 1 }),
-          }, { dir = "col", size = "60%" }),
-          Layout.Box(p2, { grow = 1 }),
-        }, { dir = "row" }))
-
-        local expected_layout_config = {
-          relative = {
-            type = "win",
-            winid = winid,
-          },
-          position = {
-            row = 0,
-            col = 0,
-          },
-          size = {
-            width = win_width,
-            height = win_height,
-          },
-        }
-
-        assert_layout_config(expected_layout_config)
-
-        assert_component = get_assert_component(layout)
-
-        assert_component(p1, {
-          position = {
-            row = 0,
-            col = 0,
-          },
-          size = {
-            width = percent(win_width, 20),
-            height = win_height,
-          },
-        })
-
-        assert_component(p3, {
-          position = {
-            row = 4,
-            col = percent(win_width, 20),
-          },
-          size = {
-            width = percent(win_width, 60),
-            height = percent(win_height - 4 - 8, 100 / 2),
-          },
-        })
-
-        assert_component(p4, {
-          position = {
-            row = 4 + 8 + percent(win_height - 4 - 8, 100 / 2),
-            col = percent(win_width, 20),
-          },
-          size = {
-            width = percent(win_width, 60),
-            height = percent(win_height - 4 - 8, 100 / 2),
-          },
-        })
-
-        assert_component(p2, {
-          position = {
-            row = 0,
-            col = percent(win_width, 20) + percent(win_width, 60),
-          },
-          size = {
-            width = percent(win_width, 100 - 20 - 60),
-            height = win_height,
-          },
-        })
-      end)
-
-      it("can change boxes", function()
-        layout = Layout(
-          { position = 0, size = "100%" },
-          Layout.Box({
-            Layout.Box(p1, { size = "40%" }),
-            Layout.Box(p2, { size = "60%" }),
-          }, { dir = "col" })
-        )
-
-        layout:mount()
-
-        assert_component = get_assert_component(layout)
-
-        assert_component(p1, {
-          position = {
-            row = 0,
-            col = 0,
-          },
-          size = {
-            width = win_width,
-            height = percent(win_height, 40),
-          },
-        })
-
-        assert_component(p2, {
-          position = {
-            row = percent(win_height, 40),
-            col = 0,
-          },
-          size = {
-            width = win_width,
-            height = percent(win_height, 60),
-          },
-        })
-
-        layout:update(Layout.Box({
-          Layout.Box({
-            Layout.Box(p1, { size = "40%" }),
-            Layout.Box(p2, { size = "60%" }),
-          }, { dir = "col", size = "60%" }),
-          Layout.Box(p3, { size = "40%" }),
-        }, { dir = "row" }))
-
-        assert_component = get_assert_component(layout)
-
-        assert_component(p1, {
-          position = {
-            row = 0,
-            col = 0,
-          },
-          size = {
-            width = percent(win_width, 60),
-            height = percent(win_height, 40),
-          },
-        })
-
-        assert_component(p2, {
-          position = {
-            row = percent(win_height, 40),
-            col = 0,
-          },
-          size = {
-            width = percent(win_width, 60),
-            height = percent(win_height, 60),
-          },
-        })
-
-        assert_component(p3, {
-          position = {
-            row = 0,
-            col = percent(win_width, 60),
-          },
-          size = {
-            width = percent(win_width, 40),
-            height = win_height,
-          },
-        })
-
-        layout:update(Layout.Box({
-          Layout.Box({
-            Layout.Box(p1, { size = "40%" }),
-            Layout.Box(p2, { size = "60%" }),
-          }, { dir = "col", size = "60%" }),
-          Layout.Box(p4, { size = "40%" }),
-        }, { dir = "row" }))
-
-        assert_component(p4, {
-          position = {
-            row = 0,
-            col = percent(win_width, 60),
-          },
-          size = {
-            width = percent(win_width, 40),
-            height = win_height,
-          },
-        })
-
-        eq(p3.winid, nil)
-
-        layout:update(Layout.Box({
-          Layout.Box(p3, { size = "40%" }),
-          Layout.Box(p4, { size = "60%" }),
-        }, { dir = "col" }))
-
-        eq(p1.winid, nil)
-        eq(p2.winid, nil)
-
-        assert_component(p3, {
-          position = {
-            row = 0,
-            col = 0,
-          },
-          size = {
-            width = win_width,
-            height = percent(win_height, 40),
-          },
-        })
-
-        assert_component(p4, {
-          position = {
-            row = percent(win_height, 40),
-            col = 0,
-          },
-          size = {
-            width = win_width,
-            height = percent(win_height, 60),
-          },
-        })
-      end)
-
-      it("positions popup with complex border correctly", function()
-        p1 = unpack(create_popups({
-          border = {
-            style = "single",
-            text = {
-              top = "text",
-            },
-            padding = { 1 },
-          },
-        }))
-
-        layout = Layout(
-          { position = 0, size = "100%" },
-          Layout.Box({
-            Layout.Box(p1, { size = "100%" }),
-          }, { dir = "col" })
-        )
-
-        layout:mount()
-
-        assert_component = get_assert_component(layout)
-
-        assert_component(p1, {
-          position = {
-            row = 0,
-            col = 0,
-          },
-          size = {
-            width = win_width,
-            height = percent(win_height, 100),
-          },
-        })
-      end)
-
-      it("can change anchor", function()
-        layout = Layout({
-          position = 0,
-          size = 10,
-        }, {
-          Layout.Box(p1, { size = "100%" }),
-        })
-
-        layout:mount()
-
-        layout:update({ anchor = "SW" })
-
-        assert_layout_config({
-          anchor = "SW",
-          relative = { type = "win", winid = winid },
-          position = { row = 0, col = 0 },
-          size = { height = 10, width = 10 },
-        })
-      end)
-
-      it("can handle col[box,row[box,col[box,box]]]", function()
-        layout = get_initial_layout({ position = 0, size = "100%" })
-
-        layout:mount()
-
-        layout:update(Layout.Box({
-          Layout.Box(p1, { size = "50%" }),
-          Layout.Box({
-            Layout.Box(p2, { size = "50%" }),
-            Layout.Box({
-              Layout.Box(p3, { size = "50%" }),
-              Layout.Box(p4, { size = "50%" }),
-            }, { dir = "col", size = "50%" }),
-          }, { dir = "row", size = "50%" }),
-        }, { dir = "col" }))
-
-        assert_component = get_assert_component(layout)
-
-        assert_component(p1, {
-          position = {
-            row = 0,
-            col = 0,
-          },
-          size = {
-            width = win_width,
-            height = percent(win_height, 50),
-          },
-        })
-
-        assert_component(p2, {
-          position = {
-            row = percent(win_height, 50),
-            col = 0,
-          },
-          size = {
-            width = percent(win_width, 50),
-            height = percent(win_height, 50),
-          },
-        })
-
-        assert_component(p3, {
-          position = {
-            row = percent(win_height, 50),
-            col = percent(win_width, 50),
-          },
-          size = {
-            width = percent(win_width, 50),
-            height = percent(percent(win_height, 50), 50),
-          },
-        })
-
-        assert_component(p4, {
-          position = {
-            row = percent(win_height, 50 + 25),
-            col = percent(win_width, 50),
-          },
-          size = {
-            width = percent(win_width, 50),
-            height = percent(percent(win_height, 50), 50),
-          },
-        })
-      end)
-    end)
-  end)
-
-  describe("[split]", function()
-    local function assert_size(winid, expected, tolerance)
-      h.approx(vim.api.nvim_win_get_width(winid), expected.width, tolerance or 0)
-      h.approx(vim.api.nvim_win_get_height(winid), expected.height, tolerance or 0)
-    end
-
-    describe("method :mount", function()
-      it("mounts all components", function()
-        local s1, s2, s3 = unpack(create_splits({}, {}, {}))
-
-        local s1_mount = spy.on(s1, "mount")
-        local s2_mount = spy.on(s2, "mount")
-        local s3_mount = spy.on(s3, "mount")
-
-        layout = Layout(
-          {
-            position = "bottom",
-            size = 20,
-          },
-          Layout.Box({
-            Layout.Box(s1, { size = "50%" }),
-            Layout.Box({
-              Layout.Box(s2, { size = "50%" }),
-              Layout.Box({
-                Layout.Box(s3, { size = "100%" }),
-              }, { size = "50%" }),
-            }, { size = "50%" }),
-          })
-        )
-
-        layout:mount()
-
-        eq(type(layout.bufnr), "nil")
-        eq(type(layout.winid), "nil")
-
-        assert.spy(s1_mount).was_called()
-        assert.spy(s2_mount).was_called()
-        assert.spy(s3_mount).was_called()
-      end)
-
-      it("is idempotent", function()
-        local s1, s2 = unpack(create_splits({}, {}))
-
-        local s1_mount = spy.on(s1, "mount")
-        local s2_mount = spy.on(s2, "mount")
-
-        layout = Layout(
-          {
-            position = "bottom",
-            size = 20,
-          },
-          Layout.Box({
-            Layout.Box(s1, { size = "50%" }),
-            Layout.Box(s2, { size = "50%" }),
-          })
-        )
-
-        layout:mount()
-
-        assert.spy(s1_mount).was_called(1)
-        assert.spy(s2_mount).was_called(1)
-
-        layout:mount()
-
-        assert.spy(s1_mount).was_called(1)
-        assert.spy(s2_mount).was_called(1)
-      end)
-
-      it("mounts with correct layout", function()
-        local winid = vim.api.nvim_get_current_win()
-
-        local s1, s2, s3, s4, s5 = unpack(create_splits({}, {}, {}, {}, {}))
-
-        layout = Layout(
-          {
-            position = "bottom",
-            size = 20,
-          },
-          Layout.Box({
-            Layout.Box(s1, { size = "100%" }),
-            Layout.Box({
-              Layout.Box({
-                Layout.Box(s2, { size = "100%" }),
-              }, { dir = "col", size = "60%" }),
-              Layout.Box({
-                Layout.Box(s3, { size = "40%" }),
-                Layout.Box(s4, { size = "60%" }),
-              }, { dir = "row", size = "40%" }),
-              Layout.Box({}, { size = "0%" }),
-            }, { dir = "col", size = "40%" }),
-            Layout.Box(s5, { size = "35%" }),
-          })
-        )
-
-        layout:mount()
-
-        eq(vim.fn.winlayout(), {
-          "col",
-          {
-            { "leaf", winid },
-            {
-              "row",
-              {
-                { "leaf", s1.winid },
-                {
-                  "col",
-                  {
-                    { "leaf", s2.winid },
-                    {
-                      "row",
-                      {
-                        { "leaf", s3.winid },
-                        { "leaf", s4.winid },
-                      },
-                    },
-                  },
-                },
-                { "leaf", s5.winid },
-              },
-            },
-          },
-        })
-      end)
-
-      it("mounts with acceptable sizes", function()
-        local winid = vim.api.nvim_get_current_win()
-        local base_size = {
-          width = vim.api.nvim_win_get_width(winid),
-          height = vim.api.nvim_win_get_height(winid),
-        }
-
-        local s1, s2, s3, s4, s5 = unpack(create_splits({}, {}, {}, {}, {}))
-
-        layout = Layout(
-          {
-            position = "bottom",
-            size = 20,
-          },
-          Layout.Box({
-            Layout.Box(s1, { size = "25%" }),
-            Layout.Box({
-              Layout.Box({
-                Layout.Box(s2, { size = "100%" }),
-              }, { dir = "col", size = "60%" }),
-              Layout.Box({
-                Layout.Box(s3, { size = "40%" }),
-                Layout.Box(s4, { size = "60%" }),
-              }, { dir = "row", size = "40%" }),
-              Layout.Box({}, { size = "0%" }),
-            }, { dir = "col", size = "40%" }),
-            Layout.Box(s5, { size = "35%" }),
-          })
-        )
-
-        layout:mount()
-
-        assert_size(s1.winid, {
-          width = percent(base_size.width, 25),
-          height = percent(20, 100),
-        }, 2)
-
-        assert_size(s2.winid, {
-          width = percent(base_size.width, 40),
-          height = percent(20, 60),
-        }, 1)
-
-        assert_size(s3.winid, {
-          width = percent(percent(base_size.width, 40), 40),
-          height = percent(20, 40),
-        }, 1)
-
-        assert_size(s4.winid, {
-          width = percent(percent(base_size.width, 40), 60),
-          height = percent(20, 40),
-        }, 1)
-
-        assert_size(s5.winid, {
-          width = percent(base_size.width, 35),
-          height = percent(20, 100),
-        })
-      end)
-    end)
-
-    describe("method :unmount", function()
-      it("unmounts all components", function()
-        local s1, s2, s3 = unpack(create_splits({}, {}, {}))
-
-        local s1_unmount = spy.on(s1, "unmount")
-        local s2_unmount = spy.on(s2, "unmount")
-        local s3_unmount = spy.on(s3, "unmount")
-
-        layout = Layout(
-          {
-            position = "bottom",
-            size = 20,
-          },
-          Layout.Box({
-            Layout.Box(s1, { size = "50%" }),
-            Layout.Box({
-              Layout.Box(s2, { size = "50%" }),
-              Layout.Box({
-                Layout.Box(s3, { size = "100%" }),
-              }, { size = "50%" }),
-            }, { size = "50%" }),
-          })
-        )
-
-        layout:mount()
-        layout:unmount()
-
-        assert.spy(s1_unmount).was_called()
-        assert.spy(s2_unmount).was_called()
-        assert.spy(s3_unmount).was_called()
-      end)
-
-      it("is called if any split is unmounted", function()
-        local s1, s2, s3 = unpack(create_splits({}, {}, {}))
-
-        layout = Layout(
-          {
-            position = "bottom",
-            size = 20,
-          },
-          Layout.Box({
-            Layout.Box(s1, { size = "50%" }),
-            Layout.Box({
-              Layout.Box(s2, { size = "50%" }),
-              Layout.Box({
-                Layout.Box(s3, { size = "100%" }),
-              }, { size = "50%" }),
-            }, { size = "50%" }),
-          })
-        )
-
-        local layout_unmount = spy.on(layout, "unmount")
-
-        layout:mount()
-
-        s2:unmount()
-
-        vim.wait(100, function()
-          return not layout._.mounted
-        end, 10)
-
-        assert.spy(layout_unmount).was_called()
-      end)
-
-      it("is called if any split is quitted", function()
-        local s1, s2, s3 = unpack(create_splits({}, {}, {}))
-
-        layout = Layout(
-          {
-            position = "bottom",
-            size = 20,
-          },
-          Layout.Box({
-            Layout.Box(s1, { size = "50%" }),
-            Layout.Box({
-              Layout.Box(s2, { size = "50%" }),
-              Layout.Box({
-                Layout.Box(s3, { size = "100%" }),
-              }, { size = "50%" }),
-            }, { size = "50%" }),
-          })
-        )
-
-        local layout_unmount = spy.on(layout, "unmount")
-
-        layout:mount()
-
-        vim.api.nvim_buf_call(s2.bufnr, function()
-          vim.cmd([[quit]])
-        end)
-
-        vim.wait(100, function()
-          return not layout._.mounted
-        end, 10)
-
-        assert.spy(layout_unmount).was_called()
-      end)
-    end)
-
-    describe("method :hide", function()
-      it("does nothing if not mounted", function()
-        local s1 = unpack(create_splits({}))
-
-        local s1_hide = spy.on(s1, "hide")
-
-        layout = Layout(
-          {
-            position = "bottom",
-            size = 20,
-          },
-          Layout.Box({
-            Layout.Box(s1, { size = "100%" }),
-          })
-        )
-
-        layout:hide()
-
-        assert.spy(s1_hide).was_not_called()
-      end)
-
-      it("hides all components", function()
-        local s1, s2, s3 = unpack(create_splits({}, {}, {}))
-
-        local s1_hide = spy.on(s1, "hide")
-        local s2_hide = spy.on(s2, "hide")
-        local s3_hide = spy.on(s3, "hide")
-
-        layout = Layout(
-          {
-            position = "bottom",
-            size = 20,
-          },
-          Layout.Box({
-            Layout.Box(s1, { size = "50%" }),
-            Layout.Box({
-              Layout.Box(s2, { size = "50%" }),
-              Layout.Box({
-                Layout.Box(s3, { size = "100%" }),
-              }, { size = "50%" }),
-            }, { size = "50%" }),
-          })
-        )
-
-        layout:mount()
-
-        layout:hide()
-
-        assert.spy(s1_hide).was_called()
-        assert.spy(s2_hide).was_called()
-        assert.spy(s3_hide).was_called()
-      end)
-
-      it("is called if any split is hidden", function()
-        local s1, s2, s3 = unpack(create_splits({}, {}, {}))
-
-        layout = Layout(
-          {
-            position = "bottom",
-            size = 20,
-          },
-          Layout.Box({
-            Layout.Box(s1, { size = "50%" }),
-            Layout.Box({
-              Layout.Box(s2, { size = "50%" }),
-              Layout.Box({
-                Layout.Box(s3, { size = "100%" }),
-              }, { size = "50%" }),
-            }, { size = "50%" }),
-          })
-        )
-
-        local layout_hide = spy.on(layout, "hide")
-
-        layout:mount()
-
-        s2:hide()
-
-        assert.spy(layout_hide).was_called()
-      end)
-    end)
-
-    describe("method :show", function()
-      it("mounts if not mounted", function()
-        local s1 = unpack(create_splits({}))
-
-        local s1_mount = spy.on(s1, "mount")
-        local s1_show = spy.on(s1, "show")
-
-        layout = Layout(
-          {
-            position = "bottom",
-            size = 20,
-          },
-          Layout.Box({
-            Layout.Box(s1, { size = "100%" }),
-          })
-        )
-
-        layout:hide()
-        layout:show()
-
-        assert.spy(s1_mount).was_called()
-        assert.spy(s1_show).was_not_called()
-      end)
-
-      it("shows all components", function()
-        local s1, s2, s3 = unpack(create_splits({}, {}, {}))
-
-        local s1_show = spy.on(s1, "show")
-        local s2_show = spy.on(s2, "show")
-        local s3_show = spy.on(s3, "show")
-
-        layout = Layout(
-          {
-            position = "bottom",
-            size = 20,
-          },
-          Layout.Box({
-            Layout.Box(s1, { size = "50%" }),
-            Layout.Box({
-              Layout.Box(s2, { size = "50%" }),
-              Layout.Box({
-                Layout.Box(s3, { size = "100%" }),
-              }, { size = "50%" }),
-            }, { size = "50%" }),
-          })
-        )
-
-        layout:mount()
-
-        layout:hide()
-        layout:show()
-
-        assert.spy(s1_show).was_called()
-        assert.spy(s2_show).was_called()
-        assert.spy(s3_show).was_called()
-      end)
-    end)
-
-    describe("method :update", function()
-      local winid, base_size
-      local s1, s2, s3, s4
-
-      before_each(function()
-        winid = vim.api.nvim_get_current_win()
-        base_size = {
-          width = vim.api.nvim_win_get_width(winid),
-          height = vim.api.nvim_win_get_height(winid),
-        }
-
-        s1, s2, s3, s4 = unpack(create_splits({}, {}, {}, {}))
-      end)
-
-      local function get_initial_layout(config)
-        return Layout(
-          config,
-          Layout.Box({
-            Layout.Box(s1, { size = "20%" }),
-            Layout.Box({
-              Layout.Box(s2, { size = "40%" }),
-              Layout.Box(s3, { size = "60%" }),
-            }, { dir = "col", size = "50%" }),
-            Layout.Box(s4, { size = "30%" }),
-          }, { dir = "row" })
-        )
-      end
-
-      it("can update layout win_config w/o rearranging boxes", function()
-        layout = get_initial_layout({
-          position = "bottom",
-          size = 10,
-        })
-
-        layout:mount()
-
-        assert_size(s1.winid, {
-          width = percent(base_size.width, 20),
-          height = percent(10, 100),
-        }, 2)
-
-        assert_size(s2.winid, {
-          width = percent(base_size.width, 50),
-          height = percent(10, 40),
-        }, 1)
-
-        assert_size(s3.winid, {
-          width = percent(base_size.width, 50),
-          height = percent(10, 60),
-        })
-
-        assert_size(s4.winid, {
-          width = percent(base_size.width, 30),
-          height = percent(10, 100),
-        })
-
-        layout:update({ size = 20 })
-
-        assert_size(s1.winid, {
-          width = percent(base_size.width, 20),
-          height = percent(20, 100),
-        }, 2)
-
-        assert_size(s2.winid, {
-          width = percent(base_size.width, 50),
-          height = percent(20, 40),
-        }, 2)
-
-        assert_size(s3.winid, {
-          width = percent(base_size.width, 50),
-          height = percent(20, 60),
-        }, 2)
-
-        assert_size(s4.winid, {
-          width = percent(base_size.width, 30),
-          height = percent(20, 100),
-        })
-      end)
-
-      it("supports child with child.grow", function()
-        layout = get_initial_layout({
-          position = "bottom",
-          size = 10,
-        })
-
-        layout:update(Layout.Box({
-          Layout.Box(s1, { size = 20 }),
-          Layout.Box({
-            Layout.Box(s2, { grow = 1 }),
-            Layout.Box(s3, { grow = 2 }),
-          }, { dir = "col", grow = 2 }),
-          Layout.Box(s4, { grow = 1 }),
-        }, { dir = "row" }))
-
-        layout:mount()
-
-        assert_size(s1.winid, {
-          width = 20,
-          height = 10,
-        }, 2)
-
-        assert_size(s2.winid, {
-          width = ((base_size.width - 20) / (2 + 1)) * 2,
-          height = (10 / (1 + 2)) * 1,
-        }, 1)
-
-        assert_size(s3.winid, {
-          width = ((base_size.width - 20) / (2 + 1)) * 2,
-          height = (10 / (1 + 2)) * 2,
-        }, 1)
-
-        assert_size(s4.winid, {
-          width = ((base_size.width - 20) / (2 + 1)) * 1,
-          height = 10,
-        })
-      end)
-
-      it("can change boxes", function()
-        layout = Layout(
-          { position = "bottom", size = 10 },
-          Layout.Box({
-            Layout.Box(s1, { size = "40%" }),
-            Layout.Box(s2, { size = "60%" }),
-          }, { dir = "row" })
-        )
-
-        layout:mount()
-
-        eq(vim.fn.winlayout(), {
-          "col",
-          {
-            { "leaf", winid },
-            {
-              "row",
-              {
-                { "leaf", s1.winid },
-                { "leaf", s2.winid },
-              },
-            },
-          },
-        })
-
-        layout:update(Layout.Box({
-          Layout.Box({
-            Layout.Box(s1, { size = "40%" }),
-            Layout.Box(s2, { size = "60%" }),
-          }, { dir = "col", size = "60%" }),
-          Layout.Box(s3, { size = "40%" }),
-        }, { dir = "row" }))
-
-        eq(vim.fn.winlayout(), {
-          "col",
-          {
-            { "leaf", winid },
-            {
-              "row",
-              {
-                {
-                  "col",
-                  {
-                    { "leaf", s1.winid },
-                    { "leaf", s2.winid },
-                  },
-                },
-                { "leaf", s3.winid },
-              },
-            },
-          },
-        })
-
-        layout:update(Layout.Box({
-          Layout.Box({
-            Layout.Box(s1, { size = "40%" }),
-            Layout.Box(s2, { size = "60%" }),
-          }, { dir = "col", size = "60%" }),
-          Layout.Box(s4, { size = "40%" }),
-        }, { dir = "row" }))
-
-        eq(vim.fn.winlayout(), {
-          "col",
-          {
-            { "leaf", winid },
-            {
-              "row",
-              {
-                {
-                  "col",
-                  {
-                    { "leaf", s1.winid },
-                    { "leaf", s2.winid },
-                  },
-                },
-                { "leaf", s4.winid },
-              },
-            },
-          },
-        })
-
-        eq(s3.winid, nil)
-      end)
-    end)
-  end)
-end)
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/layout/utils_spec.lua b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/layout/utils_spec.lua
deleted file mode 100644
index 7f7851cf..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/layout/utils_spec.lua
+++ /dev/null
@@ -1,144 +0,0 @@
-pcall(require, "luacov")
-
-local utils = require("nui.layout.utils")
-local h = require("tests.helpers")
-
-local eq = h.eq
-
-describe("nui.layout", function()
-  describe("utils", function()
-    describe("parse_relative", function()
-      local fallback_winid = 17
-
-      it("works for type=buf", function()
-        local relative = {
-          type = "buf",
-          position = { row = 2, col = 4 },
-          winid = 42,
-        }
-
-        local result = utils.parse_relative(relative, fallback_winid)
-
-        eq(result, {
-          relative = "win",
-          win = relative.winid,
-          bufpos = {
-            relative.position.row,
-            relative.position.col,
-          },
-        })
-      end)
-
-      it("works for type=cursor", function()
-        local relative = {
-          type = "cursor",
-          winid = 42,
-        }
-
-        local result = utils.parse_relative(relative, fallback_winid)
-
-        eq(result, {
-          relative = relative.type,
-          win = relative.winid,
-        })
-      end)
-
-      it("works for type=editor", function()
-        local relative = {
-          type = "editor",
-          winid = 42,
-        }
-
-        local result = utils.parse_relative(relative, fallback_winid)
-
-        eq(result, {
-          relative = relative.type,
-          win = relative.winid,
-        })
-      end)
-
-      it("works for type=win", function()
-        local relative = {
-          type = "win",
-          winid = 42,
-        }
-
-        local result = utils.parse_relative(relative, fallback_winid)
-
-        eq(result, {
-          relative = relative.type,
-          win = relative.winid,
-        })
-      end)
-
-      it("uses fallback_winid if relative.winid is nil", function()
-        local relative = {
-          type = "win",
-        }
-
-        local result = utils.parse_relative(relative, fallback_winid)
-
-        eq(result, {
-          relative = relative.type,
-          win = fallback_winid,
-        })
-      end)
-    end)
-
-    describe("get_container_info", function()
-      it("works for relative=editor", function()
-        local result = utils.get_container_info({
-          relative = "editor",
-        })
-
-        eq(result, {
-          relative = "editor",
-          size = {
-            width = vim.o.columns,
-            height = vim.o.lines,
-          },
-          type = "editor",
-        })
-      end)
-
-      it("works for relative=cursor", function()
-        local winid = vim.api.nvim_get_current_win()
-
-        local result = utils.get_container_info({
-          relative = "cursor",
-          win = 0,
-        })
-
-        eq(result, {
-          relative = "cursor",
-          size = {
-            width = vim.api.nvim_win_get_width(winid),
-            height = vim.api.nvim_win_get_height(winid),
-          },
-          type = "window",
-          winid = winid,
-        })
-      end)
-
-      it("works for relative=win w/ bufpos", function()
-        local winid = vim.api.nvim_get_current_win()
-
-        local result = utils.get_container_info({
-          relative = "win",
-          win = winid,
-          bufpos = { 2, 4 },
-        })
-
-        eq(result, {
-          relative = "buf",
-          size = {
-            width = vim.api.nvim_win_get_width(winid),
-            height = vim.api.nvim_win_get_height(winid),
-          },
-          type = "window",
-          winid = winid,
-        })
-      end)
-    end)
-  end)
-end)
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/line/init_spec.lua b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/line/init_spec.lua
deleted file mode 100644
index ba7c374f..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/line/init_spec.lua
+++ /dev/null
@@ -1,164 +0,0 @@
-pcall(require, "luacov")
-
-local Line = require("nui.line")
-local Text = require("nui.text")
-local h = require("tests.helpers")
-
-local eq = h.eq
-
-describe("nui.line", function()
-  it("can accept initial nui.text objects", function()
-    local t1, t2 = Text("One"), Text("Two")
-    local line = Line({ t1, t2 })
-
-    eq(#line._texts, 2)
-  end)
-
-  describe("method :append", function()
-    it("returns nui.text for string parameter", function()
-      local line = Line()
-      local text = line:append("One")
-
-      eq(type(text.content), "function")
-    end)
-
-    it("returns nui.text for nui.text parameter", function()
-      local line = Line()
-      local text = Text("One")
-      local ret_text = line:append(text)
-
-      eq(text == ret_text, true)
-      eq(type(ret_text.content), "function")
-    end)
-
-    it("returns nui.line for nui.line parameter", function()
-      local line = Line()
-
-      local content_line = Line({ Text("One"), Text("Two") })
-
-      local ret_content_line = line:append(content_line)
-
-      eq(content_line == ret_content_line, true)
-      eq(type(ret_content_line.append), "function")
-    end)
-
-    it("stores and returns block with same reference", function()
-      local line = Line()
-
-      local text_one = line:append("One")
-
-      eq(line._texts[1] == text_one, true)
-
-      local text_two = Text("Two")
-      local ret_text_two = line:append(text_two)
-
-      eq(text_two == ret_text_two, true)
-      eq(line._texts[2] == text_two, true)
-      eq(line._texts[2] == ret_text_two, true)
-
-      local text_three = Text("Three")
-      local text_four = Text("Four")
-      local content_line = Line({ text_three, text_four })
-      local ret_content_line = line:append(content_line)
-
-      eq(content_line == ret_content_line, true)
-      eq(line._texts[3] == content_line._texts[1], true)
-      eq(line._texts[4] == content_line._texts[2], true)
-    end)
-  end)
-
-  describe("method :content", function()
-    it("returns whole text content", function()
-      local line = Line()
-      line:append("One")
-      line:append("Two")
-
-      eq(line:content(), "OneTwo")
-    end)
-  end)
-
-  describe("method :width", function()
-    it("returns whole text width", function()
-      local line = Line()
-      line:append("One")
-      line:append("Two")
-
-      eq(line:width(), 6)
-    end)
-  end)
-
-  describe("method", function()
-    local winid, bufnr
-
-    before_each(function()
-      winid = vim.api.nvim_get_current_win()
-      bufnr = vim.api.nvim_create_buf(false, true)
-
-      vim.api.nvim_win_set_buf(winid, bufnr)
-    end)
-
-    after_each(function()
-      vim.api.nvim_buf_delete(bufnr, { force = true })
-    end)
-
-    describe(":highlight", function()
-      local hl_group_one, hl_group_two, ns, ns_id
-      local linenr
-      local t1, t2, t3, t4
-      local line
-
-      before_each(function()
-        hl_group_one = "NuiTextTestOne"
-        hl_group_two = "NuiTextTestTwo"
-        ns = "NuiTest"
-        ns_id = vim.api.nvim_create_namespace(ns)
-
-        linenr = 1
-
-        t1 = Text("One")
-        t2 = Text("Two", hl_group_one)
-        t3 = Text("Three", hl_group_two)
-        t4 = Text("Four")
-
-        line = Line({ t1, t2, t3, t4 })
-      end)
-
-      it("is applied with :render", function()
-        line:render(bufnr, ns_id, linenr)
-
-        h.assert_highlight(bufnr, ns_id, linenr, t2:content(), hl_group_one)
-        h.assert_highlight(bufnr, ns_id, linenr, t3:content(), hl_group_two)
-      end)
-
-      it("can highlight existing buffer line", function()
-        vim.api.nvim_buf_set_lines(
-          bufnr,
-          linenr - 1,
-          -1,
-          false,
-          { t1:content() .. t2:content() .. t3:content() .. t4:content() }
-        )
-
-        line:highlight(bufnr, ns_id, linenr)
-
-        h.assert_highlight(bufnr, ns_id, linenr, t2:content(), hl_group_one)
-        h.assert_highlight(bufnr, ns_id, linenr, t3:content(), hl_group_two)
-      end)
-    end)
-
-    describe(":render", function()
-      it("works", function()
-        local linenr = 1
-
-        local line = Line()
-        line:append("4")
-        line:append("2")
-        line:render(bufnr, -1, linenr)
-
-        h.assert_buf_lines(bufnr, {
-          "42",
-        })
-      end)
-    end)
-  end)
-end)
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/menu/init_spec.lua b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/menu/init_spec.lua
deleted file mode 100644
index b90f5d06..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/menu/init_spec.lua
+++ /dev/null
@@ -1,601 +0,0 @@
-pcall(require, "luacov")
-
-local Menu = require("nui.menu")
-local Layout = require("nui.layout")
-local Line = require("nui.line")
-local Text = require("nui.text")
-local h = require("tests.helpers")
-local spy = require("luassert.spy")
-
-local eq, feedkeys = h.eq, h.feedkeys
-
-describe("nui.menu", function()
-  local callbacks
-  local popup_options
-  local menu
-
-  before_each(function()
-    callbacks = {
-      on_change = function() end,
-      on_submit = function() end,
-    }
-
-    popup_options = {
-      relative = "win",
-      position = "50%",
-    }
-  end)
-
-  after_each(function()
-    if menu then
-      menu:unmount()
-      menu = nil
-    end
-  end)
-
-  describe("method :new", function()
-    it("works with menu", function()
-      menu = Menu:new(popup_options, {
-        lines = {
-          Menu.item("a"),
-        },
-      })
-
-      menu:mount()
-
-      h.assert_buf_lines(menu.bufnr, {
-        "a",
-      })
-    end)
-  end)
-
-  describe("o.keymap", function()
-    it("supports multiple keys as table", function()
-      local on_change = spy.on(callbacks, "on_change")
-
-      local lines = {
-        Menu.item("Item 1", { id = 1 }),
-        Menu.item("Item 2", { id = 2 }),
-        Menu.item("Item 3", { id = 3 }),
-      }
-
-      menu = Menu(popup_options, {
-        keymap = {
-          focus_next = { "j", "s" },
-          focus_prev = { "k", "w" },
-        },
-        lines = lines,
-        on_change = on_change,
-      })
-
-      menu:mount()
-
-      feedkeys("j", "x")
-      assert.spy(on_change).called_with(lines[2], menu)
-      on_change:clear()
-
-      feedkeys("s", "x")
-      assert.spy(on_change).called_with(lines[3], menu)
-      on_change:clear()
-
-      feedkeys("w", "x")
-      assert.spy(on_change).called_with(lines[2], menu)
-      on_change:clear()
-
-      feedkeys("k", "x")
-      assert.spy(on_change).called_with(lines[1], menu)
-      on_change:clear()
-    end)
-
-    it("supports single key as string", function()
-      local on_change = spy.on(callbacks, "on_change")
-
-      local lines = {
-        Menu.item("Item 1", { id = 1 }),
-        Menu.item("Item 2", { id = 2 }),
-        Menu.item("Item 3", { id = 3 }),
-      }
-
-      menu = Menu(popup_options, {
-        keymap = {
-          focus_next = "s",
-          focus_prev = "w",
-        },
-        lines = lines,
-        on_change = on_change,
-      })
-
-      menu:mount()
-
-      feedkeys("s", "x")
-      assert.spy(on_change).called_with(lines[2], menu)
-      on_change:clear()
-
-      feedkeys("w", "x")
-      assert.spy(on_change).called_with(lines[1], menu)
-      on_change:clear()
-    end)
-  end)
-
-  describe("size", function()
-    it("respects o.min_width", function()
-      local min_width = 3
-
-      local items = {
-        Menu.item("A"),
-        Menu.separator("*"),
-        Menu.item("B"),
-      }
-
-      menu = Menu(popup_options, {
-        lines = items,
-        min_width = min_width,
-      })
-
-      menu:mount()
-
-      eq(vim.api.nvim_win_get_width(menu.winid), min_width)
-
-      h.assert_buf_lines(menu.bufnr, {
-        "A",
-        " * ",
-        "B",
-      })
-    end)
-
-    it("respects o.max_width", function()
-      local max_width = 6
-
-      local items = {
-        Menu.item("Item 1"),
-        Menu.separator("*"),
-        Menu.item("Item Number Two"),
-      }
-
-      menu = Menu(popup_options, {
-        lines = items,
-        max_width = max_width,
-      })
-
-      menu:mount()
-
-      eq(vim.api.nvim_win_get_width(menu.winid), max_width)
-
-      h.assert_buf_lines(menu.bufnr, {
-        "Item 1",
-        " *    ",
-        "Item …",
-      })
-    end)
-
-    it("respects o.min_height", function()
-      local min_height = 3
-
-      local items = {
-        Menu.item("A"),
-        Menu.separator("*"),
-        Menu.item("B"),
-      }
-
-      menu = Menu(popup_options, {
-        lines = items,
-        min_height = min_height,
-      })
-
-      menu:mount()
-
-      eq(vim.api.nvim_win_get_height(menu.winid), min_height)
-    end)
-
-    it("respects o.max_height", function()
-      local max_height = 2
-
-      local items = {
-        Menu.item("A"),
-        Menu.separator("*"),
-        Menu.item("B"),
-      }
-
-      menu = Menu(popup_options, {
-        lines = items,
-        max_height = max_height,
-      })
-
-      menu:mount()
-
-      eq(vim.api.nvim_win_get_height(menu.winid), max_height)
-    end)
-  end)
-
-  it("calls o.on_change item focus is changed", function()
-    local on_change = spy.on(callbacks, "on_change")
-
-    local lines = {
-      Menu.item("Item 1", { id = 1 }),
-      Menu.item("Item 2", { id = 2 }),
-    }
-
-    menu = Menu(popup_options, {
-      lines = lines,
-      on_change = on_change,
-    })
-
-    menu:mount()
-
-    -- initial focus
-    assert.spy(on_change).called_with(lines[1], menu)
-    on_change:clear()
-
-    feedkeys("j", "x")
-    assert.spy(on_change).called_with(lines[2], menu)
-    on_change:clear()
-
-    feedkeys("j", "x")
-    assert.spy(on_change).called_with(lines[1], menu)
-    on_change:clear()
-
-    feedkeys("k", "x")
-    assert.spy(on_change).called_with(lines[2], menu)
-    on_change:clear()
-  end)
-
-  it("calls o.on_submit when item is submitted", function()
-    local on_submit = spy.on(callbacks, "on_submit")
-
-    local lines = {
-      Menu.item("Item 1", { id = 1 }),
-      Menu.item("Item 2", { id = 2 }),
-    }
-
-    menu = Menu(popup_options, {
-      lines = lines,
-      on_submit = on_submit,
-    })
-
-    menu:mount()
-
-    feedkeys("j", "x")
-    feedkeys("<CR>", "x")
-
-    assert.spy(on_submit).called_with(lines[2])
-  end)
-
-  it("calls o.on_close when menu is closed", function()
-    local on_close = spy.on(callbacks, "on_close")
-
-    local lines = {
-      Menu.item("Item 1", { id = 1 }),
-      Menu.item("Item 2", { id = 2 }),
-    }
-
-    menu = Menu(popup_options, {
-      lines = lines,
-      on_close = on_close,
-    })
-
-    menu:mount()
-
-    feedkeys("<Esc>", "x")
-
-    assert.spy(on_close).called_with()
-  end)
-
-  describe("item", function()
-    it("is prepared using o.prepare_item if provided", function()
-      local items = {
-        Menu.item("A"),
-        Menu.separator("*"),
-        Menu.item("B"),
-      }
-
-      local function prepare_item(item)
-        return "-" .. item.text .. "-"
-      end
-
-      menu = Menu(popup_options, {
-        lines = items,
-        prepare_item = prepare_item,
-      })
-
-      menu:mount()
-
-      h.assert_buf_lines(menu.bufnr, vim.tbl_map(prepare_item, items))
-    end)
-
-    it("is prepared when o.prepare_item is not provided", function()
-      local items = {
-        Menu.item("A"),
-        Menu.separator("*"),
-        Menu.item("B"),
-      }
-
-      popup_options.border = "single"
-
-      menu = Menu(popup_options, {
-        lines = items,
-      })
-
-      menu:mount()
-
-      h.assert_buf_lines(menu.bufnr, {
-        "A",
-        "─*──",
-        "B",
-      })
-    end)
-
-    it("is skipped respecting o.should_skip_item if provided", function()
-      local on_change = spy.on(callbacks, "on_change")
-
-      local items = {
-        Menu.item("-"),
-        Menu.item("A", { id = 1 }),
-        Menu.item("-"),
-        Menu.item("B", { id = 2 }),
-        Menu.item("-"),
-      }
-
-      menu = Menu(popup_options, {
-        lines = items,
-        on_change = on_change,
-        should_skip_item = function(item)
-          return not item.id
-        end,
-      })
-
-      menu:mount()
-
-      assert.spy(on_change).called_with(items[2], menu)
-      on_change:clear()
-
-      feedkeys("j", "x")
-      assert.spy(on_change).called_with(items[4], menu)
-      on_change:clear()
-
-      feedkeys("j", "x")
-      assert.spy(on_change).called_with(items[2], menu)
-      on_change:clear()
-    end)
-
-    it("supports table with key .text", function()
-      local text = "text"
-
-      local items = {
-        Menu.item({ text = text }),
-      }
-
-      menu = Menu(popup_options, {
-        lines = items,
-      })
-
-      menu:mount()
-
-      h.assert_buf_lines(menu.bufnr, {
-        text,
-      })
-    end)
-
-    it("supports nui.text", function()
-      local hl_group = "NuiMenuTest"
-      local text = "text"
-      local items = {
-        Menu.item(Text(text, hl_group)),
-      }
-
-      menu = Menu(popup_options, {
-        lines = items,
-      })
-
-      menu:mount()
-
-      h.assert_buf_lines(menu.bufnr, {
-        text,
-      })
-
-      h.assert_highlight(menu.bufnr, menu.ns_id, 1, text, hl_group)
-    end)
-
-    it("supports nui.line", function()
-      local hl_group = "NuiMenuTest"
-      local text = "text"
-      local items = {
-        Menu.item(Line({ Text(text, hl_group) })),
-      }
-
-      menu = Menu(popup_options, {
-        lines = items,
-      })
-
-      menu:mount()
-
-      h.assert_buf_lines(menu.bufnr, {
-        text,
-      })
-
-      h.assert_highlight(menu.bufnr, menu.ns_id, 1, text, hl_group)
-    end)
-
-    it("content longer than max_width is truncated", function()
-      local items = {
-        Menu.item({ text = "Item 10 -" }),
-        Menu.item(Text("Item 20 -")),
-        Menu.item(Line({ Text("Item 30 -") })),
-        Menu.item(Line({ Text("Item 40"), Text(" -") })),
-        Menu.item(Line({ Text("Item 50 -"), Text(" -") })),
-      }
-
-      menu = Menu(popup_options, {
-        max_width = 7,
-        lines = items,
-      })
-
-      menu:mount()
-
-      h.assert_buf_lines(menu.bufnr, {
-        "Item 1…",
-        "Item 2…",
-        "Item 3…",
-        "Item 4…",
-        "Item 5…",
-      })
-    end)
-  end)
-
-  describe("separator", function()
-    it("text supports string", function()
-      menu = Menu(popup_options, {
-        lines = {
-          Menu.item("A"),
-          Menu.separator("Group"),
-        },
-        min_width = 10,
-      })
-
-      menu:mount()
-
-      h.assert_buf_lines(menu.bufnr, {
-        "A",
-        " Group    ",
-      })
-    end)
-
-    it("content longer than max_width is truncated", function()
-      menu = Menu(popup_options, {
-        lines = {
-          Menu.item("A"),
-          Menu.separator("Long Long Group"),
-        },
-        max_width = 10,
-      })
-
-      menu:mount()
-
-      h.assert_buf_lines(menu.bufnr, {
-        "A",
-        " Long Lo… ",
-      })
-    end)
-
-    it("text supports nui.text", function()
-      local hl_group = "NuiMenuTest"
-      local text = "Group"
-
-      menu = Menu(popup_options, {
-        lines = {
-          Menu.item("A"),
-          Menu.separator(Text(text, hl_group)),
-        },
-        min_width = 10,
-      })
-
-      menu:mount()
-
-      h.assert_buf_lines(menu.bufnr, {
-        "A",
-        " Group    ",
-      })
-
-      h.assert_highlight(menu.bufnr, menu.ns_id, 2, text, hl_group)
-    end)
-
-    it("text supports nui.line", function()
-      local hl_group = "NuiMenuTest"
-      local text = "Group"
-
-      menu = Menu(popup_options, {
-        lines = {
-          Menu.item("A"),
-          Menu.separator(Line({ Text(text, hl_group), Text(" nui.text") })),
-        },
-        min_width = 10,
-      })
-
-      menu:mount()
-
-      h.assert_buf_lines(menu.bufnr, {
-        "A",
-        " Group nui.t… ",
-      })
-
-      h.assert_highlight(menu.bufnr, menu.ns_id, 2, text, hl_group)
-    end)
-
-    it("o.char supports string", function()
-      menu = Menu(popup_options, {
-        lines = {
-          Menu.item("A"),
-          Menu.separator("Group", {
-            char = "*",
-            text_align = "right",
-          }),
-        },
-        min_width = 10,
-      })
-
-      menu:mount()
-
-      h.assert_buf_lines(menu.bufnr, {
-        "A",
-        "****Group*",
-      })
-    end)
-
-    it("o.char supports nui.text", function()
-      local hl_group = "NuiMenuTest"
-
-      menu = Menu(popup_options, {
-        lines = {
-          Menu.item("A"),
-          Menu.separator("Group", {
-            char = Text("*", hl_group),
-            text_align = "center",
-          }),
-        },
-        min_width = 10,
-      })
-
-      menu:mount()
-
-      h.assert_buf_lines(menu.bufnr, {
-        "A",
-        "**Group***",
-      })
-
-      local linenr = 2
-
-      local extmarks = h.get_line_extmarks(menu.bufnr, menu.ns_id, linenr)
-
-      eq(#extmarks, 4)
-      h.assert_extmark(extmarks[1], linenr, "*", hl_group)
-      h.assert_extmark(extmarks[2], linenr, "*", hl_group)
-      h.assert_extmark(extmarks[3], linenr, "**", hl_group)
-      h.assert_extmark(extmarks[4], linenr, "*", hl_group)
-    end)
-  end)
-
-  describe("w/ Layout", function()
-    it("can be used", function()
-      menu = Menu({}, {
-        lines = {
-          Menu.item("A"),
-        },
-      })
-
-      local layout = Layout(
-        {
-          position = "50%",
-          size = "100%",
-        },
-        Layout.Box({
-          Layout.Box(menu, { size = "100%" }),
-        })
-      )
-
-      layout:mount()
-
-      h.assert_buf_lines(menu.bufnr, {
-        "A",
-      })
-    end)
-  end)
-end)
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/object/init_spec.lua b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/object/init_spec.lua
deleted file mode 100644
index 9abc9140..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/object/init_spec.lua
+++ /dev/null
@@ -1,413 +0,0 @@
-pcall(require, "luacov")
-
-local h = require("tests.helpers")
-local Object = require("nui.object")
-local spy = require("luassert.spy")
-
-local function assert_class(Class, SuperClass, name)
-  h.eq(type(Class), "table")
-
-  h.eq(Class.super, SuperClass)
-  h.eq(Class.name, name)
-  h.eq(tostring(Class), "class " .. name)
-
-  h.eq(type(Class.new), "function")
-  h.eq(type(Class.extend), "function")
-
-  local is_callable = pcall(function()
-    return Class()
-  end)
-  h.eq(is_callable, true)
-end
-
-local function assert_instance(instance, Class)
-  h.eq(instance.class, Class)
-  h.eq(tostring(instance), "instance of class " .. Class.name)
-
-  h.eq(instance.name, nil)
-  h.eq(instance.super, nil)
-  h.eq(instance.static, nil)
-
-  h.eq(instance.new, nil)
-  h.eq(instance.extend, nil)
-end
-
-local function create_classes(...)
-  local by_name = {}
-  local classes = {}
-
-  for i, def in ipairs({ ... }) do
-    if type(def) == "string" then
-      local class = Object(def)
-      assert_class(class, nil, def)
-      by_name[def] = class
-      classes[i] = class
-    elseif type(def) == "table" then
-      local super = type(def[2]) == "table" and def[2] or (by_name[def[2]] and by_name[def[2]] or nil)
-      local class = super and super:extend(def[1]) or Object(def[1])
-      assert_class(class, super, def[1])
-      by_name[def[1]] = class
-      classes[i] = class
-    else
-      error("invalid argument")
-    end
-  end
-
-  return unpack(classes)
-end
-
-describe("nui.object", function()
-  describe("class", function()
-    it("can be created", function()
-      local Class = Object("Class")
-      assert_class(Class, nil, "Class")
-    end)
-
-    describe("static", function()
-      describe("method", function()
-        describe(":new", function()
-          it("is called when creating instance", function()
-            local Class = Object("Class")
-
-            spy.on(Class.static, "new")
-            Class()
-            assert.spy(Class.static.new).called_with(Class)
-            Class.static.new:revert()
-
-            spy.on(Class.static, "new")
-            Class:new()
-            assert.spy(Class.static.new).called_with(Class)
-            Class.static.new:revert()
-          end)
-
-          it("creates new instance", function()
-            local Class = Object("Class")
-
-            local instance = Class:new()
-            assert_instance(instance, Class)
-          end)
-        end)
-
-        describe(":extend", function()
-          it("creates subclass", function()
-            local Class = Object("Class")
-
-            local SubClass = Class:extend("SubClass")
-            assert_class(SubClass, Class, "SubClass")
-          end)
-        end)
-
-        describe(":is_subclass_of", function()
-          it("works", function()
-            local A, B, C = create_classes("A", { "B", "A" }, { "C", "B" })
-
-            for _, class in ipairs({ A, B, C }) do
-              h.eq(class.is_subclass_of, Object.is_subclass)
-            end
-
-            h.eq(A:is_subclass_of(A), false)
-            h.eq(A:is_subclass_of(B), false)
-            h.eq(A:is_subclass_of(C), false)
-
-            h.eq(B:is_subclass_of(A), true)
-            h.eq(B:is_subclass_of(B), false)
-            h.eq(B:is_subclass_of(C), false)
-
-            h.eq(C:is_subclass_of(A), true)
-            h.eq(C:is_subclass_of(B), true)
-            h.eq(C:is_subclass_of(C), false)
-          end)
-        end)
-      end)
-
-      local function define_static_say_level(A)
-        A.static.level = 1
-        function A.static.say_level(class)
-          return "Level: " .. class.level
-        end
-
-        h.eq(A.level, 1)
-        h.eq(A:say_level(), "Level: 1")
-      end
-
-      it("can be defined for class", function()
-        local A = create_classes("A")
-        define_static_say_level(A)
-      end)
-
-      it("is inherited by subclass", function()
-        local A, B = create_classes("A", { "B", "A" })
-
-        define_static_say_level(A)
-
-        h.eq(B.level, 1)
-        h.eq(B:say_level(), "Level: 1")
-
-        local C, D = create_classes({ "C", A }, { "D", B })
-
-        h.eq(C.level, 1)
-        h.eq(C:say_level(), "Level: 1")
-
-        h.eq(D.level, 1)
-        h.eq(D:say_level(), "Level: 1")
-      end)
-
-      it("can be redefined for subclass", function()
-        local A = create_classes("A")
-        define_static_say_level(A)
-
-        local B = create_classes({ "B", A })
-
-        B.static.level = 2
-        h.eq(B:say_level(), "Level: 2")
-
-        function B.static.say_level(class)
-          return "LEVEL: " .. class.level
-        end
-        h.eq(B:say_level(), "LEVEL: 2")
-
-        local C, D = create_classes({ "C", A }, { "D", B })
-
-        C.static.level = 2
-        h.eq(C:say_level(), "Level: 2")
-
-        D.static.level = 3
-        h.eq(D:say_level(), "LEVEL: 3")
-      end)
-
-      it("for subclass does not affect super", function()
-        local A = create_classes("A")
-        define_static_say_level(A)
-
-        local B = create_classes({ "B", A })
-
-        B.static.level = 2
-        function B.static.say_level(class)
-          return "LEVEL: " .. class.level
-        end
-
-        h.eq(A:say_level(), "Level: 1")
-
-        local C = create_classes({ "C", B })
-
-        function C.static.say_name(class)
-          return class.name
-        end
-
-        h.eq(C:say_name(), "C")
-
-        h.eq(type(C.say_name), "function")
-        h.eq(type(B.say_name), "nil")
-        h.eq(type(A.say_name), "nil")
-      end)
-    end)
-
-    describe("instance", function()
-      it("can be created", function()
-        local A = create_classes("A")
-
-        local a = A:new()
-        assert_instance(a, A)
-      end)
-
-      describe("method", function()
-        describe(":is_instance_of", function()
-          it("works", function()
-            local A, B, C, D = create_classes("A", { "B", "A" }, { "C", "B" }, "D")
-
-            local a, b, c, d = A:new(), B:new(), C:new(), D:new()
-
-            for _, instance in ipairs({ a, b, c, d }) do
-              h.eq(instance.is_instance_of, Object.is_instance)
-            end
-
-            h.eq(a:is_instance_of(A), true)
-            h.eq(a:is_instance_of(B), false)
-            h.eq(a:is_instance_of(C), false)
-            h.eq(a:is_instance_of(D), false)
-
-            h.eq(b:is_instance_of(A), true)
-            h.eq(b:is_instance_of(B), true)
-            h.eq(b:is_instance_of(C), false)
-            h.eq(b:is_instance_of(D), false)
-
-            h.eq(c:is_instance_of(A), true)
-            h.eq(c:is_instance_of(B), true)
-            h.eq(c:is_instance_of(C), true)
-            h.eq(c:is_instance_of(D), false)
-
-            h.eq(d:is_instance_of(A), false)
-            h.eq(d:is_instance_of(B), false)
-            h.eq(d:is_instance_of(C), false)
-            h.eq(d:is_instance_of(D), true)
-          end)
-        end)
-
-        it("can be defined", function()
-          local A = create_classes("A")
-
-          function A:before_instance_creation()
-            return "before " .. self.class.name .. " instance"
-          end
-
-          local a = A:new()
-
-          function A:after_instance_creation()
-            return "after " .. self.class.name .. " instance"
-          end
-
-          h.eq(a:before_instance_creation(), "before A instance")
-          h.eq(a:after_instance_creation(), "after A instance")
-        end)
-
-        it("can be inherited", function()
-          local A, B = create_classes("A", { "B", "A" })
-
-          function A:say_class_name()
-            return self.class.name
-          end
-
-          local a = A:new()
-          h.eq(a:say_class_name(), "A")
-
-          local b = B:new()
-          h.eq(b:say_class_name(), "B")
-
-          local C = create_classes({ "C", B })
-
-          local c = C:new()
-          h.eq(c:say_class_name(), "C")
-        end)
-
-        it("can be redefined", function()
-          local A, B = create_classes("A", { "B", "A" })
-
-          function A:say_class_name()
-            return self.class.name
-          end
-
-          local a = A:new()
-          h.eq(a:say_class_name(), "A")
-
-          function B:say_class_name()
-            return string.lower(self.class.name)
-          end
-
-          local b = B:new()
-          h.eq(b:say_class_name(), "b")
-
-          local C = create_classes({ "C", B })
-
-          local c = C:new()
-          h.eq(c:say_class_name(), "c")
-
-          function C:say_class_name()
-            return string.rep(self.class.name, 3)
-          end
-
-          h.eq(c:say_class_name(), "CCC")
-
-          C.say_class_name = nil
-
-          h.eq(c:say_class_name(), "c")
-
-          B.say_class_name = nil
-
-          h.eq(c:say_class_name(), "C")
-        end)
-      end)
-
-      describe("metamethod", function()
-        describe("__index", function()
-          it("can be set to table", function()
-            local A = create_classes("A")
-
-            function A:upper(str) -- luacheck: no unused args
-              return string.upper(str)
-            end
-
-            A.__index = {
-              upper = function(_, str)
-                return str
-              end,
-              lower = function(_, str)
-                return string.lower(str)
-              end,
-            }
-
-            local a = A()
-
-            h.eq(a:upper("y"), "Y")
-
-            h.eq(a:lower("Y"), "y")
-
-            A.__index = nil
-
-            h.eq(type(a.lower), "nil")
-          end)
-
-          it("can be set to function", function()
-            local A = create_classes("A")
-
-            function A:upper(str) -- luacheck: no unused args
-              return string.upper(str)
-            end
-
-            local index = {
-              upper = function(self, str) -- luacheck: no unused args
-                return str
-              end,
-              lower = function(self, str) -- luacheck: no unused args
-                return string.lower(str)
-              end,
-            }
-
-            A.__index = function(self, key) -- luacheck: no unused args
-              return index[key]
-            end
-
-            local a = A()
-
-            h.eq(a:upper("y"), "Y")
-
-            h.eq(a:lower("Y"), "y")
-
-            A.__index = nil
-
-            h.eq(type(a.lower), "nil")
-          end)
-        end)
-
-        describe("__tostring", function()
-          it("can be redefined", function()
-            local A, B = create_classes("A", { "B", "A" })
-
-            local a = A()
-
-            h.eq(tostring(a), "instance of class A")
-
-            function A:__tostring()
-              return "class " .. self.class.name .. "'s child"
-            end
-
-            h.eq(tostring(a), "class A's child")
-
-            local b = B()
-
-            h.eq(tostring(b), "class B's child")
-
-            function B:__tostring()
-              return "child of " .. self.class.name
-            end
-
-            h.eq(tostring(b), "child of B")
-
-            B.__tostring = nil
-
-            h.eq(tostring(b), "class B's child")
-          end)
-        end)
-      end)
-    end)
-  end)
-end)
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/popup/border_spec.lua b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/popup/border_spec.lua
deleted file mode 100644
index 73a65bee..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/popup/border_spec.lua
+++ /dev/null
@@ -1,1031 +0,0 @@
-pcall(require, "luacov")
-
-local Layout = require("nui.layout")
-local Popup = require("nui.popup")
-local Line = require("nui.line")
-local Text = require("nui.text")
-local h = require("tests.helpers")
-
-local eq = h.eq
-
-describe("nui.popup", function()
-  local popup_options = {}
-  local popup
-
-  before_each(function()
-    popup_options = {
-      ns_id = vim.api.nvim_create_namespace("NuiTest"),
-      position = "50%",
-      size = {
-        height = 2,
-        width = 8,
-      },
-    }
-  end)
-
-  after_each(function()
-    if popup then
-      popup:unmount()
-      popup = nil
-    end
-  end)
-
-  describe("(#deprecated) border.highlight", function()
-    it("works for 'hl_group'", function()
-      local hl_group = "NuiPopupTest"
-
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "rounded",
-          highlight = hl_group,
-          padding = { 0 },
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      eq(vim.api.nvim_win_get_option(popup.border.winid, "winhighlight"), "FloatBorder:" .. hl_group)
-    end)
-
-    it("works for 'FloatBorder:hl_group'", function()
-      local hl_group = "NuiPopupTest"
-
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "rounded",
-          highlight = "FloatBorder:" .. hl_group,
-          padding = { 0 },
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      eq(vim.api.nvim_win_get_option(popup.border.winid, "winhighlight"), "FloatBorder:" .. hl_group)
-    end)
-  end)
-
-  describe("border.padding", function()
-    local function assert_padding(padding, target_popup)
-      local border_char_size = 1
-
-      local popup_win_config = vim.api.nvim_win_get_config(target_popup.winid)
-      eq(popup_win_config.win, target_popup.border.winid)
-      eq(popup_win_config.row, border_char_size + padding.top)
-      eq(popup_win_config.col, border_char_size + padding.left)
-
-      local border_win_config = vim.api.nvim_win_get_config(target_popup.border.winid)
-      eq(border_win_config.width, popup_options.size.width + border_char_size * 2 + padding.right + padding.left)
-      eq(border_win_config.height, popup_options.size.height + border_char_size * 2 + padding.top + padding.bottom)
-    end
-
-    it("supports list table", function()
-      local padding = {
-        top = 2,
-        right = 2,
-        bottom = 1,
-        left = 1,
-      }
-
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "rounded",
-          padding = { padding.top, padding.right, padding.bottom, padding.left },
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      assert_padding(padding, popup)
-    end)
-
-    it("supports partial list table", function()
-      local padding = {
-        top = 2,
-        right = 1,
-        bottom = 2,
-        left = 1,
-      }
-
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "rounded",
-          padding = { padding.top, padding.right },
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      assert_padding(padding, popup)
-    end)
-
-    it("supports map table", function()
-      local padding = {
-        top = 2,
-        right = 2,
-        bottom = 1,
-        left = 1,
-      }
-
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "rounded",
-          padding = padding,
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      assert_padding(padding, popup)
-    end)
-  end)
-
-  describe("border.style", function()
-    describe("for complex border", function()
-      it("is normalized", function()
-        local index_name = {
-          "top_left",
-          "top",
-          "top_right",
-          "right",
-          "bottom_right",
-          "bottom",
-          "bottom_left",
-          "left",
-        }
-
-        local char_map
-
-        popup_options = vim.tbl_deep_extend("force", popup_options, {
-          border = {
-            padding = { 0 },
-          },
-        })
-
-        popup = Popup(popup_options)
-        char_map = popup.border._.char
-        eq(char_map, "none")
-
-        popup_options.border.style = "shadow"
-        popup = Popup(popup_options)
-        char_map = popup.border._.char
-        eq(char_map, "shadow")
-
-        popup_options.border.style = "rounded"
-        popup = Popup(popup_options)
-        char_map = popup.border._.char
-        for _, name in ipairs(index_name) do
-          eq(type(char_map[name]:content()), "string")
-          eq(char_map[name].extmark.hl_group, "FloatBorder")
-        end
-
-        popup_options.border.style = h.popup.create_border_style_list()
-        popup_options.border.style[1] = { popup_options.border.style[1], "TopLeft" }
-        popup_options.border.style[2] = Text(popup_options.border.style[2])
-        popup_options.border.style[3] = Text(popup_options.border.style[3], "TopRight")
-        popup_options.border.style[6] = { popup_options.border.style[6] }
-        popup = Popup(popup_options)
-        char_map = popup.border._.char
-        for _, name in ipairs(index_name) do
-          eq(type(char_map[name]:content()), "string")
-          if name == "top_left" then
-            eq(char_map[name].extmark.hl_group, "TopLeft")
-          elseif name == "top_right" then
-            eq(char_map[name].extmark.hl_group, "TopRight")
-          else
-            eq(char_map[name].extmark.hl_group, "FloatBorder")
-          end
-        end
-
-        popup_options.border.style = h.popup.create_border_style_map()
-        popup_options.border.style.top_left = { popup_options.border.style.top_left, "TopLeft" }
-        popup_options.border.style.top = Text(popup_options.border.style.top)
-        popup_options.border.style.top_right = Text(popup_options.border.style.top_right, "TopRight")
-        popup_options.border.style.bottom = { popup_options.border.style.bottom }
-        popup = Popup(popup_options)
-        char_map = popup.border._.char
-        for _, name in ipairs(index_name) do
-          eq(type(char_map[name]:content()), "string")
-          if name == "top_left" then
-            eq(char_map[name].extmark.hl_group, "TopLeft")
-          elseif name == "top_right" then
-            eq(char_map[name].extmark.hl_group, "TopRight")
-          else
-            eq(char_map[name].extmark.hl_group, "FloatBorder")
-          end
-        end
-      end)
-
-      it("supports string name", function()
-        popup_options = vim.tbl_deep_extend("force", popup_options, {
-          border = {
-            style = "rounded",
-            padding = { 0 },
-          },
-        })
-
-        popup = Popup(popup_options)
-
-        popup:mount()
-
-        h.assert_buf_lines(popup.border.bufnr, {
-          "╭────────╮",
-          "│        │",
-          "│        │",
-          "╰────────╯",
-        })
-      end)
-
-      it("supports list table", function()
-        local style = h.popup.create_border_style_list()
-
-        popup_options = vim.tbl_deep_extend("force", popup_options, {
-          border = {
-            style = style,
-            padding = { 0 },
-          },
-        })
-
-        popup = Popup(popup_options)
-
-        popup:mount()
-
-        h.popup.assert_border_lines(popup_options, popup.border.bufnr)
-      end)
-
-      it("supports partial list table", function()
-        popup_options = vim.tbl_deep_extend("force", popup_options, {
-          border = {
-            style = { "-" },
-            padding = { 0 },
-          },
-        })
-
-        popup = Popup(popup_options)
-
-        popup:mount()
-
-        popup_options.border.style = { "-", "-", "-", "-", "-", "-", "-", "-" }
-
-        h.popup.assert_border_lines(popup_options, popup.border.bufnr)
-      end)
-
-      it("supports map table", function()
-        local style = h.popup.create_border_style_map()
-
-        popup_options = vim.tbl_deep_extend("force", popup_options, {
-          border = {
-            style = style,
-            padding = { 0 },
-          },
-        })
-
-        popup = Popup(popup_options)
-
-        popup:mount()
-
-        h.popup.assert_border_lines(popup_options, popup.border.bufnr)
-      end)
-
-      it("supports (char, hl_group) tuple in partial list table", function()
-        local hl_group = "NuiPopupTest"
-
-        popup_options = vim.tbl_deep_extend("force", popup_options, {
-          border = {
-            style = { { "-", hl_group } },
-            padding = { 0 },
-          },
-        })
-
-        popup = Popup(popup_options)
-
-        popup:mount()
-
-        popup_options.border.style = { "-", "-", "-", "-", "-", "-", "-", "-" }
-
-        h.popup.assert_border_lines(popup_options, popup.border.bufnr)
-        h.popup.assert_border_highlight(popup_options, popup.border.bufnr, hl_group, true)
-      end)
-
-      it("supports (char, hl_group) tuple in map table", function()
-        local hl_group = "NuiPopupTest"
-        local style = h.popup.create_border_style_map_with_tuple(hl_group)
-
-        popup_options = vim.tbl_deep_extend("force", popup_options, {
-          border = {
-            style = style,
-            padding = { 0 },
-          },
-        })
-
-        popup = Popup(popup_options)
-
-        popup:mount()
-
-        h.popup.assert_border_lines(popup_options, popup.border.bufnr)
-        h.popup.assert_border_highlight(popup_options, popup.border.bufnr, hl_group)
-      end)
-
-      it("supports nui.text in map table", function()
-        local hl_group = "NuiPopupTest"
-        local style = h.popup.create_border_style_map_with_nui_text(hl_group)
-
-        popup_options = vim.tbl_deep_extend("force", popup_options, {
-          border = {
-            style = style,
-            padding = { 0 },
-          },
-        })
-
-        popup = Popup(popup_options)
-
-        popup:mount()
-
-        h.popup.assert_border_lines(popup_options, popup.border.bufnr)
-        h.popup.assert_border_highlight(popup_options, popup.border.bufnr, hl_group)
-      end)
-    end)
-
-    describe("for simple border", function()
-      it("supports nui.text as char", function()
-        local hl_group = "NuiPopupTest"
-
-        local style = h.popup.create_border_style_list()
-        style[2] = Text(style[2], hl_group)
-        style[6] = Text(style[6])
-
-        popup_options = vim.tbl_deep_extend("force", popup_options, {
-          border = {
-            style = style,
-          },
-        })
-
-        popup = Popup(popup_options)
-
-        popup:mount()
-
-        local win_config = vim.api.nvim_win_get_config(popup.winid)
-
-        eq(win_config.border[2], { style[2]:content(), hl_group })
-        eq(win_config.border[6], { style[6]:content(), "FloatBorder" })
-      end)
-
-      it("supports (char, hl_group) tuple as char", function()
-        local hl_group = "NuiPopupTest"
-
-        local style = h.popup.create_border_style_list()
-        style[2] = { style[2], hl_group }
-        style[6] = { style[6] }
-
-        popup_options = vim.tbl_deep_extend("force", popup_options, {
-          border = {
-            style = style,
-          },
-        })
-
-        popup = Popup(popup_options)
-
-        popup:mount()
-
-        local win_config = vim.api.nvim_win_get_config(popup.winid)
-
-        eq(win_config.border[2], { style[2][1], style[2][2] })
-        eq(win_config.border[6], { style[6][1], "FloatBorder" })
-      end)
-
-      it("throws if map table missing keys", function()
-        local style = h.popup.create_border_style_map()
-        style["top"] = nil
-
-        popup_options = vim.tbl_deep_extend("force", popup_options, {
-          border = {
-            style = style,
-          },
-        })
-
-        local ok, err = pcall(Popup, popup_options)
-        eq(ok, false)
-        eq(type(string.match(err, "missing named border: top")), "string")
-      end)
-    end)
-  end)
-
-  describe("border.text", function()
-    it("throws error if borderless", function()
-      local text = "popup"
-
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "none",
-          text = {
-            top = text,
-          },
-        },
-      })
-
-      local ok, err = pcall(Popup, popup_options)
-      eq(ok, false)
-      eq(type(string.match(err, "text not supported for style:")), "string")
-    end)
-
-    it("throws error if invalid border style", function()
-      local text = "popup"
-
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "__invalid__",
-          text = {
-            top = text,
-          },
-        },
-      })
-
-      local ok, err = pcall(Popup, popup_options)
-      eq(ok, false)
-      eq(type(string.match(err, "invalid border style name")), "string")
-    end)
-
-    it("throws error if invalid align", function()
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "single",
-          text = {
-            top = "popup",
-            top_align = "diagonal",
-          },
-        },
-      })
-
-      local ok, err = pcall(Popup, popup_options)
-      eq(ok, false)
-      eq(type(string.match(err, "invalid value align=diagonal")), "string")
-    end)
-
-    it("supports simple text", function()
-      local text = "popup"
-
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "single",
-          text = {
-            top = text,
-          },
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      h.assert_buf_lines(popup.border.bufnr, {
-        "┌─popup──┐",
-      }, 1, 1)
-      h.assert_highlight(popup.border.bufnr, popup_options.ns_id, 1, text, "FloatTitle")
-    end)
-
-    it("supports string[]", function()
-      local text = { "a", "-", "b" }
-
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "single",
-          text = {
-            top = text,
-          },
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      h.assert_buf_lines(popup.border.bufnr, {
-        "┌──a-b───┐",
-      }, 1, 1)
-      h.assert_highlight(popup.border.bufnr, popup_options.ns_id, 1, "a", "FloatTitle")
-      h.assert_highlight(popup.border.bufnr, popup_options.ns_id, 1, "-", "FloatTitle")
-      h.assert_highlight(popup.border.bufnr, popup_options.ns_id, 1, "b", "FloatTitle")
-    end)
-
-    it("supports nui.text", function()
-      local text = "popup"
-      local hl_group = "NuiPopupTest"
-
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "single",
-          text = {
-            top = Text(text),
-            bottom = Text(text, hl_group),
-          },
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      h.assert_buf_lines(popup.border.bufnr, {
-        "┌─popup──┐",
-      }, 1, 1)
-      h.assert_highlight(popup.border.bufnr, popup_options.ns_id, 1, text, "FloatTitle")
-
-      h.assert_buf_lines(popup.border.bufnr, {
-        "└─popup──┘",
-      }, 4, 4)
-      h.assert_highlight(popup.border.bufnr, popup_options.ns_id, 4, text, hl_group)
-    end)
-
-    it("supports nui.line", function()
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "single",
-          text = {
-            top = Line({ Text("a", "NuiTestA"), Text("-"), Text("b", "NuiTestB") }),
-          },
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      h.assert_buf_lines(popup.border.bufnr, {
-        "┌──a-b───┐",
-      }, 1, 1)
-      h.assert_highlight(popup.border.bufnr, popup_options.ns_id, 1, "a", "NuiTestA")
-      h.assert_highlight(popup.border.bufnr, popup_options.ns_id, 1, "-", "FloatTitle")
-      h.assert_highlight(popup.border.bufnr, popup_options.ns_id, 1, "b", "NuiTestB")
-    end)
-
-    it("supports (text, hl_group)[]", function()
-      local text = { { "a", "NuiTestA" }, "-", { "b", "NuiTestB" } }
-
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "single",
-          text = {
-            top = text,
-          },
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      h.assert_buf_lines(popup.border.bufnr, {
-        "┌──a-b───┐",
-      }, 1, 1)
-      h.assert_highlight(popup.border.bufnr, popup_options.ns_id, 1, "a", "NuiTestA")
-      h.assert_highlight(popup.border.bufnr, popup_options.ns_id, 1, "-", "FloatTitle")
-      h.assert_highlight(popup.border.bufnr, popup_options.ns_id, 1, "b", "NuiTestB")
-    end)
-  end)
-
-  describe("method :mount", function()
-    it("ensure .bufnr is valid", function()
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "single",
-          text = {},
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup.border.bufnr = nil
-      popup:mount()
-      eq(vim.api.nvim_buf_is_valid(popup.border.bufnr), true)
-      popup:unmount()
-
-      popup = Popup(popup_options)
-      vim.api.nvim_buf_delete(popup.border.bufnr, { force = true })
-      popup:mount()
-      eq(vim.api.nvim_buf_is_valid(popup.border.bufnr), true)
-      popup:unmount()
-    end)
-
-    it("sets winblend from popup", function()
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "rounded",
-          text = {
-            top = "text",
-          },
-        },
-        win_options = {
-          winblend = 20,
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      eq(vim.api.nvim_win_get_option(popup.border.winid, "winblend"), 20)
-    end)
-
-    it("sets winhighlight correctly", function()
-      local hl_group = "NuiPopupTest"
-      local winhighlight = "Normal:Normal,FloatBorder:" .. hl_group
-
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "rounded",
-          text = {
-            top = "text",
-          },
-        },
-        win_options = {
-          winhighlight = winhighlight,
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      eq(vim.api.nvim_win_get_option(popup.border.winid, "winhighlight"), winhighlight)
-    end)
-
-    it("does nothing if popup mounted", function()
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "rounded",
-          text = {
-            top = "text",
-          },
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      local bufnr, winid = popup.border.bufnr, popup.border.winid
-      eq(type(bufnr), "number")
-      eq(type(winid), "number")
-
-      popup.border:mount()
-
-      eq(bufnr, popup.border.bufnr)
-      eq(winid, popup.border.winid)
-    end)
-  end)
-
-  describe("method :unmount", function()
-    it("does nothing if popup not mounted", function()
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "rounded",
-          text = {
-            top = "text",
-          },
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      local bufnr = popup.border.bufnr
-      eq(type(popup.border.winid), "nil")
-
-      popup.border:unmount()
-
-      eq(popup.border.bufnr, bufnr)
-      eq(type(popup.border.winid), "nil")
-    end)
-  end)
-
-  describe("method :set_style", function()
-    it("throws when trying to convert complex border to simple", function()
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "rounded",
-          padding = { 0 },
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      local ok, err = pcall(function()
-        popup.border:set_style("none")
-      end)
-      eq(ok, false)
-      eq(type(string.match(err, "cannot change from previous style to none")), "string")
-    end)
-  end)
-
-  describe("method :set_text", function()
-    it("works before :mount", function()
-      local text_top, text_bottom = "top", "bot"
-
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "rounded",
-          text = {
-            top = text_top,
-            top_align = "left",
-          },
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      h.assert_buf_lines(popup.border.bufnr, {
-        "╭top─────╮",
-        "│        │",
-        "│        │",
-        "╰────────╯",
-      })
-
-      popup.border:set_text("top", text_top, "center")
-
-      h.assert_buf_lines(popup.border.bufnr, {
-        "╭──top───╮",
-        "│        │",
-        "│        │",
-        "╰────────╯",
-      })
-
-      popup.border:set_text("top", text_top, "right")
-
-      h.assert_buf_lines(popup.border.bufnr, {
-        "╭─────top╮",
-        "│        │",
-        "│        │",
-        "╰────────╯",
-      })
-
-      local hl_group = "NuiPopupTest"
-
-      popup.border:set_text("bottom", Text(text_bottom, hl_group))
-
-      popup:mount()
-
-      h.assert_buf_lines(popup.border.bufnr, {
-        "╭─────top╮",
-        "│        │",
-        "│        │",
-        "╰──bot───╯",
-      })
-
-      h.assert_highlight(popup.border.bufnr, popup_options.ns_id, 4, text_bottom, hl_group)
-    end)
-
-    it("works after :mount", function()
-      local text_top, text_bottom = "top", "bot"
-
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "rounded",
-          text = {
-            top = text_top,
-            top_align = "left",
-          },
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      h.assert_buf_lines(popup.border.bufnr, {
-        "╭top─────╮",
-        "│        │",
-        "│        │",
-        "╰────────╯",
-      })
-
-      popup.border:set_text("top", text_top, "center")
-
-      h.assert_buf_lines(popup.border.bufnr, {
-        "╭──top───╮",
-        "│        │",
-        "│        │",
-        "╰────────╯",
-      })
-
-      popup.border:set_text("top", text_top, "right")
-
-      h.assert_buf_lines(popup.border.bufnr, {
-        "╭─────top╮",
-        "│        │",
-        "│        │",
-        "╰────────╯",
-      })
-
-      local hl_group = "NuiPopupTest"
-
-      popup.border:set_text("bottom", Text(text_bottom, hl_group))
-
-      h.assert_buf_lines(popup.border.bufnr, {
-        "╭─────top╮",
-        "│        │",
-        "│        │",
-        "╰──bot───╯",
-      })
-
-      h.assert_highlight(popup.border.bufnr, popup_options.ns_id, 4, text_bottom, hl_group)
-    end)
-
-    it("works w/ Layout before :mount", function()
-      local text_top = "top"
-
-      popup = Popup({
-        border = {
-          style = "rounded",
-          text = {
-            top = text_top,
-            top_align = "left",
-          },
-        },
-      })
-
-      popup.border:set_text("top", "TOP", "right")
-
-      local layout = Layout(
-        {
-          position = popup_options.position,
-          size = {
-            width = popup_options.size.width + 2,
-            height = popup_options.size.height + 2,
-          },
-        },
-        Layout.Box({
-          Layout.Box(popup, { size = "100%" }),
-        })
-      )
-
-      layout:mount()
-
-      h.assert_buf_lines(popup.border.bufnr, {
-        "╭─────TOP╮",
-        "│        │",
-        "│        │",
-        "╰────────╯",
-      })
-
-      layout:unmount()
-    end)
-
-    it("does nothing for simple border", function()
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = "rounded",
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      eq(type(popup.border.bufnr), "nil")
-
-      popup.border:set_text("top", "text")
-
-      eq(type(popup.border.bufnr), "nil")
-    end)
-  end)
-
-  describe("method :set_highlight", function()
-    it("works for simple border", function()
-      local style = h.popup.create_border_style_map()
-
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = style,
-        },
-        win_options = {
-          winhighlight = "Normal:Normal,FloatBorder:Normal",
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      eq(popup.border.winid, nil)
-
-      local hl_group = "NuiPopupTest"
-
-      popup.border:set_highlight(hl_group)
-
-      eq(vim.api.nvim_win_get_option(popup.winid, "winhighlight"), "FloatBorder:" .. hl_group .. ",Normal:Normal")
-    end)
-
-    it("works for complex border", function()
-      local style = h.popup.create_border_style_map()
-
-      local hl_group = "NuiPopupTest"
-
-      popup_options = vim.tbl_deep_extend("force", popup_options, {
-        border = {
-          style = style,
-          padding = { 0 },
-        },
-        win_options = {
-          winhighlight = "Normal:Normal,FloatBorder:" .. hl_group,
-        },
-      })
-
-      popup = Popup(popup_options)
-
-      popup:mount()
-
-      eq(vim.api.nvim_win_get_option(popup.winid, "winhighlight"), "Normal:Normal,FloatBorder:" .. hl_group)
-      eq(vim.api.nvim_win_get_option(popup.border.winid, "winhighlight"), "Normal:Normal,FloatBorder:" .. hl_group)
-
-      local hl_group_override = "NuiPopupTestOverride"
-
-      popup.border:set_highlight(hl_group_override)
-
-      eq(
-        vim.api.nvim_win_get_option(popup.winid, "winhighlight"),
-        "FloatBorder:" .. hl_group_override .. ",Normal:Normal"
-      )
-      eq(
-        vim.api.nvim_win_get_option(popup.border.winid, "winhighlight"),
-        "FloatBorder:" .. hl_group_override .. ",Normal:Normal"
-      )
-    end)
-  end)
-
-  describe("empty char", function()
-    for key, result in pairs({
-      top_left = {
-        "─────────╮",
-        "│        │",
-        "│        │",
-        "╰────────╯",
-      },
-      top = {
-        "╭        ╮",
-        "│        │",
-        "╰────────╯",
-      },
-      top_right = {
-        "╭─────────",
-        "│        │",
-        "│        │",
-        "╰────────╯",
-      },
-      right = {
-        "╭───────╮",
-        "│        ",
-        "│        ",
-        "╰───────╯",
-      },
-      bottom_right = {
-        "╭────────╮",
-        "│        │",
-        "│        │",
-        "╰─────────",
-      },
-      bottom = {
-        "╭────────╮",
-        "│        │",
-        "╰        ╯",
-      },
-      bottom_left = {
-        "╭────────╮",
-        "│        │",
-        "│        │",
-        "─────────╯",
-      },
-      left = {
-        "╭───────╮",
-        "        │",
-        "        │",
-        "╰───────╯",
-      },
-    }) do
-      it("- " .. key, function()
-        local style = h.popup.create_border_style_map()
-        style[key] = ""
-
-        popup_options = vim.tbl_deep_extend("force", popup_options, {
-          border = {
-            style = style,
-            text = {},
-          },
-        })
-
-        popup = Popup(popup_options)
-
-        popup:mount()
-
-        h.assert_buf_lines(popup.border.bufnr, result)
-      end)
-    end
-  end)
-end)
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/popup/init_spec.lua b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/popup/init_spec.lua
deleted file mode 100644
index fd4cad56..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/popup/init_spec.lua
+++ /dev/null
@@ -1,1230 +0,0 @@
-pcall(require, "luacov")
-
-local Popup = require("nui.popup")
-local event = require("nui.utils.autocmd").event
-local h = require("tests.helpers")
-local spy = require("luassert.spy")
-
-local eq, feedkeys = h.eq, h.feedkeys
-
-local function percent(number, percentage)
-  return math.floor(number * percentage / 100)
-end
-
-local function assert_size(popup, size, border_size)
-  if border_size and type(border_size) ~= "table" then
-    border_size = {
-      width = size.width + 2,
-      height = size.height + 2,
-    }
-  end
-
-  local win_config = vim.api.nvim_win_get_config(popup.winid)
-  eq(win_config.width, size.width)
-  eq(win_config.height, size.height)
-
-  if popup.border.winid then
-    local border_win_config = vim.api.nvim_win_get_config(popup.border.winid)
-    eq(border_win_config.width, border_size.width)
-    eq(border_win_config.height, border_size.height)
-  end
-end
-
-describe("nui.popup", function()
-  local popup
-
-  after_each(function()
-    if popup then
-      popup:unmount()
-      popup = nil
-    end
-  end)
-
-  it("supports o.bufnr (unmanaed buffer)", function()
-    local bufnr = vim.api.nvim_create_buf(false, true)
-
-    local lines = {
-      "a",
-      "b",
-      "c",
-    }
-
-    vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
-
-    popup = Popup({
-      bufnr = bufnr,
-      position = "50%",
-      size = {
-        height = "60%",
-        width = "80%",
-      },
-    })
-
-    h.assert_buf_lines(bufnr, lines)
-    eq(popup.bufnr, bufnr)
-    popup:mount()
-    h.assert_buf_lines(bufnr, lines)
-    popup:unmount()
-    eq(popup.bufnr, bufnr)
-    h.assert_buf_lines(bufnr, lines)
-  end)
-
-  it("accepts number as o.ns_id", function()
-    local ns = "NuiPopupTest"
-    local ns_id = vim.api.nvim_create_namespace(ns)
-
-    popup = Popup({
-      ns_id = ns_id,
-      position = "50%",
-      size = {
-        height = "60%",
-        width = "80%",
-      },
-    })
-
-    eq(popup.ns_id, ns_id)
-  end)
-
-  it("accepts string as o.ns_id", function()
-    local ns = "NuiPopupTest"
-
-    popup = Popup({
-      ns_id = ns,
-      position = "50%",
-      size = {
-        height = "60%",
-        width = "80%",
-      },
-    })
-
-    eq(popup.ns_id, vim.api.nvim_create_namespace(ns))
-  end)
-
-  it("uses fallback ns_id if o.ns_id=nil", function()
-    popup = Popup({
-      position = "50%",
-      size = {
-        height = "60%",
-        width = "80%",
-      },
-    })
-
-    eq(type(popup.ns_id), "number")
-    eq(popup.ns_id > 0, true)
-  end)
-
-  describe("o.size", function()
-    it("supports integer", function()
-      popup = Popup({
-        position = 0,
-        size = {
-          height = 8,
-          width = 20,
-        },
-      })
-
-      popup:mount()
-
-      assert_size(popup, {
-        height = 8,
-        width = 20,
-      })
-    end)
-
-    it("supports decimal number in (0,1)", function()
-      popup = Popup({
-        position = 0,
-        size = {
-          height = 0.6,
-          width = 0.8,
-        },
-      })
-
-      popup:mount()
-
-      assert_size(popup, {
-        height = percent(popup._.container_info.size.height, 60),
-        width = percent(popup._.container_info.size.width, 80),
-      })
-    end)
-
-    it("supports percentage string", function()
-      popup = Popup({
-        position = 0,
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup:mount()
-
-      assert_size(popup, {
-        height = percent(popup._.container_info.size.height, 60),
-        width = percent(popup._.container_info.size.width, 80),
-      })
-    end)
-  end)
-
-  h.describe_flipping_feature("lua_keymap", "method :map", function()
-    it("works before :mount", function()
-      local callback = spy.new(function() end)
-
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup:map("n", "l", function()
-        callback()
-      end)
-
-      popup:mount()
-
-      feedkeys("l", "x")
-
-      assert.spy(callback).called()
-    end)
-
-    it("works after :mount", function()
-      local callback = spy.new(function() end)
-
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup:mount()
-
-      popup:map("n", "l", function()
-        callback()
-      end)
-
-      feedkeys("l", "x")
-
-      assert.spy(callback).called()
-    end)
-
-    it("supports lhs table", function()
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup:mount()
-
-      popup:map("n", { "k", "l" }, "o42<esc>")
-
-      feedkeys("k", "x")
-      feedkeys("l", "x")
-
-      h.assert_buf_lines(popup.bufnr, {
-        "",
-        "42",
-        "42",
-      })
-    end)
-
-    it("supports rhs function", function()
-      local callback = spy.new(function() end)
-
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup:mount()
-
-      popup:map("n", "l", function()
-        callback()
-      end)
-
-      feedkeys("l", "x")
-
-      assert.spy(callback).called()
-    end)
-
-    it("supports rhs string", function()
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup:mount()
-
-      popup:map("n", "l", "o42<esc>")
-
-      feedkeys("l", "x")
-
-      h.assert_buf_lines(popup.bufnr, {
-        "",
-        "42",
-      })
-    end)
-
-    it("supports o.remap=true", function()
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup:mount()
-
-      popup:map("n", "k", "o42<Esc>")
-      popup:map("n", "l", "k", { remap = true })
-
-      feedkeys("k", "x")
-      feedkeys("l", "x")
-
-      h.assert_buf_lines(popup.bufnr, {
-        "",
-        "42",
-        "42",
-      })
-    end)
-
-    it("supports o.remap=false", function()
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup:mount()
-
-      popup:map("n", "k", "o42<Esc>")
-      popup:map("n", "l", "k", { remap = false })
-
-      feedkeys("k", "x")
-      feedkeys("l", "x")
-
-      h.assert_buf_lines(popup.bufnr, {
-        "",
-        "42",
-      })
-    end)
-
-    it("throws if .bufnr is nil", function()
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup.bufnr = nil
-
-      local ok, result = pcall(function()
-        popup:map("n", "l", function() end)
-      end)
-
-      eq(ok, false)
-      eq(type(string.match(result, "buffer not found")), "string")
-    end)
-  end)
-
-  h.describe_flipping_feature("lua_keymap", "method :unmap", function()
-    it("works before :mount", function()
-      local callback = spy.new(function() end)
-
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup:map("n", "l", function()
-        callback()
-      end)
-
-      popup:unmap("n", "l")
-
-      popup:mount()
-
-      feedkeys("l", "x")
-
-      assert.spy(callback).not_called()
-    end)
-
-    it("works after :mount", function()
-      local callback = spy.new(function() end)
-
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup:mount()
-
-      popup:map("n", "l", function()
-        callback()
-      end)
-
-      popup:unmap("n", "l")
-
-      feedkeys("l", "x")
-
-      assert.spy(callback).not_called()
-    end)
-
-    it("supports lhs string", function()
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup:mount()
-
-      popup:map("n", "l", "o42<esc>")
-
-      popup:unmap("n", "l")
-
-      feedkeys("l", "x")
-
-      h.assert_buf_lines(popup.bufnr, {
-        "",
-      })
-    end)
-
-    it("supports lhs table", function()
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup:mount()
-
-      popup:map("n", "k", "o42<esc>")
-      popup:map("n", "l", "o42<esc>")
-
-      popup:unmap("n", { "k", "l" })
-
-      feedkeys("k", "x")
-      feedkeys("l", "x")
-
-      h.assert_buf_lines(popup.bufnr, {
-        "",
-      })
-    end)
-
-    it("throws if .bufnr is nil", function()
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup.bufnr = nil
-
-      local ok, result = pcall(function()
-        popup:unmap("n", "l")
-      end)
-
-      eq(ok, false)
-      eq(type(string.match(result, "buffer not found")), "string")
-    end)
-  end)
-
-  h.describe_flipping_feature("lua_autocmd", "method :on", function()
-    it("works before :mount", function()
-      local callback = spy.new(function() end)
-
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup:on(event.InsertEnter, function()
-        callback()
-      end)
-
-      popup:mount()
-
-      feedkeys("i", "x")
-      feedkeys("<esc>", "x")
-
-      assert.spy(callback).called()
-    end)
-
-    it("works after :mount", function()
-      local callback = spy.new(function() end)
-
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup:mount()
-
-      popup:on(event.InsertEnter, function()
-        callback()
-      end)
-
-      feedkeys("i", "x")
-      feedkeys("<esc>", "x")
-
-      assert.spy(callback).called()
-    end)
-
-    it("throws if .bufnr is nil", function()
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup.bufnr = nil
-
-      local ok, result = pcall(function()
-        popup:on(event.InsertEnter, function() end)
-      end)
-
-      eq(ok, false)
-      eq(type(string.match(result, "buffer not found")), "string")
-    end)
-  end)
-
-  h.describe_flipping_feature("lua_autocmd", "method :off", function()
-    it("works before :mount", function()
-      local callback = spy.new(function() end)
-
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup:on(event.InsertEnter, function()
-        callback()
-      end)
-
-      popup:off(event.InsertEnter)
-
-      popup:mount()
-
-      feedkeys("i", "x")
-      feedkeys("<esc>", "x")
-
-      assert.spy(callback).not_called()
-    end)
-
-    it("works after :mount", function()
-      local callback = spy.new(function() end)
-
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup:mount()
-
-      popup:on(event.InsertEnter, function()
-        callback()
-      end)
-
-      popup:off(event.InsertEnter)
-
-      feedkeys("i", "x")
-      feedkeys("<esc>", "x")
-
-      assert.spy(callback).not_called()
-    end)
-
-    it("throws if .bufnr is nil", function()
-      popup = Popup({
-        enter = true,
-        position = "50%",
-        size = {
-          height = "60%",
-          width = "80%",
-        },
-      })
-
-      popup.bufnr = nil
-
-      local ok, result = pcall(function()
-        popup:off()
-      end)
-
-      eq(ok, false)
-      eq(type(string.match(result, "buffer not found")), "string")
-    end)
-  end)
-
-  describe("method :update_layout", function()
-    local function assert_position(position, container_winid)
-      container_winid = container_winid or vim.api.nvim_get_current_win()
-
-      local win_config = vim.api.nvim_win_get_config(popup.winid)
-      eq(win_config.win, popup.border.winid or container_winid)
-
-      local row, col = win_config.row, win_config.col
-
-      if popup.border.winid then
-        eq(row, 1)
-        eq(col, 1)
-
-        local border_win_config = vim.api.nvim_win_get_config(popup.border.winid)
-        local border_row, border_col = border_win_config.row, border_win_config.col
-        local border_width, border_height = border_win_config.width, border_win_config.height
-
-        local delta_width = border_width - win_config.width
-        local delta_height = border_height - win_config.height
-
-        eq(border_row + math.floor(delta_height / 2 + 0.5), position.row)
-        eq(border_col + math.floor(delta_width / 2 + 0.5), position.col)
-      else
-        eq(row, position.row)
-        eq(col, position.col)
-      end
-    end
-
-    it("can change anchor (w/ simple border)", function()
-      popup = Popup({
-        anchor = "NW",
-        position = "50%",
-        size = { width = 2, height = 1 },
-      })
-
-      popup:mount()
-
-      eq(popup.win_config.anchor, "NW")
-
-      popup:update_layout({ anchor = "SW" })
-
-      eq(popup.win_config.anchor, "SW")
-
-      popup:update_layout()
-
-      eq(popup.win_config.anchor, "SW")
-    end)
-
-    it("can change anchor (w/ complex border)", function()
-      popup = Popup({
-        anchor = "NW",
-        border = {
-          style = "single",
-          padding = { 0 },
-        },
-        position = "50%",
-        size = { width = 2, height = 1 },
-      })
-
-      popup:mount()
-
-      eq(popup.win_config.anchor, nil)
-      eq(popup.border.win_config.anchor, "NW")
-
-      popup:update_layout({ anchor = "SW" })
-
-      eq(popup.win_config.anchor, nil)
-      eq(popup.border.win_config.anchor, "SW")
-
-      popup:update_layout()
-
-      eq(popup.win_config.anchor, nil)
-      eq(popup.border.win_config.anchor, "SW")
-    end)
-
-    it("can change size (w/ simple border)", function()
-      local size = {
-        width = 2,
-        height = 1,
-      }
-
-      popup = Popup({
-        position = "50%",
-        size = size,
-      })
-
-      popup:mount()
-
-      eq(type(popup.border.winid), "nil")
-
-      assert_size(popup, size)
-
-      local new_size = {
-        width = size.width + 2,
-        height = size.height + 2,
-      }
-
-      popup:update_layout({ size = new_size })
-
-      assert_size(popup, new_size)
-    end)
-
-    it("can change size (w/ complex border)", function()
-      local hl_group = "NuiPopupTest"
-      local style = h.popup.create_border_style_map_with_tuple(hl_group)
-
-      local size = {
-        width = 2,
-        height = 1,
-      }
-
-      popup = Popup({
-        ns_id = vim.api.nvim_create_namespace("NuiTest"),
-        border = {
-          style = style,
-          padding = { 0 },
-        },
-        position = "50%",
-        size = size,
-      })
-
-      popup:mount()
-
-      eq(type(popup.border.winid), "number")
-
-      assert_size(popup, size, true)
-      h.popup.assert_border_lines({
-        size = size,
-        border = { style = style },
-      }, popup.border.bufnr)
-      h.popup.assert_border_highlight({
-        size = size,
-        ns_id = popup.ns_id,
-      }, popup.border.bufnr, hl_group)
-
-      local new_size = {
-        width = size.width + 2,
-        height = size.height + 2,
-      }
-
-      popup:update_layout({ size = new_size })
-
-      assert_size(popup, new_size, true)
-      h.popup.assert_border_lines({
-        size = new_size,
-        border = { style = style },
-      }, popup.border.bufnr)
-      h.popup.assert_border_highlight({
-        size = new_size,
-        ns_id = popup.ns_id,
-      }, popup.border.bufnr, hl_group)
-    end)
-
-    it("can change position (w/ simple border)", function()
-      local position = {
-        row = 0,
-        col = 0,
-      }
-
-      popup = Popup({
-        position = position,
-        size = {
-          width = 4,
-          height = 2,
-        },
-      })
-
-      popup:mount()
-
-      eq(type(popup.border.winid), "nil")
-
-      assert_position(position)
-
-      local new_position = {
-        row = position.row + 2,
-        col = position.col + 2,
-      }
-
-      popup:update_layout({ position = new_position })
-
-      assert_position(new_position)
-    end)
-
-    it("can change position (w/ complex border)", function()
-      local hl_group = "NuiPopupTest"
-      local style = h.popup.create_border_style_map_with_tuple(hl_group)
-
-      local position = {
-        row = 0,
-        col = 0,
-      }
-
-      popup = Popup({
-        ns_id = vim.api.nvim_create_namespace("NuiTest"),
-        border = {
-          style = style,
-          padding = { 0 },
-        },
-        position = position,
-        size = {
-          width = 4,
-          height = 2,
-        },
-      })
-
-      popup:mount()
-
-      eq(type(popup.border.winid), "number")
-
-      assert_position(position)
-
-      local new_position = {
-        row = position.row + 2,
-        col = position.col + 2,
-      }
-
-      popup:update_layout({ position = new_position })
-
-      assert_position(new_position)
-    end)
-
-    it("refreshes layout if container size changes", function()
-      local container_size = {
-        width = 20,
-        height = 10,
-      }
-
-      local container_popup = Popup({
-        position = 0,
-        size = container_size,
-      })
-
-      container_popup:mount()
-
-      popup = Popup({
-        relative = {
-          type = "win",
-          winid = container_popup.winid,
-        },
-        position = "20%",
-        size = "50%",
-      })
-
-      popup:mount()
-
-      assert_size(popup, {
-        width = percent(container_size.width, 50),
-        height = percent(container_size.height, 50),
-      })
-
-      assert_position({
-        row = percent(container_size.height - percent(container_size.height, 50), 20),
-        col = percent(container_size.width - percent(container_size.width, 50), 20),
-      }, container_popup.winid)
-
-      container_size = {
-        width = 16,
-        height = 8,
-      }
-
-      container_popup:update_layout({
-        size = container_size,
-      })
-
-      popup:update_layout()
-
-      assert_size(popup, {
-        width = percent(container_size.width, 50),
-        height = percent(container_size.height, 50),
-      })
-
-      assert_position({
-        row = percent(container_size.height - percent(container_size.height, 50), 20),
-        col = percent(container_size.width - percent(container_size.width, 50), 20),
-      }, container_popup.winid)
-    end)
-
-    it("throws if missing config 'relative'", function()
-      popup = Popup({})
-
-      local ok, result = pcall(function()
-        popup:update_layout({})
-      end)
-
-      eq(ok, false)
-      eq(type(string.match(result, "missing layout config: relative")), "string")
-    end)
-
-    it("throws if missing config 'size'", function()
-      popup = Popup({})
-
-      local ok, result = pcall(function()
-        popup:update_layout({
-          relative = "win",
-        })
-      end)
-
-      eq(ok, false)
-      eq(type(string.match(result, "missing layout config: size")), "string")
-    end)
-
-    it("throws if missing config 'position'", function()
-      popup = Popup({})
-
-      local ok, result = pcall(function()
-        popup:update_layout({
-          relative = "win",
-          size = "50%",
-        })
-      end)
-
-      eq(ok, false)
-      eq(type(string.match(result, "missing layout config: position")), "string")
-    end)
-  end)
-
-  describe("method :mount", function()
-    it("throws if layout is not ready", function()
-      popup = Popup({})
-
-      local ok, result = pcall(function()
-        popup:mount()
-      end)
-
-      eq(ok, false)
-      eq(type(string.match(result, "layout is not ready")), "string")
-    end)
-
-    it("is idempotent", function()
-      popup = Popup({
-        position = 0,
-        size = 10,
-      })
-
-      local border_mount = spy.on(popup.border, "mount")
-
-      popup:mount()
-
-      local bufnr, winid = popup.bufnr, popup.winid
-
-      eq(type(bufnr), "number")
-      eq(type(winid), "number")
-      assert.spy(border_mount).was_called(1)
-
-      popup:mount()
-
-      eq(bufnr, popup.bufnr)
-      eq(winid, popup.winid)
-      assert.spy(border_mount).was_called(1)
-    end)
-  end)
-
-  h.describe_flipping_feature("lua_autocmd", "method :unmount", function()
-    it("is called when quitted", function()
-      popup = Popup({
-        position = 0,
-        size = 10,
-      })
-
-      local popup_unmount = spy.on(popup, "unmount")
-
-      popup:mount()
-
-      vim.api.nvim_buf_call(popup.bufnr, function()
-        vim.cmd([[quit]])
-      end)
-
-      vim.wait(100, function()
-        return not popup._.mounted
-      end, 10)
-
-      assert.spy(popup_unmount).was_called()
-    end)
-  end)
-
-  h.describe_flipping_feature("lua_autocmd", "method :hide", function()
-    it("works", function()
-      popup = Popup({
-        position = 0,
-        size = 10,
-      })
-
-      popup:mount()
-
-      vim.api.nvim_buf_set_lines(popup.bufnr, 0, -1, false, {
-        "42",
-      })
-
-      eq(type(popup.bufnr), "number")
-      eq(type(popup.winid), "number")
-
-      popup:hide()
-
-      eq(type(popup.bufnr), "number")
-      eq(type(popup.winid), "nil")
-
-      h.assert_buf_lines(popup.bufnr, {
-        "42",
-      })
-    end)
-
-    it("is idempotent", function()
-      popup = Popup({
-        position = 0,
-        size = 10,
-      })
-
-      popup:mount()
-
-      local prev_winids = vim.api.nvim_list_wins()
-
-      popup:hide()
-
-      local curr_winids = vim.api.nvim_list_wins()
-
-      eq(#prev_winids, #curr_winids + 1)
-
-      popup:hide()
-
-      eq(#curr_winids, #vim.api.nvim_list_wins())
-    end)
-
-    it("does nothing if not mounted", function()
-      popup = Popup({
-        position = 0,
-        size = 10,
-      })
-
-      local prev_winids = vim.api.nvim_list_wins()
-
-      popup:hide()
-
-      local curr_winids = vim.api.nvim_list_wins()
-
-      eq(#prev_winids, #curr_winids)
-    end)
-
-    it("is called when window is closed", function()
-      popup = Popup({
-        position = 0,
-        size = 10,
-      })
-
-      local popup_hide = spy.on(popup, "hide")
-
-      popup:mount()
-
-      vim.api.nvim_buf_call(popup.bufnr, function()
-        vim.cmd([[:bdelete]])
-      end)
-
-      assert.spy(popup_hide).was_called()
-    end)
-
-    it("is not called when other popup using same buffer is hidden", function()
-      popup = Popup({
-        position = 0,
-        size = 10,
-      })
-
-      local another_popup = Popup({
-        bufnr = popup.bufnr,
-        position = 11,
-        size = 5,
-      })
-
-      local popup_hide = spy.on(popup, "hide")
-
-      popup:mount()
-
-      another_popup:mount()
-      another_popup:hide()
-
-      assert.spy(popup_hide).was_not_called()
-
-      another_popup:unmount()
-    end)
-  end)
-
-  h.describe_flipping_feature("lua_autocmd", "method :show", function()
-    it("works", function()
-      popup = Popup({
-        position = 0,
-        size = 10,
-      })
-
-      popup:mount()
-
-      vim.api.nvim_buf_set_lines(popup.bufnr, 0, -1, false, {
-        "42",
-      })
-
-      local bufnr, winid = popup.bufnr, popup.winid
-      eq(type(bufnr), "number")
-      eq(type(winid), "number")
-
-      popup:hide()
-      popup:show()
-
-      eq(bufnr, popup.bufnr)
-      eq(type(popup.winid), "number")
-      eq(winid ~= popup.winid, true)
-
-      h.assert_buf_lines(popup.bufnr, {
-        "42",
-      })
-    end)
-
-    it("is idempotent", function()
-      popup = Popup({
-        position = 0,
-        size = 10,
-      })
-
-      popup:mount()
-
-      popup:hide()
-
-      local prev_winids = vim.api.nvim_list_wins()
-
-      popup:show()
-
-      local curr_winids = vim.api.nvim_list_wins()
-
-      eq(#prev_winids + 1, #curr_winids)
-
-      popup:show()
-
-      eq(#curr_winids, #vim.api.nvim_list_wins())
-    end)
-
-    it("mounts if not mounted", function()
-      popup = Popup({
-        position = 0,
-        size = 10,
-      })
-
-      local prev_winids = vim.api.nvim_list_wins()
-
-      popup:show()
-
-      local curr_winids = vim.api.nvim_list_wins()
-
-      eq(#prev_winids + 1, #curr_winids)
-    end)
-
-    it("does nothing if not hidden", function()
-      popup = Popup({
-        position = 0,
-        size = 10,
-      })
-
-      popup:mount()
-
-      local prev_winids = vim.api.nvim_list_wins()
-
-      popup:show()
-
-      local curr_winids = vim.api.nvim_list_wins()
-
-      eq(#prev_winids, #curr_winids)
-    end)
-
-    it("can show popups using the same buffer", function()
-      popup = Popup({
-        position = 0,
-        size = 10,
-      })
-
-      vim.api.nvim_buf_set_lines(popup.bufnr, 0, -1, false, {
-        "42",
-      })
-
-      local another_popup = Popup({
-        bufnr = popup.bufnr,
-        position = 11,
-        size = 5,
-      })
-
-      popup:mount()
-      another_popup:mount()
-
-      local bufnr, winid = popup.bufnr, popup.winid
-      eq(type(bufnr), "number")
-      eq(type(winid), "number")
-
-      local another_bufnr, another_winid = another_popup.bufnr, another_popup.winid
-      eq(type(another_bufnr), "number")
-      eq(type(another_winid), "number")
-
-      eq(bufnr, another_bufnr)
-
-      popup:hide()
-      another_popup:hide()
-
-      popup:show()
-      another_popup:show()
-
-      eq(bufnr, popup.bufnr)
-      eq(type(popup.winid), "number")
-      eq(winid ~= popup.winid, true)
-
-      eq(another_bufnr, another_popup.bufnr)
-      eq(type(another_popup.winid), "number")
-      eq(another_winid ~= another_popup.winid, true)
-
-      h.assert_buf_lines(bufnr, {
-        "42",
-      })
-    end)
-  end)
-end)
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/split/init_spec.lua b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/split/init_spec.lua
deleted file mode 100644
index 28f0275f..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/split/init_spec.lua
+++ /dev/null
@@ -1,1006 +0,0 @@
-pcall(require, "luacov")
-
-local Split = require("nui.split")
-local event = require("nui.utils.autocmd").event
-local h = require("tests.helpers")
-local spy = require("luassert.spy")
-
-local eq, feedkeys = h.eq, h.feedkeys
-
-local function percent(number, percentage)
-  return math.floor(number * percentage / 100)
-end
-
-describe("nui.split", function()
-  local split
-
-  before_each(function()
-    vim.o.winwidth = 10
-  end)
-
-  after_each(function()
-    split:unmount()
-  end)
-
-  describe("o.enter", function()
-    it("if true, sets the split as current window", function()
-      split = Split({
-        enter = true,
-        size = 10,
-        position = "bottom",
-      })
-
-      local winid = vim.api.nvim_get_current_win()
-
-      split:mount()
-
-      h.eq(winid ~= split.winid, true)
-      h.eq(split.winid, vim.api.nvim_get_current_win())
-    end)
-
-    it("if false, does not set the split as current window", function()
-      split = Split({
-        enter = false,
-        size = 10,
-        position = "bottom",
-      })
-
-      local winid = vim.api.nvim_get_current_win()
-
-      split:mount()
-
-      h.eq(winid ~= split.winid, true)
-      h.eq(winid, vim.api.nvim_get_current_win())
-    end)
-
-    it("is true by default", function()
-      split = Split({
-        size = 10,
-        position = "bottom",
-      })
-
-      local winid = vim.api.nvim_get_current_win()
-
-      split:mount()
-
-      h.eq(winid ~= split.winid, true)
-      h.eq(split.winid, vim.api.nvim_get_current_win())
-    end)
-  end)
-
-  describe("o.size", function()
-    for position, dimension in pairs({ top = "height", right = "width", bottom = "height", left = "width" }) do
-      it(string.format("is set as %s if o.position=%s", dimension, position), function()
-        local size = 20
-
-        split = Split({
-          size = size,
-          position = position,
-        })
-
-        split:mount()
-
-        local nvim_method = string.format("nvim_win_get_%s", dimension)
-
-        eq(vim.api[nvim_method](split.winid), size)
-      end)
-    end
-
-    it("supports table (.width)", function()
-      local size = 10
-
-      split = Split({
-        size = { width = size },
-        position = "left",
-      })
-
-      split:mount()
-
-      eq(vim.api.nvim_win_get_width(split.winid), size)
-    end)
-
-    it("supports table (.height)", function()
-      local size = 10
-
-      split = Split({
-        size = { height = size },
-        position = "top",
-      })
-
-      split:mount()
-
-      eq(vim.api.nvim_win_get_height(split.winid), size)
-    end)
-
-    it("is optional", function()
-      split = Split({
-        position = "bottom",
-      })
-
-      split:mount()
-
-      eq(type(vim.api.nvim_win_get_height(split.winid)), "number")
-    end)
-
-    it("works with relative='editor'", function()
-      vim.api.nvim_set_option("showtabline", 2)
-      vim.api.nvim_set_option("cmdheight", 2)
-
-      split = Split({
-        size = "50%",
-        position = "bottom",
-        relative = "editor",
-      })
-
-      split:mount()
-
-      eq(vim.api.nvim_win_get_height(split.winid), math.floor((vim.o.lines - 4) / 2))
-
-      vim.api.nvim_set_option("cmdheight", 1)
-      vim.api.nvim_set_option("showtabline", 1)
-    end)
-  end)
-
-  describe("o.relative", function()
-    it("supports 'editor'", function()
-      local left_half_split = Split({
-        size = "50%",
-        position = "left",
-      })
-
-      left_half_split:mount()
-
-      split = Split({
-        size = 20,
-        position = "bottom",
-        relative = "editor",
-      })
-
-      split:mount()
-
-      eq(vim.api.nvim_win_get_width(split.winid), vim.o.columns)
-
-      left_half_split:unmount()
-    end)
-
-    it("'editor' is not tied to specific window", function()
-      local center_split = Split({
-        size = 20,
-        position = "right",
-      })
-
-      center_split:mount()
-
-      split = Split({
-        size = 20,
-        position = "right",
-        relative = "editor",
-      })
-
-      split:mount()
-
-      center_split:unmount()
-
-      split:hide()
-
-      split:show()
-    end)
-
-    it("supports 'win'", function()
-      local left_half_split = Split({
-        size = "50%",
-        position = "left",
-      })
-
-      left_half_split:mount()
-
-      split = Split({
-        size = 20,
-        position = "bottom",
-        relative = "win",
-      })
-
-      split:mount()
-
-      eq(vim.api.nvim_win_get_width(split.winid), vim.o.columns / 2)
-
-      left_half_split:unmount()
-    end)
-
-    it("supports specific window", function()
-      local winid = vim.api.nvim_get_current_win()
-
-      local left_half_split = Split({
-        enter = false,
-        size = "30%",
-        position = "left",
-      })
-
-      left_half_split:mount()
-
-      eq(winid, vim.api.nvim_get_current_win())
-
-      eq(vim.api.nvim_win_get_width(left_half_split.winid), vim.o.columns * 30 / 100)
-
-      split = Split({
-        enter = false,
-        size = 10,
-        position = "bottom",
-        relative = {
-          type = "win",
-          winid = left_half_split.winid,
-        },
-      })
-
-      split:mount()
-
-      eq(winid, vim.api.nvim_get_current_win())
-
-      eq(vim.api.nvim_win_get_width(split.winid), vim.o.columns * 30 / 100)
-
-      left_half_split:unmount()
-    end)
-  end)
-
-  describe("method :mount", function()
-    it("opens win if not mounted", function()
-      split = Split({
-        size = 20,
-        position = "bottom",
-      })
-
-      local prev_winids = vim.api.nvim_list_wins()
-
-      split:mount()
-
-      local new_winids = vim.tbl_filter(function(winid)
-        return not vim.tbl_contains(prev_winids, winid)
-      end, vim.api.nvim_list_wins())
-
-      eq(#new_winids, 1)
-    end)
-
-    it("does nothing if already mounted", function()
-      split = Split({
-        size = 20,
-        position = "bottom",
-      })
-
-      split:mount()
-
-      local prev_winids = vim.api.nvim_list_wins()
-
-      split:mount()
-
-      local new_winids = vim.tbl_filter(function(winid)
-        return not vim.tbl_contains(prev_winids, winid)
-      end, vim.api.nvim_list_wins())
-
-      eq(#new_winids, 0)
-    end)
-
-    it("sets buffer after creating window", function()
-      local ok, winid = false, nil
-
-      split = Split({
-        size = 20,
-        position = "bottom",
-      })
-
-      split:on(event.BufWinEnter, function()
-        ok, winid = true, split.winid
-      end)
-
-      split:mount()
-
-      eq(type(split.winid), "number")
-
-      eq(ok, true)
-      eq(winid, split.winid)
-    end)
-  end)
-
-  h.describe_flipping_feature("lua_autocmd", "method :unmount", function()
-    it("closes win if mounted", function()
-      split = Split({
-        size = 20,
-        position = "bottom",
-      })
-
-      split:mount()
-
-      local split_winid = split.winid
-
-      local prev_winids = vim.api.nvim_list_wins()
-
-      split:unmount()
-
-      local curr_winids = vim.api.nvim_list_wins()
-      local closed_winids = vim.tbl_filter(function(winid)
-        return not vim.tbl_contains(curr_winids, winid)
-      end, prev_winids)
-
-      eq(#closed_winids, 1)
-      eq(closed_winids[1], split_winid)
-    end)
-
-    it("does nothing if already unmounted", function()
-      split = Split({
-        size = 20,
-        position = "bottom",
-      })
-
-      local prev_winids = vim.api.nvim_list_wins()
-
-      split:unmount()
-
-      local curr_winids = vim.api.nvim_list_wins()
-      local closed_winids = vim.tbl_filter(function(winid)
-        return not vim.tbl_contains(curr_winids, winid)
-      end, prev_winids)
-
-      eq(#closed_winids, 0)
-    end)
-
-    it("is called when quitted", function()
-      split = Split({
-        size = 10,
-        position = "bottom",
-      })
-
-      local split_unmount = spy.on(split, "unmount")
-
-      split:mount()
-
-      vim.api.nvim_buf_call(split.bufnr, function()
-        vim.cmd([[quit]])
-      end)
-
-      vim.wait(100, function()
-        return not split._.mounted
-      end, 10)
-
-      assert.spy(split_unmount).was_called()
-    end)
-  end)
-
-  h.describe_flipping_feature("lua_autocmd", "method :hide", function()
-    it("works", function()
-      local winid = vim.api.nvim_get_current_win()
-
-      local win_height = vim.api.nvim_win_get_height(winid)
-
-      split = Split({
-        size = 20,
-        position = "bottom",
-      })
-
-      split:mount()
-
-      vim.api.nvim_buf_set_lines(split.bufnr, 0, -1, false, {
-        "42",
-      })
-
-      eq(vim.api.nvim_win_get_height(winid) < win_height, true)
-
-      split:hide()
-
-      h.assert_buf_lines(split.bufnr, {
-        "42",
-      })
-
-      eq(vim.api.nvim_win_get_height(winid) == win_height, true)
-    end)
-
-    it("is idempotent", function()
-      split = Split({
-        size = 20,
-        position = "bottom",
-      })
-
-      split:mount()
-
-      local prev_winids = vim.api.nvim_list_wins()
-
-      split:hide()
-
-      local curr_winids = vim.api.nvim_list_wins()
-
-      eq(#prev_winids, #curr_winids + 1)
-
-      split:hide()
-
-      eq(#curr_winids, #vim.api.nvim_list_wins())
-    end)
-
-    it("does nothing if not mounted", function()
-      split = Split({
-        size = 20,
-        position = "bottom",
-      })
-
-      local prev_winids = vim.api.nvim_list_wins()
-
-      split:hide()
-
-      local curr_winids = vim.api.nvim_list_wins()
-
-      eq(#prev_winids, #curr_winids)
-    end)
-
-    it("is called when window is closed", function()
-      split = Split({
-        size = 20,
-        position = "bottom",
-      })
-
-      local split_hide = spy.on(split, "hide")
-
-      split:mount()
-
-      vim.api.nvim_buf_call(split.bufnr, function()
-        vim.cmd([[:bdelete]])
-      end)
-
-      assert.spy(split_hide).was_called()
-    end)
-  end)
-
-  describe("method :show", function()
-    it("works", function()
-      local winid = vim.api.nvim_get_current_win()
-
-      split = Split({
-        size = 20,
-        position = "bottom",
-      })
-
-      split:mount()
-
-      vim.api.nvim_buf_set_lines(split.bufnr, 0, -1, false, {
-        "42",
-      })
-
-      local win_height = vim.api.nvim_win_get_height(winid)
-
-      split:hide()
-      split:show()
-
-      h.assert_buf_lines(split.bufnr, {
-        "42",
-      })
-
-      eq(vim.api.nvim_win_get_height(winid) == win_height, true)
-    end)
-
-    it("is idempotent", function()
-      split = Split({
-        size = 20,
-        position = "bottom",
-      })
-
-      split:mount()
-
-      split:hide()
-
-      local prev_winids = vim.api.nvim_list_wins()
-
-      split:show()
-
-      local curr_winids = vim.api.nvim_list_wins()
-
-      eq(#prev_winids + 1, #curr_winids)
-
-      split:show()
-
-      eq(#curr_winids, #vim.api.nvim_list_wins())
-    end)
-
-    it("mounts if not mounted", function()
-      split = Split({
-        size = 20,
-        position = "bottom",
-      })
-
-      local prev_winids = vim.api.nvim_list_wins()
-
-      split:show()
-
-      local curr_winids = vim.api.nvim_list_wins()
-
-      eq(#prev_winids + 1, #curr_winids)
-    end)
-
-    it("does nothing if not hidden", function()
-      split = Split({
-        size = 20,
-        position = "bottom",
-      })
-
-      split:mount()
-
-      local prev_winids = vim.api.nvim_list_wins()
-
-      split:show()
-
-      local curr_winids = vim.api.nvim_list_wins()
-
-      eq(#prev_winids, #curr_winids)
-    end)
-  end)
-
-  describe("method :update_layout", function()
-    it("can change size", function()
-      split = Split({ positon = "bottom", size = 10 })
-
-      split:mount()
-
-      eq(vim.api.nvim_win_get_height(split.winid), 10)
-
-      split:update_layout({ size = 20 })
-
-      eq(vim.api.nvim_win_get_height(split.winid), 20)
-    end)
-
-    it('accepts size=""', function()
-      split = Split({ positon = "bottom", size = 10 })
-
-      split:mount()
-
-      eq(vim.api.nvim_win_get_height(split.winid), 10)
-
-      split:update_layout({ size = "" })
-
-      eq(vim.api.nvim_win_get_height(split.winid), 10)
-    end)
-
-    it("can change position", function()
-      local winid = vim.api.nvim_get_current_win()
-
-      split = Split({ position = "bottom", size = 10 })
-
-      split:mount()
-
-      eq(vim.fn.winlayout(), {
-        "col",
-        {
-          { "leaf", winid },
-          { "leaf", split.winid },
-        },
-      })
-
-      split:update_layout({ position = "right" })
-
-      eq(vim.fn.winlayout(), {
-        "row",
-        {
-          { "leaf", winid },
-          { "leaf", split.winid },
-        },
-      })
-    end)
-
-    it("can change position and size", function()
-      local winid = vim.api.nvim_get_current_win()
-
-      split = Split({ position = "top", size = 10 })
-
-      split:mount()
-
-      eq(vim.api.nvim_win_get_height(split.winid), 10)
-      eq(vim.fn.winlayout(), {
-        "col",
-        {
-          { "leaf", split.winid },
-          { "leaf", winid },
-        },
-      })
-
-      split:update_layout({ position = "left", size = 20 })
-
-      eq(vim.api.nvim_win_get_width(split.winid), 20)
-      eq(vim.fn.winlayout(), {
-        "row",
-        {
-          { "leaf", split.winid },
-          { "leaf", winid },
-        },
-      })
-    end)
-
-    it("can change relative", function()
-      local winid_one = vim.api.nvim_get_current_win()
-      local split_two = Split({ position = "right", size = 10 })
-      split_two:mount()
-
-      split = Split({ relative = "win", position = "top", size = 10 })
-
-      split:mount()
-
-      eq(vim.api.nvim_win_get_height(split.winid), 10)
-      eq(vim.fn.winlayout(), {
-        "row",
-        {
-          { "leaf", winid_one },
-          {
-            "col",
-            {
-              { "leaf", split.winid },
-              { "leaf", split_two.winid },
-            },
-          },
-        },
-      })
-
-      split:update_layout({ position = "bottom", relative = "editor", size = "50%" })
-
-      eq(vim.api.nvim_win_get_height(split.winid), percent(vim.o.lines - 1, 50))
-      eq(vim.fn.winlayout(), {
-        "col",
-        {
-          {
-            "row",
-            {
-              { "leaf", winid_one },
-              { "leaf", split_two.winid },
-            },
-          },
-          { "leaf", split.winid },
-        },
-      })
-
-      split_two:unmount()
-    end)
-  end)
-
-  h.describe_flipping_feature("lua_keymap", "method :map", function()
-    it("works before :mount", function()
-      local callback = spy.new(function() end)
-
-      split = Split({
-        size = 20,
-      })
-
-      split:map("n", "l", function()
-        callback()
-      end)
-
-      split:mount()
-
-      feedkeys("l", "x")
-
-      assert.spy(callback).called()
-    end)
-
-    it("works after :mount", function()
-      local callback = spy.new(function() end)
-
-      split = Split({
-        size = 20,
-      })
-
-      split:mount()
-
-      split:map("n", "l", function()
-        callback()
-      end)
-
-      feedkeys("l", "x")
-
-      assert.spy(callback).called()
-    end)
-
-    it("supports lhs table", function()
-      split = Split({
-        size = 20,
-      })
-
-      split:mount()
-
-      split:map("n", { "k", "l" }, "o42<esc>")
-
-      feedkeys("k", "x")
-      feedkeys("l", "x")
-
-      h.assert_buf_lines(split.bufnr, {
-        "",
-        "42",
-        "42",
-      })
-    end)
-
-    it("supports rhs function", function()
-      local callback = spy.new(function() end)
-
-      split = Split({
-        size = 20,
-      })
-
-      split:mount()
-
-      split:map("n", "l", function()
-        callback()
-      end)
-
-      feedkeys("l", "x")
-
-      assert.spy(callback).called()
-    end)
-
-    it("supports rhs string", function()
-      split = Split({
-        size = 20,
-      })
-
-      split:mount()
-
-      split:map("n", "l", "o42<esc>")
-
-      feedkeys("l", "x")
-
-      h.assert_buf_lines(split.bufnr, {
-        "",
-        "42",
-      })
-    end)
-
-    it("supports o.remap=true", function()
-      split = Split({
-        size = 20,
-      })
-
-      split:mount()
-
-      split:map("n", "k", "o42<Esc>")
-      split:map("n", "l", "k", { remap = true })
-
-      feedkeys("k", "x")
-      feedkeys("l", "x")
-
-      h.assert_buf_lines(split.bufnr, {
-        "",
-        "42",
-        "42",
-      })
-    end)
-
-    it("supports o.remap=false", function()
-      split = Split({
-        size = 20,
-      })
-
-      split:mount()
-
-      split:map("n", "k", "o42<Esc>")
-      split:map("n", "l", "k", { remap = false })
-
-      feedkeys("k", "x")
-      feedkeys("l", "x")
-
-      h.assert_buf_lines(split.bufnr, {
-        "",
-        "42",
-      })
-    end)
-
-    it("throws if .bufnr is nil", function()
-      split = Split({
-        size = 20,
-      })
-
-      split.bufnr = nil
-
-      local ok, result = pcall(function()
-        split:map("n", "k", "o42<Esc>")
-      end)
-
-      eq(ok, false)
-      eq(type(string.match(result, "buffer not found")), "string")
-    end)
-  end)
-
-  h.describe_flipping_feature("lua_keymap", "method :unmap", function()
-    it("works before :mount", function()
-      split = Split({
-        size = 20,
-      })
-
-      split:map("n", "l", "o42<esc>")
-
-      split:unmap("n", "l")
-
-      split:mount()
-
-      feedkeys("l", "x")
-
-      h.assert_buf_lines(split.bufnr, {
-        "",
-      })
-    end)
-
-    it("works after :mount", function()
-      split = Split({
-        size = 20,
-      })
-
-      split:mount()
-
-      split:map("n", "l", "o42<esc>")
-
-      split:unmap("n", "l")
-
-      feedkeys("l", "x")
-
-      h.assert_buf_lines(split.bufnr, {
-        "",
-      })
-    end)
-
-    it("supports lhs string", function()
-      split = Split({
-        size = 20,
-      })
-
-      split:mount()
-
-      split:map("n", "l", "o42<esc>")
-
-      split:unmap("n", "l")
-
-      feedkeys("l", "x")
-
-      h.assert_buf_lines(split.bufnr, {
-        "",
-      })
-    end)
-
-    it("supports lhs table", function()
-      split = Split({
-        size = 20,
-      })
-
-      split:mount()
-
-      split:map("n", "k", "o42<esc>")
-      split:map("n", "l", "o42<esc>")
-
-      split:unmap("n", { "k", "l" })
-
-      feedkeys("k", "x")
-      feedkeys("l", "x")
-
-      h.assert_buf_lines(split.bufnr, {
-        "",
-      })
-    end)
-
-    it("throws if .bufnr is nil", function()
-      split = Split({
-        size = 20,
-      })
-
-      split.bufnr = nil
-
-      local ok, result = pcall(function()
-        split:unmap("n", "l")
-      end)
-
-      eq(ok, false)
-      eq(type(string.match(result, "buffer not found")), "string")
-    end)
-  end)
-
-  h.describe_flipping_feature("lua_autocmd", "method :on", function()
-    it("works before :mount", function()
-      local callback = spy.new(function() end)
-
-      split = Split({
-        size = 20,
-      })
-
-      split:on(event.InsertEnter, function()
-        callback()
-      end)
-
-      split:mount()
-
-      feedkeys("i", "x")
-      feedkeys("<esc>", "x")
-
-      assert.spy(callback).called()
-    end)
-
-    it("works after :mount", function()
-      local callback = spy.new(function() end)
-
-      split = Split({
-        size = 20,
-      })
-
-      split:mount()
-
-      split:on(event.InsertEnter, function()
-        callback()
-      end)
-
-      feedkeys("i", "x")
-      feedkeys("<esc>", "x")
-
-      assert.spy(callback).called()
-    end)
-
-    it("throws if .bufnr is nil", function()
-      split = Split({
-        size = 20,
-      })
-
-      split.bufnr = nil
-
-      local ok, result = pcall(function()
-        split:on(event.InsertEnter, function() end)
-      end)
-
-      eq(ok, false)
-      eq(type(string.match(result, "buffer not found")), "string")
-    end)
-  end)
-
-  h.describe_flipping_feature("lua_autocmd", "method :off", function()
-    it("works before :mount", function()
-      local callback = spy.new(function() end)
-
-      split = Split({
-        size = 20,
-      })
-
-      split:on(event.InsertEnter, function()
-        callback()
-      end)
-
-      split:off(event.InsertEnter)
-
-      split:mount()
-
-      feedkeys("i", "x")
-      feedkeys("<esc>", "x")
-
-      assert.spy(callback).not_called()
-    end)
-
-    it("works after :mount", function()
-      local callback = spy.new(function() end)
-
-      split = Split({
-        size = 20,
-      })
-
-      split:mount()
-
-      split:on(event.InsertEnter, function()
-        callback()
-      end)
-
-      split:off(event.InsertEnter)
-
-      feedkeys("i", "x")
-      feedkeys("<esc>", "x")
-
-      assert.spy(callback).not_called()
-    end)
-
-    it("throws if .bufnr is nil", function()
-      split = Split({
-        size = 20,
-      })
-
-      split.bufnr = nil
-
-      local ok, result = pcall(function()
-        split:off()
-      end)
-
-      eq(ok, false)
-      eq(type(string.match(result, "buffer not found")), "string")
-    end)
-  end)
-end)
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/table/init_spec.lua b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/table/init_spec.lua
deleted file mode 100644
index 7b806c21..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/table/init_spec.lua
+++ /dev/null
@@ -1,632 +0,0 @@
-pcall(require, "luacov")
-
-local Line = require("nui.line")
-local Table = require("nui.table")
-local Text = require("nui.text")
-local h = require("tests.helpers")
-
-local eq = h.eq
-
-describe("nui.table", function()
-  ---@type number, number
-  local winid, bufnr
-
-  before_each(function()
-    winid = vim.api.nvim_get_current_win()
-    bufnr = vim.api.nvim_create_buf(false, true)
-
-    vim.api.nvim_win_set_buf(winid, bufnr)
-  end)
-
-  after_each(function()
-    vim.api.nvim_buf_delete(bufnr, { force = true })
-  end)
-
-  describe("o.bufnr", function()
-    it("throws if missing", function()
-      local ok, err = pcall(Table, {})
-      eq(ok, false)
-      eq(type(string.match(err, "missing bufnr")), "string")
-    end)
-
-    it("throws if invalid", function()
-      local ok, err = pcall(Table, { bufnr = 999 })
-      eq(ok, false)
-      eq(type(string.match(err, "invalid bufnr ")), "string")
-    end)
-
-    it("sets t.bufnr properly", function()
-      local table = Table({ bufnr = bufnr })
-
-      eq(table.bufnr, bufnr)
-    end)
-  end)
-
-  describe("o.buf_options", function()
-    it("sets default buf options emulating scratch-buffer", function()
-      local table = Table({ bufnr = bufnr })
-
-      h.assert_buf_options(table.bufnr, {
-        bufhidden = "hide",
-        buflisted = false,
-        buftype = "nofile",
-        swapfile = false,
-      })
-    end)
-
-    it("locks buffer by default", function()
-      local table = Table({ bufnr = bufnr })
-
-      h.assert_buf_options(table.bufnr, {
-        modifiable = false,
-        readonly = true,
-        undolevels = 0,
-      })
-    end)
-
-    it("sets values", function()
-      local table = Table({
-        bufnr = bufnr,
-        buf_options = {
-          undolevels = -1,
-        },
-      })
-
-      h.assert_buf_options(table.bufnr, {
-        undolevels = -1,
-      })
-    end)
-  end)
-
-  describe("o.ns_id", function()
-    it("sets t.ns_id if o.ns_id is string", function()
-      local ns = "NuiTest"
-      local table = Table({ bufnr = bufnr, ns_id = ns })
-
-      local namespaces = vim.api.nvim_get_namespaces()
-
-      eq(table.ns_id, namespaces[ns])
-    end)
-
-    it("sets t.ns_id if o.ns_id is number", function()
-      local ns = "NuiTest"
-      local ns_id = vim.api.nvim_create_namespace(ns)
-      local table = Table({ bufnr = bufnr, ns_id = ns_id })
-
-      eq(table.ns_id, ns_id)
-    end)
-  end)
-
-  describe("o.columns", function()
-    describe(".id", function()
-      it("fallbacks t o .accessor_key", function()
-        local table = Table({
-          bufnr = bufnr,
-          columns = { { accessor_key = "ID" } },
-          data = { { ID = 42 } },
-        })
-
-        table:render()
-
-        vim.api.nvim_win_set_cursor(winid, { 2, 3 })
-
-        eq(table:get_cell().column.id, "ID")
-      end)
-
-      for header_type, header in pairs({
-        string = "ID",
-        NuiText = Text("ID"),
-        NuiLine = Line({ Text("I"), Text("D") }),
-      }) do
-        it(string.format("fallbacks to .header (%s)", header_type), function()
-          local table = Table({
-            bufnr = bufnr,
-            columns = {
-              {
-                header = header,
-                accessor_fn = function()
-                  return ""
-                end,
-              },
-            },
-            data = { {} },
-          })
-
-          table:render()
-
-          vim.api.nvim_win_set_cursor(winid, { 4, 3 })
-
-          eq(table:get_cell().column.id, "ID")
-        end)
-      end
-
-      it("throws if missing", function()
-        local ok, err = pcall(function()
-          return Table({
-            bufnr = bufnr,
-            columns = { {} },
-          })
-        end)
-        eq(ok, false)
-        eq(type(string.match(err, "missing column id")), "string")
-      end)
-    end)
-  end)
-
-  describe("method :render", function()
-    local columns
-    local data
-
-    before_each(function()
-      columns = {
-        {
-          header = "First Name",
-          accessor_key = "firstName",
-          footer = "firstName",
-        },
-        {
-          header = "Last Name",
-          accessor_key = "lastName",
-          footer = "lastName",
-        },
-      }
-
-      data = {
-        {
-          firstName = "tanner",
-          lastName = "linsley",
-          age = 24,
-          visits = 100,
-          status = "In Relationship",
-          progress = 50,
-        },
-        {
-          firstName = "tandy",
-          lastName = "miller",
-          age = 40,
-          visits = 40,
-          status = "Single",
-          progress = 80,
-        },
-        {
-          firstName = "joe",
-          lastName = "dirte",
-          age = 45,
-          visits = 20,
-          status = "Complicated",
-          progress = 10,
-        },
-      }
-    end)
-
-    it("can handle empty columns", function()
-      local table = Table({
-        bufnr = bufnr,
-        data = data,
-      })
-      table:render()
-      h.assert_buf_lines(table.bufnr, { "" })
-    end)
-
-    it("can handle empty data", function()
-      local table = Table({
-        bufnr = bufnr,
-        columns = {
-          {
-            accessor_key = "firstName",
-          },
-        },
-      })
-      table:render()
-      h.assert_buf_lines(table.bufnr, { "" })
-    end)
-
-    it("can handle empty columns and data", function()
-      local table = Table({ bufnr = bufnr })
-      table:render()
-      h.assert_buf_lines(table.bufnr, { "" })
-    end)
-
-    it("works w/ header w/ footer", function()
-      local table = Table({
-        bufnr = bufnr,
-        columns = columns,
-        data = data,
-      })
-
-      table:render()
-
-      h.assert_buf_lines(table.bufnr, {
-        "┌──────────┬─────────┐",
-        "│First Name│Last Name│",
-        "├──────────┼─────────┤",
-        "│tanner    │linsley  │",
-        "├──────────┼─────────┤",
-        "│tandy     │miller   │",
-        "├──────────┼─────────┤",
-        "│joe       │dirte    │",
-        "├──────────┼─────────┤",
-        "│firstName │lastName │",
-        "└──────────┴─────────┘",
-      })
-    end)
-
-    it("works w/ header w/o footer", function()
-      for _, column in ipairs(columns) do
-        column.align = "center"
-        column.footer = nil
-      end
-
-      local table = Table({
-        bufnr = bufnr,
-        columns = columns,
-        data = data,
-      })
-
-      table:render()
-
-      h.assert_buf_lines(table.bufnr, {
-        "┌──────────┬─────────┐",
-        "│First Name│Last Name│",
-        "├──────────┼─────────┤",
-        "│  tanner  │ linsley │",
-        "├──────────┼─────────┤",
-        "│  tandy   │ miller  │",
-        "├──────────┼─────────┤",
-        "│   joe    │  dirte  │",
-        "└──────────┴─────────┘",
-      })
-    end)
-
-    it("works w/o header w/ footer", function()
-      for _, column in ipairs(columns) do
-        column.header = nil
-      end
-
-      local table = Table({
-        bufnr = bufnr,
-        columns = columns,
-        data = data,
-      })
-
-      table:render()
-
-      h.assert_buf_lines(table.bufnr, {
-        "┌─────────┬────────┐",
-        "│tanner   │linsley │",
-        "├─────────┼────────┤",
-        "│tandy    │miller  │",
-        "├─────────┼────────┤",
-        "│joe      │dirte   │",
-        "├─────────┼────────┤",
-        "│firstName│lastName│",
-        "└─────────┴────────┘",
-      })
-    end)
-
-    it("works w/o header w/o footer", function()
-      for _, column in ipairs(columns) do
-        column.header = nil
-        column.footer = nil
-      end
-
-      local table = Table({
-        bufnr = bufnr,
-        columns = columns,
-        data = data,
-      })
-
-      table:render()
-
-      h.assert_buf_lines(table.bufnr, {
-        "┌──────┬───────┐",
-        "│tanner│linsley│",
-        "├──────┼───────┤",
-        "│tandy │miller │",
-        "├──────┼───────┤",
-        "│joe   │dirte  │",
-        "└──────┴───────┘",
-      })
-    end)
-
-    it("supports param linenr_start", function()
-      vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, {
-        "START: NuiTest",
-        "",
-        "END: NuiTest",
-      })
-
-      local table = Table({
-        bufnr = bufnr,
-        columns = columns,
-        data = { data[1] },
-      })
-
-      table:render(2)
-      h.assert_buf_lines(table.bufnr, {
-        "START: NuiTest",
-        "┌──────────┬─────────┐",
-        "│First Name│Last Name│",
-        "├──────────┼─────────┤",
-        "│tanner    │linsley  │",
-        "├──────────┼─────────┤",
-        "│firstName │lastName │",
-        "└──────────┴─────────┘",
-        "END: NuiTest",
-      })
-
-      table:render(4)
-      h.assert_buf_lines(table.bufnr, {
-        "START: NuiTest",
-        "",
-        "",
-        "┌──────────┬─────────┐",
-        "│First Name│Last Name│",
-        "├──────────┼─────────┤",
-        "│tanner    │linsley  │",
-        "├──────────┼─────────┤",
-        "│firstName │lastName │",
-        "└──────────┴─────────┘",
-        "END: NuiTest",
-      })
-
-      table:render(3)
-      h.assert_buf_lines(table.bufnr, {
-        "START: NuiTest",
-        "",
-        "┌──────────┬─────────┐",
-        "│First Name│Last Name│",
-        "├──────────┼─────────┤",
-        "│tanner    │linsley  │",
-        "├──────────┼─────────┤",
-        "│firstName │lastName │",
-        "└──────────┴─────────┘",
-        "END: NuiTest",
-      })
-    end)
-
-    describe("grouped columns", function()
-      local grouped_columns
-      before_each(function()
-        grouped_columns = {
-          {
-            header = "Name",
-            footer = function(info)
-              return info.column.id
-            end,
-            columns = {
-              {
-                accessor_key = "firstName",
-                footer = "firstName",
-              },
-              {
-                id = "lastName",
-                header = "Last Name",
-                accessor_key = "lastName",
-                footer = function(info)
-                  return info.column.id
-                end,
-              },
-            },
-          },
-          {
-            header = "Info",
-            footer = function(info)
-              return info.column.id
-            end,
-            columns = {
-              {
-                header = "Age",
-                accessor_key = "age",
-                footer = "age",
-              },
-              {
-                header = "More Info",
-                footer = function(info)
-                  return info.column.id
-                end,
-                columns = {
-                  {
-                    accessor_key = "visits",
-                    header = "Visits",
-                    footer = function(info)
-                      return info.column.id
-                    end,
-                  },
-                  {
-                    accessor_key = "status",
-                    header = "Status",
-                    footer = function(info)
-                      return info.column.id
-                    end,
-                  },
-                },
-              },
-            },
-          },
-          {
-            header = "Profile Progress",
-            accessor_key = "progress",
-            footer = function(info)
-              return info.column.id
-            end,
-          },
-        }
-      end)
-
-      it("is drawn correctly", function()
-        local table = Table({
-          bufnr = bufnr,
-          columns = grouped_columns,
-          data = data,
-        })
-
-        table:render()
-
-        h.assert_buf_lines(table.bufnr, {
-          "┌───────────────────┬──────────────────────────┬────────────────┐",
-          "│Name               │Info                      │                │",
-          "├─────────┬─────────┼───┬──────────────────────┤                │",
-          "│         │         │   │More Info             │                │",
-          "│         │         │   ├──────┬───────────────┤                │",
-          "│firstName│Last Name│Age│Visits│Status         │Profile Progress│",
-          "├─────────┼─────────┼───┼──────┼───────────────┼────────────────┤",
-          "│tanner   │linsley  │24 │100   │In Relationship│50              │",
-          "├─────────┼─────────┼───┼──────┼───────────────┼────────────────┤",
-          "│tandy    │miller   │40 │40    │Single         │80              │",
-          "├─────────┼─────────┼───┼──────┼───────────────┼────────────────┤",
-          "│joe      │dirte    │45 │20    │Complicated    │10              │",
-          "├─────────┼─────────┼───┼──────┼───────────────┼────────────────┤",
-          "│firstName│lastName │age│visits│status         │progress        │",
-          "│         │         │   ├──────┴───────────────┤                │",
-          "│         │         │   │More Info             │                │",
-          "├─────────┴─────────┼───┴──────────────────────┤                │",
-          "│Name               │Info                      │                │",
-          "└───────────────────┴──────────────────────────┴────────────────┘",
-        })
-      end)
-    end)
-  end)
-
-  describe("method :get_cell", function()
-    it("returns nil on border", function()
-      local table = Table({
-        bufnr = bufnr,
-        columns = { { accessor_key = "value" } },
-        data = { { value = "Such Value!" } },
-      })
-
-      table:render()
-
-      vim.api.nvim_win_set_cursor(winid, { 1, 5 })
-
-      local cell = table:get_cell()
-
-      eq(cell, nil)
-    end)
-
-    it("works after shifting", function()
-      local table = Table({
-        bufnr = bufnr,
-        columns = { { accessor_key = "value" } },
-        data = { { id = 0, value = "Such Value!" } },
-      })
-
-      table:render()
-
-      local cell
-
-      vim.api.nvim_win_set_cursor(winid, { 2, 5 })
-      cell = table:get_cell()
-      eq(type(cell), "table")
-      eq(cell.row.original.id, 0)
-
-      table:render(2)
-
-      vim.api.nvim_win_set_cursor(winid, { 2, 5 })
-      cell = table:get_cell()
-      eq(type(cell), "nil")
-
-      vim.api.nvim_win_set_cursor(winid, { 3, 5 })
-      cell = table:get_cell()
-      eq(type(cell), "table")
-      eq(cell.row.original.id, 0)
-    end)
-
-    it("can take position", function()
-      local table = Table({
-        bufnr = bufnr,
-        columns = {
-          { accessor_key = "id" },
-          { accessor_key = "value" },
-        },
-        data = {
-          { id = 1, value = "One" },
-          { id = 2, value = "Two" },
-        },
-      })
-
-      table:render()
-
-      local cell
-
-      vim.api.nvim_win_set_cursor(winid, { 2, 3 })
-      cell = table:get_cell()
-      eq(cell.get_value(), 1)
-
-      cell = table:get_cell({ 1, 1 })
-      eq(cell.get_value(), "Two")
-    end)
-  end)
-
-  describe("method :refresh_cell", function()
-    it("can truncate NuiText on refesh", function()
-      local table = Table({
-        bufnr = bufnr,
-        columns = { { accessor_key = "value" } },
-        data = { { value = "Such Value!" } },
-      })
-
-      table:render()
-
-      h.assert_buf_lines(table.bufnr, {
-        "┌───────────┐",
-        "│Such Value!│",
-        "└───────────┘",
-      })
-
-      vim.api.nvim_win_set_cursor(winid, { 2, 5 })
-
-      local cell = table:get_cell()
-
-      cell.row.original.value = "Such Looooooog Value!"
-
-      table:refresh_cell(cell)
-
-      h.assert_buf_lines(table.bufnr, {
-        "┌───────────┐",
-        "│Such Loooo…│",
-        "└───────────┘",
-      })
-    end)
-
-    it("can truncate NuiLine on refesh", function()
-      local table = Table({
-        bufnr = bufnr,
-        columns = {
-          {
-            accessor_key = "value",
-            cell = function(cell)
-              return Line({ Text(tostring(cell.get_value()), "NuiTest"), Text(" years old") })
-            end,
-          },
-        },
-        data = { { value = 42 } },
-      })
-
-      table:render()
-
-      h.assert_buf_lines(table.bufnr, {
-        "┌────────────┐",
-        "│42 years old│",
-        "└────────────┘",
-      })
-
-      vim.api.nvim_win_set_cursor(winid, { 2, 5 })
-
-      local cell = table:get_cell()
-
-      eq(type(cell), "table")
-
-      cell.row.original.value = 100
-
-      table:refresh_cell(cell)
-
-      h.assert_buf_lines(table.bufnr, {
-        "┌────────────┐",
-        "│100 years o…│",
-        "└────────────┘",
-      })
-    end)
-  end)
-end)
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/text/init_spec.lua b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/text/init_spec.lua
deleted file mode 100644
index b41b2a5b..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/text/init_spec.lua
+++ /dev/null
@@ -1,284 +0,0 @@
-pcall(require, "luacov")
-
-local Text = require("nui.text")
-local h = require("tests.helpers")
-local spy = require("luassert.spy")
-
-local eq, tbl_omit = h.eq, h.tbl_omit
-
-describe("nui.text", function()
-  local multibyte_char
-
-  before_each(function()
-    multibyte_char = "║"
-  end)
-
-  it("can clone nui.text object", function()
-    local hl_group = "NuiTextTest"
-
-    local t1 = Text("42", hl_group)
-
-    t1.extmark.id = 42
-    local t2 = Text(t1)
-    eq(t2:content(), t1:content())
-    eq(t2.extmark, tbl_omit(t1.extmark, { "id" }))
-
-    t2.extmark.id = 42
-    local t3 = Text(t2)
-    eq(t3:content(), t2:content())
-    eq(t3.extmark, tbl_omit(t2.extmark, { "id" }))
-  end)
-
-  it("can clone nui.text object overriding extmark", function()
-    local hl_group = "NuiTextTest"
-    local hl_group_override = "NuiTextTestOverride"
-
-    local t1 = Text("42", hl_group)
-
-    t1.extmark.id = 42
-    local t2 = Text(t1, hl_group_override)
-    eq(t2:content(), t1:content())
-    eq(t2.extmark, { hl_group = hl_group_override })
-
-    local t3 = Text(t2, { id = 42, hl_group = hl_group })
-    eq(t3:content(), t2:content())
-    eq(t3.extmark, { hl_group = hl_group })
-  end)
-
-  describe("method :set", function()
-    it("works", function()
-      local hl_group = "NuiTextTest"
-      local hl_group_override = "NuiTextTestOverride"
-
-      local text = Text("42", hl_group)
-
-      eq(text:content(), "42")
-      eq(text:length(), 2)
-      eq(text.extmark, {
-        hl_group = hl_group,
-      })
-
-      text.extmark.id = 42
-
-      text:set("3")
-      eq(text:content(), "3")
-      eq(text:length(), 1)
-      eq(text.extmark, {
-        hl_group = hl_group,
-        id = 42,
-      })
-
-      text:set("9", hl_group_override)
-      eq(text:content(), "9")
-      eq(text.extmark, {
-        hl_group = hl_group_override,
-        id = 42,
-      })
-
-      text:set("11", { hl_group = hl_group })
-      eq(text:content(), "11")
-      eq(text.extmark, {
-        hl_group = hl_group,
-        id = 42,
-      })
-
-      text.extmark.id = nil
-
-      text:set("42", { id = 42, hl_group = hl_group })
-      eq(text:content(), "42")
-      eq(text.extmark, { hl_group = hl_group })
-    end)
-  end)
-
-  describe("method :content", function()
-    it("works", function()
-      local content = "42"
-      local text = Text(content)
-      eq(text:content(), content)
-
-      local multibyte_content = multibyte_char
-      local multibyte_text = Text(multibyte_content)
-      eq(multibyte_text:content(), multibyte_content)
-    end)
-  end)
-
-  describe("method :length", function()
-    it("works", function()
-      local content = "42"
-      local text = Text(content)
-      eq(text:length(), 2)
-      eq(text:length(), vim.fn.strlen(content))
-
-      local multibyte_content = multibyte_char
-      local multibyte_text = Text(multibyte_content)
-      eq(multibyte_text:length(), 3)
-      eq(multibyte_text:length(), vim.fn.strlen(multibyte_content))
-    end)
-  end)
-
-  describe("method :width", function()
-    it("works", function()
-      local content = "42"
-      local text = Text(content)
-      eq(text:width(), 2)
-      eq(text:width(), vim.fn.strwidth(content))
-
-      local multibyte_content = multibyte_char
-      local multibyte_text = Text(multibyte_content)
-      eq(multibyte_text:width(), 1)
-      eq(multibyte_text:width(), vim.fn.strwidth(multibyte_content))
-    end)
-  end)
-
-  describe("method", function()
-    local winid, bufnr
-    local initial_lines
-
-    before_each(function()
-      winid = vim.api.nvim_get_current_win()
-      bufnr = vim.api.nvim_create_buf(false, true)
-
-      vim.api.nvim_win_set_buf(winid, bufnr)
-
-      initial_lines = { "  1", multibyte_char .. " 2", "  3" }
-    end)
-
-    after_each(function()
-      vim.api.nvim_buf_delete(bufnr, { force = true })
-    end)
-
-    local function reset_lines(lines)
-      initial_lines = lines or initial_lines
-      vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, initial_lines)
-    end
-
-    describe(":highlight", function()
-      local hl_group, ns, ns_id
-      local linenr, byte_start
-      local text
-
-      before_each(function()
-        hl_group = "NuiTextTest"
-        ns = "NuiTest"
-        ns_id = vim.api.nvim_create_namespace(ns)
-      end)
-
-      it("is applied with :render", function()
-        reset_lines()
-        linenr, byte_start = 1, 0
-        text = Text("a", hl_group)
-        text:render(bufnr, ns_id, linenr, byte_start)
-        h.assert_highlight(bufnr, ns_id, linenr, text:content(), hl_group)
-      end)
-
-      it("is applied with :render_char", function()
-        reset_lines()
-        linenr, byte_start = 1, 0
-        text = Text(multibyte_char, hl_group)
-        text:render_char(bufnr, ns_id, linenr, byte_start)
-        h.assert_highlight(bufnr, ns_id, linenr, text:content(), hl_group)
-      end)
-
-      it("can highlight existing buffer text", function()
-        reset_lines()
-        linenr, byte_start = 2, 0
-        text = Text(initial_lines[linenr], hl_group)
-        text:highlight(bufnr, ns_id, linenr, byte_start)
-        h.assert_highlight(bufnr, ns_id, linenr, text:content(), hl_group)
-      end)
-
-      it("does not create multiple extmarks", function()
-        reset_lines()
-        linenr, byte_start = 2, 0
-        text = Text(initial_lines[linenr], hl_group)
-
-        text:highlight(bufnr, ns_id, linenr, byte_start)
-        h.assert_highlight(bufnr, ns_id, linenr, text:content(), hl_group)
-        text:highlight(bufnr, ns_id, linenr, byte_start)
-        h.assert_highlight(bufnr, ns_id, linenr, text:content(), hl_group)
-        text:highlight(bufnr, ns_id, linenr, byte_start)
-        h.assert_highlight(bufnr, ns_id, linenr, text:content(), hl_group)
-      end)
-    end)
-
-    describe(":render", function()
-      it("works on line with singlebyte characters", function()
-        reset_lines()
-
-        local text = Text("a")
-
-        spy.on(text, "highlight")
-
-        text:render(bufnr, -1, 1, 1)
-
-        assert.spy(text.highlight).was_called(1)
-        assert.spy(text.highlight).was_called_with(text, bufnr, -1, 1, 1)
-
-        h.assert_buf_lines(bufnr, {
-          " a1",
-          initial_lines[2],
-          initial_lines[3],
-        })
-      end)
-
-      it("works on line with multibyte characters", function()
-        reset_lines()
-
-        local text = Text("a")
-
-        spy.on(text, "highlight")
-
-        text:render(bufnr, -1, 2, vim.fn.strlen(multibyte_char))
-
-        assert.spy(text.highlight).was_called(1)
-        assert.spy(text.highlight).was_called_with(text, bufnr, -1, 2, vim.fn.strlen(multibyte_char))
-
-        h.assert_buf_lines(bufnr, {
-          initial_lines[1],
-          multibyte_char .. "a2",
-          initial_lines[3],
-        })
-      end)
-    end)
-
-    describe(":render_char", function()
-      it("works on line with singlebyte characters", function()
-        reset_lines()
-
-        local text = Text("a")
-
-        spy.on(text, "highlight")
-
-        text:render_char(bufnr, -1, 1, 1)
-
-        assert.spy(text.highlight).was_called(1)
-        assert.spy(text.highlight).was_called_with(text, bufnr, -1, 1, 1)
-
-        h.assert_buf_lines(bufnr, {
-          " a1",
-          initial_lines[2],
-          initial_lines[3],
-        })
-      end)
-
-      it("works on line with multibyte characters", function()
-        reset_lines()
-
-        local text = Text("a")
-
-        spy.on(text, "highlight")
-
-        text:render_char(bufnr, -1, 2, 1)
-
-        assert.spy(text.highlight).was_called(1)
-        assert.spy(text.highlight).was_called_with(text, bufnr, -1, 2, vim.fn.strlen(multibyte_char))
-
-        h.assert_buf_lines(bufnr, {
-          initial_lines[1],
-          multibyte_char .. "a2",
-          initial_lines[3],
-        })
-      end)
-    end)
-  end)
-end)
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/tree/init_spec.lua b/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/tree/init_spec.lua
deleted file mode 100644
index 5358076c..00000000
--- a/config/neovim/store/lazy-plugins/nui.nvim/nui.nvim-0.3.0-1-unstable-2024-05-18-rocks/nui.nvim/0.3.0-1/tests/nui/tree/init_spec.lua
+++ /dev/null
@@ -1,912 +0,0 @@
-pcall(require, "luacov")
-
-local Text = require("nui.text")
-local Tree = require("nui.tree")
-local h = require("tests.helpers")
-
-local eq = h.eq
-
-describe("nui.tree", function()
-  local winid, bufnr
-
-  before_each(function()
-    winid = vim.api.nvim_get_current_win()
-    bufnr = vim.api.nvim_create_buf(false, true)
-
-    vim.api.nvim_win_set_buf(winid, bufnr)
-  end)
-
-  after_each(function()
-    vim.api.nvim_buf_delete(bufnr, { force = true })
-  end)
-
-  describe("(#deprecated) o.winid", function()
-    it("throws if missing", function()
-      local ok, err = pcall(function()
-        return Tree({})
-      end)
-      eq(ok, false)
-      eq(type(string.match(err, "missing bufnr")), "string")
-    end)
-
-    it("throws if invalid", function()
-      local ok, err = pcall(function()
-        return Tree({ winid = 999 })
-      end)
-      eq(ok, false)
-      eq(type(string.match(err, "invalid winid ")), "string")
-    end)
-
-    it("sets t.winid and t.bufnr properly", function()
-      local tree = Tree({ winid = winid })
-
-      eq(tree.winid, winid)
-      eq(tree.bufnr, bufnr)
-    end)
-  end)
-
-  describe("o.bufnr", function()
-    it("throws if missing", function()
-      local ok, err = pcall(function()
-        return Tree({})
-      end)
-      eq(ok, false)
-      eq(type(string.match(err, "missing bufnr")), "string")
-    end)
-
-    it("throws if invalid", function()
-      local ok, err = pcall(function()
-        return Tree({ bufnr = 999 })
-      end)
-      eq(ok, false)
-      eq(type(string.match(err, "invalid bufnr ")), "string")
-    end)
-
-    it("sets t.bufnr properly", function()
-      local tree = Tree({ bufnr = bufnr })
-
-      eq(tree.winid, nil)
-      eq(tree.bufnr, bufnr)
-    end)
-  end)
-
-  it("throws on duplicated node id", function()
-    local ok, err = pcall(function()
-      return Tree({
-        bufnr = bufnr,
-        nodes = {
-          Tree.Node({ id = "id", text = "text" }),
-          Tree.Node({ id = "id", text = "text" }),
-        },
-      })
-    end)
-    eq(ok, false)
-    eq(type(err), "string")
-  end)
-
-  it("sets default buf options emulating scratch-buffer", function()
-    local tree = Tree({ bufnr = bufnr })
-
-    h.assert_buf_options(tree.bufnr, {
-      bufhidden = "hide",
-      buflisted = false,
-      buftype = "nofile",
-      swapfile = false,
-    })
-  end)
-
-  describe("(#deprecated) o.win_options", function()
-    it("sets default values for handling folds", function()
-      local tree = Tree({ winid = winid })
-
-      h.assert_win_options(tree.winid, {
-        foldmethod = "manual",
-        foldcolumn = "0",
-        wrap = false,
-      })
-    end)
-
-    it("sets values", function()
-      local initial_statusline = vim.api.nvim_win_get_option(winid, "statusline")
-
-      local statusline = "test: win_options " .. math.random()
-      local tree = Tree({
-        winid = winid,
-        win_options = {
-          statusline = statusline,
-        },
-      })
-
-      h.assert_win_options(tree.winid, {
-        statusline = statusline,
-      })
-
-      vim.api.nvim_win_set_option(tree.winid, "statusline", initial_statusline)
-    end)
-
-    it("has no effect if o.bufnr is present", function()
-      local initial_statusline = vim.api.nvim_win_get_option(winid, "statusline")
-
-      Tree({
-        bufnr = bufnr,
-        win_options = {
-          statusline = "test: win_options" .. math.random(),
-        },
-      })
-
-      h.assert_win_options(winid, {
-        statusline = initial_statusline,
-      })
-    end)
-  end)
-
-  it("sets t.ns_id if o.ns_id is string", function()
-    local ns = "NuiTreeTest"
-    local tree = Tree({ bufnr = bufnr, ns_id = ns })
-
-    local namespaces = vim.api.nvim_get_namespaces()
-
-    eq(tree.ns_id, namespaces[ns])
-  end)
-
-  it("sets t.ns_id if o.ns_id is number", function()
-    local ns = "NuiTreeTest"
-    local ns_id = vim.api.nvim_create_namespace(ns)
-    local tree = Tree({ bufnr = bufnr, ns_id = ns_id })
-
-    eq(tree.ns_id, ns_id)
-  end)
-
-  it("uses o.get_node_id if provided", function()
-    local node_d2 = Tree.Node({ key = "depth two" })
-    local node_d1 = Tree.Node({ key = "depth one" }, { node_d2 })
-    Tree({
-      bufnr = bufnr,
-      nodes = { node_d1 },
-      get_node_id = function(node)
-        return node.key
-      end,
-    })
-
-    eq(node_d1:get_id(), node_d1.key)
-    eq(node_d2:get_id(), node_d2.key)
-  end)
-
-  describe("default get_node_id", function()
-    it("returns id using n.id", function()
-      local node = Tree.Node({ id = "id", text = "text" })
-      Tree({ bufnr = bufnr, nodes = { node } })
-
-      eq(node:get_id(), "-id")
-    end)
-
-    it("returns id using parent_id + depth + n.text", function()
-      local node_d2 = Tree.Node({ text = { "depth two a", Text("depth two b") } })
-      local node_d1 = Tree.Node({ text = "depth one" }, { node_d2 })
-      Tree({ bufnr = bufnr, nodes = { node_d1 } })
-
-      eq(node_d1:get_id(), string.format("-%s-%s", node_d1:get_depth(), node_d1.text))
-      eq(
-        node_d2:get_id(),
-        string.format(
-          "%s-%s-%s",
-          node_d2:get_parent_id(),
-          node_d2:get_depth(),
-          table.concat({ node_d2.text[1], node_d2.text[2]:content() }, "-")
-        )
-      )
-    end)
-
-    it("returns id using random number", function()
-      math.randomseed(0)
-      local expected_id = "-" .. math.random()
-      math.randomseed(0)
-
-      local node = Tree.Node({})
-      Tree({ bufnr = bufnr, nodes = { node } })
-
-      eq(node:get_id(), expected_id)
-    end)
-  end)
-
-  it("uses o.prepare_node if provided", function()
-    local function prepare_node(node, parent_node)
-      if not parent_node then
-        return node.text
-      end
-
-      return parent_node.text .. ":" .. node.text
-    end
-
-    local nodes = {
-      Tree.Node({ text = "a" }),
-      Tree.Node({ text = "b" }, {
-        Tree.Node({ text = "b-1" }),
-        Tree.Node({ text = "b-2" }),
-      }),
-      Tree.Node({ text = "c" }),
-    }
-
-    nodes[2]:expand()
-
-    local tree = Tree({
-      bufnr = bufnr,
-      nodes = nodes,
-      prepare_node = prepare_node,
-    })
-
-    tree:render()
-
-    h.assert_buf_lines(tree.bufnr, {
-      "a",
-      "b",
-      "b:b-1",
-      "b:b-2",
-      "c",
-    })
-  end)
-
-  describe("default prepare_node", function()
-    it("throws if missing n.text", function()
-      local nodes = {
-        Tree.Node({ txt = "a" }),
-        Tree.Node({ txt = "b" }),
-        Tree.Node({ txt = "c" }),
-      }
-
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = nodes,
-      })
-
-      local ok, err = pcall(tree.render, tree)
-      eq(ok, false)
-      eq(type(err), "string")
-    end)
-
-    it("uses n.text", function()
-      local nodes = {
-        Tree.Node({ text = "a" }),
-        Tree.Node({ text = { "b-1", "b-2" } }),
-        Tree.Node({ text = "c" }),
-      }
-
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = nodes,
-      })
-
-      tree:render()
-
-      h.assert_buf_lines(tree.bufnr, {
-        "  a",
-        "  b-1",
-        "  b-2",
-        "  c",
-      })
-    end)
-
-    it("renders arrow if children are present", function()
-      local nodes = {
-        Tree.Node({ text = "a" }),
-        Tree.Node({ text = "b" }, {
-          Tree.Node({ text = "b-1" }),
-          Tree.Node({ text = { "b-2", "b-3" } }),
-        }),
-        Tree.Node({ text = "c" }),
-      }
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = nodes,
-      })
-
-      tree:render()
-
-      h.assert_buf_lines(tree.bufnr, {
-        "  a",
-        " b",
-        "  c",
-      })
-
-      nodes[2]:expand()
-      tree:render()
-
-      h.assert_buf_lines(tree.bufnr, {
-        "  a",
-        " b",
-        "    b-1",
-        "    b-2",
-        "    b-3",
-        "  c",
-      })
-    end)
-  end)
-
-  describe("method :get_node", function()
-    it("can get node under cursor", function()
-      local nodes = {
-        Tree.Node({ text = "a" }),
-        Tree.Node({ text = "b" }),
-        Tree.Node({ text = "c" }),
-      }
-
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = nodes,
-      })
-
-      tree:render()
-
-      local linenr = 3
-
-      vim.api.nvim_win_set_cursor(winid, { linenr, 0 })
-
-      eq({ tree:get_node() }, { nodes[3], linenr, linenr })
-    end)
-
-    it("can get node with id", function()
-      local b_node_children = {
-        Tree.Node({ text = "b-1" }),
-        Tree.Node({ text = { "b-2", "b-3" } }),
-      }
-
-      local nodes = {
-        Tree.Node({ text = "a" }),
-        Tree.Node({ text = "b" }, b_node_children),
-        Tree.Node({ text = "c" }),
-      }
-
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = nodes,
-        get_node_id = function(node)
-          return type(node.text) == "table" and table.concat(node.text, "-") or node.text
-        end,
-      })
-
-      tree:render()
-
-      eq({ tree:get_node("b") }, { nodes[2], 2, 2 })
-
-      tree:get_node("b"):expand()
-      tree:render()
-
-      eq({ tree:get_node("b-2-b-3") }, { b_node_children[2], 4, 5 })
-    end)
-
-    it("can get node on linenr", function()
-      local b_node_children = {
-        Tree.Node({ id = "b-1-b-2", text = { "b-1", "b-2" } }),
-      }
-
-      local nodes = {
-        Tree.Node({ text = "a" }),
-        Tree.Node({ text = "b" }, b_node_children),
-        Tree.Node({ text = "c" }),
-      }
-
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = nodes,
-      })
-
-      tree:render()
-
-      eq({ tree:get_node(1) }, { nodes[1], 1, 1 })
-
-      tree:get_node(2):expand()
-      tree:render()
-
-      eq({ tree:get_node(3) }, { b_node_children[1], 3, 4 })
-      eq({ tree:get_node(4) }, { b_node_children[1], 3, 4 })
-    end)
-  end)
-
-  describe("method :get_nodes", function()
-    it("can get nodes at root", function()
-      local nodes = {
-        Tree.Node({ text = "a" }),
-        Tree.Node({ text = "b" }, {
-          Tree.Node({ text = "b-1" }),
-        }),
-      }
-
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = nodes,
-        get_node_id = function(node)
-          return node.text
-        end,
-      })
-
-      eq(tree:get_nodes(), nodes)
-    end)
-
-    it("can get nodes under parent node", function()
-      local child_nodes = {
-        Tree.Node({ text = "b-1" }),
-      }
-
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = {
-          Tree.Node({ text = "a" }),
-          Tree.Node({ text = "b" }, child_nodes),
-        },
-        get_node_id = function(node)
-          return node.text
-        end,
-      })
-
-      eq(tree:get_nodes("b"), child_nodes)
-    end)
-  end)
-
-  describe("method :add_node", function()
-    it("throw if invalid parent_id", function()
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = {
-          Tree.Node({ text = "x" }),
-        },
-      })
-
-      local ok, err = pcall(tree.add_node, tree, Tree.Node({ text = "y" }), "invalid_parent_id")
-      eq(ok, false)
-      eq(type(err), "string")
-    end)
-
-    it("can add node at root", function()
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = {
-          Tree.Node({ text = "x" }),
-        },
-      })
-
-      tree:add_node(Tree.Node({ text = "y" }))
-
-      tree:render()
-
-      h.assert_buf_lines(tree.bufnr, {
-        "  x",
-        "  y",
-      })
-
-      tree:add_node(Tree.Node({ text = "z" }))
-
-      tree:render()
-
-      h.assert_buf_lines(tree.bufnr, {
-        "  x",
-        "  y",
-        "  z",
-      })
-    end)
-
-    it("can add node under parent node", function()
-      local nodes = {
-        Tree.Node({ text = "a" }),
-        Tree.Node({ text = "b" }, {
-          Tree.Node({ text = "b-1" }),
-        }),
-        Tree.Node({ text = "c" }),
-      }
-
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = nodes,
-        get_node_id = function(node)
-          return node.text
-        end,
-      })
-
-      tree:add_node(Tree.Node({ text = "b-2" }), "b")
-
-      tree:get_node("b"):expand()
-
-      tree:add_node(Tree.Node({ text = "c-1" }), "c")
-
-      tree:get_node("c"):expand()
-
-      tree:render()
-
-      h.assert_buf_lines(tree.bufnr, {
-        "  a",
-        " b",
-        "    b-1",
-        "    b-2",
-        " c",
-        "    c-1",
-      })
-    end)
-  end)
-
-  describe("method :set_nodes", function()
-    it("throw if invalid parent_id", function()
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = {
-          Tree.Node({ text = "x" }),
-        },
-      })
-
-      local ok, err = pcall(tree.set_nodes, tree, {}, "invalid_parent_id")
-      eq(ok, false)
-      eq(type(err), "string")
-    end)
-
-    it("can set nodes at root", function()
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = {
-          Tree.Node({ text = "x" }),
-        },
-      })
-
-      tree:set_nodes({
-        Tree.Node({ text = "a" }),
-        Tree.Node({ text = "b" }),
-      })
-
-      tree:render()
-
-      h.assert_buf_lines(tree.bufnr, {
-        "  a",
-        "  b",
-      })
-
-      tree:set_nodes({
-        Tree.Node({ text = "c" }),
-      })
-
-      tree:render()
-
-      h.assert_buf_lines(tree.bufnr, {
-        "  c",
-      })
-    end)
-
-    it("can set nodes under parent node", function()
-      local nodes = {
-        Tree.Node({ text = "a" }),
-        Tree.Node({ text = "b" }, {
-          Tree.Node({ text = "b-1" }),
-        }),
-        Tree.Node({ text = "c" }),
-      }
-
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = nodes,
-        get_node_id = function(node)
-          return node.text
-        end,
-      })
-
-      tree:set_nodes({
-        Tree.Node({ text = "b-2" }),
-      }, "b")
-
-      tree:get_node("b"):expand()
-
-      tree:set_nodes({
-        Tree.Node({ text = "c-1" }),
-        Tree.Node({ text = "c-2" }),
-      }, "c")
-
-      tree:get_node("c"):expand()
-
-      tree:render()
-
-      h.assert_buf_lines(tree.bufnr, {
-        "  a",
-        " b",
-        "    b-2",
-        " c",
-        "    c-1",
-        "    c-2",
-      })
-    end)
-  end)
-
-  describe("method :remove_node", function()
-    it("can remove node w/o parent", function()
-      local nodes = {
-        Tree.Node({ text = "a" }),
-        Tree.Node({ text = "b" }, {
-          Tree.Node({ text = "b-1" }),
-        }),
-        Tree.Node({ text = "c" }),
-      }
-
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = nodes,
-        get_node_id = function(node)
-          return node.text
-        end,
-      })
-
-      tree:remove_node("a")
-
-      tree:get_node("b"):expand()
-
-      tree:render()
-
-      eq(
-        vim.tbl_map(function(node)
-          return node:get_id()
-        end, tree:get_nodes()),
-        { "b", "c" }
-      )
-
-      h.assert_buf_lines(tree.bufnr, {
-        " b",
-        "    b-1",
-        "  c",
-      })
-    end)
-
-    it("can remove node w/ parent", function()
-      local nodes = {
-        Tree.Node({ text = "a" }),
-        Tree.Node({ text = "b" }, {
-          Tree.Node({ text = "b-1" }),
-        }),
-        Tree.Node({ text = "c" }),
-      }
-
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = nodes,
-        get_node_id = function(node)
-          return node.text
-        end,
-      })
-
-      tree:remove_node("b-1")
-
-      tree:render()
-
-      eq(tree:get_node("b"):get_child_ids(), {})
-
-      h.assert_buf_lines(tree.bufnr, {
-        "  a",
-        "  b",
-        "  c",
-      })
-    end)
-
-    it("removes children nodes recursively", function()
-      local nodes = {
-        Tree.Node({ text = "a" }, {
-          Tree.Node({ text = "a-1" }, {
-            Tree.Node({ text = "a-1-x" }),
-          }),
-        }),
-      }
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = nodes,
-        get_node_id = function(node)
-          return node.text
-        end,
-      })
-      h.neq(tree:get_node("a"), nil)
-      h.neq(tree:get_node("a-1"), nil)
-      h.neq(tree:get_node("a-1-x"), nil)
-
-      tree:remove_node("a")
-
-      eq(tree:get_node("a"), nil)
-      eq(tree:get_node("a-1"), nil)
-      eq(tree:get_node("a-1-x"), nil)
-    end)
-  end)
-
-  describe("method :render", function()
-    it("handles unexpected case of missing node", function()
-      local nodes = {
-        Tree.Node({ text = "a" }),
-        Tree.Node({ text = "b" }),
-        Tree.Node({ text = "c" }),
-      }
-
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = nodes,
-        get_node_id = function(node)
-          return node.text
-        end,
-      })
-
-      -- this should not happen normally
-      tree.nodes.by_id["a"] = nil
-
-      tree:render()
-
-      h.assert_buf_lines(tree.bufnr, {
-        "  b",
-        "  c",
-      })
-    end)
-
-    it("skips node if o.prepare_node returns nil", function()
-      local nodes = {
-        Tree.Node({ text = "a" }),
-        Tree.Node({ text = "b" }),
-        Tree.Node({ text = "c" }),
-      }
-
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = nodes,
-        get_node_id = function(node)
-          return node.text
-        end,
-        prepare_node = function(node)
-          if node:get_id() == "b" then
-            return nil
-          end
-
-          return node.text
-        end,
-      })
-
-      tree:render()
-
-      h.assert_buf_lines(tree.bufnr, {
-        "a",
-        "c",
-      })
-    end)
-
-    it("supports param linenr_start", function()
-      local b_node_children = {
-        Tree.Node({ text = "b-1" }),
-        Tree.Node({ text = "b-2" }),
-      }
-      local nodes = {
-        Tree.Node({ text = "a" }),
-        Tree.Node({ text = "b" }, b_node_children),
-      }
-
-      vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, {
-        "NuiTreeTest",
-        "",
-        "NuiTreeTest",
-      })
-
-      local tree = Tree({
-        bufnr = bufnr,
-        nodes = nodes,
-        get_node_id = function(node)
-          return node.text
-        end,
-      })
-
-      tree:render(2)
-
-      h.assert_buf_lines(tree.bufnr, {
-        "NuiTreeTest",
-        "  a",
-        " b",
-        "NuiTreeTest",
-      })
-
-      nodes[2]:expand()
-
-      tree:render()
-
-      h.assert_buf_lines(tree.bufnr, {
-        "NuiTreeTest",
-        "  a",
-        " b",
-        "    b-1",
-        "    b-2",
-        "NuiTreeTest",
-      })
-
-      nodes[2]:collapse()
-
-      tree:render(3)
-
-      h.assert_buf_lines(tree.bufnr, {
-        "NuiTreeTest",
-        "",
-        "  a",
-        " b",
-        "NuiTreeTest",
-      })
-    end)
-  end)
-end)
-
-describe("nui.tree.Node", function()
-  describe("method :has_children", function()
-    it("works before initialization", function()
-      local node_wo_children = Tree.Node({ text = "a" })
-      local node_w_children = Tree.Node({ text = "b" }, { Tree.Node({ text = "b-1" }) })
-
-      eq(node_wo_children._initialized, false)
-      eq(node_wo_children:has_children(), false)
-
-      eq(node_w_children._initialized, false)
-      eq(type(node_w_children.__children), "table")
-      eq(node_w_children:has_children(), true)
-    end)
-
-    it("works after initialization", function()
-      local node_wo_children = Tree.Node({ text = "a" })
-      local node_w_children = Tree.Node({ text = "b" }, { Tree.Node({ text = "b-1" }) })
-
-      Tree({
-        bufnr = vim.api.nvim_win_get_buf(vim.api.nvim_get_current_win()),
-        nodes = { node_wo_children, node_w_children },
-      })
-
-      eq(node_wo_children._initialized, true)
-      eq(node_wo_children:has_children(), false)
-
-      eq(node_w_children._initialized, true)
-      eq(type(node_w_children.__children), "nil")
-      eq(node_w_children:has_children(), true)
-    end)
-  end)
-
-  describe("method :expand", function()
-    it("returns true if not already expanded", function()
-      local node = Tree.Node({ text = "b" }, { Tree.Node({ text = "b-1" }) })
-      eq(node:is_expanded(), false)
-      eq(node:expand(), true)
-      eq(node:is_expanded(), true)
-    end)
-
-    it("returns false if already expanded", function()
-      local node = Tree.Node({ text = "b" }, { Tree.Node({ text = "b-1" }) })
-      node:expand()
-      eq(node:is_expanded(), true)
-      eq(node:expand(), false)
-      eq(node:is_expanded(), true)
-    end)
-
-    it("does work w/ zero child", function()
-      local node = Tree.Node({ text = "a" }, {})
-      eq(node:is_expanded(), false)
-      eq(node:expand(), true)
-      eq(node:is_expanded(), true)
-    end)
-
-    it("does not work w/o children", function()
-      local node = Tree.Node({ text = "a" })
-      eq(node:is_expanded(), false)
-      eq(node:expand(), false)
-      eq(node:is_expanded(), false)
-    end)
-  end)
-
-  describe("method :collapse", function()
-    it("returns true if not already collapsed", function()
-      local node = Tree.Node({ text = "b" }, { Tree.Node({ text = "b-1" }) })
-      node:expand()
-      eq(node:is_expanded(), true)
-      eq(node:collapse(), true)
-      eq(node:is_expanded(), false)
-    end)
-
-    it("returns false if already collapsed", function()
-      local node = Tree.Node({ text = "b" }, { Tree.Node({ text = "b-1" }) })
-      eq(node:is_expanded(), false)
-      eq(node:collapse(), false)
-      eq(node:is_expanded(), false)
-    end)
-
-    it("does not work w/o children", function()
-      local node = Tree.Node({ text = "a" })
-      eq(node:is_expanded(), false)
-      eq(node:collapse(), false)
-      eq(node:is_expanded(), false)
-    end)
-  end)
-end)
diff --git a/config/neovim/store/lazy-plugins/nui.nvim/rock_manifest b/config/neovim/store/lazy-plugins/nui.nvim/rock_manifest
index d4dd3370..3f9a3b4c 100644
--- a/config/neovim/store/lazy-plugins/nui.nvim/rock_manifest
+++ b/config/neovim/store/lazy-plugins/nui.nvim/rock_manifest
@@ -3,7 +3,7 @@ rock_manifest = {
       nui = {
          input = {
             ["README.md"] = "832b4732e882a065c23f02536578b0cf",
-            ["init.lua"] = "802d2ababa19c92bbb20a63a06351e82"
+            ["init.lua"] = "215f8b587a68e5dffa0fdc0278b7a9a6"
          },
          layout = {
             ["README.md"] = "cdd351f847db0d9e63ebceb0ada39115",
diff --git a/config/neovim/store/lazy-plugins/nvim-cmp/lua/cmp/view/ghost_text_view.lua b/config/neovim/store/lazy-plugins/nvim-cmp/lua/cmp/view/ghost_text_view.lua
index ef0d9017..78c3802e 100644
--- a/config/neovim/store/lazy-plugins/nvim-cmp/lua/cmp/view/ghost_text_view.lua
+++ b/config/neovim/store/lazy-plugins/nvim-cmp/lua/cmp/view/ghost_text_view.lua
@@ -60,11 +60,17 @@ ghost_text_view.new = function()
 
       local text = self.text_gen(self, line, col)
       if #text > 0 then
+        local virt_lines = {}
+        for _, l in ipairs(vim.fn.split(text, '\n')) do
+          table.insert(virt_lines, { { l, type(c) == 'table' and c.hl_group or 'Comment' } })
+        end
+        local first_line = table.remove(virt_lines, 1)
         self.extmark_buf = vim.api.nvim_get_current_buf()
         self.extmark_id = vim.api.nvim_buf_set_extmark(self.extmark_buf, ghost_text_view.ns, row - 1, col, {
           right_gravity = true,
-          virt_text = { { text, type(c) == 'table' and c.hl_group or 'Comment' } },
+          virt_text = first_line,
           virt_text_pos = has_inline and 'inline' or 'overlay',
+          virt_lines = virt_lines,
           hl_mode = 'combine',
           ephemeral = false,
         })
@@ -82,7 +88,6 @@ ghost_text_view.text_gen = function(self, line, cursor_col)
   if self.entry:get_completion_item().insertTextFormat == types.lsp.InsertTextFormat.Snippet then
     word = tostring(snippet.parse(word))
   end
-  word = str.oneline(word)
   local word_clen = vim.str_utfindex(word)
   local cword = string.sub(line, self.entry:get_offset(), cursor_col)
   local cword_clen = vim.str_utfindex(cword)
diff --git a/config/neovim/store/lazy-plugins/nvim-cmp/nix-support/propagated-build-inputs b/config/neovim/store/lazy-plugins/nvim-cmp/nix-support/propagated-build-inputs
index b3b8c91f..169a165b 100644
--- a/config/neovim/store/lazy-plugins/nvim-cmp/nix-support/propagated-build-inputs
+++ b/config/neovim/store/lazy-plugins/nvim-cmp/nix-support/propagated-build-inputs
@@ -1 +1 @@
-/nix/store/mqbhz05llkddfb5wni0m48kw22ixxps4-lua-5.1.5 
\ No newline at end of file
+/nix/store/3czmrawji85vf8979kll2yx2f1kjkric-lua-5.1.5 
\ No newline at end of file
diff --git a/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/manifest b/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/manifest
deleted file mode 100644
index 33f10a1c..00000000
--- a/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/manifest
+++ /dev/null
@@ -1,263 +0,0 @@
-commands = {}
-dependencies = {
-   ["nvim-cmp"] = {
-      ["scm-1"] = {
-         {
-            constraints = {
-               {
-                  op = ">=",
-                  version = {
-                     5, 1, string = "5.1"
-                  }
-               },
-               {
-                  op = "<",
-                  version = {
-                     5, 4, string = "5.4"
-                  }
-               }
-            },
-            name = "lua"
-         }
-      }
-   }
-}
-modules = {
-   ["cmp.config"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.config.compare"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.config.context"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.config.default"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.config.mapping"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.config.sources"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.config.window"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.context"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.context_spec"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.core"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.core_spec"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.entry"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.entry_spec"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.init"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.matcher"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.matcher_spec"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.source"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.source_spec"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.types.cmp"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.types.init"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.types.lsp"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.types.lsp_spec"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.types.vim"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.api"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.api_spec"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.async"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.async_spec"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.autocmd"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.binary"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.binary_spec"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.buffer"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.cache"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.char"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.debug"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.event"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.feedkeys"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.feedkeys_spec"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.highlight"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.keymap"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.keymap_spec"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.misc"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.misc_spec"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.options"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.pattern"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.snippet"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.spec"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.str"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.str_spec"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.utils.window"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.view"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.view.custom_entries_view"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.view.docs_view"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.view.ghost_text_view"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.view.native_entries_view"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.view.wildmenu_entries_view"] = {
-      "nvim-cmp/scm-1"
-   },
-   ["cmp.vim_source"] = {
-      "nvim-cmp/scm-1"
-   }
-}
-repository = {
-   ["nvim-cmp"] = {
-      ["scm-1"] = {
-         {
-            arch = "installed",
-            commands = {},
-            dependencies = {},
-            modules = {
-               ["cmp.config"] = "cmp/config.lua",
-               ["cmp.config.compare"] = "cmp/config/compare.lua",
-               ["cmp.config.context"] = "cmp/config/context.lua",
-               ["cmp.config.default"] = "cmp/config/default.lua",
-               ["cmp.config.mapping"] = "cmp/config/mapping.lua",
-               ["cmp.config.sources"] = "cmp/config/sources.lua",
-               ["cmp.config.window"] = "cmp/config/window.lua",
-               ["cmp.context"] = "cmp/context.lua",
-               ["cmp.context_spec"] = "cmp/context_spec.lua",
-               ["cmp.core"] = "cmp/core.lua",
-               ["cmp.core_spec"] = "cmp/core_spec.lua",
-               ["cmp.entry"] = "cmp/entry.lua",
-               ["cmp.entry_spec"] = "cmp/entry_spec.lua",
-               ["cmp.init"] = "cmp/init.lua",
-               ["cmp.matcher"] = "cmp/matcher.lua",
-               ["cmp.matcher_spec"] = "cmp/matcher_spec.lua",
-               ["cmp.source"] = "cmp/source.lua",
-               ["cmp.source_spec"] = "cmp/source_spec.lua",
-               ["cmp.types.cmp"] = "cmp/types/cmp.lua",
-               ["cmp.types.init"] = "cmp/types/init.lua",
-               ["cmp.types.lsp"] = "cmp/types/lsp.lua",
-               ["cmp.types.lsp_spec"] = "cmp/types/lsp_spec.lua",
-               ["cmp.types.vim"] = "cmp/types/vim.lua",
-               ["cmp.utils.api"] = "cmp/utils/api.lua",
-               ["cmp.utils.api_spec"] = "cmp/utils/api_spec.lua",
-               ["cmp.utils.async"] = "cmp/utils/async.lua",
-               ["cmp.utils.async_spec"] = "cmp/utils/async_spec.lua",
-               ["cmp.utils.autocmd"] = "cmp/utils/autocmd.lua",
-               ["cmp.utils.binary"] = "cmp/utils/binary.lua",
-               ["cmp.utils.binary_spec"] = "cmp/utils/binary_spec.lua",
-               ["cmp.utils.buffer"] = "cmp/utils/buffer.lua",
-               ["cmp.utils.cache"] = "cmp/utils/cache.lua",
-               ["cmp.utils.char"] = "cmp/utils/char.lua",
-               ["cmp.utils.debug"] = "cmp/utils/debug.lua",
-               ["cmp.utils.event"] = "cmp/utils/event.lua",
-               ["cmp.utils.feedkeys"] = "cmp/utils/feedkeys.lua",
-               ["cmp.utils.feedkeys_spec"] = "cmp/utils/feedkeys_spec.lua",
-               ["cmp.utils.highlight"] = "cmp/utils/highlight.lua",
-               ["cmp.utils.keymap"] = "cmp/utils/keymap.lua",
-               ["cmp.utils.keymap_spec"] = "cmp/utils/keymap_spec.lua",
-               ["cmp.utils.misc"] = "cmp/utils/misc.lua",
-               ["cmp.utils.misc_spec"] = "cmp/utils/misc_spec.lua",
-               ["cmp.utils.options"] = "cmp/utils/options.lua",
-               ["cmp.utils.pattern"] = "cmp/utils/pattern.lua",
-               ["cmp.utils.snippet"] = "cmp/utils/snippet.lua",
-               ["cmp.utils.spec"] = "cmp/utils/spec.lua",
-               ["cmp.utils.str"] = "cmp/utils/str.lua",
-               ["cmp.utils.str_spec"] = "cmp/utils/str_spec.lua",
-               ["cmp.utils.window"] = "cmp/utils/window.lua",
-               ["cmp.view"] = "cmp/view.lua",
-               ["cmp.view.custom_entries_view"] = "cmp/view/custom_entries_view.lua",
-               ["cmp.view.docs_view"] = "cmp/view/docs_view.lua",
-               ["cmp.view.ghost_text_view"] = "cmp/view/ghost_text_view.lua",
-               ["cmp.view.native_entries_view"] = "cmp/view/native_entries_view.lua",
-               ["cmp.view.wildmenu_entries_view"] = "cmp/view/wildmenu_entries_view.lua",
-               ["cmp.vim_source"] = "cmp/vim_source.lua"
-            }
-         }
-      }
-   }
-}
diff --git a/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/nvim-cmp/scm-1/autoload/cmp.vim b/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/nvim-cmp/scm-1/autoload/cmp.vim
deleted file mode 100644
index a331d071..00000000
--- a/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/nvim-cmp/scm-1/autoload/cmp.vim
+++ /dev/null
@@ -1,75 +0,0 @@
-let s:bridge_id = 0
-let s:sources = {}
-
-"
-" cmp#register_source
-"
-function! cmp#register_source(name, source) abort
-  let l:methods = []
-  for l:method in [
-  \   'is_available',
-  \   'get_debug_name',
-  \   'get_position_encoding_kind',
-  \   'get_trigger_characters',
-  \   'get_keyword_pattern',
-  \   'complete',
-  \   'execute',
-  \   'resolve'
-  \ ]
-    if has_key(a:source, l:method) && type(a:source[l:method]) == v:t_func
-      call add(l:methods, l:method)
-    endif
-  endfor
-
-  let s:bridge_id += 1
-  let a:source.bridge_id = s:bridge_id
-  let a:source.id = luaeval('require("cmp").register_source(_A[1], require("cmp.vim_source").new(_A[2], _A[3]))', [a:name, s:bridge_id, l:methods])
-  let s:sources[s:bridge_id] = a:source
-  return a:source.id
-endfunction
-
-"
-" cmp#unregister_source
-"
-function! cmp#unregister_source(id) abort
-  if has_key(s:sources, a:id)
-    unlet s:sources[a:id]
-  endif
-  call luaeval('require("cmp").unregister_source(_A)', a:id)
-endfunction
-
-"
-" cmp#_method
-"
-function! cmp#_method(bridge_id, method, args) abort
-  try
-    let l:source = s:sources[a:bridge_id]
-    if a:method ==# 'is_available'
-      return l:source[a:method]()
-    elseif a:method ==# 'get_debug_name'
-      return l:source[a:method]()
-    elseif a:method ==# 'get_position_encoding_kind'
-      return l:source[a:method](a:args[0])
-    elseif a:method ==# 'get_keyword_pattern'
-      return l:source[a:method](a:args[0])
-    elseif a:method ==# 'get_trigger_characters'
-      return l:source[a:method](a:args[0])
-    elseif a:method ==# 'complete'
-      return l:source[a:method](a:args[0], s:callback(a:args[1]))
-    elseif a:method ==# 'resolve'
-      return l:source[a:method](a:args[0], s:callback(a:args[1]))
-    elseif a:method ==# 'execute'
-      return l:source[a:method](a:args[0], s:callback(a:args[1]))
-    endif
-  catch /.*/
-    echomsg string({ 'exception': v:exception, 'throwpoint': v:throwpoint })
-  endtry
-  return v:null
-endfunction
-
-"
-" s:callback
-"
-function! s:callback(id) abort
-  return { ... -> luaeval('require("cmp.vim_source").on_callback(_A[1], _A[2])', [a:id, a:000]) }
-endfunction
diff --git a/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/nvim-cmp/scm-1/doc/cmp.txt b/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/nvim-cmp/scm-1/doc/cmp.txt
deleted file mode 100644
index d4401130..00000000
--- a/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/nvim-cmp/scm-1/doc/cmp.txt
+++ /dev/null
@@ -1,1071 +0,0 @@
-*nvim-cmp* *cmp*
-
-A completion plugin for neovim coded in Lua.
-
-==============================================================================
-CONTENTS                                                          *cmp-contents*
-
-Abstract                                                          |cmp-abstract|
-Concept                                                            |cmp-concept|
-Usage                                                                |cmp-usage|
-Function                                                          |cmp-function|
-Mapping                                                            |cmp-mapping|
-Command                                                            |cmp-command|
-Highlight                                                        |cmp-highlight|
-FileType                                                          |cmp-filetype|
-Autocmd                                                            |cmp-autocmd|
-Config                                                              |cmp-config|
-Config Helper                                                |cmp-config-helper|
-Develop                                                            |cmp-develop|
-FAQ                                                                    |cmp-faq|
-
-==============================================================================
-Abstract                                                          *cmp-abstract*
-
-This is nvim-cmp's document.
-
-1. This help file uses the type definition notation like `{lsp,cmp,vim}.*`
-  - You can find it in `../lua/cmp/types/init.lua`.
-2. Advanced configuration is described in the wiki.
-  - https://github.com/hrsh7th/nvim-cmp/wiki
-
-==============================================================================
-Concept                                                            *cmp-concept*
-
-- Full support for LSP completion related capabilities
-- Powerful customization abilities via Lua functions
-- Smart handling of key mappings
-- No flicker
-
-==============================================================================
-Usage                                                                *cmp-usage*
-
-A recommended configuration can be found below.
-  NOTE:
-    1. You must provide a `snippet.expand` function.
-    2. `cmp.setup.cmdline` won't work if you use the `native` completion menu.
-    3. You can disable the `default` options by specifying `cmp.config.disable` value.
->vim
-  call plug#begin(s:plug_dir)
-  Plug 'neovim/nvim-lspconfig'
-  Plug 'hrsh7th/cmp-nvim-lsp'
-  Plug 'hrsh7th/cmp-buffer'
-  Plug 'hrsh7th/cmp-path'
-  Plug 'hrsh7th/cmp-cmdline'
-  Plug 'hrsh7th/nvim-cmp'
-
-  " For vsnip users.
-  Plug 'hrsh7th/cmp-vsnip'
-  Plug 'hrsh7th/vim-vsnip'
-
-  " For luasnip users.
-  " Plug 'L3MON4D3/LuaSnip'
-  " Plug 'saadparwaiz1/cmp_luasnip'
-
-  " For snippy users.
-  " Plug 'dcampos/nvim-snippy'
-  " Plug 'dcampos/cmp-snippy'
-
-  " For ultisnips users.
-  " Plug 'SirVer/ultisnips'
-  " Plug 'quangnguyen30192/cmp-nvim-ultisnips'
-
-  call plug#end()
-
-  set completeopt=menu,menuone,noselect
-
-  lua <<EOF
-    local cmp = require'cmp'
-
-    -- Global setup.
-    cmp.setup({
-      snippet = {
-        expand = function(args)
-          vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
-          -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
-          -- require'snippy'.expand_snippet(args.body) -- For `snippy` users.
-          -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
-          -- vim.snippet.expand(args.body) -- For native neovim snippets (Neovim v0.10+)
-        end,
-      },
-      window = {
-        -- completion = cmp.config.window.bordered(),
-        -- documentation = cmp.config.window.bordered(),
-      },
-      mapping = cmp.mapping.preset.insert({
-        ['<C-d>'] = cmp.mapping.scroll_docs(-4),
-        ['<C-f>'] = cmp.mapping.scroll_docs(4),
-        ['<C-Space>'] = cmp.mapping.complete(),
-        ['<CR>'] = cmp.mapping.confirm({ select = true }),
-      }),
-      sources = cmp.config.sources({
-        { name = 'nvim_lsp' },
-        { name = 'vsnip' }, -- For vsnip users.
-        -- { name = 'luasnip' }, -- For luasnip users.
-        -- { name = 'snippy' }, -- For snippy users.
-        -- { name = 'ultisnips' }, -- For ultisnips users.
-      }, {
-        { name = 'buffer' },
-      })
-    })
-
-    -- `/` cmdline setup.
-    cmp.setup.cmdline('/', {
-      mapping = cmp.mapping.preset.cmdline(),
-      sources = {
-        { name = 'buffer' }
-      }
-    })
-
-    -- `:` cmdline setup.
-    cmp.setup.cmdline(':', {
-      mapping = cmp.mapping.preset.cmdline(),
-      sources = cmp.config.sources({
-        { name = 'path' }
-      }, {
-        { name = 'cmdline' }
-      }),
-      matching = { disallow_symbol_nonprefix_matching = false }
-    })
-
-    -- Setup lspconfig.
-    local capabilities = require('cmp_nvim_lsp').default_capabilities()
-    require('lspconfig')[%YOUR_LSP_SERVER%].setup {
-      capabilities = capabilities
-    }
-  EOF
-<
-==============================================================================
-Function                                                          *cmp-function*
-
-NOTE: `<Cmd>lua require('cmp').complete()<CR>` can be used to call these functions in a mapping.
-
-*cmp.setup* (config: cmp.ConfigSchema)
-  Setup global configuration. See configuration options.
-
-*cmp.setup.filetype* (filetype: string, config: cmp.ConfigSchema)
-  Setup filetype-specific configuration.
-
-*cmp.setup.buffer* (config: cmp.ConfigSchema)
-  Setup configuration for the current buffer.
-
-*cmp.setup.cmdline* (cmdtype: string, config: cmp.ConfigSchema)
-  Setup cmdline configuration for the specific type of command.
-  See |getcmdtype()|.
-  NOTE: nvim-cmp does not support the `=` command type.
-
-*cmp.visible* ()
-  Return a boolean showing whether the completion menu is visible or not.
-
-*cmp.visible_docs* ()
-  Return a boolean showing whether the docs window is visible or not.
-
-*cmp.get_entries* ()
-  Return all current entries.
-
-*cmp.get_selected_entry* ()
-  Return currently selected entry (including preselected).
-
-*cmp.get_active_entry* ()
-  Return currently selected entry (excluding preselected).
-
-*cmp.close* ()
-  Close the completion menu.
-
-*cmp.abort* ()
-  Closes the completion menu and restore the current line to the state before the current completion was started.
-
-*cmp.select_next_item* (option: { behavior = cmp.SelectBehavior, count = 1 })
-  Select the next item. Set count with large number to select pagedown.
-  `behavior` can be one of:
-  - `cmp.SelectBehavior.Insert`: Inserts the text at cursor.
-  - `cmp.SelectBehavior.Select`: Only selects the text, potentially adds ghost_text at
-    cursor.
->lua
-  cmp.setup {
-    mapping = {
-      ["<C-j>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Select }),
-    }
-  }
-<
-
-*cmp.select_prev_item* (option: { behavior = cmp.SelectBehavior, count = 1 })
-  Select the previous item. Set count with large number to select pageup.
-  `behavior` can be one of:
-  - `cmp.SelectBehavior.Insert`: Inserts the text at cursor.
-  - `cmp.SelectBehavior.Select`: Only selects the text, potentially adds ghost_text at
-    cursor.
->lua
-  cmp.setup {
-    mapping = {
-      ["<C-k>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Select }),
-    }
-  }
-<
-*cmp.open_docs* ()
-  Open docs view.
-
-*cmp.close_docs* ()
-  Close docs view.
-
-*cmp.scroll_docs* (delta: number)
-  Scroll the documentation window if visible.
-
-*cmp.complete* (option: { reason = cmp.ContextReason, config = cmp.ConfigSchema })
-  Invoke completion.
-
-  The following configuration defines a key mapping to show completion only for vsnip snippets.
->lua
-  cmp.setup {
-    mapping = {
-      ['<C-s>'] = cmp.mapping.complete({
-        config = {
-          sources = {
-            { name = 'vsnip' }
-          }
-        }
-      })
-    }
-  }
-< >vim
-  inoremap <C-S> <Cmd>lua require('cmp').complete({ config = { sources = { { name = 'vsnip' } } } })<CR>
-<
-  NOTE: `config` in that case means a temporary setting, but `config.mapping` remains permanent.
-
-*cmp.complete_common_string* ()
-  Complete common string (similar to shell completion behavior).
->lua
-  cmp.setup {
-    mapping = {
-      ['<C-l>'] = cmp.mapping(function(fallback)
-        if cmp.visible() then
-          return cmp.complete_common_string()
-        end
-        fallback()
-      end, { 'i', 'c' }),
-    }
-  }
-<
-*cmp.confirm* (option: cmp.ConfirmOption, callback: function)
-  Accepts the currently selected completion item.
-  If you didn't select any item and the option table contains `select = true`,
-  nvim-cmp will automatically select the first item.
-
-  You can control how the completion item is injected into
-  the file through the `behavior` option:
-
-  `behavior=cmp.ConfirmBehavior.Insert`: inserts the selected item and
-    moves adjacent text to the right (default).
-  `behavior=cmp.ConfirmBehavior.Replace`: replaces adjacent text with
-    the selected item.
->lua
-  cmp.setup {
-    mapping = {
-      ["<CR>"] = cmp.mapping.confirm({ select = true, behavior = cmp.ConfirmBehavior.Replace }),
-    }
-  }
-<
-*cmp.event:on* (%EVENT_NAME%, callback)
-  Subscribe to nvim-cmp's event. Events are listed below.
-
-  - `complete_done`: emit after current completion is done.
-  - `confirm_done`: emit after confirmation is done.
-  - `menu_opened`: emit after opening a new completion menu. Called with a table holding a key
-    named `window`, pointing to the completion menu implementation.
-  - `menu_closed`: emit after completion menu is closed. Called with a table holding a key
-    named `window`, pointing to the completion menu implementation.
-
-==============================================================================
-Mapping                                                            *cmp-mapping*
-
-Nvim-cmp's mapping mechanism is complex but flexible and user-friendly.
-
-You can specify a mapping function that receives a `fallback` function as an argument.
-The `fallback` function can be used to call an existing mapping.
-
-For example, typical pair-wise plugins automatically define mappings for `<CR>` and `(`.
-Nvim-cmp will overwrite it if you provide a mapping. To call the existing mapping,
-you would need to invoke the `fallback` function.
->lua
-  cmp.setup {
-    mapping = {
-      ['<CR>'] = function(fallback)
-        if cmp.visible() then
-          cmp.confirm()
-        else
-          fallback() -- If you use vim-endwise, this fallback will behave the same as vim-endwise.
-        end
-      end
-    }
-  }
-< >lua
-  cmp.setup {
-    mapping = {
-      ['<Tab>'] = function(fallback)
-        if cmp.visible() then
-          cmp.select_next_item()
-        else
-          fallback()
-        end
-      end
-    }
-  }
-<
-
-It is possible to specify the modes the mapping should be active in (`i` = insert mode, `c` = command mode, `s` = select mode):
->lua
-  cmp.setup {
-    mapping = {
-      ['<CR>'] = cmp.mapping(your_mapping_function, { 'i', 'c' })
-    }
-  }
-<
-You can also specify different mappings for different modes by passing a table:
->lua
-  cmp.setup {
-    mapping = {
-      ['<CR>'] = cmp.mapping({
-        i = your_mapping_function_a,
-        c = your_mapping_function_b,
-      })
-    }
-  }
-<
-There are also builtin mapping helper functions you can use:
-
-  *cmp.mapping.close* ()
-    Same as |cmp.close|.
-
-  *cmp.mapping.abort* ()
-    Same as |cmp.abort|.
-
-  *cmp.mapping.select_next_item* (option: { behavior = cmp.SelectBehavior, count = 1 })
-    Same as |cmp.select_next_item|.
-
-  *cmp.mapping.select_prev_item* (option: { behavior = cmp.SelectBehavior, count = 1 })
-    Same as |cmp.select_prev_item|.
-
-  *cmp.mapping.open_docs* ()
-    Same as |cmp.open_docs|.
-
-  *cmp.mapping.close_docs* ()
-    Same as |cmp.close_docs|.
-
-  *cmp.mapping.scroll_docs* (delta: number)
-    Same as |cmp.scroll_docs|.
-
-  *cmp.mapping.complete* (option: cmp.CompleteParams)
-    Same as |cmp.complete|.
-
-  *cmp.mapping.complete_common_string* ()
-    Same as |cmp.complete_common_string|.
-
-  *cmp.mapping.confirm* (option: cmp.ConfirmOption)
-    Same as |cmp.confirm|.
-
-Built-in mapping helpers are only available as a configuration option.
-If you want to call nvim-cmp features directly, please use |cmp-function| instead.
-
-
-
-==============================================================================
-Command                                                            *cmp-command*
-
-*CmpStatus*
-  Describes statuses and states of sources.
-  Sometimes `unknown` will be printed - this is expected.
-  For example, `cmp-nvim-lsp` registers itself on InsertEnter autocommand
-  so the status will be shown as `unknown` when running the command.
-
-
-
-==============================================================================
-Highlight                                                        *cmp-highlight*
-
-*CmpItemAbbr*
-  Highlight group for unmatched characters of each completion field.
-
-*CmpItemAbbrDeprecated*
-  Highlight group for unmatched characters of each deprecated completion field.
-
-*CmpItemAbbrMatch*
-  Highlight group for matched characters of each completion field. Matched characters
-  must form a substring of a field which share a starting position.
-
-*CmpItemAbbrMatchFuzzy*
-  Highlight group for fuzzy-matched characters of each completion field.
-
-*CmpItemKind*
-  Highlight group for the kind of the field.
-
-NOTE: `kind` is a symbol after each completion option.
-
-*CmpItemKind%KIND_NAME%*
-  Highlight group for the kind of the field for a specific `lsp.CompletionItemKind`.
-  If you only want to overwrite the `method` kind's highlight group, you can do this:
->vim
-    highlight CmpItemKindMethod guibg=NONE guifg=Orange
-<
-*CmpItemMenu*
-  The menu field's highlight group.
-
-==============================================================================
-FileType                                                          *cmp-filetype*
-
-*cmp_menu*
-  The completion menu buffer's filetype.
-
-*cmp_docs*
-  The documentation window buffer's filetype.
-
-==============================================================================
-Autocmd                                                            *cmp-autocmd*
-
-You can create custom autocommands for certain nvim-cmp events by defining
-autocommands for the User event with the following patterns:
-
-*CmpReady*
-  Invoked when nvim-cmp gets sourced from `plugin/cmp.lua`.
-
-==============================================================================
-Config                                                              *cmp-config*
-
-You can use the following options via `cmp.setup { ... }` .
-
-                                                            *cmp-config.enabled*
-enabled~
-  `boolean | fun(): boolean`
-  Toggles the plugin on and off.
-
-                                                *cmp-config.performance.debounce*
-performance.debounce~
-  `number`
-  Sets debounce time
-  This is the interval used to group up completions from different sources
-  for filtering and displaying.
-
-                                                *cmp-config.performance.throttle*
-performance.throttle~
-  `number`
-  Sets throttle time
-  This is used to delay filtering and displaying completions.
-
-                                        *cmp-config.performance.fetching_timeout*
-performance.fetching_timeout~
-    `number`
-    Sets the timeout of candidate fetching process.
-    The nvim-cmp will wait to display the most prioritized source.
-
-                                        *cmp-config.performance.confirm_resolve_timeout*
-performance.confirm_resolve_timeout~
-    `number`
-    Sets the timeout for resolving item before confirmation.
-
-                                            *cmp-config.performance.async_budget*
-performance.async_budget~
-    `number`
-    Maximum time (in ms) an async function is allowed to run during
-    one step of the event loop.
-
-                                        *cmp-config.performance.max_view_entries*
-performance.max_view_entries~
-    `number`
-    Maximum number of items to show in the entries list.
-
-                                                          *cmp-config.preselect*
-preselect~
-  `cmp.PreselectMode`
-
-  1. `cmp.PreselectMode.Item`
-    nvim-cmp will preselect the item that the source specified.
-  2. `cmp.PreselectMode.None`
-    nvim-cmp will not preselect any items.
-
-                                                            *cmp-config.mapping*
-mapping~
-  `table<string, fun(fallback: function)`
-  See |cmp-mapping| section.
-
-                                                     *cmp-config.snippet.expand*
-snippet.expand~
-  `fun(option: cmp.SnippetExpansionParams)`
-  The snippet expansion function. That's how nvim-cmp interacts with a
-  particular snippet engine.
-
-                                          *cmp-config.completion.keyword_length*
-completion.keyword_length~
-  `number`
-  The number of characters needed to trigger auto-completion.
-
-                                         *cmp-config.completion.keyword_pattern*
-completion.keyword_pattern~
-  `string`
-  The default keyword pattern.
-
-                                            *cmp-config.completion.autocomplete*
-completion.autocomplete~
-  `cmp.TriggerEvent[] | false`
-  The event to trigger autocompletion. If set to `false`, then completion is
-  only invoked manually (e.g. by calling `cmp.complete`).
-
-                                             *cmp-config.completion.completeopt*
-completion.completeopt~
-  `string`
-  Like vim's completeopt setting. See 'completeopt'.
-  In general, you don't need to change this.
-
-                                 *cmp-config.confirmation.get_commit_characters*
-confirmation.get_commit_characters~
-  `fun(commit_characters:string[]):string[]`
-  You can append or exclude commitCharacters via this configuration option
-  function. The commitCharacters are defined by the LSP spec.
-
-                                    *cmp-config.formatting.expandable_indicator*
-formatting.expandable_indicator~
-  `cmp.expandable_indicator`
-  Boolean to show the `~` expandable indicator in cmp's floating window.
-
-                                                  *cmp-config.formatting.fields*
-formatting.fields~
-  `cmp.ItemField[]`
-  An array of completion fields to specify their order.
-
-                                                  *cmp-config.formatting.format*
-formatting.format~
-  `fun(entry: cmp.Entry, vim_item: vim.CompletedItem): vim.CompletedItem`
-  The function used to customize the appearance of the completion menu. See
-  |complete-items|. This value can also be used to modify the `dup` property.
-  NOTE: The `vim.CompletedItem` can contain the special properties
-  `abbr_hl_group`, `kind_hl_group` and `menu_hl_group`.
-
-                                   *cmp-config.matching.disallow_fuzzy_matching*
-matching.disallow_fuzzy_matching~
-  `boolean`
-  Whether to allow fuzzy matching.
-
-                               *cmp-config.matching.disallow_fullfuzzy_matching*
-matching.disallow_fullfuzzy_matching~
-  `boolean`
-  Whether to allow full-fuzzy matching.
-
-                           *cmp-config.matching.disallow_partial_fuzzy_matching*
-matching.disallow_partial_fuzzy_matching~
-  `boolean`
-  Whether to allow fuzzy matching without prefix matching.
-                                 *cmp-config.matching.disallow_partial_matching*
-matching.disallow_partial_matching~
-  `boolean`
-  Whether to allow partial matching.
-
-                                *cmp-config.matching.disallow_prefix_unmatching*
-matching.disallow_prefix_unmatching~
-  `boolean`
-  Whether to allow prefix unmatching.
-
-                                cmp-config.matching.disallow_symbol_nonprefix_matching
-matching.disallow_symbol_nonprefix_matching
-  `boolean`
-  Whether to allow symbols in matches if the match is not a prefix match.
-
-                                            *cmp-config.sorting.priority_weight*
-sorting.priority_weight~
-  `number`
-  Each item's original priority (given by its corresponding source) will be
-  increased by `#sources - (source_index - 1)` and multiplied by `priority_weight`.
-  That is, the final priority is calculated by the following formula:
->lua
-  final_score = orig_score + ((#sources - (source_index - 1)) * sorting.priority_weight)
-<
-                                                *cmp-config.sorting.comparators*
-sorting.comparators~
-  `(fun(entry1: cmp.Entry, entry2: cmp.Entry): boolean | nil)[]`
-  The function to customize the sorting behavior.
-  You can use built-in comparators via `cmp.config.compare.*`.
-
-                                                            *cmp-config.sources*
-sources~
-  `cmp.SourceConfig[]`
-  List of the sources and their configurations to use.
-  The order of the sources determines their order in the completion results.
-
-                                                    *cmp-config.sources[n].name*
-sources[n].name~
-  `string`
-  The name of the source.
-
-                                                  *cmp-config.sources[n].option*
-sources[n].option~
-  `table`
-  Any specific options defined by the source itself.
-
-                                          *cmp-config.sources[n].keyword_length*
-sources[n].keyword_length~
-  `number`
-  The source-specific keyword length to trigger auto completion.
-
-                                         *cmp-config.sources[n].keyword_pattern*
-sources[n].keyword_pattern~
-  `string`
-  The source-specific keyword pattern.
-
-                                      *cmp-config.sources[n].trigger_characters*
-sources[n].trigger_characters~
-  `string[]`
-  A source-specific keyword pattern.
-
-                                                *cmp-config.sources[n].priority*
-sources[n].priority~
-  `number`
-  The source-specific priority value.
-
-                                          *cmp-config.sources[n].max_item_count*
-sources[n].max_item_count~
-  `number`
-  The source-specific maximum item count option
-  Note: This is applied before sorting, so items that aren't well-matched may be selected.
-
-                                             *cmp-config.sources[n].group_index*
-sources[n].group_index~
-  `number`
-  The source group index.
-
-  For instance, you can set the `buffer`'s source `group_index` to a larger number
-  if you don't want to see `buffer` source items while `nvim-lsp` source is available:
->lua
-    cmp.setup {
-      sources = {
-        { name = 'nvim_lsp', group_index = 1 },
-        { name = 'buffer', group_index = 2 },
-      }
-    }
-<
-  You can also achieve this by using the built-in configuration helper like this:
->lua
-    cmp.setup {
-      sources = cmp.config.sources({
-        { name = 'nvim_lsp' },
-      }, {
-        { name = 'buffer' },
-      })
-    }
-<
-
-                                             *cmp-config.sources[n].entry_filter*
-sources[n].entry_filter~
-  `function`
-  A source-specific entry filter, with the following function signature:
->
-  function(entry: cmp.Entry, ctx: cmp.Context): boolean
-<
-
-  Returning `true` will keep the entry, while returning `false` will remove it.
-
-  This can be used to hide certain entries from a given source. For instance, you
-  could hide all entries with kind `Text` from the `nvim_lsp` filter using the
-  following source definition:
->lua
-  {
-    name = 'nvim_lsp',
-    entry_filter = function(entry, ctx)
-      return require('cmp.types').lsp.CompletionItemKind[entry:get_kind()] ~= 'Text'
-    end
-  }
-<
-  Using the `ctx` parameter, you can further customize the behaviour of the
-  source.
-
-                                                               *cmp-config.view*
-view~
-  `{ docs: cmp.DocsViewConfig }`
-  `{ entries: cmp.EntriesViewConfig|string }`
-  The view class used to customize nvim-cmp's appearance.
-  Currently available configuration options are:
-
-                                                *cmp-config.view.docs.auto_open*
-view.docs.auto_open~
-  `boolean`
-
-  Specify whether to show the docs_view when selecting an item.
-
-                                                *cmp-config.view.entries.selection_order*
-view.entries.selection_order~
-  `string`
-
-  Specify whether to select the option in the pmenu that is at
-  the top (`top_down`) or nearest to the cursor (`near_cursor`).
-  Useful if pmenu is above cursor and you want to change default
-  selection direction. Custom view only. `top_down` by default.
-
-                                                 *cmp-config.view.entries.follow_cursor*
-view.entries.follow_cursor~
-  `boolean`
-
-  Specify whether the pmenu should follow the current position of the cursor
-  as the user types. Custom view only. `false` by default.
-
-                           *cmp-config.window.{completion,documentation}.border*
-window.{completion,documentation}.border~
-  `string | string[] | nil`
-  Border characters used for the completion popup menu when |experimental.native_menu| is disabled.
-  See |nvim_open_win|.
-
-                     *cmp-config.window.{completion,documentation}.winhighlight*
-window.{completion,documentation}.winhighlight~
-  `string | cmp.WinhighlightConfig`
-  Specify the window's winhighlight option.
-  See |nvim_open_win|.
-
-                     *cmp-config.window.{completion,documentation}.winblend*
-window.{completion,documentation}.winblend~
-  `string | cmp.WinhighlightConfig`
-  Specify the window's winblend option.
-  See |nvim_open_win|.
-
-                           *cmp-config.window.{completion,documentation}.zindex*
-window.{completion,documentation}.zindex~
-  `number`
-  The completion window's zindex.
-  See |nvim_open_win|.
-
-                        *cmp-config.window.{completion,documentation}.scrolloff*
-window.completion.scrolloff~
-  `number`
-  Specify the window's scrolloff option.
-  See |'scrolloff'|.
-
-                                       *cmp-config.window.completion.col_offset*
-window.completion.col_offset~
-  `number`
-  Offsets the completion window relative to the cursor.
-
-                                     *cmp-config.window.completion.side_padding*
-window.completion.side_padding~
-  `number`
-  The amount of padding to add on the completion window's sides
-
-                                     *cmp-config.window.completion.scrollbar*
-window.completion.scrollbar~
-  `boolean`
-  Whether the scrollbar should be enabled if there are more items that fit
-
-                                     *cmp-config.window.documentation.max_width*
-window.documentation.max_width~
-  `number`
-  The documentation window's max width, can be set to 0 to use all available
-  space.
-
-                                    *cmp-config.window.documentation.max_height*
-window.documentation.max_height~
-  `number`
-  The documentation window's max height, can be set to 0 to use all available
-  space.
-
-                                            *cmp-config.experimental.ghost_text*
-experimental.ghost_text~
-  `boolean | { hl_group = string }`
-  Whether to enable the ghost_text feature.
-
-==============================================================================
-Config Helper                                                *cmp-config-helper*
-
-You can use the following configuration helpers:
-
-cmp.config.compare~
-
-  TBD
-
-cmp.config.context~
-
-  The `cmp.config.context` can be used for context-aware completion toggling.
->lua
-    cmp.setup {
-      enabled = function()
-        -- disable completion if the cursor is `Comment` syntax group.
-        return not cmp.config.context.in_syntax_group('Comment')
-      end
-    }
-<
-  *cmp.config.context.in_syntax_group* (group)
-    You can specify the vim's built-in syntax group.
-    If you use tree-sitter, you should use `cmp.config.context.in_treesitter_capture` instead.
-
-  *cmp.config.context.in_treesitter_capture* (capture)
-    You can specify the treesitter capture name.
-    If you don't use the `nvim-treesitter` plugin, this helper will not work correctly.
-
-cmp.config.mapping~
-
-  See |cmp-mapping|.
-
-cmp.config.sources~
-
-  *cmp.config.sources* (...sources)
-    You can specify multiple source arrays. The sources are grouped in the
-    order you specify, and the groups are displayed as a fallback, like chain
-    completion.
->lua
-    cmp.setup {
-      sources = cmp.config.sources({
-        { name = 'nvim_lsp' },
-      }, {
-        { name = 'buffer' },
-      })
-    }
-<
-cmp.config.window~
-
-  *cmp.config.window.bordered* (option)
-    Make the completion window `bordered`.
-    The option is described in `cmp.ConfigSchema`.
->lua
-    cmp.setup {
-      window = {
-        completion = cmp.config.window.bordered(),
-        documentation = cmp.config.window.bordered(),
-      }
-    }
-<
-==============================================================================
-Develop                                                            *cmp-develop*
-
-Creating a custom source~
-
-NOTE:
-  1. The `complete` method is required. Others can be omitted.
-  2. The `callback` function must always be called.
-  3. You can use only `require('cmp')` in custom source.
-  4. If the LSP spec was changed, nvim-cmp may implement it without any announcement (potentially introducing breaking changes).
-  5. You should read ./lua/cmp/types and https://microsoft.github.io/language-server-protocol/specifications/specification-current.
-  6. Please add your source to the list of sources in the Wiki (https://github.com/hrsh7th/nvim-cmp/wiki/List-of-sources)
-  and if you publish it on GitHub, add the `nvim-cmp` topic so users can find it more easily.
-
-Here is an example on how to create a custom source:
->lua
-  local source = {}
-
-  ---Return whether this source is available in the current context or not (optional).
-  ---@return boolean
-  function source:is_available()
-    return true
-  end
-
-  ---Return the debug name of this source (optional).
-  ---@return string
-  function source:get_debug_name()
-    return 'debug name'
-  end
-
-  ---Return LSP's PositionEncodingKind.
-  ---@NOTE: If this method is omitted, the default value will be `utf-16`.
-  ---@return lsp.PositionEncodingKind
-  function source:get_position_encoding_kind()
-    return 'utf-16'
-  end
-
-  ---Return the keyword pattern for triggering completion (optional).
-  ---If this is omitted, nvim-cmp will use a default keyword pattern. See |cmp-config.completion.keyword_pattern|.
-  ---@return string
-  function source:get_keyword_pattern()
-    return [[\k\+]]
-  end
-
-  ---Return trigger characters for triggering completion (optional).
-  function source:get_trigger_characters()
-    return { '.' }
-  end
-
-  ---Invoke completion (required).
-  ---@param params cmp.SourceCompletionApiParams
-  ---@param callback fun(response: lsp.CompletionResponse|nil)
-  function source:complete(params, callback)
-    callback({
-      { label = 'January' },
-      { label = 'February' },
-      { label = 'March' },
-      { label = 'April' },
-      { label = 'May' },
-      { label = 'June' },
-      { label = 'July' },
-      { label = 'August' },
-      { label = 'September' },
-      { label = 'October' },
-      { label = 'November' },
-      { label = 'December' },
-    })
-  end
-
-  ---Resolve completion item (optional). This is called right before the completion is about to be displayed.
-  ---Useful for setting the text shown in the documentation window (`completion_item.documentation`).
-  ---@param completion_item lsp.CompletionItem
-  ---@param callback fun(completion_item: lsp.CompletionItem|nil)
-  function source:resolve(completion_item, callback)
-    callback(completion_item)
-  end
-
-  ---Executed after the item was selected.
-  ---@param completion_item lsp.CompletionItem
-  ---@param callback fun(completion_item: lsp.CompletionItem|nil)
-  function source:execute(completion_item, callback)
-    callback(completion_item)
-  end
-
-  ---Register your source to nvim-cmp.
-  require('cmp').register_source('month', source)
-<
-==============================================================================
-FAQ                                                                    *cmp-faq*
-
-Why does cmp automatically select a particular item? ~
-How to disable the preselect feature? ~
-
-  Nvim-cmp respects the LSP (Language Server Protocol) specification.
-  The LSP spec defines the `preselect` feature for completion.
-
-  You can disable the `preselect` feature like this:
->lua
-  cmp.setup {
-    preselect = cmp.PreselectMode.None
-  }
-<
-How to disable only specific language-server's completion?~
-
-  You can disable `completionProvider` in lspconfig configuration.
->lua
-  lspconfig[%SERVER_NAME%].setup {
-    on_attach = function(client)
-      client.server_capabilities.completionProvider = false
-    end
-  }
-<
-
-
-How to disable commitCharacters?~
-
-  You can disable the commitCharacters feature (which is defined in LSP spec):
->lua
-  cmp.setup {
-    confirmation = {
-      get_commit_characters = function(commit_characters)
-        return {}
-      end
-    }
-  }
-<
-
-How to disable automatic display of docs view?~
-
-  You can add the `view.docs.auto_open = false` for configuration.
->lua
-  cmp.setup {
-    ...
-    view = {
-      docs = {
-        auto_open = false
-      }
-    }
-    ...
-  }
-<
-
-  additionally, if you want to open/close docs view via your key mapping, you
-  can define keymapping as the following.
->lua
-  cmp.setup {
-    ...
-    mapping = {
-      ['<C-g>'] = function()
-        if cmp.visible_docs() then
-          cmp.close_docs()
-        else
-          cmp.open_docs()
-        end
-      end
-    }
-    ...
-  }
-<
-
-How to disable auto-completion?~
-How to use nvim-cmp as omnifunc?~
-
-  You can disable auto-completion like this:
->lua
-  cmp.setup {
-    ...
-    completion = {
-      autocomplete = false
-    }
-    ...
-  }
-<
-  Then you will need to invoke completion manually.
->vim
-  inoremap <C-x><C-o> <Cmd>lua require('cmp').complete()<CR>
-<
-
-How to disable nvim-cmp for a specific buffer?~
-How to setup nvim-cmp for a specific buffer?~
-
-  You can setup buffer-specific configuration like this:
->lua
-  cmp.setup.filetype({ 'markdown', 'help' }, {
-    sources = {
-      { name = 'path' },
-      { name = 'buffer' },
-    }
-  })
-<
-
-How to disable the documentation window?~
-
-  Simply use the following config:
->lua
-  cmp.setup.filetype({ 'markdown', 'help' }, {
-    window = {
-      documentation = cmp.config.disable
-    }
-  })
-<
-
-I'm using clangd. The menu items are mis-indented.~
-
-  It's caused by clangd. You can specify `--header-insertion-decorators` for
-  clangd's command-line arguments. See #999.
-
-
-How to integrate with copilot.vim?~
-
-  Copilot.vim and nvim-cmp both have a `key-mapping fallback` mechanism.
-  Therefore, you should manage those plugins by yourself.
-
-  Fortunately, the copilot.vim has a feature that disables the fallback mechanism.
->vim
-  let g:copilot_no_tab_map = v:true
-  imap <expr> <Plug>(vimrc:copilot-dummy-map) copilot#Accept("\<Tab>")
-<
-  You can manage copilot.vim's accept feature inside nvim-cmp's key-mapping function:
->lua
-  cmp.setup {
-    mapping = {
-      ['<C-g>'] = cmp.mapping(function(fallback)
-        vim.api.nvim_feedkeys(vim.fn['copilot#Accept'](vim.api.nvim_replace_termcodes('<Tab>', true, true, true)), 'n', true)
-      end)
-    },
-    experimental = {
-      ghost_text = false -- this feature conflict with copilot.vim's preview.
-    }
-  }
-<
-nvim-cmp does not work as expected.~
-
-  There are some known issues. Please check the following.
-
-  - nvim-cmp does not work with `set paste` option.
-  - Command line mode key mapping is unified regardless of `:`, `/`, `?`. Therefore, it is impossible to apply the mapping only to `:`.
-
-How to customize the menu appearance?~
-
-  Have a look at the wiki (https://github.com/hrsh7th/nvim-cmp/wiki).
-
-==============================================================================
- vim:tw=78:ts=2:et:ft=help:norl:
diff --git a/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/nvim-cmp/scm-1/nvim-cmp-scm-1.rockspec b/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/nvim-cmp/scm-1/nvim-cmp-scm-1.rockspec
deleted file mode 100644
index 3b6e93ea..00000000
--- a/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/nvim-cmp/scm-1/nvim-cmp-scm-1.rockspec
+++ /dev/null
@@ -1,31 +0,0 @@
-local MODREV, SPECREV = 'scm', '-1'
-rockspec_format = '3.0'
-package = 'nvim-cmp'
-version = MODREV .. SPECREV
-
-description = {
-  summary = 'A completion plugin for neovim',
-  labels = { 'neovim' },
-  detailed = [[
-    A completion engine plugin for neovim written in Lua. Completion sources are installed from external repositories and "sourced".
-   ]],
-  homepage = 'https://github.com/hrsh7th/nvim-cmp',
-  license = 'MIT',
-}
-
-dependencies = {
-  'lua >= 5.1, < 5.4',
-}
-
-source = {
-  url = 'git://github.com/hrsh7th/nvim-cmp',
-}
-
-build = {
-  type = 'builtin',
-  copy_directories = {
-    'autoload',
-    'plugin',
-    'doc'
-  }
-}
diff --git a/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/nvim-cmp/scm-1/plugin/cmp.lua b/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/nvim-cmp/scm-1/plugin/cmp.lua
deleted file mode 100644
index 611b5c96..00000000
--- a/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/nvim-cmp/scm-1/plugin/cmp.lua
+++ /dev/null
@@ -1,61 +0,0 @@
-if vim.g.loaded_cmp then
-  return
-end
-vim.g.loaded_cmp = true
-
-if not vim.api.nvim_create_autocmd then
-  return print('[nvim-cmp] Your nvim does not has `nvim_create_autocmd` function. Please update to latest nvim.')
-end
-
-local api = require('cmp.utils.api')
-local types = require('cmp.types')
-local highlight = require('cmp.utils.highlight')
-local autocmd = require('cmp.utils.autocmd')
-
-vim.api.nvim_set_hl(0, 'CmpItemAbbr', { link = 'CmpItemAbbrDefault', default = true })
-vim.api.nvim_set_hl(0, 'CmpItemAbbrDeprecated', { link = 'CmpItemAbbrDeprecatedDefault', default = true })
-vim.api.nvim_set_hl(0, 'CmpItemAbbrMatch', { link = 'CmpItemAbbrMatchDefault', default = true })
-vim.api.nvim_set_hl(0, 'CmpItemAbbrMatchFuzzy', { link = 'CmpItemAbbrMatchFuzzyDefault', default = true })
-vim.api.nvim_set_hl(0, 'CmpItemKind', { link = 'CmpItemKindDefault', default = true })
-vim.api.nvim_set_hl(0, 'CmpItemMenu', { link = 'CmpItemMenuDefault', default = true })
-for kind in pairs(types.lsp.CompletionItemKind) do
-  if type(kind) == 'string' then
-    local name = ('CmpItemKind%s'):format(kind)
-    vim.api.nvim_set_hl(0, name, { link = ('%sDefault'):format(name), default = true })
-  end
-end
-
-autocmd.subscribe({ 'ColorScheme', 'UIEnter' }, function()
-  highlight.inherit('CmpItemAbbrDefault', 'Pmenu', { bg = 'NONE', default = false })
-  highlight.inherit('CmpItemAbbrDeprecatedDefault', 'Comment', { bg = 'NONE', default = false })
-  highlight.inherit('CmpItemAbbrMatchDefault', 'Pmenu', { bg = 'NONE', default = false })
-  highlight.inherit('CmpItemAbbrMatchFuzzyDefault', 'Pmenu', { bg = 'NONE', default = false })
-  highlight.inherit('CmpItemKindDefault', 'Special', { bg = 'NONE', default = false })
-  highlight.inherit('CmpItemMenuDefault', 'Pmenu', { bg = 'NONE', default = false })
-  for name in pairs(types.lsp.CompletionItemKind) do
-    if type(name) == 'string' then
-      vim.api.nvim_set_hl(0, ('CmpItemKind%sDefault'):format(name), { link = 'CmpItemKind', default = false })
-    end
-  end
-end)
-autocmd.emit('ColorScheme')
-
-if vim.on_key then
-  local control_c_termcode = vim.api.nvim_replace_termcodes('<C-c>', true, true, true)
-  vim.on_key(function(keys)
-    if keys == control_c_termcode then
-      vim.schedule(function()
-        if not api.is_suitable_mode() then
-          autocmd.emit('InsertLeave')
-        end
-      end)
-    end
-  end, vim.api.nvim_create_namespace('cmp.plugin'))
-end
-
-
-vim.api.nvim_create_user_command('CmpStatus', function()
-  require('cmp').status()
-end, { desc = 'Check status of cmp sources' })
-
-vim.cmd([[doautocmd <nomodeline> User CmpReady]])
diff --git a/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/nvim-cmp/scm-1/rock_manifest b/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/nvim-cmp/scm-1/rock_manifest
deleted file mode 100644
index b573aad4..00000000
--- a/config/neovim/store/lazy-plugins/nvim-cmp/nvim-cmp-scm-1-unstable-2024-05-17-rocks/nvim-cmp/scm-1/rock_manifest
+++ /dev/null
@@ -1,80 +0,0 @@
-rock_manifest = {
-   autoload = {
-      ["cmp.vim"] = "3486f63ca3381e0b6bf094569f028665"
-   },
-   doc = {
-      ["cmp.txt"] = "0ed9ef42d5a72bfd6f805b64cd00276a"
-   },
-   lua = {
-      cmp = {
-         config = {
-            ["compare.lua"] = "a3570d9e528aba104a6ba6bd7f510da8",
-            ["context.lua"] = "28e9f4e9575f6183d1d05bbee4c4408c",
-            ["default.lua"] = "2f2648b4528925dc6a98f0fa4d93c6fc",
-            ["mapping.lua"] = "39b88ca1fa06ced8522ec0ee27cb24f2",
-            ["sources.lua"] = "81bb51dbe8997bfabd46541a394b4b41",
-            ["window.lua"] = "ae25fe313122f0e90b651c5e9d7dfd2e"
-         },
-         ["config.lua"] = "3a196d30b4572b8935ea4e879f900f59",
-         ["context.lua"] = "aa01e370d568a387e98389103e3e01df",
-         ["context_spec.lua"] = "d5b2fb143dd2efaee3f71bfe1bdc31a9",
-         ["core.lua"] = "0d7de2518b5be40093c777416bb36af1",
-         ["core_spec.lua"] = "edbefcd3d75e48e9d7bc4326f100a864",
-         ["entry.lua"] = "6bc6aba58cea17879cd2ccdffee61631",
-         ["entry_spec.lua"] = "ca2aff02436ad84ca62d3df331173f01",
-         ["init.lua"] = "dd38eea91cabba39091ce75117f3dda7",
-         ["matcher.lua"] = "55af0d4c7ce03827a3dbda8715a1b472",
-         ["matcher_spec.lua"] = "59da9197d47615ada5bf93011766356c",
-         ["source.lua"] = "60cc28eea79e72914142fe5dc5ad95d1",
-         ["source_spec.lua"] = "2b54677be2c92d7c3984783140b7018c",
-         types = {
-            ["cmp.lua"] = "174d92640f57fb2f3c0f2c62eb5f8654",
-            ["init.lua"] = "d372a58d9966fbc24e7ccd3d6c30a834",
-            ["lsp.lua"] = "401502e8b85568aee57584948953feb5",
-            ["lsp_spec.lua"] = "72e9da2b231e4716ac39d0759c387b44",
-            ["vim.lua"] = "a6796b027eb76f5d1cce7fa8172eabea"
-         },
-         utils = {
-            ["api.lua"] = "53067718473650f4d109780a1a7bcdc6",
-            ["api_spec.lua"] = "89fe537ce824cad191576272d8cdc47a",
-            ["async.lua"] = "2b968476962ba1c22a86a5392b62da9f",
-            ["async_spec.lua"] = "679338ab70a4c1ea72d7173e77143b68",
-            ["autocmd.lua"] = "322672f88beaeec084dbcd4086a78b8c",
-            ["binary.lua"] = "385a0844080b9d281a2ea0a254e09ddd",
-            ["binary_spec.lua"] = "cb428e4eded68b6bf27c2dd778cba44c",
-            ["buffer.lua"] = "0d72e16d90fecb8dbed6843d4ce46553",
-            ["cache.lua"] = "622af76c4c7bf212b9fd6f2c6c832ddd",
-            ["char.lua"] = "723a8066d2e67d40034ffce692250a58",
-            ["debug.lua"] = "c87003d9480670c22d73a1ba670e8c89",
-            ["event.lua"] = "38b59f97402a0c71ac21fb1408536c0d",
-            ["feedkeys.lua"] = "abbd5d1828baec177ffbc9a1c47ce7c5",
-            ["feedkeys_spec.lua"] = "76b9acca3b02ef4163ae070b9fd78ed9",
-            ["highlight.lua"] = "f9bf48596410a2105e7e1f9214ff3a33",
-            ["keymap.lua"] = "791262dc36492c6daa8a485c8c855f28",
-            ["keymap_spec.lua"] = "6cd866f56f97a1d5ed70fa8dd20c6d53",
-            ["misc.lua"] = "4a5ef5ee10bf1dd5ada4b4cd75c840c1",
-            ["misc_spec.lua"] = "691adf08c16f1312976594986340dab4",
-            ["options.lua"] = "b076c4f8f9c915f6334944ec9749fdb0",
-            ["pattern.lua"] = "e77acfc76798494a14c6e62472a2ef7b",
-            ["snippet.lua"] = "de00ee60d79f76eb7d42defb969e1eb8",
-            ["spec.lua"] = "484dcd49b1a4cfb8fc195f16b2dc38c1",
-            ["str.lua"] = "075a6cbb4683b4b2bd52ceeb3af96755",
-            ["str_spec.lua"] = "5b17025edaa3a49892951521da0bc9c4",
-            ["window.lua"] = "8b90f3cbc1992529e7326cc5ec109b47"
-         },
-         view = {
-            ["custom_entries_view.lua"] = "7011cd4c8a63f645c1e8bab3ca30d293",
-            ["docs_view.lua"] = "527e58b879a27b67382048808b1c599b",
-            ["ghost_text_view.lua"] = "7cc83940d6b631caf1e9643faf647a0a",
-            ["native_entries_view.lua"] = "fbf5f842464ee3e399f3c7825bb2604b",
-            ["wildmenu_entries_view.lua"] = "002776dbd93c238824d042a1a1ef41b6"
-         },
-         ["view.lua"] = "4604db1f3975e50e724fa14b76ffc932",
-         ["vim_source.lua"] = "205a75409f6ae2debad0bf96e7041466"
-      }
-   },
-   ["nvim-cmp-scm-1.rockspec"] = "92079ac860d2bbb56eb8dc343423d1ac",
-   plugin = {
-      ["cmp.lua"] = "070df415c09de0e23bb521a820f1614d"
-   }
-}
diff --git a/config/neovim/store/lazy-plugins/nvim-cmp/rock_manifest b/config/neovim/store/lazy-plugins/nvim-cmp/rock_manifest
index b573aad4..1f1df68c 100644
--- a/config/neovim/store/lazy-plugins/nvim-cmp/rock_manifest
+++ b/config/neovim/store/lazy-plugins/nvim-cmp/rock_manifest
@@ -65,7 +65,7 @@ rock_manifest = {
          view = {
             ["custom_entries_view.lua"] = "7011cd4c8a63f645c1e8bab3ca30d293",
             ["docs_view.lua"] = "527e58b879a27b67382048808b1c599b",
-            ["ghost_text_view.lua"] = "7cc83940d6b631caf1e9643faf647a0a",
+            ["ghost_text_view.lua"] = "0447ab52f6f0d315fac966aae10fbf92",
             ["native_entries_view.lua"] = "fbf5f842464ee3e399f3c7825bb2604b",
             ["wildmenu_entries_view.lua"] = "002776dbd93c238824d042a1a1ef41b6"
          },
diff --git a/config/neovim/store/lazy-plugins/nvim-lint/README.md b/config/neovim/store/lazy-plugins/nvim-lint/README.md
index e10ecedf..d671dc2b 100644
--- a/config/neovim/store/lazy-plugins/nvim-lint/README.md
+++ b/config/neovim/store/lazy-plugins/nvim-lint/README.md
@@ -128,6 +128,7 @@ Other dedicated linters that are built-in are:
 | [Flake8][13]                           | `flake8`               |
 | [flawfinder][35]                       | `flawfinder`           |
 | [gdlint (gdtoolkit)][gdlint]           | `gdlint`               |
+| [GHDL][ghdl]                           | `ghdl`                 |
 | [gitlint][gitlint]                     | `gitlint`              |
 | [glslc][glslc]                         | `glslc`                |
 | [Golangci-lint][16]                    | `golangcilint`         |
@@ -165,6 +166,7 @@ Other dedicated linters that are built-in are:
 | [ponyc][ponyc]                         | `pony`                 |
 | [prisma-lint][prisma-lint]             | `prisma-lint`          |
 | [proselint][proselint]                 | `proselint`            |
+| [protolint][protolint]                 | `protolint`            |
 | [psalm][psalm]                         | `psalm`                |
 | [puppet-lint][puppet-lint]             | `puppet-lint`          |
 | [pycodestyle][pcs-docs]                | `pycodestyle`          |
@@ -449,6 +451,7 @@ busted tests/
 [yamllint]: https://github.com/adrienverge/yamllint
 [cpplint]: https://github.com/cpplint/cpplint
 [proselint]: https://github.com/amperser/proselint
+[protolint]: https://github.com/yoheimuta/protolint
 [cmakelint]: https://github.com/cmake-lint/cmake-lint
 [rstcheck]: https://github.com/myint/rstcheck
 [rstlint]: https://github.com/twolfson/restructuredtext-lint
@@ -461,6 +464,7 @@ busted tests/
 [psalm]: https://psalm.dev/
 [lacheck]: https://www.ctan.org/tex-archive/support/lacheck
 [credo]: https://github.com/rrrene/credo
+[ghdl]: https://github.com/ghdl/ghdl
 [glslc]: https://github.com/google/shaderc
 [rubocop]: https://github.com/rubocop/rubocop
 [dxc]: https://github.com/microsoft/DirectXShaderCompiler
diff --git a/config/neovim/store/lazy-plugins/nvim-lint/lua/lint/linters/codespell.lua b/config/neovim/store/lazy-plugins/nvim-lint/lua/lint/linters/codespell.lua
index b64f7143..08fd873d 100644
--- a/config/neovim/store/lazy-plugins/nvim-lint/lua/lint/linters/codespell.lua
+++ b/config/neovim/store/lazy-plugins/nvim-lint/lua/lint/linters/codespell.lua
@@ -1,11 +1,15 @@
+-- stdout output in the form "63: resourcs ==> resources, resource"
+local pattern = "(%d+): (.*)"
+local groups = { "lnum", "message" }
+local severities = nil -- none provided
 
 return {
   cmd = 'codespell',
-  stdin = false,
+  args = { '--stdin-single-line', "-" },
+  stdin = true,
   ignore_exitcode = true,
-  parser = require('lint.parser').from_errorformat(
-    '%f:%l:%m',
-    { severity = vim.diagnostic.severity.INFO,
-      source = 'codespell'}
-  )
+  parser = require('lint.parser').from_pattern(pattern, groups, severities, {
+    source = 'codespell',
+    severity = vim.diagnostic.severity.INFO,
+  }),
 }
diff --git a/config/neovim/store/lazy-plugins/nvim-lint/lua/lint/linters/stylelint.lua b/config/neovim/store/lazy-plugins/nvim-lint/lua/lint/linters/stylelint.lua
index 47016b2d..4af24962 100644
--- a/config/neovim/store/lazy-plugins/nvim-lint/lua/lint/linters/stylelint.lua
+++ b/config/neovim/store/lazy-plugins/nvim-lint/lua/lint/linters/stylelint.lua
@@ -22,7 +22,7 @@ return {
       return vim.fn.expand("%:p")
     end,
   },
-  stream = "stdout",
+  stream = "both",
   ignore_exitcode = true,
   parser = function (output)
     local status, decoded = pcall(vim.json.decode, output)
diff --git a/config/neovim/store/lazy-plugins/nvim-lint/lua/lint/linters/trivy.lua b/config/neovim/store/lazy-plugins/nvim-lint/lua/lint/linters/trivy.lua
index 8d21b819..5ca40b08 100644
--- a/config/neovim/store/lazy-plugins/nvim-lint/lua/lint/linters/trivy.lua
+++ b/config/neovim/store/lazy-plugins/nvim-lint/lua/lint/linters/trivy.lua
@@ -4,34 +4,59 @@ local severity_map = {
   ["HIGH"] = vim.diagnostic.severity.ERROR,
 }
 
+
 return {
   cmd = "trivy",
   stdin = false,
   append_fname = true,
-  args = { "--scanners", "config", "--format", "json", "fs" },
+  args = { "--scanners", "misconfig", "--format", "json", "fs" },
   stream = "stdout",
   ignore_exitcode = false,
   parser = function(output, bufnr)
     local diagnostics = {}
-    local ok, decoded = pcall(vim.json.decode, output)
-    if not ok then
-      return diagnostics
-    end
+
+    -- example output:
+    -- {
+    --   "Results": [
+    --     "Target": "<file path>",
+    --     "Misconfigurations": [
+    --        {
+    --          "ID": "<nvim-lint code>",
+    --          "Title": "<title>",
+    --          "Description": "<description>",
+    --          "Severity": "<LOW|MEDIUM|HIGH>",
+    --          "CauseMetadata": {
+    --            "StartLine": <line number>,
+    --            "EndLine": <line number>,
+    --          }
+    --        }
+    --     ]
+    --   ]
+    -- }
+    local decoded = vim.json.decode(output)
     local fpath = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(bufnr), ":t")
+
     for _, result in ipairs(decoded and decoded.Results or {}) do
+      -- trivy can return Results for other files; only report for current buffer
+      --
       if result.Target == fpath then
         for _, misconfig in ipairs(result.Misconfigurations or {}) do
-          local err = {
+          local title = misconfig.Title or "<No Title>"
+          local description = misconfig.Description or "<No Description>"
+          local id = misconfig.ID or "<No ID>"
+          local md = misconfig.CauseMetadata or {}
+          local lnum = md.StartLine and md.StartLine - 1 or 0
+          local end_lnum = md.EndLine and md.EndLine - 1 or 0
+          table.insert(diagnostics, {
             source = "trivy",
-            message = string.format("%s %s", misconfig.Title, misconfig.Description),
-            col = misconfig.CauseMetadata.StartLine,
-            end_col = misconfig.CauseMetadata.EndLine,
-            lnum = misconfig.CauseMetadata.StartLine - 1,
-            end_lnum = misconfig.CauseMetadata.EndLine - 1,
-            code = misconfig.ID,
-            severity = severity_map[misconfig.Severity],
-          }
-          table.insert(diagnostics, err)
+            message = string.format("%s: %s", title, description),
+            col = 0,
+            end_col = 0,
+            lnum = lnum,
+            end_lnum = end_lnum,
+            code = id,
+            severity = severity_map[misconfig.Severity] or vim.diagnostic.severity.WARN,
+          })
         end
       end
     end
diff --git a/config/neovim/store/lazy-plugins/nvim-lint/tests/trivy_spec.lua b/config/neovim/store/lazy-plugins/nvim-lint/tests/trivy_spec.lua
index 8b440bd6..d1f63658 100644
--- a/config/neovim/store/lazy-plugins/nvim-lint/tests/trivy_spec.lua
+++ b/config/neovim/store/lazy-plugins/nvim-lint/tests/trivy_spec.lua
@@ -87,11 +87,11 @@ describe("linter.trivy", function()
     local expected = {
       {
         source = "trivy",
-        message = "A KMS key is not configured to auto-rotate. You should configure your KMS keys to auto rotate to maintain security and defend against compromise.",
+        message = "A KMS key is not configured to auto-rotate.: You should configure your KMS keys to auto rotate to maintain security and defend against compromise.",
         lnum = 14,
         end_lnum = 14,
-        col = 15,
-        end_col = 15,
+        col = 0,
+        end_col = 0,
         severity = vim.diagnostic.severity.WARN,
         code = "AVD-AWS-0065",
       },
diff --git a/config/neovim/store/lazy-plugins/nvim-lspconfig/.github/workflows/release.yml b/config/neovim/store/lazy-plugins/nvim-lspconfig/.github/workflows/release.yml
index 1f7eeeb5..28f7902f 100644
--- a/config/neovim/store/lazy-plugins/nvim-lspconfig/.github/workflows/release.yml
+++ b/config/neovim/store/lazy-plugins/nvim-lspconfig/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: LuaRocks Upload
-        uses: nvim-neorocks/luarocks-tag-release@v5
+        uses: nvim-neorocks/luarocks-tag-release@v6
         env:
           LUAROCKS_API_KEY: ${{ secrets.LUAROCKS_API_KEY }}
         with:
diff --git a/config/neovim/store/lazy-plugins/nvim-lspconfig/CONTRIBUTING.md b/config/neovim/store/lazy-plugins/nvim-lspconfig/CONTRIBUTING.md
index f328abfc..b83ee8a3 100644
--- a/config/neovim/store/lazy-plugins/nvim-lspconfig/CONTRIBUTING.md
+++ b/config/neovim/store/lazy-plugins/nvim-lspconfig/CONTRIBUTING.md
@@ -18,7 +18,7 @@ The point of lspconfig is to provide the minimal configuration necessary for a s
 
 ## Adding a server to lspconfig
 
-The general form of adding a new language server is to start with a minimal skeleton. This includes populated the `config` table with a `default_config` and `docs` table.
+The general form of adding a new language server is to start with a minimal skeleton. This includes populating the `config` table with a `default_config` and `docs` table.
 
 When choosing a server name, convert all dashes (`-`) to underscores (`_`) If the name of the server is a unique name (`pyright`, `clangd`) or a commonly used abbreviation (`zls`), prefer this as the server name. If the server instead follows the pattern x-language-server, prefer the convention `x_ls` (`jsonnet_ls`). 
 
@@ -30,7 +30,7 @@ Note that Windows has a limitation when it comes to directly invoking a server t
 cmd = { 'typescript-language-server', '--stdio' }
 ```
 
-* `filetypes`: a list for filetypes a 
+* `filetypes`: a list for filetypes the server should match with
 * `root_dir`: a function (or function handle) which returns the root of the project used to determine if lspconfig should launch a new language server, or attach a previously launched server when you open a new buffer matching the filetype of the server. Note, lspconfig does not offer a dedicated single file mode (this is not codified in the spec). Do not add `vim.fn.cwd` or `util.path.dirname` in `root_dir`. A future version of lspconfig will provide emulation of a single file mode until this is formally codified in the specification. A good fallback is `util.find_git_ancestor`, see other configurations for examples.
 
 Additionally, the following options are often added:
diff --git a/config/neovim/store/lazy-plugins/nvim-lspconfig/doc/server_configurations.md b/config/neovim/store/lazy-plugins/nvim-lspconfig/doc/server_configurations.md
index f36ded46..de136fb9 100644
--- a/config/neovim/store/lazy-plugins/nvim-lspconfig/doc/server_configurations.md
+++ b/config/neovim/store/lazy-plugins/nvim-lspconfig/doc/server_configurations.md
@@ -27,6 +27,7 @@ autogenerated from the Lua files. You can view this file in Nvim by running
 - [bicep](#bicep)
 - [biome](#biome)
 - [bitbake_language_server](#bitbake_language_server)
+- [bitbake_ls](#bitbake_ls)
 - [blueprint_ls](#blueprint_ls)
 - [bqnlsp](#bqnlsp)
 - [bright_script](#bright_script)
@@ -67,6 +68,7 @@ autogenerated from the Lua files. You can view this file in Nvim by running
 - [dhall_lsp_server](#dhall_lsp_server)
 - [diagnosticls](#diagnosticls)
 - [digestif](#digestif)
+- [djlsp](#djlsp)
 - [docker_compose_language_service](#docker_compose_language_service)
 - [dockerls](#dockerls)
 - [dolmenls](#dolmenls)
@@ -90,6 +92,7 @@ autogenerated from the Lua files. You can view this file in Nvim by running
 - [facility_language_server](#facility_language_server)
 - [fennel_language_server](#fennel_language_server)
 - [fennel_ls](#fennel_ls)
+- [fish_lsp](#fish_lsp)
 - [flow](#flow)
 - [flux_lsp](#flux_lsp)
 - [foam_ls](#foam_ls)
@@ -732,152 +735,11 @@ require'lspconfig'.arduino_language_server.setup{}
   - `capabilities` : 
   ```lua
   {
-    general = {
-      positionEncodings = { "utf-16" }
-    },
     textDocument = {
-      callHierarchy = {
-        dynamicRegistration = false
-      },
-      codeAction = {
-        codeActionLiteralSupport = {
-          codeActionKind = {
-            valueSet = { "", "quickfix", "refactor", "refactor.extract", "refactor.inline", "refactor.rewrite", "source", "source.organizeImports" }
-          }
-        },
-        dataSupport = true,
-        dynamicRegistration = true,
-        isPreferredSupport = true,
-        resolveSupport = {
-          properties = { "edit" }
-        }
-      },
-      completion = {
-        completionItem = {
-          commitCharactersSupport = false,
-          deprecatedSupport = false,
-          documentationFormat = { "markdown", "plaintext" },
-          preselectSupport = false,
-          snippetSupport = false
-        },
-        completionItemKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 }
-        },
-        completionList = {
-          itemDefaults = { "editRange", "insertTextFormat", "insertTextMode", "data" }
-        },
-        contextSupport = false,
-        dynamicRegistration = false
-      },
-      declaration = {
-        linkSupport = true
-      },
-      definition = {
-        dynamicRegistration = true,
-        linkSupport = true
-      },
-      diagnostic = {
-        dynamicRegistration = false
-      },
-      documentHighlight = {
-        dynamicRegistration = false
-      },
-      documentSymbol = {
-        dynamicRegistration = false,
-        hierarchicalDocumentSymbolSupport = true,
-        symbolKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
-        }
-      },
-      formatting = {
-        dynamicRegistration = true
-      },
-      hover = {
-        contentFormat = { "markdown", "plaintext" },
-        dynamicRegistration = true
-      },
-      implementation = {
-        linkSupport = true
-      },
-      inlayHint = {
-        dynamicRegistration = true,
-        resolveSupport = {
-          properties = { "textEdits", "tooltip", "location", "command" }
-        }
-      },
-      publishDiagnostics = {
-        dataSupport = true,
-        relatedInformation = true,
-        tagSupport = {
-          valueSet = { 1, 2 }
-        }
-      },
-      rangeFormatting = {
-        dynamicRegistration = true
-      },
-      references = {
-        dynamicRegistration = false
-      },
-      rename = {
-        dynamicRegistration = true,
-        prepareSupport = true
-      },
-      semanticTokens = vim.NIL,
-      signatureHelp = {
-        dynamicRegistration = false,
-        signatureInformation = {
-          activeParameterSupport = true,
-          documentationFormat = { "markdown", "plaintext" },
-          parameterInformation = {
-            labelOffsetSupport = true
-          }
-        }
-      },
-      synchronization = {
-        didSave = true,
-        dynamicRegistration = false,
-        willSave = true,
-        willSaveWaitUntil = true
-      },
-      typeDefinition = {
-        linkSupport = true
-      }
-    },
-    window = {
-      showDocument = {
-        support = true
-      },
-      showMessage = {
-        messageActionItem = {
-          additionalPropertiesSupport = false
-        }
-      },
-      workDoneProgress = true
+      semanticTokens = vim.NIL
     },
     workspace = {
-      applyEdit = true,
-      configuration = true,
-      didChangeConfiguration = {
-        dynamicRegistration = false
-      },
-      didChangeWatchedFiles = {
-        dynamicRegistration = false,
-        relativePatternSupport = true
-      },
-      inlayHint = {
-        refreshSupport = true
-      },
-      semanticTokens = vim.NIL,
-      symbol = {
-        dynamicRegistration = false,
-        symbolKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
-        }
-      },
-      workspaceEdit = {
-        resourceOperations = { "rename", "create", "delete" }
-      },
-      workspaceFolders = true
+      semanticTokens = vim.NIL
     }
   }
   ```
@@ -1405,7 +1267,7 @@ require'lspconfig'.biome.setup{}
   ```
   - `filetypes` : 
   ```lua
-  { "javascript", "javascriptreact", "json", "jsonc", "typescript", "typescript.tsx", "typescriptreact", "astro", "svelte", "vue" }
+  { "javascript", "javascriptreact", "json", "jsonc", "typescript", "typescript.tsx", "typescriptreact", "astro", "svelte", "vue", "css" }
   ```
   - `root_dir` : 
   ```lua
@@ -1444,6 +1306,46 @@ require'lspconfig'.bitbake_language_server.setup{}
   ```
 
 
+## bitbake_ls
+
+https://github.com/yoctoproject/vscode-bitbake/tree/staging/server
+https://www.npmjs.com/package/language-server-bitbake
+
+Official Bitbake Language Server for the Yocto Project.
+
+Can be installed from npm or github.
+
+```
+npm install -g language-server-bitbake
+```
+    
+
+
+**Snippet to enable the language server:**
+```lua
+require'lspconfig'.bitbake_ls.setup{}
+```
+
+
+**Default values:**
+  - `cmd` : 
+  ```lua
+  { "language-server-bitbake", "--stdio" }
+  ```
+  - `filetypes` : 
+  ```lua
+  { "bitbake" }
+  ```
+  - `root_dir` : 
+  ```lua
+  util.find_git_ancestor
+  ```
+  - `single_file_support` : 
+  ```lua
+  false
+  ```
+
+
 ## blueprint_ls
 
 https://gitlab.gnome.org/jwestman/blueprint-compiler
@@ -3048,6 +2950,39 @@ require'lspconfig'.digestif.setup{}
   ```
 
 
+## djlsp
+
+      https://github.com/fourdigits/django-template-lsp
+
+      `djlsp`, a language server for Django templates.
+    
+
+
+**Snippet to enable the language server:**
+```lua
+require'lspconfig'.djlsp.setup{}
+```
+
+
+**Default values:**
+  - `cmd` : 
+  ```lua
+  { "djlsp" }
+  ```
+  - `filetypes` : 
+  ```lua
+  { "html", "htmldjango" }
+  ```
+  - `root_dir` : 
+  ```lua
+  see source file
+  ```
+  - `settings` : 
+  ```lua
+  {}
+  ```
+
+
 ## docker_compose_language_service
 
 https://github.com/microsoft/compose-language-service
@@ -3552,6 +3487,12 @@ require'lspconfig'.elmls.setup{}
 
 
 **Default values:**
+  - `capabilities` : 
+  ```lua
+  {
+    offsetEncoding = { "utf-8", "utf-16" }
+  }
+  ```
   - `cmd` : 
   ```lua
   { "elm-language-server" }
@@ -4049,171 +3990,7 @@ require'lspconfig'.fennel_ls.setup{}
   - `capabilities` : 
   ```lua
   {
-    general = {
-      positionEncodings = { "utf-16" }
-    },
-    offsetEncoding = { "utf-8", "utf-16" },
-    textDocument = {
-      callHierarchy = {
-        dynamicRegistration = false
-      },
-      codeAction = {
-        codeActionLiteralSupport = {
-          codeActionKind = {
-            valueSet = { "", "quickfix", "refactor", "refactor.extract", "refactor.inline", "refactor.rewrite", "source", "source.organizeImports" }
-          }
-        },
-        dataSupport = true,
-        dynamicRegistration = true,
-        isPreferredSupport = true,
-        resolveSupport = {
-          properties = { "edit" }
-        }
-      },
-      completion = {
-        completionItem = {
-          commitCharactersSupport = false,
-          deprecatedSupport = false,
-          documentationFormat = { "markdown", "plaintext" },
-          preselectSupport = false,
-          snippetSupport = false
-        },
-        completionItemKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 }
-        },
-        completionList = {
-          itemDefaults = { "editRange", "insertTextFormat", "insertTextMode", "data" }
-        },
-        contextSupport = false,
-        dynamicRegistration = false
-      },
-      declaration = {
-        linkSupport = true
-      },
-      definition = {
-        dynamicRegistration = true,
-        linkSupport = true
-      },
-      diagnostic = {
-        dynamicRegistration = false
-      },
-      documentHighlight = {
-        dynamicRegistration = false
-      },
-      documentSymbol = {
-        dynamicRegistration = false,
-        hierarchicalDocumentSymbolSupport = true,
-        symbolKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
-        }
-      },
-      formatting = {
-        dynamicRegistration = true
-      },
-      hover = {
-        contentFormat = { "markdown", "plaintext" },
-        dynamicRegistration = true
-      },
-      implementation = {
-        linkSupport = true
-      },
-      inlayHint = {
-        dynamicRegistration = true,
-        resolveSupport = {
-          properties = { "textEdits", "tooltip", "location", "command" }
-        }
-      },
-      publishDiagnostics = {
-        dataSupport = true,
-        relatedInformation = true,
-        tagSupport = {
-          valueSet = { 1, 2 }
-        }
-      },
-      rangeFormatting = {
-        dynamicRegistration = true
-      },
-      references = {
-        dynamicRegistration = false
-      },
-      rename = {
-        dynamicRegistration = true,
-        prepareSupport = true
-      },
-      semanticTokens = {
-        augmentsSyntaxTokens = true,
-        dynamicRegistration = false,
-        formats = { "relative" },
-        multilineTokenSupport = false,
-        overlappingTokenSupport = true,
-        requests = {
-          full = {
-            delta = true
-          },
-          range = false
-        },
-        serverCancelSupport = false,
-        tokenModifiers = { "declaration", "definition", "readonly", "static", "deprecated", "abstract", "async", "modification", "documentation", "defaultLibrary" },
-        tokenTypes = { "namespace", "type", "class", "enum", "interface", "struct", "typeParameter", "parameter", "variable", "property", "enumMember", "event", "function", "method", "macro", "keyword", "modifier", "comment", "string", "number", "regexp", "operator", "decorator" }
-      },
-      signatureHelp = {
-        dynamicRegistration = false,
-        signatureInformation = {
-          activeParameterSupport = true,
-          documentationFormat = { "markdown", "plaintext" },
-          parameterInformation = {
-            labelOffsetSupport = true
-          }
-        }
-      },
-      synchronization = {
-        didSave = true,
-        dynamicRegistration = false,
-        willSave = true,
-        willSaveWaitUntil = true
-      },
-      typeDefinition = {
-        linkSupport = true
-      }
-    },
-    window = {
-      showDocument = {
-        support = true
-      },
-      showMessage = {
-        messageActionItem = {
-          additionalPropertiesSupport = false
-        }
-      },
-      workDoneProgress = true
-    },
-    workspace = {
-      applyEdit = true,
-      configuration = true,
-      didChangeConfiguration = {
-        dynamicRegistration = false
-      },
-      didChangeWatchedFiles = {
-        dynamicRegistration = false,
-        relativePatternSupport = true
-      },
-      inlayHint = {
-        refreshSupport = true
-      },
-      semanticTokens = {
-        refreshSupport = true
-      },
-      symbol = {
-        dynamicRegistration = false,
-        symbolKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
-        }
-      },
-      workspaceEdit = {
-        resourceOperations = { "rename", "create", "delete" }
-      },
-      workspaceFolders = true
-    }
+    offsetEncoding = { "utf-8", "utf-16" }
   }
   ```
   - `cmd` : 
@@ -4234,6 +4011,50 @@ require'lspconfig'.fennel_ls.setup{}
   ```
 
 
+## fish_lsp
+
+https://github.com/ndonfris/fish-lsp
+
+A Language Server Protocol (LSP) tailored for the fish shell.
+This project aims to enhance the coding experience for fish,
+by introducing a suite of intelligent features like auto-completion,
+scope aware symbol analysis, per-token hover generation, and many others.
+
+[homepage](https://www.fish-lsp.dev/)
+
+
+
+**Snippet to enable the language server:**
+```lua
+require'lspconfig'.fish_lsp.setup{}
+```
+
+
+**Default values:**
+  - `cmd` : 
+  ```lua
+  { "fish-lsp", "start" }
+  ```
+  - `cmd_env` : 
+  ```lua
+  {
+    fish_lsp_show_client_popups = false
+  }
+  ```
+  - `filetypes` : 
+  ```lua
+  { "fish" }
+  ```
+  - `root_dir` : 
+  ```lua
+  util.find_git_ancestor
+  ```
+  - `single_file_support` : 
+  ```lua
+  true
+  ```
+
+
 ## flow
 
 https://flow.org/
@@ -10154,170 +9975,6 @@ require'lspconfig'.rust_analyzer.setup{}
   {
     experimental = {
       serverStatusNotification = true
-    },
-    general = {
-      positionEncodings = { "utf-16" }
-    },
-    textDocument = {
-      callHierarchy = {
-        dynamicRegistration = false
-      },
-      codeAction = {
-        codeActionLiteralSupport = {
-          codeActionKind = {
-            valueSet = { "", "quickfix", "refactor", "refactor.extract", "refactor.inline", "refactor.rewrite", "source", "source.organizeImports" }
-          }
-        },
-        dataSupport = true,
-        dynamicRegistration = true,
-        isPreferredSupport = true,
-        resolveSupport = {
-          properties = { "edit" }
-        }
-      },
-      completion = {
-        completionItem = {
-          commitCharactersSupport = false,
-          deprecatedSupport = false,
-          documentationFormat = { "markdown", "plaintext" },
-          preselectSupport = false,
-          snippetSupport = false
-        },
-        completionItemKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 }
-        },
-        completionList = {
-          itemDefaults = { "editRange", "insertTextFormat", "insertTextMode", "data" }
-        },
-        contextSupport = false,
-        dynamicRegistration = false
-      },
-      declaration = {
-        linkSupport = true
-      },
-      definition = {
-        dynamicRegistration = true,
-        linkSupport = true
-      },
-      diagnostic = {
-        dynamicRegistration = false
-      },
-      documentHighlight = {
-        dynamicRegistration = false
-      },
-      documentSymbol = {
-        dynamicRegistration = false,
-        hierarchicalDocumentSymbolSupport = true,
-        symbolKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
-        }
-      },
-      formatting = {
-        dynamicRegistration = true
-      },
-      hover = {
-        contentFormat = { "markdown", "plaintext" },
-        dynamicRegistration = true
-      },
-      implementation = {
-        linkSupport = true
-      },
-      inlayHint = {
-        dynamicRegistration = true,
-        resolveSupport = {
-          properties = { "textEdits", "tooltip", "location", "command" }
-        }
-      },
-      publishDiagnostics = {
-        dataSupport = true,
-        relatedInformation = true,
-        tagSupport = {
-          valueSet = { 1, 2 }
-        }
-      },
-      rangeFormatting = {
-        dynamicRegistration = true
-      },
-      references = {
-        dynamicRegistration = false
-      },
-      rename = {
-        dynamicRegistration = true,
-        prepareSupport = true
-      },
-      semanticTokens = {
-        augmentsSyntaxTokens = true,
-        dynamicRegistration = false,
-        formats = { "relative" },
-        multilineTokenSupport = false,
-        overlappingTokenSupport = true,
-        requests = {
-          full = {
-            delta = true
-          },
-          range = false
-        },
-        serverCancelSupport = false,
-        tokenModifiers = { "declaration", "definition", "readonly", "static", "deprecated", "abstract", "async", "modification", "documentation", "defaultLibrary" },
-        tokenTypes = { "namespace", "type", "class", "enum", "interface", "struct", "typeParameter", "parameter", "variable", "property", "enumMember", "event", "function", "method", "macro", "keyword", "modifier", "comment", "string", "number", "regexp", "operator", "decorator" }
-      },
-      signatureHelp = {
-        dynamicRegistration = false,
-        signatureInformation = {
-          activeParameterSupport = true,
-          documentationFormat = { "markdown", "plaintext" },
-          parameterInformation = {
-            labelOffsetSupport = true
-          }
-        }
-      },
-      synchronization = {
-        didSave = true,
-        dynamicRegistration = false,
-        willSave = true,
-        willSaveWaitUntil = true
-      },
-      typeDefinition = {
-        linkSupport = true
-      }
-    },
-    window = {
-      showDocument = {
-        support = true
-      },
-      showMessage = {
-        messageActionItem = {
-          additionalPropertiesSupport = false
-        }
-      },
-      workDoneProgress = true
-    },
-    workspace = {
-      applyEdit = true,
-      configuration = true,
-      didChangeConfiguration = {
-        dynamicRegistration = false
-      },
-      didChangeWatchedFiles = {
-        dynamicRegistration = false,
-        relativePatternSupport = true
-      },
-      inlayHint = {
-        refreshSupport = true
-      },
-      semanticTokens = {
-        refreshSupport = true
-      },
-      symbol = {
-        dynamicRegistration = false,
-        symbolKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
-        }
-      },
-      workspaceEdit = {
-        resourceOperations = { "rename", "create", "delete" }
-      },
-      workspaceFolders = true
     }
   }
   ```
@@ -10643,6 +10300,10 @@ require'lspconfig'.slint_lsp.setup{}
   ```lua
   { "slint" }
   ```
+  - `root_dir` : 
+  ```lua
+  see source file
+  ```
   - `single_file_support` : 
   ```lua
   true
@@ -11153,7 +10814,7 @@ require'lspconfig'.sourcekit.setup{}
   ```
   - `root_dir` : 
   ```lua
-  root_pattern("buildServer.json", "*.xcodeproj", "*.xcworkspace", ".git", "compile_commands.json", "Package.swift")
+  root_pattern("buildServer.json", "*.xcodeproj", "*.xcworkspace", "compile_commands.json", "Package.swift", ".git")
   ```
 
 
@@ -12589,7 +12250,7 @@ require'lspconfig'.tsserver.setup{}
   ```
   - `root_dir` : 
   ```lua
-  root_pattern("tsconfig.json", "package.json", "jsconfig.json", ".git")
+  root_pattern("tsconfig.json", "jsconfig.json", "package.json", ".git")
   ```
   - `single_file_support` : 
   ```lua
diff --git a/config/neovim/store/lazy-plugins/nvim-lspconfig/doc/server_configurations.txt b/config/neovim/store/lazy-plugins/nvim-lspconfig/doc/server_configurations.txt
index f36ded46..de136fb9 100644
--- a/config/neovim/store/lazy-plugins/nvim-lspconfig/doc/server_configurations.txt
+++ b/config/neovim/store/lazy-plugins/nvim-lspconfig/doc/server_configurations.txt
@@ -27,6 +27,7 @@ autogenerated from the Lua files. You can view this file in Nvim by running
 - [bicep](#bicep)
 - [biome](#biome)
 - [bitbake_language_server](#bitbake_language_server)
+- [bitbake_ls](#bitbake_ls)
 - [blueprint_ls](#blueprint_ls)
 - [bqnlsp](#bqnlsp)
 - [bright_script](#bright_script)
@@ -67,6 +68,7 @@ autogenerated from the Lua files. You can view this file in Nvim by running
 - [dhall_lsp_server](#dhall_lsp_server)
 - [diagnosticls](#diagnosticls)
 - [digestif](#digestif)
+- [djlsp](#djlsp)
 - [docker_compose_language_service](#docker_compose_language_service)
 - [dockerls](#dockerls)
 - [dolmenls](#dolmenls)
@@ -90,6 +92,7 @@ autogenerated from the Lua files. You can view this file in Nvim by running
 - [facility_language_server](#facility_language_server)
 - [fennel_language_server](#fennel_language_server)
 - [fennel_ls](#fennel_ls)
+- [fish_lsp](#fish_lsp)
 - [flow](#flow)
 - [flux_lsp](#flux_lsp)
 - [foam_ls](#foam_ls)
@@ -732,152 +735,11 @@ require'lspconfig'.arduino_language_server.setup{}
   - `capabilities` : 
   ```lua
   {
-    general = {
-      positionEncodings = { "utf-16" }
-    },
     textDocument = {
-      callHierarchy = {
-        dynamicRegistration = false
-      },
-      codeAction = {
-        codeActionLiteralSupport = {
-          codeActionKind = {
-            valueSet = { "", "quickfix", "refactor", "refactor.extract", "refactor.inline", "refactor.rewrite", "source", "source.organizeImports" }
-          }
-        },
-        dataSupport = true,
-        dynamicRegistration = true,
-        isPreferredSupport = true,
-        resolveSupport = {
-          properties = { "edit" }
-        }
-      },
-      completion = {
-        completionItem = {
-          commitCharactersSupport = false,
-          deprecatedSupport = false,
-          documentationFormat = { "markdown", "plaintext" },
-          preselectSupport = false,
-          snippetSupport = false
-        },
-        completionItemKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 }
-        },
-        completionList = {
-          itemDefaults = { "editRange", "insertTextFormat", "insertTextMode", "data" }
-        },
-        contextSupport = false,
-        dynamicRegistration = false
-      },
-      declaration = {
-        linkSupport = true
-      },
-      definition = {
-        dynamicRegistration = true,
-        linkSupport = true
-      },
-      diagnostic = {
-        dynamicRegistration = false
-      },
-      documentHighlight = {
-        dynamicRegistration = false
-      },
-      documentSymbol = {
-        dynamicRegistration = false,
-        hierarchicalDocumentSymbolSupport = true,
-        symbolKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
-        }
-      },
-      formatting = {
-        dynamicRegistration = true
-      },
-      hover = {
-        contentFormat = { "markdown", "plaintext" },
-        dynamicRegistration = true
-      },
-      implementation = {
-        linkSupport = true
-      },
-      inlayHint = {
-        dynamicRegistration = true,
-        resolveSupport = {
-          properties = { "textEdits", "tooltip", "location", "command" }
-        }
-      },
-      publishDiagnostics = {
-        dataSupport = true,
-        relatedInformation = true,
-        tagSupport = {
-          valueSet = { 1, 2 }
-        }
-      },
-      rangeFormatting = {
-        dynamicRegistration = true
-      },
-      references = {
-        dynamicRegistration = false
-      },
-      rename = {
-        dynamicRegistration = true,
-        prepareSupport = true
-      },
-      semanticTokens = vim.NIL,
-      signatureHelp = {
-        dynamicRegistration = false,
-        signatureInformation = {
-          activeParameterSupport = true,
-          documentationFormat = { "markdown", "plaintext" },
-          parameterInformation = {
-            labelOffsetSupport = true
-          }
-        }
-      },
-      synchronization = {
-        didSave = true,
-        dynamicRegistration = false,
-        willSave = true,
-        willSaveWaitUntil = true
-      },
-      typeDefinition = {
-        linkSupport = true
-      }
-    },
-    window = {
-      showDocument = {
-        support = true
-      },
-      showMessage = {
-        messageActionItem = {
-          additionalPropertiesSupport = false
-        }
-      },
-      workDoneProgress = true
+      semanticTokens = vim.NIL
     },
     workspace = {
-      applyEdit = true,
-      configuration = true,
-      didChangeConfiguration = {
-        dynamicRegistration = false
-      },
-      didChangeWatchedFiles = {
-        dynamicRegistration = false,
-        relativePatternSupport = true
-      },
-      inlayHint = {
-        refreshSupport = true
-      },
-      semanticTokens = vim.NIL,
-      symbol = {
-        dynamicRegistration = false,
-        symbolKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
-        }
-      },
-      workspaceEdit = {
-        resourceOperations = { "rename", "create", "delete" }
-      },
-      workspaceFolders = true
+      semanticTokens = vim.NIL
     }
   }
   ```
@@ -1405,7 +1267,7 @@ require'lspconfig'.biome.setup{}
   ```
   - `filetypes` : 
   ```lua
-  { "javascript", "javascriptreact", "json", "jsonc", "typescript", "typescript.tsx", "typescriptreact", "astro", "svelte", "vue" }
+  { "javascript", "javascriptreact", "json", "jsonc", "typescript", "typescript.tsx", "typescriptreact", "astro", "svelte", "vue", "css" }
   ```
   - `root_dir` : 
   ```lua
@@ -1444,6 +1306,46 @@ require'lspconfig'.bitbake_language_server.setup{}
   ```
 
 
+## bitbake_ls
+
+https://github.com/yoctoproject/vscode-bitbake/tree/staging/server
+https://www.npmjs.com/package/language-server-bitbake
+
+Official Bitbake Language Server for the Yocto Project.
+
+Can be installed from npm or github.
+
+```
+npm install -g language-server-bitbake
+```
+    
+
+
+**Snippet to enable the language server:**
+```lua
+require'lspconfig'.bitbake_ls.setup{}
+```
+
+
+**Default values:**
+  - `cmd` : 
+  ```lua
+  { "language-server-bitbake", "--stdio" }
+  ```
+  - `filetypes` : 
+  ```lua
+  { "bitbake" }
+  ```
+  - `root_dir` : 
+  ```lua
+  util.find_git_ancestor
+  ```
+  - `single_file_support` : 
+  ```lua
+  false
+  ```
+
+
 ## blueprint_ls
 
 https://gitlab.gnome.org/jwestman/blueprint-compiler
@@ -3048,6 +2950,39 @@ require'lspconfig'.digestif.setup{}
   ```
 
 
+## djlsp
+
+      https://github.com/fourdigits/django-template-lsp
+
+      `djlsp`, a language server for Django templates.
+    
+
+
+**Snippet to enable the language server:**
+```lua
+require'lspconfig'.djlsp.setup{}
+```
+
+
+**Default values:**
+  - `cmd` : 
+  ```lua
+  { "djlsp" }
+  ```
+  - `filetypes` : 
+  ```lua
+  { "html", "htmldjango" }
+  ```
+  - `root_dir` : 
+  ```lua
+  see source file
+  ```
+  - `settings` : 
+  ```lua
+  {}
+  ```
+
+
 ## docker_compose_language_service
 
 https://github.com/microsoft/compose-language-service
@@ -3552,6 +3487,12 @@ require'lspconfig'.elmls.setup{}
 
 
 **Default values:**
+  - `capabilities` : 
+  ```lua
+  {
+    offsetEncoding = { "utf-8", "utf-16" }
+  }
+  ```
   - `cmd` : 
   ```lua
   { "elm-language-server" }
@@ -4049,171 +3990,7 @@ require'lspconfig'.fennel_ls.setup{}
   - `capabilities` : 
   ```lua
   {
-    general = {
-      positionEncodings = { "utf-16" }
-    },
-    offsetEncoding = { "utf-8", "utf-16" },
-    textDocument = {
-      callHierarchy = {
-        dynamicRegistration = false
-      },
-      codeAction = {
-        codeActionLiteralSupport = {
-          codeActionKind = {
-            valueSet = { "", "quickfix", "refactor", "refactor.extract", "refactor.inline", "refactor.rewrite", "source", "source.organizeImports" }
-          }
-        },
-        dataSupport = true,
-        dynamicRegistration = true,
-        isPreferredSupport = true,
-        resolveSupport = {
-          properties = { "edit" }
-        }
-      },
-      completion = {
-        completionItem = {
-          commitCharactersSupport = false,
-          deprecatedSupport = false,
-          documentationFormat = { "markdown", "plaintext" },
-          preselectSupport = false,
-          snippetSupport = false
-        },
-        completionItemKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 }
-        },
-        completionList = {
-          itemDefaults = { "editRange", "insertTextFormat", "insertTextMode", "data" }
-        },
-        contextSupport = false,
-        dynamicRegistration = false
-      },
-      declaration = {
-        linkSupport = true
-      },
-      definition = {
-        dynamicRegistration = true,
-        linkSupport = true
-      },
-      diagnostic = {
-        dynamicRegistration = false
-      },
-      documentHighlight = {
-        dynamicRegistration = false
-      },
-      documentSymbol = {
-        dynamicRegistration = false,
-        hierarchicalDocumentSymbolSupport = true,
-        symbolKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
-        }
-      },
-      formatting = {
-        dynamicRegistration = true
-      },
-      hover = {
-        contentFormat = { "markdown", "plaintext" },
-        dynamicRegistration = true
-      },
-      implementation = {
-        linkSupport = true
-      },
-      inlayHint = {
-        dynamicRegistration = true,
-        resolveSupport = {
-          properties = { "textEdits", "tooltip", "location", "command" }
-        }
-      },
-      publishDiagnostics = {
-        dataSupport = true,
-        relatedInformation = true,
-        tagSupport = {
-          valueSet = { 1, 2 }
-        }
-      },
-      rangeFormatting = {
-        dynamicRegistration = true
-      },
-      references = {
-        dynamicRegistration = false
-      },
-      rename = {
-        dynamicRegistration = true,
-        prepareSupport = true
-      },
-      semanticTokens = {
-        augmentsSyntaxTokens = true,
-        dynamicRegistration = false,
-        formats = { "relative" },
-        multilineTokenSupport = false,
-        overlappingTokenSupport = true,
-        requests = {
-          full = {
-            delta = true
-          },
-          range = false
-        },
-        serverCancelSupport = false,
-        tokenModifiers = { "declaration", "definition", "readonly", "static", "deprecated", "abstract", "async", "modification", "documentation", "defaultLibrary" },
-        tokenTypes = { "namespace", "type", "class", "enum", "interface", "struct", "typeParameter", "parameter", "variable", "property", "enumMember", "event", "function", "method", "macro", "keyword", "modifier", "comment", "string", "number", "regexp", "operator", "decorator" }
-      },
-      signatureHelp = {
-        dynamicRegistration = false,
-        signatureInformation = {
-          activeParameterSupport = true,
-          documentationFormat = { "markdown", "plaintext" },
-          parameterInformation = {
-            labelOffsetSupport = true
-          }
-        }
-      },
-      synchronization = {
-        didSave = true,
-        dynamicRegistration = false,
-        willSave = true,
-        willSaveWaitUntil = true
-      },
-      typeDefinition = {
-        linkSupport = true
-      }
-    },
-    window = {
-      showDocument = {
-        support = true
-      },
-      showMessage = {
-        messageActionItem = {
-          additionalPropertiesSupport = false
-        }
-      },
-      workDoneProgress = true
-    },
-    workspace = {
-      applyEdit = true,
-      configuration = true,
-      didChangeConfiguration = {
-        dynamicRegistration = false
-      },
-      didChangeWatchedFiles = {
-        dynamicRegistration = false,
-        relativePatternSupport = true
-      },
-      inlayHint = {
-        refreshSupport = true
-      },
-      semanticTokens = {
-        refreshSupport = true
-      },
-      symbol = {
-        dynamicRegistration = false,
-        symbolKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
-        }
-      },
-      workspaceEdit = {
-        resourceOperations = { "rename", "create", "delete" }
-      },
-      workspaceFolders = true
-    }
+    offsetEncoding = { "utf-8", "utf-16" }
   }
   ```
   - `cmd` : 
@@ -4234,6 +4011,50 @@ require'lspconfig'.fennel_ls.setup{}
   ```
 
 
+## fish_lsp
+
+https://github.com/ndonfris/fish-lsp
+
+A Language Server Protocol (LSP) tailored for the fish shell.
+This project aims to enhance the coding experience for fish,
+by introducing a suite of intelligent features like auto-completion,
+scope aware symbol analysis, per-token hover generation, and many others.
+
+[homepage](https://www.fish-lsp.dev/)
+
+
+
+**Snippet to enable the language server:**
+```lua
+require'lspconfig'.fish_lsp.setup{}
+```
+
+
+**Default values:**
+  - `cmd` : 
+  ```lua
+  { "fish-lsp", "start" }
+  ```
+  - `cmd_env` : 
+  ```lua
+  {
+    fish_lsp_show_client_popups = false
+  }
+  ```
+  - `filetypes` : 
+  ```lua
+  { "fish" }
+  ```
+  - `root_dir` : 
+  ```lua
+  util.find_git_ancestor
+  ```
+  - `single_file_support` : 
+  ```lua
+  true
+  ```
+
+
 ## flow
 
 https://flow.org/
@@ -10154,170 +9975,6 @@ require'lspconfig'.rust_analyzer.setup{}
   {
     experimental = {
       serverStatusNotification = true
-    },
-    general = {
-      positionEncodings = { "utf-16" }
-    },
-    textDocument = {
-      callHierarchy = {
-        dynamicRegistration = false
-      },
-      codeAction = {
-        codeActionLiteralSupport = {
-          codeActionKind = {
-            valueSet = { "", "quickfix", "refactor", "refactor.extract", "refactor.inline", "refactor.rewrite", "source", "source.organizeImports" }
-          }
-        },
-        dataSupport = true,
-        dynamicRegistration = true,
-        isPreferredSupport = true,
-        resolveSupport = {
-          properties = { "edit" }
-        }
-      },
-      completion = {
-        completionItem = {
-          commitCharactersSupport = false,
-          deprecatedSupport = false,
-          documentationFormat = { "markdown", "plaintext" },
-          preselectSupport = false,
-          snippetSupport = false
-        },
-        completionItemKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 }
-        },
-        completionList = {
-          itemDefaults = { "editRange", "insertTextFormat", "insertTextMode", "data" }
-        },
-        contextSupport = false,
-        dynamicRegistration = false
-      },
-      declaration = {
-        linkSupport = true
-      },
-      definition = {
-        dynamicRegistration = true,
-        linkSupport = true
-      },
-      diagnostic = {
-        dynamicRegistration = false
-      },
-      documentHighlight = {
-        dynamicRegistration = false
-      },
-      documentSymbol = {
-        dynamicRegistration = false,
-        hierarchicalDocumentSymbolSupport = true,
-        symbolKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
-        }
-      },
-      formatting = {
-        dynamicRegistration = true
-      },
-      hover = {
-        contentFormat = { "markdown", "plaintext" },
-        dynamicRegistration = true
-      },
-      implementation = {
-        linkSupport = true
-      },
-      inlayHint = {
-        dynamicRegistration = true,
-        resolveSupport = {
-          properties = { "textEdits", "tooltip", "location", "command" }
-        }
-      },
-      publishDiagnostics = {
-        dataSupport = true,
-        relatedInformation = true,
-        tagSupport = {
-          valueSet = { 1, 2 }
-        }
-      },
-      rangeFormatting = {
-        dynamicRegistration = true
-      },
-      references = {
-        dynamicRegistration = false
-      },
-      rename = {
-        dynamicRegistration = true,
-        prepareSupport = true
-      },
-      semanticTokens = {
-        augmentsSyntaxTokens = true,
-        dynamicRegistration = false,
-        formats = { "relative" },
-        multilineTokenSupport = false,
-        overlappingTokenSupport = true,
-        requests = {
-          full = {
-            delta = true
-          },
-          range = false
-        },
-        serverCancelSupport = false,
-        tokenModifiers = { "declaration", "definition", "readonly", "static", "deprecated", "abstract", "async", "modification", "documentation", "defaultLibrary" },
-        tokenTypes = { "namespace", "type", "class", "enum", "interface", "struct", "typeParameter", "parameter", "variable", "property", "enumMember", "event", "function", "method", "macro", "keyword", "modifier", "comment", "string", "number", "regexp", "operator", "decorator" }
-      },
-      signatureHelp = {
-        dynamicRegistration = false,
-        signatureInformation = {
-          activeParameterSupport = true,
-          documentationFormat = { "markdown", "plaintext" },
-          parameterInformation = {
-            labelOffsetSupport = true
-          }
-        }
-      },
-      synchronization = {
-        didSave = true,
-        dynamicRegistration = false,
-        willSave = true,
-        willSaveWaitUntil = true
-      },
-      typeDefinition = {
-        linkSupport = true
-      }
-    },
-    window = {
-      showDocument = {
-        support = true
-      },
-      showMessage = {
-        messageActionItem = {
-          additionalPropertiesSupport = false
-        }
-      },
-      workDoneProgress = true
-    },
-    workspace = {
-      applyEdit = true,
-      configuration = true,
-      didChangeConfiguration = {
-        dynamicRegistration = false
-      },
-      didChangeWatchedFiles = {
-        dynamicRegistration = false,
-        relativePatternSupport = true
-      },
-      inlayHint = {
-        refreshSupport = true
-      },
-      semanticTokens = {
-        refreshSupport = true
-      },
-      symbol = {
-        dynamicRegistration = false,
-        symbolKind = {
-          valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
-        }
-      },
-      workspaceEdit = {
-        resourceOperations = { "rename", "create", "delete" }
-      },
-      workspaceFolders = true
     }
   }
   ```
@@ -10643,6 +10300,10 @@ require'lspconfig'.slint_lsp.setup{}
   ```lua
   { "slint" }
   ```
+  - `root_dir` : 
+  ```lua
+  see source file
+  ```
   - `single_file_support` : 
   ```lua
   true
@@ -11153,7 +10814,7 @@ require'lspconfig'.sourcekit.setup{}
   ```
   - `root_dir` : 
   ```lua
-  root_pattern("buildServer.json", "*.xcodeproj", "*.xcworkspace", ".git", "compile_commands.json", "Package.swift")
+  root_pattern("buildServer.json", "*.xcodeproj", "*.xcworkspace", "compile_commands.json", "Package.swift", ".git")
   ```
 
 
@@ -12589,7 +12250,7 @@ require'lspconfig'.tsserver.setup{}
   ```
   - `root_dir` : 
   ```lua
-  root_pattern("tsconfig.json", "package.json", "jsconfig.json", ".git")
+  root_pattern("tsconfig.json", "jsconfig.json", "package.json", ".git")
   ```
   - `single_file_support` : 
   ```lua
diff --git a/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/arduino_language_server.lua b/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/arduino_language_server.lua
index f1d73e2b..384a9c9f 100644
--- a/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/arduino_language_server.lua
+++ b/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/arduino_language_server.lua
@@ -1,9 +1,5 @@
 local util = require 'lspconfig.util'
 
-local default_capabilities = vim.lsp.protocol.make_client_capabilities()
-default_capabilities.textDocument.semanticTokens = vim.NIL
-default_capabilities.workspace.semanticTokens = vim.NIL
-
 return {
   default_config = {
     filetypes = { 'arduino' },
@@ -11,7 +7,14 @@ return {
     cmd = {
       'arduino-language-server',
     },
-    capabilities = default_capabilities,
+    capabilities = {
+      textDocument = {
+        semanticTokens = vim.NIL,
+      },
+      workspace = {
+        semanticTokens = vim.NIL,
+      },
+    },
   },
   docs = {
     description = [[
diff --git a/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/biome.lua b/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/biome.lua
index 102954e4..8cb47f9b 100644
--- a/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/biome.lua
+++ b/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/biome.lua
@@ -14,6 +14,7 @@ return {
       'astro',
       'svelte',
       'vue',
+      'css',
     },
     root_dir = util.root_pattern('biome.json', 'biome.jsonc'),
     single_file_support = false,
diff --git a/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/elmls.lua b/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/elmls.lua
index f42449d4..e3e63bcd 100644
--- a/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/elmls.lua
+++ b/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/elmls.lua
@@ -1,9 +1,6 @@
 local util = require 'lspconfig.util'
-local lsp = vim.lsp
 local api = vim.api
 
-local default_capabilities = lsp.protocol.make_client_capabilities()
-default_capabilities.offsetEncoding = { 'utf-8', 'utf-16' }
 local elm_root_pattern = util.root_pattern 'elm.json'
 
 return {
@@ -23,6 +20,9 @@ return {
       disableElmLSDiagnostics = false,
       onlyUpdateDiagnosticsOnSave = false,
     },
+    capabilities = {
+      offsetEncoding = { 'utf-8', 'utf-16' },
+    },
   },
   docs = {
     description = [[
diff --git a/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/fennel_ls.lua b/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/fennel_ls.lua
index 50a77399..aa4f643b 100644
--- a/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/fennel_ls.lua
+++ b/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/fennel_ls.lua
@@ -1,8 +1,5 @@
 local util = require 'lspconfig.util'
 
-local default_capabilities = vim.lsp.protocol.make_client_capabilities()
-default_capabilities.offsetEncoding = { 'utf-8', 'utf-16' }
-
 return {
   default_config = {
     cmd = { 'fennel-ls' },
@@ -11,7 +8,9 @@ return {
       return util.find_git_ancestor(dir)
     end,
     settings = {},
-    capabilities = default_capabilities,
+    capabilities = {
+      offsetEncoding = { 'utf-8', 'utf-16' },
+    },
   },
   docs = {
     description = [[
diff --git a/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/rust_analyzer.lua b/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/rust_analyzer.lua
index 61dfdc1d..b89546a7 100644
--- a/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/rust_analyzer.lua
+++ b/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/rust_analyzer.lua
@@ -32,14 +32,6 @@ local function is_library(fname)
   end
 end
 
-local function register_cap()
-  local capabilities = vim.lsp.protocol.make_client_capabilities()
-  capabilities.experimental = {
-    serverStatusNotification = true,
-  }
-  return capabilities
-end
-
 return {
   default_config = {
     cmd = { 'rust-analyzer' },
@@ -80,7 +72,11 @@ return {
         or util.root_pattern 'rust-project.json'(fname)
         or util.find_git_ancestor(fname)
     end,
-    capabilities = register_cap(),
+    capabilities = {
+      experimental = {
+        serverStatusNotification = true,
+      },
+    },
   },
   commands = {
     CargoReload = {
diff --git a/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/slint_lsp.lua b/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/slint_lsp.lua
index e921cb68..bdd36597 100644
--- a/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/slint_lsp.lua
+++ b/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/slint_lsp.lua
@@ -1,7 +1,10 @@
+local util = require 'lspconfig.util'
+
 return {
   default_config = {
     cmd = { 'slint-lsp' },
     filetypes = { 'slint' },
+    root_dir = util.find_git_ancestor,
     single_file_support = true,
   },
   docs = {
diff --git a/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/sourcekit.lua b/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/sourcekit.lua
index f5ce4130..a906f083 100644
--- a/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/sourcekit.lua
+++ b/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/sourcekit.lua
@@ -7,9 +7,9 @@ return {
     root_dir = function(filename, _)
       return util.root_pattern 'buildServer.json'(filename)
         or util.root_pattern('*.xcodeproj', '*.xcworkspace')(filename)
-        or util.find_git_ancestor(filename)
         -- better to keep it at the end, because some modularized apps contain multiple Package.swift files
         or util.root_pattern('compile_commands.json', 'Package.swift')(filename)
+        or util.find_git_ancestor(filename)
     end,
   },
   docs = {
@@ -19,7 +19,7 @@ https://github.com/apple/sourcekit-lsp
 Language server for Swift and C/C++/Objective-C.
     ]],
     default_config = {
-      root_dir = [[root_pattern("buildServer.json", "*.xcodeproj", "*.xcworkspace", ".git", "compile_commands.json", "Package.swift")]],
+      root_dir = [[root_pattern("buildServer.json", "*.xcodeproj", "*.xcworkspace", "compile_commands.json", "Package.swift", ".git")]],
     },
   },
 }
diff --git a/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/tsserver.lua b/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/tsserver.lua
index b5fa5a4b..6220e7f2 100644
--- a/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/tsserver.lua
+++ b/config/neovim/store/lazy-plugins/nvim-lspconfig/lua/lspconfig/server_configurations/tsserver.lua
@@ -12,7 +12,7 @@ return {
       'typescriptreact',
       'typescript.tsx',
     },
-    root_dir = util.root_pattern('tsconfig.json', 'package.json', 'jsconfig.json', '.git'),
+    root_dir = util.root_pattern('tsconfig.json', 'jsconfig.json', 'package.json', '.git'),
     single_file_support = true,
   },
   docs = {
@@ -82,7 +82,7 @@ require'lspconfig'.tsserver.setup{
 `filetypes` is extended here to include Vue SFC.
 ]],
     default_config = {
-      root_dir = [[root_pattern("tsconfig.json", "package.json", "jsconfig.json", ".git")]],
+      root_dir = [[root_pattern("tsconfig.json", "jsconfig.json", "package.json", ".git")]],
     },
   },
 }
diff --git a/config/neovim/store/lazy-plugins/nvim-lspconfig/scripts/docgen.sh b/config/neovim/store/lazy-plugins/nvim-lspconfig/scripts/docgen.sh
index 274cf205..39e67165 100755
--- a/config/neovim/store/lazy-plugins/nvim-lspconfig/scripts/docgen.sh
+++ b/config/neovim/store/lazy-plugins/nvim-lspconfig/scripts/docgen.sh
@@ -1,2 +1,2 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/sh
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/sh
 exec nvim -u NONE -E -R --headless +'set rtp+=$PWD' +'luafile scripts/docgen.lua' +q
diff --git a/config/neovim/store/lazy-plugins/nvim-notify/scripts/docgen b/config/neovim/store/lazy-plugins/nvim-notify/scripts/docgen
index 48184db9..679b802e 100755
--- a/config/neovim/store/lazy-plugins/nvim-notify/scripts/docgen
+++ b/config/neovim/store/lazy-plugins/nvim-notify/scripts/docgen
@@ -1,3 +1,3 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 nvim --headless -c "luafile ./scripts/gendocs.lua" -c 'qa'
diff --git a/config/neovim/store/lazy-plugins/nvim-notify/scripts/style b/config/neovim/store/lazy-plugins/nvim-notify/scripts/style
index d80e2786..8b9f2b23 100755
--- a/config/neovim/store/lazy-plugins/nvim-notify/scripts/style
+++ b/config/neovim/store/lazy-plugins/nvim-notify/scripts/style
@@ -1,3 +1,3 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 stylua lua tests
diff --git a/config/neovim/store/lazy-plugins/nvim-notify/scripts/test b/config/neovim/store/lazy-plugins/nvim-notify/scripts/test
index 70fcba5d..8c3a8b0a 100755
--- a/config/neovim/store/lazy-plugins/nvim-notify/scripts/test
+++ b/config/neovim/store/lazy-plugins/nvim-notify/scripts/test
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 tempfile=".test_output.tmp"
 
 if [[ -n $1 ]]; then
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/README.md b/config/neovim/store/lazy-plugins/nvim-treesitter/README.md
index 6887b6f7..51ced3a2 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/README.md
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/README.md
@@ -366,6 +366,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [Tree-Sitter query language](https://github.com/nvim-treesitter/tree-sitter-query) (maintained by @steelsojka)
 - [x] [r](https://github.com/r-lib/tree-sitter-r) (maintained by @echasnovski)
 - [ ] [racket](https://github.com/6cdh/tree-sitter-racket)
+- [x] [ralph](https://github.com/alephium/tree-sitter-ralph) (maintained by @tdroxler)
 - [x] [rasi](https://github.com/Fymyte/tree-sitter-rasi) (maintained by @Fymyte)
 - [x] [rbs](https://github.com/joker1007/tree-sitter-rbs) (maintained by @joker1007)
 - [x] [re2c](https://github.com/amaanq/tree-sitter-re2c) (maintained by @amaanq)
@@ -375,7 +376,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [pip requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) (maintained by @ObserverOfTime)
 - [x] [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) (maintained by @bamonroe)
 - [x] [robot](https://github.com/Hubro/tree-sitter-robot) (maintained by @Hubro)
-- [x] [roc](https://github.com/nat-418/tree-sitter-roc) (maintained by @nat-418)
+- [x] [roc](https://github.com/faldor20/tree-sitter-roc) (maintained by @nat-418)
 - [x] [ron](https://github.com/amaanq/tree-sitter-ron) (maintained by @amaanq)
 - [x] [rst](https://github.com/stsewd/tree-sitter-rst) (maintained by @stsewd)
 - [x] [ruby](https://github.com/tree-sitter/tree-sitter-ruby) (maintained by @TravonteD)
@@ -547,11 +548,13 @@ If you want to install the parsers to a custom directory you can specify this
 directory with `parser_install_dir` option in that is passed to `setup`.
 `nvim-treesitter` will then install the parser files into this directory.
 
-This directory must be writeable and must be explicitly added to the
+This directory must be writeable and must be explicitly prepended to the
 `runtimepath`. For example:
 
 ```lua
-  vim.opt.runtimepath:append("/some/path/to/store/parsers")
+  -- It MUST be at the beginning of runtimepath. Otherwise the parsers from Neovim itself
+  -- is loaded that may not be compatible with the queries from the 'nvim-treesitter' plugin.
+  vim.opt.runtimepath:prepend("/some/path/to/store/parsers")
 
   require'nvim-treesitter.configs'.setup {
     parser_install_dir = "/some/path/to/store/parsers",
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/lockfile.json b/config/neovim/store/lazy-plugins/nvim-treesitter/lockfile.json
index 419eeca1..7512cbe7 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/lockfile.json
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
   },
   "arduino": {
-    "revision": "babb6d4da69b359bbb80adbf1fe39c0da9175210"
+    "revision": "afb34b2c65f507932c5c6ddbf0d5a9ca6a772f2f"
   },
   "asm": {
     "revision": "b0306e9bb2ebe01c6562f1aef265cc42ccc53070"
@@ -51,7 +51,7 @@
     "revision": "2326d709fb9cf73cf124fdbc803c267f851721a4"
   },
   "c": {
-    "revision": "00ed08f1a6c18141bfd7a81638e4d239a0bb55cc"
+    "revision": "deca017a554045b4c203e7ddff39ae64ff05e071"
   },
   "c_sharp": {
     "revision": "82fa8f05f41a33e9bc830f85d74a9548f0291738"
@@ -69,7 +69,7 @@
     "revision": "f4236d4da8aa92bc105d9c118746474c608e6af7"
   },
   "cmake": {
-    "revision": "20ffd6d3b4da1acdbf2d08204b2130a5b2f7c4b3"
+    "revision": "4864abb95a1f6e54d6b362677beef9fb674b41e9"
   },
   "comment": {
     "revision": "5d8b29f6ef3bf64d59430dcfe76b31cc44b5abfd"
@@ -81,13 +81,13 @@
     "revision": "4ebe237c1cf64cf3826fc249e9ec0988fe07e58e"
   },
   "corn": {
-    "revision": "604d73c38d4c28ca68e9e441ffd405d68cb63051"
+    "revision": "464654742cbfd3a3de560aba120998f1d5dfa844"
   },
   "cpon": {
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "d29fbff09a8c9ff4f3074de2595dfca12cb33da9"
+    "revision": "7ce8946cae4bb25adebe5b50394f702beb007026"
   },
   "css": {
     "revision": "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af"
@@ -96,7 +96,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "cuda": {
-    "revision": "e7878a9cf4157e9d6c8013ff5605c9f26d62894d"
+    "revision": "1f188eff83b562ffae36d13e1b804ec6f3b9f1d9"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -120,7 +120,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "0e9a836ec47612ade15645fb1680adb549894a6c"
+    "revision": "87bf82874c86dcf563f5521069d603ed50e5f0cc"
   },
   "dockerfile": {
     "revision": "087daa20438a6cc01fa5e6fe6906d77c869d19fe"
@@ -129,25 +129,25 @@
     "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
   },
   "doxygen": {
-    "revision": "4a30eba5d047d6a8c5b005202b4848c0b33d76ca"
+    "revision": "ccd998f378c3f9345ea4eeb223f56d7b84d16687"
   },
   "dtd": {
     "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
   },
   "earthfile": {
-    "revision": "336001d79dd62668088bc6fe6d72a774a449fa2d"
+    "revision": "b5bdcb5813ce0e582fbd8e03eb42c80d3cc8984e"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "eds": {
-    "revision": "5517bdb90c90703df49579a4b04689a614780be2"
+    "revision": "0ad62cb635c2f4353359a88dec9e3a57bbf9f66d"
   },
   "eex": {
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "de690fa8a028f122af46d9d2685679fe5f2d7d60"
+    "revision": "c7ae8b77e2749826dcf23df6514f08fdd68c66a3"
   },
   "elm": {
     "revision": "09dbf221d7491dc8d8839616b27c21b9c025c457"
@@ -162,7 +162,7 @@
     "revision": "38d5004a797298dc42c85e7706c5ceac46a3f29f"
   },
   "erlang": {
-    "revision": "98ea1f9c957b2ad520415eecb5a5b406e931101e"
+    "revision": "b8e44bc0a3b2ce6bceea47c0b1c0f303a6b322b8"
   },
   "facility": {
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
@@ -171,7 +171,7 @@
     "revision": "f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4"
   },
   "fennel": {
-    "revision": "8ad17704b3c2469155947d4e8fcb618cf1328459"
+    "revision": "cfbfa478dc2dbef267ee94ae4323d9c886f45e94"
   },
   "fidl": {
     "revision": "0a8910f293268e27ff554357c229ba172b0eaed2"
@@ -222,13 +222,13 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "8432ffe32ccd360534837256747beb5b1c82fca1"
+    "revision": "02a17bf9d0553406268cdbf466d57808ae712bf3"
   },
   "glimmer": {
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
   },
   "glsl": {
-    "revision": "33a16b6ff4d7206a16f2dc96c40e149c657db65f"
+    "revision": "7f91bf34cadc06a96efc475df501ffca4dda9410"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -279,7 +279,7 @@
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
   },
   "hcl": {
-    "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
+    "revision": "422cbe1d93a8ae3847744b664041fc76876babcd"
   },
   "heex": {
     "revision": "b5ad6e34eea18a15bbd1466ca707a17f9bff7b93"
@@ -291,7 +291,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "a84e8d4f675d0006f7c07f6c7bcea2fca04cdb6e"
+    "revision": "5e1225a30712ca0a9040509806c7ba274a1bbcde"
   },
   "hlsplaylist": {
     "revision": "64f19029339e75d6762feae39e7878595860c980"
@@ -315,13 +315,13 @@
     "revision": "ad705af8c44c737bdb965fc081329c50716d2d03"
   },
   "hyprlang": {
-    "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
+    "revision": "c9012d6dcaaa939f17c21e1fdb17b013d139e6b9"
   },
   "idl": {
-    "revision": "b5b53e2ca0521b98277d5e4b109f0b0e362e850e"
+    "revision": "9f56001f8ed29b0ea9fa4f02813f3e83ab0a2aaa"
   },
   "ini": {
-    "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
+    "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
   },
   "inko": {
     "revision": "234c87be1dac20f766ddf6f486a7bde2a4bc5594"
@@ -330,13 +330,13 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "f3d6e09cc47e76833f23f83b2c59ea0878660953"
+    "revision": "2a05cab838dfec52daa76f10920917d2e69a85bc"
   },
   "java": {
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
   },
   "javascript": {
-    "revision": "a5de24dc7939cb07a758f8d89c089cfdb6f479aa"
+    "revision": "391a8fcc48a11f63bf18ec9885f6f069e760949a"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -357,7 +357,7 @@
     "revision": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596"
   },
   "julia": {
-    "revision": "acd5ca12cc278df7960629c2429a096c7ac4bbea"
+    "revision": "f1baa5f8e271109d01cc8ff7473c11df2d8a9aee"
   },
   "just": {
     "revision": "fd814fc6c579f68c2a642f5e0268cf69daae92d7"
@@ -366,13 +366,13 @@
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
   },
   "kdl": {
-    "revision": "49fb89a854d93b58a65a19724ac307195ca11941"
+    "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
   },
   "kotlin": {
     "revision": "c9cb8504b81684375e7beb8907517dbd6947a1be"
   },
   "koto": {
-    "revision": "919440e1376109bab4edac52594c17c02ae0be5a"
+    "revision": "d4109879ba1387d19095269a7473bd7d274ab848"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -393,7 +393,7 @@
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
   },
   "liquid": {
-    "revision": "293369818da219d97327908aab33707b04b63fd9"
+    "revision": "0419ac4868585320eee8615c90b864a1b04ef433"
   },
   "liquidsoap": {
     "revision": "14feafa91630afb1ab9988cf9b738b7ea29f3f89"
@@ -408,7 +408,7 @@
     "revision": "873612aadd3f684dd4e631bdf42ea8990c57634e"
   },
   "luap": {
-    "revision": "31461ae9bd0866cb5117cfe5de71189854fd0f3e"
+    "revision": "c134aaec6acf4fa95fe4aa0dc9aba3eacdbbe55a"
   },
   "luau": {
     "revision": "5aa9b88a8e3327276ec6e72de997f04ac80b1ae4"
@@ -447,7 +447,7 @@
     "revision": "570f3d7be01fffc751237f4cfcf52d04e20532d1"
   },
   "nickel": {
-    "revision": "52478738c5a072ab3ad62c74db5d0902dab064cd"
+    "revision": "43433d8477b24cd13acaac20a66deda49b7e2547"
   },
   "nim": {
     "revision": "961c2798cec9250c44f7d7225ddb33d47d25856a"
@@ -501,10 +501,10 @@
     "revision": "309cb8d33bcfd0a81050b21be08f9eb3f2fe2138"
   },
   "php": {
-    "revision": "b38c53537769df05871643c9688c264074fb6076"
+    "revision": "4f124bc6075e1c3333e80190c1c170933ed72c95"
   },
   "php_only": {
-    "revision": "b38c53537769df05871643c9688c264074fb6076"
+    "revision": "4f124bc6075e1c3333e80190c1c170933ed72c95"
   },
   "phpdoc": {
     "revision": "1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc"
@@ -555,7 +555,7 @@
     "revision": "daf9b3e2be18b0b2996a1281f7783e0d041d8b80"
   },
   "pymanifest": {
-    "revision": "e3b82b78721aee07f676dac8473ae69db51debcf"
+    "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
     "revision": "71778c2a472ed00a64abf4219544edbf8e4b86d7"
@@ -567,7 +567,7 @@
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
   },
   "qmljs": {
-    "revision": "2c57cac27e207425f8df15327884434cb12365a3"
+    "revision": "febf48a5b6928600cd8fb2a01254743af550780d"
   },
   "query": {
     "revision": "f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0"
@@ -578,11 +578,14 @@
   "racket": {
     "revision": "171f52a8c0ed635b85cd42d1e36d82f1066a03b4"
   },
+  "ralph": {
+    "revision": "48b9d9d6e2b55ce8f9eb09ceb0d952e4b1cc87a0"
+  },
   "rasi": {
     "revision": "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa"
   },
   "rbs": {
-    "revision": "e5e807a50fcd104a2d740d354632fc671700a0bf"
+    "revision": "88d8ed487b5449ddda2fc0c4fe23b71cba29ca24"
   },
   "re2c": {
     "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"
@@ -594,10 +597,10 @@
     "revision": "47007f195752d8e57bda80b0b6cdb2d173a9f7d7"
   },
   "rego": {
-    "revision": "9ac75e71b2d791e0aadeef68098319d86a2a14cf"
+    "revision": "20b5a5958c837bc9f74b231022a68a594a313f6d"
   },
   "requirements": {
-    "revision": "360c6a6b31076a482663806f7a8241de9cad6b4e"
+    "revision": "5ad9b7581b3334f6ad492847d007f2fac6e6e5f2"
   },
   "rnoweb": {
     "revision": "1a74dc0ed731ad07db39f063e2c5a6fe528cae7f"
@@ -606,7 +609,7 @@
     "revision": "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af"
   },
   "roc": {
-    "revision": "7df2c0892e62efb81a7504d9799d4e0d0443d241"
+    "revision": "df46a85abda9f948d38f5d4e3684cec49c42fef2"
   },
   "ron": {
     "revision": "78938553b93075e638035f624973083451b29055"
@@ -633,10 +636,10 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "989bfe5ae69e7bad13454b8f52e4ab0c343d8ded"
+    "revision": "865d79e236c7f0e04276c969453d021d1da4b15f"
   },
   "slint": {
-    "revision": "0701312b74b87fe20e61aa662ba41c5815b5d428"
+    "revision": "d82ab8c19ea1b60ff570256eaef7d137cc5ecb63"
   },
   "smali": {
     "revision": "fdfa6a1febc43c7467aa7e937b87b607956f2346"
@@ -645,10 +648,10 @@
     "revision": "fa898ac0885d1da9a253695c3e0e91f5efc587cd"
   },
   "snakemake": {
-    "revision": "ba1b3868eaa960b945593404af9a7c2f296d3643"
+    "revision": "5a7b14074bca95b25935e865ca8f1efad32317e4"
   },
   "solidity": {
-    "revision": "1c94fe3d5351dfcff3551ec1f49614cbf758e444"
+    "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
   },
   "soql": {
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
@@ -657,13 +660,13 @@
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
   },
   "sourcepawn": {
-    "revision": "227656e72a5f0d430bb82a467bc8078f078bba84"
+    "revision": "645d093763bcaaf7535edbdf6575a5c978b16491"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "25f94f998de79bae9df28add9782f9ea6ea0e2b8"
+    "revision": "89fd00d0aff3bc9985ac37caf362ec4fd9b2ba1d"
   },
   "squirrel": {
     "revision": "0a50d31098e83c668d34d1160a0f6c7d23b571cc"
@@ -678,7 +681,7 @@
     "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"
   },
   "styled": {
-    "revision": "c68a4572e2d6403b6e99066c9a113b43f4a07a27"
+    "revision": "65835cca33a5f033bcde580ed66cde01c1fabbbe"
   },
   "supercollider": {
     "revision": "affa4389186b6939d89673e1e9d2b28364f5ca6f"
@@ -687,10 +690,10 @@
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
   },
   "svelte": {
-    "revision": "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"
+    "revision": "7218cf622b057ae9c530e1f0a7a3ce49806ca55e"
   },
   "swift": {
-    "revision": "26354ddec08c7efde4fa16bd29429f3310d2e2c5"
+    "revision": "d657f98dd6bbc34cb48438c9e5956f15a6d89f1d"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -711,13 +714,13 @@
     "revision": "8784024358c233efd0f3a6fd9e7a3c5852e628bc"
   },
   "teal": {
-    "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
+    "revision": "19b02da829d1721a521bf7b802eb80a50bd53aab"
   },
   "templ": {
     "revision": "cf84ea53e2e2531f23009d676ac206090c1e2392"
   },
   "terraform": {
-    "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
+    "revision": "422cbe1d93a8ae3847744b664041fc76876babcd"
   },
   "textproto": {
     "revision": "8dacf02aa402892c91079f8577998ed5148c0496"
@@ -744,19 +747,19 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "tsx": {
-    "revision": "4ad3010c91d700026d036b5230e2d99ba94ae8a4"
+    "revision": "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
   },
   "twig": {
-    "revision": "eaf80e6af969e25993576477a9dbdba3e48c1305"
+    "revision": "085648e01d1422163a1702a44e72303b4e2a0bd1"
   },
   "typescript": {
-    "revision": "4ad3010c91d700026d036b5230e2d99ba94ae8a4"
+    "revision": "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"
   },
   "typespec": {
-    "revision": "fd9a83c6c0aaaff4b1354454b5b9f130f59dd553"
+    "revision": "28821d0d6da5f0a6b5eb02b9bad953fecafd7248"
   },
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
@@ -780,7 +783,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "7e11a6f8f369df935664fadd2f0c99d90fe3226f"
+    "revision": "e91f8a42de7842f24f4ce600754f2b6651985fd4"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -798,7 +801,7 @@
     "revision": "b448ca63f972ade12c373c808acdd2bf972937db"
   },
   "vimdoc": {
-    "revision": "b711df784dd43d0a8ed8ddbfca0ddcc3239d94b4"
+    "revision": "2249c44ecd3f5cf22da3dcccfb74f816ddb29245"
   },
   "vue": {
     "revision": "22bdfa6c9fc0f5ffa44c6e938ec46869ac8a99ff"
@@ -831,9 +834,9 @@
     "revision": "e877f6ade4b77d5ef8787075141053631ba12318"
   },
   "zathurarc": {
-    "revision": "5918bf1785662c43a841b0b6a27a129337ec3a23"
+    "revision": "6e7c8edfcd6f5f7c12b2fa9ffc6d042f1b6d7068"
   },
   "zig": {
-    "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"
+    "revision": "7c5a29b721d409be8842017351bf007d7e384401"
   }
 }
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/lua/nvim-treesitter/parsers.lua b/config/neovim/store/lazy-plugins/nvim-treesitter/lua/nvim-treesitter/parsers.lua
index d2abb9d5..da2b2f6f 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/lua/nvim-treesitter/parsers.lua
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/lua/nvim-treesitter/parsers.lua
@@ -454,7 +454,7 @@ list.dtd = {
 list.earthfile = {
   install_info = {
     url = "https://github.com/glehmann/tree-sitter-earthfile",
-    files = { "src/parser.c", "src/scanner.c" },
+    files = { "src/parser.c" },
   },
   maintainers = { "@glehmann" },
 }
@@ -1699,6 +1699,14 @@ list.racket = {
   },
 }
 
+list.ralph = {
+  install_info = {
+    url = "https://github.com/alephium/tree-sitter-ralph",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@tdroxler" },
+}
+
 list.rasi = {
   install_info = {
     url = "https://github.com/Fymyte/tree-sitter-rasi",
@@ -1774,7 +1782,7 @@ list.robot = {
 
 list.roc = {
   install_info = {
-    url = "https://github.com/nat-418/tree-sitter-roc",
+    url = "https://github.com/faldor20/tree-sitter-roc",
     files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@nat-418" },
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/lua/nvim-treesitter/query_predicates.lua b/config/neovim/store/lazy-plugins/nvim-treesitter/lua/nvim-treesitter/query_predicates.lua
index 61400e47..2d61ca6b 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/lua/nvim-treesitter/query_predicates.lua
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/lua/nvim-treesitter/query_predicates.lua
@@ -124,7 +124,7 @@ end, true)
 ---@param _bufnr integer
 ---@param pred string[]
 ---@return boolean|nil
-query.add_predicate("has-type?", function(match, _pattern, _bufnr, pred)
+query.add_predicate("kind-eq?", function(match, _pattern, _bufnr, pred)
   if not valid_args(pred[1], pred, 2) then
     return
   end
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/lua/nvim-treesitter/ts_utils.lua b/config/neovim/store/lazy-plugins/nvim-treesitter/lua/nvim-treesitter/ts_utils.lua
index 655c6288..9e9ada6a 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/lua/nvim-treesitter/ts_utils.lua
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/lua/nvim-treesitter/ts_utils.lua
@@ -397,6 +397,7 @@ function M.swap_nodes(node_or_range1, node_or_range2, bufnr, cursor_to_second)
 
   local edit1 = { range = range1, newText = table.concat(text2, "\n") }
   local edit2 = { range = range2, newText = table.concat(text1, "\n") }
+  bufnr = bufnr == 0 and vim.api.nvim_get_current_buf() or bufnr
   vim.lsp.util.apply_text_edits({ edit1, edit2 }, bufnr, "utf-8")
 
   if cursor_to_second then
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/apex/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/apex/highlights.scm
index 85453b22..15b01655 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/apex/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/apex/highlights.scm
@@ -152,6 +152,9 @@
   field: (identifier) @variable.member)
 
 ; Variables
+(variable_declarator
+  (identifier) @property)
+
 (field_declaration
   (modifiers
     (modifier
@@ -167,9 +170,6 @@
   (variable_declarator
     name: (identifier) @constant))
 
-(variable_declarator
-  (identifier) @property)
-
 ((identifier) @constant
   (#lua-match? @constant "^[A-Z][A-Z0-9_]+$")) ; SCREAM SNAKE CASE
 
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/c/indents.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/c/indents.scm
index 372a26c6..1932ce8d 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/c/indents.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/c/indents.scm
@@ -24,14 +24,14 @@
 
 ((for_statement
   body: (_) @_body) @indent.begin
-  (#not-has-type? @_body compound_statement))
+  (#not-kind-eq? @_body "compound_statement"))
 
 (while_statement
   condition: (_) @indent.begin)
 
 ((while_statement
   body: (_) @_body) @indent.begin
-  (#not-has-type? @_body compound_statement))
+  (#not-kind-eq? @_body "compound_statement"))
 
 ((if_statement)
   .
@@ -45,7 +45,7 @@
 (if_statement
   consequence: (_
     ";" @indent.end) @_consequence
-  (#not-has-type? @_consequence compound_statement)
+  (#not-kind-eq? @_consequence "compound_statement")
   alternative: (else_clause
     "else" @indent.branch
     [
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/cmake/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/cmake/highlights.scm
index d6e0f243..fbbf0d54 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/cmake/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/cmake/highlights.scm
@@ -31,8 +31,6 @@
   "$"
   "{"
   "}"
-  "<"
-  ">"
 ] @punctuation.special
 
 [
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/commonlisp/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/commonlisp/highlights.scm
index 84f132e4..7236c84d 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/commonlisp/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/commonlisp/highlights.scm
@@ -105,24 +105,19 @@
   (#lua-match? @variable.builtin "^[*].+[*]$"))
 
 ; quote
-"'" @string.escape
-
 (format_specifier) @string.escape
 
-(quoting_lit) @string.escape
+(quoting_lit
+  "'" @string.escape)
 
-; syntax quote
-"`" @string.escape
+(syn_quoting_lit
+  "`" @string.escape)
 
-"," @string.escape
+(unquoting_lit
+  "," @string.escape)
 
-",@" @string.escape
-
-(syn_quoting_lit) @string.escape
-
-(unquoting_lit) @none
-
-(unquote_splicing_lit) @none
+(unquote_splicing_lit
+  ",@" @string.escape)
 
 [
   "("
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/cooklang/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/cooklang/highlights.scm
index ca870dd4..4ac39189 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/cooklang/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/cooklang/highlights.scm
@@ -1,5 +1,14 @@
 (metadata) @comment
 
+(comment) @comment @spell
+
+[
+  "{"
+  "}"
+] @punctuation.bracket
+
+"%" @punctuation.special
+
 (ingredient
   "@" @punctuation.delimiter
   (name)? @string.special.symbol
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/corn/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/corn/highlights.scm
index 02929146..8f394ed7 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/corn/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/corn/highlights.scm
@@ -1,6 +1,7 @@
-"let" @keyword
-
-"in" @keyword
+[
+  "let"
+  "in"
+] @keyword
 
 [
   "{"
@@ -11,8 +12,15 @@
 
 "." @punctuation.delimiter
 
+[
+  ".."
+  "="
+] @operator
+
 (input) @constant
 
+(null) @constant.builtin
+
 (comment) @comment @spell
 
 (string) @string
@@ -21,6 +29,9 @@
 
 (float) @number.float
 
+(float
+  "." @number.float)
+
 (boolean) @boolean
 
-(null) @keyword
+(path_seg) @property
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/djot/injections.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/djot/injections.scm
index b590e084..078b4036 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/djot/injections.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/djot/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 (code_block
   (language) @injection.language
   (code) @injection.content)
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/ecma/indents.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/ecma/indents.scm
index 03b10c60..96666421 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/ecma/indents.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/ecma/indents.scm
@@ -29,15 +29,15 @@
 
 (arrow_function
   body: (_) @_body
-  (#not-has-type? @_body statement_block)) @indent.begin
+  (#not-kind-eq? @_body "statement_block")) @indent.begin
 
 (assignment_expression
   right: (_) @_right
-  (#not-has-type? @_right arrow_function function)) @indent.begin
+  (#not-kind-eq? @_right "arrow_function" "function")) @indent.begin
 
 (variable_declarator
   value: (_) @_value
-  (#not-has-type? @_value arrow_function call_expression function)) @indent.begin
+  (#not-kind-eq? @_value "arrow_function" "call_expression" "function")) @indent.begin
 
 (arguments
   ")" @indent.end)
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/foam/injections.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/foam/injections.scm
index e1c223bd..b9f8f838 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/foam/injections.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/foam/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ; Pass code blocks to Cpp highlighter
 (code
   (code_body) @injection.content
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/git_rebase/injections.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/git_rebase/injections.scm
index da262866..c831594b 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/git_rebase/injections.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/git_rebase/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ((operation
   (command) @_command
   (message) @injection.content)
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/gitcommit/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/gitcommit/highlights.scm
index 4542413c..a1553051 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/gitcommit/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/gitcommit/highlights.scm
@@ -9,7 +9,7 @@
 
 (change) @keyword
 
-(filepath) @string.special.url
+(filepath) @string.special.path
 
 (arrow) @punctuation.delimiter
 
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/gleam/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/gleam/highlights.scm
index 8754f3ed..9daf9b8b 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/gleam/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/gleam/highlights.scm
@@ -147,9 +147,6 @@
   (type_var)
 ] @type
 
-((type_identifier) @type.builtin
-  (#any-of? @type.builtin "Int" "Float" "String" "List"))
-
 ; Type Qualifiers
 [
   "const"
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/groovy/indents.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/groovy/indents.scm
index 888d5010..ba3a2e84 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/groovy/indents.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/groovy/indents.scm
@@ -19,7 +19,7 @@
 
 ((for_loop
   body: (_) @_body) @indent.begin
-  (#not-has-type? @_body closure))
+  (#not-kind-eq? @_body "closure"))
 
 ; TODO: while, try
 (list
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/hoon/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/hoon/highlights.scm
index d98ee44e..90ac8721 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/hoon/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/hoon/highlights.scm
@@ -20,7 +20,7 @@
 
 (aura) @constant.builtin
 
-(Gap) @comment
+(lineComment) @comment
 
 (boolean) @constant.builtin
 
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/html_tags/indents.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/html_tags/indents.scm
index 6fe984fa..dc57c333 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/html_tags/indents.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/html_tags/indents.scm
@@ -1,13 +1,12 @@
-[
-  ((element
-    (start_tag
-      (tag_name) @_not_void_element))
-    (#not-any-of? @_not_void_element
-      "area" "base" "basefont" "bgsound" "br" "col" "command" "embed" "frame" "hr" "image" "img"
-      "input" "isindex" "keygen" "link" "menuitem" "meta" "nextid" "param" "source" "track" "wbr"))
-  (element
-    (self_closing_tag))
-] @indent.begin
+((element
+  (start_tag
+    (tag_name) @_not_void_element))
+  (#not-any-of? @_not_void_element
+    "area" "base" "basefont" "bgsound" "br" "col" "command" "embed" "frame" "hr" "image" "img"
+    "input" "isindex" "keygen" "link" "menuitem" "meta" "nextid" "param" "source" "track" "wbr")) @indent.begin
+
+(element
+  (self_closing_tag)) @indent.begin
 
 ((start_tag
   (tag_name) @_void_element)
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/htmldjango/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/htmldjango/highlights.scm
index a411e8f1..5648e72f 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/htmldjango/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/htmldjango/highlights.scm
@@ -22,6 +22,15 @@
 
 (variable_name) @variable
 
+(unpaired_statement
+  (tag_name)
+  (variable
+    (variable_name) @variable.parameter)
+  .
+  "="
+  .
+  (_))
+
 (filter_name) @function.method
 
 (filter_argument) @variable.parameter
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/htmldjango/injections.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/htmldjango/injections.scm
index c475757b..2d3bdb6c 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/htmldjango/injections.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/htmldjango/injections.scm
@@ -1,3 +1,9 @@
+([
+  (paired_comment)
+  (unpaired_comment)
+] @injection.content
+  (#set! injection.language "comment"))
+
 ((content) @injection.content
   (#set! injection.language "html")
   (#set! injection.combined))
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/hurl/injections.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/hurl/injections.scm
index ea62b8f5..109d9125 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/hurl/injections.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/hurl/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ; injections.scm
 ((json_value) @injection.content
   (#set! injection.language "json"))
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/hyprlang/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/hyprlang/highlights.scm
index d76993d1..597edcbf 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/hyprlang/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/hyprlang/highlights.scm
@@ -36,6 +36,8 @@
   (legacy_hex)
   (angle)
   (hex)
+  (display)
+  (position)
 ] @number
 
 "deg" @type
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/hyprlang/injections.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/hyprlang/injections.scm
index 1f0199ed..d38d499b 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/hyprlang/injections.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/hyprlang/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 (exec
   (string) @injection.content
   (#set! injection.language "bash"))
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/ispc/indents.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/ispc/indents.scm
index 80723afb..f8c04e3a 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/ispc/indents.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/ispc/indents.scm
@@ -2,8 +2,8 @@
 
 ((foreach_statement
   body: (_) @_body) @indent.begin
-  (#not-has-type? @_body compound_statement))
+  (#not-kind-eq? @_body "compound_statement"))
 
 ((foreach_instance_statement
   body: (_) @_body) @indent.begin
-  (#not-has-type? @_body compound_statement))
+  (#not-kind-eq? @_body "compound_statement"))
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/janet_simple/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/janet_simple/highlights.scm
index 179b4fef..552f865c 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/janet_simple/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/janet_simple/highlights.scm
@@ -75,13 +75,14 @@
     "%=" "*=" "++" "+=" "--" "-=" "->" "->>" "-?>" "-?>>" "/=" "and" "as->" "as-macro" "as?->"
     "assert" "case" "catseq" "chr" "comment" "compif" "comptime" "compwhen" "cond" "coro" "def-"
     "default" "defdyn" "defer" "defmacro" "defmacro-" "defn" "defn-" "delay" "doc" "each" "eachk"
-    "eachp" "eachy"
-    ; XXX: obsolete
-    "edefer" "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread" "ev/with-deadline"
-    "ffi/defbind" "fiber-fn" "for" "forever" "forv" "generate" "if-let" "if-not" "if-with" "import"
-    "juxt" "label" "let" "loop" "match" "or" "prompt" "protect" "repeat" "seq" "short-fn" "tabseq"
-    "toggle" "tracev" "try" "unless" "use" "var-" "varfn" "when" "when-let" "when-with" "with"
-    "with-dyns" "with-syms" "with-vars"))
+    "eachp" "edefer" "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread" "ev/with-deadline"
+    "ev/with-lock" "ev/with-rlock" "ev/with-wlock" "ffi/defbind" "ffi/defbind-alias" "fiber-fn"
+    "for" "forever" "forv" "generate" "if-let" "if-not" "if-with" "import" "juxt" "label" "let"
+    "loop" "match" "or" "prompt" "protect" "repeat" "seq" "short-fn" "tabseq" "toggle" "tracev"
+    "try" "unless" "use" "var-" "varfn" "when" "when-let" "when-with" "with" "with-dyns" "with-env"
+    "with-syms" "with-vars"
+    ; obsolete builtin macros
+    "eachy"))
 
 ; All builtin functions
 ;
@@ -101,74 +102,77 @@
     "abstract?" "accumulate" "accumulate2" "all" "all-bindings" "all-dynamics" "any?" "apply"
     "array" "array/clear" "array/concat" "array/ensure" "array/fill" "array/insert" "array/new"
     "array/new-filled" "array/peek" "array/pop" "array/push" "array/remove" "array/slice"
-    "array/trim" "array?" "asm" "bad-compile" "bad-parse" "band" "blshift" "bnot" "boolean?" "bor"
-    "brshift" "brushift" "buffer" "buffer/bit" "buffer/bit-clear" "buffer/bit-set"
-    "buffer/bit-toggle" "buffer/blit" "buffer/clear" "buffer/fill" "buffer/format" "buffer/new"
-    "buffer/new-filled" "buffer/popn" "buffer/push" "buffer/push-at" "buffer/push-byte"
-    "buffer/push-string" "buffer/push-word" "buffer/slice" "buffer/trim" "buffer?" "bxor" "bytes?"
-    "cancel" "cfunction?" "cli-main" "cmp" "comp" "compare" "compare<" "compare<=" "compare="
-    "compare>" "compare>=" "compile" "complement" "count" "curenv" "debug" "debug/arg-stack"
-    "debug/break" "debug/fbreak" "debug/lineage" "debug/stack" "debug/stacktrace" "debug/step"
-    "debug/unbreak" "debug/unfbreak" "debugger" "debugger-on-status" "dec" "deep-not=" "deep="
-    "defglobal" "describe" "dictionary?" "disasm" "distinct" "div" "doc*" "doc-format" "doc-of"
-    "dofile" "drop" "drop-until" "drop-while" "dyn" "eflush" "empty?" "env-lookup" "eprin" "eprinf"
-    "eprint" "eprintf" "error" "errorf" "ev/acquire-lock" "ev/acquire-rlock" "ev/acquire-wlock"
-    "ev/all-tasks" "ev/call" "ev/cancel" "ev/capacity" "ev/chan" "ev/chan-close" "ev/chunk"
-    "ev/close" "ev/count" "ev/deadline" "ev/full" "ev/give" "ev/give-supervisor" "ev/go" "ev/lock"
-    "ev/read" "ev/release-lock" "ev/release-rlock" "ev/release-wlock" "ev/rselect" "ev/rwlock"
-    "ev/select" "ev/sleep" "ev/take" "ev/thread" "ev/thread-chan" "ev/write" "eval" "eval-string"
-    "even?" "every?" "extreme" "false?" "ffi/align" "ffi/call" "ffi/calling-convetions" "ffi/close"
-    "ffi/context" "ffi/free" "ffi/jitfn" "ffi/lookup" "ffi/malloc" "ffi/native" "ffi/pointer-buffer"
-    "ffi/pointer-cfunction" "ffi/read" "ffi/signature" "ffi/size" "ffi/struct" "ffi/trampoline"
-    "ffi/write" "fiber/can-resume?" "fiber/current" "fiber/getenv" "fiber/last-value"
-    "fiber/maxstack" "fiber/new" "fiber/root" "fiber/setenv" "fiber/setmaxstack" "fiber/status"
-    "fiber?" "file/close" "file/flush" "file/lines" "file/open" "file/read" "file/seek" "file/tell"
-    "file/temp" "file/write" "filter" "find" "find-index" "first" "flatten" "flatten-into" "flush"
-    "flycheck" "freeze" "frequencies" "from-pairs" "function?" "gccollect" "gcinterval"
-    "gcsetinterval" "gensym" "get" "get-in" "getline" "getproto" "group-by" "has-key?" "has-value?"
-    "hash" "idempotent?" "identity" "import*" "in" "inc" "index-of" "indexed?" "int/s64"
-    "int/to-bytes" "int/to-number" "int/u64" "int?" "interleave" "interpose" "invert" "juxt*" "keep"
-    "keep-syntax" "keep-syntax!" "keys" "keyword" "keyword/slice" "keyword?" "kvs" "last" "length"
-    "load-image" "macex" "macex1" "maclintf" "make-env" "make-image" "map" "mapcat" "marshal"
-    "math/abs" "math/acos" "math/acosh" "math/asin" "math/asinh" "math/atan" "math/atan2"
-    "math/atanh" "math/cbrt" "math/ceil" "math/cos" "math/cosh" "math/erf" "math/erfc" "math/exp"
-    "math/exp2" "math/expm1" "math/floor" "math/gamma" "math/gcd" "math/hypot" "math/lcm" "math/log"
-    "math/log-gamma" "math/log10" "math/log1p" "math/log2" "math/next" "math/pow" "math/random"
-    "math/rng" "math/rng-buffer" "math/rng-int" "math/rng-uniform" "math/round" "math/seedrandom"
-    "math/sin" "math/sinh" "math/sqrt" "math/tan" "math/tanh" "math/trunc" "max" "max-of" "mean"
-    "memcmp" "merge" "merge-into" "merge-module" "min" "min-of" "mod" "module/add-paths"
-    "module/expand-path" "module/find" "module/value" "nan?" "nat?" "native" "neg?" "net/accept"
-    "net/accept-loop" "net/address" "net/address-unpack" "net/chunk" "net/close" "net/connect"
-    "net/flush" "net/listen" "net/localname" "net/peername" "net/read" "net/recv-from" "net/send-to"
-    "net/server" "net/setsockopt" "net/shutdown" "net/write" "next" "nil?" "not" "not=" "number?"
-    "odd?" "one?" "os/arch" "os/cd" "os/chmod" "os/clock" "os/compiler" "os/cpu-count"
-    "os/cryptorand" "os/cwd" "os/date" "os/dir" "os/environ" "os/execute" "os/exit" "os/getenv"
-    "os/link" "os/lstat" "os/mkdir" "os/mktime" "os/open" "os/perm-int" "os/perm-string" "os/pipe"
-    "os/proc-close" "os/proc-kill" "os/proc-wait" "os/readlink" "os/realpath" "os/rename" "os/rm"
-    "os/rmdir" "os/setenv" "os/shell" "os/sleep" "os/spawn" "os/stat" "os/symlink" "os/time"
-    "os/touch" "os/umask" "os/which" "pairs" "parse" "parse-all" "parser/byte" "parser/clone"
-    "parser/consume" "parser/eof" "parser/error" "parser/flush" "parser/has-more" "parser/insert"
-    "parser/new" "parser/produce" "parser/state" "parser/status" "parser/where" "partial"
-    "partition" "partition-by" "peg/compile" "peg/find" "peg/find-all" "peg/match" "peg/replace"
-    "peg/replace-all" "pos?" "postwalk" "pp" "prewalk" "prin" "prinf" "print" "printf" "product"
-    "propagate" "put" "put-in" "quit" "range" "reduce" "reduce2" "repl" "require" "resume" "return"
-    "reverse" "reverse!" "run-context" "sandbox" "scan-number" "setdyn" "signal" "slice" "slurp"
-    "some" "sort" "sort-by" "sorted" "sorted-by" "spit" "string" "string/ascii-lower"
-    "string/ascii-upper" "string/bytes" "string/check-set" "string/find" "string/find-all"
-    "string/format" "string/from-bytes" "string/has-prefix?" "string/has-suffix?" "string/join"
-    "string/repeat" "string/replace" "string/replace-all" "string/reverse" "string/slice"
-    "string/split" "string/trim" "string/triml" "string/trimr" "string?" "struct" "struct/getproto"
-    "struct/proto-flatten" "struct/to-table" "struct/with-proto" "struct?" "sum" "symbol"
-    "symbol/slice" "symbol?" "table" "table/clear" "table/clone" "table/getproto" "table/new"
-    "table/proto-flatten" "table/rawget" "table/setproto" "table/to-struct" "table?" "take"
-    "take-until" "take-while"
+    "array/trim" "array/weak" "array?" "asm" "bad-compile" "bad-parse" "band" "blshift" "bnot"
+    "boolean?" "bor" "brshift" "brushift" "buffer" "buffer/bit" "buffer/bit-clear" "buffer/bit-set"
+    "buffer/bit-toggle" "buffer/blit" "buffer/clear" "buffer/fill" "buffer/format"
+    "buffer/format-at" "buffer/from-bytes" "buffer/new" "buffer/new-filled" "buffer/popn"
+    "buffer/push" "buffer/push-at" "buffer/push-byte" "buffer/push-float32" "buffer/push-float64"
+    "buffer/push-string" "buffer/push-uint16" "buffer/push-uint32" "buffer/push-uint64"
+    "buffer/push-word" "buffer/slice" "buffer/trim" "buffer?" "bundle/add" "bundle/add-directory"
+    "bundle/add-file" "bundle/install" "bundle/installed?" "bundle/list" "bundle/manifest"
+    "bundle/prune" "bundle/reinstall" "bundle/topolist" "bundle/uninstall" "bundle/update-all"
+    "bxor" "bytes?" "cancel" "cfunction?" "cli-main" "cmp" "comp" "compare" "compare<" "compare<="
+    "compare=" "compare>" "compare>=" "compile" "complement" "count" "curenv" "debug"
+    "debug/arg-stack" "debug/break" "debug/fbreak" "debug/lineage" "debug/stack" "debug/stacktrace"
+    "debug/step" "debug/unbreak" "debug/unfbreak" "debugger" "debugger-on-status" "dec" "deep-not="
+    "deep=" "defglobal" "describe" "dictionary?" "disasm" "distinct" "div" "doc*" "doc-format"
+    "doc-of" "dofile" "drop" "drop-until" "drop-while" "dyn" "eflush" "empty?" "env-lookup" "eprin"
+    "eprinf" "eprint" "eprintf" "error" "errorf" "ev/acquire-lock" "ev/acquire-rlock"
+    "ev/acquire-wlock" "ev/all-tasks" "ev/call" "ev/cancel" "ev/capacity" "ev/chan" "ev/chan-close"
+    "ev/chunk" "ev/close" "ev/count" "ev/deadline" "ev/full" "ev/give" "ev/give-supervisor" "ev/go"
+    "ev/lock" "ev/read" "ev/release-lock" "ev/release-rlock" "ev/release-wlock" "ev/rselect"
+    "ev/rwlock" "ev/select" "ev/sleep" "ev/take" "ev/thread" "ev/thread-chan" "ev/write" "eval"
+    "eval-string" "even?" "every?" "extreme" "false?" "ffi/align" "ffi/call"
+    "ffi/calling-conventions" "ffi/close" "ffi/context" "ffi/free" "ffi/jitfn" "ffi/lookup"
+    "ffi/malloc" "ffi/native" "ffi/pointer-buffer" "ffi/pointer-cfunction" "ffi/read"
+    "ffi/signature" "ffi/size" "ffi/struct" "ffi/trampoline" "ffi/write" "fiber/can-resume?"
+    "fiber/current" "fiber/getenv" "fiber/last-value" "fiber/maxstack" "fiber/new" "fiber/root"
+    "fiber/setenv" "fiber/setmaxstack" "fiber/status" "fiber?" "file/close" "file/flush"
+    "file/lines" "file/open" "file/read" "file/seek" "file/tell" "file/temp" "file/write" "filter"
+    "find" "find-index" "first" "flatten" "flatten-into" "flush" "flycheck" "freeze" "frequencies"
+    "from-pairs" "function?" "gccollect" "gcinterval" "gcsetinterval" "gensym" "get" "get-in"
+    "getline" "getproto" "group-by" "has-key?" "has-value?" "hash" "idempotent?" "identity"
+    "import*" "in" "inc" "index-of" "indexed?" "int/s64" "int/to-bytes" "int/to-number" "int/u64"
+    "int?" "interleave" "interpose" "invert" "juxt*" "keep" "keep-syntax" "keep-syntax!" "keys"
+    "keyword" "keyword/slice" "keyword?" "kvs" "last" "length" "lengthable?" "load-image" "macex"
+    "macex1" "maclintf" "make-env" "make-image" "map" "mapcat" "marshal" "math/abs" "math/acos"
+    "math/acosh" "math/asin" "math/asinh" "math/atan" "math/atan2" "math/atanh" "math/cbrt"
+    "math/ceil" "math/cos" "math/cosh" "math/erf" "math/erfc" "math/exp" "math/exp2" "math/expm1"
+    "math/floor" "math/frexp" "math/gamma" "math/gcd" "math/hypot" "math/lcm" "math/ldexp"
+    "math/log" "math/log-gamma" "math/log10" "math/log1p" "math/log2" "math/next" "math/pow"
+    "math/random" "math/rng" "math/rng-buffer" "math/rng-int" "math/rng-uniform" "math/round"
+    "math/seedrandom" "math/sin" "math/sinh" "math/sqrt" "math/tan" "math/tanh" "math/trunc" "max"
+    "max-of" "mean" "memcmp" "merge" "merge-into" "merge-module" "min" "min-of" "mod"
+    "module/add-paths" "module/expand-path" "module/find" "module/value" "nan?" "nat?" "native"
+    "neg?" "net/accept" "net/accept-loop" "net/address" "net/address-unpack" "net/chunk" "net/close"
+    "net/connect" "net/flush" "net/listen" "net/localname" "net/peername" "net/read" "net/recv-from"
+    "net/send-to" "net/server" "net/setsockopt" "net/shutdown" "net/write" "next" "nil?" "not"
+    "not=" "number?" "odd?" "one?" "os/arch" "os/cd" "os/chmod" "os/clock" "os/compiler"
+    "os/cpu-count" "os/cryptorand" "os/cwd" "os/date" "os/dir" "os/environ" "os/execute" "os/exit"
+    "os/getenv" "os/isatty" "os/link" "os/lstat" "os/mkdir" "os/mktime" "os/open" "os/perm-int"
+    "os/perm-string" "os/pipe" "os/posix-exec" "os/posix-fork" "os/proc-close" "os/proc-kill"
+    "os/proc-wait" "os/readlink" "os/realpath" "os/rename" "os/rm" "os/rmdir" "os/setenv"
+    "os/setlocale" "os/shell" "os/sigaction" "os/sleep" "os/spawn" "os/stat" "os/strftime"
+    "os/symlink" "os/time" "os/touch" "os/umask" "os/which" "pairs" "parse" "parse-all"
+    "parser/byte" "parser/clone" "parser/consume" "parser/eof" "parser/error" "parser/flush"
+    "parser/has-more" "parser/insert" "parser/new" "parser/produce" "parser/state" "parser/status"
+    "parser/where" "partial" "partition" "partition-by" "peg/compile" "peg/find" "peg/find-all"
+    "peg/match" "peg/replace" "peg/replace-all" "pos?" "postwalk" "pp" "prewalk" "prin" "prinf"
+    "print" "printf" "product" "propagate" "put" "put-in" "quit" "range" "reduce" "reduce2" "repl"
+    "require" "resume" "return" "reverse" "reverse!" "run-context" "sandbox" "scan-number" "setdyn"
+    "signal" "slice" "slurp" "some" "sort" "sort-by" "sorted" "sorted-by" "spit" "string"
+    "string/ascii-lower" "string/ascii-upper" "string/bytes" "string/check-set" "string/find"
+    "string/find-all" "string/format" "string/from-bytes" "string/has-prefix?" "string/has-suffix?"
+    "string/join" "string/repeat" "string/replace" "string/replace-all" "string/reverse"
+    "string/slice" "string/split" "string/trim" "string/triml" "string/trimr" "string?" "struct"
+    "struct/getproto" "struct/proto-flatten" "struct/to-table" "struct/with-proto" "struct?" "sum"
+    "symbol" "symbol/slice" "symbol?" "table" "table/clear" "table/clone" "table/getproto"
+    "table/new" "table/proto-flatten" "table/rawget" "table/setproto" "table/to-struct" "table/weak"
+    "table/weak-keys" "table/weak-values" "table?" "take" "take-until" "take-while" "thaw" "trace"
+    "true?" "truthy?" "tuple" "tuple/brackets" "tuple/setmap" "tuple/slice" "tuple/sourcemap"
+    "tuple/type" "tuple?" "type" "unmarshal" "untrace" "update" "update-in" "values" "varglobal"
+    "walk" "warn-compile" "xprin" "xprinf" "xprint" "xprintf" "yield" "zero?" "zipcoll"
     ; XXX: obsolete
     "tarray/buffer" "tarray/copy-bytes" "tarray/length" "tarray/new" "tarray/properties"
-    "tarray/slice" "tarray/swap-bytes"
-    ; XXX: obsolete
-    "thread/close" "thread/current" "thread/exit" "thread/new" "thread/receive" "thread/send"
-    ; end of obsolete
-    "trace" "true?" "truthy?" "tuple" "tuple/brackets" "tuple/setmap" "tuple/slice"
-    "tuple/sourcemap" "tuple/type" "tuple?" "type" "unmarshal" "untrace" "update" "update-in"
-    "values" "varglobal" "walk" "warn-compile" "xprin" "xprinf" "xprint" "xprintf" "yield" "zero?"
-    "zipcoll"))
+    "tarray/slice" "tarray/swap-bytes" "thread/close" "thread/current" "thread/exit" "thread/new"
+    "thread/receive" "thread/send"))
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/jq/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/jq/highlights.scm
index d994d759..5d6050f4 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/jq/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/jq/highlights.scm
@@ -58,26 +58,25 @@
 ; jq -n 'builtins | map(split("/")[0]) | unique | .[]'
 ((funcname) @function.builtin
   (#any-of? @function.builtin
-    "IN" "INDEX" "JOIN" "acos" "acosh" "add" "all" "any" "arrays" "ascii_downcase" "ascii_upcase"
-    "asin" "asinh" "atan" "atan2" "atanh" "booleans" "bsearch" "builtins" "capture" "cbrt" "ceil"
-    "combinations" "contains" "copysign" "cos" "cosh" "debug" "del" "delpaths" "drem" "empty"
-    "endswith" "env" "erf" "erfc" "error" "exp" "exp10" "exp2" "explode" "expm1" "fabs" "fdim"
-    "finites" "first" "flatten" "floor" "fma" "fmax" "fmin" "fmod" "format" "frexp" "from_entries"
-    "fromdate" "fromdateiso8601" "fromjson" "fromstream" "gamma" "get_jq_origin" "get_prog_origin"
-    "get_search_list" "getpath" "gmtime" "group_by" "gsub" "halt" "halt_error" "has" "hypot"
-    "implode" "in" "index" "indices" "infinite" "input" "input_filename" "input_line_number"
-    "inputs" "inside" "isempty" "isfinite" "isinfinite" "isnan" "isnormal" "iterables" "j0" "j1"
-    "jn" "join" "keys" "keys_unsorted" "last" "ldexp" "leaf_paths" "length" "lgamma" "lgamma_r"
-    "limit" "localtime" "log" "log10" "log1p" "log2" "logb" "ltrimstr" "map" "map_values" "match"
-    "max" "max_by" "min" "min_by" "mktime" "modf" "modulemeta" "nan" "nearbyint" "nextafter"
-    "nexttoward" "normals" "not" "now" "nth" "nulls" "numbers" "objects" "path" "paths" "pow"
-    "pow10" "range" "recurse" "recurse_down" "remainder" "repeat" "reverse" "rindex" "rint" "round"
-    "rtrimstr" "scalars" "scalars_or_empty" "scalb" "scalbln" "scan" "select" "setpath"
-    "significand" "sin" "sinh" "sort" "sort_by" "split" "splits" "sqrt" "startswith" "stderr"
-    "strflocaltime" "strftime" "strings" "strptime" "sub" "tan" "tanh" "test" "tgamma" "to_entries"
-    "todate" "todateiso8601" "tojson" "tonumber" "tostream" "tostring" "transpose" "trunc"
-    "truncate_stream" "type" "unique" "unique_by" "until" "utf8bytelength" "values" "walk" "while"
-    "with_entries" "y0" "y1" "yn"))
+    "IN" "INDEX" "JOIN" "abs" "acos" "acosh" "add" "all" "any" "arrays" "ascii_downcase"
+    "ascii_upcase" "asin" "asinh" "atan" "atan2" "atanh" "booleans" "bsearch" "builtins" "capture"
+    "cbrt" "ceil" "combinations" "contains" "copysign" "cos" "cosh" "debug" "del" "delpaths" "drem"
+    "empty" "endswith" "env" "erf" "erfc" "error" "exp" "exp10" "exp2" "explode" "expm1" "fabs"
+    "fdim" "finites" "first" "flatten" "floor" "fma" "fmax" "fmin" "fmod" "format" "frexp"
+    "from_entries" "fromdate" "fromdateiso8601" "fromjson" "fromstream" "gamma" "get_jq_origin"
+    "get_prog_origin" "get_search_list" "getpath" "gmtime" "group_by" "gsub" "halt" "halt_error"
+    "has" "hypot" "implode" "in" "index" "indices" "infinite" "input" "input_filename"
+    "input_line_number" "inputs" "inside" "isempty" "isfinite" "isinfinite" "isnan" "isnormal"
+    "iterables" "j0" "j1" "jn" "join" "keys" "keys_unsorted" "last" "ldexp" "length" "lgamma"
+    "lgamma_r" "limit" "localtime" "log" "log10" "log1p" "log2" "logb" "ltrimstr" "map" "map_values"
+    "match" "max" "max_by" "min" "min_by" "mktime" "modf" "modulemeta" "nan" "nearbyint" "nextafter"
+    "nexttoward" "normals" "not" "now" "nth" "nulls" "numbers" "objects" "path" "paths" "pick" "pow"
+    "pow10" "range" "recurse" "remainder" "repeat" "reverse" "rindex" "rint" "round" "rtrimstr"
+    "scalars" "scalb" "scalbln" "scan" "select" "setpath" "significand" "sin" "sinh" "sort"
+    "sort_by" "split" "splits" "sqrt" "startswith" "stderr" "strflocaltime" "strftime" "strings"
+    "strptime" "sub" "tan" "tanh" "test" "tgamma" "to_entries" "todate" "todateiso8601" "tojson"
+    "tonumber" "tostream" "tostring" "transpose" "trunc" "truncate_stream" "type" "unique"
+    "unique_by" "until" "utf8bytelength" "values" "walk" "while" "with_entries" "y0" "y1" "yn"))
 
 ; Keywords
 [
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/just/injections.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/just/injections.scm
index dab656b6..90db6b72 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/just/injections.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/just/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ; The right side of =~ literals
 (regex_literal
   (_) @injection.content
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/koto/locals.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/koto/locals.scm
index 7c7097e1..c1848748 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/koto/locals.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/koto/locals.scm
@@ -4,16 +4,16 @@
 
 ; Definitions
 (arg
-  (identifier) @local.definition.parameter)
+  (variable) @local.definition.parameter)
 
 (assign
   (identifier) @local.definition.var)
 
 (for_args
-  (identifier) @local.definition.var)
+  (variable) @local.definition.var)
 
 (match_patterns
-  (identifier) @local.definition.var)
+  (variable) @local.definition.var)
 
 (import_item
   (identifier) @local.definition.import)
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/liquidsoap/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/liquidsoap/highlights.scm
index 38a38654..c5608f89 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/liquidsoap/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/liquidsoap/highlights.scm
@@ -104,7 +104,7 @@
 
 (bool) @boolean
 
-(comment) @comment
+(comment) @comment @spell
 
 (regexp) @string.regexp
 
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/lua/indents.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/lua/indents.scm
index 2c3dc244..c05cc4e5 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/lua/indents.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/lua/indents.scm
@@ -12,7 +12,6 @@
   (return_statement)
   (table_constructor)
   (arguments)
-  (return_statement)
 ] @indent.begin
 
 [
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/markdown/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/markdown/highlights.scm
index 4b445e02..a9ce4df2 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/markdown/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/markdown/highlights.scm
@@ -8,28 +8,22 @@
   (setext_h2_underline) @markup.heading.2)
 
 (atx_heading
-  (atx_h1_marker) @markup.heading.1
-  (inline) @markup.heading.1)
+  (atx_h1_marker)) @markup.heading.1
 
 (atx_heading
-  (atx_h2_marker) @markup.heading.2
-  (inline) @markup.heading.2)
+  (atx_h2_marker)) @markup.heading.2
 
 (atx_heading
-  (atx_h3_marker) @markup.heading.3
-  (inline) @markup.heading.3)
+  (atx_h3_marker)) @markup.heading.3
 
 (atx_heading
-  (atx_h4_marker) @markup.heading.4
-  (inline) @markup.heading.4)
+  (atx_h4_marker)) @markup.heading.4
 
 (atx_heading
-  (atx_h5_marker) @markup.heading.5
-  (inline) @markup.heading.5)
+  (atx_h5_marker)) @markup.heading.5
 
 (atx_heading
-  (atx_h6_marker) @markup.heading.6
-  (inline) @markup.heading.6)
+  (atx_h6_marker)) @markup.heading.6
 
 (info_string) @label
 
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/markdown_inline/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/markdown_inline/highlights.scm
index 233ab411..10bb5b06 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/markdown_inline/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/markdown_inline/highlights.scm
@@ -85,12 +85,15 @@
 [
   (link_destination)
   (uri_autolink)
+  (email_autolink)
 ] @markup.link.url @nospell
 
+(entity_reference) @nospell
+
 ; Replace common HTML entities.
 ((entity_reference) @character.special
   (#eq? @character.special "&nbsp;")
-  (#set! conceal ""))
+  (#set! conceal " "))
 
 ((entity_reference) @character.special
   (#eq? @character.special "&lt;")
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/menhir/injections.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/menhir/injections.scm
index 9343d60a..16a3f815 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/menhir/injections.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/menhir/injections.scm
@@ -1,2 +1,9 @@
+([
+  (comment)
+  (line_comment)
+  (ocaml_comment)
+] @injection.content
+  (#set! injection.language "comment"))
+
 ((ocaml) @injection.content
   (#set! injection.language "ocaml"))
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/ocaml/indents.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/ocaml/indents.scm
index 9181dcad..d7f05367 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/ocaml/indents.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/ocaml/indents.scm
@@ -28,7 +28,7 @@
 
 ((else_clause
   (_) @_not_if) @indent.begin
-  (#not-has-type? @_not_if if_expression))
+  (#not-kind-eq? @_not_if "if_expression"))
 
 ((parameter) @indent.begin
   (#set! indent.start_at_same_line))
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/odin/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/odin/highlights.scm
index 9e65937a..ea8d401e 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/odin/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/odin/highlights.scm
@@ -192,7 +192,7 @@
   (identifier) @type)
 
 ((identifier) @type
-  (#lua-match? @type "^[A-Z][a-zA-Z0-9]*$")
+  (#lua-match? @type "^[_A-Z][_a-zA-Z0-9]*$")
   (#not-has-parent? @type parameter procedure_declaration call_expression))
 
 ; Fields
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/php_only/indents.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/php_only/indents.scm
index ca619a32..4a67a8b0 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/php_only/indents.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/php_only/indents.scm
@@ -23,9 +23,6 @@
     (match_expression)
   ]) @indent.dedent
 
-(member_call_expression
-  object: (member_call_expression) @indent.branch)
-
 [
   ")"
   "}"
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/promql/injections.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/promql/injections.scm
index 4fbe37a0..4e7c1b26 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/promql/injections.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/promql/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ((label_value) @injection.content
   (#set! injection.language "regex")
   (#offset! @injection.content 0 1 0 -1))
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/pug/injections.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/pug/injections.scm
index d4bd712b..0c01e47e 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/pug/injections.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/pug/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ((javascript) @injection.content
   (#set! injection.language "javascript"))
 
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/roc/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/roc/highlights.scm
index d47c8770..89b42a6a 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/roc/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/roc/highlights.scm
@@ -79,29 +79,12 @@
 ] @keyword
 
 ;----headers-----
-(interface_header
-  (name) @type.definition)
-
-(imports
-  (imports_entry
-    (module) @module))
-
-(packages
-  (record_pattern
-    (record_field_pattern
-      (field_name) @module)))
-
-(app_name) @string.special
-
-(import_path) @string.special.path
-
 [
   "app"
-  "packages"
-  "provides"
-  "interface"
-  "exposes"
   "expect"
+  "module"
+  "package"
+  "import"
 ] @keyword
 
 [
@@ -184,6 +167,9 @@
   (float)
 ] @number.float
 
-(string) @string
+[
+  (string)
+  (multiline_string)
+] @string
 
 (char) @character
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/roc/locals.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/roc/locals.scm
index 71bb1940..134fe011 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/roc/locals.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/roc/locals.scm
@@ -8,6 +8,10 @@
 (exposes_list
   (ident) @local.reference)
 
+(import_expr
+  (as)
+  (module) @local.definition)
+
 (opaque_type_def
   (apply_type
     (concrete_type) @local.definition.type))
@@ -31,9 +35,6 @@
 (identifier_pattern
   (identifier) @local.definition)
 
-(exposes
-  (ident) @local.reference)
-
 (identifier) @local.reference
 
 (tag_expr
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/rust/folds.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/rust/folds.scm
index e5721c02..54290419 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/rust/folds.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/rust/folds.scm
@@ -21,4 +21,5 @@
   (macro_definition)
   (macro_invocation)
   (attribute_item)
+  (block)
 ] @fold
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/scala/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/scala/highlights.scm
index ffecefaf..5f3936d2 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/scala/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/scala/highlights.scm
@@ -120,6 +120,9 @@
 (binding
   name: (identifier) @variable.parameter)
 
+(lambda_expression
+  parameters: (identifier) @variable.parameter)
+
 ; expressions
 (field_expression
   field: (identifier) @variable.member)
@@ -177,7 +180,6 @@
   ; `macro` not implemented yet
   "object"
   "override"
-  "package"
   "val"
   "var"
   "with"
@@ -211,6 +213,8 @@
 
 (wildcard) @variable.parameter
 
+(namespace_wildcard) @punctuation.special
+
 (annotation) @attribute
 
 ; special keywords
@@ -235,6 +239,7 @@
 [
   "."
   ","
+  ":"
 ] @punctuation.delimiter
 
 [
@@ -248,6 +253,9 @@
 
 [
   "=>"
+  "?=>"
+  "="
+  "!"
   "<-"
   "@"
 ] @operator
@@ -255,6 +263,7 @@
 [
   "import"
   "export"
+  "package"
 ] @keyword.import
 
 [
@@ -278,6 +287,10 @@
   (case_clause
     "case" @keyword.conditional))
 
+(case_block
+  (case_clause
+    "=>" @punctuation.delimiter))
+
 (operator_identifier) @operator
 
 ((identifier) @type
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/snakemake/folds.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/snakemake/folds.scm
index 99850bd9..d154f3cd 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/snakemake/folds.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/snakemake/folds.scm
@@ -2,6 +2,7 @@
 
 [
   (rule_definition)
+  (rule_inheritance)
   (module_definition)
   (checkpoint_definition)
 ] @fold
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/swift/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/swift/highlights.scm
index decb506e..562be5e3 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/swift/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/swift/highlights.scm
@@ -100,6 +100,8 @@
   (modify_specifier)
 ] @keyword
 
+(shebang_line) @keyword.directive
+
 (class_body
   (property_declaration
     (pattern
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/swift/indents.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/swift/indents.scm
index f208292c..2366c3bd 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/swift/indents.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/swift/indents.scm
@@ -66,7 +66,7 @@
     (_)* @indent.branch)
   .
   _ @indent.branch
-  (#not-has-type? @indent.branch type_parameters parameter))
+  (#not-kind-eq? @indent.branch "type_parameters" "parameter"))
 
 (ERROR
   [
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/teal/injections.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/teal/injections.scm
index ac42de4e..830b745b 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/teal/injections.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/teal/injections.scm
@@ -33,7 +33,8 @@
 ; ('...'):format()
 ((function_call
   (method_index
-    (string) @printf
+    (parenthesized_expression
+      (string) @printf)
     key: (identifier) @_func))
   (#eq? @_func "format")
   (#set! injection.language "printf"))
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/textproto/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/textproto/highlights.scm
index 45136221..527af039 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/textproto/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/textproto/highlights.scm
@@ -2,7 +2,7 @@
 
 (field_name) @variable.member
 
-(comment) @comment
+(comment) @comment @spell
 
 (number) @number
 
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/twig/injections.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/twig/injections.scm
index c475757b..3fd93feb 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/twig/injections.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/twig/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ((content) @injection.content
   (#set! injection.language "html")
   (#set! injection.combined))
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/vimdoc/highlights.scm b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/vimdoc/highlights.scm
index 70a3a2f2..194c8036 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/queries/vimdoc/highlights.scm
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/queries/vimdoc/highlights.scm
@@ -1,13 +1,19 @@
-(h1) @markup.heading.1
+(h1
+  (delimiter) @markup.heading.1
+  (heading) @markup.heading.1)
 
-(h2) @markup.heading.2
+(h2
+  (delimiter) @markup.heading.2
+  (heading) @markup.heading.2)
 
-(h3) @markup.heading.3
-
-(column_heading) @markup.heading.4
+(h3
+  (heading) @markup.heading.3)
 
 (column_heading
-  "~" @markup.heading.4
+  (heading) @markup.heading.4)
+
+(column_heading
+  (delimiter) @markup.heading.4
   (#set! conceal ""))
 
 (tag
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/check-queries.lua b/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/check-queries.lua
index bcab2129..43e40809 100755
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/check-queries.lua
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/check-queries.lua
@@ -1,4 +1,4 @@
-#!/nix/store/php4qidg2bxzmm79vpri025bqi0fa889-coreutils-9.5/bin/env -S  -l
+#!/nix/store/i7qhgc0bs725qw3wdanznfkdna4z2ns2-coreutils-9.5/bin/env -S  -l
 vim.opt.rtp:prepend "./"
 
 -- Equivalent to print(), but this will ensure consistent output regardless of
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/ci-install.sh b/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/ci-install.sh
index 2418a0df..d9b2f2c7 100755
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/ci-install.sh
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/ci-install.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 set -e
 
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/format-queries.lua b/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/format-queries.lua
index ce89b043..125b5281 100755
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/format-queries.lua
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/format-queries.lua
@@ -1,4 +1,4 @@
-#!/nix/store/php4qidg2bxzmm79vpri025bqi0fa889-coreutils-9.5/bin/env -S  -l
+#!/nix/store/i7qhgc0bs725qw3wdanznfkdna4z2ns2-coreutils-9.5/bin/env -S  -l
 
 local ts = vim.treesitter
 local get_node_text = ts.get_node_text
@@ -13,7 +13,7 @@ else
   files = vim.fn.split(vim.fn.glob(arg .. "/**/*.scm"))
 end
 
-ts.query.add_predicate("has-type?", function(match, _, _, pred)
+ts.query.add_predicate("kind-eq?", function(match, _, _, pred)
   local node = match[pred[2]]
   if not node then
     return true
@@ -132,7 +132,7 @@ local format_queries = [[
 ;; Append newlines for nodes inside the list
 (list
   (_) @format.append-newline
-  (#not-has-type? @format.append-newline capture quantifier))
+  (#not-kind-eq? @format.append-newline "capture" "quantifier"))
 
 ;; (_), "_" and _ handler
 ;; Start indents if it's one of these patterns
@@ -194,7 +194,7 @@ local format_queries = [[
   ] @format.cancel-append
   .
   ")"
-  (#not-has-type? @format.cancel-append comment))
+  (#not-kind-eq? @format.cancel-append "comment"))
 
 ;; All captures should be separated with a space
 (capture) @format.prepend-space
@@ -233,7 +233,7 @@ local format_queries = [[
 ;; Collapsing closing parens
 (grouping
   (_) @format.cancel-append . ")"
-  (#not-has-type? @format.cancel-append comment))
+  (#not-kind-eq? @format.cancel-append "comment"))
 (grouping
   (capture) @format.prepend-space)
 ;; Remove unnecessary parens
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/pre-push b/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/pre-push
index ef4b0eda..bdcbc8fd 100755
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/pre-push
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/pre-push
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 # Can be used as a pre-push hook
 # Just symlink this file to .git/hooks/pre-push
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/run_tests.sh b/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/run_tests.sh
index cd22c93f..3c413eee 100755
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/run_tests.sh
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/run_tests.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 HERE="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
 cd $HERE/..
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/update-lockfile.sh b/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/update-lockfile.sh
index 532c98a7..ce49d38f 100755
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/update-lockfile.sh
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/update-lockfile.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 make_ignored() {
   if [[ -n $1 ]]; then
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/update-readme.lua b/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/update-readme.lua
index cd903b89..12e00341 100755
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/update-readme.lua
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/update-readme.lua
@@ -1,4 +1,4 @@
-#!/nix/store/php4qidg2bxzmm79vpri025bqi0fa889-coreutils-9.5/bin/env -S  -l
+#!/nix/store/i7qhgc0bs725qw3wdanznfkdna4z2ns2-coreutils-9.5/bin/env -S  -l
 
 ---@class Parser
 ---@field name string
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/write-lockfile.lua b/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/write-lockfile.lua
index 8aa833dd..e3384c71 100755
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/write-lockfile.lua
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/scripts/write-lockfile.lua
@@ -1,4 +1,4 @@
-#!/nix/store/php4qidg2bxzmm79vpri025bqi0fa889-coreutils-9.5/bin/env -S  -l
+#!/nix/store/i7qhgc0bs725qw3wdanznfkdna4z2ns2-coreutils-9.5/bin/env -S  -l
 
 ---@type string|any[]
 local skip_langs = vim.fn.getenv "SKIP_LOCKFILE_UPDATE_FOR_LANGS"
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/tests/query/highlights/gleam/function.gleam b/config/neovim/store/lazy-plugins/nvim-treesitter/tests/query/highlights/gleam/function.gleam
index f1924aaf..15fc5cc7 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/tests/query/highlights/gleam/function.gleam
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/tests/query/highlights/gleam/function.gleam
@@ -5,14 +5,14 @@ pub fn add(x: Int, y: Int) -> Int {
 //        ^ @punctuation.bracket
 //         ^ @variable.parameter
 //          ^ @punctuation.delimiter
-//            ^^^ @type.builtin
+//            ^^^ @type
 //               ^ @punctuation.delimiter
 //                 ^ @variable.parameter
 //                  ^ @punctuation.delimiter
-//                    ^^^ @type.builtin
+//                    ^^^ @type
 //                       ^ @punctuation.bracket
 //                         ^ @punctuation.delimiter
-//                            ^^^ @type.builtin
+//                            ^^^ @type
 //                                ^ @punctuation.bracket
 }
 // <- @punctuation.bracket
@@ -50,7 +50,7 @@ fn list_of_two(my_value: a) -> List(a) {
 //                       ^ @type
 //                        ^ @punctuation.bracket
 //                          ^ @punctuation.delimiter
-//                             ^^^^ @type.builtin
+//                             ^^^^ @type
 //                                 ^ @punctuation.bracket
 //                                  ^ @type
 //                                   ^ @punctuation.bracket
@@ -66,19 +66,19 @@ fn replace(
   // <- @label
   // ^^^^^^ @variable.parameter
   //       ^ @punctuation.delimiter
-  //         ^^^^^^ @type.builtin
+  //         ^^^^^^ @type
   //               ^ @punctuation.delimiter
   each pattern: String,
   // <- @label
   //   ^^^^^^^ @variable.parameter
   //          ^ @punctuation.delimiter
-  //            ^^^^^^ @type.builtin
+  //            ^^^^^^ @type
   //                  ^ @punctuation.delimiter
   with replacement: String,
   // <- @label
   //   ^^^^^^^^^^^ @variable.parameter
   //              ^ @punctuation.delimiter
-  //                ^^^^^^ @type.builtin
+  //                ^^^^^^ @type
   //                      ^ @punctuation.delimiter
 ) {
   replace(in: "A,B,C", each: ",", with: " ")
@@ -107,7 +107,7 @@ pub external fn random_float() -> Float = "rand" "uniform"
 //                          ^ @punctuation.bracket
 //                           ^ @punctuation.bracket
 //                             ^^ @punctuation.delimiter
-//                                ^^^^^ @type.builtin
+//                                ^^^^^ @type
 //                                      ^ @operator
 //                                        ^^^^^^ @module
 //                                               ^^^^^^^^^ @function
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/tests/query/highlights/gleam/type.gleam b/config/neovim/store/lazy-plugins/nvim-treesitter/tests/query/highlights/gleam/type.gleam
index 8ee82419..de0f9c4a 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/tests/query/highlights/gleam/type.gleam
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/tests/query/highlights/gleam/type.gleam
@@ -8,11 +8,11 @@ pub type Cat {
   // ^ @punctuation.bracket
   //  ^^^^ @variable.member
   //      ^ @punctuation.delimiter
-  //        ^^^^^^ @type.builtin
+  //        ^^^^^^ @type
   //              ^ @punctuation.delimiter
   //                ^^^^^^^^ @variable.member
   //                        ^ @punctuation.delimiter
-  //                          ^^^ @type.builtin
+  //                          ^^^ @type
   //                             ^ @punctuation.bracket
 }
 
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/tests/query/highlights_spec.lua b/config/neovim/store/lazy-plugins/nvim-treesitter/tests/query/highlights_spec.lua
index ff6a7523..3bb03d49 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/tests/query/highlights_spec.lua
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/tests/query/highlights_spec.lua
@@ -29,6 +29,7 @@ local function check_assertions(file)
     )
   )
   local parser = parsers.get_parser(buf, lang)
+  parser:parse(true)
 
   local self = highlighter.new(parser, {})
 
@@ -39,12 +40,13 @@ local function check_assertions(file)
 
     local captures = {}
     local highlights = {}
-    self.tree:for_each_tree(function(tstree, tree)
-      if not tstree then
+    self:prepare_highlight_states(row, row + 1)
+    self:for_each_highlight_state(function(state)
+      if not state.tstree then
         return
       end
 
-      local root = tstree:root()
+      local root = state.tstree:root()
       local root_start_row, _, root_end_row, _ = root:range()
 
       -- Only worry about trees within the line range
@@ -52,7 +54,7 @@ local function check_assertions(file)
         return
       end
 
-      local query = self:get_query(tree:lang())
+      local query = state.highlighter_query
 
       -- Some injected languages may not have highlight queries.
       if not query:query() then
@@ -62,7 +64,7 @@ local function check_assertions(file)
       local iter = query:query():iter_captures(root, self.bufnr, row, row + 1)
 
       for capture, node, _ in iter do
-        local hl = query.hl_cache[capture]
+        local hl = query:get_hl_from_capture(capture)
         assert.is.truthy(hl)
 
         assert.Truthy(node)
diff --git a/config/neovim/store/lazy-plugins/nvim-treesitter/tests/query/injection_spec.lua b/config/neovim/store/lazy-plugins/nvim-treesitter/tests/query/injection_spec.lua
index 7efbab31..95ad12ee 100644
--- a/config/neovim/store/lazy-plugins/nvim-treesitter/tests/query/injection_spec.lua
+++ b/config/neovim/store/lazy-plugins/nvim-treesitter/tests/query/injection_spec.lua
@@ -1,5 +1,4 @@
 require "nvim-treesitter.highlight" -- yes, this is necessary to set the hlmap
-local highlighter = require "vim.treesitter.highlighter"
 local configs = require "nvim-treesitter.configs"
 local parsers = require "nvim-treesitter.parsers"
 local ts = vim.treesitter
@@ -21,8 +20,8 @@ local function check_assertions(file)
   )
   local parser = parsers.get_parser(buf, lang)
 
-  local self = highlighter.new(parser, {})
-  local top_level_root = parser:parse()[1]:root()
+  local self = parser
+  local top_level_root = parser:parse(true)[1]:root()
 
   for _, assertion in ipairs(assertions) do
     local row = assertion.position.row
@@ -32,7 +31,7 @@ local function check_assertions(file)
     assertion.expected_capture_name = neg_assert and assertion.expected_capture_name:sub(2)
       or assertion.expected_capture_name
     local found = false
-    self.tree:for_each_tree(function(tstree, tree)
+    self:for_each_tree(function(tstree, tree)
       if not tstree then
         return
       end
diff --git a/config/neovim/store/lazy-plugins/nvim-ts-context-commentstring/utils/run_minimal.sh b/config/neovim/store/lazy-plugins/nvim-ts-context-commentstring/utils/run_minimal.sh
index 47876637..90b6b15d 100755
--- a/config/neovim/store/lazy-plugins/nvim-ts-context-commentstring/utils/run_minimal.sh
+++ b/config/neovim/store/lazy-plugins/nvim-ts-context-commentstring/utils/run_minimal.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
diff --git a/config/neovim/store/lazy-plugins/nvim-ufo/lua/ufo/preview/init.lua b/config/neovim/store/lazy-plugins/nvim-ufo/lua/ufo/preview/init.lua
index 1c2e8c7f..0bcefa51 100644
--- a/config/neovim/store/lazy-plugins/nvim-ufo/lua/ufo/preview/init.lua
+++ b/config/neovim/store/lazy-plugins/nvim-ufo/lua/ufo/preview/init.lua
@@ -3,6 +3,7 @@ local cmd = vim.cmd
 local fn = vim.fn
 
 local promise = require('promise')
+local async = require('async')
 local render = require('ufo.render')
 local utils = require('ufo.utils')
 local floatwin = require('ufo.preview.floatwin')
@@ -288,9 +289,47 @@ function Preview:peekFoldedLinesUnderCursor(enter, nextLineIncluded)
         floatwin:refreshTopline()
     end)
     self:toggleCursor()
-    render.mapHighlightLimitByRange(bufnr, floatwin:getBufnr(),
-        {lnum - 1, 0}, {endLnum - 1, #text[endLnum - lnum + 1]}, text, self.ns)
-    render.mapMatchByLnum(winid, floatwin.winid, lnum, endLnum)
+
+    local floatBufnr = floatwin:getBufnr()
+
+    local function doHighlight(s, e)
+        render.mapHighlightLimitByRange(bufnr, floatBufnr, lnum - 1,
+            {s - 1, 0}, {e - 1, #text[e - lnum + 1]}, text, self.ns)
+        render.mapMatchByLnum(winid, floatwin.winid, s, e)
+    end
+
+    local span = 800
+    local lower = math.max(lnum, oLnum - span / 2)
+    local upper = math.min(endLnum, oLnum + span / 2)
+    doHighlight(lower, upper)
+    if lower > lnum or upper < endLnum then
+        -- TODO
+        -- use an event like `CursorMoved` to fire is better
+        async(function()
+            local function renderSpan(s, e)
+                local i = s + span
+                while i < endLnum do
+                    if not self.validate() then
+                        return
+                    end
+                    doHighlight(i - span + 1, i)
+                    await(utils.wait(30))
+                    i = i + span
+                end
+                if not self.validate() then
+                    return
+                end
+                doHighlight(i - span + 1, e)
+            end
+
+            if lower > lnum then
+                renderSpan(lnum, lower - 1)
+            end
+            if upper < endLnum then
+                renderSpan(upper + 1, endLnum)
+            end
+        end)
+    end
     vim.wo[floatwin.winid].listchars = vim.wo[winid].listchars
     return floatwin.winid
 end
diff --git a/config/neovim/store/lazy-plugins/nvim-ufo/lua/ufo/render/init.lua b/config/neovim/store/lazy-plugins/nvim-ufo/lua/ufo/render/init.lua
index 497956e8..ae591c5e 100644
--- a/config/neovim/store/lazy-plugins/nvim-ufo/lua/ufo/render/init.lua
+++ b/config/neovim/store/lazy-plugins/nvim-ufo/lua/ufo/render/init.lua
@@ -117,8 +117,8 @@ local function mapInlayMarkers(bufnr, startRow, marks, ns)
     end
 end
 
-function M.mapHighlightLimitByRange(srcBufnr, dstBufnr, startRange, endRange, text, ns)
-    local startRow, startCol = startRange[1], startRange[1]
+function M.mapHighlightLimitByRange(srcBufnr, dstBufnr, baseRow, startRange, endRange, text, ns)
+    local startRow, startCol = startRange[1], startRange[2]
     local endRow, endCol = endRange[1], endRange[2]
     local nss = {}
     for _, namespace in pairs(api.nvim_get_namespaces()) do
@@ -128,9 +128,9 @@ function M.mapHighlightLimitByRange(srcBufnr, dstBufnr, startRange, endRange, te
     end
     local hlGroups = highlight.hlGroups()
     local hlMarks, inlayMarks = extmark.getHighlightsAndInlayByRange(srcBufnr, startRange, endRange, nss)
-    mapHighlightMarkers(dstBufnr, startRow, hlMarks, hlGroups, ns)
+    mapHighlightMarkers(dstBufnr, baseRow, hlMarks, hlGroups, ns)
     hlMarks = treesitter.getHighlightsByRange(srcBufnr, startRange, endRange, hlGroups)
-    mapHighlightMarkers(dstBufnr, startRow, hlMarks, hlGroups, ns)
+    mapHighlightMarkers(dstBufnr, baseRow, hlMarks, hlGroups, ns)
     if vim.bo[srcBufnr].syntax ~= '' then
         api.nvim_buf_call(srcBufnr, function()
             local res = {}
@@ -139,17 +139,17 @@ function M.mapHighlightLimitByRange(srcBufnr, dstBufnr, startRange, endRange, te
                 syntaxToRowHighlightRange(res, lnum, startCol + 1, endCol)
             else
                 for l = lnum, endLnum - 1 do
-                    syntaxToRowHighlightRange(res, l, 1, #text[l - lnum + 1])
+                    syntaxToRowHighlightRange(res, l, 1, #text[l - baseRow])
                 end
                 syntaxToRowHighlightRange(res, endLnum, 1, endCol)
             end
             for _, r in ipairs(res) do
-                local row = r[1] - lnum
+                local row = r[1] - baseRow - 1
                 extmark.setHighlight(dstBufnr, ns, row, r[2] - 1, row, r[3], r[4], 1)
             end
         end)
     end
-    mapInlayMarkers(dstBufnr, startRow, inlayMarks, ns)
+    mapInlayMarkers(dstBufnr, baseRow, inlayMarks, ns)
 end
 
 function M.mapMatchByLnum(srcWinid, dstWinid, lnum, endLnum)
diff --git a/config/neovim/store/lazy-plugins/nvim-web-devicons/lua/nvim-web-devicons/icons-default.lua b/config/neovim/store/lazy-plugins/nvim-web-devicons/lua/nvim-web-devicons/icons-default.lua
index 7189e9d4..cb3d79a5 100644
--- a/config/neovim/store/lazy-plugins/nvim-web-devicons/lua/nvim-web-devicons/icons-default.lua
+++ b/config/neovim/store/lazy-plugins/nvim-web-devicons/lua/nvim-web-devicons/icons-default.lua
@@ -12,7 +12,7 @@ local icons_by_filename = {
     name = "GradleSettings",
   },
   [".babelrc"] = {
-    icon = "",
+    icon = "",
     color = "#cbcb41",
     cterm_color = "185",
     name = "Babelrc",
@@ -107,6 +107,12 @@ local icons_by_filename = {
     cterm_color = "28",
     name = "Gvimrc",
   },
+  [".justfile"] = {
+    icon = "",
+    color = "#6d8086",
+    cterm_color = "66",
+    name = "Justfile",
+  },
   [".luaurc"] = {
     icon = "",
     color = "#00a2ff",
@@ -131,6 +137,12 @@ local icons_by_filename = {
     cterm_color = "197",
     name = "NPMrc",
   },
+  [".nvmrc"] = {
+    icon = "",
+    color = "#5FA04E",
+    cterm_color = "71",
+    name = "node",
+  },
   [".prettierrc"] = {
     icon = "",
     color = "#4285F4",
@@ -455,6 +467,12 @@ local icons_by_filename = {
     cterm_color = "32",
     name = "Cantorrc",
   },
+  ["justfile"] = {
+    icon = "",
+    color = "#6d8086",
+    cterm_color = "66",
+    name = "Justfile",
+  },
   ["kalgebrarc"] = {
     icon = "",
     color = "#1c99f3",
@@ -2210,6 +2228,18 @@ local icons_by_file_extension = {
     cterm_color = "215",
     name = "Mobi",
   },
+  ["mojo"] = {
+    icon = "",
+    color = "#ff4c1f",
+    cterm_color = "196",
+    name = "Mojo",
+  },
+  ["🔥"] = {
+    icon = "",
+    color = "#ff4c1f",
+    cterm_color = "196",
+    name = "Mojo",
+  },
   ["mov"] = {
     icon = "",
     color = "#FD971F",
@@ -3473,12 +3503,6 @@ local icons_by_operating_system = {
     cterm_color = "238",
     name = "LXLE",
   },
-  ["mint"] = {
-    icon = "󰣭",
-    color = "#66af3d",
-    cterm_color = "70",
-    name = "Mint",
-  },
   ["mageia"] = {
     icon = "",
     color = "#2397d4",
@@ -3491,6 +3515,12 @@ local icons_by_operating_system = {
     cterm_color = "35",
     name = "Manjaro",
   },
+  ["mint"] = {
+    icon = "󰣭",
+    color = "#66af3d",
+    cterm_color = "70",
+    name = "Mint",
+  },
   ["mxlinux"] = {
     icon = "",
     color = "#ffffff",
diff --git a/config/neovim/store/lazy-plugins/nvim-web-devicons/lua/nvim-web-devicons/icons-light.lua b/config/neovim/store/lazy-plugins/nvim-web-devicons/lua/nvim-web-devicons/icons-light.lua
index a78e150f..27549b3a 100644
--- a/config/neovim/store/lazy-plugins/nvim-web-devicons/lua/nvim-web-devicons/icons-light.lua
+++ b/config/neovim/store/lazy-plugins/nvim-web-devicons/lua/nvim-web-devicons/icons-light.lua
@@ -12,7 +12,7 @@ local icons_by_filename = {
     name = "GradleSettings",
   },
   [".babelrc"] = {
-    icon = "",
+    icon = "",
     color = "#666620",
     cterm_color = "58",
     name = "Babelrc",
@@ -107,6 +107,12 @@ local icons_by_filename = {
     cterm_color = "22",
     name = "Gvimrc",
   },
+  [".justfile"] = {
+    icon = "",
+    color = "#526064",
+    cterm_color = "59",
+    name = "Justfile",
+  },
   [".luaurc"] = {
     icon = "",
     color = "#007abf",
@@ -131,6 +137,12 @@ local icons_by_filename = {
     cterm_color = "161",
     name = "NPMrc",
   },
+  [".nvmrc"] = {
+    icon = "",
+    color = "#3f6b34",
+    cterm_color = "22",
+    name = "node",
+  },
   [".prettierrc"] = {
     icon = "",
     color = "#3264b7",
@@ -455,6 +467,12 @@ local icons_by_filename = {
     cterm_color = "32",
     name = "Cantorrc",
   },
+  ["justfile"] = {
+    icon = "",
+    color = "#526064",
+    cterm_color = "59",
+    name = "Justfile",
+  },
   ["kalgebrarc"] = {
     icon = "",
     color = "#1573b6",
@@ -2210,6 +2228,18 @@ local icons_by_file_extension = {
     cterm_color = "94",
     name = "Mobi",
   },
+  ["mojo"] = {
+    icon = "",
+    color = "#bf3917",
+    cterm_color = "160",
+    name = "Mojo",
+  },
+  ["🔥"] = {
+    icon = "",
+    color = "#bf3917",
+    cterm_color = "160",
+    name = "Mojo",
+  },
   ["mov"] = {
     icon = "",
     color = "#7e4c10",
@@ -3473,12 +3503,6 @@ local icons_by_operating_system = {
     cterm_color = "238",
     name = "LXLE",
   },
-  ["mint"] = {
-    icon = "󰣭",
-    color = "#447529",
-    cterm_color = "28",
-    name = "Mint",
-  },
   ["mageia"] = {
     icon = "",
     color = "#1a719f",
@@ -3491,6 +3515,12 @@ local icons_by_operating_system = {
     cterm_color = "29",
     name = "Manjaro",
   },
+  ["mint"] = {
+    icon = "󰣭",
+    color = "#447529",
+    cterm_color = "28",
+    name = "Mint",
+  },
   ["mxlinux"] = {
     icon = "",
     color = "#333333",
diff --git a/config/neovim/store/lazy-plugins/nvim-web-devicons/scripts/filetype-generator.sh b/config/neovim/store/lazy-plugins/nvim-web-devicons/scripts/filetype-generator.sh
index cab17966..7154386b 100755
--- a/config/neovim/store/lazy-plugins/nvim-web-devicons/scripts/filetype-generator.sh
+++ b/config/neovim/store/lazy-plugins/nvim-web-devicons/scripts/filetype-generator.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/sh
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/sh
 
 ## Credit: @B0o (Maddison Hellstrom)
 
diff --git a/config/neovim/store/lazy-plugins/persisted.nvim/Makefile b/config/neovim/store/lazy-plugins/persisted.nvim/Makefile
index a798bcdc..16f8a579 100644
--- a/config/neovim/store/lazy-plugins/persisted.nvim/Makefile
+++ b/config/neovim/store/lazy-plugins/persisted.nvim/Makefile
@@ -34,6 +34,7 @@ test: $(PLENARY_DIR)
 	nvim --headless --noplugin -u tests/minimal.vim +Setup
 	# nvim --headless --noplugin -u tests/minimal.vim +TestAutoloading
 	nvim --headless --noplugin -u tests/minimal.vim +TestGitBranching
+	nvim --headless --noplugin -u tests/minimal.vim +TestFollowCwd
 	nvim --headless --noplugin -u tests/minimal.vim +TestDefaults
 	nvim --headless --noplugin -u tests/minimal.vim +TearDown
 
diff --git a/config/neovim/store/lazy-plugins/persisted.nvim/lua/persisted/init.lua b/config/neovim/store/lazy-plugins/persisted.nvim/lua/persisted/init.lua
index e853d58f..2df64e97 100644
--- a/config/neovim/store/lazy-plugins/persisted.nvim/lua/persisted/init.lua
+++ b/config/neovim/store/lazy-plugins/persisted.nvim/lua/persisted/init.lua
@@ -203,21 +203,31 @@ end
 function M.load(opt, dir)
   opt = opt or {}
   dir = dir or session_dir()
-  local branch = get_branchname()
 
-  local session = opt.session or (opt.last and get_last() or get_current(dir))
-
-  local session_exists = vim.fn.filereadable(session) ~= 0
+  local branch
+  local session
+  if opt.session then
+    session = opt.session
+    local session_data = utils.make_session_data(session)
+    branch = session_data and session_data.branch or ""
+    if not branch then
+      vim.notify(string.format("[Persisted.nvim]: Invalid session file %s", session), vim.log.levels.WARN)
+    end
+  else
+    branch = get_branchname()
+    session = opt.last and get_last() or get_current(dir)
+  end
 
   if session then
-    if session_exists then
-      vim.g.persisting_session = config.options.follow_cwd and nil or session
+    if vim.fn.filereadable(session) ~= 0 then
+      vim.g.persisting_session = not config.options.follow_cwd and session or nil
       utils.load_session(session, config.options.silent)
     elseif type(config.options.on_autoload_no_session) == "function" then
       config.options.on_autoload_no_session()
     end
   end
 
+  dir = session_dir()
   if config.options.autosave and (allow_dir(dir) and not ignore_dir(dir)) and not ignore_branch(branch) then
     M.start()
   end
diff --git a/config/neovim/store/lazy-plugins/persisted.nvim/lua/persisted/utils.lua b/config/neovim/store/lazy-plugins/persisted.nvim/lua/persisted/utils.lua
index 58dbb072..c89ced89 100644
--- a/config/neovim/store/lazy-plugins/persisted.nvim/lua/persisted/utils.lua
+++ b/config/neovim/store/lazy-plugins/persisted.nvim/lua/persisted/utils.lua
@@ -37,12 +37,11 @@ function M.make_session_data(session)
 
   -- Split the session string into path and branch parts
   local separator_index = session:find(config.branch_separator)
-  if not separator_index then
-    return nil
+  local branch = ""
+  if separator_index then
+    branch = session:sub(separator_index + 2):gsub("%.vim$", ""):gsub("%%", "/")
   end
 
-  local branch = session:sub(separator_index + 2):gsub("%.vim$", ""):gsub("%%", "/")
-
   -- Removing the home directory from the path and cleaning leading `/`
   local name = session:gsub(config.save_dir, ""):gsub("%%", "/"):gsub(home, "")
   -- Remove the .vim extension
diff --git a/config/neovim/store/lazy-plugins/persisted.nvim/lua/telescope/_extensions/persisted/actions.lua b/config/neovim/store/lazy-plugins/persisted.nvim/lua/telescope/_extensions/persisted/actions.lua
index 3fc72cef..dff5687d 100644
--- a/config/neovim/store/lazy-plugins/persisted.nvim/lua/telescope/_extensions/persisted/actions.lua
+++ b/config/neovim/store/lazy-plugins/persisted.nvim/lua/telescope/_extensions/persisted/actions.lua
@@ -1,7 +1,7 @@
 local actions_state = require("telescope.actions.state")
 local transform_mod = require("telescope.actions.mt").transform_mod
 
-local utils = require("persisted.utils")
+local persisted = require("persisted")
 local M = {}
 
 ---Get the selected session from Telescope
@@ -18,7 +18,7 @@ M.load_session = function(session, config)
   vim.api.nvim_exec_autocmds("User", { pattern = "PersistedTelescopeLoadPre", data = session })
 
   vim.schedule(function()
-    utils.load_session(session.file_path, config.silent)
+    persisted.load({ session = session.file_path })
   end)
 
   vim.api.nvim_exec_autocmds("User", { pattern = "PersistedTelescopeLoadPost", data = session })
diff --git a/config/neovim/store/lazy-plugins/persisted.nvim/tests/follow_cwd/follow_cwd_spec.lua b/config/neovim/store/lazy-plugins/persisted.nvim/tests/follow_cwd/follow_cwd_spec.lua
index 9f6bf994..1124a73b 100644
--- a/config/neovim/store/lazy-plugins/persisted.nvim/tests/follow_cwd/follow_cwd_spec.lua
+++ b/config/neovim/store/lazy-plugins/persisted.nvim/tests/follow_cwd/follow_cwd_spec.lua
@@ -20,10 +20,14 @@ describe("Follow cwd change", function()
     vim.cmd(":bdelete")
   end)
   it("ensures both sessions were created", function()
+    require("persisted").load()
+
     local pattern = "/"
-    local name1 = vim.fn.getcwd():gsub(pattern, "%%") .. require("persisted").get_branch() .. ".vim"
+    local branch1 = require("persisted").get_branch()
+    local name1 = vim.fn.getcwd():gsub(pattern, "%%") .. (branch1 or "") .. ".vim"
     vim.cmd(":cd ../..")
-    local name2 = vim.fn.getcwd():gsub(pattern, "%%") .. require("persisted").get_branch() .. ".vim"
+    local branch2 = require("persisted").get_branch()
+    local name2 = vim.fn.getcwd():gsub(pattern, "%%") .. (branch2 or "") .. ".vim"
 
     local sessions = vim.fn.readdir(session_dir)
     assert.equals(sessions[1], name1)
@@ -52,7 +56,8 @@ describe("Don't follow cwd change", function()
   it("ensures only one session was created", function()
     local pattern = "/"
     vim.cmd(":cd ../..")
-    local name = vim.fn.getcwd():gsub(pattern, "%%") .. require("persisted").get_branch() .. ".vim"
+    local branch = require("persisted").get_branch()
+    local name = vim.fn.getcwd():gsub(pattern, "%%") .. (branch or "") .. ".vim"
 
     local sessions = vim.fn.readdir(session_dir)
     assert.equals(#sessions, 1)
diff --git a/config/neovim/store/lazy-plugins/persisted.nvim/tests/minimal.vim b/config/neovim/store/lazy-plugins/persisted.nvim/tests/minimal.vim
index b902ea84..d49f204b 100644
--- a/config/neovim/store/lazy-plugins/persisted.nvim/tests/minimal.vim
+++ b/config/neovim/store/lazy-plugins/persisted.nvim/tests/minimal.vim
@@ -5,6 +5,6 @@ runtime! plugin/plenary.vim
 command Setup PlenaryBustedDirectory tests/setup {minimal_init = 'tests/minimal.vim'}
 command TestAutoloading PlenaryBustedDirectory tests/autoload {minimal_init = 'tests/minimal.vim'}
 command TestGitBranching PlenaryBustedDirectory tests/git_branching {minimal_init = 'tests/minimal.vim'}
-command TestFollowCwd PlenaryBustedDirectory tests/follow_cwd/follow_cwd.lua {minimal_init = 'tests/minimal.vim'}
+command TestFollowCwd PlenaryBustedDirectory tests/follow_cwd {minimal_init = 'tests/minimal.vim'}
 command TestDefaults PlenaryBustedFile tests/default_settings_spec.lua
 command TearDown PlenaryBustedFile tests/teardown/clean_up_dirs.lua
diff --git a/config/neovim/store/lazy-plugins/plenary.nvim/nix-support/propagated-build-inputs b/config/neovim/store/lazy-plugins/plenary.nvim/nix-support/propagated-build-inputs
index 7e59845c..19fb9ea1 100644
--- a/config/neovim/store/lazy-plugins/plenary.nvim/nix-support/propagated-build-inputs
+++ b/config/neovim/store/lazy-plugins/plenary.nvim/nix-support/propagated-build-inputs
@@ -1 +1 @@
-/nix/store/3mv7k6zp05ahmvg2pnvd6y59pnb1qd87-lua5.1-luassert-1.9.0-1 /nix/store/mqbhz05llkddfb5wni0m48kw22ixxps4-lua-5.1.5 
\ No newline at end of file
+/nix/store/zwgvxvrwwsap3vxkwlcc4img2ggcsysp-lua5.1-luassert-1.9.0-1 /nix/store/3czmrawji85vf8979kll2yx2f1kjkric-lua-5.1.5 
\ No newline at end of file
diff --git a/config/neovim/store/lazy-plugins/promise-async/.github/workflows/test.yml b/config/neovim/store/lazy-plugins/promise-async/.github/workflows/test.yml
index 3b893ec0..dd91c1ad 100644
--- a/config/neovim/store/lazy-plugins/promise-async/.github/workflows/test.yml
+++ b/config/neovim/store/lazy-plugins/promise-async/.github/workflows/test.yml
@@ -46,10 +46,10 @@ jobs:
         name: Install Neovim on Macos
         run: |
           cd
-          curl -LO https://github.com/neovim/neovim/releases/download/${{ matrix.version }}/nvim-macos.tar.gz
-          tar xzf nvim-macos.tar.gz
-          echo "${PWD}/nvim-macos/bin" >> $GITHUB_PATH
-          export PATH="${PWD}/nvim-macos/bin:${PATH}"
+          curl -LO https://github.com/neovim/neovim/releases/download/${{ matrix.version }}/nvim-macos-x86_64.tar.gz
+          tar xzf nvim-macos-x86_64.tar.gz
+          echo "${PWD}/nvim-macos-x86_64/bin" >> $GITHUB_PATH
+          export PATH="${PWD}/nvim-macos-x86_64/bin:${PATH}"
           nvim -v
 
       - name: Run Test
diff --git a/config/neovim/store/lazy-plugins/promise-async/Makefile b/config/neovim/store/lazy-plugins/promise-async/Makefile
index 6ea0a0fb..63c009ca 100644
--- a/config/neovim/store/lazy-plugins/promise-async/Makefile
+++ b/config/neovim/store/lazy-plugins/promise-async/Makefile
@@ -66,7 +66,7 @@ lint:
 	@rm -rf $(LUA_LS)
 	@mkdir -p $(LUA_LS)
 	@lua-language-server --check $(PWD) --checklevel=$(LINT_LEVEL) --logpath=$(LUA_LS)
-	@[[ -f $(LUA_LS)/check.json ]] && { cat $(LUA_LS)/check.json 2>/dev/null; exit 1; } || true
+	@grep -q '^\[\]\s*$$' $(LUA_LS)/check.json || (cat $(LUA_LS)/check.json && exit 1)
 
 clean:
 	rm -rf $(DEPS)
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/CHANGELOG.rst b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/CHANGELOG.rst
index 732758f9..ff0245ff 100644
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/CHANGELOG.rst
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/CHANGELOG.rst
@@ -15,6 +15,12 @@ Unreleased
 Added
 =====
 
+- Recipes section in the manual
+
+- Django HTML support (preliminary, will only pass through injected languages)
+
+- WebGL Shading Language (WGSL) support
+
 - Missing patterns for C++:
 
   - `condition_clause`
@@ -26,12 +32,22 @@ Added
 
   - `loop_macro`
 
+- Missing patterns for Cue:
+
+  - `dynamic`
+  - `index_expression`
+
+
 - Missing patterns for Javascript:
 
   - `array_pattern`
   - `for_in_statement`
   - `for_statement`
 
+- Missing patterns for Rust:
+
+  - `bracketed_type`
+
 - Missing patterns for Typescript:
 
    - `enum_body`
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/doc/rainbow-delimiters.txt b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/doc/rainbow-delimiters.txt
index 1ae6c4b2..9068b695 100644
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/doc/rainbow-delimiters.txt
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/doc/rainbow-delimiters.txt
@@ -22,8 +22,9 @@ TABLE OF CONTENTS                                     *rb-delimiters-contents*
    3.2 Custom queries ........................ |rb-delimiters-custom-query|
    3.3 Custom strategies ..................... |rb-delimiters-custom-strategy|
    3.4 Adding new languages .................. |rb-delimiters-custom-lang|
-4. Acknowledgements .......................... |rb-delimiters-credit|
-5. Further reading ........................... |rb-delimiters-reading|
+4. Recipes ................................... |rb-delimiters-recipes|
+5. Acknowledgements .......................... |rb-delimiters-credit|
+6. Further reading ........................... |rb-delimiters-reading|
 
 
 ==============================================================================
@@ -698,6 +699,24 @@ language.  If the query is mature enough please consider upstreaming it so
 everyone can benefit.
 
 
+==============================================================================
+RECIPES                                                *rb-delimiters-recipes*
+
+Various tricks and hacks which have accumulated over time.
+
+
+------------------------------------------------------------------------------
+DISABLE WITHOUT BLACKLISTING
+
+If you wish to disable rainbow delimiters for a language but for whatever
+reason you do not want to blacklist this language you can create a custom
+query (|rb-delimiters-custom-query|) without any patterns.  Then set the name
+of that query as the query for that language (|rb-delimiters-query|).
+
+Or you could name your custom query the same as the default query (by default
+`rainbow-delimiters`), then you do not have to change your configuration.
+
+
 ==============================================================================
 ACKNOWLEDGMENTS                                         *rb-delimiters-credit*
 
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/doc/tags b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/doc/tags
index f6b0e8a1..760efb36 100644
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/doc/tags
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/doc/tags
@@ -16,6 +16,7 @@ rb-delimiters-intro	rainbow-delimiters.txt	/*rb-delimiters-intro*
 rb-delimiters-logging	rainbow-delimiters.txt	/*rb-delimiters-logging*
 rb-delimiters-query	rainbow-delimiters.txt	/*rb-delimiters-query*
 rb-delimiters-reading	rainbow-delimiters.txt	/*rb-delimiters-reading*
+rb-delimiters-recipes	rainbow-delimiters.txt	/*rb-delimiters-recipes*
 rb-delimiters-setup	rainbow-delimiters.txt	/*rb-delimiters-setup*
 rb-delimiters-strategy	rainbow-delimiters.txt	/*rb-delimiters-strategy*
 rb-delimiters.disable	rainbow-delimiters.txt	/*rb-delimiters.disable*
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters.types.lua b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters.types.lua
index 80c730a5..1151fafa 100644
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters.types.lua
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters.types.lua
@@ -15,7 +15,7 @@
 
 ---@class (exact) rainbow_delimiters.buffer_settings
 ---@field strategy rainbow_delimiters.strategy
----@field parser LanguageTree
+---@field parser vim.treesitter.LanguageTree
 ---@field lang string
 
 
@@ -100,6 +100,7 @@
 ---@field vim          (rainbow_delimiters.strategy | fun(bufnr: integer): rainbow_delimiters.strategy?)?
 ---@field vimdoc       (rainbow_delimiters.strategy | fun(bufnr: integer): rainbow_delimiters.strategy?)?
 ---@field vue          (rainbow_delimiters.strategy | fun(bufnr: integer): rainbow_delimiters.strategy?)?
+---@field wgsl         (rainbow_delimiters.strategy | fun(bufnr: integer): rainbow_delimiters.strategy?)?
 ---@field yaml         (rainbow_delimiters.strategy | fun(bufnr: integer): rainbow_delimiters.strategy?)?
 ---@field zig          (rainbow_delimiters.strategy | fun(bufnr: integer): rainbow_delimiters.strategy?)?
 ---User defined language, not part of rainbow_delimiters support
@@ -167,6 +168,7 @@
 ---@field vim          (('rainbow-delimiters' | string) | fun(bufnr: integer): ('rainbow-delimiters' | string))?
 ---@field vimdoc       (('rainbow-delimiters' | string) | fun(bufnr: integer): ('rainbow-delimiters' | string))?
 ---@field vue          (('rainbow-delimiters' | string) | fun(bufnr: integer): ('rainbow-delimiters' | string))?
+---@field wgsl         (('rainbow-delimiters' | string) | fun(bufnr: integer): ('rainbow-delimiters' | string))?
 ---@field yaml         (('rainbow-delimiters' | string) | fun(bufnr: integer): ('rainbow-delimiters' | string))?
 ---@field zig          (('rainbow-delimiters' | string) | fun(bufnr: integer): ('rainbow-delimiters' | string))?
 ---User defined language, not part of rainbow_delimiters support
@@ -234,6 +236,7 @@
 ---@field vim          (integer | fun(bufnr: integer): integer)?
 ---@field vimdoc       (integer | fun(bufnr: integer): integer)?
 ---@field vue          (integer | fun(bufnr: integer): integer)?
+---@field wgsl         (integer | fun(bufnr: integer): integer)?
 ---@field yaml         (integer | fun(bufnr: integer): integer)?
 ---@field zig          (integer | fun(bufnr: integer): integer)?
 ---User defined language, not part of rainbow_delimiters support
@@ -301,6 +304,7 @@
 ---| 'vim'
 ---| 'vimdoc'
 ---| 'vue'
+---| 'wgsl'
 ---| 'yaml'
 ---| 'zig'
 ---User defined language, not part of rainbow_delimiters support
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters/lib.lua b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters/lib.lua
index 76227a99..e27c2118 100644
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters/lib.lua
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters/lib.lua
@@ -15,7 +15,6 @@
    limitations under the License.
 --]]
 
-local api        = vim.api
 local get_query  = vim.treesitter.query.get
 local get_parser = vim.treesitter.get_parser
 local log        = require 'rainbow-delimiters.log'
@@ -69,7 +68,7 @@ M.buffers = {}
 ---
 ---@param lang  string   Name of the language to get the query for
 ---@param bufnr integer  Use this buffer as the current buffer
----@return Query? query  The query object
+---@return vim.treesitter.Query? query  The query object
 function M.get_query(lang, bufnr)
 	local name = config['query'][lang]
 	if type(name) == "function" then
@@ -100,9 +99,9 @@ function M.highlight(bufnr, lang, node, hlgroup)
 		priority = priority(bufnr)
 	end
 	local opts = {
-		regtype = 'c',
+		regtype   = 'v',
 		inclusive = true,
-		priority = priority,
+		priority  = priority,
 	}
 
 	local nsid = M.nsids[lang]
@@ -194,7 +193,7 @@ function M.attach(bufnr)
 			if not M.buffers[bnr] then return end
 			M.detach(bufnr)
 		end,
-		---@param child LanguageTree
+		---@param child vim.treesitter.LanguageTree
 		on_child_removed = function(child)
 			M.clear_namespace(bufnr, child:lang())
 		end,
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters/strategy/global.lua b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters/strategy/global.lua
index 4f8f9ebb..009f2256 100644
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters/strategy/global.lua
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters/strategy/global.lua
@@ -165,7 +165,7 @@ end
 
 ---Update highlights for every tree in given buffer.
 ---@param bufnr integer # Buffer number
----@param parser LanguageTree
+---@param parser vim.treesitter.LanguageTree
 local function full_update(bufnr, parser)
 	log.debug('Performing full updated on buffer %d', bufnr)
 	local function callback(tree, sub_parser)
@@ -179,7 +179,7 @@ end
 
 ---Sets up all the callbacks and performs an initial highlighting
 ---@param bufnr integer # Buffer number
----@param parser LanguageTree
+---@param parser vim.treesitter.LanguageTree
 ---@param start_parent_lang string? # Parent language or nil
 local function setup_parser(bufnr, parser, start_parent_lang)
 	log.debug('Setting up parser for buffer %d', bufnr)
@@ -261,7 +261,7 @@ local function setup_parser(bufnr, parser, start_parent_lang)
 			end,
 			-- New languages can be added into the text at some later time, e.g.
 			-- code snippets in Markdown
-			---@param child LanguageTree
+			---@param child vim.treesitter.LanguageTree
 			on_child_added = function(child)
 				setup_parser(bufnr, child, lang)
 			end,
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters/strategy/local.lua b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters/strategy/local.lua
index 532bfe48..5dbd8987 100644
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters/strategy/local.lua
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters/strategy/local.lua
@@ -235,7 +235,7 @@ end
 ---Callback function to re-highlight the buffer according to the current cursor
 ---position.
 ---@param bufnr integer
----@param parser LanguageTree
+---@param parser vim.treesitter.LanguageTree
 local function local_rainbow(bufnr, parser)
 	parser:for_each_tree(function(tree, sub_parser)
 		update_local(bufnr, tree, sub_parser:lang())
@@ -244,7 +244,7 @@ end
 
 ---Sets up all the callbacks and performs an initial highlighting
 ---@param bufnr integer # Buffer number
----@param parser LanguageTree
+---@param parser vim.treesitter.LanguageTree
 local function setup_parser(bufnr, parser)
 	log.debug('Setting up parser for buffer %d', bufnr)
 	util.for_each_child(nil, parser:lang(), parser, function(p, lang, _parent_lang)
@@ -274,7 +274,7 @@ local function setup_parser(bufnr, parser)
 			end,
 			-- New languages can be added into the text at some later time, e.g.
 			-- code snippets in Markdown
-			---@param child LanguageTree
+			---@param child vim.treesitter.LanguageTree
 			on_child_added = function(child)
 				setup_parser(bufnr, child)
 			end,
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters/util.lua b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters/util.lua
index f0e0f7e4..1a7ab977 100644
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters/util.lua
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/lua/rainbow-delimiters/util.lua
@@ -27,8 +27,8 @@ local M = {}
 ---replacement.
 ---@param parent_lang string? # Parent language or nil
 ---@param lang string
----@param language_tree LanguageTree
----@param thunk fun(p: LanguageTree, lang: string, parent_lang: string?)
+---@param language_tree vim.treesitter.LanguageTree
+---@param thunk fun(p: vim.treesitter.LanguageTree, lang: string, parent_lang: string?)
 function M.for_each_child(parent_lang, lang, language_tree, thunk)
 	thunk(language_tree, lang, parent_lang)
 	local children = language_tree:children()
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/queries/cue/rainbow-delimiters.scm b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/queries/cue/rainbow-delimiters.scm
index 17fd570e..756dff40 100644
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/queries/cue/rainbow-delimiters.scm
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/queries/cue/rainbow-delimiters.scm
@@ -2,6 +2,10 @@
   "{" @delimiter
   "}" @delimiter @sentinel) @container
 
+(index_expression
+  "[" @delimiter
+  "]" @delimiter @sentinel) @container
+
 (list_lit
   "[" @delimiter
   "]" @delimiter @sentinel) @container
@@ -18,6 +22,10 @@
   "(" @delimiter
   ")" @delimiter @sentinel) @container
 
+(dynamic
+  "(" @delimiter
+  ")" @delimiter @sentinel) @container
+
 (parenthesized_expression
   "(" @delimiter
   ")" @delimiter @sentinel) @container
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/queries/rust/rainbow-delimiters.scm b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/queries/rust/rainbow-delimiters.scm
index b42420c9..6c5d9023 100644
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/queries/rust/rainbow-delimiters.scm
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/queries/rust/rainbow-delimiters.scm
@@ -131,3 +131,7 @@
 (visibility_modifier
   "(" @delimiter
   ")" @delimiter @sentinel) @container
+
+(bracketed_type
+  "<" @delimiter
+  ">" @delimiter @sentinel) @container
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/busted b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/busted
index 872473a3..9257b490 100755
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/busted
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/busted
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/sh
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/sh
 # SPDX-License-Identifier: Unlicense
 
 # This is free and unencumbered software released into the public domain.
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/highlight/bash/regular.sh b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/highlight/bash/regular.sh
index 0810c978..e089461e 100755
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/highlight/bash/regular.sh
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/highlight/bash/regular.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 # Command substitution
 echo $(basedir $(pwd))
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/highlight/cue/regular.cue b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/highlight/cue/regular.cue
index 2c153101..9542bfce 100644
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/highlight/cue/regular.cue
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/highlight/cue/regular.cue
@@ -23,3 +23,5 @@ elems: {
 
 _env:  string | *"dev" @tag(env,type=string)
 host: "\(_env).example.com"
+
+environments: (_env): "\(numList[1])"
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/highlight/rust/regular.rs b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/highlight/rust/regular.rs
index 5803125e..4ee29cfe 100644
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/highlight/rust/regular.rs
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/highlight/rust/regular.rs
@@ -130,6 +130,8 @@ fn main() {
 
     let test_tuple: (u32, u32) = (0, 1);
     tuple_param(test_tuple);
+
+    let a = <u32 as From<u8>>::from(1u8);
 }
 
 use level_1::{
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/nvim-shim b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/nvim-shim
index ce9fbaad..b00a7e85 100755
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/nvim-shim
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/nvim-shim
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/sh
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/sh
 # SPDX-License-Identifier: Unlicense
 
 # This is free and unencumbered software released into the public domain.
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/config/nvim/plugin/busted.lua b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/config/nvim/plugin/busted.lua
index 78d6f34d..47259639 100644
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/config/nvim/plugin/busted.lua
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/config/nvim/plugin/busted.lua
@@ -2,27 +2,43 @@
 
 local say = require 'say'
 local assert = require 'luassert'
-local filter = vim.fn.filter
 
 
+---Globally unique key to retrieve the current Neovim channel from the test
+---state.
 local NVIM_STATE_KEY = {}
 
-local function nvim(state, args, level)
+local function nvim_client(state, args, _level)
 	assert(args.n > 0, "No Neovim channel provided to the modifier")
 	assert(rawget(state, NVIM_STATE_KEY) == nil, "Neovim already set")
 	rawset(state, NVIM_STATE_KEY, args[1])
 	return state
 end
 
----Asserts that there are Rainbow Delimiters extmarks at the given position
+---Asserts that there are Rainbow Delimiters extmarks at the given position.
+---
+---Arguments:
+---
+---  1) row        Zero-indexed row of the character position
+---  2) column     Zero-indexed column of the character position
+---  3) lang       Expected language of the extmark
+---  4) hl_group   Optional, expected highlight group of the extmark
+---
 ---@param arguments integer[]  Row and column, both zero-based
-local function has_extmarks_at(_state, arguments, lang)
+---@return boolean
+local function has_extmarks_at(_state, arguments)
 	local nvim = rawget(_state, NVIM_STATE_KEY)
 	assert(nvim ~= nil, 'No Neovim channel set, use the nvim modifier to set the channel')
-	local row, column = arguments[1], arguments[2]
+	local row, column, lang, hl_group = arguments[1], arguments[2], arguments[3], arguments[4]
 	local nsid = nvim:exec_lua('return require("rainbow-delimiters.lib").nsids[...]', {lang})
+
 	local extmarks = nvim:exec_lua('return vim.inspect_pos(...).extmarks', {0, row, column})
-	filter(extmarks, function(_, v) return v.ns_id == nsid end)
+	extmarks = vim.tbl_filter(function(v) return v.ns_id == nsid end, extmarks)
+	if hl_group then
+		local function same_hl_group(extmark) return extmark.opts.hl_group == hl_group end
+		extmarks = vim.tbl_filter(same_hl_group, extmarks)
+	end
+
 	return #extmarks > 0
 end
 
@@ -32,4 +48,4 @@ say:set('assertion.extmarks_at.negative', 'Expected no extmarks at (%s, %s)')
 assert:register(
 	'assertion', 'has_extmarks_at', has_extmarks_at,
 	'assertion.has_extmarks_at.positive', 'assertion.has_extmarks_at.negative')
-assert:register('modifier', 'nvim', nvim)
+assert:register('modifier', 'nvim', nvim_client)
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/check-queries.lua b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/check-queries.lua
index 53b02162..97859175 100755
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/check-queries.lua
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/check-queries.lua
@@ -1,4 +1,4 @@
-#!/nix/store/php4qidg2bxzmm79vpri025bqi0fa889-coreutils-9.5/bin/env -S  -l
+#!/nix/store/i7qhgc0bs725qw3wdanznfkdna4z2ns2-coreutils-9.5/bin/env -S  -l
 
 -- Equivalent to print(), but this will ensure consistent output regardless of
 -- operating system.
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/ci-install-macos-latest.sh b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/ci-install-macos-latest.sh
index 0e96ce0e..89f79b51 100755
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/ci-install-macos-latest.sh
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/ci-install-macos-latest.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 curl -L https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-macos.tar.gz | tar -xz
 sudo ln -s "$PWD"/nvim-macos/bin/nvim /usr/local/bin
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/ci-install-ubuntu-latest.sh b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/ci-install-ubuntu-latest.sh
index 1887a781..c957fb5b 100755
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/ci-install-ubuntu-latest.sh
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/ci-install-ubuntu-latest.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-linux64.tar.gz
 tar -zxf nvim-linux64.tar.gz
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/ci-install-windows-2022.sh b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/ci-install-windows-2022.sh
index b54fd111..e1452521 100755
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/ci-install-windows-2022.sh
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/ci-install-windows-2022.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 curl -L https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-win64.zip -o nvim-win64.zip
 unzip nvim-win64
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/pre-push b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/pre-push
index ef4b0eda..bdcbc8fd 100755
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/pre-push
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/pre-push
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 # Can be used as a pre-push hook
 # Just symlink this file to .git/hooks/pre-push
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/run_tests.sh b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/run_tests.sh
index cd22c93f..3c413eee 100755
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/run_tests.sh
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/run_tests.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 HERE="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
 cd $HERE/..
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/update-lockfile.sh b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/update-lockfile.sh
index 2d3f1a99..7c56c106 100755
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/update-lockfile.sh
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/update-lockfile.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 make_ignored() {
   if [ -n "$1" ]
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/update-readme.lua b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/update-readme.lua
index cd903b89..12e00341 100755
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/update-readme.lua
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/update-readme.lua
@@ -1,4 +1,4 @@
-#!/nix/store/php4qidg2bxzmm79vpri025bqi0fa889-coreutils-9.5/bin/env -S  -l
+#!/nix/store/i7qhgc0bs725qw3wdanznfkdna4z2ns2-coreutils-9.5/bin/env -S  -l
 
 ---@class Parser
 ---@field name string
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/write-lockfile.lua b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/write-lockfile.lua
index 67617df9..80e8b965 100755
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/write-lockfile.lua
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/nvim-treesitter/scripts/write-lockfile.lua
@@ -1,4 +1,4 @@
-#!/nix/store/php4qidg2bxzmm79vpri025bqi0fa889-coreutils-9.5/bin/env -S  -l
+#!/nix/store/i7qhgc0bs725qw3wdanznfkdna4z2ns2-coreutils-9.5/bin/env -S  -l
 
 ---@type string|any[]
 local skip_langs = vim.fn.getenv "SKIP_LOCKFILE_UPDATE_FOR_LANGS"
diff --git a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/yo-dawg/test/nvim-shim b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/yo-dawg/test/nvim-shim
index e1bc35bb..3df03e0b 100755
--- a/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/yo-dawg/test/nvim-shim
+++ b/config/neovim/store/lazy-plugins/rainbow-delimiters.nvim/test/xdg/local/share/nvim/site/pack/testing/start/yo-dawg/test/nvim-shim
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/sh
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/sh
 # SPDX-License-Identifier: Unlicense
 
 # This is free and unencumbered software released into the public domain.
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/doc/rustaceanvim.txt b/config/neovim/store/lazy-plugins/rustaceanvim/doc/rustaceanvim.txt
index 6e6234c3..42d07d43 100644
--- a/config/neovim/store/lazy-plugins/rustaceanvim/doc/rustaceanvim.txt
+++ b/config/neovim/store/lazy-plugins/rustaceanvim/doc/rustaceanvim.txt
@@ -182,13 +182,13 @@ FloatWinConfig                                                  *FloatWinConfig*
 executor_alias                                                  *executor_alias*
 
     Type: ~
-        "termopen"|"quickfix"|"toggleterm"|"vimux"|"neotest"
+        "termopen"|"quickfix"|"toggleterm"|"vimux"
 
 
 test_executor_alias                                        *test_executor_alias*
 
     Type: ~
-        executor_alias|"background"
+        executor_alias|"background"|"neotest"
 
 
 RustaceanHoverActionsOpts                            *RustaceanHoverActionsOpts*
@@ -242,6 +242,9 @@ RustaceanLspClientOpts                                  *RustaceanLspClientOpts*
         {logfile?}               (string)                                                                          The path to the rust-analyzer log file.
         {load_vscode_settings?}  (boolean)                                                                         Whether to search (upward from the buffer) for rust-analyzer settings in .vscode/settings json. If found, loaded settings will override configured options. Default: false
 
+    See: ~
+        |vim.lsp.ClientConfig|
+
 
 RustaceanDapOpts                                              *RustaceanDapOpts*
 
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/cargo.lua b/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/cargo.lua
index f12d130d..4310f2d0 100644
--- a/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/cargo.lua
+++ b/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/cargo.lua
@@ -59,6 +59,7 @@ function cargo.get_root_dir(file_name)
     upward = true,
     path = path,
   })[1])
+  ---@type string | nil
   local cargo_workspace_dir = nil
   if vim.fn.executable('cargo') == 1 then
     local cmd = { 'cargo', 'metadata', '--no-deps', '--format-version', '1' }
@@ -80,8 +81,10 @@ function cargo.get_root_dir(file_name)
       cm = -1
     end
     if cm == 0 then
-      cargo_workspace_dir = vim.fn.json_decode(cargo_metadata)['workspace_root']
-      ---@cast cargo_workspace_dir string
+      local ok, cargo_metadata_json = pcall(vim.fn.json_decode, cargo_metadata)
+      if ok and cargo_metadata_json then
+        cargo_workspace_dir = cargo_metadata_json['workspace_root']
+      end
     end
   end
   return cargo_workspace_dir
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/commands/init.lua b/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/commands/init.lua
index 00247ff9..ee1df3c9 100644
--- a/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/commands/init.lua
+++ b/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/commands/init.lua
@@ -332,17 +332,17 @@ function M.create_rust_lsp_command()
     bang = true,
     desc = 'Interacts with the rust-analyzer LSP client',
     complete = function(arg_lead, cmdline, _)
-      local commands = cmdline:match('^' .. rust_lsp_cmd_name .. '!') ~= nil
+      local commands = cmdline:match("^['<,'>]*" .. rust_lsp_cmd_name .. '!') ~= nil
           -- bang!
           and tbl_keys_by_value_filter(function(command)
             return command.bang == true
           end, rustlsp_command_tbl)
         or vim.tbl_keys(rustlsp_command_tbl)
-      local subcmd, subcmd_arg_lead = cmdline:match('^' .. rust_lsp_cmd_name .. '[!]*%s(%S+)%s(.*)$')
+      local subcmd, subcmd_arg_lead = cmdline:match("^['<,'>]*" .. rust_lsp_cmd_name .. '[!]*%s(%S+)%s(.*)$')
       if subcmd and subcmd_arg_lead and rustlsp_command_tbl[subcmd] and rustlsp_command_tbl[subcmd].complete then
         return rustlsp_command_tbl[subcmd].complete(subcmd_arg_lead)
       end
-      if cmdline:match('^' .. rust_lsp_cmd_name .. '[!]*%s+%w*$') then
+      if cmdline:match("^['<,'>]*" .. rust_lsp_cmd_name .. '[!]*%s+%w*$') then
         return vim.tbl_filter(function(command)
           return command:find(arg_lead) ~= nil
         end, commands)
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/config/init.lua b/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/config/init.lua
index 5b2fe2c7..68d2f20a 100644
--- a/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/config/init.lua
+++ b/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/config/init.lua
@@ -82,9 +82,9 @@ vim.g.rustaceanvim = vim.g.rustaceanvim
 ---@see vim.lsp.util.open_floating_preview.Opts
 ---@see vim.api.nvim_open_win
 
----@alias executor_alias 'termopen' | 'quickfix' | 'toggleterm' | 'vimux' | 'neotest'
+---@alias executor_alias 'termopen' | 'quickfix' | 'toggleterm' | 'vimux'
 
----@alias test_executor_alias executor_alias | 'background'
+---@alias test_executor_alias executor_alias | 'background' | 'neotest'
 
 ---@class RustaceanHoverActionsOpts
 ---@field replace_builtin_hover? boolean Whether to replace Neovim's built-in `vim.lsp.buf.hover` with hover actions. Default: `true`
@@ -115,6 +115,7 @@ vim.g.rustaceanvim = vim.g.rustaceanvim
 ---@field standalone? boolean Standalone file support (enabled by default). Disabling it may improve rust-analyzer's startup time.
 ---@field logfile? string The path to the rust-analyzer log file.
 ---@field load_vscode_settings? boolean Whether to search (upward from the buffer) for rust-analyzer settings in .vscode/settings json. If found, loaded settings will override configured options. Default: false
+---@see vim.lsp.ClientConfig
 
 ---@class RustaceanDapOpts
 --- @field autoload_configurations boolean Whether to autoload nvim-dap configurations when rust-analyzer has attached? Default: `true`.
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/config/server.lua b/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/config/server.lua
index fee92dba..c5c3d4b8 100644
--- a/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/config/server.lua
+++ b/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/config/server.lua
@@ -29,7 +29,6 @@ function server.load_rust_analyzer_settings(project_root, opts)
   then
     ---@diagnostic disable-next-line: inject-field
     default_settings['rust-analyzer'].check = {
-      allFeatures = true,
       command = 'clippy',
       extraArgs = { '--no-deps' },
     }
@@ -148,7 +147,7 @@ function server.create_client_capabilities()
     }
   end)
   return vim.tbl_deep_extend(
-    'keep',
+    'force',
     rs_capabilities,
     cmp_capabilities,
     selection_range_capabilities,
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/dap.lua b/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/dap.lua
index c70641a1..33473099 100644
--- a/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/dap.lua
+++ b/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/dap.lua
@@ -188,7 +188,7 @@ local function add_dynamic_library_paths(adapter, workspace_root)
   if not workspace_root or environments[workspace_root] then
     return
   end
-  compat.system({ 'rustc', '--print', 'target-libdir' }, nil, function(sc)
+  compat.system({ 'rustc', '--print', 'target-libdir' }, { cwd = workspace_root }, function(sc)
     ---@cast sc vim.SystemCompleted
     local result = sc.stdout
     if sc.code ~= 0 or result == nil then
@@ -202,7 +202,7 @@ local function add_dynamic_library_paths(adapter, workspace_root)
     elseif shell.is_macos() then
       ---@diagnostic disable-next-line: missing-parameter
       environments[workspace_root] = environments[workspace_root]
-        or format_environment_variable(adapter, 'DKLD_LIBRARY_PATH', { rustc_target_path, target_path }, ':')
+        or format_environment_variable(adapter, 'DYLD_LIBRARY_PATH', { rustc_target_path, target_path }, ':')
     else
       ---@diagnostic disable-next-line: missing-parameter
       environments[workspace_root] = environments[workspace_root]
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/lsp.lua b/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/lsp.lua
index 00c73b91..2f65482f 100644
--- a/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/lsp.lua
+++ b/config/neovim/store/lazy-plugins/rustaceanvim/lua/rustaceanvim/lsp.lua
@@ -73,6 +73,27 @@ local function get_start_settings(bufname, root_dir, client_config)
   return evaluated_settings
 end
 
+---HACK: Workaround for https://github.com/neovim/neovim/pull/28690
+--- to solve #423.
+--- Checks if Neovim's file watcher is enabled, and if it isn't,
+--- configures rust-analyzer to enable server-side file watching (if not configured otherwise).
+---
+---@param server_cfg LspStartConfig LSP start settings
+local function configure_file_watcher(server_cfg)
+  local is_client_file_watcher_enabled =
+    vim.tbl_get(server_cfg.capabilities, 'workspace', 'didChangeWatchedFiles', 'dynamicRegistration')
+  local file_watcher_setting = vim.tbl_get(server_cfg.settings, 'rust-analyzer', 'files', 'watcher')
+  if is_client_file_watcher_enabled and not file_watcher_setting then
+    server_cfg.settings = vim.tbl_deep_extend('force', server_cfg.settings, {
+      ['rust-analyzer'] = {
+        files = {
+          watcher = 'server',
+        },
+      },
+    })
+  end
+end
+
 ---@class LspStartConfig: RustaceanLspClientConfig
 ---@field root_dir string | nil
 ---@field init_options? table
@@ -105,6 +126,7 @@ M.start = function(bufnr)
   lsp_start_config.root_dir = root_dir
 
   lsp_start_config.settings = get_start_settings(bufname, root_dir, client_config)
+  configure_file_watcher(lsp_start_config)
 
   -- Check if a client is already running and add the workspace folder if necessary.
   for _, client in pairs(rust_analyzer.get_active_rustaceanvim_clients()) do
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/nix-support/propagated-build-inputs b/config/neovim/store/lazy-plugins/rustaceanvim/nix-support/propagated-build-inputs
index b3b8c91f..169a165b 100644
--- a/config/neovim/store/lazy-plugins/rustaceanvim/nix-support/propagated-build-inputs
+++ b/config/neovim/store/lazy-plugins/rustaceanvim/nix-support/propagated-build-inputs
@@ -1 +1 @@
-/nix/store/mqbhz05llkddfb5wni0m48kw22ixxps4-lua-5.1.5 
\ No newline at end of file
+/nix/store/3czmrawji85vf8979kll2yx2f1kjkric-lua-5.1.5 
\ No newline at end of file
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/rock_manifest b/config/neovim/store/lazy-plugins/rustaceanvim/rock_manifest
index 12d04fbd..9fcba68d 100644
--- a/config/neovim/store/lazy-plugins/rustaceanvim/rock_manifest
+++ b/config/neovim/store/lazy-plugins/rustaceanvim/rock_manifest
@@ -1,7 +1,7 @@
 rock_manifest = {
    doc = {
       ["mason.txt"] = "858adffa88b1649b91187f49f191e376",
-      ["rustaceanvim.txt"] = "a9fa5fd997f2e2c099d2bf715cf4d5e9"
+      ["rustaceanvim.txt"] = "015b5fced4394fb911e73ba609c2b00c"
    },
    ftplugin = {
       ["rust.lua"] = "b225026e3590a6741373922fbae423e5",
@@ -11,7 +11,7 @@ rock_manifest = {
    lua = {
       rustaceanvim = {
          ["cached_commands.lua"] = "6e23c8231f44a3edc76be54766fca334",
-         ["cargo.lua"] = "43ba56ed4ba112dd22cac598e7b248df",
+         ["cargo.lua"] = "f2a24f708ff861b7aa914407c67a5c0e",
          commands = {
             ["code_action_group.lua"] = "55bf0c83a007e5d64924eafe2e2a96eb",
             ["crate_graph.lua"] = "30d01abc92dff63ace83a5d1697d2073",
@@ -21,7 +21,7 @@ rock_manifest = {
             ["external_docs.lua"] = "1d2fa5d88ea197ad9976c23b0ff70763",
             ["fly_check.lua"] = "3f7b89700bd8f98fd5ab0ec02cce1cdd",
             ["hover_range.lua"] = "68828cfd0c465bbe0915996795ff7b92",
-            ["init.lua"] = "6d7415da1c6e12b7b7914ab4e0339fae",
+            ["init.lua"] = "0f99af7dabcd1ad961de545363e0f658",
             ["join_lines.lua"] = "f31a68f1ddac01b926d58ccd249bc03d",
             ["move_item.lua"] = "f05118ba148e66c1e92882141e68343f",
             ["open_cargo_toml.lua"] = "2368251db4ce52659693acc8eee15b74",
@@ -37,12 +37,12 @@ rock_manifest = {
          ["compat.lua"] = "fedaef1aeaceaf086116ed62b423d0a3",
          config = {
             ["check.lua"] = "55ddc99999546e6951cd2641cc997af2",
-            ["init.lua"] = "a583a64ac0023a551c16a92f61ff063d",
+            ["init.lua"] = "4f8a4eb148571862d1439263f18c7cee",
             ["internal.lua"] = "854115363fcfc13e65098150b873a8ff",
             ["json.lua"] = "a8c7caf443ad9ce1193726aec053cc8d",
-            ["server.lua"] = "d642a65f31cb4f12b812840c1171821f"
+            ["server.lua"] = "a58c53c1333c5d050d97cf3e2bf82d99"
          },
-         ["dap.lua"] = "757ecf822f6c30ebf9e462f7009ce99a",
+         ["dap.lua"] = "e39cbe01d5d7c03d585e7448d24ceab7",
          executors = {
             ["background.lua"] = "ae1c76a5c2f73e9c58456f580b7552b7",
             ["init.lua"] = "a443891fc3b974db6787502179d85c19",
@@ -56,7 +56,7 @@ rock_manifest = {
          ["health.lua"] = "126952700269c9ab976f29f59604c5da",
          ["hover_actions.lua"] = "d0842822fa99c55b4cc5a65eae968ff2",
          ["init.lua"] = "a48de2e7e937208adc6781a5ea35ec88",
-         ["lsp.lua"] = "c36e5b79bb7fb41a9781d70421f7a55c",
+         ["lsp.lua"] = "5e8af804d16be73193df6067141bdf9f",
          neotest = {
             ["init.lua"] = "ec54c5df5002742877ec6c925b273b2d",
             ["trans.lua"] = "1f79320bca0c81d91673543dd7ad4984"
@@ -74,5 +74,5 @@ rock_manifest = {
          ["ui.lua"] = "185cbb4ef9b15b4feb6699fcbd5d4435"
       }
    },
-   ["rustaceanvim-4.22.8-1.rockspec"] = "1d483e8dffa0275323da043a1e8c9cf3"
+   ["rustaceanvim-4.25.1-1.rockspec"] = "fc780a2aa2e2df3fdb088697523f426f"
 }
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/manifest b/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/manifest
deleted file mode 100644
index 756ee0f7..00000000
--- a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/manifest
+++ /dev/null
@@ -1,241 +0,0 @@
-commands = {}
-dependencies = {
-   rustaceanvim = {
-      ["4.22.8-1"] = {
-         {
-            constraints = {
-               {
-                  op = ">=",
-                  version = {
-                     5, 1, string = "5.1"
-                  }
-               }
-            },
-            name = "lua"
-         }
-      }
-   }
-}
-modules = {
-   ["rustaceanvim.cached_commands"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.cargo"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.code_action_group"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.crate_graph"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.debuggables"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.diagnostic"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.expand_macro"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.external_docs"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.fly_check"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.hover_range"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.init"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.join_lines"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.move_item"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.open_cargo_toml"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.parent_module"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.rebuild_proc_macros"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.rustc_unpretty"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.ssr"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.syntax_tree"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.view_ir"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.workspace_refresh"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.commands.workspace_symbol"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.compat"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.config.check"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.config.init"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.config.internal"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.config.json"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.config.server"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.dap"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.executors.background"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.executors.init"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.executors.meta"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.executors.neotest"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.executors.quickfix"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.executors.termopen"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.executors.toggleterm"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.executors.vimux"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.health"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.hover_actions"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.init"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.lsp"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.neotest.init"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.neotest.trans"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.os"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.overrides"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.runnables"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.rust_analyzer"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.server_status"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.shell"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.test"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.types.internal"] = {
-      "rustaceanvim/4.22.8-1"
-   },
-   ["rustaceanvim.ui"] = {
-      "rustaceanvim/4.22.8-1"
-   }
-}
-repository = {
-   rustaceanvim = {
-      ["4.22.8-1"] = {
-         {
-            arch = "installed",
-            commands = {},
-            dependencies = {},
-            modules = {
-               ["rustaceanvim.cached_commands"] = "rustaceanvim/cached_commands.lua",
-               ["rustaceanvim.cargo"] = "rustaceanvim/cargo.lua",
-               ["rustaceanvim.commands.code_action_group"] = "rustaceanvim/commands/code_action_group.lua",
-               ["rustaceanvim.commands.crate_graph"] = "rustaceanvim/commands/crate_graph.lua",
-               ["rustaceanvim.commands.debuggables"] = "rustaceanvim/commands/debuggables.lua",
-               ["rustaceanvim.commands.diagnostic"] = "rustaceanvim/commands/diagnostic.lua",
-               ["rustaceanvim.commands.expand_macro"] = "rustaceanvim/commands/expand_macro.lua",
-               ["rustaceanvim.commands.external_docs"] = "rustaceanvim/commands/external_docs.lua",
-               ["rustaceanvim.commands.fly_check"] = "rustaceanvim/commands/fly_check.lua",
-               ["rustaceanvim.commands.hover_range"] = "rustaceanvim/commands/hover_range.lua",
-               ["rustaceanvim.commands.init"] = "rustaceanvim/commands/init.lua",
-               ["rustaceanvim.commands.join_lines"] = "rustaceanvim/commands/join_lines.lua",
-               ["rustaceanvim.commands.move_item"] = "rustaceanvim/commands/move_item.lua",
-               ["rustaceanvim.commands.open_cargo_toml"] = "rustaceanvim/commands/open_cargo_toml.lua",
-               ["rustaceanvim.commands.parent_module"] = "rustaceanvim/commands/parent_module.lua",
-               ["rustaceanvim.commands.rebuild_proc_macros"] = "rustaceanvim/commands/rebuild_proc_macros.lua",
-               ["rustaceanvim.commands.rustc_unpretty"] = "rustaceanvim/commands/rustc_unpretty.lua",
-               ["rustaceanvim.commands.ssr"] = "rustaceanvim/commands/ssr.lua",
-               ["rustaceanvim.commands.syntax_tree"] = "rustaceanvim/commands/syntax_tree.lua",
-               ["rustaceanvim.commands.view_ir"] = "rustaceanvim/commands/view_ir.lua",
-               ["rustaceanvim.commands.workspace_refresh"] = "rustaceanvim/commands/workspace_refresh.lua",
-               ["rustaceanvim.commands.workspace_symbol"] = "rustaceanvim/commands/workspace_symbol.lua",
-               ["rustaceanvim.compat"] = "rustaceanvim/compat.lua",
-               ["rustaceanvim.config.check"] = "rustaceanvim/config/check.lua",
-               ["rustaceanvim.config.init"] = "rustaceanvim/config/init.lua",
-               ["rustaceanvim.config.internal"] = "rustaceanvim/config/internal.lua",
-               ["rustaceanvim.config.json"] = "rustaceanvim/config/json.lua",
-               ["rustaceanvim.config.server"] = "rustaceanvim/config/server.lua",
-               ["rustaceanvim.dap"] = "rustaceanvim/dap.lua",
-               ["rustaceanvim.executors.background"] = "rustaceanvim/executors/background.lua",
-               ["rustaceanvim.executors.init"] = "rustaceanvim/executors/init.lua",
-               ["rustaceanvim.executors.meta"] = "rustaceanvim/executors/meta.lua",
-               ["rustaceanvim.executors.neotest"] = "rustaceanvim/executors/neotest.lua",
-               ["rustaceanvim.executors.quickfix"] = "rustaceanvim/executors/quickfix.lua",
-               ["rustaceanvim.executors.termopen"] = "rustaceanvim/executors/termopen.lua",
-               ["rustaceanvim.executors.toggleterm"] = "rustaceanvim/executors/toggleterm.lua",
-               ["rustaceanvim.executors.vimux"] = "rustaceanvim/executors/vimux.lua",
-               ["rustaceanvim.health"] = "rustaceanvim/health.lua",
-               ["rustaceanvim.hover_actions"] = "rustaceanvim/hover_actions.lua",
-               ["rustaceanvim.init"] = "rustaceanvim/init.lua",
-               ["rustaceanvim.lsp"] = "rustaceanvim/lsp.lua",
-               ["rustaceanvim.neotest.init"] = "rustaceanvim/neotest/init.lua",
-               ["rustaceanvim.neotest.trans"] = "rustaceanvim/neotest/trans.lua",
-               ["rustaceanvim.os"] = "rustaceanvim/os.lua",
-               ["rustaceanvim.overrides"] = "rustaceanvim/overrides.lua",
-               ["rustaceanvim.runnables"] = "rustaceanvim/runnables.lua",
-               ["rustaceanvim.rust_analyzer"] = "rustaceanvim/rust_analyzer.lua",
-               ["rustaceanvim.server_status"] = "rustaceanvim/server_status.lua",
-               ["rustaceanvim.shell"] = "rustaceanvim/shell.lua",
-               ["rustaceanvim.test"] = "rustaceanvim/test.lua",
-               ["rustaceanvim.types.internal"] = "rustaceanvim/types/internal.lua",
-               ["rustaceanvim.ui"] = "rustaceanvim/ui.lua"
-            }
-         }
-      }
-   }
-}
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/doc/mason.txt b/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/doc/mason.txt
deleted file mode 100644
index a30f1510..00000000
--- a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/doc/mason.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-==============================================================================
-mason-lspconfig troubleshooting                          *rustaceanvim.mason*
-
-This plugin supports automatically detecting mason.nvim codelldb installations,
-but not rust-analyzer.
-The main reason for this choice is that it mason.nvim installations of rust-analyzer
-will most likely have been built with a different toolchain than your project,
-leading to inconsistencies and possibly subtle bugs.
-
-If you want to use a mason.nvim installation anyway, you can do so by specifying
-the `server.cmd` setting (see |rustaceanvim.config| and |RustaceanLspClientOpts|):
->lua
-  vim.g.rustaceanvim = {
-    server = {
-      cmd = function()
-	local mason_registry = require('mason-registry')
-	local ra_binary = mason_registry.is_installed('rust-analyzer') 
-	  -- This may need to be tweaked, depending on the operating system.
-	  and mason_registry.get_package('rust-analyzer'):get_install_path() .. "/rust-analyzer"
-	  or "rust-analyzer"
-	return { ra_binary } -- You can add args to the list, such as '--log-file'
-      end,
-    },
-  }
-<
-Note that mason-lspconfig.nvim, when configured to ensure rust-analyzer is installed,
-assumes you are using the `nvim-lspconfig.rust_analyzer` client.
-Some Neovim distributions will automatically call the client's `setup`
-function, resulting in a conflict with this plugin.
-
-General approach to prevent mason-lspconfig from setting up
-`lspconfig.rust_analyzer`:
-
->lua
-  require('mason-lspconfig').setup_handlers {
-    ['rust_analyzer'] = function() end,
-  }
-<
-
-Using LazyVim:
-
->lua
-  {
-    'neovim/nvim-lspconfig',
-    opts = {
-      setup = {
-        rust_analyzer = function()
-          return true 
-        end,
-      },
-    },
-  }
-<
-vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/doc/rustaceanvim.txt b/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/doc/rustaceanvim.txt
deleted file mode 100644
index 6e6234c3..00000000
--- a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/doc/rustaceanvim.txt
+++ /dev/null
@@ -1,410 +0,0 @@
-==============================================================================
-Table of Contents                                        *rustaceanvim.contents*
-
-Introduction ··························································· |intro|
- ································································ |rustaceanvim|
-plugin configuration ····································· |rustaceanvim.config|
-LSP configuration utility ························· |rustaceanvim.config.server|
- ························································ |rustaceanvim.neotest|
-
-==============================================================================
-Introduction                                                             *intro*
-
-This plugin automatically configures the `rust-analyzer` builtin LSP client
-and integrates with other rust tools.
-
-==============================================================================
-                                                                  *rustaceanvim*
-
-
-Commands:
-
- ':RustAnalyzer start' - Start the LSP client.
- ':RustAnalyzer stop' - Stop the LSP client.
- ':RustAnalyzer restart' - Restart the LSP client.
- ':RustAnalyzer reloadSettings' - Reload settings for the LSP client.
-
-The ':RustLsp[!]' command is available after the LSP client has initialized.
-It accepts the following subcommands:
-
- 'runnables {args[]}?' - Run tests, executables, etc.
-                         ':RustLsp!' means run the last runnable (ignores any args).
-                         `args[]` allows you to override the executable's arguments.
- 'run {args[]}?'       - Like 'runnables', but runs the target at the current cursor position.
- 'debuggables {args[]}?' - Debug tests, executables, etc. (requires |nvim-dap|).
-                           ':RustLsp!' means run the last debuggable (ignores any args).
-                           `args[]` allows you to override the executable's arguments.
- 'debug {args[]}?'       - Like 'debuggables', but debugs the target at the current cursor position.
- 'testables {args[]}?' - Run tests
-                         ':RustLsp!' means run the last testable (ignores any args).
-                         `args[]` allows you to override the executable's arguments.
- 'expandMacro' - Expand macros recursively.
- 'moveItem {up|down}' - Move items up or down.
- 'hover {actions|range}' - Hover actions, or hover over visually selected range.
- 'explainError' - Display a hover window with explanations form the Rust error index.
-                  Like |vim.diagnostic.goto_next|, |explainError| will cycle diagnostics,
-                  starting at the cursor position, until it can find a diagnostic with
-                  an error code.
- 'renderDiagnostic' - Display a hover window with the rendered diagnostic,
-                      as displayed during `cargo build`.
-                  Like |vim.diagnostic.goto_next|, |renderDiagnostic| will cycle diagnostics,
-                  starting at the cursor position, until it can find a diagnostic with
-                  rendered data.
- 'openCargo' - Open the Cargo.toml file for the current package.
- 'openDocs' - Open docs.rs documentation for the symbol under the cursor.
- 'parentModule' - Open the current module's parent module.
- 'workspaceSymbol {onlyTypes?|allSymbols?} {query?}'
-                  Filtered workspace symbol search.
-                  When run with a bang (`:RustLsp! workspaceSymbol ...`),
-                  rust-analyzer will include dependencies in the search.
-                  You can also configure rust-analyzer so that |vim.lsp.buf.workspace_symbol|
-                  supports filtering (with a # suffix to the query) or searching dependencies.
- 'joinLines' - Join adjacent lines.
- 'ssr {query}' - Structural search and replace.
-                 Searches the entire buffer in normal mode.
-                 Searches the selected region in visual mode.
- 'crateGraph {backend}' - Create and view a crate graph with graphviz.
- 'syntaxTree' - View the syntax tree.
- 'view {mir|hir}' - View MIR or HIR.
- 'flyCheck' {run?|clear?|cancel?}
-            - Run `cargo check` or another compatible command (f.x. `clippy`)
-              in a background thread and provide LSP diagnostics based on
-              the output of the command.
-              Useful in large projects where running `cargo check` on each save
-              can be costly.
-              Defaults to `flyCheck run` if called without an argument.
- 'logFile' - Open the rust-analyzer log file.
-
-The ':Rustc' command can be used to interact with rustc.
-It accepts the following subcommands:
-
- 'unpretty {args[]}' - Opens a buffer with a textual representation of the MIR or others things,
-                       of the function closest to the cursor.
-                       Achieves an experience similar to Rust Playground.
-                       NOTE: This currently requires a tree-sitter parser for Rust,
-                       and a nightly compiler toolchain.
-
-==============================================================================
-plugin configuration                                       *rustaceanvim.config*
-
-
-rustaceanvim is a filetype plugin, and does not need
-a `setup` function to work.
-
-To configure rustaceanvim, set the variable `vim.g.rustaceanvim`,
-which is a `RustaceanOpts` table, in your neovim configuration.
-
-Example:
-
->lua
----@type RustaceanOpts
-vim.g.rustaceanvim = {
-   ---@type RustaceanToolsOpts
-   tools = {
-     -- ...
-   },
-   ---@type RustaceanLspClientOpts
-   server = {
-     on_attach = function(client, bufnr)
-       -- Set keybindings, etc. here.
-     end,
-     default_settings = {
-       -- rust-analyzer language server configuration
-       ['rust-analyzer'] = {
-       },
-     },
-     -- ...
-   },
-   ---@type RustaceanDapOpts
-   dap = {
-     -- ...
-   },
- }
-<
-
-Notes:
-
- - `vim.g.rustaceanvim` can also be a function that returns a `RustaceanOpts` table.
- - `server.settings`, by default, is a function that looks for a `rust-analyzer.json` file
-    in the project root, to load settings from it. It falls back to an empty table.
-
-
-RustaceanOpts                                                    *RustaceanOpts*
-
-    Fields: ~
-        {tools?}   (RustaceanToolsOpts)      Plugin options
-        {server?}  (RustaceanLspClientOpts)  Language server client options
-        {dap?}     (RustaceanDapOpts)        Debug adapter options
-
-
-RustaceanToolsOpts                                          *RustaceanToolsOpts*
-
-    Fields: ~
-        {executor?}                          (RustaceanExecutor|executor_alias)           The executor to use for runnables/debuggables
-        {test_executor?}                     (RustaceanExecutor|test_executor_alias)      The executor to use for runnables that are tests / testables
-        {crate_test_executor?}               (RustaceanExecutor|test_executor_alias)      The executor to use for runnables that are crate test suites (--all-targets)
-        {cargo_override?}                    (string)                                     Set this to override the 'cargo' command for runnables, debuggables (etc., e.g. to 'cross'). If set, this takes precedence over 'enable_nextest'.
-        {enable_nextest?}                    (boolean)                                    Whether to enable nextest. If enabled, `cargo test` commands will be transformed to `cargo nextest run` commands. Defaults to `true` if cargo-nextest is detected. Ignored if `cargo_override` is set.
-        {enable_clippy?}                     (boolean)                                    Whether to enable clippy checks on save if a clippy installation is detected. Default: `true`
-        {on_initialized?}                    (fun(health:RustAnalyzerInitializedStatus))  Function that is invoked when the LSP server has finished initializing
-        {reload_workspace_from_cargo_toml?}  (boolean)                                    Automatically call `RustReloadWorkspace` when writing to a Cargo.toml file
-        {hover_actions?}                     (RustaceanHoverActionsOpts)                  Options for hover actions
-        {code_actions?}                      (RustaceanCodeActionOpts)                    Options for code actions
-        {float_win_config?}                  (FloatWinConfig)                             Options applied to floating windows. See |api-win_config|.
-        {create_graph?}                      (RustaceanCrateGraphConfig)                  Options for showing the crate graph based on graphviz and the dot
-        {open_url?}                          (fun(url:string):nil)                        If set, overrides how to open URLs
-        {rustc?}                             (RustcOpts)                                  Options for `rustc`
-
-
-RustaceanExecutor                                            *RustaceanExecutor*
-
-    Fields: ~
-        {execute_command}  (fun(cmd:string,args:string[],cwd:string|nil,opts?:RustaceanExecutorOpts))
-
-
-RustaceanExecutorOpts                                    *RustaceanExecutorOpts*
-
-    Fields: ~
-        {bufnr?}  (integer)  The buffer from which the executor was invoked.
-
-
-FloatWinConfig                                                  *FloatWinConfig*
-
-    Fields: ~
-        {auto_focus?}  (boolean)
-        {open_split?}  ("horizontal"|"vertical")
-
-    See: ~
-        |vim.lsp.util.open_floating_preview.Opts|
-        |vim.api.nvim_open_win|
-
-
-executor_alias                                                  *executor_alias*
-
-    Type: ~
-        "termopen"|"quickfix"|"toggleterm"|"vimux"|"neotest"
-
-
-test_executor_alias                                        *test_executor_alias*
-
-    Type: ~
-        executor_alias|"background"
-
-
-RustaceanHoverActionsOpts                            *RustaceanHoverActionsOpts*
-
-    Fields: ~
-        {replace_builtin_hover?}  (boolean)  Whether to replace Neovim's built-in `vim.lsp.buf.hover` with hover actions. Default: `true`
-
-
-RustaceanCodeActionOpts                                *RustaceanCodeActionOpts*
-
-    Fields: ~
-        {group_icon?}          (string)   Text appended to a group action
-        {ui_select_fallback?}  (boolean)  Whether to fall back to `vim.ui.select` if there are no grouped code actions. Default: `false`
-
-
-lsp_server_health_status                              *lsp_server_health_status*
-
-    Type: ~
-        "ok"|"warning"|"error"
-
-
-RustAnalyzerInitializedStatus                    *RustAnalyzerInitializedStatus*
-
-    Fields: ~
-        {health}  (lsp_server_health_status)
-
-
-RustaceanCrateGraphConfig                            *RustaceanCrateGraphConfig*
-
-    Fields: ~
-        {backend?}                    (string)    Backend used for displaying the graph. See: https://graphviz.org/docs/outputs/ Defaults to `"x11"` if unset.
-        {output?}                     (string)    Where to store the output. No output if unset. Relative path from `cwd`.
-        {enabled_graphviz_backends?}  (string[])  Override the enabled graphviz backends list, used for input validation and autocompletion.
-        {pipe?}                       (string)    Overide the pipe symbol in the shell command. Useful if using a shell that is not supported by this plugin.
-
-
-RustcOpts                                                            *RustcOpts*
-
-    Fields: ~
-        {edition}  (string)  The edition to use. See https://rustc-dev-guide.rust-lang.org/guides/editions.html. Default '2021'.
-
-
-RustaceanLspClientOpts                                  *RustaceanLspClientOpts*
-
-    Fields: ~
-        {auto_attach?}           (boolean|fun(bufnr:integer):boolean)                                              Whether to automatically attach the LSP client. Defaults to `true` if the `rust-analyzer` executable is found.
-        {cmd?}                   (string[]|fun():string[])                                                         Command and arguments for starting rust-analyzer
-        {root_dir?}              (string|fun(filename:string,default:fun(filename:string):string|nil):string|nil)  The directory to use for the attached LSP. Can be a function, which may return nil if no server should attach. The second argument contains the default implementation, which can be used for fallback behavior.
-        {settings?}              (table|fun(project_root:string|nil,default_settings:table):table)                 Setting passed to rust-analyzer. Defaults to a function that looks for a `rust-analyzer.json` file or returns an empty table. See https://rust-analyzer.github.io/manual.html#configuration.
-        {standalone?}            (boolean)                                                                         Standalone file support (enabled by default). Disabling it may improve rust-analyzer's startup time.
-        {logfile?}               (string)                                                                          The path to the rust-analyzer log file.
-        {load_vscode_settings?}  (boolean)                                                                         Whether to search (upward from the buffer) for rust-analyzer settings in .vscode/settings json. If found, loaded settings will override configured options. Default: false
-
-
-RustaceanDapOpts                                              *RustaceanDapOpts*
-
-    Fields: ~
-        {adapter?}  (DapExecutableConfig|DapServerConfig|disable|fun():DapExecutableConfig|DapServerConfig|disable)   @field autoload_configurations boolean Whether to autoload nvim-dap configurations when rust-analyzer has attached? Default: `true`.
-
-
-disable                                                                *disable*
-
-    Type: ~
-        false
-
-
-DapCommand                                                          *DapCommand*
-
-    Type: ~
-        string
-
-
-DapExecutableConfig                                        *DapExecutableConfig*
-
-    Fields: ~
-        {type}     (dap_adapter_type_executable)  The type of debug adapter.
-        {command}  (string)                       Default: `"lldb-vscode"`.
-        {args?}    (string)                       Default: unset.
-        {name?}    (string)                       Default: `"lldb"`.
-
-
-DapServerConfig                                                *DapServerConfig*
-
-    Fields: ~
-        {type}        (dap_adapter_type_server)  The type of debug adapter.
-        {host?}       (string)                   The host to connect to.
-        {port}        (string)                   The port to connect to.
-        {executable}  (DapExecutable)            The executable to run
-        {name?}       (string)
-
-
-DapExecutable                                                    *DapExecutable*
-
-    Fields: ~
-        {command}  (string)    The executable.
-        {args}     (string[])  Its arguments.
-
-
-dap_adapter_type_executable                        *dap_adapter_type_executable*
-
-    Type: ~
-        
-
-
-dap_adapter_type_server                                *dap_adapter_type_server*
-
-    Type: ~
-        
-
-
-DapClientConfig : Configuration                                *DapClientConfig*
-
-    Fields: ~
-        {type}           (string)                                                                         The dap adapter to use
-        {name}           (string)
-        {request}        (dap_config_request_launch|dap_config_request_attach|dap_config_request_custom)  The type of dap session
-        {cwd?}           (string)                                                                         Current working directory
-        {program?}       (string)                                                                         Path to executable for most DAP clients
-        {args?}          (string[])                                                                       Optional args to DAP client, not valid for all client types
-        {env?}           (EnvironmentMap)                                                                 Environmental variables
-        {initCommands?}  (string[])                                                                       Initial commands to run, `lldb` clients only
-        {coreConfigs?}   (table)                                                                          Essential config values for `probe-rs` client, see https://probe.rs/docs/tools/debugger/
-
-
-EnvironmentMap                                                  *EnvironmentMap*
-
-    Type: ~
-        table<string,string[]>
-
-
-dap_config_request_launch                            *dap_config_request_launch*
-
-    Type: ~
-        
-
-
-dap_config_request_attach                            *dap_config_request_attach*
-
-    Type: ~
-        
-
-
-dap_config_request_custom                            *dap_config_request_custom*
-
-    Type: ~
-        
-
-
-                                                        *M.get_codelldb_adapter*
-M.get_codelldb_adapter({codelldb_path}, {liblldb_path})
-    For the heroes who want to use it.
-
-    Parameters: ~
-        {codelldb_path}  (string)  Path to the codelldb executable
-        {liblldb_path}   (string)  Path to the liblldb dynamic library
-
-    Returns: ~
-        (DapServerConfig)
-
-
-==============================================================================
-LSP configuration utility                           *rustaceanvim.config.server*
-
-LoadRASettingsOpts                                          *LoadRASettingsOpts*
-
-    Fields: ~
-        {settings_file_pattern}  (string|nil)  File name or pattern to search for. Defaults to 'rust-analyzer.json'
-        {default_settings}       (table|nil)   Default settings to merge the loaded settings into
-
-
-                                            *server.load_rust_analyzer_settings*
-server.load_rust_analyzer_settings({project_root}, {opts})
-     Load rust-analyzer settings from a JSON file,
-     falling back to the default settings if none is found or if it cannot be decoded.
-
-    Parameters: ~
-        {project_root}  (string|nil)              The project root
-        {opts}          (LoadRASettingsOpts|nil)
-
-    Returns: ~
-        (table)  server_settings
-
-    See: ~
-        |https://rust-analyzer.github.io/manual.html#configuration|
-
-
-server.create_client_capabilities()          *server.create_client_capabilities*
-
-    Returns: ~
-        (lsp.ClientCapabilities)
-
-
-==============================================================================
-                                                          *rustaceanvim.neotest*
-
-
-A |neotest| adapter for rust, powered by rustaceanvim.
-
-If you add this to neotest:
-
->
-require('neotest').setup {
-    -- ...,
-    adapters = {
-      -- ...,
-      require('rustaceanvim.neotest')
-    },
-}
-<
-
-this plugin will configure itself to use |neotest|
-as a test executor, and |neotest| will use rust-analyzer
-for test discovery and command construction.
-
-Note: If you use this adapter, do not add the neotest-rust adapter
-(another plugin).
-
-
-vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/ftplugin/rust.lua b/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/ftplugin/rust.lua
deleted file mode 100644
index 11661084..00000000
--- a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/ftplugin/rust.lua
+++ /dev/null
@@ -1,57 +0,0 @@
----@type RustaceanConfig
-local config = require('rustaceanvim.config.internal')
-
-if not vim.g.loaded_rustaceanvim then
-  require('rustaceanvim.config.check').check_for_lspconfig_conflict(vim.schedule_wrap(function(warn)
-    vim.notify_once(warn, vim.log.levels.WARN)
-  end))
-  vim.lsp.commands['rust-analyzer.runSingle'] = function(command)
-    local runnables = require('rustaceanvim.runnables')
-    local cached_commands = require('rustaceanvim.cached_commands')
-    ---@type RARunnable[]
-    local ra_runnables = command.arguments
-    local runnable = ra_runnables[1]
-    local cargo_args = runnable.args.cargoArgs
-    if #cargo_args > 0 and vim.startswith(cargo_args[1], 'test') then
-      cached_commands.set_last_testable(1, ra_runnables)
-    end
-    cached_commands.set_last_runnable(1, ra_runnables)
-    runnables.run_command(1, ra_runnables)
-  end
-
-  vim.lsp.commands['rust-analyzer.gotoLocation'] = function(command, ctx)
-    local client = vim.lsp.get_client_by_id(ctx.client_id)
-    if client then
-      vim.lsp.util.jump_to_location(command.arguments[1], client.offset_encoding)
-    end
-  end
-
-  vim.lsp.commands['rust-analyzer.showReferences'] = function(_)
-    vim.lsp.buf.implementation()
-  end
-
-  vim.lsp.commands['rust-analyzer.debugSingle'] = function(command)
-    local overrides = require('rustaceanvim.overrides')
-    local args = command.arguments[1].args
-    overrides.sanitize_command_for_debugging(args.cargoArgs)
-    local cached_commands = require('rustaceanvim.cached_commands')
-    cached_commands.set_last_debuggable(args)
-    local rt_dap = require('rustaceanvim.dap')
-    rt_dap.start(args)
-  end
-
-  local commands = require('rustaceanvim.commands')
-  commands.create_rustc_command()
-end
-
-vim.g.loaded_rustaceanvim = true
-
-local auto_attach = config.server.auto_attach
-if type(auto_attach) == 'function' then
-  local bufnr = vim.api.nvim_get_current_buf()
-  auto_attach = auto_attach(bufnr)
-end
-
-if auto_attach then
-  require('rustaceanvim.lsp').start()
-end
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/ftplugin/rust.vim b/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/ftplugin/rust.vim
deleted file mode 100644
index e0466566..00000000
--- a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/ftplugin/rust.vim
+++ /dev/null
@@ -1,26 +0,0 @@
-" Copied from built-in compiler/{rustc,cargo}.vim
-setlocal errorformat=
-			\%f:%l:%c:\ %t%*[^:]:\ %m,
-			\%f:%l:%c:\ %*\\d:%*\\d\ %t%*[^:]:\ %m,
-			\%-G%f:%l\ %s,
-			\%-G%*[\ ]^,
-			\%-G%*[\ ]^%*[~],
-			\%-G%*[\ ]...
-
-" New errorformat (after nightly 2016/08/10)
-setlocal errorformat+=
-			\%-G,
-			\%-Gerror:\ aborting\ %.%#,
-			\%-Gerror:\ Could\ not\ compile\ %.%#,
-			\%Eerror:\ %m,
-			\%Eerror[E%n]:\ %m,
-			\%Wwarning:\ %m,
-			\%Inote:\ %m,
-			\%C\ %#-->\ %f:%l:%c
-
-setlocal errorformat+=
-			\%-G%\\s%#Downloading%.%#,
-			\%-G%\\s%#Compiling%.%#,
-			\%-G%\\s%#Finished%.%#,
-			\%-G%\\s%#error:\ Could\ not\ compile\ %.%#,
-			\%-G%\\s%#To\ learn\ more\\,%.%#
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/ftplugin/toml.lua b/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/ftplugin/toml.lua
deleted file mode 100644
index b465d3c4..00000000
--- a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/ftplugin/toml.lua
+++ /dev/null
@@ -1,24 +0,0 @@
-local fname = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(0), ':t')
-if fname ~= 'Cargo.toml' then
-  return
-end
-
-local config = require('rustaceanvim.config.internal')
-local ra = require('rustaceanvim.rust_analyzer')
-if config.tools.reload_workspace_from_cargo_toml then
-  local group = vim.api.nvim_create_augroup('RustaceanCargoReloadWorkspace', { clear = false })
-  local bufnr = vim.api.nvim_get_current_buf()
-  vim.api.nvim_clear_autocmds {
-    buffer = bufnr,
-    group = group,
-  }
-  vim.api.nvim_create_autocmd('BufWritePost', {
-    buffer = vim.api.nvim_get_current_buf(),
-    group = group,
-    callback = function()
-      if #ra.get_active_rustaceanvim_clients(nil) > 0 then
-        vim.cmd.RustLsp { 'reloadWorkspace', mods = { silent = true } }
-      end
-    end,
-  })
-end
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/rock_manifest b/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/rock_manifest
deleted file mode 100644
index 12d04fbd..00000000
--- a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/rock_manifest
+++ /dev/null
@@ -1,78 +0,0 @@
-rock_manifest = {
-   doc = {
-      ["mason.txt"] = "858adffa88b1649b91187f49f191e376",
-      ["rustaceanvim.txt"] = "a9fa5fd997f2e2c099d2bf715cf4d5e9"
-   },
-   ftplugin = {
-      ["rust.lua"] = "b225026e3590a6741373922fbae423e5",
-      ["rust.vim"] = "3121ffa3b7f1aa9c3efbfe32e438dbeb",
-      ["toml.lua"] = "a8807dcfb5f6687ac543f4f8da3a9554"
-   },
-   lua = {
-      rustaceanvim = {
-         ["cached_commands.lua"] = "6e23c8231f44a3edc76be54766fca334",
-         ["cargo.lua"] = "43ba56ed4ba112dd22cac598e7b248df",
-         commands = {
-            ["code_action_group.lua"] = "55bf0c83a007e5d64924eafe2e2a96eb",
-            ["crate_graph.lua"] = "30d01abc92dff63ace83a5d1697d2073",
-            ["debuggables.lua"] = "6548c5c600f14c9dc3d10e87983f6fb4",
-            ["diagnostic.lua"] = "55160b50ac49bcab96e15176fc5c7dde",
-            ["expand_macro.lua"] = "0a5991437c93aa39ace91d31dfd5d041",
-            ["external_docs.lua"] = "1d2fa5d88ea197ad9976c23b0ff70763",
-            ["fly_check.lua"] = "3f7b89700bd8f98fd5ab0ec02cce1cdd",
-            ["hover_range.lua"] = "68828cfd0c465bbe0915996795ff7b92",
-            ["init.lua"] = "6d7415da1c6e12b7b7914ab4e0339fae",
-            ["join_lines.lua"] = "f31a68f1ddac01b926d58ccd249bc03d",
-            ["move_item.lua"] = "f05118ba148e66c1e92882141e68343f",
-            ["open_cargo_toml.lua"] = "2368251db4ce52659693acc8eee15b74",
-            ["parent_module.lua"] = "c274b7357e35825f75802dc96e609992",
-            ["rebuild_proc_macros.lua"] = "6113336c3b82042f60c54446e6c5a887",
-            ["rustc_unpretty.lua"] = "fafde14d3d482667cecce2981444cad2",
-            ["ssr.lua"] = "1c936709630f09b2a81d22452d3e3fa2",
-            ["syntax_tree.lua"] = "c28fd8b22608e3f7bd3bdbb2e10c1617",
-            ["view_ir.lua"] = "12eadc00a2ca1005bcbeda4fa8fc80a0",
-            ["workspace_refresh.lua"] = "083b2d70533d0f417b65d2b7866f531b",
-            ["workspace_symbol.lua"] = "69bdc6d1255f7eb586ea8e350b840b85"
-         },
-         ["compat.lua"] = "fedaef1aeaceaf086116ed62b423d0a3",
-         config = {
-            ["check.lua"] = "55ddc99999546e6951cd2641cc997af2",
-            ["init.lua"] = "a583a64ac0023a551c16a92f61ff063d",
-            ["internal.lua"] = "854115363fcfc13e65098150b873a8ff",
-            ["json.lua"] = "a8c7caf443ad9ce1193726aec053cc8d",
-            ["server.lua"] = "d642a65f31cb4f12b812840c1171821f"
-         },
-         ["dap.lua"] = "757ecf822f6c30ebf9e462f7009ce99a",
-         executors = {
-            ["background.lua"] = "ae1c76a5c2f73e9c58456f580b7552b7",
-            ["init.lua"] = "a443891fc3b974db6787502179d85c19",
-            ["meta.lua"] = "99cae6c6b77725710ec2fc7d86bff665",
-            ["neotest.lua"] = "64a17e71f15a1741f0e7f835472f26e3",
-            ["quickfix.lua"] = "b1ea55a261b8623e73c2fd6aed278fd3",
-            ["termopen.lua"] = "4a225919ab4e1ad67fc591a9947d86e9",
-            ["toggleterm.lua"] = "221616f53cc50124694fcc1b0f1c92a2",
-            ["vimux.lua"] = "24d3f692083ca86f0926e7aa4722c0fe"
-         },
-         ["health.lua"] = "126952700269c9ab976f29f59604c5da",
-         ["hover_actions.lua"] = "d0842822fa99c55b4cc5a65eae968ff2",
-         ["init.lua"] = "a48de2e7e937208adc6781a5ea35ec88",
-         ["lsp.lua"] = "c36e5b79bb7fb41a9781d70421f7a55c",
-         neotest = {
-            ["init.lua"] = "ec54c5df5002742877ec6c925b273b2d",
-            ["trans.lua"] = "1f79320bca0c81d91673543dd7ad4984"
-         },
-         ["os.lua"] = "4c8caca1afb6a8e7862300b4dcc29f09",
-         ["overrides.lua"] = "177b171bfb8c16c19326d6402b94a535",
-         ["runnables.lua"] = "d458cb318b2cd900e178930d3b14f224",
-         ["rust_analyzer.lua"] = "aa3bce32849886001dc2cb38a4ff951e",
-         ["server_status.lua"] = "25017ef9b15fadd713574c897e242970",
-         ["shell.lua"] = "561e4be6d5ba43f93a00ad5e6169e0eb",
-         ["test.lua"] = "e436ae539217729f46a1d556974e1100",
-         types = {
-            ["internal.lua"] = "95d9ff5763390a3efae83cc27dbef452"
-         },
-         ["ui.lua"] = "185cbb4ef9b15b4feb6699fcbd5d4435"
-      }
-   },
-   ["rustaceanvim-4.22.8-1.rockspec"] = "1d483e8dffa0275323da043a1e8c9cf3"
-}
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/rustaceanvim-4.22.8-1.rockspec b/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/rustaceanvim-4.22.8-1.rockspec
deleted file mode 100644
index 0ecf8440..00000000
--- a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1-unstable-2024-05-27-rocks/rustaceanvim/4.22.8-1/rustaceanvim-4.22.8-1.rockspec
+++ /dev/null
@@ -1,40 +0,0 @@
-local git_ref = '4.22.8'
-local modrev = '4.22.8'
-local specrev = '1'
-
-local repo_url = 'https://github.com/mrcjkb/rustaceanvim'
-
-rockspec_format = '3.0'
-package = 'rustaceanvim'
-version = modrev ..'-'.. specrev
-
-description = {
-  summary = 'Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim',
-  detailed = [[
-This plugin automatically configures the rust-analyzer builtin LSP client
-and integrates with other Rust tools. See the README's #features section
-for more info.]],
-  labels = { 'dap', 'debug-adapter-protocol', 'language-server-protocol', 'lsp', 'neovim', 'nvim', 'plugin', 'rust', 'rust-analyzer', 'rust-lang', 'rust-tools' } ,
-  homepage = 'https://github.com/mrcjkb/rustaceanvim',
-  license = 'GPL-2.0'
-}
-
-dependencies = { 'lua >= 5.1' } 
-
-test_dependencies = { }
-
-source = {
-  url = repo_url .. '/archive/' .. git_ref .. '.zip',
-  dir = 'rustaceanvim-' .. '4.22.8',
-}
-
-if modrev == 'scm' or modrev == 'dev' then
-  source = {
-    url = repo_url:gsub('https', 'git')
-  }
-end
-
-build = {
-  type = 'builtin',
-  copy_directories = { 'doc', 'ftplugin' } ,
-}
diff --git a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1.rockspec b/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1.rockspec
deleted file mode 100644
index 0ecf8440..00000000
--- a/config/neovim/store/lazy-plugins/rustaceanvim/rustaceanvim-4.22.8-1.rockspec
+++ /dev/null
@@ -1,40 +0,0 @@
-local git_ref = '4.22.8'
-local modrev = '4.22.8'
-local specrev = '1'
-
-local repo_url = 'https://github.com/mrcjkb/rustaceanvim'
-
-rockspec_format = '3.0'
-package = 'rustaceanvim'
-version = modrev ..'-'.. specrev
-
-description = {
-  summary = 'Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim',
-  detailed = [[
-This plugin automatically configures the rust-analyzer builtin LSP client
-and integrates with other Rust tools. See the README's #features section
-for more info.]],
-  labels = { 'dap', 'debug-adapter-protocol', 'language-server-protocol', 'lsp', 'neovim', 'nvim', 'plugin', 'rust', 'rust-analyzer', 'rust-lang', 'rust-tools' } ,
-  homepage = 'https://github.com/mrcjkb/rustaceanvim',
-  license = 'GPL-2.0'
-}
-
-dependencies = { 'lua >= 5.1' } 
-
-test_dependencies = { }
-
-source = {
-  url = repo_url .. '/archive/' .. git_ref .. '.zip',
-  dir = 'rustaceanvim-' .. '4.22.8',
-}
-
-if modrev == 'scm' or modrev == 'dev' then
-  source = {
-    url = repo_url:gsub('https', 'git')
-  }
-end
-
-build = {
-  type = 'builtin',
-  copy_directories = { 'doc', 'ftplugin' } ,
-}
diff --git a/config/neovim/store/lazy-plugins/telescope-fzf-native.nvim/build/libfzf.so b/config/neovim/store/lazy-plugins/telescope-fzf-native.nvim/build/libfzf.so
index 0a6b2039..7635989e 100755
Binary files a/config/neovim/store/lazy-plugins/telescope-fzf-native.nvim/build/libfzf.so and b/config/neovim/store/lazy-plugins/telescope-fzf-native.nvim/build/libfzf.so differ
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/doc/telescope.txt b/config/neovim/store/lazy-plugins/telescope.nvim/doc/telescope.txt
index a38a88f8..99343a9b 100644
--- a/config/neovim/store/lazy-plugins/telescope.nvim/doc/telescope.txt
+++ b/config/neovim/store/lazy-plugins/telescope.nvim/doc/telescope.txt
@@ -1434,6 +1434,8 @@ builtin.reloader({opts})                        *telescope.builtin.reloader()*
 builtin.buffers({opts})                          *telescope.builtin.buffers()*
     Lists open buffers in current neovim instance, opens selected buffer on
     `<cr>`
+    - Default keymaps:
+      - `<M-d>`: delete the currently selected buffer
 
 
     Parameters: ~
@@ -1478,10 +1480,12 @@ builtin.colorscheme({opts})                  *telescope.builtin.colorscheme()*
         {opts} (table)  options to pass to the picker
 
     Options: ~
-        {colors}         (table)    a list of additional colorschemes to
-                                    explicitly make available to telescope
-                                    (default: {})
-        {enable_preview} (boolean)  if true, will preview the selected color
+        {colors}          (table)    a list of additional colorschemes to
+                                     explicitly make available to telescope
+                                     (default: {})
+        {enable_preview}  (boolean)  if true, will preview the selected color
+        {ignore_builtins} (boolean)  if true, builtin colorschemes are not
+                                     listed
 
 
 builtin.marks({opts})                              *telescope.builtin.marks()*
@@ -1607,6 +1611,8 @@ builtin.lsp_references({opts})            *telescope.builtin.lsp_references()*
                                           "vsplit", "never"
         {show_line}            (boolean)  show results text (default: true)
         {trim_text}            (boolean)  trim results text (default: false)
+        {reuse_win}            (boolean)  jump to existing window if buffer is
+                                          already opened (default: false)
         {file_encoding}        (string)   file encoding for the previewer
 
 
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/actions/init.lua b/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/actions/init.lua
index 3daaefd2..13168d46 100644
--- a/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/actions/init.lua
+++ b/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/actions/init.lua
@@ -1176,9 +1176,22 @@ end
 ---@param prompt_bufnr number: The prompt bufnr
 actions.delete_buffer = function(prompt_bufnr)
   local current_picker = action_state.get_current_picker(prompt_bufnr)
+
   current_picker:delete_selection(function(selection)
     local force = vim.api.nvim_buf_get_option(selection.bufnr, "buftype") == "terminal"
     local ok = pcall(vim.api.nvim_buf_delete, selection.bufnr, { force = force })
+
+    -- If the current buffer is deleted, switch to the previous buffer
+    -- according to bdelete behavior
+    if ok and selection.bufnr == current_picker.original_bufnr then
+      local jumplist = vim.fn.getjumplist(current_picker.original_win_id)[1]
+      for i = #jumplist, 1, -1 do
+        if jumplist[i].bufnr ~= selection.bufnr and vim.fn.bufloaded(jumplist[i].bufnr) == 1 then
+          vim.api.nvim_win_set_buf(current_picker.original_win_id, jumplist[i].bufnr)
+          break
+        end
+      end
+    end
     return ok
   end)
 end
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/builtin/__internal.lua b/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/builtin/__internal.lua
index 8fa988b9..105b88eb 100644
--- a/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/builtin/__internal.lua
+++ b/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/builtin/__internal.lua
@@ -933,7 +933,7 @@ internal.buffers = function(opts)
 
   local buffers = {}
   local default_selection_idx = 1
-  for _, bufnr in ipairs(bufnrs) do
+  for i, bufnr in ipairs(bufnrs) do
     local flag = bufnr == vim.fn.bufnr "" and "%" or (bufnr == vim.fn.bufnr "#" and "#" or " ")
 
     if opts.sort_lastused and not opts.ignore_current_buffer and flag == "#" then
@@ -951,7 +951,7 @@ internal.buffers = function(opts)
       table.insert(buffers, idx, element)
     else
       if opts.select_current and flag == "%" then
-        default_selection_idx = bufnr
+        default_selection_idx = i
       end
       table.insert(buffers, element)
     end
@@ -972,6 +972,10 @@ internal.buffers = function(opts)
       previewer = conf.grep_previewer(opts),
       sorter = conf.generic_sorter(opts),
       default_selection_index = default_selection_idx,
+      attach_mappings = function(_, map)
+        map({ "i", "n" }, "<M-d>", actions.delete_buffer)
+        return true
+      end,
     })
     :find()
 end
@@ -993,6 +997,19 @@ internal.colorscheme = function(opts)
     end, vim.fn.getcompletion("", "color"))
   )
 
+  if opts.ignore_builtins then
+    -- stylua: ignore
+    local builtins = {
+      "blue", "darkblue", "default", "delek", "desert", "elflord", "evening",
+      "habamax", "industry", "koehler", "lunaperche", "morning", "murphy",
+      "pablo", "peachpuff", "quiet", "retrobox", "ron", "shine", "slate",
+      "sorbet", "torte", "vim", "wildcharm", "zaibatsu", "zellner",
+    }
+    colors = vim.tbl_filter(function(color)
+      return not vim.tbl_contains(builtins, color)
+    end, colors)
+  end
+
   local previewer
   if opts.enable_preview then
     -- define previewer
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/builtin/__lsp.lua b/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/builtin/__lsp.lua
index e781d240..3bf5ed34 100644
--- a/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/builtin/__lsp.lua
+++ b/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/builtin/__lsp.lua
@@ -97,51 +97,66 @@ lsp.outgoing_calls = function(opts)
   calls(opts, "to")
 end
 
----@type { [string]: fun(results: table, items: table, opts: table): table, table }
-local action_handlers = {
-  ["textDocument/references"] = function(results, items, opts)
-    if not opts.include_current_line then
-      local retresults = {}
-      local retitems = {}
-
-      for i, item in pairs(items) do
-        if
-          not (
-            item.filename == vim.api.nvim_buf_get_name(opts.bufnr)
-            and item.lnum == vim.api.nvim_win_get_cursor(opts.winnr)[1]
-          )
-        then
-          table.insert(retresults, results[i])
-          table.insert(retitems, items[i])
-        end
-      end
-
-      return retresults, retitems
-    end
-
-    return results, items
-  end,
-}
-
----@param action string
----@param locations table
----@param items table
----@param opts table
----@return table results, table items
-local apply_action_handler = function(action, locations, items, opts)
-  local handler = action_handlers[action]
-  if handler then
-    return handler(locations, items, opts)
+--- convert `item` type back to something we can pass to `vim.lsp.util.jump_to_location`
+--- stopgap for pre-nvim 0.10 - after which we can simply use the `user_data`
+--- field on the items in `vim.lsp.util.locations_to_items`
+---@param item vim.lsp.util.locations_to_items.ret
+---@param offset_encoding string|nil utf-8|utf-16|utf-32
+---@return lsp.Location
+local function item_to_location(item, offset_encoding)
+  local line = item.lnum - 1
+  local character = vim.lsp.util._str_utfindex_enc(item.text, item.col, offset_encoding) - 1
+  local uri
+  if utils.is_uri(item.filename) then
+    uri = item.filename
+  else
+    uri = vim.uri_from_fname(item.filename)
   end
-
-  return locations, items
+  return {
+    uri = uri,
+    range = {
+      start = {
+        line = line,
+        character = character,
+      },
+      ["end"] = {
+        line = line,
+        character = character,
+      },
+    },
+  }
 end
 
----@param action string
+---@alias telescope.lsp.list_or_jump_action
+---| "textDocument/references"
+---| "textDocument/definition"
+---| "textDocument/typeDefinition"
+---| "textDocument/implementation"
+
+---@param action telescope.lsp.list_or_jump_action
+---@param items vim.lsp.util.locations_to_items.ret[]
+---@param opts table
+---@return vim.lsp.util.locations_to_items.ret[]
+local apply_action_handler = function(action, items, opts)
+  if action == "textDocument/references" and not opts.include_current_line then
+    local lnum = vim.api.nvim_win_get_cursor(opts.winnr)[1]
+    items = vim.tbl_filter(function(v)
+      return not (v.filename == opts.curr_filepath and v.lnum == lnum)
+    end, items)
+  end
+
+  return items
+end
+
+---@param action telescope.lsp.list_or_jump_action
 ---@param title string prompt title
+---@param funname string: name of the calling function
 ---@param params lsp.TextDocumentPositionParams
 ---@param opts table
-local function list_or_jump(action, title, params, opts)
+local function list_or_jump(action, title, funname, params, opts)
+  opts.reuse_win = vim.F.if_nil(opts.reuse_win, false)
+  opts.curr_filepath = vim.api.nvim_buf_get_name(opts.bufnr)
+
   vim.lsp.buf_request(opts.bufnr, action, params, function(err, result, ctx, _)
     if err then
       vim.api.nvim_err_writeln("Error when executing " .. action .. " : " .. err.message)
@@ -160,19 +175,20 @@ local function list_or_jump(action, title, params, opts)
 
     local offset_encoding = vim.lsp.get_client_by_id(ctx.client_id).offset_encoding
     local items = vim.lsp.util.locations_to_items(locations, offset_encoding)
+    items = apply_action_handler(action, items, opts)
 
-    locations, items = apply_action_handler(action, locations, items, opts)
-
-    if vim.tbl_isempty(locations) then
+    if vim.tbl_isempty(items) then
+      utils.notify(funname, {
+        msg = string.format("No %s found", title),
+        level = "INFO",
+      })
       return
     end
 
-    if #locations == 1 and opts.jump_type ~= "never" then
-      local current_uri = params.textDocument.uri
-      local target_uri = locations[1].uri or locations[1].targetUri
-      if current_uri ~= target_uri then
+    if #items == 1 and opts.jump_type ~= "never" then
+      local item = items[1]
+      if opts.curr_filepath ~= item.filename then
         local cmd
-        local file_path = vim.uri_to_fname(target_uri)
         if opts.jump_type == "tab" then
           cmd = "tabedit"
         elseif opts.jump_type == "split" then
@@ -184,11 +200,12 @@ local function list_or_jump(action, title, params, opts)
         end
 
         if cmd then
-          vim.cmd(string.format("%s %s", cmd, file_path))
+          vim.cmd(string.format("%s %s", cmd, item.filename))
         end
       end
 
-      vim.lsp.util.jump_to_location(locations[1], offset_encoding, opts.reuse_win)
+      local location = item_to_location(item, offset_encoding)
+      vim.lsp.util.jump_to_location(location, offset_encoding, opts.reuse_win)
     else
       pickers
         .new(opts, {
@@ -208,24 +225,31 @@ local function list_or_jump(action, title, params, opts)
 end
 
 lsp.references = function(opts)
+  opts.include_current_line = vim.F.if_nil(opts.include_current_line, false)
   local params = vim.lsp.util.make_position_params(opts.winnr)
   params.context = { includeDeclaration = vim.F.if_nil(opts.include_declaration, true) }
-  return list_or_jump("textDocument/references", "LSP References", params, opts)
+  return list_or_jump("textDocument/references", "LSP References", "builtin.lsp_references", params, opts)
 end
 
 lsp.definitions = function(opts)
   local params = vim.lsp.util.make_position_params(opts.winnr)
-  return list_or_jump("textDocument/definition", "LSP Definitions", params, opts)
+  return list_or_jump("textDocument/definition", "LSP Definitions", "builtin.lsp_definitions", params, opts)
 end
 
 lsp.type_definitions = function(opts)
   local params = vim.lsp.util.make_position_params(opts.winnr)
-  return list_or_jump("textDocument/typeDefinition", "LSP Type Definitions", params, opts)
+  return list_or_jump(
+    "textDocument/typeDefinition",
+    "LSP Type Definitions",
+    "builtin.lsp_type_definitions",
+    params,
+    opts
+  )
 end
 
 lsp.implementations = function(opts)
   local params = vim.lsp.util.make_position_params(opts.winnr)
-  return list_or_jump("textDocument/implementation", "LSP Implementations", params, opts)
+  return list_or_jump("textDocument/implementation", "LSP Implementations", "builtin.lsp_implementations", params, opts)
 end
 
 local symbols_sorter = function(symbols)
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/builtin/init.lua b/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/builtin/init.lua
index d46ff30a..efd39292 100644
--- a/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/builtin/init.lua
+++ b/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/builtin/init.lua
@@ -339,6 +339,8 @@ builtin.man_pages = require_on_exported_call("telescope.builtin.__internal").man
 builtin.reloader = require_on_exported_call("telescope.builtin.__internal").reloader
 
 --- Lists open buffers in current neovim instance, opens selected buffer on `<cr>`
+--- - Default keymaps:
+---   - `<M-d>`: delete the currently selected buffer
 ---@param opts table: options to pass to the picker
 ---@field cwd string: specify a working directory to filter buffers list by
 ---@field show_all_buffers boolean: if true, show all buffers, including unloaded buffers (default: true)
@@ -357,6 +359,7 @@ builtin.buffers = require_on_exported_call("telescope.builtin.__internal").buffe
 ---@param opts table: options to pass to the picker
 ---@field colors table: a list of additional colorschemes to explicitly make available to telescope (default: {})
 ---@field enable_preview boolean: if true, will preview the selected color
+---@field ignore_builtins boolean: if true, builtin colorschemes are not listed
 builtin.colorscheme = require_on_exported_call("telescope.builtin.__internal").colorscheme
 
 --- Lists vim marks and their value, jumps to the mark on `<cr>`
@@ -421,6 +424,7 @@ builtin.jumplist = require_on_exported_call("telescope.builtin.__internal").jump
 ---@field jump_type string: how to goto reference if there is only one and the definition file is different from the current file, values: "tab", "tab drop", "split", "vsplit", "never"
 ---@field show_line boolean: show results text (default: true)
 ---@field trim_text boolean: trim results text (default: false)
+---@field reuse_win boolean: jump to existing window if buffer is already opened (default: false)
 ---@field file_encoding string: file encoding for the previewer
 builtin.lsp_references = require_on_exported_call("telescope.builtin.__lsp").references
 
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/pickers.lua b/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/pickers.lua
index 189e923d..1cb62f65 100644
--- a/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/pickers.lua
+++ b/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/pickers.lua
@@ -535,6 +535,7 @@ function Picker:find()
   self.__original_mousemoveevent = vim.o.mousemoveevent
   vim.o.mousemoveevent = true
 
+  self.original_bufnr = a.nvim_get_current_buf()
   self.original_win_id = a.nvim_get_current_win()
   _, self.original_cword = pcall(vim.fn.expand, "<cword>")
   _, self.original_cWORD = pcall(vim.fn.expand, "<cWORD>")
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/pickers/layout_strategies.lua b/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/pickers/layout_strategies.lua
index 931da094..c691c8da 100644
--- a/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/pickers/layout_strategies.lua
+++ b/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/pickers/layout_strategies.lua
@@ -771,10 +771,10 @@ layout_strategies.flex = make_documented_layout(
     horizontal = "Options to pass when switching to horizontal layout",
   }),
   function(self, max_columns, max_lines, layout_config)
-    local flip_columns = vim.F.if_nil(layout_config.flip_columns, 100)
-    local flip_lines = vim.F.if_nil(layout_config.flip_lines, 20)
+    local flip_columns = vim.F.if_nil(layout_config.flip_columns, layout_config.horizontal.preview_cutoff)
+    local flip_lines = vim.F.if_nil(layout_config.flip_lines, layout_config.vertical.preview_cutoff)
 
-    if max_columns < flip_columns and max_lines > flip_lines then
+    if max_columns < flip_columns and max_lines >= flip_lines then
       self.__flex_strategy = "vertical"
       self.layout_config.flip_columns = nil
       self.layout_config.flip_lines = nil
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/utils.lua b/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/utils.lua
index ff13132d..44ab5d9b 100644
--- a/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/utils.lua
+++ b/config/neovim/store/lazy-plugins/telescope.nvim/lua/telescope/utils.lua
@@ -170,6 +170,65 @@ utils.filter_symbols = function(results, opts, post_filter)
   end
 end
 
+local path_filename_first = function(path, reverse_directories)
+  local dirs = vim.split(path, utils.get_separator())
+  local filename
+
+  if reverse_directories then
+    dirs = utils.reverse_table(dirs)
+    filename = table.remove(dirs, 1)
+  else
+    filename = table.remove(dirs, #dirs)
+  end
+
+  local tail = table.concat(dirs, utils.get_separator())
+  -- Trim prevents a top-level filename to have a trailing white space
+  local transformed_path = vim.trim(filename .. " " .. tail)
+  local path_style = { { { #filename, #transformed_path }, "TelescopeResultsComment" } }
+
+  return transformed_path, path_style
+end
+
+local calc_result_length = function(truncate_len)
+  local status = get_status(vim.api.nvim_get_current_buf())
+  local len = vim.api.nvim_win_get_width(status.layout.results.winid) - status.picker.selection_caret:len() - 2
+  return type(truncate_len) == "number" and len - truncate_len or len
+end
+
+local path_truncate = function(path, truncate_len, opts)
+  if opts.__length == nil then
+    opts.__length = calc_result_length(truncate_len)
+  end
+  if opts.__prefix == nil then
+    opts.__prefix = 0
+  end
+  return truncate(path, opts.__length - opts.__prefix, nil, -1)
+end
+
+local path_shorten = function(path, length, exclude)
+  if exclude ~= nil then
+    return Path:new(path):shorten(length, exclude)
+  else
+    return Path:new(path):shorten(length)
+  end
+end
+
+local path_abs = function(path, opts)
+  local cwd
+  if opts.cwd then
+    cwd = opts.cwd
+    if not vim.in_fast_event() then
+      cwd = utils.path_expand(opts.cwd)
+    end
+  else
+    cwd = vim.loop.cwd()
+  end
+  return Path:new(path):make_relative(cwd)
+end
+
+-- IMPORTANT: This function should have been a local function as it's only used
+-- in this file, but the code was already exported a long time ago. By making it
+-- local we would potential break consumers of this method.
 utils.path_smart = (function()
   local paths = {}
   local os_sep = utils.get_separator()
@@ -274,12 +333,6 @@ utils.is_uri = function(filename)
   return false
 end
 
-local calc_result_length = function(truncate_len)
-  local status = get_status(vim.api.nvim_get_current_buf())
-  local len = vim.api.nvim_win_get_width(status.layout.results.winid) - status.picker.selection_caret:len() - 2
-  return type(truncate_len) == "number" and len - truncate_len or len
-end
-
 --- Transform path is a util function that formats a path based on path_display
 --- found in `opts` or the default value from config.
 --- It is meant to be used in make_entry to have a uniform interface for
@@ -312,75 +365,50 @@ utils.transform_path = function(opts, path)
     return "", path_style
   elseif type(path_display) == "table" then
     if vim.tbl_contains(path_display, "tail") or path_display.tail then
-      transformed_path = utils.path_tail(transformed_path)
-    elseif vim.tbl_contains(path_display, "smart") or path_display.smart then
+      return utils.path_tail(transformed_path), path_style
+    end
+
+    if not vim.tbl_contains(path_display, "absolute") and not path_display.absolute then
+      transformed_path = path_abs(transformed_path, opts)
+    end
+
+    if vim.tbl_contains(path_display, "smart") or path_display.smart then
       transformed_path = utils.path_smart(transformed_path)
-    else
-      if not vim.tbl_contains(path_display, "absolute") and not path_display.absolute then
-        local cwd
-        if opts.cwd then
-          cwd = opts.cwd
-          if not vim.in_fast_event() then
-            cwd = utils.path_expand(opts.cwd)
-          end
+    end
+
+    if vim.tbl_contains(path_display, "shorten") or path_display["shorten"] ~= nil then
+      local length
+      local exclude = nil
+
+      if type(path_display["shorten"]) == "table" then
+        local shorten = path_display["shorten"]
+        length = shorten.len
+        exclude = shorten.exclude
+      else
+        length = type(path_display["shorten"]) == "number" and path_display["shorten"]
+      end
+
+      transformed_path = path_shorten(transformed_path, length, exclude)
+    end
+
+    if vim.tbl_contains(path_display, "truncate") or path_display.truncate then
+      transformed_path = path_truncate(transformed_path, path_display.truncate, opts)
+    end
+
+    if vim.tbl_contains(path_display, "filename_first") or path_display["filename_first"] ~= nil then
+      local reverse_directories = false
+
+      if type(path_display["filename_first"]) == "table" then
+        local filename_first_opts = path_display["filename_first"]
+
+        if filename_first_opts.reverse_directories == nil or filename_first_opts.reverse_directories == false then
+          reverse_directories = false
         else
-          cwd = vim.loop.cwd()
-        end
-        transformed_path = Path:new(transformed_path):make_relative(cwd)
-      end
-
-      if vim.tbl_contains(path_display, "shorten") or path_display["shorten"] ~= nil then
-        if type(path_display["shorten"]) == "table" then
-          local shorten = path_display["shorten"]
-          transformed_path = Path:new(transformed_path):shorten(shorten.len, shorten.exclude)
-        else
-          local length = type(path_display["shorten"]) == "number" and path_display["shorten"]
-          transformed_path = Path:new(transformed_path):shorten(length)
+          reverse_directories = filename_first_opts.reverse_directories
         end
       end
 
-      if vim.tbl_contains(path_display, "truncate") or path_display.truncate then
-        if opts.__length == nil then
-          opts.__length = calc_result_length(path_display.truncate)
-        end
-        if opts.__prefix == nil then
-          opts.__prefix = 0
-        end
-        transformed_path = truncate(transformed_path, opts.__length - opts.__prefix, nil, -1)
-      end
-
-      -- IMPORTANT: filename_first needs to be the last option. Otherwise the
-      -- other options will not be displayed correctly.
-      if vim.tbl_contains(path_display, "filename_first") or path_display["filename_first"] ~= nil then
-        local reverse_directories = false
-
-        if type(path_display["filename_first"]) == "table" then
-          local filename_first_opts = path_display["filename_first"]
-
-          if filename_first_opts.reverse_directories == nil or filename_first_opts.reverse_directories == false then
-            reverse_directories = false
-          else
-            reverse_directories = filename_first_opts.reverse_directories
-          end
-        end
-
-        local dirs = vim.split(transformed_path, utils.get_separator())
-        local filename
-
-        if reverse_directories then
-          dirs = utils.reverse_table(dirs)
-          filename = table.remove(dirs, 1)
-        else
-          filename = table.remove(dirs, #dirs)
-        end
-
-        local tail = table.concat(dirs, utils.get_separator())
-
-        -- Prevents a toplevel filename to have a trailing whitespace
-        transformed_path = vim.trim(filename .. " " .. tail)
-
-        path_style = { { { #filename, #transformed_path }, "TelescopeResultsComment" } }
-      end
+      transformed_path, path_style = path_filename_first(transformed_path, reverse_directories)
     end
 
     return transformed_path, path_style
@@ -494,6 +522,9 @@ function utils.max_split(s, pattern, maxsplit)
   return t
 end
 
+-- IMPORTANT: This function should have been a local function as it's only used
+-- in this file, but the code was already exported a long time ago. By making it
+-- local we would potential break consumers of this method.
 function utils.data_directory()
   local sourced_file = require("plenary.debug_utils").sourced_filepath()
   local base_directory = vim.fn.fnamemodify(sourced_file, ":h:h:h")
@@ -548,6 +579,9 @@ local load_once = function(f)
   end
 end
 
+-- IMPORTANT: This function should have been a local function as it's only used
+-- in this file, but the code was already exported a long time ago. By making it
+-- local we would potential break consumers of this method.
 utils.file_extension = function(filename)
   local parts = vim.split(filename, "%.")
   -- this check enables us to get multi-part extensions, like *.test.js for example
@@ -718,19 +752,22 @@ utils.__separate_file_path_location = function(path)
   return path, nil, nil
 end
 
-utils.merge_styles = function(style1, style2, offset)
-  local function addOffset(i, obj)
-    return { obj[1] + i, obj[2] + i }
-  end
+local function add_offset(offset, obj)
+  return { obj[1] + offset, obj[2] + offset }
+end
 
+utils.merge_styles = function(style1, style2, offset)
   for _, item in ipairs(style2) do
-    item[1] = addOffset(offset, item[1])
+    item[1] = add_offset(offset, item[1])
     table.insert(style1, item)
   end
 
   return style1
 end
 
+-- IMPORTANT: This function should have been a local function as it's only used
+-- in this file, but the code was already exported a long time ago. By making it
+-- local we would potential break consumers of this method.
 utils.reverse_table = function(input_table)
   local temp_table = {}
   for index = 0, #input_table do
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/nix-support/propagated-build-inputs b/config/neovim/store/lazy-plugins/telescope.nvim/nix-support/propagated-build-inputs
index 54a6e25b..9404ffd7 100644
--- a/config/neovim/store/lazy-plugins/telescope.nvim/nix-support/propagated-build-inputs
+++ b/config/neovim/store/lazy-plugins/telescope.nvim/nix-support/propagated-build-inputs
@@ -1 +1 @@
-/nix/store/k36j1wm99w5xq490qzzskhs7ngzmhsg4-lua5.1-plenary.nvim-scm-1 /nix/store/mqbhz05llkddfb5wni0m48kw22ixxps4-lua-5.1.5 
\ No newline at end of file
+/nix/store/znvc40bzd5vmhw7nfdlb3bn41r36d9w3-lua5.1-plenary.nvim-scm-1 /nix/store/3czmrawji85vf8979kll2yx2f1kjkric-lua-5.1.5 
\ No newline at end of file
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/rock_manifest b/config/neovim/store/lazy-plugins/telescope.nvim/rock_manifest
index f9ea896a..ad1f7c94 100644
--- a/config/neovim/store/lazy-plugins/telescope.nvim/rock_manifest
+++ b/config/neovim/store/lazy-plugins/telescope.nvim/rock_manifest
@@ -22,7 +22,7 @@ rock_manifest = {
    },
    doc = {
       ["secret.txt"] = "59f2d5cd8b01a044b4e7f598244869ec",
-      ["telescope.txt"] = "7216a8bf6e20d1fffcd8a31b127219c7",
+      ["telescope.txt"] = "0ef99d0fd83b8717fc995c7e76a2d0bc",
       ["telescope_changelog.txt"] = "5c807cb49d45799276be85c33693c08f"
    },
    ftplugin = {
@@ -38,7 +38,7 @@ rock_manifest = {
          actions = {
             ["generate.lua"] = "b627dbab3b7d2a572779707529331a5f",
             ["history.lua"] = "6b34c6a357dfad0762f099c1ba3b426f",
-            ["init.lua"] = "40eb8512d6b1f07e26043e3489dcf94d",
+            ["init.lua"] = "0a2a147f8fb9d292c8c90e1f21cda381",
             ["layout.lua"] = "91470edb5dd37a3025e141d5cc6691bd",
             ["mt.lua"] = "9c22e387921dbfbd56afdf3fed7b84af",
             ["set.lua"] = "e0b8491c7e789e09c032e650d8c858ef",
@@ -54,9 +54,9 @@ rock_manifest = {
             ["__diagnostics.lua"] = "debd53606d5dee06bb2031026c7c3145",
             ["__files.lua"] = "d2c0373381ef70771adae4b6e9bb03ce",
             ["__git.lua"] = "a40e030790285c1e8706d181f0b4a831",
-            ["__internal.lua"] = "89209cb8f9d22b8b6712243182f06c66",
-            ["__lsp.lua"] = "03e5d78027aa37c04280151029744063",
-            ["init.lua"] = "0e0188ef0f37c07387270ea8594c0f2e"
+            ["__internal.lua"] = "e2ecc5ba5be0f1b350af08f23a376143",
+            ["__lsp.lua"] = "0132a391de4b723ab7ea2122260d265d",
+            ["init.lua"] = "5ff2da685744ce59d0466159a54bb4f9"
          },
          ["command.lua"] = "66d2dea0d60e1a27bfff18e55b1afb4c",
          config = {
@@ -83,12 +83,12 @@ rock_manifest = {
             ["entry_display.lua"] = "27c74c2c4812244722444ebafbccd1ae",
             ["highlights.lua"] = "2a1497c924141b85e57b106d0d8ec0ed",
             ["layout.lua"] = "cdcf7f2019df1a715b233c4deae252e9",
-            ["layout_strategies.lua"] = "c11e7ff0f07d4c5e8f860bd2c4116e27",
+            ["layout_strategies.lua"] = "92c09ce299e9b01ddc971f14b7ae7d91",
             ["multi.lua"] = "7822c69f5e6e537d7ad1d46c01097069",
             ["scroller.lua"] = "54fc7267917bf9f9076a632293a73cd5",
             ["window.lua"] = "fc74d7849a1381643289a65678e14aa3"
          },
-         ["pickers.lua"] = "2dd384f602a65ad2df4ac75ffc77bcfa",
+         ["pickers.lua"] = "199781a5a14055e8681333043b013279",
          previewers = {
             ["buffer_previewer.lua"] = "544d3e3417a9c496277f3a8118141007",
             ["init.lua"] = "fa1745a8bef70d35f713d3c4b3c70257",
@@ -104,7 +104,7 @@ rock_manifest = {
             ["runner.lua"] = "1201b1158848fc7e6a581f258776a977"
          },
          ["themes.lua"] = "02e18c91826ee7834ffedc9378cbc9b9",
-         ["utils.lua"] = "fe4d526b4086bc9e2f28b7c716eea000"
+         ["utils.lua"] = "beed6a421e27ed8be0a2d49b3de470e4"
       },
       tests = {
          automated = {
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/manifest b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/manifest
deleted file mode 100644
index eadd72ee..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/manifest
+++ /dev/null
@@ -1,330 +0,0 @@
-commands = {}
-dependencies = {
-   ["plenary.nvim"] = {},
-   ["telescope.nvim"] = {
-      ["scm-1"] = {
-         {
-            constraints = {
-               {
-                  op = "==",
-                  version = {
-                     5, 1, string = "5.1"
-                  }
-               }
-            },
-            name = "lua"
-         },
-         {
-            constraints = {},
-            name = "plenary.nvim"
-         }
-      }
-   }
-}
-modules = {
-   ["telescope._"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope._extensions.init"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.actions.generate"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.actions.history"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.actions.init"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.actions.layout"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.actions.mt"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.actions.set"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.actions.state"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.actions.utils"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.algos.fzy"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.algos.linked_list"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.algos.string_distance"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.builtin.__diagnostics"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.builtin.__files"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.builtin.__git"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.builtin.__internal"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.builtin.__lsp"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.builtin.init"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.command"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.config"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.config.resolve"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.debounce"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.deprecated"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.entry_manager"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.finders"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.finders.async_job_finder"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.finders.async_oneshot_finder"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.finders.async_static_finder"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.from_entry"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.health"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.init"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.log"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.make_entry"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.mappings"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.operators"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.pickers"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.pickers.entry_display"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.pickers.highlights"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.pickers.layout"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.pickers.layout_strategies"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.pickers.multi"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.pickers.scroller"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.pickers.window"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.previewers.buffer_previewer"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.previewers.init"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.previewers.previewer"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.previewers.term_previewer"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.previewers.utils"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.sorters"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.state"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.testharness.helpers"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.testharness.init"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.testharness.runner"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.themes"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["telescope.utils"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests.automated.action_spec"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests.automated.command_spec"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests.automated.entry_display_spec"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests.automated.entry_manager_spec"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests.automated.layout_strategies_spec"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests.automated.linked_list_spec"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests.automated.pickers.find_files_spec"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests.automated.resolver_spec"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests.automated.scroller_spec"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests.automated.sorters_spec"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests.automated.telescope_spec"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests.automated.utils_spec"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests.helpers"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests.pickers.find_files__readme"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests.pickers.find_files__scrolling_descending_cycle"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests/fixtures/find_files/file_a.txt"] = {
-      "telescope.nvim/scm-1"
-   },
-   ["tests/fixtures/find_files/file_abc.txt"] = {
-      "telescope.nvim/scm-1"
-   }
-}
-repository = {
-   ["telescope.nvim"] = {
-      ["scm-1"] = {
-         {
-            arch = "installed",
-            commands = {},
-            dependencies = {},
-            modules = {
-               ["telescope._"] = "telescope/_.lua",
-               ["telescope._extensions.init"] = "telescope/_extensions/init.lua",
-               ["telescope.actions.generate"] = "telescope/actions/generate.lua",
-               ["telescope.actions.history"] = "telescope/actions/history.lua",
-               ["telescope.actions.init"] = "telescope/actions/init.lua",
-               ["telescope.actions.layout"] = "telescope/actions/layout.lua",
-               ["telescope.actions.mt"] = "telescope/actions/mt.lua",
-               ["telescope.actions.set"] = "telescope/actions/set.lua",
-               ["telescope.actions.state"] = "telescope/actions/state.lua",
-               ["telescope.actions.utils"] = "telescope/actions/utils.lua",
-               ["telescope.algos.fzy"] = "telescope/algos/fzy.lua",
-               ["telescope.algos.linked_list"] = "telescope/algos/linked_list.lua",
-               ["telescope.algos.string_distance"] = "telescope/algos/string_distance.lua",
-               ["telescope.builtin.__diagnostics"] = "telescope/builtin/__diagnostics.lua",
-               ["telescope.builtin.__files"] = "telescope/builtin/__files.lua",
-               ["telescope.builtin.__git"] = "telescope/builtin/__git.lua",
-               ["telescope.builtin.__internal"] = "telescope/builtin/__internal.lua",
-               ["telescope.builtin.__lsp"] = "telescope/builtin/__lsp.lua",
-               ["telescope.builtin.init"] = "telescope/builtin/init.lua",
-               ["telescope.command"] = "telescope/command.lua",
-               ["telescope.config"] = "telescope/config.lua",
-               ["telescope.config.resolve"] = "telescope/config/resolve.lua",
-               ["telescope.debounce"] = "telescope/debounce.lua",
-               ["telescope.deprecated"] = "telescope/deprecated.lua",
-               ["telescope.entry_manager"] = "telescope/entry_manager.lua",
-               ["telescope.finders"] = "telescope/finders.lua",
-               ["telescope.finders.async_job_finder"] = "telescope/finders/async_job_finder.lua",
-               ["telescope.finders.async_oneshot_finder"] = "telescope/finders/async_oneshot_finder.lua",
-               ["telescope.finders.async_static_finder"] = "telescope/finders/async_static_finder.lua",
-               ["telescope.from_entry"] = "telescope/from_entry.lua",
-               ["telescope.health"] = "telescope/health.lua",
-               ["telescope.init"] = "telescope/init.lua",
-               ["telescope.log"] = "telescope/log.lua",
-               ["telescope.make_entry"] = "telescope/make_entry.lua",
-               ["telescope.mappings"] = "telescope/mappings.lua",
-               ["telescope.operators"] = "telescope/operators.lua",
-               ["telescope.pickers"] = "telescope/pickers.lua",
-               ["telescope.pickers.entry_display"] = "telescope/pickers/entry_display.lua",
-               ["telescope.pickers.highlights"] = "telescope/pickers/highlights.lua",
-               ["telescope.pickers.layout"] = "telescope/pickers/layout.lua",
-               ["telescope.pickers.layout_strategies"] = "telescope/pickers/layout_strategies.lua",
-               ["telescope.pickers.multi"] = "telescope/pickers/multi.lua",
-               ["telescope.pickers.scroller"] = "telescope/pickers/scroller.lua",
-               ["telescope.pickers.window"] = "telescope/pickers/window.lua",
-               ["telescope.previewers.buffer_previewer"] = "telescope/previewers/buffer_previewer.lua",
-               ["telescope.previewers.init"] = "telescope/previewers/init.lua",
-               ["telescope.previewers.previewer"] = "telescope/previewers/previewer.lua",
-               ["telescope.previewers.term_previewer"] = "telescope/previewers/term_previewer.lua",
-               ["telescope.previewers.utils"] = "telescope/previewers/utils.lua",
-               ["telescope.sorters"] = "telescope/sorters.lua",
-               ["telescope.state"] = "telescope/state.lua",
-               ["telescope.testharness.helpers"] = "telescope/testharness/helpers.lua",
-               ["telescope.testharness.init"] = "telescope/testharness/init.lua",
-               ["telescope.testharness.runner"] = "telescope/testharness/runner.lua",
-               ["telescope.themes"] = "telescope/themes.lua",
-               ["telescope.utils"] = "telescope/utils.lua",
-               ["tests.automated.action_spec"] = "tests/automated/action_spec.lua",
-               ["tests.automated.command_spec"] = "tests/automated/command_spec.lua",
-               ["tests.automated.entry_display_spec"] = "tests/automated/entry_display_spec.lua",
-               ["tests.automated.entry_manager_spec"] = "tests/automated/entry_manager_spec.lua",
-               ["tests.automated.layout_strategies_spec"] = "tests/automated/layout_strategies_spec.lua",
-               ["tests.automated.linked_list_spec"] = "tests/automated/linked_list_spec.lua",
-               ["tests.automated.pickers.find_files_spec"] = "tests/automated/pickers/find_files_spec.lua",
-               ["tests.automated.resolver_spec"] = "tests/automated/resolver_spec.lua",
-               ["tests.automated.scroller_spec"] = "tests/automated/scroller_spec.lua",
-               ["tests.automated.sorters_spec"] = "tests/automated/sorters_spec.lua",
-               ["tests.automated.telescope_spec"] = "tests/automated/telescope_spec.lua",
-               ["tests.automated.utils_spec"] = "tests/automated/utils_spec.lua",
-               ["tests.helpers"] = "tests/helpers.lua",
-               ["tests.pickers.find_files__readme"] = "tests/pickers/find_files__readme.lua",
-               ["tests.pickers.find_files__scrolling_descending_cycle"] = "tests/pickers/find_files__scrolling_descending_cycle.lua",
-               ["tests/fixtures/find_files/file_a.txt"] = "tests/fixtures/find_files/file_a.txt",
-               ["tests/fixtures/find_files/file_abc.txt"] = "tests/fixtures/find_files/file_abc.txt"
-            }
-         }
-      }
-   }
-}
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/autoload/health/telescope.vim b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/autoload/health/telescope.vim
deleted file mode 100644
index 46cc9280..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/autoload/health/telescope.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-function! health#telescope#check()
-  lua require 'telescope.health'.check()
-endfunction
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/earth b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/earth
deleted file mode 100644
index aa624e17..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/earth
+++ /dev/null
@@ -1,36 +0,0 @@
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓   ▓▓▓▓▓▓▓▓▓▓▓▒▒▒░  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▒▒  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▒▓▓▓▓▓▒▒   ░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▓▓▓▒▒▓▒▒░   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▓▓▓ ░▓▓▓▒▒▒▒▒  ▒░ ▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▒▓▓▓▓▓▓▒▒ ▒▓▒░░▒▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓░▓▓▓▒▒▒▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▓░░▒▓▓▓▓▓▓▓▓▓   ▒░░  ░ ▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▒▓▒▒▓▓▓▓▒▓▒▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▒▓▓▓▓▓▓▓▓ ▒░  ░▓  ░ ░ ▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▒▒▒▓▓▒░░▓▒▓▓▓▓▓▒▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓     ░▒▓      ▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▒▒▓▒▒░░░▓▒▒▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ░    ▓       ▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▒▒▒▒▒▒▒░▒▓▓▓▓▒▓▒▒▓▒▓▓▓▒▓▓▓▓▓▓▓▓▓▓▒▒▓▒▒░▓▓▓░▓▓▓▓▓▒▓    ░▒▓▒▓░       ▓▓▓▓▓▓
-▓▓▓▓▓▓ ▒▒▒▒░▒▒▒░░▒▓▓▒▓░▓▓▓░▒▓▓▓▓▓▓▓▓▒▓▓▒▒▒▒▒░░░▓▓ ▓▓░▓▓▓▒▒░  ▓ ░▒▓         ▓▓▓▓▓
-▓▓▓▓▓▓▒▒▒▒░▒▒▒░▒▓▒▒▓▓▓▓▓▓▒▓▓ ▓░▓▓▓▒▒▒▓▓▓▓▒░░░░▒▒▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒         ▓▓▓▓▓
-▓▓▓▓▓ ▒▒▒▓▓▒▒▒▒▒▓▓▒▒▓▓▓▓▓▓▓▒ ▓▓▓▓▓▓▒▒ ▓▓▒▓▒▒░▒ ▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▒░▓   ░░   ▒ ▓▓▓▓▓
-▓▓▓▓▓▒▒▒▒▒▒▒▒▒▓▒▓▓▒▓▓▓▓▓▓▒▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▒▒▒▓▓▒▓▓▓▓▓▓▓▓ ░▓▓▓▓▒▒░   ▒ ░   ▒░ ▓▓▓▓
-▓▓▓▓▓▒▒▒▒▒▒▒▒▒▓▓▒▓▓▓▒▓▓▓▓▒▓▓▓▓▒▓▒░ ▓▒▓▒▒▓▓▓▓▓▒▓▓▓▓▓▓▓▓  ▒ ▒░▒░░    ░ ▒░     ▓▓▓▓
-▓▓▓▓▓▒▒▒▒▒▒▓▒▒▒▒▒▒▒▒▓▒▒▓▓▓▓▓▓▓▒▓▓▓▒▓▓▓▓▓▒▒▓░▓▓▓▒░▒   ░▒  ░ ░    ▒    ░▒░    ▓▓▓▓
-▓▓▓▓▓▒▒▒▒▒░░▒▓▒▒▒▒▒▒▒▓ ▓▓▓▒▓▓▓▓▓▓ ▓▒░░▓▓░▒▓▓            ░   ░ ░▒ ░░░░▒░ ░░▒ ▓▓▓▓
-▓▓▓▓▓▒▒▒▒▓▒▒▒▒░▒░▒▓  ▓▒▓▓▒▓▓▓▓▓▓▓▓▓▓▓▒ ▓▓▓▓░          ▒▒▓▒░ ▒░░ ▒▓▓▓▒▒▒░▒ ▓ ▓▓▓▓
-▓▓▓▓▓ ▒░▒▓▒▒░░▒░░░▒▒▓ ░ ░▒▒▒▓▓▓▓▓▓▓▓▓▓▓▒▒▓▓▒ ▒▓   ▓▓  ░░░▒░▒   ▒▓▓▓▓▒░░    ▓▓▓▓▓
-▓▓▓▓▓▓▒▒░  ▒▓▒▒▒▒▓▒░ ▒ ░▒ ░▓▓▓▓▓▓▓▓▓▓▓▓░▒░░▓▓▓▓ ▓▓▓ ░▓▒░  ░ ░▒▒░▒▓▓░░░▒    ▓▓▓▓▓
-▓▓▓▓▓▓░▒▒▒▒ ▒  ▒▒░▓▒░▒ ▒░▒▓░▒▒▓▓▓▓▓▓▓▓▓▒▒░ ▒▓▓▒▓▓▓▓▓▓▓▓▓▒░▓▒ ▓▓▒▓▓▓▓▓▓▒░ ▒▓▓▓▓▓▓
-▓▓▓▓▓▓▓▒▒▒▒▒▒▒░▒▒▒░░▒▓░░▒▒░▒░▒░▒▓▓▓▒▒▒▒▓░ ░ ░       ▓▓▒▒▒░▓▓▓▓▓▓▓▓▓▓▓▓▒▒░ ▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▒▒░▒▒▒▒░▒▒░▒ ▒ ▓▓▓░▒▓░▒▓▓▒░░░░▒▒  ░░▓ ▒░ ▒░░▒░▓▓░▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒ ▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▒░▒▒▒▒▒░▒▒▒░▒▒▒▒  ▒▒░ ▒▒▒▓░▒▒   ▒▓▓░▒      ▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒ ▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▒▒▒▒▒▒░▒▒░▒░▒▒▓░▒▓▓░▒▒░▒░▒▓▒▓▓▓▓▒▒▓░▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▒▒▒▒ ▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▒▒▒▒▒▒▒▒▒░▒▒▒▒░▒░░▓▒▓▒▒▓░▓▓░▓▓ ▓▒▓ ▒  ░▓ ▒░▓░▓▓▓▓▓▓▓▒▒▒▒▒▒ ▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓ ▒ ▒▒▒▒▒▒▒░▒░▒░░░▒▒░░░░ ▒ ░░▓▒░▓▓▓▓▓▒▓▓▓ ▓▓▓▓▓▓▓▒▒▒▒▒▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▒▒▒▒▒▒▒▓░▒▒░▒░▒▒░░▒▓▒▒▓▒▒▒▓▒░▓▒▒▓▓▓▓▓▓▓▓░░▓▓▓▓▓▒▒▒▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▒ ▒▒▒▒▒▒▒▒▒▒▒▒▒▒░▒▒░░▒▓▓▓▒▓▓▓▒▓▓▓▒▒▒▓▓▓▓▓▓▓▓▓▓▓ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒ ▒▒▒▒░░▒▒▒▓▒▒▓▒░▒▒▒▒░▒▒▓▓▒▒▓▓▒▓▓▓▓▓▓▓▓▓▓░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▒▒░▒▒▒▒▒▒▒▒▒▒▓▒▒▒▓▓▒▓▒▒▒▒▓▓▒▒▓▓▓▓▓▒▓░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▒▓▓▒▓▓▓▒░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▒▒▒▒▒▒▒▓▒▒▒▒▒▒▒▒▓▒░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/jupiter b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/jupiter
deleted file mode 100644
index dac1487f..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/jupiter
+++ /dev/null
@@ -1,36 +0,0 @@
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓  ░░░ ░    ░  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒ ▒▒▒▒▒▒▒░░ ▒ ░▒░ ░░▓▓▓▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒░░▒▓▒▒░▒▒ ▒▒▒░▒▒░▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒ ▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▒▒▓▓▒▓▒▓▓▓▓▓▓▓▓▒▓▒▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒   ▓ ░   ░▒▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▒▒▓▒▒▓▓▒▓▓▓▒▒▒▒▓▒▒▒▒▒▒▓▒▓▓▒▓▒▒▒▒▓▓▓▓▓▒▓▓▓▓▓▓▓▓▒▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▓▒▒▒▒▓▒▒▓▓▓▒▒▒▒▒▒▒▒▓░░░▒▒▒▒░░░░░▒▒▒░░░░░▒▒▒░░░▒░▒▒▒▒▒▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▒▒▓▓▓▓▓▓▒▓▓▓▓▒▒▓▓▒▒▒▓▓▒▒▒▒▓▓▓▒▓▓▓▓▓▒▓▒▓▓▓▓▓▓▓▓ ▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▒▓▓▓▒░▒▓▒▒▓▓▓▒▓▓▒▓▓▓▓▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▓▓▓▓▒░▓▒▓▓   ▒ ▓▓▒▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▒▒░▓▓░░░  ▒   ▒▒▓▓▒  ▓▓░▓░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▓▓▓▓▓ ▓▓▓▓▒▓▓▓▒▒▓▓░▒░ ▓▓▒▒▒▒▒▓▓▓▓▓▓▓▓▓▓ ▓▓▓
-▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▒▒▓▓▓▓▒▓▒▓▓▒▒▒▒▒▒▒▒▒▒▒▒▓▓▒▒▒▒▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▓▓▒▓▓▓▓▓▒▒▓▓▒▒▒▒▒▒▒▒▒▒▓▓▓▓▓▓▒▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▓▓▓░░▓▒▒▓▒▓ ▒▒▓▓▒▓▓▒▓▓▒▓▓▓▓▒▒▒▒▒▒▒▒▒▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▒▒▒▒▒▒▓▒▓▓▓▒▒▓▓▒▒    ░░▓▓▓▓▓▓▓▓▓▓▓▓▓ ▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▒▒▓▓▓▒▓▓▓▓▒      ░▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▒▓▓▓▒▓▒▓▓▓▓▒▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▓▓▓▓▓▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/mars b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/mars
deleted file mode 100644
index 2eb8cfdd..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/mars
+++ /dev/null
@@ -1,27 +0,0 @@
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒░▒   ▓▒ ░░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ░  ░░░▒▒ ░ ▒░  ░░░░░░░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░░░░ ░░  ░ ░░▒▓░░░░░░░ ░░ ░░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░░  ░░░░░░░░ ░▒░▒░░░▒▒░░░░░░░░░ ░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░ ░░░░░░░░░░░░░░░▒▒▒▓▒▒▒▒▒▒▒░░░░░░░░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░ ░░ ░  ░░░░░░░░░░ ░░░▒▒▒▒▒▒▒▓▒▒▒▒░▒▒░░░▒░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░ ░ ░░         ░  ░  ░ ░░▒▓▒▒▒▒▒▒▒▓▒▒░▒░▒▒░░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░ ░░                  ░ ░░▒▒▒▒▒▓▒▒▓▒▒░░ ▒▒░ ░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░ ░                        ░░░▒▒▒▒▒▒▒▒▒░ ░░▒░░░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓                          ░▒░░▒▒▒▒▒▒░░░░░░░░░░░░░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓                        ░░ ░░░░░▒▒░▒░▒▒▒░░░░░ ░ ░░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓                        ░ ░▒▒ ░ ░▒░░░░░░░░░  ░▒░░ ░▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓                        ░░  ░░ ░░ ░░░░░░░ ░░░░  ░░  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓        ░           ░░ ░              ░     ▒░░░░░░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓                      ░░░░     ░░     ░░ ░░░░░ ▒░░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓                       ░░░             ░ ░░▒░ ░▒▒▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓                        ░░  ░  ░       ░░░  ░▒▒▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░                       ░ ▒        ░  ░░░▒▒░▒▒▒░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░        ░     ░ ░    ▒  ░░░ ░  ░░░░▒░░▓░▒░░░░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░        ░          ░░ ▒▓▒░▒▒▒ ░░░░▒▒░▒▒ ░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒░░ ░   ░░░          ░▒ ▒▒▒▓▒▒░░░░░░░░░▒░▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒░░ ░░░░░░░░░░ ░░░░ ▓▒▒▒▒▒▒▒▒▒▒░░░░░░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒░░░░░░▒▒▒▒▒░▒▒▒░░▒▒▓▓▓▓▒▓▒▒▒▒▒░▒░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒░   ░▒▒░░░░░▒▒░░▒▒▒▓▓▒▒▒▒▒▒░░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░ ░ ░ ░░░░░░░░░▒▒░░░░░░░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ░░░░░░░░░░ ░ ░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/mercury b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/mercury
deleted file mode 100644
index fcad37da..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/mercury
+++ /dev/null
@@ -1,36 +0,0 @@
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓            ░  ░░    ░   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓    ░░            ░░   ░░  ░░ ░░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓      ░░            ░   ░ ░░ ░ ░     ░   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓    ░░ ░          ░ ░        ░░ ░  ░░░     ░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓                 ░░    ░          ░░  ░  ░ ░  ░ ░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓             ░░     ░░░░      ░ ░  ░ ░░  ░ ░░░░ ░░░░  ▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓             ░░  ░     ░ ░░░ ░░ ░ ░░░    ░ ░░░░░░░ ░░░░░ ▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓ ░    ░   ░ ░░░  ░░░ ░░  ░░░░░░   ░░░░░  ░ ░ ░░ ░░░ ░░░░░░░ ▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓░   ░░ ░░  ░  ░  ░░░  ░░░ ░░ ░░  ░  ░░░░░░ ░░░ ░░░   ░░ ░░░░░░░▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓    ░░           ░░ ░   ░ ░░  ░░░░░░ ░░░░░░ ░    ░ ░  ░  ░░░░░ ░ ▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓ ░   ░ ░░░    ░  ░░░░ ░ ░ ░░░  ░░░░░░░░░░░░░░░░░░░ ░ ░ ░ ░░░░░░ ░░░▓▓▓▓▓▓
-▓▓▓▓▓▓    ░ ░     ░     ░░░░      ░   ░░░   ░ ░░░░░░░░░░░ ░░  ░░░  ░  ░ ░░▓▓▓▓▓▓
-▓▓▓▓▓▓ ░   ░  ░░░ ░   ░░░░░     ░   ░░  ░░   ░░░   ░░░░░░░░  ░░░░░░░░░░░░ ░▓▓▓▓▓
-▓▓▓▓▓░ ░  ░░        ░ ░░░ ░ ░░ ░  ░░░░░░░░ ░  ░░░ ░ ░░░░░░    ░░░ ░░░░░░░░  ▓▓▓▓
-▓▓▓▓▓   ░░░ ░░░░░  ░░  ░░░░░   ░░░░ ░░  ░ ░░░ ░░░░░░ ░ ░░░░ ░  ░░░░░░   ░░ ░▓▓▓▓
-▓▓▓▓▓ ░░░░░░░ ░░░     ░░░░ ░░░░░░░░     ░░░ ░      ░   ░░░░ ░░░░░░░░░░  ░░░ ▓▓▓▓
-▓▓▓▓ ░ ░░░░░ ░░░   ░░░░░ ░ ░░░░░░░░ ░   ░  ░  ░ ░░ ░░  ░░░░░░░░░░░░░░░░░░░░░▓▓▓▓
-▓▓▓▓░░░░░░░░░░░░░░░░░   ░    ░░ ░░░░░░  ░      ░ ░░░     ░ ░░░░░░░░░░░░░░░░ ▓▓▓▓
-▓▓▓▓ ░  ░░ ░░  ░░░░░░  ░ ░░    ░ ░░░░░         ░░ ░░░░░░░░░ ░░░░░░░░░░░░░ ░ ▓▓▓▓
-▓▓▓▓▓ ░░░       ░░░░░░ ░  ░     ░  ░░░░░ ░░░ ░░░░ ░░░░░░░░ ░░░░░░░░░░░░░░ ░░▓▓▓▓
-▓▓▓▓▓ ░░░░░░ ░  ░░░ ░░ ░ ░░░  ░     ░░░░ ░ ░░░░  ░░░ ░  ░░░  ░░░░░░░░   ░░  ▓▓▓▓
-▓▓▓▓▓░░░  ░░ ░░  ░░░ ░░░░░░░░░░░   ░  ░░░ ░░ ░ ░░░░░    ░ ░░ ░░ ░░░ ░ ░░ ░░░▓▓▓▓
-▓▓▓▓▓▓░░  ░░ ░  ░░░░░░░░░░░░░░░░░░░░░░░ ░  ░░░░       ░░░  ░░░░░░░░ ░░░ ░░ ▓▓▓▓▓
-▓▓▓▓▓▓▓  ░░ ░░░░░░░ ░ ░░░░ ░░░░░ ░░░░░   ░░ ░░░    ░  ░░ ░░░ ░ ░  ░░░░  ░░▓▓▓▓▓▓
-▓▓▓▓▓▓▓  ░░░░░░░░░░░░░░░░░░░ ░   ░░░░░░ ░  ░░ ░    ░  ░     ░  ░░░░  ░░░░░▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓ ░░░░ ░░░░░      ░░░░░  ░░         ░ ░ ░                  ░ ░ ░ ░▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓ ░░░░  ░░░░░░░░░░░░░   ░           ░░             ░    ░░     ░▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓      ░░░░  ░  ░░                ░ ░ ░  ░░        ░      ░░ ▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓    ░░░░░░░░        ░                                 ░░ ▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓   ░░░░░░░                     ░░░    ░              ▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓       ░           ░         ░  ░     ░          ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░                      ░  ░    ░          ░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░ ░                      ░           ░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓    ░   ░        ░              ░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓                   ░  ░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/moon b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/moon
deleted file mode 100644
index 2943e284..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/moon
+++ /dev/null
@@ -1,35 +0,0 @@
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/neptune b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/neptune
deleted file mode 100644
index 9c2954e0..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/neptune
+++ /dev/null
@@ -1,36 +0,0 @@
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓       ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░▒▒▒░░░▒▒░░▒░▒░▒░░▒▒░░░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒░░░░░░░░░░░░░░░▒░░░░▒░▒░░▒▒▒░░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒░░░░   ░░░░░░░░░░░░▒░▒░▒░░░▒▒░░▒░▒░░  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒░░▒░▒░▒░░░  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒░▒░▒░░░░▒▒▒░░░░░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒░░░░░░░░░░░░░      ░░░░░░░░░░░░░░░░░▒░░▒▒░▒░░░░   ▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▒░░░▒░▒░░░░░░                 ░ ░░░░░░░░░░░▒░▒░░░░░░░   ▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓░▒░▒░░░░░                           ░░░░░░▒░░▒▒░░░▒░░░░░  ▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓ ▒▒▒░░░░░░                              ░░░░▒░▒░▒▒░▒▒░░░░░   ▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓░▒▒░░░░░░                                ░ ░░░░░░▒░░▒░░░░░░░   ▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓ ▒▒▒░░░░░                                   ░░░░░░▒░░▒░░▒▒░░░░   ▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▒▒░░░░░░                                    ░░░░░▒░░░▒░░▒░▒░░░   ▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓░░░▒░░░                                       ░░░░░▒░░▒░▒░▒░░░░░   ▓▓▓▓▓▓▓
-▓▓▓▓▓▓▒░▒▒░░                         ░ ░░░░░░░░░     ░░░░░░░▒▒░░░▒░░░    ▓▓▓▓▓▓▓
-▓▓▓▓▓░▒░▒░░░░                          ░░░░░░░░░░░░░░░░░░░▒░▒░▒░░░░░░░░  ▓▓▓▓▓▓▓
-▓▓▓▓▓▒▒▒░░░░░                              ░ ░░░░░░░░░░░ ░▒▒░▒▒▒░░░░░░   ▓▓▓▓▓▓▓
-▓▓▓▓▓▒▒▒▒░░░░                                     ░░░░░░▒░▒▒▒▒▒░░░░░░    ▓▓▓▓▓▓▓
-▓▓▓▓▓░░▒░░░░░░                                   ░░░░░░  ░▒░▒░░░▒░░░░░   ▓▓▓▓▓▓▓
-▓▓▓▓▓░░▒░░░░░░                                   ░░░░░▒▒░░░░░▒▒░▒░▒░░░   ▓▓▓▓▓▓▓
-▓▓▓▓▓ ▒▒▒▒░░░░░░                                ░░░░░░░░░░░▒░▒░░▒░░░░░   ▓▓▓▓▓▓▓
-▓▓▓▓▓▓░▒░░▒░░░░░                            ░ ░░░░░░░░░░░░▒░▒░░░░░░░░   ▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓░▒▒░▒▒░░░░░ ░      ░     ░   ░   ░░░░░░░░░░░░▒░░░░░░▒░░░░░░░░     ▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓░▒▒░▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒░░░░░░░░░▒░░▒░░░░░░░░░   ▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓ ▒▒▒░▒ ░░░░░░░░░░░░░░░░░░░▒░░░░░░░░░▒░░░▒░░░▒░▒░▒░░░░░▒░░ ░    ▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓░░░░░░░░░░░░░░░▒░░░▒░░░░░░░░░░░▒░░░░░░░░░░░░▒░▒░░░░░░░░░░    ▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓ ▒░░░░░░░░░░░░░░░░░░▒░░░░░░░░░░░▒░▒░░▒░░░▒░▒░░░░░░░░░ ░░   ▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓░▒░░░░▒░░░░░░░░░░░░░░░░░░░░░░░▒▒▒░░░░░▒░░░░░░░░░░░░░    ▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓░░▒░░░▒░░░░░░▒░░░░░░░░░░▒░░░░░░░▒░░░░░▒░░░░░░ ░      ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓ ░░░░░░░▒░░░▒░░░░░░▒▒░░░░▒░▒░░░▒▒▒░░░░░░░░░  ░     ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ░░░░░░▒░░░░░░░░░░░░░░░░░░░░░░▒░░░░░░░░░░      ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░░▒░░░░░░░░░▒░░░░░░▒░░▒░░▒░░░░░░░ ░    ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ░ ░░░░░░░░░░░░░░░░░░░▒░░░░░░░       ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓     ░░░░░░░░░░░░░░░░        ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓                    ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/pluto b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/pluto
deleted file mode 100644
index cfcde6ff..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/pluto
+++ /dev/null
@@ -1,39 +0,0 @@
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▓▒▒▒▒▒▒▒░░░░ ░░░▒░▒▒▒▒▒▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▓▒▒▒▒░░ ░░░░░░ ░░░▒▒▒░▒▒▒▒▒▒▒▒▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒▒▒▒▒  ░░  ░     ░░░ ░ ░▒▒▒▒▒▒▒▓▓▒▓▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▒▓▒▒▒░           ░        ░░▒▒▒▒▒▒▓▓▓▓▒▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▒▒░                  ░░░▒▒░▒▒▒▒▒▓▓▓▒▓▒▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▒▒▒░░     ▒   ░       ░░░░░░▒▒▒▒▒▓▓▓▓▓▓▓▒▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▓▓▓▒▒▒░░░▒ ░░▒▒▒░░      ░░░░░░▒▒▒▒▒▓▓▓▓▓▓▓▒▒▒░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▒▒░▒▒▒▒▒▒▒▒▒▒░░░░░░▒▒░▒▒▒▒▒▒▒▒▓▓▒▓▓▓▓▓▓▒▒▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▒▒▓░▒▒▒▒▒▒▒▒░░▒▒▒▒▒░▒▒▒▒▒▒▒▒▒▒▒▓▓▓▓▒▓▓▒▒▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▒▒▒▒▓▒▒▒▒░░▒ ░░▒▒▒▒▒▓▓▒▓▒▒▒▒▒▒▓▓▓▓▓▓▓▒░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▒▓▓▓▓▒▓▒▒▒▒▒       ░▒▒▒▓▓▒▓▓▒▒▒▒▒▓▒▒▓▓▓▒▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▒▓▓▓▓▓▒▓▓▒▒▒▒ ░         ░▒▓▒▒▒▒▒▒▒░▒▓▒▒▓▓▓▒▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒▓▒▓▓▓▓▒▒▓▓▒░             ░▒░░░▒▒▒▒▒▒▒▓▓▓▒▒▒░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒ ▒▓▓▒▒▓▓▓▓▓░░░░          ░░░░ ░▒▒▒▒░▓▒▒▓▓▓▓  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓    ░░▒ ▒▓▓▒▓▓▒░         ░░░░░░░▒▒▒▒▒▒▓▓▓▒▒  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒      ▒▒▒ ▒▒▒▒░░░░░░░░░░░░▒▒▒▒▒▒▒▒▒▓▓▓▒▒  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒          ▒▓▒▒▒░░░░░▒▒▒░▒▒▒▒▒▒▒▓▓▓▓▓▒▒  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓    ▒ ▒   ▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▓▓▓░░▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒  ▒       ▓▓▓▓▒▒▒▒▒▒▒▓▓▓▓▓▓░      ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▓▓▒░▓▒▓▒▓▓▓▓▓▓▓▓▓▓▓▒▒▒░▒░     ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▒▒▒▒▒    ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▓▓▓▓▓▓▒▒▓▒░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/saturn b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/saturn
deleted file mode 100644
index 68a7ffae..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/saturn
+++ /dev/null
@@ -1,36 +0,0 @@
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓ ▓▓▓▒▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒  ▒ ▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒▒▒▒▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒▒▒▒░▒▒▒▒▒▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒ ▒▒▓▒▓▓▒▓░▓░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒▒▒▒    ░▒▒▒ ▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒░▒▒  ▓▓  ▒▒▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒░▒ ▓▓▓▓▓▓  ▒▓▓▓▓▒▒▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▒ ▓▓▓▓▓▓▓▒ ▒▒▓▓▒▓▓▓▓▓▓▓▓▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░ ▒▒ ▓▓▓▓▓▓▓▒ ▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▓▒▒ ▒▓▓▒▒▒▓▒░▓▒▓▒▓▒▓░▒▓▓▓▓▓▓▓▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▒▒▒▒▒▒░▒▒▒▒▒▒▒▒▒▒▒░▓▓▓▓▓▓▓▓▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▒▒▒▒▒▒▒░░▒▒▒▒▒▒▒▒▒▒▒░▒▓▓▓▓▓▓▓▒░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒  ▓▒▒▒ ▒░░░░░▒▒▒▒▒▒▒▒▒▒░░▓▓▓▓▓▓▓▒░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░  ▒▓▒▒▒▒░▒░░░░▒▒▒▒▒▒▒▒▒▒▒░▒▓▓▓▓▓▓▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓  ▒  ▓▓▒▒▒▒▒░░░░░▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▓▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒     ▓▓▒▒▒░░░░░░░▒▒▒▒▒▒▒▒▒▒▓▓▓▓▒▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒ ▓  ░▒▒▓▒▒▒▓▒░░░░░▒▒▒▒▒▒▒▓▒▓▒▓▓▓▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▒▓▓▒  ▒▓▒▒▒▒▒░░░░░▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓░░▒▒▓▒▒▒ ░▒▒▒▒░▒▒▒▒▒▓▒▒▒▒▒▒░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▒▒░  ▓ ░▓▓▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▓▓▒▓   ▓▒▒▓▓▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓░▓░  ▓▓▓▓▓▒▒▒░▒▓▒▒▒▒▓▒▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▒▒▒ ▒▓▒▒▒▓▒▒▒▒▒▓▒▒▒▒▒▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▒▒▒▒▒▓▒▓▓▒▒▒▒░░▓▓▓▓▓ ▓▓ ▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▒▒▒▒▒▒▒▓▓▒▓▒ ▓▓▓▓   ▓▒▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒▓      ▒▒░▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▒▒▒   ░▒▒▒▒▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▒▒▒▓▓▓▒▒░ ░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒░▒▒▒▒▒░▓ ▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▒▒▒▒░▒▒ ▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ░░▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/uranus b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/uranus
deleted file mode 100644
index f5a8b36a..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/uranus
+++ /dev/null
@@ -1,39 +0,0 @@
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓       ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓  ░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ░▒▓▓▓▓▓▓▒▒░     ░░▒▒▓▓▓▓░ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ░▒▓▓▓▓▓▓▒░              ▒▒▓▓▓ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒▓▓▓▓▓▓▓▓░                 ░▒▓▓▓ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▒▓▒▓▓▓▒▒▓▓▓░                   ░▒▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▓▒▒▓▒▒▒▒▒▒▒▓ ▓▓▓▓▓▓▓▓▓           ▒▓▓▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▓▓▒▒▒▒▒▒▒░░░░░  ▓▓▓▓▓▓▓▓▓▓          ▒▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▓▓▒▒▒░▒░░░░░░    ▓▓▓▓▓▓▓▓▓▓          ▒▓▓░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▒▓▓▓▒▒▒░░░░░░░      ▓▓▓▓▓▓▓▓▓▓▓       ▒▓▓▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒▓▓▒▒▒▒░░░░░░░         ▓▓▓▓▓▓▓▓▓      ▒▓▓▓ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒▒▓▓▒▒▒░░ ░░                ▓▓▓▓    ░▒▓▓▓▓ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒▒▒▒▒▒▒░░░                    ░▒▒▓▓▓▓▓▓▓▓▓ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒░░▒▒▒░░░░░            ░░░░░░░▒▒▒▒▓▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒░░  ░▒▒░░░░░░            ░░░░░░░▒▒▒▓▓▓▓▓░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▒░░   ░▒▒░░░░    ░    ░  ░░░░░░▒▒▒▓▓▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒░     ░▒░░░░░░░ ░░░░░░░░░░░░▒▒▒▒▓▓▒▓▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒░      ░▒░░░░░░░░░░░░░░░░▒▒▒▒▒▓▓▓▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒░       ░░▒▒▒▒░▒░▒▒▒▒▒▒▒▒▓▓▓▓▓ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒░         ░▒▒▒▒▒▓▓▓▓▓▓▓▓▓▓░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ ▒▒▒░░         ░░▒▒▒▒▒▒▒▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▒▒▒▒▒▒▒░░▒▒▒▒▒▒▒ ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
-
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/venus b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/venus
deleted file mode 100644
index b95aff1b..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/data/memes/planets/venus
+++ /dev/null
@@ -1,35 +0,0 @@
-                          ▓   ▓  ░░        ░░░░ ▓  ▓                            
-                           ▒   ░        ░░░░░░  ░   ▒                           
-                  ▓ ▓▓ ░  ░      ░░░     ░  ░░   ░ ░ ░  ▒    ▓                  
-                ▓   ░░░  ░      ░     ░ ░             ░░   ░                    
-                 ▓ ░░░   ░      ░  ░ ░ ░         ░ ░  ▒ ░ ░ ░░   ▓▓             
-              ▓    ░  ░░ ░       ░░   ░                        ░                
-             ▓░  ░░ ░ ░ ░  ░░  ░  ░ ░░  ░    ░  ░     ░          ▒              
-          ▓▓ ░   ░  ░    ░  ░ ░    ░      ░ ░ ░    ░     ░ ░░ ░                 
-          ▓  ░  ░  ░░  ░ ▒  ░ ░░░░        ▒  ░░ ░  ░░  ░░   ░         ▓         
-           ░ ░  ░ ░░░   ░░  ░  ▒▒    ░  ░ ░   ░             ▒ ░  ░  ░           
-        ▓     ░ ░ ░    ░       ░░      ░░▒     ░░▒▒          ░ ░  ░    ▒        
-        ▓░   ░    ░  ░     ░  ░   ░   ░             ░  ░░       ▒  ░   ▓        
-         ░     ░ ░    ░ ░  ░            ░░      ░  ░░░░░         ░              
-        ░  ░     ░  ░░    ░ ░░   ░    ░ ░     ░░  ░ ▒  ░ ░  ░ ░  ░░    ░        
-    ▓                   ░   ░ ▓░     ░           ░ ░         ░     ░  ░░        
-    ▓ ▓░          ░  ░ ░░    ░  ░ ░  ░░░        ░░░             ░░              
-       ▒     ░░ ░ ░  ░░  ░ ░ ░░           ░        ░    ░           ░ ░  ▓      
-                  ░   ░░░░ ░  ░ ░  ░               ░                ░░   ▓      
-        ░ ░      ░     ░    ░           ░     ░         ░           ░░          
-     ▓ ▓     ░  ░ ░         ░            ░          ░      ░ ░          ▓       
-         ░        ░    ░        ░    ░   ░         ░  ░                ▒        
-        ▓ ░ ░  ░░   ░  ░    ░   ░  ░░   ░       ░                      ▓        
-        ▓    ░  ░          ░   ░░ ░  ░░  ░ ░   ░░ ░              ░              
-              ░  ░░     ░ ░░          ░   ░   ░░                ░   ░           
-             ░    ░  ░  ░ ░    ░    ░ ░ ░░░░ ░                                  
-             ░ ░       ░ ░      ░ ░░  ░   ░ ░   ░       ░░        ░▓            
-              ▒░░       ░           ░        ░   ░   ░          ░░  ▓           
-                ░                    ░░        ░    ░░ ░       ░                
-                  ▒ ░         ░        ░   ░      ░       ░  ░                  
-                    ▒  ░ ░        ░    ░  ░     ░           ▓                   
-                    ▓  ░░  ░        ░░  ░     ░  ░  ░   ░                       
-                     ▓▓    ▒░      ░           ░   ░░   ▓                       
-                              ▓  ░░░░       ░░   ▓                              
-
-
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/doc/secret.txt b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/doc/secret.txt
deleted file mode 100644
index e872ca45..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/doc/secret.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-================================================================================
-                                                      *telescope.theprimeagen*
-
-To The Viewers: ~
-
-Oh why hello, I didn't see you there. So nice of you to join us. The Primeagen
-must have sent you here.
-
-The places you want to look for help are: (you can do `:help <name>` below)
-    - |telescope.nvim|
-    - |telescope.setup|
-    - |telescope.builtin|
-    - |telescope.layout|
-    - |telescope.actions|
-
-I hope you enjoy telescope & Neovim. May your programming always be fun and
-your vimming be quick.
-
-
-
-To The Primeagen: ~
-
-Cyrnfr ernq guvf uryc znahny orsber pnyyvat zr ng 3 NZ jvgu gryrfpbcr
-rzretrapvrf. V xabj ynfg gvzr jr fnirq gur ragver fgernzvat vaqhfgel, ohg
-V unir n lbhat fba jub xrrcf zr hc ng avtug nyy ol uvzfrys. OGJ, unir lbh
-pbafvqrerq fraqvat culfvpny QIQf sbe znkvzhz dhnyvgl naq rneyl npprff gb arj
-pbagrag? Vg frrzf yvxr vg pbhyq or n cerggl pbby vqrn.
-
-#FunzryrffFrysCebzbgvba: uggcf://tvguho.pbz/fcbafbef/gwqrievrf
-
-
- vim:tw=78:ts=8:ft=help:norl:
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/doc/telescope.txt b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/doc/telescope.txt
deleted file mode 100644
index a38a88f8..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/doc/telescope.txt
+++ /dev/null
@@ -1,4195 +0,0 @@
-================================================================================
-INTRODUCTION                                                    *telescope.nvim*
-
-Telescope.nvim is a plugin for fuzzy finding and neovim. It helps you search,
-filter, find and pick things in Lua.
-
-Getting started with telescope:
-  1. Run `:checkhealth telescope` to make sure everything is installed.
-  2. Evaluate it is working with `:Telescope find_files` or `:lua
-     require("telescope.builtin").find_files()`
-  3. Put a `require("telescope").setup()` call somewhere in your neovim config.
-  4. Read |telescope.setup| to check what config keys are available and what
-     you can put inside the setup call
-  5. Read |telescope.builtin| to check which builtin pickers are offered and
-     what options these implement
-  6. Profit
-
-The below flow chart illustrates a simplified telescope architecture:
-┌───────────────────────────────────────────────────────────┐
-│      ┌────────┐                                           │
-│      │ Multi  │                                ┌───────+  │
-│      │ Select │    ┌───────┐                   │ Entry │  │
-│      └─────┬──*    │ Entry │    ┌────────+     │ Maker │  │
-│            │   ┌───│Manager│────│ Sorter │┐    └───┬───*  │
-│            ▼   ▼   └───────*    └────────┘│        │      │
-│            1────────┐                 2───┴──┐     │      │
-│      ┌─────│ Picker │                 │Finder│◀────┘      │
-│      ▼     └───┬────┘                 └──────*            │
-│ ┌────────┐     │       3────────+         ▲               │
-│ │Selected│     └───────│ Prompt │─────────┘               │
-│ │ Entry  │             └───┬────┘                         │
-│ └────────*             ┌───┴────┐  ┌────────┐  ┌────────┐ │
-│     │  ▲    4─────────┐│ Prompt │  │(Attach)│  │Actions │ │
-│     ▼  └──▶ │ Results ││ Buffer │◀─┤Mappings│◀─┤User Fn │ │
-│5─────────┐  └─────────┘└────────┘  └────────┘  └────────┘ │
-││Previewer│                                                │
-│└─────────┘                   telescope.nvim architecture  │
-└───────────────────────────────────────────────────────────┘
-
-  + The `Entry Maker` at least defines
-    - value: "raw" result of the finder
-    - ordinal: string to be sorted derived from value
-    - display: line representation of entry in results buffer
-
-  * The finder, entry manager, selected entry, and multi selections
-    comprises `entries` constructed by the `Entry Maker` from
-    raw results of the finder (`value`s)
-
- Primary components:
-  1 Picker: central UI dedicated to varying use cases
-            (finding files, grepping, diagnostics, etc.)
-            see :h telescope.builtin
-  2 Finder: pipe or interactively generates results to pick over
-  3 Prompt: user input that triggers the finder which sorts results
-            in order into the entry manager
-  4 Results: listed entries scored by sorter from finder results
-  5 Previewer: preview of context of selected entry
-               see :h telescope.previewers
-
-A practical introduction into telescope customization is our `developers.md`
-(top-level of repo) and `:h telescope.actions` that showcase how to access
-information about the state of the picker (current selection, etc.).
-To find out more:
-https://github.com/nvim-telescope/telescope.nvim
-
-  :h telescope.setup
-  :h telescope.command
-  :h telescope.builtin
-  :h telescope.themes
-  :h telescope.layout
-  :h telescope.resolve
-  :h telescope.actions
-  :h telescope.actions.state
-  :h telescope.actions.set
-  :h telescope.actions.utils
-  :h telescope.actions.generate
-  :h telescope.actions.history
-  :h telescope.previewers
-
-telescope.setup({opts})                                    *telescope.setup()*
-    Setup function to be run by user. Configures the defaults, pickers and
-    extensions of telescope.
-
-    Usage:
-    >
-    require('telescope').setup{
-      defaults = {
-        -- Default configuration for telescope goes here:
-        -- config_key = value,
-        -- ..
-      },
-      pickers = {
-        -- Default configuration for builtin pickers goes here:
-        -- picker_name = {
-        --   picker_config_key = value,
-        --   ...
-        -- }
-        -- Now the picker_config_key will be applied every time you call this
-        -- builtin picker
-      },
-      extensions = {
-        -- Your extension configuration goes here:
-        -- extension_name = {
-        --   extension_config_key = value,
-        -- }
-        -- please take a look at the readme of the extension you want to configure
-      }
-    }
-<
-
-
-    Valid keys for {opts.defaults}
-
-                                      *telescope.defaults.sorting_strategy*
-    sorting_strategy: ~
-        Determines the direction "better" results are sorted towards.
-
-        Available options are:
-        - "descending" (default)
-        - "ascending"
-
-                                    *telescope.defaults.selection_strategy*
-    selection_strategy: ~
-        Determines how the cursor acts after each sort iteration.
-
-        Available options are:
-        - "reset" (default)
-        - "follow"
-        - "row"
-        - "closest"
-        - "none"
-
-                                       *telescope.defaults.scroll_strategy*
-    scroll_strategy: ~
-        Determines what happens if you try to scroll past the view of the
-        picker.
-
-        Available options are:
-        - "cycle" (default)
-        - "limit"
-
-                                       *telescope.defaults.layout_strategy*
-    layout_strategy: ~
-        Determines the default layout of Telescope pickers.
-        See |telescope.layout| for details of the available strategies.
-
-        Default: 'horizontal'
-
-                                         *telescope.defaults.create_layout*
-    create_layout: ~
-        Configure the layout of Telescope pickers.
-        See |telescope.pickers.layout| for details.
-
-        Default: 'nil'
-
-                                         *telescope.defaults.layout_config*
-    layout_config: ~
-        Determines the default configuration values for layout strategies.
-        See |telescope.layout| for details of the configurations options for
-        each strategy.
-
-        Allows setting defaults for all strategies as top level options and
-        for overriding for specific options.
-        For example, the default values below set the default width to 80% of
-        the screen width for all strategies except 'center', which has width
-        of 50% of the screen width.
-
-        Default: {
-          bottom_pane = {
-            height = 25,
-            preview_cutoff = 120,
-            prompt_position = "top"
-          },
-          center = {
-            height = 0.4,
-            preview_cutoff = 40,
-            prompt_position = "top",
-            width = 0.5
-          },
-          cursor = {
-            height = 0.9,
-            preview_cutoff = 40,
-            width = 0.8
-          },
-          horizontal = {
-            height = 0.9,
-            preview_cutoff = 120,
-            prompt_position = "bottom",
-            width = 0.8
-          },
-          vertical = {
-            height = 0.9,
-            preview_cutoff = 40,
-            prompt_position = "bottom",
-            width = 0.8
-          }
-        }
-
-
-                                     *telescope.defaults.cycle_layout_list*
-    cycle_layout_list: ~
-        Determines the layouts to cycle through when using `actions.layout.cycle_layout_next`
-        and `actions.layout.cycle_layout_prev`.
-        Should be a list of "layout setups".
-        Each "layout setup" can take one of two forms:
-        1. string
-            This is interpreted as the name of a `layout_strategy`
-        2. table
-            A table with possible keys `layout_strategy`, `layout_config` and `previewer`
-
-        Default: { "horizontal", "vertical" }
-
-
-                                              *telescope.defaults.winblend*
-    winblend: ~
-        Configure winblend for telescope floating windows. See |winblend| for
-        more information. Type can be a number or a function returning a
-        number
-
-        Default: function() return vim.o.winblend end
-
-                                          *telescope.defaults.wrap_results*
-    wrap_results: ~
-        Word wrap the search results
-
-        Default: false
-
-                                         *telescope.defaults.prompt_prefix*
-    prompt_prefix: ~
-        The character(s) that will be shown in front of Telescope's prompt.
-
-        Default: '> '
-
-                                       *telescope.defaults.selection_caret*
-    selection_caret: ~
-        The character(s) that will be shown in front of the current selection.
-
-        Default: '> '
-
-                                          *telescope.defaults.entry_prefix*
-    entry_prefix: ~
-        Prefix in front of each result entry. Current selection not included.
-
-        Default: '  '
-
-                                            *telescope.defaults.multi_icon*
-    multi_icon: ~
-        Symbol to add in front of a multi-selected result entry.
-        Replaces final character of |telescope.defaults.selection_caret| and
-        |telescope.defaults.entry_prefix| as appropriate.
-        To have no icon, set to the empty string.
-
-        Default: '+'
-
-                                          *telescope.defaults.initial_mode*
-    initial_mode: ~
-        Determines in which mode telescope starts. Valid Keys:
-        `insert` and `normal`.
-
-        Default: "insert"
-
-                                                *telescope.defaults.border*
-    border: ~
-        Boolean defining if borders are added to Telescope windows.
-
-        Default: true
-
-                                          *telescope.defaults.path_display*
-    path_display: ~
-        Determines how file paths are displayed.
-
-        path_display can be set to an array with a combination of:
-        - "hidden"          hide file names
-        - "tail"            only display the file name, and not the path
-        - "absolute"        display absolute paths
-        - "smart"           remove as much from the path as possible to only show
-                            the difference between the displayed paths.
-                            Warning: The nature of the algorithm might have a negative
-                            performance impact!
-        - "shorten"         only display the first character of each directory in
-                            the path
-        - "truncate"        truncates the start of the path when the whole path will
-                            not fit. To increase the gap between the path and the edge,
-                            set truncate to number `truncate = 3`
-        - "filename_first"  shows filenames first and then the directories
-
-        You can also specify the number of characters of each directory name
-        to keep by setting `path_display.shorten = num`.
-          e.g. for a path like
-            `alpha/beta/gamma/delta.txt`
-          setting `path_display.shorten = 1` will give a path like:
-            `a/b/g/delta.txt`
-          Similarly, `path_display.shorten = 2` will give a path like:
-            `al/be/ga/delta.txt`
-
-        You can also further customise the shortening behaviour by
-        setting `path_display.shorten = { len = num, exclude = list }`,
-        where `len` acts as above, and `exclude` is a list of positions
-        that are not shortened. Negative numbers in the list are considered
-        relative to the end of the path.
-          e.g. for a path like
-            `alpha/beta/gamma/delta.txt`
-          setting `path_display.shorten = { len = 1, exclude = {1, -1} }`
-          will give a path like:
-            `alpha/b/g/delta.txt`
-          setting `path_display.shorten = { len = 2, exclude = {2, -2} }`
-          will give a path like:
-            `al/beta/gamma/de`
-
-        path_display can also be set to 'filename_first' to put the filename
-        in front.
-
-          path_display = {
-            "filename_first"
-          },
-
-        The directory structure can be reversed as follows:
-
-          path_display = {
-            filename_first = {
-                reverse_directories = true
-            }
-          },
-
-        path_display can also be set to 'hidden' string to hide file names
-
-        path_display can also be set to a function for custom formatting of
-        the path display with the following signature
-
-        Signature: fun(opts: table, path: string): string, table?
-
-        The optional table is an list of positions and highlight groups to
-        set the highlighting of the return path string.
-
-        Example:
-
-            -- Format path as "file.txt (path\to\file\)"
-            path_display = function(opts, path)
-              local tail = require("telescope.utils").path_tail(path)
-              return string.format("%s (%s)", tail, path)
-            end,
-
-            -- Format path and add custom highlighting
-            path_display = function(opts, path)
-              local tail = require("telescope.utils").path_tail(path)
-              path = string.format("%s (%s)", tail, path)
-
-              local highlights = {
-                {
-                  {
-                    0, -- highlight start position
-                    #path, -- highlight end position
-                  },
-                  "Comment", -- highlight group name
-                },
-              }
-
-              return path, highlights
-            end
-
-        Default: {}
-
-                                           *telescope.defaults.borderchars*
-    borderchars: ~
-        Set the borderchars of telescope floating windows. It has to be a
-        table of 8 string values.
-
-        Default: { "─", "│", "─", "│", "╭", "╮", "╯", "╰" }
-
-                                       *telescope.defaults.get_status_text*
-    get_status_text: ~
-        A function that determines what the virtual text looks like.
-        Signature: function(picker) -> str
-
-        Default: function that shows current count / all
-
-                                         *telescope.defaults.hl_result_eol*
-    hl_result_eol: ~
-        Changes if the highlight for the selected item in the results
-        window is always the full width of the window
-
-        Default: true
-
-                                 *telescope.defaults.dynamic_preview_title*
-    dynamic_preview_title: ~
-        Will change the title of the preview window dynamically, where it
-        is supported. For example, the preview window's title could show up as
-        the full filename.
-
-        Default: false
-
-                                         *telescope.defaults.results_title*
-    results_title: ~
-        Defines the default title of the results window. A false value
-        can be used to hide the title altogether.
-
-        Default: "Results"
-
-                                          *telescope.defaults.prompt_title*
-    prompt_title: ~
-        Defines the default title of the prompt window. A false value
-        can be used to hide the title altogether. Most of the times builtins
-        define a prompt_title which will be preferred over this default.
-
-        Default: "Prompt"
-
-                                              *telescope.defaults.mappings*
-    mappings: ~
-        Your mappings to override telescope's default mappings.
-
-        See: ~
-            |telescope.mappings|
-
-
-                                      *telescope.defaults.default_mappings*
-    default_mappings: ~
-        Not recommended to use except for advanced users.
-
-        Will allow you to completely remove all of telescope's default maps
-        and use your own.
-
-        Default: nil
-
-
-                                               *telescope.defaults.history*
-    history: ~
-        This field handles the configuration for prompt history.
-        By default it is a table, with default values (more below).
-        To disable history, set it to false.
-
-        Currently mappings still need to be added, Example:
-          mappings = {
-            i = {
-              ["<C-Down>"] = require('telescope.actions').cycle_history_next,
-              ["<C-Up>"] = require('telescope.actions').cycle_history_prev,
-            },
-          },
-
-        Fields:
-          - path:       The path to the telescope history as string.
-                        Default: stdpath("data")/telescope_history
-          - limit:      The amount of entries that will be written in the
-                        history.
-                        Warning: If limit is set to nil it will grow unbound.
-                        Default: 100
-          - handler:    A lua function that implements the history.
-                        This is meant as a developer setting for extensions to
-                        override the history handling, e.g.,
-                        https://github.com/nvim-telescope/telescope-smart-history.nvim,
-                        which allows context sensitive (cwd + picker) history.
-
-                        Default:
-                        require('telescope.actions.history').get_simple_history
-          - cycle_wrap: Indicates whether the cycle_history_next and
-                        cycle_history_prev functions should wrap around to the
-                        beginning or end of the history entries on reaching
-                        their respective ends
-                        Default: false
-
-                                          *telescope.defaults.cache_picker*
-    cache_picker: ~
-        This field handles the configuration for picker caching.
-        By default it is a table, with default values (more below).
-        To disable caching, set it to false.
-
-        Caching preserves all previous multi selections and results and
-        therefore may result in slowdown or increased RAM occupation
-        if too many pickers (`cache_picker.num_pickers`) or entries
-        ('cache_picker.limit_entries`) are cached.
-
-        Fields:
-          - num_pickers:          The number of pickers to be cached.
-                                  Set to -1 to preserve all pickers of your
-                                  session. If passed to a picker, the cached
-                                  pickers with indices larger than
-                                  `cache_picker.num_pickers` will be cleared.
-                                  Default: 1
-          - limit_entries:        The amount of entries that will be saved for
-                                  each picker.
-                                  Default: 1000
-          - ignore_empty_prompt:  If true, the picker will not be cached if
-                                  the prompt is empty (i.e., no text has been
-                                  typed at the time of closing the prompt).
-                                  Default: false
-
-
-                                               *telescope.defaults.preview*
-    preview: ~
-        This field handles the global configuration for previewers.
-        By default it is a table, with default values (more below).
-        To disable previewing, set it to false. If you have disabled previewers
-        globally, but want to opt in to previewing for single pickers, you will have to
-        pass `preview = true` or `preview = {...}` (your config) to the `opts` of
-        your picker.
-
-        Fields:
-          - check_mime_type:  Use `file` if available to try to infer whether the
-                              file to preview is a binary if filetype
-                              detection fails.
-                              Windows users get `file` from:
-                              https://github.com/julian-r/file-windows
-                              Set to false to attempt to preview any mime type.
-                              Default: true for all OS excl. Windows
-          - filesize_limit:   The maximum file size in MB attempted to be previewed.
-                              Set to false to attempt to preview any file size.
-                              Default: 25
-          - highlight_limit:  The maximum file size in MB attempted to be highlighted.
-                              Set to false to attempt to highlight any file size.
-                              Default: 1
-          - timeout:          Timeout the previewer if the preview did not
-                              complete within `timeout` milliseconds.
-                              Set to false to not timeout preview.
-                              Default: 250
-          - hook(s):          Function(s) that takes `(filepath, bufnr, opts)`, where opts
-                              exposes winid and ft (filetype).
-                              Available hooks (in order of priority):
-                              {filetype, mime, filesize, timeout}_hook
-                              Important: the filetype_hook must return true or false
-                              to indicate whether to continue (true) previewing or not (false),
-                              respectively.
-                              Two examples:
-                              local putils = require("telescope.previewers.utils")
-                              ... -- preview is called in telescope.setup { ... }
-                                preview = {
-                                  -- 1) Do not show previewer for certain files
-                                  filetype_hook = function(filepath, bufnr, opts)
-                                    -- you could analogously check opts.ft for filetypes
-                                    local excluded = vim.tbl_filter(function(ending)
-                                      return filepath:match(ending)
-                                    end, {
-                                      ".*%.csv",
-                                      ".*%.toml",
-                                    })
-                                    if not vim.tbl_isempty(excluded) then
-                                      putils.set_preview_message(
-                                        bufnr,
-                                        opts.winid,
-                                        string.format("I don't like %s files!",
-                                        excluded[1]:sub(5, -1))
-                                      )
-                                      return false
-                                    end
-                                    return true
-                                  end,
-                                  -- 2) Truncate lines to preview window for too large files
-                                  filesize_hook = function(filepath, bufnr, opts)
-                                    local path = require("plenary.path"):new(filepath)
-                                    -- opts exposes winid
-                                    local height = vim.api.nvim_win_get_height(opts.winid)
-                                    local lines = vim.split(path:head(height), "[\r]?\n")
-                                    vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
-                                  end,
-                                }
-                              The configuration recipes for relevant examples.
-                              Note: we use vim.filetype filetype detection,
-                                    so if you have troubles with files not
-                                    highlighting correctly, please read
-                                    |vim.filetype|
-                              Default: nil
-          - treesitter:       Determines whether the previewer performs treesitter
-                              highlighting, which falls back to regex-based highlighting.
-                              `true`: treesitter highlighting for all available filetypes
-                              `false`: regex-based highlighting for all filetypes
-                              `table`: may contain the following keys:
-                                  - enable boolean|table: if boolean, enable ts
-                                                          highlighting for all supported
-                                                          filetypes.
-                                                          if table, ts highlighting is only
-                                                            enabled for given filetypes.
-                                  - disable table: list of filetypes for which ts highlighting
-                                                   is not used if `enable = true`.
-                              Default: true
-          - msg_bg_fillchar:  Character to fill background of unpreviewable buffers with
-                              Default: "╱"
-          - hide_on_startup:  Hide previewer when picker starts. Previewer can be toggled
-                              with actions.layout.toggle_preview.
-                              Default: false
-          - ls_short:         Determines whether to use the `--short` flag for the `ls`
-                              command when previewing directories. Otherwise will result
-                              to using `--long`.
-                              Default: false
-
-
-                                     *telescope.defaults.vimgrep_arguments*
-    vimgrep_arguments: ~
-        Defines the command that will be used for `live_grep` and `grep_string`
-        pickers.
-        Hint: Make sure that color is currently set to `never` because we do
-        not yet interpret color codes
-        Hint 2: Make sure that these options are in your changes arguments:
-          "--no-heading", "--with-filename", "--line-number", "--column"
-        because we need them so the ripgrep output is in the correct format.
-
-        Default: {
-          "rg",
-          "--color=never",
-          "--no-heading",
-          "--with-filename",
-          "--line-number",
-          "--column",
-          "--smart-case"
-        }
-
-                                              *telescope.defaults.use_less*
-    use_less: ~
-        Boolean if less should be enabled in term_previewer (deprecated and
-        currently no longer used in the builtin pickers).
-
-        Default: true
-
-                                               *telescope.defaults.set_env*
-    set_env: ~
-        Set an environment for term_previewer. A table of key values:
-        Example: { COLORTERM = "truecolor", ... }
-        Hint: Empty table is not allowed.
-
-        Default: nil
-
-                                        *telescope.defaults.color_devicons*
-    color_devicons: ~
-        Boolean if devicons should be enabled or not. If set to false, the
-        text highlight group is used.
-        Hint: Coloring only works if |termguicolors| is enabled.
-
-        Default: true
-
-                                           *telescope.defaults.file_sorter*
-    file_sorter: ~
-        A function pointer that specifies the file_sorter. This sorter will
-        be used for find_files, git_files and similar.
-        Hint: If you load a native sorter, you don't need to change this value,
-        the native sorter will override it anyway.
-
-        Default: require("telescope.sorters").get_fzy_sorter
-
-                                        *telescope.defaults.generic_sorter*
-    generic_sorter: ~
-        A function pointer to the generic sorter. The sorter that should be
-        used for everything that is not a file.
-        Hint: If you load a native sorter, you don't need to change this value,
-        the native sorter will override it anyway.
-
-        Default: require("telescope.sorters").get_fzy_sorter
-
-                                      *telescope.defaults.prefilter_sorter*
-    prefilter_sorter: ~
-        This points to a wrapper sorter around the generic_sorter that is able
-        to do prefiltering.
-        It's usually used for lsp_*_symbols and lsp_*_diagnostics
-
-        Default: require("telescope.sorters").prefilter
-
-                                              *telescope.defaults.tiebreak*
-    tiebreak: ~
-        A function that determines how to break a tie when two entries have
-        the same score.
-        Having a function that always returns false would keep the entries in
-        the order they are found, so existing_entry before current_entry.
-        Vice versa always returning true would place the current_entry
-        before the existing_entry.
-
-        Signature: function(current_entry, existing_entry, prompt) -> boolean
-
-        Default: function that breaks the tie based on the length of the
-                 entry's ordinal
-
-                                  *telescope.defaults.file_ignore_patterns*
-    file_ignore_patterns: ~
-        A table of lua regex that define the files that should be ignored.
-        Example: { "^scratch/" } -- ignore all files in scratch directory
-        Example: { "%.npz" } -- ignore all npz files
-        See: https://www.lua.org/manual/5.1/manual.html#5.4.1 for more
-        information about lua regex
-        Note: `file_ignore_patterns` will be used in all pickers that have a
-        file associated. This might lead to the problem that lsp_ pickers
-        aren't displaying results because they might be ignored by
-        `file_ignore_patterns`. For example, setting up node_modules as ignored
-        will never show node_modules in any results, even if you are
-        interested in lsp_ results.
-
-        If you only want `file_ignore_patterns` for `find_files` and
-        `grep_string`/`live_grep` it is suggested that you setup `gitignore`
-        and have fd and or ripgrep installed because both tools will not show
-        `gitignore`d files on default.
-
-        Default: nil
-
-                                  *telescope.defaults.get_selection_window*
-    get_selection_window: ~
-          Function that takes function(picker, entry) and returns a window id.
-          The window ID will be used to decide what window the chosen file will
-          be opened in and the cursor placed in upon leaving the picker.
-
-          Default: `function() return 0 end`
-
-
-                                         *telescope.defaults.git_worktrees*
-    git_worktrees: ~
-        A table of arrays of detached working trees with keys `gitdir` and `toplevel`.
-        Used to pass `--git-dir` and `--work-tree` flags to git commands when telescope fails
-        to infer the top-level directory of a given working tree based on cwd.
-        Example:
-        git_worktrees = {
-          {
-            toplevel = vim.env.HOME,
-            gitdir = vim.env.HOME .. '/.cfg'
-          }
-        }
-
-        Default: nil
-
-
-                                        *telescope.defaults.file_previewer*
-    file_previewer: ~
-        Function pointer to the default file_previewer. It is mostly used
-        for find_files, git_files and similar.
-        You can change this function pointer to either use your own
-        previewer or use the command-line program bat as the previewer:
-          require("telescope.previewers").cat.new
-
-        Default: require("telescope.previewers").vim_buffer_cat.new
-
-                                        *telescope.defaults.grep_previewer*
-    grep_previewer: ~
-        Function pointer to the default vim_grep previewer. It is mostly
-        used for live_grep, grep_string and similar.
-        You can change this function pointer to either use your own
-        previewer or use the command-line program bat as the previewer:
-          require("telescope.previewers").vimgrep.new
-
-        Default: require("telescope.previewers").vim_buffer_vimgrep.new
-
-                                      *telescope.defaults.qflist_previewer*
-    qflist_previewer: ~
-        Function pointer to the default qflist previewer. It is mostly
-        used for qflist, loclist and lsp.
-        You can change this function pointer to either use your own
-        previewer or use the command-line program bat as the previewer:
-          require("telescope.previewers").qflist.new
-
-        Default: require("telescope.previewers").vim_buffer_qflist.new
-
-                                *telescope.defaults.buffer_previewer_maker*
-    buffer_previewer_maker: ~
-        Developer option that defines the underlining functionality
-        of the buffer previewer.
-        For interesting configuration examples take a look at
-        https://github.com/nvim-telescope/telescope.nvim/wiki/Configuration-Recipes
-
-        Default: require("telescope.previewers").buffer_previewer_maker
-
-    Parameters: ~
-        {opts} (table)  Configuration opts. Keys: defaults, pickers,
-                        extensions
-
-
-telescope.load_extension({name})                  *telescope.load_extension()*
-    Load an extension.
-    - Notes:
-      - Loading triggers ext setup via the config passed in |telescope.setup|
-
-
-    Parameters: ~
-        {name} (string)  Name of the extension
-
-
-telescope.register_extension({mod})           *telescope.register_extension()*
-    Register an extension. To be used by plugin authors.
-
-
-    Parameters: ~
-        {mod} (table)  Module
-
-
-telescope.extensions()                                *telescope.extensions()*
-    Use telescope.extensions to reference any extensions within your
-    configuration.
-    While the docs currently generate this as a function, it's actually a
-    table. Sorry.
-
-
-
-
-================================================================================
-COMMAND                                                      *telescope.command*
-
-Telescope commands can be called through two apis, the lua api and the viml
-api.
-
-The lua api is the more direct way to interact with Telescope, as you directly
-call the lua functions that Telescope defines. It can be called in a lua file
-using commands like:
-`require("telescope.builtin").find_files({hidden=true, layout_config={prompt_position="top"}})`
-If you want to use this api from a vim file you should prepend `lua` to the
-command, as below:
-`lua require("telescope.builtin").find_files({hidden=true, layout_config={prompt_position="top"}})`
-If you want to use this api from a neovim command line you should prepend
-`:lua` to the command, as below:
-`:lua require("telescope.builtin").find_files({hidden=true, layout_config={prompt_position="top"}})`
-
-The viml api is more indirect, as first the command must be parsed to the
-relevant lua equivalent, which brings some limitations. The viml api can be
-called using commands like:
-`:Telescope find_files hidden=true layout_config={"prompt_position":"top"}`
-This involves setting options using an `=` and using viml syntax for lists and
-dictionaries when the corresponding lua function requires a table.
-
-One limitation of the viml api is that there can be no spaces in any of the
-options. For example, if you want to use the `cwd` option for `find_files` to
-specify that you only want to search within the folder `/foo bar/subfolder/`
-you could not do that using the viml api, as the path name contains a space.
-Similarly, you could NOT set the `prompt_position` to `"top"` using the
-following command:
-`:Telescope find_files layout_config={ "prompt_position" : "top" }`
-as there are spaces in the option.
-
-
-
-================================================================================
-BUILTIN                                                      *telescope.builtin*
-
-Telescope Builtins is a collection of community maintained pickers to support
-common workflows. It can be used as reference when writing PRs, Telescope
-extensions, your own custom pickers, or just as a discovery tool for all of the
-amazing pickers already shipped with Telescope!
-
-Any of these functions can just be called directly by doing:
-
-:lua require('telescope.builtin').$NAME_OF_PICKER()
-
-To use any of Telescope's default options or any picker-specific options, call
-your desired picker by passing a lua table to the picker with all of the
-options you want to use. Here's an example with the live_grep picker:
-
->
-  :lua require('telescope.builtin').live_grep({
-    prompt_title = 'find string in open buffers...',
-    grep_open_files = true
-  })
-  -- or with dropdown theme
-  :lua require('telescope.builtin').find_files(require('telescope.themes').get_dropdown{
-    previewer = false
-  })
-<
-
-builtin.live_grep({opts})                      *telescope.builtin.live_grep()*
-    Search for a string and get results live as you type, respects .gitignore
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {cwd}                 (string)          root dir to search from
-                                                (default: cwd, use
-                                                utils.buffer_dir() to search
-                                                relative to open buffer)
-        {grep_open_files}     (boolean)         if true, restrict search to
-                                                open files only, mutually
-                                                exclusive with `search_dirs`
-        {search_dirs}         (table)           directory/directories/files to
-                                                search, mutually exclusive
-                                                with `grep_open_files`
-        {glob_pattern}        (string|table)    argument to be used with
-                                                `--glob`, e.g. "*.toml", can
-                                                use the opposite "!*.toml"
-        {type_filter}         (string)          argument to be used with
-                                                `--type`, e.g. "rust", see `rg
-                                                --type-list`
-        {additional_args}     (function|table)  additional arguments to be
-                                                passed on. Can be fn(opts) ->
-                                                tbl
-        {max_results}         (number)          define a upper result value
-        {disable_coordinates} (boolean)         don't show the line & row
-                                                numbers (default: false)
-        {file_encoding}       (string)          file encoding for the entry &
-                                                previewer
-
-
-builtin.grep_string({opts})                  *telescope.builtin.grep_string()*
-    Searches for the string under your cursor or the visual selection in your
-    current working directory
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {cwd}                 (string)          root dir to search from
-                                                (default: cwd, use
-                                                utils.buffer_dir() to search
-                                                relative to open buffer)
-        {search}              (string)          the query to search
-        {grep_open_files}     (boolean)         if true, restrict search to
-                                                open files only, mutually
-                                                exclusive with `search_dirs`
-        {search_dirs}         (table)           directory/directories/files to
-                                                search, mutually exclusive
-                                                with `grep_open_files`
-        {use_regex}           (boolean)         if true, special characters
-                                                won't be escaped, allows for
-                                                using regex (default: false)
-        {word_match}          (string)          can be set to `-w` to enable
-                                                exact word matches
-        {additional_args}     (function|table)  additional arguments to be
-                                                passed on. Can be fn(opts) ->
-                                                tbl
-        {disable_coordinates} (boolean)         don't show the line and row
-                                                numbers (default: false)
-        {only_sort_text}      (boolean)         only sort the text, not the
-                                                file, line or row (default:
-                                                false)
-        {file_encoding}       (string)          file encoding for the entry &
-                                                previewer
-
-
-builtin.find_files({opts})                    *telescope.builtin.find_files()*
-    Search for files (respecting .gitignore)
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {cwd}                 (string)          root dir to search from
-                                                (default: cwd, use
-                                                utils.buffer_dir() to search
-                                                relative to open buffer)
-        {find_command}        (function|table)  cmd to use for the search. Can
-                                                be a fn(opts) -> tbl (default:
-                                                autodetect)
-        {file_entry_encoding} (string)          encoding of output of
-                                                `find_command`
-        {follow}              (boolean)         if true, follows symlinks
-                                                (i.e. uses `-L` flag for the
-                                                `find` command)
-        {hidden}              (boolean)         determines whether to show
-                                                hidden files or not (default:
-                                                false)
-        {no_ignore}           (boolean)         show files ignored by
-                                                .gitignore, .ignore, etc.
-                                                (default: false)
-        {no_ignore_parent}    (boolean)         show files ignored by
-                                                .gitignore, .ignore, etc. in
-                                                parent dirs. (default: false)
-        {search_dirs}         (table)           directory/directories/files to
-                                                search
-        {search_file}         (string)          specify a filename to search
-                                                for
-        {file_encoding}       (string)          file encoding for the
-                                                previewer
-
-
-builtin.fd()                                          *telescope.builtin.fd()*
-    This is an alias for the `find_files` picker
-
-
-
-builtin.treesitter()                          *telescope.builtin.treesitter()*
-    Lists function names, variables, and other symbols from treesitter queries
-    - Default keymaps:
-      - `<C-l>`: show autocompletion menu to prefilter your query by kind of ts
-        node you want to see (i.e. `:var:`)
-
-
-    Options: ~
-        {show_line}         (boolean)       if true, shows the row:column that
-                                            the result is found at (default:
-                                            true)
-        {bufnr}             (number)        specify the buffer number where
-                                            treesitter should run. (default:
-                                            current buffer)
-        {symbol_width}      (number)        defines the width of the symbol
-                                            section (default: 25)
-        {symbols}           (string|table)  filter results by symbol kind(s)
-        {ignore_symbols}    (string|table)  list of symbols to ignore
-        {symbol_highlights} (table)         string -> string. Matches symbol
-                                            with hl_group
-        {file_encoding}     (string)        file encoding for the previewer
-
-
-builtin.current_buffer_fuzzy_find({opts}) *telescope.builtin.current_buffer_fuzzy_find()*
-    Live fuzzy search inside of the currently open buffer
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {skip_empty_lines}     (boolean)  if true we don't display empty lines
-                                          (default: false)
-        {results_ts_highlight} (boolean)  highlight result entries with
-                                          treesitter (default: true)
-        {file_encoding}        (string)   file encoding for the previewer
-
-
-builtin.tags({opts})                                *telescope.builtin.tags()*
-    Lists tags in current directory with tag location file preview (users are
-    required to run ctags -R to generate tags or update when introducing new
-    changes)
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {cwd}            (string)   root dir to search from (default: cwd, use
-                                    utils.buffer_dir() to search relative to
-                                    open buffer)
-        {ctags_file}     (string)   specify a particular ctags file to use
-        {show_line}      (boolean)  if true, shows the content of the line the
-                                    tag is found on in the picker (default:
-                                    true)
-        {only_sort_tags} (boolean)  if true we will only sort tags (default:
-                                    false)
-        {fname_width}    (number)   defines the width of the filename section
-                                    (default: 30)
-
-
-builtin.current_buffer_tags({opts})  *telescope.builtin.current_buffer_tags()*
-    Lists all of the tags for the currently open buffer, with a preview
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {cwd}            (string)   root dir to search from (default: cwd, use
-                                    utils.buffer_dir() to search relative to
-                                    open buffer)
-        {ctags_file}     (string)   specify a particular ctags file to use
-        {show_line}      (boolean)  if true, shows the content of the line the
-                                    tag is found on in the picker (default:
-                                    true)
-        {only_sort_tags} (boolean)  if true we will only sort tags (default:
-                                    false)
-        {fname_width}    (number)   defines the width of the filename section
-                                    (default: 30)
-
-
-builtin.git_files({opts})                      *telescope.builtin.git_files()*
-    Fuzzy search for files tracked by Git. This command lists the output of the
-    `git ls-files` command, respects .gitignore
-    - Default keymaps:
-      - `<cr>`: opens the currently selected file
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {cwd}                (string)   specify the path of the repo
-        {use_file_path}      (boolean)  if we should use the current buffer
-                                        git root (default: false)
-        {use_git_root}       (boolean)  if we should use git root as cwd or
-                                        the cwd (important for submodule)
-                                        (default: true)
-        {show_untracked}     (boolean)  if true, adds `--others` flag to
-                                        command and shows untracked files
-                                        (default: false)
-        {recurse_submodules} (boolean)  if true, adds the
-                                        `--recurse-submodules` flag to command
-                                        (default: false)
-        {git_command}        (table)    command that will be executed.
-                                        {"git","ls-files","--exclude-standard","--cached"}
-        {file_encoding}      (string)   file encoding for the previewer
-
-
-builtin.git_commits({opts})                  *telescope.builtin.git_commits()*
-    Lists commits for current directory with diff preview
-    - Default keymaps:
-      - `<cr>`: checks out the currently selected commit
-      - `<C-r>m`: resets current branch to selected commit using mixed mode
-      - `<C-r>s`: resets current branch to selected commit using soft mode
-      - `<C-r>h`: resets current branch to selected commit using hard mode
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {cwd}           (string)   specify the path of the repo
-        {use_file_path} (boolean)  if we should use the current buffer git
-                                   root (default: false)
-        {use_git_root}  (boolean)  if we should use git root as cwd or the cwd
-                                   (important for submodule) (default: true)
-        {git_command}   (table)    command that will be executed.
-                                   {"git","log","--pretty=oneline","--abbrev-commit","--","."}
-
-
-builtin.git_bcommits({opts})                *telescope.builtin.git_bcommits()*
-    Lists commits for current buffer with diff preview
-    - Default keymaps or your overridden `select_` keys:
-      - `<cr>`: checks out the currently selected commit
-      - `<c-v>`: opens a diff in a vertical split
-      - `<c-x>`: opens a diff in a horizontal split
-      - `<c-t>`: opens a diff in a new tab
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {cwd}           (string)   specify the path of the repo
-        {use_file_path} (boolean)  if we should use the current buffer git
-                                   root (default: false)
-        {use_git_root}  (boolean)  if we should use git root as cwd or the cwd
-                                   (important for submodule) (default: true)
-        {current_file}  (string)   specify the current file that should be
-                                   used for bcommits (default: current buffer)
-        {git_command}   (table)    command that will be executed.
-                                   {"git","log","--pretty=oneline","--abbrev-commit"}
-
-
-builtin.git_bcommits_range({opts})    *telescope.builtin.git_bcommits_range()*
-    Lists commits for a range of lines in the current buffer with diff preview
-    In visual mode, lists commits for the selected lines With operator mode
-    enabled, lists commits inside the text object/motion
-    - Default keymaps or your overridden `select_` keys:
-      - `<cr>`: checks out the currently selected commit
-      - `<c-v>`: opens a diff in a vertical split
-      - `<c-x>`: opens a diff in a horizontal split
-      - `<c-t>`: opens a diff in a new tab
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {cwd}          (string)   specify the path of the repo
-        {use_git_root} (boolean)  if we should use git root as cwd or the cwd
-                                  (important for submodule) (default: true)
-        {current_file} (string)   specify the current file that should be used
-                                  for bcommits (default: current buffer)
-        {git_command}  (table)    command that will be executed. the last
-                                  element must be "-L".
-                                  {"git","log","--pretty=oneline","--abbrev-commit","--no-patch","-L"}
-        {from}         (number)   the first line number in the range (default:
-                                  current line)
-        {to}           (number)   the last line number in the range (default:
-                                  the value of `from`)
-        {operator}     (boolean)  select lines in operator-pending mode
-                                  (default: false)
-
-
-builtin.git_branches({opts})                *telescope.builtin.git_branches()*
-    List branches for current directory, with output from `git log --oneline`
-    shown in the preview window
-    - Default keymaps:
-      - `<cr>`: checks out the currently selected branch
-      - `<C-t>`: tracks currently selected branch
-      - `<C-r>`: rebases currently selected branch
-      - `<C-a>`: creates a new branch, with confirmation prompt before creation
-      - `<C-d>`: deletes the currently selected branch, with confirmation
-        prompt before deletion
-      - `<C-y>`: merges the currently selected branch, with confirmation prompt
-        before deletion
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {cwd}                           (string)   specify the path of the
-                                                   repo
-        {use_file_path}                 (boolean)  if we should use the
-                                                   current buffer git root
-                                                   (default: false)
-        {use_git_root}                  (boolean)  if we should use git root
-                                                   as cwd or the cwd
-                                                   (important for submodule)
-                                                   (default: true)
-        {show_remote_tracking_branches} (boolean)  show remote tracking
-                                                   branches like origin/main
-                                                   (default: true)
-        {pattern}                       (string)   specify the pattern to
-                                                   match all refs
-
-
-builtin.git_status({opts})                    *telescope.builtin.git_status()*
-    Lists git status for current directory
-    - Default keymaps:
-      - `<Tab>`: stages or unstages the currently selected file
-      - `<cr>`: opens the currently selected file
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {cwd}           (string)   specify the path of the repo
-        {use_file_path} (boolean)  if we should use the current buffer git
-                                   root (default: false)
-        {use_git_root}  (boolean)  if we should use git root as cwd or the cwd
-                                   (important for submodule) (default: true)
-        {git_icons}     (table)    string -> string. Matches name with icon
-                                   (see source code, make_entry.lua
-                                   git_icon_defaults)
-        {expand_dir}    (boolean)  pass flag `-uall` to show files in
-                                   untracked directories (default: true)
-
-
-builtin.git_stash({opts})                      *telescope.builtin.git_stash()*
-    Lists stash items in current repository
-    - Default keymaps:
-      - `<cr>`: runs `git apply` for currently selected stash
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {cwd}           (string)   specify the path of the repo
-        {use_file_path} (boolean)  if we should use the current buffer git
-                                   root (default: false)
-        {use_git_root}  (boolean)  if we should use git root as cwd or the cwd
-                                   (important for submodule) (default: true)
-        {show_branch}   (boolean)  if we should display the branch name for
-                                   git stash entries (default: true)
-
-
-builtin.builtin({opts})                          *telescope.builtin.builtin()*
-    Lists all of the community maintained pickers built into Telescope
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {include_extensions} (boolean)  if true will show the pickers of the
-                                        installed extensions (default: false)
-        {use_default_opts}   (boolean)  if the selected picker should use its
-                                        default options (default: false)
-
-
-builtin.resume({opts})                            *telescope.builtin.resume()*
-    Opens the previous picker in the identical state (incl. multi selections)
-    - Notes:
-      - Requires `cache_picker` in setup or when having invoked pickers, see
-        |telescope.defaults.cache_picker|
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {cache_index} (number)  what picker to resume, where 1 denotes most
-                                recent (default: 1)
-
-
-builtin.pickers({opts})                          *telescope.builtin.pickers()*
-    Opens a picker over previously cached pickers in their preserved states
-    (incl. multi selections)
-    - Default keymaps:
-      - `<C-x>`: delete the selected cached picker
-    - Notes:
-      - Requires `cache_picker` in setup or when having invoked pickers, see
-        |telescope.defaults.cache_picker|
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-
-builtin.planets({opts})                          *telescope.builtin.planets()*
-    Use the telescope...
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {show_pluto} (boolean)  we love Pluto (default: false, because its a
-                                hidden feature)
-        {show_moon}  (boolean)  we love the Moon (default: false, because its
-                                a hidden feature)
-
-
-builtin.symbols({opts})                          *telescope.builtin.symbols()*
-    Lists symbols inside of `data/telescope-sources/*.json` found in your
-    runtime path or found in `stdpath("data")/telescope/symbols/*.json`. The
-    second path can be customized. We provide a couple of default symbols which
-    can be found in https://github.com/nvim-telescope/telescope-symbols.nvim.
-    This repos README also provides more information about the format in which
-    the symbols have to be.
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {symbol_path} (string)  specify the second path. Default:
-                                `stdpath("data")/telescope/symbols/*.json`
-        {sources}     (table)   specify a table of sources you want to load
-                                this time
-
-
-builtin.commands({opts})                        *telescope.builtin.commands()*
-    Lists available plugin/user commands and runs them on `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {show_buf_command} (boolean)  show buf local command (Default: true)
-
-
-builtin.quickfix({opts})                        *telescope.builtin.quickfix()*
-    Lists items in the quickfix list, jumps to location on `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {show_line} (boolean)  show results text (default: true)
-        {trim_text} (boolean)  trim results text (default: false)
-        {nr}        (number)   specify the quickfix list number
-
-
-builtin.quickfixhistory({opts})          *telescope.builtin.quickfixhistory()*
-    Lists all quickfix lists in your history and open them with
-    `builtin.quickfix`. It seems that neovim only keeps the full history for 10
-    lists
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-
-builtin.loclist({opts})                          *telescope.builtin.loclist()*
-    Lists items from the current window's location list, jumps to location on
-    `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {show_line} (boolean)  show results text (default: true)
-        {trim_text} (boolean)  trim results text (default: false)
-
-
-builtin.oldfiles({opts})                        *telescope.builtin.oldfiles()*
-    Lists previously open files, opens on `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {cwd}           (string)   specify a working directory to filter
-                                   oldfiles by
-        {only_cwd}      (boolean)  show only files in the cwd (default: false)
-        {cwd_only}      (boolean)  alias for only_cwd
-        {file_encoding} (string)   file encoding for the previewer
-
-
-builtin.command_history({opts})          *telescope.builtin.command_history()*
-    Lists commands that were executed recently, and reruns them on `<cr>`
-    - Default keymaps:
-      - `<C-e>`: open the command line with the text of the currently selected
-        result populated in it
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {filter_fn} (function)  filter fn(cmd:string). true if the history
-                                command should be presented.
-
-
-builtin.search_history({opts})            *telescope.builtin.search_history()*
-    Lists searches that were executed recently, and reruns them on `<cr>`
-    - Default keymaps:
-      - `<C-e>`: open a search window with the text of the currently selected
-        search result populated in it
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-
-builtin.vim_options({opts})                  *telescope.builtin.vim_options()*
-    Lists vim options, allows you to edit the current value on `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-
-builtin.help_tags({opts})                      *telescope.builtin.help_tags()*
-    Lists available help tags and opens a new window with the relevant help
-    info on `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {lang}     (string)   specify language (default: vim.o.helplang)
-        {fallback} (boolean)  fallback to en if language isn't installed
-                              (default: true)
-
-
-builtin.man_pages({opts})                      *telescope.builtin.man_pages()*
-    Lists manpage entries, opens them in a help window on `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {sections} (table)     a list of sections to search, use `{ "ALL" }`
-                               to search in all sections (default: { "1" })
-        {man_cmd}  (function)  that returns the man command. (Default:
-                               `apropos ""` on linux, `apropos " "` on macos)
-
-
-builtin.reloader({opts})                        *telescope.builtin.reloader()*
-    Lists lua modules and reloads them on `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {column_len} (number)  define the max column len for the module name
-                               (default: dynamic, longest module name)
-
-
-builtin.buffers({opts})                          *telescope.builtin.buffers()*
-    Lists open buffers in current neovim instance, opens selected buffer on
-    `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {cwd}                   (string)    specify a working directory to
-                                            filter buffers list by
-        {show_all_buffers}      (boolean)   if true, show all buffers,
-                                            including unloaded buffers
-                                            (default: true)
-        {ignore_current_buffer} (boolean)   if true, don't show the current
-                                            buffer in the list (default:
-                                            false)
-        {only_cwd}              (boolean)   if true, only show buffers in the
-                                            current working directory
-                                            (default: false)
-        {cwd_only}              (boolean)   alias for only_cwd
-        {sort_lastused}         (boolean)   Sorts current and last buffer to
-                                            the top and selects the lastused
-                                            (default: false)
-        {sort_mru}              (boolean)   Sorts all buffers after most
-                                            recent used. Not just the current
-                                            and last one (default: false)
-        {bufnr_width}           (number)    Defines the width of the buffer
-                                            numbers in front of the filenames 
-                                            (default: dynamic)
-        {file_encoding}         (string)    file encoding for the previewer
-        {sort_buffers}          (function)  sort fn(bufnr_a, bufnr_b). true if
-                                            bufnr_a should go first. Runs
-                                            after sorting by most recent (if
-                                            specified)
-        {select_current}        (boolean)   select current buffer (default:
-                                            false)
-
-
-builtin.colorscheme({opts})                  *telescope.builtin.colorscheme()*
-    Lists available colorschemes and applies them on `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {colors}         (table)    a list of additional colorschemes to
-                                    explicitly make available to telescope
-                                    (default: {})
-        {enable_preview} (boolean)  if true, will preview the selected color
-
-
-builtin.marks({opts})                              *telescope.builtin.marks()*
-    Lists vim marks and their value, jumps to the mark on `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {file_encoding} (string)  file encoding for the previewer
-        {mark_type}     (string)  filter marks by type (default: "all",
-                                  options: "all"|"global"|"local")
-
-
-builtin.registers({opts})                      *telescope.builtin.registers()*
-    Lists vim registers, pastes the contents of the register on `<cr>`
-    - Default keymaps:
-      - `<C-e>`: edit the contents of the currently selected register
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-
-builtin.keymaps({opts})                          *telescope.builtin.keymaps()*
-    Lists normal mode keymappings, runs the selected keymap on `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {modes}      (table)     a list of short-named keymap modes to search
-                                 (default: { "n", "i", "c", "x" })
-        {show_plug}  (boolean)   if true, the keymaps for which the lhs
-                                 contains "<Plug>" are also shown (default:
-                                 true)
-        {only_buf}   (boolean)   if true, only show the buffer-local keymaps
-                                 (default: false)
-        {lhs_filter} (function)  filter(lhs:string) -> boolean. true for
-                                 keymap.lhs if the keymap should be shown
-                                 (optional)
-        {filter}     (function)  filter(km:keymap) -> boolean. true for the
-                                 keymap if it should be shown (optional)
-
-
-builtin.filetypes({opts})                      *telescope.builtin.filetypes()*
-    Lists all available filetypes, sets currently open buffer's filetype to
-    selected filetype in Telescope on `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-
-builtin.highlights({opts})                    *telescope.builtin.highlights()*
-    Lists all available highlights
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-
-builtin.autocommands({opts})                *telescope.builtin.autocommands()*
-    Lists vim autocommands and goes to their declaration on `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-
-builtin.spell_suggest({opts})              *telescope.builtin.spell_suggest()*
-    Lists spelling suggestions for the current word under the cursor, replaces
-    word with selected suggestion on `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-
-builtin.tagstack({opts})                        *telescope.builtin.tagstack()*
-    Lists the tag stack for the current window, jumps to tag on `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {show_line} (boolean)  show results text (default: true)
-        {trim_text} (boolean)  trim results text (default: false)
-
-
-builtin.jumplist({opts})                        *telescope.builtin.jumplist()*
-    Lists items from Vim's jumplist, jumps to location on `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {show_line} (boolean)  show results text (default: true)
-        {trim_text} (boolean)  trim results text (default: false)
-
-
-builtin.lsp_references({opts})            *telescope.builtin.lsp_references()*
-    Lists LSP references for word under the cursor, jumps to reference on
-    `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {include_declaration}  (boolean)  include symbol declaration in the
-                                          lsp references (default: true)
-        {include_current_line} (boolean)  include current line (default:
-                                          false)
-        {jump_type}            (string)   how to goto reference if there is
-                                          only one and the definition file is
-                                          different from the current file,
-                                          values: "tab", "tab drop", "split",
-                                          "vsplit", "never"
-        {show_line}            (boolean)  show results text (default: true)
-        {trim_text}            (boolean)  trim results text (default: false)
-        {file_encoding}        (string)   file encoding for the previewer
-
-
-builtin.lsp_incoming_calls({opts})    *telescope.builtin.lsp_incoming_calls()*
-    Lists LSP incoming calls for word under the cursor, jumps to reference on
-    `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {show_line}     (boolean)  show results text (default: true)
-        {trim_text}     (boolean)  trim results text (default: false)
-        {file_encoding} (string)   file encoding for the previewer
-
-
-builtin.lsp_outgoing_calls({opts})    *telescope.builtin.lsp_outgoing_calls()*
-    Lists LSP outgoing calls for word under the cursor, jumps to reference on
-    `<cr>`
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {show_line}     (boolean)  show results text (default: true)
-        {trim_text}     (boolean)  trim results text (default: false)
-        {file_encoding} (string)   file encoding for the previewer
-
-
-builtin.lsp_definitions({opts})          *telescope.builtin.lsp_definitions()*
-    Goto the definition of the word under the cursor, if there's only one,
-    otherwise show all options in Telescope
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {jump_type}     (string)   how to goto definition if there is only one
-                                   and the definition file is different from
-                                   the current file, values: "tab", "tab
-                                   drop", "split", "vsplit", "never"
-        {show_line}     (boolean)  show results text (default: true)
-        {trim_text}     (boolean)  trim results text (default: false)
-        {reuse_win}     (boolean)  jump to existing window if buffer is
-                                   already opened (default: false)
-        {file_encoding} (string)   file encoding for the previewer
-
-
-builtin.lsp_type_definitions({opts}) *telescope.builtin.lsp_type_definitions()*
-    Goto the definition of the type of the word under the cursor, if there's
-    only one, otherwise show all options in Telescope
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {jump_type}     (string)   how to goto definition if there is only one
-                                   and the definition file is different from
-                                   the current file, values: "tab", "tab
-                                   drop", "split", "vsplit", "never"
-        {show_line}     (boolean)  show results text (default: true)
-        {trim_text}     (boolean)  trim results text (default: false)
-        {reuse_win}     (boolean)  jump to existing window if buffer is
-                                   already opened (default: false)
-        {file_encoding} (string)   file encoding for the previewer
-
-
-builtin.lsp_implementations({opts})  *telescope.builtin.lsp_implementations()*
-    Goto the implementation of the word under the cursor if there's only one,
-    otherwise show all options in Telescope
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {jump_type}     (string)   how to goto implementation if there is only
-                                   one and the definition file is different
-                                   from the current file, values: "tab", "tab
-                                   drop", "split", "vsplit", "never"
-        {show_line}     (boolean)  show results text (default: true)
-        {trim_text}     (boolean)  trim results text (default: false)
-        {reuse_win}     (boolean)  jump to existing window if buffer is
-                                   already opened (default: false)
-        {file_encoding} (string)   file encoding for the previewer
-
-
-builtin.lsp_document_symbols({opts}) *telescope.builtin.lsp_document_symbols()*
-    Lists LSP document symbols in the current buffer
-    - Default keymaps:
-      - `<C-l>`: show autocompletion menu to prefilter your query by type of
-        symbol you want to see (i.e. `:variable:`)
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {fname_width}       (number)        defines the width of the filename
-                                            section (default: 30)
-        {symbol_width}      (number)        defines the width of the symbol
-                                            section (default: 25)
-        {symbol_type_width} (number)        defines the width of the symbol
-                                            type section (default: 8)
-        {show_line}         (boolean)       if true, shows the content of the
-                                            line the tag is found on (default:
-                                            false)
-        {symbols}           (string|table)  filter results by symbol kind(s)
-        {ignore_symbols}    (string|table)  list of symbols to ignore
-        {symbol_highlights} (table)         string -> string. Matches symbol
-                                            with hl_group
-        {file_encoding}     (string)        file encoding for the previewer
-
-
-builtin.lsp_workspace_symbols({opts}) *telescope.builtin.lsp_workspace_symbols()*
-    Lists LSP document symbols in the current workspace
-    - Default keymaps:
-      - `<C-l>`: show autocompletion menu to prefilter your query by type of
-        symbol you want to see (i.e. `:variable:`)
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {query}             (string)        for what to query the workspace
-                                            (default: "")
-        {fname_width}       (number)        defines the width of the filename
-                                            section (default: 30)
-        {symbol_width}      (number)        defines the width of the symbol
-                                            section (default: 25)
-        {symbol_type_width} (number)        defines the width of the symbol
-                                            type section (default: 8)
-        {show_line}         (boolean)       if true, shows the content of the
-                                            line the tag is found on (default:
-                                            false)
-        {symbols}           (string|table)  filter results by symbol kind(s)
-        {ignore_symbols}    (string|table)  list of symbols to ignore
-        {symbol_highlights} (table)         string -> string. Matches symbol
-                                            with hl_group
-        {file_encoding}     (string)        file encoding for the previewer
-
-
-builtin.lsp_dynamic_workspace_symbols({opts}) *telescope.builtin.lsp_dynamic_workspace_symbols()*
-    Dynamically lists LSP for all workspace symbols
-    - Default keymaps:
-      - `<C-l>`: show autocompletion menu to prefilter your query by type of
-        symbol you want to see (i.e. `:variable:`), only works after refining
-        to fuzzy search using <C-space>
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {fname_width}       (number)        defines the width of the filename
-                                            section (default: 30)
-        {show_line}         (boolean)       if true, shows the content of the
-                                            line the symbol is found on
-                                            (default: false)
-        {symbols}           (string|table)  filter results by symbol kind(s)
-        {ignore_symbols}    (string|table)  list of symbols to ignore
-        {symbol_highlights} (table)         string -> string. Matches symbol
-                                            with hl_group
-        {file_encoding}     (string)        file encoding for the previewer
-
-
-builtin.diagnostics({opts})                  *telescope.builtin.diagnostics()*
-    Lists diagnostics
-    - Fields:
-      - `All severity flags can be passed as `string` or `number` as per
-        `:vim.diagnostic.severity:`
-    - Default keymaps:
-      - `<C-l>`: show autocompletion menu to prefilter your query with the
-        diagnostic you want to see (i.e. `:warning:`)
-    - sort_by option:
-      - "buffer": order by bufnr (prioritizing current bufnr), severity, lnum
-      - "severity": order by severity, bufnr (prioritizing current bufnr), lnum
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to the picker
-
-    Options: ~
-        {bufnr}               (number|nil)      Buffer number to get
-                                                diagnostics from. Use 0 for
-                                                current buffer or nil for all
-                                                buffers
-        {severity}            (string|number)   filter diagnostics by severity
-                                                name (string) or id (number)
-        {severity_limit}      (string|number)   keep diagnostics equal or more
-                                                severe wrt severity name
-                                                (string) or id (number)
-        {severity_bound}      (string|number)   keep diagnostics equal or less
-                                                severe wrt severity name
-                                                (string) or id (number)
-        {root_dir}            (string|boolean)  if set to string, get
-                                                diagnostics only for buffers
-                                                under this dir otherwise cwd
-        {no_unlisted}         (boolean)         if true, get diagnostics only
-                                                for listed buffers
-        {no_sign}             (boolean)         hide DiagnosticSigns from
-                                                Results (default: false)
-        {line_width}          (string|number)   set length of diagnostic entry
-                                                text in Results. Use 'full'
-                                                for full untruncated text
-        {namespace}           (number)          limit your diagnostics to a
-                                                specific namespace
-        {disable_coordinates} (boolean)         don't show the line & row
-                                                numbers (default: false)
-        {sort_by}             (string)          sort order of the diagnostics
-                                                results; see above notes
-                                                (default: "buffer")
-
-
-
-================================================================================
-THEMES                                                        *telescope.themes*
-
-Themes are ways to combine several elements of styling together.
-
-They are helpful for managing the several different UI aspects for telescope
-and provide a simple interface for users to get a particular "style" of picker.
-
-themes.get_dropdown()                        *telescope.themes.get_dropdown()*
-    Dropdown style theme.
-
-    Usage:
-    >
-        local opts = {...} -- picker options
-        local builtin = require('telescope.builtin')
-        local themes = require('telescope.themes')
-        builtin.find_files(themes.get_dropdown(opts))
-<
-
-
-
-themes.get_cursor()                            *telescope.themes.get_cursor()*
-    Cursor style theme.
-
-    Usage:
-    >
-        local opts = {...} -- picker options
-        local builtin = require('telescope.builtin')
-        local themes = require('telescope.themes')
-        builtin.find_files(themes.get_cursor(opts))
-<
-
-
-
-themes.get_ivy()                                  *telescope.themes.get_ivy()*
-    Ivy style theme.
-
-    Usage:
-    >
-        local opts = {...} -- picker options
-        local builtin = require('telescope.builtin')
-        local themes = require('telescope.themes')
-        builtin.find_files(themes.get_ivy(opts))
-<
-
-
-
-
-================================================================================
-MAPPINGS                                                    *telescope.mappings*
-
-|telescope.mappings| is used to configure the keybindings within a telescope
-picker. These key binds are only local to the picker window and will be cleared
-once you exit the picker.
-
-We provide multiple configuration options to make it easy for you to adjust
-telescope's default key bindings and create your own custom key binds.
-
-To see many of the builtin actions that you can use as values for this table,
-see |telescope.actions|
-
-Format is:
->
-  {
-    mode = { ..keys }
-  }
-<
-
-where {mode} is the one character letter for a mode ('i' for insert, 'n' for
-normal).
-
-For example:
->
-  mappings = {
-    i = {
-      ["<esc>"] = require('telescope.actions').close,
-    },
-  }
-<
-
-To disable a keymap, put `[map] = false`
-For example:
->
-  {
-    ...,
-    ["<C-n>"] = false,
-    ...,
-  }
-<
-
-To override behavior of a key, simply set the value to be a function (either by
-requiring an action or by writing your own function)
->
-  {
-    ...,
-    ["<C-i>"] = require('telescope.actions').select_default,
-    ...,
-  }
-<
-
-If the function you want is part of `telescope.actions`, then you can simply
-supply the function name as a string. For example, the previous option is
-equivalent to:
->
-  {
-    ...,
-    ["<C-i>"] = "select_default",
-    ...,
-  }
-<
-
-You can also add other mappings using tables with `type = "command"`. For
-example:
->
-  {
-    ...,
-    ["jj"] = { "<esc>", type = "command" },
-    ["kk"] = { "<cmd>echo \"Hello, World!\"<cr>", type = "command" },)
-    ...,
-  }
-<
-
-You can also add additional options for mappings of any type ("action" and
-"command"). For example:
->
-  {
-    ...,
-    ["<C-j>"] = {
-      actions.move_selection_next, type = "action",
-      opts = { nowait = true, silent = true }
-    },
-    ...,
-  }
-<
-
-There are three main places you can configure |telescope.mappings|. These are
-ordered from the lowest priority to the highest priority.
-
-1. |telescope.defaults.mappings|
-2. In the |telescope.setup()| table, inside a picker with a given name, use the
-   `mappings` key
->
-  require("telescope").setup {
-    pickers = {
-      find_files = {
-        mappings = {
-          n = {
-            ["kj"] = "close",
-          },
-        },
-      },
-    },
-  }
-<
-3. `attach_mappings` function for a particular picker.
->
-  require("telescope.builtin").find_files {
-    attach_mappings = function(_, map)
-      map("i", "asdf", function(_prompt_bufnr)
-        print "You typed asdf"
-      end)
-
-      map({"i", "n"}, "<C-r>", function(_prompt_bufnr)
-        print "You typed <C-r>"
-      end, { desc = "desc for which key"})
-
-      -- needs to return true if you want to map default_mappings and
-      -- false if not
-      return true
-    end,
-  }
-<
-
-
-================================================================================
-LAYOUT                                                *telescope.pickers.layout*
-
-The telescope pickers layout can be configured using the
-|telescope.defaults.create_layout| option.
-
-Parameters: ~
-  - picker : A Picker object.
-
-Return: ~
-  - layout : instance of `TelescopeLayout` class.
-
-Example: ~
->
-local Layout = require "telescope.pickers.layout"
-
-require("telescope").setup {
-  create_layout = function(picker)
-    local function create_window(enter, width, height, row, col, title)
-      local bufnr = vim.api.nvim_create_buf(false, true)
-      local winid = vim.api.nvim_open_win(bufnr, enter, {
-        style = "minimal",
-        relative = "editor",
-        width = width,
-        height = height,
-        row = row,
-        col = col,
-        border = "single",
-        title = title,
-      })
-
-      vim.wo[winid].winhighlight = "Normal:Normal"
-
-      return Layout.Window {
-        bufnr = bufnr,
-        winid = winid,
-      }
-    end
-
-    local function destory_window(window)
-      if window then
-        if vim.api.nvim_win_is_valid(window.winid) then
-          vim.api.nvim_win_close(window.winid, true)
-        end
-        if vim.api.nvim_buf_is_valid(window.bufnr) then
-          vim.api.nvim_buf_delete(window.bufnr, { force = true })
-        end
-      end
-    end
-
-    local layout = Layout {
-      picker = picker,
-      mount = function(self)
-        self.results = create_window(false, 40, 20, 0, 0, "Results")
-        self.preview = create_window(false, 40, 23, 0, 42, "Preview")
-        self.prompt = create_window(true, 40, 1, 22, 0, "Prompt")
-      end,
-      unmount = function(self)
-        destory_window(self.results)
-        destory_window(self.preview)
-        destory_window(self.prompt)
-      end,
-      update = function(self) end,
-    }
-
-    return layout
-  end,
-}
-<
-
-TelescopeWindowBorder.config                    *TelescopeWindowBorder.config*
-
-
-    Fields: ~
-        {bufnr}        (integer)
-        {winid}        (integer|nil)
-        {change_title} (nil|function)  (self: TelescopeWindowBorder, title:
-                                       string, pos?:
-                                       "NW"|"N"|"NE"|"SW"|"S"|"SE"):nil
-
-
-TelescopeWindowBorder                                  *TelescopeWindowBorder*
-
-
-    Fields: ~
-        {bufnr} (integer|nil)
-        {winid} (integer|nil)
-
-
-TelescopeWindow.config                                *TelescopeWindow.config*
-
-
-    Fields: ~
-        {bufnr}  (integer)
-        {winid}  (integer|nil)
-        {border} (TelescopeWindowBorder.config|nil)
-
-
-TelescopeWindow                                              *TelescopeWindow*
-
-
-    Fields: ~
-        {border} (TelescopeWindowBorder)
-        {bufnr}  (integer)
-        {winid}  (integer)
-
-
-TelescopeLayout.config                                *TelescopeLayout.config*
-
-
-    Fields: ~
-        {mount}   (function)             (self: TelescopeLayout):nil
-        {unmount} (function)             (self: TelescopeLayout):nil
-        {update}  (function)             (self: TelescopeLayout):nil
-        {prompt}  (TelescopeWindow|nil)
-        {results} (TelescopeWindow|nil)
-        {preview} (TelescopeWindow|nil)
-
-
-TelescopeLayout                                              *TelescopeLayout*
-
-
-    Fields: ~
-        {prompt}  (TelescopeWindow)
-        {results} (TelescopeWindow)
-        {preview} (TelescopeWindow|nil)
-
-
-Layout:mount()                              *telescope.pickers.layout:mount()*
-    Create the layout. This needs to ensure the required properties are
-    populated.
-
-
-
-Layout:unmount()                          *telescope.pickers.layout:unmount()*
-    Destroy the layout. This is responsible for performing clean-up, for
-    example:
-     - deleting buffers
-     - closing windows
-     - clearing autocmds
-
-
-
-Layout:update()                            *telescope.pickers.layout:update()*
-    Refresh the layout. This is called when, for example, vim is resized.
-
-
-
-
-================================================================================
-LAYOUT                                                        *telescope.layout*
-
-The layout of telescope pickers can be adjusted using the
-|telescope.defaults.layout_strategy| and |telescope.defaults.layout_config|
-options. For example, the following configuration changes the default layout
-strategy and the default size of the picker:
->
-  require('telescope').setup{
-    defaults = {
-      layout_strategy = 'vertical',
-      layout_config = { height = 0.95 },
-    },
-  }
-<
-
-
-────────────────────────────────────────────────────────────────────────────────
-
-Layout strategies are different functions to position telescope.
-
-All layout strategies are functions with the following signature:
-
->
-  function(picker, columns, lines, layout_config)
-    -- Do some calculations here...
-    return {
-      preview = preview_configuration
-      results = results_configuration,
-      prompt = prompt_configuration,
-    }
-  end
-<
-
-  Parameters: ~
-    - picker        : A Picker object. (docs coming soon)
-    - columns       : (number) Columns in the vim window
-    - lines         : (number) Lines in the vim window
-    - layout_config : (table) The configuration values specific to the picker.
-
-This means you can create your own layout strategy if you want! Just be aware
-for now that we may change some APIs or interfaces, so they may break if you
-create your own.
-
-A good method for creating your own would be to copy one of the strategies that
-most resembles what you want from
-"./lua/telescope/pickers/layout_strategies.lua" in the telescope repo.
-
-
-layout_strategies.horizontal()                 *telescope.layout.horizontal()*
-    Horizontal layout has two columns, one for the preview and one for the
-    prompt and results.
-
-    ┌──────────────────────────────────────────────────┐
-    │                                                  │
-    │    ┌───────────────────┐┌───────────────────┐    │
-    │    │                   ││                   │    │
-    │    │                   ││                   │    │
-    │    │                   ││                   │    │
-    │    │      Results      ││                   │    │
-    │    │                   ││      Preview      │    │
-    │    │                   ││                   │    │
-    │    │                   ││                   │    │
-    │    └───────────────────┘│                   │    │
-    │    ┌───────────────────┐│                   │    │
-    │    │      Prompt       ││                   │    │
-    │    └───────────────────┘└───────────────────┘    │
-    │                                                  │
-    └──────────────────────────────────────────────────┘
-
-    `picker.layout_config` shared options:
-      - anchor:
-        - Which edge/corner to pin the picker to
-        - See |resolver.resolve_anchor_pos()|
-      - height:
-        - How tall to make Telescope's entire layout
-        - See |resolver.resolve_height()|
-      - mirror: Flip the location of the results/prompt and preview windows
-      - prompt_position:
-        - Where to place prompt window.
-        - Available Values: 'bottom', 'top'
-      - scroll_speed: The number of lines to scroll through the previewer
-      - width:
-        - How wide to make Telescope's entire layout
-        - See |resolver.resolve_width()|
-
-    `picker.layout_config` unique options:
-      - preview_cutoff: When columns are less than this value, the preview will be disabled
-      - preview_width:
-        - Change the width of Telescope's preview window
-        - See |resolver.resolve_width()|
-
-
-layout_strategies.center()                         *telescope.layout.center()*
-    Centered layout with a combined block of the prompt and results aligned to
-    the middle of the screen. The preview window is then placed in the
-    remaining space above or below, according to `anchor` or `mirror`.
-    Particularly useful for creating dropdown menus (see |telescope.themes| and
-    |themes.get_dropdown()|).
-
-    Note that vertical anchoring, i.e. `anchor` containing `"N"` or `"S"`, will
-    override `mirror` config. For `"N"` anchoring preview will be placed below
-    prompt/result block. For `"S"` anchoring preview will be placed above
-    prompt/result block. For horizontal only anchoring preview will be placed
-    according to `mirror` config, default is above the prompt/result block.
-
-    ┌──────────────────────────────────────────────────┐
-    │    ┌────────────────────────────────────────┐    │
-    │    │                 Preview                │    │
-    │    │                 Preview                │    │
-    │    └────────────────────────────────────────┘    │
-    │    ┌────────────────────────────────────────┐    │
-    │    │                 Prompt                 │    │
-    │    ├────────────────────────────────────────┤    │
-    │    │                 Result                 │    │
-    │    │                 Result                 │    │
-    │    └────────────────────────────────────────┘    │
-    │                                                  │
-    │                                                  │
-    │                                                  │
-    │                                                  │
-    └──────────────────────────────────────────────────┘
-
-    `picker.layout_config` shared options:
-      - anchor:
-        - Which edge/corner to pin the picker to
-        - See |resolver.resolve_anchor_pos()|
-      - height:
-        - How tall to make Telescope's entire layout
-        - See |resolver.resolve_height()|
-      - mirror: Flip the location of the results/prompt and preview windows
-      - prompt_position:
-        - Where to place prompt window.
-        - Available Values: 'bottom', 'top'
-      - scroll_speed: The number of lines to scroll through the previewer
-      - width:
-        - How wide to make Telescope's entire layout
-        - See |resolver.resolve_width()|
-
-    `picker.layout_config` unique options:
-      - preview_cutoff: When lines are less than this value, the preview will be disabled
-
-
-layout_strategies.cursor()                         *telescope.layout.cursor()*
-    Cursor layout dynamically positioned below the cursor if possible. If there
-    is no place below the cursor it will be placed above.
-
-    ┌──────────────────────────────────────────────────┐
-    │                                                  │
-    │   █                                              │
-    │   ┌──────────────┐┌─────────────────────┐        │
-    │   │    Prompt    ││      Preview        │        │
-    │   ├──────────────┤│      Preview        │        │
-    │   │    Result    ││      Preview        │        │
-    │   │    Result    ││      Preview        │        │
-    │   └──────────────┘└─────────────────────┘        │
-    │                                         █        │
-    │                                                  │
-    │                                                  │
-    │                                                  │
-    │                                                  │
-    │                                                  │
-    └──────────────────────────────────────────────────┘
-
-    `picker.layout_config` shared options:
-      - height:
-        - How tall to make Telescope's entire layout
-        - See |resolver.resolve_height()|
-      - scroll_speed: The number of lines to scroll through the previewer
-      - width:
-        - How wide to make Telescope's entire layout
-        - See |resolver.resolve_width()|
-
-    `picker.layout_config` unique options:
-      - preview_cutoff: When columns are less than this value, the preview will be disabled
-      - preview_width:
-        - Change the width of Telescope's preview window
-        - See |resolver.resolve_width()|
-
-
-layout_strategies.vertical()                     *telescope.layout.vertical()*
-    Vertical layout stacks the items on top of each other. Particularly useful
-    with thinner windows.
-
-    ┌──────────────────────────────────────────────────┐
-    │                                                  │
-    │    ┌────────────────────────────────────────┐    │
-    │    │                 Preview                │    │
-    │    │                 Preview                │    │
-    │    │                 Preview                │    │
-    │    └────────────────────────────────────────┘    │
-    │    ┌────────────────────────────────────────┐    │
-    │    │                 Result                 │    │
-    │    │                 Result                 │    │
-    │    └────────────────────────────────────────┘    │
-    │    ┌────────────────────────────────────────┐    │
-    │    │                 Prompt                 │    │
-    │    └────────────────────────────────────────┘    │
-    │                                                  │
-    └──────────────────────────────────────────────────┘
-
-    `picker.layout_config` shared options:
-      - anchor:
-        - Which edge/corner to pin the picker to
-        - See |resolver.resolve_anchor_pos()|
-      - height:
-        - How tall to make Telescope's entire layout
-        - See |resolver.resolve_height()|
-      - mirror: Flip the location of the results/prompt and preview windows
-      - prompt_position:
-        - Where to place prompt window.
-        - Available Values: 'bottom', 'top'
-      - scroll_speed: The number of lines to scroll through the previewer
-      - width:
-        - How wide to make Telescope's entire layout
-        - See |resolver.resolve_width()|
-
-    `picker.layout_config` unique options:
-      - preview_cutoff: When lines are less than this value, the preview will be disabled
-      - preview_height:
-        - Change the height of Telescope's preview window
-        - See |resolver.resolve_height()|
-
-
-layout_strategies.flex()                             *telescope.layout.flex()*
-    Flex layout swaps between `horizontal` and `vertical` strategies based on
-    the window width
-     - Supports |layout_strategies.vertical| or |layout_strategies.horizontal|
-       features
-
-
-    `picker.layout_config` shared options:
-      - anchor:
-        - Which edge/corner to pin the picker to
-        - See |resolver.resolve_anchor_pos()|
-      - height:
-        - How tall to make Telescope's entire layout
-        - See |resolver.resolve_height()|
-      - mirror: Flip the location of the results/prompt and preview windows
-      - prompt_position:
-        - Where to place prompt window.
-        - Available Values: 'bottom', 'top'
-      - scroll_speed: The number of lines to scroll through the previewer
-      - width:
-        - How wide to make Telescope's entire layout
-        - See |resolver.resolve_width()|
-
-    `picker.layout_config` unique options:
-      - flip_columns: The number of columns required to move to horizontal mode
-      - flip_lines: The number of lines required to move to horizontal mode
-      - horizontal: Options to pass when switching to horizontal layout
-      - vertical: Options to pass when switching to vertical layout
-
-
-layout_strategies.bottom_pane()               *telescope.layout.bottom_pane()*
-    Bottom pane can be used to create layouts similar to "ivy".
-
-    For an easy ivy configuration, see |themes.get_ivy()|
-
-
-
-
-================================================================================
-RESOLVE                                                      *telescope.resolve*
-
-Provides "resolver functions" to allow more customisable inputs for options.
-
-resolver.resolve_height()                 *telescope.resolve.resolve_height()*
-    Converts input to a function that returns the height. The input must take
-    one of five forms:
-    1. 0 <= number < 1
-       This means total height as a percentage.
-    2. 1 <= number
-       This means total height as a fixed number.
-    3. function
-       Must have signature: function(self, max_columns, max_lines): number
-    4. table of the form: { val, max = ..., min = ... }
-       val has to be in the first form 0 <= val < 1 and only one is given, 
-       `min` or `max` as fixed number
-    5. table of the form: {padding = `foo`}
-       where `foo` has one of the previous three forms.
-       The height is then set to be the remaining space after padding. For
-       example, if the window has height 50, and the input is {padding = 5}, 
-       the height returned will be `40 = 50 - 2*5`
-
-    The returned function will have signature: function(self, max_columns,
-    max_lines): number
-
-
-
-resolver.resolve_width()                   *telescope.resolve.resolve_width()*
-    Converts input to a function that returns the width. The input must take
-    one of five forms:
-    1. 0 <= number < 1
-       This means total width as a percentage.
-    2. 1 <= number
-       This means total width as a fixed number.
-    3. function
-       Must have signature: function(self, max_columns, max_lines): number
-    4. table of the form: { val, max = ..., min = ... }
-       val has to be in the first form 0 <= val < 1 and only one is given, 
-       `min` or `max` as fixed number
-    5. table of the form: {padding = `foo`}
-       where `foo` has one of the previous three forms.
-       The width is then set to be the remaining space after padding. For
-       example, if the window has width 100, and the input is {padding = 5}, 
-       the width returned will be `90 = 100 - 2*5`
-
-    The returned function will have signature: function(self, max_columns,
-    max_lines): number
-
-
-
-resolver.resolve_anchor_pos()         *telescope.resolve.resolve_anchor_pos()*
-    Calculates the adjustment required to move the picker from the middle of
-    the screen to an edge or corner.
-    The `anchor` can be any of the following strings:
-      - "", "CENTER", "NW", "N", "NE", "E", "SE", "S", "SW", "W" The anchors
-        have the following meanings:
-      - "" or "CENTER":
-        the picker will remain in the middle of the screen.
-      - Compass directions:
-        the picker will move to the corresponding edge/corner e.g. "NW" -> "top
-        left corner", "E" -> "right edge", "S" -> "bottom edge"
-
-
-
-
-================================================================================
-MAKE_ENTRY                                                *telescope.make_entry*
-
-Each picker has a finder made up of two parts, the results which are the data
-to be displayed, and the entry_maker. These entry_makers are functions returned
-from make_entry functions. These will be referred to as entry_makers in the
-following documentation.
-
-Every entry maker returns a function that accepts the data to be used for an
-entry. This function will return an entry table (or nil, meaning skip this
-entry) which contains the following important keys:
-- value any: value key can be anything but still required
-- valid bool (optional): is an optional key because it defaults to true but if
-  the key is set to false it will not be displayed by the picker
-- ordinal string: is the text that is used for filtering
-- display string|function: is either a string of the text that is being 
-  displayed or a function receiving the entry at a later stage, when the entry 
-  is actually being displayed. A function can be useful here if a complex 
-  calculation has to be done. `make_entry` can also return a second value - a
-  highlight array which will then apply to the line. Highlight entry in this
-  array has the following signature `{ { start_col, end_col }, hl_group }`
-- filename string (optional): will be interpreted by the default `<cr>` action
-  as open this file
-- bufnr number (optional): will be interpreted by the default `<cr>` action as
-  open this buffer
-- lnum number (optional): lnum value which will be interpreted by the default
-  `<cr>` action as a jump to this line
-- col number (optional): col value which will be interpreted by the default
-  `<cr>` action as a jump to this column
-
-For more information on easier displaying, see
-|telescope.pickers.entry_display|
-
-TODO: Document something we call `entry_index`
-
-
-================================================================================
-ENTRY_DISPLAY                                  *telescope.pickers.entry_display*
-
-Entry Display is used to format each entry shown in the result panel.
-
-Entry Display create() will give us a function based on the configuration of
-column widths we pass into it. We then can use this function n times to return
-a string based on structured input.
-
-Note that if you call `create()` inside `make_display` it will be called for
-every single entry. So it is suggested to do this outside of `make_display` for
-the best performance.
-
-The create function will use the column widths passed to it in
-configuration.items. Each item in that table is the number of characters in the
-column. It's also possible for the final column to not have a fixed width, this
-will be shown in the configuration as 'remaining = true'.
-
-An example of this configuration is shown for the buffers picker:
->
-local displayer = entry_display.create {
-  separator = " ",
-  items = {
-    { width = opts.bufnr_width },
-    { width = 4 },
-    { width = icon_width },
-    { remaining = true },
-  },
-}
-<
-
-This shows 4 columns, the first is defined in the opts as the width we'll use
-when display_string is the number of the buffer. The second has a fixed width
-of 4 and the third column's width will be decided by the width of the icons we
-use. The fourth column will use the remaining space. Finally, we have also
-defined the separator between each column will be the space " ".
-
-An example of how the display reference will be used is shown, again for the
-buffers picker:
->
-return displayer {
-  { entry.bufnr, "TelescopeResultsNumber" },
-  { entry.indicator, "TelescopeResultsComment" },
-  { icon, hl_group },
-  display_bufname .. ":" .. entry.lnum,
-}
-<
-
-There are two types of values each column can have. Either a simple String or a
-table containing the String as well as the hl_group.
-
-The displayer can return values, string and an optional highlights. The string
-is all the text to be displayed for this entry as a single string. If parts of
-the string are to be highlighted they will be described in the highlights
-table.
-
-For a better understanding of how create() and displayer are used it's best to
-look at the code in make_entry.lua.
-
-
-================================================================================
-UTILS                                                          *telescope.utils*
-
-Utilities for writing telescope pickers
-
-utils.path_expand({path})                      *telescope.utils.path_expand()*
-    Hybrid of `vim.fn.expand()` and custom `vim.fs.normalize()`
-
-    Paths starting with '%', '#' or '<' are expanded with `vim.fn.expand()`.
-    Otherwise avoids using `vim.fn.expand()` due to its overly aggressive
-    expansion behavior which can sometimes lead to errors or the creation of
-    non-existent paths when dealing with valid absolute paths.
-
-    Other paths will have '~' and environment variables expanded. Unlike
-    `vim.fs.normalize()`, backslashes are preserved. This has better
-    compatibility with `plenary.path` and also avoids mangling valid Unix paths
-    with literal backslashes.
-
-    Trailing slashes are trimmed. With the exception of root paths. eg. `/` on
-    Unix or `C:\` on Windows
-
-
-
-    Parameters: ~
-        {path} (string)
-
-    Return: ~
-        string
-
-
-utils.transform_path({opts}, {path})        *telescope.utils.transform_path()*
-    Transform path is a util function that formats a path based on path_display
-    found in `opts` or the default value from config. It is meant to be used in
-    make_entry to have a uniform interface for builtins as well as extensions
-    utilizing the same user configuration Note: It is only supported inside
-    `make_entry`/`make_display` the use of this function outside of telescope
-    might yield to undefined behavior and will not be addressed by us
-
-
-    Parameters: ~
-        {opts} (table)       The opts the users passed into the picker. Might
-                             contains a path_display key
-        {path} (string|nil)  The path that should be formatted
-
-    Return: ~
-        string: path to be displayed
-        table: The transformed path ready to be displayed with the styling
-
-
-utils.has_ts_parser({lang})                  *telescope.utils.has_ts_parser()*
-    Checks if treesitter parser for language is installed
-
-
-    Parameters: ~
-        {lang} (string)
-
-
-utils.notify({funname}, {opts})                     *telescope.utils.notify()*
-    Telescope Wrapper around vim.notify
-
-
-    Parameters: ~
-        {funname} (string)  name of the function that will be
-        {opts}    (table)   opts.level string, opts.msg string, opts.once bool
-
-
-
-================================================================================
-ACTIONS                                                      *telescope.actions*
-
-These functions are useful for people creating their own mappings.
-
-Actions can be either normal functions that expect the `prompt_bufnr` as first
-argument (1) or they can be a custom telescope type called "action" (2).
-
-(1) The `prompt_bufnr` of a normal function denotes the identifier of your
-picker which can be used to access the picker state. In practice, users most
-commonly access from both picker and global state via the following:
->
-  -- for utility functions
-  local action_state = require "telescope.actions.state"
-
-  local actions = {}
-  actions.do_stuff = function(prompt_bufnr)
-    local current_picker = action_state.get_current_picker(prompt_bufnr) -- picker state
-    local entry = action_state.get_selected_entry()
-  end
-<
-
-See |telescope.actions.state| for more information.
-
-(2) To transform a module of functions into a module of "action"s, you need to
-do the following:
->
-  local transform_mod = require("telescope.actions.mt").transform_mod
-
-  local mod = {}
-  mod.a1 = function(prompt_bufnr)
-    -- your code goes here
-    -- You can access the picker/global state as described above in (1).
-  end
-
-  mod.a2 = function(prompt_bufnr)
-    -- your code goes here
-  end
-  mod = transform_mod(mod)
-
-  -- Now the following is possible. This means that actions a2 will be executed
-  -- after action a1. You can chain as many actions as you want.
-  local action = mod.a1 + mod.a2
-  action(bufnr)
-<
-
-Another interesting thing to do is that these actions now have functions you
-can call. These functions include `:replace(f)`, `:replace_if(f, c)`,
-`replace_map(tbl)` and `enhance(tbl)`. More information on these functions can
-be found in the `developers.md` and `lua/tests/automated/action_spec.lua` file.
-
-actions.move_selection_next({prompt_bufnr}) *telescope.actions.move_selection_next()*
-    Move the selection to the next entry
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.move_selection_previous({prompt_bufnr}) *telescope.actions.move_selection_previous()*
-    Move the selection to the previous entry
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.move_selection_worse({prompt_bufnr}) *telescope.actions.move_selection_worse()*
-    Move the selection to the entry that has a worse score
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.move_selection_better({prompt_bufnr}) *telescope.actions.move_selection_better()*
-    Move the selection to the entry that has a better score
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.move_to_top({prompt_bufnr})          *telescope.actions.move_to_top()*
-    Move to the top of the picker
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.move_to_middle({prompt_bufnr})    *telescope.actions.move_to_middle()*
-    Move to the middle of the picker
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.move_to_bottom({prompt_bufnr})    *telescope.actions.move_to_bottom()*
-    Move to the bottom of the picker
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.add_selection({prompt_bufnr})      *telescope.actions.add_selection()*
-    Add current entry to multi select
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.remove_selection({prompt_bufnr}) *telescope.actions.remove_selection()*
-    Remove current entry from multi select
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.toggle_selection({prompt_bufnr}) *telescope.actions.toggle_selection()*
-    Toggle current entry status for multi select
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.select_all({prompt_bufnr})            *telescope.actions.select_all()*
-    Multi select all entries.
-    - Note: selected entries may include results not visible in the results pop
-      up.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.drop_all({prompt_bufnr})                *telescope.actions.drop_all()*
-    Drop all entries from the current multi selection.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.toggle_all({prompt_bufnr})            *telescope.actions.toggle_all()*
-    Toggle multi selection for all entries.
-    - Note: toggled entries may include results not visible in the results pop
-      up.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.preview_scrolling_up({prompt_bufnr}) *telescope.actions.preview_scrolling_up()*
-    Scroll the preview window up
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.preview_scrolling_down({prompt_bufnr}) *telescope.actions.preview_scrolling_down()*
-    Scroll the preview window down
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.preview_scrolling_left({prompt_bufnr}) *telescope.actions.preview_scrolling_left()*
-    Scroll the preview window to the left
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.preview_scrolling_right({prompt_bufnr}) *telescope.actions.preview_scrolling_right()*
-    Scroll the preview window to the right
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.results_scrolling_up({prompt_bufnr}) *telescope.actions.results_scrolling_up()*
-    Scroll the results window up
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.results_scrolling_down({prompt_bufnr}) *telescope.actions.results_scrolling_down()*
-    Scroll the results window down
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.results_scrolling_left({prompt_bufnr}) *telescope.actions.results_scrolling_left()*
-    Scroll the results window to the left
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.results_scrolling_right({prompt_bufnr}) *telescope.actions.results_scrolling_right()*
-    Scroll the results window to the right
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.center({prompt_bufnr})                    *telescope.actions.center()*
-    Center the cursor in the window, can be used after selecting a file to edit
-    You can just map `actions.select_default + actions.center`
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.select_default({prompt_bufnr})    *telescope.actions.select_default()*
-    Perform default action on selection, usually something like
-    `:edit <selection>`
-
-    i.e. open the selection in the current buffer
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.select_horizontal({prompt_bufnr}) *telescope.actions.select_horizontal()*
-    Perform 'horizontal' action on selection, usually something like
-    `:new <selection>`
-
-    i.e. open the selection in a new horizontal split
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.select_vertical({prompt_bufnr})  *telescope.actions.select_vertical()*
-    Perform 'vertical' action on selection, usually something like
-    `:vnew <selection>`
-
-    i.e. open the selection in a new vertical split
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.select_tab({prompt_bufnr})            *telescope.actions.select_tab()*
-    Perform 'tab' action on selection, usually something like
-    `:tabedit <selection>`
-
-    i.e. open the selection in a new tab
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.select_drop({prompt_bufnr})          *telescope.actions.select_drop()*
-    Perform 'drop' action on selection, usually something like
-    `:drop <selection>`
-
-    i.e. open the selection in a window
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.select_tab_drop({prompt_bufnr})  *telescope.actions.select_tab_drop()*
-    Perform 'tab drop' action on selection, usually something like
-    `:tab drop <selection>`
-
-    i.e. open the selection in a new tab
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.file_edit({prompt_bufnr})              *telescope.actions.file_edit()*
-    Perform file edit on selection, usually something like
-    `:edit <selection>`
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.file_split({prompt_bufnr})            *telescope.actions.file_split()*
-    Perform file split on selection, usually something like
-    `:new <selection>`
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.file_vsplit({prompt_bufnr})          *telescope.actions.file_vsplit()*
-    Perform file vsplit on selection, usually something like
-    `:vnew <selection>`
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.file_tab({prompt_bufnr})                *telescope.actions.file_tab()*
-    Perform file tab on selection, usually something like
-    `:tabedit <selection>`
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.close({prompt_bufnr})                      *telescope.actions.close()*
-    Close the Telescope window, usually used within an action
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions._close({prompt_bufnr})                    *telescope.actions._close()*
-    Close the Telescope window, usually used within an action
-    Deprecated and no longer needed, does the same as
-    |telescope.actions.close|. Might be removed in the future
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.edit_command_line({prompt_bufnr}) *telescope.actions.edit_command_line()*
-    Set a value in the command line and don't run it, making it editable.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.set_command_line({prompt_bufnr}) *telescope.actions.set_command_line()*
-    Set a value in the command line and run it
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.edit_search_line({prompt_bufnr}) *telescope.actions.edit_search_line()*
-    Set a value in the search line and don't search for it, making it editable.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.set_search_line({prompt_bufnr})  *telescope.actions.set_search_line()*
-    Set a value in the search line and search for it
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.edit_register({prompt_bufnr})      *telescope.actions.edit_register()*
-    Edit a register
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.paste_register({prompt_bufnr})    *telescope.actions.paste_register()*
-    Paste the selected register into the buffer
-
-    Note: only meant to be used inside builtin.registers
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.insert_symbol({prompt_bufnr})      *telescope.actions.insert_symbol()*
-    Insert a symbol into the current buffer (while switching to normal mode)
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.insert_symbol_i({prompt_bufnr})  *telescope.actions.insert_symbol_i()*
-    Insert a symbol into the current buffer and keeping the insert mode.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.git_create_branch({prompt_bufnr}) *telescope.actions.git_create_branch()*
-    Create and checkout a new git branch if it doesn't already exist
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.git_apply_stash({prompt_bufnr})  *telescope.actions.git_apply_stash()*
-    Applies an existing git stash
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.git_checkout({prompt_bufnr})        *telescope.actions.git_checkout()*
-    Checkout an existing git branch
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.git_switch_branch({prompt_bufnr}) *telescope.actions.git_switch_branch()*
-    Switch to git branch.
-    If the branch already exists in local, switch to that. If the branch is
-    only in remote, create new branch tracking remote and switch to new one.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.git_rename_branch()            *telescope.actions.git_rename_branch()*
-    Action to rename selected git branch
-
-
-
-actions.git_track_branch({prompt_bufnr}) *telescope.actions.git_track_branch()*
-    Tell git to track the currently selected remote branch in Telescope
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.git_delete_branch({prompt_bufnr}) *telescope.actions.git_delete_branch()*
-    Delete all currently selected branches
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.git_merge_branch({prompt_bufnr}) *telescope.actions.git_merge_branch()*
-    Merge the currently selected branch
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.git_rebase_branch({prompt_bufnr}) *telescope.actions.git_rebase_branch()*
-    Rebase to selected git branch
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.git_reset_mixed({prompt_bufnr})  *telescope.actions.git_reset_mixed()*
-    Reset to selected git commit using mixed mode
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.git_reset_soft({prompt_bufnr})    *telescope.actions.git_reset_soft()*
-    Reset to selected git commit using soft mode
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.git_reset_hard({prompt_bufnr})    *telescope.actions.git_reset_hard()*
-    Reset to selected git commit using hard mode
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.git_checkout_current_buffer({prompt_bufnr}) *telescope.actions.git_checkout_current_buffer()*
-    Checkout a specific file for a given sha
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.git_staging_toggle({prompt_bufnr}) *telescope.actions.git_staging_toggle()*
-    Stage/unstage selected file
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.send_selected_to_qflist({prompt_bufnr}) *telescope.actions.send_selected_to_qflist()*
-    Sends the selected entries to the quickfix list, replacing the previous
-    entries.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.add_selected_to_qflist({prompt_bufnr}) *telescope.actions.add_selected_to_qflist()*
-    Adds the selected entries to the quickfix list, keeping the previous
-    entries.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.send_to_qflist({prompt_bufnr})    *telescope.actions.send_to_qflist()*
-    Sends all entries to the quickfix list, replacing the previous entries.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.add_to_qflist({prompt_bufnr})      *telescope.actions.add_to_qflist()*
-    Adds all entries to the quickfix list, keeping the previous entries.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.send_selected_to_loclist({prompt_bufnr}) *telescope.actions.send_selected_to_loclist()*
-    Sends the selected entries to the location list, replacing the previous
-    entries.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.add_selected_to_loclist({prompt_bufnr}) *telescope.actions.add_selected_to_loclist()*
-    Adds the selected entries to the location list, keeping the previous
-    entries.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.send_to_loclist({prompt_bufnr})  *telescope.actions.send_to_loclist()*
-    Sends all entries to the location list, replacing the previous entries.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.add_to_loclist({prompt_bufnr})    *telescope.actions.add_to_loclist()*
-    Adds all entries to the location list, keeping the previous entries.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.smart_send_to_qflist({prompt_bufnr}) *telescope.actions.smart_send_to_qflist()*
-    Sends the selected entries to the quickfix list, replacing the previous
-    entries. If no entry was selected, sends all entries.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.smart_add_to_qflist({prompt_bufnr}) *telescope.actions.smart_add_to_qflist()*
-    Adds the selected entries to the quickfix list, keeping the previous
-    entries. If no entry was selected, adds all entries.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.smart_send_to_loclist({prompt_bufnr}) *telescope.actions.smart_send_to_loclist()*
-    Sends the selected entries to the location list, replacing the previous
-    entries. If no entry was selected, sends all entries.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.smart_add_to_loclist({prompt_bufnr}) *telescope.actions.smart_add_to_loclist()*
-    Adds the selected entries to the location list, keeping the previous
-    entries. If no entry was selected, adds all entries.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.complete_tag({prompt_bufnr})        *telescope.actions.complete_tag()*
-    Open completion menu containing the tags which can be used to filter the
-    results in a faster way
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.cycle_history_next({prompt_bufnr}) *telescope.actions.cycle_history_next()*
-    Cycle to the next search prompt in the history
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.cycle_history_prev({prompt_bufnr}) *telescope.actions.cycle_history_prev()*
-    Cycle to the previous search prompt in the history
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.open_qflist({prompt_bufnr})          *telescope.actions.open_qflist()*
-    Open the quickfix list. It makes sense to use this in combination with one
-    of the send_to_qflist actions `actions.smart_send_to_qflist +
-    actions.open_qflist`
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.open_loclist({prompt_bufnr})        *telescope.actions.open_loclist()*
-    Open the location list. It makes sense to use this in combination with one
-    of the send_to_loclist actions `actions.smart_send_to_qflist +
-    actions.open_qflist`
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.delete_buffer({prompt_bufnr})      *telescope.actions.delete_buffer()*
-    Delete the selected buffer or all the buffers selected using multi
-    selection.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.cycle_previewers_next({prompt_bufnr}) *telescope.actions.cycle_previewers_next()*
-    Cycle to the next previewer if there is one available.
-    This action is not mapped on default.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.cycle_previewers_prev({prompt_bufnr}) *telescope.actions.cycle_previewers_prev()*
-    Cycle to the previous previewer if there is one available.
-    This action is not mapped on default.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.remove_selected_picker({prompt_bufnr}) *telescope.actions.remove_selected_picker()*
-    Removes the selected picker in |builtin.pickers|.
-    This action is not mapped by default and only intended for
-    |builtin.pickers|.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.which_key({prompt_bufnr})              *telescope.actions.which_key()*
-    Display the keymaps of registered actions similar to which-key.nvim.
-
-    - Notes:
-      - The defaults can be overridden via |action_generate.which_key|.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.to_fuzzy_refine({prompt_bufnr})  *telescope.actions.to_fuzzy_refine()*
-    Move from a none fuzzy search to a fuzzy one
-    This action is meant to be used in live_grep and
-    lsp_dynamic_workspace_symbols
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.delete_mark({prompt_bufnr})          *telescope.actions.delete_mark()*
-    Delete the selected mark or all the marks selected using multi selection.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.insert_original_cword({prompt_bufnr}) *telescope.actions.insert_original_cword()*
-    Insert the word under the cursor of the original (pre-Telescope) window
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.insert_original_cWORD({prompt_bufnr}) *telescope.actions.insert_original_cWORD()*
-    Insert the WORD under the cursor of the original (pre-Telescope) window
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.insert_original_cfile({prompt_bufnr}) *telescope.actions.insert_original_cfile()*
-    Insert the file under the cursor of the original (pre-Telescope) window
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-actions.insert_original_cline({prompt_bufnr}) *telescope.actions.insert_original_cline()*
-    Insert the line under the cursor of the original (pre-Telescope) window
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-
-================================================================================
-ACTIONS_STATE                                          *telescope.actions.state*
-
-Functions to be used to determine the current state of telescope.
-
-Generally used from within other |telescope.actions|
-
-action_state.get_selected_entry() *telescope.actions.state.get_selected_entry()*
-    Get the current entry
-
-
-
-action_state.get_current_line()   *telescope.actions.state.get_current_line()*
-    Gets the current line in the search prompt
-
-
-
-action_state.get_current_picker({prompt_bufnr}) *telescope.actions.state.get_current_picker()*
-    Gets the current picker
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-
-================================================================================
-ACTIONS_SET                                              *telescope.actions.set*
-
-Telescope action sets are used to provide an interface for managing actions
-that all primarily do the same thing, but with slight tweaks.
-
-For example, when editing files you may want it in the current split, a
-vertical split, etc. Instead of making users have to overwrite EACH of those
-every time they want to change this behavior, they can instead replace the
-`set` itself and then it will work great and they're done.
-
-action_set.shift_selection({prompt_bufnr}, {change}) *telescope.actions.set.shift_selection()*
-    Move the current selection of a picker {change} rows. Handles not
-    overflowing / underflowing the list.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-        {change}       (number)  The amount to shift the selection by
-
-
-action_set.select({prompt_bufnr}, {type})     *telescope.actions.set.select()*
-    Select the current entry. This is the action set to overwrite common
-    actions by the user.
-
-    By default maps to editing a file.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-        {type}         (string)  The type of selection to make
-
-
-action_set.edit({prompt_bufnr}, {command})      *telescope.actions.set.edit()*
-    Edit a file based on the current selection.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-        {command}      (string)  The command to use to open the file.
-
-
-action_set.scroll_previewer({prompt_bufnr}, {direction}) *telescope.actions.set.scroll_previewer()*
-    Scrolls the previewer up or down. Defaults to a half page scroll, but can
-    be overridden using the `scroll_speed` option in `layout_config`. See
-    |telescope.layout| for more details.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-        {direction}    (number)  The direction of the scrolling
-
-
-action_set.scroll_horizontal_previewer({prompt_bufnr}, {direction}) *telescope.actions.set.scroll_horizontal_previewer()*
-    Scrolls the previewer to the left or right. Defaults to a half page scroll,
-    but can be overridden using the `scroll_speed` option in `layout_config`.
-    See |telescope.layout| for more details.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-        {direction}    (number)  The direction of the scrolling
-
-
-action_set.scroll_results({prompt_bufnr}, {direction}) *telescope.actions.set.scroll_results()*
-    Scrolls the results up or down. Defaults to a half page scroll, but can be
-    overridden using the `scroll_speed` option in `layout_config`. See
-    |telescope.layout| for more details.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-        {direction}    (number)  The direction of the scrolling
-
-
-action_set.scroll_horizontal_results({prompt_bufnr}, {direction}) *telescope.actions.set.scroll_horizontal_results()*
-    Scrolls the results to the left or right. Defaults to a half page scroll,
-    but can be overridden using the `scroll_speed` option in `layout_config`.
-    See |telescope.layout| for more details.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-        {direction}    (number)  The direction of the scrolling
-
-
-
-================================================================================
-ACTIONS_LAYOUT                                        *telescope.actions.layout*
-
-The layout actions are actions to be used to change the layout of a picker.
-
-action_layout.toggle_preview({prompt_bufnr}) *telescope.actions.layout.toggle_preview()*
-    Toggle preview window.
-    - Note: preview window can be toggled even if preview is set to false.
-
-    This action is not mapped by default.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-action_layout.toggle_prompt_position({prompt_bufnr}) *telescope.actions.layout.toggle_prompt_position()*
-    Toggles the `prompt_position` option between "top" and "bottom". Checks if
-    `prompt_position` is an option for the current layout.
-
-    This action is not mapped by default.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-action_layout.toggle_mirror({prompt_bufnr}) *telescope.actions.layout.toggle_mirror()*
-    Toggles the `mirror` option between `true` and `false`. Checks if `mirror`
-    is an option for the current layout.
-
-    This action is not mapped by default.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-action_layout.cycle_layout_next({prompt_bufnr}) *telescope.actions.layout.cycle_layout_next()*
-    Cycles to the next layout in `cycle_layout_list`.
-
-    This action is not mapped by default.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-action_layout.cycle_layout_prev({prompt_bufnr}) *telescope.actions.layout.cycle_layout_prev()*
-    Cycles to the previous layout in `cycle_layout_list`.
-
-    This action is not mapped by default.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-
-================================================================================
-ACTIONS_UTILS                                          *telescope.actions.utils*
-
-Utilities to wrap functions around picker selections and entries.
-
-Generally used from within other |telescope.actions|
-
-utils.map_entries({prompt_bufnr}, {f}) *telescope.actions.utils.map_entries()*
-    Apply `f` to the entries of the current picker.
-    - Notes:
-      - Mapped entries include all currently filtered results, not just the
-        visible ones.
-      - Indices are 1-indexed, whereas rows are 0-indexed.
-    - Warning: `map_entries` has no return value.
-      - The below example showcases how to collect results
-
-    Usage:
-    >
-      local action_state = require "telescope.actions.state"
-      local action_utils = require "telescope.actions.utils"
-      function entry_value_by_row()
-        local prompt_bufnr = vim.api.nvim_get_current_buf()
-        local current_picker = action_state.get_current_picker(prompt_bufnr)
-        local results = {}
-        action_utils.map_entries(prompt_bufnr, function(entry, index, row)
-          results[row] = entry.value
-        end)
-        return results
-      end
-<
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)    The prompt bufnr
-        {f}            (function)  Function to map onto entries of picker that
-                                   takes (entry, index, row) as viable
-                                   arguments
-
-
-utils.map_selections({prompt_bufnr}, {f}) *telescope.actions.utils.map_selections()*
-    Apply `f` to the multi selections of the current picker and return a table
-    of mapped selections.
-    - Notes:
-      - Mapped selections may include results not visible in the results pop
-        up.
-      - Selected entries are returned in order of their selection.
-    - Warning: `map_selections` has no return value.
-      - The below example showcases how to collect results
-
-    Usage:
-    >
-      local action_state = require "telescope.actions.state"
-      local action_utils = require "telescope.actions.utils"
-      function selection_by_index()
-        local prompt_bufnr = vim.api.nvim_get_current_buf()
-        local current_picker = action_state.get_current_picker(prompt_bufnr)
-        local results = {}
-        action_utils.map_selections(prompt_bufnr, function(entry, index)
-          results[index] = entry.value
-        end)
-        return results
-      end
-<
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)    The prompt bufnr
-        {f}            (function)  Function to map onto selection of picker
-                                   that takes (selection) as a viable argument
-
-
-utils.get_registered_mappings({prompt_bufnr}) *telescope.actions.utils.get_registered_mappings()*
-    Utility to collect mappings of prompt buffer in array of `{mode, keybind,
-    name}`.
-
-
-    Parameters: ~
-        {prompt_bufnr} (number)  The prompt bufnr
-
-
-
-================================================================================
-ACTIONS_GENERATE                                    *telescope.actions.generate*
-
-Module for convenience to override defaults of corresponding
-|telescope.actions| at |telescope.setup()|.
-
-General usage:
->
-  require("telescope").setup {
-    defaults = {
-      mappings = {
-        n = {
-          ["?"] = action_generate.which_key {
-            name_width = 20, -- typically leads to smaller floats
-            max_height = 0.5, -- increase potential maximum height
-            separator = " > ", -- change sep between mode, keybind, and name
-            close_with_action = false, -- do not close float on action
-          },
-        },
-      },
-    },
-  }
-<
-
-action_generate.which_key({opts})     *telescope.actions.generate.which_key()*
-    Display the keymaps of registered actions similar to which-key.nvim.
-
-    - Floating window:
-      - Appears on the opposite side of the prompt.
-      - Resolves to minimum required number of lines to show hints with `opts`
-        or truncates entries at `max_height`.
-      - Closes automatically on action call and can be disabled with by setting
-        `close_with_action` to false.
-
-
-    Parameters: ~
-        {opts} (table)  options to pass to toggling registered actions
-
-    Fields: ~
-        {max_height}             (number)   % of max. height or no. of rows
-                                            for hints (default: 0.4), see
-                                            |resolver.resolve_height()|
-        {only_show_current_mode} (boolean)  only show keymaps for the current
-                                            mode (default: true)
-        {mode_width}             (number)   fixed width of mode to be shown
-                                            (default: 1)
-        {keybind_width}          (number)   fixed width of keybind to be shown
-                                            (default: 7)
-        {name_width}             (number)   fixed width of action name to be
-                                            shown (default: 30)
-        {column_padding}         (string)   string to split; can be used for
-                                            vertical separator (default: " ")
-        {mode_hl}                (string)   hl group of mode (default:
-                                            TelescopeResultsConstant)
-        {keybind_hl}             (string)   hl group of keybind (default:
-                                            TelescopeResultsVariable)
-        {name_hl}                (string)   hl group of action name (default:
-                                            TelescopeResultsFunction)
-        {column_indent}          (number)   number of left-most spaces before
-                                            keybinds are shown (default: 4)
-        {line_padding}           (number)   row padding in top and bottom of
-                                            float (default: 1)
-        {separator}              (string)   separator string between mode, key
-                                            bindings, and action (default: "
-                                            -> ")
-        {close_with_action}      (boolean)  registered action will close
-                                            keymap float (default: true)
-        {normal_hl}              (string)   winhl of "Normal" for keymap hints
-                                            floating window (default:
-                                            "TelescopePrompt")
-        {border_hl}              (string)   winhl of "Normal" for keymap
-                                            borders (default:
-                                            "TelescopePromptBorder")
-        {winblend}               (number)   pseudo-transparency of keymap
-                                            hints floating window
-        {zindex}                 (number)   z-index of keymap hints floating
-                                            window (default: 100)
-
-
-
-================================================================================
-PREVIEWERS                                                *telescope.previewers*
-
-Provides a Previewer table that has to be implemented by each previewer. To
-achieve this, this module also provides two wrappers that abstract most of the
-work and make it really easy to create new previewers.
-  - `previewers.new_termopen_previewer`
-  - `previewers.new_buffer_previewer`
-
-Furthermore, there are a collection of previewers already defined which can be
-used for every picker, as long as the entries of the picker provide the
-necessary fields. The more important ones are
-  - `previewers.cat`
-  - `previewers.vimgrep`
-  - `previewers.qflist`
-  - `previewers.vim_buffer_cat`
-  - `previewers.vim_buffer_vimgrep`
-  - `previewers.vim_buffer_qflist`
-
-Previewers can be disabled for any builtin or custom picker by doing :Telescope
-find_files previewer=false
-
-previewers.Previewer()                      *telescope.previewers.Previewer()*
-    This is the base table all previewers have to implement. It's possible to
-    write a wrapper for this because most previewers need to have the same keys
-    set. Examples of wrappers are:
-      - `new_buffer_previewer`
-      - `new_termopen_previewer`
-
-    To create a new table do following:
-      - `local new_previewer = Previewer:new(opts)`
-
-    What `:new` expects is listed below
-
-    The interface provides the following set of functions. All of them, besides
-    `new`, will be handled by telescope pickers.
-    - `:new(opts)`
-    - `:preview(entry, status)`
-    - `:teardown()`
-    - `:send_input(input)`
-    - `:scroll_fn(direction)`
-    - `:scroll_horizontal_fn(direction)`
-
-    `Previewer:new()` expects a table as input with following keys:
-      - `setup` function(self): Will be called the first time preview will be 
-        called.
-      - `teardown` function(self): Will be called on clean up.
-      - `preview_fn` function(self, entry, status): Will be called each time a
-        new entry was selected.
-      - `title` function(self): Will return the static title of the previewer.
-      - `dynamic_title` function(self, entry): Will return the dynamic title of
-        the previewer. Will only be called when config value
-        dynamic_preview_title is true.
-      - `send_input` function(self, input): This is meant for 
-        `termopen_previewer` and it can be used to send input to the terminal 
-        application, like less.
-      - `scroll_fn` function(self, direction): Used to make scrolling work.
-      - `scroll_horizontal_fn` function(self, direction): Used to make 
-        horizontal scrolling work.
-
-
-
-previewers.new()                                  *telescope.previewers.new()*
-    A shorthand for creating a new Previewer. The provided table will be
-    forwarded to `Previewer:new(...)`
-
-
-
-previewers.new_termopen_previewer() *telescope.previewers.new_termopen_previewer()*
-    Is a wrapper around Previewer and helps with creating a new
-    `termopen_previewer`.
-
-    It requires you to specify one table entry `get_command(entry, status)`.
-    This `get_command` function has to return the terminal command that will be
-    executed for each entry. Example:
-    >
-      get_command = function(entry, status)
-        return { 'bat', entry.path }
-      end
-<
-
-    Additionally you can define:
-    - `title` a static title for example "File Preview"
-    - `dyn_title(self, entry)` a dynamic title function which gets called when
-      config value `dynamic_preview_title = true`
-
-    It's an easy way to get your first previewer going and it integrates well
-    with `bat` and `less`. Providing out of the box scrolling if the command
-    uses less.
-
-    Furthermore, it will forward all `config.set_env` environment variables to
-    that terminal process.
-
-
-
-previewers.cat()                                  *telescope.previewers.cat()*
-    Provides a `termopen_previewer` which has the ability to display files. It
-    will always show the top of the file and has support for `bat`(prioritized)
-    and `cat`. Each entry has to provide either the field `path` or `filename`
-    in order to make this previewer work.
-
-    The preferred way of using this previewer is like this
-    `require('telescope.config').values.cat_previewer` This will respect user
-    configuration and will use `buffer_previewers` in case it's configured that
-    way.
-
-
-
-previewers.vimgrep()                          *telescope.previewers.vimgrep()*
-    Provides a `termopen_previewer` which has the ability to display files at
-    the provided line. It has support for `bat`(prioritized) and `cat`. Each
-    entry has to provide either the field `path` or `filename` and a `lnum`
-    field in order to make this previewer work.
-
-    The preferred way of using this previewer is like this
-    `require('telescope.config').values.grep_previewer` This will respect user
-    configuration and will use `buffer_previewers` in case it's configured that
-    way.
-
-
-
-previewers.qflist()                            *telescope.previewers.qflist()*
-    Provides a `termopen_previewer` which has the ability to display files at
-    the provided line or range. It has support for `bat`(prioritized) and
-    `cat`. Each entry has to provide either the field `path` or `filename`,
-    `lnum` and a `start` and `finish` range in order to make this previewer
-    work.
-
-    The preferred way of using this previewer is like this
-    `require('telescope.config').values.qflist_previewer` This will respect
-    user configuration and will use buffer previewers in case it's configured
-    that way.
-
-
-
-previewers.new_buffer_previewer() *telescope.previewers.new_buffer_previewer()*
-    An interface to instantiate a new `buffer_previewer`. That means that the
-    content actually lives inside a vim buffer which enables us more control
-    over the actual content. For example, we can use `vim.fn.search` to jump to
-    a specific line or reuse buffers/already opened files more easily. This
-    interface is more complex than `termopen_previewer` but offers more
-    flexibility over your content. It was designed to display files but was
-    extended to also display the output of terminal commands.
-
-    In the following options, state table and general tips are mentioned to
-    make your experience with this previewer more seamless.
-
-
-    options:
-      - `define_preview = function(self, entry, status)` (required) Is called
-        for each selected entry, after each selection_move (up or down) and is
-        meant to handle things like reading file, jump to line or attach a
-        highlighter.
-      - `setup = function(self)` (optional) Is called once at the beginning,
-        before the preview for the first entry is displayed. You can return a
-        table of vars that will be available in `self.state` in each
-        `define_preview` call.
-      - `teardown = function(self)` (optional) Will be called at the end, when
-        the picker is being closed and is meant to clean up everything that was
-        allocated by the previewer. The `buffer_previewer` will automatically
-        clean up all created buffers. So you only need to handle things that
-        were introduced by you.
-      - `keep_last_buf = true` (optional) Will not delete the last selected
-        buffer. This would allow you to reuse that buffer in the select action.
-        For example, that buffer can be opened in a new split, rather than
-        recreating that buffer in an action. To access the last buffer number: 
-        `require('telescope.state').get_global_key("last_preview_bufnr")`
-      - `get_buffer_by_name = function(self, entry)` Allows you to set a unique
-        name for each buffer. This is used for caching purposes.
-        `self.state.bufname` will be nil if the entry was never loaded or the
-        unique name when it was loaded once. For example, useful if you have
-        one file but multiple entries. This happens for grep and lsp builtins.
-        So to make the cache work only load content if `self.state.bufname ~=
-        entry.your_unique_key`
-      - `title` a static title for example "File Preview"
-      - `dyn_title(self, entry)` a dynamic title function which gets called 
-        when config value `dynamic_preview_title = true`
-
-    `self.state` table:
-      - `self.state.bufnr` Is the current buffer number, in which you have to
-        write the loaded content. Don't create a buffer yourself, otherwise
-        it's not managed by the buffer_previewer interface and you will
-        probably be better off writing your own interface.
-      - self.state.winid Current window id. Useful if you want to set the
-        cursor to a provided line number.
-      - self.state.bufname Will return the current buffer name, if
-        `get_buffer_by_name` is defined. nil will be returned if the entry was
-        never loaded or when `get_buffer_by_name` is not set.
-
-    Tips:
-      - If you want to display content of a terminal job, use: 
-        `require('telescope.previewers.utils').job_maker(cmd, bufnr, opts)`
-          - `cmd` table: for example { 'git', 'diff', entry.value }
-          - `bufnr` number: in which the content will be written
-          - `opts` table: with following keys
-            - `bufname` string: used for cache
-            - `value` string: used for cache
-            - `mode` string: either "insert" or "append". "insert" is default
-            - `env` table: define environment variables. Example:
-              - `{ ['PAGER'] = '', ['MANWIDTH'] = 50 }`
-            - `cwd` string: define current working directory for job
-            - `callback` function(bufnr, content): will be called when job is
-              done. Content will be nil if job is already loaded. So you can do
-              highlighting only the first time the previewer is created for
-              that entry. Use the returned `bufnr` and not `self.state.bufnr`
-              in callback, because state can already be changed at this point
-              in time.
-      - If you want to attach a highlighter use:
-        - `require('telescope.previewers.utils').highlighter(bufnr, ft)`
-          - This will prioritize tree sitter highlighting if available for 
-            environment and language.
-        - `require('telescope.previewers.utils').regex_highlighter(bufnr, ft)`
-        - `require('telescope.previewers.utils').ts_highlighter(bufnr, ft)`
-      - If you want to use `vim.fn.search` or similar you need to run it in 
-        that specific buffer context. Do
-    >
-          vim.api.nvim_buf_call(bufnr, function()
-            -- for example `search` and `matchadd`
-          end)
-<
-    to achieve that.
-      - If you want to read a file into the buffer it's best to use 
-        `buffer_previewer_maker`. But access this function with 
-        `require('telescope.config').values.buffer_previewer_maker` because it
-        can be redefined by users.
-
-
-
-previewers.buffer_previewer_maker({filepath}, {bufnr}, {opts}) *telescope.previewers.buffer_previewer_maker()*
-    A universal way of reading a file into a buffer previewer. It handles async
-    reading, cache, highlighting, displaying directories and provides a
-    callback which can be used, to jump to a line in the buffer.
-
-
-    Parameters: ~
-        {filepath} (string)  String to the filepath, will be expanded
-        {bufnr}    (number)  Where the content will be written
-        {opts}     (table)   keys: `use_ft_detect`, `bufname` and `callback`
-
-
-previewers.vim_buffer_cat()            *telescope.previewers.vim_buffer_cat()*
-    A previewer that is used to display a file. It uses the `buffer_previewer`
-    interface and won't jump to the line. To integrate this one into your own
-    picker make sure that the field `path` or `filename` is set for each entry.
-    The preferred way of using this previewer is like this
-    `require('telescope.config').values.file_previewer` This will respect user
-    configuration and will use `termopen_previewer` in case it's configured
-    that way.
-
-
-
-previewers.vim_buffer_vimgrep()    *telescope.previewers.vim_buffer_vimgrep()*
-    A previewer that is used to display a file and jump to the provided line.
-    It uses the `buffer_previewer` interface. To integrate this one into your
-    own picker make sure that the field `path` or `filename` and `lnum` is set
-    in each entry. If the latter is not present, it will default to the first
-    line. Additionally, `lnend`, `col` and `colend` can be set to highlight a
-    text range instead of a single line. All line/column values are 1-indexed.
-    The preferred way of using this previewer is like this
-    `require('telescope.config').values.grep_previewer` This will respect user
-    configuration and will use `termopen_previewer` in case it's configured
-    that way.
-
-
-
-previewers.vim_buffer_qflist()      *telescope.previewers.vim_buffer_qflist()*
-    Is the same as `vim_buffer_vimgrep` and only exists for consistency with
-    `term_previewers`.
-
-    The preferred way of using this previewer is like this
-    `require('telescope.config').values.qflist_previewer` This will respect
-    user configuration and will use `termopen_previewer` in case it's
-    configured that way.
-
-
-
-previewers.git_branch_log()            *telescope.previewers.git_branch_log()*
-    A previewer that shows a log of a branch as graph
-
-
-
-previewers.git_stash_diff()            *telescope.previewers.git_stash_diff()*
-    A previewer that shows a diff of a stash
-
-
-
-previewers.git_commit_diff_to_parent() *telescope.previewers.git_commit_diff_to_parent()*
-    A previewer that shows a diff of a commit to a parent commit.
-    The run command is `git --no-pager diff SHA^! -- $CURRENT_FILE`
-
-    The current file part is optional. So is only uses it with bcommits.
-
-
-
-previewers.git_commit_diff_to_head() *telescope.previewers.git_commit_diff_to_head()*
-    A previewer that shows a diff of a commit to head.
-    The run command is `git --no-pager diff --cached $SHA -- $CURRENT_FILE`
-
-    The current file part is optional. So is only uses it with bcommits.
-
-
-
-previewers.git_commit_diff_as_was() *telescope.previewers.git_commit_diff_as_was()*
-    A previewer that shows a diff of a commit as it was.
-    The run command is `git --no-pager show $SHA:$CURRENT_FILE` or `git
-    --no-pager show $SHA`
-
-
-
-previewers.git_commit_message()    *telescope.previewers.git_commit_message()*
-    A previewer that shows the commit message of a diff.
-    The run command is `git --no-pager log -n 1 $SHA`
-
-
-
-previewers.git_file_diff()              *telescope.previewers.git_file_diff()*
-    A previewer that shows the current diff of a file. Used in git_status.
-    The run command is `git --no-pager diff $FILE`
-
-
-
-previewers.display_content()          *telescope.previewers.display_content()*
-    A deprecated way of displaying content more easily. Was written at a time,
-    where the buffer_previewer interface wasn't present. Nowadays it's easier
-    to just use this. We will keep it around for backwards compatibility
-    because some extensions use it. It doesn't use cache or some other clever
-    tricks.
-
-
-
-
-================================================================================
-HISTORY                                              *telescope.actions.history*
-
-A base implementation of a prompt history that provides a simple history and
-can be replaced with a custom implementation.
-
-For example: We provide an extension for a smart history that uses sql.nvim to
-map histories to metadata, like the calling picker or cwd.
-
-So you have a history for:
-- find_files project_1
-- grep_string project_1
-- live_grep project_1
-- find_files project_2
-- grep_string project_2
-- live_grep project_2
-- etc
-
-See https://github.com/nvim-telescope/telescope-smart-history.nvim
-
-histories.History()                      *telescope.actions.history.History()*
-    Manages prompt history
-
-
-    Fields: ~
-        {enabled}    (boolean)  Will indicate if History is enabled or
-                                disabled
-        {path}       (string)   Will point to the location of the history file
-        {limit}      (string)   Will have the limit of the history. Can be
-                                nil, if limit is disabled.
-        {content}    (table)    History table. Needs to be filled by your own
-                                History implementation
-        {index}      (number)   Used to keep track of the next or previous
-                                index. Default is #content + 1
-        {cycle_wrap} (boolean)  Controls if history will wrap on reaching
-                                beginning or end
-
-
-histories.History:new({opts})        *telescope.actions.history.History:new()*
-    Create a new History
-
-
-    Parameters: ~
-        {opts} (table)  Defines the behavior of History
-
-    Fields: ~
-        {init}    (function)  Will be called after handling configuration
-                              (required)
-        {append}  (function)  How to append a new prompt item (required)
-        {reset}   (function)  What happens on reset. Will be called when
-                              telescope closes (required)
-        {pre_get} (function)  Will be called before a next or previous item
-                              will be returned (optional)
-
-
-histories.new()                              *telescope.actions.history.new()*
-    Shorthand to create a new history
-
-
-
-histories.History:reset()          *telescope.actions.history.History:reset()*
-    Will reset the history index to the default initial state. Will happen
-    after the picker closed
-
-
-
-histories.History:append({line}, {picker}, {no_reset}) *telescope.actions.history.History:append()*
-    Append a new line to the history
-
-
-    Parameters: ~
-        {line}     (string)   current line that will be appended
-        {picker}   (table)    the current picker object
-        {no_reset} (boolean)  On default it will reset the state at the end.
-                              If you don't want to do this set to true
-
-
-histories.History:get_next({line}, {picker}) *telescope.actions.history.History:get_next()*
-    Will return the next history item. Can be nil if there are no next items
-
-
-    Parameters: ~
-        {line}   (string)  the current line
-        {picker} (table)   the current picker object
-
-    Return: ~
-        string: the next history item
-
-
-histories.History:get_prev({line}, {picker}) *telescope.actions.history.History:get_prev()*
-    Will return the previous history item. Can be nil if there are no previous
-    items
-
-
-    Parameters: ~
-        {line}   (string)  the current line
-        {picker} (table)   the current picker object
-
-    Return: ~
-        string: the previous history item
-
-
-histories.get_simple_history() *telescope.actions.history.get_simple_history()*
-    A simple implementation of history.
-
-    It will keep one unified history across all pickers.
-
-
-
-
- vim:tw=78:ts=8:ft=help:norl:
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/doc/telescope_changelog.txt b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/doc/telescope_changelog.txt
deleted file mode 100644
index 08750a7b..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/doc/telescope_changelog.txt
+++ /dev/null
@@ -1,282 +0,0 @@
-================================================================================
-                                                         *telescope.changelog*
-
-# Changelog
-
-                                                     *telescope.changelog-922*
-
-Date: May 17, 2021
-PR: https://github.com/nvim-telescope/telescope.nvim/pull/922
-
-This is one of our largest breaking changes thus far, so I (TJ) am adding some
-information here so that you can more easily update (without having to track
-down the commit, etc.).
-
-The goal of these breaking changes is to greatly simplify the way
-configuration for layouts happen. This should make it much easier to configure
-each picker, layout_strategy, and more. Please report any bugs or behavior
-that is broken / confusing upstream and we can try and make the configuration
-better.
-
-|telescope.setup()| has changed `layout_defaults` -> `layout_config`.
-    This makes it so that the setup and the pickers share the same key,
-    otherwise it is too confusing which key is for which.
-
-
-`picker:find()` now has different values available for configuring the UI.
-    All configuration for the layout must be passed in the key:
-        `layout_config`.
-
-    Previously, these keys were passed via `picker:find(opts)`, but should be
-    passed via `opts.layout_config` now.
-        - {height}
-        - {width}
-        - {prompt_position}
-        - {preview_cutoff}
-
-    These keys are removed:
-        - {results_height}: This key is no longer valid. Instead, use `height`
-          and the corresponding `preview_*` options for the layout strategy to
-          get the correct results height. This simplifies the configuration
-          for many of the existing strategies.
-
-        - {results_width}: This key actually never did anything. It was
-          leftover from some hacking that I had attempted before. Instead you
-          should be using something like the `preview_width` configuration
-          option for |layout_strategies.horizontal()|
-
-    You should get error messages when you try and use any of the above keys now.
-
-                                                     *telescope.changelog-839*
-
-Date: July 7, 2021
-PR: https://github.com/nvim-telescope/telescope.nvim/pull/839
-
-Small breaking change regarding `shorten_path` and `hide_filename`.
-This allows to configure path displays on a global level and offers a way for
-extension developers to make use of the same configuration, offering a better
-overall experience.
-
-The new way to configure to configure path displays is with:
-    `path_display`: It is a table and accepts multiple values:
-        - "hidden"    hide file names
-        - "tail"      only display the file name, and not the path
-        - "absolute"  display absolute paths
-        - "shorten"   only display the first character of each directory in
-                      the path
-    see |telescope.defaults.path_display|
-
-Example would be for a global configuration:
-  require("telescope").setup{
-    defaults = {
-      path_display = {
-        "shorten",
-        "absolute",
-      },
-    }
-  }
-
-You can also still pass this to a single builtin call:
-    require("telescope.builtin").find_files {
-      path_display = { "shorten" }
-    }
-
-For extension developers there is a new util function that can be used to
-display a path:
-    local filename = utils.transform_path(opts, entry.filename)
-
-                                                     *telescope.changelog-473*
-
-Date: July 14, 2021
-PR: https://github.com/nvim-telescope/telescope.nvim/pull/473
-
-Deprecation of telescope.path
-
-Extension developers need to move to plenary.path, because we will remove the
-telescope.path  module soon.
-
-Guide to switch over to plenary.path
-    - separator
-        before: require("telescope.path").separator
-        now:    require("plenary.path").path.sep
-    - home
-        before: require("telescope.path").home
-        now:    require("plenary.path").path.home
-    - make_relative
-        before: require("telescope.path").make_relative(filepath, cwd)
-        now:    require("plenary.path"):new(filepath):make_relative(cwd)
-    - shorten
-        before: require("telescope.path").shorten(filepath)
-        now:    require("plenary.path"):new(filepath):shorten()
-                with optional len, default is 1
-    - normalize
-        before: require("telescope.path").normalize(filepath, cwd)
-        now:    require("plenary.path"):new(filepath):normalize(cwd)
-    - read_file
-        before: require("telescope.path").read_file(filepath)
-        now:    require("plenary.path"):new(filepath):read()
-    - read_file_async
-        before: require("telescope.path").read_file_async(filepath, callback)
-        now:    require("plenary.path"):new(filepath):read(callback)
-
-                                                    *telescope.changelog-1406*
-
-Date: November 4, 2021
-PR: https://github.com/nvim-telescope/telescope.nvim/pull/1406
-
-Telescope requires Neovim release 0.5.1 or a recent nightly
-
-Due to making use of newly implemented extmark features, Telescope now
-requires users to be on Neovim 0.5.1 (the most recent stable version) or on
-the LATEST version of Neovim nightly.
-
-
-                                                    *telescope.changelog-1549*
-
-Date: December 10, 2021
-PR: https://github.com/nvim-telescope/telescope.nvim/pull/1549
-
-Telescope requires now Neovim release 0.6.0 or a more recent nightly.
-If you are running neovim nightly, you need to make sure that you are on the
-LATEST version. Every other commit is not supported. So make sure you build
-the newest nightly before reporting issues.
-
-
-                                                    *telescope.changelog-1553*
-
-Date: December 10, 2021
-PR: https://github.com/nvim-telescope/telescope.nvim/pull/1553
-
-Move from `vim.lsp.diagnostic` to `vim.diagnostic`.
-
-Because the newly added `vim.diagnostic` has no longer anything to do with lsp
-we also decided to rename our diagnostic functions:
-    Telescope lsp_document_diagnostics -> Telescope diagnostics bufnr=0
-    Telescope lsp_workspace_diagnostics -> Telescope diagnostics
-Because of that the `lsp_*_diagnostics` inside Telescope will be deprecated
-and removed soon. The new `diagnostics` works almost identical to the previous
-functions. Note that there is no longer a workspace diagnostics. You can only
-get all diagnostics for all open buffers.
-
-
-                                                    *telescope.changelog-1851*
-
-Date: April 22, 2022
-PR: https://github.com/nvim-telescope/telescope.nvim/pull/1851
-
-Telescope requires now Neovim release 0.7.0 or a more recent nightly.
-If you are running Neovim nightly, you need to make sure that you are on the
-LATEST version. Every other commit is not supported. So make sure you build
-the newest nightly before reporting issues.
-In the future, we will adopt a different release strategy. This release
-strategy follows the approach that the latest telescope.nvim master will only
-work with latest Neovim nightly and we will provide tags for specific Neovim
-versions. You can read more about this strategy here:
-https://github.com/nvim-telescope/telescope.nvim/issues/1772
-
-
-                                                    *telescope.changelog-1866*
-
-Date: April 25, 2022
-PR: https://github.com/nvim-telescope/telescope.nvim/pull/1866
-
-We decided to remove both `lsp_code_actions` and `lsp_range_code_actions`.
-Currently, both functions are highly duplicated code from neovim, with fewer
-features, because it's out of date. So rather that we copy over the required
-changes to fix some bugs or implement client side code actions, we decided to
-remove both of them and suggest you use `vim.lsp.buf.code_action` and
-`vim.lsp.buf.range_code_action`. The transition to it is easy thanks to
-`vim.ui.select` which allows you to override the select UI. We provide a small
-extension for quite some time that make it easy to use telescope for
-`vim.ui.select`. You can found the code here
-https://github.com/nvim-telescope/telescope-ui-select.nvim. It offers the same
-displaying as the current version of `lsp_code_actions`. An alternative is
-https://github.com/stevearc/dressing.nvim which has support for multiple
-different backends including telescope.
-
-
-                                                    *telescope.changelog-1945*
-
-Date: July 01, 2022
-PR: https://github.com/nvim-telescope/telescope.nvim/pull/1945
-
-This is our dev branch which contains a lot of PRs, a lot of fixes,
-refactoring and general quality of life improvements. It also contains new
-features, the most noteworthy are the following (mostly developed by the
-community):
-- feat: none strategy & control attachment (#1867)
-- feat: force buffer delete for terminal and improvements for
-  Picker:delete_selection (#1943)
-- feat(tags): process tagfiles on the fly (#1989)
-- feat(builtin.lsp): implement builtin handlers for
-  lsp.(incoming|outgoing)_calls (#1484)
-- feat: clear previewer if no item is selected (#2004)
-- feat: add min max boundary to width, height resolver (#2002)
-- feat: Add entry_index for entry_makers (#1850)
-- feat: refine with new_table (#1115)
-
-The last one is one of the most exciting new features, because it allows you
-to go from live_grep into a fuzzy environment with the following mapping
-`<C-Space>`. It's a general interface we now implemented for `live_grep` and
-`lsp_dynamic_workspace_symbols` but it could also be easily implemented for
-other builtins, by us or the user. It's now available for extension developers.
-We will add documentation in the next couple of days and improve it by adding
-more options to configure it after the initial 0.1 release.
-
-But as with all longer development phases, there are also some breaking
-changes. This is the main reason we moved development to a separate branch, for
-the past two months. We can't promise that there won't be more breaking
-changes, but it is the plan that this is the last set of breaking changes prior
-to the 0.1 release on July, 12. We are deeply sorry for the inconvenience. The
-following breaking changes are included in this PR:
-- break(git_files): change `show_untracked` default to false. Can be changed
-  back with `:Telescope git_files show_untracked=true`
-- break: deprecate `utils.get_default` `utils.if_nil`, will be removed prior
-  to 0.1, so if you use it in your config, please move to `vim.F.if_nil`
-- break: drops `ignore_filename` option, use `path_display= { "hidden" }`
-  instead
-- break: prefix internal interfaces with __ so
-  `require("telescope.builtin.files").find_files` will show a notify error but
-  still works for now. The error will be removed prior to 0.1! You should use
-  `require("telescope.builtin").find_files` because we wrap all the functions
-  that are exposed in this module.
-- break: defaults.preview.treesitter rework that allows you to either enable a
-  list of languages, or enable all and disable some. Please read
-  `:help telescope.defaults.preview` for more information.
-  Something like this is now possible:
-    >
-    treesitter = {
-      enable = false,
-      -- or
-      enable = { "c" },
-      -- disable can be set if enable isn't set
-      disable = { "perl", "javascript" },
-    },
-<
-
-
-                                                    *telescope.changelog-2499*
-
-Date: May 24, 2023
-PR: https://github.com/nvim-telescope/telescope.nvim/pull/2499
-
-We decided to bump the minimum Neovim version to 0.9.0, in order to remove a
-couple of no longer required workarounds. That includes using upstream
-treesitter implementation in favor of nvim-treesitter.
-If you still have a requirement for Neovim 0.7 or 0.8, we also have a stable
-branch 0.1.x (or version, currently 0.1.1) which will not receive this version
-bump and will continue to offer support for older Neovim versions.
-
-
-                                                    *telescope.changelog-2529*
-
-Date: June 09, 2023
-PR: https://github.com/nvim-telescope/telescope.nvim/pull/2529
-
-We finally removed usage of `plenary.filetype` to determine filetypes for
-previewing and replaced it with `vim.filetype`. So if you have highlighting
-issues you no longer have to configure `plenary`, but rather read
-|vim.filetype|.
-
-
- vim:tw=78:ts=8:ft=help:norl:
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/ftplugin/TelescopePrompt.lua b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/ftplugin/TelescopePrompt.lua
deleted file mode 100644
index 8888a88f..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/ftplugin/TelescopePrompt.lua
+++ /dev/null
@@ -1,12 +0,0 @@
--- Don't wrap textwidth things
-vim.opt_local.formatoptions:remove "t"
-vim.opt_local.formatoptions:remove "c"
-
--- Don't include `showbreak` when calculating strdisplaywidth
-vim.opt_local.wrap = false
-
--- There's also no reason to enable textwidth here anyway
-vim.opt_local.textwidth = 0
-vim.opt_local.scrollbind = false
-
-vim.opt_local.signcolumn = "no"
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/ftplugin/TelescopeResults.lua b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/ftplugin/TelescopeResults.lua
deleted file mode 100644
index 08e9dccf..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/ftplugin/TelescopeResults.lua
+++ /dev/null
@@ -1,5 +0,0 @@
--- Don't have scrolloff, it makes things weird.
-vim.opt_local.scrolloff = 0
-vim.opt_local.scrollbind = false
-
-vim.opt_local.signcolumn = "no"
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/plugin/telescope.lua b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/plugin/telescope.lua
deleted file mode 100644
index 338036cd..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/plugin/telescope.lua
+++ /dev/null
@@ -1,156 +0,0 @@
-if 1 ~= vim.fn.has "nvim-0.9.0" then
-  vim.api.nvim_err_writeln "Telescope.nvim requires at least nvim-0.9.0. See `:h telescope.changelog-2499`"
-  return
-end
-
-if vim.g.loaded_telescope == 1 then
-  return
-end
-vim.g.loaded_telescope = 1
-
-local highlights = {
-  -- Sets the highlight for selected items within the picker.
-  TelescopeSelection = { default = true, link = "Visual" },
-  TelescopeSelectionCaret = { default = true, link = "TelescopeSelection" },
-  TelescopeMultiSelection = { default = true, link = "Type" },
-  TelescopeMultiIcon = { default = true, link = "Identifier" },
-
-  -- "Normal" in the floating windows created by telescope.
-  TelescopeNormal = { default = true, link = "Normal" },
-  TelescopePreviewNormal = { default = true, link = "TelescopeNormal" },
-  TelescopePromptNormal = { default = true, link = "TelescopeNormal" },
-  TelescopeResultsNormal = { default = true, link = "TelescopeNormal" },
-
-  -- Border highlight groups.
-  --   Use TelescopeBorder to override the default.
-  --   Otherwise set them specifically
-  TelescopeBorder = { default = true, link = "TelescopeNormal" },
-  TelescopePromptBorder = { default = true, link = "TelescopeBorder" },
-  TelescopeResultsBorder = { default = true, link = "TelescopeBorder" },
-  TelescopePreviewBorder = { default = true, link = "TelescopeBorder" },
-
-  -- Title highlight groups.
-  --   Use TelescopeTitle to override the default.
-  --   Otherwise set them specifically
-  TelescopeTitle = { default = true, link = "TelescopeBorder" },
-  TelescopePromptTitle = { default = true, link = "TelescopeTitle" },
-  TelescopeResultsTitle = { default = true, link = "TelescopeTitle" },
-  TelescopePreviewTitle = { default = true, link = "TelescopeTitle" },
-
-  TelescopePromptCounter = { default = true, link = "NonText" },
-
-  -- Used for highlighting characters that you match.
-  TelescopeMatching = { default = true, link = "Special" },
-
-  -- Used for the prompt prefix
-  TelescopePromptPrefix = { default = true, link = "Identifier" },
-
-  -- Used for highlighting the matched line inside Previewer. Works only for (vim_buffer_ previewer)
-  TelescopePreviewLine = { default = true, link = "Visual" },
-  TelescopePreviewMatch = { default = true, link = "Search" },
-
-  TelescopePreviewPipe = { default = true, link = "Constant" },
-  TelescopePreviewCharDev = { default = true, link = "Constant" },
-  TelescopePreviewDirectory = { default = true, link = "Directory" },
-  TelescopePreviewBlock = { default = true, link = "Constant" },
-  TelescopePreviewLink = { default = true, link = "Special" },
-  TelescopePreviewSocket = { default = true, link = "Statement" },
-  TelescopePreviewRead = { default = true, link = "Constant" },
-  TelescopePreviewWrite = { default = true, link = "Statement" },
-  TelescopePreviewExecute = { default = true, link = "String" },
-  TelescopePreviewHyphen = { default = true, link = "NonText" },
-  TelescopePreviewSticky = { default = true, link = "Keyword" },
-  TelescopePreviewSize = { default = true, link = "String" },
-  TelescopePreviewUser = { default = true, link = "Constant" },
-  TelescopePreviewGroup = { default = true, link = "Constant" },
-  TelescopePreviewDate = { default = true, link = "Directory" },
-  TelescopePreviewMessage = { default = true, link = "TelescopePreviewNormal" },
-  TelescopePreviewMessageFillchar = { default = true, link = "TelescopePreviewMessage" },
-
-  -- Used for Picker specific Results highlighting
-  TelescopeResultsClass = { default = true, link = "Function" },
-  TelescopeResultsConstant = { default = true, link = "Constant" },
-  TelescopeResultsField = { default = true, link = "Function" },
-  TelescopeResultsFunction = { default = true, link = "Function" },
-  TelescopeResultsMethod = { default = true, link = "Method" },
-  TelescopeResultsOperator = { default = true, link = "Operator" },
-  TelescopeResultsStruct = { default = true, link = "Struct" },
-  TelescopeResultsVariable = { default = true, link = "SpecialChar" },
-
-  TelescopeResultsLineNr = { default = true, link = "LineNr" },
-  TelescopeResultsIdentifier = { default = true, link = "Identifier" },
-  TelescopeResultsNumber = { default = true, link = "Number" },
-  TelescopeResultsComment = { default = true, link = "Comment" },
-  TelescopeResultsSpecialComment = { default = true, link = "SpecialComment" },
-
-  -- Used for git status Results highlighting
-  TelescopeResultsDiffChange = { default = true, link = "DiffChange" },
-  TelescopeResultsDiffAdd = { default = true, link = "DiffAdd" },
-  TelescopeResultsDiffDelete = { default = true, link = "DiffDelete" },
-  TelescopeResultsDiffUntracked = { default = true, link = "NonText" },
-}
-
-for k, v in pairs(highlights) do
-  vim.api.nvim_set_hl(0, k, v)
-end
-
--- This is like "<C-R>" in your terminal.
---     To use it, do `cmap <C-R> <Plug>(TelescopeFuzzyCommandSearch)
-vim.keymap.set(
-  "c",
-  "<Plug>(TelescopeFuzzyCommandSearch)",
-  "<C-\\>e \"lua require('telescope.builtin').command_history "
-    .. '{ default_text = [=[" . escape(getcmdline(), \'"\') . "]=] }"<CR><CR>',
-  { silent = true, noremap = true }
-)
-
-vim.api.nvim_create_user_command("Telescope", function(opts)
-  require("telescope.command").load_command(unpack(opts.fargs))
-end, {
-  nargs = "*",
-  complete = function(_, line)
-    local builtin_list = vim.tbl_keys(require "telescope.builtin")
-    local extensions_list = vim.tbl_keys(require("telescope._extensions").manager)
-
-    local l = vim.split(line, "%s+")
-    local n = #l - 2
-
-    if n == 0 then
-      local commands = { builtin_list, extensions_list }
-      -- TODO(clason): remove when dropping support for Nvim 0.9
-      if vim.fn.has "nvim-0.11" == 1 then
-        commands = vim.iter(commands):flatten():totable()
-      else
-        commands = vim.tbl_flatten(commands)
-      end
-      table.sort(commands)
-
-      return vim.tbl_filter(function(val)
-        return vim.startswith(val, l[2])
-      end, commands)
-    end
-
-    if n == 1 then
-      local is_extension = vim.tbl_filter(function(val)
-        return val == l[2]
-      end, extensions_list)
-
-      if #is_extension > 0 then
-        local extensions_subcommand_dict = require("telescope.command").get_extensions_subcommand()
-        local commands = extensions_subcommand_dict[l[2]]
-        table.sort(commands)
-
-        return vim.tbl_filter(function(val)
-          return vim.startswith(val, l[3])
-        end, commands)
-      end
-    end
-
-    local options_list = vim.tbl_keys(require("telescope.config").values)
-    table.sort(options_list)
-
-    return vim.tbl_filter(function(val)
-      return vim.startswith(val, l[#l])
-    end, options_list)
-  end,
-})
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/rock_manifest b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/rock_manifest
deleted file mode 100644
index f9ea896a..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/rock_manifest
+++ /dev/null
@@ -1,147 +0,0 @@
-rock_manifest = {
-   autoload = {
-      health = {
-         ["telescope.vim"] = "7e299db63944941eca0a9c0a857ee937"
-      }
-   },
-   data = {
-      memes = {
-         planets = {
-            earth = "82832fcbe2e0eedeb3422285312ede07",
-            jupiter = "026b61e7620f516ea15d42813128a626",
-            mars = "552a3bb388e63202c5298b5a8759e720",
-            mercury = "846e54aca2ba791b745a8cc7fb3271e2",
-            moon = "da940686c32ef9e6d59481c418da9acc",
-            neptune = "49326b778a7a38ebfc7c90006967fb72",
-            pluto = "1a9e8e9618dbe487b7c140eec3996a4c",
-            saturn = "c93f370b9099a4a0727c2331d1d57dc6",
-            uranus = "5ff7c70e9b0b825e6793533b6560ef97",
-            venus = "59a266ef8a3cde831a540568ed3fa6b2"
-         }
-      }
-   },
-   doc = {
-      ["secret.txt"] = "59f2d5cd8b01a044b4e7f598244869ec",
-      ["telescope.txt"] = "7216a8bf6e20d1fffcd8a31b127219c7",
-      ["telescope_changelog.txt"] = "5c807cb49d45799276be85c33693c08f"
-   },
-   ftplugin = {
-      ["TelescopePrompt.lua"] = "207de42b635cc7de9ebf5e73128106aa",
-      ["TelescopeResults.lua"] = "50bc0d8c4520c7e678f4122a956d9a49"
-   },
-   lua = {
-      telescope = {
-         ["_.lua"] = "e94b53c4fe57d51c361f0b1df9a6d64f",
-         _extensions = {
-            ["init.lua"] = "6c8e3d4e324874d3e9fef2f3b973027a"
-         },
-         actions = {
-            ["generate.lua"] = "b627dbab3b7d2a572779707529331a5f",
-            ["history.lua"] = "6b34c6a357dfad0762f099c1ba3b426f",
-            ["init.lua"] = "40eb8512d6b1f07e26043e3489dcf94d",
-            ["layout.lua"] = "91470edb5dd37a3025e141d5cc6691bd",
-            ["mt.lua"] = "9c22e387921dbfbd56afdf3fed7b84af",
-            ["set.lua"] = "e0b8491c7e789e09c032e650d8c858ef",
-            ["state.lua"] = "7c488697afa9b5a993920103661c5cc1",
-            ["utils.lua"] = "bc8870c00a9206ab13dcb2ab1142b5bd"
-         },
-         algos = {
-            ["fzy.lua"] = "146c9ee304190d4f50d46f4b279e3182",
-            ["linked_list.lua"] = "9ca6315ec7c740da8198d8d62823040b",
-            ["string_distance.lua"] = "1d63486c008b414586ec505b36c361a2"
-         },
-         builtin = {
-            ["__diagnostics.lua"] = "debd53606d5dee06bb2031026c7c3145",
-            ["__files.lua"] = "d2c0373381ef70771adae4b6e9bb03ce",
-            ["__git.lua"] = "a40e030790285c1e8706d181f0b4a831",
-            ["__internal.lua"] = "89209cb8f9d22b8b6712243182f06c66",
-            ["__lsp.lua"] = "03e5d78027aa37c04280151029744063",
-            ["init.lua"] = "0e0188ef0f37c07387270ea8594c0f2e"
-         },
-         ["command.lua"] = "66d2dea0d60e1a27bfff18e55b1afb4c",
-         config = {
-            ["resolve.lua"] = "2ba48ad00f945ebcb300e211bc0280e3"
-         },
-         ["config.lua"] = "824e9c60f4923d5e389d64ebc3b2914b",
-         ["debounce.lua"] = "562e0f836431d2e8e99130e657212196",
-         ["deprecated.lua"] = "7c1395098782b9c220a0dad7daca2fa6",
-         ["entry_manager.lua"] = "3d493cab0145fa8fd1405b2f160e0ec1",
-         finders = {
-            ["async_job_finder.lua"] = "7653d922e17ba0d3705a6cadcc9b544d",
-            ["async_oneshot_finder.lua"] = "4fd43f20022a9b72188776ef9b667497",
-            ["async_static_finder.lua"] = "66421d0a0cd5ce650bf107faaae87e62"
-         },
-         ["finders.lua"] = "742e701ba623ff99035c455e231dc05a",
-         ["from_entry.lua"] = "7c2b68ad9af645ef0be4d7f929e021eb",
-         ["health.lua"] = "885a0947d640b003eba0b9aac67f5a21",
-         ["init.lua"] = "defe6eaf81f3596ccfafb9647afdac9f",
-         ["log.lua"] = "5c57992c1ac7c17c2e5879d38921f819",
-         ["make_entry.lua"] = "4fe6b147629c109e23c3962ba9cf2ba6",
-         ["mappings.lua"] = "aa736d661e2200619a98629ebb07f505",
-         ["operators.lua"] = "e7244d086698dfaa71be2133820e57ee",
-         pickers = {
-            ["entry_display.lua"] = "27c74c2c4812244722444ebafbccd1ae",
-            ["highlights.lua"] = "2a1497c924141b85e57b106d0d8ec0ed",
-            ["layout.lua"] = "cdcf7f2019df1a715b233c4deae252e9",
-            ["layout_strategies.lua"] = "c11e7ff0f07d4c5e8f860bd2c4116e27",
-            ["multi.lua"] = "7822c69f5e6e537d7ad1d46c01097069",
-            ["scroller.lua"] = "54fc7267917bf9f9076a632293a73cd5",
-            ["window.lua"] = "fc74d7849a1381643289a65678e14aa3"
-         },
-         ["pickers.lua"] = "2dd384f602a65ad2df4ac75ffc77bcfa",
-         previewers = {
-            ["buffer_previewer.lua"] = "544d3e3417a9c496277f3a8118141007",
-            ["init.lua"] = "fa1745a8bef70d35f713d3c4b3c70257",
-            ["previewer.lua"] = "3b02d1b4a9aeb5c6a79771709ca799cc",
-            ["term_previewer.lua"] = "6d38b050b6bc564215113e7cb42bb42a",
-            ["utils.lua"] = "6aad15a9e8ec96ddb7576e0f3bd9bc48"
-         },
-         ["sorters.lua"] = "bb1c9e687331d5cf0952582b2dadab7f",
-         ["state.lua"] = "450c0b38c2497ae8c505a882257e0bed",
-         testharness = {
-            ["helpers.lua"] = "1783be4d1f997b8ad23e9fab7680e0e3",
-            ["init.lua"] = "a447ceb5e7478053e98eb27acd011799",
-            ["runner.lua"] = "1201b1158848fc7e6a581f258776a977"
-         },
-         ["themes.lua"] = "02e18c91826ee7834ffedc9378cbc9b9",
-         ["utils.lua"] = "fe4d526b4086bc9e2f28b7c716eea000"
-      },
-      tests = {
-         automated = {
-            ["action_spec.lua"] = "7ffd015976efdc4bef88bf143e876a29",
-            ["command_spec.lua"] = "46a62833bbda1c56e29b2f183be62b9c",
-            ["entry_display_spec.lua"] = "b10d4d661d3ab2e1b89b412f45942061",
-            ["entry_manager_spec.lua"] = "708fbb4c280288a0a9c6fdd4e396c16e",
-            ["layout_strategies_spec.lua"] = "b146a6044e86ce63449f1463571b3ae2",
-            ["linked_list_spec.lua"] = "ebd7de3a8a8eaabf1e2fa6ced761374b",
-            pickers = {
-               ["find_files_spec.lua"] = "87af15abf6f94d58c667149a3e5a4e59"
-            },
-            ["resolver_spec.lua"] = "ccfc7d99d8d230513c5e22ad5100e02e",
-            ["scroller_spec.lua"] = "3595abe16efe6753888274f11f1818ad",
-            ["sorters_spec.lua"] = "6a5c265752ac0ea6a07ef39d66518b8e",
-            ["telescope_spec.lua"] = "573cee7dce62d9f8cd0d3592f784aade",
-            ["utils_spec.lua"] = "48b3bda11ba9261ddc0b1c122adfbb44"
-         },
-         fixtures = {
-            find_files = {
-               ["file_a.txt"] = "d41d8cd98f00b204e9800998ecf8427e",
-               ["file_abc.txt"] = "d41d8cd98f00b204e9800998ecf8427e"
-            }
-         },
-         ["helpers.lua"] = "9d89080a25a31d5731b967731ed97c1d",
-         pickers = {
-            ["find_files__readme.lua"] = "c4a263e39c831b33a06a9d72ad383263",
-            ["find_files__scrolling_descending_cycle.lua"] = "8f32f279f627bdf01aa21628db699eef"
-         }
-      }
-   },
-   plugin = {
-      ["telescope.lua"] = "0c9ae4aa6947d3bb124d7437d901237e"
-   },
-   scripts = {
-      ["gendocs.lua"] = "bc7142cfb353b6315afec3fa2cac8b22",
-      ["minimal_init.vim"] = "97317fe610193d1fdad989e007a6cff6"
-   },
-   ["telescope.nvim-scm-1.rockspec"] = "ecc6c254c09cc8213cde6d58393bc57b"
-}
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/scripts/gendocs.lua b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/scripts/gendocs.lua
deleted file mode 100644
index ec0047c9..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/scripts/gendocs.lua
+++ /dev/null
@@ -1,49 +0,0 @@
--- Setup telescope with defaults
-if RELOAD then
-  RELOAD "telescope"
-end
-require("telescope").setup()
-
-local docgen = require "docgen"
-
-local docs = {}
-
-docs.test = function()
-  -- TODO: Fix the other files so that we can add them here.
-  local input_files = {
-    "./lua/telescope/init.lua",
-    "./lua/telescope/command.lua",
-    "./lua/telescope/builtin/init.lua",
-    "./lua/telescope/themes.lua",
-    "./lua/telescope/mappings.lua",
-    "./lua/telescope/pickers/layout.lua",
-    "./lua/telescope/pickers/layout_strategies.lua",
-    "./lua/telescope/config/resolve.lua",
-    "./lua/telescope/make_entry.lua",
-    "./lua/telescope/pickers/entry_display.lua",
-    "./lua/telescope/utils.lua",
-    "./lua/telescope/actions/init.lua",
-    "./lua/telescope/actions/state.lua",
-    "./lua/telescope/actions/set.lua",
-    "./lua/telescope/actions/layout.lua",
-    "./lua/telescope/actions/utils.lua",
-    "./lua/telescope/actions/generate.lua",
-    "./lua/telescope/previewers/init.lua",
-    "./lua/telescope/actions/history.lua",
-  }
-
-  local output_file = "./doc/telescope.txt"
-  local output_file_handle = io.open(output_file, "w")
-
-  for _, input_file in ipairs(input_files) do
-    docgen.write(input_file, output_file_handle)
-  end
-
-  output_file_handle:write " vim:tw=78:ts=8:ft=help:norl:\n"
-  output_file_handle:close()
-  vim.cmd [[checktime]]
-end
-
-docs.test()
-
-return docs
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/scripts/minimal_init.vim b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/scripts/minimal_init.vim
deleted file mode 100644
index 6f6731f7..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/scripts/minimal_init.vim
+++ /dev/null
@@ -1,8 +0,0 @@
-set rtp+=.
-set rtp+=../plenary.nvim/
-set rtp+=../tree-sitter-lua/
-
-runtime! plugin/plenary.vim
-runtime! plugin/telescope.lua
-
-let g:telescope_test_delay = 100
diff --git a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/telescope.nvim-scm-1.rockspec b/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/telescope.nvim-scm-1.rockspec
deleted file mode 100644
index f717d640..00000000
--- a/config/neovim/store/lazy-plugins/telescope.nvim/telescope.nvim-scm-1-unstable-2024-05-27-rocks/telescope.nvim/scm-1/telescope.nvim-scm-1.rockspec
+++ /dev/null
@@ -1,44 +0,0 @@
-local MODREV, SPECREV = 'scm', '-1'
-rockspec_format = '3.0'
-package = 'telescope.nvim'
-version = MODREV .. SPECREV
-
-description = {
-  summary = 'Find, Filter, Preview, Pick. All lua, all the time.',
-  detailed = [[
-  A highly extendable fuzzy finder over lists. 
-  Built on the latest awesome features from neovim core. 
-  Telescope is centered around modularity, allowing for easy customization.
-  ]],
-  labels = { 'neovim', 'plugin', },
-  homepage = 'https://github.com/nvim-telescope/telescope.nvim',
-  license = 'MIT',
-}
-
-dependencies = {
-  'lua == 5.1',
-  'plenary.nvim',
-}
-
-source = {
-  url = 'https://github.com/nvim-telescope/telescope.nvim/archive/refs/tags/' .. MODREV .. '.zip',
-  dir = 'telescope.nvim-' .. MODREV
-}
-
-if MODREV == 'scm' then
-  source = {
-    url = 'git://github.com/nvim-telescope/telescope.nvim',
-  }
-end
-
-build = {
-  type = 'builtin',
-  copy_directories = {
-    'doc',
-    'ftplugin',
-    'plugin',
-    'scripts',
-    'autoload',
-    'data',
-  }
-}
diff --git a/config/neovim/store/lazy-plugins/todo-comments.nvim/README.md b/config/neovim/store/lazy-plugins/todo-comments.nvim/README.md
index 4e277428..81f82d68 100644
--- a/config/neovim/store/lazy-plugins/todo-comments.nvim/README.md
+++ b/config/neovim/store/lazy-plugins/todo-comments.nvim/README.md
@@ -19,9 +19,9 @@
 - Neovim >= 0.8.0 (use the `neovim-pre-0.8.0` branch for older versions)
 - a [patched font](https://www.nerdfonts.com/) for the icons, or change them to simple ASCII characters
 - optional:
-  - [ripgrep](https://github.com/BurntSushi/ripgrep) and [plenary.nvim](https://github.com/nvim-lua/plenary.nvim) are used for searching.
-  - [Trouble](https://github.com/folke/trouble.nvim)
-  - [Telescope](https://github.com/nvim-telescope/telescope.nvim)
+  + [ripgrep](https://github.com/BurntSushi/ripgrep) and [plenary.nvim](https://github.com/nvim-lua/plenary.nvim) are used for searching.
+  + [Trouble](https://github.com/folke/trouble.nvim)
+  + [Telescope](https://github.com/nvim-telescope/telescope.nvim)
 
 ## 📦 Installation
 
@@ -149,7 +149,7 @@ Each of the commands below accept the following arguments:
 - `cwd` - Specify the directory to search for comments, like:
 
 ```vim
-:TodoTrouble cwd=~/projects/foobar
+:TodoTelescope cwd=~/projects/foobar
 ```
 
 - `keywords` - Comma separated list of keywords to filter results by. Keywords are case-sensitive.
@@ -170,10 +170,12 @@ This uses the location list to show all todos in your project.
 
 ![image](https://user-images.githubusercontent.com/292349/118135332-bf9c2300-b3b7-11eb-9a40-1307feb27c44.png)
 
-### 🚦 `:TodoTrouble`
+### 🚦 `:Trouble todo`
 
 List all project todos in [trouble](https://github.com/folke/trouble.nvim)
 
+Use Trouble's filtering: `Trouble todo filter = {tag = {TODO,FIX,FIXME}}`
+
 > See screenshot at the top
 
 ### 🔭 `:TodoTelescope`
diff --git a/config/neovim/store/lazy-plugins/todo-comments.nvim/doc/todo-comments.nvim.txt b/config/neovim/store/lazy-plugins/todo-comments.nvim/doc/todo-comments.nvim.txt
index 9780a271..bb323008 100644
--- a/config/neovim/store/lazy-plugins/todo-comments.nvim/doc/todo-comments.nvim.txt
+++ b/config/neovim/store/lazy-plugins/todo-comments.nvim/doc/todo-comments.nvim.txt
@@ -1,4 +1,4 @@
-*todo-comments.nvim.txt*      For Neovim >= 0.8.0     Last change: 2024 May 22
+*todo-comments.nvim.txt*     For Neovim >= 0.8.0     Last change: 2024 June 12
 
 ==============================================================================
 Table of Contents                       *todo-comments.nvim-table-of-contents*
@@ -167,7 +167,7 @@ Each of the commands below accept the following arguments:
 - `cwd` - Specify the directory to search for comments, like:
 
 >vim
-    :TodoTrouble cwd=~/projects/foobar
+    :TodoTelescope cwd=~/projects/foobar
 <
 
 - `keywords` - Comma separated list of keywords to filter results by. Keywords are case-sensitive.
@@ -187,10 +187,12 @@ This uses the quickfix list to show all todos in your project.
 This uses the location list to show all todos in your project.
 
 
-:TODOTROUBLE ~
+:TROUBLE TODO ~
 
 List all project todos in trouble <https://github.com/folke/trouble.nvim>
 
+Use Trouble’s filtering: `Trouble todo filter = {tag = {TODO,FIX,FIXME}}`
+
 
   See screenshot at the top
 
diff --git a/config/neovim/store/lazy-plugins/todo-comments.nvim/lua/telescope/_extensions/todo-comments.lua b/config/neovim/store/lazy-plugins/todo-comments.nvim/lua/telescope/_extensions/todo-comments.lua
index 78e37054..596ca8ab 100644
--- a/config/neovim/store/lazy-plugins/todo-comments.nvim/lua/telescope/_extensions/todo-comments.lua
+++ b/config/neovim/store/lazy-plugins/todo-comments.nvim/lua/telescope/_extensions/todo-comments.lua
@@ -41,7 +41,7 @@ local function todo(opts)
 
       if start then
         kw = Config.keywords[kw] or kw
-        local icon = Config.options.keywords[kw].icon
+        local icon = Config.options.keywords[kw].icon or ' '
         display = icon .. " " .. display
         table.insert(hl, { { 1, #icon + 1 }, "TodoFg" .. kw })
         text = vim.trim(text:sub(start))
diff --git a/config/neovim/store/lazy-plugins/todo-comments.nvim/lua/todo-comments/search.lua b/config/neovim/store/lazy-plugins/todo-comments.nvim/lua/todo-comments/search.lua
index 10310e18..74a5a358 100644
--- a/config/neovim/store/lazy-plugins/todo-comments.nvim/lua/todo-comments/search.lua
+++ b/config/neovim/store/lazy-plugins/todo-comments.nvim/lua/todo-comments/search.lua
@@ -65,25 +65,25 @@ function M.search(cb, opts)
     return
   end
 
-  local args =
-    vim.tbl_flatten({ Config.options.search.args, Config.search_regex(keywords_filter(opts.keywords)), opts.cwd })
-  Job
-    :new({
-      command = command,
-      args = args,
-      on_exit = vim.schedule_wrap(function(j, code)
-        if code == 2 then
-          local error = table.concat(j:stderr_result(), "\n")
-          Util.error(command .. " failed with code " .. code .. "\n" .. error)
-        end
-        if code == 1 and opts.disable_not_found_warnings ~= true then
-          Util.warn("no todos found")
-        end
-        local lines = j:result()
-        cb(M.process(lines))
-      end),
-    })
-    :start()
+  local args = {}
+  vim.list_extend(args, Config.options.search.args)
+  vim.list_extend(args, { Config.search_regex(keywords_filter(opts.keywords)), opts.cwd })
+
+  Job:new({
+    command = command,
+    args = args,
+    on_exit = vim.schedule_wrap(function(j, code)
+      if code == 2 then
+        local error = table.concat(j:stderr_result(), "\n")
+        Util.error(command .. " failed with code " .. code .. "\n" .. error)
+      end
+      if code == 1 and opts.disable_not_found_warnings ~= true then
+        Util.warn("no todos found")
+      end
+      local lines = j:result()
+      cb(M.process(lines))
+    end),
+  }):start()
 end
 
 local function parse_opts(opts)
@@ -106,7 +106,7 @@ end
 
 function M.setlist(opts, use_loclist)
   opts = parse_opts(opts) or {}
-  opts.open = (opts.open ~= nil and {opts.open} or {true})[1]
+  opts.open = (opts.open ~= nil and { opts.open } or { true })[1]
   M.search(function(results)
     if use_loclist then
       vim.fn.setloclist(0, {}, " ", { title = "Todo", id = "$", items = results })
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/.github/ISSUE_TEMPLATE/bug_report_v3.yml b/config/neovim/store/lazy-plugins/trouble.nvim/.github/ISSUE_TEMPLATE/bug_report_v3.yml
deleted file mode 100644
index 20b04ab4..00000000
--- a/config/neovim/store/lazy-plugins/trouble.nvim/.github/ISSUE_TEMPLATE/bug_report_v3.yml
+++ /dev/null
@@ -1,89 +0,0 @@
-name: Bug Report v3
-description: File a bug/issue
-title: "bug v3: "
-labels: [bug v3]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Before** reporting an issue, make sure to read the [documentation](https://github.com/folke/trouble.nvim/tree/dev) and search [existing issues](https://github.com/folke/trouble.nvim/issues). Usage questions such as ***"How do I...?"*** belong in [Discussions](https://github.com/folke/trouble.nvim/discussions) and will be closed.
-  - type: checkboxes
-    attributes:
-      label: Did you check docs and existing issues?
-      description: Make sure you checked all of the below before submitting an issue
-      options:
-        - label: I have read all the trouble.nvim docs
-          required: true
-        - label: I have searched the existing issues of trouble.nvim
-          required: true
-        - label: I have searched the existing issues of plugins related to this issue
-          required: true
-  - type: input
-    attributes:
-      label: "Neovim version (nvim -v)"
-      placeholder: "0.8.0 commit db1b0ee3b30f"
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: "Operating system/version"
-      placeholder: "MacOS 11.5"
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe the bug
-      description: A clear and concise description of what the bug is. Please include any related errors you see in Neovim.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Steps To Reproduce
-      description: Steps to reproduce the behavior.
-      placeholder: |
-        1.
-        2. 
-        3.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected Behavior
-      description: A concise description of what you expected to happen.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Repro
-      description: Minimal `init.lua` to reproduce this issue. Save as `repro.lua` and run with `nvim -u repro.lua`
-      value: |
-        -- DO NOT change the paths and don't remove the colorscheme
-        local root = vim.fn.fnamemodify("./.repro", ":p")
-
-        -- set stdpaths to use .repro
-        for _, name in ipairs({ "config", "data", "state", "cache" }) do
-          vim.env[("XDG_%s_HOME"):format(name:upper())] = root .. "/" .. name
-        end
-
-        -- bootstrap lazy
-        local lazypath = root .. "/plugins/lazy.nvim"
-        if not vim.loop.fs_stat(lazypath) then
-          vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", lazypath, })
-        end
-        vim.opt.runtimepath:prepend(lazypath)
-
-        -- install plugins
-        local plugins = {
-          "folke/tokyonight.nvim",
-          "folke/trouble.nvim",
-          -- add any other plugins here
-        }
-        require("lazy").setup(plugins, {
-          root = root .. "/plugins",
-        })
-
-        vim.cmd.colorscheme("tokyonight")
-        -- add anything else here
-      render: Lua
-    validations:
-      required: false
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/.github/ISSUE_TEMPLATE/feature_request_v3.yml b/config/neovim/store/lazy-plugins/trouble.nvim/.github/ISSUE_TEMPLATE/feature_request_v3.yml
deleted file mode 100644
index 2fc74ae1..00000000
--- a/config/neovim/store/lazy-plugins/trouble.nvim/.github/ISSUE_TEMPLATE/feature_request_v3.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Feature Request v3
-description: Suggest a new feature
-title: "feature: "
-labels: [enhancement v3]
-body:
-  - type: checkboxes
-    attributes:
-      label: Did you check the docs?
-      description: Make sure you read all the docs before submitting a feature request
-      options:
-        - label: I have read all the trouble.nvim docs
-          required: true
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: Is your feature request related to a problem? Please describe.
-      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: Describe the solution you'd like
-      description: A clear and concise description of what you want to happen.
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: Describe alternatives you've considered
-      description: A clear and concise description of any alternative solutions or features you've considered.
-  - type: textarea
-    validations:
-      required: false
-    attributes:
-      label: Additional context
-      description: Add any other context or screenshots about the feature request here.
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/.github/workflows/ci.yml b/config/neovim/store/lazy-plugins/trouble.nvim/.github/workflows/ci.yml
index 0bc9fb39..9138189f 100644
--- a/config/neovim/store/lazy-plugins/trouble.nvim/.github/workflows/ci.yml
+++ b/config/neovim/store/lazy-plugins/trouble.nvim/.github/workflows/ci.yml
@@ -29,9 +29,21 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     needs: tests
-    if: ${{ github.ref == 'refs/heads/main' }}
     steps:
       - uses: actions/checkout@v3
+      - name: Install Neovim
+        shell: bash
+        run: |
+          mkdir -p /tmp/nvim
+          wget -q https://github.com/neovim/neovim/releases/download/nightly/nvim.appimage -O /tmp/nvim/nvim.appimage
+          cd /tmp/nvim
+          chmod a+x ./nvim.appimage
+          ./nvim.appimage --appimage-extract
+          echo "/tmp/nvim/squashfs-root/usr/bin/" >> $GITHUB_PATH
+      - name: Generate docs
+        run: |
+          nvim --version
+          nvim --headless -u tests/init.lua -l "lua/trouble/docs.lua"
       - name: panvimdoc
         uses: kdheepak/panvimdoc@main
         with:
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/.nvim.lsp.json b/config/neovim/store/lazy-plugins/trouble.nvim/.nvim.lsp.json
deleted file mode 100644
index 3eb67cdc..00000000
--- a/config/neovim/store/lazy-plugins/trouble.nvim/.nvim.lsp.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "Lua.diagnostics.disable": ["undefined-local"]
-}
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/CHANGELOG.md b/config/neovim/store/lazy-plugins/trouble.nvim/CHANGELOG.md
index bb94e472..8eb65de9 100644
--- a/config/neovim/store/lazy-plugins/trouble.nvim/CHANGELOG.md
+++ b/config/neovim/store/lazy-plugins/trouble.nvim/CHANGELOG.md
@@ -1,5 +1,281 @@
 # Changelog
 
+## [3.4.2](https://github.com/folke/trouble.nvim/compare/v3.4.1...v3.4.2) (2024-06-14)
+
+
+### Bug Fixes
+
+* correct invalid float positions. Fixes [#502](https://github.com/folke/trouble.nvim/issues/502) ([88a40f1](https://github.com/folke/trouble.nvim/commit/88a40f1cc3af846b520ae167f0177b5faa148c86))
+* **diagnostics:** custom format for code. Fixes [#508](https://github.com/folke/trouble.nvim/issues/508) ([ada78fa](https://github.com/folke/trouble.nvim/commit/ada78fae41fc05d52883f19fb5e22d5a61e0ef08))
+* fixup ([60b0ac3](https://github.com/folke/trouble.nvim/commit/60b0ac3772e991bc194207afc28368a5f15d913a))
+* **highlights:** link TroubleBasename to TroubleFilename. Fixes [#507](https://github.com/folke/trouble.nvim/issues/507) ([276e7b7](https://github.com/folke/trouble.nvim/commit/276e7b7a8764cd59de5c8a588771a54a979ab3c3))
+* **main:** handle windows with changed buffers ([286c044](https://github.com/folke/trouble.nvim/commit/286c04474cbb24894d233e6b0c00f1e6c8d2ae54))
+* **view:** dont go to main when not in the trouble window when closing ([8d5e05c](https://github.com/folke/trouble.nvim/commit/8d5e05c0d0ce7a2c630ce92cb3cc923044848063))
+
+## [3.4.1](https://github.com/folke/trouble.nvim/compare/v3.4.0...v3.4.1) (2024-06-12)
+
+
+### Bug Fixes
+
+* **fzf:** added descriptions ([5e45bb7](https://github.com/folke/trouble.nvim/commit/5e45bb78f8da3444d35616934c180fce3742c439))
+
+## [3.4.0](https://github.com/folke/trouble.nvim/compare/v3.3.0...v3.4.0) (2024-06-11)
+
+
+### Features
+
+* added fzf-lua integration ([d14323f](https://github.com/folke/trouble.nvim/commit/d14323fe3461b89e91fb569148b44731655ae196))
+* **fzf-lua:** added smart open/add that will use selection or all when nothing selected. ([bed3c5b](https://github.com/folke/trouble.nvim/commit/bed3c5b79298d94d4981d86ed699c70f58ceccff))
+
+
+### Bug Fixes
+
+* **fzf-lua:** smart-open on windows ([4d0f045](https://github.com/folke/trouble.nvim/commit/4d0f0454ae2a246ec3e0ff541a347164dac23b7b))
+* initialize `auto_open`. Fixes [#489](https://github.com/folke/trouble.nvim/issues/489) ([0793267](https://github.com/folke/trouble.nvim/commit/0793267d3d4b782e46161931b7cbaaf062a892d7))
+* **spec:** properly process actions. Fixes [#494](https://github.com/folke/trouble.nvim/issues/494) ([3082f4b](https://github.com/folke/trouble.nvim/commit/3082f4b10fe9f0a8aa922065b998bc37115c4bef))
+* **telescope:** autmatically select telescope_files mode if list are files without locations. Fixes [#466](https://github.com/folke/trouble.nvim/issues/466) ([1ad6b14](https://github.com/folke/trouble.nvim/commit/1ad6b141316f90a658c6d654516092d43e3e596c))
+* **telescope:** set end_pos to end of word ([4deb811](https://github.com/folke/trouble.nvim/commit/4deb8111e7ffa48a4a27bad1ecdfb7779f4efb7d))
+* **views:** pending should be considered open. Fixes [#492](https://github.com/folke/trouble.nvim/issues/492) ([57b50a6](https://github.com/folke/trouble.nvim/commit/57b50a6dc129f3a82c3bdd9f81b9f2d4e770ac09))
+
+## [3.3.0](https://github.com/folke/trouble.nvim/compare/v3.2.0...v3.3.0) (2024-06-07)
+
+
+### Features
+
+* **lsp:** most lsp sources now support `params.include_current`. Fixes [#482](https://github.com/folke/trouble.nvim/issues/482) ([29d19d4](https://github.com/folke/trouble.nvim/commit/29d19d4f2102306176578f1fe537fbd9740b19e1))
+* **window:** more options for mapping keys ([fdcfc5a](https://github.com/folke/trouble.nvim/commit/fdcfc5a200491e9509e56e04c6b3cdee8ada3153))
+* you can now use `dd` and `d` to delete items in the trouble list. Fixes [#149](https://github.com/folke/trouble.nvim/issues/149). Fixes [#347](https://github.com/folke/trouble.nvim/issues/347) ([e879302](https://github.com/folke/trouble.nvim/commit/e879302d003bf5bda746a36365431d4a72cf3226))
+
+
+### Bug Fixes
+
+* **api:** only refresh on open if there's no action. Fixes [#488](https://github.com/folke/trouble.nvim/issues/488) ([2661f46](https://github.com/folke/trouble.nvim/commit/2661f4612209cbbc1106fb9537666ea0133e4859))
+* **preview:** fixed mouse clicks in the preview main window. Fixes [#484](https://github.com/folke/trouble.nvim/issues/484) ([98d9ed7](https://github.com/folke/trouble.nvim/commit/98d9ed74aec4e82171de3ae0541cdd078558e546))
+* **telescope:** show error when use tries to add when telescope picker does not exist ([c11dc27](https://github.com/folke/trouble.nvim/commit/c11dc2777d52da2c8da25836817e43608ec951a5))
+* use vim.loop for nvim 0.9 in view/init.lua ([#487](https://github.com/folke/trouble.nvim/issues/487)) ([791278e](https://github.com/folke/trouble.nvim/commit/791278e498e1147520e4214982767f77ca4a99df))
+* **view:** when calling open when the view is already open, do a refresh. See [#485](https://github.com/folke/trouble.nvim/issues/485) ([39595e8](https://github.com/folke/trouble.nvim/commit/39595e883e2f91456413ca4df287575d31665940))
+
+## [3.2.0](https://github.com/folke/trouble.nvim/compare/v3.1.0...v3.2.0) (2024-06-06)
+
+
+### Features
+
+* **lsp:** add incoming/outgoing calls to lsp mode ([8adafc1](https://github.com/folke/trouble.nvim/commit/8adafc14d8fe2a4471a0311ff72927250390d7bd))
+* **lsp:** added support for showing locations from lsp execute commands ([b1d16ac](https://github.com/folke/trouble.nvim/commit/b1d16ac02d787e40165130e0cd09474ce639b175))
+* promise class ([84f0c6d](https://github.com/folke/trouble.nvim/commit/84f0c6d047dbf182622f3d89bc47ec4a70c900b2))
+
+
+### Bug Fixes
+
+* **api:** show error when an invalid mode was used. Fixes [#465](https://github.com/folke/trouble.nvim/issues/465) ([4b1914c](https://github.com/folke/trouble.nvim/commit/4b1914c5cdbf7be18fee797c410df2faa2be13f2))
+* **format:** pos format. See [#472](https://github.com/folke/trouble.nvim/issues/472) ([abdfa1d](https://github.com/folke/trouble.nvim/commit/abdfa1daeb9713470a9b61676a82f24f32e31900))
+* **lsp:** check for nil on faulty lsp results ([d7f69ff](https://github.com/folke/trouble.nvim/commit/d7f69ff5638cf1864cabac54ade1b1694adfe085))
+* **lsp:** dont process nil results ([06a4892](https://github.com/folke/trouble.nvim/commit/06a48922e83b114a78c63ec770819b4afacd2166))
+* **lsp:** send request only to needed clients ([c147a75](https://github.com/folke/trouble.nvim/commit/c147a75c421b2df6986d82f61657ccec2f302091))
+* **lsp:** use document uri of document symbols don't have an uri set. Fixes [#480](https://github.com/folke/trouble.nvim/issues/480) ([358f0ee](https://github.com/folke/trouble.nvim/commit/358f0ee6ce4c379a3b0c37bb04ab6587c86e285a))
+* **preview:** hide winbar when previewing in main. Fixes [#464](https://github.com/folke/trouble.nvim/issues/464) ([250ea79](https://github.com/folke/trouble.nvim/commit/250ea79c810a3e5fff846c788792441f1c795c92))
+* **preview:** respect fold settings. Fixes [#459](https://github.com/folke/trouble.nvim/issues/459) ([29d1bb8](https://github.com/folke/trouble.nvim/commit/29d1bb81adc847e89ddbbf5b11ff0079daf7cc0a))
+* **preview:** set correct extmark priorities in preview highlight. Fixes [#476](https://github.com/folke/trouble.nvim/issues/476) ([13ad959](https://github.com/folke/trouble.nvim/commit/13ad95902cf479b0fa091a77368af0e03b486fe3))
+* **view:** correctly set folding options to wo. See [#477](https://github.com/folke/trouble.nvim/issues/477) ([9151797](https://github.com/folke/trouble.nvim/commit/915179759c9459b69faae90a38da6fc1ca6b90d7))
+* **view:** ensure fold settings are correct for the trouble views. See [#477](https://github.com/folke/trouble.nvim/issues/477) ([b5181b6](https://github.com/folke/trouble.nvim/commit/b5181b65912c704d5378f8fe6889924f0182c357))
+* **view:** execute actions on first render ([97bfb74](https://github.com/folke/trouble.nvim/commit/97bfb74826476b26634b5321c5d8dfbc46e41497))
+* **window:** account for winbar for preview in main. Fixes [#468](https://github.com/folke/trouble.nvim/issues/468) ([23ded52](https://github.com/folke/trouble.nvim/commit/23ded52593d017fd7d6042215460419801e35481))
+* **window:** set default winblend=0. See [#468](https://github.com/folke/trouble.nvim/issues/468) ([e296940](https://github.com/folke/trouble.nvim/commit/e2969409cf3f38f69913cc8fd9aa13137aabe760))
+
+
+### Performance Improvements
+
+* use promises for fetching sections ([e49a490](https://github.com/folke/trouble.nvim/commit/e49a49044cca072c4aca1cb3a5013aa92ac3b4f9))
+
+## [3.1.0](https://github.com/folke/trouble.nvim/compare/v3.0.0...v3.1.0) (2024-05-31)
+
+
+### Features
+
+* added severity filter keymap and improved filtering actions ([7842dbb](https://github.com/folke/trouble.nvim/commit/7842dbb70f088cbaae969004bd2fbae09b2a2d26))
+* only open trouble when results (optionally). Fixes [#450](https://github.com/folke/trouble.nvim/issues/450) ([8fbd2ab](https://github.com/folke/trouble.nvim/commit/8fbd2abb3ff42ebb134e389f405bfa9140db1fe3))
+* **telescope:** allow passing additional trouble options to telescope open/add. Fixes [#457](https://github.com/folke/trouble.nvim/issues/457) ([4eaaf9c](https://github.com/folke/trouble.nvim/commit/4eaaf9cf8b967010998ccfc4af525b3e6d70b8b5))
+
+
+### Bug Fixes
+
+* close section session when needed ([2caf73d](https://github.com/folke/trouble.nvim/commit/2caf73d2d136625d77c0d25cc3b5d5e1e0bef3d0))
+* **fold:** start folding with closest non leaf node. Fixes [#420](https://github.com/folke/trouble.nvim/issues/420) ([f248c69](https://github.com/folke/trouble.nvim/commit/f248c6941ba5a48be531cbb25aac32e1042c65ad))
+* **follow:** improve the way follow works ([cf81aac](https://github.com/folke/trouble.nvim/commit/cf81aaca820017388fc630c534774c95b58233f2))
+* **format:** compat old signs ([0e843ed](https://github.com/folke/trouble.nvim/commit/0e843edbdc1b25ca6a5468d636b22e7035a4ad69))
+* **format:** fallback to sign_defined. Fixes [#448](https://github.com/folke/trouble.nvim/issues/448) ([36545cb](https://github.com/folke/trouble.nvim/commit/36545cb88fa999f211bfc341998f501803bf5434))
+* **lsp:** batch get offset position for lsp results. See [#452](https://github.com/folke/trouble.nvim/issues/452) ([96c30dc](https://github.com/folke/trouble.nvim/commit/96c30dc6ae10e42ab47c1f68d7f715bf01100c48))
+* **lsp:** correctly clear location cache ([7ea94a6](https://github.com/folke/trouble.nvim/commit/7ea94a6366141878758938010e4a0818a56721ad))
+* **lsp:** exclude locations that match the current line ([8c03e13](https://github.com/folke/trouble.nvim/commit/8c03e133bc88fb7c242e9915d06f0a8978511c29))
+* make sure line is always a string passed to get_line_col ([5a12185](https://github.com/folke/trouble.nvim/commit/5a12185787896da209738bd41cbe4133d82ce9bb))
+* **preview:** correctly load non-scratch buffers ([965f56f](https://github.com/folke/trouble.nvim/commit/965f56f3e17baee4213cf50637f92de4be32d8e9))
+* **preview:** correctly pass options to create scratch buffers. Fixes [#451](https://github.com/folke/trouble.nvim/issues/451) ([c50c7e3](https://github.com/folke/trouble.nvim/commit/c50c7e35d4f504d6336875994109c546ff0634b5))
+* **preview:** don't error on invalid positions ([6112c3c](https://github.com/folke/trouble.nvim/commit/6112c3c5c903a05178276a083edc756ba3cb65a0))
+* **qf:** only listen for TextChanged in the main buffer. See [#201](https://github.com/folke/trouble.nvim/issues/201) ([f75992f](https://github.com/folke/trouble.nvim/commit/f75992f9a1b93cc4490dca28f93acc921c25419e))
+* **qf:** update qflist on TextChanged to update pos. Fixes [#201](https://github.com/folke/trouble.nvim/issues/201) ([c1d9294](https://github.com/folke/trouble.nvim/commit/c1d9294eb73479fd4007237613eb7e945cd84e20))
+* stop ([bda8de4](https://github.com/folke/trouble.nvim/commit/bda8de4205f06c3939b8b59e4da1f3713d04ea05))
+* **telescope:** remove filter on `buf = 0`. See [#399](https://github.com/folke/trouble.nvim/issues/399) ([f776ab0](https://github.com/folke/trouble.nvim/commit/f776ab0ff1658f052b7345d4bbd5961b443ea8a0))
+* **view:** restore loc on first render and dont delete last loc if trouble window was never visisted. See [#367](https://github.com/folke/trouble.nvim/issues/367) ([51bf510](https://github.com/folke/trouble.nvim/commit/51bf51068d929173157ebcfb863115760c837355))
+
+
+### Performance Improvements
+
+* **lsp:** cache location requests ([6053627](https://github.com/folke/trouble.nvim/commit/6053627943020d9774c75ec637eb06847a79c7a1))
+* **lsp:** optimize batch fetching lsp item locations. Fixes [#452](https://github.com/folke/trouble.nvim/issues/452) ([a6f1af5](https://github.com/folke/trouble.nvim/commit/a6f1af567fc987306f0f328e78651bab1bfe874e))
+* much faster treesitter highlighter ([d4de08d](https://github.com/folke/trouble.nvim/commit/d4de08d9314a9ddf7278ee16efb58d0efe332bc8))
+* prevent autocmd leaks ([9e3391c](https://github.com/folke/trouble.nvim/commit/9e3391ce735f4f6fa98fe70ba9a3e444f2fd539a))
+* **preview:** re-use existing preview when preview is for the same file ([a415b64](https://github.com/folke/trouble.nvim/commit/a415b64b8a702ab6388e3aaaf16306750fc53f79))
+
+## [3.0.0](https://github.com/folke/trouble.nvim/compare/v2.10.0...v3.0.0) (2024-05-30)
+
+
+### ⚠ BREAKING CHANGES
+
+* Trouble v3 is now merged in main. You may need to update your configs.
+
+### Features
+
+* `Trouble` now shows vim.ui.select to chose a mode ([0189184](https://github.com/folke/trouble.nvim/commit/01891844a9adb3b5b2de508724024d516a2b891a))
+* added basename/dirname ([bb3740a](https://github.com/folke/trouble.nvim/commit/bb3740a1c41e83bcd59c3fe04714a85b445c4742))
+* added help ([68ac238](https://github.com/folke/trouble.nvim/commit/68ac238aeef333a37dc95d875bed46a2698793d5))
+* added kind symbol highlights ([de08657](https://github.com/folke/trouble.nvim/commit/de086574208b19b762055487334ce50ca95cc008))
+* added lpeg parser for parsing `:Trouble` args into lua tables ([b25ef53](https://github.com/folke/trouble.nvim/commit/b25ef53117b0bdc5733d26e42a55c7f32daadbe5))
+* added missing fold keymaps. folding is now feature complete ([9fb1be0](https://github.com/folke/trouble.nvim/commit/9fb1be0915202989bd17e0c9768be23ae7b15010))
+* added multiline option back ([d80e978](https://github.com/folke/trouble.nvim/commit/d80e978f70cc3c026ad028dafbde9e3ad45ba54c))
+* added proper api ([a327003](https://github.com/folke/trouble.nvim/commit/a3270035999dc965176ccd140dcc9afe57f0934a))
+* added support for formatting fields with a treesitter language ([21cfee9](https://github.com/folke/trouble.nvim/commit/21cfee9e4e026482c1c9719156aae3152b2c590a))
+* allow items without buf ([c3b01ce](https://github.com/folke/trouble.nvim/commit/c3b01ce7662dda3a542c52aa1521f8467300c84a))
+* allow top-level filter ([12447df](https://github.com/folke/trouble.nvim/commit/12447df2a81205b8bda12dd1c9271c1c0059184f))
+* **config:** added `auto_jump` to jump to the item when there's only one. Fixes [#409](https://github.com/folke/trouble.nvim/issues/409) ([94a84ab](https://github.com/folke/trouble.nvim/commit/94a84ab884757b1a9f697807e7bdace8b8919afb))
+* **config:** added keymap to inspect an item. Useful for dev ([9da1a47](https://github.com/folke/trouble.nvim/commit/9da1a4783bc0d87427f5cbf6964321774e0bb1bc))
+* **config:** set `focus=false` by default ([c7e5398](https://github.com/folke/trouble.nvim/commit/c7e539819e6d21428a747f46715a23b3d1a204b6))
+* **diagnostics:** added support for diagnostics signs on Neovim &gt;= 0.10.0. Fixes [#369](https://github.com/folke/trouble.nvim/issues/369), fixes [#389](https://github.com/folke/trouble.nvim/issues/389) ([6303740](https://github.com/folke/trouble.nvim/commit/6303740eb1a0730b5654d554ba38bd9614c87e28))
+* **filter:** added filetype filter ([e541444](https://github.com/folke/trouble.nvim/commit/e5414444bdbd5fb70a954ad24abeaa0866179f62))
+* **filter:** easier filtering of any values ([1b528d8](https://github.com/folke/trouble.nvim/commit/1b528d8f3b91fe07ab4f27cbe8eee65b0532192b))
+* **filter:** range filter ([34a06d6](https://github.com/folke/trouble.nvim/commit/34a06d6f4bd32b37f685a36a5037c1556ce6b88f))
+* filters, formatters and sorters are now configurable ([c16679d](https://github.com/folke/trouble.nvim/commit/c16679ddf67f28b5df0735f488497a4c1e7881ee))
+* **format:** formats now support `{one|two}`. First field that returns a value will be used ([26ad82e](https://github.com/folke/trouble.nvim/commit/26ad82eb3c81a434ade3d7bebd97e02565ac717e))
+* global view filters and easy toggling of just items of the current buffer ([11e7c39](https://github.com/folke/trouble.nvim/commit/11e7c39803ff33c68346019a46172fe9be5f3f6d))
+* improved commandline parser and completion ([f7eccfb](https://github.com/folke/trouble.nvim/commit/f7eccfbddef64f3379cf6997617cb41e3005f355))
+* initial commit of rewrite ([d9542ca](https://github.com/folke/trouble.nvim/commit/d9542ca97e37a43844d9088bf453bbb257de423c))
+* item hierarchies and directory grouping ([d2ed413](https://github.com/folke/trouble.nvim/commit/d2ed41320e548149d024634d8a6aa1b5c40396a1))
+* Item.get_lang and Item.get_ft ([498da6b](https://github.com/folke/trouble.nvim/commit/498da6bcff8170f620506f66dd71465b3565baaa))
+* **item:** util method to add missing text to items ([de9e7e6](https://github.com/folke/trouble.nvim/commit/de9e7e68ebb7aa36d78a68207d42943d49a31a85))
+* **lsp:** added `lsp_incoming_calls` and `lsp_outgoing_calls`. Closes [#222](https://github.com/folke/trouble.nvim/issues/222) ([b855469](https://github.com/folke/trouble.nvim/commit/b855469429f10c74a3314432ba2735a32115cbb2))
+* **lsp:** document symbols caching and compat with Neovim 0.9.5 ([2f49b92](https://github.com/folke/trouble.nvim/commit/2f49b920b0822a3d06c25d24d840830016168a82))
+* main window tracking ([23a0631](https://github.com/folke/trouble.nvim/commit/23a06316607fe2d2ab311fdb5bb45157c2d8ec91))
+* make the preview action a toggle ([86da179](https://github.com/folke/trouble.nvim/commit/86da1794855f71ec592efec2a6a65911f08892a2))
+* preview can now be shown in a split/float ([e2919eb](https://github.com/folke/trouble.nvim/commit/e2919eb565ccc66d4adad729b4e323a718d41953))
+* preview is now fully configurable ([b99110a](https://github.com/folke/trouble.nvim/commit/b99110adc3815f1b7b8fe3dd40f4c9da315f7cca))
+* **preview:** option to force loading real buffers in preview. Fixes [#435](https://github.com/folke/trouble.nvim/issues/435) ([ccacba2](https://github.com/folke/trouble.nvim/commit/ccacba22b2c1946cfe1b9f767f7880bcd031ad7c))
+* **preview:** use a float to show preview in the main window instead of messing with the main window itself ([9e0311d](https://github.com/folke/trouble.nvim/commit/9e0311d177af7cd6750d88280d589ceca4f7685a))
+* **preview:** window var to know a window is a preview win ([dcecbb9](https://github.com/folke/trouble.nvim/commit/dcecbb9b9d67770c8df4c1c49b91631fbdae8ae5))
+* **qf:** add treesitter highlighting to quickfix/loclist. Fixes [#441](https://github.com/folke/trouble.nvim/issues/441) ([325d681](https://github.com/folke/trouble.nvim/commit/325d681953611336cdfdf08a3d71e5125c5f89a5))
+* **render:** `{field:ts}` will now use the treesitter lang of the item buffer for highlighting ([21af85c](https://github.com/folke/trouble.nvim/commit/21af85cc97860e3bcf157891c2598af517f9b421))
+* **render:** added support for rendering multiple sections ([332b25b](https://github.com/folke/trouble.nvim/commit/332b25b09c7159a82322ec97f7aa1717133ffa6f))
+* **source:** added lsp source ([3969907](https://github.com/folke/trouble.nvim/commit/39699074cd18cdeb5e9a29e80ffd2d239c58ac7e))
+* **source:** added quickfix source ([3507b7b](https://github.com/folke/trouble.nvim/commit/3507b7b694ddee5921c7004c6bed0b71ab8e0920))
+* **sources:** added support for loading external sources ([89ac6f1](https://github.com/folke/trouble.nvim/commit/89ac6f1a7f238ca65d964569786b205a496ad213))
+* **sources:** added telescope source ([39069e2](https://github.com/folke/trouble.nvim/commit/39069e2f4139c7ae28cf7e16fe610b8462fb3939))
+* **source:** sources can now have multiple child sources ([c433301](https://github.com/folke/trouble.nvim/commit/c4333014a770eca5a66c7685f4063d8de13517db))
+* **source:** sources now always execute in the context of the main window even when a preview is active ([4eab561](https://github.com/folke/trouble.nvim/commit/4eab56122bb335a5627405791e4691af5043493e))
+* **statusline:** added statusline component ([5c0b163](https://github.com/folke/trouble.nvim/commit/5c0b1639c83266427489bb515bffd8b8bc055809))
+* **statusline:** allow 'fixing' the statusline bg color based on a hl_group. Fixes [#411](https://github.com/folke/trouble.nvim/issues/411) ([986b44d](https://github.com/folke/trouble.nvim/commit/986b44d4471ee8b8a708a0172fb0829a9c858543))
+* **statusline:** statusline api ([c219a1a](https://github.com/folke/trouble.nvim/commit/c219a1a9f56a70ac55e89325c333fcfd0616ea97))
+* **telescope:** added option to add telescope results to trouble, without clearing the existing results. Fixes [#370](https://github.com/folke/trouble.nvim/issues/370) ([a7119ab](https://github.com/folke/trouble.nvim/commit/a7119abb0cd1b1ef058fc99c036230bbe153504f))
+* **tree:** added `flatten()` to get all items from the tree ([35c0236](https://github.com/folke/trouble.nvim/commit/35c0236ceb78fc37a94f5882f736416ebb15c306))
+* Trouble v3 is now merged in main. You may need to update your configs. ([1b362b8](https://github.com/folke/trouble.nvim/commit/1b362b861eacb9b2367ce92129fad86352707311))
+* **util:** better notify functions ([c68c915](https://github.com/folke/trouble.nvim/commit/c68c915353dc5162e5d7494b5ca0919f0e336318))
+* **util:** fast get_lines for a buffer ([6940cd8](https://github.com/folke/trouble.nvim/commit/6940cd8c6913e834254e7221ede0ca6a38c81fc0))
+* **util:** fast plain text split ([6a30aec](https://github.com/folke/trouble.nvim/commit/6a30aec15ca90e8b396a381f8f1b7c452f6ce68a))
+* **util:** make throttles configurable ([8c297c1](https://github.com/folke/trouble.nvim/commit/8c297c171547e8c81fc918a7f31b3c2a8ce58512))
+* **view:** added support for pinned views. Main window of the view will stay the same as long as its a valid window ([17131e2](https://github.com/folke/trouble.nvim/commit/17131e2b9a0b7d17046cb9b7ed9b7eeb36b6423a))
+* **view:** expose some params in the trouble window var. Fixes [#357](https://github.com/folke/trouble.nvim/issues/357) ([a4b9849](https://github.com/folke/trouble.nvim/commit/a4b9849ce7ec14213069034403f5fc96d174046b))
+* **view:** follow now also scrolls to the file in the list when not on an item ([30b939e](https://github.com/folke/trouble.nvim/commit/30b939efebd8559e9e84c95e3658c447f702b1c2))
+* **view:** follow the current item in the list ([e76e280](https://github.com/folke/trouble.nvim/commit/e76e280701e643e8a3074edcb86e819298e7df12))
+* **view:** when toggling a trouble list, restore to the last location. Fixes [#367](https://github.com/folke/trouble.nvim/issues/367) ([1d951f5](https://github.com/folke/trouble.nvim/commit/1d951f5c13fd56933e9170b84bfcbbf8ca1a582b))
+* **window:** added possibility to override TroubleNormalNC. Fixes [#216](https://github.com/folke/trouble.nvim/issues/216) ([daa5157](https://github.com/folke/trouble.nvim/commit/daa5157e3f0f6cf80ca473d7e43bd73734d6594d))
+* **window:** added support for showing a floating window over the main window ([3525169](https://github.com/folke/trouble.nvim/commit/35251698e7836ecb3ee981efe2efe7bcb64ca5f3))
+* **window:** allow setting width/height a size for splits. either will be used based on position ([e8ee9b0](https://github.com/folke/trouble.nvim/commit/e8ee9b01ee46f9cd2e2a8fe8b883320f3212608d))
+* **window:** expose some window vars for integration with other plugins (edgy.nvim) ([aae1da8](https://github.com/folke/trouble.nvim/commit/aae1da81cba50ca207ce3681e5ef927bd369f074))
+
+
+### Bug Fixes
+
+* add vim to parser globals ([6077342](https://github.com/folke/trouble.nvim/commit/6077342efe9e7f77756dd064cdb2129ffea5674f))
+* **api:** make sure new=true works when opening with a mode string ([398ac76](https://github.com/folke/trouble.nvim/commit/398ac76019a74bbbe0c2b77c0a0a7a1e4ce71c3d))
+* better defaults for lsp/diagnostics ([569416d](https://github.com/folke/trouble.nvim/commit/569416d52f1953c35ba8494d7cab2be1b01fe409))
+* better way of creating preview buffers ([667b010](https://github.com/folke/trouble.nvim/commit/667b010ba81d7ce49fa2cca6cb80c0b85b328543))
+* **command:** improved command completion ([9f59aac](https://github.com/folke/trouble.nvim/commit/9f59aac5ccdb3b5c2c1425176e0112efd7b84a16))
+* **commmand:** show mode descriptions ([ce488b9](https://github.com/folke/trouble.nvim/commit/ce488b9b4ddc0f9a61d48d0ae8974c22e5472e0c))
+* **config:** fixed some highlights to use the latest treesitter hl groups ([63313cd](https://github.com/folke/trouble.nvim/commit/63313cd5a1e55d1ec870f9716f2e6cc9b6471cfc))
+* deprecated tbl_islist ([#436](https://github.com/folke/trouble.nvim/issues/436)) ([5aa7993](https://github.com/folke/trouble.nvim/commit/5aa79935f1de301ed3592981ad7031c166cc5c84))
+* diagnostics sections ([27efb63](https://github.com/folke/trouble.nvim/commit/27efb6326d8bb9019d2b69e737c1c3741a3af568))
+* **diagnostics:** use main buffer for buffer-local diags ([259770d](https://github.com/folke/trouble.nvim/commit/259770dd860fd08007d13c116a5a7ee985e5f5bf))
+* **filter:** fix range filter to include col ([6cae8af](https://github.com/folke/trouble.nvim/commit/6cae8af72ccf1be72718d3f735a467bff23c9beb))
+* **filter:** range should also check that the buffer is the same ([fdd27d8](https://github.com/folke/trouble.nvim/commit/fdd27d8ac5276147b91cee2c2578b178a3dd7be2))
+* **format:** always pass a valid buffer to ftdetect even just the current onw ([b01b11e](https://github.com/folke/trouble.nvim/commit/b01b11efc901dc3bc5f89d164de5eb71d56cc257))
+* **help:** sort keymaps case incensitive ([5d81927](https://github.com/folke/trouble.nvim/commit/5d81927bc7eb9de085d9ea6cf8b977616694f771))
+* **highlights:** reset statusline hl groups when colorscheme changes ([a665272](https://github.com/folke/trouble.nvim/commit/a665272b1e1d4b06b1b6824cc3f853874b06c0a1))
+* **item:** clamp pos ([6c0204c](https://github.com/folke/trouble.nvim/commit/6c0204cb7d758d70edc5b88919f19a76de853aa7))
+* **jump:** save current main cursor to jump list before jumping. Fixes [#385](https://github.com/folke/trouble.nvim/issues/385) ([bd8bfc8](https://github.com/folke/trouble.nvim/commit/bd8bfc8abedbf992a6d8c0db941780e1a79d3b41))
+* **lsp:** check if buf is still valid after receiving document symbols ([33ec71c](https://github.com/folke/trouble.nvim/commit/33ec71cf377c518d8b8c022e2b46511f85c3a47d))
+* **lsp:** handle invalid positions. Fixes [#434](https://github.com/folke/trouble.nvim/issues/434) ([371cf26](https://github.com/folke/trouble.nvim/commit/371cf26bcbddb39e2e91d69dae90a480f29c3fc0))
+* **lsp:** refresh on LspAttach ([17afc44](https://github.com/folke/trouble.nvim/commit/17afc44fc317449128f1804ea6f316ce457295cc))
+* **main:** always return a main window, even when no main. Fixes [#426](https://github.com/folke/trouble.nvim/issues/426) ([bda72a5](https://github.com/folke/trouble.nvim/commit/bda72a548e4eb9cab3bcf567ca965b21a136263d))
+* make focus the default ([ba1ae49](https://github.com/folke/trouble.nvim/commit/ba1ae497e1899af0e57adb815ab30e37b73d0b76))
+* **parser:** handle empty args ([e667da7](https://github.com/folke/trouble.nvim/commit/e667da705c64509347829326d19668e3276355e9))
+* **preview:** better preview for multiline items ([60c9fdc](https://github.com/folke/trouble.nvim/commit/60c9fdcad7003fe6ed6f4a225bf709acd19068df))
+* **preview:** center preview location and open folds. See [#408](https://github.com/folke/trouble.nvim/issues/408) ([a87fa2a](https://github.com/folke/trouble.nvim/commit/a87fa2ae521d058ad67dc7610efdd234b792d6ef))
+* **preview:** clear highlights of preview buffer ([d590491](https://github.com/folke/trouble.nvim/commit/d590491de9515caf5ec3a3a0bd0fdb3047b1fda3))
+* **preview:** dont show preview for directories. Fixes [#410](https://github.com/folke/trouble.nvim/issues/410) ([769ee0f](https://github.com/folke/trouble.nvim/commit/769ee0f632ea3b6ffc5716590a711db340e80caf))
+* **preview:** fixup for directory check ([eed25b2](https://github.com/folke/trouble.nvim/commit/eed25b2bcea6e59e5f5c92c184ac08be4590b6de))
+* **preview:** pass valid buffer so that ftdetect works for ts files. See [#435](https://github.com/folke/trouble.nvim/issues/435) ([65f2430](https://github.com/folke/trouble.nvim/commit/65f2430f6d6276832ec9500b5eafabb01e17d01a))
+* **preview:** set correct winhighlight for preview window in main. See [#408](https://github.com/folke/trouble.nvim/issues/408) ([8c3c1db](https://github.com/folke/trouble.nvim/commit/8c3c1db742e74f0e48134cd4e84c976c2706e6b6))
+* **preview:** unload preview buffer again when closing and when it wasnt loaded before ([8cc680a](https://github.com/folke/trouble.nvim/commit/8cc680a25f30e63c9e92005155c7916b9a000ac9))
+* proper deprecated fix ffs... Fixes [#438](https://github.com/folke/trouble.nvim/issues/438) ([a8264a6](https://github.com/folke/trouble.nvim/commit/a8264a65a0b894832ea642844f5b7c30112c458f))
+* properly deal with multiline treesitter segments ([31681a9](https://github.com/folke/trouble.nvim/commit/31681a92e2e7fa0537284ad1516561b46cdb4a24))
+* **qf:** col/row offsets ([8ad817f](https://github.com/folke/trouble.nvim/commit/8ad817f12b4c9c4d6bd239c963cda3ac518d272a))
+* remove `buf = 0` sorting since it acts weirdly with next/prev ([2b589e9](https://github.com/folke/trouble.nvim/commit/2b589e938c4b5245d7f74b7f23293645e566cee3))
+* remove space from `zz zv` command ([ca2cd56](https://github.com/folke/trouble.nvim/commit/ca2cd56d14df8fc619ba44bebd5334d78b57d74c))
+* require Neovim &gt;= 0.9.2 ([2448521](https://github.com/folke/trouble.nvim/commit/24485219198a1ab10731e45229f2736ec3242231))
+* **section:** dont trigger on invalid buffers ([29ee890](https://github.com/folke/trouble.nvim/commit/29ee890b28280b0a8a504571596a0508244122e1))
+* **setup:** add check for NEovim 0.10.0 or markdown parsers. Fixes [#413](https://github.com/folke/trouble.nvim/issues/413) ([6267ef1](https://github.com/folke/trouble.nvim/commit/6267ef15e98bd8df29be7a8d6f47b0e724ceaaaf))
+* **sources:** always load sources when not registered yet. Fixes [#393](https://github.com/folke/trouble.nvim/issues/393) ([1470302](https://github.com/folke/trouble.nvim/commit/1470302bd7eef110aef3710dfc8808bc3c3a2179))
+* specs and tests ([315f624](https://github.com/folke/trouble.nvim/commit/315f624492c54f9893631459fc79e6c0b33b7cad))
+* **statusline:** double escape `#`. Fixes [#424](https://github.com/folke/trouble.nvim/issues/424) ([9ddfd47](https://github.com/folke/trouble.nvim/commit/9ddfd47eec3a1bd43f5e7dd34eb1084f6793eaba))
+* **statusline:** make sure max_items is honored ([da8ba7d](https://github.com/folke/trouble.nvim/commit/da8ba7dfba2341c5ea679e6cff85c01943777380))
+* **statusline:** schedule statusline refresh ([f000daa](https://github.com/folke/trouble.nvim/commit/f000daadd6d49b30eebacb2a6dd7c4d9758f2de6))
+* **telescope:** close telescope after sending results to trouble ([2753932](https://github.com/folke/trouble.nvim/commit/2753932bed13cff73be80e2565043dccce899983))
+* **telescope:** deprecation warning for old telescope provider ([0d7cdeb](https://github.com/folke/trouble.nvim/commit/0d7cdeba2d139f26314d53e2e06507b6a7b72e3b))
+* **throttle:** fixed throttling so that it now only gets scheduled when there are pending args ([0db2084](https://github.com/folke/trouble.nvim/commit/0db20847636e6715cb2d1c542fee34d349f47ee3))
+* **tree:** fixed tree item count. Fixes [#419](https://github.com/folke/trouble.nvim/issues/419) ([cb59440](https://github.com/folke/trouble.nvim/commit/cb594402cf4407bbf54111c20ef39d42d9b017f6))
+* **tree:** make sure qf items always have a unique id. Fixes [#367](https://github.com/folke/trouble.nvim/issues/367) ([c0755d5](https://github.com/folke/trouble.nvim/commit/c0755d59731869994187b04adcb89ebce75c27eb))
+* **treesitter:** show warning for missing treesitter parsers ([4253652](https://github.com/folke/trouble.nvim/commit/425365272136c731eea9da4c337f7b1dfe4d44d6))
+* **tree:** use format as node id for group without fields ([a29c293](https://github.com/folke/trouble.nvim/commit/a29c29382da0dcb8554da25e40a4d2495dff771f))
+* **ui:** better deal with invalid items positions and extmarks. Fixes [#404](https://github.com/folke/trouble.nvim/issues/404) ([bc0a194](https://github.com/folke/trouble.nvim/commit/bc0a19482ee8f68eb427939df2e28cca800b9cbb))
+* **util:** deprecation warnings for tbl_islist ([7577f3a](https://github.com/folke/trouble.nvim/commit/7577f3a82ff60ef7425451b1f40dd83ffee12307))
+* **util:** typo ([37f6266](https://github.com/folke/trouble.nvim/commit/37f62665dfc8db002f7fe62ae6b467c566329ec3))
+* **util:** use xpcall in throttle for better stack traces ([6d9a0ba](https://github.com/folke/trouble.nvim/commit/6d9a0baeb226548b967329d7c045c38ff16a19e8))
+* **view:** check if trouble win is still valid in OptionSet. Fixes [#400](https://github.com/folke/trouble.nvim/issues/400) ([e9fae8c](https://github.com/folke/trouble.nvim/commit/e9fae8c453eac69aa33dc4899c46b76417a04e3e))
+* **view:** check that window is open before checking active item ([5b5446d](https://github.com/folke/trouble.nvim/commit/5b5446ddf2d6c50b555d28459ce7632ca39d6ac0))
+* **view:** do `norm! zz zv` after jump. See [#408](https://github.com/folke/trouble.nvim/issues/408) ([74e31e7](https://github.com/folke/trouble.nvim/commit/74e31e732fa6888a72f6b73b3115b8ea84ef47f5))
+* **view:** dont refresh items when calling `open` and already open ([7485aa7](https://github.com/folke/trouble.nvim/commit/7485aa70e0341c55bd25e2287b29e991c61297d1))
+* **view:** dont trigger follow when moving. Fixes [#3359](https://github.com/folke/trouble.nvim/issues/3359) ([7cc4df2](https://github.com/folke/trouble.nvim/commit/7cc4df259b208a1f19a67a171da7d5f7e917e7c4))
+* **view:** store restore locations when moving the cursor. See [#367](https://github.com/folke/trouble.nvim/issues/367) ([d8265a6](https://github.com/folke/trouble.nvim/commit/d8265a6f0eea8fff249decf3a1304991f850715b))
+* **window:** main window float should have regular winhighlight ([6ccd579](https://github.com/folke/trouble.nvim/commit/6ccd579a177dc81d81706194131e23b24e93e5fa))
+* **window:** properly deal with alien buffers opening in trouble windows ([92832c4](https://github.com/folke/trouble.nvim/commit/92832c4676e079c4fe824fd5c9a5ba3259d2e506))
+* **windows:** Corrected regex matching path with backslash. ([#396](https://github.com/folke/trouble.nvim/issues/396)) ([a784506](https://github.com/folke/trouble.nvim/commit/a784506b4e5f649e568ec6763aa90d7a7ec4c0b3))
+* **window:** set cursorlineopt for the trouble window. Fixes [#356](https://github.com/folke/trouble.nvim/issues/356) ([4c07228](https://github.com/folke/trouble.nvim/commit/4c07228dec2663d9dda9b12f68785a9f9ec9fd72))
+
+
+### Performance Improvements
+
+* better throttle ([c10d53d](https://github.com/folke/trouble.nvim/commit/c10d53d3d7a48dc8090e44f375d2a12ca7ef0fb6))
+* only trigger refresh when event happens in main for some sources ([6eac568](https://github.com/folke/trouble.nvim/commit/6eac5689fe59fbb8038eebb150c66dbb2a3960a0))
+* use weak references to prevent memory leaks ([4d31d77](https://github.com/folke/trouble.nvim/commit/4d31d77561860cbe582239ebb970db1c75872018))
+* **util:** get_lines can now use a buf or filename or both ([e987642](https://github.com/folke/trouble.nvim/commit/e9876428329f2a91e5dd8b29bd854d9b9ff7813a))
+
 ## [2.10.0](https://github.com/folke/trouble.nvim/compare/v2.9.1...v2.10.0) (2023-10-18)
 
 
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/README.md b/config/neovim/store/lazy-plugins/trouble.nvim/README.md
index aa1e23db..c9dbd8e5 100644
--- a/config/neovim/store/lazy-plugins/trouble.nvim/README.md
+++ b/config/neovim/store/lazy-plugins/trouble.nvim/README.md
@@ -1,43 +1,54 @@
-# 🚦 Trouble v3 Beta!
-
-❗**Trouble** has been rewritten from scratch. If you'd like to try the new version,
-please refer to the [beta docs](https://github.com/folke/trouble.nvim/tree/dev)
-
-![image](https://github.com/folke/trouble.nvim/assets/292349/481bc1f7-cb93-432d-8ab6-f54044334b96)
-
-
----
-
-# 🚦 Trouble v2
+# 🚦 Trouble
 
 A pretty list for showing diagnostics, references, telescope results, quickfix and location lists to help you solve all the trouble your code is causing.
 
-![LSP Trouble Screenshot](./media/shot.png)
+![image](https://github.com/folke/trouble.nvim/assets/292349/481bc1f7-cb93-432d-8ab6-f54044334b96)
 
 ## ✨ Features
 
-- pretty list of:
-  - Diagnostics
-  - LSP references
-  - LSP implementations
-  - LSP definitions
-  - LSP type definitions
-  - quickfix list
-  - location list
-  - [Telescope](https://github.com/nvim-telescope/telescope.nvim) search results
-- automatically updates on new diagnostics
-- toggle **diagnostics** mode between **workspace** or **document**
-- **interactive preview** in your last accessed window
-- _cancel_ preview or _jump_ to the location
-- configurable actions, signs, highlights,...
+- Diagnostics
+- LSP references
+- LSP implementations
+- LSP definitions
+- LSP type definitions
+- LSP Document Symbols
+- LSP Incoming/Outgoing calls
+- quickfix list
+- location list
+- [Telescope](https://github.com/nvim-telescope/telescope.nvim) search results
+- [fzf-lua](https://github.com/ibhagwan/fzf-lua) results
+
+## 📰 What's new?
+
+This is a full rewrite of the original **trouble.nvim**.
+
+The new version is much more flexible and powerful,
+with a lot of new features and improvements:
+
+- multiple trouble windows at the same time
+- LSP document symbols
+- LSP incoming/outgoing calls
+- lots of options to configure trouble windows (floats or splits)
+- `focus` option to focus the trouble window when opened (or not)
+- `follow` option to follow the item under the cursor
+- `pinned` option to pin the buffer as the source for the opened trouble window
+- full tree views of anything
+- highly configurable views with custom formatters, filters, and sorters
+- show multiple sections in the same view
+- multi-line messages
+- prettier and configurable indent guides
+- tree view that follows the natural hierarchy of the items (like document symbols, or file structure)
+- expansive API and `Trouble` command
+- trouble `modes` to define custom views
+- statusline component (useful with document symbols)
 
 ## ⚡️ Requirements
 
-- Neovim >= 0.7.2
+- Neovim >= 0.9.2
+- Neovim >= 0.10.0 **OR** the `markdown` and `markdown_inline` [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) parsers
 - Properly configured Neovim LSP client
 - [nvim-web-devicons](https://github.com/nvim-tree/nvim-web-devicons) is optional to enable file icons
 - a theme with properly configured highlight groups for Neovim Diagnostics
-- or install 🌈 [lsp-colors](https://github.com/folke/lsp-colors.nvim) to automatically create the missing highlight groups
 - a [patched font](https://www.nerdfonts.com/) for the default severity and fold icons
 
 ## 📦 Installation
@@ -47,14 +58,42 @@ Install the plugin with your preferred package manager:
 ### [lazy.nvim](https://github.com/folke/lazy.nvim)
 
 ```lua
-return {
- "folke/trouble.nvim",
- dependencies = { "nvim-tree/nvim-web-devicons" },
- opts = {
-  -- your configuration comes here
-  -- or leave it empty to use the default settings
-  -- refer to the configuration section below
- },
+{
+  "folke/trouble.nvim",
+  opts = {}, -- for default options, refer to the configuration section for custom setup.
+  cmd = "Trouble",
+  keys = {
+    {
+      "<leader>xx",
+      "<cmd>Trouble diagnostics toggle<cr>",
+      desc = "Diagnostics (Trouble)",
+    },
+    {
+      "<leader>xX",
+      "<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
+      desc = "Buffer Diagnostics (Trouble)",
+    },
+    {
+      "<leader>cs",
+      "<cmd>Trouble symbols toggle focus=false<cr>",
+      desc = "Symbols (Trouble)",
+    },
+    {
+      "<leader>cl",
+      "<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
+      desc = "LSP Definitions / references / ... (Trouble)",
+    },
+    {
+      "<leader>xL",
+      "<cmd>Trouble loclist toggle<cr>",
+      desc = "Location List (Trouble)",
+    },
+    {
+      "<leader>xQ",
+      "<cmd>Trouble qflist toggle<cr>",
+      desc = "Quickfix List (Trouble)",
+    },
+  },
 }
 ```
 
@@ -62,206 +101,625 @@ return {
 
 ### Setup
 
-Trouble comes with the following defaults:
+**Trouble** is highly configurable. Please refer to the default settings below.
+
+<details><summary>Default Settings</summary>
+
+<!-- config:start -->
 
 ```lua
-{
-    position = "bottom", -- position of the list can be: bottom, top, left, right
-    height = 10, -- height of the trouble list when position is top or bottom
-    width = 50, -- width of the list when position is left or right
-    icons = true, -- use devicons for filenames
-    mode = "workspace_diagnostics", -- "workspace_diagnostics", "document_diagnostics", "quickfix", "lsp_references", "loclist"
-    severity = nil, -- nil (ALL) or vim.diagnostic.severity.ERROR | WARN | INFO | HINT
-    fold_open = "", -- icon used for open folds
-    fold_closed = "", -- icon used for closed folds
-    group = true, -- group results by file
-    padding = true, -- add an extra new line on top of the list
-    cycle_results = true, -- cycle item list when reaching beginning or end of list
-    action_keys = { -- key mappings for actions in the trouble list
-        -- map to {} to remove a mapping, for example:
-        -- close = {},
-        close = "q", -- close the list
-        cancel = "<esc>", -- cancel the preview and get back to your last window / buffer / cursor
-        refresh = "r", -- manually refresh
-        jump = { "<cr>", "<tab>", "<2-leftmouse>" }, -- jump to the diagnostic or open / close folds
-        open_split = { "<c-x>" }, -- open buffer in new split
-        open_vsplit = { "<c-v>" }, -- open buffer in new vsplit
-        open_tab = { "<c-t>" }, -- open buffer in new tab
-        jump_close = {"o"}, -- jump to the diagnostic and close the list
-        toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode
-        switch_severity = "s", -- switch "diagnostics" severity filter level to HINT / INFO / WARN / ERROR
-        toggle_preview = "P", -- toggle auto_preview
-        hover = "K", -- opens a small popup with the full multiline message
-        preview = "p", -- preview the diagnostic location
-        open_code_href = "c", -- if present, open a URI with more information about the diagnostic error
-        close_folds = {"zM", "zm"}, -- close all folds
-        open_folds = {"zR", "zr"}, -- open all folds
-        toggle_fold = {"zA", "za"}, -- toggle fold of current file
-        previous = "k", -- previous item
-        next = "j" -- next item
-        help = "?" -- help menu
+---@class trouble.Mode: trouble.Config,trouble.Section.spec
+---@field desc? string
+---@field sections? string[]
+
+---@class trouble.Config
+---@field mode? string
+---@field config? fun(opts:trouble.Config)
+---@field formatters? table<string,trouble.Formatter> custom formatters
+---@field filters? table<string, trouble.FilterFn> custom filters
+---@field sorters? table<string, trouble.SorterFn> custom sorters
+local defaults = {
+  auto_close = false, -- auto close when there are no items
+  auto_open = false, -- auto open when there are items
+  auto_preview = true, -- automatically open preview when on an item
+  auto_refresh = true, -- auto refresh when open
+  auto_jump = false, -- auto jump to the item when there's only one
+  focus = false, -- Focus the window when opened
+  restore = true, -- restores the last location in the list when opening
+  follow = true, -- Follow the current item
+  indent_guides = true, -- show indent guides
+  max_items = 200, -- limit number of items that can be displayed per section
+  multiline = true, -- render multi-line messages
+  pinned = false, -- When pinned, the opened trouble window will be bound to the current buffer
+  warn_no_results = true, -- show a warning when there are no results
+  open_no_results = false, -- open the trouble window when there are no results
+  ---@type trouble.Window.opts
+  win = {}, -- window options for the results window. Can be a split or a floating window.
+  -- Window options for the preview window. Can be a split, floating window,
+  -- or `main` to show the preview in the main editor window.
+  ---@type trouble.Window.opts
+  preview = {
+    type = "main",
+    -- when a buffer is not yet loaded, the preview window will be created
+    -- in a scratch buffer with only syntax highlighting enabled.
+    -- Set to false, if you want the preview to always be a real loaded buffer.
+    scratch = true,
+  },
+  -- Throttle/Debounce settings. Should usually not be changed.
+  ---@type table<string, number|{ms:number, debounce?:boolean}>
+  throttle = {
+    refresh = 20, -- fetches new data when needed
+    update = 10, -- updates the window
+    render = 10, -- renders the window
+    follow = 100, -- follows the current item
+    preview = { ms = 100, debounce = true }, -- shows the preview for the current item
+  },
+  -- Key mappings can be set to the name of a builtin action,
+  -- or you can define your own custom action.
+  ---@type table<string, trouble.Action.spec>
+  keys = {
+    ["?"] = "help",
+    r = "refresh",
+    R = "toggle_refresh",
+    q = "close",
+    o = "jump_close",
+    ["<esc>"] = "cancel",
+    ["<cr>"] = "jump",
+    ["<2-leftmouse>"] = "jump",
+    ["<c-s>"] = "jump_split",
+    ["<c-v>"] = "jump_vsplit",
+    -- go down to next item (accepts count)
+    -- j = "next",
+    ["}"] = "next",
+    ["]]"] = "next",
+    -- go up to prev item (accepts count)
+    -- k = "prev",
+    ["{"] = "prev",
+    ["[["] = "prev",
+    dd = "delete",
+    d = { action = "delete", mode = "v" },
+    i = "inspect",
+    p = "preview",
+    P = "toggle_preview",
+    zo = "fold_open",
+    zO = "fold_open_recursive",
+    zc = "fold_close",
+    zC = "fold_close_recursive",
+    za = "fold_toggle",
+    zA = "fold_toggle_recursive",
+    zm = "fold_more",
+    zM = "fold_close_all",
+    zr = "fold_reduce",
+    zR = "fold_open_all",
+    zx = "fold_update",
+    zX = "fold_update_all",
+    zn = "fold_disable",
+    zN = "fold_enable",
+    zi = "fold_toggle_enable",
+    gb = { -- example of a custom action that toggles the active view filter
+      action = function(view)
+        view:filter({ buf = 0 }, { toggle = true })
+      end,
+      desc = "Toggle Current Buffer Filter",
     },
-    multiline = true, -- render multi-line messages
-    indent_lines = true, -- add an indent guide below the fold icons
-    win_config = { border = "single" }, -- window configuration for floating windows. See |nvim_open_win()|.
-    auto_open = false, -- automatically open the list when you have diagnostics
-    auto_close = false, -- automatically close the list when you have no diagnostics
-    auto_preview = true, -- automatically preview the location of the diagnostic. <esc> to close preview and go back to last window
-    auto_fold = false, -- automatically fold a file trouble list at creation
-    auto_jump = {"lsp_definitions"}, -- for the given modes, automatically jump if there is only a single result
-    include_declaration = { "lsp_references", "lsp_implementations", "lsp_definitions"  }, -- for the given modes, include the declaration of the current symbol in the results
-    signs = {
-      -- icons / text used for a diagnostic
-      error = "",
-      warning = "",
-      hint = "",
-      information = "",
-      other = "",
+    s = { -- example of a custom action that toggles the severity
+      action = function(view)
+        local f = view:get_filter("severity")
+        local severity = ((f and f.filter.severity or 0) + 1) % 5
+        view:filter({ severity = severity }, {
+          id = "severity",
+          template = "{hl:Title}Filter:{hl} {severity}",
+          del = severity == 0,
+        })
+      end,
+      desc = "Toggle Severity Filter",
     },
-    use_diagnostic_signs = false -- enabling this will use the signs defined in your lsp client
+  },
+  ---@type table<string, trouble.Mode>
+  modes = {
+    -- sources define their own modes, which you can use directly,
+    -- or override like in the example below
+    lsp_references = {
+      -- some modes are configurable, see the source code for more details
+      params = {
+        include_declaration = true,
+      },
+    },
+    -- The LSP base mode for:
+    -- * lsp_definitions, lsp_references, lsp_implementations
+    -- * lsp_type_definitions, lsp_declarations, lsp_command
+    lsp_base = {
+      params = {
+        -- don't include the current location in the results
+        include_current = false,
+      },
+    },
+    -- more advanced example that extends the lsp_document_symbols
+    symbols = {
+      desc = "document symbols",
+      mode = "lsp_document_symbols",
+      focus = false,
+      win = { position = "right" },
+      filter = {
+        -- remove Package since luals uses it for control flow structures
+        ["not"] = { ft = "lua", kind = "Package" },
+        any = {
+          -- all symbol kinds for help / markdown files
+          ft = { "help", "markdown" },
+          -- default set of symbol kinds
+          kind = {
+            "Class",
+            "Constructor",
+            "Enum",
+            "Field",
+            "Function",
+            "Interface",
+            "Method",
+            "Module",
+            "Namespace",
+            "Package",
+            "Property",
+            "Struct",
+            "Trait",
+          },
+        },
+      },
+    },
+  },
+  -- stylua: ignore
+  icons = {
+    ---@type trouble.Indent.symbols
+    indent = {
+      top           = "│ ",
+      middle        = "├╴",
+      last          = "└╴",
+      -- last          = "-╴",
+      -- last       = "╰╴", -- rounded
+      fold_open     = " ",
+      fold_closed   = " ",
+      ws            = "  ",
+    },
+    folder_closed   = " ",
+    folder_open     = " ",
+    kinds = {
+      Array         = " ",
+      Boolean       = "󰨙 ",
+      Class         = " ",
+      Constant      = "󰏿 ",
+      Constructor   = " ",
+      Enum          = " ",
+      EnumMember    = " ",
+      Event         = " ",
+      Field         = " ",
+      File          = " ",
+      Function      = "󰊕 ",
+      Interface     = " ",
+      Key           = " ",
+      Method        = "󰊕 ",
+      Module        = " ",
+      Namespace     = "󰦮 ",
+      Null          = " ",
+      Number        = "󰎠 ",
+      Object        = " ",
+      Operator      = " ",
+      Package       = " ",
+      Property      = " ",
+      String        = " ",
+      Struct        = "󰆼 ",
+      TypeParameter = " ",
+      Variable      = "󰀫 ",
+    },
+  },
 }
 ```
 
-> 💡 if you don't want to use icons or a patched font, you can use the settings below
+<!-- config:end -->
 
-```lua
--- settings without a patched font or icons
-{
-    icons = false,
-    fold_open = "v", -- icon used for open folds
-    fold_closed = ">", -- icon used for closed folds
-    indent_lines = false, -- add an indent guide below the fold icons
-    signs = {
-        -- icons / text used for a diagnostic
-        error = "error",
-        warning = "warn",
-        hint = "hint",
-        information = "info"
-    },
-    use_diagnostic_signs = false -- enabling this will use the signs defined in your lsp client
-}
-```
+</details>
+
+Make sure to check the [Examples](/docs/examples.md)!
 
 ## 🚀 Usage
 
 ### Commands
 
-Trouble comes with the following commands:
+The **Trouble** command is a wrapper around the **Trouble** API.
+It can do anything the regular API can do.
 
-- `Trouble [mode]`: open the list
-- `TroubleClose [mode]`: close the list
-- `TroubleToggle [mode]`: toggle the list
-- `TroubleRefresh`: manually refresh the active list
+- `Trouble [mode] [action] [options]`
+
+Some examples:
+
+- Toggle diagnostics for the current buffer and stay in the current window:
+  - `Trouble diagnostics toggle focus=false filter.buf=0`
+- Show document symbols on the right of the current window.
+  Keep the document symbols in sync with the buffer you started the command in.
+  - `Trouble symbols toggle pinned=true results.win.relative=win results.win.position=right`
+- You can use **lua** code in the options for the `Trouble` command.
+  The examples below all do the same thing.
+  - `Trouble diagnostics filter.severity=vim.diagnostic.severity.ERROR`
+  - `Trouble diagnostics filter.severity = vim.diagnostic.severity.ERROR`
+  - `Trouble diagnostics filter = { severity=vim.diagnostic.severity.ERROR }`
+- Merging of nested options, with or without quoting strings:
+  - `Trouble diagnostics results.win.type = split result.win.position=right`
+  - `Trouble diagnostics results.win = { type = split, position=right}`
+  - `Trouble diagnostics results.win = { type = "split", position='right'}`
+
+Please refer to the API section for more information on the available actions and options.
 
 Modes:
 
-- **document_diagnostics:** document diagnostics from the builtin LSP client
-- **workspace_diagnostics:** workspace diagnostics from the builtin LSP client
-- **lsp_references:** references of the word under the cursor from the builtin LSP client
-- **lsp_definitions:** definitions of the word under the cursor from the builtin LSP client
+<!-- modes:start -->
 
-* **lsp_type_definitions:** type definitions of the word under the cursor from the builtin LSP client
+- **diagnostics**: diagnostics
+- **fzf**: FzfLua results previously opened with `require('trouble.sources.fzf').open()`.
+- **fzf_files**: FzfLua results previously opened with `require('trouble.sources.fzf').open()`.
+- **loclist**: Location List
+- **lsp**: LSP definitions, references, implementations, type definitions, and declarations
+- **lsp_command**: command
+- **lsp_declarations**: declarations
+- **lsp_definitions**: definitions
+- **lsp_document_symbols**: document symbols
+- **lsp_implementations**: implementations
+- **lsp_incoming_calls**: Incoming Calls
+- **lsp_outgoing_calls**: Outgoing Calls
+- **lsp_references**: references
+- **lsp_type_definitions**: type definitions
+- **qflist**: Quickfix List
+- **quickfix**: Quickfix List
+- **symbols**: document symbols
+- **telescope**: Telescope results previously opened with `require('trouble.sources.telescope').open()`.
+- **telescope_files**: Telescope results previously opened with `require('trouble.sources.telescope').open()`.
 
-- **quickfix:** [quickfix](https://neovim.io/doc/user/quickfix.html) items
-- **loclist:** items from the window's [location list](https://neovim.io/doc/user/quickfix.html)
+<!-- modes:end -->
 
-Example keybindings:
+### Filters
 
-```vim
-" Vim Script
-nnoremap <leader>xx <cmd>TroubleToggle<cr>
-nnoremap <leader>xw <cmd>TroubleToggle workspace_diagnostics<cr>
-nnoremap <leader>xd <cmd>TroubleToggle document_diagnostics<cr>
-nnoremap <leader>xq <cmd>TroubleToggle quickfix<cr>
-nnoremap <leader>xl <cmd>TroubleToggle loclist<cr>
-nnoremap gR <cmd>TroubleToggle lsp_references<cr>
-```
-
-```lua
--- Lua
-vim.keymap.set("n", "<leader>xx", function() require("trouble").toggle() end)
-vim.keymap.set("n", "<leader>xw", function() require("trouble").toggle("workspace_diagnostics") end)
-vim.keymap.set("n", "<leader>xd", function() require("trouble").toggle("document_diagnostics") end)
-vim.keymap.set("n", "<leader>xq", function() require("trouble").toggle("quickfix") end)
-vim.keymap.set("n", "<leader>xl", function() require("trouble").toggle("loclist") end)
-vim.keymap.set("n", "gR", function() require("trouble").toggle("lsp_references") end)
-```
+Please refer to the [filter docs](docs/filter.md) for more information examples on filters.
 
 ### API
 
 You can use the following functions in your keybindings:
 
+<details><summary>API</summary>
+
+<!-- api:start -->
+
 ```lua
--- toggle trouble with optional mode
-require("trouble").toggle(mode?)
+-- Opens trouble with the given mode.
+-- If a view is already open with the same mode,
+-- it will be focused unless `opts.focus = false`.
+-- When a view is already open and `opts.new = true`,
+-- a new view will be created.
+---@param opts? trouble.Mode | { new?: boolean, refresh?: boolean } | string
+---@return trouble.View?
+require("trouble").open(opts)
 
--- open trouble with optional mode
-require("trouble").open(mode?)
+-- Closes the last open view matching the filter.
+---@param opts? trouble.Mode|string
+---@return trouble.View?
+require("trouble").close(opts)
 
--- close trouble
-require("trouble").close()
+-- Toggle the view with the given mode.
+---@param opts? trouble.Mode|string
+---@return trouble.View?
+require("trouble").toggle(opts)
 
--- jump to the next item, skipping the groups
-require("trouble").next({skip_groups = true, jump = true});
+-- Returns true if there is an open view matching the mode.
+---@param opts? trouble.Mode|string
+require("trouble").is_open(opts)
 
--- jump to the previous item, skipping the groups
-require("trouble").previous({skip_groups = true, jump = true});
+-- Refresh all open views. Normally this is done automatically,
+-- unless you disabled auto refresh.
+---@param opts? trouble.Mode|string
+require("trouble").refresh(opts)
 
--- jump to the first item, skipping the groups
-require("trouble").first({skip_groups = true, jump = true});
+-- Get all items from the active view for a given mode.
+---@param opts? trouble.Mode|string
+require("trouble").get_items(opts)
 
--- jump to the last item, skipping the groups
-require("trouble").last({skip_groups = true, jump = true});
+-- Renders a trouble list as a statusline component.
+-- Check the docs for examples.
+---@param opts? trouble.Mode|string|{hl_group?:string}
+---@return {get: (fun():string), has: (fun():boolean)}
+require("trouble").statusline(opts)
+
+-- Closes the preview and goes to the main window.
+-- The Trouble window is not closed.
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").cancel(opts)
+
+-- Open the preview
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").delete(opts)
+
+-- filter
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").filter(opts)
+
+-- Go to the first item
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").first(opts)
+
+-- Focus the trouble window
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").focus(opts)
+
+-- Fold close 
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").fold_close(opts)
+
+-- fold close all
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").fold_close_all(opts)
+
+-- Fold close recursive
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").fold_close_recursive(opts)
+
+-- fold disable
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").fold_disable(opts)
+
+-- fold enable
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").fold_enable(opts)
+
+-- fold more
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").fold_more(opts)
+
+-- Fold open 
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").fold_open(opts)
+
+-- fold open all
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").fold_open_all(opts)
+
+-- Fold open recursive
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").fold_open_recursive(opts)
+
+-- fold reduce
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").fold_reduce(opts)
+
+-- Fold toggle 
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").fold_toggle(opts)
+
+-- fold toggle enable
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").fold_toggle_enable(opts)
+
+-- Fold toggle recursive
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").fold_toggle_recursive(opts)
+
+-- fold update
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").fold_update(opts)
+
+-- fold update all
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").fold_update_all(opts)
+
+-- Show the help
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").help(opts)
+
+-- Dump the item to the console
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").inspect(opts)
+
+-- Jump to the item if on an item, otherwise fold the node
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").jump(opts)
+
+-- Jump to the item and close the trouble window
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").jump_close(opts)
+
+-- Jump to the item if on an item, otherwise do nothing
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").jump_only(opts)
+
+-- Open the item in a split
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").jump_split(opts)
+
+-- Open the item in a vsplit
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").jump_vsplit(opts)
+
+-- Go to the last item
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").last(opts)
+
+-- Go to the next item
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").next(opts)
+
+-- Go to the previous item
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").prev(opts)
+
+-- Open the preview
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").preview(opts)
+
+-- Refresh the trouble source
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").refresh(opts)
+
+-- Toggle the preview
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").toggle_preview(opts)
+
+-- Toggle the auto refresh
+---@param opts? trouble.Mode | { new? : boolean } | string
+---@return trouble.View
+require("trouble").toggle_refresh(opts)
 ```
 
+<!-- api:end -->
+
+</details>
+
 ### Telescope
 
 You can easily open any search results in **Trouble**, by defining a custom action:
 
 ```lua
 local actions = require("telescope.actions")
-local trouble = require("trouble.providers.telescope")
+local open_with_trouble = require("trouble.sources.telescope").open
+
+-- Use this to add more results without clearing the trouble list
+local add_to_trouble = require("trouble.sources.telescope").add
 
 local telescope = require("telescope")
 
-telescope.setup {
+telescope.setup({
   defaults = {
     mappings = {
-      i = { ["<c-t>"] = trouble.open_with_trouble },
-      n = { ["<c-t>"] = trouble.open_with_trouble },
+      i = { ["<c-t>"] = open_with_trouble },
+      n = { ["<c-t>"] = open_with_trouble },
     },
   },
-}
+})
 ```
 
 When you open telescope, you can now hit `<c-t>` to open the results in **Trouble**
 
+### fzf-lua
+
+You can easily open any search results in **Trouble**, by defining a custom action:
+
+```lua
+local config = require("fzf-lua.config")
+local actions = require("trouble.sources.fzf").actions
+config.defaults.actions.files["ctrl-t"] = actions.open
+```
+
+When you open fzf-lua, you can now hit `<c-t>` to open the results in **Trouble**
+
+### Statusline Component
+
+Example for [lualine.nvim](https://github.com/nvim-lualine/lualine.nvim):
+
+```lua
+{
+  "nvim-lualine/lualine.nvim",
+  opts = function(_, opts)
+    local trouble = require("trouble")
+    local symbols = trouble.statusline({
+      mode = "lsp_document_symbols",
+      groups = {},
+      title = false,
+      filter = { range = true },
+      format = "{kind_icon}{symbol.name:Normal}",
+      -- The following line is needed to fix the background color
+      -- Set it to the lualine section you want to use
+      hl_group = "lualine_c_normal",
+    })
+    table.insert(opts.sections.lualine_c, {
+      symbols.get,
+      cond = symbols.has,
+    })
+  end,
+}
+```
+
 ## 🎨 Colors
 
 The table below shows all the highlight groups defined for Trouble.
 
-| Highlight Group          |
-| ------------------------ |
-| _TroubleCount_           |
-| _TroubleError_           |
-| _TroubleNormal_          |
-| _TroubleTextInformation_ |
-| _TroubleSignWarning_     |
-| _TroubleLocation_        |
-| _TroubleWarning_         |
-| _TroublePreview_         |
-| _TroubleTextError_       |
-| _TroubleSignInformation_ |
-| _TroubleIndent_          |
-| _TroubleSource_          |
-| _TroubleSignHint_        |
-| _TroubleSignOther_       |
-| _TroubleFoldIcon_        |
-| _TroubleTextWarning_     |
-| _TroubleCode_            |
-| _TroubleInformation_     |
-| _TroubleSignError_       |
-| _TroubleFile_            |
-| _TroubleHint_            |
-| _TroubleTextHint_        |
-| _TroubleText_            |
+<details><summary>Highlight Groups</summary>
+
+<!-- colors:start -->
+
+| Highlight Group | Default Group | Description |
+| --- | --- | --- |
+| **TroubleBasename** | ***TroubleFilename*** |  |
+| **TroubleCode** | ***Special*** |  |
+| **TroubleCount** | ***TabLineSel*** |  |
+| **TroubleDirectory** | ***Directory*** |  |
+| **TroubleFilename** | ***Directory*** |  |
+| **TroubleIconArray** | ***@punctuation.bracket*** |  |
+| **TroubleIconBoolean** | ***@boolean*** |  |
+| **TroubleIconClass** | ***@type*** |  |
+| **TroubleIconConstant** | ***@constant*** |  |
+| **TroubleIconConstructor** | ***@constructor*** |  |
+| **TroubleIconDirectory** | ***Special*** |  |
+| **TroubleIconEnum** | ***@lsp.type.enum*** |  |
+| **TroubleIconEnumMember** | ***@lsp.type.enumMember*** |  |
+| **TroubleIconEvent** | ***Special*** |  |
+| **TroubleIconField** | ***@variable.member*** |  |
+| **TroubleIconFile** | ***Normal*** |  |
+| **TroubleIconFunction** | ***@function*** |  |
+| **TroubleIconInterface** | ***@lsp.type.interface*** |  |
+| **TroubleIconKey** | ***@lsp.type.keyword*** |  |
+| **TroubleIconMethod** | ***@function.method*** |  |
+| **TroubleIconModule** | ***@module*** |  |
+| **TroubleIconNamespace** | ***@module*** |  |
+| **TroubleIconNull** | ***@constant.builtin*** |  |
+| **TroubleIconNumber** | ***@number*** |  |
+| **TroubleIconObject** | ***@constant*** |  |
+| **TroubleIconOperator** | ***@operator*** |  |
+| **TroubleIconPackage** | ***@module*** |  |
+| **TroubleIconProperty** | ***@property*** |  |
+| **TroubleIconString** | ***@string*** |  |
+| **TroubleIconStruct** | ***@lsp.type.struct*** |  |
+| **TroubleIconTypeParameter** | ***@lsp.type.typeParameter*** |  |
+| **TroubleIconVariable** | ***@variable*** |  |
+| **TroubleIndent** | ***LineNr*** |  |
+| **TroubleIndentFoldClosed** | ***CursorLineNr*** |  |
+| **TroubleIndentFoldOpen** | ***TroubleIndent*** |  |
+| **TroubleIndentLast** | ***TroubleIndent*** |  |
+| **TroubleIndentMiddle** | ***TroubleIndent*** |  |
+| **TroubleIndentTop** | ***TroubleIndent*** |  |
+| **TroubleIndentWs** | ***TroubleIndent*** |  |
+| **TroubleNormal** | ***NormalFloat*** |  |
+| **TroubleNormalNC** | ***NormalFloat*** |  |
+| **TroublePos** | ***LineNr*** |  |
+| **TroublePreview** | ***Visual*** |  |
+| **TroubleSource** | ***Comment*** |  |
+| **TroubleText** | ***Normal*** |  |
+
+<!-- colors:end -->
+
+</details>
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/doc/tags b/config/neovim/store/lazy-plugins/trouble.nvim/doc/tags
index 16e20e4e..414aa16e 100644
--- a/config/neovim/store/lazy-plugins/trouble.nvim/doc/tags
+++ b/config/neovim/store/lazy-plugins/trouble.nvim/doc/tags
@@ -1,11 +1,11 @@
 trouble.nvim-links	trouble.nvim.txt	/*trouble.nvim-links*
 trouble.nvim-table-of-contents	trouble.nvim.txt	/*trouble.nvim-table-of-contents*
-trouble.nvim-trouble-v2	trouble.nvim.txt	/*trouble.nvim-trouble-v2*
-trouble.nvim-trouble-v2-colors	trouble.nvim.txt	/*trouble.nvim-trouble-v2-colors*
-trouble.nvim-trouble-v2-configuration	trouble.nvim.txt	/*trouble.nvim-trouble-v2-configuration*
-trouble.nvim-trouble-v2-features	trouble.nvim.txt	/*trouble.nvim-trouble-v2-features*
-trouble.nvim-trouble-v2-installation	trouble.nvim.txt	/*trouble.nvim-trouble-v2-installation*
-trouble.nvim-trouble-v2-requirements	trouble.nvim.txt	/*trouble.nvim-trouble-v2-requirements*
-trouble.nvim-trouble-v2-usage	trouble.nvim.txt	/*trouble.nvim-trouble-v2-usage*
-trouble.nvim-trouble-v3-beta!	trouble.nvim.txt	/*trouble.nvim-trouble-v3-beta!*
+trouble.nvim-trouble	trouble.nvim.txt	/*trouble.nvim-trouble*
+trouble.nvim-trouble-colors	trouble.nvim.txt	/*trouble.nvim-trouble-colors*
+trouble.nvim-trouble-configuration	trouble.nvim.txt	/*trouble.nvim-trouble-configuration*
+trouble.nvim-trouble-features	trouble.nvim.txt	/*trouble.nvim-trouble-features*
+trouble.nvim-trouble-installation	trouble.nvim.txt	/*trouble.nvim-trouble-installation*
+trouble.nvim-trouble-requirements	trouble.nvim.txt	/*trouble.nvim-trouble-requirements*
+trouble.nvim-trouble-usage	trouble.nvim.txt	/*trouble.nvim-trouble-usage*
+trouble.nvim-trouble-what’s-new?	trouble.nvim.txt	/*trouble.nvim-trouble-what’s-new?*
 trouble.nvim.txt	trouble.nvim.txt	/*trouble.nvim.txt*
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/doc/trouble.nvim.txt b/config/neovim/store/lazy-plugins/trouble.nvim/doc/trouble.nvim.txt
index 7689dad7..2a57ee79 100644
--- a/config/neovim/store/lazy-plugins/trouble.nvim/doc/trouble.nvim.txt
+++ b/config/neovim/store/lazy-plugins/trouble.nvim/doc/trouble.nvim.txt
@@ -1,63 +1,76 @@
-*trouble.nvim.txt*         For Neovim >= 0.8.0        Last change: 2024 May 19
+*trouble.nvim.txt*        For Neovim >= 0.8.0        Last change: 2024 June 14
 
 ==============================================================================
 Table of Contents                             *trouble.nvim-table-of-contents*
 
-1. Trouble v3 Beta!                            |trouble.nvim-trouble-v3-beta!|
-2. Trouble v2                                        |trouble.nvim-trouble-v2|
-  - Features                                |trouble.nvim-trouble-v2-features|
-  - Requirements                        |trouble.nvim-trouble-v2-requirements|
-  - Installation                        |trouble.nvim-trouble-v2-installation|
-  - Configuration                      |trouble.nvim-trouble-v2-configuration|
-  - Usage                                      |trouble.nvim-trouble-v2-usage|
-  - Colors                                    |trouble.nvim-trouble-v2-colors|
-3. Links                                                  |trouble.nvim-links|
+1. Trouble                                              |trouble.nvim-trouble|
+  - Features                                   |trouble.nvim-trouble-features|
+  - What’s new?                         |trouble.nvim-trouble-what’s-new?|
+  - Requirements                           |trouble.nvim-trouble-requirements|
+  - Installation                           |trouble.nvim-trouble-installation|
+  - Configuration                         |trouble.nvim-trouble-configuration|
+  - Usage                                         |trouble.nvim-trouble-usage|
+  - Colors                                       |trouble.nvim-trouble-colors|
+2. Links                                                  |trouble.nvim-links|
 
 ==============================================================================
-1. Trouble v3 Beta!                            *trouble.nvim-trouble-v3-beta!*
-
-**Trouble**has been rewritten from scratch. If you’d like to try the new
-version, please refer to the beta docs
-<https://github.com/folke/trouble.nvim/tree/dev>
-
-------------------------------------------------------------------------------
-
-==============================================================================
-2. Trouble v2                                        *trouble.nvim-trouble-v2*
+1. Trouble                                              *trouble.nvim-trouble*
 
 A pretty list for showing diagnostics, references, telescope results, quickfix
 and location lists to help you solve all the trouble your code is causing.
 
 
-FEATURES                                    *trouble.nvim-trouble-v2-features*
+FEATURES                                       *trouble.nvim-trouble-features*
 
-- pretty list of:
-    - Diagnostics
-    - LSP references
-    - LSP implementations
-    - LSP definitions
-    - LSP type definitions
-    - quickfix list
-    - location list
-    - Telescope <https://github.com/nvim-telescope/telescope.nvim> search results
-- automatically updates on new diagnostics
-- toggle **diagnostics** mode between **workspace** or **document**
-- **interactive preview** in your last accessed window
-- _cancel_ preview or _jump_ to the location
-- configurable actions, signs, highlights,…
+- Diagnostics
+- LSP references
+- LSP implementations
+- LSP definitions
+- LSP type definitions
+- LSP Document Symbols
+- LSP Incoming/Outgoing calls
+- quickfix list
+- location list
+- Telescope <https://github.com/nvim-telescope/telescope.nvim> search results
+- fzf-lua <https://github.com/ibhagwan/fzf-lua> results
 
 
-REQUIREMENTS                            *trouble.nvim-trouble-v2-requirements*
+WHAT’S NEW?                             *trouble.nvim-trouble-what’s-new?*
 
-- Neovim >= 0.7.2
+This is a full rewrite of the original **trouble.nvim**.
+
+The new version is much more flexible and powerful, with a lot of new features
+and improvements:
+
+- multiple trouble windows at the same time
+- LSP document symbols
+- LSP incoming/outgoing calls
+- lots of options to configure trouble windows (floats or splits)
+- `focus` option to focus the trouble window when opened (or not)
+- `follow` option to follow the item under the cursor
+- `pinned` option to pin the buffer as the source for the opened trouble window
+- full tree views of anything
+- highly configurable views with custom formatters, filters, and sorters
+- show multiple sections in the same view
+- multi-line messages
+- prettier and configurable indent guides
+- tree view that follows the natural hierarchy of the items (like document symbols, or file structure)
+- expansive API and `Trouble` command
+- trouble `modes` to define custom views
+- statusline component (useful with document symbols)
+
+
+REQUIREMENTS                               *trouble.nvim-trouble-requirements*
+
+- Neovim >= 0.9.2
+- Neovim >= 0.10.0 **OR** the `markdown` and `markdown_inline` nvim-treesitter <https://github.com/nvim-treesitter/nvim-treesitter> parsers
 - Properly configured Neovim LSP client
 - nvim-web-devicons <https://github.com/nvim-tree/nvim-web-devicons> is optional to enable file icons
 - a theme with properly configured highlight groups for Neovim Diagnostics
-- or install lsp-colors <https://github.com/folke/lsp-colors.nvim> to automatically create the missing highlight groups
 - a patched font <https://www.nerdfonts.com/> for the default severity and fold icons
 
 
-INSTALLATION                            *trouble.nvim-trouble-v2-installation*
+INSTALLATION                               *trouble.nvim-trouble-installation*
 
 Install the plugin with your preferred package manager:
 
@@ -65,178 +78,538 @@ Install the plugin with your preferred package manager:
 LAZY.NVIM ~
 
 >lua
-    return {
-     "folke/trouble.nvim",
-     dependencies = { "nvim-tree/nvim-web-devicons" },
-     opts = {
-      -- your configuration comes here
-      -- or leave it empty to use the default settings
-      -- refer to the configuration section below
-     },
+    {
+      "folke/trouble.nvim",
+      opts = {}, -- for default options, refer to the configuration section for custom setup.
+      cmd = "Trouble",
+      keys = {
+        {
+          "<leader>xx",
+          "<cmd>Trouble diagnostics toggle<cr>",
+          desc = "Diagnostics (Trouble)",
+        },
+        {
+          "<leader>xX",
+          "<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
+          desc = "Buffer Diagnostics (Trouble)",
+        },
+        {
+          "<leader>cs",
+          "<cmd>Trouble symbols toggle focus=false<cr>",
+          desc = "Symbols (Trouble)",
+        },
+        {
+          "<leader>cl",
+          "<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
+          desc = "LSP Definitions / references / ... (Trouble)",
+        },
+        {
+          "<leader>xL",
+          "<cmd>Trouble loclist toggle<cr>",
+          desc = "Location List (Trouble)",
+        },
+        {
+          "<leader>xQ",
+          "<cmd>Trouble qflist toggle<cr>",
+          desc = "Quickfix List (Trouble)",
+        },
+      },
     }
 <
 
 
-CONFIGURATION                          *trouble.nvim-trouble-v2-configuration*
+CONFIGURATION                             *trouble.nvim-trouble-configuration*
 
 
 SETUP ~
 
-Trouble comes with the following defaults:
+**Trouble** is highly configurable. Please refer to the default settings below.
+
+Default Settings ~
 
 >lua
-    {
-        position = "bottom", -- position of the list can be: bottom, top, left, right
-        height = 10, -- height of the trouble list when position is top or bottom
-        width = 50, -- width of the list when position is left or right
-        icons = true, -- use devicons for filenames
-        mode = "workspace_diagnostics", -- "workspace_diagnostics", "document_diagnostics", "quickfix", "lsp_references", "loclist"
-        severity = nil, -- nil (ALL) or vim.diagnostic.severity.ERROR | WARN | INFO | HINT
-        fold_open = "", -- icon used for open folds
-        fold_closed = "", -- icon used for closed folds
-        group = true, -- group results by file
-        padding = true, -- add an extra new line on top of the list
-        cycle_results = true, -- cycle item list when reaching beginning or end of list
-        action_keys = { -- key mappings for actions in the trouble list
-            -- map to {} to remove a mapping, for example:
-            -- close = {},
-            close = "q", -- close the list
-            cancel = "<esc>", -- cancel the preview and get back to your last window / buffer / cursor
-            refresh = "r", -- manually refresh
-            jump = { "<cr>", "<tab>", "<2-leftmouse>" }, -- jump to the diagnostic or open / close folds
-            open_split = { "<c-x>" }, -- open buffer in new split
-            open_vsplit = { "<c-v>" }, -- open buffer in new vsplit
-            open_tab = { "<c-t>" }, -- open buffer in new tab
-            jump_close = {"o"}, -- jump to the diagnostic and close the list
-            toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode
-            switch_severity = "s", -- switch "diagnostics" severity filter level to HINT / INFO / WARN / ERROR
-            toggle_preview = "P", -- toggle auto_preview
-            hover = "K", -- opens a small popup with the full multiline message
-            preview = "p", -- preview the diagnostic location
-            open_code_href = "c", -- if present, open a URI with more information about the diagnostic error
-            close_folds = {"zM", "zm"}, -- close all folds
-            open_folds = {"zR", "zr"}, -- open all folds
-            toggle_fold = {"zA", "za"}, -- toggle fold of current file
-            previous = "k", -- previous item
-            next = "j" -- next item
-            help = "?" -- help menu
+    ---@class trouble.Mode: trouble.Config,trouble.Section.spec
+    ---@field desc? string
+    ---@field sections? string[]
+    
+    ---@class trouble.Config
+    ---@field mode? string
+    ---@field config? fun(opts:trouble.Config)
+    ---@field formatters? table<string,trouble.Formatter> custom formatters
+    ---@field filters? table<string, trouble.FilterFn> custom filters
+    ---@field sorters? table<string, trouble.SorterFn> custom sorters
+    local defaults = {
+      auto_close = false, -- auto close when there are no items
+      auto_open = false, -- auto open when there are items
+      auto_preview = true, -- automatically open preview when on an item
+      auto_refresh = true, -- auto refresh when open
+      auto_jump = false, -- auto jump to the item when there's only one
+      focus = false, -- Focus the window when opened
+      restore = true, -- restores the last location in the list when opening
+      follow = true, -- Follow the current item
+      indent_guides = true, -- show indent guides
+      max_items = 200, -- limit number of items that can be displayed per section
+      multiline = true, -- render multi-line messages
+      pinned = false, -- When pinned, the opened trouble window will be bound to the current buffer
+      warn_no_results = true, -- show a warning when there are no results
+      open_no_results = false, -- open the trouble window when there are no results
+      ---@type trouble.Window.opts
+      win = {}, -- window options for the results window. Can be a split or a floating window.
+      -- Window options for the preview window. Can be a split, floating window,
+      -- or `main` to show the preview in the main editor window.
+      ---@type trouble.Window.opts
+      preview = {
+        type = "main",
+        -- when a buffer is not yet loaded, the preview window will be created
+        -- in a scratch buffer with only syntax highlighting enabled.
+        -- Set to false, if you want the preview to always be a real loaded buffer.
+        scratch = true,
+      },
+      -- Throttle/Debounce settings. Should usually not be changed.
+      ---@type table<string, number|{ms:number, debounce?:boolean}>
+      throttle = {
+        refresh = 20, -- fetches new data when needed
+        update = 10, -- updates the window
+        render = 10, -- renders the window
+        follow = 100, -- follows the current item
+        preview = { ms = 100, debounce = true }, -- shows the preview for the current item
+      },
+      -- Key mappings can be set to the name of a builtin action,
+      -- or you can define your own custom action.
+      ---@type table<string, trouble.Action.spec>
+      keys = {
+        ["?"] = "help",
+        r = "refresh",
+        R = "toggle_refresh",
+        q = "close",
+        o = "jump_close",
+        ["<esc>"] = "cancel",
+        ["<cr>"] = "jump",
+        ["<2-leftmouse>"] = "jump",
+        ["<c-s>"] = "jump_split",
+        ["<c-v>"] = "jump_vsplit",
+        -- go down to next item (accepts count)
+        -- j = "next",
+        ["}"] = "next",
+        ["]]"] = "next",
+        -- go up to prev item (accepts count)
+        -- k = "prev",
+        ["{"] = "prev",
+        ["[["] = "prev",
+        dd = "delete",
+        d = { action = "delete", mode = "v" },
+        i = "inspect",
+        p = "preview",
+        P = "toggle_preview",
+        zo = "fold_open",
+        zO = "fold_open_recursive",
+        zc = "fold_close",
+        zC = "fold_close_recursive",
+        za = "fold_toggle",
+        zA = "fold_toggle_recursive",
+        zm = "fold_more",
+        zM = "fold_close_all",
+        zr = "fold_reduce",
+        zR = "fold_open_all",
+        zx = "fold_update",
+        zX = "fold_update_all",
+        zn = "fold_disable",
+        zN = "fold_enable",
+        zi = "fold_toggle_enable",
+        gb = { -- example of a custom action that toggles the active view filter
+          action = function(view)
+            view:filter({ buf = 0 }, { toggle = true })
+          end,
+          desc = "Toggle Current Buffer Filter",
         },
-        multiline = true, -- render multi-line messages
-        indent_lines = true, -- add an indent guide below the fold icons
-        win_config = { border = "single" }, -- window configuration for floating windows. See |nvim_open_win()|.
-        auto_open = false, -- automatically open the list when you have diagnostics
-        auto_close = false, -- automatically close the list when you have no diagnostics
-        auto_preview = true, -- automatically preview the location of the diagnostic. <esc> to close preview and go back to last window
-        auto_fold = false, -- automatically fold a file trouble list at creation
-        auto_jump = {"lsp_definitions"}, -- for the given modes, automatically jump if there is only a single result
-        include_declaration = { "lsp_references", "lsp_implementations", "lsp_definitions"  }, -- for the given modes, include the declaration of the current symbol in the results
-        signs = {
-          -- icons / text used for a diagnostic
-          error = "",
-          warning = "",
-          hint = "",
-          information = "",
-          other = "",
+        s = { -- example of a custom action that toggles the severity
+          action = function(view)
+            local f = view:get_filter("severity")
+            local severity = ((f and f.filter.severity or 0) + 1) % 5
+            view:filter({ severity = severity }, {
+              id = "severity",
+              template = "{hl:Title}Filter:{hl} {severity}",
+              del = severity == 0,
+            })
+          end,
+          desc = "Toggle Severity Filter",
         },
-        use_diagnostic_signs = false -- enabling this will use the signs defined in your lsp client
+      },
+      ---@type table<string, trouble.Mode>
+      modes = {
+        -- sources define their own modes, which you can use directly,
+        -- or override like in the example below
+        lsp_references = {
+          -- some modes are configurable, see the source code for more details
+          params = {
+            include_declaration = true,
+          },
+        },
+        -- The LSP base mode for:
+        -- * lsp_definitions, lsp_references, lsp_implementations
+        -- * lsp_type_definitions, lsp_declarations, lsp_command
+        lsp_base = {
+          params = {
+            -- don't include the current location in the results
+            include_current = false,
+          },
+        },
+        -- more advanced example that extends the lsp_document_symbols
+        symbols = {
+          desc = "document symbols",
+          mode = "lsp_document_symbols",
+          focus = false,
+          win = { position = "right" },
+          filter = {
+            -- remove Package since luals uses it for control flow structures
+            ["not"] = { ft = "lua", kind = "Package" },
+            any = {
+              -- all symbol kinds for help / markdown files
+              ft = { "help", "markdown" },
+              -- default set of symbol kinds
+              kind = {
+                "Class",
+                "Constructor",
+                "Enum",
+                "Field",
+                "Function",
+                "Interface",
+                "Method",
+                "Module",
+                "Namespace",
+                "Package",
+                "Property",
+                "Struct",
+                "Trait",
+              },
+            },
+          },
+        },
+      },
+      -- stylua: ignore
+      icons = {
+        ---@type trouble.Indent.symbols
+        indent = {
+          top           = "│ ",
+          middle        = "├╴",
+          last          = "└╴",
+          -- last          = "-╴",
+          -- last       = "╰╴", -- rounded
+          fold_open     = " ",
+          fold_closed   = " ",
+          ws            = "  ",
+        },
+        folder_closed   = " ",
+        folder_open     = " ",
+        kinds = {
+          Array         = " ",
+          Boolean       = "󰨙 ",
+          Class         = " ",
+          Constant      = "󰏿 ",
+          Constructor   = " ",
+          Enum          = " ",
+          EnumMember    = " ",
+          Event         = " ",
+          Field         = " ",
+          File          = " ",
+          Function      = "󰊕 ",
+          Interface     = " ",
+          Key           = " ",
+          Method        = "󰊕 ",
+          Module        = " ",
+          Namespace     = "󰦮 ",
+          Null          = " ",
+          Number        = "󰎠 ",
+          Object        = " ",
+          Operator      = " ",
+          Package       = " ",
+          Property      = " ",
+          String        = " ",
+          Struct        = "󰆼 ",
+          TypeParameter = " ",
+          Variable      = "󰀫 ",
+        },
+      },
     }
 <
 
-
-  if you don’t want to use icons or a patched font, you can use the settings
-  below
->lua
-    -- settings without a patched font or icons
-    {
-        icons = false,
-        fold_open = "v", -- icon used for open folds
-        fold_closed = ">", -- icon used for closed folds
-        indent_lines = false, -- add an indent guide below the fold icons
-        signs = {
-            -- icons / text used for a diagnostic
-            error = "error",
-            warning = "warn",
-            hint = "hint",
-            information = "info"
-        },
-        use_diagnostic_signs = false -- enabling this will use the signs defined in your lsp client
-    }
-<
+Make sure to check the Examples </docs/examples.md>!
 
 
-USAGE                                          *trouble.nvim-trouble-v2-usage*
+USAGE                                             *trouble.nvim-trouble-usage*
 
 
 COMMANDS ~
 
-Trouble comes with the following commands:
+The **Trouble** command is a wrapper around the **Trouble** API. It can do
+anything the regular API can do.
 
-- `Trouble [mode]`open the list
-- `TroubleClose [mode]`close the list
-- `TroubleToggle [mode]`toggle the list
-- `TroubleRefresh`manually refresh the active list
+- `Trouble [mode] [action] [options]`
+
+Some examples:
+
+- Toggle diagnostics for the current buffer and stay in the current window:
+    - `Trouble diagnostics toggle focus=false filter.buf=0`
+- Show document symbols on the right of the current window.
+    Keep the document symbols in sync with the buffer you started the command in.
+    - `Trouble symbols toggle pinned=true results.win.relative=win results.win.position=right`
+- You can use **lua** code in the options for the `Trouble` command.
+    The examples below all do the same thing.
+    - `Trouble diagnostics filter.severity=vim.diagnostic.severity.ERROR`
+    - `Trouble diagnostics filter.severity = vim.diagnostic.severity.ERROR`
+    - `Trouble diagnostics filter = { severity=vim.diagnostic.severity.ERROR }`
+- Merging of nested options, with or without quoting strings:
+    - `Trouble diagnostics results.win.type = split result.win.position=right`
+    - `Trouble diagnostics results.win = { type = split, position=right}`
+    - `Trouble diagnostics results.win = { type = "split", position='right'}`
+
+Please refer to the API section for more information on the available actions
+and options.
 
 Modes:
 
-- **document_diagnostics:** document diagnostics from the builtin LSP client
-- **workspace_diagnostics:** workspace diagnostics from the builtin LSP client
-- **lsp_references:** references of the word under the cursor from the builtin
-    LSP client
-- **lsp_definitions:** definitions of the word under the cursor from the builtin
-    LSP client
-- **lsp_type_definitions:** type definitions of the word under the cursor from
-    the builtin LSP client
-- **quickfix:** |quickfix| items
-- **loclist:** items from the window’s |location list|
+- **diagnostics**diagnostics
+- **fzf**FzfLua results previously opened with `require('trouble.sources.fzf').open()`.
+- **fzf_files**FzfLua results previously opened with `require('trouble.sources.fzf').open()`.
+- **loclist**Location List
+- **lsp**LSP definitions, references, implementations, type definitions, and declarations
+- **lsp_command**command
+- **lsp_declarations**declarations
+- **lsp_definitions**definitions
+- **lsp_document_symbols**document symbols
+- **lsp_implementations**implementations
+- **lsp_incoming_calls**Incoming Calls
+- **lsp_outgoing_calls**Outgoing Calls
+- **lsp_references**references
+- **lsp_type_definitions**type definitions
+- **qflist**Quickfix List
+- **quickfix**Quickfix List
+- **symbols**document symbols
+- **telescope**Telescope results previously opened with `require('trouble.sources.telescope').open()`.
+- **telescope_files**Telescope results previously opened with `require('trouble.sources.telescope').open()`.
 
-Example keybindings:
 
->vim
-    " Vim Script
-    nnoremap <leader>xx <cmd>TroubleToggle<cr>
-    nnoremap <leader>xw <cmd>TroubleToggle workspace_diagnostics<cr>
-    nnoremap <leader>xd <cmd>TroubleToggle document_diagnostics<cr>
-    nnoremap <leader>xq <cmd>TroubleToggle quickfix<cr>
-    nnoremap <leader>xl <cmd>TroubleToggle loclist<cr>
-    nnoremap gR <cmd>TroubleToggle lsp_references<cr>
-<
+FILTERS ~
 
->lua
-    -- Lua
-    vim.keymap.set("n", "<leader>xx", function() require("trouble").toggle() end)
-    vim.keymap.set("n", "<leader>xw", function() require("trouble").toggle("workspace_diagnostics") end)
-    vim.keymap.set("n", "<leader>xd", function() require("trouble").toggle("document_diagnostics") end)
-    vim.keymap.set("n", "<leader>xq", function() require("trouble").toggle("quickfix") end)
-    vim.keymap.set("n", "<leader>xl", function() require("trouble").toggle("loclist") end)
-    vim.keymap.set("n", "gR", function() require("trouble").toggle("lsp_references") end)
-<
+Please refer to the filter docs <docs/filter.md> for more information examples
+on filters.
 
 
 API ~
 
 You can use the following functions in your keybindings:
 
+API ~
+
 >lua
-    -- toggle trouble with optional mode
-    require("trouble").toggle(mode?)
+    -- Opens trouble with the given mode.
+    -- If a view is already open with the same mode,
+    -- it will be focused unless `opts.focus = false`.
+    -- When a view is already open and `opts.new = true`,
+    -- a new view will be created.
+    ---@param opts? trouble.Mode | { new?: boolean, refresh?: boolean } | string
+    ---@return trouble.View?
+    require("trouble").open(opts)
     
-    -- open trouble with optional mode
-    require("trouble").open(mode?)
+    -- Closes the last open view matching the filter.
+    ---@param opts? trouble.Mode|string
+    ---@return trouble.View?
+    require("trouble").close(opts)
     
-    -- close trouble
-    require("trouble").close()
+    -- Toggle the view with the given mode.
+    ---@param opts? trouble.Mode|string
+    ---@return trouble.View?
+    require("trouble").toggle(opts)
     
-    -- jump to the next item, skipping the groups
-    require("trouble").next({skip_groups = true, jump = true});
+    -- Returns true if there is an open view matching the mode.
+    ---@param opts? trouble.Mode|string
+    require("trouble").is_open(opts)
     
-    -- jump to the previous item, skipping the groups
-    require("trouble").previous({skip_groups = true, jump = true});
+    -- Refresh all open views. Normally this is done automatically,
+    -- unless you disabled auto refresh.
+    ---@param opts? trouble.Mode|string
+    require("trouble").refresh(opts)
     
-    -- jump to the first item, skipping the groups
-    require("trouble").first({skip_groups = true, jump = true});
+    -- Get all items from the active view for a given mode.
+    ---@param opts? trouble.Mode|string
+    require("trouble").get_items(opts)
     
-    -- jump to the last item, skipping the groups
-    require("trouble").last({skip_groups = true, jump = true});
+    -- Renders a trouble list as a statusline component.
+    -- Check the docs for examples.
+    ---@param opts? trouble.Mode|string|{hl_group?:string}
+    ---@return {get: (fun():string), has: (fun():boolean)}
+    require("trouble").statusline(opts)
+    
+    -- Closes the preview and goes to the main window.
+    -- The Trouble window is not closed.
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").cancel(opts)
+    
+    -- Open the preview
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").delete(opts)
+    
+    -- filter
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").filter(opts)
+    
+    -- Go to the first item
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").first(opts)
+    
+    -- Focus the trouble window
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").focus(opts)
+    
+    -- Fold close 
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").fold_close(opts)
+    
+    -- fold close all
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").fold_close_all(opts)
+    
+    -- Fold close recursive
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").fold_close_recursive(opts)
+    
+    -- fold disable
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").fold_disable(opts)
+    
+    -- fold enable
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").fold_enable(opts)
+    
+    -- fold more
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").fold_more(opts)
+    
+    -- Fold open 
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").fold_open(opts)
+    
+    -- fold open all
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").fold_open_all(opts)
+    
+    -- Fold open recursive
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").fold_open_recursive(opts)
+    
+    -- fold reduce
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").fold_reduce(opts)
+    
+    -- Fold toggle 
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").fold_toggle(opts)
+    
+    -- fold toggle enable
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").fold_toggle_enable(opts)
+    
+    -- Fold toggle recursive
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").fold_toggle_recursive(opts)
+    
+    -- fold update
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").fold_update(opts)
+    
+    -- fold update all
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").fold_update_all(opts)
+    
+    -- Show the help
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").help(opts)
+    
+    -- Dump the item to the console
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").inspect(opts)
+    
+    -- Jump to the item if on an item, otherwise fold the node
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").jump(opts)
+    
+    -- Jump to the item and close the trouble window
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").jump_close(opts)
+    
+    -- Jump to the item if on an item, otherwise do nothing
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").jump_only(opts)
+    
+    -- Open the item in a split
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").jump_split(opts)
+    
+    -- Open the item in a vsplit
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").jump_vsplit(opts)
+    
+    -- Go to the last item
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").last(opts)
+    
+    -- Go to the next item
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").next(opts)
+    
+    -- Go to the previous item
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").prev(opts)
+    
+    -- Open the preview
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").preview(opts)
+    
+    -- Refresh the trouble source
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").refresh(opts)
+    
+    -- Toggle the preview
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").toggle_preview(opts)
+    
+    -- Toggle the auto refresh
+    ---@param opts? trouble.Mode | { new? : boolean } | string
+    ---@return trouble.View
+    require("trouble").toggle_refresh(opts)
 <
 
 
@@ -247,58 +620,127 @@ action:
 
 >lua
     local actions = require("telescope.actions")
-    local trouble = require("trouble.providers.telescope")
+    local open_with_trouble = require("trouble.sources.telescope").open
+    
+    -- Use this to add more results without clearing the trouble list
+    local add_to_trouble = require("trouble.sources.telescope").add
     
     local telescope = require("telescope")
     
-    telescope.setup {
+    telescope.setup({
       defaults = {
         mappings = {
-          i = { ["<c-t>"] = trouble.open_with_trouble },
-          n = { ["<c-t>"] = trouble.open_with_trouble },
+          i = { ["<c-t>"] = open_with_trouble },
+          n = { ["<c-t>"] = open_with_trouble },
         },
       },
-    }
+    })
 <
 
 When you open telescope, you can now hit `<c-t>` to open the results in
 **Trouble**
 
 
-COLORS                                        *trouble.nvim-trouble-v2-colors*
+FZF-LUA ~
+
+You can easily open any search results in **Trouble**, by defining a custom
+action:
+
+>lua
+    local config = require("fzf-lua.config")
+    local actions = require("trouble.sources.fzf").actions
+    config.defaults.actions.files["ctrl-t"] = actions.open
+<
+
+When you open fzf-lua, you can now hit `<c-t>` to open the results in
+**Trouble**
+
+
+STATUSLINE COMPONENT ~
+
+Example for lualine.nvim <https://github.com/nvim-lualine/lualine.nvim>
+
+>lua
+    {
+      "nvim-lualine/lualine.nvim",
+      opts = function(_, opts)
+        local trouble = require("trouble")
+        local symbols = trouble.statusline({
+          mode = "lsp_document_symbols",
+          groups = {},
+          title = false,
+          filter = { range = true },
+          format = "{kind_icon}{symbol.name:Normal}",
+          -- The following line is needed to fix the background color
+          -- Set it to the lualine section you want to use
+          hl_group = "lualine_c_normal",
+        })
+        table.insert(opts.sections.lualine_c, {
+          symbols.get,
+          cond = symbols.has,
+        })
+      end,
+    }
+<
+
+
+COLORS                                           *trouble.nvim-trouble-colors*
 
 The table below shows all the highlight groups defined for Trouble.
 
-  Highlight Group
-  ------------------------
-  TroubleCount
-  TroubleError
-  TroubleNormal
-  TroubleTextInformation
-  TroubleSignWarning
-  TroubleLocation
-  TroubleWarning
-  TroublePreview
-  TroubleTextError
-  TroubleSignInformation
-  TroubleIndent
-  TroubleSource
-  TroubleSignHint
-  TroubleSignOther
-  TroubleFoldIcon
-  TroubleTextWarning
-  TroubleCode
-  TroubleInformation
-  TroubleSignError
-  TroubleFile
-  TroubleHint
-  TroubleTextHint
-  TroubleText
+Highlight Groups ~
+
+  Highlight Group            Default Group             Description
+  -------------------------- ------------------------- -------------
+  TroubleBasename            TroubleFilename           
+  TroubleCode                Special                   
+  TroubleCount               TabLineSel                
+  TroubleDirectory           Directory                 
+  TroubleFilename            Directory                 
+  TroubleIconArray           @punctuation.bracket      
+  TroubleIconBoolean         @boolean                  
+  TroubleIconClass           @type                     
+  TroubleIconConstant        @constant                 
+  TroubleIconConstructor     @constructor              
+  TroubleIconDirectory       Special                   
+  TroubleIconEnum            @lsp.type.enum            
+  TroubleIconEnumMember      @lsp.type.enumMember      
+  TroubleIconEvent           Special                   
+  TroubleIconField           @variable.member          
+  TroubleIconFile            Normal                    
+  TroubleIconFunction        @function                 
+  TroubleIconInterface       @lsp.type.interface       
+  TroubleIconKey             @lsp.type.keyword         
+  TroubleIconMethod          @function.method          
+  TroubleIconModule          @module                   
+  TroubleIconNamespace       @module                   
+  TroubleIconNull            @constant.builtin         
+  TroubleIconNumber          @number                   
+  TroubleIconObject          @constant                 
+  TroubleIconOperator        @operator                 
+  TroubleIconPackage         @module                   
+  TroubleIconProperty        @property                 
+  TroubleIconString          @string                   
+  TroubleIconStruct          @lsp.type.struct          
+  TroubleIconTypeParameter   @lsp.type.typeParameter   
+  TroubleIconVariable        @variable                 
+  TroubleIndent              LineNr                    
+  TroubleIndentFoldClosed    CursorLineNr              
+  TroubleIndentFoldOpen      TroubleIndent             
+  TroubleIndentLast          TroubleIndent             
+  TroubleIndentMiddle        TroubleIndent             
+  TroubleIndentTop           TroubleIndent             
+  TroubleIndentWs            TroubleIndent             
+  TroubleNormal              NormalFloat               
+  TroubleNormalNC            NormalFloat               
+  TroublePos                 LineNr                    
+  TroublePreview             Visual                    
+  TroubleSource              Comment                   
+  TroubleText                Normal                    
 ==============================================================================
-3. Links                                                  *trouble.nvim-links*
+2. Links                                                  *trouble.nvim-links*
 
 1. *image*: https://github.com/folke/trouble.nvim/assets/292349/481bc1f7-cb93-432d-8ab6-f54044334b96
-2. *LSP Trouble Screenshot*: ./media/shot.png
 
 Generated by panvimdoc <https://github.com/kdheepak/panvimdoc>
 
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/colors.lua b/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/colors.lua
deleted file mode 100644
index 9623fa82..00000000
--- a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/colors.lua
+++ /dev/null
@@ -1,34 +0,0 @@
-local util = require("trouble.util")
-
-local M = {}
-
-local links = {
-  TextError = "TroubleText",
-  TextWarning = "TroubleText",
-  TextInformation = "TroubleText",
-  TextHint = "TroubleText",
-  Text = "Normal",
-  File = "Directory",
-  Source = "Comment",
-  Code = "Comment",
-  Location = "LineNr",
-  FoldIcon = "CursorLineNr",
-  Normal = "Normal",
-  Count = "TabLineSel",
-  Preview = "Search",
-  Indent = "LineNr",
-  SignOther = "TroubleSignInformation",
-}
-
-function M.setup()
-  for k, v in pairs(links) do
-    vim.api.nvim_command("hi def link Trouble" .. k .. " " .. v)
-  end
-
-  for _, severity in pairs(util.severity) do
-    vim.api.nvim_command("hi def link Trouble" .. severity .. " " .. util.get_severity_label(severity))
-    vim.api.nvim_command("hi def link TroubleSign" .. severity .. " " .. util.get_severity_label(severity, "Sign"))
-  end
-end
-
-return M
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/config.lua b/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/config.lua
deleted file mode 100644
index 6402263a..00000000
--- a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/config.lua
+++ /dev/null
@@ -1,83 +0,0 @@
-local M = {}
-
-M.namespace = vim.api.nvim_create_namespace("Trouble")
-
----@class TroubleOptions
----@field buf number|nil
----@field win number|nil
----@field severity lsp.DiagnosticSeverity|nil
--- TODO: make some options configurable per mode
--- TODO: make it possible to have multiple trouble lists open at the same time
-local defaults = {
-  debug = false,
-  cmd_options = {},
-  group = true, -- group results by file
-  padding = true, -- add an extra new line on top of the list
-  position = "bottom", -- position of the list can be: bottom, top, left, right
-  height = 10, -- height of the trouble list when position is top or bottom
-  width = 50, -- width of the list when position is left or right
-  icons = true, -- use devicons for filenames
-  mode = "workspace_diagnostics", -- "workspace_diagnostics", "document_diagnostics", "quickfix", "lsp_references", "loclist"
-  severity = nil, -- nil (ALL) or vim.diagnostic.severity.ERROR | WARN | INFO | HINT
-  fold_open = "", -- icon used for open folds
-  fold_closed = "", -- icon used for closed folds
-  cycle_results = true, -- cycle item list when reaching beginning or end of list
-  action_keys = { -- key mappings for actions in the trouble list
-    close = "q", -- close the list
-    cancel = "<esc>", -- cancel the preview and get back to your last window / buffer / cursor
-    refresh = "r", -- manually refresh
-    jump = { "<cr>", "<tab>", "<2-leftmouse>" }, -- jump to the diagnostic or open / close folds
-    open_split = { "<c-x>" }, -- open buffer in new split
-    open_vsplit = { "<c-v>" }, -- open buffer in new vsplit
-    open_tab = { "<c-t>" }, -- open buffer in new tab
-    jump_close = { "o" }, -- jump to the diagnostic and close the list
-    toggle_mode = "m", -- toggle between "workspace" and "document" mode
-    switch_severity = "s", -- switch "diagnostics" severity filter level to ALL / HINT / INFO / WARN / ERROR
-    toggle_preview = "P", -- toggle auto_preview
-    hover = "K", -- opens a small popup with the full multiline message
-    preview = "p", -- preview the diagnostic location
-    open_code_href = "c", -- if present, open a URI with more information about the diagnostic error
-    close_folds = { "zM", "zm" }, -- close all folds
-    open_folds = { "zR", "zr" }, -- open all folds
-    toggle_fold = { "zA", "za" }, -- toggle fold of current file
-    previous = "k", -- preview item
-    next = "j", -- next item
-    help = "?", -- help menu
-  },
-  multiline = true, -- render multi-line messages
-  indent_lines = true, -- add an indent guide below the fold icons
-  win_config = { border = "single" }, -- window configuration for floating windows. See |nvim_open_win()|.
-  auto_open = false, -- automatically open the list when you have diagnostics
-  auto_close = false, -- automatically close the list when you have no diagnostics
-  auto_preview = true, -- automatically preview the location of the diagnostic. <esc> to close preview and go back to last window
-  auto_fold = false, -- automatically fold a file trouble list at creation
-  auto_jump = { "lsp_definitions" }, -- for the given modes, automatically jump if there is only a single result
-  include_declaration = { "lsp_references", "lsp_implementations", "lsp_definitions" }, -- for the given modes, include the declaration of the current symbol in the results
-  signs = {
-    -- icons / text used for a diagnostic
-    error = "",
-    warning = "",
-    hint = "",
-    information = "",
-    other = "",
-  },
-  use_diagnostic_signs = false, -- enabling this will use the signs defined in your lsp client
-  sort_keys = {
-    "severity",
-    "filename",
-    "lnum",
-    "col",
-  },
-}
-
----@type TroubleOptions
-M.options = {}
----@return TroubleOptions
-
-function M.setup(options)
-  M.options = vim.tbl_deep_extend("force", {}, defaults, options or {})
-end
-
-M.setup()
-
-return M
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/folds.lua b/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/folds.lua
deleted file mode 100644
index e0c8f442..00000000
--- a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/folds.lua
+++ /dev/null
@@ -1,24 +0,0 @@
-local config = require("trouble.config")
-
-local M = {}
-
-M.folded = {}
-
-function M.is_folded(filename)
-  local fold = M.folded[filename]
-  return (fold == nil and config.options.auto_fold == true) or (fold == true)
-end
-
-function M.toggle(filename)
-  M.folded[filename] = not M.is_folded(filename)
-end
-
-function M.close(filename)
-  M.folded[filename] = true
-end
-
-function M.open(filename)
-  M.folded[filename] = false
-end
-
-return M
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/init.lua b/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/init.lua
index 31abfe5d..734a07c1 100644
--- a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/init.lua
+++ b/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/init.lua
@@ -1,300 +1,13 @@
-local View = require("trouble.view")
-local config = require("trouble.config")
-local colors = require("trouble.colors")
-local util = require("trouble.util")
+---@class trouble: trouble.api
+local M = {}
 
-colors.setup()
-
-local Trouble = {}
-
-local view
-
-function Trouble.is_open()
-  return view and view:is_valid() or false
+---@param opts? trouble.Config
+function M.setup(opts)
+  require("trouble.config").setup(opts)
 end
 
-function Trouble.setup(options)
-  if vim.fn.has("nvim-0.7.2") == 0 then
-    util.error("Trouble needs Neovim >= 0.7.2")
-    return
-  end
-  config.setup(options)
-  util.fix_mode(config.options)
-  colors.setup()
-end
-
-function Trouble.close()
-  if Trouble.is_open() then
-    view:close()
-  end
-end
-
-local function get_opts(...)
-  local args = { ... }
-  if (vim.islist or vim.tbl_islist)(args) and #args == 1 and type(args[1]) == "table" then
-    args = args[1]
-  end
-  local opts = {}
-  for key, value in pairs(args) do
-    if type(key) == "number" then
-      local k, v = value:match("^(.*)=(.*)$")
-      if k then
-        opts[k] = v
-      elseif opts.mode then
-        util.error("unknown option " .. value)
-      else
-        opts.mode = value
-      end
-    else
-      opts[key] = value
-    end
-  end
-  opts = opts or {}
-  util.fix_mode(opts)
-  config.options.cmd_options = opts
-  return opts
-end
-
-function Trouble.open(...)
-  local opts = get_opts(...)
-  if opts.mode and (opts.mode ~= config.options.mode) then
-    config.options.mode = opts.mode
-  end
-
-  if opts.severity and (opts.severity ~= config.options.severity) then
-    config.options.severity = opts.severity
-  end
-
-  opts.focus = (opts.focus == nil and not opts.auto) and true or opts.focus
-  opts.on_open = true
-
-  if Trouble.is_open() then
-    Trouble.refresh(opts)
-  elseif not opts.auto and vim.tbl_contains(config.options.auto_jump, opts.mode) then
-    require("trouble.providers").get(vim.api.nvim_get_current_win(), vim.api.nvim_get_current_buf(), function(results)
-      if #results == 1 then
-        util.jump_to_item(opts.win, opts.precmd, results[1])
-      elseif #results > 0 then
-        view = View.create(opts)
-      end
-    end, config.options)
-  else
-    view = View.create(opts)
-  end
-end
-
-function Trouble.toggle(...)
-  local opts = get_opts(...)
-
-  if opts.mode and (opts.mode ~= config.options.mode) then
-    config.options.mode = opts.mode
-    Trouble.open(...)
-    return
-  end
-
-  if Trouble.is_open() then
-    Trouble.close()
-  else
-    Trouble.open(...)
-  end
-end
-
-function Trouble.help()
-  local lines = { "# Key Bindings" }
-  local height = 1
-  for command, key in pairs(config.options.action_keys) do
-    if type(key) == "table" then
-      key = table.concat(key, " | ")
-    end
-    table.insert(lines, " * **" .. key .. "** " .. command:gsub("_", " "))
-    height = height + 1
-  end
-  -- help
-  vim.lsp.util.open_floating_preview(lines, "markdown", config.options.win_config)
-end
-
-local updater = util.debounce(100, function()
-  -- buff might have been closed during the debounce
-  if not Trouble.is_open() then
-    util.debug("refresh: not open anymore")
-    return
-  end
-
-  util.debug("refresh: auto")
-  view:update({ auto = true })
-end)
-
-function Trouble.refresh(opts)
-  opts = opts or {}
-
-  -- dont do an update if this is an automated refresh from a different provider
-  if opts.auto then
-    if opts.provider == "diagnostics" and config.options.mode == "document_diagnostics" then
-      opts.provider = "document_diagnostics"
-    elseif opts.provider == "diagnostics" and config.options.mode == "workspace_diagnostics" then
-      opts.provider = "workspace_diagnostics"
-    elseif opts.provider == "qf" and config.options.mode == "quickfix" then
-      opts.provider = "quickfix"
-    elseif opts.provider == "qf" and config.options.mode == "loclist" then
-      opts.provider = "loclist"
-    end
-    if opts.provider ~= config.options.mode then
-      return
-    end
-  end
-
-  if Trouble.is_open() then
-    if opts.auto then
-      updater()
-    else
-      util.debug("refresh")
-      view:update(opts)
-    end
-  elseif opts.auto and config.options.auto_open and opts.provider == config.options.mode then
-    require("trouble.providers").get(vim.api.nvim_get_current_win(), vim.api.nvim_get_current_buf(), function(results)
-      if #results > 0 then
-        Trouble.open(opts)
-      end
-    end, config.options)
-  end
-end
-
-function Trouble.action(action)
-  if action == "toggle_mode" then
-    if config.options.mode == "document_diagnostics" then
-      config.options.mode = "workspace_diagnostics"
-    elseif config.options.mode == "workspace_diagnostics" then
-      config.options.mode = "document_diagnostics"
-    end
-    action = "refresh"
-  end
-
-  if action == "switch_severity" then
-    if config.options.severity == nil then
-      config.options.severity = vim.diagnostic.severity.ERROR
-    elseif config.options.severity < 4 then
-      config.options.severity = config.options.severity + 1
-    else
-      config.options.severity = nil
-    end
-    action = "refresh"
-  end
-
-  if view and action == "on_win_enter" then
-    view:on_win_enter()
-  end
-  if not Trouble.is_open() then
-    return Trouble
-  end
-  if action == "hover" then
-    view:hover()
-  end
-  if action == "jump" then
-    view:jump()
-  elseif action == "open_split" then
-    view:jump({ precmd = "split" })
-  elseif action == "open_vsplit" then
-    view:jump({ precmd = "vsplit" })
-  elseif action == "open_tab" then
-    view:jump({ precmd = "tabe" })
-  end
-  if action == "jump_close" then
-    view:jump()
-    Trouble.close()
-  end
-  if action == "open_folds" then
-    Trouble.refresh({ open_folds = true })
-  end
-  if action == "close_folds" then
-    Trouble.refresh({ close_folds = true })
-  end
-  if action == "toggle_fold" then
-    view:toggle_fold()
-  end
-  if action == "on_enter" then
-    view:on_enter()
-  end
-  if action == "on_leave" then
-    view:on_leave()
-  end
-  if action == "cancel" then
-    view:switch_to_parent()
-  end
-  if action == "next" then
-    view:next_item()
-    return Trouble
-  end
-  if action == "previous" then
-    view:previous_item()
-    return Trouble
-  end
-  if action == "first" then
-    view:first_item()
-    return Trouble
-  end
-  if action == "last" then
-    view:last_item()
-    return Trouble
-  end
-
-  if action == "toggle_preview" then
-    config.options.auto_preview = not config.options.auto_preview
-    if not config.options.auto_preview then
-      view:close_preview()
-    else
-      action = "preview"
-    end
-  end
-  if action == "auto_preview" and config.options.auto_preview then
-    action = "preview"
-  end
-  if action == "preview" then
-    view:preview()
-  end
-  if action == "open_code_href" then
-    view:open_code_href()
-  end
-
-  if Trouble[action] then
-    Trouble[action]()
-  end
-  return Trouble
-end
-
-function Trouble.next(opts)
-  util.fix_mode(opts)
-  if view then
-    view:next_item(opts)
-  end
-end
-
-function Trouble.previous(opts)
-  util.fix_mode(opts)
-  if view then
-    view:previous_item(opts)
-  end
-end
-
-function Trouble.first(opts)
-  util.fix_mode(opts)
-  if view then
-    view:first_item(opts)
-  end
-end
-
-function Trouble.last(opts)
-  util.fix_mode(opts)
-  if view then
-    view:last_item(opts)
-  end
-end
-
-function Trouble.get_items()
-  if view ~= nil then
-    return view.items
-  else
-    return {}
-  end
-end
-
-return Trouble
+return setmetatable(M, {
+  __index = function(_, k)
+    return require("trouble.api")[k]
+  end,
+})
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/providers/diagnostic.lua b/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/providers/diagnostic.lua
deleted file mode 100644
index 3a917d17..00000000
--- a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/providers/diagnostic.lua
+++ /dev/null
@@ -1,59 +0,0 @@
-local util = require("trouble.util")
-
----@class Lsp
-local M = {}
-
-local severity = {
-  [1] = "ERROR",
-  [2] = "WARN",
-  [3] = "INFO",
-  [4] = "HINT",
-}
-
----@param options TroubleOptions
----@return Item[]
-function M.diagnostics(_, buf, cb, options)
-  if options.mode == "workspace_diagnostics" then
-    buf = nil
-  end
-
-  local items = {}
-
-  if vim.diagnostic then
-    local diags = vim.diagnostic.get(buf, { severity = options.severity })
-    for _, item in ipairs(diags) do
-      table.insert(items, util.process_item(item))
-    end
-  else
-    ---@diagnostic disable-next-line: deprecated
-    local diags = buf and { [buf] = vim.lsp.diagnostic.get(buf) } or vim.lsp.diagnostic.get_all()
-    items = util.locations_to_items(diags, 1)
-  end
-
-  local messages = {}
-  if severity[options.severity] then
-    table.insert(messages, { text = "filter:", group = "Information" })
-    table.insert(messages, { text = severity[options.severity], group = "Sign" .. util.severity[options.severity] })
-  end
-
-  cb(items, messages)
-end
-
-function M.get_signs()
-  local signs = {}
-  for _, v in pairs(util.severity) do
-    if v ~= "Other" then
-      -- pcall to catch entirely unbound or cleared out sign hl group
-      local status, sign = pcall(function()
-        return vim.trim(vim.fn.sign_getdefined(util.get_severity_label(v, "Sign"))[1].text)
-      end)
-      if not status then
-        sign = v:sub(1, 1)
-      end
-      signs[string.lower(v)] = sign
-    end
-  end
-  return signs
-end
-
-return M
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/providers/init.lua b/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/providers/init.lua
deleted file mode 100644
index 88d80b61..00000000
--- a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/providers/init.lua
+++ /dev/null
@@ -1,94 +0,0 @@
-local util = require("trouble.util")
-local qf = require("trouble.providers.qf")
-local telescope = require("trouble.providers.telescope")
-local lsp = require("trouble.providers.lsp")
-local diagnostic = require("trouble.providers.diagnostic")
-
-local M = {}
-
-M.providers = {
-  workspace_diagnostics = diagnostic.diagnostics,
-  document_diagnostics = diagnostic.diagnostics,
-  lsp_references = lsp.references,
-  lsp_implementations = lsp.implementations,
-  lsp_definitions = lsp.definitions,
-  lsp_type_definitions = lsp.type_definitions,
-  quickfix = qf.qflist,
-  loclist = qf.loclist,
-  telescope = telescope.telescope,
-}
-
----@param options TroubleOptions
-function M.get(win, buf, cb, options)
-  local name = options.mode
-  local provider = M.providers[name]
-
-  if not provider then
-    local ok, mod = pcall(require, "trouble.providers." .. name)
-    if ok then
-      M.providers[name] = mod
-      provider = mod
-    end
-  end
-
-  if not provider then
-    util.error(("invalid provider %q"):format(name))
-    return {}
-  end
-
-  local sort_keys = vim.list_extend({
-    function(item)
-      local cwd = vim.loop.fs_realpath(vim.fn.getcwd())
-      local path = vim.loop.fs_realpath(item.filename)
-      if not path then
-        return 200
-      end
-      local ret = string.find(path, cwd, 1, true) == 1 and 10 or 100
-      -- prefer non-hidden files
-      if string.find(path, ".") then
-        ret = ret + 1
-      end
-      return ret
-    end,
-  }, options.sort_keys)
-
-  provider(win, buf, function(items, messages)
-    table.sort(items, function(a, b)
-      for _, key in ipairs(sort_keys) do
-        local ak = type(key) == "string" and a[key] or key(a)
-        local bk = type(key) == "string" and b[key] or key(b)
-        if ak ~= bk then
-          return ak < bk
-        end
-      end
-    end)
-    cb(items, messages)
-  end, options)
-end
-
----@param items Item[]
----@return table<string, Item[]>
-function M.group(items)
-  local keys = {}
-  local keyid = 0
-  local groups = {}
-  for _, item in ipairs(items) do
-    if groups[item.filename] == nil then
-      groups[item.filename] = { filename = item.filename, items = {} }
-      keys[item.filename] = keyid
-      keyid = keyid + 1
-    end
-    table.insert(groups[item.filename].items, item)
-  end
-
-  local ret = {}
-  for _, group in pairs(groups) do
-    table.insert(ret, group)
-  end
-  table.sort(ret, function(a, b)
-    return keys[a.filename] < keys[b.filename]
-  end)
-  return ret
-end
-
-return M
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/providers/lsp.lua b/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/providers/lsp.lua
deleted file mode 100644
index 536299ea..00000000
--- a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/providers/lsp.lua
+++ /dev/null
@@ -1,93 +0,0 @@
-local lsp = require("vim.lsp")
-local util = require("trouble.util")
-
----@class Lsp
-local M = {}
-
-local function lsp_buf_request(buf, method, params, handler)
-  lsp.buf_request(buf, method, params, function(err, m, result)
-    handler(err, method == m and result or m)
-  end)
-end
-
----@return Item[]
-function M.references(win, buf, cb, options)
-  local method = "textDocument/references"
-  local params = util.make_position_params(win, buf)
-  params.context = { includeDeclaration = vim.tbl_contains(options.include_declaration, options.mode) }
-
-  lsp_buf_request(buf, method, params, function(err, result)
-    if err then
-      util.error("an error happened getting references: " .. err.message)
-      return cb({})
-    end
-    if result == nil or #result == 0 then
-      return cb({})
-    end
-    local ret = util.locations_to_items({ result }, 0)
-    cb(ret)
-  end)
-end
-
----@return Item[]
-function M.implementations(win, buf, cb, options)
-  local method = "textDocument/implementation"
-  local params = util.make_position_params(win, buf)
-  params.context = { includeDeclaration = vim.tbl_contains(options.include_declaration, options.mode) }
-  lsp_buf_request(buf, method, params, function(err, result)
-    if err then
-      util.error("an error happened getting implementation: " .. err.message)
-      return cb({})
-    end
-    if result == nil or #result == 0 then
-      return cb({})
-    end
-    local ret = util.locations_to_items({ result }, 0)
-    cb(ret)
-  end)
-end
-
----@return Item[]
-function M.definitions(win, buf, cb, options)
-  local method = "textDocument/definition"
-  local params = util.make_position_params(win, buf)
-  params.context = { includeDeclaration = vim.tbl_contains(options.include_declaration, options.mode) }
-  lsp_buf_request(buf, method, params, function(err, result)
-    if err then
-      util.error("an error happened getting definitions: " .. err.message)
-      return cb({})
-    end
-    if result == nil or #result == 0 then
-      return cb({})
-    end
-    for _, value in ipairs(result) do
-      value.uri = value.targetUri or value.uri
-      value.range = value.targetSelectionRange or value.range
-    end
-    local ret = util.locations_to_items({ result }, 0)
-    cb(ret)
-  end)
-end
-
----@return Item[]
-function M.type_definitions(win, buf, cb, _options)
-  local method = "textDocument/typeDefinition"
-  local params = util.make_position_params(win, buf)
-  lsp_buf_request(buf, method, params, function(err, result)
-    if err then
-      util.error("an error happened getting type definitions: " .. err.message)
-      return cb({})
-    end
-    if result == nil or #result == 0 then
-      return cb({})
-    end
-    for _, value in ipairs(result) do
-      value.uri = value.targetUri or value.uri
-      value.range = value.targetSelectionRange or value.range
-    end
-    local ret = util.locations_to_items({ result }, 0)
-    cb(ret)
-  end)
-end
-
-return M
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/providers/qf.lua b/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/providers/qf.lua
deleted file mode 100644
index 3e3b6235..00000000
--- a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/providers/qf.lua
+++ /dev/null
@@ -1,47 +0,0 @@
-local util = require("trouble.util")
-
-local M = {}
-
-local severities = { E = 1, W = 2, I = 3, H = 4 }
-
-function M.get_list(winid)
-  local list = winid == nil and vim.fn.getqflist({ all = true }) or vim.fn.getloclist(winid, { all = true })
-
-  local ret = {}
-  for _, item in pairs(list.items) do
-    local row = (item.lnum == 0 and 1 or item.lnum) - 1
-    local col = (item.col == 0 and 1 or item.col) - 1
-
-    if item.valid == 1 then
-      ret[#ret + 1] = {
-        row = row,
-        col = col,
-        message = item.text,
-        severity = severities[item.type] or 0,
-        bufnr = item.bufnr,
-        range = {
-          start = { line = row, character = col },
-          ["end"] = { line = row, character = -1 },
-        },
-      }
-    elseif #ret > 0 then
-      ret[#ret].message = ret[#ret].message .. "\n" .. item.text
-    end
-  end
-
-  for i, item in ipairs(ret) do
-    ret[i] = util.process_item(item)
-  end
-
-  return ret
-end
-
-function M.loclist(win, _buf, cb, _options)
-  return cb(M.get_list(win))
-end
-
-function M.qflist(_win, _buf, cb, _options)
-  return cb(M.get_list())
-end
-
-return M
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/providers/telescope.lua b/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/providers/telescope.lua
index d6721486..4813e753 100644
--- a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/providers/telescope.lua
+++ b/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/providers/telescope.lua
@@ -1,86 +1,19 @@
-local util = require("trouble.util")
+local T = require("trouble.sources.telescope")
 
-local M = {}
+return setmetatable({}, {
+  __index = function(_, k)
+    require("trouble.util").warn(
+      ([[
+`%s()` is deprecated
+```lua
+-- Use this:
+require("trouble.sources.telescope").open()
 
-M.results = {}
-
---- Turns a Telescope item into a Trouble item.
-local function item_to_result(item)
-  local row = (item.lnum or 1) - 1
-  local col = (item.col or 1) - 1
-
-  if not item.bufnr then
-    local fname = vim.fn.fnamemodify(item.filename, ":p")
-    if vim.fn.filereadable(fname) == 0 and item.cwd then
-      fname = vim.fn.fnamemodify(item.cwd .. "/" .. item.filename, ":p")
-    end
-    item.bufnr = vim.fn.bufnr(fname, true)
-  end
-
-  local pitem = {
-    row = row,
-    col = col,
-    message = item.text,
-    severity = 0,
-    range = {
-      start = { line = row, character = col },
-      ["end"] = { line = row, character = -1 },
-    },
-  }
-
-  return util.process_item(pitem, item.bufnr)
-end
-
---- Shows all Telescope results in Trouble.
-function M.open_with_trouble(prompt_bufnr, _mode)
-  local action_state = require("telescope.actions.state")
-  local actions = require("telescope.actions")
-  local picker = action_state.get_current_picker(prompt_bufnr)
-  local manager = picker.manager
-
-  M.results = {}
-  for item in manager:iter() do
-    table.insert(M.results, item_to_result(item))
-  end
-
-  actions.close(prompt_bufnr)
-  require("trouble").open("telescope")
-end
-
---- Shows the selected Telescope results in Trouble.
-function M.open_selected_with_trouble(prompt_bufnr, _mode)
-  local action_state = require("telescope.actions.state")
-  local actions = require("telescope.actions")
-  local picker = action_state.get_current_picker(prompt_bufnr)
-
-  M.results = {}
-  for _, item in ipairs(picker:get_multi_selection()) do
-    table.insert(M.results, item_to_result(item))
-  end
-
-  actions.close(prompt_bufnr)
-  require("trouble").open("telescope")
-end
-
---- Shows the selected Telescope results in Trouble.
---- If no results are currently selected, shows all of them.
-function M.smart_open_with_trouble(prompt_bufnr, _mode)
-  local action_state = require("telescope.actions.state")
-  local picker = action_state.get_current_picker(prompt_bufnr)
-  if #picker:get_multi_selection() > 0 then
-    M.open_selected_with_trouble(prompt_bufnr, _mode)
-  else
-    M.open_with_trouble(prompt_bufnr, _mode)
-  end
-end
-
-function M.telescope(_win, _buf, cb, _options)
-  if #M.results == 0 then
-    util.warn(
-      "No Telescope results found. Open Telescope and send results to Trouble first. Refer to the documentation for more info."
+-- Instead of:
+require("trouble.providers.telescope").%s()
+]]):format(k, k),
+      { once = true }
     )
-  end
-  cb(M.results)
-end
-
-return M
+    return T.open
+  end,
+})
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/renderer.lua b/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/renderer.lua
deleted file mode 100644
index 7786bf0f..00000000
--- a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/renderer.lua
+++ /dev/null
@@ -1,173 +0,0 @@
-local providers = require("trouble.providers")
-local util = require("trouble.util")
-local config = require("trouble.config")
-local Text = require("trouble.text")
-local folds = require("trouble.folds")
-
----@class Renderer
-local renderer = {}
-
-renderer.signs = {}
-
-local function get_icon(file)
-  local ok, icons = pcall(require, "nvim-web-devicons")
-  if not ok then
-    util.warn(
-      "'nvim-web-devicons' is not installed. Install it, or set icons=false in your configuration to disable this message"
-    )
-    return ""
-  end
-  local fname = vim.fn.fnamemodify(file, ":t")
-  local ext = vim.fn.fnamemodify(file, ":e")
-  return icons.get_icon(fname, ext, { default = true })
-end
-
-local function update_signs()
-  renderer.signs = config.options.signs
-  if config.options.use_diagnostic_signs then
-    local lsp_signs = require("trouble.providers.diagnostic").get_signs()
-    renderer.signs = vim.tbl_deep_extend("force", {}, renderer.signs, lsp_signs)
-  end
-end
-
----@param view TroubleView
-function renderer.render(view, opts)
-  opts = opts or {}
-  local buf = vim.api.nvim_win_get_buf(view.parent)
-  providers.get(view.parent, buf, function(items, messages)
-    local auto_jump = vim.tbl_contains(config.options.auto_jump, opts.mode)
-    if opts.on_open and #items == 1 and auto_jump and not opts.auto then
-      view:close()
-      util.jump_to_item(opts.win, opts.precmd, items[1])
-      return
-    end
-
-    local grouped = providers.group(items)
-    local count = util.count(grouped)
-
-    -- check for auto close
-    if opts.auto and config.options.auto_close then
-      if count == 0 then
-        view:close()
-        return
-      end
-    end
-
-    -- Update lsp signs
-    update_signs()
-
-    local text = Text:new()
-    view.items = {}
-
-    if config.options.padding then
-      if messages ~= nil then
-        for _, msg in ipairs(messages) do
-          text:render(" " .. msg.text, msg.group, { append = " " })
-        end
-      end
-      text:nl()
-    end
-
-    -- render file groups
-    for _, group in ipairs(grouped) do
-      if opts.open_folds then
-        folds.open(group.filename)
-      end
-      if opts.close_folds then
-        folds.close(group.filename)
-      end
-      renderer.render_file(view, text, group.filename, group.items)
-    end
-
-    view:render(text)
-    if opts.focus then
-      view:focus()
-    end
-  end, config.options)
-end
-
----@param view TroubleView
----@param text Text
----@param items Item[]
----@param filename string
-function renderer.render_file(view, text, filename, items)
-  view.items[text.lineNr + 1] = { filename = filename, is_file = true }
-
-  if view.group == true then
-    local count = util.count(items)
-
-    text:render(" ")
-
-    if folds.is_folded(filename) then
-      text:render(config.options.fold_closed, "FoldIcon", " ")
-    else
-      text:render(config.options.fold_open, "FoldIcon", " ")
-    end
-
-    if config.options.icons then
-      local icon, icon_hl = get_icon(filename)
-      text:render(icon, icon_hl, { exact = true, append = " " })
-    end
-
-    text:render(vim.fn.fnamemodify(filename, ":p:."), "File", " ")
-    text:render(" " .. count .. " ", "Count")
-    text:nl()
-  end
-
-  if not folds.is_folded(filename) then
-    renderer.render_diagnostics(view, text, items)
-  end
-end
-
----@param view TroubleView
----@param text Text
----@param items Item[]
-function renderer.render_diagnostics(view, text, items)
-  for _, diag in ipairs(items) do
-    view.items[text.lineNr + 1] = diag
-
-    local sign = diag.sign or renderer.signs[string.lower(diag.type)]
-    if not sign then
-      sign = diag.type
-    end
-
-    local indent = "     "
-    if config.options.indent_lines then
-      indent = " │   "
-    elseif config.options.group == false then
-      indent = " "
-    end
-
-    local sign_hl = diag.sign_hl or ("TroubleSign" .. diag.type)
-
-    text:render(indent, "Indent")
-    text:render(sign .. "  ", sign_hl, { exact = true })
-
-    local lines = config.options.multiline and vim.split(diag.full_text, "\n") or { diag.text }
-
-    text:render(lines[1], "Text" .. diag.type, " ")
-
-    if diag.source then
-      text:render(diag.source, "Source")
-    end
-    if diag.code and diag.code ~= vim.NIL then
-      text:render(" (" .. diag.code .. ")", "Code")
-    end
-
-    text:render(" ")
-
-    text:render("[" .. diag.lnum .. ", " .. diag.col .. "]", "Location")
-
-    for l = 2, #lines do
-      local str = lines[l]
-      text:nl()
-      view.items[text.lineNr + 1] = diag
-      text:render(indent .. "   ", "Indent")
-      text:render(str, "Text" .. diag.type, " ")
-    end
-
-    text:nl()
-  end
-end
-
-return renderer
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/text.lua b/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/text.lua
deleted file mode 100644
index d3595096..00000000
--- a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/text.lua
+++ /dev/null
@@ -1,52 +0,0 @@
----@class Text
----@field lines string[]
----@field hl Highlight[]
----@field lineNr number
----@field current string
-local Text = {}
-Text.__index = Text
-
-function Text:new()
-  local this = { lines = {}, hl = {}, lineNr = 0, current = "" }
-  setmetatable(this, self)
-  return this
-end
-
-function Text:nl()
-  table.insert(self.lines, self.current)
-  self.current = ""
-  self.lineNr = self.lineNr + 1
-end
-
-function Text:render(str, group, opts)
-  str = str:gsub("[\n]", " ")
-  if type(opts) == "string" then
-    opts = { append = opts }
-  end
-  opts = opts or {}
-
-  if group then
-    if opts.exact ~= true then
-      group = "Trouble" .. group
-    end
-    local from = string.len(self.current)
-    ---@class Highlight
-    local hl
-    hl = {
-      line = self.lineNr,
-      from = from,
-      to = from + string.len(str),
-      group = group,
-    }
-    table.insert(self.hl, hl)
-  end
-  self.current = self.current .. str
-  if opts.append then
-    self.current = self.current .. opts.append
-  end
-  if opts.nl then
-    self:nl()
-  end
-end
-
-return Text
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/util.lua b/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/util.lua
index 62fe12e4..1291721f 100644
--- a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/util.lua
+++ b/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/util.lua
@@ -1,242 +1,317 @@
-local config = require("trouble.config")
-local uv = vim.loop
+local Config = require("trouble.config")
+local uv = vim.loop or vim.uv
 
 local M = {}
 
-function M.jump_to_item(win, precmd, item)
-  -- requiring here, as otherwise we run into a circular dependency
-  local View = require("trouble.view")
-
-  -- save position in jump list
-  vim.cmd("normal! m'")
-
-  View.switch_to(win)
-  if precmd then
-    vim.cmd(precmd)
-  end
-  if not vim.bo[item.bufnr].buflisted then
-    vim.bo[item.bufnr].buflisted = true
-  end
-  if not vim.api.nvim_buf_is_loaded(item.bufnr) then
-    vim.fn.bufload(item.bufnr)
-  end
-  vim.api.nvim_set_current_buf(item.bufnr)
-  vim.api.nvim_win_set_cursor(win or 0, { item.start.line + 1, item.start.character })
-  vim.api.nvim_exec_autocmds("User", { pattern = "TroubleJump", modeline = false })
+---@param fn function
+function M.noautocmd(fn)
+  local ei = vim.o.eventignore
+  vim.o.eventignore = "all"
+  fn()
+  vim.o.eventignore = ei
 end
 
-function M.fix_mode(opts)
-  if opts.use_lsp_diagnostic_signs then
-    opts.use_diagnostic_signs = opts.use_lsp_diagnostic_signs
-    M.warn("The Trouble option use_lsp_diagnostic_signs has been renamed to use_diagnostic_signs")
-  end
-  local replace = {
-    lsp_workspace_diagnostics = "workspace_diagnostics",
-    lsp_document_diagnostics = "document_diagnostics",
-    workspace = "workspace_diagnostics",
-    document = "document_diagnostics",
-  }
+function M.is_win()
+  return vim.uv.os_uname().sysname:find("Windows") ~= nil
+end
 
-  for old, new in pairs(replace) do
-    if opts.mode == old then
-      opts.mode = new
-      M.warn("Using " .. old .. " for Trouble is deprecated. Please use " .. new .. " instead.")
+---@param opts? {msg?: string}
+function M.try(fn, opts)
+  local ok, err = pcall(fn)
+  if not ok then
+    local msg = opts and opts.msg or "Something went wrong:"
+    msg = msg .. "\n" .. err
+    M.error(msg)
+  end
+end
+
+M.islist = vim.islist or vim.tbl_islist
+
+---@alias NotifyOpts {level?: number, title?: string, once?: boolean, id?:string}
+
+---@type table<string, any>
+local notif_ids = {}
+
+---@param msg string|string[]
+---@param opts? NotifyOpts
+function M.notify(msg, opts)
+  opts = opts or {}
+  msg = type(msg) == "table" and table.concat(msg, "\n") or msg
+  ---@cast msg string
+  msg = vim.trim(msg)
+  local ret = vim[opts.once and "notify_once" or "notify"](msg, opts.level, {
+    replace = opts.id and notif_ids[opts.id] or nil,
+    title = opts.title or "Trouble",
+    on_open = function(win)
+      vim.wo.conceallevel = 3
+      vim.wo.concealcursor = "n"
+      vim.wo.spell = false
+      vim.treesitter.start(vim.api.nvim_win_get_buf(win), "markdown")
+    end,
+  })
+  if opts.id then
+    notif_ids[opts.id] = ret
+  end
+  return ret
+end
+
+---@param msg string|string[]
+---@param opts? NotifyOpts
+function M.warn(msg, opts)
+  M.notify(msg, vim.tbl_extend("keep", { level = vim.log.levels.WARN }, opts or {}))
+end
+
+---@param msg string|string[]
+---@param opts? NotifyOpts
+function M.info(msg, opts)
+  M.notify(msg, vim.tbl_extend("keep", { level = vim.log.levels.INFO }, opts or {}))
+end
+
+---@param msg string|string[]
+---@param opts? NotifyOpts
+function M.error(msg, opts)
+  M.notify(msg, vim.tbl_extend("keep", { level = vim.log.levels.ERROR }, opts or {}))
+end
+
+---@param msg string|string[]
+function M.debug(msg, ...)
+  if Config.debug then
+    if select("#", ...) > 0 then
+      local obj = select("#", ...) == 1 and ... or { ... }
+      msg = msg .. "\n```lua\n" .. vim.inspect(obj) .. "\n```"
     end
+    M.notify(msg, { title = "Trouble (debug)" })
   end
 end
 
----@return number
-function M.count(tab)
-  local count = 0
-  for _ in pairs(tab) do
-    count = count + 1
-  end
-  return count
-end
-
-function M.warn(msg)
-  vim.notify(msg, vim.log.levels.WARN, { title = "Trouble" })
-end
-
-function M.error(msg)
-  vim.notify(msg, vim.log.levels.ERROR, { title = "Trouble" })
-end
-
-function M.debug(msg)
-  if config.options.debug then
-    vim.notify(msg, vim.log.levels.DEBUG, { title = "Trouble" })
+---@param buf number
+---@param row number
+---@param ns number
+---@param col number
+---@param opts vim.api.keyset.set_extmark
+---@param debug_info? any
+function M.set_extmark(buf, ns, row, col, opts, debug_info)
+  local ok, err = pcall(vim.api.nvim_buf_set_extmark, buf, ns, row, col, opts)
+  if not ok and Config.debug then
+    M.debug("Failed to set extmark for preview", { info = debug_info, row = row, col = col, opts = opts, error = err })
   end
 end
 
-function M.debounce(ms, fn)
-  local timer = vim.loop.new_timer()
-  return function(...)
-    local argv = { ... }
-    timer:start(ms, 0, function()
-      timer:stop()
-      vim.schedule_wrap(fn)(unpack(argv))
+---@param str string
+---@param sep? string
+function M.camel(str, sep)
+  local parts = vim.split(str, "[%.%-%_]")
+  ---@diagnostic disable-next-line: no-unknown
+  return table.concat(
+    vim.tbl_map(function(part)
+      return part:sub(1, 1):upper() .. part:sub(2)
+    end, parts),
+    sep or ""
+  )
+end
+
+---@param opts? {ms?: number, debounce?: boolean}|number
+---@param default Throttle.opts
+---@return Throttle.opts
+function M.throttle_opts(opts, default)
+  opts = opts or {}
+  if type(opts) == "number" then
+    opts = { ms = opts }
+  end
+  return vim.tbl_deep_extend("force", default, opts)
+end
+
+---@alias Throttle.opts {ms:number, debounce?:boolean, is_running?:fun():boolean}
+
+-- throttle with trailing execution
+---@generic T: fun()
+---@param fn T
+---@param opts? Throttle.opts
+---@return T
+function M.throttle(fn, opts)
+  opts = opts or {}
+  opts.ms = opts.ms or 20
+  local last = 0
+  local args = nil ---@type {n?:number}?
+  local timer = assert(uv.new_timer())
+  local pending = false -- from run() till end of fn
+  local running = false -- from run() till end of fn with is_running()
+
+  local t = {}
+
+  function t.run()
+    pending = true
+    running = true
+    timer:stop()
+    last = uv.now()
+    vim.schedule(function()
+      xpcall(function()
+        if not args then
+          return M.debug("Empty args. This should not happen.")
+        end
+        fn(vim.F.unpack_len(args))
+        args = nil
+      end, function(err)
+        vim.schedule(function()
+          M.error(err)
+        end)
+      end)
+      pending = false
+      t.check()
     end)
   end
-end
 
-function M.throttle(ms, fn)
-  local timer = vim.loop.new_timer()
-  local running = false
+  function t.schedule()
+    local now = uv.now()
+    local delay = opts.debounce and opts.ms or (opts.ms - (now - last))
+    timer:stop()
+    timer:start(math.max(0, delay), 0, t.run)
+  end
+
+  function t.check()
+    if running and not pending and not (opts.is_running and opts.is_running()) then
+      running = false
+      if args then -- schedule if there are pending args
+        t.schedule()
+      end
+    end
+  end
+
+  local check = assert(uv.new_check())
+  check:start(t.check)
+
   return function(...)
-    if not running then
-      local argv = { ... }
-      local argc = select("#", ...)
+    args = vim.F.pack_len(...)
 
-      timer:start(ms, 0, function()
-        running = false
-        pcall(vim.schedule_wrap(fn), unpack(argv, 1, argc))
-      end)
-      running = true
+    if timer:is_active() and not opts.debounce then
+      return
+    elseif not running then
+      t.schedule()
     end
   end
 end
 
-M.severity = {
-  [0] = "Other",
-  [1] = "Error",
-  [2] = "Warning",
-  [3] = "Information",
-  [4] = "Hint",
-}
-
--- returns a hl or sign label for the givin severity and type
--- correctly handles new names introduced in vim.diagnostic
-function M.get_severity_label(severity, type)
-  local label = severity
-  local prefix = "LspDiagnostics" .. (type or "Default")
-
-  if vim.diagnostic then
-    prefix = type and ("Diagnostic" .. type) or "Diagnostic"
-    label = ({
-      Warning = "Warn",
-      Information = "Info",
-    })[severity] or severity
-  end
-
-  return prefix .. label
+---@param s string
+function M.lines(s)
+  return M.split(s, "\n")
 end
 
--- based on the Telescope diagnostics code
--- see https://github.com/nvim-telescope/telescope.nvim/blob/0d6cd47990781ea760dd3db578015c140c7b9fa7/lua/telescope/utils.lua#L85
-function M.process_item(item, bufnr)
-  bufnr = bufnr or item.bufnr
-  local filename = vim.api.nvim_buf_get_name(bufnr)
-  local range = item.range or item.targetSelectionRange
+---@param s string
+---@param c? string
+function M.split(s, c)
+  c = c or "\n"
+  local pos = 1
+  local l = 0
+  return function()
+    if pos == -1 then
+      return
+    end
+    l = l + 1
 
-  local start = {
-    line = range and vim.tbl_get(range, "start", "line") or item.lnum,
-    character = range and vim.tbl_get(range, "start", "character") or item.col,
-  }
-  local finish = {
-    line = range and vim.tbl_get(range, "end", "line") or item.end_lnum,
-    character = range and vim.tbl_get(range, "end", "character") or item.end_col,
-  }
+    local nl = s:find(c, pos, true)
+    if not nl then
+      local lastLine = s:sub(pos)
+      pos = -1
+      return l, lastLine
+    end
 
-  if start.character == nil or start.line == nil then
-    M.error("Found an item for Trouble without start range " .. vim.inspect(start))
+    local line = s:sub(pos, nl - 1)
+    pos = nl + 1
+    return l, line
   end
-  if finish.character == nil or finish.line == nil then
-    M.error("Found an item for Trouble without finish range " .. vim.inspect(finish))
-  end
-  local row = start.line ---@type number
-  local col = start.character ---@type number
+end
 
-  if not item.message and filename then
-    -- check if the filename is a uri
-    if string.match(filename, "^%w+://") ~= nil then
-      if not vim.api.nvim_buf_is_loaded(bufnr) then
-        vim.fn.bufload(bufnr)
+--- Gets lines from a file or buffer
+---@param opts {path?:string, buf?: number, rows?: number[]}
+---@return table<number, string>?
+function M.get_lines(opts)
+  if opts.buf then
+    local uri = vim.uri_from_bufnr(opts.buf)
+
+    if uri:sub(1, 4) ~= "file" then
+      vim.fn.bufload(opts.buf)
+    end
+
+    if vim.api.nvim_buf_is_loaded(opts.buf) then
+      local lines = {} ---@type table<number, string>
+      if not opts.rows then
+        return vim.api.nvim_buf_get_lines(opts.buf, 0, -1, false)
       end
-      local lines = vim.api.nvim_buf_get_lines(bufnr, row, row + 1, false)
-      item.message = lines[1] or ""
-    else
-      local fd = assert(uv.fs_open(filename, "r", 438))
-      local stat = assert(uv.fs_fstat(fd))
-      local data = assert(uv.fs_read(fd, stat.size, 0))
-      assert(uv.fs_close(fd))
+      for _, row in ipairs(opts.rows) do
+        lines[row] = vim.api.nvim_buf_get_lines(opts.buf, row - 1, row, false)[1]
+      end
+      return lines
+    end
+    opts.path = vim.uri_to_fname(uri)
+  elseif not opts.path then
+    error("buf or filename is required")
+  end
 
-      item.message = vim.split(data, "\n", { plain = true })[row + 1] or ""
+  local fd = uv.fs_open(opts.path, "r", 438)
+  if not fd then
+    return
+  end
+  local stat = assert(uv.fs_fstat(fd))
+  if not (stat.type == "file" or stat.type == "link") then
+    return
+  end
+  local data = assert(uv.fs_read(fd, stat.size, 0)) --[[@as string]]
+  assert(uv.fs_close(fd))
+
+  local todo = 0
+  local ret = {} ---@type table<number, string|boolean>
+  for _, r in ipairs(opts.rows or {}) do
+    if not ret[r] then
+      todo = todo + 1
+      ret[r] = true
     end
   end
 
-  ---@class Item
-  ---@field is_file boolean
-  ---@field fixed boolean
-  local ret = {
-    bufnr = bufnr,
-    filename = filename,
-    lnum = row + 1,
-    col = col + 1,
-    start = start,
-    finish = finish,
-    sign = item.sign, ---@type string?
-    sign_hl = item.sign_hl, ---@type string?
-    -- remove line break to avoid display issues
-    text = vim.trim(item.message:gsub("[\n]+", "")):sub(0, vim.o.columns),
-    full_text = vim.trim(item.message),
-    type = M.severity[item.severity] or M.severity[0],
-    code = item.code or (item.user_data and item.user_data.lsp and item.user_data.lsp.code), ---@type string?
-    code_href = (item.codeDescription and item.codeDescription.href)
-      or (
-        item.user_data
-        and item.user_data.lsp
-        and item.user_data.lsp.codeDescription
-        and item.user_data.lsp.codeDescription.href
-      ), ---@type string?
-    source = item.source, ---@type string?
-    severity = item.severity or 0,
-  }
-  return ret
-end
-
--- takes either a table indexed by bufnr, or an lsp result with uri
----@return Item[]
-function M.locations_to_items(results, default_severity)
-  default_severity = default_severity or 0
-  local ret = {}
-  for bufnr, locs in pairs(results or {}) do
-    for _, loc in pairs(locs.result or locs) do
-      if not vim.tbl_isempty(loc) then
-        local uri = loc.uri or loc.targetUri
-        local buf = uri and vim.uri_to_bufnr(uri) or bufnr
-        loc.severity = loc.severity or default_severity
-        table.insert(ret, M.process_item(loc, buf))
+  for row, line in M.lines(data) do
+    if not opts.rows or ret[row] then
+      todo = todo - 1
+      ret[row] = line
+      if todo == 0 then
+        break
       end
     end
   end
+  for i, r in pairs(ret) do
+    if r == true then
+      ret[i] = ""
+    end
+  end
   return ret
 end
 
--- @private
-local function make_position_param(win, buf)
-  local row, col = unpack(vim.api.nvim_win_get_cursor(win))
-  row = row - 1
-  local line = vim.api.nvim_buf_get_lines(buf, row, row + 1, true)[1]
-  if not line then
-    return { line = 0, character = 0 }
+--- Creates a weak reference to an object.
+--- Calling the returned function will return the object if it has not been garbage collected.
+---@generic T: table
+---@param obj T
+---@return T|fun():T?
+function M.weak(obj)
+  local weak = { _obj = obj }
+  ---@return table<any, any>
+  local function get()
+    local ret = rawget(weak, "_obj")
+    return ret == nil and error("Object has been garbage collected", 2) or ret
   end
-  col = vim.str_utfindex(line, col)
-  return { line = row, character = col }
-end
-
-function M.make_text_document_params(buf)
-  return { uri = vim.uri_from_bufnr(buf) }
-end
-
---- Creates a `TextDocumentPositionParams` object for the current buffer and cursor position.
----
--- @returns `TextDocumentPositionParams` object
--- @see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocumentPositionParams
-function M.make_position_params(win, buf)
-  return {
-    textDocument = M.make_text_document_params(buf),
-    position = make_position_param(win, buf),
+  local mt = {
+    __mode = "v",
+    __call = function(t)
+      return rawget(t, "_obj")
+    end,
+    __index = function(_, k)
+      return get()[k]
+    end,
+    __newindex = function(_, k, v)
+      get()[k] = v
+    end,
+    __pairs = function()
+      return pairs(get())
+    end,
   }
+  return setmetatable(weak, mt)
 end
 
 return M
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/view.lua b/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/view.lua
deleted file mode 100644
index 9569a5ef..00000000
--- a/config/neovim/store/lazy-plugins/trouble.nvim/lua/trouble/view.lua
+++ /dev/null
@@ -1,581 +0,0 @@
-local renderer = require("trouble.renderer")
-local config = require("trouble.config")
-local folds = require("trouble.folds")
-local util = require("trouble.util")
-
-local highlight = vim.api.nvim_buf_add_highlight
-
----@class TroubleView
----@field buf number
----@field win number
----@field group boolean
----@field items Item[]
----@field folded table<string, boolean>
----@field parent number
----@field float number
-local View = {}
-View.__index = View
-
--- keep track of buffers with added highlights
--- highlights are cleared on BufLeave of Trouble
-local hl_bufs = {}
-
-local function clear_hl(bufnr)
-  if vim.api.nvim_buf_is_valid(bufnr) then
-    vim.api.nvim_buf_clear_namespace(bufnr, config.namespace, 0, -1)
-  end
-end
-
----Find a rogue Trouble buffer that might have been spawned by i.e. a session.
-local function find_rogue_buffer()
-  for _, v in ipairs(vim.api.nvim_list_bufs()) do
-    if vim.fn.bufname(v) == "Trouble" then
-      return v
-    end
-  end
-  return nil
-end
-
----Find pre-existing Trouble buffer, delete its windows then wipe it.
----@private
-local function wipe_rogue_buffer()
-  local bn = find_rogue_buffer()
-  if bn then
-    local win_ids = vim.fn.win_findbuf(bn)
-    for _, id in ipairs(win_ids) do
-      if vim.fn.win_gettype(id) ~= "autocmd" and vim.api.nvim_win_is_valid(id) then
-        vim.api.nvim_win_close(id, true)
-      end
-    end
-
-    vim.api.nvim_buf_set_name(bn, "")
-    vim.schedule(function()
-      pcall(vim.api.nvim_buf_delete, bn, {})
-    end)
-  end
-end
-
----@return TroubleView
-function View:new(opts)
-  opts = opts or {}
-
-  local group
-  if opts.group ~= nil then
-    group = opts.group
-  else
-    group = config.options.group
-  end
-
-  local this = {
-    buf = vim.api.nvim_get_current_buf(),
-    win = opts.win or vim.api.nvim_get_current_win(),
-    parent = opts.parent,
-    items = {},
-    group = group,
-  }
-  setmetatable(this, self)
-  return this
-end
-
-function View:set_option(name, value, win)
-  if win then
-    return vim.api.nvim_set_option_value(name, value, { win = self.win, scope = "local" })
-  else
-    return vim.api.nvim_set_option_value(name, value, { buf = self.buf })
-  end
-end
-
----@param text Text
-function View:render(text)
-  if not self:is_valid() then
-    return
-  end
-
-  self:unlock()
-  self:set_lines(text.lines)
-  self:lock()
-  clear_hl(self.buf)
-  for _, data in ipairs(text.hl) do
-    highlight(self.buf, config.namespace, data.group, data.line, data.from, data.to)
-  end
-end
-
-function View:clear()
-  return vim.api.nvim_buf_set_lines(self.buf, 0, -1, false, {})
-end
-
-function View:unlock()
-  self:set_option("modifiable", true)
-  self:set_option("readonly", false)
-end
-
-function View:lock()
-  self:set_option("readonly", true)
-  self:set_option("modifiable", false)
-end
-
-function View:set_lines(lines, first, last, strict)
-  first = first or 0
-  last = last or -1
-  strict = strict or false
-  return vim.api.nvim_buf_set_lines(self.buf, first, last, strict, lines)
-end
-
-function View:is_valid()
-  return vim.api.nvim_buf_is_valid(self.buf) and vim.api.nvim_buf_is_loaded(self.buf)
-end
-
-function View:update(opts)
-  util.debug("update")
-  renderer.render(self, opts)
-end
-
-function View:setup(opts)
-  util.debug("setup")
-  opts = opts or {}
-  vim.cmd("setlocal nonu")
-  vim.cmd("setlocal nornu")
-  if not pcall(vim.api.nvim_buf_set_name, self.buf, "Trouble") then
-    wipe_rogue_buffer()
-    vim.api.nvim_buf_set_name(self.buf, "Trouble")
-  end
-  self:set_option("bufhidden", "wipe")
-  self:set_option("buftype", "nofile")
-  self:set_option("swapfile", false)
-  self:set_option("cursorline", true, true)
-  self:set_option("buflisted", false)
-  self:set_option("winfixwidth", true, true)
-  self:set_option("wrap", false, true)
-  self:set_option("spell", false, true)
-  self:set_option("list", false, true)
-  self:set_option("winfixheight", true, true)
-  self:set_option("signcolumn", "no", true)
-  self:set_option("foldmethod", "manual", true)
-  self:set_option("foldcolumn", "0", true)
-  self:set_option("foldlevel", 3, true)
-  self:set_option("foldenable", false, true)
-  self:set_option("winhighlight", "Normal:TroubleNormal,EndOfBuffer:TroubleNormal,SignColumn:TroubleNormal", true)
-  self:set_option("fcs", "eob: ", true)
-
-  for action, keys in pairs(config.options.action_keys) do
-    if type(keys) == "string" then
-      keys = { keys }
-    end
-    for _, key in pairs(keys) do
-      vim.api.nvim_buf_set_keymap(
-        self.buf,
-        "n",
-        key,
-        [[<cmd>lua require("trouble").action("]] .. action .. [[")<cr>]],
-        {
-          silent = true,
-          noremap = true,
-          nowait = true,
-        }
-      )
-    end
-  end
-
-  if config.options.position == "top" or config.options.position == "bottom" then
-    vim.api.nvim_win_set_height(self.win, config.options.height)
-  else
-    vim.api.nvim_win_set_width(self.win, config.options.width)
-  end
-
-  self:set_option("filetype", "Trouble")
-
-  vim.api.nvim_exec(
-    [[
-      augroup TroubleHighlights
-        autocmd! * <buffer>
-        autocmd BufEnter <buffer> lua require("trouble").action("on_enter")
-        autocmd CursorMoved <buffer> lua require("trouble").action("auto_preview")
-        autocmd BufLeave <buffer> lua require("trouble").action("on_leave")
-      augroup END
-    ]],
-    false
-  )
-
-  if not opts.parent then
-    self:on_enter()
-  end
-  self:lock()
-  self:update(opts)
-end
-
-function View:on_enter()
-  util.debug("on_enter")
-
-  self.parent = self.parent or vim.fn.win_getid(vim.fn.winnr("#"))
-
-  if (not self:is_valid_parent(self.parent)) or self.parent == self.win then
-    util.debug("not valid parent")
-    for _, win in pairs(vim.api.nvim_list_wins()) do
-      if self:is_valid_parent(win) and win ~= self.win then
-        self.parent = win
-        break
-      end
-    end
-  end
-
-  if not vim.api.nvim_win_is_valid(self.parent) then
-    return self:close()
-  end
-
-  self.parent_state = {
-    buf = vim.api.nvim_win_get_buf(self.parent),
-    cursor = vim.api.nvim_win_get_cursor(self.parent),
-  }
-end
-
-function View:on_leave()
-  util.debug("on_leave")
-  self:close_preview()
-end
-
-function View:close_preview()
-  -- Clear preview highlights
-  for buf, _ in pairs(hl_bufs) do
-    clear_hl(buf)
-  end
-  hl_bufs = {}
-
-  -- Reset parent state
-  local valid_win = vim.api.nvim_win_is_valid(self.parent)
-  local valid_buf = self.parent_state and vim.api.nvim_buf_is_valid(self.parent_state.buf)
-
-  if self.parent_state and valid_buf and valid_win then
-    vim.api.nvim_win_set_buf(self.parent, self.parent_state.buf)
-    vim.api.nvim_win_set_cursor(self.parent, self.parent_state.cursor)
-  end
-
-  self.parent_state = nil
-end
-
-function View:is_float(win)
-  local opts = vim.api.nvim_win_get_config(win)
-  return opts and opts.relative and opts.relative ~= ""
-end
-
-function View:is_valid_parent(win)
-  if not vim.api.nvim_win_is_valid(win) then
-    return false
-  end
-  -- dont do anything for floating windows
-  if View:is_float(win) then
-    return false
-  end
-  local buf = vim.api.nvim_win_get_buf(win)
-  -- Skip special buffers
-  if vim.api.nvim_buf_get_option(buf, "buftype") ~= "" then
-    return false
-  end
-
-  return true
-end
-
-function View:on_win_enter()
-  util.debug("on_win_enter")
-
-  local current_win = vim.api.nvim_get_current_win()
-
-  if vim.fn.winnr("$") == 1 and current_win == self.win then
-    vim.cmd([[q]])
-    return
-  end
-
-  if not self:is_valid_parent(current_win) then
-    return
-  end
-
-  local current_buf = vim.api.nvim_get_current_buf()
-
-  -- update parent when needed
-  if current_win ~= self.parent and current_win ~= self.win then
-    self.parent = current_win
-    -- update diagnostics to match the window we are viewing
-    if self:is_valid() then
-      vim.defer_fn(function()
-        util.debug("update_on_win_enter")
-        self:update()
-      end, 100)
-    end
-  end
-
-  -- check if another buffer took over our window
-  local parent = self.parent
-  if current_win == self.win and current_buf ~= self.buf then
-    -- open the buffer in the parent
-    vim.api.nvim_win_set_buf(parent, current_buf)
-    -- HACK: some window local settings need to be reset
-    vim.api.nvim_win_set_option(parent, "winhl", "")
-    -- close the current trouble window
-    vim.api.nvim_win_close(self.win, false)
-    -- open a new trouble window
-    require("trouble").open()
-    -- switch back to the opened window / buffer
-    View.switch_to(parent, current_buf)
-    -- util.warn("win_enter pro")
-  end
-end
-
-function View:focus()
-  if not self:is_valid() then
-    return
-  end
-
-  View.switch_to(self.win, self.buf)
-  local line = self:get_line()
-  if line == 1 then
-    self:next_item()
-    if config.options.padding then
-      self:next_item()
-    end
-  end
-end
-
-function View.switch_to(win, buf)
-  if win then
-    vim.api.nvim_set_current_win(win)
-    if buf then
-      vim.api.nvim_win_set_buf(win, buf)
-    end
-  end
-end
-
-function View:switch_to_parent()
-  -- vim.cmd("wincmd p")
-  View.switch_to(self.parent)
-end
-
-function View:close()
-  util.debug("close")
-  if vim.api.nvim_win_is_valid(self.win) then
-    if vim.api.nvim_win_is_valid(self.parent) then
-      vim.api.nvim_set_current_win(self.parent)
-    end
-    vim.api.nvim_win_close(self.win, {})
-  end
-  if vim.api.nvim_buf_is_valid(self.buf) then
-    vim.api.nvim_buf_delete(self.buf, {})
-  end
-end
-
-function View.create(opts)
-  opts = opts or {}
-  ---@type TroubleView
-  local view
-  vim.api.nvim_win_call(0, function()
-    if opts.win then
-      View.switch_to(opts.win)
-      vim.cmd("enew")
-    else
-      vim.cmd("below new")
-      local pos = { bottom = "J", top = "K", left = "H", right = "L" }
-      vim.cmd("wincmd " .. (pos[config.options.position] or "K"))
-    end
-    view = View:new(opts)
-    view:setup(opts)
-  end)
-
-  if opts.focus == true then
-    view:focus()
-  end
-
-  return view
-end
-
-function View:get_cursor()
-  return vim.api.nvim_win_get_cursor(self.win)
-end
-function View:get_line()
-  return self:get_cursor()[1]
-end
-function View:get_col()
-  return self:get_cursor()[2]
-end
-
-function View:current_item()
-  local line = self:get_line()
-  local item = self.items[line]
-  return item
-end
-
-function View:next_item(opts)
-  opts = opts or { skip_groups = false }
-  local line = opts.first and 0 or self:get_line() + 1
-
-  if line > #self.items then
-    if config.options.cycle_results then
-      self:first_item(opts)
-    end
-  else
-    for i = line, vim.api.nvim_buf_line_count(self.buf), 1 do
-      if self.items[i] and not (opts.skip_groups and self.items[i].is_file) then
-        vim.api.nvim_win_set_cursor(self.win, { i, self:get_col() })
-        if opts.jump then
-          self:jump()
-        end
-        return
-      end
-    end
-  end
-end
-
-function View:previous_item(opts)
-  opts = opts or { skip_groups = false }
-  local line = opts.last and vim.api.nvim_buf_line_count(self.buf) or self:get_line() - 1
-
-  for i = 0, vim.api.nvim_buf_line_count(self.buf), 1 do
-    if self.items[i] then
-      if line < i + (opts.skip_groups and 1 or 0) then
-        if config.options.cycle_results then
-          self:last_item(opts)
-        end
-        return
-      end
-      break
-    end
-  end
-
-  for i = line, 0, -1 do
-    if self.items[i] and not (opts.skip_groups and self.items[i].is_file) then
-      vim.api.nvim_win_set_cursor(self.win, { i, self:get_col() })
-      if opts.jump then
-        self:jump()
-      end
-      return
-    end
-  end
-end
-
-function View:first_item(opts)
-  opts = opts or {}
-  opts.first = true
-  return self:next_item(opts)
-end
-
-function View:last_item(opts)
-  opts = opts or {}
-  opts.last = true
-  return self:previous_item(opts)
-end
-
-function View:hover(opts)
-  opts = opts or {}
-  local item = opts.item or self:current_item()
-  if not (item and item.full_text) then
-    return
-  end
-  vim.lsp.util.open_floating_preview(vim.split(item.full_text, "\n"), "markdown", config.options.win_config)
-end
-
-function View:jump(opts)
-  opts = opts or {}
-  local item = opts.item or self:current_item()
-  if not item then
-    return
-  end
-
-  if item.is_file == true then
-    folds.toggle(item.filename)
-    self:update()
-  else
-    util.jump_to_item(opts.win or self.parent, opts.precmd, item)
-  end
-end
-
-function View:toggle_fold()
-  folds.toggle(self:current_item().filename)
-  self:update()
-end
-
-function View:_preview()
-  if not vim.api.nvim_win_is_valid(self.parent) then
-    return
-  end
-  if not vim.api.nvim_win_is_valid(self.win) then
-    return
-  end
-
-  local item = self:current_item()
-  if not item then
-    return
-  end
-  if item.bufnr == 0 then
-    return
-  end
-
-  util.debug("preview")
-
-  if item.is_file ~= true then
-    vim.api.nvim_win_set_buf(self.parent, item.bufnr)
-    local pos = { item.start.line + 1, item.start.character }
-    local line_count = vim.api.nvim_buf_line_count(item.bufnr)
-    pos[1] = math.min(pos[1], line_count)
-    vim.api.nvim_win_set_cursor(self.parent, pos)
-
-    vim.api.nvim_buf_call(item.bufnr, function()
-      -- Center preview line on screen and open enough folds to show it
-      vim.cmd("norm! zz zv")
-      if not vim.api.nvim_buf_is_loaded(item.bufnr) then
-        vim.fn.bufload(item.bufnr)
-      end
-    end)
-
-    clear_hl(item.bufnr)
-    hl_bufs[item.bufnr] = true
-    for row = item.start.line, item.finish.line, 1 do
-      local col_start = 0
-      local col_end = -1
-      if row == item.start.line then
-        col_start = item.start.character
-      end
-      if row == item.finish.line then
-        col_end = item.finish.character
-      end
-      highlight(item.bufnr, config.namespace, "TroublePreview", row, col_start, col_end)
-    end
-  end
-end
-
--- View.preview = View._preview
-
-View.preview = util.throttle(50, View._preview)
-
-function View:open_code_href()
-  if not vim.api.nvim_win_is_valid(self.parent) then
-    return
-  end
-
-  local item = self:current_item()
-  if not item then
-    return
-  end
-  util.debug("open code href")
-
-  if item.is_file ~= true and item.code_href then
-    local cmd
-    if vim.fn.has("win32") == 1 then
-      cmd = "explorer"
-    elseif vim.fn.executable("xdg-open") == 1 then
-      cmd = "xdg-open"
-    elseif vim.fn.executable("wslview") == 1 then
-      cmd = "wslview"
-    else
-      cmd = "open"
-    end
-
-    local ret = vim.fn.jobstart({ cmd, item.code_href }, { detach = true })
-    if ret <= 0 then
-      local msg = {
-        "Failed to open code href",
-        ret,
-        vim.inspect(cmd),
-      }
-      vim.notify(table.concat(msg, "\n"), vim.log.levels.ERROR)
-    end
-  end
-end
-
-return View
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/media/shot.png b/config/neovim/store/lazy-plugins/trouble.nvim/media/shot.png
deleted file mode 100644
index e75f1fcc..00000000
Binary files a/config/neovim/store/lazy-plugins/trouble.nvim/media/shot.png and /dev/null differ
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/plugin/trouble.vim b/config/neovim/store/lazy-plugins/trouble.nvim/plugin/trouble.vim
deleted file mode 100644
index b0ac8ba0..00000000
--- a/config/neovim/store/lazy-plugins/trouble.nvim/plugin/trouble.vim
+++ /dev/null
@@ -1,21 +0,0 @@
-
-augroup Trouble
-  autocmd!
-  if has('nvim-0.6')
-    " Use the new diagnostic subsystem for neovim 0.6 and up
-    au DiagnosticChanged * lua require'trouble'.refresh({auto = true, provider = "diagnostics"})
-  else
-    au User LspDiagnosticsChanged lua require'trouble'.refresh({auto = true, provider = "diagnostics"})
-  endif
-  autocmd BufWinEnter,BufEnter * lua require("trouble").action("on_win_enter")
-augroup end
-
-function! s:complete(arg,line,pos) abort
-  return join(sort(luaeval('vim.tbl_keys(require("trouble.providers").providers)')), "\n")
-endfunction
-
-command! -nargs=* -complete=custom,s:complete Trouble lua require'trouble'.open(<f-args>)
-command! -nargs=* -complete=custom,s:complete TroubleToggle lua require'trouble'.toggle(<f-args>)
-command! TroubleClose lua require'trouble'.close()
-command! TroubleRefresh lua require'trouble'.refresh()
-
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/selene.toml b/config/neovim/store/lazy-plugins/trouble.nvim/selene.toml
index 6540d6f9..eac3e9b4 100644
--- a/config/neovim/store/lazy-plugins/trouble.nvim/selene.toml
+++ b/config/neovim/store/lazy-plugins/trouble.nvim/selene.toml
@@ -1 +1,4 @@
-std="lua51+vim"
+std = "vim"
+
+[lints]
+mixed_table = "allow"
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/stylua.toml b/config/neovim/store/lazy-plugins/trouble.nvim/stylua.toml
index 5d6c50dc..9732fe64 100644
--- a/config/neovim/store/lazy-plugins/trouble.nvim/stylua.toml
+++ b/config/neovim/store/lazy-plugins/trouble.nvim/stylua.toml
@@ -1,3 +1,6 @@
 indent_type = "Spaces"
 indent_width = 2
-column_width = 120
\ No newline at end of file
+column_width = 120
+[sort_requires]
+enabled = true
+
diff --git a/config/neovim/store/lazy-plugins/trouble.nvim/vim.toml b/config/neovim/store/lazy-plugins/trouble.nvim/vim.toml
index 0fa5c4fc..4206f6cf 100644
--- a/config/neovim/store/lazy-plugins/trouble.nvim/vim.toml
+++ b/config/neovim/store/lazy-plugins/trouble.nvim/vim.toml
@@ -1,2 +1,49 @@
+[selene]
+base = "lua51"
+name = "vim"
+
 [vim]
 any = true
+
+[jit]
+any = true
+
+[[describe.args]]
+type = "string"
+[[describe.args]]
+type = "function"
+
+[[it.args]]
+type = "string"
+[[it.args]]
+type = "function"
+
+[[before_each.args]]
+type = "function"
+[[after_each.args]]
+type = "function"
+
+[assert.is_not]
+any = true
+
+[[assert.equals.args]]
+type = "any"
+[[assert.equals.args]]
+type = "any"
+[[assert.equals.args]]
+type = "any"
+required = false
+
+[[assert.same.args]]
+type = "any"
+[[assert.same.args]]
+type = "any"
+
+[[assert.truthy.args]]
+type = "any"
+
+[[assert.spy.args]]
+type = "any"
+
+[[assert.stub.args]]
+type = "any"
diff --git a/config/neovim/store/lazy-plugins/vimtex/README.md b/config/neovim/store/lazy-plugins/vimtex/README.md
index a96b3a5e..e538cb0a 100644
--- a/config/neovim/store/lazy-plugins/vimtex/README.md
+++ b/config/neovim/store/lazy-plugins/vimtex/README.md
@@ -59,17 +59,24 @@ The following explains the most common and popular approaches.
 
 In Neovim, [lazy.nvim](https://github.com/folke/lazy.nvim) is probably the most popular plugin manger.
 To install VimTeX, add a plugin spec similar to this:
+
 ```lua
 {
   "lervag/vimtex",
   lazy = false,     -- we don't want to lazy load VimTeX
   -- tag = "v2.15", -- uncomment to pin to a specific release
   init = function()
-    -- VimTeX configuration goes here
+    -- VimTeX configuration goes here, e.g.
+    vim.g.vimtex_view_method = "zathura"
   end
 }
 ```
 
+VimTeX is mostly implemented with Vimscript and is configured with the
+classical vimscript variable convention like `g:vimtex_OPTION_NAME`. Nowadays,
+Neovim is often configured with Lua, thus some users may be interested in
+reading `:help lua-vimscript`.
+
 ### vim-plug
 
 If you use [vim-plug](https://github.com/junegunn/vim-plug), then add *one* of the following lines to your configuration.
@@ -111,12 +118,13 @@ overview of some of the main aspects.
 
 ```vim
 " This is necessary for VimTeX to load properly. The "indent" is optional.
-" Note that most plugin managers will do this automatically.
+" Note: Most plugin managers will do this automatically!
 filetype plugin indent on
 
 " This enables Vim's and neovim's syntax-related features. Without this, some
 " VimTeX features will not work (see ":help vimtex-requirements" for more
 " info).
+" Note: Most plugin managers will do this automatically!
 syntax enable
 
 " Viewer options: One may configure the viewer either by specifying a built-in
diff --git a/config/neovim/store/lazy-plugins/vimtex/autoload/vimtex/state/class.vim b/config/neovim/store/lazy-plugins/vimtex/autoload/vimtex/state/class.vim
index 447210f5..627bd480 100644
--- a/config/neovim/store/lazy-plugins/vimtex/autoload/vimtex/state/class.vim
+++ b/config/neovim/store/lazy-plugins/vimtex/autoload/vimtex/state/class.vim
@@ -136,13 +136,13 @@ endfunction
 
 " }}}1
 function! s:vimtex.get_tex_program() abort dict " {{{1
-  let l:tex_program_re =
-        \ '\v^\c\s*\%\s*!?\s*tex\s+%(ts-)?program\s*\=\s*\zs.*\ze\s*$'
-
   let l:lines = vimtex#parser#preamble(self.tex, {'root' : self.root})[:20]
-  call map(l:lines, 'matchstr(v:val, l:tex_program_re)')
-  call filter(l:lines, '!empty(v:val)')
-  return tolower(get(l:lines, -1, '_'))
+  call map(l:lines, { _, x ->
+        \ matchstr(x, '\v^\c\s*\%\s*!?\s*tex\s+%(ts-)?program\s*\=\s*\zs.*$')
+        \})
+  call filter(l:lines, { _, x -> !empty(x) })
+  let l:tex_program = get(l:lines, -1, '_')
+  return tolower(trim(l:tex_program))
 endfunction
 
 " }}}1
diff --git a/config/neovim/store/lazy-plugins/vimtex/autoload/vimtex/syntax/core.vim b/config/neovim/store/lazy-plugins/vimtex/autoload/vimtex/syntax/core.vim
index 97aee30d..659dc871 100644
--- a/config/neovim/store/lazy-plugins/vimtex/autoload/vimtex/syntax/core.vim
+++ b/config/neovim/store/lazy-plugins/vimtex/autoload/vimtex/syntax/core.vim
@@ -67,6 +67,8 @@ function! vimtex#syntax#core#init_rules() abort " {{{1
   syntax match texSpecialChar "\\[SP@]\ze[^a-zA-Z@]"
   syntax match texSpecialChar "\^\^\%(\S\|[0-9a-f]\{2}\)"
 
+  syntax match texError "[_^]"
+
   " }}}2
   " {{{2 Commands: general
 
diff --git a/config/neovim/store/lazy-plugins/vimtex/doc/vimtex.txt b/config/neovim/store/lazy-plugins/vimtex/doc/vimtex.txt
index 7e8dfbc1..81795674 100644
--- a/config/neovim/store/lazy-plugins/vimtex/doc/vimtex.txt
+++ b/config/neovim/store/lazy-plugins/vimtex/doc/vimtex.txt
@@ -4135,11 +4135,17 @@ Examples (Vimscript) - see below for a Lua example: >vim
   augroup END
 
   " Specify extra behaviour after reverse goto
-  augroup vimtex_event_4
+  augroup vimtex_event_5
     au!
     au User VimtexEventViewReverse normal! zMzvzz
   augroup END
 
+  " Focus the terminal after inverse search
+  augroup vimtex_event_6
+    autocmd!
+    autocmd User VimtexEventViewReverse call b:vimtex.viewer.xdo_focus_vim()
+  augroup END
+
 Examples - Lua: >lua
 
   local au_group = vim.api.nvim_create_augroup("vimtex_events", {}),
@@ -4151,6 +4157,13 @@ Examples - Lua: >lua
     command = "VimtexClean"
   })
 
+  -- Focus the terminal after inverse search
+  vim.api.nvim_create_autocmd('User', {
+    pattern = 'VimtexEventViewReverse',
+    group = au_group,
+    command = "call b:vimtex.viewer.xdo_focus_vim()"
+  })
+
 ------------------------------------------------------------------------------
 TEXT OBJECTS                                              *vimtex-text-objects*
 
diff --git a/config/neovim/store/lazy-plugins/vimtex/test/test-syntax/test-core.tex b/config/neovim/store/lazy-plugins/vimtex/test/test-syntax/test-core.tex
index efce92b1..02feed76 100644
--- a/config/neovim/store/lazy-plugins/vimtex/test/test-syntax/test-core.tex
+++ b/config/neovim/store/lazy-plugins/vimtex/test/test-syntax/test-core.tex
@@ -40,7 +40,7 @@ $
 
 \begin{document}
 
-Test accents \v! and \v@ here.
+Test accents \v! and \v@ here. And errors: _ ^
 
 Line with inline verbatim: \verb+verb+
 Line with inline verbatim: \verb*+verb+
diff --git a/config/neovim/store/lazy-plugins/which-key.nvim/CHANGELOG.md b/config/neovim/store/lazy-plugins/which-key.nvim/CHANGELOG.md
index 21965670..f77c9450 100644
--- a/config/neovim/store/lazy-plugins/which-key.nvim/CHANGELOG.md
+++ b/config/neovim/store/lazy-plugins/which-key.nvim/CHANGELOG.md
@@ -1,5 +1,56 @@
 # Changelog
 
+## [2.1.0](https://github.com/folke/which-key.nvim/compare/v2.0.1...v2.1.0) (2024-06-06)
+
+
+### Features
+
+* **presets:** add descriptions for fold deletion ([#504](https://github.com/folke/which-key.nvim/issues/504)) ([53b6085](https://github.com/folke/which-key.nvim/commit/53b6085367a92740664783330583facd958dbceb))
+
+
+### Bug Fixes
+
+* black hole z= replacements ([#602](https://github.com/folke/which-key.nvim/issues/602)) ([f5b9124](https://github.com/folke/which-key.nvim/commit/f5b912451f33fd19e52230e73617ad099ffd3ab1))
+* **keys:** fix nested operators. See [#600](https://github.com/folke/which-key.nvim/issues/600). Fixes [#609](https://github.com/folke/which-key.nvim/issues/609) ([25d5b9e](https://github.com/folke/which-key.nvim/commit/25d5b9e9b5775525248b8d5c95271ba28f75d326))
+* restore win view after rendering buffer ([#516](https://github.com/folke/which-key.nvim/issues/516)) ([ea4a17d](https://github.com/folke/which-key.nvim/commit/ea4a17d63571c81f529669a373d20c855b9b351d)), closes [#515](https://github.com/folke/which-key.nvim/issues/515)
+* support nested operators ([#600](https://github.com/folke/which-key.nvim/issues/600)) ([476f4ca](https://github.com/folke/which-key.nvim/commit/476f4cacb15da81dcebe68ea45333e660409612d))
+
+## [2.0.1](https://github.com/folke/which-key.nvim/compare/v2.0.0...v2.0.1) (2024-06-06)
+
+
+### Bug Fixes
+
+* label -&gt; desc ([b8eb534](https://github.com/folke/which-key.nvim/commit/b8eb5348a749e214dfd08d38654a736d91191918))
+
+## [2.0.0](https://github.com/folke/which-key.nvim/compare/v1.6.1...v2.0.0) (2024-06-06)
+
+
+### ⚠ BREAKING CHANGES
+
+* which-key now requires Neovim >= 0.9
+
+### Features
+
+* **keys:** `desc` in `"&lt;nop&gt;"` or `""` keymaps can now become prefix label ([#522](https://github.com/folke/which-key.nvim/issues/522)) ([c1958e2](https://github.com/folke/which-key.nvim/commit/c1958e2529433ef096e924c72315733790ca7f88))
+* **mappings:** check if desc exists when parsing mappings ([#589](https://github.com/folke/which-key.nvim/issues/589)) ([a7ced9f](https://github.com/folke/which-key.nvim/commit/a7ced9f00a309418865ec2e3c272113147d167fe))
+* which-key now requires Neovim &gt;= 0.9 ([53ba0ac](https://github.com/folke/which-key.nvim/commit/53ba0accc2d607ef3f2b4f6e40aa9ac75e611dee))
+
+
+### Bug Fixes
+
+* **ignore_missing:** not showing key maps with desc field ([#577](https://github.com/folke/which-key.nvim/issues/577)) ([928c6c8](https://github.com/folke/which-key.nvim/commit/928c6c8fb62df55fa640399b7d76410c037b5f55))
+* **is_enabled:** disable whichkey in cmdline-window ([#581](https://github.com/folke/which-key.nvim/issues/581)) ([26ff0e6](https://github.com/folke/which-key.nvim/commit/26ff0e6084a4e957fc13ffe00bafd7c0c5ab81cc))
+* **keys:** fix buffer-local mapping groups ([d87c01c](https://github.com/folke/which-key.nvim/commit/d87c01c9bbcc7c1c2d248dca1b11285259d66be8))
+* **mappings:** dont remove desc ([4a7d732](https://github.com/folke/which-key.nvim/commit/4a7d7328b26d3f3355a43af4d8dc5ffd33cbd793))
+
+## [1.6.1](https://github.com/folke/which-key.nvim/compare/v1.6.0...v1.6.1) (2024-05-31)
+
+
+### Bug Fixes
+
+* **reg:** Added check for OSC 52 to disable related register previews ([#604](https://github.com/folke/which-key.nvim/issues/604)) ([8063a7f](https://github.com/folke/which-key.nvim/commit/8063a7f33bfea6a6387907c93a30a5877aa02633))
+* small typo in operator description ([#528](https://github.com/folke/which-key.nvim/issues/528)) ([d65087b](https://github.com/folke/which-key.nvim/commit/d65087b892c45d3722b6511c83a029671d6290e5))
+
 ## [1.6.0](https://github.com/folke/which-key.nvim/compare/v1.5.1...v1.6.0) (2023-10-17)
 
 
diff --git a/config/neovim/store/lazy-plugins/which-key.nvim/README.md b/config/neovim/store/lazy-plugins/which-key.nvim/README.md
index 7458b66b..80031239 100644
--- a/config/neovim/store/lazy-plugins/which-key.nvim/README.md
+++ b/config/neovim/store/lazy-plugins/which-key.nvim/README.md
@@ -139,7 +139,7 @@ WhichKey comes with the following defaults:
   show_help = true, -- show a help message in the command line for using WhichKey
   show_keys = true, -- show the currently pressed key and its label as a message in the command line
   triggers = "auto", -- automatically setup triggers
-  -- triggers = {"<leader>"} -- or specifiy a list manually
+  -- triggers = {"<leader>"} -- or specify a list manually
   -- list of triggers, where WhichKey should not wait for timeoutlen and show immediately
   triggers_nowait = {
     -- marks
diff --git a/config/neovim/store/lazy-plugins/which-key.nvim/doc/which-key.nvim.txt b/config/neovim/store/lazy-plugins/which-key.nvim/doc/which-key.nvim.txt
index 67a9d425..d76c2abe 100644
--- a/config/neovim/store/lazy-plugins/which-key.nvim/doc/which-key.nvim.txt
+++ b/config/neovim/store/lazy-plugins/which-key.nvim/doc/which-key.nvim.txt
@@ -1,4 +1,4 @@
-*which-key.nvim.txt*      For Neovim >= 0.8.0     Last change: 2023 October 20
+*which-key.nvim.txt*       For Neovim >= 0.8.0       Last change: 2024 June 07
 
 ==============================================================================
 Table of Contents                           *which-key.nvim-table-of-contents*
@@ -12,6 +12,7 @@ Table of Contents                           *which-key.nvim-table-of-contents*
   - Usage                                     |which-key.nvim-which-key-usage|
   - Plugins                                 |which-key.nvim-which-key-plugins|
   - Colors                                   |which-key.nvim-which-key-colors|
+2. Links                                                |which-key.nvim-links|
 
 ==============================================================================
 1. Which Key                                        *which-key.nvim-which-key*
@@ -164,7 +165,7 @@ WhichKey comes with the following defaults:
       show_help = true, -- show a help message in the command line for using WhichKey
       show_keys = true, -- show the currently pressed key and its label as a message in the command line
       triggers = "auto", -- automatically setup triggers
-      -- triggers = {"<leader>"} -- or specifiy a list manually
+      -- triggers = {"<leader>"} -- or specify a list manually
       -- list of triggers, where WhichKey should not wait for timeoutlen and show immediately
       triggers_nowait = {
         -- marks
diff --git a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/config.lua b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/config.lua
index bd97e907..0186174c 100644
--- a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/config.lua
+++ b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/config.lua
@@ -64,7 +64,7 @@ local defaults = {
   show_help = true, -- show a help message in the command line for using WhichKey
   show_keys = true, -- show the currently pressed key and its label as a message in the command line
   triggers = "auto", -- automatically setup triggers
-  -- triggers = {"<leader>"} -- or specifiy a list manually
+  -- triggers = {"<leader>"} -- or specify a list manually
   -- list of triggers, where WhichKey should not wait for timeoutlen and show immediately
   triggers_nowait = {
     -- marks
@@ -85,7 +85,7 @@ local defaults = {
     v = { "j", "k" },
   },
   -- disable the WhichKey popup for certain buf types and file types.
-  -- Disabled by deafult for Telescope
+  -- Disabled by default for Telescope
   disable = {
     buftypes = {},
     filetypes = {},
@@ -97,6 +97,9 @@ M.options = {}
 
 ---@param options? Options
 function M.setup(options)
+  if vim.fn.has("nvim-0.9") == 0 then
+    return vim.notify("WhichKey.nvim requires Neovim 0.9 or higher", vim.log.levels.ERROR)
+  end
   M.options = vim.tbl_deep_extend("force", {}, defaults, options or {})
 end
 
diff --git a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/init.lua b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/init.lua
index a1f34c44..4227b60f 100644
--- a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/init.lua
+++ b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/init.lua
@@ -25,11 +25,6 @@ function M.setup(options)
   schedule_load()
 end
 
-function M.execute(id)
-  local func = Keys.functions[id]
-  return func()
-end
-
 function M.show(keys, opts)
   opts = opts or {}
   if type(opts) == "string" then
@@ -98,11 +93,4 @@ function M.load()
   loaded = true
 end
 
-function M.reset()
-  -- local mappings = Keys.mappings
-  require("plenary.reload").reload_module("which-key")
-  -- require("which-key.Keys").mappings = mappings
-  require("which-key").setup()
-end
-
 return M
diff --git a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/keys.lua b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/keys.lua
index aabb22ce..e704e355 100644
--- a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/keys.lua
+++ b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/keys.lua
@@ -8,10 +8,9 @@ local secret = "Þ"
 ---@class Keys
 local M = {}
 
-M.functions = {}
-M.operators = {}
-M.nowait = {}
-M.blacklist = {}
+M.operators = {} ---@type table<string, boolean>
+M.nowait = {} ---@type table<string, boolean>
+M.blacklist = {} ---@type table<string, table<string, boolean>>
 
 function M.setup()
   local builtin_ops = require("which-key.plugins.presets").operators
@@ -39,12 +38,14 @@ function M.setup()
 end
 
 function M.get_operator(prefix_i)
+  local ret = { i = nil, n = nil, len = nil }
   for op_n, _ in pairs(Config.options.operators) do
     local op_i = Util.t(op_n)
-    if prefix_i:sub(1, #op_i) == op_i then
-      return op_i, op_n
+    if prefix_i:sub(1, #op_i) == op_i and (ret.len == nil or #op_i > ret.len) then
+      ret = { i = op_i, n = op_n, len = #op_i }
     end
   end
+  return ret.i, ret.n
 end
 
 function M.process_motions(ret, mode, prefix_i, buf)
@@ -102,11 +103,11 @@ function M.get_mappings(mode, prefix_i, buf)
       for k, child in pairs(node.children) do
         if
           child.mapping
-          and child.mapping.label ~= "which_key_ignore"
           and child.mapping.desc ~= "which_key_ignore"
           and not (child.mapping.group and vim.tbl_isempty(child.children))
         then
-          ret.mappings[k] = vim.tbl_deep_extend("force", {}, ret.mappings[k] or {}, child.mapping)
+          local child_mapping = vim.deepcopy(child.mapping)
+          ret.mappings[k] = vim.tbl_deep_extend("force", ret.mappings[k] or {}, child_mapping)
         end
       end
     end
@@ -126,19 +127,19 @@ function M.get_mappings(mode, prefix_i, buf)
     if Config.options.key_labels[value.key] then
       value.key = Config.options.key_labels[value.key]
     end
-    local skip = not value.label and Config.options.ignore_missing == true
+    local skip = not value.desc and Config.options.ignore_missing == true
     if Util.t(value.key) == Util.t("<esc>") then
       skip = true
     end
     if not skip then
       if value.group then
-        value.label = value.label or "+prefix"
-        value.label = value.label:gsub("^%+", "")
-        value.label = Config.options.icons.group .. value.label
-      elseif not value.label then
-        value.label = value.desc or value.cmd or ""
+        value.desc = value.desc or "+prefix"
+        value.desc = value.desc:gsub("^%+", "")
+        value.desc = Config.options.icons.group .. value.desc
+      elseif not value.desc then
+        value.desc = value.cmd or ""
         for _, v in ipairs(Config.options.hidden) do
-          value.label = value.label:gsub(v, "")
+          value.desc = value.desc:gsub(v, "")
         end
       end
       if value.value then
@@ -342,7 +343,7 @@ function M.add_hooks(mode, buf, node, secret_only)
     node.mapping = { prefix = node.prefix_n, group = true, keys = Util.parse_keys(node.prefix_n) }
   end
   if node.prefix_n ~= "" and node.mapping.group == true and not (node.mapping.cmd or node.mapping.callback) then
-    -- first non-cmd level, so create hook and make all decendents secret only
+    -- first non-cmd level, so create hook and make all descendents secret only
     M.hook_add(node.prefix_n, mode, buf, secret_only)
     secret_only = true
   end
@@ -360,7 +361,7 @@ function M.dump()
       ---@param node Node
       function(node)
         if node.mapping then
-          if node.mapping.label then
+          if node.mapping.desc then
             ok[node.mapping.prefix] = true
             todo[node.mapping.prefix] = nil
           elseif not ok[node.mapping.prefix] then
@@ -374,7 +375,7 @@ function M.dump()
 end
 
 ---@param mode string
----@param buf? buffer
+---@param buf? number
 function M.get_tree(mode, buf)
   if mode == "s" or mode == "x" then
     mode = "v"
@@ -411,24 +412,34 @@ function M.update_keymaps(mode, buf)
 
   for _, keymap in pairs(keymaps) do
     local skip = M.is_hook(keymap.lhs, keymap.rhs)
+    local is_group = false
 
-    if is_nop(keymap) then
-      skip = true
+    if not skip and is_nop(keymap) then
+      if keymap.desc then
+        pcall(vim.keymap.del, { mode }, keymap.lhs, { buffer = buf })
+        is_group = true
+      else
+        skip = true
+      end
     end
 
     if not skip then
+      ---@type Mapping
       local mapping = {
         prefix = keymap.lhs,
-        cmd = keymap.rhs,
+        cmd = not is_group and keymap.rhs or nil,
         desc = keymap.desc,
+        group = is_group,
         callback = keymap.callback,
         keys = Util.parse_keys(keymap.lhs),
+        buf = buf,
+        mode = mode,
       }
       -- don't include Plug keymaps
       if mapping.keys.notation[1]:lower() ~= "<plug>" then
         local node = tree:add(mapping)
         if node.mapping and node.mapping.preset and mapping.desc then
-          node.mapping.label = mapping.desc
+          node.mapping.desc = mapping.desc
         end
       end
     end
diff --git a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/layout.lua b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/layout.lua
index ddaf5974..3b9e8630 100644
--- a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/layout.lua
+++ b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/layout.lua
@@ -45,12 +45,12 @@ function Layout:trail()
   local cmd_line = { { " " } }
   for i = 1, len, 1 do
     local node = buf_path[i]
-    if not (node and node.mapping and node.mapping.label) then
+    if not (node and node.mapping and node.mapping.desc) then
       node = path[i]
     end
     local step = self.mapping.keys.notation[i]
-    if node and node.mapping and node.mapping.label then
-      step = self.options.icons.group .. node.mapping.label
+    if node and node.mapping and node.mapping.desc then
+      step = self.options.icons.group .. node.mapping.desc
     end
     if Config.options.key_labels[step] then
       step = Config.options.key_labels[step]
@@ -113,7 +113,7 @@ function Layout:layout(win)
   width = width - pad_right - pad_left
 
   local max_key_width = self:max_width("key")
-  local max_label_width = self:max_width("label")
+  local max_label_width = self:max_width("desc")
   local max_value_width = self:max_width("value")
 
   local intro_width = max_key_width + 2 + Text.len(self.options.icons.separator) + self.options.layout.spacing
@@ -192,7 +192,7 @@ function Layout:layout(win)
       start = start + max_value_width + 2
     end
 
-    local label = item.label
+    local label = item.desc
     if Text.len(label) > max_label_width then
       label = vim.fn.strcharpart(label, 0, max_label_width - 2) .. " …"
     end
diff --git a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/mappings.lua b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/mappings.lua
index a21ff8e5..7fe266ce 100644
--- a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/mappings.lua
+++ b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/mappings.lua
@@ -134,7 +134,7 @@ function M._parse(value, mappings, opts)
     if type(list[1]) ~= "string" then
       error("Invalid mapping for " .. vim.inspect({ value = value, opts = opts }))
     end
-    opts.desc = list[1]
+    opts.desc = opts.desc or list[1]
   -- { cmd, desc }
   elseif #list == 2 then
     -- desc
@@ -179,7 +179,8 @@ function M.to_mapping(mapping)
   mapping.buffer = nil
 
   mapping.mode = mapping.mode or "n"
-  mapping.label = mapping.desc or mapping.name
+  mapping.desc = mapping.desc or mapping.name
+  mapping.name = nil
   mapping.keys = Util.parse_keys(mapping.prefix or "")
 
   local opts = {}
@@ -187,25 +188,8 @@ function M.to_mapping(mapping)
     opts[o] = mapping[o]
     mapping[o] = nil
   end
-
-  if vim.fn.has("nvim-0.7.0") == 0 then
-    opts.replace_keycodes = nil
-
-    -- Neovim < 0.7.0 doesn't support descriptions
-    opts.desc = nil
-
-    -- use lua functions proxy for Neovim < 0.7.0
-    if opts.callback then
-      local functions = require("which-key.keys").functions
-      table.insert(functions, opts.callback)
-      if opts.expr then
-        opts.cmd = string.format([[luaeval('require("which-key").execute(%d)')]], #functions)
-      else
-        opts.cmd = string.format([[<cmd>lua require("which-key").execute(%d)<cr>]], #functions)
-      end
-      opts.callback = nil
-    end
-  end
+  -- restore desc
+  mapping.desc = opts.desc
 
   mapping.opts = opts
   return mapping
diff --git a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/plugins/marks.lua b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/plugins/marks.lua
index 55a251e4..de6fafb8 100644
--- a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/plugins/marks.lua
+++ b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/plugins/marks.lua
@@ -55,7 +55,7 @@ function M.run(_trigger, _mode, buf)
 
     table.insert(items, {
       key = key,
-      label = labels[key] or file and ("file: " .. file) or "",
+      desc = labels[key] or file and ("file: " .. file) or "",
       value = value,
       highlights = { { 1, 5, "Number" } },
     })
diff --git a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/plugins/presets/misc.lua b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/plugins/presets/misc.lua
index 388028e1..00373132 100644
--- a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/plugins/presets/misc.lua
+++ b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/plugins/presets/misc.lua
@@ -32,6 +32,9 @@ local misc = {
       O = "Open all folds under cursor",
       c = "Close fold under cursor",
       C = "Close all folds under cursor",
+      d = "Delete fold under cursor",
+      D = "Delete all folds under cursor",
+      E = "Delete all folds in file",
       a = "Toggle fold under cursor",
       A = "Toggle all folds under cursor",
       v = "Show cursor line",
@@ -92,6 +95,7 @@ function M.setup(wk, config)
       wk.register(mappings, { mode = "n", prefix = "", preset = true })
     end
   end
+  wk.register({ ["zf"] = "Create fold from selection" }, { mode = "x", prefix = "", preset = true })
 end
 
 return M
diff --git a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/plugins/registers.lua b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/plugins/registers.lua
index 4003b20a..a6e6292d 100644
--- a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/plugins/registers.lua
+++ b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/plugins/registers.lua
@@ -30,20 +30,44 @@ local labels = {
   ["/"] = "last search pattern",
 }
 
+-- This function makes the assumption that OSC 52 is set up per :help osc-52
+M.osc52_active = function()
+  -- If no clipboard set, can't be OSC 52
+  if not vim.g.clipboard then
+    return false
+  end
+
+  -- Per the docs, OSC 52 should be set up with a name field in the table
+  if vim.g.clipboard.name == "OSC 52" then
+    return true
+  end
+
+  return false
+end
+
 ---@type Plugin
 ---@return PluginItem[]
 function M.run(_trigger, _mode, _buf)
   local items = {}
 
+  local osc52_skip_keys = { "+", "*" }
+
   for i = 1, #M.registers, 1 do
     local key = M.registers:sub(i, i)
-    local ok, value = pcall(vim.fn.getreg, key, 1)
-    if not ok then
-      value = ""
+
+    local value = ""
+
+    if M.osc52_active() and vim.tbl_contains(osc52_skip_keys, key) then
+      value = "OSC 52 detected, register not checked to maintain compatibility"
+    else
+      local ok, reg_value = pcall(vim.fn.getreg, key, 1)
+      if ok then
+        value = reg_value
+      end
     end
 
     if value ~= "" then
-      table.insert(items, { key = key, label = labels[key] or "", value = value })
+      table.insert(items, { key = key, desc = labels[key] or "", value = value })
     end
   end
   return items
diff --git a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/plugins/spelling.lua b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/plugins/spelling.lua
index ae9e81b1..86ae82d7 100644
--- a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/plugins/spelling.lua
+++ b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/plugins/spelling.lua
@@ -21,7 +21,7 @@ function M.run()
 
   ---@diagnostic disable-next-line: missing-parameter
   local cursor_word = vim.fn.expand("<cword>")
-  -- get a misspellled word from under the cursor, if not found, then use the cursor_word instead
+  -- get a misspelled word from under the cursor, if not found, then use the cursor_word instead
   ---@diagnostic disable-next-line: redundant-parameter
   local bad = vim.fn.spellbadword(cursor_word)
   local word = bad[1]
@@ -39,9 +39,9 @@ function M.run()
 
     table.insert(items, {
       key = key,
-      label = label,
+      desc = label,
       fn = function()
-        vim.cmd("norm! ciw" .. label)
+        vim.cmd('norm! "_ciw' .. label)
       end,
     })
   end
diff --git a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/tree.lua b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/tree.lua
index fb2e2801..5e223ce4 100644
--- a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/tree.lua
+++ b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/tree.lua
@@ -83,7 +83,11 @@ function Tree:add(mapping, opts)
       path_i = path_i .. prefix_i[i]
       path_n = path_n .. prefix_n[i]
       if not node.children[prefix_i[i]] then
-        node.children[prefix_i[i]] = { children = {}, prefix_i = path_i, prefix_n = path_n }
+        node.children[prefix_i[i]] = {
+          children = {},
+          prefix_i = path_i,
+          prefix_n = path_n,
+        }
       end
       node = node.children[prefix_i[i]]
     end
diff --git a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/types.lua b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/types.lua
index 78671c73..992cb4bd 100644
--- a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/types.lua
+++ b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/types.lua
@@ -32,7 +32,6 @@
 ---@class Mapping
 ---@field buf number
 ---@field group boolean
----@field label string
 ---@field desc string
 ---@field prefix string
 ---@field cmd string
diff --git a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/view.lua b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/view.lua
index 636eba87..6ffd2a4b 100644
--- a/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/view.lua
+++ b/config/neovim/store/lazy-plugins/which-key.nvim/lua/which-key/view.lua
@@ -52,17 +52,13 @@ function M.show()
 
   local opts = {
     relative = "editor",
-    width = vim.o.columns
-      - margins[2]
-      - margins[4]
-      - (vim.fn.has("nvim-0.6") == 0 and config.options.window.border ~= "none" and 2 or 0),
+    width = vim.o.columns - margins[2] - margins[4],
     height = config.options.layout.height.min,
     focusable = false,
     anchor = "SW",
     border = config.options.window.border,
     row = vim.o.lines
       - margins[3]
-      - (vim.fn.has("nvim-0.6") == 0 and config.options.window.border ~= "none" and 2 or 0)
       + ((vim.o.laststatus == 0 or vim.o.laststatus == 1 and #wins == 1) and 1 or 0)
       - vim.o.cmdheight,
     col = margins[4],
@@ -76,18 +72,13 @@ function M.show()
   end
   M.buf = vim.api.nvim_create_buf(false, true)
   M.win = vim.api.nvim_open_win(M.buf, false, opts)
-  vim.api.nvim_buf_set_option(M.buf, "filetype", "WhichKey")
-  vim.api.nvim_buf_set_option(M.buf, "buftype", "nofile")
-  vim.api.nvim_buf_set_option(M.buf, "bufhidden", "wipe")
-  vim.api.nvim_buf_set_option(M.buf, "modifiable", true)
-
-  local winhl = "NormalFloat:WhichKeyFloat"
-  if vim.fn.hlexists("FloatBorder") == 1 then
-    winhl = winhl .. ",FloatBorder:WhichKeyBorder"
-  end
-  vim.api.nvim_win_set_option(M.win, "winhighlight", winhl)
-  vim.api.nvim_win_set_option(M.win, "foldmethod", "manual")
-  vim.api.nvim_win_set_option(M.win, "winblend", config.options.window.winblend)
+  vim.bo[M.buf].filetype = "WhichKey"
+  vim.bo[M.buf].buftype = "nofile"
+  vim.bo[M.buf].bufhidden = "wipe"
+  vim.bo[M.buf].modifiable = true
+  vim.wo[M.win].winhighlight = "NormalFloat:WhichKeyFloat,FloatBorder:WhichKeyBorder"
+  vim.wo[M.win].foldmethod = "manual"
+  vim.wo[M.win].winblend = config.options.window.winblend
 end
 
 function M.read_pending()
@@ -204,7 +195,7 @@ function M.execute(prefix_i, mode, buf)
   end
 
   -- make sure we remove all WK hooks before executing the sequence
-  -- this is to make existing keybindongs work and prevent recursion
+  -- this is to make existing keybindings work and prevent recursion
   unhook(Keys.get_tree(mode).tree:path(prefix_i))
   if buf then
     unhook(Keys.get_tree(mode, buf).tree:path(prefix_i), buf)
@@ -256,20 +247,24 @@ function M.open(keys, opts)
 end
 
 function M.is_enabled(buf)
-  local buftype = vim.api.nvim_buf_get_option(buf, "buftype")
+  local buftype = vim.bo[buf].buftype
   for _, bt in ipairs(config.options.disable.buftypes) do
     if bt == buftype then
       return false
     end
   end
 
-  local filetype = vim.api.nvim_buf_get_option(buf, "filetype")
+  local filetype = vim.bo[buf].filetype
   for _, bt in ipairs(config.options.disable.filetypes) do
     if bt == filetype then
       return false
     end
   end
 
+  if vim.fn.getcmdwintype() ~= "" then
+    return false
+  end
+
   return true
 end
 
@@ -333,6 +328,7 @@ end
 
 ---@param text Text
 function M.render(text)
+  local view = vim.api.nvim_win_call(M.win, vim.fn.winsaveview)
   vim.api.nvim_buf_set_lines(M.buf, 0, -1, false, text.lines)
   local height = #text.lines
   if height > config.options.layout.height.max then
@@ -345,6 +341,9 @@ function M.render(text)
   for _, data in ipairs(text.hl) do
     highlight(M.buf, config.namespace, data.group, data.line, data.from, data.to)
   end
+  vim.api.nvim_win_call(M.win, function()
+    vim.fn.winrestview(view)
+  end)
 end
 
 return M
diff --git a/config/neovim/store/lazy-plugins/yanky.nvim/README.md b/config/neovim/store/lazy-plugins/yanky.nvim/README.md
index 54bf7015..67bb9220 100644
--- a/config/neovim/store/lazy-plugins/yanky.nvim/README.md
+++ b/config/neovim/store/lazy-plugins/yanky.nvim/README.md
@@ -706,6 +706,12 @@ require("substitute").setup({
   on_substitute = require("yanky.integration").substitute(),
 })
 ```
+or
+```lua
+opts = {
+  on_substitute = function() require("yanky.integration").substitute() end,
+}
+```
 
 </details>
 
diff --git a/config/neovim/store/lazy-plugins/yanky.nvim/doc/yanky.txt b/config/neovim/store/lazy-plugins/yanky.nvim/doc/yanky.txt
index 5a40d137..fc42acb5 100644
--- a/config/neovim/store/lazy-plugins/yanky.nvim/doc/yanky.txt
+++ b/config/neovim/store/lazy-plugins/yanky.nvim/doc/yanky.txt
@@ -770,6 +770,14 @@ swap when performing a substitution, you can add this to your setup:
     })
 <
 
+or
+
+>lua
+    opts = {
+      on_substitute = function() require("yanky.integration").substitute() end,
+    }
+<
+
 hrsh7th/nvim-cmp ~
 
 Using hrsh7th/nvim-cmp <https://github.com/hrsh7th/nvim-cmp> and
diff --git a/config/neovim/store/nvim-treesitter/README.md b/config/neovim/store/nvim-treesitter/README.md
index 6887b6f7..51ced3a2 100644
--- a/config/neovim/store/nvim-treesitter/README.md
+++ b/config/neovim/store/nvim-treesitter/README.md
@@ -366,6 +366,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [Tree-Sitter query language](https://github.com/nvim-treesitter/tree-sitter-query) (maintained by @steelsojka)
 - [x] [r](https://github.com/r-lib/tree-sitter-r) (maintained by @echasnovski)
 - [ ] [racket](https://github.com/6cdh/tree-sitter-racket)
+- [x] [ralph](https://github.com/alephium/tree-sitter-ralph) (maintained by @tdroxler)
 - [x] [rasi](https://github.com/Fymyte/tree-sitter-rasi) (maintained by @Fymyte)
 - [x] [rbs](https://github.com/joker1007/tree-sitter-rbs) (maintained by @joker1007)
 - [x] [re2c](https://github.com/amaanq/tree-sitter-re2c) (maintained by @amaanq)
@@ -375,7 +376,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [pip requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) (maintained by @ObserverOfTime)
 - [x] [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) (maintained by @bamonroe)
 - [x] [robot](https://github.com/Hubro/tree-sitter-robot) (maintained by @Hubro)
-- [x] [roc](https://github.com/nat-418/tree-sitter-roc) (maintained by @nat-418)
+- [x] [roc](https://github.com/faldor20/tree-sitter-roc) (maintained by @nat-418)
 - [x] [ron](https://github.com/amaanq/tree-sitter-ron) (maintained by @amaanq)
 - [x] [rst](https://github.com/stsewd/tree-sitter-rst) (maintained by @stsewd)
 - [x] [ruby](https://github.com/tree-sitter/tree-sitter-ruby) (maintained by @TravonteD)
@@ -547,11 +548,13 @@ If you want to install the parsers to a custom directory you can specify this
 directory with `parser_install_dir` option in that is passed to `setup`.
 `nvim-treesitter` will then install the parser files into this directory.
 
-This directory must be writeable and must be explicitly added to the
+This directory must be writeable and must be explicitly prepended to the
 `runtimepath`. For example:
 
 ```lua
-  vim.opt.runtimepath:append("/some/path/to/store/parsers")
+  -- It MUST be at the beginning of runtimepath. Otherwise the parsers from Neovim itself
+  -- is loaded that may not be compatible with the queries from the 'nvim-treesitter' plugin.
+  vim.opt.runtimepath:prepend("/some/path/to/store/parsers")
 
   require'nvim-treesitter.configs'.setup {
     parser_install_dir = "/some/path/to/store/parsers",
diff --git a/config/neovim/store/nvim-treesitter/lockfile.json b/config/neovim/store/nvim-treesitter/lockfile.json
index 419eeca1..7512cbe7 100644
--- a/config/neovim/store/nvim-treesitter/lockfile.json
+++ b/config/neovim/store/nvim-treesitter/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
   },
   "arduino": {
-    "revision": "babb6d4da69b359bbb80adbf1fe39c0da9175210"
+    "revision": "afb34b2c65f507932c5c6ddbf0d5a9ca6a772f2f"
   },
   "asm": {
     "revision": "b0306e9bb2ebe01c6562f1aef265cc42ccc53070"
@@ -51,7 +51,7 @@
     "revision": "2326d709fb9cf73cf124fdbc803c267f851721a4"
   },
   "c": {
-    "revision": "00ed08f1a6c18141bfd7a81638e4d239a0bb55cc"
+    "revision": "deca017a554045b4c203e7ddff39ae64ff05e071"
   },
   "c_sharp": {
     "revision": "82fa8f05f41a33e9bc830f85d74a9548f0291738"
@@ -69,7 +69,7 @@
     "revision": "f4236d4da8aa92bc105d9c118746474c608e6af7"
   },
   "cmake": {
-    "revision": "20ffd6d3b4da1acdbf2d08204b2130a5b2f7c4b3"
+    "revision": "4864abb95a1f6e54d6b362677beef9fb674b41e9"
   },
   "comment": {
     "revision": "5d8b29f6ef3bf64d59430dcfe76b31cc44b5abfd"
@@ -81,13 +81,13 @@
     "revision": "4ebe237c1cf64cf3826fc249e9ec0988fe07e58e"
   },
   "corn": {
-    "revision": "604d73c38d4c28ca68e9e441ffd405d68cb63051"
+    "revision": "464654742cbfd3a3de560aba120998f1d5dfa844"
   },
   "cpon": {
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "d29fbff09a8c9ff4f3074de2595dfca12cb33da9"
+    "revision": "7ce8946cae4bb25adebe5b50394f702beb007026"
   },
   "css": {
     "revision": "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af"
@@ -96,7 +96,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "cuda": {
-    "revision": "e7878a9cf4157e9d6c8013ff5605c9f26d62894d"
+    "revision": "1f188eff83b562ffae36d13e1b804ec6f3b9f1d9"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -120,7 +120,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "0e9a836ec47612ade15645fb1680adb549894a6c"
+    "revision": "87bf82874c86dcf563f5521069d603ed50e5f0cc"
   },
   "dockerfile": {
     "revision": "087daa20438a6cc01fa5e6fe6906d77c869d19fe"
@@ -129,25 +129,25 @@
     "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
   },
   "doxygen": {
-    "revision": "4a30eba5d047d6a8c5b005202b4848c0b33d76ca"
+    "revision": "ccd998f378c3f9345ea4eeb223f56d7b84d16687"
   },
   "dtd": {
     "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
   },
   "earthfile": {
-    "revision": "336001d79dd62668088bc6fe6d72a774a449fa2d"
+    "revision": "b5bdcb5813ce0e582fbd8e03eb42c80d3cc8984e"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "eds": {
-    "revision": "5517bdb90c90703df49579a4b04689a614780be2"
+    "revision": "0ad62cb635c2f4353359a88dec9e3a57bbf9f66d"
   },
   "eex": {
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "de690fa8a028f122af46d9d2685679fe5f2d7d60"
+    "revision": "c7ae8b77e2749826dcf23df6514f08fdd68c66a3"
   },
   "elm": {
     "revision": "09dbf221d7491dc8d8839616b27c21b9c025c457"
@@ -162,7 +162,7 @@
     "revision": "38d5004a797298dc42c85e7706c5ceac46a3f29f"
   },
   "erlang": {
-    "revision": "98ea1f9c957b2ad520415eecb5a5b406e931101e"
+    "revision": "b8e44bc0a3b2ce6bceea47c0b1c0f303a6b322b8"
   },
   "facility": {
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
@@ -171,7 +171,7 @@
     "revision": "f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4"
   },
   "fennel": {
-    "revision": "8ad17704b3c2469155947d4e8fcb618cf1328459"
+    "revision": "cfbfa478dc2dbef267ee94ae4323d9c886f45e94"
   },
   "fidl": {
     "revision": "0a8910f293268e27ff554357c229ba172b0eaed2"
@@ -222,13 +222,13 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "8432ffe32ccd360534837256747beb5b1c82fca1"
+    "revision": "02a17bf9d0553406268cdbf466d57808ae712bf3"
   },
   "glimmer": {
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
   },
   "glsl": {
-    "revision": "33a16b6ff4d7206a16f2dc96c40e149c657db65f"
+    "revision": "7f91bf34cadc06a96efc475df501ffca4dda9410"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -279,7 +279,7 @@
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
   },
   "hcl": {
-    "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
+    "revision": "422cbe1d93a8ae3847744b664041fc76876babcd"
   },
   "heex": {
     "revision": "b5ad6e34eea18a15bbd1466ca707a17f9bff7b93"
@@ -291,7 +291,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "a84e8d4f675d0006f7c07f6c7bcea2fca04cdb6e"
+    "revision": "5e1225a30712ca0a9040509806c7ba274a1bbcde"
   },
   "hlsplaylist": {
     "revision": "64f19029339e75d6762feae39e7878595860c980"
@@ -315,13 +315,13 @@
     "revision": "ad705af8c44c737bdb965fc081329c50716d2d03"
   },
   "hyprlang": {
-    "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
+    "revision": "c9012d6dcaaa939f17c21e1fdb17b013d139e6b9"
   },
   "idl": {
-    "revision": "b5b53e2ca0521b98277d5e4b109f0b0e362e850e"
+    "revision": "9f56001f8ed29b0ea9fa4f02813f3e83ab0a2aaa"
   },
   "ini": {
-    "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
+    "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
   },
   "inko": {
     "revision": "234c87be1dac20f766ddf6f486a7bde2a4bc5594"
@@ -330,13 +330,13 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "f3d6e09cc47e76833f23f83b2c59ea0878660953"
+    "revision": "2a05cab838dfec52daa76f10920917d2e69a85bc"
   },
   "java": {
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
   },
   "javascript": {
-    "revision": "a5de24dc7939cb07a758f8d89c089cfdb6f479aa"
+    "revision": "391a8fcc48a11f63bf18ec9885f6f069e760949a"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -357,7 +357,7 @@
     "revision": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596"
   },
   "julia": {
-    "revision": "acd5ca12cc278df7960629c2429a096c7ac4bbea"
+    "revision": "f1baa5f8e271109d01cc8ff7473c11df2d8a9aee"
   },
   "just": {
     "revision": "fd814fc6c579f68c2a642f5e0268cf69daae92d7"
@@ -366,13 +366,13 @@
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
   },
   "kdl": {
-    "revision": "49fb89a854d93b58a65a19724ac307195ca11941"
+    "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
   },
   "kotlin": {
     "revision": "c9cb8504b81684375e7beb8907517dbd6947a1be"
   },
   "koto": {
-    "revision": "919440e1376109bab4edac52594c17c02ae0be5a"
+    "revision": "d4109879ba1387d19095269a7473bd7d274ab848"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -393,7 +393,7 @@
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
   },
   "liquid": {
-    "revision": "293369818da219d97327908aab33707b04b63fd9"
+    "revision": "0419ac4868585320eee8615c90b864a1b04ef433"
   },
   "liquidsoap": {
     "revision": "14feafa91630afb1ab9988cf9b738b7ea29f3f89"
@@ -408,7 +408,7 @@
     "revision": "873612aadd3f684dd4e631bdf42ea8990c57634e"
   },
   "luap": {
-    "revision": "31461ae9bd0866cb5117cfe5de71189854fd0f3e"
+    "revision": "c134aaec6acf4fa95fe4aa0dc9aba3eacdbbe55a"
   },
   "luau": {
     "revision": "5aa9b88a8e3327276ec6e72de997f04ac80b1ae4"
@@ -447,7 +447,7 @@
     "revision": "570f3d7be01fffc751237f4cfcf52d04e20532d1"
   },
   "nickel": {
-    "revision": "52478738c5a072ab3ad62c74db5d0902dab064cd"
+    "revision": "43433d8477b24cd13acaac20a66deda49b7e2547"
   },
   "nim": {
     "revision": "961c2798cec9250c44f7d7225ddb33d47d25856a"
@@ -501,10 +501,10 @@
     "revision": "309cb8d33bcfd0a81050b21be08f9eb3f2fe2138"
   },
   "php": {
-    "revision": "b38c53537769df05871643c9688c264074fb6076"
+    "revision": "4f124bc6075e1c3333e80190c1c170933ed72c95"
   },
   "php_only": {
-    "revision": "b38c53537769df05871643c9688c264074fb6076"
+    "revision": "4f124bc6075e1c3333e80190c1c170933ed72c95"
   },
   "phpdoc": {
     "revision": "1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc"
@@ -555,7 +555,7 @@
     "revision": "daf9b3e2be18b0b2996a1281f7783e0d041d8b80"
   },
   "pymanifest": {
-    "revision": "e3b82b78721aee07f676dac8473ae69db51debcf"
+    "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
     "revision": "71778c2a472ed00a64abf4219544edbf8e4b86d7"
@@ -567,7 +567,7 @@
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
   },
   "qmljs": {
-    "revision": "2c57cac27e207425f8df15327884434cb12365a3"
+    "revision": "febf48a5b6928600cd8fb2a01254743af550780d"
   },
   "query": {
     "revision": "f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0"
@@ -578,11 +578,14 @@
   "racket": {
     "revision": "171f52a8c0ed635b85cd42d1e36d82f1066a03b4"
   },
+  "ralph": {
+    "revision": "48b9d9d6e2b55ce8f9eb09ceb0d952e4b1cc87a0"
+  },
   "rasi": {
     "revision": "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa"
   },
   "rbs": {
-    "revision": "e5e807a50fcd104a2d740d354632fc671700a0bf"
+    "revision": "88d8ed487b5449ddda2fc0c4fe23b71cba29ca24"
   },
   "re2c": {
     "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"
@@ -594,10 +597,10 @@
     "revision": "47007f195752d8e57bda80b0b6cdb2d173a9f7d7"
   },
   "rego": {
-    "revision": "9ac75e71b2d791e0aadeef68098319d86a2a14cf"
+    "revision": "20b5a5958c837bc9f74b231022a68a594a313f6d"
   },
   "requirements": {
-    "revision": "360c6a6b31076a482663806f7a8241de9cad6b4e"
+    "revision": "5ad9b7581b3334f6ad492847d007f2fac6e6e5f2"
   },
   "rnoweb": {
     "revision": "1a74dc0ed731ad07db39f063e2c5a6fe528cae7f"
@@ -606,7 +609,7 @@
     "revision": "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af"
   },
   "roc": {
-    "revision": "7df2c0892e62efb81a7504d9799d4e0d0443d241"
+    "revision": "df46a85abda9f948d38f5d4e3684cec49c42fef2"
   },
   "ron": {
     "revision": "78938553b93075e638035f624973083451b29055"
@@ -633,10 +636,10 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "989bfe5ae69e7bad13454b8f52e4ab0c343d8ded"
+    "revision": "865d79e236c7f0e04276c969453d021d1da4b15f"
   },
   "slint": {
-    "revision": "0701312b74b87fe20e61aa662ba41c5815b5d428"
+    "revision": "d82ab8c19ea1b60ff570256eaef7d137cc5ecb63"
   },
   "smali": {
     "revision": "fdfa6a1febc43c7467aa7e937b87b607956f2346"
@@ -645,10 +648,10 @@
     "revision": "fa898ac0885d1da9a253695c3e0e91f5efc587cd"
   },
   "snakemake": {
-    "revision": "ba1b3868eaa960b945593404af9a7c2f296d3643"
+    "revision": "5a7b14074bca95b25935e865ca8f1efad32317e4"
   },
   "solidity": {
-    "revision": "1c94fe3d5351dfcff3551ec1f49614cbf758e444"
+    "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
   },
   "soql": {
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
@@ -657,13 +660,13 @@
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
   },
   "sourcepawn": {
-    "revision": "227656e72a5f0d430bb82a467bc8078f078bba84"
+    "revision": "645d093763bcaaf7535edbdf6575a5c978b16491"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "25f94f998de79bae9df28add9782f9ea6ea0e2b8"
+    "revision": "89fd00d0aff3bc9985ac37caf362ec4fd9b2ba1d"
   },
   "squirrel": {
     "revision": "0a50d31098e83c668d34d1160a0f6c7d23b571cc"
@@ -678,7 +681,7 @@
     "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"
   },
   "styled": {
-    "revision": "c68a4572e2d6403b6e99066c9a113b43f4a07a27"
+    "revision": "65835cca33a5f033bcde580ed66cde01c1fabbbe"
   },
   "supercollider": {
     "revision": "affa4389186b6939d89673e1e9d2b28364f5ca6f"
@@ -687,10 +690,10 @@
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
   },
   "svelte": {
-    "revision": "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"
+    "revision": "7218cf622b057ae9c530e1f0a7a3ce49806ca55e"
   },
   "swift": {
-    "revision": "26354ddec08c7efde4fa16bd29429f3310d2e2c5"
+    "revision": "d657f98dd6bbc34cb48438c9e5956f15a6d89f1d"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -711,13 +714,13 @@
     "revision": "8784024358c233efd0f3a6fd9e7a3c5852e628bc"
   },
   "teal": {
-    "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
+    "revision": "19b02da829d1721a521bf7b802eb80a50bd53aab"
   },
   "templ": {
     "revision": "cf84ea53e2e2531f23009d676ac206090c1e2392"
   },
   "terraform": {
-    "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
+    "revision": "422cbe1d93a8ae3847744b664041fc76876babcd"
   },
   "textproto": {
     "revision": "8dacf02aa402892c91079f8577998ed5148c0496"
@@ -744,19 +747,19 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "tsx": {
-    "revision": "4ad3010c91d700026d036b5230e2d99ba94ae8a4"
+    "revision": "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
   },
   "twig": {
-    "revision": "eaf80e6af969e25993576477a9dbdba3e48c1305"
+    "revision": "085648e01d1422163a1702a44e72303b4e2a0bd1"
   },
   "typescript": {
-    "revision": "4ad3010c91d700026d036b5230e2d99ba94ae8a4"
+    "revision": "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"
   },
   "typespec": {
-    "revision": "fd9a83c6c0aaaff4b1354454b5b9f130f59dd553"
+    "revision": "28821d0d6da5f0a6b5eb02b9bad953fecafd7248"
   },
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
@@ -780,7 +783,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "7e11a6f8f369df935664fadd2f0c99d90fe3226f"
+    "revision": "e91f8a42de7842f24f4ce600754f2b6651985fd4"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -798,7 +801,7 @@
     "revision": "b448ca63f972ade12c373c808acdd2bf972937db"
   },
   "vimdoc": {
-    "revision": "b711df784dd43d0a8ed8ddbfca0ddcc3239d94b4"
+    "revision": "2249c44ecd3f5cf22da3dcccfb74f816ddb29245"
   },
   "vue": {
     "revision": "22bdfa6c9fc0f5ffa44c6e938ec46869ac8a99ff"
@@ -831,9 +834,9 @@
     "revision": "e877f6ade4b77d5ef8787075141053631ba12318"
   },
   "zathurarc": {
-    "revision": "5918bf1785662c43a841b0b6a27a129337ec3a23"
+    "revision": "6e7c8edfcd6f5f7c12b2fa9ffc6d042f1b6d7068"
   },
   "zig": {
-    "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"
+    "revision": "7c5a29b721d409be8842017351bf007d7e384401"
   }
 }
diff --git a/config/neovim/store/nvim-treesitter/lua/nvim-treesitter/parsers.lua b/config/neovim/store/nvim-treesitter/lua/nvim-treesitter/parsers.lua
index d2abb9d5..da2b2f6f 100644
--- a/config/neovim/store/nvim-treesitter/lua/nvim-treesitter/parsers.lua
+++ b/config/neovim/store/nvim-treesitter/lua/nvim-treesitter/parsers.lua
@@ -454,7 +454,7 @@ list.dtd = {
 list.earthfile = {
   install_info = {
     url = "https://github.com/glehmann/tree-sitter-earthfile",
-    files = { "src/parser.c", "src/scanner.c" },
+    files = { "src/parser.c" },
   },
   maintainers = { "@glehmann" },
 }
@@ -1699,6 +1699,14 @@ list.racket = {
   },
 }
 
+list.ralph = {
+  install_info = {
+    url = "https://github.com/alephium/tree-sitter-ralph",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@tdroxler" },
+}
+
 list.rasi = {
   install_info = {
     url = "https://github.com/Fymyte/tree-sitter-rasi",
@@ -1774,7 +1782,7 @@ list.robot = {
 
 list.roc = {
   install_info = {
-    url = "https://github.com/nat-418/tree-sitter-roc",
+    url = "https://github.com/faldor20/tree-sitter-roc",
     files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@nat-418" },
diff --git a/config/neovim/store/nvim-treesitter/lua/nvim-treesitter/query_predicates.lua b/config/neovim/store/nvim-treesitter/lua/nvim-treesitter/query_predicates.lua
index 61400e47..2d61ca6b 100644
--- a/config/neovim/store/nvim-treesitter/lua/nvim-treesitter/query_predicates.lua
+++ b/config/neovim/store/nvim-treesitter/lua/nvim-treesitter/query_predicates.lua
@@ -124,7 +124,7 @@ end, true)
 ---@param _bufnr integer
 ---@param pred string[]
 ---@return boolean|nil
-query.add_predicate("has-type?", function(match, _pattern, _bufnr, pred)
+query.add_predicate("kind-eq?", function(match, _pattern, _bufnr, pred)
   if not valid_args(pred[1], pred, 2) then
     return
   end
diff --git a/config/neovim/store/nvim-treesitter/lua/nvim-treesitter/ts_utils.lua b/config/neovim/store/nvim-treesitter/lua/nvim-treesitter/ts_utils.lua
index 655c6288..9e9ada6a 100644
--- a/config/neovim/store/nvim-treesitter/lua/nvim-treesitter/ts_utils.lua
+++ b/config/neovim/store/nvim-treesitter/lua/nvim-treesitter/ts_utils.lua
@@ -397,6 +397,7 @@ function M.swap_nodes(node_or_range1, node_or_range2, bufnr, cursor_to_second)
 
   local edit1 = { range = range1, newText = table.concat(text2, "\n") }
   local edit2 = { range = range2, newText = table.concat(text1, "\n") }
+  bufnr = bufnr == 0 and vim.api.nvim_get_current_buf() or bufnr
   vim.lsp.util.apply_text_edits({ edit1, edit2 }, bufnr, "utf-8")
 
   if cursor_to_second then
diff --git a/config/neovim/store/nvim-treesitter/queries/apex/highlights.scm b/config/neovim/store/nvim-treesitter/queries/apex/highlights.scm
index 85453b22..15b01655 100644
--- a/config/neovim/store/nvim-treesitter/queries/apex/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/apex/highlights.scm
@@ -152,6 +152,9 @@
   field: (identifier) @variable.member)
 
 ; Variables
+(variable_declarator
+  (identifier) @property)
+
 (field_declaration
   (modifiers
     (modifier
@@ -167,9 +170,6 @@
   (variable_declarator
     name: (identifier) @constant))
 
-(variable_declarator
-  (identifier) @property)
-
 ((identifier) @constant
   (#lua-match? @constant "^[A-Z][A-Z0-9_]+$")) ; SCREAM SNAKE CASE
 
diff --git a/config/neovim/store/nvim-treesitter/queries/c/indents.scm b/config/neovim/store/nvim-treesitter/queries/c/indents.scm
index 372a26c6..1932ce8d 100644
--- a/config/neovim/store/nvim-treesitter/queries/c/indents.scm
+++ b/config/neovim/store/nvim-treesitter/queries/c/indents.scm
@@ -24,14 +24,14 @@
 
 ((for_statement
   body: (_) @_body) @indent.begin
-  (#not-has-type? @_body compound_statement))
+  (#not-kind-eq? @_body "compound_statement"))
 
 (while_statement
   condition: (_) @indent.begin)
 
 ((while_statement
   body: (_) @_body) @indent.begin
-  (#not-has-type? @_body compound_statement))
+  (#not-kind-eq? @_body "compound_statement"))
 
 ((if_statement)
   .
@@ -45,7 +45,7 @@
 (if_statement
   consequence: (_
     ";" @indent.end) @_consequence
-  (#not-has-type? @_consequence compound_statement)
+  (#not-kind-eq? @_consequence "compound_statement")
   alternative: (else_clause
     "else" @indent.branch
     [
diff --git a/config/neovim/store/nvim-treesitter/queries/cmake/highlights.scm b/config/neovim/store/nvim-treesitter/queries/cmake/highlights.scm
index d6e0f243..fbbf0d54 100644
--- a/config/neovim/store/nvim-treesitter/queries/cmake/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/cmake/highlights.scm
@@ -31,8 +31,6 @@
   "$"
   "{"
   "}"
-  "<"
-  ">"
 ] @punctuation.special
 
 [
diff --git a/config/neovim/store/nvim-treesitter/queries/commonlisp/highlights.scm b/config/neovim/store/nvim-treesitter/queries/commonlisp/highlights.scm
index 84f132e4..7236c84d 100644
--- a/config/neovim/store/nvim-treesitter/queries/commonlisp/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/commonlisp/highlights.scm
@@ -105,24 +105,19 @@
   (#lua-match? @variable.builtin "^[*].+[*]$"))
 
 ; quote
-"'" @string.escape
-
 (format_specifier) @string.escape
 
-(quoting_lit) @string.escape
+(quoting_lit
+  "'" @string.escape)
 
-; syntax quote
-"`" @string.escape
+(syn_quoting_lit
+  "`" @string.escape)
 
-"," @string.escape
+(unquoting_lit
+  "," @string.escape)
 
-",@" @string.escape
-
-(syn_quoting_lit) @string.escape
-
-(unquoting_lit) @none
-
-(unquote_splicing_lit) @none
+(unquote_splicing_lit
+  ",@" @string.escape)
 
 [
   "("
diff --git a/config/neovim/store/nvim-treesitter/queries/cooklang/highlights.scm b/config/neovim/store/nvim-treesitter/queries/cooklang/highlights.scm
index ca870dd4..4ac39189 100644
--- a/config/neovim/store/nvim-treesitter/queries/cooklang/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/cooklang/highlights.scm
@@ -1,5 +1,14 @@
 (metadata) @comment
 
+(comment) @comment @spell
+
+[
+  "{"
+  "}"
+] @punctuation.bracket
+
+"%" @punctuation.special
+
 (ingredient
   "@" @punctuation.delimiter
   (name)? @string.special.symbol
diff --git a/config/neovim/store/nvim-treesitter/queries/corn/highlights.scm b/config/neovim/store/nvim-treesitter/queries/corn/highlights.scm
index 02929146..8f394ed7 100644
--- a/config/neovim/store/nvim-treesitter/queries/corn/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/corn/highlights.scm
@@ -1,6 +1,7 @@
-"let" @keyword
-
-"in" @keyword
+[
+  "let"
+  "in"
+] @keyword
 
 [
   "{"
@@ -11,8 +12,15 @@
 
 "." @punctuation.delimiter
 
+[
+  ".."
+  "="
+] @operator
+
 (input) @constant
 
+(null) @constant.builtin
+
 (comment) @comment @spell
 
 (string) @string
@@ -21,6 +29,9 @@
 
 (float) @number.float
 
+(float
+  "." @number.float)
+
 (boolean) @boolean
 
-(null) @keyword
+(path_seg) @property
diff --git a/config/neovim/store/nvim-treesitter/queries/djot/injections.scm b/config/neovim/store/nvim-treesitter/queries/djot/injections.scm
index b590e084..078b4036 100644
--- a/config/neovim/store/nvim-treesitter/queries/djot/injections.scm
+++ b/config/neovim/store/nvim-treesitter/queries/djot/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 (code_block
   (language) @injection.language
   (code) @injection.content)
diff --git a/config/neovim/store/nvim-treesitter/queries/ecma/indents.scm b/config/neovim/store/nvim-treesitter/queries/ecma/indents.scm
index 03b10c60..96666421 100644
--- a/config/neovim/store/nvim-treesitter/queries/ecma/indents.scm
+++ b/config/neovim/store/nvim-treesitter/queries/ecma/indents.scm
@@ -29,15 +29,15 @@
 
 (arrow_function
   body: (_) @_body
-  (#not-has-type? @_body statement_block)) @indent.begin
+  (#not-kind-eq? @_body "statement_block")) @indent.begin
 
 (assignment_expression
   right: (_) @_right
-  (#not-has-type? @_right arrow_function function)) @indent.begin
+  (#not-kind-eq? @_right "arrow_function" "function")) @indent.begin
 
 (variable_declarator
   value: (_) @_value
-  (#not-has-type? @_value arrow_function call_expression function)) @indent.begin
+  (#not-kind-eq? @_value "arrow_function" "call_expression" "function")) @indent.begin
 
 (arguments
   ")" @indent.end)
diff --git a/config/neovim/store/nvim-treesitter/queries/foam/injections.scm b/config/neovim/store/nvim-treesitter/queries/foam/injections.scm
index e1c223bd..b9f8f838 100644
--- a/config/neovim/store/nvim-treesitter/queries/foam/injections.scm
+++ b/config/neovim/store/nvim-treesitter/queries/foam/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ; Pass code blocks to Cpp highlighter
 (code
   (code_body) @injection.content
diff --git a/config/neovim/store/nvim-treesitter/queries/git_rebase/injections.scm b/config/neovim/store/nvim-treesitter/queries/git_rebase/injections.scm
index da262866..c831594b 100644
--- a/config/neovim/store/nvim-treesitter/queries/git_rebase/injections.scm
+++ b/config/neovim/store/nvim-treesitter/queries/git_rebase/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ((operation
   (command) @_command
   (message) @injection.content)
diff --git a/config/neovim/store/nvim-treesitter/queries/gitcommit/highlights.scm b/config/neovim/store/nvim-treesitter/queries/gitcommit/highlights.scm
index 4542413c..a1553051 100644
--- a/config/neovim/store/nvim-treesitter/queries/gitcommit/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/gitcommit/highlights.scm
@@ -9,7 +9,7 @@
 
 (change) @keyword
 
-(filepath) @string.special.url
+(filepath) @string.special.path
 
 (arrow) @punctuation.delimiter
 
diff --git a/config/neovim/store/nvim-treesitter/queries/gleam/highlights.scm b/config/neovim/store/nvim-treesitter/queries/gleam/highlights.scm
index 8754f3ed..9daf9b8b 100644
--- a/config/neovim/store/nvim-treesitter/queries/gleam/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/gleam/highlights.scm
@@ -147,9 +147,6 @@
   (type_var)
 ] @type
 
-((type_identifier) @type.builtin
-  (#any-of? @type.builtin "Int" "Float" "String" "List"))
-
 ; Type Qualifiers
 [
   "const"
diff --git a/config/neovim/store/nvim-treesitter/queries/groovy/indents.scm b/config/neovim/store/nvim-treesitter/queries/groovy/indents.scm
index 888d5010..ba3a2e84 100644
--- a/config/neovim/store/nvim-treesitter/queries/groovy/indents.scm
+++ b/config/neovim/store/nvim-treesitter/queries/groovy/indents.scm
@@ -19,7 +19,7 @@
 
 ((for_loop
   body: (_) @_body) @indent.begin
-  (#not-has-type? @_body closure))
+  (#not-kind-eq? @_body "closure"))
 
 ; TODO: while, try
 (list
diff --git a/config/neovim/store/nvim-treesitter/queries/hoon/highlights.scm b/config/neovim/store/nvim-treesitter/queries/hoon/highlights.scm
index d98ee44e..90ac8721 100644
--- a/config/neovim/store/nvim-treesitter/queries/hoon/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/hoon/highlights.scm
@@ -20,7 +20,7 @@
 
 (aura) @constant.builtin
 
-(Gap) @comment
+(lineComment) @comment
 
 (boolean) @constant.builtin
 
diff --git a/config/neovim/store/nvim-treesitter/queries/html_tags/indents.scm b/config/neovim/store/nvim-treesitter/queries/html_tags/indents.scm
index 6fe984fa..dc57c333 100644
--- a/config/neovim/store/nvim-treesitter/queries/html_tags/indents.scm
+++ b/config/neovim/store/nvim-treesitter/queries/html_tags/indents.scm
@@ -1,13 +1,12 @@
-[
-  ((element
-    (start_tag
-      (tag_name) @_not_void_element))
-    (#not-any-of? @_not_void_element
-      "area" "base" "basefont" "bgsound" "br" "col" "command" "embed" "frame" "hr" "image" "img"
-      "input" "isindex" "keygen" "link" "menuitem" "meta" "nextid" "param" "source" "track" "wbr"))
-  (element
-    (self_closing_tag))
-] @indent.begin
+((element
+  (start_tag
+    (tag_name) @_not_void_element))
+  (#not-any-of? @_not_void_element
+    "area" "base" "basefont" "bgsound" "br" "col" "command" "embed" "frame" "hr" "image" "img"
+    "input" "isindex" "keygen" "link" "menuitem" "meta" "nextid" "param" "source" "track" "wbr")) @indent.begin
+
+(element
+  (self_closing_tag)) @indent.begin
 
 ((start_tag
   (tag_name) @_void_element)
diff --git a/config/neovim/store/nvim-treesitter/queries/htmldjango/highlights.scm b/config/neovim/store/nvim-treesitter/queries/htmldjango/highlights.scm
index a411e8f1..5648e72f 100644
--- a/config/neovim/store/nvim-treesitter/queries/htmldjango/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/htmldjango/highlights.scm
@@ -22,6 +22,15 @@
 
 (variable_name) @variable
 
+(unpaired_statement
+  (tag_name)
+  (variable
+    (variable_name) @variable.parameter)
+  .
+  "="
+  .
+  (_))
+
 (filter_name) @function.method
 
 (filter_argument) @variable.parameter
diff --git a/config/neovim/store/nvim-treesitter/queries/htmldjango/injections.scm b/config/neovim/store/nvim-treesitter/queries/htmldjango/injections.scm
index c475757b..2d3bdb6c 100644
--- a/config/neovim/store/nvim-treesitter/queries/htmldjango/injections.scm
+++ b/config/neovim/store/nvim-treesitter/queries/htmldjango/injections.scm
@@ -1,3 +1,9 @@
+([
+  (paired_comment)
+  (unpaired_comment)
+] @injection.content
+  (#set! injection.language "comment"))
+
 ((content) @injection.content
   (#set! injection.language "html")
   (#set! injection.combined))
diff --git a/config/neovim/store/nvim-treesitter/queries/hurl/injections.scm b/config/neovim/store/nvim-treesitter/queries/hurl/injections.scm
index ea62b8f5..109d9125 100644
--- a/config/neovim/store/nvim-treesitter/queries/hurl/injections.scm
+++ b/config/neovim/store/nvim-treesitter/queries/hurl/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ; injections.scm
 ((json_value) @injection.content
   (#set! injection.language "json"))
diff --git a/config/neovim/store/nvim-treesitter/queries/hyprlang/highlights.scm b/config/neovim/store/nvim-treesitter/queries/hyprlang/highlights.scm
index d76993d1..597edcbf 100644
--- a/config/neovim/store/nvim-treesitter/queries/hyprlang/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/hyprlang/highlights.scm
@@ -36,6 +36,8 @@
   (legacy_hex)
   (angle)
   (hex)
+  (display)
+  (position)
 ] @number
 
 "deg" @type
diff --git a/config/neovim/store/nvim-treesitter/queries/hyprlang/injections.scm b/config/neovim/store/nvim-treesitter/queries/hyprlang/injections.scm
index 1f0199ed..d38d499b 100644
--- a/config/neovim/store/nvim-treesitter/queries/hyprlang/injections.scm
+++ b/config/neovim/store/nvim-treesitter/queries/hyprlang/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 (exec
   (string) @injection.content
   (#set! injection.language "bash"))
diff --git a/config/neovim/store/nvim-treesitter/queries/ispc/indents.scm b/config/neovim/store/nvim-treesitter/queries/ispc/indents.scm
index 80723afb..f8c04e3a 100644
--- a/config/neovim/store/nvim-treesitter/queries/ispc/indents.scm
+++ b/config/neovim/store/nvim-treesitter/queries/ispc/indents.scm
@@ -2,8 +2,8 @@
 
 ((foreach_statement
   body: (_) @_body) @indent.begin
-  (#not-has-type? @_body compound_statement))
+  (#not-kind-eq? @_body "compound_statement"))
 
 ((foreach_instance_statement
   body: (_) @_body) @indent.begin
-  (#not-has-type? @_body compound_statement))
+  (#not-kind-eq? @_body "compound_statement"))
diff --git a/config/neovim/store/nvim-treesitter/queries/janet_simple/highlights.scm b/config/neovim/store/nvim-treesitter/queries/janet_simple/highlights.scm
index 179b4fef..552f865c 100644
--- a/config/neovim/store/nvim-treesitter/queries/janet_simple/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/janet_simple/highlights.scm
@@ -75,13 +75,14 @@
     "%=" "*=" "++" "+=" "--" "-=" "->" "->>" "-?>" "-?>>" "/=" "and" "as->" "as-macro" "as?->"
     "assert" "case" "catseq" "chr" "comment" "compif" "comptime" "compwhen" "cond" "coro" "def-"
     "default" "defdyn" "defer" "defmacro" "defmacro-" "defn" "defn-" "delay" "doc" "each" "eachk"
-    "eachp" "eachy"
-    ; XXX: obsolete
-    "edefer" "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread" "ev/with-deadline"
-    "ffi/defbind" "fiber-fn" "for" "forever" "forv" "generate" "if-let" "if-not" "if-with" "import"
-    "juxt" "label" "let" "loop" "match" "or" "prompt" "protect" "repeat" "seq" "short-fn" "tabseq"
-    "toggle" "tracev" "try" "unless" "use" "var-" "varfn" "when" "when-let" "when-with" "with"
-    "with-dyns" "with-syms" "with-vars"))
+    "eachp" "edefer" "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread" "ev/with-deadline"
+    "ev/with-lock" "ev/with-rlock" "ev/with-wlock" "ffi/defbind" "ffi/defbind-alias" "fiber-fn"
+    "for" "forever" "forv" "generate" "if-let" "if-not" "if-with" "import" "juxt" "label" "let"
+    "loop" "match" "or" "prompt" "protect" "repeat" "seq" "short-fn" "tabseq" "toggle" "tracev"
+    "try" "unless" "use" "var-" "varfn" "when" "when-let" "when-with" "with" "with-dyns" "with-env"
+    "with-syms" "with-vars"
+    ; obsolete builtin macros
+    "eachy"))
 
 ; All builtin functions
 ;
@@ -101,74 +102,77 @@
     "abstract?" "accumulate" "accumulate2" "all" "all-bindings" "all-dynamics" "any?" "apply"
     "array" "array/clear" "array/concat" "array/ensure" "array/fill" "array/insert" "array/new"
     "array/new-filled" "array/peek" "array/pop" "array/push" "array/remove" "array/slice"
-    "array/trim" "array?" "asm" "bad-compile" "bad-parse" "band" "blshift" "bnot" "boolean?" "bor"
-    "brshift" "brushift" "buffer" "buffer/bit" "buffer/bit-clear" "buffer/bit-set"
-    "buffer/bit-toggle" "buffer/blit" "buffer/clear" "buffer/fill" "buffer/format" "buffer/new"
-    "buffer/new-filled" "buffer/popn" "buffer/push" "buffer/push-at" "buffer/push-byte"
-    "buffer/push-string" "buffer/push-word" "buffer/slice" "buffer/trim" "buffer?" "bxor" "bytes?"
-    "cancel" "cfunction?" "cli-main" "cmp" "comp" "compare" "compare<" "compare<=" "compare="
-    "compare>" "compare>=" "compile" "complement" "count" "curenv" "debug" "debug/arg-stack"
-    "debug/break" "debug/fbreak" "debug/lineage" "debug/stack" "debug/stacktrace" "debug/step"
-    "debug/unbreak" "debug/unfbreak" "debugger" "debugger-on-status" "dec" "deep-not=" "deep="
-    "defglobal" "describe" "dictionary?" "disasm" "distinct" "div" "doc*" "doc-format" "doc-of"
-    "dofile" "drop" "drop-until" "drop-while" "dyn" "eflush" "empty?" "env-lookup" "eprin" "eprinf"
-    "eprint" "eprintf" "error" "errorf" "ev/acquire-lock" "ev/acquire-rlock" "ev/acquire-wlock"
-    "ev/all-tasks" "ev/call" "ev/cancel" "ev/capacity" "ev/chan" "ev/chan-close" "ev/chunk"
-    "ev/close" "ev/count" "ev/deadline" "ev/full" "ev/give" "ev/give-supervisor" "ev/go" "ev/lock"
-    "ev/read" "ev/release-lock" "ev/release-rlock" "ev/release-wlock" "ev/rselect" "ev/rwlock"
-    "ev/select" "ev/sleep" "ev/take" "ev/thread" "ev/thread-chan" "ev/write" "eval" "eval-string"
-    "even?" "every?" "extreme" "false?" "ffi/align" "ffi/call" "ffi/calling-convetions" "ffi/close"
-    "ffi/context" "ffi/free" "ffi/jitfn" "ffi/lookup" "ffi/malloc" "ffi/native" "ffi/pointer-buffer"
-    "ffi/pointer-cfunction" "ffi/read" "ffi/signature" "ffi/size" "ffi/struct" "ffi/trampoline"
-    "ffi/write" "fiber/can-resume?" "fiber/current" "fiber/getenv" "fiber/last-value"
-    "fiber/maxstack" "fiber/new" "fiber/root" "fiber/setenv" "fiber/setmaxstack" "fiber/status"
-    "fiber?" "file/close" "file/flush" "file/lines" "file/open" "file/read" "file/seek" "file/tell"
-    "file/temp" "file/write" "filter" "find" "find-index" "first" "flatten" "flatten-into" "flush"
-    "flycheck" "freeze" "frequencies" "from-pairs" "function?" "gccollect" "gcinterval"
-    "gcsetinterval" "gensym" "get" "get-in" "getline" "getproto" "group-by" "has-key?" "has-value?"
-    "hash" "idempotent?" "identity" "import*" "in" "inc" "index-of" "indexed?" "int/s64"
-    "int/to-bytes" "int/to-number" "int/u64" "int?" "interleave" "interpose" "invert" "juxt*" "keep"
-    "keep-syntax" "keep-syntax!" "keys" "keyword" "keyword/slice" "keyword?" "kvs" "last" "length"
-    "load-image" "macex" "macex1" "maclintf" "make-env" "make-image" "map" "mapcat" "marshal"
-    "math/abs" "math/acos" "math/acosh" "math/asin" "math/asinh" "math/atan" "math/atan2"
-    "math/atanh" "math/cbrt" "math/ceil" "math/cos" "math/cosh" "math/erf" "math/erfc" "math/exp"
-    "math/exp2" "math/expm1" "math/floor" "math/gamma" "math/gcd" "math/hypot" "math/lcm" "math/log"
-    "math/log-gamma" "math/log10" "math/log1p" "math/log2" "math/next" "math/pow" "math/random"
-    "math/rng" "math/rng-buffer" "math/rng-int" "math/rng-uniform" "math/round" "math/seedrandom"
-    "math/sin" "math/sinh" "math/sqrt" "math/tan" "math/tanh" "math/trunc" "max" "max-of" "mean"
-    "memcmp" "merge" "merge-into" "merge-module" "min" "min-of" "mod" "module/add-paths"
-    "module/expand-path" "module/find" "module/value" "nan?" "nat?" "native" "neg?" "net/accept"
-    "net/accept-loop" "net/address" "net/address-unpack" "net/chunk" "net/close" "net/connect"
-    "net/flush" "net/listen" "net/localname" "net/peername" "net/read" "net/recv-from" "net/send-to"
-    "net/server" "net/setsockopt" "net/shutdown" "net/write" "next" "nil?" "not" "not=" "number?"
-    "odd?" "one?" "os/arch" "os/cd" "os/chmod" "os/clock" "os/compiler" "os/cpu-count"
-    "os/cryptorand" "os/cwd" "os/date" "os/dir" "os/environ" "os/execute" "os/exit" "os/getenv"
-    "os/link" "os/lstat" "os/mkdir" "os/mktime" "os/open" "os/perm-int" "os/perm-string" "os/pipe"
-    "os/proc-close" "os/proc-kill" "os/proc-wait" "os/readlink" "os/realpath" "os/rename" "os/rm"
-    "os/rmdir" "os/setenv" "os/shell" "os/sleep" "os/spawn" "os/stat" "os/symlink" "os/time"
-    "os/touch" "os/umask" "os/which" "pairs" "parse" "parse-all" "parser/byte" "parser/clone"
-    "parser/consume" "parser/eof" "parser/error" "parser/flush" "parser/has-more" "parser/insert"
-    "parser/new" "parser/produce" "parser/state" "parser/status" "parser/where" "partial"
-    "partition" "partition-by" "peg/compile" "peg/find" "peg/find-all" "peg/match" "peg/replace"
-    "peg/replace-all" "pos?" "postwalk" "pp" "prewalk" "prin" "prinf" "print" "printf" "product"
-    "propagate" "put" "put-in" "quit" "range" "reduce" "reduce2" "repl" "require" "resume" "return"
-    "reverse" "reverse!" "run-context" "sandbox" "scan-number" "setdyn" "signal" "slice" "slurp"
-    "some" "sort" "sort-by" "sorted" "sorted-by" "spit" "string" "string/ascii-lower"
-    "string/ascii-upper" "string/bytes" "string/check-set" "string/find" "string/find-all"
-    "string/format" "string/from-bytes" "string/has-prefix?" "string/has-suffix?" "string/join"
-    "string/repeat" "string/replace" "string/replace-all" "string/reverse" "string/slice"
-    "string/split" "string/trim" "string/triml" "string/trimr" "string?" "struct" "struct/getproto"
-    "struct/proto-flatten" "struct/to-table" "struct/with-proto" "struct?" "sum" "symbol"
-    "symbol/slice" "symbol?" "table" "table/clear" "table/clone" "table/getproto" "table/new"
-    "table/proto-flatten" "table/rawget" "table/setproto" "table/to-struct" "table?" "take"
-    "take-until" "take-while"
+    "array/trim" "array/weak" "array?" "asm" "bad-compile" "bad-parse" "band" "blshift" "bnot"
+    "boolean?" "bor" "brshift" "brushift" "buffer" "buffer/bit" "buffer/bit-clear" "buffer/bit-set"
+    "buffer/bit-toggle" "buffer/blit" "buffer/clear" "buffer/fill" "buffer/format"
+    "buffer/format-at" "buffer/from-bytes" "buffer/new" "buffer/new-filled" "buffer/popn"
+    "buffer/push" "buffer/push-at" "buffer/push-byte" "buffer/push-float32" "buffer/push-float64"
+    "buffer/push-string" "buffer/push-uint16" "buffer/push-uint32" "buffer/push-uint64"
+    "buffer/push-word" "buffer/slice" "buffer/trim" "buffer?" "bundle/add" "bundle/add-directory"
+    "bundle/add-file" "bundle/install" "bundle/installed?" "bundle/list" "bundle/manifest"
+    "bundle/prune" "bundle/reinstall" "bundle/topolist" "bundle/uninstall" "bundle/update-all"
+    "bxor" "bytes?" "cancel" "cfunction?" "cli-main" "cmp" "comp" "compare" "compare<" "compare<="
+    "compare=" "compare>" "compare>=" "compile" "complement" "count" "curenv" "debug"
+    "debug/arg-stack" "debug/break" "debug/fbreak" "debug/lineage" "debug/stack" "debug/stacktrace"
+    "debug/step" "debug/unbreak" "debug/unfbreak" "debugger" "debugger-on-status" "dec" "deep-not="
+    "deep=" "defglobal" "describe" "dictionary?" "disasm" "distinct" "div" "doc*" "doc-format"
+    "doc-of" "dofile" "drop" "drop-until" "drop-while" "dyn" "eflush" "empty?" "env-lookup" "eprin"
+    "eprinf" "eprint" "eprintf" "error" "errorf" "ev/acquire-lock" "ev/acquire-rlock"
+    "ev/acquire-wlock" "ev/all-tasks" "ev/call" "ev/cancel" "ev/capacity" "ev/chan" "ev/chan-close"
+    "ev/chunk" "ev/close" "ev/count" "ev/deadline" "ev/full" "ev/give" "ev/give-supervisor" "ev/go"
+    "ev/lock" "ev/read" "ev/release-lock" "ev/release-rlock" "ev/release-wlock" "ev/rselect"
+    "ev/rwlock" "ev/select" "ev/sleep" "ev/take" "ev/thread" "ev/thread-chan" "ev/write" "eval"
+    "eval-string" "even?" "every?" "extreme" "false?" "ffi/align" "ffi/call"
+    "ffi/calling-conventions" "ffi/close" "ffi/context" "ffi/free" "ffi/jitfn" "ffi/lookup"
+    "ffi/malloc" "ffi/native" "ffi/pointer-buffer" "ffi/pointer-cfunction" "ffi/read"
+    "ffi/signature" "ffi/size" "ffi/struct" "ffi/trampoline" "ffi/write" "fiber/can-resume?"
+    "fiber/current" "fiber/getenv" "fiber/last-value" "fiber/maxstack" "fiber/new" "fiber/root"
+    "fiber/setenv" "fiber/setmaxstack" "fiber/status" "fiber?" "file/close" "file/flush"
+    "file/lines" "file/open" "file/read" "file/seek" "file/tell" "file/temp" "file/write" "filter"
+    "find" "find-index" "first" "flatten" "flatten-into" "flush" "flycheck" "freeze" "frequencies"
+    "from-pairs" "function?" "gccollect" "gcinterval" "gcsetinterval" "gensym" "get" "get-in"
+    "getline" "getproto" "group-by" "has-key?" "has-value?" "hash" "idempotent?" "identity"
+    "import*" "in" "inc" "index-of" "indexed?" "int/s64" "int/to-bytes" "int/to-number" "int/u64"
+    "int?" "interleave" "interpose" "invert" "juxt*" "keep" "keep-syntax" "keep-syntax!" "keys"
+    "keyword" "keyword/slice" "keyword?" "kvs" "last" "length" "lengthable?" "load-image" "macex"
+    "macex1" "maclintf" "make-env" "make-image" "map" "mapcat" "marshal" "math/abs" "math/acos"
+    "math/acosh" "math/asin" "math/asinh" "math/atan" "math/atan2" "math/atanh" "math/cbrt"
+    "math/ceil" "math/cos" "math/cosh" "math/erf" "math/erfc" "math/exp" "math/exp2" "math/expm1"
+    "math/floor" "math/frexp" "math/gamma" "math/gcd" "math/hypot" "math/lcm" "math/ldexp"
+    "math/log" "math/log-gamma" "math/log10" "math/log1p" "math/log2" "math/next" "math/pow"
+    "math/random" "math/rng" "math/rng-buffer" "math/rng-int" "math/rng-uniform" "math/round"
+    "math/seedrandom" "math/sin" "math/sinh" "math/sqrt" "math/tan" "math/tanh" "math/trunc" "max"
+    "max-of" "mean" "memcmp" "merge" "merge-into" "merge-module" "min" "min-of" "mod"
+    "module/add-paths" "module/expand-path" "module/find" "module/value" "nan?" "nat?" "native"
+    "neg?" "net/accept" "net/accept-loop" "net/address" "net/address-unpack" "net/chunk" "net/close"
+    "net/connect" "net/flush" "net/listen" "net/localname" "net/peername" "net/read" "net/recv-from"
+    "net/send-to" "net/server" "net/setsockopt" "net/shutdown" "net/write" "next" "nil?" "not"
+    "not=" "number?" "odd?" "one?" "os/arch" "os/cd" "os/chmod" "os/clock" "os/compiler"
+    "os/cpu-count" "os/cryptorand" "os/cwd" "os/date" "os/dir" "os/environ" "os/execute" "os/exit"
+    "os/getenv" "os/isatty" "os/link" "os/lstat" "os/mkdir" "os/mktime" "os/open" "os/perm-int"
+    "os/perm-string" "os/pipe" "os/posix-exec" "os/posix-fork" "os/proc-close" "os/proc-kill"
+    "os/proc-wait" "os/readlink" "os/realpath" "os/rename" "os/rm" "os/rmdir" "os/setenv"
+    "os/setlocale" "os/shell" "os/sigaction" "os/sleep" "os/spawn" "os/stat" "os/strftime"
+    "os/symlink" "os/time" "os/touch" "os/umask" "os/which" "pairs" "parse" "parse-all"
+    "parser/byte" "parser/clone" "parser/consume" "parser/eof" "parser/error" "parser/flush"
+    "parser/has-more" "parser/insert" "parser/new" "parser/produce" "parser/state" "parser/status"
+    "parser/where" "partial" "partition" "partition-by" "peg/compile" "peg/find" "peg/find-all"
+    "peg/match" "peg/replace" "peg/replace-all" "pos?" "postwalk" "pp" "prewalk" "prin" "prinf"
+    "print" "printf" "product" "propagate" "put" "put-in" "quit" "range" "reduce" "reduce2" "repl"
+    "require" "resume" "return" "reverse" "reverse!" "run-context" "sandbox" "scan-number" "setdyn"
+    "signal" "slice" "slurp" "some" "sort" "sort-by" "sorted" "sorted-by" "spit" "string"
+    "string/ascii-lower" "string/ascii-upper" "string/bytes" "string/check-set" "string/find"
+    "string/find-all" "string/format" "string/from-bytes" "string/has-prefix?" "string/has-suffix?"
+    "string/join" "string/repeat" "string/replace" "string/replace-all" "string/reverse"
+    "string/slice" "string/split" "string/trim" "string/triml" "string/trimr" "string?" "struct"
+    "struct/getproto" "struct/proto-flatten" "struct/to-table" "struct/with-proto" "struct?" "sum"
+    "symbol" "symbol/slice" "symbol?" "table" "table/clear" "table/clone" "table/getproto"
+    "table/new" "table/proto-flatten" "table/rawget" "table/setproto" "table/to-struct" "table/weak"
+    "table/weak-keys" "table/weak-values" "table?" "take" "take-until" "take-while" "thaw" "trace"
+    "true?" "truthy?" "tuple" "tuple/brackets" "tuple/setmap" "tuple/slice" "tuple/sourcemap"
+    "tuple/type" "tuple?" "type" "unmarshal" "untrace" "update" "update-in" "values" "varglobal"
+    "walk" "warn-compile" "xprin" "xprinf" "xprint" "xprintf" "yield" "zero?" "zipcoll"
     ; XXX: obsolete
     "tarray/buffer" "tarray/copy-bytes" "tarray/length" "tarray/new" "tarray/properties"
-    "tarray/slice" "tarray/swap-bytes"
-    ; XXX: obsolete
-    "thread/close" "thread/current" "thread/exit" "thread/new" "thread/receive" "thread/send"
-    ; end of obsolete
-    "trace" "true?" "truthy?" "tuple" "tuple/brackets" "tuple/setmap" "tuple/slice"
-    "tuple/sourcemap" "tuple/type" "tuple?" "type" "unmarshal" "untrace" "update" "update-in"
-    "values" "varglobal" "walk" "warn-compile" "xprin" "xprinf" "xprint" "xprintf" "yield" "zero?"
-    "zipcoll"))
+    "tarray/slice" "tarray/swap-bytes" "thread/close" "thread/current" "thread/exit" "thread/new"
+    "thread/receive" "thread/send"))
diff --git a/config/neovim/store/nvim-treesitter/queries/jq/highlights.scm b/config/neovim/store/nvim-treesitter/queries/jq/highlights.scm
index d994d759..5d6050f4 100644
--- a/config/neovim/store/nvim-treesitter/queries/jq/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/jq/highlights.scm
@@ -58,26 +58,25 @@
 ; jq -n 'builtins | map(split("/")[0]) | unique | .[]'
 ((funcname) @function.builtin
   (#any-of? @function.builtin
-    "IN" "INDEX" "JOIN" "acos" "acosh" "add" "all" "any" "arrays" "ascii_downcase" "ascii_upcase"
-    "asin" "asinh" "atan" "atan2" "atanh" "booleans" "bsearch" "builtins" "capture" "cbrt" "ceil"
-    "combinations" "contains" "copysign" "cos" "cosh" "debug" "del" "delpaths" "drem" "empty"
-    "endswith" "env" "erf" "erfc" "error" "exp" "exp10" "exp2" "explode" "expm1" "fabs" "fdim"
-    "finites" "first" "flatten" "floor" "fma" "fmax" "fmin" "fmod" "format" "frexp" "from_entries"
-    "fromdate" "fromdateiso8601" "fromjson" "fromstream" "gamma" "get_jq_origin" "get_prog_origin"
-    "get_search_list" "getpath" "gmtime" "group_by" "gsub" "halt" "halt_error" "has" "hypot"
-    "implode" "in" "index" "indices" "infinite" "input" "input_filename" "input_line_number"
-    "inputs" "inside" "isempty" "isfinite" "isinfinite" "isnan" "isnormal" "iterables" "j0" "j1"
-    "jn" "join" "keys" "keys_unsorted" "last" "ldexp" "leaf_paths" "length" "lgamma" "lgamma_r"
-    "limit" "localtime" "log" "log10" "log1p" "log2" "logb" "ltrimstr" "map" "map_values" "match"
-    "max" "max_by" "min" "min_by" "mktime" "modf" "modulemeta" "nan" "nearbyint" "nextafter"
-    "nexttoward" "normals" "not" "now" "nth" "nulls" "numbers" "objects" "path" "paths" "pow"
-    "pow10" "range" "recurse" "recurse_down" "remainder" "repeat" "reverse" "rindex" "rint" "round"
-    "rtrimstr" "scalars" "scalars_or_empty" "scalb" "scalbln" "scan" "select" "setpath"
-    "significand" "sin" "sinh" "sort" "sort_by" "split" "splits" "sqrt" "startswith" "stderr"
-    "strflocaltime" "strftime" "strings" "strptime" "sub" "tan" "tanh" "test" "tgamma" "to_entries"
-    "todate" "todateiso8601" "tojson" "tonumber" "tostream" "tostring" "transpose" "trunc"
-    "truncate_stream" "type" "unique" "unique_by" "until" "utf8bytelength" "values" "walk" "while"
-    "with_entries" "y0" "y1" "yn"))
+    "IN" "INDEX" "JOIN" "abs" "acos" "acosh" "add" "all" "any" "arrays" "ascii_downcase"
+    "ascii_upcase" "asin" "asinh" "atan" "atan2" "atanh" "booleans" "bsearch" "builtins" "capture"
+    "cbrt" "ceil" "combinations" "contains" "copysign" "cos" "cosh" "debug" "del" "delpaths" "drem"
+    "empty" "endswith" "env" "erf" "erfc" "error" "exp" "exp10" "exp2" "explode" "expm1" "fabs"
+    "fdim" "finites" "first" "flatten" "floor" "fma" "fmax" "fmin" "fmod" "format" "frexp"
+    "from_entries" "fromdate" "fromdateiso8601" "fromjson" "fromstream" "gamma" "get_jq_origin"
+    "get_prog_origin" "get_search_list" "getpath" "gmtime" "group_by" "gsub" "halt" "halt_error"
+    "has" "hypot" "implode" "in" "index" "indices" "infinite" "input" "input_filename"
+    "input_line_number" "inputs" "inside" "isempty" "isfinite" "isinfinite" "isnan" "isnormal"
+    "iterables" "j0" "j1" "jn" "join" "keys" "keys_unsorted" "last" "ldexp" "length" "lgamma"
+    "lgamma_r" "limit" "localtime" "log" "log10" "log1p" "log2" "logb" "ltrimstr" "map" "map_values"
+    "match" "max" "max_by" "min" "min_by" "mktime" "modf" "modulemeta" "nan" "nearbyint" "nextafter"
+    "nexttoward" "normals" "not" "now" "nth" "nulls" "numbers" "objects" "path" "paths" "pick" "pow"
+    "pow10" "range" "recurse" "remainder" "repeat" "reverse" "rindex" "rint" "round" "rtrimstr"
+    "scalars" "scalb" "scalbln" "scan" "select" "setpath" "significand" "sin" "sinh" "sort"
+    "sort_by" "split" "splits" "sqrt" "startswith" "stderr" "strflocaltime" "strftime" "strings"
+    "strptime" "sub" "tan" "tanh" "test" "tgamma" "to_entries" "todate" "todateiso8601" "tojson"
+    "tonumber" "tostream" "tostring" "transpose" "trunc" "truncate_stream" "type" "unique"
+    "unique_by" "until" "utf8bytelength" "values" "walk" "while" "with_entries" "y0" "y1" "yn"))
 
 ; Keywords
 [
diff --git a/config/neovim/store/nvim-treesitter/queries/just/injections.scm b/config/neovim/store/nvim-treesitter/queries/just/injections.scm
index dab656b6..90db6b72 100644
--- a/config/neovim/store/nvim-treesitter/queries/just/injections.scm
+++ b/config/neovim/store/nvim-treesitter/queries/just/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ; The right side of =~ literals
 (regex_literal
   (_) @injection.content
diff --git a/config/neovim/store/nvim-treesitter/queries/koto/locals.scm b/config/neovim/store/nvim-treesitter/queries/koto/locals.scm
index 7c7097e1..c1848748 100644
--- a/config/neovim/store/nvim-treesitter/queries/koto/locals.scm
+++ b/config/neovim/store/nvim-treesitter/queries/koto/locals.scm
@@ -4,16 +4,16 @@
 
 ; Definitions
 (arg
-  (identifier) @local.definition.parameter)
+  (variable) @local.definition.parameter)
 
 (assign
   (identifier) @local.definition.var)
 
 (for_args
-  (identifier) @local.definition.var)
+  (variable) @local.definition.var)
 
 (match_patterns
-  (identifier) @local.definition.var)
+  (variable) @local.definition.var)
 
 (import_item
   (identifier) @local.definition.import)
diff --git a/config/neovim/store/nvim-treesitter/queries/liquidsoap/highlights.scm b/config/neovim/store/nvim-treesitter/queries/liquidsoap/highlights.scm
index 38a38654..c5608f89 100644
--- a/config/neovim/store/nvim-treesitter/queries/liquidsoap/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/liquidsoap/highlights.scm
@@ -104,7 +104,7 @@
 
 (bool) @boolean
 
-(comment) @comment
+(comment) @comment @spell
 
 (regexp) @string.regexp
 
diff --git a/config/neovim/store/nvim-treesitter/queries/lua/indents.scm b/config/neovim/store/nvim-treesitter/queries/lua/indents.scm
index 2c3dc244..c05cc4e5 100644
--- a/config/neovim/store/nvim-treesitter/queries/lua/indents.scm
+++ b/config/neovim/store/nvim-treesitter/queries/lua/indents.scm
@@ -12,7 +12,6 @@
   (return_statement)
   (table_constructor)
   (arguments)
-  (return_statement)
 ] @indent.begin
 
 [
diff --git a/config/neovim/store/nvim-treesitter/queries/markdown/highlights.scm b/config/neovim/store/nvim-treesitter/queries/markdown/highlights.scm
index 4b445e02..a9ce4df2 100644
--- a/config/neovim/store/nvim-treesitter/queries/markdown/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/markdown/highlights.scm
@@ -8,28 +8,22 @@
   (setext_h2_underline) @markup.heading.2)
 
 (atx_heading
-  (atx_h1_marker) @markup.heading.1
-  (inline) @markup.heading.1)
+  (atx_h1_marker)) @markup.heading.1
 
 (atx_heading
-  (atx_h2_marker) @markup.heading.2
-  (inline) @markup.heading.2)
+  (atx_h2_marker)) @markup.heading.2
 
 (atx_heading
-  (atx_h3_marker) @markup.heading.3
-  (inline) @markup.heading.3)
+  (atx_h3_marker)) @markup.heading.3
 
 (atx_heading
-  (atx_h4_marker) @markup.heading.4
-  (inline) @markup.heading.4)
+  (atx_h4_marker)) @markup.heading.4
 
 (atx_heading
-  (atx_h5_marker) @markup.heading.5
-  (inline) @markup.heading.5)
+  (atx_h5_marker)) @markup.heading.5
 
 (atx_heading
-  (atx_h6_marker) @markup.heading.6
-  (inline) @markup.heading.6)
+  (atx_h6_marker)) @markup.heading.6
 
 (info_string) @label
 
diff --git a/config/neovim/store/nvim-treesitter/queries/markdown_inline/highlights.scm b/config/neovim/store/nvim-treesitter/queries/markdown_inline/highlights.scm
index 233ab411..10bb5b06 100644
--- a/config/neovim/store/nvim-treesitter/queries/markdown_inline/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/markdown_inline/highlights.scm
@@ -85,12 +85,15 @@
 [
   (link_destination)
   (uri_autolink)
+  (email_autolink)
 ] @markup.link.url @nospell
 
+(entity_reference) @nospell
+
 ; Replace common HTML entities.
 ((entity_reference) @character.special
   (#eq? @character.special "&nbsp;")
-  (#set! conceal ""))
+  (#set! conceal " "))
 
 ((entity_reference) @character.special
   (#eq? @character.special "&lt;")
diff --git a/config/neovim/store/nvim-treesitter/queries/menhir/injections.scm b/config/neovim/store/nvim-treesitter/queries/menhir/injections.scm
index 9343d60a..16a3f815 100644
--- a/config/neovim/store/nvim-treesitter/queries/menhir/injections.scm
+++ b/config/neovim/store/nvim-treesitter/queries/menhir/injections.scm
@@ -1,2 +1,9 @@
+([
+  (comment)
+  (line_comment)
+  (ocaml_comment)
+] @injection.content
+  (#set! injection.language "comment"))
+
 ((ocaml) @injection.content
   (#set! injection.language "ocaml"))
diff --git a/config/neovim/store/nvim-treesitter/queries/ocaml/indents.scm b/config/neovim/store/nvim-treesitter/queries/ocaml/indents.scm
index 9181dcad..d7f05367 100644
--- a/config/neovim/store/nvim-treesitter/queries/ocaml/indents.scm
+++ b/config/neovim/store/nvim-treesitter/queries/ocaml/indents.scm
@@ -28,7 +28,7 @@
 
 ((else_clause
   (_) @_not_if) @indent.begin
-  (#not-has-type? @_not_if if_expression))
+  (#not-kind-eq? @_not_if "if_expression"))
 
 ((parameter) @indent.begin
   (#set! indent.start_at_same_line))
diff --git a/config/neovim/store/nvim-treesitter/queries/odin/highlights.scm b/config/neovim/store/nvim-treesitter/queries/odin/highlights.scm
index 9e65937a..ea8d401e 100644
--- a/config/neovim/store/nvim-treesitter/queries/odin/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/odin/highlights.scm
@@ -192,7 +192,7 @@
   (identifier) @type)
 
 ((identifier) @type
-  (#lua-match? @type "^[A-Z][a-zA-Z0-9]*$")
+  (#lua-match? @type "^[_A-Z][_a-zA-Z0-9]*$")
   (#not-has-parent? @type parameter procedure_declaration call_expression))
 
 ; Fields
diff --git a/config/neovim/store/nvim-treesitter/queries/php_only/indents.scm b/config/neovim/store/nvim-treesitter/queries/php_only/indents.scm
index ca619a32..4a67a8b0 100644
--- a/config/neovim/store/nvim-treesitter/queries/php_only/indents.scm
+++ b/config/neovim/store/nvim-treesitter/queries/php_only/indents.scm
@@ -23,9 +23,6 @@
     (match_expression)
   ]) @indent.dedent
 
-(member_call_expression
-  object: (member_call_expression) @indent.branch)
-
 [
   ")"
   "}"
diff --git a/config/neovim/store/nvim-treesitter/queries/promql/injections.scm b/config/neovim/store/nvim-treesitter/queries/promql/injections.scm
index 4fbe37a0..4e7c1b26 100644
--- a/config/neovim/store/nvim-treesitter/queries/promql/injections.scm
+++ b/config/neovim/store/nvim-treesitter/queries/promql/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ((label_value) @injection.content
   (#set! injection.language "regex")
   (#offset! @injection.content 0 1 0 -1))
diff --git a/config/neovim/store/nvim-treesitter/queries/pug/injections.scm b/config/neovim/store/nvim-treesitter/queries/pug/injections.scm
index d4bd712b..0c01e47e 100644
--- a/config/neovim/store/nvim-treesitter/queries/pug/injections.scm
+++ b/config/neovim/store/nvim-treesitter/queries/pug/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ((javascript) @injection.content
   (#set! injection.language "javascript"))
 
diff --git a/config/neovim/store/nvim-treesitter/queries/roc/highlights.scm b/config/neovim/store/nvim-treesitter/queries/roc/highlights.scm
index d47c8770..89b42a6a 100644
--- a/config/neovim/store/nvim-treesitter/queries/roc/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/roc/highlights.scm
@@ -79,29 +79,12 @@
 ] @keyword
 
 ;----headers-----
-(interface_header
-  (name) @type.definition)
-
-(imports
-  (imports_entry
-    (module) @module))
-
-(packages
-  (record_pattern
-    (record_field_pattern
-      (field_name) @module)))
-
-(app_name) @string.special
-
-(import_path) @string.special.path
-
 [
   "app"
-  "packages"
-  "provides"
-  "interface"
-  "exposes"
   "expect"
+  "module"
+  "package"
+  "import"
 ] @keyword
 
 [
@@ -184,6 +167,9 @@
   (float)
 ] @number.float
 
-(string) @string
+[
+  (string)
+  (multiline_string)
+] @string
 
 (char) @character
diff --git a/config/neovim/store/nvim-treesitter/queries/roc/locals.scm b/config/neovim/store/nvim-treesitter/queries/roc/locals.scm
index 71bb1940..134fe011 100644
--- a/config/neovim/store/nvim-treesitter/queries/roc/locals.scm
+++ b/config/neovim/store/nvim-treesitter/queries/roc/locals.scm
@@ -8,6 +8,10 @@
 (exposes_list
   (ident) @local.reference)
 
+(import_expr
+  (as)
+  (module) @local.definition)
+
 (opaque_type_def
   (apply_type
     (concrete_type) @local.definition.type))
@@ -31,9 +35,6 @@
 (identifier_pattern
   (identifier) @local.definition)
 
-(exposes
-  (ident) @local.reference)
-
 (identifier) @local.reference
 
 (tag_expr
diff --git a/config/neovim/store/nvim-treesitter/queries/rust/folds.scm b/config/neovim/store/nvim-treesitter/queries/rust/folds.scm
index e5721c02..54290419 100644
--- a/config/neovim/store/nvim-treesitter/queries/rust/folds.scm
+++ b/config/neovim/store/nvim-treesitter/queries/rust/folds.scm
@@ -21,4 +21,5 @@
   (macro_definition)
   (macro_invocation)
   (attribute_item)
+  (block)
 ] @fold
diff --git a/config/neovim/store/nvim-treesitter/queries/scala/highlights.scm b/config/neovim/store/nvim-treesitter/queries/scala/highlights.scm
index ffecefaf..5f3936d2 100644
--- a/config/neovim/store/nvim-treesitter/queries/scala/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/scala/highlights.scm
@@ -120,6 +120,9 @@
 (binding
   name: (identifier) @variable.parameter)
 
+(lambda_expression
+  parameters: (identifier) @variable.parameter)
+
 ; expressions
 (field_expression
   field: (identifier) @variable.member)
@@ -177,7 +180,6 @@
   ; `macro` not implemented yet
   "object"
   "override"
-  "package"
   "val"
   "var"
   "with"
@@ -211,6 +213,8 @@
 
 (wildcard) @variable.parameter
 
+(namespace_wildcard) @punctuation.special
+
 (annotation) @attribute
 
 ; special keywords
@@ -235,6 +239,7 @@
 [
   "."
   ","
+  ":"
 ] @punctuation.delimiter
 
 [
@@ -248,6 +253,9 @@
 
 [
   "=>"
+  "?=>"
+  "="
+  "!"
   "<-"
   "@"
 ] @operator
@@ -255,6 +263,7 @@
 [
   "import"
   "export"
+  "package"
 ] @keyword.import
 
 [
@@ -278,6 +287,10 @@
   (case_clause
     "case" @keyword.conditional))
 
+(case_block
+  (case_clause
+    "=>" @punctuation.delimiter))
+
 (operator_identifier) @operator
 
 ((identifier) @type
diff --git a/config/neovim/store/nvim-treesitter/queries/snakemake/folds.scm b/config/neovim/store/nvim-treesitter/queries/snakemake/folds.scm
index 99850bd9..d154f3cd 100644
--- a/config/neovim/store/nvim-treesitter/queries/snakemake/folds.scm
+++ b/config/neovim/store/nvim-treesitter/queries/snakemake/folds.scm
@@ -2,6 +2,7 @@
 
 [
   (rule_definition)
+  (rule_inheritance)
   (module_definition)
   (checkpoint_definition)
 ] @fold
diff --git a/config/neovim/store/nvim-treesitter/queries/swift/highlights.scm b/config/neovim/store/nvim-treesitter/queries/swift/highlights.scm
index decb506e..562be5e3 100644
--- a/config/neovim/store/nvim-treesitter/queries/swift/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/swift/highlights.scm
@@ -100,6 +100,8 @@
   (modify_specifier)
 ] @keyword
 
+(shebang_line) @keyword.directive
+
 (class_body
   (property_declaration
     (pattern
diff --git a/config/neovim/store/nvim-treesitter/queries/swift/indents.scm b/config/neovim/store/nvim-treesitter/queries/swift/indents.scm
index f208292c..2366c3bd 100644
--- a/config/neovim/store/nvim-treesitter/queries/swift/indents.scm
+++ b/config/neovim/store/nvim-treesitter/queries/swift/indents.scm
@@ -66,7 +66,7 @@
     (_)* @indent.branch)
   .
   _ @indent.branch
-  (#not-has-type? @indent.branch type_parameters parameter))
+  (#not-kind-eq? @indent.branch "type_parameters" "parameter"))
 
 (ERROR
   [
diff --git a/config/neovim/store/nvim-treesitter/queries/teal/injections.scm b/config/neovim/store/nvim-treesitter/queries/teal/injections.scm
index ac42de4e..830b745b 100644
--- a/config/neovim/store/nvim-treesitter/queries/teal/injections.scm
+++ b/config/neovim/store/nvim-treesitter/queries/teal/injections.scm
@@ -33,7 +33,8 @@
 ; ('...'):format()
 ((function_call
   (method_index
-    (string) @printf
+    (parenthesized_expression
+      (string) @printf)
     key: (identifier) @_func))
   (#eq? @_func "format")
   (#set! injection.language "printf"))
diff --git a/config/neovim/store/nvim-treesitter/queries/textproto/highlights.scm b/config/neovim/store/nvim-treesitter/queries/textproto/highlights.scm
index 45136221..527af039 100644
--- a/config/neovim/store/nvim-treesitter/queries/textproto/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/textproto/highlights.scm
@@ -2,7 +2,7 @@
 
 (field_name) @variable.member
 
-(comment) @comment
+(comment) @comment @spell
 
 (number) @number
 
diff --git a/config/neovim/store/nvim-treesitter/queries/twig/injections.scm b/config/neovim/store/nvim-treesitter/queries/twig/injections.scm
index c475757b..3fd93feb 100644
--- a/config/neovim/store/nvim-treesitter/queries/twig/injections.scm
+++ b/config/neovim/store/nvim-treesitter/queries/twig/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ((content) @injection.content
   (#set! injection.language "html")
   (#set! injection.combined))
diff --git a/config/neovim/store/nvim-treesitter/queries/vimdoc/highlights.scm b/config/neovim/store/nvim-treesitter/queries/vimdoc/highlights.scm
index 70a3a2f2..194c8036 100644
--- a/config/neovim/store/nvim-treesitter/queries/vimdoc/highlights.scm
+++ b/config/neovim/store/nvim-treesitter/queries/vimdoc/highlights.scm
@@ -1,13 +1,19 @@
-(h1) @markup.heading.1
+(h1
+  (delimiter) @markup.heading.1
+  (heading) @markup.heading.1)
 
-(h2) @markup.heading.2
+(h2
+  (delimiter) @markup.heading.2
+  (heading) @markup.heading.2)
 
-(h3) @markup.heading.3
-
-(column_heading) @markup.heading.4
+(h3
+  (heading) @markup.heading.3)
 
 (column_heading
-  "~" @markup.heading.4
+  (heading) @markup.heading.4)
+
+(column_heading
+  (delimiter) @markup.heading.4
   (#set! conceal ""))
 
 (tag
diff --git a/config/neovim/store/nvim-treesitter/scripts/check-queries.lua b/config/neovim/store/nvim-treesitter/scripts/check-queries.lua
index bcab2129..43e40809 100755
--- a/config/neovim/store/nvim-treesitter/scripts/check-queries.lua
+++ b/config/neovim/store/nvim-treesitter/scripts/check-queries.lua
@@ -1,4 +1,4 @@
-#!/nix/store/php4qidg2bxzmm79vpri025bqi0fa889-coreutils-9.5/bin/env -S  -l
+#!/nix/store/i7qhgc0bs725qw3wdanznfkdna4z2ns2-coreutils-9.5/bin/env -S  -l
 vim.opt.rtp:prepend "./"
 
 -- Equivalent to print(), but this will ensure consistent output regardless of
diff --git a/config/neovim/store/nvim-treesitter/scripts/ci-install.sh b/config/neovim/store/nvim-treesitter/scripts/ci-install.sh
index 2418a0df..d9b2f2c7 100755
--- a/config/neovim/store/nvim-treesitter/scripts/ci-install.sh
+++ b/config/neovim/store/nvim-treesitter/scripts/ci-install.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 set -e
 
diff --git a/config/neovim/store/nvim-treesitter/scripts/format-queries.lua b/config/neovim/store/nvim-treesitter/scripts/format-queries.lua
index ce89b043..125b5281 100755
--- a/config/neovim/store/nvim-treesitter/scripts/format-queries.lua
+++ b/config/neovim/store/nvim-treesitter/scripts/format-queries.lua
@@ -1,4 +1,4 @@
-#!/nix/store/php4qidg2bxzmm79vpri025bqi0fa889-coreutils-9.5/bin/env -S  -l
+#!/nix/store/i7qhgc0bs725qw3wdanznfkdna4z2ns2-coreutils-9.5/bin/env -S  -l
 
 local ts = vim.treesitter
 local get_node_text = ts.get_node_text
@@ -13,7 +13,7 @@ else
   files = vim.fn.split(vim.fn.glob(arg .. "/**/*.scm"))
 end
 
-ts.query.add_predicate("has-type?", function(match, _, _, pred)
+ts.query.add_predicate("kind-eq?", function(match, _, _, pred)
   local node = match[pred[2]]
   if not node then
     return true
@@ -132,7 +132,7 @@ local format_queries = [[
 ;; Append newlines for nodes inside the list
 (list
   (_) @format.append-newline
-  (#not-has-type? @format.append-newline capture quantifier))
+  (#not-kind-eq? @format.append-newline "capture" "quantifier"))
 
 ;; (_), "_" and _ handler
 ;; Start indents if it's one of these patterns
@@ -194,7 +194,7 @@ local format_queries = [[
   ] @format.cancel-append
   .
   ")"
-  (#not-has-type? @format.cancel-append comment))
+  (#not-kind-eq? @format.cancel-append "comment"))
 
 ;; All captures should be separated with a space
 (capture) @format.prepend-space
@@ -233,7 +233,7 @@ local format_queries = [[
 ;; Collapsing closing parens
 (grouping
   (_) @format.cancel-append . ")"
-  (#not-has-type? @format.cancel-append comment))
+  (#not-kind-eq? @format.cancel-append "comment"))
 (grouping
   (capture) @format.prepend-space)
 ;; Remove unnecessary parens
diff --git a/config/neovim/store/nvim-treesitter/scripts/pre-push b/config/neovim/store/nvim-treesitter/scripts/pre-push
index ef4b0eda..bdcbc8fd 100755
--- a/config/neovim/store/nvim-treesitter/scripts/pre-push
+++ b/config/neovim/store/nvim-treesitter/scripts/pre-push
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 # Can be used as a pre-push hook
 # Just symlink this file to .git/hooks/pre-push
diff --git a/config/neovim/store/nvim-treesitter/scripts/run_tests.sh b/config/neovim/store/nvim-treesitter/scripts/run_tests.sh
index cd22c93f..3c413eee 100755
--- a/config/neovim/store/nvim-treesitter/scripts/run_tests.sh
+++ b/config/neovim/store/nvim-treesitter/scripts/run_tests.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 HERE="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
 cd $HERE/..
diff --git a/config/neovim/store/nvim-treesitter/scripts/update-lockfile.sh b/config/neovim/store/nvim-treesitter/scripts/update-lockfile.sh
index 532c98a7..ce49d38f 100755
--- a/config/neovim/store/nvim-treesitter/scripts/update-lockfile.sh
+++ b/config/neovim/store/nvim-treesitter/scripts/update-lockfile.sh
@@ -1,4 +1,4 @@
-#!/nix/store/306znyj77fv49kwnkpxmb0j2znqpa8bj-bash-5.2p26/bin/bash
+#!/nix/store/agkxax48k35wdmkhmmija2i2sxg8i7ny-bash-5.2p26/bin/bash
 
 make_ignored() {
   if [[ -n $1 ]]; then
diff --git a/config/neovim/store/nvim-treesitter/scripts/update-readme.lua b/config/neovim/store/nvim-treesitter/scripts/update-readme.lua
index cd903b89..12e00341 100755
--- a/config/neovim/store/nvim-treesitter/scripts/update-readme.lua
+++ b/config/neovim/store/nvim-treesitter/scripts/update-readme.lua
@@ -1,4 +1,4 @@
-#!/nix/store/php4qidg2bxzmm79vpri025bqi0fa889-coreutils-9.5/bin/env -S  -l
+#!/nix/store/i7qhgc0bs725qw3wdanznfkdna4z2ns2-coreutils-9.5/bin/env -S  -l
 
 ---@class Parser
 ---@field name string
diff --git a/config/neovim/store/nvim-treesitter/scripts/write-lockfile.lua b/config/neovim/store/nvim-treesitter/scripts/write-lockfile.lua
index 8aa833dd..e3384c71 100755
--- a/config/neovim/store/nvim-treesitter/scripts/write-lockfile.lua
+++ b/config/neovim/store/nvim-treesitter/scripts/write-lockfile.lua
@@ -1,4 +1,4 @@
-#!/nix/store/php4qidg2bxzmm79vpri025bqi0fa889-coreutils-9.5/bin/env -S  -l
+#!/nix/store/i7qhgc0bs725qw3wdanznfkdna4z2ns2-coreutils-9.5/bin/env -S  -l
 
 ---@type string|any[]
 local skip_langs = vim.fn.getenv "SKIP_LOCKFILE_UPDATE_FOR_LANGS"
diff --git a/config/neovim/store/nvim-treesitter/tests/query/highlights/gleam/function.gleam b/config/neovim/store/nvim-treesitter/tests/query/highlights/gleam/function.gleam
index f1924aaf..15fc5cc7 100644
--- a/config/neovim/store/nvim-treesitter/tests/query/highlights/gleam/function.gleam
+++ b/config/neovim/store/nvim-treesitter/tests/query/highlights/gleam/function.gleam
@@ -5,14 +5,14 @@ pub fn add(x: Int, y: Int) -> Int {
 //        ^ @punctuation.bracket
 //         ^ @variable.parameter
 //          ^ @punctuation.delimiter
-//            ^^^ @type.builtin
+//            ^^^ @type
 //               ^ @punctuation.delimiter
 //                 ^ @variable.parameter
 //                  ^ @punctuation.delimiter
-//                    ^^^ @type.builtin
+//                    ^^^ @type
 //                       ^ @punctuation.bracket
 //                         ^ @punctuation.delimiter
-//                            ^^^ @type.builtin
+//                            ^^^ @type
 //                                ^ @punctuation.bracket
 }
 // <- @punctuation.bracket
@@ -50,7 +50,7 @@ fn list_of_two(my_value: a) -> List(a) {
 //                       ^ @type
 //                        ^ @punctuation.bracket
 //                          ^ @punctuation.delimiter
-//                             ^^^^ @type.builtin
+//                             ^^^^ @type
 //                                 ^ @punctuation.bracket
 //                                  ^ @type
 //                                   ^ @punctuation.bracket
@@ -66,19 +66,19 @@ fn replace(
   // <- @label
   // ^^^^^^ @variable.parameter
   //       ^ @punctuation.delimiter
-  //         ^^^^^^ @type.builtin
+  //         ^^^^^^ @type
   //               ^ @punctuation.delimiter
   each pattern: String,
   // <- @label
   //   ^^^^^^^ @variable.parameter
   //          ^ @punctuation.delimiter
-  //            ^^^^^^ @type.builtin
+  //            ^^^^^^ @type
   //                  ^ @punctuation.delimiter
   with replacement: String,
   // <- @label
   //   ^^^^^^^^^^^ @variable.parameter
   //              ^ @punctuation.delimiter
-  //                ^^^^^^ @type.builtin
+  //                ^^^^^^ @type
   //                      ^ @punctuation.delimiter
 ) {
   replace(in: "A,B,C", each: ",", with: " ")
@@ -107,7 +107,7 @@ pub external fn random_float() -> Float = "rand" "uniform"
 //                          ^ @punctuation.bracket
 //                           ^ @punctuation.bracket
 //                             ^^ @punctuation.delimiter
-//                                ^^^^^ @type.builtin
+//                                ^^^^^ @type
 //                                      ^ @operator
 //                                        ^^^^^^ @module
 //                                               ^^^^^^^^^ @function
diff --git a/config/neovim/store/nvim-treesitter/tests/query/highlights/gleam/type.gleam b/config/neovim/store/nvim-treesitter/tests/query/highlights/gleam/type.gleam
index 8ee82419..de0f9c4a 100644
--- a/config/neovim/store/nvim-treesitter/tests/query/highlights/gleam/type.gleam
+++ b/config/neovim/store/nvim-treesitter/tests/query/highlights/gleam/type.gleam
@@ -8,11 +8,11 @@ pub type Cat {
   // ^ @punctuation.bracket
   //  ^^^^ @variable.member
   //      ^ @punctuation.delimiter
-  //        ^^^^^^ @type.builtin
+  //        ^^^^^^ @type
   //              ^ @punctuation.delimiter
   //                ^^^^^^^^ @variable.member
   //                        ^ @punctuation.delimiter
-  //                          ^^^ @type.builtin
+  //                          ^^^ @type
   //                             ^ @punctuation.bracket
 }
 
diff --git a/config/neovim/store/nvim-treesitter/tests/query/highlights_spec.lua b/config/neovim/store/nvim-treesitter/tests/query/highlights_spec.lua
index ff6a7523..3bb03d49 100644
--- a/config/neovim/store/nvim-treesitter/tests/query/highlights_spec.lua
+++ b/config/neovim/store/nvim-treesitter/tests/query/highlights_spec.lua
@@ -29,6 +29,7 @@ local function check_assertions(file)
     )
   )
   local parser = parsers.get_parser(buf, lang)
+  parser:parse(true)
 
   local self = highlighter.new(parser, {})
 
@@ -39,12 +40,13 @@ local function check_assertions(file)
 
     local captures = {}
     local highlights = {}
-    self.tree:for_each_tree(function(tstree, tree)
-      if not tstree then
+    self:prepare_highlight_states(row, row + 1)
+    self:for_each_highlight_state(function(state)
+      if not state.tstree then
         return
       end
 
-      local root = tstree:root()
+      local root = state.tstree:root()
       local root_start_row, _, root_end_row, _ = root:range()
 
       -- Only worry about trees within the line range
@@ -52,7 +54,7 @@ local function check_assertions(file)
         return
       end
 
-      local query = self:get_query(tree:lang())
+      local query = state.highlighter_query
 
       -- Some injected languages may not have highlight queries.
       if not query:query() then
@@ -62,7 +64,7 @@ local function check_assertions(file)
       local iter = query:query():iter_captures(root, self.bufnr, row, row + 1)
 
       for capture, node, _ in iter do
-        local hl = query.hl_cache[capture]
+        local hl = query:get_hl_from_capture(capture)
         assert.is.truthy(hl)
 
         assert.Truthy(node)
diff --git a/config/neovim/store/nvim-treesitter/tests/query/injection_spec.lua b/config/neovim/store/nvim-treesitter/tests/query/injection_spec.lua
index 7efbab31..95ad12ee 100644
--- a/config/neovim/store/nvim-treesitter/tests/query/injection_spec.lua
+++ b/config/neovim/store/nvim-treesitter/tests/query/injection_spec.lua
@@ -1,5 +1,4 @@
 require "nvim-treesitter.highlight" -- yes, this is necessary to set the hlmap
-local highlighter = require "vim.treesitter.highlighter"
 local configs = require "nvim-treesitter.configs"
 local parsers = require "nvim-treesitter.parsers"
 local ts = vim.treesitter
@@ -21,8 +20,8 @@ local function check_assertions(file)
   )
   local parser = parsers.get_parser(buf, lang)
 
-  local self = highlighter.new(parser, {})
-  local top_level_root = parser:parse()[1]:root()
+  local self = parser
+  local top_level_root = parser:parse(true)[1]:root()
 
   for _, assertion in ipairs(assertions) do
     local row = assertion.position.row
@@ -32,7 +31,7 @@ local function check_assertions(file)
     assertion.expected_capture_name = neg_assert and assertion.expected_capture_name:sub(2)
       or assertion.expected_capture_name
     local found = false
-    self.tree:for_each_tree(function(tstree, tree)
+    self:for_each_tree(function(tstree, tree)
       if not tstree then
         return
       end
diff --git a/config/neovim/store/treesitter-parsers/parser/ada.so b/config/neovim/store/treesitter-parsers/parser/ada.so
index b8bc3eab..38465035 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/ada.so and b/config/neovim/store/treesitter-parsers/parser/ada.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/agda.so b/config/neovim/store/treesitter-parsers/parser/agda.so
index e47e9718..26bc07c1 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/agda.so and b/config/neovim/store/treesitter-parsers/parser/agda.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/angular.so b/config/neovim/store/treesitter-parsers/parser/angular.so
index 2af7b970..98555a12 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/angular.so and b/config/neovim/store/treesitter-parsers/parser/angular.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/apex.so b/config/neovim/store/treesitter-parsers/parser/apex.so
index afba8a80..f6b868d8 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/apex.so and b/config/neovim/store/treesitter-parsers/parser/apex.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/arduino.so b/config/neovim/store/treesitter-parsers/parser/arduino.so
index cfb3fa37..f6624499 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/arduino.so and b/config/neovim/store/treesitter-parsers/parser/arduino.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/asm.so b/config/neovim/store/treesitter-parsers/parser/asm.so
index 44063bcb..34107753 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/asm.so and b/config/neovim/store/treesitter-parsers/parser/asm.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/astro.so b/config/neovim/store/treesitter-parsers/parser/astro.so
index 657d5932..13adcf85 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/astro.so and b/config/neovim/store/treesitter-parsers/parser/astro.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/authzed.so b/config/neovim/store/treesitter-parsers/parser/authzed.so
index 3724f899..8aaa0af9 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/authzed.so and b/config/neovim/store/treesitter-parsers/parser/authzed.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/awk.so b/config/neovim/store/treesitter-parsers/parser/awk.so
index bc4bd33b..742a2c3f 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/awk.so and b/config/neovim/store/treesitter-parsers/parser/awk.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/bash.so b/config/neovim/store/treesitter-parsers/parser/bash.so
index 62c0dbdc..23fd197b 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/bash.so and b/config/neovim/store/treesitter-parsers/parser/bash.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/bass.so b/config/neovim/store/treesitter-parsers/parser/bass.so
index 25f4cbc6..0a961143 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/bass.so and b/config/neovim/store/treesitter-parsers/parser/bass.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/beancount.so b/config/neovim/store/treesitter-parsers/parser/beancount.so
index c0093160..f6b8e112 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/beancount.so and b/config/neovim/store/treesitter-parsers/parser/beancount.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/bibtex.so b/config/neovim/store/treesitter-parsers/parser/bibtex.so
index 680786eb..8f46bfcf 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/bibtex.so and b/config/neovim/store/treesitter-parsers/parser/bibtex.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/bicep.so b/config/neovim/store/treesitter-parsers/parser/bicep.so
index 4e7c80f7..24b39d54 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/bicep.so and b/config/neovim/store/treesitter-parsers/parser/bicep.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/bitbake.so b/config/neovim/store/treesitter-parsers/parser/bitbake.so
index 3217c0d2..b6428319 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/bitbake.so and b/config/neovim/store/treesitter-parsers/parser/bitbake.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/blueprint.so b/config/neovim/store/treesitter-parsers/parser/blueprint.so
index 41201685..12da3d0e 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/blueprint.so and b/config/neovim/store/treesitter-parsers/parser/blueprint.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/bp.so b/config/neovim/store/treesitter-parsers/parser/bp.so
index 7c6639c2..02e9dac9 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/bp.so and b/config/neovim/store/treesitter-parsers/parser/bp.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/c.so b/config/neovim/store/treesitter-parsers/parser/c.so
index b47416cf..12a43383 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/c.so and b/config/neovim/store/treesitter-parsers/parser/c.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/c_sharp.so b/config/neovim/store/treesitter-parsers/parser/c_sharp.so
index e9aa3e7f..e775ffad 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/c_sharp.so and b/config/neovim/store/treesitter-parsers/parser/c_sharp.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/cairo.so b/config/neovim/store/treesitter-parsers/parser/cairo.so
index 44b164f6..ea1e7bec 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/cairo.so and b/config/neovim/store/treesitter-parsers/parser/cairo.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/capnp.so b/config/neovim/store/treesitter-parsers/parser/capnp.so
index bf775de8..4b09a079 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/capnp.so and b/config/neovim/store/treesitter-parsers/parser/capnp.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/chatito.so b/config/neovim/store/treesitter-parsers/parser/chatito.so
index 46472ac6..db96e449 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/chatito.so and b/config/neovim/store/treesitter-parsers/parser/chatito.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/clojure.so b/config/neovim/store/treesitter-parsers/parser/clojure.so
index 57c7b2e8..cb6c48a4 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/clojure.so and b/config/neovim/store/treesitter-parsers/parser/clojure.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/cmake.so b/config/neovim/store/treesitter-parsers/parser/cmake.so
index 46c952da..1233600d 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/cmake.so and b/config/neovim/store/treesitter-parsers/parser/cmake.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/comment.so b/config/neovim/store/treesitter-parsers/parser/comment.so
index 3f506711..baded592 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/comment.so and b/config/neovim/store/treesitter-parsers/parser/comment.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/commonlisp.so b/config/neovim/store/treesitter-parsers/parser/commonlisp.so
index e6b41ead..82d724b5 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/commonlisp.so and b/config/neovim/store/treesitter-parsers/parser/commonlisp.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/cooklang.so b/config/neovim/store/treesitter-parsers/parser/cooklang.so
index b5fd4b7f..f445bde8 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/cooklang.so and b/config/neovim/store/treesitter-parsers/parser/cooklang.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/corn.so b/config/neovim/store/treesitter-parsers/parser/corn.so
index d6527977..7f94c21e 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/corn.so and b/config/neovim/store/treesitter-parsers/parser/corn.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/cpon.so b/config/neovim/store/treesitter-parsers/parser/cpon.so
index 0ccfcf60..3d349fb2 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/cpon.so and b/config/neovim/store/treesitter-parsers/parser/cpon.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/cpp.so b/config/neovim/store/treesitter-parsers/parser/cpp.so
index 398c0628..38fcdc72 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/cpp.so and b/config/neovim/store/treesitter-parsers/parser/cpp.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/css.so b/config/neovim/store/treesitter-parsers/parser/css.so
index 77f707f4..1a6694d1 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/css.so and b/config/neovim/store/treesitter-parsers/parser/css.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/csv.so b/config/neovim/store/treesitter-parsers/parser/csv.so
index 8cbc88ef..e15863fb 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/csv.so and b/config/neovim/store/treesitter-parsers/parser/csv.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/cuda.so b/config/neovim/store/treesitter-parsers/parser/cuda.so
index 70768b13..bce8489e 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/cuda.so and b/config/neovim/store/treesitter-parsers/parser/cuda.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/cue.so b/config/neovim/store/treesitter-parsers/parser/cue.so
index a1cf6050..d3490971 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/cue.so and b/config/neovim/store/treesitter-parsers/parser/cue.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/d.so b/config/neovim/store/treesitter-parsers/parser/d.so
index 5a3c800d..94043872 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/d.so and b/config/neovim/store/treesitter-parsers/parser/d.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/dart.so b/config/neovim/store/treesitter-parsers/parser/dart.so
index d6844fa3..8b95fdf3 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/dart.so and b/config/neovim/store/treesitter-parsers/parser/dart.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/devicetree.so b/config/neovim/store/treesitter-parsers/parser/devicetree.so
index 1677d5a8..29656f62 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/devicetree.so and b/config/neovim/store/treesitter-parsers/parser/devicetree.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/dhall.so b/config/neovim/store/treesitter-parsers/parser/dhall.so
index 9120bb19..bcdf600f 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/dhall.so and b/config/neovim/store/treesitter-parsers/parser/dhall.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/diff.so b/config/neovim/store/treesitter-parsers/parser/diff.so
index 15392672..d55b8399 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/diff.so and b/config/neovim/store/treesitter-parsers/parser/diff.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/disassembly.so b/config/neovim/store/treesitter-parsers/parser/disassembly.so
index fc303804..e1fdcc41 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/disassembly.so and b/config/neovim/store/treesitter-parsers/parser/disassembly.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/djot.so b/config/neovim/store/treesitter-parsers/parser/djot.so
index c9375a8c..d79873f2 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/djot.so and b/config/neovim/store/treesitter-parsers/parser/djot.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/dockerfile.so b/config/neovim/store/treesitter-parsers/parser/dockerfile.so
index cea90c33..5d9ad0e7 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/dockerfile.so and b/config/neovim/store/treesitter-parsers/parser/dockerfile.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/dot.so b/config/neovim/store/treesitter-parsers/parser/dot.so
index 5bfb434c..a42b8093 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/dot.so and b/config/neovim/store/treesitter-parsers/parser/dot.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/doxygen.so b/config/neovim/store/treesitter-parsers/parser/doxygen.so
index e28aab1a..eb06ec66 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/doxygen.so and b/config/neovim/store/treesitter-parsers/parser/doxygen.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/dtd.so b/config/neovim/store/treesitter-parsers/parser/dtd.so
index 6a37c29d..3301adba 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/dtd.so and b/config/neovim/store/treesitter-parsers/parser/dtd.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/earthfile.so b/config/neovim/store/treesitter-parsers/parser/earthfile.so
index dd11fb31..94d54dbe 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/earthfile.so and b/config/neovim/store/treesitter-parsers/parser/earthfile.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/ebnf.so b/config/neovim/store/treesitter-parsers/parser/ebnf.so
index 51e70587..2d0a0773 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/ebnf.so and b/config/neovim/store/treesitter-parsers/parser/ebnf.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/eds.so b/config/neovim/store/treesitter-parsers/parser/eds.so
index d5feef42..0efe50f1 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/eds.so and b/config/neovim/store/treesitter-parsers/parser/eds.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/eex.so b/config/neovim/store/treesitter-parsers/parser/eex.so
index 302c980e..fee8911b 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/eex.so and b/config/neovim/store/treesitter-parsers/parser/eex.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/elixir.so b/config/neovim/store/treesitter-parsers/parser/elixir.so
index 0dd02e0f..473494a8 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/elixir.so and b/config/neovim/store/treesitter-parsers/parser/elixir.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/elm.so b/config/neovim/store/treesitter-parsers/parser/elm.so
index 68710714..e2b3c393 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/elm.so and b/config/neovim/store/treesitter-parsers/parser/elm.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/elsa.so b/config/neovim/store/treesitter-parsers/parser/elsa.so
index 7ee81263..237b990a 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/elsa.so and b/config/neovim/store/treesitter-parsers/parser/elsa.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/elvish.so b/config/neovim/store/treesitter-parsers/parser/elvish.so
index 9b1b3e48..b8c9b3ae 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/elvish.so and b/config/neovim/store/treesitter-parsers/parser/elvish.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/embedded_template.so b/config/neovim/store/treesitter-parsers/parser/embedded_template.so
index 5994ec0b..3470ce61 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/embedded_template.so and b/config/neovim/store/treesitter-parsers/parser/embedded_template.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/erlang.so b/config/neovim/store/treesitter-parsers/parser/erlang.so
index e4c37b10..69b0adb9 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/erlang.so and b/config/neovim/store/treesitter-parsers/parser/erlang.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/facility.so b/config/neovim/store/treesitter-parsers/parser/facility.so
index 4c424a65..5a2662fb 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/facility.so and b/config/neovim/store/treesitter-parsers/parser/facility.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/faust.so b/config/neovim/store/treesitter-parsers/parser/faust.so
index 582c61cd..2fdad71c 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/faust.so and b/config/neovim/store/treesitter-parsers/parser/faust.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/fennel.so b/config/neovim/store/treesitter-parsers/parser/fennel.so
index 333ffdf7..a93254d4 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/fennel.so and b/config/neovim/store/treesitter-parsers/parser/fennel.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/fidl.so b/config/neovim/store/treesitter-parsers/parser/fidl.so
index 5c93895e..d37df5ee 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/fidl.so and b/config/neovim/store/treesitter-parsers/parser/fidl.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/firrtl.so b/config/neovim/store/treesitter-parsers/parser/firrtl.so
index 9735d316..2720b5c4 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/firrtl.so and b/config/neovim/store/treesitter-parsers/parser/firrtl.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/fish.so b/config/neovim/store/treesitter-parsers/parser/fish.so
index c197493c..ec4c87c1 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/fish.so and b/config/neovim/store/treesitter-parsers/parser/fish.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/foam.so b/config/neovim/store/treesitter-parsers/parser/foam.so
index 11ddd304..77197fc8 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/foam.so and b/config/neovim/store/treesitter-parsers/parser/foam.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/forth.so b/config/neovim/store/treesitter-parsers/parser/forth.so
index 8b6a0c9b..b453c1aa 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/forth.so and b/config/neovim/store/treesitter-parsers/parser/forth.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/fortran.so b/config/neovim/store/treesitter-parsers/parser/fortran.so
index f4f7d043..6c652ac2 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/fortran.so and b/config/neovim/store/treesitter-parsers/parser/fortran.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/fsh.so b/config/neovim/store/treesitter-parsers/parser/fsh.so
index 7631d7f6..104bdf95 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/fsh.so and b/config/neovim/store/treesitter-parsers/parser/fsh.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/func.so b/config/neovim/store/treesitter-parsers/parser/func.so
index 43ff47cc..4a7a2509 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/func.so and b/config/neovim/store/treesitter-parsers/parser/func.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/fusion.so b/config/neovim/store/treesitter-parsers/parser/fusion.so
index 817577c4..c572b6e4 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/fusion.so and b/config/neovim/store/treesitter-parsers/parser/fusion.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/gdscript.so b/config/neovim/store/treesitter-parsers/parser/gdscript.so
index 70418506..a01d8156 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/gdscript.so and b/config/neovim/store/treesitter-parsers/parser/gdscript.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/gdshader.so b/config/neovim/store/treesitter-parsers/parser/gdshader.so
index 763a6fc0..fd73a639 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/gdshader.so and b/config/neovim/store/treesitter-parsers/parser/gdshader.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/git_config.so b/config/neovim/store/treesitter-parsers/parser/git_config.so
index 91e629cc..e07563e2 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/git_config.so and b/config/neovim/store/treesitter-parsers/parser/git_config.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/git_rebase.so b/config/neovim/store/treesitter-parsers/parser/git_rebase.so
index dc03bca2..fd21b813 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/git_rebase.so and b/config/neovim/store/treesitter-parsers/parser/git_rebase.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/gitattributes.so b/config/neovim/store/treesitter-parsers/parser/gitattributes.so
index ec4d0076..5969ce0d 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/gitattributes.so and b/config/neovim/store/treesitter-parsers/parser/gitattributes.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/gitcommit.so b/config/neovim/store/treesitter-parsers/parser/gitcommit.so
index 34b1c5fb..07718555 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/gitcommit.so and b/config/neovim/store/treesitter-parsers/parser/gitcommit.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/gitignore.so b/config/neovim/store/treesitter-parsers/parser/gitignore.so
index 5c2b422c..ef396496 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/gitignore.so and b/config/neovim/store/treesitter-parsers/parser/gitignore.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/gleam.so b/config/neovim/store/treesitter-parsers/parser/gleam.so
index 75ce0711..a73f6d17 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/gleam.so and b/config/neovim/store/treesitter-parsers/parser/gleam.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/glimmer.so b/config/neovim/store/treesitter-parsers/parser/glimmer.so
index 09d434a1..ccc200dd 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/glimmer.so and b/config/neovim/store/treesitter-parsers/parser/glimmer.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/glsl.so b/config/neovim/store/treesitter-parsers/parser/glsl.so
index 0c26fe2e..2f92c3f1 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/glsl.so and b/config/neovim/store/treesitter-parsers/parser/glsl.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/gn.so b/config/neovim/store/treesitter-parsers/parser/gn.so
index 08b16484..7803e5b7 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/gn.so and b/config/neovim/store/treesitter-parsers/parser/gn.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/gnuplot.so b/config/neovim/store/treesitter-parsers/parser/gnuplot.so
index abf6f16e..016a5a33 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/gnuplot.so and b/config/neovim/store/treesitter-parsers/parser/gnuplot.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/go.so b/config/neovim/store/treesitter-parsers/parser/go.so
index 678f66f9..edb99b3f 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/go.so and b/config/neovim/store/treesitter-parsers/parser/go.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/godot_resource.so b/config/neovim/store/treesitter-parsers/parser/godot_resource.so
index 39052652..e8cac2aa 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/godot_resource.so and b/config/neovim/store/treesitter-parsers/parser/godot_resource.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/gomod.so b/config/neovim/store/treesitter-parsers/parser/gomod.so
index cc59037a..02534acd 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/gomod.so and b/config/neovim/store/treesitter-parsers/parser/gomod.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/gosum.so b/config/neovim/store/treesitter-parsers/parser/gosum.so
index 2a39c472..932bf904 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/gosum.so and b/config/neovim/store/treesitter-parsers/parser/gosum.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/gotmpl.so b/config/neovim/store/treesitter-parsers/parser/gotmpl.so
index bde65bd6..db7d5175 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/gotmpl.so and b/config/neovim/store/treesitter-parsers/parser/gotmpl.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/gowork.so b/config/neovim/store/treesitter-parsers/parser/gowork.so
index 40d58286..b7bcbe64 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/gowork.so and b/config/neovim/store/treesitter-parsers/parser/gowork.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/gpg.so b/config/neovim/store/treesitter-parsers/parser/gpg.so
index bc6455b3..73a95c44 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/gpg.so and b/config/neovim/store/treesitter-parsers/parser/gpg.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/graphql.so b/config/neovim/store/treesitter-parsers/parser/graphql.so
index 299908c2..ce657e1e 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/graphql.so and b/config/neovim/store/treesitter-parsers/parser/graphql.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/groovy.so b/config/neovim/store/treesitter-parsers/parser/groovy.so
index 4a9e770e..40fc2160 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/groovy.so and b/config/neovim/store/treesitter-parsers/parser/groovy.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/gstlaunch.so b/config/neovim/store/treesitter-parsers/parser/gstlaunch.so
index bca81dc1..6c3f0668 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/gstlaunch.so and b/config/neovim/store/treesitter-parsers/parser/gstlaunch.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/hack.so b/config/neovim/store/treesitter-parsers/parser/hack.so
index d9f20c80..6ed667da 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/hack.so and b/config/neovim/store/treesitter-parsers/parser/hack.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/hare.so b/config/neovim/store/treesitter-parsers/parser/hare.so
index ebb1154d..1d5520ce 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/hare.so and b/config/neovim/store/treesitter-parsers/parser/hare.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/haskell.so b/config/neovim/store/treesitter-parsers/parser/haskell.so
index f76237fa..b0af4e9a 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/haskell.so and b/config/neovim/store/treesitter-parsers/parser/haskell.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/haskell_persistent.so b/config/neovim/store/treesitter-parsers/parser/haskell_persistent.so
index b1bc642e..2cdd71ad 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/haskell_persistent.so and b/config/neovim/store/treesitter-parsers/parser/haskell_persistent.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/hcl.so b/config/neovim/store/treesitter-parsers/parser/hcl.so
index ab45352e..8505df7f 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/hcl.so and b/config/neovim/store/treesitter-parsers/parser/hcl.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/heex.so b/config/neovim/store/treesitter-parsers/parser/heex.so
index 80cdf4e0..2366422d 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/heex.so and b/config/neovim/store/treesitter-parsers/parser/heex.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/helm.so b/config/neovim/store/treesitter-parsers/parser/helm.so
index 9640fd35..3c80e0ca 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/helm.so and b/config/neovim/store/treesitter-parsers/parser/helm.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/hjson.so b/config/neovim/store/treesitter-parsers/parser/hjson.so
index a25d917b..0dbf7194 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/hjson.so and b/config/neovim/store/treesitter-parsers/parser/hjson.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/hlsl.so b/config/neovim/store/treesitter-parsers/parser/hlsl.so
index 57f72f32..1d7b4276 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/hlsl.so and b/config/neovim/store/treesitter-parsers/parser/hlsl.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/hlsplaylist.so b/config/neovim/store/treesitter-parsers/parser/hlsplaylist.so
index 225927b7..c8650f27 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/hlsplaylist.so and b/config/neovim/store/treesitter-parsers/parser/hlsplaylist.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/hocon.so b/config/neovim/store/treesitter-parsers/parser/hocon.so
index 9e9d2c12..9bcdf8f3 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/hocon.so and b/config/neovim/store/treesitter-parsers/parser/hocon.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/hoon.so b/config/neovim/store/treesitter-parsers/parser/hoon.so
index c068eba8..827a5bbf 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/hoon.so and b/config/neovim/store/treesitter-parsers/parser/hoon.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/html.so b/config/neovim/store/treesitter-parsers/parser/html.so
index 038ac6df..ddcec704 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/html.so and b/config/neovim/store/treesitter-parsers/parser/html.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/htmldjango.so b/config/neovim/store/treesitter-parsers/parser/htmldjango.so
index badb39ad..eb025d03 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/htmldjango.so and b/config/neovim/store/treesitter-parsers/parser/htmldjango.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/http.so b/config/neovim/store/treesitter-parsers/parser/http.so
index 43b9da2e..ed7af50a 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/http.so and b/config/neovim/store/treesitter-parsers/parser/http.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/hurl.so b/config/neovim/store/treesitter-parsers/parser/hurl.so
index 3b6b5b9b..526c2ac1 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/hurl.so and b/config/neovim/store/treesitter-parsers/parser/hurl.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/hyprlang.so b/config/neovim/store/treesitter-parsers/parser/hyprlang.so
index 0e5569fe..c05bcec3 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/hyprlang.so and b/config/neovim/store/treesitter-parsers/parser/hyprlang.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/idl.so b/config/neovim/store/treesitter-parsers/parser/idl.so
index a4591fa5..83abcc33 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/idl.so and b/config/neovim/store/treesitter-parsers/parser/idl.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/ini.so b/config/neovim/store/treesitter-parsers/parser/ini.so
index f4d11177..23b4da83 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/ini.so and b/config/neovim/store/treesitter-parsers/parser/ini.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/inko.so b/config/neovim/store/treesitter-parsers/parser/inko.so
index 24225ed1..1207d295 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/inko.so and b/config/neovim/store/treesitter-parsers/parser/inko.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/ispc.so b/config/neovim/store/treesitter-parsers/parser/ispc.so
index f5f6e1a2..9b554db6 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/ispc.so and b/config/neovim/store/treesitter-parsers/parser/ispc.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/janet_simple.so b/config/neovim/store/treesitter-parsers/parser/janet_simple.so
index 0f11fc67..7c1c6090 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/janet_simple.so and b/config/neovim/store/treesitter-parsers/parser/janet_simple.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/java.so b/config/neovim/store/treesitter-parsers/parser/java.so
index 87191035..01401a63 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/java.so and b/config/neovim/store/treesitter-parsers/parser/java.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/javascript.so b/config/neovim/store/treesitter-parsers/parser/javascript.so
index ba978add..979929ca 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/javascript.so and b/config/neovim/store/treesitter-parsers/parser/javascript.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/jq.so b/config/neovim/store/treesitter-parsers/parser/jq.so
index c0324111..0cd7635f 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/jq.so and b/config/neovim/store/treesitter-parsers/parser/jq.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/jsdoc.so b/config/neovim/store/treesitter-parsers/parser/jsdoc.so
index fc19449d..007357af 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/jsdoc.so and b/config/neovim/store/treesitter-parsers/parser/jsdoc.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/json.so b/config/neovim/store/treesitter-parsers/parser/json.so
index c9b89655..9d19272a 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/json.so and b/config/neovim/store/treesitter-parsers/parser/json.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/json5.so b/config/neovim/store/treesitter-parsers/parser/json5.so
index cf105164..d60c3cdf 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/json5.so and b/config/neovim/store/treesitter-parsers/parser/json5.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/jsonc.so b/config/neovim/store/treesitter-parsers/parser/jsonc.so
index 2a911c79..41ef7783 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/jsonc.so and b/config/neovim/store/treesitter-parsers/parser/jsonc.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/jsonnet.so b/config/neovim/store/treesitter-parsers/parser/jsonnet.so
index 7cac6cc4..6a0744d4 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/jsonnet.so and b/config/neovim/store/treesitter-parsers/parser/jsonnet.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/julia.so b/config/neovim/store/treesitter-parsers/parser/julia.so
index 3786e395..50808a97 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/julia.so and b/config/neovim/store/treesitter-parsers/parser/julia.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/just.so b/config/neovim/store/treesitter-parsers/parser/just.so
index d1b8a651..8af58361 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/just.so and b/config/neovim/store/treesitter-parsers/parser/just.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/kconfig.so b/config/neovim/store/treesitter-parsers/parser/kconfig.so
index e0fa4667..69a547a8 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/kconfig.so and b/config/neovim/store/treesitter-parsers/parser/kconfig.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/kdl.so b/config/neovim/store/treesitter-parsers/parser/kdl.so
index d31f4f42..7b8b0660 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/kdl.so and b/config/neovim/store/treesitter-parsers/parser/kdl.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/kotlin.so b/config/neovim/store/treesitter-parsers/parser/kotlin.so
index f6425cc8..0422d2ac 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/kotlin.so and b/config/neovim/store/treesitter-parsers/parser/kotlin.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/koto.so b/config/neovim/store/treesitter-parsers/parser/koto.so
index 055314c4..4eb9d2c0 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/koto.so and b/config/neovim/store/treesitter-parsers/parser/koto.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/kusto.so b/config/neovim/store/treesitter-parsers/parser/kusto.so
index af15c153..75165a72 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/kusto.so and b/config/neovim/store/treesitter-parsers/parser/kusto.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/lalrpop.so b/config/neovim/store/treesitter-parsers/parser/lalrpop.so
index 20b2e8cd..06da39f2 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/lalrpop.so and b/config/neovim/store/treesitter-parsers/parser/lalrpop.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/latex.so b/config/neovim/store/treesitter-parsers/parser/latex.so
index 87956cf6..994c6786 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/latex.so and b/config/neovim/store/treesitter-parsers/parser/latex.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/ledger.so b/config/neovim/store/treesitter-parsers/parser/ledger.so
index f14a39c6..13071e02 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/ledger.so and b/config/neovim/store/treesitter-parsers/parser/ledger.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/leo.so b/config/neovim/store/treesitter-parsers/parser/leo.so
index bcf7708f..ed9d05b7 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/leo.so and b/config/neovim/store/treesitter-parsers/parser/leo.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/linkerscript.so b/config/neovim/store/treesitter-parsers/parser/linkerscript.so
index 9aceef16..0c0ad539 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/linkerscript.so and b/config/neovim/store/treesitter-parsers/parser/linkerscript.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/liquid.so b/config/neovim/store/treesitter-parsers/parser/liquid.so
index 47c11f79..c7a3b377 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/liquid.so and b/config/neovim/store/treesitter-parsers/parser/liquid.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/liquidsoap.so b/config/neovim/store/treesitter-parsers/parser/liquidsoap.so
index 055257a6..39ad4cd2 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/liquidsoap.so and b/config/neovim/store/treesitter-parsers/parser/liquidsoap.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/llvm.so b/config/neovim/store/treesitter-parsers/parser/llvm.so
index 39d5705c..eb92fdad 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/llvm.so and b/config/neovim/store/treesitter-parsers/parser/llvm.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/lua.so b/config/neovim/store/treesitter-parsers/parser/lua.so
index 6874a006..8a97a6af 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/lua.so and b/config/neovim/store/treesitter-parsers/parser/lua.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/luadoc.so b/config/neovim/store/treesitter-parsers/parser/luadoc.so
index eee360da..9165c287 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/luadoc.so and b/config/neovim/store/treesitter-parsers/parser/luadoc.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/luap.so b/config/neovim/store/treesitter-parsers/parser/luap.so
index 228a82cb..efcbebd3 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/luap.so and b/config/neovim/store/treesitter-parsers/parser/luap.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/luau.so b/config/neovim/store/treesitter-parsers/parser/luau.so
index 3644ca7c..23ec5f1e 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/luau.so and b/config/neovim/store/treesitter-parsers/parser/luau.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/m68k.so b/config/neovim/store/treesitter-parsers/parser/m68k.so
index 60b0f98b..b36479fc 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/m68k.so and b/config/neovim/store/treesitter-parsers/parser/m68k.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/make.so b/config/neovim/store/treesitter-parsers/parser/make.so
index 7973d333..9250a777 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/make.so and b/config/neovim/store/treesitter-parsers/parser/make.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/markdown.so b/config/neovim/store/treesitter-parsers/parser/markdown.so
index b4dbdc3e..64271723 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/markdown.so and b/config/neovim/store/treesitter-parsers/parser/markdown.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/markdown_inline.so b/config/neovim/store/treesitter-parsers/parser/markdown_inline.so
index 65ddf020..15851e9a 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/markdown_inline.so and b/config/neovim/store/treesitter-parsers/parser/markdown_inline.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/matlab.so b/config/neovim/store/treesitter-parsers/parser/matlab.so
index b020aacb..cbb574f6 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/matlab.so and b/config/neovim/store/treesitter-parsers/parser/matlab.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/menhir.so b/config/neovim/store/treesitter-parsers/parser/menhir.so
index 81c1f0d1..db88fedb 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/menhir.so and b/config/neovim/store/treesitter-parsers/parser/menhir.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/mermaid.so b/config/neovim/store/treesitter-parsers/parser/mermaid.so
index 6aa5be6d..4cc6e73d 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/mermaid.so and b/config/neovim/store/treesitter-parsers/parser/mermaid.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/meson.so b/config/neovim/store/treesitter-parsers/parser/meson.so
index a7ece949..0b919f83 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/meson.so and b/config/neovim/store/treesitter-parsers/parser/meson.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/mlir.so b/config/neovim/store/treesitter-parsers/parser/mlir.so
index 4f05d230..21e1d813 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/mlir.so and b/config/neovim/store/treesitter-parsers/parser/mlir.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/muttrc.so b/config/neovim/store/treesitter-parsers/parser/muttrc.so
index 4c039868..c690204c 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/muttrc.so and b/config/neovim/store/treesitter-parsers/parser/muttrc.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/nasm.so b/config/neovim/store/treesitter-parsers/parser/nasm.so
index fcf99763..4cf25213 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/nasm.so and b/config/neovim/store/treesitter-parsers/parser/nasm.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/nickel.so b/config/neovim/store/treesitter-parsers/parser/nickel.so
index 15861bd5..4912d4fd 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/nickel.so and b/config/neovim/store/treesitter-parsers/parser/nickel.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/nim.so b/config/neovim/store/treesitter-parsers/parser/nim.so
index 0e3671b8..bf19c9df 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/nim.so and b/config/neovim/store/treesitter-parsers/parser/nim.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/nim_format_string.so b/config/neovim/store/treesitter-parsers/parser/nim_format_string.so
index 76ecd79a..fb62a20e 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/nim_format_string.so and b/config/neovim/store/treesitter-parsers/parser/nim_format_string.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/ninja.so b/config/neovim/store/treesitter-parsers/parser/ninja.so
index 81ee96c8..13e3db51 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/ninja.so and b/config/neovim/store/treesitter-parsers/parser/ninja.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/nix.so b/config/neovim/store/treesitter-parsers/parser/nix.so
index ef9ea23c..c305b1ba 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/nix.so and b/config/neovim/store/treesitter-parsers/parser/nix.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/norg.so b/config/neovim/store/treesitter-parsers/parser/norg.so
index 5e4b1bf1..f617ffd0 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/norg.so and b/config/neovim/store/treesitter-parsers/parser/norg.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/nqc.so b/config/neovim/store/treesitter-parsers/parser/nqc.so
index 7732430f..aab4d789 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/nqc.so and b/config/neovim/store/treesitter-parsers/parser/nqc.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/objc.so b/config/neovim/store/treesitter-parsers/parser/objc.so
index 2cd73465..d97d3d78 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/objc.so and b/config/neovim/store/treesitter-parsers/parser/objc.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/objdump.so b/config/neovim/store/treesitter-parsers/parser/objdump.so
index f3968395..6d320654 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/objdump.so and b/config/neovim/store/treesitter-parsers/parser/objdump.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/ocaml.so b/config/neovim/store/treesitter-parsers/parser/ocaml.so
index e4e98929..96ce3f70 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/ocaml.so and b/config/neovim/store/treesitter-parsers/parser/ocaml.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/ocaml_interface.so b/config/neovim/store/treesitter-parsers/parser/ocaml_interface.so
index 451f747a..11da8c77 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/ocaml_interface.so and b/config/neovim/store/treesitter-parsers/parser/ocaml_interface.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/ocamllex.so b/config/neovim/store/treesitter-parsers/parser/ocamllex.so
index 7ecd4c97..48b6a36d 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/ocamllex.so and b/config/neovim/store/treesitter-parsers/parser/ocamllex.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/odin.so b/config/neovim/store/treesitter-parsers/parser/odin.so
index dbd68e7a..4318f137 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/odin.so and b/config/neovim/store/treesitter-parsers/parser/odin.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/org.so b/config/neovim/store/treesitter-parsers/parser/org.so
index bd08a132..6dbe74b7 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/org.so and b/config/neovim/store/treesitter-parsers/parser/org.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/pascal.so b/config/neovim/store/treesitter-parsers/parser/pascal.so
index 62216a56..48463f52 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/pascal.so and b/config/neovim/store/treesitter-parsers/parser/pascal.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/passwd.so b/config/neovim/store/treesitter-parsers/parser/passwd.so
index 3f68aba5..2364cffb 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/passwd.so and b/config/neovim/store/treesitter-parsers/parser/passwd.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/pem.so b/config/neovim/store/treesitter-parsers/parser/pem.so
index 69ce853d..4996ded3 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/pem.so and b/config/neovim/store/treesitter-parsers/parser/pem.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/perl.so b/config/neovim/store/treesitter-parsers/parser/perl.so
index 85c70176..3666460f 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/perl.so and b/config/neovim/store/treesitter-parsers/parser/perl.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/php.so b/config/neovim/store/treesitter-parsers/parser/php.so
index dfeae78e..2e22df68 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/php.so and b/config/neovim/store/treesitter-parsers/parser/php.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/php_only.so b/config/neovim/store/treesitter-parsers/parser/php_only.so
index 923f293c..f0b6fdd1 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/php_only.so and b/config/neovim/store/treesitter-parsers/parser/php_only.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/phpdoc.so b/config/neovim/store/treesitter-parsers/parser/phpdoc.so
index 38dcc38b..336c07f1 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/phpdoc.so and b/config/neovim/store/treesitter-parsers/parser/phpdoc.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/pioasm.so b/config/neovim/store/treesitter-parsers/parser/pioasm.so
index d98d0da6..fb630fe8 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/pioasm.so and b/config/neovim/store/treesitter-parsers/parser/pioasm.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/po.so b/config/neovim/store/treesitter-parsers/parser/po.so
index 85a9243f..a5da3897 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/po.so and b/config/neovim/store/treesitter-parsers/parser/po.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/pod.so b/config/neovim/store/treesitter-parsers/parser/pod.so
index 796c707d..968d1087 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/pod.so and b/config/neovim/store/treesitter-parsers/parser/pod.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/poe_filter.so b/config/neovim/store/treesitter-parsers/parser/poe_filter.so
index 50542cf6..2532b911 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/poe_filter.so and b/config/neovim/store/treesitter-parsers/parser/poe_filter.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/pony.so b/config/neovim/store/treesitter-parsers/parser/pony.so
index 7dbccb13..d024bce4 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/pony.so and b/config/neovim/store/treesitter-parsers/parser/pony.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/printf.so b/config/neovim/store/treesitter-parsers/parser/printf.so
index d776dcff..25d172ce 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/printf.so and b/config/neovim/store/treesitter-parsers/parser/printf.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/prisma.so b/config/neovim/store/treesitter-parsers/parser/prisma.so
index 67252fe0..ed7cff8d 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/prisma.so and b/config/neovim/store/treesitter-parsers/parser/prisma.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/promql.so b/config/neovim/store/treesitter-parsers/parser/promql.so
index fe39874a..3da1284b 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/promql.so and b/config/neovim/store/treesitter-parsers/parser/promql.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/properties.so b/config/neovim/store/treesitter-parsers/parser/properties.so
index 5940a186..edeb65a1 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/properties.so and b/config/neovim/store/treesitter-parsers/parser/properties.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/proto.so b/config/neovim/store/treesitter-parsers/parser/proto.so
index c82ac4ac..79415e3e 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/proto.so and b/config/neovim/store/treesitter-parsers/parser/proto.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/prql.so b/config/neovim/store/treesitter-parsers/parser/prql.so
index 5f3d59a3..3a34f134 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/prql.so and b/config/neovim/store/treesitter-parsers/parser/prql.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/psv.so b/config/neovim/store/treesitter-parsers/parser/psv.so
index 0bb206ab..35817f70 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/psv.so and b/config/neovim/store/treesitter-parsers/parser/psv.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/pug.so b/config/neovim/store/treesitter-parsers/parser/pug.so
index 8b20e656..36fc7f21 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/pug.so and b/config/neovim/store/treesitter-parsers/parser/pug.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/puppet.so b/config/neovim/store/treesitter-parsers/parser/puppet.so
index 5da719cf..e8e4c28a 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/puppet.so and b/config/neovim/store/treesitter-parsers/parser/puppet.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/purescript.so b/config/neovim/store/treesitter-parsers/parser/purescript.so
index dfdc11c4..ecf1128f 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/purescript.so and b/config/neovim/store/treesitter-parsers/parser/purescript.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/pymanifest.so b/config/neovim/store/treesitter-parsers/parser/pymanifest.so
index df93daf9..ef128376 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/pymanifest.so and b/config/neovim/store/treesitter-parsers/parser/pymanifest.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/python.so b/config/neovim/store/treesitter-parsers/parser/python.so
index 9df4aba2..419d3ae4 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/python.so and b/config/neovim/store/treesitter-parsers/parser/python.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/ql.so b/config/neovim/store/treesitter-parsers/parser/ql.so
index dcc59d76..1ee0f54c 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/ql.so and b/config/neovim/store/treesitter-parsers/parser/ql.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/qmldir.so b/config/neovim/store/treesitter-parsers/parser/qmldir.so
index a35a05a1..eb6f2a5a 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/qmldir.so and b/config/neovim/store/treesitter-parsers/parser/qmldir.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/qmljs.so b/config/neovim/store/treesitter-parsers/parser/qmljs.so
index 63f3a473..32c860bb 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/qmljs.so and b/config/neovim/store/treesitter-parsers/parser/qmljs.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/query.so b/config/neovim/store/treesitter-parsers/parser/query.so
index f2c47b4b..e9c223b0 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/query.so and b/config/neovim/store/treesitter-parsers/parser/query.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/r.so b/config/neovim/store/treesitter-parsers/parser/r.so
index ad5a7e3f..8ebbe80a 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/r.so and b/config/neovim/store/treesitter-parsers/parser/r.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/racket.so b/config/neovim/store/treesitter-parsers/parser/racket.so
index c2f6dfb9..a495994f 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/racket.so and b/config/neovim/store/treesitter-parsers/parser/racket.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/rasi.so b/config/neovim/store/treesitter-parsers/parser/rasi.so
index d680c146..ea8e13ae 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/rasi.so and b/config/neovim/store/treesitter-parsers/parser/rasi.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/rbs.so b/config/neovim/store/treesitter-parsers/parser/rbs.so
index 996daac3..5bf08ecb 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/rbs.so and b/config/neovim/store/treesitter-parsers/parser/rbs.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/re2c.so b/config/neovim/store/treesitter-parsers/parser/re2c.so
index 80e3b7f7..0102a09e 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/re2c.so and b/config/neovim/store/treesitter-parsers/parser/re2c.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/readline.so b/config/neovim/store/treesitter-parsers/parser/readline.so
index d46d987c..c9898429 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/readline.so and b/config/neovim/store/treesitter-parsers/parser/readline.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/regex.so b/config/neovim/store/treesitter-parsers/parser/regex.so
index 100b052e..feeaf0b5 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/regex.so and b/config/neovim/store/treesitter-parsers/parser/regex.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/rego.so b/config/neovim/store/treesitter-parsers/parser/rego.so
index 8be7454a..2852f72a 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/rego.so and b/config/neovim/store/treesitter-parsers/parser/rego.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/requirements.so b/config/neovim/store/treesitter-parsers/parser/requirements.so
index f078dd3d..b1a1736d 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/requirements.so and b/config/neovim/store/treesitter-parsers/parser/requirements.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/rnoweb.so b/config/neovim/store/treesitter-parsers/parser/rnoweb.so
index 12b701ae..9ae32fb7 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/rnoweb.so and b/config/neovim/store/treesitter-parsers/parser/rnoweb.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/robot.so b/config/neovim/store/treesitter-parsers/parser/robot.so
index e1e52b20..76a2e333 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/robot.so and b/config/neovim/store/treesitter-parsers/parser/robot.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/roc.so b/config/neovim/store/treesitter-parsers/parser/roc.so
index 28304d59..beefe06d 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/roc.so and b/config/neovim/store/treesitter-parsers/parser/roc.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/ron.so b/config/neovim/store/treesitter-parsers/parser/ron.so
index b66129cf..2bf5a0e4 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/ron.so and b/config/neovim/store/treesitter-parsers/parser/ron.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/rst.so b/config/neovim/store/treesitter-parsers/parser/rst.so
index bf79d855..d4a15629 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/rst.so and b/config/neovim/store/treesitter-parsers/parser/rst.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/ruby.so b/config/neovim/store/treesitter-parsers/parser/ruby.so
index 496d2e15..cb0be8fd 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/ruby.so and b/config/neovim/store/treesitter-parsers/parser/ruby.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/rust.so b/config/neovim/store/treesitter-parsers/parser/rust.so
index 70a7530f..a03bc3a3 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/rust.so and b/config/neovim/store/treesitter-parsers/parser/rust.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/scala.so b/config/neovim/store/treesitter-parsers/parser/scala.so
index 6462f005..59d123bc 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/scala.so and b/config/neovim/store/treesitter-parsers/parser/scala.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/scfg.so b/config/neovim/store/treesitter-parsers/parser/scfg.so
index 4b1d099d..b23d6624 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/scfg.so and b/config/neovim/store/treesitter-parsers/parser/scfg.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/scheme.so b/config/neovim/store/treesitter-parsers/parser/scheme.so
index 1377d7fb..8ccfdf37 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/scheme.so and b/config/neovim/store/treesitter-parsers/parser/scheme.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/scss.so b/config/neovim/store/treesitter-parsers/parser/scss.so
index 3a37931b..27a0bee7 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/scss.so and b/config/neovim/store/treesitter-parsers/parser/scss.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/slang.so b/config/neovim/store/treesitter-parsers/parser/slang.so
index ce71a5c6..d9d7c54d 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/slang.so and b/config/neovim/store/treesitter-parsers/parser/slang.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/slint.so b/config/neovim/store/treesitter-parsers/parser/slint.so
index a03b1351..ca639e12 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/slint.so and b/config/neovim/store/treesitter-parsers/parser/slint.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/smali.so b/config/neovim/store/treesitter-parsers/parser/smali.so
index 8eff6e9e..48e1238c 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/smali.so and b/config/neovim/store/treesitter-parsers/parser/smali.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/smithy.so b/config/neovim/store/treesitter-parsers/parser/smithy.so
index 4cb0e8c3..9bd38465 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/smithy.so and b/config/neovim/store/treesitter-parsers/parser/smithy.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/snakemake.so b/config/neovim/store/treesitter-parsers/parser/snakemake.so
index 1c7837dd..6e5ab8e3 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/snakemake.so and b/config/neovim/store/treesitter-parsers/parser/snakemake.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/solidity.so b/config/neovim/store/treesitter-parsers/parser/solidity.so
index a693d7e4..f6754a19 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/solidity.so and b/config/neovim/store/treesitter-parsers/parser/solidity.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/soql.so b/config/neovim/store/treesitter-parsers/parser/soql.so
index 2f7d124c..c9c8b482 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/soql.so and b/config/neovim/store/treesitter-parsers/parser/soql.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/sosl.so b/config/neovim/store/treesitter-parsers/parser/sosl.so
index d3e402d7..d57d95ca 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/sosl.so and b/config/neovim/store/treesitter-parsers/parser/sosl.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/sourcepawn.so b/config/neovim/store/treesitter-parsers/parser/sourcepawn.so
index c368a926..4fbc4e5d 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/sourcepawn.so and b/config/neovim/store/treesitter-parsers/parser/sourcepawn.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/sparql.so b/config/neovim/store/treesitter-parsers/parser/sparql.so
index 588172a9..4e37982f 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/sparql.so and b/config/neovim/store/treesitter-parsers/parser/sparql.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/sql.so b/config/neovim/store/treesitter-parsers/parser/sql.so
index fbd9fed3..d973b91a 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/sql.so and b/config/neovim/store/treesitter-parsers/parser/sql.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/squirrel.so b/config/neovim/store/treesitter-parsers/parser/squirrel.so
index d62749c5..bb4a10aa 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/squirrel.so and b/config/neovim/store/treesitter-parsers/parser/squirrel.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/ssh_config.so b/config/neovim/store/treesitter-parsers/parser/ssh_config.so
index cda16841..a6fad26a 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/ssh_config.so and b/config/neovim/store/treesitter-parsers/parser/ssh_config.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/starlark.so b/config/neovim/store/treesitter-parsers/parser/starlark.so
index 73ba368b..8b7954bf 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/starlark.so and b/config/neovim/store/treesitter-parsers/parser/starlark.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/strace.so b/config/neovim/store/treesitter-parsers/parser/strace.so
index b8ff64d8..afde9ee2 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/strace.so and b/config/neovim/store/treesitter-parsers/parser/strace.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/styled.so b/config/neovim/store/treesitter-parsers/parser/styled.so
index 6878f96f..fbc4cd08 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/styled.so and b/config/neovim/store/treesitter-parsers/parser/styled.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/supercollider.so b/config/neovim/store/treesitter-parsers/parser/supercollider.so
index bcb0fb98..b1dccb73 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/supercollider.so and b/config/neovim/store/treesitter-parsers/parser/supercollider.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/surface.so b/config/neovim/store/treesitter-parsers/parser/surface.so
index 93c816ee..65846fa3 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/surface.so and b/config/neovim/store/treesitter-parsers/parser/surface.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/svelte.so b/config/neovim/store/treesitter-parsers/parser/svelte.so
index 603f7dfd..a620cce8 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/svelte.so and b/config/neovim/store/treesitter-parsers/parser/svelte.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/swift.so b/config/neovim/store/treesitter-parsers/parser/swift.so
index 26c28143..d25bb533 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/swift.so and b/config/neovim/store/treesitter-parsers/parser/swift.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/sxhkdrc.so b/config/neovim/store/treesitter-parsers/parser/sxhkdrc.so
index f59fd323..e8d72d91 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/sxhkdrc.so and b/config/neovim/store/treesitter-parsers/parser/sxhkdrc.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/systemtap.so b/config/neovim/store/treesitter-parsers/parser/systemtap.so
index 2de8da67..655b08b6 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/systemtap.so and b/config/neovim/store/treesitter-parsers/parser/systemtap.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/t32.so b/config/neovim/store/treesitter-parsers/parser/t32.so
index b9646f42..1a6720ce 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/t32.so and b/config/neovim/store/treesitter-parsers/parser/t32.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/tablegen.so b/config/neovim/store/treesitter-parsers/parser/tablegen.so
index 5e51205d..1e4aa29a 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/tablegen.so and b/config/neovim/store/treesitter-parsers/parser/tablegen.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/tact.so b/config/neovim/store/treesitter-parsers/parser/tact.so
index 0a3d7428..7f4a3ee8 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/tact.so and b/config/neovim/store/treesitter-parsers/parser/tact.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/tcl.so b/config/neovim/store/treesitter-parsers/parser/tcl.so
index dcdaace8..79c64e68 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/tcl.so and b/config/neovim/store/treesitter-parsers/parser/tcl.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/teal.so b/config/neovim/store/treesitter-parsers/parser/teal.so
index 03d71741..529f20dd 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/teal.so and b/config/neovim/store/treesitter-parsers/parser/teal.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/templ.so b/config/neovim/store/treesitter-parsers/parser/templ.so
index 1e0894c1..a0d34750 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/templ.so and b/config/neovim/store/treesitter-parsers/parser/templ.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/terraform.so b/config/neovim/store/treesitter-parsers/parser/terraform.so
index d09d5e8c..e62dd5ef 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/terraform.so and b/config/neovim/store/treesitter-parsers/parser/terraform.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/textproto.so b/config/neovim/store/treesitter-parsers/parser/textproto.so
index 39ce5fdf..63b91c0c 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/textproto.so and b/config/neovim/store/treesitter-parsers/parser/textproto.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/thrift.so b/config/neovim/store/treesitter-parsers/parser/thrift.so
index 56b2498b..1a4f8de8 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/thrift.so and b/config/neovim/store/treesitter-parsers/parser/thrift.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/tiger.so b/config/neovim/store/treesitter-parsers/parser/tiger.so
index 8534c139..06e8d964 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/tiger.so and b/config/neovim/store/treesitter-parsers/parser/tiger.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/tlaplus.so b/config/neovim/store/treesitter-parsers/parser/tlaplus.so
index e2369faf..7e56ca6c 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/tlaplus.so and b/config/neovim/store/treesitter-parsers/parser/tlaplus.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/tmux.so b/config/neovim/store/treesitter-parsers/parser/tmux.so
index 7f2b9924..d1d6246a 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/tmux.so and b/config/neovim/store/treesitter-parsers/parser/tmux.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/todotxt.so b/config/neovim/store/treesitter-parsers/parser/todotxt.so
index efaddd6f..7f025ff3 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/todotxt.so and b/config/neovim/store/treesitter-parsers/parser/todotxt.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/toml.so b/config/neovim/store/treesitter-parsers/parser/toml.so
index 70c3d4e7..9cafca84 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/toml.so and b/config/neovim/store/treesitter-parsers/parser/toml.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/tsv.so b/config/neovim/store/treesitter-parsers/parser/tsv.so
index 0a0aa957..37e55727 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/tsv.so and b/config/neovim/store/treesitter-parsers/parser/tsv.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/tsx.so b/config/neovim/store/treesitter-parsers/parser/tsx.so
index 3c31e6b0..fbb66e17 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/tsx.so and b/config/neovim/store/treesitter-parsers/parser/tsx.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/turtle.so b/config/neovim/store/treesitter-parsers/parser/turtle.so
index b18470f1..0ad5af83 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/turtle.so and b/config/neovim/store/treesitter-parsers/parser/turtle.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/twig.so b/config/neovim/store/treesitter-parsers/parser/twig.so
index 268003f8..aab2c772 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/twig.so and b/config/neovim/store/treesitter-parsers/parser/twig.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/typescript.so b/config/neovim/store/treesitter-parsers/parser/typescript.so
index cf3f813b..d7693821 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/typescript.so and b/config/neovim/store/treesitter-parsers/parser/typescript.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/typespec.so b/config/neovim/store/treesitter-parsers/parser/typespec.so
index b64e514c..0691ce90 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/typespec.so and b/config/neovim/store/treesitter-parsers/parser/typespec.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/typoscript.so b/config/neovim/store/treesitter-parsers/parser/typoscript.so
index b8082df0..d62f5dac 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/typoscript.so and b/config/neovim/store/treesitter-parsers/parser/typoscript.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/typst.so b/config/neovim/store/treesitter-parsers/parser/typst.so
index e4fc1dc9..0d7f94f9 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/typst.so and b/config/neovim/store/treesitter-parsers/parser/typst.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/udev.so b/config/neovim/store/treesitter-parsers/parser/udev.so
index 059c278b..7a8b777a 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/udev.so and b/config/neovim/store/treesitter-parsers/parser/udev.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/ungrammar.so b/config/neovim/store/treesitter-parsers/parser/ungrammar.so
index 8a3da62b..6ee67921 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/ungrammar.so and b/config/neovim/store/treesitter-parsers/parser/ungrammar.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/unison.so b/config/neovim/store/treesitter-parsers/parser/unison.so
index 01cbc006..42302799 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/unison.so and b/config/neovim/store/treesitter-parsers/parser/unison.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/usd.so b/config/neovim/store/treesitter-parsers/parser/usd.so
index 92b2f188..105c4eb4 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/usd.so and b/config/neovim/store/treesitter-parsers/parser/usd.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/uxntal.so b/config/neovim/store/treesitter-parsers/parser/uxntal.so
index b033655b..a5f97506 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/uxntal.so and b/config/neovim/store/treesitter-parsers/parser/uxntal.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/v.so b/config/neovim/store/treesitter-parsers/parser/v.so
index 3e15cacd..5f6c505d 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/v.so and b/config/neovim/store/treesitter-parsers/parser/v.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/vala.so b/config/neovim/store/treesitter-parsers/parser/vala.so
index ce7e1055..625f3357 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/vala.so and b/config/neovim/store/treesitter-parsers/parser/vala.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/vento.so b/config/neovim/store/treesitter-parsers/parser/vento.so
index d3c47ec6..ee19e8d2 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/vento.so and b/config/neovim/store/treesitter-parsers/parser/vento.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/verilog.so b/config/neovim/store/treesitter-parsers/parser/verilog.so
index 59e608ad..7017b865 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/verilog.so and b/config/neovim/store/treesitter-parsers/parser/verilog.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/vhs.so b/config/neovim/store/treesitter-parsers/parser/vhs.so
index 2f61afd6..1b05adcf 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/vhs.so and b/config/neovim/store/treesitter-parsers/parser/vhs.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/vim.so b/config/neovim/store/treesitter-parsers/parser/vim.so
index 0edef44b..008fad3d 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/vim.so and b/config/neovim/store/treesitter-parsers/parser/vim.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/vimdoc.so b/config/neovim/store/treesitter-parsers/parser/vimdoc.so
index 5e41a59c..b607dbff 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/vimdoc.so and b/config/neovim/store/treesitter-parsers/parser/vimdoc.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/vue.so b/config/neovim/store/treesitter-parsers/parser/vue.so
index d2d53c2f..1f825170 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/vue.so and b/config/neovim/store/treesitter-parsers/parser/vue.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/wgsl.so b/config/neovim/store/treesitter-parsers/parser/wgsl.so
index 2630952e..b48844d3 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/wgsl.so and b/config/neovim/store/treesitter-parsers/parser/wgsl.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/wgsl_bevy.so b/config/neovim/store/treesitter-parsers/parser/wgsl_bevy.so
index b5dea4be..b0d0788a 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/wgsl_bevy.so and b/config/neovim/store/treesitter-parsers/parser/wgsl_bevy.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/wing.so b/config/neovim/store/treesitter-parsers/parser/wing.so
index b3fe665e..a641307d 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/wing.so and b/config/neovim/store/treesitter-parsers/parser/wing.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/wit.so b/config/neovim/store/treesitter-parsers/parser/wit.so
index 5cf84645..904f9d1b 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/wit.so and b/config/neovim/store/treesitter-parsers/parser/wit.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/xcompose.so b/config/neovim/store/treesitter-parsers/parser/xcompose.so
index 4db91dc2..991b173a 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/xcompose.so and b/config/neovim/store/treesitter-parsers/parser/xcompose.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/xml.so b/config/neovim/store/treesitter-parsers/parser/xml.so
index 95e568e0..3c09deff 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/xml.so and b/config/neovim/store/treesitter-parsers/parser/xml.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/yaml.so b/config/neovim/store/treesitter-parsers/parser/yaml.so
index 7d65a17c..7c7966cf 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/yaml.so and b/config/neovim/store/treesitter-parsers/parser/yaml.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/yang.so b/config/neovim/store/treesitter-parsers/parser/yang.so
index db496e4c..becdb3a4 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/yang.so and b/config/neovim/store/treesitter-parsers/parser/yang.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/yuck.so b/config/neovim/store/treesitter-parsers/parser/yuck.so
index a2622425..bb611f9e 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/yuck.so and b/config/neovim/store/treesitter-parsers/parser/yuck.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/zathurarc.so b/config/neovim/store/treesitter-parsers/parser/zathurarc.so
index c1ddbf21..ba788e11 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/zathurarc.so and b/config/neovim/store/treesitter-parsers/parser/zathurarc.so differ
diff --git a/config/neovim/store/treesitter-parsers/parser/zig.so b/config/neovim/store/treesitter-parsers/parser/zig.so
index 4b6e38c7..6f00ff5c 100755
Binary files a/config/neovim/store/treesitter-parsers/parser/zig.so and b/config/neovim/store/treesitter-parsers/parser/zig.so differ