From 2f02c47c1b5895b97295aacd454fad6eb1822598 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Mar 2025 21:37:32 +0000
Subject: [PATCH 001/202] ci: bump cachix/cachix-action from 15 to 16 (#703)

Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from 15 to 16.
- [Release notes](https://github.com/cachix/cachix-action/releases)
- [Commits](https://github.com/cachix/cachix-action/compare/v15...v16)

---
updated-dependencies:
- dependency-name: cachix/cachix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cachix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index cac8ee51..959a04b6 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
 
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           authToken: ${{ secrets.CACHIX_TOKEN }}
           extraPullNames: nix-community

From bafa6cbf84970e03c40e22e80fff32f077ef741c Mon Sep 17 00:00:00 2001
From: Thales Menato <8753631+thamenato@users.noreply.github.com>
Date: Tue, 11 Mar 2025 06:33:39 -0400
Subject: [PATCH 002/202] languages/cue: initial CUE language support (#704)

* feat: add cue language support

* docs: add changelog information
---
 docs/release-notes/rl-0.8.md          |  2 ++
 modules/plugins/languages/cue.nix     | 51 +++++++++++++++++++++++++++
 modules/plugins/languages/default.nix |  1 +
 3 files changed, 54 insertions(+)
 create mode 100644 modules/plugins/languages/cue.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 1a5b7e4c..1acc855e 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -159,8 +159,10 @@
 [thamenato](https://github.com/thamenato):
 
 [ruff]: (https://github.com/astral-sh/ruff)
+[cue]: (https://cuelang.org/)
 
 - Add [ruff] as a formatter option in `vim.languages.python.format.type`.
+- Add [cue] support under `vim.languages.cue`.
 
 [ARCIII](https://github.com/ArmandoCIII):
 
diff --git a/modules/plugins/languages/cue.nix b/modules/plugins/languages/cue.nix
new file mode 100644
index 00000000..313e3233
--- /dev/null
+++ b/modules/plugins/languages/cue.nix
@@ -0,0 +1,51 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.types) package;
+  inherit (lib.nvim.types) mkGrammarOption;
+
+  cfg = config.vim.languages.cue;
+in {
+  options.vim.languages.cue = {
+    enable = mkEnableOption "CUE language support";
+
+    treesitter = {
+      enable = mkEnableOption "CUE treesitter" // {default = config.vim.languages.enableTreesitter;};
+
+      package = mkGrammarOption pkgs "cue";
+    };
+
+    lsp = {
+      enable = mkEnableOption "CUE LSP support" // {default = config.vim.languages.enableLSP;};
+
+      package = mkOption {
+        type = package;
+        default = pkgs.cue;
+        description = "cue lsp implementation";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.cue-lsp = ''
+        lspconfig.cue.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = {"${cfg.lsp.package}/bin/cue", "lsp"},
+        }
+      '';
+    })
+  ]);
+}
diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix
index 08d676b9..d452ef56 100644
--- a/modules/plugins/languages/default.nix
+++ b/modules/plugins/languages/default.nix
@@ -5,6 +5,7 @@ in {
     ./asm.nix
     ./astro.nix
     ./bash.nix
+    ./cue.nix
     ./dart.nix
     ./clang.nix
     ./css.nix

From 06250248696fa5c44e11a89a5647d12570fc0851 Mon Sep 17 00:00:00 2001
From: "Adam M. Szalkowski" <a.szalkowski@datahow.ch>
Date: Thu, 13 Mar 2025 00:21:13 +0100
Subject: [PATCH 003/202] languages/helm: init (#679)

---
 docs/release-notes/rl-0.8.md          |  4 ++
 modules/plugins/languages/default.nix |  1 +
 modules/plugins/languages/helm.nix    | 89 +++++++++++++++++++++++++++
 modules/plugins/languages/yaml.nix    | 17 ++++-
 4 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 modules/plugins/languages/helm.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 1acc855e..ee579d3e 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -243,3 +243,7 @@
 [BANanaD3V](https://github.com/BANanaD3V):
 
 - `alpha` is now configured with nix.
+
+[Butzist](https://github.com/butzist)
+
+- Add Helm chart support under `vim.languages.helm`.
diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix
index d452ef56..20acfb6c 100644
--- a/modules/plugins/languages/default.nix
+++ b/modules/plugins/languages/default.nix
@@ -13,6 +13,7 @@ in {
     ./gleam.nix
     ./go.nix
     ./hcl.nix
+    ./helm.nix
     ./kotlin.nix
     ./html.nix
     ./haskell.nix
diff --git a/modules/plugins/languages/helm.nix b/modules/plugins/languages/helm.nix
new file mode 100644
index 00000000..d3fd636e
--- /dev/null
+++ b/modules/plugins/languages/helm.nix
@@ -0,0 +1,89 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  inherit (builtins) attrNames;
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either listOf package str;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
+
+  cfg = config.vim.languages.helm;
+  yamlCfg = config.vim.languages.yaml;
+
+  helmCmd =
+    if isList cfg.lsp.package
+    then cfg.lsp.package
+    else ["${cfg.lsp.package}/bin/helm_ls" "serve"];
+  yamlCmd =
+    if isList yamlCfg.lsp.package
+    then builtins.elemAt yamlCfg.lsp.package 0
+    else "${yamlCfg.lsp.package}/bin/yaml-language-server";
+
+  defaultServer = "helm-ls";
+  servers = {
+    helm-ls = {
+      package = pkgs.helm-ls;
+      lspConfig = ''
+        lspconfig.helm_ls.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${expToLua helmCmd},
+          settings = {
+            ['helm-ls'] = {
+              yamlls = {
+                  path = "${yamlCmd}"
+              }
+            }
+          }
+        }
+      '';
+    };
+  };
+in {
+  options.vim.languages.helm = {
+    enable = mkEnableOption "Helm language support";
+
+    treesitter = {
+      enable = mkEnableOption "Helm treesitter" // {default = config.vim.languages.enableTreesitter;};
+      package = mkGrammarOption pkgs "helm";
+    };
+
+    lsp = {
+      enable = mkEnableOption "Helm LSP support" // {default = config.vim.languages.enableLSP;};
+
+      server = mkOption {
+        description = "Helm LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "Helm LSP server package";
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.helm-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+
+    {
+      # Enables filetype detection
+      vim.startPlugins = [pkgs.vimPlugins.vim-helm];
+    }
+  ]);
+}
diff --git a/modules/plugins/languages/yaml.nix b/modules/plugins/languages/yaml.nix
index ef17b964..c84b17cd 100644
--- a/modules/plugins/languages/yaml.nix
+++ b/modules/plugins/languages/yaml.nix
@@ -14,14 +14,27 @@
 
   cfg = config.vim.languages.yaml;
 
+  onAttach =
+    if config.vim.languages.helm.lsp.enable
+    then ''
+      on_attach = function(client, bufnr)
+        local filetype = vim.bo[bufnr].filetype
+        if filetype == "helm" then
+          client.stop()
+        end
+      end''
+    else "on_attach = default_on_attach";
+
   defaultServer = "yaml-language-server";
   servers = {
     yaml-language-server = {
       package = pkgs.nodePackages.yaml-language-server;
       lspConfig = ''
+
+
         lspconfig.yamlls.setup {
-          capabilities = capabilities;
-          on_attach = default_on_attach;
+          capabilities = capabilities,
+          ${onAttach},
           cmd = ${
           if isList cfg.lsp.package
           then expToLua cfg.lsp.package

From 54311277fc5c3ed22850f804c25cd9c406d75646 Mon Sep 17 00:00:00 2001
From: Victor R <39545521+viicslen@users.noreply.github.com>
Date: Fri, 14 Mar 2025 01:42:50 +0000
Subject: [PATCH 004/202] language/php: add initial support for intelephense
 php lsp (#709)

* language/php: add initial support for intelephense php lsp

* docs: update release notes

---------

Co-authored-by: raf <me@notashelf.dev>
---
 docs/release-notes/rl-0.8.md      |  7 ++++++-
 modules/plugins/languages/php.nix | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index ee579d3e..bd52df0d 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -244,6 +244,11 @@
 
 - `alpha` is now configured with nix.
 
-[Butzist](https://github.com/butzist)
+[viicslen](https://github.com/viicslen):
+
+- Add `intelephense` language server support under
+  `vim.languages.php.lsp.server`
+
+[Butzist](https://github.com/butzist):
 
 - Add Helm chart support under `vim.languages.helm`.
diff --git a/modules/plugins/languages/php.nix b/modules/plugins/languages/php.nix
index d921b11d..4dccc8cd 100644
--- a/modules/plugins/languages/php.nix
+++ b/modules/plugins/languages/php.nix
@@ -64,6 +64,26 @@
         }
       '';
     };
+
+    intelephense = {
+      package = pkgs.intelephense;
+      lspConfig = ''
+        lspconfig.intelephense.setup{
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''
+            {
+              "${getExe cfg.lsp.package}",
+              "--stdio"
+            },
+          ''
+        }
+        }
+      '';
+    };
   };
 in {
   options.vim.languages.php = {

From 2d5ff939b0a55f0a143927fb52f3ff386077c22b Mon Sep 17 00:00:00 2001
From: ARCIII <88923299+ArmandoCIII@users.noreply.github.com>
Date: Sat, 15 Mar 2025 09:44:33 -0400
Subject: [PATCH 005/202] assistant/codecompanion-nvim: init (#707)

* assistant/codecompanion-nvim: init

* assistant/codecompanion-nvim: PR review revisions

---------

Co-authored-by: raf <me@notashelf.dev>
---
 configuration.nix                             |   1 +
 docs/release-notes/rl-0.8.md                  |   2 +
 .../codecompanion/codecompanion-nvim.nix      | 278 ++++++++++++++++++
 .../assistant/codecompanion/config.nix        |  27 ++
 .../assistant/codecompanion/default.nix       |   6 +
 modules/plugins/assistant/default.nix         |   1 +
 npins/sources.json                            |  12 +
 7 files changed, 327 insertions(+)
 create mode 100644 modules/plugins/assistant/codecompanion/codecompanion-nvim.nix
 create mode 100644 modules/plugins/assistant/codecompanion/config.nix
 create mode 100644 modules/plugins/assistant/codecompanion/default.nix

diff --git a/configuration.nix b/configuration.nix
index 692337db..a243c970 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -234,6 +234,7 @@ isMaximal: {
         enable = false;
         cmp.enable = isMaximal;
       };
+      codecompanion-nvim.enable = false;
     };
 
     session = {
diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index bd52df0d..9f05f60a 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -167,10 +167,12 @@
 [ARCIII](https://github.com/ArmandoCIII):
 
 [leetcode.nvim]: https://github.com/kawre/leetcode.nvim
+[codecompanion-nvim]: https://github.com/olimorris/codecompanion.nvim
 
 - Add `vim.languages.zig.dap` support through pkgs.lldb dap adapter. Code
   Inspiration from `vim.languages.clang.dap` implementation.
 - Add [leetcode.nvim] plugin under `vim.utility.leetcode-nvim`.
+- Add [codecompanion.nvim] plugin under `vim.assistant.codecompanion-nvim`.
 
 [nezia1](https://github.com/nezia1):
 
diff --git a/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix b/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix
new file mode 100644
index 00000000..9ebe30c0
--- /dev/null
+++ b/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix
@@ -0,0 +1,278 @@
+{lib, ...}: let
+  inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.types) int str enum nullOr attrs;
+  inherit (lib.nvim.types) mkPluginSetupOption luaInline;
+in {
+  options.vim.assistant = {
+    codecompanion-nvim = {
+      enable = mkEnableOption "complementary neovim plugin for codecompanion.nvim";
+
+      setupOpts = mkPluginSetupOption "codecompanion-nvim" {
+        opts = {
+          send_code = mkEnableOption "code from being sent to the LLM.";
+
+          log_level = mkOption {
+            type = enum ["DEBUG" "INFO" "ERROR" "TRACE"];
+            default = "ERROR";
+            description = "Change the level of logging.";
+          };
+
+          language = mkOption {
+            type = str;
+            default = "English";
+            description = "Specify which language an LLM should respond in.";
+          };
+        };
+
+        display = {
+          diff = {
+            enabled =
+              mkEnableOption ""
+              // {
+                default = true;
+                description = "a diff view to see the changes made by the LLM.";
+              };
+
+            close_chat_at = mkOption {
+              type = int;
+              default = 240;
+              description = ''
+                Close an open chat buffer if the
+                total columns of your display are less than...
+              '';
+            };
+
+            layout = mkOption {
+              type = enum ["vertical" "horizontal"];
+              default = "vertical";
+              description = "Type of split for default provider.";
+            };
+
+            provider = mkOption {
+              type = enum ["default" "mini_diff"];
+              default = "default";
+              description = "The preferred kind of provider.";
+            };
+          };
+
+          inline = {
+            layout = mkOption {
+              type = enum ["vertical" "horizontal" "buffer"];
+              default = "vertical";
+              description = "Customize how output is created in new buffer.";
+            };
+          };
+
+          chat = {
+            auto_scroll = mkEnableOption "automatic page scrolling.";
+
+            show_settings = mkEnableOption ''
+              LLM settings to appear at the top of the chat buffer.
+            '';
+
+            start_in_insert_mode = mkEnableOption ''
+              opening the chat buffer in insert mode.
+            '';
+
+            show_header_separator = mkEnableOption ''
+              header separators in the chat buffer.
+
+              Set this to false if you're using an
+              external markdown formatting plugin.
+            '';
+
+            show_references =
+              mkEnableOption ""
+              // {
+                default = true;
+                description = "references in the chat buffer.";
+              };
+
+            show_token_count =
+              mkEnableOption ""
+              // {
+                default = true;
+                description = "the token count for each response.";
+              };
+
+            intro_message = mkOption {
+              type = str;
+              default = "Welcome to CodeCompanion ✨! Press ? for options.";
+              description = "Message to appear in chat buffer.";
+            };
+
+            separator = mkOption {
+              type = str;
+              default = "─";
+              description = ''
+                The separator between the
+                different messages in the chat buffer.
+              '';
+            };
+
+            icons = {
+              pinned_buffer = mkOption {
+                type = str;
+                default = " ";
+                description = "The icon to represent a pinned buffer.";
+              };
+
+              watched_buffer = mkOption {
+                type = str;
+                default = "👀 ";
+                description = "The icon to represent a watched buffer.";
+              };
+            };
+          };
+
+          action_palette = {
+            width = mkOption {
+              type = int;
+              default = 95;
+              description = "Width of the action palette.";
+            };
+
+            height = mkOption {
+              type = int;
+              default = 10;
+              description = "Height of the action palette.";
+            };
+
+            prompt = mkOption {
+              type = str;
+              default = "Prompt ";
+              description = "Prompt used for interactive LLM calls.";
+            };
+
+            provider = mkOption {
+              type = enum ["default" "telescope" "mini_pick"];
+              default = "default";
+              description = "Provider used for the action palette.";
+            };
+
+            opts = {
+              show_default_actions =
+                mkEnableOption ""
+                // {
+                  default = true;
+                  description = "showing default actions in the action palette.";
+                };
+
+              show_default_prompt_library =
+                mkEnableOption ""
+                // {
+                  default = true;
+                  description = ''
+                    showing default prompt library in the action palette.
+                  '';
+                };
+            };
+          };
+        };
+
+        adapters = mkOption {
+          type = nullOr luaInline;
+          default = null;
+          description = "An adapter is what connects Neovim to an LLM.";
+        };
+
+        strategies = {
+          chat = {
+            adapter = mkOption {
+              type = nullOr str;
+              default = null;
+              description = "Adapter used for the chat strategy.";
+            };
+
+            keymaps = mkOption {
+              type = nullOr attrs;
+              default = null;
+              description = "Define or override the default keymaps.";
+            };
+
+            variables = mkOption {
+              type = nullOr luaInline;
+              default = null;
+              description = ''
+                Define your own variables
+                to share specific content.
+              '';
+            };
+
+            slash_commands = mkOption {
+              type = nullOr luaInline;
+              default = null;
+              description = ''
+                Slash Commands (invoked with /) let you dynamically
+                insert context into the chat buffer,
+                such as file contents or date/time.
+              '';
+            };
+
+            tools = mkOption {
+              type = nullOr attrs;
+              default = null;
+              description = ''
+                Configure tools to perform specific
+                tasks when invoked by an LLM.
+              '';
+            };
+
+            roles = mkOption {
+              type = nullOr luaInline;
+              default = null;
+              description = ''
+                The chat buffer places user and LLM responses under a H2 header.
+                These can be customized in the configuration.
+              '';
+            };
+          };
+
+          inline = {
+            adapter = mkOption {
+              type = nullOr str;
+              default = null;
+              description = "Adapter used for the inline strategy.";
+            };
+
+            variables = mkOption {
+              type = nullOr luaInline;
+              default = null;
+              description = ''
+                Define your own variables
+                to share specific content.
+              '';
+            };
+
+            keymaps = {
+              accept_change = {
+                n = mkOption {
+                  type = str;
+                  default = "ga";
+                  description = "Accept the suggested change.";
+                };
+              };
+
+              reject_change = {
+                n = mkOption {
+                  type = str;
+                  default = "gr";
+                  description = "Reject the suggested change.";
+                };
+              };
+            };
+          };
+        };
+
+        prompt_library = mkOption {
+          type = nullOr attrs;
+          default = null;
+          description = ''
+            A prompt library is a collection of prompts
+            that can be used in the action palette.
+          '';
+        };
+      };
+    };
+  };
+}
diff --git a/modules/plugins/assistant/codecompanion/config.nix b/modules/plugins/assistant/codecompanion/config.nix
new file mode 100644
index 00000000..6b427d28
--- /dev/null
+++ b/modules/plugins/assistant/codecompanion/config.nix
@@ -0,0 +1,27 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+
+  cfg = config.vim.assistant.codecompanion-nvim;
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      startPlugins = [
+        "plenary-nvim"
+      ];
+
+      lazy.plugins = {
+        codecompanion-nvim = {
+          package = "codecompanion-nvim";
+          setupModule = "codecompanion";
+          inherit (cfg) setupOpts;
+        };
+      };
+
+      treesitter.enable = true;
+    };
+  };
+}
diff --git a/modules/plugins/assistant/codecompanion/default.nix b/modules/plugins/assistant/codecompanion/default.nix
new file mode 100644
index 00000000..7f7b4452
--- /dev/null
+++ b/modules/plugins/assistant/codecompanion/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./config.nix
+    ./codecompanion-nvim.nix
+  ];
+}
diff --git a/modules/plugins/assistant/default.nix b/modules/plugins/assistant/default.nix
index 5b5cf323..697d54f6 100644
--- a/modules/plugins/assistant/default.nix
+++ b/modules/plugins/assistant/default.nix
@@ -2,5 +2,6 @@
   imports = [
     ./chatgpt
     ./copilot
+    ./codecompanion
   ];
 }
diff --git a/npins/sources.json b/npins/sources.json
index daad4177..a1d5d19c 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -243,6 +243,18 @@
       "url": "https://github.com/ray-x/cmp-treesitter/archive/958fcfa0d8ce46d215e19cc3992c542f576c4123.tar.gz",
       "hash": "05as01c2f7i20zkzpqbq9n8ji9bcwd678ixmxnrz9vmz5zsj8q7i"
     },
+    "codecompanion-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "olimorris",
+        "repo": "codecompanion.nvim"
+      },
+      "branch": "main",
+      "revision": "dd81bd9176daba9ea507cd0457f662c0a15c001f",
+      "url": "https://github.com/olimorris/codecompanion.nvim/archive/dd81bd9176daba9ea507cd0457f662c0a15c001f.tar.gz",
+      "hash": "09a20q1hshp07nf9n8w4cxpa8s32vwyd4ya0gdnx5jp7g00dksrg"
+    },
     "codewindow-nvim": {
       "type": "Git",
       "repository": {

From b3d59642370ba52e61e6db65d1b85937e2d6f210 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 16 Mar 2025 19:31:25 +0300
Subject: [PATCH 006/202] pins: bump all plugins

---
 npins/sources.json | 346 ++++++++++++++++++++++-----------------------
 1 file changed, 173 insertions(+), 173 deletions(-)

diff --git a/npins/sources.json b/npins/sources.json
index a1d5d19c..54256514 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -8,9 +8,9 @@
         "repo": "aerial.nvim"
       },
       "branch": "master",
-      "revision": "3284a2cb858ba009c79da87d5e010ccee3c99c4d",
-      "url": "https://github.com/stevearc/aerial.nvim/archive/3284a2cb858ba009c79da87d5e010ccee3c99c4d.tar.gz",
-      "hash": "0fsvd6ndkp3r8lzpyshqshapna5sh37nz6qabznpwpwax42ghakp"
+      "revision": "2204cf08791449a6a2fd2ef187a29112eeefd989",
+      "url": "https://github.com/stevearc/aerial.nvim/archive/2204cf08791449a6a2fd2ef187a29112eeefd989.tar.gz",
+      "hash": "1482md9kzyrr7mjkca3nnyqgy64q8clhi6xbvgql8qjw7ifz51mx"
     },
     "alpha-nvim": {
       "type": "Git",
@@ -46,10 +46,10 @@
       "pre_releases": false,
       "version_upper_bound": null,
       "release_prefix": null,
-      "version": "v0.12.4",
-      "revision": "a5625f1b14fb5c44b0f9256f5ec0714817f5e355",
-      "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v0.12.4",
-      "hash": "0jdifjifxjqa8r80wlqgkn5rm48wziap92340xz228nrgd0c9g69"
+      "version": "v0.13.1",
+      "revision": "29861baf37bbb16f5dbf524a6edac5daaad6f4fc",
+      "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v0.13.1",
+      "hash": "1y5p7i6g884r65mhfsazx28g0qs37hc57jm37i7kch9kcf8m7sbq"
     },
     "blink-cmp-spell": {
       "type": "Git",
@@ -59,9 +59,9 @@
         "repo": "blink-cmp-spell"
       },
       "branch": "master",
-      "revision": "38d6797dea6f72baa6e8b3bfca6da96d8fcac64d",
-      "url": "https://github.com/ribru17/blink-cmp-spell/archive/38d6797dea6f72baa6e8b3bfca6da96d8fcac64d.tar.gz",
-      "hash": "19pnasa446iiapgsr3z2fpk0nnrzh8g5wrzrq8n0y4q0z6spc9f6"
+      "revision": "782bc76be09c0c5dd08e3edd04e4ec1054c3158e",
+      "url": "https://github.com/ribru17/blink-cmp-spell/archive/782bc76be09c0c5dd08e3edd04e4ec1054c3158e.tar.gz",
+      "hash": "13adgj9qxfmbwzvx348kpkm70h0jli9qv3bqhkwh8p6zkfajm607"
     },
     "blink-compat": {
       "type": "Git",
@@ -95,9 +95,9 @@
         "repo": "blink-ripgrep.nvim"
       },
       "branch": "main",
-      "revision": "305e1ae5363f527abdfd71915a3fe1f42af52824",
-      "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/305e1ae5363f527abdfd71915a3fe1f42af52824.tar.gz",
-      "hash": "1hcfyicgf33dlr2hhgnhhzdcxxqw1v8v1yjfbnwvlcsgw0rhjl8w"
+      "revision": "91aee73557237b0cc1313e4ed2b32f10de6cc65e",
+      "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/91aee73557237b0cc1313e4ed2b32f10de6cc65e.tar.gz",
+      "hash": "1jg4559946rzsvvny1r7jki1gmr70yjxr8qlnsjkjyxj8h0pjjwl"
     },
     "bufdelete-nvim": {
       "type": "Git",
@@ -119,9 +119,9 @@
         "repo": "nvim"
       },
       "branch": "main",
-      "revision": "4bb938bbba41d306db18bf0eb0633a5f28fd7ba0",
-      "url": "https://github.com/catppuccin/nvim/archive/4bb938bbba41d306db18bf0eb0633a5f28fd7ba0.tar.gz",
-      "hash": "112q9iqfp6ay13c1ca1s9svhxqfgnqfn0a1k2s7dy9ydswwmcxbk"
+      "revision": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429",
+      "url": "https://github.com/catppuccin/nvim/archive/5b5e3aef9ad7af84f463d17b5479f06b87d5c429.tar.gz",
+      "hash": "0jmrwag2dx4b1g9x32xwxcr8y0l159hqks09z5miy99wav6dy7z2"
     },
     "ccc-nvim": {
       "type": "Git",
@@ -251,9 +251,9 @@
         "repo": "codecompanion.nvim"
       },
       "branch": "main",
-      "revision": "dd81bd9176daba9ea507cd0457f662c0a15c001f",
-      "url": "https://github.com/olimorris/codecompanion.nvim/archive/dd81bd9176daba9ea507cd0457f662c0a15c001f.tar.gz",
-      "hash": "09a20q1hshp07nf9n8w4cxpa8s32vwyd4ya0gdnx5jp7g00dksrg"
+      "revision": "4f56b047f03bf5edc0d71bf0ca694243a49b912f",
+      "url": "https://github.com/olimorris/codecompanion.nvim/archive/4f56b047f03bf5edc0d71bf0ca694243a49b912f.tar.gz",
+      "hash": "1mrb8qxd6mz5dlly9bh30pcd599gfy173f6pd4p8lszs3xhp598k"
     },
     "codewindow-nvim": {
       "type": "Git",
@@ -287,9 +287,9 @@
         "repo": "conform.nvim"
       },
       "branch": "master",
-      "revision": "a6f5bdb78caa305496357d17e962bbc4c0b392e2",
-      "url": "https://github.com/stevearc/conform.nvim/archive/a6f5bdb78caa305496357d17e962bbc4c0b392e2.tar.gz",
-      "hash": "1jkm8pbfnp2s9y70cc67pj2fa25a4jl1y4lx6y1k5i323f4lplhz"
+      "revision": "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d",
+      "url": "https://github.com/stevearc/conform.nvim/archive/db8a4a9edb217067b1d7a2e0362c74bfe9cc944d.tar.gz",
+      "hash": "13vpizk8ani64d3a9yrm0g3bz8m6m6cxnpzr2xgslbhxnkmbxq7j"
     },
     "copilot-cmp": {
       "type": "Git",
@@ -323,9 +323,9 @@
         "repo": "crates.nvim"
       },
       "branch": "main",
-      "revision": "1803c8b5516610ba7cdb759a4472a78414ee6cd4",
-      "url": "https://github.com/Saecki/crates.nvim/archive/1803c8b5516610ba7cdb759a4472a78414ee6cd4.tar.gz",
-      "hash": "0bqcdsbhs1ab51nmqd3cx7p6nlpmrjj0a53hax9scpqzr23nvr66"
+      "revision": "403a0abef0e2aec12749a534dc468d6fd50c6741",
+      "url": "https://github.com/Saecki/crates.nvim/archive/403a0abef0e2aec12749a534dc468d6fd50c6741.tar.gz",
+      "hash": "19ix86nbww5vljinfwfpjkz806j7dzw4pgjyjya201jb0n22lrc6"
     },
     "csharpls-extended-lsp-nvim": {
       "type": "Git",
@@ -335,9 +335,9 @@
         "repo": "csharpls-extended-lsp.nvim"
       },
       "branch": "master",
-      "revision": "7768c15fe901fd58bfd557034a3cad191a820cfb",
-      "url": "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/archive/7768c15fe901fd58bfd557034a3cad191a820cfb.tar.gz",
-      "hash": "0s2jpc22c6s9nnp47kia01bv95xipyn08d0s0pax11fddv2b951f"
+      "revision": "991d2c43afd7c7be77edd27a2ae686f9779382da",
+      "url": "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/archive/991d2c43afd7c7be77edd27a2ae686f9779382da.tar.gz",
+      "hash": "10jj6x78k34yrarp5ydc7n1ylp2xxgxl7jqh1y4d133mgcygabak"
     },
     "dashboard-nvim": {
       "type": "Git",
@@ -407,9 +407,9 @@
         "repo": "elixir-tools.nvim"
       },
       "branch": "main",
-      "revision": "f7e18753f5587b422aac628249fa46c66ed24af3",
-      "url": "https://github.com/elixir-tools/elixir-tools.nvim/archive/f7e18753f5587b422aac628249fa46c66ed24af3.tar.gz",
-      "hash": "06h1aqdkr3c5samz819j8c1cgnz636p6qbiavg504fd4kqz3ykzr"
+      "revision": "6beae8194152e2d8b4a59de19a3e60c1f7ffcff5",
+      "url": "https://github.com/elixir-tools/elixir-tools.nvim/archive/6beae8194152e2d8b4a59de19a3e60c1f7ffcff5.tar.gz",
+      "hash": "0kncq60x3kvy4plszq4zygrsy6cyzf43g2xgzqwif88i85ki7zq6"
     },
     "fastaction-nvim": {
       "type": "Git",
@@ -443,9 +443,9 @@
         "repo": "flutter-tools.nvim"
       },
       "branch": "main",
-      "revision": "d135e1d02f6a3a8808efc2b58950ab1fdd49d000",
-      "url": "https://github.com/akinsho/flutter-tools.nvim/archive/d135e1d02f6a3a8808efc2b58950ab1fdd49d000.tar.gz",
-      "hash": "06hiiwzb00lc7qalq74lyydks8v007fnsbpkgpkfm7zki0dg22m7"
+      "revision": "70430c32d176f4a15c6e2c80586cd2791e3a664e",
+      "url": "https://github.com/akinsho/flutter-tools.nvim/archive/70430c32d176f4a15c6e2c80586cd2791e3a664e.tar.gz",
+      "hash": "01p721ca4as9b9nn4qibb6s775fn66j13zsx2d3flhkssii06v45"
     },
     "friendly-snippets": {
       "type": "Git",
@@ -467,9 +467,9 @@
         "repo": "fzf-lua"
       },
       "branch": "main",
-      "revision": "9b84b53f3297d4912d7eb95b979e9b27e2e61281",
-      "url": "https://github.com/ibhagwan/fzf-lua/archive/9b84b53f3297d4912d7eb95b979e9b27e2e61281.tar.gz",
-      "hash": "1p3fb68h7x50b6m6aaxxqcylipa5rdg0yfz6jlrd5i2kmr5gxldq"
+      "revision": "03eed634a3b1f4a4dc53f928868566b0b697dabe",
+      "url": "https://github.com/ibhagwan/fzf-lua/archive/03eed634a3b1f4a4dc53f928868566b0b697dabe.tar.gz",
+      "hash": "007fz9rwhcfx8l6k6dfnm91dcc4gsazr3vqbv95z5l1h1j184v6c"
     },
     "gesture-nvim": {
       "type": "Git",
@@ -515,9 +515,9 @@
         "repo": "gitsigns.nvim"
       },
       "branch": "main",
-      "revision": "4c40357994f386e72be92a46f41fc1664c84c87d",
-      "url": "https://github.com/lewis6991/gitsigns.nvim/archive/4c40357994f386e72be92a46f41fc1664c84c87d.tar.gz",
-      "hash": "1d3i82g5barb9afk7ra3gmcwwjvaqp49sbdz0acki4a0yc80m31w"
+      "revision": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9",
+      "url": "https://github.com/lewis6991/gitsigns.nvim/archive/7010000889bfb6c26065e0b0f7f1e6aa9163edd9.tar.gz",
+      "hash": "0hl572j5l1bqg51rg545bavxs8kxya02ss3fj5fxvp9ylrnaqsx9"
     },
     "glow-nvim": {
       "type": "Git",
@@ -539,9 +539,9 @@
         "repo": "gruvbox.nvim"
       },
       "branch": "main",
-      "revision": "089b60e92aa0a1c6fa76ff527837cd35b6f5ac81",
-      "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/089b60e92aa0a1c6fa76ff527837cd35b6f5ac81.tar.gz",
-      "hash": "0mr8q2xi4s2anibll8lhxax7q1akyg687bp5r58gckkhi04064q4"
+      "revision": "15958f5ee43e144856cd2084ce6c571bfdb44504",
+      "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/15958f5ee43e144856cd2084ce6c571bfdb44504.tar.gz",
+      "hash": "16nrxcpds3zacqmfw5jsd5d8qqbwllkw9xacjkglcnaynp4qghqq"
     },
     "harpoon": {
       "type": "Git",
@@ -563,9 +563,9 @@
         "repo": "haskell-tools.nvim"
       },
       "branch": "master",
-      "revision": "834d949f3911297fd657787c73f647be9675ae53",
-      "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/834d949f3911297fd657787c73f647be9675ae53.tar.gz",
-      "hash": "1l4jm6010mhjq8bvjc0sbqh0bfadyrq2wisdvsjrgjb0h0w1s8d4"
+      "revision": "52608d83b424de44e914711c0f505906816e7427",
+      "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/52608d83b424de44e914711c0f505906816e7427.tar.gz",
+      "hash": "1ngz8zzyni2wh0xhvrcl27am39kqaaabh5y9c4i8ym211ravzhv6"
     },
     "highlight-undo-nvim": {
       "type": "Git",
@@ -662,9 +662,9 @@
         "repo": "leap.nvim"
       },
       "branch": "main",
-      "revision": "8b826a9fc766bffd14288aee01847cb0d6c6c383",
-      "url": "https://github.com/ggandor/leap.nvim/archive/8b826a9fc766bffd14288aee01847cb0d6c6c383.tar.gz",
-      "hash": "1biydwaky3104c1dys8m37yalrgcwyjyprlbk31j82y4mvmd1lmy"
+      "revision": "346a16ef942635a8ca5ff92e603d07e7e8be6cbe",
+      "url": "https://github.com/ggandor/leap.nvim/archive/346a16ef942635a8ca5ff92e603d07e7e8be6cbe.tar.gz",
+      "hash": "0rq73f7sw1sf8dn6angwgns8jd811aiixmvrndgqz2939dlqaw2l"
     },
     "leetcode-nvim": {
       "type": "Git",
@@ -697,9 +697,9 @@
         "repo": "lsp_signature.nvim"
       },
       "branch": "master",
-      "revision": "693b75f1dc31f5af45ceb762966a6ab00af1850b",
-      "url": "https://github.com/ray-x/lsp_signature.nvim/archive/693b75f1dc31f5af45ceb762966a6ab00af1850b.tar.gz",
-      "hash": "0jfiips0ddbry91h52k671sll0zfqpz10dc8fw0w5np6lwiy7z34"
+      "revision": "8b681c86b0bd7f932cd91987983d91497e43d83f",
+      "url": "https://github.com/ray-x/lsp_signature.nvim/archive/8b681c86b0bd7f932cd91987983d91497e43d83f.tar.gz",
+      "hash": "1ap077hgl334klfyi2hv81hf6r9mqpkarrz0b3ky99aavz7bmn2j"
     },
     "lspkind-nvim": {
       "type": "Git",
@@ -745,9 +745,9 @@
         "repo": "lualine.nvim"
       },
       "branch": "master",
-      "revision": "f4f791f67e70d378a754d02da068231d2352e5bc",
-      "url": "https://github.com/hoob3rt/lualine.nvim/archive/f4f791f67e70d378a754d02da068231d2352e5bc.tar.gz",
-      "hash": "12jm3vc3mi0p9kjw7g1cd6a9nkgws1mvq2h7lpfmflad8zfmw35q"
+      "revision": "b8b60c7f1d0d95ad74ee215b2291280b30482476",
+      "url": "https://github.com/hoob3rt/lualine.nvim/archive/b8b60c7f1d0d95ad74ee215b2291280b30482476.tar.gz",
+      "hash": "02xyjp446b2nypw3hh4k6b6g9f892kxmmdv23s7dypcws28v50m9"
     },
     "luasnip": {
       "type": "Git",
@@ -769,9 +769,9 @@
         "repo": "lz.n"
       },
       "branch": "master",
-      "revision": "eb94a39433518b26a0eeb117b937b21dc6b18713",
-      "url": "https://github.com/nvim-neorocks/lz.n/archive/eb94a39433518b26a0eeb117b937b21dc6b18713.tar.gz",
-      "hash": "1sarbbj53b5f4mcj6b1iqkbjacrh3w63vp8dpz6j802wqwvi51wc"
+      "revision": "d5856041d60f9500804c872709b8d5f59505d92b",
+      "url": "https://github.com/nvim-neorocks/lz.n/archive/d5856041d60f9500804c872709b8d5f59505d92b.tar.gz",
+      "hash": "1dxsy8baq7zdc047ixxxa1qkfw48jgbng4vngwlg6gc2rv16rf36"
     },
     "lzn-auto-require": {
       "type": "Git",
@@ -841,9 +841,9 @@
         "repo": "mini.base16"
       },
       "branch": "main",
-      "revision": "d64302f57a692a2ff2c9a4556935780133f821f9",
-      "url": "https://github.com/echasnovski/mini.base16/archive/d64302f57a692a2ff2c9a4556935780133f821f9.tar.gz",
-      "hash": "1vkhhqb9785ypmp7bzqljxfdjg5gz5jxkxp0wl6iacjvwwf18dq7"
+      "revision": "44240f11871c15aba8fc49959ebd27c0b4768a40",
+      "url": "https://github.com/echasnovski/mini.base16/archive/44240f11871c15aba8fc49959ebd27c0b4768a40.tar.gz",
+      "hash": "0z4vvsm2hc1cab5qqd28x6jzyzh23cdijrrs1hkkkj0nj3si3zkn"
     },
     "mini-basics": {
       "type": "Git",
@@ -865,9 +865,9 @@
         "repo": "mini.bracketed"
       },
       "branch": "main",
-      "revision": "95e1023c1734c805ad3b9da364fc3518e0881c70",
-      "url": "https://github.com/echasnovski/mini.bracketed/archive/95e1023c1734c805ad3b9da364fc3518e0881c70.tar.gz",
-      "hash": "0is5mk998v3givmlfq5c09pdww7bm1nmrwm5iijhvjgc2rlxxlc4"
+      "revision": "0ec65567ffde0ad4d94d794d55f3b627203b496a",
+      "url": "https://github.com/echasnovski/mini.bracketed/archive/0ec65567ffde0ad4d94d794d55f3b627203b496a.tar.gz",
+      "hash": "05xg63hw83n99al5sylysbq1xpschlj547s3j484jjs7wsbzzp6c"
     },
     "mini-bufremove": {
       "type": "Git",
@@ -889,9 +889,9 @@
         "repo": "mini.clue"
       },
       "branch": "main",
-      "revision": "3ba5f3ff9afbf8c962bf69a483a890e414ba4697",
-      "url": "https://github.com/echasnovski/mini.clue/archive/3ba5f3ff9afbf8c962bf69a483a890e414ba4697.tar.gz",
-      "hash": "0j9l26kzvsc0p7xssav97r28cnqbr5av6k64nz83n3xx5xlndnp0"
+      "revision": "08901d2223797aa25611c33aaf9d8a1049a653bb",
+      "url": "https://github.com/echasnovski/mini.clue/archive/08901d2223797aa25611c33aaf9d8a1049a653bb.tar.gz",
+      "hash": "026d647acwxr0wrf43lffmzw4x84jm6v5lipbqqpicqgqs8b4rfv"
     },
     "mini-colors": {
       "type": "Git",
@@ -901,9 +901,9 @@
         "repo": "mini.colors"
       },
       "branch": "main",
-      "revision": "60306b701f574c3f7111a7ef67de208d0c121bbd",
-      "url": "https://github.com/echasnovski/mini.colors/archive/60306b701f574c3f7111a7ef67de208d0c121bbd.tar.gz",
-      "hash": "1avblmv2alra43dlq94czmnd4rsjwng66yjg7xcn4bs358z13kzw"
+      "revision": "d49e0764821d40adbf3f9e92091dfba0b0590378",
+      "url": "https://github.com/echasnovski/mini.colors/archive/d49e0764821d40adbf3f9e92091dfba0b0590378.tar.gz",
+      "hash": "1kn5012q6x1hfpyjqhssydln3v6b25gvvjw1zhw93m8x9km2j524"
     },
     "mini-comment": {
       "type": "Git",
@@ -925,9 +925,9 @@
         "repo": "mini.completion"
       },
       "branch": "main",
-      "revision": "dd457bfecf68fb67107f8668b46f745a219c045a",
-      "url": "https://github.com/echasnovski/mini.completion/archive/dd457bfecf68fb67107f8668b46f745a219c045a.tar.gz",
-      "hash": "1aharapzl1ll2fpyhl88n47ni12p0mndgpgi34jn57k3mhj0pcgy"
+      "revision": "8f439dfb5432f9a78fb172ec7e03ee31f18551c4",
+      "url": "https://github.com/echasnovski/mini.completion/archive/8f439dfb5432f9a78fb172ec7e03ee31f18551c4.tar.gz",
+      "hash": "0y4zzp4najk2bydwzx72nbn18n32v6ar0dc2qgialszivy0nnhgh"
     },
     "mini-diff": {
       "type": "Git",
@@ -973,9 +973,9 @@
         "repo": "mini.files"
       },
       "branch": "main",
-      "revision": "5900f50608771af55c6cc4f0817152e5e89de820",
-      "url": "https://github.com/echasnovski/mini.files/archive/5900f50608771af55c6cc4f0817152e5e89de820.tar.gz",
-      "hash": "1xq2b3xacn5haamw5vmwzmjqqgacrwmfp0yci69kmgpxa8ac3dq0"
+      "revision": "0a396f5ca5516a07959ae2c00667e1a26c20f0ea",
+      "url": "https://github.com/echasnovski/mini.files/archive/0a396f5ca5516a07959ae2c00667e1a26c20f0ea.tar.gz",
+      "hash": "1axjd6a6c02jllhi1l8c9xfplipvz4g82hnxjbsgx4kzc9b60zdq"
     },
     "mini-fuzzy": {
       "type": "Git",
@@ -985,9 +985,9 @@
         "repo": "mini.fuzzy"
       },
       "branch": "main",
-      "revision": "345ff7f65f50177c5567c43ec2c79973cb1278fe",
-      "url": "https://github.com/echasnovski/mini.fuzzy/archive/345ff7f65f50177c5567c43ec2c79973cb1278fe.tar.gz",
-      "hash": "18ylb8v7g21r87qkl86hng3zvw9c2q163z535m5m85dxnrxzlgcm"
+      "revision": "fb42763285075e316fd4250739af9b8c442503de",
+      "url": "https://github.com/echasnovski/mini.fuzzy/archive/fb42763285075e316fd4250739af9b8c442503de.tar.gz",
+      "hash": "0hl5ygzlf73g70j7pdd1x4975368sqpynpja1zx7bc5jln698vr4"
     },
     "mini-git": {
       "type": "Git",
@@ -1021,9 +1021,9 @@
         "repo": "mini.hues"
       },
       "branch": "main",
-      "revision": "6b039a95f8fbc002ea79086b8617a1022a5aea5b",
-      "url": "https://github.com/echasnovski/mini.hues/archive/6b039a95f8fbc002ea79086b8617a1022a5aea5b.tar.gz",
-      "hash": "1cyk4abrkd6y5hkkh05cywvhg8116aiv7p8yihfcjwgrcjwkwsan"
+      "revision": "7a88e67dfb953820718106d8fc83d0f97c4d9173",
+      "url": "https://github.com/echasnovski/mini.hues/archive/7a88e67dfb953820718106d8fc83d0f97c4d9173.tar.gz",
+      "hash": "1kgjkx9bqycmm077i4jk0fnyl47fkmmd2vv0qf6lqsnnliivqxqw"
     },
     "mini-icons": {
       "type": "Git",
@@ -1093,9 +1093,9 @@
         "repo": "mini.misc"
       },
       "branch": "main",
-      "revision": "bfd8ee265d9cb1f9fcba7a8ae0899fbf84e33d5e",
-      "url": "https://github.com/echasnovski/mini.misc/archive/bfd8ee265d9cb1f9fcba7a8ae0899fbf84e33d5e.tar.gz",
-      "hash": "1fd3ah7gsm8zyagl3mk09aqrj8s2m0gxrx225nwbvb8i2pi0g1c1"
+      "revision": "a477a9d5790f6d899d3055c87f2e771118f91180",
+      "url": "https://github.com/echasnovski/mini.misc/archive/a477a9d5790f6d899d3055c87f2e771118f91180.tar.gz",
+      "hash": "1fp60lhv93jiygc0hvchzdzjgs8scczp7kv9cm3kzzimcfa84ky6"
     },
     "mini-move": {
       "type": "Git",
@@ -1117,9 +1117,9 @@
         "repo": "mini.notify"
       },
       "branch": "main",
-      "revision": "f8c84f89c8d981a979f915bd64a2f97bbad285d4",
-      "url": "https://github.com/echasnovski/mini.notify/archive/f8c84f89c8d981a979f915bd64a2f97bbad285d4.tar.gz",
-      "hash": "0raw9chqjgwxqdiqqk9xjxgkjf6rg14c7968pvfvfh9jkjdasxg8"
+      "revision": "e71f08013db6812d9ce95c2624ae405a4267f4f3",
+      "url": "https://github.com/echasnovski/mini.notify/archive/e71f08013db6812d9ce95c2624ae405a4267f4f3.tar.gz",
+      "hash": "0fmy3d62283j2cwlxk97fyylad2zkd5j2r7pg7fb3cq8k1021d0s"
     },
     "mini-operators": {
       "type": "Git",
@@ -1129,9 +1129,9 @@
         "repo": "mini.operators"
       },
       "branch": "main",
-      "revision": "81e5059268154f5a8b594c95748968febdd539e3",
-      "url": "https://github.com/echasnovski/mini.operators/archive/81e5059268154f5a8b594c95748968febdd539e3.tar.gz",
-      "hash": "066mh426wr9pb137d8b65cl5hkcgmal9mr8y94r3xya7649207mh"
+      "revision": "02cfac95919b945c19221f0fcebe883c6dce04f6",
+      "url": "https://github.com/echasnovski/mini.operators/archive/02cfac95919b945c19221f0fcebe883c6dce04f6.tar.gz",
+      "hash": "1b51b3d1qkbzh68yadx3fcx9dgk405cb2ghln999fl5czvc3crmd"
     },
     "mini-pairs": {
       "type": "Git",
@@ -1153,9 +1153,9 @@
         "repo": "mini.pick"
       },
       "branch": "main",
-      "revision": "bdd189e6b7741177db53875cbc6071f1c8dc6fbd",
-      "url": "https://github.com/echasnovski/mini.pick/archive/bdd189e6b7741177db53875cbc6071f1c8dc6fbd.tar.gz",
-      "hash": "1cxifi4vlfknk4i2grdrx5nbzw9jzj6s0ybbmwrcvs1cj9dhzbzh"
+      "revision": "12ea14f8e285d1bcc909116685fdbb129a89d546",
+      "url": "https://github.com/echasnovski/mini.pick/archive/12ea14f8e285d1bcc909116685fdbb129a89d546.tar.gz",
+      "hash": "1ssa7ym6zxhazx551bjsnfdmvm1553kj6amvcczw9jrqbf4ynjqy"
     },
     "mini-sessions": {
       "type": "Git",
@@ -1201,9 +1201,9 @@
         "repo": "mini.starter"
       },
       "branch": "main",
-      "revision": "4f46dc11e1dd9f62310794121405853be8d6b13f",
-      "url": "https://github.com/echasnovski/mini.starter/archive/4f46dc11e1dd9f62310794121405853be8d6b13f.tar.gz",
-      "hash": "1iic2f3d93fjiqrk0q1iq3sb6ycbw4vag4c01wk5wj1jc58k3iz5"
+      "revision": "736c5177bd90cc852c05d903f662f0fc395a4b4b",
+      "url": "https://github.com/echasnovski/mini.starter/archive/736c5177bd90cc852c05d903f662f0fc395a4b4b.tar.gz",
+      "hash": "0w2awkcrabbsybvv2hlzjlqgcr53480pg5p3fhaaparrhd90c7na"
     },
     "mini-statusline": {
       "type": "Git",
@@ -1249,9 +1249,9 @@
         "repo": "mini.test"
       },
       "branch": "main",
-      "revision": "82ae4d87a23faa27e7e4119d4a5cf5897cbf1b70",
-      "url": "https://github.com/echasnovski/mini.test/archive/82ae4d87a23faa27e7e4119d4a5cf5897cbf1b70.tar.gz",
-      "hash": "0n3n7j8lkxp6mc0wf80ysnwxfw29zjqyfs3ghjl518xbsvjbgcz6"
+      "revision": "16a909c3ce39d9af9ec4dacca16205d36f85d823",
+      "url": "https://github.com/echasnovski/mini.test/archive/16a909c3ce39d9af9ec4dacca16205d36f85d823.tar.gz",
+      "hash": "1qf8ay763d011rvy9qwpv8q3mlxjlymvc4gx3bjfv0n56k5dzpg0"
     },
     "mini-trailspace": {
       "type": "Git",
@@ -1273,9 +1273,9 @@
         "repo": "mini.visits"
       },
       "branch": "main",
-      "revision": "8a2b551a86c556c8a26ce8d6402d03ded1cc7aec",
-      "url": "https://github.com/echasnovski/mini.visits/archive/8a2b551a86c556c8a26ce8d6402d03ded1cc7aec.tar.gz",
-      "hash": "1jwpvxlsr8wd5wakd22ah7h127hsxj6ds7jp5m99w2gnlymhsq41"
+      "revision": "46e7a4074032d0340308c3379bc3650626c85da8",
+      "url": "https://github.com/echasnovski/mini.visits/archive/46e7a4074032d0340308c3379bc3650626c85da8.tar.gz",
+      "hash": "1776i3xn9dpccjjamy5ys5acc3nxd3zph4a77sbw2dipfd8zpasi"
     },
     "minimap-vim": {
       "type": "Git",
@@ -1336,9 +1336,9 @@
         "repo": "neo-tree.nvim"
       },
       "branch": "main",
-      "revision": "c2f12ba9dba917d53dba13121c15d7903e28c24d",
-      "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/c2f12ba9dba917d53dba13121c15d7903e28c24d.tar.gz",
-      "hash": "07hh7gjjp4zdhwdhrrd3mvndd6cqf0lydhsb5hn0aqagm65z2jm3"
+      "revision": "d9544c74ec43cca0564fdc334c116fbe0be8a807",
+      "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/d9544c74ec43cca0564fdc334c116fbe0be8a807.tar.gz",
+      "hash": "0wiw4aipg3qmzw6k9vrljh4cg09kyqd28s6xpv2zhsg05mm38nhb"
     },
     "neocord": {
       "type": "Git",
@@ -1348,9 +1348,9 @@
         "repo": "neocord"
       },
       "branch": "main",
-      "revision": "4d55d8dab2d5f2f272192add7a2c21982039c699",
-      "url": "https://github.com/IogaMaster/neocord/archive/4d55d8dab2d5f2f272192add7a2c21982039c699.tar.gz",
-      "hash": "18d84bd5242a3khpsk0iya3i75bc65mc2xc9kjldpvb827m6myl3"
+      "revision": "41bacd44e9d36f5e36e0271672ac2c02f6fa355a",
+      "url": "https://github.com/IogaMaster/neocord/archive/41bacd44e9d36f5e36e0271672ac2c02f6fa355a.tar.gz",
+      "hash": "1n998zsv0bikscwpr75qq11xh559xzx6d7rs7fc21jj1rivkk4aw"
     },
     "neorg": {
       "type": "Git",
@@ -1360,9 +1360,9 @@
         "repo": "neorg"
       },
       "branch": "main",
-      "revision": "b47b4d3138beef51ffbf59bcbd7d149150b4bd2e",
-      "url": "https://github.com/nvim-neorg/neorg/archive/b47b4d3138beef51ffbf59bcbd7d149150b4bd2e.tar.gz",
-      "hash": "1x9sk24i8gyxssc8qz99x3d5nh3m2pi3srmv1f3fbgpffcgvl1yv"
+      "revision": "6f0b4eefa591fbc4c9344f110b0c0bac5b49078c",
+      "url": "https://github.com/nvim-neorg/neorg/archive/6f0b4eefa591fbc4c9344f110b0c0bac5b49078c.tar.gz",
+      "hash": "1x8h5hxzg06g1d849bna6rs4jzjf248g59v87zvlc4scmp9pzjga"
     },
     "neorg-telescope": {
       "type": "Git",
@@ -1384,9 +1384,9 @@
         "repo": "neovim-session-manager"
       },
       "branch": "master",
-      "revision": "270e235b014f0c37bf362eb1e8913d66bba33a2e",
-      "url": "https://github.com/Shatur/neovim-session-manager/archive/270e235b014f0c37bf362eb1e8913d66bba33a2e.tar.gz",
-      "hash": "16455f05wj5qjdvspj0hjwa77hsdhj3443h57lck3px33bz7n86h"
+      "revision": "3409dc920d40bec4c901c0a122a80bee03d6d1e1",
+      "url": "https://github.com/Shatur/neovim-session-manager/archive/3409dc920d40bec4c901c0a122a80bee03d6d1e1.tar.gz",
+      "hash": "1f7farfkr5ldpa7y7hz9sh8dp7538x1xvwr9n1zrra1szf7s8rlk"
     },
     "new-file-template-nvim": {
       "type": "Git",
@@ -1456,9 +1456,9 @@
         "repo": "nui.nvim"
       },
       "branch": "main",
-      "revision": "53e907ffe5eedebdca1cd503b00aa8692068ca46",
-      "url": "https://github.com/MunifTanjim/nui.nvim/archive/53e907ffe5eedebdca1cd503b00aa8692068ca46.tar.gz",
-      "hash": "1m4vlf9qcs01a8qrq3salcz966sp8cpf01gbrg8dbf255vzc8kp9"
+      "revision": "8d3bce9764e627b62b07424e0df77f680d47ffdb",
+      "url": "https://github.com/MunifTanjim/nui.nvim/archive/8d3bce9764e627b62b07424e0df77f680d47ffdb.tar.gz",
+      "hash": "0ia8q5d4xcss45vw6jlaanyr0migy03cjzq9g0kipfyqxkcxi105"
     },
     "nvim-autopairs": {
       "type": "Git",
@@ -1492,9 +1492,9 @@
         "repo": "nvim-cmp"
       },
       "branch": "main",
-      "revision": "5a11682453ac6b13dbf32cd403da4ee9c07ef1c3",
-      "url": "https://github.com/hrsh7th/nvim-cmp/archive/5a11682453ac6b13dbf32cd403da4ee9c07ef1c3.tar.gz",
-      "hash": "06n3barrl80i0y43q250l49q07f7hry9w5ggwlimv7jxvilih43l"
+      "revision": "1e1900b0769324a9675ef85b38f99cca29e203b3",
+      "url": "https://github.com/hrsh7th/nvim-cmp/archive/1e1900b0769324a9675ef85b38f99cca29e203b3.tar.gz",
+      "hash": "1yqg4gnzmlm9h5rcmzv7msjmqna0ffn7gllf5knfkps5ns0ynpyf"
     },
     "nvim-colorizer-lua": {
       "type": "Git",
@@ -1504,9 +1504,9 @@
         "repo": "nvim-colorizer.lua"
       },
       "branch": "master",
-      "revision": "943be69156b94fbc96064f4913d653f0c7fb299f",
-      "url": "https://github.com/NvChad/nvim-colorizer.lua/archive/943be69156b94fbc96064f4913d653f0c7fb299f.tar.gz",
-      "hash": "0fb973i0h0dq02zr7c9ivm9vk64w6h3px9db2gqb6rzrm2inf0m1"
+      "revision": "517df88cf2afb36652830df2c655df2da416a0ae",
+      "url": "https://github.com/NvChad/nvim-colorizer.lua/archive/517df88cf2afb36652830df2c655df2da416a0ae.tar.gz",
+      "hash": "0gaxkq30wvxq3d8x6l6r10vdxyizfi5g55xnvzw69lfyl61d9qy8"
     },
     "nvim-cursorline": {
       "type": "Git",
@@ -1528,9 +1528,9 @@
         "repo": "nvim-dap"
       },
       "branch": "master",
-      "revision": "6e0e8ab4d8ed520076971465a4388dfe54a91d83",
-      "url": "https://github.com/mfussenegger/nvim-dap/archive/6e0e8ab4d8ed520076971465a4388dfe54a91d83.tar.gz",
-      "hash": "09skngq8caazmggdmqs7490i8icg6fxzwf1nxkc0hkg6ja82b0nb"
+      "revision": "a720d4966f758ab22e8ec28812b6df90a53e0f02",
+      "url": "https://github.com/mfussenegger/nvim-dap/archive/a720d4966f758ab22e8ec28812b6df90a53e0f02.tar.gz",
+      "hash": "0b979dhl5jr3kx9j5zih39jbrv22d554ws6y8g1cgsm2i3412s4h"
     },
     "nvim-dap-go": {
       "type": "Git",
@@ -1600,9 +1600,9 @@
         "repo": "nvim-lspconfig"
       },
       "branch": "master",
-      "revision": "9e932edb0af4e20880685ddb96a231669fbe8091",
-      "url": "https://github.com/neovim/nvim-lspconfig/archive/9e932edb0af4e20880685ddb96a231669fbe8091.tar.gz",
-      "hash": "08hwg32a9yj78w4mh2idcpaig9qbx48ak8aqkp88z4wm65299v4r"
+      "revision": "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0",
+      "url": "https://github.com/neovim/nvim-lspconfig/archive/8a1529e46eef5efc86c34c8d9bdd313abc2ecba0.tar.gz",
+      "hash": "0l9mns71hh0jssxblr1q286z8hmxwbgyq1nw6scki9ffn23jwnz0"
     },
     "nvim-metals": {
       "type": "Git",
@@ -1612,9 +1612,9 @@
         "repo": "nvim-metals"
       },
       "branch": "main",
-      "revision": "5d27f4918ea954772725d6741f84a71cfaff932a",
-      "url": "https://github.com/scalameta/nvim-metals/archive/5d27f4918ea954772725d6741f84a71cfaff932a.tar.gz",
-      "hash": "17769ccpkkb53bikhfp2m809xs6p0mszb8d1hnssp1l0s3ip2j1f"
+      "revision": "fe6125f633c1b2f68d468a2041e81e2e5e8933d4",
+      "url": "https://github.com/scalameta/nvim-metals/archive/fe6125f633c1b2f68d468a2041e81e2e5e8933d4.tar.gz",
+      "hash": "1xpav9ykwk7kz61c6y33kyjxf0nf47risdj0q9gf5rnl88cln4by"
     },
     "nvim-navbuddy": {
       "type": "Git",
@@ -1696,9 +1696,9 @@
         "repo": "nvim-surround"
       },
       "branch": "main",
-      "revision": "ae298105122c87bbe0a36b1ad20b06d417c0433e",
-      "url": "https://github.com/kylechui/nvim-surround/archive/ae298105122c87bbe0a36b1ad20b06d417c0433e.tar.gz",
-      "hash": "1xrkg4is4spjwkzr6l0qmn3axlrm52d2wm69g2db83jww756pz1h"
+      "revision": "6c54643ef42016b744888b06d2381abd23f9b7ea",
+      "url": "https://github.com/kylechui/nvim-surround/archive/6c54643ef42016b744888b06d2381abd23f9b7ea.tar.gz",
+      "hash": "1c5agqfffmjxc73bv8d4hmrnzx62ikqpv7pii19v5alfdcnh5j48"
     },
     "nvim-tree-lua": {
       "type": "Git",
@@ -1708,9 +1708,9 @@
         "repo": "nvim-tree.lua"
       },
       "branch": "master",
-      "revision": "6709463b2d18e77f7a946027917aa00d4aaed6f4",
-      "url": "https://github.com/nvim-tree/nvim-tree.lua/archive/6709463b2d18e77f7a946027917aa00d4aaed6f4.tar.gz",
-      "hash": "1m26fvvsj4lxlwdinvnz8nz968n6x59w8n7zj7vsqm5i8yi84fr6"
+      "revision": "c09ff35de503a41fa62465c6b4ae72d96e7a7ce4",
+      "url": "https://github.com/nvim-tree/nvim-tree.lua/archive/c09ff35de503a41fa62465c6b4ae72d96e7a7ce4.tar.gz",
+      "hash": "0bnc2fc9ipz9yp917l61vvcaqmbdg5fhqxrp7jfjxj5qmvadhai9"
     },
     "nvim-treesitter-context": {
       "type": "Git",
@@ -1720,9 +1720,9 @@
         "repo": "nvim-treesitter-context"
       },
       "branch": "master",
-      "revision": "198720b4016af04c9590f375d714d5bf8afecc1a",
-      "url": "https://github.com/nvim-treesitter/nvim-treesitter-context/archive/198720b4016af04c9590f375d714d5bf8afecc1a.tar.gz",
-      "hash": "13msw9i509ncysbgkqbl2wr1c23iw3f4mxkw30sc1yk9x9nx49ri"
+      "revision": "572e534c9f881bb9bf9f388e4c87f360446c72d4",
+      "url": "https://github.com/nvim-treesitter/nvim-treesitter-context/archive/572e534c9f881bb9bf9f388e4c87f360446c72d4.tar.gz",
+      "hash": "0bg3x75j8mwvpdhwd945lxbwmhw2j1qi135zn0yli78c9jn8g0ay"
     },
     "nvim-ts-autotag": {
       "type": "Git",
@@ -1756,9 +1756,9 @@
         "repo": "nvim-web-devicons"
       },
       "branch": "master",
-      "revision": "1020869742ecb191f260818234517f4a1515cfe8",
-      "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/1020869742ecb191f260818234517f4a1515cfe8.tar.gz",
-      "hash": "024c8c5d6lpakgf9jxzrbkxk3r8haxa7qhmp8i4zsg35ycg6vqaq"
+      "revision": "d0cafff5c4347a604a07edf7bb9a91fda7eb577e",
+      "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/d0cafff5c4347a604a07edf7bb9a91fda7eb577e.tar.gz",
+      "hash": "1j5ccksn2lkd1f1fvhhjs2amhq17wxmgcqv6jk05jpdbngw2mv98"
     },
     "obsidian-nvim": {
       "type": "Git",
@@ -1804,9 +1804,9 @@
         "repo": "orgmode"
       },
       "branch": "master",
-      "revision": "c0cdcbdced83ceb9b9f058b402a8bfc5f64ab3a6",
-      "url": "https://github.com/nvim-orgmode/orgmode/archive/c0cdcbdced83ceb9b9f058b402a8bfc5f64ab3a6.tar.gz",
-      "hash": "0qwv2pg4s9spmy5wvkvflhcb0a2drlygch6hmjanj3g2kkn3ph5f"
+      "revision": "abf8890a9b0612c51d738268c759c4331bc2109c",
+      "url": "https://github.com/nvim-orgmode/orgmode/archive/abf8890a9b0612c51d738268c759c4331bc2109c.tar.gz",
+      "hash": "0j4f2y47s5ymii1w0r9gk39z4vks5fc9cy0rvj1vzml4vf4wijsi"
     },
     "otter-nvim": {
       "type": "Git",
@@ -1864,9 +1864,9 @@
         "repo": "precognition.nvim"
       },
       "branch": "main",
-      "revision": "24f2cc51dccecec4cf3de04bfbd14f5b9e79df0b",
-      "url": "https://github.com/tris203/precognition.nvim/archive/24f2cc51dccecec4cf3de04bfbd14f5b9e79df0b.tar.gz",
-      "hash": "0x7i2cim9jwc90v11wm61qbbq54m5581hsvj5jaash3gb5piacvw"
+      "revision": "4223fb903cbafc3bd8a87a314dac375bbd1c01ce",
+      "url": "https://github.com/tris203/precognition.nvim/archive/4223fb903cbafc3bd8a87a314dac375bbd1c01ce.tar.gz",
+      "hash": "11ng6p0xmrjky5xr9jdkrrav7is9r090qhs2fsnbg16124bgb0g5"
     },
     "project-nvim": {
       "type": "Git",
@@ -1900,9 +1900,9 @@
         "repo": "rainbow-delimiters.nvim"
       },
       "branch": "master",
-      "revision": "011d98eaa3a73b5a51d82ce5bc6b1397dde95562",
-      "url": "https://github.com/HiPhish/rainbow-delimiters.nvim/archive/011d98eaa3a73b5a51d82ce5bc6b1397dde95562.tar.gz",
-      "hash": "0b2hr4afdp9b30ckh772bg5wbscgdjvssn533988and27jassfaf"
+      "revision": "f1e5490e87478cf0b528250ebb51552f3d08436a",
+      "url": "https://github.com/HiPhish/rainbow-delimiters.nvim/archive/f1e5490e87478cf0b528250ebb51552f3d08436a.tar.gz",
+      "hash": "02265awjpkd8v6s22wx8qrk2wxq8b7c7h5lr9n7pi6d4lwyrkrxf"
     },
     "registers-nvim": {
       "type": "Git",
@@ -1924,9 +1924,9 @@
         "repo": "render-markdown.nvim"
       },
       "branch": "main",
-      "revision": "57fa691b9e374c6539cc0340062dac8f42d4bd8b",
-      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/57fa691b9e374c6539cc0340062dac8f42d4bd8b.tar.gz",
-      "hash": "1kfzj1sj1ljy3ihp7ic3n4cs82im61yh6xvr68m39jg5a1zmy9iv"
+      "revision": "08e1fa4e281e48ee4aa892428de9fb91e66edca6",
+      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/08e1fa4e281e48ee4aa892428de9fb91e66edca6.tar.gz",
+      "hash": "1kiwa88l2262ycfj6z70hdriml0y2wnji3l9w27jbky9zxwhazrs"
     },
     "rose-pine": {
       "type": "Git",
@@ -1936,9 +1936,9 @@
         "repo": "neovim"
       },
       "branch": "main",
-      "revision": "3fe41d3959110139e03bcbc6c0c648be83d06b33",
-      "url": "https://github.com/rose-pine/neovim/archive/3fe41d3959110139e03bcbc6c0c648be83d06b33.tar.gz",
-      "hash": "105bdjw4phv5229yp0zyrkvf8v6l38rgcp83qy7ap9vlna57fk46"
+      "revision": "7d1b5c7dcd274921f0f58e90a8bf935f6a95fbf3",
+      "url": "https://github.com/rose-pine/neovim/archive/7d1b5c7dcd274921f0f58e90a8bf935f6a95fbf3.tar.gz",
+      "hash": "0iy9is76bhgb17v0l7mr95mkhd9b4ah917v9shx74jp1xsgc481q"
     },
     "rtp-nvim": {
       "type": "Git",
@@ -1972,9 +1972,9 @@
         "repo": "rustaceanvim"
       },
       "branch": "master",
-      "revision": "2feffcf9aa0e160221caafd544c4dedf30414522",
-      "url": "https://github.com/mrcjkb/rustaceanvim/archive/2feffcf9aa0e160221caafd544c4dedf30414522.tar.gz",
-      "hash": "1x3fw90k78s3kx3hrhgk1zdv9wd2kbkhmip06q5s61p4zw6bns5r"
+      "revision": "c7cc0e00ec53cafaa38e258cba4a6507c180289b",
+      "url": "https://github.com/mrcjkb/rustaceanvim/archive/c7cc0e00ec53cafaa38e258cba4a6507c180289b.tar.gz",
+      "hash": "1514w2x5vpn790rz8wkah0chr7yz9sm5whaprnm1qc26fz4jwc17"
     },
     "smartcolumn-nvim": {
       "type": "Git",
@@ -2068,9 +2068,9 @@
         "repo": "toggleterm.nvim"
       },
       "branch": "main",
-      "revision": "e76134e682c1a866e3dfcdaeb691eb7b01068668",
-      "url": "https://github.com/akinsho/toggleterm.nvim/archive/e76134e682c1a866e3dfcdaeb691eb7b01068668.tar.gz",
-      "hash": "1jyg3nv54kssz2a4blpwhd718msf95zqz6sr2sqblc7b35gm73g1"
+      "revision": "9a88eae817ef395952e08650b3283726786fb5fb",
+      "url": "https://github.com/akinsho/toggleterm.nvim/archive/9a88eae817ef395952e08650b3283726786fb5fb.tar.gz",
+      "hash": "17plyvajwdhpiadsd80vph75qll8pv9571c2wnw35ngmw9gmnavz"
     },
     "tokyonight": {
       "type": "Git",
@@ -2116,9 +2116,9 @@
         "repo": "typst-preview.nvim"
       },
       "branch": "master",
-      "revision": "df393b47c5bc35abe4d60bb479afd0c15802fda8",
-      "url": "https://github.com/chomosuke/typst-preview.nvim/archive/df393b47c5bc35abe4d60bb479afd0c15802fda8.tar.gz",
-      "hash": "1k4ir8ss25fm58xfy0588wjim8dxl6vjdl4va2br3knx6jcy2jd8"
+      "revision": "ddcc71126f910ec83037622bc8d506f91a290ade",
+      "url": "https://github.com/chomosuke/typst-preview.nvim/archive/ddcc71126f910ec83037622bc8d506f91a290ade.tar.gz",
+      "hash": "1iqcbpgk87gcgnqd5dv8n4h4hbildp5hbjhnlwjx5zlzcg5qv2my"
     },
     "vim-dirtytalk": {
       "type": "Git",
@@ -2212,10 +2212,10 @@
         "repo": "yanky.nvim"
       },
       "branch": "main",
-      "revision": "9543d4c6c537720419bccb3338c4ddd5bb6fbd44",
-      "url": "https://github.com/gbprod/yanky.nvim/archive/9543d4c6c537720419bccb3338c4ddd5bb6fbd44.tar.gz",
-      "hash": "017v0f082pfd79q2j1naapybsmismflwdscn58mhbqh7s7mq8qk8"
+      "revision": "80d9385dbebe7049fd1961d7909b835a58ce9dcc",
+      "url": "https://github.com/gbprod/yanky.nvim/archive/80d9385dbebe7049fd1961d7909b835a58ce9dcc.tar.gz",
+      "hash": "1lg9nxc01shkazqk5g3j0iskiqbwr9sxv07sqrwkwlh36jn59rcp"
     }
   },
   "version": 3
-}
\ No newline at end of file
+}

From ed2ce4bd0241c1e24e53bc3465517a4823492569 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 16 Mar 2025 20:11:11 +0300
Subject: [PATCH 007/202] modules: clean up descriptions for colorizer &
 surround; add lazyload events to surround

---
 modules/plugins/ui/colorizer/colorizer.nix    | 20 +++++++++++--------
 modules/plugins/utility/surround/config.nix   |  3 ++-
 modules/plugins/utility/surround/surround.nix | 14 +++++++++----
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/modules/plugins/ui/colorizer/colorizer.nix b/modules/plugins/ui/colorizer/colorizer.nix
index 313097e7..1cee089f 100644
--- a/modules/plugins/ui/colorizer/colorizer.nix
+++ b/modules/plugins/ui/colorizer/colorizer.nix
@@ -102,11 +102,7 @@ in {
 
     setupOpts = mkPluginSetupOption "colorizer" {
       filetypes = mkOption {
-        description = ''
-          Filetypes to enable on and their option overrides.
-
-          "*" means enable on all filetypes. Filetypes prefixed with "!" are disabled.
-        '';
+        type = attrsOf settingSubmodule;
         default = {};
         example = {
           "*" = {};
@@ -115,13 +111,21 @@ in {
             AARRGGBB = false;
           };
         };
-        type = attrsOf settingSubmodule;
+        description = ''
+          Filetypes to enable on and their option overrides.
+
+          `"*"` means enable on all filetypes. Filetypes prefixed with `"!"` are disabled.
+        '';
       };
 
       user_default_options = mkOption {
-        description = "Default options";
-        default = {};
         type = settingSubmodule;
+        default = {};
+        description = ''
+          `user_default_options` is the second parameter to nvim-colorizer's setup function.
+
+          Anything set here is the inverse of the previous setup configuration.
+        '';
       };
     };
   };
diff --git a/modules/plugins/utility/surround/config.nix b/modules/plugins/utility/surround/config.nix
index 31b4033d..63a1f8d7 100644
--- a/modules/plugins/utility/surround/config.nix
+++ b/modules/plugins/utility/surround/config.nix
@@ -14,10 +14,11 @@ in {
     vim = {
       lazy.plugins.nvim-surround = {
         package = "nvim-surround";
-
         setupModule = "nvim-surround";
         inherit (cfg) setupOpts;
 
+        event = ["BufReadPre" "BufNewFile"];
+
         keys = [
           (mkLznKey "i" cfg.setupOpts.keymaps.insert)
           (mkLznKey "i" cfg.setupOpts.keymaps.insert_line)
diff --git a/modules/plugins/utility/surround/surround.nix b/modules/plugins/utility/surround/surround.nix
index 96ff5efb..475c283f 100644
--- a/modules/plugins/utility/surround/surround.nix
+++ b/modules/plugins/utility/surround/surround.nix
@@ -37,9 +37,13 @@ in {
       type = bool;
       default = false;
       description = ''
-        nvim-surround: add/change/delete surrounding delimiter pairs with ease.
-        Note that the default mappings deviate from upstream to avoid conflicts
-        with nvim-leap.
+        Whether to enable nvim-surround, Neovim plugin to add/change/delete
+        surrounding delimiter pairs with ease.
+
+        ::: {.note}
+        The default mappings deviate from upstream to avoid conflicts with nvim-leap.
+        You may change thsoe in your configuration if you do not use nvim-leap
+        :::
       '';
     };
     setupOpts = mkPluginSetupOption "nvim-surround" {
@@ -61,7 +65,9 @@ in {
     useVendoredKeybindings = mkOption {
       type = bool;
       default = true;
-      description = "Use alternative set of keybindings that avoids conflicts with other popular plugins, e.g. nvim-leap";
+      description = ''
+        Use alternative set of keybindings that avoids conflicts with other popular plugins, e.g. nvim-leap
+      '';
     };
   };
 }

From 07d7b7f3bdf5b974620bc4bc69dc9500504331af Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 16 Mar 2025 20:12:28 +0300
Subject: [PATCH 008/202] flake: bump inputs

---
 flake.lock | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3b624bec..72912dee 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1738453229,
-        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+        "lastModified": 1741352980,
+        "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+        "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1738852285,
-        "narHash": "sha256-8Y1uyE6gGHxdU0Vcx2CMg/dAmDSxJw19aAl3TKbbo54=",
+        "lastModified": 1741647548,
+        "narHash": "sha256-UqVAeOylufUGIx7BXSneFHD8eI6n0sVwEY2noFENnSE=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "6ae73dc9cb72cea17bcc2e3d4670825f483e80e8",
+        "rev": "3fb89e600e26b91d1795cf8a1a34e11e084b4a04",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1732053863,
-        "narHash": "sha256-DCIVdlb81Fct2uwzbtnawLBC/U03U2hqx8trqTJB7WA=",
+        "lastModified": 1741118843,
+        "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=",
         "owner": "oxalica",
         "repo": "nil",
-        "rev": "2e24c9834e3bb5aa2a3701d3713b43a6fb106362",
+        "rev": "577d160da311cc7f5042038456a0713e9863d09e",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1740303746,
-        "narHash": "sha256-XcdiWLEhjJkMxDLKQJ0CCivmYYCvA5MDxu9pMybM5kM=",
+        "lastModified": 1741865919,
+        "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2d068ae5c6516b2d04562de50a58c682540de9bf",
+        "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a",
         "type": "github"
       },
       "original": {
@@ -93,14 +93,17 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1738452942,
-        "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
+        "lastModified": 1740877520,
+        "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c",
+        "type": "github"
       },
       "original": {
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
       }
     },
     "nmd": {
@@ -138,11 +141,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731983527,
-        "narHash": "sha256-JECaBgC0pQ91Hq3W4unH6K9to8s2Zl2sPNu7bLOv4ek=",
+        "lastModified": 1741055476,
+        "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "71287228d96e9568e1e70c6bbfa3f992d145947b",
+        "rev": "aefb7017d710f150970299685e8d8b549d653649",
         "type": "github"
       },
       "original": {

From dc2a38f273b0694379bb3d701cee6e5136401ebd Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 16 Mar 2025 20:13:20 +0300
Subject: [PATCH 009/202] utility/surround: fix typo in description

---
 modules/plugins/utility/surround/surround.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/utility/surround/surround.nix b/modules/plugins/utility/surround/surround.nix
index 475c283f..2819b6d6 100644
--- a/modules/plugins/utility/surround/surround.nix
+++ b/modules/plugins/utility/surround/surround.nix
@@ -42,7 +42,7 @@ in {
 
         ::: {.note}
         The default mappings deviate from upstream to avoid conflicts with nvim-leap.
-        You may change thsoe in your configuration if you do not use nvim-leap
+        You may change those in your configuration if you do not use nvim-leap
         :::
       '';
     };

From cacbac08fb0738ca26da8ae1c321cadb1fc7dd6d Mon Sep 17 00:00:00 2001
From: raf <me@notashelf.dev>
Date: Sun, 16 Mar 2025 22:50:05 +0000
Subject: [PATCH 010/202] utiltiy/snacks-nvim: init module (#712)

---
 docs/release-notes/rl-0.8.md                  |  4 ++++
 modules/plugins/utility/default.nix           |  1 +
 .../plugins/utility/snacks-nvim/config.nix    | 20 +++++++++++++++++++
 .../plugins/utility/snacks-nvim/default.nix   |  6 ++++++
 .../utility/snacks-nvim/snacks-nvim.nix       | 12 +++++++++++
 npins/sources.json                            | 15 ++++++++------
 6 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 modules/plugins/utility/snacks-nvim/config.nix
 create mode 100644 modules/plugins/utility/snacks-nvim/default.nix
 create mode 100644 modules/plugins/utility/snacks-nvim/snacks-nvim.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 9f05f60a..353eeac1 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -13,6 +13,7 @@
 [render-markdown.nvim]: https://github.com/MeanderingProgrammer/render-markdown.nvim
 [yanky.nvim]: https://github.com/gbprod/yanky.nvim
 [yazi.nvim]: https://github.com/mikavilpas/yazi.nvim
+[snacks.nvim]: https://github.com/folke/snacks.nvim
 
 - Add [typst-preview.nvim] under
   `languages.typst.extensions.typst-preview-nvim`.
@@ -62,6 +63,9 @@
 
 - Add [yazi.nvim] as a companion plugin for Yazi, the terminal file manager.
 
+- Add [snacks.nvim] under `vim.utility.snacks-nvim` as a general-purpose utility
+  plugin.
+
 [amadaluzia](https://github.com/amadaluzia):
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix
index a1574b97..cbe776cc 100644
--- a/modules/plugins/utility/default.nix
+++ b/modules/plugins/utility/default.nix
@@ -17,6 +17,7 @@
     ./nix-develop
     ./outline
     ./preview
+    ./snacks-nvim
     ./surround
     ./telescope
     ./wakatime
diff --git a/modules/plugins/utility/snacks-nvim/config.nix b/modules/plugins/utility/snacks-nvim/config.nix
new file mode 100644
index 00000000..e726e3e2
--- /dev/null
+++ b/modules/plugins/utility/snacks-nvim/config.nix
@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.lua) toLuaObject;
+  inherit (lib.nvim.dag) entryAnywhere;
+
+  cfg = config.vim.utility.snacks-nvim;
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      startPlugins = ["snacks-nvim"];
+      pluginRC.snacks-nvim = entryAnywhere ''
+        require("snacks").setup(${toLuaObject cfg.setupOpts});
+      '';
+    };
+  };
+}
diff --git a/modules/plugins/utility/snacks-nvim/default.nix b/modules/plugins/utility/snacks-nvim/default.nix
new file mode 100644
index 00000000..8a712baa
--- /dev/null
+++ b/modules/plugins/utility/snacks-nvim/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./config.nix
+    ./snacks-nvim.nix
+  ];
+}
diff --git a/modules/plugins/utility/snacks-nvim/snacks-nvim.nix b/modules/plugins/utility/snacks-nvim/snacks-nvim.nix
new file mode 100644
index 00000000..30fd6f89
--- /dev/null
+++ b/modules/plugins/utility/snacks-nvim/snacks-nvim.nix
@@ -0,0 +1,12 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.utility.snacks-nvim = {
+    enable = mkEnableOption ''
+      collection of QoL plugins for Neovim [snacks-nvim]
+    '';
+
+    setupOpts = mkPluginSetupOption "snacks-nvim" {};
+  };
+}
diff --git a/npins/sources.json b/npins/sources.json
index 54256514..3e903dc3 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -1989,16 +1989,19 @@
       "hash": "0k1xnyvblshn4fhbxgl0i34j22n55xlwr09sdmb23l57br5rb07q"
     },
     "snacks-nvim": {
-      "type": "Git",
+      "type": "GitRelease",
       "repository": {
         "type": "GitHub",
         "owner": "folke",
         "repo": "snacks.nvim"
       },
-      "branch": "main",
-      "revision": "bc0630e43be5699bb94dadc302c0d21615421d93",
-      "url": "https://github.com/folke/snacks.nvim/archive/bc0630e43be5699bb94dadc302c0d21615421d93.tar.gz",
-      "hash": "0a5nw7xa33shag1h12gf930g3vcixbwk8dxv0ji4980ycskh238v"
+      "pre_releases": false,
+      "version_upper_bound": null,
+      "release_prefix": null,
+      "version": "v2.22.0",
+      "revision": "5eac729fa290248acfe10916d92a5ed5e5c0f9ed",
+      "url": "https://api.github.com/repos/folke/snacks.nvim/tarball/v2.22.0",
+      "hash": "1hbm4fnw51qdp0nz83fcxbvnxjq2k57a37w6dp0wz6wkcx7cwxw9"
     },
     "sqls-nvim": {
       "type": "Git",
@@ -2218,4 +2221,4 @@
     }
   },
   "version": 3
-}
+}
\ No newline at end of file

From bc978c4fad0645a2cc010783b2f411b8800e9a37 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 17 Mar 2025 11:46:33 +0300
Subject: [PATCH 011/202] diagnostics/nvim-lint: fix invalid setup table call

---
 .../plugins/diagnostics/nvim-lint/config.nix  |  2 +-
 .../diagnostics/nvim-lint/nvim-lint.nix       | 30 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/modules/plugins/diagnostics/nvim-lint/config.nix b/modules/plugins/diagnostics/nvim-lint/config.nix
index dac2c2f4..49517f72 100644
--- a/modules/plugins/diagnostics/nvim-lint/config.nix
+++ b/modules/plugins/diagnostics/nvim-lint/config.nix
@@ -13,7 +13,7 @@ in {
     vim = {
       startPlugins = ["nvim-lint"];
       pluginRC.nvim-lint = entryAnywhere ''
-        require("lint").setup(${toLuaObject cfg.setupOpts})
+        require("lint").linters_by_ft(${toLuaObject cfg.linters_by_ft})
       '';
     };
   };
diff --git a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
index 2211211e..b08d82be 100644
--- a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
+++ b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
@@ -1,27 +1,25 @@
 {lib, ...}: let
   inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.types) attrsOf listOf str;
-  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.diagnostics.nvim-lint = {
     enable = mkEnableOption "asynchronous linter plugin for Neovim [nvim-lint]";
-    setupOpts = mkPluginSetupOption "nvim-lint" {
-      linters_by_ft = mkOption {
-        type = attrsOf (listOf str);
-        default = {};
-        example = {
-          text = ["vale"];
-          markdown = ["vale"];
-        };
 
-        description = ''
-          Map of filetype to formatters. This option takes a set of
-          `key = value` format where the `value` will be converted
-          to its Lua equivalent. You are responsible for passing the
-          correct Nix data types to generate a correct Lua value that
-          conform is able to accept.
-        '';
+    # nvim-lint does not have a setup table.
+    linters_by_ft = mkOption {
+      type = attrsOf (listOf str);
+      default = {};
+      example = {
+        text = ["vale"];
+        markdown = ["vale"];
       };
+      description = ''
+        Map of filetype to formatters. This option takes a set of `key = value`
+        format where the `value` will be converted to its Lua equivalent
+        through `toLuaObject. You are responsible for passing the correct Nix
+        data types to generate a correct Lua value that conform is able to
+        accept.
+      '';
     };
   };
 }

From 0367f490ba978597c979d973098dd795be8bb30d Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 17 Mar 2025 20:25:57 +0300
Subject: [PATCH 012/202] lsp/lspsaga: convert setupOpts format

---
 docs/release-notes/rl-0.8.md            |  3 +++
 modules/plugins/lsp/lspsaga/config.nix  | 16 ++++++----------
 modules/plugins/lsp/lspsaga/lspsaga.nix | 17 +++++++++++++++--
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 353eeac1..278b0a68 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -66,6 +66,9 @@
 - Add [snacks.nvim] under `vim.utility.snacks-nvim` as a general-purpose utility
   plugin.
 
+- Move LSPSaga to `setupOpts` format, allowing freeform configuration in
+  `vim.lsp.lspsaga.setupOpts`.
+
 [amadaluzia](https://github.com/amadaluzia):
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
diff --git a/modules/plugins/lsp/lspsaga/config.nix b/modules/plugins/lsp/lspsaga/config.nix
index 3af6b7f1..2d2903a6 100644
--- a/modules/plugins/lsp/lspsaga/config.nix
+++ b/modules/plugins/lsp/lspsaga/config.nix
@@ -4,12 +4,12 @@
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.strings) optionalString;
   inherit (lib.nvim.dag) entryAnywhere;
   inherit (lib.nvim.binds) addDescriptionsToMappings mkSetLuaBinding;
+  inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.lsp;
-  self = import ./lspsaga.nix {inherit lib;};
+  self = import ./lspsaga.nix {inherit config lib;};
 
   mappingDefinitions = self.options.vim.lsp.lspsaga.mappings;
   mappings = addDescriptionsToMappings cfg.lspsaga.mappings mappingDefinitions;
@@ -18,6 +18,10 @@ in {
     vim = {
       startPlugins = ["lspsaga-nvim"];
 
+      pluginRC.lspsaga = entryAnywhere ''
+        require('lspsaga').init_lsp_saga(${toLuaObject cfg.lspsaga.setupOpts})
+      '';
+
       maps = {
         visual = mkSetLuaBinding mappings.codeAction "require('lspsaga.codeaction').range_code_action";
         normal = mkMerge [
@@ -40,14 +44,6 @@ in {
           (mkIf (!cfg.lspSignature.enable) (mkSetLuaBinding mappings.signatureHelp "require('lspsaga.signaturehelp').signature_help"))
         ];
       };
-
-      pluginRC.lspsaga = entryAnywhere ''
-        require('lspsaga').init_lsp_saga({
-          ${optionalString config.vim.ui.borders.plugins.lspsaga.enable ''
-          border_style = '${config.vim.ui.borders.plugins.lspsaga.style}',
-        ''}
-        })
-      '';
     };
   };
 }
diff --git a/modules/plugins/lsp/lspsaga/lspsaga.nix b/modules/plugins/lsp/lspsaga/lspsaga.nix
index f308aaaa..59fea808 100644
--- a/modules/plugins/lsp/lspsaga/lspsaga.nix
+++ b/modules/plugins/lsp/lspsaga/lspsaga.nix
@@ -1,10 +1,23 @@
-{lib, ...}: let
-  inherit (lib.options) mkEnableOption;
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.nvim.binds) mkMappingOption;
+  inherit (lib.nvim.types) borderType mkPluginSetupOption;
 in {
   options.vim.lsp.lspsaga = {
     enable = mkEnableOption "LSP Saga";
 
+    setupOpts = mkPluginSetupOption "lspsaga" {
+      border_style = mkOption {
+        type = borderType;
+        default = config.vim.ui.borders.globalStyle;
+        description = "Border type, see {command}`:help nvim_open_win`";
+      };
+    };
+
     mappings = {
       lspFinder = mkMappingOption "LSP Finder [LSPSaga]" "<leader>lf";
       renderHoveredDoc = mkMappingOption "Rendered hovered docs [LSPSaga]" "<leader>lh";

From af26fb3c7da1a8707a9c5c5bf9482cebabdcdbd3 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 17 Mar 2025 20:30:59 +0300
Subject: [PATCH 013/202] docs/custom-plugins: fix invalid backlink to DAG
 section

---
 docs/manual/configuring/custom-plugins/configuring.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/manual/configuring/custom-plugins/configuring.md b/docs/manual/configuring/custom-plugins/configuring.md
index c0935f03..5106d29b 100644
--- a/docs/manual/configuring/custom-plugins/configuring.md
+++ b/docs/manual/configuring/custom-plugins/configuring.md
@@ -67,7 +67,7 @@ of individual sections of configuration as needed. nvf provides helper functions
 in the extended library, usually under `inputs.nvf.lib.nvim.dag` that you may
 use.
 
-Please refer to the [DAG section](/index.xhtml#ch-dag-entries) in the nvf manual
+Please refer to the [DAG section](#ch-dag-entries) in the nvf manual
 to find out more about the DAG system.
 :::
 

From 93d375af64c5db55e6be86a8bb27323a24b85452 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 18 Mar 2025 12:49:03 +0300
Subject: [PATCH 014/202] minimap/minimap-vim: move code-minimap to
 `extraPackages`

---
 modules/plugins/minimap/minimap-vim/config.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/plugins/minimap/minimap-vim/config.nix b/modules/plugins/minimap/minimap-vim/config.nix
index 5276a426..a39b9590 100644
--- a/modules/plugins/minimap/minimap-vim/config.nix
+++ b/modules/plugins/minimap/minimap-vim/config.nix
@@ -10,13 +10,13 @@
   cfg = config.vim.minimap.minimap-vim;
 in {
   config = mkIf cfg.enable {
-    vim.startPlugins = [
-      pkgs.code-minimap
-      "minimap-vim"
-    ];
+    vim = {
+      startPlugins = ["minimap-vim"];
+      extraPackages = [pkgs.code-minimap];
 
-    vim.binds.whichKey.register = pushDownDefault {
-      "<leader>m" = "+Minimap";
+      binds.whichKey.register = pushDownDefault {
+        "<leader>m" = "+Minimap";
+      };
     };
   };
 }

From a297acc368f1f56310d422767e277886f3685d7f Mon Sep 17 00:00:00 2001
From: Gerg-L <88247690+Gerg-L@users.noreply.github.com>
Date: Tue, 18 Mar 2025 09:51:20 +0000
Subject: [PATCH 015/202] flake: update mnw (#723)

---
 flake.lock                       |  6 +++---
 modules/wrapper/build/config.nix | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index 72912dee..3ced812a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1741647548,
-        "narHash": "sha256-UqVAeOylufUGIx7BXSneFHD8eI6n0sVwEY2noFENnSE=",
+        "lastModified": 1742255973,
+        "narHash": "sha256-XfEGVKatTgEMMOVb4SNp1LYLQOSzzrFTDMVDTZFyMVE=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "3fb89e600e26b91d1795cf8a1a34e11e084b4a04",
+        "rev": "b982dbd5e6d55d4438832b3567c09bc2a129649d",
         "type": "github"
       },
       "original": {
diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix
index d145f798..3c778169 100644
--- a/modules/wrapper/build/config.nix
+++ b/modules/wrapper/build/config.nix
@@ -6,9 +6,8 @@
   ...
 }: let
   inherit (pkgs) vimPlugins;
-  inherit (lib.strings) isString;
-  inherit (lib.lists) filter map;
-  inherit (builtins) path;
+  inherit (lib.trivial) flip;
+  inherit (builtins) path filter isString;
 
   getPin = name: ((pkgs.callPackages ../../../npins/sources.nix {}) // config.vim.pluginOverrides).${name};
 
@@ -76,13 +75,6 @@
     buildConfigPlugins config.vim.optPlugins
   );
 
-  # additional Lua and Python3 packages, mapped to their respective functions
-  # to conform to the format mnw expects. end user should
-  # only ever need to pass a list of packages, which are modified
-  # here
-  extraLuaPackages = ps: map (x: ps.${x}) config.vim.luaPackages;
-  extraPython3Packages = ps: map (x: ps.${x}) config.vim.python3Packages;
-
   # Wrap the user's desired (unwrapped) Neovim package with arguments that'll be used to
   # generate a wrapped Neovim package.
   neovim-wrapped = inputs.mnw.lib.wrap pkgs {
@@ -92,9 +84,17 @@
     extraBinPath = config.vim.extraPackages;
     initLua = config.vim.builtLuaConfigRC;
     luaFiles = config.vim.extraLuaFiles;
+    providers = {
+      python3 = {
+        enable = config.vim.withPython3;
+        extraPackages = ps: map (flip builtins.getAttr ps) config.vim.python3Packages;
+      };
+      ruby.enable = config.vim.withRuby;
+      nodeJs.enable = config.vim.withNodeJs;
+    };
+    aliases = lib.optional config.vim.viAlias "vi" ++ lib.optional config.vim.vimAlias "vim";
 
-    inherit (config.vim) viAlias vimAlias withRuby withNodeJs withPython3;
-    inherit extraLuaPackages extraPython3Packages;
+    extraLuaPackages = ps: map (flip builtins.getAttr ps) config.vim.luaPackages;
   };
 
   dummyInit = pkgs.writeText "nvf-init.lua" config.vim.builtLuaConfigRC;

From e473a4ddb15090e791b202531e165e969d600b93 Mon Sep 17 00:00:00 2001
From: raf <me@notashelf.dev>
Date: Tue, 18 Mar 2025 09:52:07 +0000
Subject: [PATCH 016/202] lsp/lspsaga: update source; lazyload; remove keybinds
 (#724)

* pins: point lspsaga to new source

Stop using the fork, the author is back.

* pins: point lspsaga to new source

Stop using the fork, the author is back.
---
 docs/release-notes/rl-0.8.md            |  9 +++++
 modules/plugins/lsp/lspsaga/config.nix  | 45 ++++++-------------------
 modules/plugins/lsp/lspsaga/lspsaga.nix | 34 +++++++------------
 npins/sources.json                      |  8 ++---
 4 files changed, 36 insertions(+), 60 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 278b0a68..399e2712 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -2,11 +2,18 @@
 
 ## Breaking changes
 
+[Lspsaga documentation]: https://nvimdev.github.io/lspsaga/
+
 - `git-conflict` keybinds are now prefixed with `<leader>` to avoid conflicting
   with builtins.
 
 - `alpha` is now configured with nix, default config removed.
 
+- Lspsaga module no longer ships default keybindings. The keybind format has
+  been changed by upstream, and old keybindings do not have equivalents under
+  the new API they provide. Please manually set your keybinds according to
+  [Lspsaga documentation] following the new API.
+
 [NotAShelf](https://github.com/notashelf):
 
 [typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim
@@ -69,6 +76,8 @@
 - Move LSPSaga to `setupOpts` format, allowing freeform configuration in
   `vim.lsp.lspsaga.setupOpts`.
 
+- Lazyload Lspsaga and remove default keybindings for it.
+
 [amadaluzia](https://github.com/amadaluzia):
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
diff --git a/modules/plugins/lsp/lspsaga/config.nix b/modules/plugins/lsp/lspsaga/config.nix
index 2d2903a6..811d0178 100644
--- a/modules/plugins/lsp/lspsaga/config.nix
+++ b/modules/plugins/lsp/lspsaga/config.nix
@@ -3,47 +3,24 @@
   lib,
   ...
 }: let
-  inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.nvim.dag) entryAnywhere;
-  inherit (lib.nvim.binds) addDescriptionsToMappings mkSetLuaBinding;
-  inherit (lib.nvim.lua) toLuaObject;
+  inherit (lib.modules) mkIf mkDefault;
 
   cfg = config.vim.lsp;
-  self = import ./lspsaga.nix {inherit config lib;};
-
-  mappingDefinitions = self.options.vim.lsp.lspsaga.mappings;
-  mappings = addDescriptionsToMappings cfg.lspsaga.mappings mappingDefinitions;
 in {
   config = mkIf (cfg.enable && cfg.lspsaga.enable) {
     vim = {
-      startPlugins = ["lspsaga-nvim"];
+      lazy.plugins.lspsaga-nvim = {
+        package = "lspsaga-nvim";
+        setupModule = "lspsaga";
+        inherit (cfg.lspsaga) setupOpts;
 
-      pluginRC.lspsaga = entryAnywhere ''
-        require('lspsaga').init_lsp_saga(${toLuaObject cfg.lspsaga.setupOpts})
-      '';
-
-      maps = {
-        visual = mkSetLuaBinding mappings.codeAction "require('lspsaga.codeaction').range_code_action";
-        normal = mkMerge [
-          (mkSetLuaBinding mappings.lspFinder "require('lspsaga.provider').lsp_finder")
-          (mkSetLuaBinding mappings.renderHoveredDoc "require('lspsaga.hover').render_hover_doc")
-
-          (mkSetLuaBinding mappings.smartScrollUp "function() require('lspsaga.action').smart_scroll_with_saga(-1) end")
-          (mkSetLuaBinding mappings.smartScrollDown "function() require('lspsaga.action').smart_scroll_with_saga(1) end")
-
-          (mkSetLuaBinding mappings.rename "require('lspsaga.rename').rename")
-          (mkSetLuaBinding mappings.previewDefinition "require('lspsaga.provider').preview_definition")
-
-          (mkSetLuaBinding mappings.showLineDiagnostics "require('lspsaga.diagnostic').show_line_diagnostics")
-          (mkSetLuaBinding mappings.showCursorDiagnostics "require('lspsaga.diagnostic').show_cursor_diagnostics")
-
-          (mkSetLuaBinding mappings.nextDiagnostic "require('lspsaga.diagnostic').navigate('next')")
-          (mkSetLuaBinding mappings.previousDiagnostic "require('lspsaga.diagnostic').navigate('prev')")
-
-          (mkSetLuaBinding mappings.codeAction "require('lspsaga.codeaction').code_action")
-          (mkIf (!cfg.lspSignature.enable) (mkSetLuaBinding mappings.signatureHelp "require('lspsaga.signaturehelp').signature_help"))
-        ];
+        event = ["LspAttach"];
       };
+
+      # Optional dependencies, pretty useful to enhance default functionality of
+      # Lspsaga.
+      treesitter.enable = mkDefault true;
+      visuals.nvim-web-devicons.enable = mkDefault true;
     };
   };
 }
diff --git a/modules/plugins/lsp/lspsaga/lspsaga.nix b/modules/plugins/lsp/lspsaga/lspsaga.nix
index 59fea808..39ce6298 100644
--- a/modules/plugins/lsp/lspsaga/lspsaga.nix
+++ b/modules/plugins/lsp/lspsaga/lspsaga.nix
@@ -3,10 +3,21 @@
   lib,
   ...
 }: let
+  inherit (lib.modules) mkRemovedOptionModule;
   inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.nvim.binds) mkMappingOption;
   inherit (lib.nvim.types) borderType mkPluginSetupOption;
 in {
+  imports = [
+    (mkRemovedOptionModule ["vim" "lsp" "lspsaga" "mappings"] ''
+      Lspsaga mappings have been removed from nvf, as the original author has made
+      very drastic changes to the API after taking back ownership, and the fork we
+      used is now archived. Please refer to Lspsaga documentation to add keybinds
+      for functionality you have used.
+
+      <https://nvimdev.github.io/lspsaga>
+    '')
+  ];
+
   options.vim.lsp.lspsaga = {
     enable = mkEnableOption "LSP Saga";
 
@@ -17,26 +28,5 @@ in {
         description = "Border type, see {command}`:help nvim_open_win`";
       };
     };
-
-    mappings = {
-      lspFinder = mkMappingOption "LSP Finder [LSPSaga]" "<leader>lf";
-      renderHoveredDoc = mkMappingOption "Rendered hovered docs [LSPSaga]" "<leader>lh";
-
-      smartScrollUp = mkMappingOption "Smart scroll up [LSPSaga]" "<C-f>";
-      smartScrollDown = mkMappingOption "Smart scroll up [LSPSaga]" "<C-b>";
-
-      rename = mkMappingOption "Rename [LSPSaga]" "<leader>lr";
-      previewDefinition = mkMappingOption "Preview definition [LSPSaga]" "<leader>ld";
-
-      showLineDiagnostics = mkMappingOption "Show line diagnostics [LSPSaga]" "<leader>ll";
-      showCursorDiagnostics = mkMappingOption "Show cursor diagnostics [LSPSaga]" "<leader>lc";
-
-      nextDiagnostic = mkMappingOption "Next diagnostic [LSPSaga]" "<leader>ln";
-      previousDiagnostic = mkMappingOption "Previous diagnostic [LSPSaga]" "<leader>lp";
-
-      codeAction = mkMappingOption "Code action [LSPSaga]" "<leader>ca";
-
-      signatureHelp = mkMappingOption "Signature help [LSPSaga]" "<leader>ls";
-    };
   };
 }
diff --git a/npins/sources.json b/npins/sources.json
index 3e903dc3..91c3f68e 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -717,13 +717,13 @@
       "type": "Git",
       "repository": {
         "type": "GitHub",
-        "owner": "tami5",
+        "owner": "nvimdev",
         "repo": "lspsaga.nvim"
       },
       "branch": "main",
-      "revision": "5faeec9f2508d2d49a66c0ac0d191096b4e3fa81",
-      "url": "https://github.com/tami5/lspsaga.nvim/archive/5faeec9f2508d2d49a66c0ac0d191096b4e3fa81.tar.gz",
-      "hash": "1bw71db69na2sriv9q167z9bgkir4nwny1bdfv9z606bmng4hhzc"
+      "revision": "6063935cf68de9aa6dd79f8e1caf5df0a9385de3",
+      "url": "https://github.com/nvimdev/lspsaga.nvim/archive/6063935cf68de9aa6dd79f8e1caf5df0a9385de3.tar.gz",
+      "hash": "1pqasjg2f2yd3ci8hyxfqqs7xnkmwdc411dlm6qg1agiv1h8v205"
     },
     "lua-utils-nvim": {
       "type": "Git",

From 71081d084bdf01ff49a3d29f62860483f225be38 Mon Sep 17 00:00:00 2001
From: raf <me@notashelf.dev>
Date: Tue, 18 Mar 2025 14:40:45 +0000
Subject: [PATCH 017/202] completion/nvim-cmp: document default sources; allow
 override (#725)

---
 modules/plugins/completion/nvim-cmp/config.nix   |  6 ------
 modules/plugins/completion/nvim-cmp/nvim-cmp.nix | 16 +++++++++-------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/modules/plugins/completion/nvim-cmp/config.nix b/modules/plugins/completion/nvim-cmp/config.nix
index ce058876..749ebb7c 100644
--- a/modules/plugins/completion/nvim-cmp/config.nix
+++ b/modules/plugins/completion/nvim-cmp/config.nix
@@ -60,12 +60,6 @@ in {
         enableSharedCmpSources = true;
 
         nvim-cmp = {
-          sources = {
-            nvim-cmp = null;
-            buffer = "[Buffer]";
-            path = "[Path]";
-          };
-
           sourcePlugins = ["cmp-buffer" "cmp-path"];
 
           setupOpts = {
diff --git a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
index 0c790455..2c8c77d3 100644
--- a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
+++ b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
@@ -98,14 +98,16 @@ in {
 
     sources = mkOption {
       type = attrsOf (nullOr str);
-      default = {};
+      default = {
+        nvim-cmp = null;
+        buffer = "[Buffer]";
+        path = "[Path]";
+      };
+      example = {
+        nvim-cmp = null;
+        buffer = "[Buffer]";
+      };
       description = "The list of sources used by nvim-cmp";
-      example = literalExpression ''
-        {
-          nvim-cmp = null;
-          buffer = "[Buffer]";
-        }
-      '';
     };
 
     sourcePlugins = mkOption {

From a5dee946a9eb749649d17a9d4cd78271600247d0 Mon Sep 17 00:00:00 2001
From: raf <raf@notashelf.dev>
Date: Tue, 18 Mar 2025 20:34:34 +0000
Subject: [PATCH 018/202] blink-cmp: apply Nix patch; use new fetcher (#714)

* blink-cmp: apply Nix patch; use new fetcher

* completion/blink: don't break when modifying built-in sources.providers (#683)

* completion/blink-cmp: add missing options

**Blink breaks again, 11985891th recorded incident**

---------

Co-authored-by: Alfarel <alfarelcynthesis@proton.me>
---
 docs/release-notes/rl-0.8.md                  |  5 +-
 flake/legacyPackages/blink-cmp.nix            | 22 +++++++--
 .../completion/blink-cmp/blink-cmp.nix        | 48 ++++++++++++++++---
 .../plugins/completion/blink-cmp/config.nix   | 19 +++++++-
 4 files changed, 80 insertions(+), 14 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 399e2712..c84ef199 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -244,8 +244,9 @@
   syncing of nvim shell environment with direnv's.
 - Add [blink.cmp] source options and some default-disabled sources.
 - Add [blink.cmp] option to add
-  [friendly-snippets](https://github.com/rafamadriz/friendly-snippets) so
-  blink.cmp can source snippets from it.
+  [friendly-snippets](https://github.com/rafamadriz/friendly-snippets)
+  so blink.cmp can source snippets from it.
+- Fix [blink.cmp] breaking when built-in sources were modified.
 
 [TheColorman](https://github.com/TheColorman):
 
diff --git a/flake/legacyPackages/blink-cmp.nix b/flake/legacyPackages/blink-cmp.nix
index 924cb4cc..ba1d7424 100644
--- a/flake/legacyPackages/blink-cmp.nix
+++ b/flake/legacyPackages/blink-cmp.nix
@@ -5,6 +5,7 @@
   git,
   src,
   version,
+  fetchpatch,
 }: let
   blink-fuzzy-lib = rustPlatform.buildRustPackage {
     pname = "blink-fuzzy-lib";
@@ -13,11 +14,10 @@
     # TODO: remove this if plugin stops using nightly rust
     env.RUSTC_BOOTSTRAP = true;
 
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-F1wh/TjYoiIbDY3J/prVF367MKk3vwM7LqOpRobOs7I=";
+
     nativeBuildInputs = [git];
-    cargoLock = {
-      lockFile = "${src}/Cargo.lock";
-      allowBuiltinFetchGit = true;
-    };
   };
 
   libExt =
@@ -34,5 +34,19 @@ in
     preInstall = ''
       mkdir -p target/release
       ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.${libExt} target/release/libblink_cmp_fuzzy.${libExt}
+      echo -n "nix" > target/release/version
     '';
+
+    # Borrowed from nixpkgs
+    # TODO: Remove this patch when updating to next version
+    patches = [
+      (fetchpatch {
+        name = "blink-add-bypass-for-nix.patch";
+        url = "https://github.com/Saghen/blink.cmp/commit/6c83ef1ae34abd7ef9a32bfcd9595ac77b61037c.diff?full_index=1";
+        hash = "sha256-304F1gDDKVI1nXRvvQ0T1xBN+kHr3jdmwMMp8CNl+GU=";
+      })
+    ];
+
+    # Module for reproducing issues
+    nvimSkipModule = ["repro"];
   }
diff --git a/modules/plugins/completion/blink-cmp/blink-cmp.nix b/modules/plugins/completion/blink-cmp/blink-cmp.nix
index 4290e1cb..f5e38ed1 100644
--- a/modules/plugins/completion/blink-cmp/blink-cmp.nix
+++ b/modules/plugins/completion/blink-cmp/blink-cmp.nix
@@ -1,6 +1,6 @@
 {lib, ...}: let
   inherit (lib.options) mkEnableOption mkOption literalMD;
-  inherit (lib.types) listOf str either attrsOf submodule enum anything int nullOr;
+  inherit (lib.types) bool listOf str either attrsOf submodule enum anything int nullOr;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.types) mkPluginSetupOption luaInline pluginType;
   inherit (lib.nvim.binds) mkMappingOption;
@@ -21,8 +21,9 @@
     freeformType = anything;
     options = {
       module = mkOption {
-        type = str;
-        description = "module of the provider";
+        type = nullOr str;
+        default = null;
+        description = "Provider module.";
       };
     };
   };
@@ -40,7 +41,7 @@ in {
         providers = mkOption {
           type = attrsOf providerType;
           default = {};
-          description = "Settings for completion providers";
+          description = "Settings for completion providers.";
         };
 
         transform_items = mkOption {
@@ -63,6 +64,12 @@ in {
           default = [];
           description = "List of sources to enable for cmdline. Null means use default source list.";
         };
+
+        keymap = mkOption {
+          type = keymapType;
+          default = {};
+          description = "blink.cmp cmdline keymap";
+        };
       };
 
       completion = {
@@ -74,6 +81,16 @@ in {
             description = "Delay before auto show triggers";
           };
         };
+
+        menu.auto_show = mkOption {
+          type = bool;
+          default = true;
+          description = ''
+            Manages the appearance of the completion menu. You may prevent the menu
+            from automatically showing by this option to `false` and manually showing
+            it with the show keymap command.
+          '';
+        };
       };
 
       keymap = mkOption {
@@ -103,7 +120,25 @@ in {
       fuzzy = {
         prebuilt_binaries = {
           download = mkBool false ''
-            Auto-downloads prebuilt binaries. Do not enable, it doesn't work on nix
+            Auto-downloads prebuilt binaries.
+
+            ::: .{warning}
+            Do not enable this option, as it does **not work** on Nix!
+            :::
+          '';
+        };
+
+        implementation = mkOption {
+          type = enum ["lua" "prefer_rust" "rust" "prefer_rust_with_warning"];
+          default = "prefer_rust";
+          description = ''
+            fuzzy matcher implementation for Blink.
+
+            * `"lua"`: slower, Lua native fuzzy matcher implementation
+            * `"rust": use the SIMD fuzzy matcher, 'frizbee'
+            * `"prefer_rust"`: use the rust implementation, but fall back to lua
+            * `"prefer_rust_with_warning"`: use the rust implementation, and fall back to lua
+              if it is not available after emitting a warning.
           '';
         };
       };
@@ -122,12 +157,14 @@ in {
     sourcePlugins = let
       sourcePluginType = submodule {
         options = {
+          enable = mkEnableOption "this source";
           package = mkOption {
             type = pluginType;
             description = ''
               `blink-cmp` source plugin package.
             '';
           };
+
           module = mkOption {
             type = str;
             description = ''
@@ -136,7 +173,6 @@ in {
               Should be present in the source's documentation.
             '';
           };
-          enable = mkEnableOption "this source";
         };
       };
     in
diff --git a/modules/plugins/completion/blink-cmp/config.nix b/modules/plugins/completion/blink-cmp/config.nix
index 875a4fd4..9302332e 100644
--- a/modules/plugins/completion/blink-cmp/config.nix
+++ b/modules/plugins/completion/blink-cmp/config.nix
@@ -6,8 +6,8 @@
   inherit (lib.modules) mkIf;
   inherit (lib.strings) optionalString;
   inherit (lib.generators) mkLuaInline;
-  inherit (lib.attrsets) attrValues filterAttrs;
-  inherit (lib.lists) map optional;
+  inherit (lib.attrsets) attrValues filterAttrs mapAttrsToList;
+  inherit (lib.lists) map optional elem;
   inherit (lib.nvim.lua) toLuaObject;
   inherit (builtins) concatStringsSep typeOf tryEval attrNames mapAttrs;
 
@@ -24,7 +24,22 @@
 
   enabledBlinkSources = filterAttrs (_source: definition: definition.enable) cfg.sourcePlugins;
   blinkSourcePlugins = map (definition: definition.package) (attrValues enabledBlinkSources);
+
+  blinkBuiltins = [
+    "path"
+    "lsp"
+    "snippets"
+    "buffer"
+    "omni"
+  ];
 in {
+  assertions =
+    mapAttrsToList (provider: definition: {
+      assertion = elem provider blinkBuiltins || definition.module != null;
+      message = "`config.vim.autocomplete.blink-cmp.setupOpts.sources.providers.${provider}.module` is `null`: non-builtin providers must set `module`.";
+    })
+    cfg.setupOpts.sources.providers;
+
   vim = mkIf cfg.enable {
     startPlugins = ["blink-compat"] ++ blinkSourcePlugins ++ (optional cfg.friendly-snippets.enable "friendly-snippets");
     lazy.plugins = {

From d8a56fc5f59fce2c470c059d9810ddeb107528ec Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 20 Mar 2025 14:39:53 +0300
Subject: [PATCH 019/202] meta: update CODEOWNERS with new maintainers

---
 .github/CODEOWNERS | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index de6ff5ef..2fb071ca 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1,5 @@
-* @NotAShelf
+# Codeowners should be used to distinguish the maintainers of the project
+# and not contributors of specific modules to nvf. While adding a new module
+# please consider adding yourself to 'meta.maintainers' in the module instead
+# of CODEOWNERS here.
+* @NotAShelf @horriblename @Soliprem

From 3a28d05684f7f4e314eb4e56a5af624b648ab278 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Mar 2025 11:44:49 +0000
Subject: [PATCH 020/202] build(deps): bump beatlabs/delete-old-branches-action
 (#729)

Bumps [beatlabs/delete-old-branches-action](https://github.com/beatlabs/delete-old-branches-action) from 0.0.10 to 0.0.11.
- [Release notes](https://github.com/beatlabs/delete-old-branches-action/releases)
- [Commits](https://github.com/beatlabs/delete-old-branches-action/compare/v0.0.10...v0.0.11)

---
updated-dependencies:
- dependency-name: beatlabs/delete-old-branches-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cleanup.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
index 204dcba7..fbc12bc1 100644
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: "Delete old branches"
-        uses: beatlabs/delete-old-branches-action@v0.0.10
+        uses: beatlabs/delete-old-branches-action@v0.0.11
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           date: "1 months ago"

From 60c3a2ff1e2a30d1b245592da84f231098d4ec75 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <59727193+horriblename@users.noreply.github.com>
Date: Sat, 22 Mar 2025 17:57:21 +0100
Subject: [PATCH 021/202] nvim-lint: fix config syntax (#735)

---
 modules/plugins/diagnostics/nvim-lint/config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/diagnostics/nvim-lint/config.nix b/modules/plugins/diagnostics/nvim-lint/config.nix
index 49517f72..085140dc 100644
--- a/modules/plugins/diagnostics/nvim-lint/config.nix
+++ b/modules/plugins/diagnostics/nvim-lint/config.nix
@@ -13,7 +13,7 @@ in {
     vim = {
       startPlugins = ["nvim-lint"];
       pluginRC.nvim-lint = entryAnywhere ''
-        require("lint").linters_by_ft(${toLuaObject cfg.linters_by_ft})
+        require("lint").linters_by_ft = ${toLuaObject cfg.linters_by_ft}
       '';
     };
   };

From 58021beb1c952c55feb693c1469dd9e9c9c9e7a5 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 22 Mar 2025 15:01:51 +0100
Subject: [PATCH 022/202] lazy: fix incomplete event type

---
 modules/wrapper/lazy/lazy.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/wrapper/lazy/lazy.nix b/modules/wrapper/lazy/lazy.nix
index 5d67aa59..eb1f5cdf 100644
--- a/modules/wrapper/lazy/lazy.nix
+++ b/modules/wrapper/lazy/lazy.nix
@@ -126,7 +126,7 @@
       };
 
       event = mkOption {
-        type = nullOr (oneOf [str (listOf str) lznEvent]);
+        type = nullOr (oneOf [str lznEvent (listOf (either str lznEvent))]);
         default = null;
         description = "Lazy-load on event";
       };

From e2d10e8fb20c8a366a23bcd97535ecd3b3b940c8 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 22 Mar 2025 15:02:13 +0100
Subject: [PATCH 023/202] lazy: create LazyFile user event

---
 modules/wrapper/lazy/config.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/wrapper/lazy/config.nix b/modules/wrapper/lazy/config.nix
index 3468d5ec..c1bd8829 100644
--- a/modules/wrapper/lazy/config.nix
+++ b/modules/wrapper/lazy/config.nix
@@ -134,6 +134,15 @@ in {
       startPlugins = ["lz-n" "lzn-auto-require"];
 
       optPlugins = pluginPackages;
+      augroups = [{name = "nvf_lazy_file_hooks";}];
+      autocmds = [
+        {
+          event = ["BufReadPost" "BufNewFile" "BufWritePre"];
+          group = "nvf_lazy_file_hooks";
+          command = "doautocmd User LazyFile";
+          once = true;
+        }
+      ];
 
       lazy.builtLazyConfig = ''
         require('lz.n').load(${toLuaObject lznSpecs})

From c639cf50646abc67f87231654c49d749c8b16135 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 22 Mar 2025 15:02:40 +0100
Subject: [PATCH 024/202] copilot: load on LazyFile

---
 modules/plugins/assistant/copilot/config.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/plugins/assistant/copilot/config.nix b/modules/plugins/assistant/copilot/config.nix
index 37da046f..525fe3bd 100644
--- a/modules/plugins/assistant/copilot/config.nix
+++ b/modules/plugins/assistant/copilot/config.nix
@@ -37,6 +37,12 @@ in {
           inherit (cfg) setupOpts;
           after = mkIf cfg.cmp.enable "require('copilot_cmp').setup()";
 
+          event = [
+            {
+              event = "User";
+              pattern = "LazyFile";
+            }
+          ];
           cmd = ["Copilot" "CopilotAuth" "CopilotDetach" "CopilotPanel" "CopilotStop"];
           keys = [
             (mkLuaKeymap ["n"] cfg.mappings.panel.accept (wrapPanelBinding ''require("copilot.panel").accept'' cfg.mappings.panel.accept) "[copilot] Accept suggestion" {})

From 5f99c7f4e5cd7db5a3d0ef3e56b0beb75411f93a Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 22 Mar 2025 15:07:27 +0100
Subject: [PATCH 025/202] docs: update release notes

---
 docs/release-notes/rl-0.8.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index c84ef199..e1c1f38f 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -89,6 +89,7 @@
 [blink.cmp]: https://github.com/saghen/blink.cmp
 
 - Add [blink.cmp] support.
+- Add `LazyFile` user event.
 
 [diniamo](https://github.com/diniamo):
 
@@ -244,8 +245,8 @@
   syncing of nvim shell environment with direnv's.
 - Add [blink.cmp] source options and some default-disabled sources.
 - Add [blink.cmp] option to add
-  [friendly-snippets](https://github.com/rafamadriz/friendly-snippets)
-  so blink.cmp can source snippets from it.
+  [friendly-snippets](https://github.com/rafamadriz/friendly-snippets) so
+  blink.cmp can source snippets from it.
 - Fix [blink.cmp] breaking when built-in sources were modified.
 
 [TheColorman](https://github.com/TheColorman):

From d105f699219954d973a9f56c60b1be120b67fde4 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 22 Mar 2025 15:13:44 +0100
Subject: [PATCH 026/202] docs: mention LazyFile

---
 .../configuring/custom-plugins/lazy-method.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/manual/configuring/custom-plugins/lazy-method.md b/docs/manual/configuring/custom-plugins/lazy-method.md
index c6fd7106..ae766535 100644
--- a/docs/manual/configuring/custom-plugins/lazy-method.md
+++ b/docs/manual/configuring/custom-plugins/lazy-method.md
@@ -38,3 +38,22 @@ As of version **0.7**, we exposed an API for configuring lazy-loaded plugins via
   };
 }
 ```
+
+## LazyFile event {#sec-lazyfile-event}
+
+You can use the `LazyFile` user event to load a plugin when a file is opened:
+
+```nix
+{
+  config.vim.lazy.plugins = {
+    "aerial.nvim" = {
+      package = pkgs.vimPlugins.aerial-nvim;
+      event = [{event = "User"; pattern = "LazyFile";}];
+      # ...
+    };
+  };
+}
+```
+
+You can consider `LazyFile` as an alias to
+`["BufReadPost" "BufNewFile" "BufWritePre"]`

From 7696f470a7ccd23fa12875256779032d0aa43cf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Phan=20=C4=90=C4=83ng=20Khoa?= <ricecracker2234@proton.me>
Date: Sun, 23 Mar 2025 22:57:38 +0700
Subject: [PATCH 027/202] eslint_d: added conditions for launching eslint_d
 (#737)

* eslint_d: added conditions for launching eslint_d

* eslint_d: documented changes to docs/release-notes/rl-0.8.md

---------

Co-authored-by: raf <raf@notashelf.dev>
---
 docs/release-notes/rl-0.8.md         |  4 ++++
 modules/plugins/languages/astro.nix  | 10 ++++++++++
 modules/plugins/languages/svelte.nix | 10 ++++++++++
 modules/plugins/languages/ts.nix     | 10 ++++++++++
 4 files changed, 34 insertions(+)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index c84ef199..32a8c28e 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -271,3 +271,7 @@
 [Butzist](https://github.com/butzist):
 
 - Add Helm chart support under `vim.languages.helm`.
+
+[rice-cracker-dev](https://github.com/rice-cracker-dev):
+
+- `eslint_d` now checks for configuration files to load.
diff --git a/modules/plugins/languages/astro.nix b/modules/plugins/languages/astro.nix
index 9e70424b..d5672af0 100644
--- a/modules/plugins/languages/astro.nix
+++ b/modules/plugins/languages/astro.nix
@@ -72,6 +72,16 @@
           ls_sources,
           null_ls.builtins.diagnostics.eslint_d.with({
             command = "${getExe pkg}",
+            condition = function(utils)
+              return utils.root_has_file({
+                "eslint.config.js",
+                "eslint.config.mjs",
+                ".eslintrc",
+                ".eslintrc.json",
+                ".eslintrc.js",
+                ".eslintrc.yml",
+              })
+            end,
           })
         )
       '';
diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix
index a3c55e10..4d96c20a 100644
--- a/modules/plugins/languages/svelte.nix
+++ b/modules/plugins/languages/svelte.nix
@@ -72,6 +72,16 @@
           ls_sources,
           null_ls.builtins.diagnostics.eslint_d.with({
             command = "${getExe pkg}",
+            condition = function(utils)
+              return utils.root_has_file({
+                "eslint.config.js",
+                "eslint.config.mjs",
+                ".eslintrc",
+                ".eslintrc.json",
+                ".eslintrc.js",
+                ".eslintrc.yml",
+              })
+            end,
           })
         )
       '';
diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix
index c9070554..790c235a 100644
--- a/modules/plugins/languages/ts.nix
+++ b/modules/plugins/languages/ts.nix
@@ -123,6 +123,16 @@
           ls_sources,
           null_ls.builtins.diagnostics.eslint_d.with({
             command = "${getExe pkg}",
+            condition = function(utils)
+              return utils.root_has_file({
+                "eslint.config.js",
+                "eslint.config.mjs",
+                ".eslintrc",
+                ".eslintrc.json",
+                ".eslintrc.js",
+                ".eslintrc.yml",
+              })
+            end,
           })
         )
       '';

From ac59df1bc91b6e1f7f5c7847de73b2e4a8731557 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 24 Mar 2025 08:43:04 +0300
Subject: [PATCH 028/202] treewide: remove `nmd` dependency

---
 docs/default.nix                               |  2 --
 flake.lock                                     | 17 -----------------
 flake.nix                                      |  6 ------
 modules/plugins/statusline/lualine/lualine.nix |  2 --
 4 files changed, 27 deletions(-)

diff --git a/docs/default.nix b/docs/default.nix
index 48cff563..98b29db0 100644
--- a/docs/default.nix
+++ b/docs/default.nix
@@ -95,8 +95,6 @@
     inherit (nvimModuleDocs) optionsJSON;
   };
 in {
-  inherit (inputs) nmd;
-
   # TODO: Use `hmOptionsDocs.optionsJSON` directly once upstream
   # `nixosOptionsDoc` is more customizable.
   options.json =
diff --git a/flake.lock b/flake.lock
index 3ced812a..603d0f50 100644
--- a/flake.lock
+++ b/flake.lock
@@ -106,22 +106,6 @@
         "type": "github"
       }
     },
-    "nmd": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1705050560,
-        "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=",
-        "owner": "~rycee",
-        "repo": "nmd",
-        "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3",
-        "type": "sourcehut"
-      },
-      "original": {
-        "owner": "~rycee",
-        "repo": "nmd",
-        "type": "sourcehut"
-      }
-    },
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -129,7 +113,6 @@
         "mnw": "mnw",
         "nil": "nil",
         "nixpkgs": "nixpkgs",
-        "nmd": "nmd",
         "systems": "systems_2"
       }
     },
diff --git a/flake.nix b/flake.nix
index 30b71f80..6e716581 100644
--- a/flake.nix
+++ b/flake.nix
@@ -86,12 +86,6 @@
     # Alternate neovim-wrapper
     mnw.url = "github:Gerg-L/mnw";
 
-    # For generating documentation website
-    nmd = {
-      url = "sourcehut:~rycee/nmd";
-      flake = false;
-    };
-
     # Language servers (use master instead of nixpkgs)
     nil = {
       url = "github:oxalica/nil";
diff --git a/modules/plugins/statusline/lualine/lualine.nix b/modules/plugins/statusline/lualine/lualine.nix
index 9943f78e..bf070db7 100644
--- a/modules/plugins/statusline/lualine/lualine.nix
+++ b/modules/plugins/statusline/lualine/lualine.nix
@@ -124,8 +124,6 @@ in {
       mkOption {
         type = enum themesConcatted;
         default = "auto";
-        # TODO: xml generation error if the closing '' is on a new line.
-        # issue: https://gitlab.com/rycee/nmd/-/issues/10
         defaultText = ''`config.vim.theme.name` if theme supports lualine else "auto"'';
         description = "Theme for lualine";
       };

From df1b3f796831d942b6e405355bdc5a3637429c0a Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 24 Mar 2025 11:57:38 +0300
Subject: [PATCH 029/202] blink: v0.13.1 -> v0.14.1

---
 flake/legacyPackages/blink-cmp.nix | 24 +++++-------------------
 npins/sources.json                 |  8 ++++----
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/flake/legacyPackages/blink-cmp.nix b/flake/legacyPackages/blink-cmp.nix
index ba1d7424..477616aa 100644
--- a/flake/legacyPackages/blink-cmp.nix
+++ b/flake/legacyPackages/blink-cmp.nix
@@ -1,11 +1,11 @@
 {
+  stdenv,
   rustPlatform,
   hostPlatform,
   vimUtils,
   git,
   src,
   version,
-  fetchpatch,
 }: let
   blink-fuzzy-lib = rustPlatform.buildRustPackage {
     pname = "blink-fuzzy-lib";
@@ -19,11 +19,6 @@
 
     nativeBuildInputs = [git];
   };
-
-  libExt =
-    if hostPlatform.isDarwin
-    then "dylib"
-    else "so";
 in
   vimUtils.buildVimPlugin {
     pname = "blink-cmp";
@@ -31,22 +26,13 @@ in
 
     # blink references a repro.lua which is placed outside the lua/ directory
     doCheck = false;
-    preInstall = ''
+    preInstall = let
+      ext = stdenv.hostPlatform.extensions.sharedLibrary;
+    in ''
       mkdir -p target/release
-      ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.${libExt} target/release/libblink_cmp_fuzzy.${libExt}
-      echo -n "nix" > target/release/version
+      ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy${ext} target/release/libblink_cmp_fuzzy${ext}
     '';
 
-    # Borrowed from nixpkgs
-    # TODO: Remove this patch when updating to next version
-    patches = [
-      (fetchpatch {
-        name = "blink-add-bypass-for-nix.patch";
-        url = "https://github.com/Saghen/blink.cmp/commit/6c83ef1ae34abd7ef9a32bfcd9595ac77b61037c.diff?full_index=1";
-        hash = "sha256-304F1gDDKVI1nXRvvQ0T1xBN+kHr3jdmwMMp8CNl+GU=";
-      })
-    ];
-
     # Module for reproducing issues
     nvimSkipModule = ["repro"];
   }
diff --git a/npins/sources.json b/npins/sources.json
index 91c3f68e..53cb810e 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -46,10 +46,10 @@
       "pre_releases": false,
       "version_upper_bound": null,
       "release_prefix": null,
-      "version": "v0.13.1",
-      "revision": "29861baf37bbb16f5dbf524a6edac5daaad6f4fc",
-      "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v0.13.1",
-      "hash": "1y5p7i6g884r65mhfsazx28g0qs37hc57jm37i7kch9kcf8m7sbq"
+      "version": "v0.14.1",
+      "revision": "7a91dc584f41f5aa2373a917faf8100b2e54d6c9",
+      "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v0.14.1",
+      "hash": "0zm6s3v9liimx28vs1g5yi7bcfrl691q81bvzmdpavcwrzcdb0c8"
     },
     "blink-cmp-spell": {
       "type": "Git",

From 9074c734b7d515b23d80dee32105e332e3055d09 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 24 Mar 2025 21:09:47 +0300
Subject: [PATCH 030/202] docs: update co-maintainers section

---
 .github/README.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/README.md b/.github/README.md
index 7c0974c3..a6ef7a44 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -246,14 +246,15 @@ Neovim's behaviour with Nix.
 
 ### Co-Maintainers
 
-Alongside myself, nvf is developed by those talented folk:
+Alongside [myself](https://github.com/notashelf), nvf is developed by those
+talented folk. nvf would not be what it is today without their invaluable
+contributions.
 
 - [**@horriblename**](https://github.com/horriblename)
   ([Liberapay](https://liberapay.com/horriblename/))- For actively implementing
   planned features and quality of life updates.
-- [**@Diniamo**](https://github.com/Diniamo)
-  ([Liberapay](https://en.liberapay.com/diniamo/)) - For actively submitting
-  pull requests, issues and assistance with maintenance of nvf.
+- [**@Soliprem**](https://github.com/soliprem) - For rigorously implementing
+  missing features and excellent work on new language modules.
 
 Please do remember to extend your thanks (financially or otherwise) if this
 project has been helpful to you.
@@ -270,14 +271,14 @@ heart-felt thanks to
 - [**@FlafyDev**](https://github.com/FlafyDev) - For getting Home-Manager module
   to work and Nix assistance.
 - [**@n3oney**](https://github.com/n3oney) - For making custom keybinds finally
-  possible, and other module additions.
+  possible, great ideas and module additions.
 - [**@Yavko**](https://github.com/Yavko) - For the amazing **nvf** logo
 - [**@FrothyMarrow**](https://github.com/FrothyMarrow) - For seeing mistakes
-  that I could not.
+  that I could not and contributing good ideas & code.
 - [**@Gerg-l**](https://github.com/gerg-l) 🐸 - For the modern Neovim wrapper,
-  [mnw], and occasional code improvements.
-- [**@Soliprem**](https://github.com/soliprem) - Rigorously implementing missing
-  features and excellent work on new language modules.
+  [mnw], and occasional improvements to the codebase.
+- [**@Diniamo**](https://github.com/Diniamo) - For actively submitting pull
+  requests, issues and assistance with co-maintenance of nvf.
 
 and everyone who has submitted issues or pull requests!
 
@@ -301,7 +302,6 @@ including:
 
 I am grateful for their previous work and inspiration, and I wholeheartedly
 recommend checking their work out.
-<br/>
 
 ## License
 

From 9f8b7edbf6d2c842c361c863aba633f1d7a17d72 Mon Sep 17 00:00:00 2001
From: Marlon Rosenberg <marlon.rosenberg@t-online.de>
Date: Mon, 24 Mar 2025 22:25:01 +0100
Subject: [PATCH 031/202] languages/fsharp: init

---
 docs/manual/configuring/languages.md  |   1 +
 docs/release-notes/rl-0.8.md          |   4 +
 modules/plugins/languages/default.nix |   1 +
 modules/plugins/languages/fsharp.nix  | 108 ++++++++++++++++++++++++++
 4 files changed, 114 insertions(+)
 create mode 100644 modules/plugins/languages/fsharp.nix

diff --git a/docs/manual/configuring/languages.md b/docs/manual/configuring/languages.md
index 74714365..252163fb 100644
--- a/docs/manual/configuring/languages.md
+++ b/docs/manual/configuring/languages.md
@@ -19,6 +19,7 @@ formatting to diagnostics. The following languages have sections under the
 - Go: [vim.languages.go.enable](#opt-vim.languages.go.enable)
 - Lua: [vim.languages.lua.enable](#opt-vim.languages.lua.enable)
 - PHP: [vim.languages.php.enable](#opt-vim.languages.php.enable)
+- F#: [vim.languages.fsharp.enable](#opt-vim.languages.fsharp.enable)
 
 Adding support for more languages, and improving support for existing ones are
 great places where you can contribute with a PR.
diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 5e09bb35..afb5ccd3 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -276,3 +276,7 @@
 [rice-cracker-dev](https://github.com/rice-cracker-dev):
 
 - `eslint_d` now checks for configuration files to load.
+
+[Sc3l3t0n](https://github.com/Sc3l3t0n)
+
+- Add F# support under `vim.languages.fsharp`.
diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix
index 20acfb6c..c3312135 100644
--- a/modules/plugins/languages/default.nix
+++ b/modules/plugins/languages/default.nix
@@ -10,6 +10,7 @@ in {
     ./clang.nix
     ./css.nix
     ./elixir.nix
+    ./fsharp.nix
     ./gleam.nix
     ./go.nix
     ./hcl.nix
diff --git a/modules/plugins/languages/fsharp.nix b/modules/plugins/languages/fsharp.nix
new file mode 100644
index 00000000..2b80bf11
--- /dev/null
+++ b/modules/plugins/languages/fsharp.nix
@@ -0,0 +1,108 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: let
+  inherit (builtins) attrNames;
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.types) either listOf package str enum;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.lists) isList;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
+
+  defaultServer = "fsautocomplete";
+  servers = {
+    fsautocomplete = {
+      package = pkgs.fsautocomplete;
+      internalFormatter = false;
+      lspConfig = ''
+        lspconfig.fsautocomplete.setup {
+          capabilities = capabilities;
+          on_attach = default_on_attach;
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else "{'${cfg.lsp.package}/bin/fsautocomplete'}"
+        },
+        }
+      '';
+    };
+  };
+
+  defaultFormat = "fantomas";
+  formats = {
+    fantomas = {
+      package = pkgs.fantomas;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.fantomas.with({
+            command = "${cfg.format.package}/bin/fantomas",
+          })
+        )
+      '';
+    };
+  };
+
+  cfg = config.vim.languages.fsharp;
+in {
+  options = {
+    vim.languages.fsharp = {
+      enable = mkEnableOption "F# language support";
+
+      treesitter = {
+        enable = mkEnableOption "F# treesitter" // {default = config.vim.languages.enableTreesitter;};
+        package = mkGrammarOption pkgs "fsharp";
+      };
+
+      lsp = {
+        enable = mkEnableOption "F# LSP support" // {default = config.vim.languages.enableLSP;};
+        server = mkOption {
+          description = "F# LSP server to use";
+          type = enum (attrNames servers);
+          default = defaultServer;
+        };
+
+        package = mkOption {
+          description = "F# LSP server package, or the command to run as a list of strings";
+          type = either package (listOf str);
+          default = servers.${cfg.lsp.server}.package;
+        };
+      };
+      format = {
+        enable = mkEnableOption "F# formatting" // {default = config.vim.languages.enableFormat;};
+
+        type = mkOption {
+          description = "F# formatter to use";
+          type = enum (attrNames formats);
+          default = defaultFormat;
+        };
+
+        package = mkOption {
+          description = "F# formatter package";
+          type = package;
+          default = formats.${cfg.format.type}.package;
+        };
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.fsharp-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+
+    (mkIf cfg.format.enable {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources.fsharp-format = formats.${cfg.format.type}.nullConfig;
+    })
+  ]);
+}

From 7835cbdc1da7785dca4cb1b2123157b7712109c8 Mon Sep 17 00:00:00 2001
From: Al Duncanson <alDuncanson@proton.me>
Date: Mon, 24 Mar 2025 19:04:23 -0400
Subject: [PATCH 032/202] docs: fix typo

Add missing word in sentence: `let`.
---
 docs/manual/options.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/manual/options.md b/docs/manual/options.md
index 61282dfa..beab4f16 100644
--- a/docs/manual/options.md
+++ b/docs/manual/options.md
@@ -5,8 +5,8 @@ options will include useful comments, warnings or setup tips on how a module
 option is meant to be used as well as examples in complex cases.
 
 An offline version of this page is bundled with nvf as a part of the manpages
-which you can access with `man 5 nvf`. Please us know if you believe any of the
-options below are missing useful examples.
+which you can access with `man 5 nvf`. Please let us know if you believe any of
+the options below are missing useful examples.
 
 <!--
 In the manual, individual options may be referenced in Hyperlinks as follows:

From f82ea9650b5cfa696f2d4837dc4c57294fe4a889 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Mon, 24 Mar 2025 18:21:56 -0400
Subject: [PATCH 033/202] fix: Update npins version

---
 npins/sources.json | 190 ++++++++++++++++++++++++++++++++++++++++++++-
 npins/sources.nix  |  73 +++++++++++------
 2 files changed, 237 insertions(+), 26 deletions(-)

diff --git a/npins/sources.json b/npins/sources.json
index 53cb810e..d1c9fb7d 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -8,6 +8,7 @@
         "repo": "aerial.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "2204cf08791449a6a2fd2ef187a29112eeefd989",
       "url": "https://github.com/stevearc/aerial.nvim/archive/2204cf08791449a6a2fd2ef187a29112eeefd989.tar.gz",
       "hash": "1482md9kzyrr7mjkca3nnyqgy64q8clhi6xbvgql8qjw7ifz51mx"
@@ -20,6 +21,7 @@
         "repo": "alpha-nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "de72250e054e5e691b9736ee30db72c65d560771",
       "url": "https://github.com/goolord/alpha-nvim/archive/de72250e054e5e691b9736ee30db72c65d560771.tar.gz",
       "hash": "0c1jkhxamfn2md7m1r5b2wpxa26y90b98yzjwf68m3fymalvkn5h"
@@ -32,6 +34,7 @@
         "repo": "base16-nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "3f13e15c53ea2aaf79c24ceab725309d87f0619c",
       "url": "https://github.com/rrethy/base16-nvim/archive/3f13e15c53ea2aaf79c24ceab725309d87f0619c.tar.gz",
       "hash": "1z6pdf707r2rpmzi057dhcmd045695v03215asn1hdn8r294zcmg"
@@ -46,6 +49,7 @@
       "pre_releases": false,
       "version_upper_bound": null,
       "release_prefix": null,
+      "submodules": false,
       "version": "v0.14.1",
       "revision": "7a91dc584f41f5aa2373a917faf8100b2e54d6c9",
       "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v0.14.1",
@@ -59,6 +63,7 @@
         "repo": "blink-cmp-spell"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "782bc76be09c0c5dd08e3edd04e4ec1054c3158e",
       "url": "https://github.com/ribru17/blink-cmp-spell/archive/782bc76be09c0c5dd08e3edd04e4ec1054c3158e.tar.gz",
       "hash": "13adgj9qxfmbwzvx348kpkm70h0jli9qv3bqhkwh8p6zkfajm607"
@@ -71,6 +76,7 @@
         "repo": "blink.compat"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "4104671562c663d059d91a99da3780bead5bc467",
       "url": "https://github.com/saghen/blink.compat/archive/4104671562c663d059d91a99da3780bead5bc467.tar.gz",
       "hash": "0bsf8kg5s3m1xk9d4n0yl0h5xyk484hip3z8va547f6ibim9ccv4"
@@ -83,6 +89,7 @@
         "repo": "blink-emoji.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "a77aebc092ebece1eed108f301452ae774d6b67a",
       "url": "https://github.com/moyiz/blink-emoji.nvim/archive/a77aebc092ebece1eed108f301452ae774d6b67a.tar.gz",
       "hash": "0n4qv2mk7zx910gnwf9ri2w5qxwx8szx99nqqzik4yyvl4axm41d"
@@ -95,6 +102,7 @@
         "repo": "blink-ripgrep.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "91aee73557237b0cc1313e4ed2b32f10de6cc65e",
       "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/91aee73557237b0cc1313e4ed2b32f10de6cc65e.tar.gz",
       "hash": "1jg4559946rzsvvny1r7jki1gmr70yjxr8qlnsjkjyxj8h0pjjwl"
@@ -107,6 +115,7 @@
         "repo": "bufdelete.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "f6bcea78afb3060b198125256f897040538bcb81",
       "url": "https://github.com/famiu/bufdelete.nvim/archive/f6bcea78afb3060b198125256f897040538bcb81.tar.gz",
       "hash": "0xfzk3zgnxbwnr55n3lglsb8nmhnchpiqz9d152xr6j8d9z0sdcn"
@@ -119,6 +128,7 @@
         "repo": "nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429",
       "url": "https://github.com/catppuccin/nvim/archive/5b5e3aef9ad7af84f463d17b5479f06b87d5c429.tar.gz",
       "hash": "0jmrwag2dx4b1g9x32xwxcr8y0l159hqks09z5miy99wav6dy7z2"
@@ -131,6 +141,7 @@
         "repo": "ccc.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "b57cbaf8db3ac43c56c9e2c7f3812944638260ed",
       "url": "https://github.com/uga-rosa/ccc.nvim/archive/b57cbaf8db3ac43c56c9e2c7f3812944638260ed.tar.gz",
       "hash": "0ixqbsag43pyrvj0i9dkn28j7b2v0c75rljnw57bjl6nwz2aqxg7"
@@ -143,6 +154,7 @@
         "repo": "cellular-automaton.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "1606e9d5d04ff254023c3f3c62842d065708d6d3",
       "url": "https://github.com/Eandrju/cellular-automaton.nvim/archive/1606e9d5d04ff254023c3f3c62842d065708d6d3.tar.gz",
       "hash": "1yn6wr8fznwykdy031381cyph1yqad4wp0afcxnv1zxqf1fih7ah"
@@ -155,6 +167,7 @@
         "repo": "ChatGPT.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "5b6d296eefc75331e2ff9f0adcffbd7d27862dd6",
       "url": "https://github.com/jackMort/ChatGPT.nvim/archive/5b6d296eefc75331e2ff9f0adcffbd7d27862dd6.tar.gz",
       "hash": "07f0p03fb4060lc7jfvp8mqi0jbk8mril9fg3b8rx9mq8415g1gr"
@@ -167,6 +180,7 @@
         "repo": "cheatsheet.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "9716f9aaa94dd1fd6ce59b5aae0e5f25e2a463ef",
       "url": "https://github.com/sudormrfbin/cheatsheet.nvim/archive/9716f9aaa94dd1fd6ce59b5aae0e5f25e2a463ef.tar.gz",
       "hash": "0dm94kppbnky8y0gs1pdfs7vcc9hyp8lf6h33dw6ndqfnw3hd2ad"
@@ -179,6 +193,7 @@
         "repo": "cinnamon.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "450cb3247765fed7871b41ef4ce5fa492d834215",
       "url": "https://github.com/declancm/cinnamon.nvim/archive/450cb3247765fed7871b41ef4ce5fa492d834215.tar.gz",
       "hash": "1vq0cab139gyix2qhmivp86fq6l4fhzn7qafphj0yjac47i11iwi"
@@ -191,6 +206,7 @@
         "repo": "cmp-buffer"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "3022dbc9166796b644a841a02de8dd1cc1d311fa",
       "url": "https://github.com/hrsh7th/cmp-buffer/archive/3022dbc9166796b644a841a02de8dd1cc1d311fa.tar.gz",
       "hash": "1cwx8ky74633y0bmqmvq1lqzmphadnhzmhzkddl3hpb7rgn18vkl"
@@ -203,6 +219,7 @@
         "repo": "cmp_luasnip"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90",
       "url": "https://github.com/saadparwaiz1/cmp_luasnip/archive/98d9cb5c2c38532bd9bdb481067b20fea8f32e90.tar.gz",
       "hash": "037sh4g1747wf07f9sqngiifp89hqww6m2rvizy5ra7jyd04magk"
@@ -215,6 +232,7 @@
         "repo": "cmp-nvim-lsp"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "99290b3ec1322070bcfb9e846450a46f6efa50f0",
       "url": "https://github.com/hrsh7th/cmp-nvim-lsp/archive/99290b3ec1322070bcfb9e846450a46f6efa50f0.tar.gz",
       "hash": "08q5mf5jrqjjcl1s4h9zj2vd1kcizz0a5a6p65wv1rc5s1fa3a49"
@@ -227,6 +245,7 @@
         "repo": "cmp-path"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "91ff86cd9c29299a64f968ebb45846c485725f23",
       "url": "https://github.com/hrsh7th/cmp-path/archive/91ff86cd9c29299a64f968ebb45846c485725f23.tar.gz",
       "hash": "18ixx14ibc7qrv32nj0ylxrx8w4ggg49l5vhcqd35hkp4n56j6mn"
@@ -239,6 +258,7 @@
         "repo": "cmp-treesitter"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "958fcfa0d8ce46d215e19cc3992c542f576c4123",
       "url": "https://github.com/ray-x/cmp-treesitter/archive/958fcfa0d8ce46d215e19cc3992c542f576c4123.tar.gz",
       "hash": "05as01c2f7i20zkzpqbq9n8ji9bcwd678ixmxnrz9vmz5zsj8q7i"
@@ -251,6 +271,7 @@
         "repo": "codecompanion.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "4f56b047f03bf5edc0d71bf0ca694243a49b912f",
       "url": "https://github.com/olimorris/codecompanion.nvim/archive/4f56b047f03bf5edc0d71bf0ca694243a49b912f.tar.gz",
       "hash": "1mrb8qxd6mz5dlly9bh30pcd599gfy173f6pd4p8lszs3xhp598k"
@@ -263,6 +284,7 @@
         "repo": "codewindow.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "dd7017617962943eb1d152fc58940f11c6775a4a",
       "url": "https://github.com/gorbit99/codewindow.nvim/archive/dd7017617962943eb1d152fc58940f11c6775a4a.tar.gz",
       "hash": "1kxkf50rkqrzqz03jvygbwxb1yfmqh0gskr00vpmyrq51569a2hw"
@@ -275,6 +297,7 @@
         "repo": "Comment.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "e30b7f2008e52442154b66f7c519bfd2f1e32acb",
       "url": "https://github.com/numToStr/Comment.nvim/archive/e30b7f2008e52442154b66f7c519bfd2f1e32acb.tar.gz",
       "hash": "0dyz78j0kj3j99y5g8wncl7794g6z2qs05gfg9ddxaa4xswhyjc7"
@@ -287,6 +310,7 @@
         "repo": "conform.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d",
       "url": "https://github.com/stevearc/conform.nvim/archive/db8a4a9edb217067b1d7a2e0362c74bfe9cc944d.tar.gz",
       "hash": "13vpizk8ani64d3a9yrm0g3bz8m6m6cxnpzr2xgslbhxnkmbxq7j"
@@ -299,6 +323,7 @@
         "repo": "copilot-cmp"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "15fc12af3d0109fa76b60b5cffa1373697e261d1",
       "url": "https://github.com/zbirenbaum/copilot-cmp/archive/15fc12af3d0109fa76b60b5cffa1373697e261d1.tar.gz",
       "hash": "0qyakf6wvkdxpzx63gv3p9bwafmxk87vgvcp14pfrkiznvqlpd3s"
@@ -311,6 +336,7 @@
         "repo": "copilot.lua"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9",
       "url": "https://github.com/zbirenbaum/copilot.lua/archive/30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9.tar.gz",
       "hash": "0jlwd5x0pdfxa1hg41dfvz9zji0frvlfg86vzak0d3xmn4hr8zgb"
@@ -323,6 +349,7 @@
         "repo": "crates.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "403a0abef0e2aec12749a534dc468d6fd50c6741",
       "url": "https://github.com/Saecki/crates.nvim/archive/403a0abef0e2aec12749a534dc468d6fd50c6741.tar.gz",
       "hash": "19ix86nbww5vljinfwfpjkz806j7dzw4pgjyjya201jb0n22lrc6"
@@ -335,6 +362,7 @@
         "repo": "csharpls-extended-lsp.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "991d2c43afd7c7be77edd27a2ae686f9779382da",
       "url": "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/archive/991d2c43afd7c7be77edd27a2ae686f9779382da.tar.gz",
       "hash": "10jj6x78k34yrarp5ydc7n1ylp2xxgxl7jqh1y4d133mgcygabak"
@@ -347,6 +375,7 @@
         "repo": "dashboard-nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "000448d837f6e7a47f8f342f29526c4d7e49e9ce",
       "url": "https://github.com/glepnir/dashboard-nvim/archive/000448d837f6e7a47f8f342f29526c4d7e49e9ce.tar.gz",
       "hash": "11kh15qp819dhr2r3q78dv9pzxrswzzpjqmdpa5nlba9mvgjzzy3"
@@ -359,6 +388,7 @@
         "repo": "diffview.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "4516612fe98ff56ae0415a259ff6361a89419b0a",
       "url": "https://github.com/sindrets/diffview.nvim/archive/4516612fe98ff56ae0415a259ff6361a89419b0a.tar.gz",
       "hash": "0brabpd02596hg98bml118bx6z2sly98kf1cr2p0xzybiinb4zs9"
@@ -371,6 +401,7 @@
         "repo": "direnv.vim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "ab2a7e08dd630060cd81d7946739ac7442a4f269",
       "url": "https://github.com/direnv/direnv.vim/archive/ab2a7e08dd630060cd81d7946739ac7442a4f269.tar.gz",
       "hash": "1hhwfnaj9ibz17ggxvhzrkinghfy51fqfa0bs482z484jpvjc31g"
@@ -383,6 +414,7 @@
         "repo": "dracula.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "96c9d19ce81b26053055ad6f688277d655b3f7d2",
       "url": "https://github.com/Mofiqul/dracula.nvim/archive/96c9d19ce81b26053055ad6f688277d655b3f7d2.tar.gz",
       "hash": "0w8r0h9sk3gspahiv203wxj744cry70sra2gf230x2pfrysp09g0"
@@ -395,6 +427,7 @@
         "repo": "dressing.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "2d7c2db2507fa3c4956142ee607431ddb2828639",
       "url": "https://github.com/stevearc/dressing.nvim/archive/2d7c2db2507fa3c4956142ee607431ddb2828639.tar.gz",
       "hash": "00wn24vcsww9svbdy6hkfd3q0wb4781lmiig4ygyxs200vzgw73l"
@@ -407,6 +440,7 @@
         "repo": "elixir-tools.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "6beae8194152e2d8b4a59de19a3e60c1f7ffcff5",
       "url": "https://github.com/elixir-tools/elixir-tools.nvim/archive/6beae8194152e2d8b4a59de19a3e60c1f7ffcff5.tar.gz",
       "hash": "0kncq60x3kvy4plszq4zygrsy6cyzf43g2xgzqwif88i85ki7zq6"
@@ -419,6 +453,7 @@
         "repo": "fastaction.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "c43684448470e732387beccaff12e6667a534800",
       "url": "https://github.com/Chaitanyabsprip/fastaction.nvim/archive/c43684448470e732387beccaff12e6667a534800.tar.gz",
       "hash": "1ihh07j9q4089m4iw7sb33zg106g1m84bd2nk81gixfl76vg3vbi"
@@ -431,6 +466,7 @@
         "repo": "fidget.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "d9ba6b7bfe29b3119a610892af67602641da778e",
       "url": "https://github.com/j-hui/fidget.nvim/archive/d9ba6b7bfe29b3119a610892af67602641da778e.tar.gz",
       "hash": "070jadci8x6zgxnsqaldjah1gm1p78wscsb9wpn5wn8mjkyk2m80"
@@ -443,6 +479,7 @@
         "repo": "flutter-tools.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "70430c32d176f4a15c6e2c80586cd2791e3a664e",
       "url": "https://github.com/akinsho/flutter-tools.nvim/archive/70430c32d176f4a15c6e2c80586cd2791e3a664e.tar.gz",
       "hash": "01p721ca4as9b9nn4qibb6s775fn66j13zsx2d3flhkssii06v45"
@@ -455,6 +492,7 @@
         "repo": "friendly-snippets"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "efff286dd74c22f731cdec26a70b46e5b203c619",
       "url": "https://github.com/rafamadriz/friendly-snippets/archive/efff286dd74c22f731cdec26a70b46e5b203c619.tar.gz",
       "hash": "1vb5l8ipfjwsrqffbq8v2z5p1cpg035b3gk57692wd7835kr3i13"
@@ -467,6 +505,7 @@
         "repo": "fzf-lua"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "03eed634a3b1f4a4dc53f928868566b0b697dabe",
       "url": "https://github.com/ibhagwan/fzf-lua/archive/03eed634a3b1f4a4dc53f928868566b0b697dabe.tar.gz",
       "hash": "007fz9rwhcfx8l6k6dfnm91dcc4gsazr3vqbv95z5l1h1j184v6c"
@@ -479,6 +518,7 @@
         "repo": "gesture.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "eee4a4c9f108b40cb63766e96e0fe28fe5968127",
       "url": "https://github.com/notomo/gesture.nvim/archive/eee4a4c9f108b40cb63766e96e0fe28fe5968127.tar.gz",
       "hash": "0h6f4s39q1kzsgc3wx6kanmhada00av1nj1ngzmgbafsxl2ax0bw"
@@ -491,6 +531,7 @@
         "repo": "git-conflict.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "a1badcd070d176172940eb55d9d59029dad1c5a6",
       "url": "https://github.com/akinsho/git-conflict.nvim/archive/a1badcd070d176172940eb55d9d59029dad1c5a6.tar.gz",
       "hash": "05rnwhm1fmg3yb7j2xc9nmw262jc687qxhwabn97qarrk2da0r0a"
@@ -503,9 +544,10 @@
         "repo": "github-nvim-theme"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "c106c9472154d6b2c74b74565616b877ae8ed31d",
       "url": "https://github.com/projekt0n/github-nvim-theme/archive/c106c9472154d6b2c74b74565616b877ae8ed31d.tar.gz",
-      "hash": "/A4hkKTzjzeoR1SuwwklraAyI8oMkhxrwBBV9xb59PA="
+      "hash": "1w7lz4bgfm8hq1mir4hcr8ik585d4l4w7bjl8yl3g3zklj8223pw"
     },
     "gitsigns-nvim": {
       "type": "Git",
@@ -515,6 +557,7 @@
         "repo": "gitsigns.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9",
       "url": "https://github.com/lewis6991/gitsigns.nvim/archive/7010000889bfb6c26065e0b0f7f1e6aa9163edd9.tar.gz",
       "hash": "0hl572j5l1bqg51rg545bavxs8kxya02ss3fj5fxvp9ylrnaqsx9"
@@ -527,6 +570,7 @@
         "repo": "glow.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "238070a686c1da3bccccf1079700eb4b5e19aea4",
       "url": "https://github.com/ellisonleao/glow.nvim/archive/238070a686c1da3bccccf1079700eb4b5e19aea4.tar.gz",
       "hash": "1j63y3hb03n5m4jig8576sxnb3jixxlr66m9xcs8vgfm5h0mrhqs"
@@ -539,6 +583,7 @@
         "repo": "gruvbox.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "15958f5ee43e144856cd2084ce6c571bfdb44504",
       "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/15958f5ee43e144856cd2084ce6c571bfdb44504.tar.gz",
       "hash": "16nrxcpds3zacqmfw5jsd5d8qqbwllkw9xacjkglcnaynp4qghqq"
@@ -551,6 +596,7 @@
         "repo": "harpoon"
       },
       "branch": "harpoon2",
+      "submodules": false,
       "revision": "ed1f853847ffd04b2b61c314865665e1dadf22c7",
       "url": "https://github.com/ThePrimeagen/harpoon/archive/ed1f853847ffd04b2b61c314865665e1dadf22c7.tar.gz",
       "hash": "1dcpdlna2lff9dlsh6i4v16qmn5r9279wdvn0ry3xg4abqwnzc9g"
@@ -563,6 +609,7 @@
         "repo": "haskell-tools.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "52608d83b424de44e914711c0f505906816e7427",
       "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/52608d83b424de44e914711c0f505906816e7427.tar.gz",
       "hash": "1ngz8zzyni2wh0xhvrcl27am39kqaaabh5y9c4i8ym211ravzhv6"
@@ -575,6 +622,7 @@
         "repo": "highlight-undo.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "a5e2e2d43f6d131bf526619baeeeec32397b0789",
       "url": "https://github.com/tzachar/highlight-undo.nvim/archive/a5e2e2d43f6d131bf526619baeeeec32397b0789.tar.gz",
       "hash": "0gvd45mpkhd7hj8hvm20z036vr178hzzwhknj0l5bfnnnwl8xnjc"
@@ -587,6 +635,7 @@
         "repo": "hop.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "1a1eceafe54b5081eae4cb91c723abd1d450f34b",
       "url": "https://github.com/phaazon/hop.nvim/archive/1a1eceafe54b5081eae4cb91c723abd1d450f34b.tar.gz",
       "hash": "08h18cam2yr57qvfsnf1bra28vbl6013wlchnr5crb757xw8aysa"
@@ -601,6 +650,7 @@
       "pre_releases": false,
       "version_upper_bound": null,
       "release_prefix": null,
+      "submodules": false,
       "version": "v1.0.2",
       "revision": "8578056a2226ed49fc608167edc143a87f75d809",
       "url": "https://api.github.com/repos/nvimtools/hydra.nvim/tarball/v1.0.2",
@@ -614,6 +664,7 @@
         "repo": "icon-picker.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3",
       "url": "https://github.com/ziontee113/icon-picker.nvim/archive/3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3.tar.gz",
       "hash": "1357c2dhl7m7hbdsj0l2bmk97i76bp5yrfnd0g01sgd6wiasr4jm"
@@ -626,6 +677,7 @@
         "repo": "image.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "6ffafab2e98b5bda46bf227055aa84b90add8cdc",
       "url": "https://github.com/3rd/image.nvim/archive/6ffafab2e98b5bda46bf227055aa84b90add8cdc.tar.gz",
       "hash": "105k4ccv18nynm70lphb4ac3ih1ad4hlh2syrhmyi1i1jwdirjgz"
@@ -638,6 +690,7 @@
         "repo": "indent-blankline.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78",
       "url": "https://github.com/lukas-reineke/indent-blankline.nvim/archive/e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78.tar.gz",
       "hash": "1whsjd715rr59warfy7nmw0hzkxfkxgzx9c8r6k2vka4flifirnk"
@@ -650,6 +703,7 @@
         "repo": "lazydev.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c",
       "url": "https://github.com/folke/lazydev.nvim/archive/2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c.tar.gz",
       "hash": "1v4m18j270rfbjrcn99fkbiwhlmmr9bm9lcbagp533kx4n57731f"
@@ -662,6 +716,7 @@
         "repo": "leap.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "346a16ef942635a8ca5ff92e603d07e7e8be6cbe",
       "url": "https://github.com/ggandor/leap.nvim/archive/346a16ef942635a8ca5ff92e603d07e7e8be6cbe.tar.gz",
       "hash": "0rq73f7sw1sf8dn6angwgns8jd811aiixmvrndgqz2939dlqaw2l"
@@ -674,6 +729,7 @@
         "repo": "leetcode.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "db7e1cd6b9191b34b4c1f2f96e4e3949cde9f951",
       "url": "https://github.com/kawre/leetcode.nvim/archive/db7e1cd6b9191b34b4c1f2f96e4e3949cde9f951.tar.gz",
       "hash": "1d3lb7625b2qdzqm74mzrac66rxqc0qgjd3mb37l4v8wqyiyv6pp"
@@ -685,6 +741,7 @@
         "url": "https://git.sr.ht/~whynothugo/lsp_lines.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "a92c755f182b89ea91bd8a6a2227208026f27b4d",
       "url": null,
       "hash": "14ym4d8vgvw2vhsaxik8612wyvszd895q69n9h100yd7x5jqhy4c"
@@ -697,6 +754,7 @@
         "repo": "lsp_signature.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "8b681c86b0bd7f932cd91987983d91497e43d83f",
       "url": "https://github.com/ray-x/lsp_signature.nvim/archive/8b681c86b0bd7f932cd91987983d91497e43d83f.tar.gz",
       "hash": "1ap077hgl334klfyi2hv81hf6r9mqpkarrz0b3ky99aavz7bmn2j"
@@ -709,6 +767,7 @@
         "repo": "lspkind-nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "d79a1c3299ad0ef94e255d045bed9fa26025dab6",
       "url": "https://github.com/onsails/lspkind-nvim/archive/d79a1c3299ad0ef94e255d045bed9fa26025dab6.tar.gz",
       "hash": "1wdavqmwadby9lyw415jw79kxynxv4fxg2v376y0rkxf258clarq"
@@ -721,6 +780,7 @@
         "repo": "lspsaga.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "6063935cf68de9aa6dd79f8e1caf5df0a9385de3",
       "url": "https://github.com/nvimdev/lspsaga.nvim/archive/6063935cf68de9aa6dd79f8e1caf5df0a9385de3.tar.gz",
       "hash": "1pqasjg2f2yd3ci8hyxfqqs7xnkmwdc411dlm6qg1agiv1h8v205"
@@ -733,6 +793,7 @@
         "repo": "lua-utils.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd",
       "url": "https://github.com/nvim-neorg/lua-utils.nvim/archive/e565749421f4bbb5d2e85e37c3cef9d56553d8bd.tar.gz",
       "hash": "0bnl2kvxs55l8cjhfpa834bm010n8r4gmsmivjcp548c076msagn"
@@ -745,6 +806,7 @@
         "repo": "lualine.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "b8b60c7f1d0d95ad74ee215b2291280b30482476",
       "url": "https://github.com/hoob3rt/lualine.nvim/archive/b8b60c7f1d0d95ad74ee215b2291280b30482476.tar.gz",
       "hash": "02xyjp446b2nypw3hh4k6b6g9f892kxmmdv23s7dypcws28v50m9"
@@ -757,6 +819,7 @@
         "repo": "LuaSnip"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "c9b9a22904c97d0eb69ccb9bab76037838326817",
       "url": "https://github.com/L3MON4D3/LuaSnip/archive/c9b9a22904c97d0eb69ccb9bab76037838326817.tar.gz",
       "hash": "03anxdspqz7ylq4239jyr9y51mw5qw1lkccyvfhj6wfk43jjdryx"
@@ -769,6 +832,7 @@
         "repo": "lz.n"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "d5856041d60f9500804c872709b8d5f59505d92b",
       "url": "https://github.com/nvim-neorocks/lz.n/archive/d5856041d60f9500804c872709b8d5f59505d92b.tar.gz",
       "hash": "1dxsy8baq7zdc047ixxxa1qkfw48jgbng4vngwlg6gc2rv16rf36"
@@ -781,6 +845,7 @@
         "repo": "lzn-auto-require"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "ef746afb55467984ef3200d9709c8059ee0257d0",
       "url": "https://github.com/horriblename/lzn-auto-require/archive/ef746afb55467984ef3200d9709c8059ee0257d0.tar.gz",
       "hash": "1mgka1mmvpd2gfya898qdbbwrp5rpqds8manjs1s7g5x63xp6b98"
@@ -793,6 +858,7 @@
         "repo": "mind.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "002137dd7cf97865ebd01b6a260209d2daf2da66",
       "url": "https://github.com/phaazon/mind.nvim/archive/002137dd7cf97865ebd01b6a260209d2daf2da66.tar.gz",
       "hash": "1p7gb8p1jrb2wx3x67lv7am3k1a14kvwsq89fdpb8b060s2l1214"
@@ -805,6 +871,7 @@
         "repo": "mini.ai"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "6e01c0e5a15554852546fac9853960780ac52ed4",
       "url": "https://github.com/echasnovski/mini.ai/archive/6e01c0e5a15554852546fac9853960780ac52ed4.tar.gz",
       "hash": "0138rsb0rh4fjiicm3gjah0b5n1c08lil29c5ssqk3xq1bdr69j9"
@@ -817,6 +884,7 @@
         "repo": "mini.align"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "3bdf6f0b91b31db5300a7b04f53f296a7fb150c1",
       "url": "https://github.com/echasnovski/mini.align/archive/3bdf6f0b91b31db5300a7b04f53f296a7fb150c1.tar.gz",
       "hash": "1255r5c9q0nnb7vnhs7xk45vqigmbhbim02ciczv8i80amfh9yw3"
@@ -829,6 +897,7 @@
         "repo": "mini.animate"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "13e170c13030b043aa8ad4311012ec0eaba0d5c7",
       "url": "https://github.com/echasnovski/mini.animate/archive/13e170c13030b043aa8ad4311012ec0eaba0d5c7.tar.gz",
       "hash": "153hrx7i0kn65lz4yjgkaxkvj0xvqamm3mi6ciq9b0q3c2ngh7rj"
@@ -841,6 +910,7 @@
         "repo": "mini.base16"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "44240f11871c15aba8fc49959ebd27c0b4768a40",
       "url": "https://github.com/echasnovski/mini.base16/archive/44240f11871c15aba8fc49959ebd27c0b4768a40.tar.gz",
       "hash": "0z4vvsm2hc1cab5qqd28x6jzyzh23cdijrrs1hkkkj0nj3si3zkn"
@@ -853,6 +923,7 @@
         "repo": "mini.basics"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "e8fbcf96e4e8262d452ddc851acea6c50449fa79",
       "url": "https://github.com/echasnovski/mini.basics/archive/e8fbcf96e4e8262d452ddc851acea6c50449fa79.tar.gz",
       "hash": "0v3j61qik4mv2r246b7q7h4ndg68x373dr5jag3a4hwszgpf7jcl"
@@ -865,6 +936,7 @@
         "repo": "mini.bracketed"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "0ec65567ffde0ad4d94d794d55f3b627203b496a",
       "url": "https://github.com/echasnovski/mini.bracketed/archive/0ec65567ffde0ad4d94d794d55f3b627203b496a.tar.gz",
       "hash": "05xg63hw83n99al5sylysbq1xpschlj547s3j484jjs7wsbzzp6c"
@@ -877,6 +949,7 @@
         "repo": "mini.bufremove"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "bba1d8b413d37081756f59200b8cf756181e5b9a",
       "url": "https://github.com/echasnovski/mini.bufremove/archive/bba1d8b413d37081756f59200b8cf756181e5b9a.tar.gz",
       "hash": "0lbh2azsa9fmb8qp8gzhv36riiafybmjgg0prppchik8lsbhjzy4"
@@ -889,6 +962,7 @@
         "repo": "mini.clue"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "08901d2223797aa25611c33aaf9d8a1049a653bb",
       "url": "https://github.com/echasnovski/mini.clue/archive/08901d2223797aa25611c33aaf9d8a1049a653bb.tar.gz",
       "hash": "026d647acwxr0wrf43lffmzw4x84jm6v5lipbqqpicqgqs8b4rfv"
@@ -901,6 +975,7 @@
         "repo": "mini.colors"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "d49e0764821d40adbf3f9e92091dfba0b0590378",
       "url": "https://github.com/echasnovski/mini.colors/archive/d49e0764821d40adbf3f9e92091dfba0b0590378.tar.gz",
       "hash": "1kn5012q6x1hfpyjqhssydln3v6b25gvvjw1zhw93m8x9km2j524"
@@ -913,6 +988,7 @@
         "repo": "mini.comment"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "264b8a63edd5a9a41d5361a1d52c13131c3c51a2",
       "url": "https://github.com/echasnovski/mini.comment/archive/264b8a63edd5a9a41d5361a1d52c13131c3c51a2.tar.gz",
       "hash": "1s4jl8sa7l6kibgsz0d6w2h4xnbpbf3k4rqq90x4l4dmx8if9vkb"
@@ -925,6 +1001,7 @@
         "repo": "mini.completion"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "8f439dfb5432f9a78fb172ec7e03ee31f18551c4",
       "url": "https://github.com/echasnovski/mini.completion/archive/8f439dfb5432f9a78fb172ec7e03ee31f18551c4.tar.gz",
       "hash": "0y4zzp4najk2bydwzx72nbn18n32v6ar0dc2qgialszivy0nnhgh"
@@ -937,6 +1014,7 @@
         "repo": "mini.diff"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "bc3a7be30fd45ed4961ea90de1d9d04637cdeae6",
       "url": "https://github.com/echasnovski/mini.diff/archive/bc3a7be30fd45ed4961ea90de1d9d04637cdeae6.tar.gz",
       "hash": "0mjl819rd7hbsk3my9ypsl7q7kvxaiyms6a8z63d63nljsbs8ycf"
@@ -949,6 +1027,7 @@
         "repo": "mini.doc"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "466c340917b76d16a79fcbb2545c397fc49b110e",
       "url": "https://github.com/echasnovski/mini.doc/archive/466c340917b76d16a79fcbb2545c397fc49b110e.tar.gz",
       "hash": "16aglk95hw9wbgz4vzpv3bf3hqzqa2qrrzsxqjva2smg9f59c7rl"
@@ -961,6 +1040,7 @@
         "repo": "mini.extra"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "7725a82b4d9c0acdc370385b9c04bb0791017230",
       "url": "https://github.com/echasnovski/mini.extra/archive/7725a82b4d9c0acdc370385b9c04bb0791017230.tar.gz",
       "hash": "0vndliykk98dn9qy8r3ip73y8zflyr40qml7jg522lq5ql546my6"
@@ -973,6 +1053,7 @@
         "repo": "mini.files"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "0a396f5ca5516a07959ae2c00667e1a26c20f0ea",
       "url": "https://github.com/echasnovski/mini.files/archive/0a396f5ca5516a07959ae2c00667e1a26c20f0ea.tar.gz",
       "hash": "1axjd6a6c02jllhi1l8c9xfplipvz4g82hnxjbsgx4kzc9b60zdq"
@@ -985,6 +1066,7 @@
         "repo": "mini.fuzzy"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "fb42763285075e316fd4250739af9b8c442503de",
       "url": "https://github.com/echasnovski/mini.fuzzy/archive/fb42763285075e316fd4250739af9b8c442503de.tar.gz",
       "hash": "0hl5ygzlf73g70j7pdd1x4975368sqpynpja1zx7bc5jln698vr4"
@@ -997,6 +1079,7 @@
         "repo": "mini-git"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "05f9ec07534ce8e2bf797c05c0a8bd826d9d24a2",
       "url": "https://github.com/echasnovski/mini-git/archive/05f9ec07534ce8e2bf797c05c0a8bd826d9d24a2.tar.gz",
       "hash": "0irvwbxhi9y4wf04khgv1l8z4a2hff3r7f2j3r0p76slqjgd7x19"
@@ -1009,6 +1092,7 @@
         "repo": "mini.hipatterns"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "fbf1e2195fdd65cf1bc970316c28098257728868",
       "url": "https://github.com/echasnovski/mini.hipatterns/archive/fbf1e2195fdd65cf1bc970316c28098257728868.tar.gz",
       "hash": "09g9b2jm1hac7pppmmncqpgaddd3yrlw9anhr4jw7lldr2bpwrqa"
@@ -1021,6 +1105,7 @@
         "repo": "mini.hues"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "7a88e67dfb953820718106d8fc83d0f97c4d9173",
       "url": "https://github.com/echasnovski/mini.hues/archive/7a88e67dfb953820718106d8fc83d0f97c4d9173.tar.gz",
       "hash": "1kgjkx9bqycmm077i4jk0fnyl47fkmmd2vv0qf6lqsnnliivqxqw"
@@ -1033,6 +1118,7 @@
         "repo": "mini.icons"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36",
       "url": "https://github.com/echasnovski/mini.icons/archive/ec61af6e606fc89ee3b1d8f2f20166a3ca917a36.tar.gz",
       "hash": "0y5b4bswykf8mf429y29lahmjzjsri0qspwyimnb1d73028qn8ck"
@@ -1045,6 +1131,7 @@
         "repo": "mini.indentscope"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "8ce41a77eed7f4121c83c67fda5e2e86af999e6d",
       "url": "https://github.com/echasnovski/mini.indentscope/archive/8ce41a77eed7f4121c83c67fda5e2e86af999e6d.tar.gz",
       "hash": "0dv4c6yf1s5fzvwy1n0chq553353bsix3g8ysajp9lswnd9lhbh4"
@@ -1057,6 +1144,7 @@
         "repo": "mini.jump"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "1fb371cfdcb314c5faa272976f23514f264bd755",
       "url": "https://github.com/echasnovski/mini.jump/archive/1fb371cfdcb314c5faa272976f23514f264bd755.tar.gz",
       "hash": "1975qyjzcziya2w121cjkqaj17wxp205jl3b7lrl25db6l6ggjcs"
@@ -1069,6 +1157,7 @@
         "repo": "mini.jump2d"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "3de91ea974627c4c2645e288bf0a6e6717a4dfa8",
       "url": "https://github.com/echasnovski/mini.jump2d/archive/3de91ea974627c4c2645e288bf0a6e6717a4dfa8.tar.gz",
       "hash": "0n40jmjbqnz1bbgal3j8m9cgzyma59ss8lxsqmi9230mkgd4xsnq"
@@ -1081,6 +1170,7 @@
         "repo": "mini.map"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "7f4c785b95ff6d266588fe6e5b6ea696cf654e61",
       "url": "https://github.com/echasnovski/mini.map/archive/7f4c785b95ff6d266588fe6e5b6ea696cf654e61.tar.gz",
       "hash": "0f8mlszgi1fnmy0npqw27g28h9bgavy7mc97zivgsxgx2whgz6al"
@@ -1093,6 +1183,7 @@
         "repo": "mini.misc"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "a477a9d5790f6d899d3055c87f2e771118f91180",
       "url": "https://github.com/echasnovski/mini.misc/archive/a477a9d5790f6d899d3055c87f2e771118f91180.tar.gz",
       "hash": "1fp60lhv93jiygc0hvchzdzjgs8scczp7kv9cm3kzzimcfa84ky6"
@@ -1105,6 +1196,7 @@
         "repo": "mini.move"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "c8b30e92dd2668dd6e56a9a23cb7d4ee38c2266d",
       "url": "https://github.com/echasnovski/mini.move/archive/c8b30e92dd2668dd6e56a9a23cb7d4ee38c2266d.tar.gz",
       "hash": "0cnzfn706s90bc0m49jkx3fjghrcv0byqbajdhwbrv8f77c6crg3"
@@ -1117,6 +1209,7 @@
         "repo": "mini.notify"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "e71f08013db6812d9ce95c2624ae405a4267f4f3",
       "url": "https://github.com/echasnovski/mini.notify/archive/e71f08013db6812d9ce95c2624ae405a4267f4f3.tar.gz",
       "hash": "0fmy3d62283j2cwlxk97fyylad2zkd5j2r7pg7fb3cq8k1021d0s"
@@ -1129,6 +1222,7 @@
         "repo": "mini.operators"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "02cfac95919b945c19221f0fcebe883c6dce04f6",
       "url": "https://github.com/echasnovski/mini.operators/archive/02cfac95919b945c19221f0fcebe883c6dce04f6.tar.gz",
       "hash": "1b51b3d1qkbzh68yadx3fcx9dgk405cb2ghln999fl5czvc3crmd"
@@ -1141,6 +1235,7 @@
         "repo": "mini.pairs"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918",
       "url": "https://github.com/echasnovski/mini.pairs/archive/1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918.tar.gz",
       "hash": "0d0188v3gw2sdqnfly6i12v9036hdk1sg362lkngjmlpnq3m8574"
@@ -1153,6 +1248,7 @@
         "repo": "mini.pick"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "12ea14f8e285d1bcc909116685fdbb129a89d546",
       "url": "https://github.com/echasnovski/mini.pick/archive/12ea14f8e285d1bcc909116685fdbb129a89d546.tar.gz",
       "hash": "1ssa7ym6zxhazx551bjsnfdmvm1553kj6amvcczw9jrqbf4ynjqy"
@@ -1165,6 +1261,7 @@
         "repo": "mini.sessions"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "f38354b72c11d5bbb2153183fa6ba0cf238147d5",
       "url": "https://github.com/echasnovski/mini.sessions/archive/f38354b72c11d5bbb2153183fa6ba0cf238147d5.tar.gz",
       "hash": "1m08i9b235bpgyjgajj85i10z991yigrhp3hg5xji9hajn0d67iw"
@@ -1177,6 +1274,7 @@
         "repo": "mini.snippets"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "04e1c0f8538a4ee0ddc054e30e92a93cb4c1b568",
       "url": "https://github.com/echasnovski/mini.snippets/archive/04e1c0f8538a4ee0ddc054e30e92a93cb4c1b568.tar.gz",
       "hash": "17fqgsr7id11f1wp6wri1zi67m2vh6i9hdrwj9bgjy4528x7gi6f"
@@ -1189,6 +1287,7 @@
         "repo": "mini.splitjoin"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "efe24ba54f9623cb05698355981ec05278976788",
       "url": "https://github.com/echasnovski/mini.splitjoin/archive/efe24ba54f9623cb05698355981ec05278976788.tar.gz",
       "hash": "0xnc61cm1zpj8j7j10zgpx4438vmqpdwbqick9rrw9jbmbzcc0p5"
@@ -1201,6 +1300,7 @@
         "repo": "mini.starter"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "736c5177bd90cc852c05d903f662f0fc395a4b4b",
       "url": "https://github.com/echasnovski/mini.starter/archive/736c5177bd90cc852c05d903f662f0fc395a4b4b.tar.gz",
       "hash": "0w2awkcrabbsybvv2hlzjlqgcr53480pg5p3fhaaparrhd90c7na"
@@ -1213,6 +1313,7 @@
         "repo": "mini.statusline"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "83209bfbca156f9e4a5ec47a2a8ce1e5ce26311d",
       "url": "https://github.com/echasnovski/mini.statusline/archive/83209bfbca156f9e4a5ec47a2a8ce1e5ce26311d.tar.gz",
       "hash": "1hma81mnylbnx812km7zc0xjxbs3bp2pb3bqzsny9w1llxwv7zrr"
@@ -1225,6 +1326,7 @@
         "repo": "mini.surround"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "f90069c7441a5fb04c3de42eacf93e16b64dd3eb",
       "url": "https://github.com/echasnovski/mini.surround/archive/f90069c7441a5fb04c3de42eacf93e16b64dd3eb.tar.gz",
       "hash": "0bs7y0ai67jlwdz76x6945xvj9f4vqr4qx4vyfg7z7b6k1gzc092"
@@ -1237,6 +1339,7 @@
         "repo": "mini.tabline"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "46108e2d32b0ec8643ee46df14badedb33f3defe",
       "url": "https://github.com/echasnovski/mini.tabline/archive/46108e2d32b0ec8643ee46df14badedb33f3defe.tar.gz",
       "hash": "19n37b89dxssx3p3lzr9l7pxmbdh0k2mb14ankpq3cy0ax3mi79c"
@@ -1249,6 +1352,7 @@
         "repo": "mini.test"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "16a909c3ce39d9af9ec4dacca16205d36f85d823",
       "url": "https://github.com/echasnovski/mini.test/archive/16a909c3ce39d9af9ec4dacca16205d36f85d823.tar.gz",
       "hash": "1qf8ay763d011rvy9qwpv8q3mlxjlymvc4gx3bjfv0n56k5dzpg0"
@@ -1261,6 +1365,7 @@
         "repo": "mini.trailspace"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "9bbbf568c06fe424dc21d2c228fa76098008a5f3",
       "url": "https://github.com/echasnovski/mini.trailspace/archive/9bbbf568c06fe424dc21d2c228fa76098008a5f3.tar.gz",
       "hash": "1ihd8fbs5imnp5xcllcj6fgpx0y4vclrkfz802q9fl7fqh00dcay"
@@ -1273,6 +1378,7 @@
         "repo": "mini.visits"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "46e7a4074032d0340308c3379bc3650626c85da8",
       "url": "https://github.com/echasnovski/mini.visits/archive/46e7a4074032d0340308c3379bc3650626c85da8.tar.gz",
       "hash": "1776i3xn9dpccjjamy5ys5acc3nxd3zph4a77sbw2dipfd8zpasi"
@@ -1285,6 +1391,7 @@
         "repo": "minimap.vim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "57287e2dd28fa3e63276a32d11c729df14741d54",
       "url": "https://github.com/wfxr/minimap.vim/archive/57287e2dd28fa3e63276a32d11c729df14741d54.tar.gz",
       "hash": "05k4cgcrz0gj92xy685bd4p6nh2jmaywc2f5sw1lap0v685h7n79"
@@ -1297,6 +1404,7 @@
         "repo": "mkdir.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "c55d1dee4f099528a1853b28bb28caa802eba217",
       "url": "https://github.com/jghauser/mkdir.nvim/archive/c55d1dee4f099528a1853b28bb28caa802eba217.tar.gz",
       "hash": "0zpyvkbw7wfqdxfgidr7zfxqb5ldci4pflx50rsm1hbwai0ybv23"
@@ -1309,6 +1417,7 @@
         "repo": "modes.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "1e34663c32e8f5d915921a938e0dc4e3e788ceb8",
       "url": "https://github.com/mvllow/modes.nvim/archive/1e34663c32e8f5d915921a938e0dc4e3e788ceb8.tar.gz",
       "hash": "07dara1m8igb6yr8jx62rl8jr71s51vxphiyk8i206bzmbx120ay"
@@ -1323,6 +1432,7 @@
       "pre_releases": false,
       "version_upper_bound": null,
       "release_prefix": null,
+      "submodules": false,
       "version": "v2.0.0",
       "revision": "782820896b1691ed664e4c24f1cd9793dcb33dfb",
       "url": "https://api.github.com/repos/smoka7/multicursors.nvim/tarball/v2.0.0",
@@ -1336,6 +1446,7 @@
         "repo": "neo-tree.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "d9544c74ec43cca0564fdc334c116fbe0be8a807",
       "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/d9544c74ec43cca0564fdc334c116fbe0be8a807.tar.gz",
       "hash": "0wiw4aipg3qmzw6k9vrljh4cg09kyqd28s6xpv2zhsg05mm38nhb"
@@ -1348,6 +1459,7 @@
         "repo": "neocord"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "41bacd44e9d36f5e36e0271672ac2c02f6fa355a",
       "url": "https://github.com/IogaMaster/neocord/archive/41bacd44e9d36f5e36e0271672ac2c02f6fa355a.tar.gz",
       "hash": "1n998zsv0bikscwpr75qq11xh559xzx6d7rs7fc21jj1rivkk4aw"
@@ -1360,6 +1472,7 @@
         "repo": "neorg"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "6f0b4eefa591fbc4c9344f110b0c0bac5b49078c",
       "url": "https://github.com/nvim-neorg/neorg/archive/6f0b4eefa591fbc4c9344f110b0c0bac5b49078c.tar.gz",
       "hash": "1x8h5hxzg06g1d849bna6rs4jzjf248g59v87zvlc4scmp9pzjga"
@@ -1372,6 +1485,7 @@
         "repo": "neorg-telescope"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "ddb2556644cae922699a239bbb0fe16e25b084b7",
       "url": "https://github.com/nvim-neorg/neorg-telescope/archive/ddb2556644cae922699a239bbb0fe16e25b084b7.tar.gz",
       "hash": "0p2s3n22fy1vkqc9n55x6kssqs4n0znwlszfrs532hj8m992wbks"
@@ -1384,6 +1498,7 @@
         "repo": "neovim-session-manager"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "3409dc920d40bec4c901c0a122a80bee03d6d1e1",
       "url": "https://github.com/Shatur/neovim-session-manager/archive/3409dc920d40bec4c901c0a122a80bee03d6d1e1.tar.gz",
       "hash": "1f7farfkr5ldpa7y7hz9sh8dp7538x1xvwr9n1zrra1szf7s8rlk"
@@ -1396,6 +1511,7 @@
         "repo": "new-file-template.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "6ac66669dbf2dc5cdee184a4fe76d22465ca67e8",
       "url": "https://github.com/otavioschwanck/new-file-template.nvim/archive/6ac66669dbf2dc5cdee184a4fe76d22465ca67e8.tar.gz",
       "hash": "0c7378c3w6bniclp666rq15c28akb0sjy58ayva0wpyin4k26hl3"
@@ -1408,6 +1524,7 @@
         "repo": "nix-develop.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "afea026f5c478c000a8af8de87f7b711676387ab",
       "url": "https://github.com/figsoda/nix-develop.nvim/archive/afea026f5c478c000a8af8de87f7b711676387ab.tar.gz",
       "hash": "0nwjgr19pzdxd7yygz380b388qcfbzp9svs916kh0zayzi9yxc2k"
@@ -1420,6 +1537,7 @@
         "repo": "noice.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "0427460c2d7f673ad60eb02b35f5e9926cf67c59",
       "url": "https://github.com/folke/noice.nvim/archive/0427460c2d7f673ad60eb02b35f5e9926cf67c59.tar.gz",
       "hash": "000y204jli68kg0s0dsqx78gkbg8zr9h2i2lzddvypfxgqjvfayk"
@@ -1432,6 +1550,7 @@
         "repo": "none-ls.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "bb680d752cec37949faca7a1f509e2fe67ab418a",
       "url": "https://github.com/nvimtools/none-ls.nvim/archive/bb680d752cec37949faca7a1f509e2fe67ab418a.tar.gz",
       "hash": "11zgc86cjkv1vi183mplx3bsqa2x7ardk7ybyrp702xx5hmd882l"
@@ -1444,6 +1563,7 @@
         "repo": "nord.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "57fb474a1d628bdf9d1e7964719464ed5675d7c7",
       "url": "https://github.com/gbprod/nord.nvim/archive/57fb474a1d628bdf9d1e7964719464ed5675d7c7.tar.gz",
       "hash": "1qdrss698sllsv0dkpfj6idap5w0dhkjwmy59kgafpdv0xyid2gp"
@@ -1456,6 +1576,7 @@
         "repo": "nui.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "8d3bce9764e627b62b07424e0df77f680d47ffdb",
       "url": "https://github.com/MunifTanjim/nui.nvim/archive/8d3bce9764e627b62b07424e0df77f680d47ffdb.tar.gz",
       "hash": "0ia8q5d4xcss45vw6jlaanyr0migy03cjzq9g0kipfyqxkcxi105"
@@ -1468,6 +1589,7 @@
         "repo": "nvim-autopairs"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "68f0e5c3dab23261a945272032ee6700af86227a",
       "url": "https://github.com/windwp/nvim-autopairs/archive/68f0e5c3dab23261a945272032ee6700af86227a.tar.gz",
       "hash": "1ai3s1083dx6bddhrkv7d3hyq3zsrblizbvpgl09r1w9cijxhj8m"
@@ -1480,6 +1602,7 @@
         "repo": "nvim-bufferline.lua"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3",
       "url": "https://github.com/akinsho/nvim-bufferline.lua/archive/655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3.tar.gz",
       "hash": "0m5363rpbjgvsnbhp9yrivbqj17lmrb5m57lpnq7dgxsmw3hrvk9"
@@ -1492,6 +1615,7 @@
         "repo": "nvim-cmp"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "1e1900b0769324a9675ef85b38f99cca29e203b3",
       "url": "https://github.com/hrsh7th/nvim-cmp/archive/1e1900b0769324a9675ef85b38f99cca29e203b3.tar.gz",
       "hash": "1yqg4gnzmlm9h5rcmzv7msjmqna0ffn7gllf5knfkps5ns0ynpyf"
@@ -1504,6 +1628,7 @@
         "repo": "nvim-colorizer.lua"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "517df88cf2afb36652830df2c655df2da416a0ae",
       "url": "https://github.com/NvChad/nvim-colorizer.lua/archive/517df88cf2afb36652830df2c655df2da416a0ae.tar.gz",
       "hash": "0gaxkq30wvxq3d8x6l6r10vdxyizfi5g55xnvzw69lfyl61d9qy8"
@@ -1516,6 +1641,7 @@
         "repo": "nvim-cursorline"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "804f0023692653b2b2368462d67d2a87056947f9",
       "url": "https://github.com/yamatsum/nvim-cursorline/archive/804f0023692653b2b2368462d67d2a87056947f9.tar.gz",
       "hash": "1zqbykfi4mjp07y8c1kir4lxgvcaxqy9jkn558y3n1jakpk3l72j"
@@ -1528,6 +1654,7 @@
         "repo": "nvim-dap"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "a720d4966f758ab22e8ec28812b6df90a53e0f02",
       "url": "https://github.com/mfussenegger/nvim-dap/archive/a720d4966f758ab22e8ec28812b6df90a53e0f02.tar.gz",
       "hash": "0b979dhl5jr3kx9j5zih39jbrv22d554ws6y8g1cgsm2i3412s4h"
@@ -1540,6 +1667,7 @@
         "repo": "nvim-dap-go"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "8763ced35b19c8dc526e04a70ab07c34e11ad064",
       "url": "https://github.com/leoluz/nvim-dap-go/archive/8763ced35b19c8dc526e04a70ab07c34e11ad064.tar.gz",
       "hash": "1s4vkq2ni9a5df455qn6qbj44r82rcghkcbkifxdcmz2kvmq3wmn"
@@ -1552,6 +1680,7 @@
         "repo": "nvim-dap-ui"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "bc81f8d3440aede116f821114547a476b082b319",
       "url": "https://github.com/rcarriga/nvim-dap-ui/archive/bc81f8d3440aede116f821114547a476b082b319.tar.gz",
       "hash": "0hk34mfjxqiq82faf3q75ixpxd822vh8zbl1i5pvx6akn4v3mxk7"
@@ -1564,6 +1693,7 @@
         "repo": "nvim-docs-view"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "1b97f8f954d74c46061bf289b6cea9232484c12c",
       "url": "https://github.com/amrbashir/nvim-docs-view/archive/1b97f8f954d74c46061bf289b6cea9232484c12c.tar.gz",
       "hash": "1xi0w20fq3yziwdjld1xhkm7dr0ihbbq2hik0qsckd7y73qqg5kg"
@@ -1576,6 +1706,7 @@
         "repo": "nvim-lightbulb"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "f7f61c47af5bf701b1f4af127bc565ab6491acbf",
       "url": "https://github.com/kosayoda/nvim-lightbulb/archive/f7f61c47af5bf701b1f4af127bc565ab6491acbf.tar.gz",
       "hash": "1wg7yib9qn8ybsk615kw1g8b3g5zbpdldp6bb7ax0jwxsn5nwwfb"
@@ -1588,6 +1719,7 @@
         "repo": "nvim-lint"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8",
       "url": "https://github.com/mfussenegger/nvim-lint/archive/6e9dd545a1af204c4022a8fcd99727ea41ffdcc8.tar.gz",
       "hash": "0b318dahzf9kd043mjsa41rj44zfbs7k8i4bz0rqhcqipr19rwhk"
@@ -1600,6 +1732,7 @@
         "repo": "nvim-lspconfig"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0",
       "url": "https://github.com/neovim/nvim-lspconfig/archive/8a1529e46eef5efc86c34c8d9bdd313abc2ecba0.tar.gz",
       "hash": "0l9mns71hh0jssxblr1q286z8hmxwbgyq1nw6scki9ffn23jwnz0"
@@ -1612,6 +1745,7 @@
         "repo": "nvim-metals"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "fe6125f633c1b2f68d468a2041e81e2e5e8933d4",
       "url": "https://github.com/scalameta/nvim-metals/archive/fe6125f633c1b2f68d468a2041e81e2e5e8933d4.tar.gz",
       "hash": "1xpav9ykwk7kz61c6y33kyjxf0nf47risdj0q9gf5rnl88cln4by"
@@ -1624,6 +1758,7 @@
         "repo": "nvim-navbuddy"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "f22bac988f2dd073601d75ba39ea5636ab6e38cb",
       "url": "https://github.com/SmiteshP/nvim-navbuddy/archive/f22bac988f2dd073601d75ba39ea5636ab6e38cb.tar.gz",
       "hash": "034pmg403y0y1fxnb1jv291mr016bx1vn68y543v6v4dpbdlr7di"
@@ -1636,6 +1771,7 @@
         "repo": "nvim-navic"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "8649f694d3e76ee10c19255dece6411c29206a54",
       "url": "https://github.com/SmiteshP/nvim-navic/archive/8649f694d3e76ee10c19255dece6411c29206a54.tar.gz",
       "hash": "0964wgwh6i4nm637vx36bshkpd5i63ipwzqmrdbkz5h9bzyng7nj"
@@ -1648,6 +1784,7 @@
         "repo": "nvim-neoclip.lua"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "831a97c7697736411a05ff8b91e8798ea4c2d6fb",
       "url": "https://github.com/AckslD/nvim-neoclip.lua/archive/831a97c7697736411a05ff8b91e8798ea4c2d6fb.tar.gz",
       "hash": "11nc3c04ljgh34jjjmyhanwbd4kmkay109168q88yfy6n6l2jf92"
@@ -1660,6 +1797,7 @@
         "repo": "nvim-nio"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "21f5324bfac14e22ba26553caf69ec76ae8a7662",
       "url": "https://github.com/nvim-neotest/nvim-nio/archive/21f5324bfac14e22ba26553caf69ec76ae8a7662.tar.gz",
       "hash": "1bz5msxwk232zkkhfxcmr7a665la8pgkdx70q99ihl4x04jg6dkq"
@@ -1672,6 +1810,7 @@
         "repo": "nvim-notify"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "22f29093eae7785773ee9d543f8750348b1a195c",
       "url": "https://github.com/rcarriga/nvim-notify/archive/22f29093eae7785773ee9d543f8750348b1a195c.tar.gz",
       "hash": "0nnxmi65ppmn8dzwh38vx2w7w6piq0i28mw0s32wa31xn5rmzwza"
@@ -1684,6 +1823,7 @@
         "repo": "nvim-scrollbar"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "6994eb9f73d5fdc36ee2c8717940e8c853e51a49",
       "url": "https://github.com/petertriho/nvim-scrollbar/archive/6994eb9f73d5fdc36ee2c8717940e8c853e51a49.tar.gz",
       "hash": "0h01gcaqgjkb2392zl2jwvlsh5qmz10k9sy5rhyz1kwizmw7nw7y"
@@ -1696,6 +1836,7 @@
         "repo": "nvim-surround"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "6c54643ef42016b744888b06d2381abd23f9b7ea",
       "url": "https://github.com/kylechui/nvim-surround/archive/6c54643ef42016b744888b06d2381abd23f9b7ea.tar.gz",
       "hash": "1c5agqfffmjxc73bv8d4hmrnzx62ikqpv7pii19v5alfdcnh5j48"
@@ -1708,6 +1849,7 @@
         "repo": "nvim-tree.lua"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "c09ff35de503a41fa62465c6b4ae72d96e7a7ce4",
       "url": "https://github.com/nvim-tree/nvim-tree.lua/archive/c09ff35de503a41fa62465c6b4ae72d96e7a7ce4.tar.gz",
       "hash": "0bnc2fc9ipz9yp917l61vvcaqmbdg5fhqxrp7jfjxj5qmvadhai9"
@@ -1720,6 +1862,7 @@
         "repo": "nvim-treesitter-context"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "572e534c9f881bb9bf9f388e4c87f360446c72d4",
       "url": "https://github.com/nvim-treesitter/nvim-treesitter-context/archive/572e534c9f881bb9bf9f388e4c87f360446c72d4.tar.gz",
       "hash": "0bg3x75j8mwvpdhwd945lxbwmhw2j1qi135zn0yli78c9jn8g0ay"
@@ -1732,6 +1875,7 @@
         "repo": "nvim-ts-autotag"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "a1d526af391f6aebb25a8795cbc05351ed3620b5",
       "url": "https://github.com/windwp/nvim-ts-autotag/archive/a1d526af391f6aebb25a8795cbc05351ed3620b5.tar.gz",
       "hash": "1wl30qr6xs6xwx0s3yjkprxp802dhg45rzdiwpr9v6mwbsm5qw3b"
@@ -1744,6 +1888,7 @@
         "repo": "nvim-ufo"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "a52c92c3bbaa10f0c9b547a50adaa8c7d8b29f94",
       "url": "https://github.com/kevinhwang91/nvim-ufo/archive/a52c92c3bbaa10f0c9b547a50adaa8c7d8b29f94.tar.gz",
       "hash": "1fv3rhny1d8wgxd3h3fy4vv05nb0fz506sk2in8rkmwlzwixl2wn"
@@ -1756,6 +1901,7 @@
         "repo": "nvim-web-devicons"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "d0cafff5c4347a604a07edf7bb9a91fda7eb577e",
       "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/d0cafff5c4347a604a07edf7bb9a91fda7eb577e.tar.gz",
       "hash": "1j5ccksn2lkd1f1fvhhjs2amhq17wxmgcqv6jk05jpdbngw2mv98"
@@ -1768,6 +1914,7 @@
         "repo": "obsidian.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "14e0427bef6c55da0d63f9a313fd9941be3a2479",
       "url": "https://github.com/epwalsh/obsidian.nvim/archive/14e0427bef6c55da0d63f9a313fd9941be3a2479.tar.gz",
       "hash": "15ycmhn48ryaqzch6w3w6llq2qgmjx8xwkb9dn0075z60dybpflr"
@@ -1780,6 +1927,7 @@
         "repo": "omnisharp-extended-lsp.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "ec1a2431f8872f650a85ed71c24f0715df2e49c2",
       "url": "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/archive/ec1a2431f8872f650a85ed71c24f0715df2e49c2.tar.gz",
       "hash": "14wgsvbxlid2qx0yyy6g10d5v37dkf5d75cwffmmgf0pzs88z004"
@@ -1792,6 +1940,7 @@
         "repo": "onedark.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "67a74c275d1116d575ab25485d1bfa6b2a9c38a6",
       "url": "https://github.com/navarasu/onedark.nvim/archive/67a74c275d1116d575ab25485d1bfa6b2a9c38a6.tar.gz",
       "hash": "1pfyz3ascxs3sxl878qcirp9jsz77kpl2ks3wxkcv8ql4psymc9l"
@@ -1804,6 +1953,7 @@
         "repo": "orgmode"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "abf8890a9b0612c51d738268c759c4331bc2109c",
       "url": "https://github.com/nvim-orgmode/orgmode/archive/abf8890a9b0612c51d738268c759c4331bc2109c.tar.gz",
       "hash": "0j4f2y47s5ymii1w0r9gk39z4vks5fc9cy0rvj1vzml4vf4wijsi"
@@ -1816,6 +1966,7 @@
         "repo": "otter.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "e37053d2c6a17463e705483122eee04d41e3d4af",
       "url": "https://github.com/jmbuhr/otter.nvim/archive/e37053d2c6a17463e705483122eee04d41e3d4af.tar.gz",
       "hash": "0sq7x2mcxl7z0j4s3a395fy0bzz13h4rxd03lp6674y6hsjxcm55"
@@ -1828,6 +1979,7 @@
         "repo": "oxocarbon.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "004777819ba294423b638a35a75c9f0c7be758ed",
       "url": "https://github.com/nyoom-engineering/oxocarbon.nvim/archive/004777819ba294423b638a35a75c9f0c7be758ed.tar.gz",
       "hash": "1qllk870nqc9nhkdgmqm8km2rar6dsmyhfhpcfx8crrg640yfbqy"
@@ -1840,6 +1992,7 @@
         "repo": "pathlib.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1",
       "url": "https://github.com/pysan3/pathlib.nvim/archive/57e5598af6fe253761c1b48e0b59b7cd6699e2c1.tar.gz",
       "hash": "1z3nwy83r3zbll9wc2wyvg60z0dqc5hm2xdfvqh3hwm5s9w8j432"
@@ -1852,6 +2005,7 @@
         "repo": "plenary.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "857c5ac632080dba10aae49dba902ce3abf91b35",
       "url": "https://github.com/nvim-lua/plenary.nvim/archive/857c5ac632080dba10aae49dba902ce3abf91b35.tar.gz",
       "hash": "0jxx9nfga7z87v78cifglqs8w4mrpf99wcp483kb0hbv6537jmgh"
@@ -1864,6 +2018,7 @@
         "repo": "precognition.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "4223fb903cbafc3bd8a87a314dac375bbd1c01ce",
       "url": "https://github.com/tris203/precognition.nvim/archive/4223fb903cbafc3bd8a87a314dac375bbd1c01ce.tar.gz",
       "hash": "11ng6p0xmrjky5xr9jdkrrav7is9r090qhs2fsnbg16124bgb0g5"
@@ -1876,6 +2031,7 @@
         "repo": "project.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb",
       "url": "https://github.com/ahmedkhalf/project.nvim/archive/8c6bad7d22eef1b71144b401c9f74ed01526a4fb.tar.gz",
       "hash": "1md639mcs3dgvhvx93wi0rxiwjnb195r9al9bfqvcvl3r307gxba"
@@ -1888,6 +2044,7 @@
         "repo": "promise-async"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "119e8961014c9bfaf1487bf3c2a393d254f337e2",
       "url": "https://github.com/kevinhwang91/promise-async/archive/119e8961014c9bfaf1487bf3c2a393d254f337e2.tar.gz",
       "hash": "0q4a0rmy09hka6zvydzjj2gcm2j5mlbrhbxfcdjj33ngpblkmqzm"
@@ -1900,6 +2057,7 @@
         "repo": "rainbow-delimiters.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "f1e5490e87478cf0b528250ebb51552f3d08436a",
       "url": "https://github.com/HiPhish/rainbow-delimiters.nvim/archive/f1e5490e87478cf0b528250ebb51552f3d08436a.tar.gz",
       "hash": "02265awjpkd8v6s22wx8qrk2wxq8b7c7h5lr9n7pi6d4lwyrkrxf"
@@ -1912,6 +2070,7 @@
         "repo": "registers.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "c217f8f369e0886776cda6c94eab839b30a8940d",
       "url": "https://github.com/tversteeg/registers.nvim/archive/c217f8f369e0886776cda6c94eab839b30a8940d.tar.gz",
       "hash": "1pdfm98grlka537i1c94vi8bpbp66slkyz3by040wlfq4pgr3frk"
@@ -1924,6 +2083,7 @@
         "repo": "render-markdown.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "08e1fa4e281e48ee4aa892428de9fb91e66edca6",
       "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/08e1fa4e281e48ee4aa892428de9fb91e66edca6.tar.gz",
       "hash": "1kiwa88l2262ycfj6z70hdriml0y2wnji3l9w27jbky9zxwhazrs"
@@ -1936,6 +2096,7 @@
         "repo": "neovim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "7d1b5c7dcd274921f0f58e90a8bf935f6a95fbf3",
       "url": "https://github.com/rose-pine/neovim/archive/7d1b5c7dcd274921f0f58e90a8bf935f6a95fbf3.tar.gz",
       "hash": "0iy9is76bhgb17v0l7mr95mkhd9b4ah917v9shx74jp1xsgc481q"
@@ -1948,6 +2109,7 @@
         "repo": "rtp.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "494ddfc888bb466555d90ace731856de1320fe45",
       "url": "https://github.com/nvim-neorocks/rtp.nvim/archive/494ddfc888bb466555d90ace731856de1320fe45.tar.gz",
       "hash": "1b6hx50nr2s2mnhsx9zy54pjdq7f78mi394v2b2c9v687s45nqln"
@@ -1960,6 +2122,7 @@
         "repo": "run.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "9015c9cece816ccf10a185b420f6e345fd990802",
       "url": "https://github.com/diniamo/run.nvim/archive/9015c9cece816ccf10a185b420f6e345fd990802.tar.gz",
       "hash": "10xqwck0l1ad79midicilv4hnrczzjn7lkqi7a60hba20hwb4lq8"
@@ -1972,6 +2135,7 @@
         "repo": "rustaceanvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "c7cc0e00ec53cafaa38e258cba4a6507c180289b",
       "url": "https://github.com/mrcjkb/rustaceanvim/archive/c7cc0e00ec53cafaa38e258cba4a6507c180289b.tar.gz",
       "hash": "1514w2x5vpn790rz8wkah0chr7yz9sm5whaprnm1qc26fz4jwc17"
@@ -1984,6 +2148,7 @@
         "repo": "smartcolumn.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "92f3773af80d674f1eb61e112dca79e2fa449fd1",
       "url": "https://github.com/m4xshen/smartcolumn.nvim/archive/92f3773af80d674f1eb61e112dca79e2fa449fd1.tar.gz",
       "hash": "0k1xnyvblshn4fhbxgl0i34j22n55xlwr09sdmb23l57br5rb07q"
@@ -1998,6 +2163,7 @@
       "pre_releases": false,
       "version_upper_bound": null,
       "release_prefix": null,
+      "submodules": false,
       "version": "v2.22.0",
       "revision": "5eac729fa290248acfe10916d92a5ed5e5c0f9ed",
       "url": "https://api.github.com/repos/folke/snacks.nvim/tarball/v2.22.0",
@@ -2011,6 +2177,7 @@
         "repo": "sqls.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "a514379f5f89bf72955ed3bf5c1c31a40b8a1472",
       "url": "https://github.com/nanotee/sqls.nvim/archive/a514379f5f89bf72955ed3bf5c1c31a40b8a1472.tar.gz",
       "hash": "0rdhfjzfqhpjimi7b398d8ivfrg3ay084gz92fp0g4sgr3m876x3"
@@ -2023,6 +2190,7 @@
         "repo": "tabular"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "12437cd1b53488e24936ec4b091c9324cafee311",
       "url": "https://github.com/godlygeek/tabular/archive/12437cd1b53488e24936ec4b091c9324cafee311.tar.gz",
       "hash": "1cnh21yhcn2f4fajdr2b6hrclnhf1sz4abra4nw7b5yk1mvfjq5a"
@@ -2035,6 +2203,7 @@
         "repo": "telescope.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "814f102cd1da3dc78c7d2f20f2ef3ed3cdf0e6e4",
       "url": "https://github.com/nvim-telescope/telescope.nvim/archive/814f102cd1da3dc78c7d2f20f2ef3ed3cdf0e6e4.tar.gz",
       "hash": "0lbsq6x5bf7l54x7rkdkh7pa63afsgf0jnm0zf9ig7fw2lh18b8f"
@@ -2047,6 +2216,7 @@
         "repo": "tiny-devicons-auto-colors.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "51f548421f8a74680eff27d283c9d5ea6e8d0074",
       "url": "https://github.com/rachartier/tiny-devicons-auto-colors.nvim/archive/51f548421f8a74680eff27d283c9d5ea6e8d0074.tar.gz",
       "hash": "1nps9l2bagnxb5948rc6ggvc48097kza5ijl33vz0msdriqnkznf"
@@ -2059,6 +2229,7 @@
         "repo": "todo-comments.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5",
       "url": "https://github.com/folke/todo-comments.nvim/archive/304a8d204ee787d2544d8bc23cd38d2f929e7cc5.tar.gz",
       "hash": "0hrmiaxjp11200nds3y33brj8gpbn5ykd78jfy1jiash3d44xpva"
@@ -2071,6 +2242,7 @@
         "repo": "toggleterm.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "9a88eae817ef395952e08650b3283726786fb5fb",
       "url": "https://github.com/akinsho/toggleterm.nvim/archive/9a88eae817ef395952e08650b3283726786fb5fb.tar.gz",
       "hash": "17plyvajwdhpiadsd80vph75qll8pv9571c2wnw35ngmw9gmnavz"
@@ -2083,6 +2255,7 @@
         "repo": "tokyonight.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "057ef5d260c1931f1dffd0f052c685dcd14100a3",
       "url": "https://github.com/folke/tokyonight.nvim/archive/057ef5d260c1931f1dffd0f052c685dcd14100a3.tar.gz",
       "hash": "002rzmdxq45bdyd27i8k8lhdcwxn9l4v6x5cm6g7v1213m0n25np"
@@ -2095,6 +2268,7 @@
         "repo": "trouble.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3",
       "url": "https://github.com/folke/trouble.nvim/archive/85bedb7eb7fa331a2ccbecb9202d8abba64d37b3.tar.gz",
       "hash": "0qn84q75dk2vbw2shh7g9i3x8m5wnhcg17zx26njpl0srykp1vva"
@@ -2107,6 +2281,7 @@
         "repo": "ts-error-translator.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "47e5ba89f71b9e6c72eaaaaa519dd59bd6897df4",
       "url": "https://github.com/dmmulroy/ts-error-translator.nvim/archive/47e5ba89f71b9e6c72eaaaaa519dd59bd6897df4.tar.gz",
       "hash": "08whn7l75qv5n74cifmnxc0s7n7ja1g7589pjnbbsk2djn6bqbky"
@@ -2119,6 +2294,7 @@
         "repo": "typst-preview.nvim"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "ddcc71126f910ec83037622bc8d506f91a290ade",
       "url": "https://github.com/chomosuke/typst-preview.nvim/archive/ddcc71126f910ec83037622bc8d506f91a290ade.tar.gz",
       "hash": "1iqcbpgk87gcgnqd5dv8n4h4hbildp5hbjhnlwjx5zlzcg5qv2my"
@@ -2131,6 +2307,7 @@
         "repo": "vim-dirtytalk"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "aa57ba902b04341a04ff97214360f56856493583",
       "url": "https://github.com/psliwka/vim-dirtytalk/archive/aa57ba902b04341a04ff97214360f56856493583.tar.gz",
       "hash": "0ikk2z9axk9hys3an3cvp7m8fwrmrxb570iw1km3yz7z9f73jdbb"
@@ -2143,6 +2320,7 @@
         "repo": "vim-fugitive"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "4a745ea72fa93bb15dd077109afbb3d1809383f2",
       "url": "https://github.com/tpope/vim-fugitive/archive/4a745ea72fa93bb15dd077109afbb3d1809383f2.tar.gz",
       "hash": "188l24j7j57hgs02gy6ch165agyrwr4g034c5j3m1vnw14vmw2yl"
@@ -2155,6 +2333,7 @@
         "repo": "vim-illuminate"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "19cb21f513fc2b02f0c66be70107741e837516a1",
       "url": "https://github.com/RRethy/vim-illuminate/archive/19cb21f513fc2b02f0c66be70107741e837516a1.tar.gz",
       "hash": "1wfri17br6yqxnci43g69mvbckb7ajhj3c0mlcn1g0s7jkxz4acd"
@@ -2167,6 +2346,7 @@
         "repo": "vim-markdown"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51",
       "url": "https://github.com/preservim/vim-markdown/archive/8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51.tar.gz",
       "hash": "14x6jfla4921jyx4xxqng9vzmb0iaj2nn7wckhmlx8jpks6r4834"
@@ -2179,6 +2359,7 @@
         "repo": "vim-repeat"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "65846025c15494983dafe5e3b46c8f88ab2e9635",
       "url": "https://github.com/tpope/vim-repeat/archive/65846025c15494983dafe5e3b46c8f88ab2e9635.tar.gz",
       "hash": "0n8sx6s2sbjb21dv9j6y5lyqda9vvxraffg2jz423daamn96dxqv"
@@ -2191,6 +2372,7 @@
         "repo": "vim-startify"
       },
       "branch": "master",
+      "submodules": false,
       "revision": "4e089dffdad46f3f5593f34362d530e8fe823dcf",
       "url": "https://github.com/mhinz/vim-startify/archive/4e089dffdad46f3f5593f34362d530e8fe823dcf.tar.gz",
       "hash": "1ycqfqnmalqzrx1yy9a1fc2p0w922x4sqv2222bi9xjzmh77z4sv"
@@ -2203,6 +2385,7 @@
         "repo": "which-key.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "370ec46f710e058c9c1646273e6b225acf47cbed",
       "url": "https://github.com/folke/which-key.nvim/archive/370ec46f710e058c9c1646273e6b225acf47cbed.tar.gz",
       "hash": "0am4yw7lnibgc949qvbsi4a7hqdx6gk209l5vafv5bwcvd4irwxs"
@@ -2215,10 +2398,11 @@
         "repo": "yanky.nvim"
       },
       "branch": "main",
+      "submodules": false,
       "revision": "80d9385dbebe7049fd1961d7909b835a58ce9dcc",
       "url": "https://github.com/gbprod/yanky.nvim/archive/80d9385dbebe7049fd1961d7909b835a58ce9dcc.tar.gz",
       "hash": "1lg9nxc01shkazqk5g3j0iskiqbwr9sxv07sqrwkwlh36jn59rcp"
     }
   },
-  "version": 3
-}
\ No newline at end of file
+  "version": 5
+}
diff --git a/npins/sources.nix b/npins/sources.nix
index daa176a0..162f1d94 100644
--- a/npins/sources.nix
+++ b/npins/sources.nix
@@ -1,5 +1,3 @@
-# Based off of:
-# https://github.com/NixOS/nixpkgs/blob/776c3bee4769c616479393aeefceefeda16b6fcb/pkgs/tools/nix/npins/source.nix
 {
   lib,
   fetchurl,
@@ -8,7 +6,16 @@
 }:
 builtins.mapAttrs
 (
-  _: let
+  name: let
+    getUrl = {
+      url,
+      hash,
+      ...
+    }:
+      fetchurl {
+        inherit url;
+        sha256 = hash;
+      };
     getZip = {
       url,
       hash,
@@ -23,19 +30,29 @@ builtins.mapAttrs
       repository,
       revision,
       url ? null,
+      submodules,
       hash,
       ...
     } @ attrs:
       assert repository ? type;
-        if url != null
+        if url != null && !submodules
         then getZip attrs
         else
           assert repository.type == "Git"; let
-            urlToName = url: rev: let
-              matched = builtins.match "^.*/([^/]*)(\\.git)?$" repository.url;
-              short = builtins.substring 0 7 rev;
+            url' =
+              if repository.type == "Git"
+              then repository.url
+              else if repository.type == "GitHub"
+              then "https://github.com/${repository.owner}/${repository.repo}.git"
+              else if repository.type == "GitLab"
+              then "${repository.server}/${repository.repo_path}.git"
+              else throw "Unrecognized repository type ${repository.type}";
+
+            name = let
+              matched = builtins.match "^.*/([^/]*)(\\.git)?$" url';
+              short = builtins.substring 0 7 revision;
               appendShort =
-                if (builtins.match "[a-f0-9]*" rev) != null
+                if (builtins.match "[a-f0-9]*" revision) != null
                 then "-${short}"
                 else "";
             in "${
@@ -43,43 +60,53 @@ builtins.mapAttrs
               then "source"
               else builtins.head matched
             }${appendShort}";
-            name = urlToName repository.url revision;
           in
             fetchgit {
               inherit name;
-              inherit (repository) url;
+              url = url';
               rev = revision;
               sha256 = hash;
+              fetchSubmodules = submodules;
             };
-
-    mkPyPiSource = {
-      url,
-      hash,
-      ...
-    }:
-      fetchurl {
-        inherit url;
-        sha256 = hash;
-      };
   in
     spec:
       assert spec ? type; let
+        mayOverride = path: let
+          envVarName = "NPINS_OVERRIDE_${saneName}";
+          saneName = lib.stringAsChars (c:
+            if (builtins.match "[a-zA-Z0-9]" c) == null
+            then "_"
+            else c)
+          name;
+          ersatz = builtins.getEnv envVarName;
+        in
+          if ersatz == ""
+          then path
+          else
+            # this turns the string into an actual Nix path (for both absolute and
+            # relative paths)
+            builtins.trace "Overriding path of \"${name}\" with \"${ersatz}\" due to set \"${envVarName}\"" (
+              if builtins.substring 0 1 ersatz == "/"
+              then /. + ersatz
+              else /. + builtins.getEnv "PWD" + "/${ersatz}"
+            );
         func =
           {
             Git = mkGitSource;
             GitRelease = mkGitSource;
-            PyPi = mkPyPiSource;
+            PyPi = getUrl;
             Channel = getZip;
+            Tarball = getUrl;
           }
           .${spec.type}
           or (builtins.throw "Unknown source type ${spec.type}");
       in
-        spec // {outPath = func spec;}
+        spec // {outPath = mayOverride (func spec);}
 )
 (
   let
     json = lib.importJSON ./sources.json;
   in
-    assert lib.assertMsg (json.version == 3) "Npins version mismatch!";
+    assert lib.assertMsg (json.version == 5) "Npins version mismatch!";
       json.pins
 )

From 7a78edac81a1dc635c61c2b5117dd0c94943d0e5 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 25 Mar 2025 12:49:55 +0300
Subject: [PATCH 034/202] ci: consolidate 'check' type workflows into one

---
 .github/workflows/check-docs.yml   |  56 -------------
 .github/workflows/check.yml        | 127 +++++++++++++++++++++++++++--
 .github/workflows/cleanup.yml      |   6 +-
 .github/workflows/docs-preview.yml |   4 +-
 .github/workflows/editorconfig.yml |  46 -----------
 .github/workflows/typos.yml        |  30 -------
 6 files changed, 128 insertions(+), 141 deletions(-)
 delete mode 100644 .github/workflows/check-docs.yml
 delete mode 100644 .github/workflows/editorconfig.yml
 delete mode 100644 .github/workflows/typos.yml

diff --git a/.github/workflows/check-docs.yml b/.github/workflows/check-docs.yml
deleted file mode 100644
index 4d133ecd..00000000
--- a/.github/workflows/check-docs.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: "Validate flake & check documentation"
-on:
-  pull_request:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-    paths:
-      - docs/**
-jobs:
-  flake-docs-check:
-    name: Validate Flake Documentation
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        package:
-          - docs
-          - docs-html
-          - docs-manpages
-          - docs-json
-    steps:
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@main
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set default git branch (to reduce log spam)
-        run: git config --global init.defaultBranch main
-
-      - name: Build documentation packages
-        run: nix build .#${{ matrix.package }} --print-build-logs
-
-      - name: Get current date
-        id: get-date
-        # output format: 2023-12-22-120000
-        run: echo "date=$(date +'%Y-%m-%d-%H%M%S')" >> ${GITHUB_OUTPUT}
-
-      - name: Upload doc artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: "${{ matrix.package }}"
-          path: result/share/doc/nvf
-
-  flake-docs-linkcheck:
-    name: Validate hyperlinks in documentation sources
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@main
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Build documentation packages
-        run: nix build .#docs-linkcheck -Lv
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 7a7677eb..c6967f21 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -1,4 +1,6 @@
-name: "Validate flake & check formatting"
+name: "Treewide Checks"
+permissions: read-all
+
 on:
   pull_request:
   workflow_dispatch:
@@ -6,13 +8,13 @@ on:
     branches:
       - main
     paths-ignore:
-      - .github/**
       - assets/**
-      - .gitignore
+
 jobs:
   nix-flake-check:
-    name: Validate Flake
+    name: "Validate flake"
     runs-on: ubuntu-latest
+    if: "!contains(github.event.pull_request.title, '[skip ci]')"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -24,8 +26,9 @@ jobs:
         run: nix flake check
 
   format-with-alejandra:
-    name: Formatting via Alejandra
+    name: "Check formatting"
     runs-on: ubuntu-latest
+    if: "!contains(github.event.pull_request.title, '[skip ci]')"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -33,4 +36,116 @@ jobs:
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
 
-      - run: nix run nixpkgs#alejandra -- -c .
+      - name: Check formatting via Alejandra
+        run: nix run nixpkgs#alejandra -- -c .
+
+  check-typos:
+    name: "Check source tree for typos"
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.pull_request.title, '[skip ci]')"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Check for typos
+        uses: crate-ci/typos@master
+        with:
+          config: .github/typos.toml
+
+      - if: ${{ failure() }}
+        shell: bash
+        run: |
+          echo "::error:: Current codebase contains typos that were caught by the CI!"
+          echo "If those typos were intentional, please add them to the ignored regexes in .github/typos.toml"
+          echo "[skip ci] label may be added to the PR title if this is a one-time issue and is safe to ignore"
+          exit 1
+
+  flake-docs-check:
+    name: "Validate documentation builds"
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.pull_request.title, '[skip ci]')"
+    strategy:
+      matrix:
+        package:
+          - docs
+          - docs-html
+          - docs-manpages
+          - docs-json
+    steps:
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set default git branch (to reduce log spam)
+        run: git config --global init.defaultBranch main
+
+      - name: Build documentation packages
+        run: nix build .#${{ matrix.package }} --print-build-logs
+
+      - name: Get current date
+        id: get-date
+        # output format: 2023-12-22-120000
+        run: echo "date=$(date +'%Y-%m-%d-%H%M%S')" >> ${GITHUB_OUTPUT}
+
+      - name: Upload doc artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: "${{ matrix.package }}"
+          path: result/share/doc/nvf
+
+  flake-docs-linkcheck:
+    name: "Validate hyperlinks in documentation sources"
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.pull_request.title, '[skip ci]')"
+    steps:
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build linkcheck package
+        run: nix build .#docs-linkcheck -Lv
+
+  check-editorconfig:
+    name: "Validate Editorconfig conformance"
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.pull_request.title, '[skip ci]')"
+    steps:
+      - name: Get list of changed files from PR
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh api \
+            repos/${{ github.repository }}/pulls/${{github.event.number}}/files --paginate \
+            | jq '.[] | select(.status != "removed") | .filename' \
+            > "$HOME/changed_files"
+
+      - name: Print list of changed files
+        run: |
+          cat "$HOME/changed_files"
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: refs/pull/${{ github.event.pull_request.number }}/merge
+
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
+
+      - name: Checking EditorConfig
+        shell: bash
+        run: |
+          cat "$HOME/changed_files" | nix-shell -p editorconfig-checker.out \
+            --run 'xargs -r editorconfig-checker -disable-indentation -exclude flake.lock --verbose'
+          echo -n "Check status: $?"
+
+      - if: ${{ failure() }}
+        shell: bash
+        run: |
+          echo "::error:: Current formatting does not fit convention provided by .editorconfig located in the project root."
+          echo "Please make sure your editor properly integrates editorconfig, Neovim does so by default."
+          echo "See https://editorconfig.org/#download on how to integrate Editorconfig to your editor."
+          exit 1
diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
index fbc12bc1..aa8fb272 100644
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -1,9 +1,13 @@
-name: Cleanup
+name: Delete Stale Branches
+permissions:
+  contents: write
+
 on:
   workflow_dispatch:
   schedule:
     - cron: "0 4 1 * *" # 4AM on 1st of every month
     - cron: "0 4 15 * *" # 4AM on the 15th of every month
+
 jobs:
   branches:
     name: Cleanup old branches
diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml
index f8f45d05..9adaf5ef 100644
--- a/.github/workflows/docs-preview.yml
+++ b/.github/workflows/docs-preview.yml
@@ -9,7 +9,7 @@ on:
       - "modules/**"
       - "docs/**"
 
-# Defining permissions here passes it to all workflows.
+# Defining permissions here passes it to all jobs.
 # https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/controlling-permissions-for-github_token
 permissions:
   contents: write
@@ -34,7 +34,7 @@ jobs:
         run: git config --global init.defaultBranch main
 
       - name: Build documentation packages
-        run: nix build .#docs-html --print-build-logs
+        run: nix build .#docs-html --print-build-logs || exit 1
 
       - name: Deploy to GitHub Pages preview
         run: |
diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml
deleted file mode 100644
index 3d8ca360..00000000
--- a/.github/workflows/editorconfig.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: "Check validity of .editorconfig"
-
-permissions: read-all
-
-on:
-  pull_request:
-
-jobs:
-  check-editorconfig:
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.pull_request.title, '[skip ci]')"
-    steps:
-      - name: Get list of changed files from PR
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh api \
-            repos/notashelf/nvf/pulls/${{github.event.number}}/files --paginate \
-            | jq '.[] | select(.status != "removed") | .filename' \
-            > "$HOME/changed_files"
-
-      - name: Print list of changed files
-        run: |
-          cat "$HOME/changed_files"
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: refs/pull/${{ github.event.pull_request.number }}/merge
-
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@main
-
-      - name: Checking EditorConfig
-        shell: bash
-        run: |
-          cat "$HOME/changed_files" | nix-shell -p editorconfig-checker.out --run 'xargs -r editorconfig-checker -disable-indentation -exclude flake.lock --verbose'
-          echo -n "Check status: $?"
-
-      - name: Fail Gracefully
-        if: ${{ failure() }}
-        shell: bash
-        run: |
-          echo "::error:: Current formatting does not fit convention provided by .editorconfig located in the project root."
-          echo "Please make sure your editor properly integrates editorconfig. See https://editorconfig.org/#download for more."
-          exit 1
diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
deleted file mode 100644
index d74ee5b7..00000000
--- a/.github/workflows/typos.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: "Check for typos in the source tree"
-
-permissions: read-all
-
-on:
-  pull_request:
-  workflow_dispatch:
-  push:
-
-jobs:
-  check-typos:
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.pull_request.title, '[skip ci]')"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Check for typos
-        uses: crate-ci/typos@master
-        with:
-          config: .github/typos.toml
-
-      - name: Fail Gracefully
-        if: ${{ failure() }}
-        shell: bash
-        run: |
-          echo "::error:: Current codebase contains typos that were caught by the CI!"
-          echo "If those typos were intentional, please add them to the ignored regexes in .github/typos.toml"
-          echo "[skip ci] label may be used if this is a one-time issue"
-          exit 1

From d6a310252fd307acf90d2171368ee6e1b05b3950 Mon Sep 17 00:00:00 2001
From: Marlon Rosenberg <marlon.rosenberg@t-online.de>
Date: Tue, 25 Mar 2025 19:42:50 +0000
Subject: [PATCH 035/202] languages/fsharp: resolve comments

---
 configuration.nix                    | 1 +
 modules/plugins/languages/fsharp.nix | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index a243c970..78dad9c7 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -82,6 +82,7 @@ isMaximal: {
       elixir.enable = false;
       haskell.enable = false;
       ruby.enable = false;
+      fsharp.enable = false;
 
       tailwind.enable = false;
       svelte.enable = false;
diff --git a/modules/plugins/languages/fsharp.nix b/modules/plugins/languages/fsharp.nix
index 2b80bf11..ee728060 100644
--- a/modules/plugins/languages/fsharp.nix
+++ b/modules/plugins/languages/fsharp.nix
@@ -60,14 +60,14 @@ in {
       lsp = {
         enable = mkEnableOption "F# LSP support" // {default = config.vim.languages.enableLSP;};
         server = mkOption {
-          description = "F# LSP server to use";
           type = enum (attrNames servers);
+          description = "F# LSP server to use";
           default = defaultServer;
         };
 
         package = mkOption {
-          description = "F# LSP server package, or the command to run as a list of strings";
           type = either package (listOf str);
+          description = "F# LSP server package, or the command to run as a list of strings";
           default = servers.${cfg.lsp.server}.package;
         };
       };
@@ -75,14 +75,14 @@ in {
         enable = mkEnableOption "F# formatting" // {default = config.vim.languages.enableFormat;};
 
         type = mkOption {
-          description = "F# formatter to use";
           type = enum (attrNames formats);
+          description = "F# formatter to use";
           default = defaultFormat;
         };
 
         package = mkOption {
-          description = "F# formatter package";
           type = package;
+          description = "F# formatter package";
           default = formats.${cfg.format.type}.package;
         };
       };

From 2aa187999618ad94a1ea701a46d80dff21c9d871 Mon Sep 17 00:00:00 2001
From: raf <raf@notashelf.dev>
Date: Tue, 25 Mar 2025 21:40:13 +0000
Subject: [PATCH 036/202] Update rl-0.8.md

---
 docs/release-notes/rl-0.8.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index afb5ccd3..7f6c6ffe 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -277,6 +277,6 @@
 
 - `eslint_d` now checks for configuration files to load.
 
-[Sc3l3t0n](https://github.com/Sc3l3t0n)
+[Sc3l3t0n](https://github.com/Sc3l3t0n):
 
 - Add F# support under `vim.languages.fsharp`.

From d92b3f37143a73e6f6b1fffc753fc1b898bc2c87 Mon Sep 17 00:00:00 2001
From: Marlon Rosenberg <marlon.rosenberg@t-online.de>
Date: Tue, 25 Mar 2025 22:16:20 +0000
Subject: [PATCH 037/202] correct ordering

---
 modules/plugins/languages/fsharp.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/plugins/languages/fsharp.nix b/modules/plugins/languages/fsharp.nix
index ee728060..6ae1a5b1 100644
--- a/modules/plugins/languages/fsharp.nix
+++ b/modules/plugins/languages/fsharp.nix
@@ -61,14 +61,14 @@ in {
         enable = mkEnableOption "F# LSP support" // {default = config.vim.languages.enableLSP;};
         server = mkOption {
           type = enum (attrNames servers);
-          description = "F# LSP server to use";
           default = defaultServer;
+          description = "F# LSP server to use";
         };
 
         package = mkOption {
           type = either package (listOf str);
-          description = "F# LSP server package, or the command to run as a list of strings";
           default = servers.${cfg.lsp.server}.package;
+          description = "F# LSP server package, or the command to run as a list of strings";
         };
       };
       format = {
@@ -76,14 +76,14 @@ in {
 
         type = mkOption {
           type = enum (attrNames formats);
-          description = "F# formatter to use";
           default = defaultFormat;
+          description = "F# formatter to use";
         };
 
         package = mkOption {
           type = package;
-          description = "F# formatter package";
           default = formats.${cfg.format.type}.package;
+          description = "F# formatter package";
         };
       };
     };

From 43843da2300fa2eba2dc880cfb30ff964a1311de Mon Sep 17 00:00:00 2001
From: Marlon Rosenberg <marlon.rosenberg@t-online.de>
Date: Tue, 25 Mar 2025 22:28:08 +0000
Subject: [PATCH 038/202] add example to lsp package

---
 modules/plugins/languages/fsharp.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/plugins/languages/fsharp.nix b/modules/plugins/languages/fsharp.nix
index 6ae1a5b1..86c08d39 100644
--- a/modules/plugins/languages/fsharp.nix
+++ b/modules/plugins/languages/fsharp.nix
@@ -68,6 +68,7 @@ in {
         package = mkOption {
           type = either package (listOf str);
           default = servers.${cfg.lsp.server}.package;
+          example = ''[lib.getExe pkgs.fsautocomplete "--state-directory" "~/.cache/fsautocomplete"]'';
           description = "F# LSP server package, or the command to run as a list of strings";
         };
       };

From 72c019cc8f5757ef39882cda59afb5c9d7e1d45a Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 27 Mar 2025 14:41:04 +0300
Subject: [PATCH 039/202] flake: bump inputs

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 603d0f50..4c687864 100644
--- a/flake.lock
+++ b/flake.lock
@@ -77,11 +77,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1741865919,
-        "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=",
+        "lastModified": 1742923925,
+        "narHash": "sha256-biPjLws6FiBVUUDHEMFq5pUQL84Wf7PntPYdo3oKkFw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a",
+        "rev": "25d1b84f5c90632a623c48d83a2faf156451e6b1",
         "type": "github"
       },
       "original": {

From aed996eb33bf37d5cf19bc224e56612321c0eaac Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 27 Mar 2025 14:46:32 +0300
Subject: [PATCH 040/202] ci: use repo name in editorconfig check

---
 .github/workflows/check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index c6967f21..eb2aef34 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -119,7 +119,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh api \
-            repos/${{ github.repository }}/pulls/${{github.event.number}}/files --paginate \
+            repos/notashelf/nvf/pulls/${{github.event.number}}/files --paginate \
             | jq '.[] | select(.status != "removed") | .filename' \
             > "$HOME/changed_files"
 

From 6e8b6bf6356a19f04b2d9fff73549f9d49e951be Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 27 Mar 2025 16:31:52 +0100
Subject: [PATCH 041/202] nvim-lint: add lint after save autocmd

---
 .../plugins/diagnostics/nvim-lint/config.nix  | 36 ++++++++++++++-----
 .../diagnostics/nvim-lint/nvim-lint.nix       |  2 ++
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/modules/plugins/diagnostics/nvim-lint/config.nix b/modules/plugins/diagnostics/nvim-lint/config.nix
index 085140dc..5ecd8d70 100644
--- a/modules/plugins/diagnostics/nvim-lint/config.nix
+++ b/modules/plugins/diagnostics/nvim-lint/config.nix
@@ -3,18 +3,36 @@
   lib,
   ...
 }: let
-  inherit (lib.modules) mkIf;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.dag) entryAnywhere;
   inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.diagnostics.nvim-lint;
 in {
-  config = mkIf cfg.enable {
-    vim = {
-      startPlugins = ["nvim-lint"];
-      pluginRC.nvim-lint = entryAnywhere ''
-        require("lint").linters_by_ft = ${toLuaObject cfg.linters_by_ft}
-      '';
-    };
-  };
+  config = mkMerge [
+    (mkIf cfg.enable {
+      vim = {
+        startPlugins = ["nvim-lint"];
+        pluginRC.nvim-lint = entryAnywhere ''
+          require("lint").linters_by_ft = ${toLuaObject cfg.linters_by_ft}
+        '';
+      };
+    })
+    (mkIf cfg.lint_after_save {
+      vim = {
+        augroups = [{name = "nvf_nvim_lint";}];
+        autocmds = [
+          {
+            event = ["BufWritePost"];
+            callback = mkLuaInline ''
+              function()
+                require("lint").try_lint()
+              end
+            '';
+          }
+        ];
+      };
+    })
+  ];
 }
diff --git a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
index b08d82be..fc19d987 100644
--- a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
+++ b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
@@ -21,5 +21,7 @@ in {
         accept.
       '';
     };
+
+    lint_after_save = mkEnableOption "autocmd to lint after each save" // {default = true;};
   };
 }

From 7e1ffe40f519f31e8b22a4900c3b11d980d231ef Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 27 Mar 2025 16:32:44 +0100
Subject: [PATCH 042/202] nvim-lint: add linters option

---
 .../plugins/diagnostics/nvim-lint/config.nix  | 12 +++
 .../diagnostics/nvim-lint/nvim-lint.nix       | 96 ++++++++++++++++++-
 2 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/modules/plugins/diagnostics/nvim-lint/config.nix b/modules/plugins/diagnostics/nvim-lint/config.nix
index 5ecd8d70..cf9c45e2 100644
--- a/modules/plugins/diagnostics/nvim-lint/config.nix
+++ b/modules/plugins/diagnostics/nvim-lint/config.nix
@@ -16,6 +16,18 @@ in {
         startPlugins = ["nvim-lint"];
         pluginRC.nvim-lint = entryAnywhere ''
           require("lint").linters_by_ft = ${toLuaObject cfg.linters_by_ft}
+
+          local linters = require("lint").linters
+          local nvf_linters = ${toLuaObject cfg.linters}
+          for linter, config in pairs(nvf_linters) do
+            if linters[linter] == nil then
+              linters[linter] = config
+            else
+              for key, val in pairs(config) do
+                linters[linter][key] = val
+              end
+            end
+          end
         '';
       };
     })
diff --git a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
index fc19d987..20f14f0b 100644
--- a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
+++ b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
@@ -1,6 +1,76 @@
 {lib, ...}: let
   inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) attrsOf listOf str;
+  inherit (lib.types) nullOr attrsOf listOf str either submodule bool enum;
+  inherit (lib.nvim.types) luaInline;
+
+  linterType = submodule {
+    options = {
+      name = mkOption {
+        type = nullOr str;
+        default = null;
+        description = "Name of the linter";
+      };
+
+      cmd = mkOption {
+        type = nullOr str;
+        default = null;
+        description = "Command of the linter";
+      };
+
+      args = mkOption {
+        type = nullOr (listOf (either str luaInline));
+        default = null;
+        description = "Arguments to pass";
+      };
+
+      stdin = mkOption {
+        type = nullOr bool;
+        default = null;
+        description = "Send content via stdin.";
+      };
+
+      append_fname = mkOption {
+        type = nullOr bool;
+        default = null;
+        description = ''
+          Automatically add the current file name to the commands arguments. Only
+          has an effect if stdin is false
+        '';
+      };
+
+      stream = mkOption {
+        type = nullOr (enum ["stdout" "stderr" "both"]);
+        default = null;
+        description = "Result stream";
+      };
+
+      ignore_exitcode = mkOption {
+        type = nullOr bool;
+        default = null;
+        description = ''
+          Declares if exit code != 1 should be ignored or result in a warning.
+        '';
+      };
+
+      env = mkOption {
+        type = nullOr (attrsOf str);
+        default = null;
+        description = "Environment variables to use";
+      };
+
+      cwd = mkOption {
+        type = nullOr str;
+        default = null;
+        description = "Working directory of the linter";
+      };
+
+      parser = mkOption {
+        type = nullOr luaInline;
+        default = null;
+        description = "Parser function";
+      };
+    };
+  };
 in {
   options.vim.diagnostics.nvim-lint = {
     enable = mkEnableOption "asynchronous linter plugin for Neovim [nvim-lint]";
@@ -22,6 +92,30 @@ in {
       '';
     };
 
+    linters = mkOption {
+      type = attrsOf linterType;
+      default = {};
+      example = ''
+        {
+          phpcs = {
+            args = ["-q" "--report-json" "-"];
+
+            # this will replace the builtin's env table if it exists
+            env = {
+              ENV_VAR = "something";
+            };
+          };
+        }
+      '';
+
+      description = ''
+        Linter configurations. Builtin linters will be updated and not
+        replaced, but note that this is not a deep extend operation, i.e. if
+        you define an `env` option, it will replace the entire `env` table
+        provided by the builtin (if it exists).
+      '';
+    };
+
     lint_after_save = mkEnableOption "autocmd to lint after each save" // {default = true;};
   };
 }

From 2bc0492af3735fafebcb72a737f14fcc7e5dac20 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 27 Mar 2025 16:32:58 +0100
Subject: [PATCH 043/202] nix: migrate to conform/nvim-lint

---
 modules/plugins/languages/nix.nix | 41 ++++++++++++-------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix
index 54c11af2..ad16a34e 100644
--- a/modules/plugins/languages/nix.nix
+++ b/modules/plugins/languages/nix.nix
@@ -6,6 +6,7 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib) concatStringsSep;
+  inherit (lib.meta) getExe;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
@@ -13,7 +14,6 @@
   inherit (lib.types) anything attrsOf enum either listOf nullOr package str;
   inherit (lib.nvim.types) mkGrammarOption diagnostics;
   inherit (lib.nvim.lua) expToLua toLuaObject;
-  inherit (lib.nvim.languages) diagnosticsToLua;
 
   cfg = config.vim.languages.nix;
 
@@ -100,26 +100,10 @@
   formats = {
     alejandra = {
       package = pkgs.alejandra;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.alejandra.with({
-            command = "${cfg.format.package}/bin/alejandra"
-          })
-        )
-      '';
     };
 
     nixfmt = {
       package = pkgs.nixfmt-rfc-style;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.nixfmt.with({
-            command = "${cfg.format.package}/bin/nixfmt"
-          })
-        )
-      '';
     };
   };
 
@@ -237,17 +221,24 @@ in {
       vim.lsp.lspconfig.sources.nix-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
-    (mkIf (cfg.format.enable && !servers.${cfg.lsp.server}.internalFormatter) {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.nix-format = formats.${cfg.format.type}.nullConfig;
+    (mkIf (cfg.format.enable && (!cfg.lsp.enable || !servers.${cfg.lsp.server}.internalFormatter)) {
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.nix = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
+        };
+      };
     })
 
     (mkIf cfg.extraDiagnostics.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources = diagnosticsToLua {
-        lang = "nix";
-        config = cfg.extraDiagnostics.types;
-        inherit diagnosticsProviders;
+      vim.diagnostics.nvim-lint = {
+        enable = true;
+        linters_by_ft.nix = cfg.extraDiagnostics.types;
+        linters = mkMerge (map (name: {
+            ${name}.cmd = getExe diagnosticsProviders.${name}.package;
+          })
+          cfg.extraDiagnostics.types);
       };
     })
   ]);

From a0c94b31d61420f30bc395b8b051e67b7df05897 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 27 Mar 2025 18:12:24 +0100
Subject: [PATCH 044/202] language/astro: migrate to conform/nvim-lint

---
 modules/plugins/languages/astro.nix | 80 ++++++++++++++---------------
 1 file changed, 38 insertions(+), 42 deletions(-)

diff --git a/modules/plugins/languages/astro.nix b/modules/plugins/languages/astro.nix
index d5672af0..e1a56172 100644
--- a/modules/plugins/languages/astro.nix
+++ b/modules/plugins/languages/astro.nix
@@ -10,8 +10,8 @@
   inherit (lib.lists) isList;
   inherit (lib.meta) getExe;
   inherit (lib.types) enum either listOf package str;
+  inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.lua) expToLua;
-  inherit (lib.nvim.languages) diagnosticsToLua;
   inherit (lib.nvim.types) mkGrammarOption diagnostics;
 
   cfg = config.vim.languages.astro;
@@ -39,26 +39,10 @@
   formats = {
     prettier = {
       package = pkgs.nodePackages.prettier;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.prettier.with({
-            command = "${cfg.format.package}/bin/prettier",
-          })
-        )
-      '';
     };
 
     biome = {
       package = pkgs.biome;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.biome.with({
-            command = "${cfg.format.package}/bin/biome",
-          })
-        )
-      '';
     };
   };
 
@@ -67,24 +51,23 @@
   diagnosticsProviders = {
     eslint_d = {
       package = pkgs.eslint_d;
-      nullConfig = pkg: ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.diagnostics.eslint_d.with({
-            command = "${getExe pkg}",
-            condition = function(utils)
-              return utils.root_has_file({
-                "eslint.config.js",
-                "eslint.config.mjs",
-                ".eslintrc",
-                ".eslintrc.json",
-                ".eslintrc.js",
-                ".eslintrc.yml",
-              })
-            end,
-          })
-        )
-      '';
+      config = {
+        # HACK: change if nvim-lint gets a dynamic enable thing
+        parser = mkLuaInline ''
+          function(output, bufnr, cwd)
+            local markers = { "eslint.config.js", "eslint.config.mjs",
+              ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.yml", }
+            for _, filename in ipairs(markers) do
+              local path = vim.fs.join(cwd, filename)
+              if vim.loop.fs_stat(path) then
+                return require("lint.linters.eslint_d").parser(output, bufnr, cwd)
+              end
+            end
+
+            return {}
+          end
+        '';
+      };
     };
   };
 in {
@@ -153,16 +136,29 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.astro-format = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.astro = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
+        };
+      };
     })
 
     (mkIf cfg.extraDiagnostics.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources = diagnosticsToLua {
-        lang = "astro";
-        config = cfg.extraDiagnostics.types;
-        inherit diagnosticsProviders;
+      vim.diagnostics.nvim-lint = {
+        enable = true;
+        linters_by_ft.astro = cfg.extraDiagnostics.types;
+        linters = mkMerge (map (
+            name: {
+              ${name} =
+                diagnosticsProviders.${name}.config
+                // {
+                  cmd = getExe diagnosticsProviders.${name}.package;
+                };
+            }
+          )
+          cfg.extraDiagnostics.types);
       };
     })
   ]);

From e996999c0b9fd5308a4a8682e955d61973f7ea45 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 27 Mar 2025 19:28:00 +0100
Subject: [PATCH 045/202] language/bash: migrate to conform/nvim-lint

---
 modules/plugins/languages/bash.nix | 40 +++++++++++-------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/modules/plugins/languages/bash.nix b/modules/plugins/languages/bash.nix
index c0066b3c..bfe01032 100644
--- a/modules/plugins/languages/bash.nix
+++ b/modules/plugins/languages/bash.nix
@@ -6,10 +6,10 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.options) mkOption mkEnableOption literalExpression;
+  inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.types) enum either package listOf str bool;
-  inherit (lib.nvim.languages) diagnosticsToLua;
   inherit (lib.nvim.types) diagnostics mkGrammarOption;
   inherit (lib.nvim.lua) expToLua;
 
@@ -37,14 +37,6 @@
   formats = {
     shfmt = {
       package = pkgs.shfmt;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.shfmt.with({
-            command = "${pkgs.shfmt}/bin/shfmt",
-          })
-        )
-      '';
     };
   };
 
@@ -52,15 +44,6 @@
   diagnosticsProviders = {
     shellcheck = {
       package = pkgs.shellcheck;
-      nullConfig = pkg: ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.diagnostics.shellcheck.with({
-            command = "${pkg}/bin/shellcheck",
-            diagnostics_format = "#{m} [#{c}]"
-          })
-        )
-      '';
     };
   };
 in {
@@ -130,16 +113,23 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.bash-format = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.sh = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
+        };
+      };
     })
 
     (mkIf cfg.extraDiagnostics.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources = diagnosticsToLua {
-        lang = "bash";
-        config = cfg.extraDiagnostics.types;
-        inherit diagnosticsProviders;
+      vim.diagnostics.nvim-lint = {
+        enable = true;
+        linters_by_ft.sh = cfg.extraDiagnostics.types;
+        linters = mkMerge (map (name: {
+            ${name}.cmd = getExe diagnosticsProviders.${name}.package;
+          })
+          cfg.extraDiagnostics.types);
       };
     })
   ]);

From 459e97dab7dc3c5194c68d5dc73ea81bf798d98d Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 27 Mar 2025 19:52:28 +0100
Subject: [PATCH 046/202] language/css: migrate to conform/nvim-lint

---
 modules/plugins/languages/css.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/plugins/languages/css.nix b/modules/plugins/languages/css.nix
index 8330a41a..d103f241 100644
--- a/modules/plugins/languages/css.nix
+++ b/modules/plugins/languages/css.nix
@@ -6,6 +6,7 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.types) enum either listOf package str;
@@ -42,14 +43,6 @@
   formats = {
     prettier = {
       package = pkgs.nodePackages.prettier;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.prettier.with({
-            command = "${cfg.format.package}/bin/prettier",
-          })
-        )
-      '';
     };
 
     prettierd = {
@@ -132,8 +125,13 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.css-format = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.css = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
+        };
+      };
     })
   ]);
 }

From 07384c3887f6aadb0c1ec56b57faa2cc08d7c783 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 27 Mar 2025 19:57:01 +0100
Subject: [PATCH 047/202] language/elixir: migrate to conform/nvim-lint

---
 modules/plugins/languages/elixir.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/modules/plugins/languages/elixir.nix b/modules/plugins/languages/elixir.nix
index f8f338b1..7b3a0256 100644
--- a/modules/plugins/languages/elixir.nix
+++ b/modules/plugins/languages/elixir.nix
@@ -38,14 +38,9 @@
   formats = {
     mix = {
       package = pkgs.elixir;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.mix.with({
-            command = "${cfg.format.package}/bin/mix",
-          })
-        )
-      '';
+      config = {
+        command = "${cfg.format.package}/bin/mix";
+      };
     };
   };
 in {
@@ -107,8 +102,12 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.elixir-format = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.elixir = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} =
+          formats.${cfg.format.type}.config;
+      };
     })
 
     (mkIf cfg.elixir-tools.enable {

From 6225dff47a9b1778bb8517f7856defb1220f87e7 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 27 Mar 2025 20:05:22 +0100
Subject: [PATCH 048/202] language/fsharp: migrate to conform/nvim-lint

---
 modules/plugins/languages/fsharp.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/plugins/languages/fsharp.nix b/modules/plugins/languages/fsharp.nix
index 86c08d39..966b0349 100644
--- a/modules/plugins/languages/fsharp.nix
+++ b/modules/plugins/languages/fsharp.nix
@@ -7,6 +7,7 @@
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.types) either listOf package str enum;
+  inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.nvim.types) mkGrammarOption;
@@ -35,14 +36,6 @@
   formats = {
     fantomas = {
       package = pkgs.fantomas;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.fantomas.with({
-            command = "${cfg.format.package}/bin/fantomas",
-          })
-        )
-      '';
     };
   };
 
@@ -102,8 +95,13 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.fsharp-format = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.fsharp = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
+        };
+      };
     })
   ]);
 }

From 856b064a19f8bbac70b45cba8f91ee2be1043a65 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 27 Mar 2025 20:07:51 +0100
Subject: [PATCH 049/202] language/go: migrate to conform/nvim-lint

---
 modules/plugins/languages/go.nix | 34 ++++++++------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/modules/plugins/languages/go.nix b/modules/plugins/languages/go.nix
index 3ac9ae77..9f8bca3c 100644
--- a/modules/plugins/languages/go.nix
+++ b/modules/plugins/languages/go.nix
@@ -38,36 +38,15 @@
   formats = {
     gofmt = {
       package = pkgs.go;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.gofmt.with({
-            command = "${cfg.format.package}/bin/gofmt",
-          })
-        )
-      '';
+      config.command = "${cfg.format.package}/bin/gofmt";
     };
     gofumpt = {
       package = pkgs.gofumpt;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.gofumpt.with({
-            command = "${cfg.format.package}/bin/gofumpt",
-          })
-        )
-      '';
+      config.command = getExe cfg.format.package;
     };
     golines = {
       package = pkgs.golines;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.golines.with({
-            command = "${cfg.format.package}/bin/golines",
-          })
-        )
-      '';
+      config.command = "${cfg.format.package}/bin/golines";
     };
   };
 
@@ -153,8 +132,11 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.go-format = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.go = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = formats.${cfg.format.type}.config;
+      };
     })
 
     (mkIf cfg.dap.enable {

From b24999300baf3b22a8037a4bb24c0272b9046a96 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 27 Mar 2025 20:10:30 +0100
Subject: [PATCH 050/202] language/hcl: migrate to conform/nvim-lint

---
 modules/plugins/languages/hcl.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/plugins/languages/hcl.nix b/modules/plugins/languages/hcl.nix
index e340e74d..3a3db782 100644
--- a/modules/plugins/languages/hcl.nix
+++ b/modules/plugins/languages/hcl.nix
@@ -6,6 +6,7 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.types) package bool enum;
   inherit (lib.nvim.types) mkGrammarOption;
@@ -30,14 +31,6 @@
   formats = {
     hclfmt = {
       package = pkgs.hclfmt;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.hclfmt.with({
-            command = "${lib.getExe cfg.format.package}",
-          })
-        )
-      '';
     };
   };
 in {
@@ -110,8 +103,13 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.hcl-format = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.hcl = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
+        };
+      };
     })
   ]);
 }

From 543deb5c2a04699e446e6109e3d023d84b3c10e6 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 27 Mar 2025 20:12:58 +0100
Subject: [PATCH 051/202] language/kotlin: migrate to conform/nvim-lint

---
 modules/plugins/languages/kotlin.nix | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/modules/plugins/languages/kotlin.nix b/modules/plugins/languages/kotlin.nix
index 03433215..2ddc63e9 100644
--- a/modules/plugins/languages/kotlin.nix
+++ b/modules/plugins/languages/kotlin.nix
@@ -7,7 +7,6 @@
   inherit (lib.options) mkEnableOption mkOption literalExpression;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
-  inherit (lib.nvim.languages) diagnosticsToLua;
   inherit (lib.types) either package listOf str;
   inherit (lib.nvim.types) mkGrammarOption diagnostics;
   inherit (lib.lists) isList;
@@ -19,14 +18,6 @@
   diagnosticsProviders = {
     ktlint = {
       package = pkgs.ktlint;
-      nullConfig = pkg: ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.diagnostics.ktlint.with({
-            command = "${getExe pkg}",
-          })
-        )
-      '';
     };
   };
 in {
@@ -76,11 +67,13 @@ in {
     })
 
     (mkIf cfg.extraDiagnostics.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources = diagnosticsToLua {
-        lang = "kotlin";
-        config = cfg.extraDiagnostics.types;
-        inherit diagnosticsProviders;
+      vim.diagnostics.nvim-lint = {
+        enable = true;
+        linters_by_ft.kotlin = cfg.extraDiagnostics.types;
+        linters = mkMerge (map (name: {
+            ${name}.cmd = getExe diagnosticsProviders.${name}.package;
+          })
+          cfg.extraDiagnostics.types);
       };
     })
 

From ab5dbb263e03cd9004ed9a5c543687229470d76f Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 27 Mar 2025 20:13:07 +0100
Subject: [PATCH 052/202] language/markdown: migrate to conform/nvim-lint

---
 modules/plugins/languages/markdown.nix | 42 ++++++++++++--------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/modules/plugins/languages/markdown.nix b/modules/plugins/languages/markdown.nix
index ac098a1c..6767a9cf 100644
--- a/modules/plugins/languages/markdown.nix
+++ b/modules/plugins/languages/markdown.nix
@@ -5,9 +5,10 @@
   ...
 }: let
   inherit (builtins) attrNames;
+  inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.lists) isList concatLists;
+  inherit (lib.lists) isList;
   inherit (lib.types) bool enum either package listOf str;
   inherit (lib.nvim.lua) expToLua toLuaObject;
   inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
@@ -32,31 +33,17 @@
     };
   };
 
-  defaultFormat = "denofmt";
+  defaultFormat = "deno_fmt";
   formats = {
+    # for backwards compatibility
     denofmt = {
       package = pkgs.deno;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.deno_fmt.with({
-            filetypes = ${expToLua (concatLists [cfg.format.extraFiletypes ["markdown"]])},
-            command = "${cfg.format.package}/bin/deno",
-          })
-        )
-      '';
+    };
+    deno_fmt = {
+      package = pkgs.deno;
     };
     prettierd = {
       package = pkgs.prettierd;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.prettierd.with({
-            filetypes = ${expToLua (concatLists [cfg.format.extraFiletypes ["markdown"]])},
-            command = "${cfg.format.package}/bin/prettierd",
-          })
-        )
-      '';
     };
   };
 in {
@@ -96,7 +83,7 @@ in {
       type = mkOption {
         type = enum (attrNames formats);
         default = defaultFormat;
-        description = "Markdown formatter to use";
+        description = "Markdown formatter to use. `denofmt` is deprecated and currently aliased to deno_fmt.";
       };
 
       package = mkOption {
@@ -148,8 +135,17 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.markdown-format = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.markdown = [cfg.format.type];
+        setupOpts.formatters.${
+          if cfg.format.type == "denofmt"
+          then "deno_fmt"
+          else cfg.format.type
+        } = {
+          command = getExe cfg.format.package;
+        };
+      };
     })
 
     # Extensions

From e0bcd93bea016dd8caf20495783cd1b3220bf08b Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 27 Mar 2025 20:14:05 +0100
Subject: [PATCH 053/202] language/nim: migrate to conform/nvim-lint

---
 modules/plugins/languages/nim.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/modules/plugins/languages/nim.nix b/modules/plugins/languages/nim.nix
index f218038e..69288223 100644
--- a/modules/plugins/languages/nim.nix
+++ b/modules/plugins/languages/nim.nix
@@ -6,6 +6,7 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.types) enum either listOf package str;
@@ -38,14 +39,9 @@
   formats = {
     nimpretty = {
       package = pkgs.nim;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.nimpretty.with({
-            command = "${pkgs.nim}/bin/nimpretty",
-          })
-        )
-      '';
+      config = {
+        command = "${cfg.format.package}/bin/nimpretty";
+      };
     };
   };
 in {
@@ -110,8 +106,11 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.nim-format = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.nim = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = formats.${cfg.format.type}.config;
+      };
     })
   ]);
 }

From 09e5a13c6159c32d7ff1adfb39b2075b04dfa9a1 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 27 Mar 2025 20:16:32 +0100
Subject: [PATCH 054/202] language/ocaml: migrate to conform/nvim-lint

---
 modules/plugins/languages/ocaml.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/modules/plugins/languages/ocaml.nix b/modules/plugins/languages/ocaml.nix
index ddfa85e4..568b846e 100644
--- a/modules/plugins/languages/ocaml.nix
+++ b/modules/plugins/languages/ocaml.nix
@@ -37,14 +37,6 @@
   formats = {
     ocamlformat = {
       package = pkgs.ocamlPackages.ocamlformat;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.ocamlformat.with({
-            command = "${cfg.format.package}/bin/ocamlformat",
-          })
-        )
-      '';
     };
   };
 in {
@@ -97,9 +89,13 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.ocamlformat = formats.${cfg.format.type}.nullConfig;
-      vim.extraPackages = [formats.${cfg.format.type}.package];
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.ocaml = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
+        };
+      };
     })
   ]);
 }

From a5deffb8900756d32ca668682fadcb6b0c00949e Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Fri, 28 Mar 2025 10:11:33 +0100
Subject: [PATCH 055/202] language/python: migrate to conform/nvim-lint

---
 modules/plugins/languages/python.nix | 51 +++++++++-------------------
 1 file changed, 16 insertions(+), 35 deletions(-)

diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix
index 0a3c6c8a..ccb15f7c 100644
--- a/modules/plugins/languages/python.nix
+++ b/modules/plugins/languages/python.nix
@@ -66,26 +66,10 @@
   formats = {
     black = {
       package = pkgs.black;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.black.with({
-            command = "${cfg.format.package}/bin/black",
-          })
-        )
-      '';
     };
 
     isort = {
       package = pkgs.isort;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.isort.with({
-            command = "${cfg.format.package}/bin/isort",
-          })
-        )
-      '';
     };
 
     black-and-isort = {
@@ -96,15 +80,6 @@
           black --quiet - "$@" | isort --profile black -
         '';
       };
-
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.black.with({
-            command = "${cfg.format.package}/bin/black",
-          })
-        )
-      '';
     };
 
     ruff = {
@@ -115,14 +90,6 @@
           ruff format -
         '';
       };
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.ruff.with({
-            command = "${cfg.format.package}/bin/ruff",
-          })
-        )
-      '';
     };
   };
 
@@ -272,8 +239,22 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.python-format = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        # HACK: I'm planning to remove these soon so I just took the easiest way out
+        setupOpts.formatters_by_ft.python =
+          if cfg.format.type == "black-and-isort"
+          then ["black"]
+          else [cfg.format.type];
+        setupOpts.formatters =
+          if (cfg.format.type == "black-and-isort")
+          then {
+            black.command = "${cfg.format.package}/bin/black";
+          }
+          else {
+            ${cfg.format.type}.command = getExe cfg.format.package;
+          };
+      };
     })
 
     (mkIf cfg.dap.enable {

From 7cf9e5c0a6b5411dc1059d0cb7006eb9ea59899a Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Fri, 28 Mar 2025 11:09:20 +0100
Subject: [PATCH 056/202] language/r: migrate to conform/nvim-lint

---
 modules/plugins/languages/r.nix | 40 ++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/modules/plugins/languages/r.nix b/modules/plugins/languages/r.nix
index 8a685a01..fcadcc37 100644
--- a/modules/plugins/languages/r.nix
+++ b/modules/plugins/languages/r.nix
@@ -24,28 +24,29 @@
       package = pkgs.rWrapper.override {
         packages = [pkgs.rPackages.styler];
       };
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.styler.with({
-            command = "${cfg.format.package}/bin/R",
-          })
-        )
-      '';
+      config = {
+        command = "${cfg.format.package}/bin/R";
+      };
     };
 
     format_r = {
       package = pkgs.rWrapper.override {
         packages = [pkgs.rPackages.formatR];
       };
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.format_r.with({
-            command = "${cfg.format.package}/bin/R",
-          })
-        )
-      '';
+      config = {
+        command = "${cfg.format.package}/bin/R";
+        stdin = true;
+        args = [
+          "--slave"
+          "--no-restore"
+          "--no-save"
+          "-s"
+          "-e"
+          ''formatR::tidy_source(source="stdin")''
+        ];
+        # TODO: range_args seem to be possible
+        # https://github.com/nvimtools/none-ls.nvim/blob/main/lua/null-ls/builtins/formatting/format_r.lua
+      };
     };
   };
 
@@ -118,8 +119,11 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.r-format = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.r = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = formats.${cfg.format.type}.config;
+      };
     })
 
     (mkIf cfg.lsp.enable {

From 2c153f57e68ec418cba227ba15473ae11e78c18e Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Fri, 28 Mar 2025 11:34:14 +0100
Subject: [PATCH 057/202] language/ruby: migrate to conform/nvim-lint

---
 modules/plugins/languages/ruby.nix | 50 ++++++++++--------------------
 1 file changed, 17 insertions(+), 33 deletions(-)

diff --git a/modules/plugins/languages/ruby.nix b/modules/plugins/languages/ruby.nix
index 33f11d5d..2f42aa4f 100644
--- a/modules/plugins/languages/ruby.nix
+++ b/modules/plugins/languages/ruby.nix
@@ -6,10 +6,10 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.nvim.types) mkGrammarOption diagnostics;
   inherit (lib.types) either listOf package str enum;
-  inherit (lib.nvim.languages) diagnosticsToLua;
 
   cfg = config.vim.languages.ruby;
 
@@ -35,24 +35,8 @@
   defaultFormat = "rubocop";
   formats = {
     rubocop = {
+      # TODO: is this right?
       package = pkgs.rubyPackages.rubocop;
-      nullConfig = ''
-        local conditional = function(fn)
-          local utils = require("null-ls.utils").make_conditional_utils()
-          return fn(utils)
-        end
-
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.rubocop.with({
-            command="${pkgs.bundler}/bin/bundle",
-            args = vim.list_extend(
-              {"exec", "rubocop", "-a" },
-              null_ls.builtins.formatting.rubocop._opts.args
-            ),
-          })
-        )
-      '';
     };
   };
 
@@ -60,14 +44,7 @@
   diagnosticsProviders = {
     rubocop = {
       package = pkgs.rubyPackages.rubocop;
-      nullConfig = pkg: ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.diagnostics.rubocop.with({
-            command = "${lib.getExe pkg}",
-          })
-        )
-      '';
+      config.command = getExe cfg.format.package;
     };
   };
 in {
@@ -136,16 +113,23 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.ruby-format = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.ruby = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
+        };
+      };
     })
 
     (mkIf cfg.extraDiagnostics.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources = diagnosticsToLua {
-        lang = "ruby";
-        config = cfg.extraDiagnostics.types;
-        inherit diagnosticsProviders;
+      vim.diagnostics.nvim-lint = {
+        enable = true;
+        linters_by_ft.ruby = cfg.extraDiagnostics.types;
+        linters = mkMerge (map (name: {
+            ${name}.cmd = getExe diagnosticsProviders.${name}.package;
+          })
+          cfg.extraDiagnostics.types);
       };
     })
   ]);

From 24a3989ddc07fe531efd9fa015257077c6f2a98b Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Fri, 28 Mar 2025 11:36:53 +0100
Subject: [PATCH 058/202] language/rust: migrate to conform/nvim-lint

---
 modules/plugins/languages/rust.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/plugins/languages/rust.nix b/modules/plugins/languages/rust.nix
index aea10687..2181623a 100644
--- a/modules/plugins/languages/rust.nix
+++ b/modules/plugins/languages/rust.nix
@@ -5,6 +5,7 @@
   ...
 }: let
   inherit (builtins) attrNames;
+  inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.strings) optionalString;
@@ -21,14 +22,6 @@
   formats = {
     rustfmt = {
       package = pkgs.rustfmt;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.rustfmt.with({
-            command = "${cfg.format.package}/bin/rustfmt",
-          })
-        )
-      '';
     };
   };
 in {
@@ -128,8 +121,13 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.rust-format = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.rust = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
+        };
+      };
     })
 
     (mkIf (cfg.lsp.enable || cfg.dap.enable) {

From 0db226be846592a187a4b2893ee403a53a7cdee7 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Fri, 28 Mar 2025 12:00:36 +0100
Subject: [PATCH 059/202] language/sql: migrate to conform/nvim-lint

---
 modules/plugins/languages/sql.nix | 46 ++++++++++++++-----------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/modules/plugins/languages/sql.nix b/modules/plugins/languages/sql.nix
index ed08ee72..277dbeef 100644
--- a/modules/plugins/languages/sql.nix
+++ b/modules/plugins/languages/sql.nix
@@ -6,11 +6,11 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.types) enum either listOf package str;
   inherit (lib.nvim.lua) expToLua;
-  inherit (lib.nvim.languages) diagnosticsToLua;
   inherit (lib.nvim.types) diagnostics;
 
   cfg = config.vim.languages.sql;
@@ -41,15 +41,10 @@
   formats = {
     sqlfluff = {
       package = sqlfluffDefault;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.sqlfluff.with({
-            command = "${cfg.format.package}/bin/sqlfluff",
-            extra_args = {"--dialect", "${cfg.dialect}"}
-          })
-        )
-      '';
+      config = {
+        command = getExe cfg.format.package;
+        append_args = ["--dialect=${cfg.dialect}"];
+      };
     };
   };
 
@@ -57,15 +52,10 @@
   diagnosticsProviders = {
     sqlfluff = {
       package = sqlfluffDefault;
-      nullConfig = pkg: ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.diagnostics.sqlfluff.with({
-            command = "${pkg}/bin/sqlfluff",
-            extra_args = {"--dialect", "${cfg.dialect}"}
-          })
-        )
-      '';
+      config = {
+        cmd = getExe sqlfluffDefault;
+        args = ["lint" "--format=json" "--dialect=${cfg.dialect}"];
+      };
     };
   };
 in {
@@ -150,16 +140,20 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources."sql-format" = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.sql = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = formats.${cfg.format.type}.config;
+      };
     })
 
     (mkIf cfg.extraDiagnostics.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources = diagnosticsToLua {
-        lang = "sql";
-        config = cfg.extraDiagnostics.types;
-        inherit diagnosticsProviders;
+      vim.diagnostics.nvim-lint = {
+        enable = true;
+        linters_by_ft.sql = cfg.extraDiagnostics.types;
+        linters =
+          mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
+            cfg.extraDiagnostics.types);
       };
     })
   ]);

From bc76ced636feadbb195ff1dceb809e4e6fbddd9c Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Fri, 28 Mar 2025 12:05:17 +0100
Subject: [PATCH 060/202] language/svelte: migrate to conform/nvim-lint

---
 modules/plugins/languages/svelte.nix | 80 +++++++++++++---------------
 1 file changed, 36 insertions(+), 44 deletions(-)

diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix
index 4d96c20a..67f11bc2 100644
--- a/modules/plugins/languages/svelte.nix
+++ b/modules/plugins/languages/svelte.nix
@@ -9,9 +9,9 @@
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.meta) getExe;
+  inherit (lib.generators) mkLuaInline;
   inherit (lib.types) enum either listOf package str;
   inherit (lib.nvim.lua) expToLua;
-  inherit (lib.nvim.languages) diagnosticsToLua;
   inherit (lib.nvim.types) mkGrammarOption diagnostics;
 
   cfg = config.vim.languages.svelte;
@@ -39,52 +39,38 @@
   formats = {
     prettier = {
       package = pkgs.nodePackages.prettier;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.prettier.with({
-            command = "${cfg.format.package}/bin/prettier",
-          })
-        )
-      '';
     };
 
     biome = {
       package = pkgs.biome;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.biome.with({
-            command = "${cfg.format.package}/bin/biome",
-          })
-        )
-      '';
     };
   };
 
   # TODO: specify packages
   defaultDiagnosticsProvider = ["eslint_d"];
   diagnosticsProviders = {
-    eslint_d = {
-      package = pkgs.eslint_d;
-      nullConfig = pkg: ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.diagnostics.eslint_d.with({
-            command = "${getExe pkg}",
-            condition = function(utils)
-              return utils.root_has_file({
-                "eslint.config.js",
-                "eslint.config.mjs",
-                ".eslintrc",
-                ".eslintrc.json",
-                ".eslintrc.js",
-                ".eslintrc.yml",
-              })
-            end,
-          })
-        )
-      '';
+    eslint_d = let
+      pkg = pkgs.eslint_d;
+    in {
+      package = pkg;
+      config = {
+        cmd = getExe pkg;
+        # HACK: change if nvim-lint gets a dynamic enable thing
+        parser = mkLuaInline ''
+          function(output, bufnr, cwd)
+            local markers = { "eslint.config.js", "eslint.config.mjs",
+              ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.yml", }
+            for _, filename in ipairs(markers) do
+              local path = vim.fs.join(cwd, filename)
+              if vim.loop.fs_stat(path) then
+                return require("lint.linters.eslint_d").parser(output, bufnr, cwd)
+              end
+            end
+
+            return {}
+          end
+        '';
+      };
     };
   };
 in {
@@ -153,16 +139,22 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.svelte-format = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.svelte = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
+        };
+      };
     })
 
     (mkIf cfg.extraDiagnostics.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources = diagnosticsToLua {
-        lang = "svelte";
-        config = cfg.extraDiagnostics.types;
-        inherit diagnosticsProviders;
+      vim.diagnostics.nvim-lint = {
+        enable = true;
+        linters_by_ft.svelte = cfg.extraDiagnostics.types;
+        linters =
+          mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
+            cfg.extraDiagnostics.types);
       };
     })
   ]);

From 6f5738da0c59db306cfc1c19571105be055699d7 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Fri, 28 Mar 2025 12:12:22 +0100
Subject: [PATCH 061/202] language/ts: migrate to conform/nvim-lint

---
 modules/plugins/languages/ts.nix | 87 +++++++++++++-------------------
 1 file changed, 36 insertions(+), 51 deletions(-)

diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix
index 790c235a..8589d7ec 100644
--- a/modules/plugins/languages/ts.nix
+++ b/modules/plugins/languages/ts.nix
@@ -9,10 +9,10 @@
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.meta) getExe;
+  inherit (lib.generators) mkLuaInline;
   inherit (lib.types) enum either listOf package str bool;
   inherit (lib.nvim.lua) expToLua toLuaObject;
   inherit (lib.nvim.types) mkGrammarOption diagnostics mkPluginSetupOption;
-  inherit (lib.nvim.languages) diagnosticsToLua;
   inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.languages.ts;
@@ -77,39 +77,14 @@
   formats = {
     prettier = {
       package = pkgs.nodePackages.prettier;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.prettier.with({
-            command = "${cfg.format.package}/bin/prettier",
-            filetypes = { "typescript", "javascript" },
-          })
-        )
-      '';
     };
 
     prettierd = {
       package = pkgs.prettierd;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.prettier.with({
-            command = "${cfg.format.package}/bin/prettierd",
-          })
-        )
-      '';
     };
 
     biome = {
       package = pkgs.biome;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.biome.with({
-            command = "${cfg.format.package}/bin/biome",
-          })
-        )
-      '';
     };
   };
 
@@ -118,24 +93,26 @@
   diagnosticsProviders = {
     eslint_d = {
       package = pkgs.eslint_d;
-      nullConfig = pkg: ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.diagnostics.eslint_d.with({
-            command = "${getExe pkg}",
-            condition = function(utils)
-              return utils.root_has_file({
-                "eslint.config.js",
-                "eslint.config.mjs",
-                ".eslintrc",
-                ".eslintrc.json",
-                ".eslintrc.js",
-                ".eslintrc.yml",
-              })
-            end,
-          })
-        )
-      '';
+      config = let
+        pkg = pkgs.eslint_d;
+      in {
+        cmd = getExe pkg;
+        # HACK: change if nvim-lint gets a dynamic enable thing
+        parser = mkLuaInline ''
+          function(output, bufnr, cwd)
+            local markers = { "eslint.config.js", "eslint.config.mjs",
+              ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.yml", }
+            for _, filename in ipairs(markers) do
+              local path = vim.fs.join(cwd, filename)
+              if vim.loop.fs_stat(path) then
+                return require("lint.linters.eslint_d").parser(output, bufnr, cwd)
+              end
+            end
+
+            return {}
+          end
+        '';
+      };
     };
   };
 in {
@@ -225,16 +202,24 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.ts-format = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.typescript = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
+        };
+      };
     })
 
     (mkIf cfg.extraDiagnostics.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources = diagnosticsToLua {
-        lang = "ts";
-        config = cfg.extraDiagnostics.types;
-        inherit diagnosticsProviders;
+      vim.diagnostics.nvim-lint = {
+        enable = true;
+        linters_by_ft.typescript = cfg.extraDiagnostics.types;
+
+        linters = mkMerge (map (name: {
+            ${name}.cmd = getExe diagnosticsProviders.${name}.package;
+          })
+          cfg.extraDiagnostics.types);
       };
     })
 

From d45763f7e26259b801b8adff4ba75ffd3fbfabe2 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Fri, 28 Mar 2025 12:16:07 +0100
Subject: [PATCH 062/202] language/typst: migrate to conform/nvim-lint

---
 modules/plugins/languages/typst.nix | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/modules/plugins/languages/typst.nix b/modules/plugins/languages/typst.nix
index 24097e2c..8c65ae2c 100644
--- a/modules/plugins/languages/typst.nix
+++ b/modules/plugins/languages/typst.nix
@@ -9,7 +9,6 @@
   inherit (lib.lists) isList;
   inherit (lib.types) nullOr enum either attrsOf listOf package str;
   inherit (lib.attrsets) attrNames;
-  inherit (lib.generators) mkLuaInline;
   inherit (lib.meta) getExe;
   inherit (lib.nvim.lua) expToLua toLuaObject;
   inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
@@ -61,26 +60,10 @@
   formats = {
     typstfmt = {
       package = pkgs.typstfmt;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.typstfmt.with({
-            command = "${cfg.format.package}/bin/typstfmt",
-          })
-        )
-      '';
     };
     # https://github.com/Enter-tainer/typstyle
     typstyle = {
       package = pkgs.typstyle;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.typstfmt.with({
-            command = "${cfg.format.package}/bin/typstyle",
-          })
-        )
-      '';
     };
   };
 in {
@@ -176,8 +159,13 @@ in {
     })
 
     (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.typst-format = formats.${cfg.format.type}.nullConfig;
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts.formatters_by_ft.typst = [cfg.format.type];
+        setupOpts.formatters.${cfg.format.type} = {
+          command = getExe cfg.format.package;
+        };
+      };
     })
 
     (mkIf cfg.lsp.enable {

From e353ae9f71facdcb591c187c5a1bca8d2a33f928 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 29 Mar 2025 14:59:48 +0100
Subject: [PATCH 063/202] docs: update release notes

---
 docs/release-notes/rl-0.8.md | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 7f6c6ffe..d4dcdf60 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -88,8 +88,11 @@
 
 [blink.cmp]: https://github.com/saghen/blink.cmp
 
+- Add [aerial.nvim].
+- Add [nvim-ufo].
 - Add [blink.cmp] support.
 - Add `LazyFile` user event.
+- Migrate language modules from none-ls to conform/nvim-lint
 
 [diniamo](https://github.com/diniamo):
 
@@ -98,14 +101,6 @@
 - Disable the built-in format-on-save feature of zls. Use `vim.lsp.formatOnSave`
   instead.
 
-[horriblename](https://github.com/horriblename):
-
-[aerial.nvim]: (https://github.com/stevearc/aerial.nvim)
-[nvim-ufo]: (https://github.com/kevinhwang91/nvim-ufo)
-
-- Add [aerial.nvim].
-- Add [nvim-ufo].
-
 [LilleAila](https://github.com/LilleAila):
 
 - Remove `vim.notes.obsidian.setupOpts.dir`, which was set by default. Fixes

From 91a167f334266b8c8a669f3acf38b9e695ef4504 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 29 Mar 2025 15:58:15 +0100
Subject: [PATCH 064/202] chore: update none-ls

---
 npins/sources.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/npins/sources.json b/npins/sources.json
index d1c9fb7d..99220bf8 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -1551,9 +1551,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "bb680d752cec37949faca7a1f509e2fe67ab418a",
-      "url": "https://github.com/nvimtools/none-ls.nvim/archive/bb680d752cec37949faca7a1f509e2fe67ab418a.tar.gz",
-      "hash": "11zgc86cjkv1vi183mplx3bsqa2x7ardk7ybyrp702xx5hmd882l"
+      "revision": "a117163db44c256d53c3be8717f3e1a2a28e6299",
+      "url": "https://github.com/nvimtools/none-ls.nvim/archive/a117163db44c256d53c3be8717f3e1a2a28e6299.tar.gz",
+      "hash": "1qxi1wq3snhns49sl6rli5hsgjn7zzc43brnwv0b6mfzl55ydzr8"
     },
     "nord": {
       "type": "Git",

From 18d745c08fcc376ecf5c7f80be589b8fb4608c68 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 29 Mar 2025 19:02:40 +0300
Subject: [PATCH 065/202] docs: mention none-ls update in changelog

---
 docs/release-notes/rl-0.8.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index d4dcdf60..fe3e3166 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -14,6 +14,11 @@
   the new API they provide. Please manually set your keybinds according to
   [Lspsaga documentation] following the new API.
 
+- none-ls has been updated to the latest version. If you have been using raw Lua
+  configuration to _manually_ configure it, some of the formats may become
+  unavailable as they have been refactored out of the main none-ls repository
+  upstream.
+
 [NotAShelf](https://github.com/notashelf):
 
 [typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim

From c7df81c3b8689c00fb7dff2c3ace9c99b86cc4c8 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 29 Mar 2025 19:03:08 +0300
Subject: [PATCH 066/202] pins: bump all plugins

---
 npins/sources.json | 416 ++++++++++++++++++++++-----------------------
 1 file changed, 208 insertions(+), 208 deletions(-)

diff --git a/npins/sources.json b/npins/sources.json
index 99220bf8..f9091f20 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -9,9 +9,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "2204cf08791449a6a2fd2ef187a29112eeefd989",
-      "url": "https://github.com/stevearc/aerial.nvim/archive/2204cf08791449a6a2fd2ef187a29112eeefd989.tar.gz",
-      "hash": "1482md9kzyrr7mjkca3nnyqgy64q8clhi6xbvgql8qjw7ifz51mx"
+      "revision": "9ebc13583cff447f5493a63e99dfca526b3c3088",
+      "url": "https://github.com/stevearc/aerial.nvim/archive/9ebc13583cff447f5493a63e99dfca526b3c3088.tar.gz",
+      "hash": "17mjs95jnnvsg1ihwbsa3z6hr88rvfh36pv1x4cad7hsaal3dcrg"
     },
     "alpha-nvim": {
       "type": "Git",
@@ -50,10 +50,10 @@
       "version_upper_bound": null,
       "release_prefix": null,
       "submodules": false,
-      "version": "v0.14.1",
-      "revision": "7a91dc584f41f5aa2373a917faf8100b2e54d6c9",
-      "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v0.14.1",
-      "hash": "0zm6s3v9liimx28vs1g5yi7bcfrl691q81bvzmdpavcwrzcdb0c8"
+      "version": "v1.0.0",
+      "revision": "47be01b7424d386fc3294de7838fb9134f74b228",
+      "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v1.0.0",
+      "hash": "04mjgyfcin134g9w3ag3gy6vppmh8cqq0g9whyq407fx6rjmgvfi"
     },
     "blink-cmp-spell": {
       "type": "Git",
@@ -77,9 +77,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "4104671562c663d059d91a99da3780bead5bc467",
-      "url": "https://github.com/saghen/blink.compat/archive/4104671562c663d059d91a99da3780bead5bc467.tar.gz",
-      "hash": "0bsf8kg5s3m1xk9d4n0yl0h5xyk484hip3z8va547f6ibim9ccv4"
+      "revision": "2ed6d9a28b07fa6f3bface818470605f8896408c",
+      "url": "https://github.com/saghen/blink.compat/archive/2ed6d9a28b07fa6f3bface818470605f8896408c.tar.gz",
+      "hash": "009475xy41l4dpayswhx65q6a7djzw7rz2ycbrbpyg041y0qynqs"
     },
     "blink-emoji-nvim": {
       "type": "Git",
@@ -103,9 +103,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "91aee73557237b0cc1313e4ed2b32f10de6cc65e",
-      "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/91aee73557237b0cc1313e4ed2b32f10de6cc65e.tar.gz",
-      "hash": "1jg4559946rzsvvny1r7jki1gmr70yjxr8qlnsjkjyxj8h0pjjwl"
+      "revision": "d4af981745ea67b2c29bcd25f9843dbeedc580ed",
+      "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/d4af981745ea67b2c29bcd25f9843dbeedc580ed.tar.gz",
+      "hash": "1xjhpp9118bgpp2x3pxv0llngkm69fzxhdqp92civ19s5pxb5h5y"
     },
     "bufdelete-nvim": {
       "type": "Git",
@@ -272,9 +272,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "4f56b047f03bf5edc0d71bf0ca694243a49b912f",
-      "url": "https://github.com/olimorris/codecompanion.nvim/archive/4f56b047f03bf5edc0d71bf0ca694243a49b912f.tar.gz",
-      "hash": "1mrb8qxd6mz5dlly9bh30pcd599gfy173f6pd4p8lszs3xhp598k"
+      "revision": "51fe5a782dbbd5cad8189420cb8d38fd7c245684",
+      "url": "https://github.com/olimorris/codecompanion.nvim/archive/51fe5a782dbbd5cad8189420cb8d38fd7c245684.tar.gz",
+      "hash": "09vjvbf5rxmj2fax0ddcinbvx6mhjdy58fw9d1nf8ll7x8dj5j2s"
     },
     "codewindow-nvim": {
       "type": "Git",
@@ -311,9 +311,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d",
-      "url": "https://github.com/stevearc/conform.nvim/archive/db8a4a9edb217067b1d7a2e0362c74bfe9cc944d.tar.gz",
-      "hash": "13vpizk8ani64d3a9yrm0g3bz8m6m6cxnpzr2xgslbhxnkmbxq7j"
+      "revision": "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5",
+      "url": "https://github.com/stevearc/conform.nvim/archive/f9ef25a7ef00267b7d13bfc00b0dea22d78702d5.tar.gz",
+      "hash": "1942dsg83skxnm3jrqyxx9mvzgiq1v68i9z43hpar4bmqvggviif"
     },
     "copilot-cmp": {
       "type": "Git",
@@ -337,9 +337,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9",
-      "url": "https://github.com/zbirenbaum/copilot.lua/archive/30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9.tar.gz",
-      "hash": "0jlwd5x0pdfxa1hg41dfvz9zji0frvlfg86vzak0d3xmn4hr8zgb"
+      "revision": "6c65c53a849c8ac4278ad07a4bac150f449da3c4",
+      "url": "https://github.com/zbirenbaum/copilot.lua/archive/6c65c53a849c8ac4278ad07a4bac150f449da3c4.tar.gz",
+      "hash": "0psmi1pknc8cpckj9iqk4yx79xjkvmrjlwcnl0x1a5lbahdzifhv"
     },
     "crates-nvim": {
       "type": "Git",
@@ -350,9 +350,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "403a0abef0e2aec12749a534dc468d6fd50c6741",
-      "url": "https://github.com/Saecki/crates.nvim/archive/403a0abef0e2aec12749a534dc468d6fd50c6741.tar.gz",
-      "hash": "19ix86nbww5vljinfwfpjkz806j7dzw4pgjyjya201jb0n22lrc6"
+      "revision": "fd2bbca7aa588f24ffc3517831934b4c4a9588e9",
+      "url": "https://github.com/Saecki/crates.nvim/archive/fd2bbca7aa588f24ffc3517831934b4c4a9588e9.tar.gz",
+      "hash": "1l2z447svf1ldpnsb9sn5b4q1a22g3wx126yw9hj7rcqrv50xw6i"
     },
     "csharpls-extended-lsp-nvim": {
       "type": "Git",
@@ -363,9 +363,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "991d2c43afd7c7be77edd27a2ae686f9779382da",
-      "url": "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/archive/991d2c43afd7c7be77edd27a2ae686f9779382da.tar.gz",
-      "hash": "10jj6x78k34yrarp5ydc7n1ylp2xxgxl7jqh1y4d133mgcygabak"
+      "revision": "8420ee6a9fe0bfc9a37920fd572b0ae5a2348967",
+      "url": "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/archive/8420ee6a9fe0bfc9a37920fd572b0ae5a2348967.tar.gz",
+      "hash": "19k5iayhji76q031mzm1vw0n2irh2417mn0gdhf4cmadkrj4ygmg"
     },
     "dashboard-nvim": {
       "type": "Git",
@@ -480,9 +480,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "70430c32d176f4a15c6e2c80586cd2791e3a664e",
-      "url": "https://github.com/akinsho/flutter-tools.nvim/archive/70430c32d176f4a15c6e2c80586cd2791e3a664e.tar.gz",
-      "hash": "01p721ca4as9b9nn4qibb6s775fn66j13zsx2d3flhkssii06v45"
+      "revision": "2d91a86a43a1ae1303e48aac55542f57b5731990",
+      "url": "https://github.com/akinsho/flutter-tools.nvim/archive/2d91a86a43a1ae1303e48aac55542f57b5731990.tar.gz",
+      "hash": "1ijwhwmf6f2rrixdpbr0aigjjy7jwl20bi4v5y7rz8cg0lhsmy5x"
     },
     "friendly-snippets": {
       "type": "Git",
@@ -506,9 +506,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "03eed634a3b1f4a4dc53f928868566b0b697dabe",
-      "url": "https://github.com/ibhagwan/fzf-lua/archive/03eed634a3b1f4a4dc53f928868566b0b697dabe.tar.gz",
-      "hash": "007fz9rwhcfx8l6k6dfnm91dcc4gsazr3vqbv95z5l1h1j184v6c"
+      "revision": "89ff12300e9a768f4890a8e02bb6a3f5d97f9a65",
+      "url": "https://github.com/ibhagwan/fzf-lua/archive/89ff12300e9a768f4890a8e02bb6a3f5d97f9a65.tar.gz",
+      "hash": "13bpzf0nb5sqf80fhly3zpfh94kkbr934qbn588668kjpplp1rqn"
     },
     "gesture-nvim": {
       "type": "Git",
@@ -571,9 +571,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "238070a686c1da3bccccf1079700eb4b5e19aea4",
-      "url": "https://github.com/ellisonleao/glow.nvim/archive/238070a686c1da3bccccf1079700eb4b5e19aea4.tar.gz",
-      "hash": "1j63y3hb03n5m4jig8576sxnb3jixxlr66m9xcs8vgfm5h0mrhqs"
+      "revision": "5d5954b2f22e109d4a6eba8b2618c5b96e4ee7a2",
+      "url": "https://github.com/ellisonleao/glow.nvim/archive/5d5954b2f22e109d4a6eba8b2618c5b96e4ee7a2.tar.gz",
+      "hash": "11rlis4riy1w4clnkiza8x6fs8xjwsrsgfzlz2k8z041ancmrw0a"
     },
     "gruvbox": {
       "type": "Git",
@@ -584,9 +584,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "15958f5ee43e144856cd2084ce6c571bfdb44504",
-      "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/15958f5ee43e144856cd2084ce6c571bfdb44504.tar.gz",
-      "hash": "16nrxcpds3zacqmfw5jsd5d8qqbwllkw9xacjkglcnaynp4qghqq"
+      "revision": "c6f42890551b4827253387e93b035568826a9cb7",
+      "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/c6f42890551b4827253387e93b035568826a9cb7.tar.gz",
+      "hash": "1ac056i9hs5wbb9qzdijmhjcaz4h67v2c8q0361d17gdm8pdrvnj"
     },
     "harpoon": {
       "type": "Git",
@@ -610,9 +610,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "52608d83b424de44e914711c0f505906816e7427",
-      "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/52608d83b424de44e914711c0f505906816e7427.tar.gz",
-      "hash": "1ngz8zzyni2wh0xhvrcl27am39kqaaabh5y9c4i8ym211ravzhv6"
+      "revision": "0a1d1119e69cdf9b89e509a8bea025e21d5a41c5",
+      "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/0a1d1119e69cdf9b89e509a8bea025e21d5a41c5.tar.gz",
+      "hash": "1i0m53ri2c5l4yzwjkbwwa73c8k5yh8yz6ddcljz1b9q5vs9dazk"
     },
     "highlight-undo-nvim": {
       "type": "Git",
@@ -678,9 +678,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "6ffafab2e98b5bda46bf227055aa84b90add8cdc",
-      "url": "https://github.com/3rd/image.nvim/archive/6ffafab2e98b5bda46bf227055aa84b90add8cdc.tar.gz",
-      "hash": "105k4ccv18nynm70lphb4ac3ih1ad4hlh2syrhmyi1i1jwdirjgz"
+      "revision": "2e2d28b7734b5efdfc1219f4da8a46c761587bc2",
+      "url": "https://github.com/3rd/image.nvim/archive/2e2d28b7734b5efdfc1219f4da8a46c761587bc2.tar.gz",
+      "hash": "1k2bch2l9bvy4ian6l3jymddcy7p4mvblpmbq0qvn8rzxdi65fy1"
     },
     "indent-blankline-nvim": {
       "type": "Git",
@@ -691,9 +691,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78",
-      "url": "https://github.com/lukas-reineke/indent-blankline.nvim/archive/e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78.tar.gz",
-      "hash": "1whsjd715rr59warfy7nmw0hzkxfkxgzx9c8r6k2vka4flifirnk"
+      "revision": "005b56001b2cb30bfa61b7986bc50657816ba4ba",
+      "url": "https://github.com/lukas-reineke/indent-blankline.nvim/archive/005b56001b2cb30bfa61b7986bc50657816ba4ba.tar.gz",
+      "hash": "1rmpi866bg7hyw620hbgmmmksxgll9ilbpigd1kk9b0lpvwxbbyj"
     },
     "lazydev-nvim": {
       "type": "Git",
@@ -755,9 +755,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "8b681c86b0bd7f932cd91987983d91497e43d83f",
-      "url": "https://github.com/ray-x/lsp_signature.nvim/archive/8b681c86b0bd7f932cd91987983d91497e43d83f.tar.gz",
-      "hash": "1ap077hgl334klfyi2hv81hf6r9mqpkarrz0b3ky99aavz7bmn2j"
+      "revision": "b58cca003d1d3311213d6db0352f58d8e57bfff0",
+      "url": "https://github.com/ray-x/lsp_signature.nvim/archive/b58cca003d1d3311213d6db0352f58d8e57bfff0.tar.gz",
+      "hash": "1jqpjb7xgdm5ikay8hdjz04bdkirhns6zpa68cblsyslpkvk4hk0"
     },
     "lspkind-nvim": {
       "type": "Git",
@@ -781,9 +781,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "6063935cf68de9aa6dd79f8e1caf5df0a9385de3",
-      "url": "https://github.com/nvimdev/lspsaga.nvim/archive/6063935cf68de9aa6dd79f8e1caf5df0a9385de3.tar.gz",
-      "hash": "1pqasjg2f2yd3ci8hyxfqqs7xnkmwdc411dlm6qg1agiv1h8v205"
+      "revision": "778d56ff9b387dacd14ae648ed5604394b486f51",
+      "url": "https://github.com/nvimdev/lspsaga.nvim/archive/778d56ff9b387dacd14ae648ed5604394b486f51.tar.gz",
+      "hash": "1rm8ww8krxliwli9m2j6j37xgwgjsrgapvgrcdr6nd4mi6hgmczm"
     },
     "lua-utils-nvim": {
       "type": "Git",
@@ -807,9 +807,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "b8b60c7f1d0d95ad74ee215b2291280b30482476",
-      "url": "https://github.com/hoob3rt/lualine.nvim/archive/b8b60c7f1d0d95ad74ee215b2291280b30482476.tar.gz",
-      "hash": "02xyjp446b2nypw3hh4k6b6g9f892kxmmdv23s7dypcws28v50m9"
+      "revision": "1517caa8fff05e4b4999857319d3b0609a7f57fa",
+      "url": "https://github.com/hoob3rt/lualine.nvim/archive/1517caa8fff05e4b4999857319d3b0609a7f57fa.tar.gz",
+      "hash": "0mzclk1rb03ln0my8pqq8p4sn84zkwn0amy2xyb2xds8q9zi21hc"
     },
     "luasnip": {
       "type": "Git",
@@ -833,9 +833,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "d5856041d60f9500804c872709b8d5f59505d92b",
-      "url": "https://github.com/nvim-neorocks/lz.n/archive/d5856041d60f9500804c872709b8d5f59505d92b.tar.gz",
-      "hash": "1dxsy8baq7zdc047ixxxa1qkfw48jgbng4vngwlg6gc2rv16rf36"
+      "revision": "136e315e0c1e2ac116cc0953dd41adfebfb4a695",
+      "url": "https://github.com/nvim-neorocks/lz.n/archive/136e315e0c1e2ac116cc0953dd41adfebfb4a695.tar.gz",
+      "hash": "0fdgr21cj5nis4vicvws635w9c8bcls59yj64d3xwfj7nr40mzws"
     },
     "lzn-auto-require": {
       "type": "Git",
@@ -872,9 +872,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "6e01c0e5a15554852546fac9853960780ac52ed4",
-      "url": "https://github.com/echasnovski/mini.ai/archive/6e01c0e5a15554852546fac9853960780ac52ed4.tar.gz",
-      "hash": "0138rsb0rh4fjiicm3gjah0b5n1c08lil29c5ssqk3xq1bdr69j9"
+      "revision": "978ffc65c6b513fde9ef075326d34d89197f1ea5",
+      "url": "https://github.com/echasnovski/mini.ai/archive/978ffc65c6b513fde9ef075326d34d89197f1ea5.tar.gz",
+      "hash": "1kgar55azqq9g6m9y98kr96cldhzipdfp2cjhszvnzw9ad28p3nb"
     },
     "mini-align": {
       "type": "Git",
@@ -885,9 +885,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "3bdf6f0b91b31db5300a7b04f53f296a7fb150c1",
-      "url": "https://github.com/echasnovski/mini.align/archive/3bdf6f0b91b31db5300a7b04f53f296a7fb150c1.tar.gz",
-      "hash": "1255r5c9q0nnb7vnhs7xk45vqigmbhbim02ciczv8i80amfh9yw3"
+      "revision": "0ce67804b0343409c93eb14275b98d53a7b209cc",
+      "url": "https://github.com/echasnovski/mini.align/archive/0ce67804b0343409c93eb14275b98d53a7b209cc.tar.gz",
+      "hash": "1lq5pzi24ahwfp1jipwl7a1mynnz1ja7c70bs2kilafpa314ymnp"
     },
     "mini-animate": {
       "type": "Git",
@@ -898,9 +898,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "13e170c13030b043aa8ad4311012ec0eaba0d5c7",
-      "url": "https://github.com/echasnovski/mini.animate/archive/13e170c13030b043aa8ad4311012ec0eaba0d5c7.tar.gz",
-      "hash": "153hrx7i0kn65lz4yjgkaxkvj0xvqamm3mi6ciq9b0q3c2ngh7rj"
+      "revision": "33235a02c7dbaf2a5abdb9c584f9bdb6a6fef247",
+      "url": "https://github.com/echasnovski/mini.animate/archive/33235a02c7dbaf2a5abdb9c584f9bdb6a6fef247.tar.gz",
+      "hash": "1v4xlphp9h1vc48dxwf9hmm2mfr1z1s708knsbyx6gkd282zmzkg"
     },
     "mini-base16": {
       "type": "Git",
@@ -911,9 +911,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "44240f11871c15aba8fc49959ebd27c0b4768a40",
-      "url": "https://github.com/echasnovski/mini.base16/archive/44240f11871c15aba8fc49959ebd27c0b4768a40.tar.gz",
-      "hash": "0z4vvsm2hc1cab5qqd28x6jzyzh23cdijrrs1hkkkj0nj3si3zkn"
+      "revision": "492b34f496fd1a53126feb1e47ebf55ce9d61e25",
+      "url": "https://github.com/echasnovski/mini.base16/archive/492b34f496fd1a53126feb1e47ebf55ce9d61e25.tar.gz",
+      "hash": "0srxnxkpi03282zdcbrq13b2m259pchnfvp94awn286zwsc9x23l"
     },
     "mini-basics": {
       "type": "Git",
@@ -924,9 +924,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "e8fbcf96e4e8262d452ddc851acea6c50449fa79",
-      "url": "https://github.com/echasnovski/mini.basics/archive/e8fbcf96e4e8262d452ddc851acea6c50449fa79.tar.gz",
-      "hash": "0v3j61qik4mv2r246b7q7h4ndg68x373dr5jag3a4hwszgpf7jcl"
+      "revision": "307ba95901099f44cff557da040ee8862093e410",
+      "url": "https://github.com/echasnovski/mini.basics/archive/307ba95901099f44cff557da040ee8862093e410.tar.gz",
+      "hash": "130y4b372n3gckg1in5mgdssxg55cswa0dwxrs4icq2nb7rxnbia"
     },
     "mini-bracketed": {
       "type": "Git",
@@ -950,9 +950,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "bba1d8b413d37081756f59200b8cf756181e5b9a",
-      "url": "https://github.com/echasnovski/mini.bufremove/archive/bba1d8b413d37081756f59200b8cf756181e5b9a.tar.gz",
-      "hash": "0lbh2azsa9fmb8qp8gzhv36riiafybmjgg0prppchik8lsbhjzy4"
+      "revision": "c635c40d06a45450d34695d70c3fb3efe432728f",
+      "url": "https://github.com/echasnovski/mini.bufremove/archive/c635c40d06a45450d34695d70c3fb3efe432728f.tar.gz",
+      "hash": "0d5zmn1rldcl37i6v6m2b2ql3nvkdfqjzf3zhdkqfd7pxvvwp12j"
     },
     "mini-clue": {
       "type": "Git",
@@ -963,9 +963,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "08901d2223797aa25611c33aaf9d8a1049a653bb",
-      "url": "https://github.com/echasnovski/mini.clue/archive/08901d2223797aa25611c33aaf9d8a1049a653bb.tar.gz",
-      "hash": "026d647acwxr0wrf43lffmzw4x84jm6v5lipbqqpicqgqs8b4rfv"
+      "revision": "9bfd8ce71ae31460837fcec82a03946008929777",
+      "url": "https://github.com/echasnovski/mini.clue/archive/9bfd8ce71ae31460837fcec82a03946008929777.tar.gz",
+      "hash": "1rx2952li3zby1v24asrp9avy6l9f7f6v954a6xf1rl8ijz2aa5j"
     },
     "mini-colors": {
       "type": "Git",
@@ -976,9 +976,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "d49e0764821d40adbf3f9e92091dfba0b0590378",
-      "url": "https://github.com/echasnovski/mini.colors/archive/d49e0764821d40adbf3f9e92091dfba0b0590378.tar.gz",
-      "hash": "1kn5012q6x1hfpyjqhssydln3v6b25gvvjw1zhw93m8x9km2j524"
+      "revision": "0b13a3f8c7279d31833203b1c15d456047321f28",
+      "url": "https://github.com/echasnovski/mini.colors/archive/0b13a3f8c7279d31833203b1c15d456047321f28.tar.gz",
+      "hash": "00037f03cmx01y6hd7cdk4bibbzfqmygf851alhnvd2fs7flvxcw"
     },
     "mini-comment": {
       "type": "Git",
@@ -1002,9 +1002,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "8f439dfb5432f9a78fb172ec7e03ee31f18551c4",
-      "url": "https://github.com/echasnovski/mini.completion/archive/8f439dfb5432f9a78fb172ec7e03ee31f18551c4.tar.gz",
-      "hash": "0y4zzp4najk2bydwzx72nbn18n32v6ar0dc2qgialszivy0nnhgh"
+      "revision": "9e6aa17fef2e86d3f33666a7843b942791cc1c1f",
+      "url": "https://github.com/echasnovski/mini.completion/archive/9e6aa17fef2e86d3f33666a7843b942791cc1c1f.tar.gz",
+      "hash": "05z0ghbwh7h2ij8k72sidrpypnzkf57kf058kwpc0wd1jm9ymznm"
     },
     "mini-diff": {
       "type": "Git",
@@ -1015,9 +1015,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "bc3a7be30fd45ed4961ea90de1d9d04637cdeae6",
-      "url": "https://github.com/echasnovski/mini.diff/archive/bc3a7be30fd45ed4961ea90de1d9d04637cdeae6.tar.gz",
-      "hash": "0mjl819rd7hbsk3my9ypsl7q7kvxaiyms6a8z63d63nljsbs8ycf"
+      "revision": "e4a59a8a22d9afeeaac92e3cb3fbd8ff5dc8e310",
+      "url": "https://github.com/echasnovski/mini.diff/archive/e4a59a8a22d9afeeaac92e3cb3fbd8ff5dc8e310.tar.gz",
+      "hash": "0z38rpxdgg298a1i5ar49694xfjv26m8572qbhq2s6wkf24p08yk"
     },
     "mini-doc": {
       "type": "Git",
@@ -1028,9 +1028,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "466c340917b76d16a79fcbb2545c397fc49b110e",
-      "url": "https://github.com/echasnovski/mini.doc/archive/466c340917b76d16a79fcbb2545c397fc49b110e.tar.gz",
-      "hash": "16aglk95hw9wbgz4vzpv3bf3hqzqa2qrrzsxqjva2smg9f59c7rl"
+      "revision": "00d626a03e5642c657c58c99d14cc0ea6ed51abd",
+      "url": "https://github.com/echasnovski/mini.doc/archive/00d626a03e5642c657c58c99d14cc0ea6ed51abd.tar.gz",
+      "hash": "0n920j25rnb66hk3klrni9ji673800dbxyb8j30vd4dymq5051ym"
     },
     "mini-extra": {
       "type": "Git",
@@ -1041,9 +1041,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "7725a82b4d9c0acdc370385b9c04bb0791017230",
-      "url": "https://github.com/echasnovski/mini.extra/archive/7725a82b4d9c0acdc370385b9c04bb0791017230.tar.gz",
-      "hash": "0vndliykk98dn9qy8r3ip73y8zflyr40qml7jg522lq5ql546my6"
+      "revision": "54420de7ee36cf011c6351a1d6290b2555120c7b",
+      "url": "https://github.com/echasnovski/mini.extra/archive/54420de7ee36cf011c6351a1d6290b2555120c7b.tar.gz",
+      "hash": "16kyn5jh6pnpiiahf16r2yk3bck9yz8vy5fbvwlfa847rbl39ybd"
     },
     "mini-files": {
       "type": "Git",
@@ -1054,9 +1054,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "0a396f5ca5516a07959ae2c00667e1a26c20f0ea",
-      "url": "https://github.com/echasnovski/mini.files/archive/0a396f5ca5516a07959ae2c00667e1a26c20f0ea.tar.gz",
-      "hash": "1axjd6a6c02jllhi1l8c9xfplipvz4g82hnxjbsgx4kzc9b60zdq"
+      "revision": "3007632477bb9df28b4e32329c63aea1ab2c2b0a",
+      "url": "https://github.com/echasnovski/mini.files/archive/3007632477bb9df28b4e32329c63aea1ab2c2b0a.tar.gz",
+      "hash": "1bb0sv766gjnwnqpn7qhcsm6m6c8zj96ippsh1sjlqd3ma09hzwm"
     },
     "mini-fuzzy": {
       "type": "Git",
@@ -1080,9 +1080,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "05f9ec07534ce8e2bf797c05c0a8bd826d9d24a2",
-      "url": "https://github.com/echasnovski/mini-git/archive/05f9ec07534ce8e2bf797c05c0a8bd826d9d24a2.tar.gz",
-      "hash": "0irvwbxhi9y4wf04khgv1l8z4a2hff3r7f2j3r0p76slqjgd7x19"
+      "revision": "96034bd94220115e49dbf8c38ef4da5508ba29c2",
+      "url": "https://github.com/echasnovski/mini-git/archive/96034bd94220115e49dbf8c38ef4da5508ba29c2.tar.gz",
+      "hash": "0f15bsqrjbifjp0g0fscncyhzsvjd3i4fh0vyagpl08g4as1fqx3"
     },
     "mini-hipatterns": {
       "type": "Git",
@@ -1106,9 +1106,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "7a88e67dfb953820718106d8fc83d0f97c4d9173",
-      "url": "https://github.com/echasnovski/mini.hues/archive/7a88e67dfb953820718106d8fc83d0f97c4d9173.tar.gz",
-      "hash": "1kgjkx9bqycmm077i4jk0fnyl47fkmmd2vv0qf6lqsnnliivqxqw"
+      "revision": "b65cb42ad651ee3543985e333c504bf820bc5a85",
+      "url": "https://github.com/echasnovski/mini.hues/archive/b65cb42ad651ee3543985e333c504bf820bc5a85.tar.gz",
+      "hash": "1yhkvszlw6pp1pxkz0w76fwmmysb2bl2kka0f0ws4jhfcdj6qv1c"
     },
     "mini-icons": {
       "type": "Git",
@@ -1119,9 +1119,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36",
-      "url": "https://github.com/echasnovski/mini.icons/archive/ec61af6e606fc89ee3b1d8f2f20166a3ca917a36.tar.gz",
-      "hash": "0y5b4bswykf8mf429y29lahmjzjsri0qspwyimnb1d73028qn8ck"
+      "revision": "86a633f0dffcfd80110bac86681dbf4b5c37ba5c",
+      "url": "https://github.com/echasnovski/mini.icons/archive/86a633f0dffcfd80110bac86681dbf4b5c37ba5c.tar.gz",
+      "hash": "1810mvav1k24kxx3kj364v09k26d1s1p2y6dnc2l8mwzw7q70byr"
     },
     "mini-indentscope": {
       "type": "Git",
@@ -1171,9 +1171,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "7f4c785b95ff6d266588fe6e5b6ea696cf654e61",
-      "url": "https://github.com/echasnovski/mini.map/archive/7f4c785b95ff6d266588fe6e5b6ea696cf654e61.tar.gz",
-      "hash": "0f8mlszgi1fnmy0npqw27g28h9bgavy7mc97zivgsxgx2whgz6al"
+      "revision": "2fe08148f883d613c825c1c0c6ea8a19901061f0",
+      "url": "https://github.com/echasnovski/mini.map/archive/2fe08148f883d613c825c1c0c6ea8a19901061f0.tar.gz",
+      "hash": "1mqf5bkyp8r05h7ba4drfxx97js2fzmdbjz0xb88xhnpmrikfjnv"
     },
     "mini-misc": {
       "type": "Git",
@@ -1184,9 +1184,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "a477a9d5790f6d899d3055c87f2e771118f91180",
-      "url": "https://github.com/echasnovski/mini.misc/archive/a477a9d5790f6d899d3055c87f2e771118f91180.tar.gz",
-      "hash": "1fp60lhv93jiygc0hvchzdzjgs8scczp7kv9cm3kzzimcfa84ky6"
+      "revision": "3f0cf62b7e9c545e7e92fe5614f4d6acbe5a8f29",
+      "url": "https://github.com/echasnovski/mini.misc/archive/3f0cf62b7e9c545e7e92fe5614f4d6acbe5a8f29.tar.gz",
+      "hash": "04sw3kxx7qa8i2xvagxls78ih7l6fq9mk42xrqjim225657hva5p"
     },
     "mini-move": {
       "type": "Git",
@@ -1210,9 +1210,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "e71f08013db6812d9ce95c2624ae405a4267f4f3",
-      "url": "https://github.com/echasnovski/mini.notify/archive/e71f08013db6812d9ce95c2624ae405a4267f4f3.tar.gz",
-      "hash": "0fmy3d62283j2cwlxk97fyylad2zkd5j2r7pg7fb3cq8k1021d0s"
+      "revision": "be6661ee23f2325841fb087efb8e492b29eccc9a",
+      "url": "https://github.com/echasnovski/mini.notify/archive/be6661ee23f2325841fb087efb8e492b29eccc9a.tar.gz",
+      "hash": "16n36gvk3gz46cs30gh8zd4mcwszniynl2k87rzbfhhcwsj71svx"
     },
     "mini-operators": {
       "type": "Git",
@@ -1223,9 +1223,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "02cfac95919b945c19221f0fcebe883c6dce04f6",
-      "url": "https://github.com/echasnovski/mini.operators/archive/02cfac95919b945c19221f0fcebe883c6dce04f6.tar.gz",
-      "hash": "1b51b3d1qkbzh68yadx3fcx9dgk405cb2ghln999fl5czvc3crmd"
+      "revision": "298218fb8280fd4a8234db80230dd84db6b07efd",
+      "url": "https://github.com/echasnovski/mini.operators/archive/298218fb8280fd4a8234db80230dd84db6b07efd.tar.gz",
+      "hash": "021big8pqbwkjrzkak0chffwhhvj8klanda5q9wxwgg1wky9qvi6"
     },
     "mini-pairs": {
       "type": "Git",
@@ -1236,9 +1236,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918",
-      "url": "https://github.com/echasnovski/mini.pairs/archive/1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918.tar.gz",
-      "hash": "0d0188v3gw2sdqnfly6i12v9036hdk1sg362lkngjmlpnq3m8574"
+      "revision": "b90e36aa5ca5e0d825e77ad67aac22214a4d9096",
+      "url": "https://github.com/echasnovski/mini.pairs/archive/b90e36aa5ca5e0d825e77ad67aac22214a4d9096.tar.gz",
+      "hash": "0h35xn8029d74sdv1fyrycpkl10vv0m01fvx2v955v0jfc9cii1n"
     },
     "mini-pick": {
       "type": "Git",
@@ -1249,9 +1249,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "12ea14f8e285d1bcc909116685fdbb129a89d546",
-      "url": "https://github.com/echasnovski/mini.pick/archive/12ea14f8e285d1bcc909116685fdbb129a89d546.tar.gz",
-      "hash": "1ssa7ym6zxhazx551bjsnfdmvm1553kj6amvcczw9jrqbf4ynjqy"
+      "revision": "4dfc0a21f16d34e9b2429b96d62788ed8a65e6cd",
+      "url": "https://github.com/echasnovski/mini.pick/archive/4dfc0a21f16d34e9b2429b96d62788ed8a65e6cd.tar.gz",
+      "hash": "0ybfn2mn038mn2bdaf5hyiycimfi785silpcnayh4nj544zhzjc9"
     },
     "mini-sessions": {
       "type": "Git",
@@ -1301,9 +1301,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "736c5177bd90cc852c05d903f662f0fc395a4b4b",
-      "url": "https://github.com/echasnovski/mini.starter/archive/736c5177bd90cc852c05d903f662f0fc395a4b4b.tar.gz",
-      "hash": "0w2awkcrabbsybvv2hlzjlqgcr53480pg5p3fhaaparrhd90c7na"
+      "revision": "cf770619b85968bc0f45cace82f5c80b69ca0e96",
+      "url": "https://github.com/echasnovski/mini.starter/archive/cf770619b85968bc0f45cace82f5c80b69ca0e96.tar.gz",
+      "hash": "11l7vxhd6sra55aj2xmm79nfhrkisv9r6fssknmcdxrmh47dr3kd"
     },
     "mini-statusline": {
       "type": "Git",
@@ -1314,9 +1314,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "83209bfbca156f9e4a5ec47a2a8ce1e5ce26311d",
-      "url": "https://github.com/echasnovski/mini.statusline/archive/83209bfbca156f9e4a5ec47a2a8ce1e5ce26311d.tar.gz",
-      "hash": "1hma81mnylbnx812km7zc0xjxbs3bp2pb3bqzsny9w1llxwv7zrr"
+      "revision": "ec3adf7813b7604275dd4a28433e9c9610b70f1b",
+      "url": "https://github.com/echasnovski/mini.statusline/archive/ec3adf7813b7604275dd4a28433e9c9610b70f1b.tar.gz",
+      "hash": "1ny69yjvldl4jpyjpy8z4w4zz6ir976x63nds8z05zgkq8fa2ajd"
     },
     "mini-surround": {
       "type": "Git",
@@ -1327,9 +1327,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "f90069c7441a5fb04c3de42eacf93e16b64dd3eb",
-      "url": "https://github.com/echasnovski/mini.surround/archive/f90069c7441a5fb04c3de42eacf93e16b64dd3eb.tar.gz",
-      "hash": "0bs7y0ai67jlwdz76x6945xvj9f4vqr4qx4vyfg7z7b6k1gzc092"
+      "revision": "97796f68a8698d9b63ac3927da0d0bf5c3a0876b",
+      "url": "https://github.com/echasnovski/mini.surround/archive/97796f68a8698d9b63ac3927da0d0bf5c3a0876b.tar.gz",
+      "hash": "1lris02am949lqg35ql3jgyfhzya68df3yhb5d2dbfmwhk6mjxgc"
     },
     "mini-tabline": {
       "type": "Git",
@@ -1353,9 +1353,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "16a909c3ce39d9af9ec4dacca16205d36f85d823",
-      "url": "https://github.com/echasnovski/mini.test/archive/16a909c3ce39d9af9ec4dacca16205d36f85d823.tar.gz",
-      "hash": "1qf8ay763d011rvy9qwpv8q3mlxjlymvc4gx3bjfv0n56k5dzpg0"
+      "revision": "5db2659a3bcda7890d3416cfbe49eb9c36824675",
+      "url": "https://github.com/echasnovski/mini.test/archive/5db2659a3bcda7890d3416cfbe49eb9c36824675.tar.gz",
+      "hash": "173wj06k5g8k6ah2aw4azlgwmq7jmin5jkqkkpr9z1lviagrdss7"
     },
     "mini-trailspace": {
       "type": "Git",
@@ -1447,9 +1447,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "d9544c74ec43cca0564fdc334c116fbe0be8a807",
-      "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/d9544c74ec43cca0564fdc334c116fbe0be8a807.tar.gz",
-      "hash": "0wiw4aipg3qmzw6k9vrljh4cg09kyqd28s6xpv2zhsg05mm38nhb"
+      "revision": "69f798bf9493b84df660ac3c6b2fc03e23956d25",
+      "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/69f798bf9493b84df660ac3c6b2fc03e23956d25.tar.gz",
+      "hash": "0yybrcljbfq6xygaqzspjz3bhxa6fb7w0qypky66cvhbpzrl6blz"
     },
     "neocord": {
       "type": "Git",
@@ -1473,9 +1473,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "6f0b4eefa591fbc4c9344f110b0c0bac5b49078c",
-      "url": "https://github.com/nvim-neorg/neorg/archive/6f0b4eefa591fbc4c9344f110b0c0bac5b49078c.tar.gz",
-      "hash": "1x8h5hxzg06g1d849bna6rs4jzjf248g59v87zvlc4scmp9pzjga"
+      "revision": "79ffd346ca19af49197d9c1b45d0b902c32c3e14",
+      "url": "https://github.com/nvim-neorg/neorg/archive/79ffd346ca19af49197d9c1b45d0b902c32c3e14.tar.gz",
+      "hash": "0czkcdfh0l8j80kaz2zpdyb424xa28c35jybkdigwj1fgi0afnzd"
     },
     "neorg-telescope": {
       "type": "Git",
@@ -1590,9 +1590,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "68f0e5c3dab23261a945272032ee6700af86227a",
-      "url": "https://github.com/windwp/nvim-autopairs/archive/68f0e5c3dab23261a945272032ee6700af86227a.tar.gz",
-      "hash": "1ai3s1083dx6bddhrkv7d3hyq3zsrblizbvpgl09r1w9cijxhj8m"
+      "revision": "6522027785b305269fa17088395dfc0f456cedd2",
+      "url": "https://github.com/windwp/nvim-autopairs/archive/6522027785b305269fa17088395dfc0f456cedd2.tar.gz",
+      "hash": "1i63wdgm54n3iiiix0y18mjvy2rsswc4iybqppsfpvi8cg2xjpa6"
     },
     "nvim-bufferline-lua": {
       "type": "Git",
@@ -1655,9 +1655,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "a720d4966f758ab22e8ec28812b6df90a53e0f02",
-      "url": "https://github.com/mfussenegger/nvim-dap/archive/a720d4966f758ab22e8ec28812b6df90a53e0f02.tar.gz",
-      "hash": "0b979dhl5jr3kx9j5zih39jbrv22d554ws6y8g1cgsm2i3412s4h"
+      "revision": "7aade9e99bef5f0735cf966e715b3ce45515d786",
+      "url": "https://github.com/mfussenegger/nvim-dap/archive/7aade9e99bef5f0735cf966e715b3ce45515d786.tar.gz",
+      "hash": "0cr2y3lkr6ffxxd9b2pj8hr3fzb5dlj003fcknswqwsdhws75l22"
     },
     "nvim-dap-go": {
       "type": "Git",
@@ -1694,9 +1694,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "1b97f8f954d74c46061bf289b6cea9232484c12c",
-      "url": "https://github.com/amrbashir/nvim-docs-view/archive/1b97f8f954d74c46061bf289b6cea9232484c12c.tar.gz",
-      "hash": "1xi0w20fq3yziwdjld1xhkm7dr0ihbbq2hik0qsckd7y73qqg5kg"
+      "revision": "f674ba57349849bce894efdd54096483c88e810b",
+      "url": "https://github.com/amrbashir/nvim-docs-view/archive/f674ba57349849bce894efdd54096483c88e810b.tar.gz",
+      "hash": "0ifbfhifly5sdsbxv1p71wvl644jz505ln9j1yr6qwvyk6a2krm1"
     },
     "nvim-lightbulb": {
       "type": "Git",
@@ -1707,9 +1707,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "f7f61c47af5bf701b1f4af127bc565ab6491acbf",
-      "url": "https://github.com/kosayoda/nvim-lightbulb/archive/f7f61c47af5bf701b1f4af127bc565ab6491acbf.tar.gz",
-      "hash": "1wg7yib9qn8ybsk615kw1g8b3g5zbpdldp6bb7ax0jwxsn5nwwfb"
+      "revision": "aa3a8b0f4305b25cfe368f6c9be9923a7c9d0805",
+      "url": "https://github.com/kosayoda/nvim-lightbulb/archive/aa3a8b0f4305b25cfe368f6c9be9923a7c9d0805.tar.gz",
+      "hash": "0wp8f6yphb28iaxlhg326kvrh3h8xn5fkkcfn1whbacch6562wym"
     },
     "nvim-lint": {
       "type": "Git",
@@ -1720,9 +1720,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8",
-      "url": "https://github.com/mfussenegger/nvim-lint/archive/6e9dd545a1af204c4022a8fcd99727ea41ffdcc8.tar.gz",
-      "hash": "0b318dahzf9kd043mjsa41rj44zfbs7k8i4bz0rqhcqipr19rwhk"
+      "revision": "93b8040115c9114dac1047311763bef275e752dc",
+      "url": "https://github.com/mfussenegger/nvim-lint/archive/93b8040115c9114dac1047311763bef275e752dc.tar.gz",
+      "hash": "1115rn9npzj2xdj2zr1ayhfy76281zv0avbiyi5vgnvfg7064jmq"
     },
     "nvim-lspconfig": {
       "type": "Git",
@@ -1733,9 +1733,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0",
-      "url": "https://github.com/neovim/nvim-lspconfig/archive/8a1529e46eef5efc86c34c8d9bdd313abc2ecba0.tar.gz",
-      "hash": "0l9mns71hh0jssxblr1q286z8hmxwbgyq1nw6scki9ffn23jwnz0"
+      "revision": "a785eb7ad5adf9341f5e9fc8bc3b25af4fdc9385",
+      "url": "https://github.com/neovim/nvim-lspconfig/archive/a785eb7ad5adf9341f5e9fc8bc3b25af4fdc9385.tar.gz",
+      "hash": "02bc6g1dq54hmg481dd2vywx1pirklymsq36dlwzg77qr2hr6701"
     },
     "nvim-metals": {
       "type": "Git",
@@ -1746,9 +1746,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "fe6125f633c1b2f68d468a2041e81e2e5e8933d4",
-      "url": "https://github.com/scalameta/nvim-metals/archive/fe6125f633c1b2f68d468a2041e81e2e5e8933d4.tar.gz",
-      "hash": "1xpav9ykwk7kz61c6y33kyjxf0nf47risdj0q9gf5rnl88cln4by"
+      "revision": "f763b65fd71cb17d544753194fd91090e611c6e0",
+      "url": "https://github.com/scalameta/nvim-metals/archive/f763b65fd71cb17d544753194fd91090e611c6e0.tar.gz",
+      "hash": "0ayn8npywhr9j1rlhvq5kij0s3751hh89fd5qqp1iqjqr9mg4ns8"
     },
     "nvim-navbuddy": {
       "type": "Git",
@@ -1837,9 +1837,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "6c54643ef42016b744888b06d2381abd23f9b7ea",
-      "url": "https://github.com/kylechui/nvim-surround/archive/6c54643ef42016b744888b06d2381abd23f9b7ea.tar.gz",
-      "hash": "1c5agqfffmjxc73bv8d4hmrnzx62ikqpv7pii19v5alfdcnh5j48"
+      "revision": "caf6f633d4d77a29b6e265b560c5a035d171a913",
+      "url": "https://github.com/kylechui/nvim-surround/archive/caf6f633d4d77a29b6e265b560c5a035d171a913.tar.gz",
+      "hash": "130y0b2f69y5rzm64ss34a9zyqkpkybr2d1s4p0pcvvaq1ngq0r0"
     },
     "nvim-tree-lua": {
       "type": "Git",
@@ -1850,9 +1850,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "c09ff35de503a41fa62465c6b4ae72d96e7a7ce4",
-      "url": "https://github.com/nvim-tree/nvim-tree.lua/archive/c09ff35de503a41fa62465c6b4ae72d96e7a7ce4.tar.gz",
-      "hash": "0bnc2fc9ipz9yp917l61vvcaqmbdg5fhqxrp7jfjxj5qmvadhai9"
+      "revision": "44d9b58f11d5a426c297aafd0be1c9d45617a849",
+      "url": "https://github.com/nvim-tree/nvim-tree.lua/archive/44d9b58f11d5a426c297aafd0be1c9d45617a849.tar.gz",
+      "hash": "0gya49yydrbq5jylsk4b9c2cpygy0mxhr6kwdsbg0di0i74pkav0"
     },
     "nvim-treesitter-context": {
       "type": "Git",
@@ -1863,9 +1863,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "572e534c9f881bb9bf9f388e4c87f360446c72d4",
-      "url": "https://github.com/nvim-treesitter/nvim-treesitter-context/archive/572e534c9f881bb9bf9f388e4c87f360446c72d4.tar.gz",
-      "hash": "0bg3x75j8mwvpdhwd945lxbwmhw2j1qi135zn0yli78c9jn8g0ay"
+      "revision": "93b29a32d5f4be10e39226c6b796f28d68a8b483",
+      "url": "https://github.com/nvim-treesitter/nvim-treesitter-context/archive/93b29a32d5f4be10e39226c6b796f28d68a8b483.tar.gz",
+      "hash": "12ixiqb4bj7n3kkzqi81hyhn3bjsb93250gvfy12bxya2l5bi20g"
     },
     "nvim-ts-autotag": {
       "type": "Git",
@@ -1889,9 +1889,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "a52c92c3bbaa10f0c9b547a50adaa8c7d8b29f94",
-      "url": "https://github.com/kevinhwang91/nvim-ufo/archive/a52c92c3bbaa10f0c9b547a50adaa8c7d8b29f94.tar.gz",
-      "hash": "1fv3rhny1d8wgxd3h3fy4vv05nb0fz506sk2in8rkmwlzwixl2wn"
+      "revision": "5b75cf5fdb74054fc8badb2e7ca9911dc0470d94",
+      "url": "https://github.com/kevinhwang91/nvim-ufo/archive/5b75cf5fdb74054fc8badb2e7ca9911dc0470d94.tar.gz",
+      "hash": "0arbnim2lchd4khrr06f5n0vsj29ahrs7v277j9vmnkmrfpjzvhb"
     },
     "nvim-web-devicons": {
       "type": "Git",
@@ -1902,9 +1902,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "d0cafff5c4347a604a07edf7bb9a91fda7eb577e",
-      "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/d0cafff5c4347a604a07edf7bb9a91fda7eb577e.tar.gz",
-      "hash": "1j5ccksn2lkd1f1fvhhjs2amhq17wxmgcqv6jk05jpdbngw2mv98"
+      "revision": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c",
+      "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/4c3a5848ee0b09ecdea73adcd2a689190aeb728c.tar.gz",
+      "hash": "1a3pkkjdv99nzmh9rf3rn4x1wwhbrr7497ln7xlnkczmk9faz8r4"
     },
     "obsidian-nvim": {
       "type": "Git",
@@ -1954,9 +1954,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "abf8890a9b0612c51d738268c759c4331bc2109c",
-      "url": "https://github.com/nvim-orgmode/orgmode/archive/abf8890a9b0612c51d738268c759c4331bc2109c.tar.gz",
-      "hash": "0j4f2y47s5ymii1w0r9gk39z4vks5fc9cy0rvj1vzml4vf4wijsi"
+      "revision": "145dce4d2f1bbaed5ff9e353822981b783627b32",
+      "url": "https://github.com/nvim-orgmode/orgmode/archive/145dce4d2f1bbaed5ff9e353822981b783627b32.tar.gz",
+      "hash": "0vy5wx8kwf0k7sx27cy6lcqvni5njq1nhcj2yxk8xkdn61wk7gyi"
     },
     "otter-nvim": {
       "type": "Git",
@@ -1967,9 +1967,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "e37053d2c6a17463e705483122eee04d41e3d4af",
-      "url": "https://github.com/jmbuhr/otter.nvim/archive/e37053d2c6a17463e705483122eee04d41e3d4af.tar.gz",
-      "hash": "0sq7x2mcxl7z0j4s3a395fy0bzz13h4rxd03lp6674y6hsjxcm55"
+      "revision": "622816aac66933352e20e4d5d01993cd270d6fb0",
+      "url": "https://github.com/jmbuhr/otter.nvim/archive/622816aac66933352e20e4d5d01993cd270d6fb0.tar.gz",
+      "hash": "15ciqkx3hbbccy30dkga17jhra4mslvas0qnqiqrv5qlc09shyrp"
     },
     "oxocarbon": {
       "type": "Git",
@@ -2058,9 +2058,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "f1e5490e87478cf0b528250ebb51552f3d08436a",
-      "url": "https://github.com/HiPhish/rainbow-delimiters.nvim/archive/f1e5490e87478cf0b528250ebb51552f3d08436a.tar.gz",
-      "hash": "02265awjpkd8v6s22wx8qrk2wxq8b7c7h5lr9n7pi6d4lwyrkrxf"
+      "revision": "de39919a57e1a40a4c7dc5bae0de276f9c616ef3",
+      "url": "https://github.com/HiPhish/rainbow-delimiters.nvim/archive/de39919a57e1a40a4c7dc5bae0de276f9c616ef3.tar.gz",
+      "hash": "04a3y7kyszgjgi1nmjb41vwwpz4svkxh61zkbxrn4ajvxz1ia05i"
     },
     "registers-nvim": {
       "type": "Git",
@@ -2084,9 +2084,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "08e1fa4e281e48ee4aa892428de9fb91e66edca6",
-      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/08e1fa4e281e48ee4aa892428de9fb91e66edca6.tar.gz",
-      "hash": "1kiwa88l2262ycfj6z70hdriml0y2wnji3l9w27jbky9zxwhazrs"
+      "revision": "a1fc4e559252baa128c471adadf0be045abd542d",
+      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/a1fc4e559252baa128c471adadf0be045abd542d.tar.gz",
+      "hash": "0n9zis5jf7khjdmc622g40is5yjsqkxph64mldpd3q8ka64yaib1"
     },
     "rose-pine": {
       "type": "Git",
@@ -2136,9 +2136,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "c7cc0e00ec53cafaa38e258cba4a6507c180289b",
-      "url": "https://github.com/mrcjkb/rustaceanvim/archive/c7cc0e00ec53cafaa38e258cba4a6507c180289b.tar.gz",
-      "hash": "1514w2x5vpn790rz8wkah0chr7yz9sm5whaprnm1qc26fz4jwc17"
+      "revision": "1486b5a2cc0de646d6d0837ec77127c9d6e2c50f",
+      "url": "https://github.com/mrcjkb/rustaceanvim/archive/1486b5a2cc0de646d6d0837ec77127c9d6e2c50f.tar.gz",
+      "hash": "1gl4i8pbmia78srxcsi131vxby5d8w9mn0ydzl3r0v7pawyvwr9q"
     },
     "smartcolumn-nvim": {
       "type": "Git",
@@ -2178,9 +2178,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "a514379f5f89bf72955ed3bf5c1c31a40b8a1472",
-      "url": "https://github.com/nanotee/sqls.nvim/archive/a514379f5f89bf72955ed3bf5c1c31a40b8a1472.tar.gz",
-      "hash": "0rdhfjzfqhpjimi7b398d8ivfrg3ay084gz92fp0g4sgr3m876x3"
+      "revision": "d1bc5421ef3e8edc5101e37edbb7de6639207a09",
+      "url": "https://github.com/nanotee/sqls.nvim/archive/d1bc5421ef3e8edc5101e37edbb7de6639207a09.tar.gz",
+      "hash": "1j4n5c8h1iriqzsjxr0wvz70g9lf6d4lm3nyxlpwy9dqmbj8w0kd"
     },
     "tabular": {
       "type": "Git",
@@ -2204,9 +2204,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "814f102cd1da3dc78c7d2f20f2ef3ed3cdf0e6e4",
-      "url": "https://github.com/nvim-telescope/telescope.nvim/archive/814f102cd1da3dc78c7d2f20f2ef3ed3cdf0e6e4.tar.gz",
-      "hash": "0lbsq6x5bf7l54x7rkdkh7pa63afsgf0jnm0zf9ig7fw2lh18b8f"
+      "revision": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5",
+      "url": "https://github.com/nvim-telescope/telescope.nvim/archive/a4ed82509cecc56df1c7138920a1aeaf246c0ac5.tar.gz",
+      "hash": "0vc2fr5nhbc39d55zn09fh8zpy4472ic4xmwvmk5dda8fqw76p8q"
     },
     "tiny-devicons-auto-colors-nvim": {
       "type": "Git",
@@ -2295,9 +2295,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "ddcc71126f910ec83037622bc8d506f91a290ade",
-      "url": "https://github.com/chomosuke/typst-preview.nvim/archive/ddcc71126f910ec83037622bc8d506f91a290ade.tar.gz",
-      "hash": "1iqcbpgk87gcgnqd5dv8n4h4hbildp5hbjhnlwjx5zlzcg5qv2my"
+      "revision": "10e6ec6f00365639e383fa8e95a32058dad53b22",
+      "url": "https://github.com/chomosuke/typst-preview.nvim/archive/10e6ec6f00365639e383fa8e95a32058dad53b22.tar.gz",
+      "hash": "1va3yw7iq5170ilfzd0fvpvkbkxn2yqk413j64ymg31aql8amgjc"
     },
     "vim-dirtytalk": {
       "type": "Git",
@@ -2399,9 +2399,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "80d9385dbebe7049fd1961d7909b835a58ce9dcc",
-      "url": "https://github.com/gbprod/yanky.nvim/archive/80d9385dbebe7049fd1961d7909b835a58ce9dcc.tar.gz",
-      "hash": "1lg9nxc01shkazqk5g3j0iskiqbwr9sxv07sqrwkwlh36jn59rcp"
+      "revision": "a21a0b4f593e1fb17b17882f1ab3a3c1b943b831",
+      "url": "https://github.com/gbprod/yanky.nvim/archive/a21a0b4f593e1fb17b17882f1ab3a3c1b943b831.tar.gz",
+      "hash": "1sk3acrwwmx9wfxnfymgvl88bnp0xh8a30pyx040czrj3zl5l920"
     }
   },
   "version": 5

From e7d5e6c4acc3d5ee1f05e776df1a1f235e6b567f Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 29 Mar 2025 19:03:31 +0300
Subject: [PATCH 067/202] blink: 0.14.1 -> 1.0.0

---
 flake/legacyPackages/blink-cmp.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/flake/legacyPackages/blink-cmp.nix b/flake/legacyPackages/blink-cmp.nix
index 477616aa..8d734719 100644
--- a/flake/legacyPackages/blink-cmp.nix
+++ b/flake/legacyPackages/blink-cmp.nix
@@ -1,9 +1,8 @@
 {
   stdenv,
   rustPlatform,
-  hostPlatform,
   vimUtils,
-  git,
+  gitMinimal,
   src,
   version,
 }: let
@@ -17,7 +16,7 @@
     useFetchCargoVendor = true;
     cargoHash = "sha256-F1wh/TjYoiIbDY3J/prVF367MKk3vwM7LqOpRobOs7I=";
 
-    nativeBuildInputs = [git];
+    nativeBuildInputs = [gitMinimal];
   };
 in
   vimUtils.buildVimPlugin {
@@ -34,5 +33,5 @@ in
     '';
 
     # Module for reproducing issues
-    nvimSkipModule = ["repro"];
+    nvimSkipModules = ["repro"];
   }

From f3f818656d95bffab3ce3ba5963242e55fbbeb09 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 29 Mar 2025 19:04:03 +0300
Subject: [PATCH 068/202] ci: update editorconfig check

---
 .github/workflows/check.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index eb2aef34..055f80dd 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -119,7 +119,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh api \
-            repos/notashelf/nvf/pulls/${{github.event.number}}/files --paginate \
+            repos/${{ github.repository }}/pulls/${{ github.event.number }}/files --paginate \
             | jq '.[] | select(.status != "removed") | .filename' \
             > "$HOME/changed_files"
 
@@ -138,9 +138,7 @@ jobs:
       - name: Checking EditorConfig
         shell: bash
         run: |
-          cat "$HOME/changed_files" | nix-shell -p editorconfig-checker.out \
-            --run 'xargs -r editorconfig-checker -disable-indentation -exclude flake.lock --verbose'
-          echo -n "Check status: $?"
+          < "$HOME/changed_files" nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size'
 
       - if: ${{ failure() }}
         shell: bash

From 6914a70e48f4f1003abc0e16967af38804b671b5 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 29 Mar 2025 19:11:50 +0300
Subject: [PATCH 069/202] ci: inline gh API call for Editorconfig check

---
 .github/workflows/check.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 055f80dd..d154756f 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -117,9 +117,9 @@ jobs:
       - name: Get list of changed files from PR
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
         run: |
-          gh api \
-            repos/${{ github.repository }}/pulls/${{ github.event.number }}/files --paginate \
+          gh api repos/${{ github.repository }}/pulls/${{ github.event.number }}/files --paginate \
             | jq '.[] | select(.status != "removed") | .filename' \
             > "$HOME/changed_files"
 

From b9050558a4b8e4211cc935e8fb9a4760e9d9fd3e Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 29 Mar 2025 19:59:50 +0300
Subject: [PATCH 070/202] flake: bump inputs

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4c687864..8780caec 100644
--- a/flake.lock
+++ b/flake.lock
@@ -77,11 +77,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742923925,
-        "narHash": "sha256-biPjLws6FiBVUUDHEMFq5pUQL84Wf7PntPYdo3oKkFw=",
+        "lastModified": 1743076231,
+        "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "25d1b84f5c90632a623c48d83a2faf156451e6b1",
+        "rev": "6c5963357f3c1c840201eda129a99d455074db04",
         "type": "github"
       },
       "original": {

From e133d68ecc7dbd6388a2a84569fff073efb61c26 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 29 Mar 2025 20:03:37 +0300
Subject: [PATCH 071/202] ci: attempt to support non-PR changes

---
 .github/workflows/check.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index d154756f..6987bb48 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -114,28 +114,31 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.pull_request.title, '[skip ci]')"
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2 # slows down checkout, but we need to compare against the previous commit on push events
+
       - name: Get list of changed files from PR
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         shell: bash
         run: |
-          gh api repos/${{ github.repository }}/pulls/${{ github.event.number }}/files --paginate \
-            | jq '.[] | select(.status != "removed") | .filename' \
-            > "$HOME/changed_files"
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            gh api repos/${{ github.repository }}/pulls/${{ github.event.number }}/files --paginate \
+              | jq -r '.[] | select(.status != "removed") | .filename' \
+              > "$HOME/changed_files"
+          else
+            git diff --name-only HEAD^ > "$HOME/changed_files"
 
       - name: Print list of changed files
         run: |
           cat "$HOME/changed_files"
 
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: refs/pull/${{ github.event.pull_request.number }}/merge
-
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
 
-      - name: Checking EditorConfig
+      - name: Checking Editorconfig conformance
         shell: bash
         run: |
           < "$HOME/changed_files" nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size'

From 33b4d9da44491003cf5f1fc060aaca7034914fd6 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 29 Mar 2025 20:04:40 +0300
Subject: [PATCH 072/202] statusline/lualine: rewrite LSP client component

---
 .../plugins/statusline/lualine/lualine.nix    | 35 +++++++------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/modules/plugins/statusline/lualine/lualine.nix b/modules/plugins/statusline/lualine/lualine.nix
index bf070db7..4e69c852 100644
--- a/modules/plugins/statusline/lualine/lualine.nix
+++ b/modules/plugins/statusline/lualine/lualine.nix
@@ -239,35 +239,26 @@ in {
             {
               -- Lsp server name
               function()
-                local buf_ft = vim.api.nvim_get_option_value('filetype', {})
+                local buf_ft = vim.bo.filetype
+                local excluded_buf_ft = { toggleterm = true, NvimTree = true, ["neo-tree"] = true, TelescopePrompt = true }
 
-                -- List of buffer types to exclude
-                local excluded_buf_ft = {"toggleterm", "NvimTree", "neo-tree", "TelescopePrompt"}
-
-                -- Check if the current buffer type is in the excluded list
-                for _, excluded_type in ipairs(excluded_buf_ft) do
-                  if buf_ft == excluded_type then
-                    return ""
+                if excluded_buf_ft[buf_ft] then
+                  return ""
                   end
+
+                local bufnr = vim.api.nvim_get_current_buf()
+                local clients = vim.lsp.get_clients({ bufnr = bufnr })
+
+                if vim.tbl_isempty(clients) then
+                  return "No Active LSP"
                 end
 
-                -- Get the name of the LSP server active in the current buffer
-                local clients = vim.lsp.get_active_clients()
-                local msg = 'No Active Lsp'
-
-                -- if no lsp client is attached then return the msg
-                if next(clients) == nil then
-                  return msg
-                end
-
+                local active_clients = {}
                 for _, client in ipairs(clients) do
-                  local filetypes = client.config.filetypes
-                  if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then
-                    return client.name
-                  end
+                  table.insert(active_clients, client.name)
                 end
 
-                return msg
+                return table.concat(active_clients, ", ")
               end,
               icon = ' ',
               separator = {left = ''},

From 736c323c598d77a54585e2327e2e4ad6af864549 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 29 Mar 2025 20:11:47 +0300
Subject: [PATCH 073/202] ci: fix bash syntax

---
 .github/workflows/check.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 6987bb48..a349cb07 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -130,6 +130,7 @@ jobs:
               > "$HOME/changed_files"
           else
             git diff --name-only HEAD^ > "$HOME/changed_files"
+          fi
 
       - name: Print list of changed files
         run: |

From 701dd911ebcec53389db8cbdf64ce8c08d24523c Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 29 Mar 2025 20:57:05 +0300
Subject: [PATCH 074/202] docs: mention android support

---
 .github/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/README.md b/.github/README.md
index a6ef7a44..3fc7ffdf 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -200,8 +200,9 @@ fix.
 **Q**: What platforms are supported?
 
 **A**: nvf actively supports **Linux and Darwin** platforms using standalone
-Nix, NixOS or Home-Manager. Please take a look at the [nvf manual] for available
-installation instructions.
+Nix, NixOS or Home-Manager. It has been reported that **Android** is also
+supported through the Home-Manager module, or using standalone package. Please
+take a look at the [nvf manual] for available installation instructions.
 
 **Q**: Can you add _X_?
 

From fce24ec604487268875844bb6fb911bb66464d96 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 29 Mar 2025 21:06:11 +0300
Subject: [PATCH 075/202] utility/oil-nvim: init

---
 docs/release-notes/rl-0.8.md                  |  4 ++++
 modules/plugins/utility/default.nix           |  1 +
 modules/plugins/utility/oil-nvim/config.nix   | 20 +++++++++++++++++++
 modules/plugins/utility/oil-nvim/default.nix  |  6 ++++++
 modules/plugins/utility/oil-nvim/oil-nvim.nix | 12 +++++++++++
 npins/sources.json                            | 13 ++++++++++++
 6 files changed, 56 insertions(+)
 create mode 100644 modules/plugins/utility/oil-nvim/config.nix
 create mode 100644 modules/plugins/utility/oil-nvim/default.nix
 create mode 100644 modules/plugins/utility/oil-nvim/oil-nvim.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index fe3e3166..7b9b20ca 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -26,6 +26,7 @@
 [yanky.nvim]: https://github.com/gbprod/yanky.nvim
 [yazi.nvim]: https://github.com/mikavilpas/yazi.nvim
 [snacks.nvim]: https://github.com/folke/snacks.nvim
+[oil.nvim]: https://github.com/stevearc/oil.nvim
 
 - Add [typst-preview.nvim] under
   `languages.typst.extensions.typst-preview-nvim`.
@@ -83,6 +84,9 @@
 
 - Lazyload Lspsaga and remove default keybindings for it.
 
+- Add [oil.nvim] as an alternative file explorer. It will be available under
+  `vim.utility.oil-nvim`.
+
 [amadaluzia](https://github.com/amadaluzia):
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix
index cbe776cc..62b07574 100644
--- a/modules/plugins/utility/default.nix
+++ b/modules/plugins/utility/default.nix
@@ -15,6 +15,7 @@
     ./multicursors
     ./new-file-template
     ./nix-develop
+    ./oil-nvim
     ./outline
     ./preview
     ./snacks-nvim
diff --git a/modules/plugins/utility/oil-nvim/config.nix b/modules/plugins/utility/oil-nvim/config.nix
new file mode 100644
index 00000000..46f49112
--- /dev/null
+++ b/modules/plugins/utility/oil-nvim/config.nix
@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.lua) toLuaObject;
+  inherit (lib.nvim.dag) entryAnywhere;
+
+  cfg = config.vim.utility.oil-nvim;
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      startPlugins = ["oil-nvim"];
+      pluginRC.snacks-nvim = entryAnywhere ''
+        require("oil").setup(${toLuaObject cfg.setupOpts});
+      '';
+    };
+  };
+}
diff --git a/modules/plugins/utility/oil-nvim/default.nix b/modules/plugins/utility/oil-nvim/default.nix
new file mode 100644
index 00000000..1b771b07
--- /dev/null
+++ b/modules/plugins/utility/oil-nvim/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./config.nix
+    ./oil-nvim.nix
+  ];
+}
diff --git a/modules/plugins/utility/oil-nvim/oil-nvim.nix b/modules/plugins/utility/oil-nvim/oil-nvim.nix
new file mode 100644
index 00000000..557f3db6
--- /dev/null
+++ b/modules/plugins/utility/oil-nvim/oil-nvim.nix
@@ -0,0 +1,12 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.utility.oil-nvim = {
+    enable = mkEnableOption ''
+      Neovim file explorer: edit your filesystem like a buffer [oil-nvim]
+    '';
+
+    setupOpts = mkPluginSetupOption "oil-nvim" {};
+  };
+}
diff --git a/npins/sources.json b/npins/sources.json
index f9091f20..a1388f6f 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -1919,6 +1919,19 @@
       "url": "https://github.com/epwalsh/obsidian.nvim/archive/14e0427bef6c55da0d63f9a313fd9941be3a2479.tar.gz",
       "hash": "15ycmhn48ryaqzch6w3w6llq2qgmjx8xwkb9dn0075z60dybpflr"
     },
+    "oil-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "stevearc",
+        "repo": "oil.nvim"
+      },
+      "branch": "master",
+      "submodules": false,
+      "revision": "ab887d926c2665a708fbe9e6c4654042cc5f4c60",
+      "url": "https://github.com/stevearc/oil.nvim/archive/ab887d926c2665a708fbe9e6c4654042cc5f4c60.tar.gz",
+      "hash": "13jp8i11yhl9xjki3pcyr1q1gzskskm2fgb3slrwfphn586jb5i6"
+    },
     "omnisharp-extended-lsp-nvim": {
       "type": "Git",
       "repository": {

From 5d2d249a4676114aa57f49e1759209355b869a8d Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 29 Mar 2025 20:50:14 +0300
Subject: [PATCH 076/202] lsp/null-ls: convert to new setupOpts format; get rid
 of prelude DAG

---
 modules/plugins/lsp/null-ls/config.nix  | 40 +++-------
 modules/plugins/lsp/null-ls/null-ls.nix | 99 +++++++++++++++++++------
 2 files changed, 85 insertions(+), 54 deletions(-)

diff --git a/modules/plugins/lsp/null-ls/config.nix b/modules/plugins/lsp/null-ls/config.nix
index 549ef0b7..eb06870f 100644
--- a/modules/plugins/lsp/null-ls/config.nix
+++ b/modules/plugins/lsp/null-ls/config.nix
@@ -4,13 +4,12 @@
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.attrsets) mapAttrs;
-  inherit (lib.trivial) boolToString;
-  inherit (lib.nvim.dag) entryAnywhere entryAfter entryBetween;
+  inherit (lib.nvim.lua) toLuaObject;
+  inherit (lib.nvim.dag) entryAfter;
 
-  cfg = config.vim.lsp;
+  cfg = config.vim.lsp.null-ls;
 in {
-  config = mkIf cfg.null-ls.enable (mkMerge [
+  config = mkIf cfg.enable (mkMerge [
     {
       vim = {
         startPlugins = [
@@ -18,35 +17,14 @@ in {
           "plenary-nvim"
         ];
 
-        # null-ls implies LSP already being set up
-        # since it will hook into LSPs to receive information
+        # null-ls implies that LSP is already being set up
+        # as it will hook into LSPs to receive information.
         lsp.enable = true;
 
-        pluginRC = {
-          # early setup for null-ls
-          null_ls-setup = entryAnywhere ''
-            local null_ls = require("null-ls")
-            local null_helpers = require("null-ls.helpers")
-            local null_methods = require("null-ls.methods")
-            local ls_sources = {}
-          '';
-
-          # null-ls setup
-          null_ls = entryAfter ["null_ls-setup" "lsp-setup"] ''
-            require('null-ls').setup({
-              debug = ${boolToString cfg.null-ls.debug},
-              diagnostics_format = "${cfg.null-ls.diagnostics_format}",
-              debounce = ${toString cfg.null-ls.debounce},
-              default_timeout = ${toString cfg.null-ls.default_timeout},
-              sources = ls_sources,
-              on_attach = default_on_attach
-            })
-          '';
-        };
+        pluginRC.null_ls = entryAfter ["lsp-setup"] ''
+          require('null-ls').setup(${toLuaObject cfg.setupOpts})
+        '';
       };
     }
-    {
-      vim.pluginRC = mapAttrs (_: v: (entryBetween ["null_ls"] ["null_ls-setup"] v)) cfg.null-ls.sources;
-    }
   ]);
 }
diff --git a/modules/plugins/lsp/null-ls/null-ls.nix b/modules/plugins/lsp/null-ls/null-ls.nix
index 37305540..3a10bac7 100644
--- a/modules/plugins/lsp/null-ls/null-ls.nix
+++ b/modules/plugins/lsp/null-ls/null-ls.nix
@@ -1,34 +1,87 @@
 {lib, ...}: let
-  inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.types) attrsOf str int;
+  inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.types) attrsOf str int nullOr;
+  inherit (lib.generators) mkLuaInline;
+  inherit (lib.nvim.types) luaInline mkPluginSetupOption;
+  inherit (lib.nvim.config) batchRenameOptions;
+
+  migrationTable = {
+    debug = "debug";
+    diagnostics_format = "diagnostics_format";
+    debounce = "debounce";
+    default_timeout = "default_timeout";
+    sources = "sources";
+  };
+
+  renamedSetupOpts =
+    batchRenameOptions
+    ["vim" "lsp" "null-ls"]
+    ["vim" "lsp" "null-ls" "setupOpts"]
+    migrationTable;
 in {
+  imports = renamedSetupOpts;
+
   options.vim.lsp.null-ls = {
-    enable = mkEnableOption "null-ls, also enabled automatically";
+    enable = mkEnableOption ''
+      null-ls, plugin to use Neovim as a language server to inject LSP diagnostics,
+      code actions, and more via Lua.
+    '';
 
-    debug = mkEnableOption "debugging information for `null-ls";
+    setupOpts = mkPluginSetupOption "null-ls" {
+      debug = mkEnableOption ''
+        debugging information for null-ls.
 
-    diagnostics_format = mkOption {
-      type = str;
-      default = "[#{m}] #{s} (#{c})";
-      description = "Diagnostic output format for null-ls";
-    };
+        Displays all possible log messages and writes them to the null-ls log,
+        which you can view with the command `:NullLsLog`
+      '';
 
-    debounce = mkOption {
-      type = int;
-      default = 250;
-      description = "Default debounce";
-    };
+      diagnostics_format = mkOption {
+        type = str;
+        default = "[#{m}] #{s} (#{c})";
+        description = ''
+          Sets the default format used for diagnostics. null-ls will replace th
+          e following special components with the relevant diagnostic information:
 
-    default_timeout = mkOption {
-      type = int;
-      default = 5000;
-      description = "Default timeout value, in milliseconds";
-    };
+          * `#{m}`: message
+          * `#{s}`: source name (defaults to null-ls if not specified)
+          * `#{c}`: code (if available)
+        '';
+      };
 
-    sources = mkOption {
-      description = "null-ls sources";
-      type = attrsOf str;
-      default = {};
+      debounce = mkOption {
+        type = int;
+        default = 250;
+        description = ''
+          Amount of time between the last change to a buffer and the next `textDocument/didChange` notification.
+        '';
+      };
+
+      default_timeout = mkOption {
+        type = int;
+        default = 5000;
+        description = ''
+          Amount of time (in milliseconds) after which built-in sources will time out.
+
+          :::{.note}
+          Built-in sources can define their own timeout period and users can override
+          the timeout period on a per-source basis
+          :::
+        '';
+      };
+
+      sources = mkOption {
+        type = nullOr (attrsOf luaInline);
+        default = null;
+        description = "Sources for null-ls to register";
+      };
+
+      on_attach = mkOption {
+        type = nullOr luaInline;
+        default = mkLuaInline "on_attach";
+        description = ''
+          Defines an on_attach callback to run whenever null-ls attaches to a buffer.
+        '';
+      };
     };
   };
 }

From 43b99474e69458a6f6446a74992a7424cdc47e7a Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 29 Mar 2025 20:50:34 +0300
Subject: [PATCH 077/202] git/gitsigns: switch to new null-ls sources API

---
 modules/plugins/git/gitsigns/config.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/plugins/git/gitsigns/config.nix b/modules/plugins/git/gitsigns/config.nix
index 9aee73b7..99927546 100644
--- a/modules/plugins/git/gitsigns/config.nix
+++ b/modules/plugins/git/gitsigns/config.nix
@@ -5,6 +5,7 @@
 }: let
   inherit (builtins) toJSON;
   inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.binds) addDescriptionsToMappings mkSetExprBinding mkSetLuaBinding pushDownDefault;
   inherit (lib.nvim.dag) entryAnywhere;
   inherit (lib.nvim.lua) toLuaObject;
@@ -32,6 +33,7 @@ in {
                 return '<Ignore>'
               end
             '')
+
             (mkSetExprBinding gsMappings.previousHunk ''
               function()
                 if vim.wo.diff then return ${toJSON gsMappings.previousHunk.value} end
@@ -77,13 +79,12 @@ in {
     }
 
     (mkIf cfg.codeActions.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.gitsigns-ca = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.code_actions.gitsigns
-        )
-      '';
+      vim.lsp.null-ls = {
+        enable = true;
+        setupOpts.sources.gitsigns-ca = mkLuaInline ''
+          require("null-ls").builtins.code_actions.gitsigns
+        '';
+      };
     })
   ]);
 }

From 722014ca3f28046e81a0858df628ed6e369e6881 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 30 Mar 2025 05:08:01 +0300
Subject: [PATCH 078/202] visuals/nvim-scrollbar: add fastaction popups to
 ignored fts

---
 modules/plugins/visuals/nvim-scrollbar/config.nix         | 3 +--
 modules/plugins/visuals/nvim-scrollbar/scrollbar-nvim.nix | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/plugins/visuals/nvim-scrollbar/config.nix b/modules/plugins/visuals/nvim-scrollbar/config.nix
index 1d0ebc76..ce00d699 100644
--- a/modules/plugins/visuals/nvim-scrollbar/config.nix
+++ b/modules/plugins/visuals/nvim-scrollbar/config.nix
@@ -12,8 +12,7 @@ in {
   config = mkIf cfg.enable {
     vim = {
       startPlugins = ["nvim-scrollbar"];
-
-      pluginRC.cursorline = entryAnywhere ''
+      pluginRC.nvim-scrollbar = entryAnywhere ''
         require("scrollbar").setup(${toLuaObject cfg.setupOpts})
       '';
     };
diff --git a/modules/plugins/visuals/nvim-scrollbar/scrollbar-nvim.nix b/modules/plugins/visuals/nvim-scrollbar/scrollbar-nvim.nix
index bdf48cb4..5a3f3084 100644
--- a/modules/plugins/visuals/nvim-scrollbar/scrollbar-nvim.nix
+++ b/modules/plugins/visuals/nvim-scrollbar/scrollbar-nvim.nix
@@ -13,7 +13,7 @@ in {
     setupOpts = mkPluginSetupOption "scrollbar-nvim" {
       excluded_filetypes = mkOption {
         type = listOf str;
-        default = ["prompt" "TelescopePrompt" "noice" "noice" "NvimTree" "neo-tree" "alpha" "notify" "Navbuddy"];
+        default = ["prompt" "TelescopePrompt" "noice" "NvimTree" "neo-tree" "alpha" "notify" "Navbuddy" "fastaction_popup"];
         description = "Filetypes to hide the scrollbar on";
       };
     };

From 88d5a499d06eaf0602f72eec83214826f131bcbc Mon Sep 17 00:00:00 2001
From: alfarel <alfarelcynthesis@proton.me>
Date: Fri, 28 Mar 2025 11:04:20 -0400
Subject: [PATCH 079/202] fix(formatter/conform-nvim): allow disabling format
 on/after save

---
 docs/release-notes/rl-0.8.md                            | 5 ++++-
 modules/plugins/formatter/conform-nvim/conform-nvim.nix | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index fe3e3166..5d0e1dbe 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -235,8 +235,9 @@
 
 [alfarel](https://github.com/alfarelcynthesis):
 
-- Add missing `yazi.nvim` dependency (`snacks.nvim`).
+[conform.nvim]: https://github.com/stevearc/conform.nvim
 
+- Add missing `yazi.nvim` dependency (`snacks.nvim`).
 - Add [mkdir.nvim](https://github.com/jghauser/mkdir.nvim) plugin for automatic
   creation of parent directories when editing a nested file.
 - Add [nix-develop.nvim](https://github.com/figsoda/nix-develop.nvim) plugin for
@@ -248,6 +249,8 @@
   [friendly-snippets](https://github.com/rafamadriz/friendly-snippets) so
   blink.cmp can source snippets from it.
 - Fix [blink.cmp] breaking when built-in sources were modified.
+- Fix [conform.nvim] not allowing disabling formatting on and after save.
+  Use `null` value to disable them if conform is enabled.
 
 [TheColorman](https://github.com/TheColorman):
 
diff --git a/modules/plugins/formatter/conform-nvim/conform-nvim.nix b/modules/plugins/formatter/conform-nvim/conform-nvim.nix
index 423a4f44..727985a3 100644
--- a/modules/plugins/formatter/conform-nvim/conform-nvim.nix
+++ b/modules/plugins/formatter/conform-nvim/conform-nvim.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib.options) mkOption mkEnableOption literalExpression;
-  inherit (lib.types) attrs enum;
+  inherit (lib.types) attrs enum nullOr;
   inherit (lib.nvim.types) mkPluginSetupOption;
   inherit (lib.nvim.lua) mkLuaInline;
 in {
@@ -31,7 +31,7 @@ in {
       };
 
       format_on_save = mkOption {
-        type = attrs;
+        type = nullOr attrs;
         default = {
           lsp_format = "fallback";
           timeout_ms = 500;
@@ -43,7 +43,7 @@ in {
       };
 
       format_after_save = mkOption {
-        type = attrs;
+        type = nullOr attrs;
         default = {lsp_format = "fallback";};
         description = ''
           Table that will be passed to `conform.format()`. If this

From d33286d5495a4b0869e8cb8e25fc8e0778060eb8 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 31 Mar 2025 03:22:25 +0300
Subject: [PATCH 080/202] diagnostics/nvim-lint: enable autocmd only if
 nvim-lint is enabled

---
 modules/plugins/diagnostics/nvim-lint/config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/diagnostics/nvim-lint/config.nix b/modules/plugins/diagnostics/nvim-lint/config.nix
index cf9c45e2..b284270b 100644
--- a/modules/plugins/diagnostics/nvim-lint/config.nix
+++ b/modules/plugins/diagnostics/nvim-lint/config.nix
@@ -31,7 +31,7 @@ in {
         '';
       };
     })
-    (mkIf cfg.lint_after_save {
+    (mkIf (cfg.enable && cfg.lint_after_save) {
       vim = {
         augroups = [{name = "nvf_nvim_lint";}];
         autocmds = [

From fa7fb83315e379206ec62bd0bdd4891784cc48cf Mon Sep 17 00:00:00 2001
From: tebuevd <3241533+tebuevd@users.noreply.github.com>
Date: Sun, 30 Mar 2025 20:04:48 -0700
Subject: [PATCH 081/202] Merge pull request #760 from
 tebuevd/fix-telescope-pickers-config

telescope: correctly nest pickers under setupOpts
---
 docs/release-notes/rl-0.8.md                    |  8 ++++++++
 modules/plugins/utility/telescope/telescope.nix | 11 ++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 5d0e1dbe..dc4a6fe8 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -283,3 +283,11 @@
 [Sc3l3t0n](https://github.com/Sc3l3t0n):
 
 - Add F# support under `vim.languages.fsharp`.
+
+[tebuevd](https://github.com/tebuevd):
+
+- Fix `pickers` configuration for `telescope` by nesting it under `setupOpts`
+- Fix `find_command` configuration for `telescope` by nesting it under
+  `setupOpts.pickers.find_files`
+- Update default `telescope.setupOpts.pickers.find_files.find_command` to only
+  include files (and therefore exclude directories from results)
diff --git a/modules/plugins/utility/telescope/telescope.nix b/modules/plugins/utility/telescope/telescope.nix
index 0665eb11..beacc990 100644
--- a/modules/plugins/utility/telescope/telescope.nix
+++ b/modules/plugins/utility/telescope/telescope.nix
@@ -8,6 +8,12 @@
   inherit (lib.nvim.binds) mkMappingOption;
   inherit (lib.nvim.types) mkPluginSetupOption luaInline;
   setupOptions = {
+    pickers.find_files.find_command = mkOption {
+      description = "cmd to use for finding files";
+      type = either (listOf str) luaInline;
+      default = ["${pkgs.fd}/bin/fd" "--type=file"];
+    };
+
     defaults = {
       vimgrep_arguments = mkOption {
         description = ''
@@ -27,11 +33,6 @@
           "--no-ignore"
         ];
       };
-      pickers.find_command = mkOption {
-        description = "cmd to use for finding files";
-        type = either (listOf str) luaInline;
-        default = ["${pkgs.fd}/bin/fd"];
-      };
       prompt_prefix = mkOption {
         description = "Shown in front of Telescope's prompt";
         type = str;

From b92d9e7e2638be558a466c6dfcc2d3e08b82e894 Mon Sep 17 00:00:00 2001
From: Venkatesan Ravi <venkyrocker7777@gmail.com>
Date: Sun, 30 Mar 2025 20:07:18 -0700
Subject: [PATCH 082/202] languages/lua: add luacheck and stylua support (#763)

* Add lint(luacheck), format(stylua) support for lua

* fix comments for PR#763

* Update rl-0.8.md

---------

Co-authored-by: raf <raf@notashelf.dev>
---
 docs/release-notes/rl-0.8.md      |  4 ++
 modules/plugins/languages/lua.nix | 67 ++++++++++++++++++++++++++++++-
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index dc4a6fe8..8e3d93e0 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -284,6 +284,10 @@
 
 - Add F# support under `vim.languages.fsharp`.
 
+[venkyr77](https://github.com/venkyr77):
+
+- Add lint (luacheck) and formatting (stylua) support for Lua.
+
 [tebuevd](https://github.com/tebuevd):
 
 - Fix `pickers` configuration for `telescope` by nesting it under `setupOpts`
diff --git a/modules/plugins/languages/lua.nix b/modules/plugins/languages/lua.nix
index 4ad49784..d5be4905 100644
--- a/modules/plugins/languages/lua.nix
+++ b/modules/plugins/languages/lua.nix
@@ -4,16 +4,30 @@
   lib,
   ...
 }: let
+  inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
   inherit (lib.lists) isList;
-  inherit (lib.types) either listOf package str;
-  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.types) bool either enum listOf package str;
+  inherit (lib.nvim.types) diagnostics mkGrammarOption;
   inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.dag) entryBefore;
 
   cfg = config.vim.languages.lua;
+  defaultFormat = "stylua";
+  formats = {
+    stylua = {
+      package = pkgs.stylua;
+    };
+  };
+
+  defaultDiagnosticsProvider = ["luacheck"];
+  diagnosticsProviders = {
+    luacheck = {
+      package = pkgs.luajitPackages.luacheck;
+    };
+  };
 in {
   imports = [
     (lib.mkRemovedOptionModule ["vim" "languages" "lua" "lsp" "neodev"] ''
@@ -39,6 +53,34 @@ in {
 
       lazydev.enable = mkEnableOption "lazydev.nvim integration, useful for neovim plugin developers";
     };
+
+    format = {
+      enable = mkOption {
+        type = bool;
+        default = config.vim.languages.enableFormat;
+        description = "Enable Lua formatting";
+      };
+      type = mkOption {
+        type = enum (attrNames formats);
+        default = defaultFormat;
+        description = "Lua formatter to use";
+      };
+
+      package = mkOption {
+        type = package;
+        default = formats.${cfg.format.type}.package;
+        description = "Lua formatter package";
+      };
+    };
+
+    extraDiagnostics = {
+      enable = mkEnableOption "extra Lua diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;};
+      types = diagnostics {
+        langDesc = "Lua";
+        inherit diagnosticsProviders;
+        inherit defaultDiagnosticsProvider;
+      };
+    };
   };
 
   config = mkMerge [
@@ -74,6 +116,27 @@ in {
           })
         '';
       })
+
+      (mkIf cfg.format.enable {
+        vim.formatter.conform-nvim = {
+          enable = true;
+          setupOpts.formatters_by_ft.lua = [cfg.format.type];
+          setupOpts.formatters.${cfg.format.type} = {
+            command = getExe cfg.format.package;
+          };
+        };
+      })
+
+      (mkIf cfg.extraDiagnostics.enable {
+        vim.diagnostics.nvim-lint = {
+          enable = true;
+          linters_by_ft.lua = cfg.extraDiagnostics.types;
+          linters = mkMerge (map (name: {
+              ${name}.cmd = getExe diagnosticsProviders.${name}.package;
+            })
+            cfg.extraDiagnostics.types);
+        };
+      })
     ]))
   ];
 }

From ed20d9d1bb940a70aef7ecf3654dd9dc1b5bd06f Mon Sep 17 00:00:00 2001
From: Venkatesan Ravi <venkyrocker7777@gmail.com>
Date: Mon, 31 Mar 2025 12:15:02 -0700
Subject: [PATCH 083/202] languages/markdown: add markdownlint-cli2 support
 (#767)

---
 docs/release-notes/rl-0.8.md           |  1 +
 modules/plugins/languages/markdown.nix | 28 +++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 8e3d93e0..1d3e0491 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -287,6 +287,7 @@
 [venkyr77](https://github.com/venkyr77):
 
 - Add lint (luacheck) and formatting (stylua) support for Lua.
+- Add lint (markdownlint-cli2) support for Markdown.
 
 [tebuevd](https://github.com/tebuevd):
 
diff --git a/modules/plugins/languages/markdown.nix b/modules/plugins/languages/markdown.nix
index 6767a9cf..2447aba0 100644
--- a/modules/plugins/languages/markdown.nix
+++ b/modules/plugins/languages/markdown.nix
@@ -11,7 +11,7 @@
   inherit (lib.lists) isList;
   inherit (lib.types) bool enum either package listOf str;
   inherit (lib.nvim.lua) expToLua toLuaObject;
-  inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
+  inherit (lib.nvim.types) diagnostics mkGrammarOption mkPluginSetupOption;
   inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.languages.markdown;
@@ -46,6 +46,12 @@
       package = pkgs.prettierd;
     };
   };
+  defaultDiagnosticsProvider = ["markdownlint-cli2"];
+  diagnosticsProviders = {
+    markdownlint-cli2 = {
+      package = pkgs.markdownlint-cli2;
+    };
+  };
 in {
   options.vim.languages.markdown = {
     enable = mkEnableOption "Markdown markup language support";
@@ -121,6 +127,15 @@ in {
         };
       };
     };
+
+    extraDiagnostics = {
+      enable = mkEnableOption "extra Markdown diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;};
+      types = diagnostics {
+        langDesc = "Markdown";
+        inherit diagnosticsProviders;
+        inherit defaultDiagnosticsProvider;
+      };
+    };
   };
 
   config = mkIf cfg.enable (mkMerge [
@@ -155,5 +170,16 @@ in {
         require("render-markdown").setup(${toLuaObject cfg.extensions.render-markdown-nvim.setupOpts})
       '';
     })
+
+    (mkIf cfg.extraDiagnostics.enable {
+      vim.diagnostics.nvim-lint = {
+        enable = true;
+        linters_by_ft.markdown = cfg.extraDiagnostics.types;
+        linters = mkMerge (map (name: {
+            ${name}.cmd = getExe diagnosticsProviders.${name}.package;
+          })
+          cfg.extraDiagnostics.types);
+      };
+    })
   ]);
 }

From 13b2f7a96d8395ccd399aad04dde23b0ae1edf43 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 1 Apr 2025 11:16:28 +0300
Subject: [PATCH 084/202] wrapper/build: disable checks in
 flutter-tools-patched

---
 modules/wrapper/build/config.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix
index 3c778169..3b147571 100644
--- a/modules/wrapper/build/config.nix
+++ b/modules/wrapper/build/config.nix
@@ -48,16 +48,9 @@
       patches = [./patches/flutter-tools.patch];
 
       # Disable failing require check hook checks
-      nvimSkipModule = [
-        "flutter-tools.devices"
-        "flutter-tools.dap"
-        "flutter-tools.runners.job_runner"
-        "flutter-tools.decorations"
-        "flutter-tools.commands"
-        "flutter-tools.executable"
-        "flutter-tools.dev_tools"
-      ];
+      doCheck = false;
     };
+
     inherit (inputs.self.legacyPackages.${pkgs.stdenv.system}) blink-cmp;
   };
 

From 92ae676e54e63c04a3179b8d672b3b257213fc07 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Mon, 31 Mar 2025 22:49:10 +0200
Subject: [PATCH 085/202] blink: remove ineffectful default transform_items

blink no longer deprioritize snippets
---
 modules/plugins/completion/blink-cmp/blink-cmp.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/modules/plugins/completion/blink-cmp/blink-cmp.nix b/modules/plugins/completion/blink-cmp/blink-cmp.nix
index f5e38ed1..65b88815 100644
--- a/modules/plugins/completion/blink-cmp/blink-cmp.nix
+++ b/modules/plugins/completion/blink-cmp/blink-cmp.nix
@@ -43,19 +43,6 @@ in {
           default = {};
           description = "Settings for completion providers.";
         };
-
-        transform_items = mkOption {
-          type = nullOr luaInline;
-          default = mkLuaInline "function(_, items) return items end";
-          defaultText = ''
-            Our default does nothing. If you want blink.cmp's default, which
-            lowers the score for snippets, set this option to null.
-          '';
-          description = ''
-            Function to use when transforming the items before they're returned
-            for all providers.
-          '';
-        };
       };
 
       cmdline = {

From 6ab36bbd1c7c92fa5bcab600f7cc7b4b99f57b96 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 2 Apr 2025 02:59:11 +0300
Subject: [PATCH 086/202] pins: bump render-markdown.nvim

---
 npins/sources.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/npins/sources.json b/npins/sources.json
index a1388f6f..74dc20c8 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -2097,9 +2097,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "a1fc4e559252baa128c471adadf0be045abd542d",
-      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/a1fc4e559252baa128c471adadf0be045abd542d.tar.gz",
-      "hash": "0n9zis5jf7khjdmc622g40is5yjsqkxph64mldpd3q8ka64yaib1"
+      "revision": "6b66c32364cd3e6101d37fd71ba4c6fbb2eddfda",
+      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/6b66c32364cd3e6101d37fd71ba4c6fbb2eddfda.tar.gz",
+      "hash": "0hlsxh1bjfmzb4vh87631nbi0xl1svs9qdkb3id6ybks8n4qb9jw"
     },
     "rose-pine": {
       "type": "Git",

From ae23c34be1e358f28b9cb54f304bcf4cb9ae28f8 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 2 Apr 2025 02:59:33 +0300
Subject: [PATCH 087/202] languages/markdown: remove invalid key from
 render-markdown setupOpts

---
 modules/plugins/languages/markdown.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules/plugins/languages/markdown.nix b/modules/plugins/languages/markdown.nix
index 2447aba0..62081549 100644
--- a/modules/plugins/languages/markdown.nix
+++ b/modules/plugins/languages/markdown.nix
@@ -114,17 +114,10 @@ in {
               [render-markdown.nvim]: https://github.com/MeanderingProgrammer/render-markdown.nvim
 
               Inline Markdown rendering with [render-markdown.nvim]
-
             '';
           };
 
-        setupOpts = mkPluginSetupOption "render-markdown" {
-          auto_override_publish_diagnostics = mkOption {
-            description = "Automatically override the publish_diagnostics handler";
-            type = bool;
-            default = true;
-          };
-        };
+        setupOpts = mkPluginSetupOption "render-markdown" {};
       };
     };
 

From 3ae4b3158acb66adade0b699a3afdb86c9e46929 Mon Sep 17 00:00:00 2001
From: Christoph Koehler <christoph@zerodeviation.net>
Date: Wed, 2 Apr 2025 08:54:00 -0600
Subject: [PATCH 088/202] fix: don't reference snacks in oil config

---
 docs/release-notes/rl-0.8.md                | 4 ++++
 modules/plugins/utility/oil-nvim/config.nix | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 9adcddee..a3387fd6 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -300,3 +300,7 @@
   `setupOpts.pickers.find_files`
 - Update default `telescope.setupOpts.pickers.find_files.find_command` to only
   include files (and therefore exclude directories from results)
+
+  [ckoehler](https://github.com/ckoehler):
+
+  - Fix oil config referencing snacks
diff --git a/modules/plugins/utility/oil-nvim/config.nix b/modules/plugins/utility/oil-nvim/config.nix
index 46f49112..dca4de60 100644
--- a/modules/plugins/utility/oil-nvim/config.nix
+++ b/modules/plugins/utility/oil-nvim/config.nix
@@ -12,7 +12,7 @@ in {
   config = mkIf cfg.enable {
     vim = {
       startPlugins = ["oil-nvim"];
-      pluginRC.snacks-nvim = entryAnywhere ''
+      pluginRC.oil-nvim = entryAnywhere ''
         require("oil").setup(${toLuaObject cfg.setupOpts});
       '';
     };

From 514d4da2d3ff56b591d19f5a8c3f0d3210eea879 Mon Sep 17 00:00:00 2001
From: Christoph Koehler <christoph@zerodeviation.net>
Date: Tue, 1 Apr 2025 19:08:46 -0600
Subject: [PATCH 089/202] feat: add flash.nvim

A motion plugin, from Folke. https://github.com/folke/flash.nvim
---
 docs/release-notes/rl-0.8.md                  |  7 +++-
 modules/plugins/utility/motion/default.nix    |  1 +
 .../plugins/utility/motion/flash/config.nix   | 34 +++++++++++++++++
 .../plugins/utility/motion/flash/default.nix  |  6 +++
 .../plugins/utility/motion/flash/flash.nix    | 38 +++++++++++++++++++
 npins/sources.json                            | 13 +++++++
 6 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 modules/plugins/utility/motion/flash/config.nix
 create mode 100644 modules/plugins/utility/motion/flash/default.nix
 create mode 100644 modules/plugins/utility/motion/flash/flash.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index a3387fd6..368df9f5 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -301,6 +301,9 @@
 - Update default `telescope.setupOpts.pickers.find_files.find_command` to only
   include files (and therefore exclude directories from results)
 
-  [ckoehler](https://github.com/ckoehler):
+[ckoehler](https://github.com/ckoehler):
 
-  - Fix oil config referencing snacks
+[flash.nvim]: https://github.com/folke/flash.nvim
+
+- Fix oil config referencing snacks
+- Add [flash.nvim] plugin to `vim.utility.motion.flash-nvim`
diff --git a/modules/plugins/utility/motion/default.nix b/modules/plugins/utility/motion/default.nix
index 838fec78..10074939 100644
--- a/modules/plugins/utility/motion/default.nix
+++ b/modules/plugins/utility/motion/default.nix
@@ -1,5 +1,6 @@
 _: {
   imports = [
+    ./flash
     ./hop
     ./leap
     ./precognition
diff --git a/modules/plugins/utility/motion/flash/config.nix b/modules/plugins/utility/motion/flash/config.nix
new file mode 100644
index 00000000..3adf0de8
--- /dev/null
+++ b/modules/plugins/utility/motion/flash/config.nix
@@ -0,0 +1,34 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.binds) mkKeymap;
+  inherit (lib.nvim.lua) toLuaObject;
+  inherit (lib.nvim.dag) entryAnywhere;
+
+  cfg = config.vim.utility.motion.flash-nvim;
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      lazy.plugins = {
+        "flash-nvim" = {
+          package = "flash-nvim";
+          setupModule = "flash";
+          setupOpts = cfg.setupOpts;
+
+          lazy = true;
+
+          keys = [
+            (mkKeymap ["n" "o" "x"] cfg.mappings.jump "<cmd>lua require(\"flash\").jump()<cr>" {desc = "Flash";})
+            (mkKeymap ["n" "o" "x"] cfg.mappings.treesitter "<cmd>lua require(\"flash\").treesitter()<cr>" {desc = "Flash Treesitter";})
+            (mkKeymap "o" cfg.mappings.remote "<cmd>lua require(\"flash\").remote()<cr>" {desc = "Remote Flash";})
+            (mkKeymap ["o" "x"] cfg.mappings.treesitter_search "<cmd>lua require(\"flash\").treesitter_search()<cr>" {desc = "Treesitter Search";})
+            (mkKeymap "c" cfg.mappings.toggle "<cmd>lua require(\"flash\").toggle()<cr>" {desc = "Toggle Flash Search";})
+          ];
+        };
+      };
+    };
+  };
+}
diff --git a/modules/plugins/utility/motion/flash/default.nix b/modules/plugins/utility/motion/flash/default.nix
new file mode 100644
index 00000000..5978df25
--- /dev/null
+++ b/modules/plugins/utility/motion/flash/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./flash.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/utility/motion/flash/flash.nix b/modules/plugins/utility/motion/flash/flash.nix
new file mode 100644
index 00000000..825b86a0
--- /dev/null
+++ b/modules/plugins/utility/motion/flash/flash.nix
@@ -0,0 +1,38 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.types) nullOr str;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.utility.motion.flash-nvim = {
+    enable = mkEnableOption "enhanced code navigation with flash.nvim";
+    setupOpts = mkPluginSetupOption "flash-nvim" {};
+
+    mappings = {
+      jump = mkOption {
+        type = nullOr str;
+        default = "s";
+        description = "Jump";
+      };
+      treesitter = mkOption {
+        type = nullOr str;
+        default = "S";
+        description = "Treesitter";
+      };
+      remote = mkOption {
+        type = nullOr str;
+        default = "r";
+        description = "Remote Flash";
+      };
+      treesitter_search = mkOption {
+        type = nullOr str;
+        default = "R";
+        description = "Treesitter Search";
+      };
+      toggle = mkOption {
+        type = nullOr str;
+        default = "<c-s>";
+        description = "Toggle Flash Search";
+      };
+    };
+  };
+}
diff --git a/npins/sources.json b/npins/sources.json
index 74dc20c8..a8573213 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -471,6 +471,19 @@
       "url": "https://github.com/j-hui/fidget.nvim/archive/d9ba6b7bfe29b3119a610892af67602641da778e.tar.gz",
       "hash": "070jadci8x6zgxnsqaldjah1gm1p78wscsb9wpn5wn8mjkyk2m80"
     },
+    "flash-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "folke",
+        "repo": "flash.nvim"
+      },
+      "branch": "main",
+      "submodules": false,
+      "revision": "3c942666f115e2811e959eabbdd361a025db8b63",
+      "url": "https://github.com/folke/flash.nvim/archive/3c942666f115e2811e959eabbdd361a025db8b63.tar.gz",
+      "hash": "1xil2lkyr404zni1qmkwrl9hvbwjjk52fmncg59vqmvdybwsnqni"
+    },
     "flutter-tools-nvim": {
       "type": "Git",
       "repository": {

From b49402bccd27ebbaa93ce924f94a8893dfc46ed8 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 3 Apr 2025 07:36:46 +0300
Subject: [PATCH 090/202] languages/astro: fix syntax issue in inline Lua; add
 prettierd

---
 modules/plugins/languages/astro.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/plugins/languages/astro.nix b/modules/plugins/languages/astro.nix
index e1a56172..9c359a2e 100644
--- a/modules/plugins/languages/astro.nix
+++ b/modules/plugins/languages/astro.nix
@@ -22,7 +22,7 @@
       package = pkgs.astro-language-server;
       lspConfig = ''
         lspconfig.astro.setup {
-          capabilities = capabilities;
+          capabilities = capabilities,
           on_attach = attach_keymaps,
           cmd = ${
           if isList cfg.lsp.package
@@ -41,6 +41,10 @@
       package = pkgs.nodePackages.prettier;
     };
 
+    prettierd = {
+      package = pkgs.prettierd;
+    };
+
     biome = {
       package = pkgs.biome;
     };
@@ -84,16 +88,16 @@ in {
       enable = mkEnableOption "Astro LSP support" // {default = config.vim.languages.enableLSP;};
 
       server = mkOption {
-        description = "Astro LSP server to use";
         type = enum (attrNames servers);
         default = defaultServer;
+        description = "Astro LSP server to use";
       };
 
       package = mkOption {
-        description = "Astro LSP server package, or the command to run as a list of strings";
-        example = ''[lib.getExe pkgs.astro-language-server "--minify" "--stdio"]'';
         type = either package (listOf str);
         default = servers.${cfg.lsp.server}.package;
+        example = ''[lib.getExe pkgs.astro-language-server "--minify" "--stdio"]'';
+        description = "Astro LSP server package, or the command to run as a list of strings";
       };
     };
 

From 95c991e48d668b3ab6fb8719648f4b0f0cc749dd Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 3 Apr 2025 11:05:57 +0300
Subject: [PATCH 091/202] pins: bump all plugins

---
 npins/sources.json | 422 ++++++++++++++++++++++-----------------------
 1 file changed, 211 insertions(+), 211 deletions(-)

diff --git a/npins/sources.json b/npins/sources.json
index a8573213..86fa0f6b 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -9,9 +9,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "9ebc13583cff447f5493a63e99dfca526b3c3088",
-      "url": "https://github.com/stevearc/aerial.nvim/archive/9ebc13583cff447f5493a63e99dfca526b3c3088.tar.gz",
-      "hash": "17mjs95jnnvsg1ihwbsa3z6hr88rvfh36pv1x4cad7hsaal3dcrg"
+      "revision": "44684bf429dc40e97a6d00ffa09043ac3f692186",
+      "url": "https://github.com/stevearc/aerial.nvim/archive/44684bf429dc40e97a6d00ffa09043ac3f692186.tar.gz",
+      "hash": "02zd23np2pn7hivi8sl63lcdn85cfbvsapkyghkwh9prxg8a81zn"
     },
     "alpha-nvim": {
       "type": "Git",
@@ -103,9 +103,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "d4af981745ea67b2c29bcd25f9843dbeedc580ed",
-      "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/d4af981745ea67b2c29bcd25f9843dbeedc580ed.tar.gz",
-      "hash": "1xjhpp9118bgpp2x3pxv0llngkm69fzxhdqp92civ19s5pxb5h5y"
+      "revision": "56084d1f45c8621d23d4bac724c2dc50b1eb75db",
+      "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/56084d1f45c8621d23d4bac724c2dc50b1eb75db.tar.gz",
+      "hash": "1lyczjvwpi5f1mjgw059yzkxxjrk48vcvhdjzkjgakhsq76s125x"
     },
     "bufdelete-nvim": {
       "type": "Git",
@@ -142,9 +142,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "b57cbaf8db3ac43c56c9e2c7f3812944638260ed",
-      "url": "https://github.com/uga-rosa/ccc.nvim/archive/b57cbaf8db3ac43c56c9e2c7f3812944638260ed.tar.gz",
-      "hash": "0ixqbsag43pyrvj0i9dkn28j7b2v0c75rljnw57bjl6nwz2aqxg7"
+      "revision": "9abb22d5d47460852a935129b4feff39fd8033e3",
+      "url": "https://github.com/uga-rosa/ccc.nvim/archive/9abb22d5d47460852a935129b4feff39fd8033e3.tar.gz",
+      "hash": "1lv00jwlqmhki6n8dqrxfvg5kci6a2xiz7mh8d488n7hr1pwkrpn"
     },
     "cellular-automaton-nvim": {
       "type": "Git",
@@ -207,8 +207,8 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "3022dbc9166796b644a841a02de8dd1cc1d311fa",
-      "url": "https://github.com/hrsh7th/cmp-buffer/archive/3022dbc9166796b644a841a02de8dd1cc1d311fa.tar.gz",
+      "revision": "b74fab3656eea9de20a9b8116afa3cfc4ec09657",
+      "url": "https://github.com/hrsh7th/cmp-buffer/archive/b74fab3656eea9de20a9b8116afa3cfc4ec09657.tar.gz",
       "hash": "1cwx8ky74633y0bmqmvq1lqzmphadnhzmhzkddl3hpb7rgn18vkl"
     },
     "cmp-luasnip": {
@@ -233,8 +233,8 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "99290b3ec1322070bcfb9e846450a46f6efa50f0",
-      "url": "https://github.com/hrsh7th/cmp-nvim-lsp/archive/99290b3ec1322070bcfb9e846450a46f6efa50f0.tar.gz",
+      "revision": "a8912b88ce488f411177fc8aed358b04dc246d7b",
+      "url": "https://github.com/hrsh7th/cmp-nvim-lsp/archive/a8912b88ce488f411177fc8aed358b04dc246d7b.tar.gz",
       "hash": "08q5mf5jrqjjcl1s4h9zj2vd1kcizz0a5a6p65wv1rc5s1fa3a49"
     },
     "cmp-path": {
@@ -246,8 +246,8 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "91ff86cd9c29299a64f968ebb45846c485725f23",
-      "url": "https://github.com/hrsh7th/cmp-path/archive/91ff86cd9c29299a64f968ebb45846c485725f23.tar.gz",
+      "revision": "c6635aae33a50d6010bf1aa756ac2398a2d54c32",
+      "url": "https://github.com/hrsh7th/cmp-path/archive/c6635aae33a50d6010bf1aa756ac2398a2d54c32.tar.gz",
       "hash": "18ixx14ibc7qrv32nj0ylxrx8w4ggg49l5vhcqd35hkp4n56j6mn"
     },
     "cmp-treesitter": {
@@ -272,9 +272,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "51fe5a782dbbd5cad8189420cb8d38fd7c245684",
-      "url": "https://github.com/olimorris/codecompanion.nvim/archive/51fe5a782dbbd5cad8189420cb8d38fd7c245684.tar.gz",
-      "hash": "09vjvbf5rxmj2fax0ddcinbvx6mhjdy58fw9d1nf8ll7x8dj5j2s"
+      "revision": "9f6ba9c0858179fe250412ad2f4d1f0d1bd31eb0",
+      "url": "https://github.com/olimorris/codecompanion.nvim/archive/9f6ba9c0858179fe250412ad2f4d1f0d1bd31eb0.tar.gz",
+      "hash": "1bs16rwj8wrpx1ijlhcjdfmz97616ny80pw16igm0dbwsf85nnj4"
     },
     "codewindow-nvim": {
       "type": "Git",
@@ -311,9 +311,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5",
-      "url": "https://github.com/stevearc/conform.nvim/archive/f9ef25a7ef00267b7d13bfc00b0dea22d78702d5.tar.gz",
-      "hash": "1942dsg83skxnm3jrqyxx9mvzgiq1v68i9z43hpar4bmqvggviif"
+      "revision": "b1a75324ddf96b7bb84963a297b1ed334db087c0",
+      "url": "https://github.com/stevearc/conform.nvim/archive/b1a75324ddf96b7bb84963a297b1ed334db087c0.tar.gz",
+      "hash": "0g0r324dg2yxj8g47lj8zg63166bhjlk8vskh3rdypxd437rbii0"
     },
     "copilot-cmp": {
       "type": "Git",
@@ -337,9 +337,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "6c65c53a849c8ac4278ad07a4bac150f449da3c4",
-      "url": "https://github.com/zbirenbaum/copilot.lua/archive/6c65c53a849c8ac4278ad07a4bac150f449da3c4.tar.gz",
-      "hash": "0psmi1pknc8cpckj9iqk4yx79xjkvmrjlwcnl0x1a5lbahdzifhv"
+      "revision": "d661d65b4cab20a5c164f6d9081d91ed324fe4d8",
+      "url": "https://github.com/zbirenbaum/copilot.lua/archive/d661d65b4cab20a5c164f6d9081d91ed324fe4d8.tar.gz",
+      "hash": "1lhrs1cw3v7z2sksbd8m1c6ya5m5xfn1dnx8yxqq3s2kqim6n7jb"
     },
     "crates-nvim": {
       "type": "Git",
@@ -363,9 +363,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "8420ee6a9fe0bfc9a37920fd572b0ae5a2348967",
-      "url": "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/archive/8420ee6a9fe0bfc9a37920fd572b0ae5a2348967.tar.gz",
-      "hash": "19k5iayhji76q031mzm1vw0n2irh2417mn0gdhf4cmadkrj4ygmg"
+      "revision": "52710d523e5a4d325fe62811a48ee2eeb93dbe26",
+      "url": "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/archive/52710d523e5a4d325fe62811a48ee2eeb93dbe26.tar.gz",
+      "hash": "1gxfcj8v7140v5njl0299dx8aqzjbxxz1i0af0p50lli5bk5s25g"
     },
     "dashboard-nvim": {
       "type": "Git",
@@ -493,9 +493,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "2d91a86a43a1ae1303e48aac55542f57b5731990",
-      "url": "https://github.com/akinsho/flutter-tools.nvim/archive/2d91a86a43a1ae1303e48aac55542f57b5731990.tar.gz",
-      "hash": "1ijwhwmf6f2rrixdpbr0aigjjy7jwl20bi4v5y7rz8cg0lhsmy5x"
+      "revision": "6faf2c70bd56f1fe78620591a2bb73f4dc6f4870",
+      "url": "https://github.com/akinsho/flutter-tools.nvim/archive/6faf2c70bd56f1fe78620591a2bb73f4dc6f4870.tar.gz",
+      "hash": "0mhqzicm56xp20mm8swmick63p9sbbby394v0qykzb9l73wpqdka"
     },
     "friendly-snippets": {
       "type": "Git",
@@ -519,9 +519,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "89ff12300e9a768f4890a8e02bb6a3f5d97f9a65",
-      "url": "https://github.com/ibhagwan/fzf-lua/archive/89ff12300e9a768f4890a8e02bb6a3f5d97f9a65.tar.gz",
-      "hash": "13bpzf0nb5sqf80fhly3zpfh94kkbr934qbn588668kjpplp1rqn"
+      "revision": "6488ada2f376e47789391dc353b6d91a3f9de6f6",
+      "url": "https://github.com/ibhagwan/fzf-lua/archive/6488ada2f376e47789391dc353b6d91a3f9de6f6.tar.gz",
+      "hash": "1hj550c9bn0f2wzmrhc4g9l6024in7jwqfqvrr23fly3b42lfa8a"
     },
     "gesture-nvim": {
       "type": "Git",
@@ -571,9 +571,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9",
-      "url": "https://github.com/lewis6991/gitsigns.nvim/archive/7010000889bfb6c26065e0b0f7f1e6aa9163edd9.tar.gz",
-      "hash": "0hl572j5l1bqg51rg545bavxs8kxya02ss3fj5fxvp9ylrnaqsx9"
+      "revision": "3c76f7fabac723aa682365ef782f88a83ccdb4ac",
+      "url": "https://github.com/lewis6991/gitsigns.nvim/archive/3c76f7fabac723aa682365ef782f88a83ccdb4ac.tar.gz",
+      "hash": "1ngw8n25g6rpdn089xwjidfglsli2v8mbv769ikpp6y89h9j91l3"
     },
     "glow-nvim": {
       "type": "Git",
@@ -597,9 +597,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "c6f42890551b4827253387e93b035568826a9cb7",
-      "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/c6f42890551b4827253387e93b035568826a9cb7.tar.gz",
-      "hash": "1ac056i9hs5wbb9qzdijmhjcaz4h67v2c8q0361d17gdm8pdrvnj"
+      "revision": "12b5420b665e8053d74eb075d8a589477333f67d",
+      "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/12b5420b665e8053d74eb075d8a589477333f67d.tar.gz",
+      "hash": "16fa841cv0dbn7pkcs44r5ch241vhax8jfxgcxwwd0z4srlbj6gy"
     },
     "harpoon": {
       "type": "Git",
@@ -623,9 +623,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "0a1d1119e69cdf9b89e509a8bea025e21d5a41c5",
-      "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/0a1d1119e69cdf9b89e509a8bea025e21d5a41c5.tar.gz",
-      "hash": "1i0m53ri2c5l4yzwjkbwwa73c8k5yh8yz6ddcljz1b9q5vs9dazk"
+      "revision": "5fa6671ff4face61be6a439b085c4977c20a60dc",
+      "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/5fa6671ff4face61be6a439b085c4977c20a60dc.tar.gz",
+      "hash": "002lzdjdf9f5jp63bngmp9fadzs81c0w0gqqpy7b2wfxg76biggr"
     },
     "highlight-undo-nvim": {
       "type": "Git",
@@ -664,10 +664,10 @@
       "version_upper_bound": null,
       "release_prefix": null,
       "submodules": false,
-      "version": "v1.0.2",
-      "revision": "8578056a2226ed49fc608167edc143a87f75d809",
-      "url": "https://api.github.com/repos/nvimtools/hydra.nvim/tarball/v1.0.2",
-      "hash": "13f04pmqrfl65xx9bfkdak6ll57s94anaw7nqd0fm5hp50b7c6j3"
+      "version": "v1.0.3",
+      "revision": "f3d4822060376cb253d4cc0d5af2c272c28de2a7",
+      "url": "https://api.github.com/repos/nvimtools/hydra.nvim/tarball/v1.0.3",
+      "hash": "13dd1q951pbwi36r4s1zfs02mk5pyfvwlj1pmv4l8bnc4fs242qv"
     },
     "icon-picker-nvim": {
       "type": "Git",
@@ -846,9 +846,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "136e315e0c1e2ac116cc0953dd41adfebfb4a695",
-      "url": "https://github.com/nvim-neorocks/lz.n/archive/136e315e0c1e2ac116cc0953dd41adfebfb4a695.tar.gz",
-      "hash": "0fdgr21cj5nis4vicvws635w9c8bcls59yj64d3xwfj7nr40mzws"
+      "revision": "4d32f775806f9dbc1ad2c773c305cc1dc4ce2bba",
+      "url": "https://github.com/nvim-neorocks/lz.n/archive/4d32f775806f9dbc1ad2c773c305cc1dc4ce2bba.tar.gz",
+      "hash": "0ydm1vms8bhiq2yxa1ndb38fi71vai2hk1azdaw4xbjrylbhpnjq"
     },
     "lzn-auto-require": {
       "type": "Git",
@@ -885,9 +885,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "978ffc65c6b513fde9ef075326d34d89197f1ea5",
-      "url": "https://github.com/echasnovski/mini.ai/archive/978ffc65c6b513fde9ef075326d34d89197f1ea5.tar.gz",
-      "hash": "1kgar55azqq9g6m9y98kr96cldhzipdfp2cjhszvnzw9ad28p3nb"
+      "revision": "e139eb1101beb0250fea322f8c07a42f0f175688",
+      "url": "https://github.com/echasnovski/mini.ai/archive/e139eb1101beb0250fea322f8c07a42f0f175688.tar.gz",
+      "hash": "1lc7nwxlm4ndf2d2m4y90dybscig39qh5ijacns5r40w31rfgpmc"
     },
     "mini-align": {
       "type": "Git",
@@ -898,9 +898,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "0ce67804b0343409c93eb14275b98d53a7b209cc",
-      "url": "https://github.com/echasnovski/mini.align/archive/0ce67804b0343409c93eb14275b98d53a7b209cc.tar.gz",
-      "hash": "1lq5pzi24ahwfp1jipwl7a1mynnz1ja7c70bs2kilafpa314ymnp"
+      "revision": "2b42ac0be7d570c2208f9e334ecef13453cd222d",
+      "url": "https://github.com/echasnovski/mini.align/archive/2b42ac0be7d570c2208f9e334ecef13453cd222d.tar.gz",
+      "hash": "12k8jv9f4kzn4gn507539v1llm1zn0afl2pwihv4gsr62l9gbmw9"
     },
     "mini-animate": {
       "type": "Git",
@@ -911,9 +911,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "33235a02c7dbaf2a5abdb9c584f9bdb6a6fef247",
-      "url": "https://github.com/echasnovski/mini.animate/archive/33235a02c7dbaf2a5abdb9c584f9bdb6a6fef247.tar.gz",
-      "hash": "1v4xlphp9h1vc48dxwf9hmm2mfr1z1s708knsbyx6gkd282zmzkg"
+      "revision": "9b518c39c0e25b7b5e4e61db3f1407f7b4889f4e",
+      "url": "https://github.com/echasnovski/mini.animate/archive/9b518c39c0e25b7b5e4e61db3f1407f7b4889f4e.tar.gz",
+      "hash": "197fgvnh05j5s0bhablgvlz1h6fl4m3n9d1sxzyf6p661dk8chcf"
     },
     "mini-base16": {
       "type": "Git",
@@ -924,9 +924,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "492b34f496fd1a53126feb1e47ebf55ce9d61e25",
-      "url": "https://github.com/echasnovski/mini.base16/archive/492b34f496fd1a53126feb1e47ebf55ce9d61e25.tar.gz",
-      "hash": "0srxnxkpi03282zdcbrq13b2m259pchnfvp94awn286zwsc9x23l"
+      "revision": "1e0a62b8d9592e842c545442cddf3236634c0b67",
+      "url": "https://github.com/echasnovski/mini.base16/archive/1e0a62b8d9592e842c545442cddf3236634c0b67.tar.gz",
+      "hash": "038a1w0fi6ivhs0s5lnj45vq40d4whvrbqmkkv1sa9g56cqr17wi"
     },
     "mini-basics": {
       "type": "Git",
@@ -937,9 +937,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "307ba95901099f44cff557da040ee8862093e410",
-      "url": "https://github.com/echasnovski/mini.basics/archive/307ba95901099f44cff557da040ee8862093e410.tar.gz",
-      "hash": "130y4b372n3gckg1in5mgdssxg55cswa0dwxrs4icq2nb7rxnbia"
+      "revision": "9904890cf863a7cbc3f57a1cbac3d298a33e90a4",
+      "url": "https://github.com/echasnovski/mini.basics/archive/9904890cf863a7cbc3f57a1cbac3d298a33e90a4.tar.gz",
+      "hash": "0k9xzdgmyrjvazvi2j1pgy8wsdbm3g3wcq4nnhdxl51i9ib5i3wj"
     },
     "mini-bracketed": {
       "type": "Git",
@@ -950,9 +950,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "0ec65567ffde0ad4d94d794d55f3b627203b496a",
-      "url": "https://github.com/echasnovski/mini.bracketed/archive/0ec65567ffde0ad4d94d794d55f3b627203b496a.tar.gz",
-      "hash": "05xg63hw83n99al5sylysbq1xpschlj547s3j484jjs7wsbzzp6c"
+      "revision": "cd77e1e498a561a0f11b41a650caa1ba3a6a3fcc",
+      "url": "https://github.com/echasnovski/mini.bracketed/archive/cd77e1e498a561a0f11b41a650caa1ba3a6a3fcc.tar.gz",
+      "hash": "1490iv3j7ks3c04x48xqysq62kya9ygxca84avhah4pg43h1pws9"
     },
     "mini-bufremove": {
       "type": "Git",
@@ -963,9 +963,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "c635c40d06a45450d34695d70c3fb3efe432728f",
-      "url": "https://github.com/echasnovski/mini.bufremove/archive/c635c40d06a45450d34695d70c3fb3efe432728f.tar.gz",
-      "hash": "0d5zmn1rldcl37i6v6m2b2ql3nvkdfqjzf3zhdkqfd7pxvvwp12j"
+      "revision": "8f4567b323f74116422f3a1c0ac8e7b9d108cebb",
+      "url": "https://github.com/echasnovski/mini.bufremove/archive/8f4567b323f74116422f3a1c0ac8e7b9d108cebb.tar.gz",
+      "hash": "0rpj7jdfxq6c509ng911rrncmfip6l39r6np9b6gsgv7j1563ja6"
     },
     "mini-clue": {
       "type": "Git",
@@ -976,9 +976,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "9bfd8ce71ae31460837fcec82a03946008929777",
-      "url": "https://github.com/echasnovski/mini.clue/archive/9bfd8ce71ae31460837fcec82a03946008929777.tar.gz",
-      "hash": "1rx2952li3zby1v24asrp9avy6l9f7f6v954a6xf1rl8ijz2aa5j"
+      "revision": "298ece93383cf7feb82ff726ebe3570573cd6308",
+      "url": "https://github.com/echasnovski/mini.clue/archive/298ece93383cf7feb82ff726ebe3570573cd6308.tar.gz",
+      "hash": "09av4cxvfqc8vfhdhfa6dlv1l47hqfq9ip6w23xpdfv8acdhqr44"
     },
     "mini-colors": {
       "type": "Git",
@@ -989,9 +989,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "0b13a3f8c7279d31833203b1c15d456047321f28",
-      "url": "https://github.com/echasnovski/mini.colors/archive/0b13a3f8c7279d31833203b1c15d456047321f28.tar.gz",
-      "hash": "00037f03cmx01y6hd7cdk4bibbzfqmygf851alhnvd2fs7flvxcw"
+      "revision": "a946cd32c0e5b9bab9cd27ebd6c23259e7d70a72",
+      "url": "https://github.com/echasnovski/mini.colors/archive/a946cd32c0e5b9bab9cd27ebd6c23259e7d70a72.tar.gz",
+      "hash": "0jiw5vz7jnfwpbcls1fzny6nv1pxpjyvldf6rzrv9yihpcjgixqy"
     },
     "mini-comment": {
       "type": "Git",
@@ -1002,9 +1002,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "264b8a63edd5a9a41d5361a1d52c13131c3c51a2",
-      "url": "https://github.com/echasnovski/mini.comment/archive/264b8a63edd5a9a41d5361a1d52c13131c3c51a2.tar.gz",
-      "hash": "1s4jl8sa7l6kibgsz0d6w2h4xnbpbf3k4rqq90x4l4dmx8if9vkb"
+      "revision": "fb867a9246f9b892cf51a8c84a3f8479cdf1558c",
+      "url": "https://github.com/echasnovski/mini.comment/archive/fb867a9246f9b892cf51a8c84a3f8479cdf1558c.tar.gz",
+      "hash": "0d3yl412f95alg5rlvq387sbx3gwyqa0nc2f8ivgw5vllnwycj3a"
     },
     "mini-completion": {
       "type": "Git",
@@ -1015,9 +1015,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "9e6aa17fef2e86d3f33666a7843b942791cc1c1f",
-      "url": "https://github.com/echasnovski/mini.completion/archive/9e6aa17fef2e86d3f33666a7843b942791cc1c1f.tar.gz",
-      "hash": "05z0ghbwh7h2ij8k72sidrpypnzkf57kf058kwpc0wd1jm9ymznm"
+      "revision": "aef3a80fece4662abbf5fc09d899e9f3e1805d7d",
+      "url": "https://github.com/echasnovski/mini.completion/archive/aef3a80fece4662abbf5fc09d899e9f3e1805d7d.tar.gz",
+      "hash": "1154rxj021vsjqk4jqnxqgww7ajkhlwhbbh92avs05wg9hxpnjzg"
     },
     "mini-diff": {
       "type": "Git",
@@ -1028,9 +1028,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "e4a59a8a22d9afeeaac92e3cb3fbd8ff5dc8e310",
-      "url": "https://github.com/echasnovski/mini.diff/archive/e4a59a8a22d9afeeaac92e3cb3fbd8ff5dc8e310.tar.gz",
-      "hash": "0z38rpxdgg298a1i5ar49694xfjv26m8572qbhq2s6wkf24p08yk"
+      "revision": "06c9fe0e33fbcf41202793550b905d7431dc81fc",
+      "url": "https://github.com/echasnovski/mini.diff/archive/06c9fe0e33fbcf41202793550b905d7431dc81fc.tar.gz",
+      "hash": "0bixw71ds5k8ag0bfhc19yg4x03jf5m3i4d7g7s0h4kdngvj84mg"
     },
     "mini-doc": {
       "type": "Git",
@@ -1041,9 +1041,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "00d626a03e5642c657c58c99d14cc0ea6ed51abd",
-      "url": "https://github.com/echasnovski/mini.doc/archive/00d626a03e5642c657c58c99d14cc0ea6ed51abd.tar.gz",
-      "hash": "0n920j25rnb66hk3klrni9ji673800dbxyb8j30vd4dymq5051ym"
+      "revision": "9b3e1b20508c7a6218cadf59b177a79a5df290f6",
+      "url": "https://github.com/echasnovski/mini.doc/archive/9b3e1b20508c7a6218cadf59b177a79a5df290f6.tar.gz",
+      "hash": "1anxn3lasm1x3yn1i0hd4im7y8fvf0fhyazn3yj6hzpm4vb12p0k"
     },
     "mini-extra": {
       "type": "Git",
@@ -1054,9 +1054,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "54420de7ee36cf011c6351a1d6290b2555120c7b",
-      "url": "https://github.com/echasnovski/mini.extra/archive/54420de7ee36cf011c6351a1d6290b2555120c7b.tar.gz",
-      "hash": "16kyn5jh6pnpiiahf16r2yk3bck9yz8vy5fbvwlfa847rbl39ybd"
+      "revision": "dc571df8f1f61debd59e200adfe7f701c0d67eca",
+      "url": "https://github.com/echasnovski/mini.extra/archive/dc571df8f1f61debd59e200adfe7f701c0d67eca.tar.gz",
+      "hash": "14zbqrwcxyhax10q082n4wqmqb3519i5kmj0zc8flwmswv742gyr"
     },
     "mini-files": {
       "type": "Git",
@@ -1067,9 +1067,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "3007632477bb9df28b4e32329c63aea1ab2c2b0a",
-      "url": "https://github.com/echasnovski/mini.files/archive/3007632477bb9df28b4e32329c63aea1ab2c2b0a.tar.gz",
-      "hash": "1bb0sv766gjnwnqpn7qhcsm6m6c8zj96ippsh1sjlqd3ma09hzwm"
+      "revision": "432142ada983ec5863ba480f0e4891b7d64ce3f6",
+      "url": "https://github.com/echasnovski/mini.files/archive/432142ada983ec5863ba480f0e4891b7d64ce3f6.tar.gz",
+      "hash": "0422sf8jx5sxws2kssi3ynynpmm1xpgk7i50dqml1kc8nymx4z5b"
     },
     "mini-fuzzy": {
       "type": "Git",
@@ -1080,9 +1080,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "fb42763285075e316fd4250739af9b8c442503de",
-      "url": "https://github.com/echasnovski/mini.fuzzy/archive/fb42763285075e316fd4250739af9b8c442503de.tar.gz",
-      "hash": "0hl5ygzlf73g70j7pdd1x4975368sqpynpja1zx7bc5jln698vr4"
+      "revision": "c33d6a93c4fe395ae8a9bd02fed35315a90b688a",
+      "url": "https://github.com/echasnovski/mini.fuzzy/archive/c33d6a93c4fe395ae8a9bd02fed35315a90b688a.tar.gz",
+      "hash": "0n3rnvhz1hzj32l006il96zf61iv4wc0fy6dqp1lyrqm13skadvp"
     },
     "mini-git": {
       "type": "Git",
@@ -1093,9 +1093,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "96034bd94220115e49dbf8c38ef4da5508ba29c2",
-      "url": "https://github.com/echasnovski/mini-git/archive/96034bd94220115e49dbf8c38ef4da5508ba29c2.tar.gz",
-      "hash": "0f15bsqrjbifjp0g0fscncyhzsvjd3i4fh0vyagpl08g4as1fqx3"
+      "revision": "cf928950a29d5158dcc76530443436a45411738f",
+      "url": "https://github.com/echasnovski/mini-git/archive/cf928950a29d5158dcc76530443436a45411738f.tar.gz",
+      "hash": "05q0anazch60xy3rk5f8gxg8hnnmgvfp5zff80qpi43y48jgkvyx"
     },
     "mini-hipatterns": {
       "type": "Git",
@@ -1106,9 +1106,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "fbf1e2195fdd65cf1bc970316c28098257728868",
-      "url": "https://github.com/echasnovski/mini.hipatterns/archive/fbf1e2195fdd65cf1bc970316c28098257728868.tar.gz",
-      "hash": "09g9b2jm1hac7pppmmncqpgaddd3yrlw9anhr4jw7lldr2bpwrqa"
+      "revision": "dd53c18779a2e47a1902180c72bc54a8bb554388",
+      "url": "https://github.com/echasnovski/mini.hipatterns/archive/dd53c18779a2e47a1902180c72bc54a8bb554388.tar.gz",
+      "hash": "0cw6sfhzny5wds5ydwlp8qw448g7fgakhh2dzqijw4nn1yxhmkr2"
     },
     "mini-hues": {
       "type": "Git",
@@ -1119,9 +1119,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "b65cb42ad651ee3543985e333c504bf820bc5a85",
-      "url": "https://github.com/echasnovski/mini.hues/archive/b65cb42ad651ee3543985e333c504bf820bc5a85.tar.gz",
-      "hash": "1yhkvszlw6pp1pxkz0w76fwmmysb2bl2kka0f0ws4jhfcdj6qv1c"
+      "revision": "dd8b2105323c6b5277f76ea0f30f016c85f8171e",
+      "url": "https://github.com/echasnovski/mini.hues/archive/dd8b2105323c6b5277f76ea0f30f016c85f8171e.tar.gz",
+      "hash": "0kxj26zllydwcxd3jyijy084s96giydajc10fxzhmjg8gvb1pxmf"
     },
     "mini-icons": {
       "type": "Git",
@@ -1132,9 +1132,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "86a633f0dffcfd80110bac86681dbf4b5c37ba5c",
-      "url": "https://github.com/echasnovski/mini.icons/archive/86a633f0dffcfd80110bac86681dbf4b5c37ba5c.tar.gz",
-      "hash": "1810mvav1k24kxx3kj364v09k26d1s1p2y6dnc2l8mwzw7q70byr"
+      "revision": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a",
+      "url": "https://github.com/echasnovski/mini.icons/archive/397ed3807e96b59709ef3292f0a3e253d5c1dc0a.tar.gz",
+      "hash": "110bglbbyafjym4md2slgccyjhf90bgg8h9h2ipya6cfqfs4pizy"
     },
     "mini-indentscope": {
       "type": "Git",
@@ -1145,9 +1145,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "8ce41a77eed7f4121c83c67fda5e2e86af999e6d",
-      "url": "https://github.com/echasnovski/mini.indentscope/archive/8ce41a77eed7f4121c83c67fda5e2e86af999e6d.tar.gz",
-      "hash": "0dv4c6yf1s5fzvwy1n0chq553353bsix3g8ysajp9lswnd9lhbh4"
+      "revision": "8af2569a7d7fd37300dfa760e44e71efbbf322fd",
+      "url": "https://github.com/echasnovski/mini.indentscope/archive/8af2569a7d7fd37300dfa760e44e71efbbf322fd.tar.gz",
+      "hash": "1xk31bl9gchc8r1pv6f2z7nfkr6q7f1i4qrrj3h4crxb6nhpxmry"
     },
     "mini-jump": {
       "type": "Git",
@@ -1158,9 +1158,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "1fb371cfdcb314c5faa272976f23514f264bd755",
-      "url": "https://github.com/echasnovski/mini.jump/archive/1fb371cfdcb314c5faa272976f23514f264bd755.tar.gz",
-      "hash": "1975qyjzcziya2w121cjkqaj17wxp205jl3b7lrl25db6l6ggjcs"
+      "revision": "65bf2c55680d8be63d29ce0c5ee4e33031426115",
+      "url": "https://github.com/echasnovski/mini.jump/archive/65bf2c55680d8be63d29ce0c5ee4e33031426115.tar.gz",
+      "hash": "17ilfgsazwq20rw42am1jzxvcdzbzsk65jzsxa5s8zs65sx6rdch"
     },
     "mini-jump2d": {
       "type": "Git",
@@ -1171,9 +1171,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "3de91ea974627c4c2645e288bf0a6e6717a4dfa8",
-      "url": "https://github.com/echasnovski/mini.jump2d/archive/3de91ea974627c4c2645e288bf0a6e6717a4dfa8.tar.gz",
-      "hash": "0n40jmjbqnz1bbgal3j8m9cgzyma59ss8lxsqmi9230mkgd4xsnq"
+      "revision": "c90f7f8cebf3282d0f0b228015fceefb841375c6",
+      "url": "https://github.com/echasnovski/mini.jump2d/archive/c90f7f8cebf3282d0f0b228015fceefb841375c6.tar.gz",
+      "hash": "04wv8q8g5p1sv6hdaq83rik9x7fq8ki4d617v5gk5d3nv0i6pqq0"
     },
     "mini-map": {
       "type": "Git",
@@ -1184,9 +1184,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "2fe08148f883d613c825c1c0c6ea8a19901061f0",
-      "url": "https://github.com/echasnovski/mini.map/archive/2fe08148f883d613c825c1c0c6ea8a19901061f0.tar.gz",
-      "hash": "1mqf5bkyp8r05h7ba4drfxx97js2fzmdbjz0xb88xhnpmrikfjnv"
+      "revision": "f3c156693a9f68a10ae285d537edd36f4cf0e64f",
+      "url": "https://github.com/echasnovski/mini.map/archive/f3c156693a9f68a10ae285d537edd36f4cf0e64f.tar.gz",
+      "hash": "1z2rf664z7krs40w66b5fjmq3xffv357mv689425i5nyc1q0gr4n"
     },
     "mini-misc": {
       "type": "Git",
@@ -1197,9 +1197,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "3f0cf62b7e9c545e7e92fe5614f4d6acbe5a8f29",
-      "url": "https://github.com/echasnovski/mini.misc/archive/3f0cf62b7e9c545e7e92fe5614f4d6acbe5a8f29.tar.gz",
-      "hash": "04sw3kxx7qa8i2xvagxls78ih7l6fq9mk42xrqjim225657hva5p"
+      "revision": "52bf20e952a26820c25776c7b594f64b7a6dcb66",
+      "url": "https://github.com/echasnovski/mini.misc/archive/52bf20e952a26820c25776c7b594f64b7a6dcb66.tar.gz",
+      "hash": "0r2xmxlsq8ifq4ps54l7yjljczlp7ldxp8b30gjdkkrbbi1rkbvg"
     },
     "mini-move": {
       "type": "Git",
@@ -1210,9 +1210,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "c8b30e92dd2668dd6e56a9a23cb7d4ee38c2266d",
-      "url": "https://github.com/echasnovski/mini.move/archive/c8b30e92dd2668dd6e56a9a23cb7d4ee38c2266d.tar.gz",
-      "hash": "0cnzfn706s90bc0m49jkx3fjghrcv0byqbajdhwbrv8f77c6crg3"
+      "revision": "4fe4a855fee53c66b0f3255a4b54ddc2ae6b308c",
+      "url": "https://github.com/echasnovski/mini.move/archive/4fe4a855fee53c66b0f3255a4b54ddc2ae6b308c.tar.gz",
+      "hash": "0dd29nx1z54ljjz9m4m9ghhv39x7ajjx43hbr4gn7p1lv2kvjv7p"
     },
     "mini-notify": {
       "type": "Git",
@@ -1223,9 +1223,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "be6661ee23f2325841fb087efb8e492b29eccc9a",
-      "url": "https://github.com/echasnovski/mini.notify/archive/be6661ee23f2325841fb087efb8e492b29eccc9a.tar.gz",
-      "hash": "16n36gvk3gz46cs30gh8zd4mcwszniynl2k87rzbfhhcwsj71svx"
+      "revision": "f4e892533c8821bc5e0f373b353022a42bd465f7",
+      "url": "https://github.com/echasnovski/mini.notify/archive/f4e892533c8821bc5e0f373b353022a42bd465f7.tar.gz",
+      "hash": "0ziqqd8zz2d28x7801g9h45jgcv5vxqx25wcyh3574zrd5aay5s7"
     },
     "mini-operators": {
       "type": "Git",
@@ -1236,9 +1236,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "298218fb8280fd4a8234db80230dd84db6b07efd",
-      "url": "https://github.com/echasnovski/mini.operators/archive/298218fb8280fd4a8234db80230dd84db6b07efd.tar.gz",
-      "hash": "021big8pqbwkjrzkak0chffwhhvj8klanda5q9wxwgg1wky9qvi6"
+      "revision": "c6d87731f1a2c849888754347ffc5a1395bf2977",
+      "url": "https://github.com/echasnovski/mini.operators/archive/c6d87731f1a2c849888754347ffc5a1395bf2977.tar.gz",
+      "hash": "1ijnhxajpii17a1rz1avp1i5j35an2dq0ji28v2wrvaa0b5jg13a"
     },
     "mini-pairs": {
       "type": "Git",
@@ -1249,9 +1249,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "b90e36aa5ca5e0d825e77ad67aac22214a4d9096",
-      "url": "https://github.com/echasnovski/mini.pairs/archive/b90e36aa5ca5e0d825e77ad67aac22214a4d9096.tar.gz",
-      "hash": "0h35xn8029d74sdv1fyrycpkl10vv0m01fvx2v955v0jfc9cii1n"
+      "revision": "69864a2efb36c030877421634487fd90db1e4298",
+      "url": "https://github.com/echasnovski/mini.pairs/archive/69864a2efb36c030877421634487fd90db1e4298.tar.gz",
+      "hash": "0avjjikmz3b8676hzcqck3r2lv0zxsdr8hqs65zn2dr12q8zh41r"
     },
     "mini-pick": {
       "type": "Git",
@@ -1262,9 +1262,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "4dfc0a21f16d34e9b2429b96d62788ed8a65e6cd",
-      "url": "https://github.com/echasnovski/mini.pick/archive/4dfc0a21f16d34e9b2429b96d62788ed8a65e6cd.tar.gz",
-      "hash": "0ybfn2mn038mn2bdaf5hyiycimfi785silpcnayh4nj544zhzjc9"
+      "revision": "f95dc0bb9db7124f55b225f544a8719476c64314",
+      "url": "https://github.com/echasnovski/mini.pick/archive/f95dc0bb9db7124f55b225f544a8719476c64314.tar.gz",
+      "hash": "0cq2hjaw4fyjk692s3dl8hb6aad9a3mqciknj8zsda85n6i2i3qy"
     },
     "mini-sessions": {
       "type": "Git",
@@ -1275,9 +1275,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "f38354b72c11d5bbb2153183fa6ba0cf238147d5",
-      "url": "https://github.com/echasnovski/mini.sessions/archive/f38354b72c11d5bbb2153183fa6ba0cf238147d5.tar.gz",
-      "hash": "1m08i9b235bpgyjgajj85i10z991yigrhp3hg5xji9hajn0d67iw"
+      "revision": "dd7fe484dfcbf270a788e9291545df509cdb9691",
+      "url": "https://github.com/echasnovski/mini.sessions/archive/dd7fe484dfcbf270a788e9291545df509cdb9691.tar.gz",
+      "hash": "0m8l1hw8y3mwhcnyzhxb7j4jvvwmf8i7ybxddy2r2rq89rc7x3ln"
     },
     "mini-snippets": {
       "type": "Git",
@@ -1288,9 +1288,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "04e1c0f8538a4ee0ddc054e30e92a93cb4c1b568",
-      "url": "https://github.com/echasnovski/mini.snippets/archive/04e1c0f8538a4ee0ddc054e30e92a93cb4c1b568.tar.gz",
-      "hash": "17fqgsr7id11f1wp6wri1zi67m2vh6i9hdrwj9bgjy4528x7gi6f"
+      "revision": "e05106957fc178285dbc510ff833985da59d3e5a",
+      "url": "https://github.com/echasnovski/mini.snippets/archive/e05106957fc178285dbc510ff833985da59d3e5a.tar.gz",
+      "hash": "0pn9i6sfh3fxkjzh9yyyc05lgcgm8wsanvl7axmy4p7a9spnfa2q"
     },
     "mini-splitjoin": {
       "type": "Git",
@@ -1301,9 +1301,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "efe24ba54f9623cb05698355981ec05278976788",
-      "url": "https://github.com/echasnovski/mini.splitjoin/archive/efe24ba54f9623cb05698355981ec05278976788.tar.gz",
-      "hash": "0xnc61cm1zpj8j7j10zgpx4438vmqpdwbqick9rrw9jbmbzcc0p5"
+      "revision": "70240d5d3881ff1b2b1d7902450f98a6fa303800",
+      "url": "https://github.com/echasnovski/mini.splitjoin/archive/70240d5d3881ff1b2b1d7902450f98a6fa303800.tar.gz",
+      "hash": "1sp4p0s4cv888n0nmgy04j5k51ndxpmksy235rg9jkk7j5gg47qb"
     },
     "mini-starter": {
       "type": "Git",
@@ -1314,9 +1314,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "cf770619b85968bc0f45cace82f5c80b69ca0e96",
-      "url": "https://github.com/echasnovski/mini.starter/archive/cf770619b85968bc0f45cace82f5c80b69ca0e96.tar.gz",
-      "hash": "11l7vxhd6sra55aj2xmm79nfhrkisv9r6fssknmcdxrmh47dr3kd"
+      "revision": "d8038690eadf203a40863c3a9423df880a901d39",
+      "url": "https://github.com/echasnovski/mini.starter/archive/d8038690eadf203a40863c3a9423df880a901d39.tar.gz",
+      "hash": "06rglm7m32lrgba47vb96kaxdsyz8pl2ivbr41m1swy3ihrv69y3"
     },
     "mini-statusline": {
       "type": "Git",
@@ -1327,9 +1327,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "ec3adf7813b7604275dd4a28433e9c9610b70f1b",
-      "url": "https://github.com/echasnovski/mini.statusline/archive/ec3adf7813b7604275dd4a28433e9c9610b70f1b.tar.gz",
-      "hash": "1ny69yjvldl4jpyjpy8z4w4zz6ir976x63nds8z05zgkq8fa2ajd"
+      "revision": "6a22a137926c60f987ab76433c56230ffdd7c42d",
+      "url": "https://github.com/echasnovski/mini.statusline/archive/6a22a137926c60f987ab76433c56230ffdd7c42d.tar.gz",
+      "hash": "0yvw7j0yydqcv78n145s59y4kw8dj5h8wj44sy46cnzh4bn8l65d"
     },
     "mini-surround": {
       "type": "Git",
@@ -1340,9 +1340,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "97796f68a8698d9b63ac3927da0d0bf5c3a0876b",
-      "url": "https://github.com/echasnovski/mini.surround/archive/97796f68a8698d9b63ac3927da0d0bf5c3a0876b.tar.gz",
-      "hash": "1lris02am949lqg35ql3jgyfhzya68df3yhb5d2dbfmwhk6mjxgc"
+      "revision": "5aab42fcdcf31fa010f012771eda5631c077840a",
+      "url": "https://github.com/echasnovski/mini.surround/archive/5aab42fcdcf31fa010f012771eda5631c077840a.tar.gz",
+      "hash": "0hsy7ngqz17a663k4gkj9ambbcn24jvqx7010aiv8g4b0gbmzhky"
     },
     "mini-tabline": {
       "type": "Git",
@@ -1353,9 +1353,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "46108e2d32b0ec8643ee46df14badedb33f3defe",
-      "url": "https://github.com/echasnovski/mini.tabline/archive/46108e2d32b0ec8643ee46df14badedb33f3defe.tar.gz",
-      "hash": "19n37b89dxssx3p3lzr9l7pxmbdh0k2mb14ankpq3cy0ax3mi79c"
+      "revision": "fc00d47c6f00eeef8ee05694e59021afb4ae0e0e",
+      "url": "https://github.com/echasnovski/mini.tabline/archive/fc00d47c6f00eeef8ee05694e59021afb4ae0e0e.tar.gz",
+      "hash": "1h33s1fzl2wy24pkik0ybjj541srybyjw3zyvpylfm93cjabgbf0"
     },
     "mini-test": {
       "type": "Git",
@@ -1366,9 +1366,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "5db2659a3bcda7890d3416cfbe49eb9c36824675",
-      "url": "https://github.com/echasnovski/mini.test/archive/5db2659a3bcda7890d3416cfbe49eb9c36824675.tar.gz",
-      "hash": "173wj06k5g8k6ah2aw4azlgwmq7jmin5jkqkkpr9z1lviagrdss7"
+      "revision": "4c70379d07ea44f697d96c7a6f04c79f17b34bb3",
+      "url": "https://github.com/echasnovski/mini.test/archive/4c70379d07ea44f697d96c7a6f04c79f17b34bb3.tar.gz",
+      "hash": "0si92d4jc7lmzj2mppz0vcmgqgsbgy64fl4bj8jwdl7z78bhpjwk"
     },
     "mini-trailspace": {
       "type": "Git",
@@ -1379,9 +1379,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "9bbbf568c06fe424dc21d2c228fa76098008a5f3",
-      "url": "https://github.com/echasnovski/mini.trailspace/archive/9bbbf568c06fe424dc21d2c228fa76098008a5f3.tar.gz",
-      "hash": "1ihd8fbs5imnp5xcllcj6fgpx0y4vclrkfz802q9fl7fqh00dcay"
+      "revision": "39a0460c025a605519fdd6bea1ce870642429996",
+      "url": "https://github.com/echasnovski/mini.trailspace/archive/39a0460c025a605519fdd6bea1ce870642429996.tar.gz",
+      "hash": "1d95vcxm7fhav8gz9n8m36q3hkxi6j1p0f6y35qnps1x7yz1wyfg"
     },
     "mini-visits": {
       "type": "Git",
@@ -1392,9 +1392,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "46e7a4074032d0340308c3379bc3650626c85da8",
-      "url": "https://github.com/echasnovski/mini.visits/archive/46e7a4074032d0340308c3379bc3650626c85da8.tar.gz",
-      "hash": "1776i3xn9dpccjjamy5ys5acc3nxd3zph4a77sbw2dipfd8zpasi"
+      "revision": "c0a3b02f5d82080a2aa6cd9185ff16944ce2451a",
+      "url": "https://github.com/echasnovski/mini.visits/archive/c0a3b02f5d82080a2aa6cd9185ff16944ce2451a.tar.gz",
+      "hash": "02wr34zzd5x6zn4iwhbv5g4shibpvb8536hr5lk0aw7i55aqg5x8"
     },
     "minimap-vim": {
       "type": "Git",
@@ -1486,9 +1486,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "79ffd346ca19af49197d9c1b45d0b902c32c3e14",
-      "url": "https://github.com/nvim-neorg/neorg/archive/79ffd346ca19af49197d9c1b45d0b902c32c3e14.tar.gz",
-      "hash": "0czkcdfh0l8j80kaz2zpdyb424xa28c35jybkdigwj1fgi0afnzd"
+      "revision": "a1e19618c012a712c5ed7cd5ebd01b48ad9f4b5b",
+      "url": "https://github.com/nvim-neorg/neorg/archive/a1e19618c012a712c5ed7cd5ebd01b48ad9f4b5b.tar.gz",
+      "hash": "1lp1chm788rnzqjndw64rnjn299889fx66lm01lvfgail0509dw0"
     },
     "neorg-telescope": {
       "type": "Git",
@@ -1603,9 +1603,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "6522027785b305269fa17088395dfc0f456cedd2",
-      "url": "https://github.com/windwp/nvim-autopairs/archive/6522027785b305269fa17088395dfc0f456cedd2.tar.gz",
-      "hash": "1i63wdgm54n3iiiix0y18mjvy2rsswc4iybqppsfpvi8cg2xjpa6"
+      "revision": "84a81a7d1f28b381b32acf1e8fe5ff5bef4f7968",
+      "url": "https://github.com/windwp/nvim-autopairs/archive/84a81a7d1f28b381b32acf1e8fe5ff5bef4f7968.tar.gz",
+      "hash": "07w8shkvmhxn7gpx4zac34r0xb7qqs2z2m6hk9y7ccr6w2dczpxy"
     },
     "nvim-bufferline-lua": {
       "type": "Git",
@@ -1629,9 +1629,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "1e1900b0769324a9675ef85b38f99cca29e203b3",
-      "url": "https://github.com/hrsh7th/nvim-cmp/archive/1e1900b0769324a9675ef85b38f99cca29e203b3.tar.gz",
-      "hash": "1yqg4gnzmlm9h5rcmzv7msjmqna0ffn7gllf5knfkps5ns0ynpyf"
+      "revision": "059e89495b3ec09395262f16b1ad441a38081d04",
+      "url": "https://github.com/hrsh7th/nvim-cmp/archive/059e89495b3ec09395262f16b1ad441a38081d04.tar.gz",
+      "hash": "0yfxjkascn45svvzx727kz20bm6lkflkx4jc8nrx3rxv0j39wbb0"
     },
     "nvim-colorizer-lua": {
       "type": "Git",
@@ -1733,9 +1733,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "93b8040115c9114dac1047311763bef275e752dc",
-      "url": "https://github.com/mfussenegger/nvim-lint/archive/93b8040115c9114dac1047311763bef275e752dc.tar.gz",
-      "hash": "1115rn9npzj2xdj2zr1ayhfy76281zv0avbiyi5vgnvfg7064jmq"
+      "revision": "810f2f06611677c965e54636a27fd176a795a4d2",
+      "url": "https://github.com/mfussenegger/nvim-lint/archive/810f2f06611677c965e54636a27fd176a795a4d2.tar.gz",
+      "hash": "0d0ilcwp8v6mci9s1hwn9qvwp1marrq2cgidry4p2ylp7qps96nk"
     },
     "nvim-lspconfig": {
       "type": "Git",
@@ -1746,9 +1746,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "a785eb7ad5adf9341f5e9fc8bc3b25af4fdc9385",
-      "url": "https://github.com/neovim/nvim-lspconfig/archive/a785eb7ad5adf9341f5e9fc8bc3b25af4fdc9385.tar.gz",
-      "hash": "02bc6g1dq54hmg481dd2vywx1pirklymsq36dlwzg77qr2hr6701"
+      "revision": "40f120c10ea4b87311175539a183c3b75eab95a3",
+      "url": "https://github.com/neovim/nvim-lspconfig/archive/40f120c10ea4b87311175539a183c3b75eab95a3.tar.gz",
+      "hash": "0fiqibnfqyrfa5mma7yz2xb19y9wkvsa6a6yjylk8zfair8yb5j0"
     },
     "nvim-metals": {
       "type": "Git",
@@ -1759,9 +1759,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "f763b65fd71cb17d544753194fd91090e611c6e0",
-      "url": "https://github.com/scalameta/nvim-metals/archive/f763b65fd71cb17d544753194fd91090e611c6e0.tar.gz",
-      "hash": "0ayn8npywhr9j1rlhvq5kij0s3751hh89fd5qqp1iqjqr9mg4ns8"
+      "revision": "4610aceb97fbcf2b050220ee5f83527e5c1699c5",
+      "url": "https://github.com/scalameta/nvim-metals/archive/4610aceb97fbcf2b050220ee5f83527e5c1699c5.tar.gz",
+      "hash": "082skbc8iml0fnfvy1w2f552bkpmj1czc436mk2nzh73bxi5wh91"
     },
     "nvim-navbuddy": {
       "type": "Git",
@@ -1902,9 +1902,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "5b75cf5fdb74054fc8badb2e7ca9911dc0470d94",
-      "url": "https://github.com/kevinhwang91/nvim-ufo/archive/5b75cf5fdb74054fc8badb2e7ca9911dc0470d94.tar.gz",
-      "hash": "0arbnim2lchd4khrr06f5n0vsj29ahrs7v277j9vmnkmrfpjzvhb"
+      "revision": "5b5435cd510f6520676ab609bdbf477e6beb6029",
+      "url": "https://github.com/kevinhwang91/nvim-ufo/archive/5b5435cd510f6520676ab609bdbf477e6beb6029.tar.gz",
+      "hash": "0qmq63hw6gljsai080gi6bbay2jnxpicrdlwigay5kd34jldxbj4"
     },
     "nvim-web-devicons": {
       "type": "Git",
@@ -1941,9 +1941,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "ab887d926c2665a708fbe9e6c4654042cc5f4c60",
-      "url": "https://github.com/stevearc/oil.nvim/archive/ab887d926c2665a708fbe9e6c4654042cc5f4c60.tar.gz",
-      "hash": "13jp8i11yhl9xjki3pcyr1q1gzskskm2fgb3slrwfphn586jb5i6"
+      "revision": "302bbaceeafc690e6419e0c8296e804d60cb9446",
+      "url": "https://github.com/stevearc/oil.nvim/archive/302bbaceeafc690e6419e0c8296e804d60cb9446.tar.gz",
+      "hash": "155v10myfpahyf9hf2x3dmp8ljjqavmqg1958x255i9l5swqcp5g"
     },
     "omnisharp-extended-lsp-nvim": {
       "type": "Git",
@@ -1980,9 +1980,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "145dce4d2f1bbaed5ff9e353822981b783627b32",
-      "url": "https://github.com/nvim-orgmode/orgmode/archive/145dce4d2f1bbaed5ff9e353822981b783627b32.tar.gz",
-      "hash": "0vy5wx8kwf0k7sx27cy6lcqvni5njq1nhcj2yxk8xkdn61wk7gyi"
+      "revision": "2929054293953e486a25c9768095455987ba391b",
+      "url": "https://github.com/nvim-orgmode/orgmode/archive/2929054293953e486a25c9768095455987ba391b.tar.gz",
+      "hash": "08x9yx6iblscfj273adzvhj8xv72i8kd89bf1yd93n80lkdmizyf"
     },
     "otter-nvim": {
       "type": "Git",
@@ -2045,9 +2045,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "4223fb903cbafc3bd8a87a314dac375bbd1c01ce",
-      "url": "https://github.com/tris203/precognition.nvim/archive/4223fb903cbafc3bd8a87a314dac375bbd1c01ce.tar.gz",
-      "hash": "11ng6p0xmrjky5xr9jdkrrav7is9r090qhs2fsnbg16124bgb0g5"
+      "revision": "80ac0a99064eba71894dd164e891cc5d7e05827e",
+      "url": "https://github.com/tris203/precognition.nvim/archive/80ac0a99064eba71894dd164e891cc5d7e05827e.tar.gz",
+      "hash": "1v1knpvd3wxvixmfyzrjwg9r7xbixg53n4dvvk7r8d05y5cgbzmc"
     },
     "project-nvim": {
       "type": "Git",
@@ -2110,9 +2110,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "6b66c32364cd3e6101d37fd71ba4c6fbb2eddfda",
-      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/6b66c32364cd3e6101d37fd71ba4c6fbb2eddfda.tar.gz",
-      "hash": "0hlsxh1bjfmzb4vh87631nbi0xl1svs9qdkb3id6ybks8n4qb9jw"
+      "revision": "d2285137fa4fbc0b4152cb444008166962b727b5",
+      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/d2285137fa4fbc0b4152cb444008166962b727b5.tar.gz",
+      "hash": "01mawxqfrn2sf6f6ngcsp9cv7p4w43dx3zr6n635gg1s6wsi59bj"
     },
     "rose-pine": {
       "type": "Git",
@@ -2123,9 +2123,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "7d1b5c7dcd274921f0f58e90a8bf935f6a95fbf3",
-      "url": "https://github.com/rose-pine/neovim/archive/7d1b5c7dcd274921f0f58e90a8bf935f6a95fbf3.tar.gz",
-      "hash": "0iy9is76bhgb17v0l7mr95mkhd9b4ah917v9shx74jp1xsgc481q"
+      "revision": "96ff3993a67356ee85d1cdab9be652cdc1c5d1ac",
+      "url": "https://github.com/rose-pine/neovim/archive/96ff3993a67356ee85d1cdab9be652cdc1c5d1ac.tar.gz",
+      "hash": "0p712rivi5i3zlrigm86p8vrn1nvg4qils86snlw717cq3scj9gj"
     },
     "rtp-nvim": {
       "type": "Git",
@@ -2162,9 +2162,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "1486b5a2cc0de646d6d0837ec77127c9d6e2c50f",
-      "url": "https://github.com/mrcjkb/rustaceanvim/archive/1486b5a2cc0de646d6d0837ec77127c9d6e2c50f.tar.gz",
-      "hash": "1gl4i8pbmia78srxcsi131vxby5d8w9mn0ydzl3r0v7pawyvwr9q"
+      "revision": "0f7e844e3d82703ae8fe82b6d3ab40041b3cd9f8",
+      "url": "https://github.com/mrcjkb/rustaceanvim/archive/0f7e844e3d82703ae8fe82b6d3ab40041b3cd9f8.tar.gz",
+      "hash": "0z7q7gp2fa6fmpndnn9043wihvbv04h60vpikq84yfa4yvwz282g"
     },
     "smartcolumn-nvim": {
       "type": "Git",
@@ -2425,9 +2425,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "a21a0b4f593e1fb17b17882f1ab3a3c1b943b831",
-      "url": "https://github.com/gbprod/yanky.nvim/archive/a21a0b4f593e1fb17b17882f1ab3a3c1b943b831.tar.gz",
-      "hash": "1sk3acrwwmx9wfxnfymgvl88bnp0xh8a30pyx040czrj3zl5l920"
+      "revision": "98b9c21d3c06d79f68fd9d471dcc28fc6d2d72ef",
+      "url": "https://github.com/gbprod/yanky.nvim/archive/98b9c21d3c06d79f68fd9d471dcc28fc6d2d72ef.tar.gz",
+      "hash": "1bdplxlhsc72kmbzmi7x4p378f3dyjdm3ncikkjs3qwxkvjl1bxw"
     }
   },
   "version": 5

From 94b58381755b0329e2aa29f0766d4553c84e0aed Mon Sep 17 00:00:00 2001
From: Venkatesan Ravi <venkyrocker7777@gmail.com>
Date: Thu, 3 Apr 2025 06:27:59 -0700
Subject: [PATCH 092/202] lsp/lsp-aga: add catppuccin integration (#779)

Co-authored-by: raf <raf@notashelf.dev>
---
 docs/release-notes/rl-0.8.md               |  1 +
 modules/plugins/lsp/lspsaga/lspsaga.nix    | 29 ++++++++++++++++------
 modules/plugins/theme/supported-themes.nix | 25 ++++++++++---------
 3 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 368df9f5..48d9e05f 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -292,6 +292,7 @@
 
 - Add lint (luacheck) and formatting (stylua) support for Lua.
 - Add lint (markdownlint-cli2) support for Markdown.
+- Add catppuccin integration for Lspsaga.
 
 [tebuevd](https://github.com/tebuevd):
 
diff --git a/modules/plugins/lsp/lspsaga/lspsaga.nix b/modules/plugins/lsp/lspsaga/lspsaga.nix
index 39ce6298..570cee1a 100644
--- a/modules/plugins/lsp/lspsaga/lspsaga.nix
+++ b/modules/plugins/lsp/lspsaga/lspsaga.nix
@@ -6,6 +6,19 @@
   inherit (lib.modules) mkRemovedOptionModule;
   inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.nvim.types) borderType mkPluginSetupOption;
+  inherit (lib.nvim.lua) mkLuaInline;
+
+  uiKindSetupOpts =
+    if config.vim.theme.enable && config.vim.theme.name == "catppuccin"
+    then {
+      ui.kind =
+        mkLuaInline
+        # lua
+        ''
+          require("catppuccin.groups.integrations.lsp_saga").custom_kind()
+        '';
+    }
+    else {};
 in {
   imports = [
     (mkRemovedOptionModule ["vim" "lsp" "lspsaga" "mappings"] ''
@@ -21,12 +34,14 @@ in {
   options.vim.lsp.lspsaga = {
     enable = mkEnableOption "LSP Saga";
 
-    setupOpts = mkPluginSetupOption "lspsaga" {
-      border_style = mkOption {
-        type = borderType;
-        default = config.vim.ui.borders.globalStyle;
-        description = "Border type, see {command}`:help nvim_open_win`";
-      };
-    };
+    setupOpts =
+      mkPluginSetupOption "lspsaga" {
+        border_style = mkOption {
+          type = borderType;
+          default = config.vim.ui.borders.globalStyle;
+          description = "Border type, see {command}`:help nvim_open_win`";
+        };
+      }
+      // uiKindSetupOpts;
   };
 }
diff --git a/modules/plugins/theme/supported-themes.nix b/modules/plugins/theme/supported-themes.nix
index 0b5cb90b..2b427871 100644
--- a/modules/plugins/theme/supported-themes.nix
+++ b/modules/plugins/theme/supported-themes.nix
@@ -66,21 +66,22 @@ in {
         transparent_background = ${boolToString transparent},
         term_colors = true,
         integrations = {
-      	  nvimtree = {
-      		  enabled = true,
-      		  transparent_panel = ${boolToString transparent},
-      		  show_root = true,
-      	  },
+          nvimtree = {
+            enabled = true,
+            transparent_panel = ${boolToString transparent},
+            show_root = true,
+          },
 
           hop = true,
-      	  gitsigns = true,
-      	  telescope = true,
-      	  treesitter = true,
+          gitsigns = true,
+          telescope = true,
+          treesitter = true,
           treesitter_context = true,
-      	  ts_rainbow = true,
+          ts_rainbow = true,
           fidget = true,
           alpha = true,
           leap = true,
+          lsp_saga = true,
           markdown = true,
           noice = true,
           notify = true, -- nvim-notify
@@ -106,9 +107,9 @@ in {
       style' =
         warnIf (style == "light") "oxocarbon: light theme is not well-supported" style;
     in ''
-       require('oxocarbon')
-       vim.opt.background = "${style'}"
-       vim.cmd.colorscheme = "oxocarbon"
+      require('oxocarbon')
+      vim.opt.background = "${style'}"
+      vim.cmd.colorscheme = "oxocarbon"
       ${optionalString transparent ''
         vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
         vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })

From 45b4f0b31931f14e01eec8522067b75b09d476c5 Mon Sep 17 00:00:00 2001
From: Venkatesan Ravi <venkyrocker7777@gmail.com>
Date: Fri, 4 Apr 2025 01:13:09 +0000
Subject: [PATCH 093/202] tabline/bufferline: add catppuccin integration

---
 docs/release-notes/rl-0.8.md                      |  2 +-
 .../plugins/tabline/nvim-bufferline/config.nix    |  2 +-
 .../tabline/nvim-bufferline/nvim-bufferline.nix   | 15 +++++++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 48d9e05f..49bf4eb9 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -292,7 +292,7 @@
 
 - Add lint (luacheck) and formatting (stylua) support for Lua.
 - Add lint (markdownlint-cli2) support for Markdown.
-- Add catppuccin integration for Lspsaga.
+- Add catppuccin integration for Bufferline, Lspsaga.
 
 [tebuevd](https://github.com/tebuevd):
 
diff --git a/modules/plugins/tabline/nvim-bufferline/config.nix b/modules/plugins/tabline/nvim-bufferline/config.nix
index 4989e991..965f81f0 100644
--- a/modules/plugins/tabline/nvim-bufferline/config.nix
+++ b/modules/plugins/tabline/nvim-bufferline/config.nix
@@ -9,7 +9,7 @@
   inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.tabline.nvimBufferline;
-  self = import ./nvim-bufferline.nix {inherit lib;};
+  self = import ./nvim-bufferline.nix {inherit config lib;};
   inherit (self.options.vim.tabline.nvimBufferline) mappings;
 in {
   config = mkIf cfg.enable {
diff --git a/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
index dc32226e..5a4f1ff0 100644
--- a/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
+++ b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkOption mkEnableOption literalExpression;
   inherit (lib.types) enum bool either nullOr str int listOf attrs;
   inherit (lib.generators) mkLuaInline;
@@ -23,7 +27,14 @@ in {
     setupOpts = mkPluginSetupOption "Bufferline-nvim" {
       highlights = mkOption {
         type = either attrs luaInline;
-        default = {};
+        default =
+          if config.vim.theme.enable && config.vim.theme.name == "catppuccin"
+          then
+            mkLuaInline
+            ''
+              require("catppuccin.groups.integrations.bufferline").get()
+            ''
+          else {};
         description = ''
           Overrides the highlight groups of bufferline.
 

From 68346ebedea3f33ca93cf9b77ca69562660faf2d Mon Sep 17 00:00:00 2001
From: rafiq <mohammadrafiq567@gmail.com>
Date: Fri, 4 Apr 2025 19:17:11 +0800
Subject: [PATCH 094/202] Merge pull request #787 from rrvsh/fix/pylsp-pkgs

languages/python get python-lsp-server python3Packages
---
 docs/release-notes/rl-0.8.md         | 4 ++++
 modules/plugins/languages/python.nix | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 49bf4eb9..e8239681 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -308,3 +308,7 @@
 
 - Fix oil config referencing snacks
 - Add [flash.nvim] plugin to `vim.utility.motion.flash-nvim`
+
+[rrvsh](https://github.com/rrvsh):
+
+- Fix namespace of python-lsp-server by changing it to python3Packages
diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix
index ccb15f7c..476b56ef 100644
--- a/modules/plugins/languages/python.nix
+++ b/modules/plugins/languages/python.nix
@@ -47,7 +47,7 @@
     };
 
     python-lsp-server = {
-      package = pkgs.python-lsp-server;
+      package = pkgs.python3Packages.python-lsp-server;
       lspConfig = ''
         lspconfig.pylsp.setup{
           capabilities = capabilities;

From c5bc6d503ef595745f77e2d9c550651c198879ac Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 4 Apr 2025 09:52:23 +0300
Subject: [PATCH 095/202] neovim/diagnostics: init module

---
 docs/release-notes/rl-0.8.md        |   8 ++-
 modules/neovim/init/default.nix     |   1 +
 modules/neovim/init/diagnostics.nix | 102 ++++++++++++++++++++++++++++
 3 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 modules/neovim/init/diagnostics.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 368df9f5..49da794b 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -87,6 +87,10 @@
 - Add [oil.nvim] as an alternative file explorer. It will be available under
   `vim.utility.oil-nvim`.
 
+- Add `vim.diagnostics` to interact with Neovim's diagnostics module. Available
+  options for `vim.diagnostic.config()` can now be customized through the
+  [](#opt-vim.diagnostics.config) in nvf.
+
 [amadaluzia](https://github.com/amadaluzia):
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
@@ -253,8 +257,8 @@
   [friendly-snippets](https://github.com/rafamadriz/friendly-snippets) so
   blink.cmp can source snippets from it.
 - Fix [blink.cmp] breaking when built-in sources were modified.
-- Fix [conform.nvim] not allowing disabling formatting on and after save.
-  Use `null` value to disable them if conform is enabled.
+- Fix [conform.nvim] not allowing disabling formatting on and after save. Use
+  `null` value to disable them if conform is enabled.
 
 [TheColorman](https://github.com/TheColorman):
 
diff --git a/modules/neovim/init/default.nix b/modules/neovim/init/default.nix
index ac9d29e5..0e7a4c6b 100644
--- a/modules/neovim/init/default.nix
+++ b/modules/neovim/init/default.nix
@@ -3,6 +3,7 @@
     ./autocmds.nix
     ./basic.nix
     ./debug.nix
+    ./diagnostics.nix
     ./highlight.nix
     ./spellcheck.nix
   ];
diff --git a/modules/neovim/init/diagnostics.nix b/modules/neovim/init/diagnostics.nix
new file mode 100644
index 00000000..26ca6e84
--- /dev/null
+++ b/modules/neovim/init/diagnostics.nix
@@ -0,0 +1,102 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.options) mkOption mkEnableOption literalExpression;
+  inherit (lib.types) attrsOf anything oneOf bool submodule;
+  inherit (lib.nvim.dag) entryAfter;
+  inherit (lib.nvim.types) luaInline;
+  inherit (lib.nvim.lua) toLuaObject;
+
+  cfg = config.vim.diagnostics;
+
+  diagnosticType = oneOf [(attrsOf anything) bool luaInline];
+  diagnosticsSubmodule = submodule {
+    freeformType = attrsOf diagnosticType;
+    underline = mkOption {
+      type = diagnosticType;
+      default = true;
+      description = "Use underline for diagnostics.";
+    };
+
+    virtual_text = mkOption {
+      type = diagnosticType;
+      default = false;
+      example = literalExpression ''
+        {
+          format = lib.generators.mkLuaInline '''
+            function(diagnostic)
+              return string.format("%s (%s)", diagnostic.message, diagnostic.source)
+            end
+          ''';
+        }
+      '';
+
+      description = ''
+        Use virtual text for diagnostics. If multiple diagnostics are set for a namespace,
+        one prefix per diagnostic + the last diagnostic message are shown.
+      '';
+    };
+
+    virtual_lines = mkOption {
+      type = diagnosticType;
+      default = false;
+      description = ''
+        Use virtual lines for diagnostics.
+      '';
+    };
+
+    signs = mkOption {
+      type = diagnosticType;
+      default = false;
+      example = {
+        signs.text = {
+          "vim.diagnostic.severity.ERROR" = "󰅚 ";
+          "vim.diagnostic.severity.WARN" = "󰀪 ";
+        };
+      };
+      description = ''
+        Use signs for diagnostics. See {command}`:help diagnostic-signs`.
+      '';
+    };
+
+    update_in_insert = mkOption {
+      type = bool;
+      default = false;
+      description = ''
+        Update diagnostics in Insert mode. If `false`, diagnostics will
+        be updated on InsertLeave ({command}`:help InsertLeave`).
+      '';
+    };
+  };
+in {
+  options.vim = {
+    diagnostics = {
+      enable = mkEnableOption "diagostics module for Neovim";
+      config = mkOption {
+        type = diagnosticsSubmodule;
+        default = {};
+        description = ''
+          Values that will be passed to `vim.diagnostic.config` after being converted
+          to a Lua table. Possible values for each key can be found in the help text
+          for `vim.diagnostics.Opts`. You may find more about the diagnostics API of
+          Neovim in {command}`:help diagnostic-api`.
+
+          :::{.note}
+          This option is freeform. You may set values that are not present in nvf
+          documentation, but those values will not be fully type checked. Please
+          refer to the help text for `vim.diagnostic.Opts` for appropriate values.
+          :::
+        '';
+      };
+    };
+  };
+
+  config.vim = mkIf cfg.enable {
+    luaConfigRC.diagnostics = entryAfter ["basic"] ''
+      vim.diagnostic.config(${toLuaObject cfg.config})
+    '';
+  };
+}

From 335a878a8f89604d7f6bb39d80874c2e227f1d5d Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 4 Apr 2025 10:17:31 +0300
Subject: [PATCH 096/202] lsp: deprecate lsplines in favor of `vim.diagnostics`

---
 configuration.nix                         |  1 -
 modules/extra/deprecations.nix            |  7 +++++++
 modules/plugins/lsp/default.nix           |  1 -
 modules/plugins/lsp/lsplines/config.nix   | 21 ---------------------
 modules/plugins/lsp/lsplines/default.nix  |  6 ------
 modules/plugins/lsp/lsplines/lsplines.nix | 11 -----------
 6 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 modules/plugins/lsp/lsplines/config.nix
 delete mode 100644 modules/plugins/lsp/lsplines/default.nix
 delete mode 100644 modules/plugins/lsp/lsplines/lsplines.nix

diff --git a/configuration.nix b/configuration.nix
index 78dad9c7..011d6fae 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -25,7 +25,6 @@ isMaximal: {
       trouble.enable = true;
       lspSignature.enable = true;
       otter-nvim.enable = isMaximal;
-      lsplines.enable = isMaximal;
       nvim-docs-view.enable = isMaximal;
     };
 
diff --git a/modules/extra/deprecations.nix b/modules/extra/deprecations.nix
index 5efe2ae2..86497130 100644
--- a/modules/extra/deprecations.nix
+++ b/modules/extra/deprecations.nix
@@ -104,6 +104,13 @@ in {
         their behaviour was abstract, and confusing. Please use 'vim.options' or 'vim.luaConfigRC'
         to replicate previous behaviour.
       '')
+
+      # 2025-04-04
+      (mkRemovedOptionModule ["vim" "lsp" "lsplines"] ''
+        lsplines module has been removed from nvf, as its functionality is now built into Neovim
+        under the diagnostics module. Please consider using one of 'vim.diagnostics.config' or
+        'vim.luaConfigRC' to configure LSP lines for Neovim through its own diagnostics API.
+      '')
     ]
 
     # Migrated via batchRenameOptions. Further batch renames must be below this line.
diff --git a/modules/plugins/lsp/default.nix b/modules/plugins/lsp/default.nix
index 421f5fda..eb694583 100644
--- a/modules/plugins/lsp/default.nix
+++ b/modules/plugins/lsp/default.nix
@@ -15,7 +15,6 @@
     ./lightbulb
     ./otter
     ./lspkind
-    ./lsplines
     ./nvim-docs-view
   ];
 }
diff --git a/modules/plugins/lsp/lsplines/config.nix b/modules/plugins/lsp/lsplines/config.nix
deleted file mode 100644
index bb07edc9..00000000
--- a/modules/plugins/lsp/lsplines/config.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib.modules) mkIf;
-  inherit (lib.nvim.dag) entryAfter;
-
-  cfg = config.vim.lsp;
-in {
-  config = mkIf (cfg.enable && cfg.lsplines.enable) {
-    vim.startPlugins = ["lsp-lines"];
-    vim.pluginRC.lsplines = entryAfter ["lspconfig"] ''
-      require("lsp_lines").setup()
-
-      vim.diagnostic.config({
-        virtual_text = false,
-      })
-    '';
-  };
-}
diff --git a/modules/plugins/lsp/lsplines/default.nix b/modules/plugins/lsp/lsplines/default.nix
deleted file mode 100644
index 359cec4f..00000000
--- a/modules/plugins/lsp/lsplines/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./config.nix
-    ./lsplines.nix
-  ];
-}
diff --git a/modules/plugins/lsp/lsplines/lsplines.nix b/modules/plugins/lsp/lsplines/lsplines.nix
deleted file mode 100644
index aac4cbbc..00000000
--- a/modules/plugins/lsp/lsplines/lsplines.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{lib, ...}: let
-  inherit (lib.options) mkEnableOption;
-in {
-  options.vim.lsp = {
-    lsplines = {
-      enable = mkEnableOption ''
-        diagnostics using virtual lines on top of the real line of code. [lsp_lines]
-      '';
-    };
-  };
-}

From 37397706d67933baa9c6768a8d97158b1551574e Mon Sep 17 00:00:00 2001
From: Venkatesan Ravi <venkyrocker7777@gmail.com>
Date: Fri, 4 Apr 2025 12:18:59 +0000
Subject: [PATCH 097/202] tabline/bufferline: add neo-tree integration

---
 docs/release-notes/rl-0.8.md                                | 1 +
 modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index e8239681..2934a94b 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -293,6 +293,7 @@
 - Add lint (luacheck) and formatting (stylua) support for Lua.
 - Add lint (markdownlint-cli2) support for Markdown.
 - Add catppuccin integration for Bufferline, Lspsaga.
+- Add neo-tree integration for Bufferline.
 
 [tebuevd](https://github.com/tebuevd):
 
diff --git a/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
index 5a4f1ff0..997c9ba3 100644
--- a/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
+++ b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
@@ -279,6 +279,12 @@ in {
               highlight = "Directory";
               separator = true;
             }
+            {
+              filetype = "neo-tree";
+              text = "File Explorer";
+              highlight = "Directory";
+              separator = true;
+            }
           ];
           description = "The windows to offset bufferline above, see `:help bufferline-offset`";
         };

From 072f7599ae68bd3c75eb36f8f23da79829f660b9 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 4 Apr 2025 16:45:05 +0300
Subject: [PATCH 098/202] treesitter: mention builtGrammars in grammars option

---
 modules/plugins/treesitter/treesitter.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/plugins/treesitter/treesitter.nix b/modules/plugins/treesitter/treesitter.nix
index 322d2eb0..d88cc1a9 100644
--- a/modules/plugins/treesitter/treesitter.nix
+++ b/modules/plugins/treesitter/treesitter.nix
@@ -24,12 +24,19 @@ in {
     grammars = mkOption {
       type = listOf package;
       default = [];
+      example = literalExpression ''
+        pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
+          regex
+          kdl
+        ];
+      '';
       description = ''
-        List of treesitter grammars to install.
+        List of treesitter grammars to install. For grammars to be installed properly,
+        you must use grammars from `pkgs.vimPlugins.nvim-treesitter.builtGrammars`.
 
-        For languages already supported by nvf, you may
-        use the {option}`vim.language.<lang>.treesitter` options, which
-        will automatically add the required grammars to this.
+        For languages already supported by nvf, you may use
+        {option}`vim.language.<lang>.treesitter` options, which will automatically add
+        the required grammars to this.
       '';
     };
 

From efd67cd82f834f211e0099ac2a79b3dd015546d1 Mon Sep 17 00:00:00 2001
From: Venkatesan Ravi <venkyrocker7777@gmail.com>
Date: Fri, 4 Apr 2025 16:26:18 +0000
Subject: [PATCH 099/202] ui/illuminate: add more applicable filetypes to
 denylist

---
 docs/release-notes/rl-0.8.md                 | 1 +
 modules/plugins/ui/illuminate/illuminate.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 2934a94b..3642df7b 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -294,6 +294,7 @@
 - Add lint (markdownlint-cli2) support for Markdown.
 - Add catppuccin integration for Bufferline, Lspsaga.
 - Add neo-tree integration for Bufferline.
+- Add more applicable filetypes to illuminate denylist.
 
 [tebuevd](https://github.com/tebuevd):
 
diff --git a/modules/plugins/ui/illuminate/illuminate.nix b/modules/plugins/ui/illuminate/illuminate.nix
index b910101f..4096e73c 100644
--- a/modules/plugins/ui/illuminate/illuminate.nix
+++ b/modules/plugins/ui/illuminate/illuminate.nix
@@ -11,7 +11,7 @@ in {
     setupOpts = mkPluginSetupOption "vim-illuminate" {
       filetypes_denylist = mkOption {
         type = listOf str;
-        default = ["dirvish" "fugitive" "NvimTree" "TelescopePrompt"];
+        default = ["dirvish" "fugitive" "help" "neo-tree" "notify" "NvimTree" "TelescopePrompt"];
         description = "Filetypes to not illuminate, this overrides `filetypes_allowlist`";
       };
     };

From 19339ac3cd1b5c47a1f6729ceb8c50bfb02dcdca Mon Sep 17 00:00:00 2001
From: Venkatesan Ravi <venkyrocker7777@gmail.com>
Date: Fri, 4 Apr 2025 17:41:44 +0000
Subject: [PATCH 100/202] mini/indentscope: add autocmd to disable indentscope
 in applicable filetypes

---
 docs/release-notes/rl-0.8.md                    |  1 +
 modules/plugins/mini/indentscope/config.nix     | 16 ++++++++++++++++
 .../plugins/mini/indentscope/indentscope.nix    | 17 ++++++++++-------
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 3642df7b..8d5562c4 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -295,6 +295,7 @@
 - Add catppuccin integration for Bufferline, Lspsaga.
 - Add neo-tree integration for Bufferline.
 - Add more applicable filetypes to illuminate denylist.
+- Disable mini.indentscope for applicable filetypes.
 
 [tebuevd](https://github.com/tebuevd):
 
diff --git a/modules/plugins/mini/indentscope/config.nix b/modules/plugins/mini/indentscope/config.nix
index 2e6ec03d..a6fd16d7 100644
--- a/modules/plugins/mini/indentscope/config.nix
+++ b/modules/plugins/mini/indentscope/config.nix
@@ -3,6 +3,7 @@
   lib,
   ...
 }: let
+  inherit (lib.generators) mkLuaInline;
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.dag) entryAnywhere;
   inherit (lib.nvim.lua) toLuaObject;
@@ -10,6 +11,21 @@
   cfg = config.vim.mini.indentscope;
 in {
   vim = mkIf cfg.enable {
+    autocmds = [
+      {
+        callback = mkLuaInline ''
+          function()
+            local ignore_filetypes = ${toLuaObject cfg.setupOpts.ignore_filetypes}
+            if vim.tbl_contains(ignore_filetypes, vim.bo.filetype) then
+              vim.b.miniindentscope_disable = true
+            end
+          end
+        '';
+        desc = "Disable indentscope for certain filetypes";
+        event = ["FileType"];
+      }
+    ];
+
     startPlugins = ["mini-indentscope"];
 
     pluginRC.mini-indentscope = entryAnywhere ''
diff --git a/modules/plugins/mini/indentscope/indentscope.nix b/modules/plugins/mini/indentscope/indentscope.nix
index 6feffaee..6a2224c8 100644
--- a/modules/plugins/mini/indentscope/indentscope.nix
+++ b/modules/plugins/mini/indentscope/indentscope.nix
@@ -1,13 +1,16 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib.options) mkEnableOption;
+{lib, ...}: let
+  inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
+  inherit (lib.types) str listOf;
 in {
   options.vim.mini.indentscope = {
     enable = mkEnableOption "mini.indentscope";
-    setupOpts = mkPluginSetupOption "mini.indentscope" {};
+    setupOpts = mkPluginSetupOption "mini.indentscope" {
+      ignore_filetypes = mkOption {
+        type = listOf str;
+        default = ["help" "neo-tree" "notify" "NvimTree" "TelescopePrompt"];
+        description = "File types to ignore for illuminate";
+      };
+    };
   };
 }

From 1a04f40e89365732ad0a1cd255b7b4a333943d69 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 5 Apr 2025 03:54:01 +0300
Subject: [PATCH 101/202] pins: remove lsp-lines

---
 npins/sources.json | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/npins/sources.json b/npins/sources.json
index 86fa0f6b..140b3b24 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -747,18 +747,6 @@
       "url": "https://github.com/kawre/leetcode.nvim/archive/db7e1cd6b9191b34b4c1f2f96e4e3949cde9f951.tar.gz",
       "hash": "1d3lb7625b2qdzqm74mzrac66rxqc0qgjd3mb37l4v8wqyiyv6pp"
     },
-    "lsp-lines": {
-      "type": "Git",
-      "repository": {
-        "type": "Git",
-        "url": "https://git.sr.ht/~whynothugo/lsp_lines.nvim"
-      },
-      "branch": "main",
-      "submodules": false,
-      "revision": "a92c755f182b89ea91bd8a6a2227208026f27b4d",
-      "url": null,
-      "hash": "14ym4d8vgvw2vhsaxik8612wyvszd895q69n9h100yd7x5jqhy4c"
-    },
     "lsp-signature-nvim": {
       "type": "Git",
       "repository": {

From a1fbdf49fdc97b615030bde532bff19632c49403 Mon Sep 17 00:00:00 2001
From: Venkatesan Ravi <venkyrocker7777@gmail.com>
Date: Sat, 5 Apr 2025 01:32:58 +0000
Subject: [PATCH 102/202] lsp: add inlayHints support

---
 docs/release-notes/rl-0.8.md   |  1 +
 modules/plugins/lsp/config.nix | 20 ++++++++++++++++++++
 modules/plugins/lsp/module.nix |  3 +++
 3 files changed, 24 insertions(+)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index a245b006..8b87ae99 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -300,6 +300,7 @@
 - Add neo-tree integration for Bufferline.
 - Add more applicable filetypes to illuminate denylist.
 - Disable mini.indentscope for applicable filetypes.
+- Enable inlay hints support - `config.vim.lsp.inlayHints`.
 
 [tebuevd](https://github.com/tebuevd):
 
diff --git a/modules/plugins/lsp/config.nix b/modules/plugins/lsp/config.nix
index 0fa16e47..3702ac5f 100644
--- a/modules/plugins/lsp/config.nix
+++ b/modules/plugins/lsp/config.nix
@@ -4,6 +4,7 @@
   pkgs,
   ...
 }: let
+  inherit (lib.generators) mkLuaInline;
   inherit (lib.modules) mkIf;
   inherit (lib.strings) optionalString;
   inherit (lib.trivial) boolToString;
@@ -28,6 +29,25 @@ in {
         sourcePlugins = ["cmp-nvim-lsp"];
       };
 
+      autocmds =
+        if cfg.inlayHints.enable
+        then [
+          {
+            callback = mkLuaInline ''
+              function(event)
+                local bufnr = event.buf
+                local client = vim.lsp.get_client_by_id(event.data.client_id)
+                if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then
+                  vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = bufnr }), { bufnr = bufnr })
+                end
+              end
+            '';
+            desc = "LSP on-attach enable inlay hints autocmd";
+            event = ["LspAttach"];
+          }
+        ]
+        else [];
+
       pluginRC.lsp-setup = ''
         vim.g.formatsave = ${boolToString cfg.formatOnSave};
 
diff --git a/modules/plugins/lsp/module.nix b/modules/plugins/lsp/module.nix
index b16f9c13..f408d873 100644
--- a/modules/plugins/lsp/module.nix
+++ b/modules/plugins/lsp/module.nix
@@ -5,6 +5,9 @@ in {
   options.vim.lsp = {
     enable = mkEnableOption "LSP, also enabled automatically through null-ls and lspconfig options";
     formatOnSave = mkEnableOption "format on save";
+    inlayHints = {
+      enable = mkEnableOption "inlay hints";
+    };
     mappings = {
       goToDefinition =
         mkMappingOption "Go to definition"

From 95c0cc3bb07ec294101562f5300ab0f5cbae1258 Mon Sep 17 00:00:00 2001
From: Venkatesan Ravi <venkyrocker7777@gmail.com>
Date: Sat, 5 Apr 2025 02:00:02 +0000
Subject: [PATCH 103/202] utility/fzf-lua: remove hard dependency on fzf

---
 docs/release-notes/rl-0.8.md                | 1 +
 modules/plugins/utility/fzf-lua/fzf-lua.nix | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index a245b006..1f36e37b 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -300,6 +300,7 @@
 - Add neo-tree integration for Bufferline.
 - Add more applicable filetypes to illuminate denylist.
 - Disable mini.indentscope for applicable filetypes.
+- Fix fzf-lua having a hard dependency on fzf.
 
 [tebuevd](https://github.com/tebuevd):
 
diff --git a/modules/plugins/utility/fzf-lua/fzf-lua.nix b/modules/plugins/utility/fzf-lua/fzf-lua.nix
index c700add7..dbdf320f 100644
--- a/modules/plugins/utility/fzf-lua/fzf-lua.nix
+++ b/modules/plugins/utility/fzf-lua/fzf-lua.nix
@@ -1,15 +1,21 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }: let
-  inherit (lib.types) nullOr enum;
+  inherit (lib.types) enum package;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.nvim.types) mkPluginSetupOption borderType;
 in {
   options.vim.fzf-lua = {
     enable = mkEnableOption "fzf-lua";
     setupOpts = mkPluginSetupOption "fzf-lua" {
+      fzf_bin = mkOption {
+        type = package;
+        default = "${lib.getExe pkgs.fzf}";
+        description = "fzf package to use";
+      };
       winopts.border = mkOption {
         type = borderType;
         default = config.vim.ui.borders.globalStyle;

From e2b3daa6f839ce246978cd6607e88d01d8f3ecd3 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 5 Apr 2025 06:21:50 +0300
Subject: [PATCH 104/202] neovim/diagnostic: fix missin submodule opts

---
 modules/neovim/init/diagnostics.nix | 111 +++++++++++++++-------------
 1 file changed, 59 insertions(+), 52 deletions(-)

diff --git a/modules/neovim/init/diagnostics.nix b/modules/neovim/init/diagnostics.nix
index 26ca6e84..18717edf 100644
--- a/modules/neovim/init/diagnostics.nix
+++ b/modules/neovim/init/diagnostics.nix
@@ -12,63 +12,70 @@
 
   cfg = config.vim.diagnostics;
 
+  # Takes a boolean, a table, or a Lua list ({key = value}). We
+  # would like to allow all of those types, while clearly expressing
+  # them in the option's type. As such, this type is what it is.
   diagnosticType = oneOf [(attrsOf anything) bool luaInline];
   diagnosticsSubmodule = submodule {
+    # The table might need to be extended, so let's allow that case
+    # with a freeform type of what is supported by diagnostics opts.
     freeformType = attrsOf diagnosticType;
-    underline = mkOption {
-      type = diagnosticType;
-      default = true;
-      description = "Use underline for diagnostics.";
-    };
-
-    virtual_text = mkOption {
-      type = diagnosticType;
-      default = false;
-      example = literalExpression ''
-        {
-          format = lib.generators.mkLuaInline '''
-            function(diagnostic)
-              return string.format("%s (%s)", diagnostic.message, diagnostic.source)
-            end
-          ''';
-        }
-      '';
-
-      description = ''
-        Use virtual text for diagnostics. If multiple diagnostics are set for a namespace,
-        one prefix per diagnostic + the last diagnostic message are shown.
-      '';
-    };
-
-    virtual_lines = mkOption {
-      type = diagnosticType;
-      default = false;
-      description = ''
-        Use virtual lines for diagnostics.
-      '';
-    };
-
-    signs = mkOption {
-      type = diagnosticType;
-      default = false;
-      example = {
-        signs.text = {
-          "vim.diagnostic.severity.ERROR" = "󰅚 ";
-          "vim.diagnostic.severity.WARN" = "󰀪 ";
-        };
+    options = {
+      underline = mkOption {
+        type = diagnosticType;
+        default = true;
+        description = "Use underline for diagnostics.";
       };
-      description = ''
-        Use signs for diagnostics. See {command}`:help diagnostic-signs`.
-      '';
-    };
 
-    update_in_insert = mkOption {
-      type = bool;
-      default = false;
-      description = ''
-        Update diagnostics in Insert mode. If `false`, diagnostics will
-        be updated on InsertLeave ({command}`:help InsertLeave`).
-      '';
+      virtual_text = mkOption {
+        type = diagnosticType;
+        default = false;
+        example = literalExpression ''
+          {
+            format = lib.generators.mkLuaInline '''
+              function(diagnostic)
+                return string.format("%s (%s)", diagnostic.message, diagnostic.source)
+              end
+            ''';
+          }
+        '';
+
+        description = ''
+          Use virtual text for diagnostics. If multiple diagnostics are set for a namespace,
+          one prefix per diagnostic + the last diagnostic message are shown.
+        '';
+      };
+
+      virtual_lines = mkOption {
+        type = diagnosticType;
+        default = false;
+        description = ''
+          Use virtual lines for diagnostics.
+        '';
+      };
+
+      signs = mkOption {
+        type = diagnosticType;
+        default = false;
+        example = {
+          signs.text = {
+            "vim.diagnostic.severity.ERROR" = "󰅚 ";
+            "vim.diagnostic.severity.WARN" = "󰀪 ";
+          };
+        };
+        description = ''
+          Use signs for diagnostics. See {command}`:help diagnostic-signs`.
+        '';
+      };
+
+      update_in_insert = mkOption {
+        type = bool;
+        default = false;
+        description = ''
+          Update diagnostics in Insert mode. If `false`, diagnostics will
+          be updated on InsertLeave ({command}`:help InsertLeave`).
+        '';
+      };
     };
   };
 in {

From b7c08147e0a725b0bed8dc9d313ee3f80d97e3b5 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Fri, 4 Apr 2025 15:56:23 +0200
Subject: [PATCH 105/202] language/ts: add conform and lint rules for tsx

---
 modules/plugins/languages/ts.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix
index 8589d7ec..1736af2b 100644
--- a/modules/plugins/languages/ts.nix
+++ b/modules/plugins/languages/ts.nix
@@ -204,9 +204,13 @@ in {
     (mkIf cfg.format.enable {
       vim.formatter.conform-nvim = {
         enable = true;
-        setupOpts.formatters_by_ft.typescript = [cfg.format.type];
-        setupOpts.formatters.${cfg.format.type} = {
-          command = getExe cfg.format.package;
+        setupOpts = {
+          formatters_by_ft.typescript = [cfg.format.type];
+          # .tsx files
+          formatters_by_ft.typescriptreact = [cfg.format.type];
+          formatters.${cfg.format.type} = {
+            command = getExe cfg.format.package;
+          };
         };
       };
     })
@@ -215,6 +219,7 @@ in {
       vim.diagnostics.nvim-lint = {
         enable = true;
         linters_by_ft.typescript = cfg.extraDiagnostics.types;
+        linters_by_ft.typescriptreact = cfg.extraDiagnostics.types;
 
         linters = mkMerge (map (name: {
             ${name}.cmd = getExe diagnosticsProviders.${name}.package;

From cb1d127d2f90e22fb8ad92ec94b71c5b88ce9c48 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 5 Apr 2025 15:51:35 +0200
Subject: [PATCH 106/202] docs: update release notes

---
 docs/release-notes/rl-0.8.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 8b87ae99..0ab84f45 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -106,6 +106,7 @@
 - Add [blink.cmp] support.
 - Add `LazyFile` user event.
 - Migrate language modules from none-ls to conform/nvim-lint
+- Add tsx support in conform and lint
 
 [diniamo](https://github.com/diniamo):
 

From da57f955dfc59c62cba92c823021be03ac7593dd Mon Sep 17 00:00:00 2001
From: army castillo <arcastilloiii@gmail.com>
Date: Sat, 5 Apr 2025 23:50:41 -0400
Subject: [PATCH 107/202] assistant/codecompanion-nvim: fix nvim-cmp and
 defaults

---
 docs/release-notes/rl-0.8.md                       |  1 +
 .../assistant/codecompanion/codecompanion-nvim.nix | 14 ++++++++++++--
 modules/plugins/assistant/codecompanion/config.nix |  5 +++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 8b87ae99..161f50fe 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -198,6 +198,7 @@
   Inspiration from `vim.languages.clang.dap` implementation.
 - Add [leetcode.nvim] plugin under `vim.utility.leetcode-nvim`.
 - Add [codecompanion.nvim] plugin under `vim.assistant.codecompanion-nvim`.
+- Fix [codecompanion-nvim] plugin: nvim-cmp error and setupOpts defaults.
 
 [nezia1](https://github.com/nezia1):
 
diff --git a/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix b/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix
index 9ebe30c0..a73f1566 100644
--- a/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix
+++ b/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix
@@ -9,7 +9,12 @@ in {
 
       setupOpts = mkPluginSetupOption "codecompanion-nvim" {
         opts = {
-          send_code = mkEnableOption "code from being sent to the LLM.";
+          send_code =
+            mkEnableOption ""
+            // {
+              default = true;
+              description = "code from being sent to the LLM.";
+            };
 
           log_level = mkOption {
             type = enum ["DEBUG" "INFO" "ERROR" "TRACE"];
@@ -64,7 +69,12 @@ in {
           };
 
           chat = {
-            auto_scroll = mkEnableOption "automatic page scrolling.";
+            auto_scroll =
+              mkEnableOption ""
+              // {
+                default = true;
+                description = "automatic page scrolling.";
+              };
 
             show_settings = mkEnableOption ''
               LLM settings to appear at the top of the chat buffer.
diff --git a/modules/plugins/assistant/codecompanion/config.nix b/modules/plugins/assistant/codecompanion/config.nix
index 6b427d28..08fc8cb2 100644
--- a/modules/plugins/assistant/codecompanion/config.nix
+++ b/modules/plugins/assistant/codecompanion/config.nix
@@ -22,6 +22,11 @@ in {
       };
 
       treesitter.enable = true;
+
+      autocomplete.nvim-cmp = {
+        sources = {codecompanion-nvim = "[codecompanion]";};
+        sourcePlugins = ["codecompanion-nvim"];
+      };
     };
   };
 }

From 2ef9022b58e8fb928841e9aa3f51a1d2c2a2662c Mon Sep 17 00:00:00 2001
From: Venkatesan Ravi <venkyrocker7777@gmail.com>
Date: Sun, 6 Apr 2025 04:46:56 +0000
Subject: [PATCH 108/202] utility/fzf-lua: fix type for fzf-bin

---
 modules/plugins/utility/fzf-lua/fzf-lua.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/plugins/utility/fzf-lua/fzf-lua.nix b/modules/plugins/utility/fzf-lua/fzf-lua.nix
index dbdf320f..0b242864 100644
--- a/modules/plugins/utility/fzf-lua/fzf-lua.nix
+++ b/modules/plugins/utility/fzf-lua/fzf-lua.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  inherit (lib.types) enum package;
+  inherit (lib.types) enum str;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.nvim.types) mkPluginSetupOption borderType;
 in {
@@ -12,9 +12,9 @@ in {
     enable = mkEnableOption "fzf-lua";
     setupOpts = mkPluginSetupOption "fzf-lua" {
       fzf_bin = mkOption {
-        type = package;
+        type = str;
         default = "${lib.getExe pkgs.fzf}";
-        description = "fzf package to use";
+        description = "Path to fzf executable";
       };
       winopts.border = mkOption {
         type = borderType;

From edbadf5d5a180ddb2cafa50774c05487146baeed Mon Sep 17 00:00:00 2001
From: Christoph Koehler <christoph@zerodeviation.net>
Date: Sat, 5 Apr 2025 22:45:25 -0600
Subject: [PATCH 109/202] fix: telescope ignore patterns

".git" is a regex, so because of the '.' it matches more than just
the .git directory, so escape the dot to make it literal. Here, that's
done with a '%'.
---
 docs/release-notes/rl-0.8.md                    | 1 +
 modules/plugins/utility/telescope/telescope.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 8b87ae99..4ce12e95 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -316,6 +316,7 @@
 
 - Fix oil config referencing snacks
 - Add [flash.nvim] plugin to `vim.utility.motion.flash-nvim`
+- Fix default telescope ignore list entry for '.git/' to properly match
 
 [rrvsh](https://github.com/rrvsh):
 
diff --git a/modules/plugins/utility/telescope/telescope.nix b/modules/plugins/utility/telescope/telescope.nix
index beacc990..9d63c3cf 100644
--- a/modules/plugins/utility/telescope/telescope.nix
+++ b/modules/plugins/utility/telescope/telescope.nix
@@ -117,7 +117,7 @@
       file_ignore_patterns = mkOption {
         description = "A table of lua regex that define the files that should be ignored.";
         type = listOf str;
-        default = ["node_modules" ".git/" "dist/" "build/" "target/" "result/"];
+        default = ["node_modules" "%.git/" "dist/" "build/" "target/" "result/"];
       };
       color_devicons = mkOption {
         description = "Boolean if devicons should be enabled or not.";

From 51d76dd51572193135a0dde94fc6ad6dbf1fff1d Mon Sep 17 00:00:00 2001
From: army castillo <arcastilloiii@gmail.com>
Date: Sun, 6 Apr 2025 02:48:58 -0400
Subject: [PATCH 110/202] assistant/codecompanion-nvim: Description clean up

Added "Whether to enable" to mkEnableOption descriptions with `//`
merge.
---
 .../codecompanion/codecompanion-nvim.nix      | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix b/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix
index a73f1566..8e5ed4cc 100644
--- a/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix
+++ b/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix
@@ -13,7 +13,9 @@ in {
             mkEnableOption ""
             // {
               default = true;
-              description = "code from being sent to the LLM.";
+              description = ''
+                Whether to enable code being sent to the LLM.
+              '';
             };
 
           log_level = mkOption {
@@ -35,7 +37,10 @@ in {
               mkEnableOption ""
               // {
                 default = true;
-                description = "a diff view to see the changes made by the LLM.";
+                description = ''
+                  Whether to enable a diff view
+                  to see the changes made by the LLM.
+                '';
               };
 
             close_chat_at = mkOption {
@@ -73,7 +78,7 @@ in {
               mkEnableOption ""
               // {
                 default = true;
-                description = "automatic page scrolling.";
+                description = "Whether to enable automatic page scrolling.";
               };
 
             show_settings = mkEnableOption ''
@@ -95,14 +100,18 @@ in {
               mkEnableOption ""
               // {
                 default = true;
-                description = "references in the chat buffer.";
+                description = ''
+                  Whether to enable references in the chat buffer.
+                '';
               };
 
             show_token_count =
               mkEnableOption ""
               // {
                 default = true;
-                description = "the token count for each response.";
+                description = ''
+                  Whether to enable the token count for each response.
+                '';
               };
 
             intro_message = mkOption {
@@ -165,7 +174,10 @@ in {
                 mkEnableOption ""
                 // {
                   default = true;
-                  description = "showing default actions in the action palette.";
+                  description = ''
+                    Whether to enable showing default
+                    actions in the action palette.
+                  '';
                 };
 
               show_default_prompt_library =
@@ -173,7 +185,8 @@ in {
                 // {
                   default = true;
                   description = ''
-                    showing default prompt library in the action palette.
+                    Whether to enable showing default
+                    prompt library in the action palette.
                   '';
                 };
             };

From 3e4f99311aeec70cb769ed09564ed9d3914a0ebc Mon Sep 17 00:00:00 2001
From: Venkatesan Ravi <venkyrocker7777@gmail.com>
Date: Sun, 6 Apr 2025 07:12:44 +0000
Subject: [PATCH 111/202] statusline/lualine: add neo-tree extension

---
 docs/release-notes/rl-0.8.md                  | 1 +
 modules/plugins/statusline/lualine/config.nix | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 32460969..4068c8f0 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -303,6 +303,7 @@
 - Disable mini.indentscope for applicable filetypes.
 - Fix fzf-lua having a hard dependency on fzf.
 - Enable inlay hints support - `config.vim.lsp.inlayHints`.
+- Add `neo-tree` extension to `lualine`.
 
 [tebuevd](https://github.com/tebuevd):
 
diff --git a/modules/plugins/statusline/lualine/config.nix b/modules/plugins/statusline/lualine/config.nix
index facfcebb..b8334bfd 100644
--- a/modules/plugins/statusline/lualine/config.nix
+++ b/modules/plugins/statusline/lualine/config.nix
@@ -14,13 +14,18 @@
   bCfg = config.vim.ui.breadcrumbs;
 in {
   config = mkMerge [
-    # TODO: move into nvim-tree file
     (mkIf config.vim.filetree.nvimTree.enable {
       vim.statusline.lualine.setupOpts = {
         extensions = ["nvim-tree"];
       };
     })
 
+    (mkIf config.vim.filetree.neo-tree.enable {
+      vim.statusline.lualine.setupOpts = {
+        extensions = ["neo-tree"];
+      };
+    })
+
     (mkIf (bCfg.enable && bCfg.lualine.winbar.enable && bCfg.source == "nvim-navic") {
       vim.statusline.lualine.setupOpts = {
         # TODO: rewrite in new syntax

From 851dbc92fb5b280207bfc8234c33369b01b8efcd Mon Sep 17 00:00:00 2001
From: Christoph Koehler <christoph@zerodeviation.net>
Date: Mon, 7 Apr 2025 12:00:02 -0600
Subject: [PATCH 112/202] Merge pull request #808 from ckoehler/gitlinker

git/gitlinker-nvim: init
---
 docs/release-notes/rl-0.8.md                  |  2 ++
 modules/plugins/git/default.nix               |  2 ++
 modules/plugins/git/gitlinker-nvim/config.nix | 23 +++++++++++++++++++
 .../plugins/git/gitlinker-nvim/default.nix    |  6 +++++
 .../git/gitlinker-nvim/gitlinker-nvim.nix     | 13 +++++++++++
 npins/sources.json                            | 13 +++++++++++
 6 files changed, 59 insertions(+)
 create mode 100644 modules/plugins/git/gitlinker-nvim/config.nix
 create mode 100644 modules/plugins/git/gitlinker-nvim/default.nix
 create mode 100644 modules/plugins/git/gitlinker-nvim/gitlinker-nvim.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 32460969..239f91b0 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -315,10 +315,12 @@
 [ckoehler](https://github.com/ckoehler):
 
 [flash.nvim]: https://github.com/folke/flash.nvim
+[gitlinker.nvim]: https://github.com/linrongbin16/gitlinker.nvim
 
 - Fix oil config referencing snacks
 - Add [flash.nvim] plugin to `vim.utility.motion.flash-nvim`
 - Fix default telescope ignore list entry for '.git/' to properly match
+- Add [gitlinker.nvim] plugin to `vim.git.gitlinker-nvim`
 
 [rrvsh](https://github.com/rrvsh):
 
diff --git a/modules/plugins/git/default.nix b/modules/plugins/git/default.nix
index 6ed92217..06c80f35 100644
--- a/modules/plugins/git/default.nix
+++ b/modules/plugins/git/default.nix
@@ -5,6 +5,7 @@ in {
     ./gitsigns
     ./vim-fugitive
     ./git-conflict
+    ./gitlinker-nvim
   ];
 
   options.vim.git = {
@@ -15,6 +16,7 @@ in {
       * gitsigns
       * vim-fugitive
       * git-conflict
+      * gitlinker-nvim
     '';
   };
 }
diff --git a/modules/plugins/git/gitlinker-nvim/config.nix b/modules/plugins/git/gitlinker-nvim/config.nix
new file mode 100644
index 00000000..d1104a28
--- /dev/null
+++ b/modules/plugins/git/gitlinker-nvim/config.nix
@@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+
+  cfg = config.vim.git.gitlinker-nvim;
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      startPlugins = ["gitlinker-nvim"];
+      lazy.plugins = {
+        "gitlinker-nvim" = {
+          package = "gitlinker-nvim";
+          setupModule = "gitlinker";
+          inherit (cfg) setupOpts;
+          cmd = ["GitLink"];
+        };
+      };
+    };
+  };
+}
diff --git a/modules/plugins/git/gitlinker-nvim/default.nix b/modules/plugins/git/gitlinker-nvim/default.nix
new file mode 100644
index 00000000..389b7a55
--- /dev/null
+++ b/modules/plugins/git/gitlinker-nvim/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./config.nix
+    ./gitlinker-nvim.nix
+  ];
+}
diff --git a/modules/plugins/git/gitlinker-nvim/gitlinker-nvim.nix b/modules/plugins/git/gitlinker-nvim/gitlinker-nvim.nix
new file mode 100644
index 00000000..f315e5f9
--- /dev/null
+++ b/modules/plugins/git/gitlinker-nvim/gitlinker-nvim.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.git.gitlinker-nvim = {
+    enable = mkEnableOption "gitlinker-nvim" // {default = config.vim.git.enable;};
+    setupOpts = mkPluginSetupOption "gitlinker-nvim" {};
+  };
+}
diff --git a/npins/sources.json b/npins/sources.json
index 140b3b24..c3ec23b1 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -562,6 +562,19 @@
       "url": "https://github.com/projekt0n/github-nvim-theme/archive/c106c9472154d6b2c74b74565616b877ae8ed31d.tar.gz",
       "hash": "1w7lz4bgfm8hq1mir4hcr8ik585d4l4w7bjl8yl3g3zklj8223pw"
     },
+    "gitlinker-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "linrongbin16",
+        "repo": "gitlinker.nvim"
+      },
+      "branch": "master",
+      "submodules": false,
+      "revision": "23982c86f50a9c3f4bc531d41b7a4a68ddd12355",
+      "url": "https://github.com/linrongbin16/gitlinker.nvim/archive/23982c86f50a9c3f4bc531d41b7a4a68ddd12355.tar.gz",
+      "hash": "1kz3gpdysxzpb27izhq0jgk59xw01mmnfvg5yrqvxnfhyjblxvqh"
+    },
     "gitsigns-nvim": {
       "type": "Git",
       "repository": {

From 28af5c1ff9fd10e7ff1fe4c3e4991d65ff5a0cc8 Mon Sep 17 00:00:00 2001
From: Venkatesan Ravi <venkyrocker7777@gmail.com>
Date: Wed, 9 Apr 2025 21:52:55 +0000
Subject: [PATCH 113/202] utility/snacks-nvim: add lualine, bufferline
 extension / offset

---
 docs/release-notes/rl-0.8.md                  |  4 +--
 modules/plugins/statusline/lualine/config.nix | 33 ++++++++++++-------
 .../nvim-bufferline/nvim-bufferline.nix       | 20 ++++-------
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 40f2af57..8177cb88 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -298,12 +298,12 @@
 - Add lint (luacheck) and formatting (stylua) support for Lua.
 - Add lint (markdownlint-cli2) support for Markdown.
 - Add catppuccin integration for Bufferline, Lspsaga.
-- Add neo-tree integration for Bufferline.
+- Add `neo-tree`, `snacks.explorer` integrations to `bufferline`.
 - Add more applicable filetypes to illuminate denylist.
 - Disable mini.indentscope for applicable filetypes.
 - Fix fzf-lua having a hard dependency on fzf.
 - Enable inlay hints support - `config.vim.lsp.inlayHints`.
-- Add `neo-tree` extension to `lualine`.
+- Add `neo-tree`, `snacks.picker` extensions to `lualine`.
 
 [tebuevd](https://github.com/tebuevd):
 
diff --git a/modules/plugins/statusline/lualine/config.nix b/modules/plugins/statusline/lualine/config.nix
index b8334bfd..89dcbbe5 100644
--- a/modules/plugins/statusline/lualine/config.nix
+++ b/modules/plugins/statusline/lualine/config.nix
@@ -14,17 +14,28 @@
   bCfg = config.vim.ui.breadcrumbs;
 in {
   config = mkMerge [
-    (mkIf config.vim.filetree.nvimTree.enable {
-      vim.statusline.lualine.setupOpts = {
-        extensions = ["nvim-tree"];
-      };
-    })
-
-    (mkIf config.vim.filetree.neo-tree.enable {
-      vim.statusline.lualine.setupOpts = {
-        extensions = ["neo-tree"];
-      };
-    })
+    {
+      vim.statusline.lualine.setupOpts.extensions =
+        (lib.optionals config.vim.filetree.nvimTree.enable ["nvim-tree"])
+        ++ (lib.optionals config.vim.filetree.neo-tree.enable ["neo-tree"])
+        ++ (lib.optionals config.vim.utility.snacks-nvim.enable [
+          {
+            # same extensions as nerdtree / neo-tree
+            # https://github.com/nvim-lualine/lualine.nvim/blob/master/lua/lualine/extensions/nerdtree.lua
+            # https://github.com/nvim-lualine/lualine.nvim/blob/master/lua/lualine/extensions/neo-tree.lua
+            sections = {
+              lualine_a = mkLuaInline ''
+                {
+                  function()
+                    return vim.fn.fnamemodify(vim.fn.getcwd(), ":~")
+                  end,
+                }
+              '';
+            };
+            filetypes = ["snacks_picker_list" "snacks_picker_input"];
+          }
+        ]);
+    }
 
     (mkIf (bCfg.enable && bCfg.lualine.winbar.enable && bCfg.source == "nvim-navic") {
       vim.statusline.lualine.setupOpts = {
diff --git a/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
index 997c9ba3..14243670 100644
--- a/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
+++ b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
@@ -272,20 +272,12 @@ in {
 
         offsets = mkOption {
           type = listOf attrs;
-          default = [
-            {
-              filetype = "NvimTree";
-              text = "File Explorer";
-              highlight = "Directory";
-              separator = true;
-            }
-            {
-              filetype = "neo-tree";
-              text = "File Explorer";
-              highlight = "Directory";
-              separator = true;
-            }
-          ];
+          default = map (filetype: {
+            inherit filetype;
+            text = "File Explorer";
+            highlight = "Directory";
+            separator = true;
+          }) ["NvimTree" "neo-tree" "snacks_layout_box"];
           description = "The windows to offset bufferline above, see `:help bufferline-offset`";
         };
 

From a6f8df678549829a0dfcd6d7609ee098efeacb09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Phan=20=C4=90=C4=83ng=20Khoa?= <ricecracker2234@proton.me>
Date: Thu, 10 Apr 2025 20:47:52 +0700
Subject: [PATCH 114/202] Merge pull request #818 from
 rice-cracker-dev/eslint-fix

languages: fix eslint_d error on load
---
 docs/release-notes/rl-0.8.md         | 1 +
 modules/plugins/languages/astro.nix  | 2 +-
 modules/plugins/languages/svelte.nix | 2 +-
 modules/plugins/languages/ts.nix     | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 40f2af57..6fc28a55 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -288,6 +288,7 @@
 [rice-cracker-dev](https://github.com/rice-cracker-dev):
 
 - `eslint_d` now checks for configuration files to load.
+- Fixed an error where `eslint_d` fails to load.
 
 [Sc3l3t0n](https://github.com/Sc3l3t0n):
 
diff --git a/modules/plugins/languages/astro.nix b/modules/plugins/languages/astro.nix
index 9c359a2e..c12f6ada 100644
--- a/modules/plugins/languages/astro.nix
+++ b/modules/plugins/languages/astro.nix
@@ -62,7 +62,7 @@
             local markers = { "eslint.config.js", "eslint.config.mjs",
               ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.yml", }
             for _, filename in ipairs(markers) do
-              local path = vim.fs.join(cwd, filename)
+              local path = vim.fs.joinpath(cwd, filename)
               if vim.loop.fs_stat(path) then
                 return require("lint.linters.eslint_d").parser(output, bufnr, cwd)
               end
diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix
index 67f11bc2..e01ec427 100644
--- a/modules/plugins/languages/svelte.nix
+++ b/modules/plugins/languages/svelte.nix
@@ -61,7 +61,7 @@
             local markers = { "eslint.config.js", "eslint.config.mjs",
               ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.yml", }
             for _, filename in ipairs(markers) do
-              local path = vim.fs.join(cwd, filename)
+              local path = vim.fs.joinpath(cwd, filename)
               if vim.loop.fs_stat(path) then
                 return require("lint.linters.eslint_d").parser(output, bufnr, cwd)
               end
diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix
index 1736af2b..ffab265b 100644
--- a/modules/plugins/languages/ts.nix
+++ b/modules/plugins/languages/ts.nix
@@ -103,7 +103,7 @@
             local markers = { "eslint.config.js", "eslint.config.mjs",
               ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.yml", }
             for _, filename in ipairs(markers) do
-              local path = vim.fs.join(cwd, filename)
+              local path = vim.fs.joinpath(cwd, filename)
               if vim.loop.fs_stat(path) then
                 return require("lint.linters.eslint_d").parser(output, bufnr, cwd)
               end

From a436aca603a0c95b9b085d05ce9593b9afd99c1b Mon Sep 17 00:00:00 2001
From: rice-cracker-dev <ricecracker2234@proton.me>
Date: Sat, 12 Apr 2025 20:53:19 +0700
Subject: [PATCH 115/202] nvim-lint: added required files support

---
 docs/release-notes/rl-0.8.md                  |  1 +
 .../plugins/diagnostics/nvim-lint/config.nix  | 25 ++++++++++-
 .../diagnostics/nvim-lint/nvim-lint.nix       |  7 +++
 modules/plugins/languages/astro.nix           | 43 +++++++------------
 modules/plugins/languages/svelte.nix          | 23 ++++------
 modules/plugins/languages/ts.nix              | 40 +++++++----------
 6 files changed, 71 insertions(+), 68 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 710578eb..d5190855 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -290,6 +290,7 @@
 
 - `eslint_d` now checks for configuration files to load.
 - Fixed an error where `eslint_d` fails to load.
+- Added required files support for linters under `vim.diagnostics.nvim-lint.linters.*.required_files`.
 
 [Sc3l3t0n](https://github.com/Sc3l3t0n):
 
diff --git a/modules/plugins/diagnostics/nvim-lint/config.nix b/modules/plugins/diagnostics/nvim-lint/config.nix
index b284270b..c7326cff 100644
--- a/modules/plugins/diagnostics/nvim-lint/config.nix
+++ b/modules/plugins/diagnostics/nvim-lint/config.nix
@@ -38,8 +38,29 @@ in {
           {
             event = ["BufWritePost"];
             callback = mkLuaInline ''
-              function()
-                require("lint").try_lint()
+              function(args)
+                local ft = vim.api.nvim_get_option_value("filetype", { buf = args.buf })
+                local linters = require("lint").linters
+                local linters_from_ft = require("lint").linters_by_ft[ft]
+
+                -- if no linter is configured for this filetype, stops linting
+                if linters_from_ft == nil then return end
+
+                for _, name in ipairs(linters_from_ft) do
+                  local cwd = linters[name].required_files
+
+                  -- if no configuration files are configured, lint
+                  if cwd == nil then
+                    require("lint").try_lint(name)
+                  else
+                    -- if configuration files are configured and present in the project, lint
+                    for _, fn in ipairs(cwd) do
+                      if vim.uv.fs_stat(fn) then
+                        require("lint").try_lint(name)
+                      end
+                    end
+                  end
+                end
               end
             '';
           }
diff --git a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
index 20f14f0b..cb830975 100644
--- a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
+++ b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
@@ -69,6 +69,13 @@
         default = null;
         description = "Parser function";
       };
+
+      required_files = mkOption {
+        type = nullOr (listOf str);
+        default = null;
+        description = "Required files to lint";
+        example = ["eslint.config.js"];
+      };
     };
   };
 in {
diff --git a/modules/plugins/languages/astro.nix b/modules/plugins/languages/astro.nix
index c12f6ada..2ecbbe47 100644
--- a/modules/plugins/languages/astro.nix
+++ b/modules/plugins/languages/astro.nix
@@ -53,24 +53,20 @@
   # TODO: specify packages
   defaultDiagnosticsProvider = ["eslint_d"];
   diagnosticsProviders = {
-    eslint_d = {
-      package = pkgs.eslint_d;
+    eslint_d = let
+      pkg = pkgs.eslint_d;
+    in {
+      package = pkg;
       config = {
-        # HACK: change if nvim-lint gets a dynamic enable thing
-        parser = mkLuaInline ''
-          function(output, bufnr, cwd)
-            local markers = { "eslint.config.js", "eslint.config.mjs",
-              ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.yml", }
-            for _, filename in ipairs(markers) do
-              local path = vim.fs.joinpath(cwd, filename)
-              if vim.loop.fs_stat(path) then
-                return require("lint.linters.eslint_d").parser(output, bufnr, cwd)
-              end
-            end
-
-            return {}
-          end
-        '';
+        cmd = getExe pkg;
+        required_files = [
+          "eslint.config.js"
+          "eslint.config.mjs"
+          ".eslintrc"
+          ".eslintrc.json"
+          ".eslintrc.js"
+          ".eslintrc.yml"
+        ];
       };
     };
   };
@@ -153,16 +149,9 @@ in {
       vim.diagnostics.nvim-lint = {
         enable = true;
         linters_by_ft.astro = cfg.extraDiagnostics.types;
-        linters = mkMerge (map (
-            name: {
-              ${name} =
-                diagnosticsProviders.${name}.config
-                // {
-                  cmd = getExe diagnosticsProviders.${name}.package;
-                };
-            }
-          )
-          cfg.extraDiagnostics.types);
+        linters =
+          mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
+            cfg.extraDiagnostics.types);
       };
     })
   ]);
diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix
index e01ec427..536ff2c1 100644
--- a/modules/plugins/languages/svelte.nix
+++ b/modules/plugins/languages/svelte.nix
@@ -55,21 +55,14 @@
       package = pkg;
       config = {
         cmd = getExe pkg;
-        # HACK: change if nvim-lint gets a dynamic enable thing
-        parser = mkLuaInline ''
-          function(output, bufnr, cwd)
-            local markers = { "eslint.config.js", "eslint.config.mjs",
-              ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.yml", }
-            for _, filename in ipairs(markers) do
-              local path = vim.fs.joinpath(cwd, filename)
-              if vim.loop.fs_stat(path) then
-                return require("lint.linters.eslint_d").parser(output, bufnr, cwd)
-              end
-            end
-
-            return {}
-          end
-        '';
+        required_files = [
+          "eslint.config.js"
+          "eslint.config.mjs"
+          ".eslintrc"
+          ".eslintrc.json"
+          ".eslintrc.js"
+          ".eslintrc.yml"
+        ];
       };
     };
   };
diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix
index ffab265b..df1353ab 100644
--- a/modules/plugins/languages/ts.nix
+++ b/modules/plugins/languages/ts.nix
@@ -91,27 +91,20 @@
   # TODO: specify packages
   defaultDiagnosticsProvider = ["eslint_d"];
   diagnosticsProviders = {
-    eslint_d = {
-      package = pkgs.eslint_d;
-      config = let
-        pkg = pkgs.eslint_d;
-      in {
+    eslint_d = let
+      pkg = pkgs.eslint_d;
+    in {
+      package = pkg;
+      config = {
         cmd = getExe pkg;
-        # HACK: change if nvim-lint gets a dynamic enable thing
-        parser = mkLuaInline ''
-          function(output, bufnr, cwd)
-            local markers = { "eslint.config.js", "eslint.config.mjs",
-              ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.yml", }
-            for _, filename in ipairs(markers) do
-              local path = vim.fs.joinpath(cwd, filename)
-              if vim.loop.fs_stat(path) then
-                return require("lint.linters.eslint_d").parser(output, bufnr, cwd)
-              end
-            end
-
-            return {}
-          end
-        '';
+        required_files = [
+          "eslint.config.js"
+          "eslint.config.mjs"
+          ".eslintrc"
+          ".eslintrc.json"
+          ".eslintrc.js"
+          ".eslintrc.yml"
+        ];
       };
     };
   };
@@ -221,10 +214,9 @@ in {
         linters_by_ft.typescript = cfg.extraDiagnostics.types;
         linters_by_ft.typescriptreact = cfg.extraDiagnostics.types;
 
-        linters = mkMerge (map (name: {
-            ${name}.cmd = getExe diagnosticsProviders.${name}.package;
-          })
-          cfg.extraDiagnostics.types);
+        linters =
+          mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
+            cfg.extraDiagnostics.types);
       };
     })
 

From 2e524ce6d5f65c6e7b5657a91fa62804aa29a51c Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 13 Apr 2025 04:50:09 +0300
Subject: [PATCH 116/202] flake: bump inputs

---
 flake.lock | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8780caec..e31038ab 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1741352980,
-        "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
+        "lastModified": 1743550720,
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1742255973,
-        "narHash": "sha256-XfEGVKatTgEMMOVb4SNp1LYLQOSzzrFTDMVDTZFyMVE=",
+        "lastModified": 1744497692,
+        "narHash": "sha256-ikWRNR/P/aKCCySZnUfF1W0u0t6rSoJgQgKeDdCBAK8=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "b982dbd5e6d55d4438832b3567c09bc2a129649d",
+        "rev": "c5322a2bf74c0066fd15ca35721561397a2e7eab",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743076231,
-        "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=",
+        "lastModified": 1744473229,
+        "narHash": "sha256-rGXvIsD/Hn+bJRFb7hqSx7UUZUIlxXs0fM6ix5+iT5w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6c5963357f3c1c840201eda129a99d455074db04",
+        "rev": "52d0eded529af34e91df6b2a2bc32eb636637cd2",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1740877520,
-        "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=",
+        "lastModified": 1743296961,
+        "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c",
+        "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
         "type": "github"
       },
       "original": {

From 1ec2e981039a72903bd7fe6dfc4e6acbd5b2e0bf Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 13 Apr 2025 04:50:13 +0300
Subject: [PATCH 117/202] pins: bump all plugins

---
 npins/sources.json | 260 ++++++++++++++++++++++-----------------------
 1 file changed, 130 insertions(+), 130 deletions(-)

diff --git a/npins/sources.json b/npins/sources.json
index c3ec23b1..d11d16c4 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -50,10 +50,10 @@
       "version_upper_bound": null,
       "release_prefix": null,
       "submodules": false,
-      "version": "v1.0.0",
-      "revision": "47be01b7424d386fc3294de7838fb9134f74b228",
-      "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v1.0.0",
-      "hash": "04mjgyfcin134g9w3ag3gy6vppmh8cqq0g9whyq407fx6rjmgvfi"
+      "version": "v1.1.1",
+      "revision": "fe2e1d3e4498d60c5ce7440ff60f79f0920e34bf",
+      "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v1.1.1",
+      "hash": "0l2m4162vk6xqrx5v0zh1b5p6wrr1jailq1995f101isyjygikan"
     },
     "blink-cmp-spell": {
       "type": "Git",
@@ -142,9 +142,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "9abb22d5d47460852a935129b4feff39fd8033e3",
-      "url": "https://github.com/uga-rosa/ccc.nvim/archive/9abb22d5d47460852a935129b4feff39fd8033e3.tar.gz",
-      "hash": "1lv00jwlqmhki6n8dqrxfvg5kci6a2xiz7mh8d488n7hr1pwkrpn"
+      "revision": "af2cf5a963f401aad868c065222ee13d4bbc9050",
+      "url": "https://github.com/uga-rosa/ccc.nvim/archive/af2cf5a963f401aad868c065222ee13d4bbc9050.tar.gz",
+      "hash": "0h43m2rz9jcckif036n6ybyv2zhgr25l0wpdg3fdfl7xkfs7sa1i"
     },
     "cellular-automaton-nvim": {
       "type": "Git",
@@ -272,9 +272,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "9f6ba9c0858179fe250412ad2f4d1f0d1bd31eb0",
-      "url": "https://github.com/olimorris/codecompanion.nvim/archive/9f6ba9c0858179fe250412ad2f4d1f0d1bd31eb0.tar.gz",
-      "hash": "1bs16rwj8wrpx1ijlhcjdfmz97616ny80pw16igm0dbwsf85nnj4"
+      "revision": "9654cb31f10c9eda3e777d03d32b29df606ab0fe",
+      "url": "https://github.com/olimorris/codecompanion.nvim/archive/9654cb31f10c9eda3e777d03d32b29df606ab0fe.tar.gz",
+      "hash": "0ff4mbfim0kj5prv9xfqp8gsk1fw0y2d0kmazfivkhg04my8m89l"
     },
     "codewindow-nvim": {
       "type": "Git",
@@ -311,9 +311,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "b1a75324ddf96b7bb84963a297b1ed334db087c0",
-      "url": "https://github.com/stevearc/conform.nvim/archive/b1a75324ddf96b7bb84963a297b1ed334db087c0.tar.gz",
-      "hash": "0g0r324dg2yxj8g47lj8zg63166bhjlk8vskh3rdypxd437rbii0"
+      "revision": "eebc724d12c5579d733d1f801386e0ceb909d001",
+      "url": "https://github.com/stevearc/conform.nvim/archive/eebc724d12c5579d733d1f801386e0ceb909d001.tar.gz",
+      "hash": "122v0svrsss8g4gzy9fz2ppzm2lxf85l4m8wincxsy75x9v3ywgn"
     },
     "copilot-cmp": {
       "type": "Git",
@@ -337,9 +337,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "d661d65b4cab20a5c164f6d9081d91ed324fe4d8",
-      "url": "https://github.com/zbirenbaum/copilot.lua/archive/d661d65b4cab20a5c164f6d9081d91ed324fe4d8.tar.gz",
-      "hash": "1lhrs1cw3v7z2sksbd8m1c6ya5m5xfn1dnx8yxqq3s2kqim6n7jb"
+      "revision": "c62a2a7616a9789a7676b6b7a8d9263b1082cdc8",
+      "url": "https://github.com/zbirenbaum/copilot.lua/archive/c62a2a7616a9789a7676b6b7a8d9263b1082cdc8.tar.gz",
+      "hash": "1agbxzq43wsga9szgaz45s638my8d7cxqwg2aa3rizyf7g8f7szy"
     },
     "crates-nvim": {
       "type": "Git",
@@ -350,9 +350,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "fd2bbca7aa588f24ffc3517831934b4c4a9588e9",
-      "url": "https://github.com/Saecki/crates.nvim/archive/fd2bbca7aa588f24ffc3517831934b4c4a9588e9.tar.gz",
-      "hash": "1l2z447svf1ldpnsb9sn5b4q1a22g3wx126yw9hj7rcqrv50xw6i"
+      "revision": "73d2c590c74a0c582144987a4decb4a642755859",
+      "url": "https://github.com/Saecki/crates.nvim/archive/73d2c590c74a0c582144987a4decb4a642755859.tar.gz",
+      "hash": "08dyl4blgi0lb3s0jbl4jcpr4j1ncyrdvxjkrqmhqcg6bmwl7iqy"
     },
     "csharpls-extended-lsp-nvim": {
       "type": "Git",
@@ -363,9 +363,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "52710d523e5a4d325fe62811a48ee2eeb93dbe26",
-      "url": "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/archive/52710d523e5a4d325fe62811a48ee2eeb93dbe26.tar.gz",
-      "hash": "1gxfcj8v7140v5njl0299dx8aqzjbxxz1i0af0p50lli5bk5s25g"
+      "revision": "53c6dfc9790d262edd3d6a4483294bedf53d70f5",
+      "url": "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/archive/53c6dfc9790d262edd3d6a4483294bedf53d70f5.tar.gz",
+      "hash": "0hy3jaq5lq72yfvy77hijp8wzpbad7a1xfwrdljzbpm4w5j59dm2"
     },
     "dashboard-nvim": {
       "type": "Git",
@@ -519,9 +519,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "6488ada2f376e47789391dc353b6d91a3f9de6f6",
-      "url": "https://github.com/ibhagwan/fzf-lua/archive/6488ada2f376e47789391dc353b6d91a3f9de6f6.tar.gz",
-      "hash": "1hj550c9bn0f2wzmrhc4g9l6024in7jwqfqvrr23fly3b42lfa8a"
+      "revision": "dc693475c4463463d84a0c7c43d463b8a8cd3aea",
+      "url": "https://github.com/ibhagwan/fzf-lua/archive/dc693475c4463463d84a0c7c43d463b8a8cd3aea.tar.gz",
+      "hash": "1his2nwjrb9xbjmz5i6nln7v5mk2f85dla10qn5xwji9zgnfy24l"
     },
     "gesture-nvim": {
       "type": "Git",
@@ -584,9 +584,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "3c76f7fabac723aa682365ef782f88a83ccdb4ac",
-      "url": "https://github.com/lewis6991/gitsigns.nvim/archive/3c76f7fabac723aa682365ef782f88a83ccdb4ac.tar.gz",
-      "hash": "1ngw8n25g6rpdn089xwjidfglsli2v8mbv769ikpp6y89h9j91l3"
+      "revision": "fcfa7a989cd6fed10abf02d9880dc76d7a38167d",
+      "url": "https://github.com/lewis6991/gitsigns.nvim/archive/fcfa7a989cd6fed10abf02d9880dc76d7a38167d.tar.gz",
+      "hash": "1grkw8x1fycw1hbppy0zakwwkk7h2f8x5qy4wh34yj5f5g9jn3vj"
     },
     "glow-nvim": {
       "type": "Git",
@@ -636,9 +636,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "5fa6671ff4face61be6a439b085c4977c20a60dc",
-      "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/5fa6671ff4face61be6a439b085c4977c20a60dc.tar.gz",
-      "hash": "002lzdjdf9f5jp63bngmp9fadzs81c0w0gqqpy7b2wfxg76biggr"
+      "revision": "18fef08cba01de6b5022e85ac4468f74edc45259",
+      "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/18fef08cba01de6b5022e85ac4468f74edc45259.tar.gz",
+      "hash": "1bhr9w58hy63zilbqdwfvwzca6sk667yagjbzf13acl306nvgnhd"
     },
     "highlight-undo-nvim": {
       "type": "Git",
@@ -743,9 +743,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "346a16ef942635a8ca5ff92e603d07e7e8be6cbe",
-      "url": "https://github.com/ggandor/leap.nvim/archive/346a16ef942635a8ca5ff92e603d07e7e8be6cbe.tar.gz",
-      "hash": "0rq73f7sw1sf8dn6angwgns8jd811aiixmvrndgqz2939dlqaw2l"
+      "revision": "03eaa2e0c0ec9436dea0e954bc47564ff3ca9196",
+      "url": "https://github.com/ggandor/leap.nvim/archive/03eaa2e0c0ec9436dea0e954bc47564ff3ca9196.tar.gz",
+      "hash": "1lskih4hvf1c57d0f6gibc36c926lqky0y2h6ypmkgh8gmcdazdw"
     },
     "leetcode-nvim": {
       "type": "Git",
@@ -769,9 +769,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "b58cca003d1d3311213d6db0352f58d8e57bfff0",
-      "url": "https://github.com/ray-x/lsp_signature.nvim/archive/b58cca003d1d3311213d6db0352f58d8e57bfff0.tar.gz",
-      "hash": "1jqpjb7xgdm5ikay8hdjz04bdkirhns6zpa68cblsyslpkvk4hk0"
+      "revision": "15bb33cdb47e85278e168cad11acb1b6fa9c6488",
+      "url": "https://github.com/ray-x/lsp_signature.nvim/archive/15bb33cdb47e85278e168cad11acb1b6fa9c6488.tar.gz",
+      "hash": "0acynlgd7vg3cn08136ky1j2qayq1f7x6fl1562cby6hl47rsnck"
     },
     "lspkind-nvim": {
       "type": "Git",
@@ -821,9 +821,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "1517caa8fff05e4b4999857319d3b0609a7f57fa",
-      "url": "https://github.com/hoob3rt/lualine.nvim/archive/1517caa8fff05e4b4999857319d3b0609a7f57fa.tar.gz",
-      "hash": "0mzclk1rb03ln0my8pqq8p4sn84zkwn0amy2xyb2xds8q9zi21hc"
+      "revision": "86fe39534b7da729a1ac56c0466e76f2c663dc42",
+      "url": "https://github.com/hoob3rt/lualine.nvim/archive/86fe39534b7da729a1ac56c0466e76f2c663dc42.tar.gz",
+      "hash": "1kqdckylsjl1ibk4wm87y1yxxzxnjz87vwziaw4k6nw61rg0bq2x"
     },
     "luasnip": {
       "type": "Git",
@@ -847,9 +847,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "4d32f775806f9dbc1ad2c773c305cc1dc4ce2bba",
-      "url": "https://github.com/nvim-neorocks/lz.n/archive/4d32f775806f9dbc1ad2c773c305cc1dc4ce2bba.tar.gz",
-      "hash": "0ydm1vms8bhiq2yxa1ndb38fi71vai2hk1azdaw4xbjrylbhpnjq"
+      "revision": "2ef8dfbef6f8f97873da4c5820067343690d114c",
+      "url": "https://github.com/nvim-neorocks/lz.n/archive/2ef8dfbef6f8f97873da4c5820067343690d114c.tar.gz",
+      "hash": "11i6ayqvyamh8i2scq7qbf6rrxrq9v0hax9gxmdxhdxd18djyq8n"
     },
     "lzn-auto-require": {
       "type": "Git",
@@ -925,9 +925,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "1e0a62b8d9592e842c545442cddf3236634c0b67",
-      "url": "https://github.com/echasnovski/mini.base16/archive/1e0a62b8d9592e842c545442cddf3236634c0b67.tar.gz",
-      "hash": "038a1w0fi6ivhs0s5lnj45vq40d4whvrbqmkkv1sa9g56cqr17wi"
+      "revision": "2eb2d2b889a8c861d1a66ec651bd0edb417d5c7f",
+      "url": "https://github.com/echasnovski/mini.base16/archive/2eb2d2b889a8c861d1a66ec651bd0edb417d5c7f.tar.gz",
+      "hash": "0g09bgk7y2j83phckg9wlm82ih1ya5j0sgz6xbscbj6jh0w75lvz"
     },
     "mini-basics": {
       "type": "Git",
@@ -964,9 +964,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "8f4567b323f74116422f3a1c0ac8e7b9d108cebb",
-      "url": "https://github.com/echasnovski/mini.bufremove/archive/8f4567b323f74116422f3a1c0ac8e7b9d108cebb.tar.gz",
-      "hash": "0rpj7jdfxq6c509ng911rrncmfip6l39r6np9b6gsgv7j1563ja6"
+      "revision": "66019ecebdc5bc0759e04747586994e2e3f98416",
+      "url": "https://github.com/echasnovski/mini.bufremove/archive/66019ecebdc5bc0759e04747586994e2e3f98416.tar.gz",
+      "hash": "0pqwi0ix7zl7sg74p19q61mizv48mjmbijigsssi9fbyk0hwmkww"
     },
     "mini-clue": {
       "type": "Git",
@@ -990,9 +990,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "a946cd32c0e5b9bab9cd27ebd6c23259e7d70a72",
-      "url": "https://github.com/echasnovski/mini.colors/archive/a946cd32c0e5b9bab9cd27ebd6c23259e7d70a72.tar.gz",
-      "hash": "0jiw5vz7jnfwpbcls1fzny6nv1pxpjyvldf6rzrv9yihpcjgixqy"
+      "revision": "1c88ba8c79e5717acc82bf596f5722c724af570e",
+      "url": "https://github.com/echasnovski/mini.colors/archive/1c88ba8c79e5717acc82bf596f5722c724af570e.tar.gz",
+      "hash": "0dcv6z4z5gq73d2s2hbcg8l5y1jzxvdsq7wy6a2rxbjmjhg5j7is"
     },
     "mini-comment": {
       "type": "Git",
@@ -1016,9 +1016,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "aef3a80fece4662abbf5fc09d899e9f3e1805d7d",
-      "url": "https://github.com/echasnovski/mini.completion/archive/aef3a80fece4662abbf5fc09d899e9f3e1805d7d.tar.gz",
-      "hash": "1154rxj021vsjqk4jqnxqgww7ajkhlwhbbh92avs05wg9hxpnjzg"
+      "revision": "cf3625d2c4a437f5edf7e61382e0fe522fc76fb7",
+      "url": "https://github.com/echasnovski/mini.completion/archive/cf3625d2c4a437f5edf7e61382e0fe522fc76fb7.tar.gz",
+      "hash": "0lpvl1kd7vmyy00p97am9ghj6gdmnk1dbw93wjmnvin057w9sysw"
     },
     "mini-diff": {
       "type": "Git",
@@ -1029,9 +1029,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "06c9fe0e33fbcf41202793550b905d7431dc81fc",
-      "url": "https://github.com/echasnovski/mini.diff/archive/06c9fe0e33fbcf41202793550b905d7431dc81fc.tar.gz",
-      "hash": "0bixw71ds5k8ag0bfhc19yg4x03jf5m3i4d7g7s0h4kdngvj84mg"
+      "revision": "7e268d0241255abaa07b8aa0ddff028f7315fe21",
+      "url": "https://github.com/echasnovski/mini.diff/archive/7e268d0241255abaa07b8aa0ddff028f7315fe21.tar.gz",
+      "hash": "0isw55vz55pcpsyi27lx7i2wrvc9r5rbi6ndljcbn8rbmx36xlyq"
     },
     "mini-doc": {
       "type": "Git",
@@ -1094,9 +1094,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "cf928950a29d5158dcc76530443436a45411738f",
-      "url": "https://github.com/echasnovski/mini-git/archive/cf928950a29d5158dcc76530443436a45411738f.tar.gz",
-      "hash": "05q0anazch60xy3rk5f8gxg8hnnmgvfp5zff80qpi43y48jgkvyx"
+      "revision": "a0ddc6302f654523053c28109e8b6dbbf05c08f8",
+      "url": "https://github.com/echasnovski/mini-git/archive/a0ddc6302f654523053c28109e8b6dbbf05c08f8.tar.gz",
+      "hash": "0vf0ys710yf1apalglxj7kcdyrnrd7jkz1ksi9v1vj3h60pvany2"
     },
     "mini-hipatterns": {
       "type": "Git",
@@ -1107,9 +1107,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "dd53c18779a2e47a1902180c72bc54a8bb554388",
-      "url": "https://github.com/echasnovski/mini.hipatterns/archive/dd53c18779a2e47a1902180c72bc54a8bb554388.tar.gz",
-      "hash": "0cw6sfhzny5wds5ydwlp8qw448g7fgakhh2dzqijw4nn1yxhmkr2"
+      "revision": "e5083df391171dc9d8172645606f8496d9443374",
+      "url": "https://github.com/echasnovski/mini.hipatterns/archive/e5083df391171dc9d8172645606f8496d9443374.tar.gz",
+      "hash": "116vpf4b86qbwrcax7dfhiswb4pwf3nmj2dh4kafj9vnpwyw1c3w"
     },
     "mini-hues": {
       "type": "Git",
@@ -1120,9 +1120,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "dd8b2105323c6b5277f76ea0f30f016c85f8171e",
-      "url": "https://github.com/echasnovski/mini.hues/archive/dd8b2105323c6b5277f76ea0f30f016c85f8171e.tar.gz",
-      "hash": "0kxj26zllydwcxd3jyijy084s96giydajc10fxzhmjg8gvb1pxmf"
+      "revision": "f1fa8ad34788eada276f0b8a41d96a15622933de",
+      "url": "https://github.com/echasnovski/mini.hues/archive/f1fa8ad34788eada276f0b8a41d96a15622933de.tar.gz",
+      "hash": "0yap91dqnr4jpwz1krmzay5p89pxb8v6m5457b6sm6f98956zgqq"
     },
     "mini-icons": {
       "type": "Git",
@@ -1263,9 +1263,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "f95dc0bb9db7124f55b225f544a8719476c64314",
-      "url": "https://github.com/echasnovski/mini.pick/archive/f95dc0bb9db7124f55b225f544a8719476c64314.tar.gz",
-      "hash": "0cq2hjaw4fyjk692s3dl8hb6aad9a3mqciknj8zsda85n6i2i3qy"
+      "revision": "6cad781797f3a9b0e69f2e9a2d63de8b1c1824f5",
+      "url": "https://github.com/echasnovski/mini.pick/archive/6cad781797f3a9b0e69f2e9a2d63de8b1c1824f5.tar.gz",
+      "hash": "1nsnz9dys2nsjrpzm4d3dc4qjms5f7pqsxbgnvglibi9vizrkahx"
     },
     "mini-sessions": {
       "type": "Git",
@@ -1328,9 +1328,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "6a22a137926c60f987ab76433c56230ffdd7c42d",
-      "url": "https://github.com/echasnovski/mini.statusline/archive/6a22a137926c60f987ab76433c56230ffdd7c42d.tar.gz",
-      "hash": "0yvw7j0yydqcv78n145s59y4kw8dj5h8wj44sy46cnzh4bn8l65d"
+      "revision": "e331175f10d9f400b42523b3890841aba202ce16",
+      "url": "https://github.com/echasnovski/mini.statusline/archive/e331175f10d9f400b42523b3890841aba202ce16.tar.gz",
+      "hash": "1hhd4fln3m04d9v5pwa3mb1n4nifsilrxp8hs14njcgk2rxv6qar"
     },
     "mini-surround": {
       "type": "Git",
@@ -1354,9 +1354,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "fc00d47c6f00eeef8ee05694e59021afb4ae0e0e",
-      "url": "https://github.com/echasnovski/mini.tabline/archive/fc00d47c6f00eeef8ee05694e59021afb4ae0e0e.tar.gz",
-      "hash": "1h33s1fzl2wy24pkik0ybjj541srybyjw3zyvpylfm93cjabgbf0"
+      "revision": "ff7a050721352580184db1ff203286c1032d5b54",
+      "url": "https://github.com/echasnovski/mini.tabline/archive/ff7a050721352580184db1ff203286c1032d5b54.tar.gz",
+      "hash": "142vv5nwg3bvia21frmcyps1ycyqqj1l0v5vclrm46cwaz2b2qfb"
     },
     "mini-test": {
       "type": "Git",
@@ -1432,9 +1432,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "1e34663c32e8f5d915921a938e0dc4e3e788ceb8",
-      "url": "https://github.com/mvllow/modes.nvim/archive/1e34663c32e8f5d915921a938e0dc4e3e788ceb8.tar.gz",
-      "hash": "07dara1m8igb6yr8jx62rl8jr71s51vxphiyk8i206bzmbx120ay"
+      "revision": "7c6ca20de4c9acb22ef06074e39fd2c021b99935",
+      "url": "https://github.com/mvllow/modes.nvim/archive/7c6ca20de4c9acb22ef06074e39fd2c021b99935.tar.gz",
+      "hash": "088bacsy76imlyd4njgrw7cg2l82dddr23g25qx81ihlaf3vmdjp"
     },
     "multicursors-nvim": {
       "type": "GitRelease",
@@ -1461,9 +1461,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "69f798bf9493b84df660ac3c6b2fc03e23956d25",
-      "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/69f798bf9493b84df660ac3c6b2fc03e23956d25.tar.gz",
-      "hash": "0yybrcljbfq6xygaqzspjz3bhxa6fb7w0qypky66cvhbpzrl6blz"
+      "revision": "5224467c6a49a6c77b8a8333f4d9af0abc788e10",
+      "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/5224467c6a49a6c77b8a8333f4d9af0abc788e10.tar.gz",
+      "hash": "0dzppxi4w38s3pqsgwd3z0xr1r14bd0v4qpakxw3kjn9wr2d8y7n"
     },
     "neocord": {
       "type": "Git",
@@ -1565,9 +1565,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "a117163db44c256d53c3be8717f3e1a2a28e6299",
-      "url": "https://github.com/nvimtools/none-ls.nvim/archive/a117163db44c256d53c3be8717f3e1a2a28e6299.tar.gz",
-      "hash": "1qxi1wq3snhns49sl6rli5hsgjn7zzc43brnwv0b6mfzl55ydzr8"
+      "revision": "8d99472fcccffd73d7501e54e9018bab5cb0c4ad",
+      "url": "https://github.com/nvimtools/none-ls.nvim/archive/8d99472fcccffd73d7501e54e9018bab5cb0c4ad.tar.gz",
+      "hash": "1x1fmpy65j8smn5lfl9bknmfnan33gd5dila49gyblgcgfvpd7ph"
     },
     "nord": {
       "type": "Git",
@@ -1604,9 +1604,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "84a81a7d1f28b381b32acf1e8fe5ff5bef4f7968",
-      "url": "https://github.com/windwp/nvim-autopairs/archive/84a81a7d1f28b381b32acf1e8fe5ff5bef4f7968.tar.gz",
-      "hash": "07w8shkvmhxn7gpx4zac34r0xb7qqs2z2m6hk9y7ccr6w2dczpxy"
+      "revision": "2a406cdd8c373ae7fe378a9e062a5424472bd8d8",
+      "url": "https://github.com/windwp/nvim-autopairs/archive/2a406cdd8c373ae7fe378a9e062a5424472bd8d8.tar.gz",
+      "hash": "06i7bdq4msy2gia6mczxaj2y7chhrmw9xwjj8q4dix0pk58hjfp1"
     },
     "nvim-bufferline-lua": {
       "type": "Git",
@@ -1734,9 +1734,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "810f2f06611677c965e54636a27fd176a795a4d2",
-      "url": "https://github.com/mfussenegger/nvim-lint/archive/810f2f06611677c965e54636a27fd176a795a4d2.tar.gz",
-      "hash": "0d0ilcwp8v6mci9s1hwn9qvwp1marrq2cgidry4p2ylp7qps96nk"
+      "revision": "5b1bdf306bd3e565908145279e8bbfc594dac3b3",
+      "url": "https://github.com/mfussenegger/nvim-lint/archive/5b1bdf306bd3e565908145279e8bbfc594dac3b3.tar.gz",
+      "hash": "0kwdb9wggkgzg9msrvnf15njqm9a8acljdak9fxnfh9al1ks8cav"
     },
     "nvim-lspconfig": {
       "type": "Git",
@@ -1747,9 +1747,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "40f120c10ea4b87311175539a183c3b75eab95a3",
-      "url": "https://github.com/neovim/nvim-lspconfig/archive/40f120c10ea4b87311175539a183c3b75eab95a3.tar.gz",
-      "hash": "0fiqibnfqyrfa5mma7yz2xb19y9wkvsa6a6yjylk8zfair8yb5j0"
+      "revision": "6ac17e69a353fea377b30a35a672a30f04e887a1",
+      "url": "https://github.com/neovim/nvim-lspconfig/archive/6ac17e69a353fea377b30a35a672a30f04e887a1.tar.gz",
+      "hash": "0s1hb7fkjvccycwdzq10lrycs8xmdlk9n4pjafgwgmnhnmgb3sfr"
     },
     "nvim-metals": {
       "type": "Git",
@@ -1760,9 +1760,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "4610aceb97fbcf2b050220ee5f83527e5c1699c5",
-      "url": "https://github.com/scalameta/nvim-metals/archive/4610aceb97fbcf2b050220ee5f83527e5c1699c5.tar.gz",
-      "hash": "082skbc8iml0fnfvy1w2f552bkpmj1czc436mk2nzh73bxi5wh91"
+      "revision": "bc896458ac639dea568e8dc06862074f8cba7fa3",
+      "url": "https://github.com/scalameta/nvim-metals/archive/bc896458ac639dea568e8dc06862074f8cba7fa3.tar.gz",
+      "hash": "0k7c300rf62f50vqzxxdgh7pqpb61im6xbz230fysvdjdx1ddglh"
     },
     "nvim-navbuddy": {
       "type": "Git",
@@ -1864,9 +1864,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "44d9b58f11d5a426c297aafd0be1c9d45617a849",
-      "url": "https://github.com/nvim-tree/nvim-tree.lua/archive/44d9b58f11d5a426c297aafd0be1c9d45617a849.tar.gz",
-      "hash": "0gya49yydrbq5jylsk4b9c2cpygy0mxhr6kwdsbg0di0i74pkav0"
+      "revision": "5bea2b37523a31288e0fcab42f3be5c1bd4516bb",
+      "url": "https://github.com/nvim-tree/nvim-tree.lua/archive/5bea2b37523a31288e0fcab42f3be5c1bd4516bb.tar.gz",
+      "hash": "1mizgknbbjqv7a8fqc0n7glgabl0fq660nrqwq6w04qqynp0z1ax"
     },
     "nvim-treesitter-context": {
       "type": "Git",
@@ -1877,9 +1877,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "93b29a32d5f4be10e39226c6b796f28d68a8b483",
-      "url": "https://github.com/nvim-treesitter/nvim-treesitter-context/archive/93b29a32d5f4be10e39226c6b796f28d68a8b483.tar.gz",
-      "hash": "12ixiqb4bj7n3kkzqi81hyhn3bjsb93250gvfy12bxya2l5bi20g"
+      "revision": "439789a9a8df9639ecd749bb3286b77117024a6f",
+      "url": "https://github.com/nvim-treesitter/nvim-treesitter-context/archive/439789a9a8df9639ecd749bb3286b77117024a6f.tar.gz",
+      "hash": "04x9nza48d2vz262myhhfnmjzcc2fkdjb21mdqvlmnzkhh7ysyz2"
     },
     "nvim-ts-autotag": {
       "type": "Git",
@@ -1903,9 +1903,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "5b5435cd510f6520676ab609bdbf477e6beb6029",
-      "url": "https://github.com/kevinhwang91/nvim-ufo/archive/5b5435cd510f6520676ab609bdbf477e6beb6029.tar.gz",
-      "hash": "0qmq63hw6gljsai080gi6bbay2jnxpicrdlwigay5kd34jldxbj4"
+      "revision": "a026364df62e88037b26d37c9f14c17c006fd577",
+      "url": "https://github.com/kevinhwang91/nvim-ufo/archive/a026364df62e88037b26d37c9f14c17c006fd577.tar.gz",
+      "hash": "02mqjwc4h29i9s9l8lsfwrx4ac69n3mpr9hw2vg7ji3c20mbh413"
     },
     "nvim-web-devicons": {
       "type": "Git",
@@ -1916,9 +1916,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c",
-      "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/4c3a5848ee0b09ecdea73adcd2a689190aeb728c.tar.gz",
-      "hash": "1a3pkkjdv99nzmh9rf3rn4x1wwhbrr7497ln7xlnkczmk9faz8r4"
+      "revision": "c90dee4e930ab9f49fa6d77f289bff335b49e972",
+      "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/c90dee4e930ab9f49fa6d77f289bff335b49e972.tar.gz",
+      "hash": "0i41df2cafrpc49cfbimajwbiyhd31q95d1s3rh40g6zgz0gm8sc"
     },
     "obsidian-nvim": {
       "type": "Git",
@@ -1981,9 +1981,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "2929054293953e486a25c9768095455987ba391b",
-      "url": "https://github.com/nvim-orgmode/orgmode/archive/2929054293953e486a25c9768095455987ba391b.tar.gz",
-      "hash": "08x9yx6iblscfj273adzvhj8xv72i8kd89bf1yd93n80lkdmizyf"
+      "revision": "e66a64183e211842c195f34fd6dcb97d7b534812",
+      "url": "https://github.com/nvim-orgmode/orgmode/archive/e66a64183e211842c195f34fd6dcb97d7b534812.tar.gz",
+      "hash": "0cm3xiqjxxxcrrmjnpfrr7k6xy94ixz55wcrfxgsa8cm2xjzx52m"
     },
     "otter-nvim": {
       "type": "Git",
@@ -1994,9 +1994,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "622816aac66933352e20e4d5d01993cd270d6fb0",
-      "url": "https://github.com/jmbuhr/otter.nvim/archive/622816aac66933352e20e4d5d01993cd270d6fb0.tar.gz",
-      "hash": "15ciqkx3hbbccy30dkga17jhra4mslvas0qnqiqrv5qlc09shyrp"
+      "revision": "a7766be1592bfa9e88e67512646e343d0b4b2ff5",
+      "url": "https://github.com/jmbuhr/otter.nvim/archive/a7766be1592bfa9e88e67512646e343d0b4b2ff5.tar.gz",
+      "hash": "18lcqr5qpa50jxmh5h53k0bsz0n3lzbihi8dchww3kz64b52hl5p"
     },
     "oxocarbon": {
       "type": "Git",
@@ -2085,9 +2085,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "de39919a57e1a40a4c7dc5bae0de276f9c616ef3",
-      "url": "https://github.com/HiPhish/rainbow-delimiters.nvim/archive/de39919a57e1a40a4c7dc5bae0de276f9c616ef3.tar.gz",
-      "hash": "04a3y7kyszgjgi1nmjb41vwwpz4svkxh61zkbxrn4ajvxz1ia05i"
+      "revision": "351e449683070a2bb946bbd603555faf5a195e9a",
+      "url": "https://github.com/HiPhish/rainbow-delimiters.nvim/archive/351e449683070a2bb946bbd603555faf5a195e9a.tar.gz",
+      "hash": "12qj32zfyjbxs3qjp283fnc8sfa8w4blfx3skgvhkifv0vi7r3bf"
     },
     "registers-nvim": {
       "type": "Git",
@@ -2111,9 +2111,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "d2285137fa4fbc0b4152cb444008166962b727b5",
-      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/d2285137fa4fbc0b4152cb444008166962b727b5.tar.gz",
-      "hash": "01mawxqfrn2sf6f6ngcsp9cv7p4w43dx3zr6n635gg1s6wsi59bj"
+      "revision": "8bb0d4725cc4909a603158d44ff28b6158ad9278",
+      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/8bb0d4725cc4909a603158d44ff28b6158ad9278.tar.gz",
+      "hash": "18yqhy2y36rydyqs9z3s1h6rghd02bd9kb3rkxs88spm18wvq41z"
     },
     "rose-pine": {
       "type": "Git",
@@ -2163,9 +2163,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "0f7e844e3d82703ae8fe82b6d3ab40041b3cd9f8",
-      "url": "https://github.com/mrcjkb/rustaceanvim/archive/0f7e844e3d82703ae8fe82b6d3ab40041b3cd9f8.tar.gz",
-      "hash": "0z7q7gp2fa6fmpndnn9043wihvbv04h60vpikq84yfa4yvwz282g"
+      "revision": "3f327d15a3c1ed48b1e1087e16873a28a39768c2",
+      "url": "https://github.com/mrcjkb/rustaceanvim/archive/3f327d15a3c1ed48b1e1087e16873a28a39768c2.tar.gz",
+      "hash": "09wrfmzbk81xax5p4wzczsvv1x28nv54mayi12fvzv6c3bmcsbvj"
     },
     "smartcolumn-nvim": {
       "type": "Git",
@@ -2322,9 +2322,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "10e6ec6f00365639e383fa8e95a32058dad53b22",
-      "url": "https://github.com/chomosuke/typst-preview.nvim/archive/10e6ec6f00365639e383fa8e95a32058dad53b22.tar.gz",
-      "hash": "1va3yw7iq5170ilfzd0fvpvkbkxn2yqk413j64ymg31aql8amgjc"
+      "revision": "2503b188cd2a17ce44fdd21a944a93335e935215",
+      "url": "https://github.com/chomosuke/typst-preview.nvim/archive/2503b188cd2a17ce44fdd21a944a93335e935215.tar.gz",
+      "hash": "0l981pjiz2ycn6rw1xwvmhdjpml7nrrlymwfyc942inw173k1jsg"
     },
     "vim-dirtytalk": {
       "type": "Git",
@@ -2361,9 +2361,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "19cb21f513fc2b02f0c66be70107741e837516a1",
-      "url": "https://github.com/RRethy/vim-illuminate/archive/19cb21f513fc2b02f0c66be70107741e837516a1.tar.gz",
-      "hash": "1wfri17br6yqxnci43g69mvbckb7ajhj3c0mlcn1g0s7jkxz4acd"
+      "revision": "08aa184f1bd508f6a59371b52cba26be07bc016d",
+      "url": "https://github.com/RRethy/vim-illuminate/archive/08aa184f1bd508f6a59371b52cba26be07bc016d.tar.gz",
+      "hash": "0sqs4q2qk9hfkh5vn08y664568pl15b88yyvb9za0f5k7v3z1bcw"
     },
     "vim-markdown": {
       "type": "Git",

From 5c3a90e3f661572ddcb23ccd52a9e7fb67d8ab32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Phan=20=C4=90=C4=83ng=20Khoa?= <ricecracker2234@proton.me>
Date: Sun, 13 Apr 2025 16:06:42 +0700
Subject: [PATCH 118/202] Update
 modules/plugins/diagnostics/nvim-lint/config.nix

Co-authored-by: Ching Pei Yang <59727193+horriblename@users.noreply.github.com>
---
 modules/plugins/diagnostics/nvim-lint/config.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/plugins/diagnostics/nvim-lint/config.nix b/modules/plugins/diagnostics/nvim-lint/config.nix
index c7326cff..69d9b35b 100644
--- a/modules/plugins/diagnostics/nvim-lint/config.nix
+++ b/modules/plugins/diagnostics/nvim-lint/config.nix
@@ -47,7 +47,13 @@ in {
                 if linters_from_ft == nil then return end
 
                 for _, name in ipairs(linters_from_ft) do
-                  local cwd = linters[name].required_files
+                  local linter = linters[name]
+                  assert(linter, 'Linter with name `' .. name .. '` not available')
+
+                  if type(linter) == "function" then
+                    linter = linter()
+                  end
+                  local cwd = linter.required_files
 
                   -- if no configuration files are configured, lint
                   if cwd == nil then

From f4ee6a275f2cd4dc40c599c63c13e6cbab31256e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Phan=20=C4=90=C4=83ng=20Khoa?= <ricecracker2234@proton.me>
Date: Sun, 13 Apr 2025 16:06:58 +0700
Subject: [PATCH 119/202] Update
 modules/plugins/diagnostics/nvim-lint/config.nix

Co-authored-by: Ching Pei Yang <59727193+horriblename@users.noreply.github.com>
---
 modules/plugins/diagnostics/nvim-lint/config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/diagnostics/nvim-lint/config.nix b/modules/plugins/diagnostics/nvim-lint/config.nix
index 69d9b35b..e1ef789a 100644
--- a/modules/plugins/diagnostics/nvim-lint/config.nix
+++ b/modules/plugins/diagnostics/nvim-lint/config.nix
@@ -57,7 +57,7 @@ in {
 
                   -- if no configuration files are configured, lint
                   if cwd == nil then
-                    require("lint").try_lint(name)
+                    require("lint").lint(linter)
                   else
                     -- if configuration files are configured and present in the project, lint
                     for _, fn in ipairs(cwd) do

From 2b62a441e9c0383451bc1796380e7ce8d76866dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Phan=20=C4=90=C4=83ng=20Khoa?= <ricecracker2234@proton.me>
Date: Sun, 13 Apr 2025 16:07:27 +0700
Subject: [PATCH 120/202] Update
 modules/plugins/diagnostics/nvim-lint/nvim-lint.nix

Co-authored-by: Ching Pei Yang <59727193+horriblename@users.noreply.github.com>
---
 modules/plugins/diagnostics/nvim-lint/nvim-lint.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
index cb830975..6657be69 100644
--- a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
+++ b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
@@ -73,7 +73,7 @@
       required_files = mkOption {
         type = nullOr (listOf str);
         default = null;
-        description = "Required files to lint";
+        description = "Required files to lint. These files must exist relative to the cwd of the linter or else this linter will be skipped";
         example = ["eslint.config.js"];
       };
     };

From 15ad754ad61640a382fd1dd61f3fa04457719b2b Mon Sep 17 00:00:00 2001
From: w1kee <31793948+w1kee@users.noreply.github.com>
Date: Sun, 13 Apr 2025 13:10:36 +0200
Subject: [PATCH 121/202] docs: fix typo (#824)

* shell -> run

* fix nix run command for maximal config in docs

---------

Co-authored-by: raf <raf@notashelf.dev>
---
 docs/manual/default-configs/maximal.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/manual/default-configs/maximal.md b/docs/manual/default-configs/maximal.md
index 36887633..e1f5273e 100644
--- a/docs/manual/default-configs/maximal.md
+++ b/docs/manual/default-configs/maximal.md
@@ -1,7 +1,7 @@
 # Maximal {#sec-default-maximal}
 
 ```bash
-$ nix shell github:notashelf/nvf#maximal test.nix
+$ nix run github:notashelf/nvf#maximal -- test.nix
 ```
 
 It is the same fully configured Neovim as with the [Nix](#sec-default-nix)

From 90d09ba05f1460214759241ce08c0dc686eb0b32 Mon Sep 17 00:00:00 2001
From: rice-cracker-dev <ricecracker2234@proton.me>
Date: Sun, 13 Apr 2025 20:57:23 +0700
Subject: [PATCH 122/202] nvim-lint: switch to .lint()

---
 modules/plugins/diagnostics/nvim-lint/config.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/plugins/diagnostics/nvim-lint/config.nix b/modules/plugins/diagnostics/nvim-lint/config.nix
index e1ef789a..f1c2f8c2 100644
--- a/modules/plugins/diagnostics/nvim-lint/config.nix
+++ b/modules/plugins/diagnostics/nvim-lint/config.nix
@@ -53,6 +53,8 @@ in {
                   if type(linter) == "function" then
                     linter = linter()
                   end
+                  -- for require("lint").lint() to work, linter.name must be set
+                  linter.name = linter.name or name
                   local cwd = linter.required_files
 
                   -- if no configuration files are configured, lint
@@ -61,8 +63,10 @@ in {
                   else
                     -- if configuration files are configured and present in the project, lint
                     for _, fn in ipairs(cwd) do
-                      if vim.uv.fs_stat(fn) then
-                        require("lint").try_lint(name)
+                      local path = vim.fs.joinpath(linter.cwd or vim.fn.getcwd(), fn);
+                      if vim.uv.fs_stat(path) then
+                        require("lint").lint(linter)
+                        break
                       end
                     end
                   end

From acbeb26854300be3186ac6176e98f5f84c129f30 Mon Sep 17 00:00:00 2001
From: rice-cracker-dev <ricecracker2234@proton.me>
Date: Mon, 14 Apr 2025 00:02:54 +0700
Subject: [PATCH 123/202] nvim-lint: moved linting into its own global function
 "nvf_lint(buf)"

---
 .../plugins/diagnostics/nvim-lint/config.nix  | 68 ++++++++++---------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/modules/plugins/diagnostics/nvim-lint/config.nix b/modules/plugins/diagnostics/nvim-lint/config.nix
index f1c2f8c2..fca38cfa 100644
--- a/modules/plugins/diagnostics/nvim-lint/config.nix
+++ b/modules/plugins/diagnostics/nvim-lint/config.nix
@@ -28,6 +28,41 @@ in {
               end
             end
           end
+
+          function nvf_lint(buf)
+            local ft = vim.api.nvim_get_option_value("filetype", { buf = buf })
+            local linters = require("lint").linters
+            local linters_from_ft = require("lint").linters_by_ft[ft]
+
+            -- if no linter is configured for this filetype, stops linting
+            if linters_from_ft == nil then return end
+
+            for _, name in ipairs(linters_from_ft) do
+              local linter = linters[name]
+              assert(linter, 'Linter with name `' .. name .. '` not available')
+
+              if type(linter) == "function" then
+                linter = linter()
+              end
+              -- for require("lint").lint() to work, linter.name must be set
+              linter.name = linter.name or name
+              local cwd = linter.required_files
+
+              -- if no configuration files are configured, lint
+              if cwd == nil then
+                require("lint").lint(linter)
+              else
+                -- if configuration files are configured and present in the project, lint
+                for _, fn in ipairs(cwd) do
+                  local path = vim.fs.joinpath(linter.cwd or vim.fn.getcwd(), fn);
+                  if vim.uv.fs_stat(path) then
+                    require("lint").lint(linter)
+                    break
+                  end
+                end
+              end
+            end
+          end
         '';
       };
     })
@@ -39,38 +74,7 @@ in {
             event = ["BufWritePost"];
             callback = mkLuaInline ''
               function(args)
-                local ft = vim.api.nvim_get_option_value("filetype", { buf = args.buf })
-                local linters = require("lint").linters
-                local linters_from_ft = require("lint").linters_by_ft[ft]
-
-                -- if no linter is configured for this filetype, stops linting
-                if linters_from_ft == nil then return end
-
-                for _, name in ipairs(linters_from_ft) do
-                  local linter = linters[name]
-                  assert(linter, 'Linter with name `' .. name .. '` not available')
-
-                  if type(linter) == "function" then
-                    linter = linter()
-                  end
-                  -- for require("lint").lint() to work, linter.name must be set
-                  linter.name = linter.name or name
-                  local cwd = linter.required_files
-
-                  -- if no configuration files are configured, lint
-                  if cwd == nil then
-                    require("lint").lint(linter)
-                  else
-                    -- if configuration files are configured and present in the project, lint
-                    for _, fn in ipairs(cwd) do
-                      local path = vim.fs.joinpath(linter.cwd or vim.fn.getcwd(), fn);
-                      if vim.uv.fs_stat(path) then
-                        require("lint").lint(linter)
-                        break
-                      end
-                    end
-                  end
-                end
+                nvf_lint(args.buf)
               end
             '';
           }

From a3051d49aa5f32d9ceab672bad52d591b8a78a8e Mon Sep 17 00:00:00 2001
From: rice-cracker-dev <ricecracker2234@proton.me>
Date: Mon, 14 Apr 2025 00:03:22 +0700
Subject: [PATCH 124/202] format: formatted the project

---
 npins/sources.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/npins/sources.nix b/npins/sources.nix
index 162f1d94..3ae0b99e 100644
--- a/npins/sources.nix
+++ b/npins/sources.nix
@@ -98,7 +98,9 @@ builtins.mapAttrs
             Channel = getZip;
             Tarball = getUrl;
           }
-          .${spec.type}
+          .${
+            spec.type
+          }
           or (builtins.throw "Unknown source type ${spec.type}");
       in
         spec // {outPath = mayOverride (func spec);}

From 3b8595a263ac689db59d06734a7336b311c42032 Mon Sep 17 00:00:00 2001
From: Alfarel <alfarelcynthesis@proton.me>
Date: Sun, 13 Apr 2025 18:20:30 +0000
Subject: [PATCH 125/202] completion/blink: fix fuzzy lib cargoHash (#829)

---
 flake/legacyPackages/blink-cmp.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake/legacyPackages/blink-cmp.nix b/flake/legacyPackages/blink-cmp.nix
index 8d734719..435cb290 100644
--- a/flake/legacyPackages/blink-cmp.nix
+++ b/flake/legacyPackages/blink-cmp.nix
@@ -14,7 +14,7 @@
     env.RUSTC_BOOTSTRAP = true;
 
     useFetchCargoVendor = true;
-    cargoHash = "sha256-F1wh/TjYoiIbDY3J/prVF367MKk3vwM7LqOpRobOs7I=";
+    cargoHash = "sha256-MWElqh7ENJ6CbLOnvz0DsP5YYu+e+y12GSUOfW1IKGU=";
 
     nativeBuildInputs = [gitMinimal];
   };

From 78efcd173c060163d1737139feea5bb793a7fdbf Mon Sep 17 00:00:00 2001
From: Gerg-L <88247690+Gerg-L@users.noreply.github.com>
Date: Mon, 14 Apr 2025 04:06:24 +0000
Subject: [PATCH 126/202] flake: bump inputs (#831)

---
 flake.lock        | 6 +++---
 npins/sources.nix | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index e31038ab..540715e9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1744497692,
-        "narHash": "sha256-ikWRNR/P/aKCCySZnUfF1W0u0t6rSoJgQgKeDdCBAK8=",
+        "lastModified": 1744592022,
+        "narHash": "sha256-QuWrCRiF3CUM99sgj3gXbIzB1IAVWS5IEfFHadbMA2g=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "c5322a2bf74c0066fd15ca35721561397a2e7eab",
+        "rev": "cf9e19413b6c2d995b55565cd99facf9c751b653",
         "type": "github"
       },
       "original": {
diff --git a/npins/sources.nix b/npins/sources.nix
index 162f1d94..3ae0b99e 100644
--- a/npins/sources.nix
+++ b/npins/sources.nix
@@ -98,7 +98,9 @@ builtins.mapAttrs
             Channel = getZip;
             Tarball = getUrl;
           }
-          .${spec.type}
+          .${
+            spec.type
+          }
           or (builtins.throw "Unknown source type ${spec.type}");
       in
         spec // {outPath = mayOverride (func spec);}

From 920f3c9670b1b9a62e7911cd17720d394648858c Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 14 Apr 2025 07:07:39 +0300
Subject: [PATCH 127/202] ci: exclude npins directory in formatting check

---
 .github/workflows/check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index a349cb07..a3f4fce3 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -37,7 +37,7 @@ jobs:
         uses: DeterminateSystems/nix-installer-action@main
 
       - name: Check formatting via Alejandra
-        run: nix run nixpkgs#alejandra -- -c .
+        run: nix run nixpkgs#alejandra -- --check . --exclude npins
 
   check-typos:
     name: "Check source tree for typos"

From f830553166bbf38963413c638d9240d71a0ea8bb Mon Sep 17 00:00:00 2001
From: rice-cracker-dev <ricecracker2234@proton.me>
Date: Mon, 14 Apr 2025 18:01:52 +0700
Subject: [PATCH 128/202] nvim_lint: moved the function into a separate option
 "lint_function"

---
 docs/release-notes/rl-0.8.md                  |  5 +-
 .../plugins/diagnostics/nvim-lint/config.nix  | 35 +-----------
 .../diagnostics/nvim-lint/nvim-lint.nix       | 56 ++++++++++++++++++-
 3 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index d5190855..b8c51358 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -289,8 +289,9 @@
 [rice-cracker-dev](https://github.com/rice-cracker-dev):
 
 - `eslint_d` now checks for configuration files to load.
-- Fixed an error where `eslint_d` fails to load.
-- Added required files support for linters under `vim.diagnostics.nvim-lint.linters.*.required_files`.
+- Fix an error where `eslint_d` fails to load.
+- Add required files support for linters under `vim.diagnostics.nvim-lint.linters.*.required_files`.
+- Add global function `nvf_lint` under `vim.diagnostics.nvim-lint.lint_function`.
 
 [Sc3l3t0n](https://github.com/Sc3l3t0n):
 
diff --git a/modules/plugins/diagnostics/nvim-lint/config.nix b/modules/plugins/diagnostics/nvim-lint/config.nix
index fca38cfa..488bd70f 100644
--- a/modules/plugins/diagnostics/nvim-lint/config.nix
+++ b/modules/plugins/diagnostics/nvim-lint/config.nix
@@ -29,40 +29,7 @@ in {
             end
           end
 
-          function nvf_lint(buf)
-            local ft = vim.api.nvim_get_option_value("filetype", { buf = buf })
-            local linters = require("lint").linters
-            local linters_from_ft = require("lint").linters_by_ft[ft]
-
-            -- if no linter is configured for this filetype, stops linting
-            if linters_from_ft == nil then return end
-
-            for _, name in ipairs(linters_from_ft) do
-              local linter = linters[name]
-              assert(linter, 'Linter with name `' .. name .. '` not available')
-
-              if type(linter) == "function" then
-                linter = linter()
-              end
-              -- for require("lint").lint() to work, linter.name must be set
-              linter.name = linter.name or name
-              local cwd = linter.required_files
-
-              -- if no configuration files are configured, lint
-              if cwd == nil then
-                require("lint").lint(linter)
-              else
-                -- if configuration files are configured and present in the project, lint
-                for _, fn in ipairs(cwd) do
-                  local path = vim.fs.joinpath(linter.cwd or vim.fn.getcwd(), fn);
-                  if vim.uv.fs_stat(path) then
-                    require("lint").lint(linter)
-                    break
-                  end
-                end
-              end
-            end
-          end
+          nvf_lint = ${toLuaObject cfg.lint_function}
         '';
       };
     })
diff --git a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
index 6657be69..59c50f1d 100644
--- a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
+++ b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
@@ -1,7 +1,8 @@
 {lib, ...}: let
-  inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.options) mkOption mkEnableOption literalExpression;
   inherit (lib.types) nullOr attrsOf listOf str either submodule bool enum;
   inherit (lib.nvim.types) luaInline;
+  inherit (lib.generators) mkLuaInline;
 
   linterType = submodule {
     options = {
@@ -73,8 +74,11 @@
       required_files = mkOption {
         type = nullOr (listOf str);
         default = null;
-        description = "Required files to lint. These files must exist relative to the cwd of the linter or else this linter will be skipped";
         example = ["eslint.config.js"];
+        description = ''
+          Required files to lint. These files must exist relative to the cwd
+          of the linter or else this linter will be skipped
+        '';
       };
     };
   };
@@ -124,5 +128,53 @@ in {
     };
 
     lint_after_save = mkEnableOption "autocmd to lint after each save" // {default = true;};
+
+    lint_function = mkOption {
+      type = luaInline;
+      default = mkLuaInline ''
+        function(buf)
+          local ft = vim.api.nvim_get_option_value("filetype", { buf = buf })
+          local linters = require("lint").linters
+          local linters_from_ft = require("lint").linters_by_ft[ft]
+
+          -- if no linter is configured for this filetype, stops linting
+          if linters_from_ft == nil then return end
+
+          for _, name in ipairs(linters_from_ft) do
+            local linter = linters[name]
+            assert(linter, 'Linter with name `' .. name .. '` not available')
+
+            if type(linter) == "function" then
+              linter = linter()
+            end
+            -- for require("lint").lint() to work, linter.name must be set
+            linter.name = linter.name or name
+            local cwd = linter.required_files
+
+            -- if no configuration files are configured, lint
+            if cwd == nil then
+              require("lint").lint(linter)
+            else
+              -- if configuration files are configured and present in the project, lint
+              for _, fn in ipairs(cwd) do
+                local path = vim.fs.joinpath(linter.cwd or vim.fn.getcwd(), fn);
+                if vim.uv.fs_stat(path) then
+                  require("lint").lint(linter)
+                  break
+                end
+              end
+            end
+          end
+        end
+      '';
+      example = literalExpression ''
+        mkLuaInline '''
+          function(buf)
+            require("lint").try_lint()
+          end
+        '''
+      '';
+      description = "Define the global function nvf_lint which is used by nvf to lint.";
+    };
   };
 }

From f516cb43ceb2b071e6b9a6d5c9d681c8a3187f5f Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 14 Apr 2025 17:02:34 +0300
Subject: [PATCH 129/202] git/gitlinker-nvim: remove duplicate package entry

---
 modules/plugins/git/gitlinker-nvim/config.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/plugins/git/gitlinker-nvim/config.nix b/modules/plugins/git/gitlinker-nvim/config.nix
index d1104a28..749cf18c 100644
--- a/modules/plugins/git/gitlinker-nvim/config.nix
+++ b/modules/plugins/git/gitlinker-nvim/config.nix
@@ -9,7 +9,6 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["gitlinker-nvim"];
       lazy.plugins = {
         "gitlinker-nvim" = {
           package = "gitlinker-nvim";

From 11426ea329344925a7ff76b64cbb012ed3ec3ebc Mon Sep 17 00:00:00 2001
From: Noah765 <noland62007@gmail.com>
Date: Thu, 17 Apr 2025 09:09:29 +0200
Subject: [PATCH 130/202] languages/dart: add flutter-tools.nvim dependency
 plenary.nvim

---
 docs/release-notes/rl-0.8.md       |  4 ++++
 modules/plugins/languages/dart.nix | 12 ++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 710578eb..642599ba 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -328,3 +328,7 @@
 [rrvsh](https://github.com/rrvsh):
 
 - Fix namespace of python-lsp-server by changing it to python3Packages
+
+[Noah765](https://github.com/Noah765):
+
+- Add missing `flutter-tools.nvim` dependency `plenary.nvim`.
diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix
index 4f8a7028..77d92d3b 100644
--- a/modules/plugins/languages/dart.nix
+++ b/modules/plugins/languages/dart.nix
@@ -134,10 +134,14 @@ in {
     })
 
     (mkIf ftcfg.enable {
-      vim.startPlugins =
-        if ftcfg.enableNoResolvePatch
-        then ["flutter-tools-patched"]
-        else ["flutter-tools-nvim"];
+      vim.startPlugins = [
+        (
+          if ftcfg.enableNoResolvePatch
+          then "flutter-tools-patched"
+          else "flutter-tools-nvim"
+        )
+        "plenary-nvim"
+      ];
 
       vim.pluginRC.flutter-tools = entryAnywhere ''
         require('flutter-tools').setup {

From db3a35a116d93162d9bc07264ede37404b243f0a Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 13 Apr 2025 11:14:50 +0200
Subject: [PATCH 131/202] rc: do not set options via luaConfigPre

---
 modules/wrapper/rc/config.nix  | 10 +++++++++-
 modules/wrapper/rc/options.nix | 26 ++------------------------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/modules/wrapper/rc/config.nix b/modules/wrapper/rc/config.nix
index ff8a4585..77a62d58 100644
--- a/modules/wrapper/rc/config.nix
+++ b/modules/wrapper/rc/config.nix
@@ -5,7 +5,7 @@
 }: let
   inherit (builtins) map mapAttrs filter;
   inherit (lib.attrsets) mapAttrsToList;
-  inherit (lib.strings) concatLines concatMapStringsSep;
+  inherit (lib.strings) concatLines concatMapStringsSep optionalString;
   inherit (lib.trivial) showWarnings;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.dag) entryAfter mkLuarcSection resolveDag entryAnywhere;
@@ -72,6 +72,14 @@ in {
           dag = cfg.luaConfigRC;
           mapResult = result:
             concatLines [
+              (optionalString (cfg.additionalRuntimePaths != []) ''
+                vim.opt.runtimepath:append(${toLuaObject cfg.additionalRuntimePaths})
+              '')
+              (optionalString cfg.enableLuaLoader ''
+                if vim.loader then
+                  vim.loader.enable()
+                end
+              '')
               cfg.luaConfigPre
               (concatMapStringsSep "\n" mkLuarcSection result)
               cfg.luaConfigPost
diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index 4cd3026f..10abd77d 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -1,15 +1,7 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
   inherit (lib.options) mkOption literalMD literalExpression;
-  inherit (lib.strings) optionalString;
   inherit (lib.types) str bool int enum attrsOf lines listOf either path submodule anything;
   inherit (lib.nvim.types) dagOf;
-  inherit (lib.nvim.lua) listToLuaTable;
-
-  cfg = config.vim;
 in {
   options.vim = {
     enableLuaLoader = mkOption {
@@ -286,21 +278,7 @@ in {
 
     luaConfigPre = mkOption {
       type = str;
-      default = ''
-        ${optionalString (cfg.additionalRuntimePaths != []) ''
-          -- The following list is generated from `vim.additionalRuntimePaths`
-          -- and is used to append additional runtime paths to the
-          -- `runtimepath` option.
-          vim.opt.runtimepath:append(${listToLuaTable cfg.additionalRuntimePaths})
-        ''}
-
-        ${optionalString cfg.enableLuaLoader ''
-          if vim.loader then
-            vim.loader.enable()
-          end
-        ''}
-      '';
-
+      default = "";
       defaultText = literalMD ''
         By default, this option will **append** paths in
         [](#opt-vim.additionalRuntimePaths)

From 1f6e2f3ca461f6d5ffa3f9676362f396eae708ff Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 13 Apr 2025 11:32:11 +0200
Subject: [PATCH 132/202] docs: update release notes

---
 docs/release-notes/rl-0.8.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 642599ba..e866e969 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -107,6 +107,8 @@
 - Add `LazyFile` user event.
 - Migrate language modules from none-ls to conform/nvim-lint
 - Add tsx support in conform and lint
+- Moved code setting additionalRuntimePaths and enableLuaLoader out of
+  luaConfigPre's default to prevent being overridden
 
 [diniamo](https://github.com/diniamo):
 

From 05954eec6d6bff2d0ed00f507aa0b50674d051c4 Mon Sep 17 00:00:00 2001
From: rice-cracker-dev <ricecracker2234@proton.me>
Date: Fri, 18 Apr 2025 11:00:16 +0700
Subject: [PATCH 133/202] docs: update
 vim.diagnostics.nvim-lint.*.required_files description

---
 modules/plugins/diagnostics/nvim-lint/nvim-lint.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
index 59c50f1d..956bd76e 100644
--- a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
+++ b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
@@ -78,6 +78,13 @@
         description = ''
           Required files to lint. These files must exist relative to the cwd
           of the linter or else this linter will be skipped
+
+          ::: {.note}
+          This option is an nvf extension that only takes effect if you
+          use the `nvf_lint()` lua function.
+
+          See {option}`vim.diagnostics.nvim-lint.lint_function`.
+          :::
         '';
       };
     };

From ef3ab83254e51e42b17cde9322070eef565a06d6 Mon Sep 17 00:00:00 2001
From: Noah765 <noland62007@gmail.com>
Date: Fri, 18 Apr 2025 15:49:11 +0200
Subject: [PATCH 134/202] languages/dart: add necessary dependency of
 flutter-tools.nvim on lsp

---
 docs/release-notes/rl-0.8.md       |  1 +
 modules/plugins/languages/dart.nix | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 642599ba..f17ca59e 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -332,3 +332,4 @@
 [Noah765](https://github.com/Noah765):
 
 - Add missing `flutter-tools.nvim` dependency `plenary.nvim`.
+- Add necessary dependency of `flutter-tools.nvim` on lsp
diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix
index 77d92d3b..d8d44d88 100644
--- a/modules/plugins/languages/dart.nix
+++ b/modules/plugins/languages/dart.nix
@@ -13,7 +13,7 @@
   inherit (lib.strings) optionalString;
   inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.types) mkGrammarOption;
-  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.dag) entryAfter;
 
   cfg = config.vim.languages.dart;
   ftcfg = cfg.flutter-tools;
@@ -122,19 +122,21 @@ in {
     };
   };
 
-  config = mkIf cfg.enable (mkMerge [
+  config.vim = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
-      vim.treesitter.enable = true;
-      vim.treesitter.grammars = [cfg.treesitter.package];
+      treesitter.enable = true;
+      treesitter.grammars = [cfg.treesitter.package];
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.dart-lsp = servers.${cfg.lsp.server}.lspConfig;
+      lsp.lspconfig.enable = true;
+      lsp.lspconfig.sources.dart-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
     (mkIf ftcfg.enable {
-      vim.startPlugins = [
+      lsp.enable = true;
+
+      startPlugins = [
         (
           if ftcfg.enableNoResolvePatch
           then "flutter-tools-patched"
@@ -143,7 +145,7 @@ in {
         "plenary-nvim"
       ];
 
-      vim.pluginRC.flutter-tools = entryAnywhere ''
+      pluginRC.flutter-tools = entryAfter ["lsp-setup"] ''
         require('flutter-tools').setup {
           lsp = {
             color = { -- show the derived colours for dart variables

From 99d600f40f4bf4d7b50524f760979886acab8ad7 Mon Sep 17 00:00:00 2001
From: Noah765 <noland62007@gmail.com>
Date: Fri, 18 Apr 2025 15:51:03 +0200
Subject: [PATCH 135/202] languages/dart: remove invalid config key lsp.flags
 from flutter-tools.nvim setup

The lsp.flags key is not present in the documentation of flutter-tools.nvim and lsp_flags always evaluates to nil.
---
 modules/plugins/languages/dart.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix
index d8d44d88..b3747099 100644
--- a/modules/plugins/languages/dart.nix
+++ b/modules/plugins/languages/dart.nix
@@ -158,7 +158,6 @@ in {
 
             capabilities = capabilities,
             on_attach = default_on_attach;
-            flags = lsp_flags,
           },
           ${optionalString cfg.dap.enable ''
           debugger = {

From df0e2060c6cd3471fb1964b99b8dc5bacd36c10e Mon Sep 17 00:00:00 2001
From: Noah765 <noland62007@gmail.com>
Date: Fri, 18 Apr 2025 17:05:57 +0200
Subject: [PATCH 136/202] languages/dart: add flutter-tools.flutterPackage
 option

Previously, flutter-tools was dependent on the flutter SDK, which it found in the PATH. Having such undeclared and non-reproducible dependencies is against the principles of nix.
The flutterPackage option has been made optional for people who have installed the flutter SDK differently and want to keep it that way.
The enableNoResolvePatch option has been retained for people who have installed the flutter SDK using nix outside the scope of nvf and do not want to have to install it twice. The default value has been changed to false, assuming that most people who use nix to install flutter will use the flutterPackage option instead.
---
 docs/release-notes/rl-0.8.md       |  3 ++-
 modules/plugins/languages/dart.nix | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index f17ca59e..312b1896 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -332,4 +332,5 @@
 [Noah765](https://github.com/Noah765):
 
 - Add missing `flutter-tools.nvim` dependency `plenary.nvim`.
-- Add necessary dependency of `flutter-tools.nvim` on lsp
+- Add necessary dependency of `flutter-tools.nvim` on lsp.
+- Add the `vim.languages.dart.flutter-tools.flutterPackage` option.
diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix
index b3747099..b61585d4 100644
--- a/modules/plugins/languages/dart.nix
+++ b/modules/plugins/languages/dart.nix
@@ -81,16 +81,23 @@ in {
         description = "Enable flutter-tools for flutter support";
       };
 
+      flutterPackage = mkOption {
+        type = nullOr package;
+        default = pkgs.flutter;
+        description = "Flutter package, or null to detect the flutter path at runtime instead.";
+      };
+
       enableNoResolvePatch = mkOption {
         type = bool;
-        default = true;
+        default = false;
         description = ''
           Whether to patch flutter-tools so that it doesn't resolve
           symlinks when detecting flutter path.
 
-          This is required if you want to use a flutter package built with nix.
-          If you are using a flutter SDK installed from a different source
-          and encounter the error "`dart` missing from PATH", disable this option.
+          This is required if flutterPackage is set to null and the flutter
+          package in your PATH was built with nix. If you are using a flutter
+          SDK installed from a different source and encounter the error "`dart`
+          missing from PATH", leave this option disabled.
         '';
       };
 
@@ -147,6 +154,7 @@ in {
 
       pluginRC.flutter-tools = entryAfter ["lsp-setup"] ''
         require('flutter-tools').setup {
+          ${optionalString (ftcfg.flutterPackage != null) "flutter_path = \"${ftcfg.flutterPackage}/bin/flutter\","}
           lsp = {
             color = { -- show the derived colours for dart variables
               enabled = ${boolToString ftcfg.color.enable}, -- whether or not to highlight color variables at all, only supported on flutter >= 2.10

From a6a7bd37f314d2bff8212a452ae22bd6698c44e3 Mon Sep 17 00:00:00 2001
From: Howard Nguyen-Huu <howardnguyenhuu@gmail.com>
Date: Fri, 18 Apr 2025 19:52:44 -0400
Subject: [PATCH 137/202] fix: change python dap name from python to debugpy

---
 modules/plugins/languages/python.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix
index 476b56ef..d6dec1c2 100644
--- a/modules/plugins/languages/python.nix
+++ b/modules/plugins/languages/python.nix
@@ -99,7 +99,7 @@
       # idk if this is the best way to install/run debugpy
       package = pkgs.python3.withPackages (ps: with ps; [debugpy]);
       dapConfig = ''
-        dap.adapters.python = function(cb, config)
+        dap.adapters.debugpy = function(cb, config)
           if config.request == 'attach' then
             ---@diagnostic disable-next-line: undefined-field
             local port = (config.connect or config).port
@@ -125,10 +125,10 @@
           end
         end
 
-        dap.configurations.python = {
+        dap.configurations.debugpy = {
           {
             -- The first three options are required by nvim-dap
-            type = 'python'; -- the type here established the link to the adapter definition: `dap.adapters.python`
+            type = 'debugpy'; -- the type here established the link to the adapter definition: `dap.adapters.debugpy`
             request = 'launch';
             name = "Launch file";
 

From b7627523333b1ac64111e0f030934f9d17dbb063 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 19 Apr 2025 13:22:06 +0200
Subject: [PATCH 138/202] languages/go: default disable gofmt if lsp is enabled

---
 modules/plugins/languages/go.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/plugins/languages/go.nix b/modules/plugins/languages/go.nix
index 9f8bca3c..3f232669 100644
--- a/modules/plugins/languages/go.nix
+++ b/modules/plugins/languages/go.nix
@@ -5,7 +5,7 @@
   ...
 }: let
   inherit (builtins) attrNames;
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption mkOption literalMD;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
   inherit (lib.lists) isList;
@@ -84,7 +84,14 @@ in {
     };
 
     format = {
-      enable = mkEnableOption "Go formatting" // {default = config.vim.languages.enableFormat;};
+      enable =
+        mkEnableOption "Go formatting"
+        // {
+          default = !cfg.lsp.enable && config.vim.languages.enableFormat;
+          defaultText = literalMD ''
+            disabled if Go LSP is enabled, otherwise follows {option}`vim.languages.enableFormat`
+          '';
+        };
 
       type = mkOption {
         description = "Go formatter to use";

From 5db21bae6f9073bf08608449ba7ea50da4040c13 Mon Sep 17 00:00:00 2001
From: Noah765 <noland62007@gmail.com>
Date: Sat, 19 Apr 2025 15:51:47 +0200
Subject: [PATCH 139/202] languages/dart: update
 flutter-tools.enableNoResolvePatch description

---
 modules/plugins/languages/dart.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix
index b61585d4..7b9584b9 100644
--- a/modules/plugins/languages/dart.nix
+++ b/modules/plugins/languages/dart.nix
@@ -94,10 +94,12 @@ in {
           Whether to patch flutter-tools so that it doesn't resolve
           symlinks when detecting flutter path.
 
-          This is required if flutterPackage is set to null and the flutter
-          package in your PATH was built with nix. If you are using a flutter
+          ::: {.note}
+          This is required if `flutterPackage` is set to null and the flutter
+          package in your `PATH` was built with Nix. If you are using a flutter
           SDK installed from a different source and encounter the error "`dart`
-          missing from PATH", leave this option disabled.
+          missing from `PATH`", leave this option disabled.
+          :::
         '';
       };
 

From b67e151d22567c9cca367ea430253299e34344c4 Mon Sep 17 00:00:00 2001
From: Howard Nguyen-Huu <howardnguyenhuu@gmail.com>
Date: Sat, 19 Apr 2025 13:53:15 -0400
Subject: [PATCH 140/202] docs: add changes to release notes

---
 docs/release-notes/rl-0.8.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index bd88ab7c..4c345d15 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -290,8 +290,10 @@
 
 - `eslint_d` now checks for configuration files to load.
 - Fix an error where `eslint_d` fails to load.
-- Add required files support for linters under `vim.diagnostics.nvim-lint.linters.*.required_files`.
-- Add global function `nvf_lint` under `vim.diagnostics.nvim-lint.lint_function`.
+- Add required files support for linters under
+  `vim.diagnostics.nvim-lint.linters.*.required_files`.
+- Add global function `nvf_lint` under
+  `vim.diagnostics.nvim-lint.lint_function`.
 
 [Sc3l3t0n](https://github.com/Sc3l3t0n):
 
@@ -334,3 +336,7 @@
 [Noah765](https://github.com/Noah765):
 
 - Add missing `flutter-tools.nvim` dependency `plenary.nvim`.
+
+[howird](https://github.com/howird):
+
+- Change python dap adapter name from `python` to commonly expected `debugpy`.

From fb7f47b375160db5845f6f7bf3815e33eae8cac3 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 20 Apr 2025 17:48:59 +0300
Subject: [PATCH 141/202] flake: bump inputs

---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 540715e9..3c089070 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1744592022,
-        "narHash": "sha256-QuWrCRiF3CUM99sgj3gXbIzB1IAVWS5IEfFHadbMA2g=",
+        "lastModified": 1744597985,
+        "narHash": "sha256-lLYB9/tQ0OAKonL0Ku963nqOm0aE1TmLavrzmXAr5Zc=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "cf9e19413b6c2d995b55565cd99facf9c751b653",
+        "rev": "cbdcbb5f8eb24e25b932bbc87e29299a72e34b64",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744473229,
-        "narHash": "sha256-rGXvIsD/Hn+bJRFb7hqSx7UUZUIlxXs0fM6ix5+iT5w=",
+        "lastModified": 1744868846,
+        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "52d0eded529af34e91df6b2a2bc32eb636637cd2",
+        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
         "type": "github"
       },
       "original": {

From 27c0b5caf3ce04f5190d360028a2ee0bc39fc5e7 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 20 Apr 2025 17:49:06 +0300
Subject: [PATCH 142/202] pins: bump all plugins

---
 npins/sources.json | 240 ++++++++++++++++++++++-----------------------
 1 file changed, 120 insertions(+), 120 deletions(-)

diff --git a/npins/sources.json b/npins/sources.json
index d11d16c4..05a8c173 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -35,9 +35,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "3f13e15c53ea2aaf79c24ceab725309d87f0619c",
-      "url": "https://github.com/rrethy/base16-nvim/archive/3f13e15c53ea2aaf79c24ceab725309d87f0619c.tar.gz",
-      "hash": "1z6pdf707r2rpmzi057dhcmd045695v03215asn1hdn8r294zcmg"
+      "revision": "965160025d0facbe9caa863e5beef2a7a488e9d1",
+      "url": "https://github.com/rrethy/base16-nvim/archive/965160025d0facbe9caa863e5beef2a7a488e9d1.tar.gz",
+      "hash": "02w1mn15gydma9canvqrlwf4l5z76s1vs01zanipwwflvwclsb8f"
     },
     "blink-cmp": {
       "type": "GitRelease",
@@ -77,9 +77,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "2ed6d9a28b07fa6f3bface818470605f8896408c",
-      "url": "https://github.com/saghen/blink.compat/archive/2ed6d9a28b07fa6f3bface818470605f8896408c.tar.gz",
-      "hash": "009475xy41l4dpayswhx65q6a7djzw7rz2ycbrbpyg041y0qynqs"
+      "revision": "f1836ed7a07f8d082ff6c3fbae1e476ba2adee84",
+      "url": "https://github.com/saghen/blink.compat/archive/f1836ed7a07f8d082ff6c3fbae1e476ba2adee84.tar.gz",
+      "hash": "0b22c943vbxn8cgfc3m0wmmia9rja6x766ywa798nx7s7x0sd53x"
     },
     "blink-emoji-nvim": {
       "type": "Git",
@@ -103,9 +103,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "56084d1f45c8621d23d4bac724c2dc50b1eb75db",
-      "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/56084d1f45c8621d23d4bac724c2dc50b1eb75db.tar.gz",
-      "hash": "1lyczjvwpi5f1mjgw059yzkxxjrk48vcvhdjzkjgakhsq76s125x"
+      "revision": "ca538d15bd22fedd3408064d2b25ff8d56ec8ce8",
+      "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/ca538d15bd22fedd3408064d2b25ff8d56ec8ce8.tar.gz",
+      "hash": "1rg40x0lvz11rl95b3q3kqzb8ygvyvhcxiw255200ccxl6q21jg8"
     },
     "bufdelete-nvim": {
       "type": "Git",
@@ -272,9 +272,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "9654cb31f10c9eda3e777d03d32b29df606ab0fe",
-      "url": "https://github.com/olimorris/codecompanion.nvim/archive/9654cb31f10c9eda3e777d03d32b29df606ab0fe.tar.gz",
-      "hash": "0ff4mbfim0kj5prv9xfqp8gsk1fw0y2d0kmazfivkhg04my8m89l"
+      "revision": "030f305930a25bd9e45b5e5252b47b7069fb800e",
+      "url": "https://github.com/olimorris/codecompanion.nvim/archive/030f305930a25bd9e45b5e5252b47b7069fb800e.tar.gz",
+      "hash": "1n59gkzfs05ybf7xvrbxacmwk8nbz8ybgdjwv8irdz5la5hi6wmn"
     },
     "codewindow-nvim": {
       "type": "Git",
@@ -311,9 +311,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "eebc724d12c5579d733d1f801386e0ceb909d001",
-      "url": "https://github.com/stevearc/conform.nvim/archive/eebc724d12c5579d733d1f801386e0ceb909d001.tar.gz",
-      "hash": "122v0svrsss8g4gzy9fz2ppzm2lxf85l4m8wincxsy75x9v3ywgn"
+      "revision": "6632e7d788a85bf8405ea0c812d343fc308b7b8c",
+      "url": "https://github.com/stevearc/conform.nvim/archive/6632e7d788a85bf8405ea0c812d343fc308b7b8c.tar.gz",
+      "hash": "0dv4h87jjb2dp6whgc7wvxisc7hcx1828ixzci80py8kjky013zw"
     },
     "copilot-cmp": {
       "type": "Git",
@@ -337,9 +337,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "c62a2a7616a9789a7676b6b7a8d9263b1082cdc8",
-      "url": "https://github.com/zbirenbaum/copilot.lua/archive/c62a2a7616a9789a7676b6b7a8d9263b1082cdc8.tar.gz",
-      "hash": "1agbxzq43wsga9szgaz45s638my8d7cxqwg2aa3rizyf7g8f7szy"
+      "revision": "dc579f98536029610cfa32c6bad86c0d24363679",
+      "url": "https://github.com/zbirenbaum/copilot.lua/archive/dc579f98536029610cfa32c6bad86c0d24363679.tar.gz",
+      "hash": "16zx9a8f2mjmj7ibdsjyj0vqdsc10yl1vrna0kkkgccj957rd99x"
     },
     "crates-nvim": {
       "type": "Git",
@@ -506,9 +506,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "efff286dd74c22f731cdec26a70b46e5b203c619",
-      "url": "https://github.com/rafamadriz/friendly-snippets/archive/efff286dd74c22f731cdec26a70b46e5b203c619.tar.gz",
-      "hash": "1vb5l8ipfjwsrqffbq8v2z5p1cpg035b3gk57692wd7835kr3i13"
+      "revision": "31f2a2657b6261724313281fe0d8ba6f43f4a4fa",
+      "url": "https://github.com/rafamadriz/friendly-snippets/archive/31f2a2657b6261724313281fe0d8ba6f43f4a4fa.tar.gz",
+      "hash": "0rkz7zbv1maqhr22nxq39w7pahahcapfyc4rgscmr3bm4dcymk2a"
     },
     "fzf-lua": {
       "type": "Git",
@@ -519,9 +519,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "dc693475c4463463d84a0c7c43d463b8a8cd3aea",
-      "url": "https://github.com/ibhagwan/fzf-lua/archive/dc693475c4463463d84a0c7c43d463b8a8cd3aea.tar.gz",
-      "hash": "1his2nwjrb9xbjmz5i6nln7v5mk2f85dla10qn5xwji9zgnfy24l"
+      "revision": "ea2bda8a9717307affd921e1b540dc06acdf8ea8",
+      "url": "https://github.com/ibhagwan/fzf-lua/archive/ea2bda8a9717307affd921e1b540dc06acdf8ea8.tar.gz",
+      "hash": "0ba9ncwjv9kcnw7nimifyad54xdf1cacbdlc7hjyy2zlivf4pm3g"
     },
     "gesture-nvim": {
       "type": "Git",
@@ -584,9 +584,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "fcfa7a989cd6fed10abf02d9880dc76d7a38167d",
-      "url": "https://github.com/lewis6991/gitsigns.nvim/archive/fcfa7a989cd6fed10abf02d9880dc76d7a38167d.tar.gz",
-      "hash": "1grkw8x1fycw1hbppy0zakwwkk7h2f8x5qy4wh34yj5f5g9jn3vj"
+      "revision": "02eafb1273afec94447f66d1a43fc5e477c2ab8a",
+      "url": "https://github.com/lewis6991/gitsigns.nvim/archive/02eafb1273afec94447f66d1a43fc5e477c2ab8a.tar.gz",
+      "hash": "1m507jyyi1nny14q2bxydy6a54g28yq855g4yaj9jslz7dml2v4i"
     },
     "glow-nvim": {
       "type": "Git",
@@ -610,9 +610,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "12b5420b665e8053d74eb075d8a589477333f67d",
-      "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/12b5420b665e8053d74eb075d8a589477333f67d.tar.gz",
-      "hash": "16fa841cv0dbn7pkcs44r5ch241vhax8jfxgcxwwd0z4srlbj6gy"
+      "revision": "a933d8666dad9363dc6908ae72cfc832299c2f59",
+      "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/a933d8666dad9363dc6908ae72cfc832299c2f59.tar.gz",
+      "hash": "02r2h0ip2vzmgmv9b36ff2r6br3ql0b9ggzl8ijsyjy7pgiij04y"
     },
     "harpoon": {
       "type": "Git",
@@ -636,9 +636,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "18fef08cba01de6b5022e85ac4468f74edc45259",
-      "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/18fef08cba01de6b5022e85ac4468f74edc45259.tar.gz",
-      "hash": "1bhr9w58hy63zilbqdwfvwzca6sk667yagjbzf13acl306nvgnhd"
+      "revision": "797610ad83d2730d0a8659ecac5d98ccb476ac23",
+      "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/797610ad83d2730d0a8659ecac5d98ccb476ac23.tar.gz",
+      "hash": "1i1ivfhl34yi9xff5s1wkr252vlfjazsf75bjphbi4c50s64wbaa"
     },
     "highlight-undo-nvim": {
       "type": "Git",
@@ -743,9 +743,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "03eaa2e0c0ec9436dea0e954bc47564ff3ca9196",
-      "url": "https://github.com/ggandor/leap.nvim/archive/03eaa2e0c0ec9436dea0e954bc47564ff3ca9196.tar.gz",
-      "hash": "1lskih4hvf1c57d0f6gibc36c926lqky0y2h6ypmkgh8gmcdazdw"
+      "revision": "8a0efa79133fee211017d769c8031512192008b3",
+      "url": "https://github.com/ggandor/leap.nvim/archive/8a0efa79133fee211017d769c8031512192008b3.tar.gz",
+      "hash": "0pgg26r5rh1r2364yj05w4scarzy6zwsp6w7s9yxgfmk7l9x89yk"
     },
     "leetcode-nvim": {
       "type": "Git",
@@ -795,9 +795,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "778d56ff9b387dacd14ae648ed5604394b486f51",
-      "url": "https://github.com/nvimdev/lspsaga.nvim/archive/778d56ff9b387dacd14ae648ed5604394b486f51.tar.gz",
-      "hash": "1rm8ww8krxliwli9m2j6j37xgwgjsrgapvgrcdr6nd4mi6hgmczm"
+      "revision": "920b1253e1a26732e53fac78412f6da7f674671d",
+      "url": "https://github.com/nvimdev/lspsaga.nvim/archive/920b1253e1a26732e53fac78412f6da7f674671d.tar.gz",
+      "hash": "0wkcgy2x119sd9xn6k9vs83pvrj0m4ali1ac72pah8pnlzfvkw7i"
     },
     "lua-utils-nvim": {
       "type": "Git",
@@ -847,9 +847,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "2ef8dfbef6f8f97873da4c5820067343690d114c",
-      "url": "https://github.com/nvim-neorocks/lz.n/archive/2ef8dfbef6f8f97873da4c5820067343690d114c.tar.gz",
-      "hash": "11i6ayqvyamh8i2scq7qbf6rrxrq9v0hax9gxmdxhdxd18djyq8n"
+      "revision": "c22bd7ef977a32b792ea70e203126a9063519a62",
+      "url": "https://github.com/nvim-neorocks/lz.n/archive/c22bd7ef977a32b792ea70e203126a9063519a62.tar.gz",
+      "hash": "0q8bz28dbmdsyndbnajw73x2cr8kpcx0fcj9lip9mr24vgx2vb8v"
     },
     "lzn-auto-require": {
       "type": "Git",
@@ -1016,9 +1016,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "cf3625d2c4a437f5edf7e61382e0fe522fc76fb7",
-      "url": "https://github.com/echasnovski/mini.completion/archive/cf3625d2c4a437f5edf7e61382e0fe522fc76fb7.tar.gz",
-      "hash": "0lpvl1kd7vmyy00p97am9ghj6gdmnk1dbw93wjmnvin057w9sysw"
+      "revision": "35130cebc63ace7d6e4583f349af8cd3f3141af7",
+      "url": "https://github.com/echasnovski/mini.completion/archive/35130cebc63ace7d6e4583f349af8cd3f3141af7.tar.gz",
+      "hash": "0h5z5i62cc780bzw60rbizngvpyl4vk7j858pndyi2g572plz929"
     },
     "mini-diff": {
       "type": "Git",
@@ -1289,9 +1289,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "e05106957fc178285dbc510ff833985da59d3e5a",
-      "url": "https://github.com/echasnovski/mini.snippets/archive/e05106957fc178285dbc510ff833985da59d3e5a.tar.gz",
-      "hash": "0pn9i6sfh3fxkjzh9yyyc05lgcgm8wsanvl7axmy4p7a9spnfa2q"
+      "revision": "d005684e620e76eb2a5fbbbd211a1eba7212b4aa",
+      "url": "https://github.com/echasnovski/mini.snippets/archive/d005684e620e76eb2a5fbbbd211a1eba7212b4aa.tar.gz",
+      "hash": "19xmqzgx0lv6m6lp6dn4pcr53clgjyrlnh45j795cy9szizw4y0x"
     },
     "mini-splitjoin": {
       "type": "Git",
@@ -1461,9 +1461,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "5224467c6a49a6c77b8a8333f4d9af0abc788e10",
-      "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/5224467c6a49a6c77b8a8333f4d9af0abc788e10.tar.gz",
-      "hash": "0dzppxi4w38s3pqsgwd3z0xr1r14bd0v4qpakxw3kjn9wr2d8y7n"
+      "revision": "1ef260eb4f54515fe121a2267b477efb054d108a",
+      "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/1ef260eb4f54515fe121a2267b477efb054d108a.tar.gz",
+      "hash": "0j0gr2pisrj5vsiwsvrd3dkrdrd3q2742srk23rw2x0h055c0mxh"
     },
     "neocord": {
       "type": "Git",
@@ -1487,9 +1487,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "a1e19618c012a712c5ed7cd5ebd01b48ad9f4b5b",
-      "url": "https://github.com/nvim-neorg/neorg/archive/a1e19618c012a712c5ed7cd5ebd01b48ad9f4b5b.tar.gz",
-      "hash": "1lp1chm788rnzqjndw64rnjn299889fx66lm01lvfgail0509dw0"
+      "revision": "35da593c55d78086a3203ee3e6d749fafe2e4e73",
+      "url": "https://github.com/nvim-neorg/neorg/archive/35da593c55d78086a3203ee3e6d749fafe2e4e73.tar.gz",
+      "hash": "0kxygwpfffa0blcy54g7cvm5laj77q0f72p69s43j9dpsps1h63y"
     },
     "neorg-telescope": {
       "type": "Git",
@@ -1500,9 +1500,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "ddb2556644cae922699a239bbb0fe16e25b084b7",
-      "url": "https://github.com/nvim-neorg/neorg-telescope/archive/ddb2556644cae922699a239bbb0fe16e25b084b7.tar.gz",
-      "hash": "0p2s3n22fy1vkqc9n55x6kssqs4n0znwlszfrs532hj8m992wbks"
+      "revision": "7fb6ca6a632c3c095601d379a664c0c1f802dc6c",
+      "url": "https://github.com/nvim-neorg/neorg-telescope/archive/7fb6ca6a632c3c095601d379a664c0c1f802dc6c.tar.gz",
+      "hash": "12pbixkb7175qb9wblq01mbpkccm9h0si7b2jjaf7yip8j8frxmn"
     },
     "neovim-session-manager": {
       "type": "Git",
@@ -1565,9 +1565,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "8d99472fcccffd73d7501e54e9018bab5cb0c4ad",
-      "url": "https://github.com/nvimtools/none-ls.nvim/archive/8d99472fcccffd73d7501e54e9018bab5cb0c4ad.tar.gz",
-      "hash": "1x1fmpy65j8smn5lfl9bknmfnan33gd5dila49gyblgcgfvpd7ph"
+      "revision": "fb50cf17e926a037c9f8d96d8db29ddbd04965d4",
+      "url": "https://github.com/nvimtools/none-ls.nvim/archive/fb50cf17e926a037c9f8d96d8db29ddbd04965d4.tar.gz",
+      "hash": "07zfkjdqwlrm1d07za0payqs37gmn4x8m489438nv84sqqhnfrvd"
     },
     "nord": {
       "type": "Git",
@@ -1604,9 +1604,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "2a406cdd8c373ae7fe378a9e062a5424472bd8d8",
-      "url": "https://github.com/windwp/nvim-autopairs/archive/2a406cdd8c373ae7fe378a9e062a5424472bd8d8.tar.gz",
-      "hash": "06i7bdq4msy2gia6mczxaj2y7chhrmw9xwjj8q4dix0pk58hjfp1"
+      "revision": "4d74e75913832866aa7de35e4202463ddf6efd1b",
+      "url": "https://github.com/windwp/nvim-autopairs/archive/4d74e75913832866aa7de35e4202463ddf6efd1b.tar.gz",
+      "hash": "0q6pv89x05l71nfg2chqf9p0d2ha72agmll2svimq0npp84ymfxz"
     },
     "nvim-bufferline-lua": {
       "type": "Git",
@@ -1630,9 +1630,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "059e89495b3ec09395262f16b1ad441a38081d04",
-      "url": "https://github.com/hrsh7th/nvim-cmp/archive/059e89495b3ec09395262f16b1ad441a38081d04.tar.gz",
-      "hash": "0yfxjkascn45svvzx727kz20bm6lkflkx4jc8nrx3rxv0j39wbb0"
+      "revision": "b5311ab3ed9c846b585c0c15b7559be131ec4be9",
+      "url": "https://github.com/hrsh7th/nvim-cmp/archive/b5311ab3ed9c846b585c0c15b7559be131ec4be9.tar.gz",
+      "hash": "07674djcyac9wlj08y9p5gsmdpsm8zxjfgk3fwyvvx8j7qyzx74p"
     },
     "nvim-colorizer-lua": {
       "type": "Git",
@@ -1669,9 +1669,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "7aade9e99bef5f0735cf966e715b3ce45515d786",
-      "url": "https://github.com/mfussenegger/nvim-dap/archive/7aade9e99bef5f0735cf966e715b3ce45515d786.tar.gz",
-      "hash": "0cr2y3lkr6ffxxd9b2pj8hr3fzb5dlj003fcknswqwsdhws75l22"
+      "revision": "98bf130702eaafad8567c0e3ea1171c2552d58bb",
+      "url": "https://github.com/mfussenegger/nvim-dap/archive/98bf130702eaafad8567c0e3ea1171c2552d58bb.tar.gz",
+      "hash": "045sajd5amwxq4964yj4lbh20daa0g8473a0ggbwggxpq6qz2678"
     },
     "nvim-dap-go": {
       "type": "Git",
@@ -1695,9 +1695,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "bc81f8d3440aede116f821114547a476b082b319",
-      "url": "https://github.com/rcarriga/nvim-dap-ui/archive/bc81f8d3440aede116f821114547a476b082b319.tar.gz",
-      "hash": "0hk34mfjxqiq82faf3q75ixpxd822vh8zbl1i5pvx6akn4v3mxk7"
+      "revision": "881a69e25bd6658864fab47450025490b74be878",
+      "url": "https://github.com/rcarriga/nvim-dap-ui/archive/881a69e25bd6658864fab47450025490b74be878.tar.gz",
+      "hash": "040xa1jg5591czydjsxf9rwk3g805nxgaaqn5zkgkxr3igc2rvsy"
     },
     "nvim-docs-view": {
       "type": "Git",
@@ -1734,9 +1734,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "5b1bdf306bd3e565908145279e8bbfc594dac3b3",
-      "url": "https://github.com/mfussenegger/nvim-lint/archive/5b1bdf306bd3e565908145279e8bbfc594dac3b3.tar.gz",
-      "hash": "0kwdb9wggkgzg9msrvnf15njqm9a8acljdak9fxnfh9al1ks8cav"
+      "revision": "d698d3b6fd7b1b85657d05a2a31d843ddb682c63",
+      "url": "https://github.com/mfussenegger/nvim-lint/archive/d698d3b6fd7b1b85657d05a2a31d843ddb682c63.tar.gz",
+      "hash": "0m4hj1yc0s6cb3icshcr3qkd5wknksnnw97axjbacsan5vc6831z"
     },
     "nvim-lspconfig": {
       "type": "Git",
@@ -1747,9 +1747,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "6ac17e69a353fea377b30a35a672a30f04e887a1",
-      "url": "https://github.com/neovim/nvim-lspconfig/archive/6ac17e69a353fea377b30a35a672a30f04e887a1.tar.gz",
-      "hash": "0s1hb7fkjvccycwdzq10lrycs8xmdlk9n4pjafgwgmnhnmgb3sfr"
+      "revision": "32b6a6449aaba11461fffbb596dd6310af79eea4",
+      "url": "https://github.com/neovim/nvim-lspconfig/archive/32b6a6449aaba11461fffbb596dd6310af79eea4.tar.gz",
+      "hash": "0rbqg3xdsdfklcsadzbbphzrgwa2c54lsipfqd67jq2p4baxsgxn"
     },
     "nvim-metals": {
       "type": "Git",
@@ -1760,9 +1760,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "bc896458ac639dea568e8dc06862074f8cba7fa3",
-      "url": "https://github.com/scalameta/nvim-metals/archive/bc896458ac639dea568e8dc06862074f8cba7fa3.tar.gz",
-      "hash": "0k7c300rf62f50vqzxxdgh7pqpb61im6xbz230fysvdjdx1ddglh"
+      "revision": "04d8ce24638412a2c93dd79fecca4b2c7b9c07f9",
+      "url": "https://github.com/scalameta/nvim-metals/archive/04d8ce24638412a2c93dd79fecca4b2c7b9c07f9.tar.gz",
+      "hash": "19mdfn5ni35ldjmwdg25cwiy9cvkg2cxrdhcjr9xplx7ln6zsld9"
     },
     "nvim-navbuddy": {
       "type": "Git",
@@ -1786,9 +1786,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "8649f694d3e76ee10c19255dece6411c29206a54",
-      "url": "https://github.com/SmiteshP/nvim-navic/archive/8649f694d3e76ee10c19255dece6411c29206a54.tar.gz",
-      "hash": "0964wgwh6i4nm637vx36bshkpd5i63ipwzqmrdbkz5h9bzyng7nj"
+      "revision": "39231352aec0d1e09cebbffdd9dc20a5dc691ffe",
+      "url": "https://github.com/SmiteshP/nvim-navic/archive/39231352aec0d1e09cebbffdd9dc20a5dc691ffe.tar.gz",
+      "hash": "1xj2bzax8hynm2x9zbvsaxv1j22chklyygzm1kbqxxs077qn45ws"
     },
     "nvim-neoclip-lua": {
       "type": "Git",
@@ -1825,9 +1825,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "22f29093eae7785773ee9d543f8750348b1a195c",
-      "url": "https://github.com/rcarriga/nvim-notify/archive/22f29093eae7785773ee9d543f8750348b1a195c.tar.gz",
-      "hash": "0nnxmi65ppmn8dzwh38vx2w7w6piq0i28mw0s32wa31xn5rmzwza"
+      "revision": "b5825cf9ee881dd8e43309c93374ed5b87b7a896",
+      "url": "https://github.com/rcarriga/nvim-notify/archive/b5825cf9ee881dd8e43309c93374ed5b87b7a896.tar.gz",
+      "hash": "13qlkncpmjvmkpcx5sv366i7scsh90wjvcqy8qlv31ccmgq511wv"
     },
     "nvim-scrollbar": {
       "type": "Git",
@@ -1851,9 +1851,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "caf6f633d4d77a29b6e265b560c5a035d171a913",
-      "url": "https://github.com/kylechui/nvim-surround/archive/caf6f633d4d77a29b6e265b560c5a035d171a913.tar.gz",
-      "hash": "130y0b2f69y5rzm64ss34a9zyqkpkybr2d1s4p0pcvvaq1ngq0r0"
+      "revision": "0e62500b98f4513feaaf7425c135472457ea5b7d",
+      "url": "https://github.com/kylechui/nvim-surround/archive/0e62500b98f4513feaaf7425c135472457ea5b7d.tar.gz",
+      "hash": "0rwzz98n8gyx2bffxg7ga7vxxxcc4crbwimvglx6bxkdg2abwyrn"
     },
     "nvim-tree-lua": {
       "type": "Git",
@@ -1864,9 +1864,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "5bea2b37523a31288e0fcab42f3be5c1bd4516bb",
-      "url": "https://github.com/nvim-tree/nvim-tree.lua/archive/5bea2b37523a31288e0fcab42f3be5c1bd4516bb.tar.gz",
-      "hash": "1mizgknbbjqv7a8fqc0n7glgabl0fq660nrqwq6w04qqynp0z1ax"
+      "revision": "3a63717d3d332d8f39aaf65be7a0e4c2265af021",
+      "url": "https://github.com/nvim-tree/nvim-tree.lua/archive/3a63717d3d332d8f39aaf65be7a0e4c2265af021.tar.gz",
+      "hash": "1w5m090wwhbsdif0w2fhg8qvdjni0g95b13h0kh5kdm3a7avwsm0"
     },
     "nvim-treesitter-context": {
       "type": "Git",
@@ -1877,9 +1877,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "439789a9a8df9639ecd749bb3286b77117024a6f",
-      "url": "https://github.com/nvim-treesitter/nvim-treesitter-context/archive/439789a9a8df9639ecd749bb3286b77117024a6f.tar.gz",
-      "hash": "04x9nza48d2vz262myhhfnmjzcc2fkdjb21mdqvlmnzkhh7ysyz2"
+      "revision": "6daca3ad780f045550b820f262002f35175a6c04",
+      "url": "https://github.com/nvim-treesitter/nvim-treesitter-context/archive/6daca3ad780f045550b820f262002f35175a6c04.tar.gz",
+      "hash": "0qprwd44hw9sz0vh14p6lpvs9vxrick462pfkradmal6ak1kfwn3"
     },
     "nvim-ts-autotag": {
       "type": "Git",
@@ -1903,9 +1903,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "a026364df62e88037b26d37c9f14c17c006fd577",
-      "url": "https://github.com/kevinhwang91/nvim-ufo/archive/a026364df62e88037b26d37c9f14c17c006fd577.tar.gz",
-      "hash": "02mqjwc4h29i9s9l8lsfwrx4ac69n3mpr9hw2vg7ji3c20mbh413"
+      "revision": "17aa9cec9081351946743a7094c0c883b24ebe64",
+      "url": "https://github.com/kevinhwang91/nvim-ufo/archive/17aa9cec9081351946743a7094c0c883b24ebe64.tar.gz",
+      "hash": "14lz7bnwkv3gjpkh8zi9ki9xlxc979gfy3ii396fpa1l3jpys18q"
     },
     "nvim-web-devicons": {
       "type": "Git",
@@ -1916,9 +1916,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "c90dee4e930ab9f49fa6d77f289bff335b49e972",
-      "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/c90dee4e930ab9f49fa6d77f289bff335b49e972.tar.gz",
-      "hash": "0i41df2cafrpc49cfbimajwbiyhd31q95d1s3rh40g6zgz0gm8sc"
+      "revision": "855c97005c8eebcdd19846f2e54706bffd40ee96",
+      "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/855c97005c8eebcdd19846f2e54706bffd40ee96.tar.gz",
+      "hash": "1rxpc5k6jbz7078dmjyjg8kgs67q2815bs8fz0srfqwyhvkgi15s"
     },
     "obsidian-nvim": {
       "type": "Git",
@@ -1981,9 +1981,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "e66a64183e211842c195f34fd6dcb97d7b534812",
-      "url": "https://github.com/nvim-orgmode/orgmode/archive/e66a64183e211842c195f34fd6dcb97d7b534812.tar.gz",
-      "hash": "0cm3xiqjxxxcrrmjnpfrr7k6xy94ixz55wcrfxgsa8cm2xjzx52m"
+      "revision": "8c17ffeb2d08f77a6fd098634f5f85034d88caf8",
+      "url": "https://github.com/nvim-orgmode/orgmode/archive/8c17ffeb2d08f77a6fd098634f5f85034d88caf8.tar.gz",
+      "hash": "1rx20i6y666n8a593b2fqw2gdxs96qhzgwrza6m8zfcavzkwh0r0"
     },
     "otter-nvim": {
       "type": "Git",
@@ -2085,9 +2085,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "351e449683070a2bb946bbd603555faf5a195e9a",
-      "url": "https://github.com/HiPhish/rainbow-delimiters.nvim/archive/351e449683070a2bb946bbd603555faf5a195e9a.tar.gz",
-      "hash": "12qj32zfyjbxs3qjp283fnc8sfa8w4blfx3skgvhkifv0vi7r3bf"
+      "revision": "55ad4fb76ab68460f700599b7449385f0c4e858e",
+      "url": "https://github.com/HiPhish/rainbow-delimiters.nvim/archive/55ad4fb76ab68460f700599b7449385f0c4e858e.tar.gz",
+      "hash": "1wb18hp5yz4vhw9ajm50006n4d1mp1krri6kidxh8rkhs0d6zqhi"
     },
     "registers-nvim": {
       "type": "Git",
@@ -2111,9 +2111,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "8bb0d4725cc4909a603158d44ff28b6158ad9278",
-      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/8bb0d4725cc4909a603158d44ff28b6158ad9278.tar.gz",
-      "hash": "18yqhy2y36rydyqs9z3s1h6rghd02bd9kb3rkxs88spm18wvq41z"
+      "revision": "dfc1299d9f32b53b34b7ac6c3a7553b5fd29977f",
+      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/dfc1299d9f32b53b34b7ac6c3a7553b5fd29977f.tar.gz",
+      "hash": "1r636cyjflhpybjwfi01blbwkrxwi4lvykffrjclwfaf4l4gwddd"
     },
     "rose-pine": {
       "type": "Git",
@@ -2163,9 +2163,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "3f327d15a3c1ed48b1e1087e16873a28a39768c2",
-      "url": "https://github.com/mrcjkb/rustaceanvim/archive/3f327d15a3c1ed48b1e1087e16873a28a39768c2.tar.gz",
-      "hash": "09wrfmzbk81xax5p4wzczsvv1x28nv54mayi12fvzv6c3bmcsbvj"
+      "revision": "69636cedf0d6aabf0eac3dfbce24883fe1051a3d",
+      "url": "https://github.com/mrcjkb/rustaceanvim/archive/69636cedf0d6aabf0eac3dfbce24883fe1051a3d.tar.gz",
+      "hash": "0g40qj67pazf428wdgzijvf1a4xr2l1nimxisyka52fpwi1rah4y"
     },
     "smartcolumn-nvim": {
       "type": "Git",
@@ -2361,9 +2361,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "08aa184f1bd508f6a59371b52cba26be07bc016d",
-      "url": "https://github.com/RRethy/vim-illuminate/archive/08aa184f1bd508f6a59371b52cba26be07bc016d.tar.gz",
-      "hash": "0sqs4q2qk9hfkh5vn08y664568pl15b88yyvb9za0f5k7v3z1bcw"
+      "revision": "1fa4b23409e22a03823648e344c77f260e2572cb",
+      "url": "https://github.com/RRethy/vim-illuminate/archive/1fa4b23409e22a03823648e344c77f260e2572cb.tar.gz",
+      "hash": "1z27z6mpj4jazmifyz5scrniqr7sgh9hbkqx4g27yk0dnn9cm9ff"
     },
     "vim-markdown": {
       "type": "Git",
@@ -2426,9 +2426,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "98b9c21d3c06d79f68fd9d471dcc28fc6d2d72ef",
-      "url": "https://github.com/gbprod/yanky.nvim/archive/98b9c21d3c06d79f68fd9d471dcc28fc6d2d72ef.tar.gz",
-      "hash": "1bdplxlhsc72kmbzmi7x4p378f3dyjdm3ncikkjs3qwxkvjl1bxw"
+      "revision": "04775cc6e10ef038c397c407bc17f00a2f52b378",
+      "url": "https://github.com/gbprod/yanky.nvim/archive/04775cc6e10ef038c397c407bc17f00a2f52b378.tar.gz",
+      "hash": "024dw52ji4691ndkaz3k12fx6qyvhdpd2r69r9d2isy81fbs2fjm"
     }
   },
   "version": 5

From 6bf57573f1e370487c049a2826b2976c8c485c05 Mon Sep 17 00:00:00 2001
From: Noah765 <noland62007@gmail.com>
Date: Mon, 21 Apr 2025 08:41:41 +0200
Subject: [PATCH 143/202] autocmds: improve autocommand descriptions

---
 modules/neovim/init/autocmds.nix | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/modules/neovim/init/autocmds.nix b/modules/neovim/init/autocmds.nix
index 5da7bc55..81580e6b 100644
--- a/modules/neovim/init/autocmds.nix
+++ b/modules/neovim/init/autocmds.nix
@@ -17,7 +17,7 @@
         mkEnableOption ""
         // {
           default = true;
-          description = "Whether to enable this autocommand";
+          description = "Whether to enable this autocommand.";
         };
 
       event = mkOption {
@@ -31,7 +31,7 @@
         type = nullOr (listOf str);
         default = null;
         example = ["*.lua" "*.vim"];
-        description = "The file pattern(s) that determine when the autocommand applies).";
+        description = "The file pattern(s) that determine when the autocommand applies.";
       };
 
       callback = mkOption {
@@ -44,13 +44,16 @@
             end
           ''''
         '';
-        description = "The file pattern(s) that determine when the autocommand applies.";
+        description = "Lua function to be called when the event(s) are triggered.";
       };
 
       command = mkOption {
         type = nullOr str;
         default = null;
-        description = "Vim command string instead of a Lua function.";
+        description = ''
+          Vim command to be executed when the event(s) are triggered.
+          Cannot be defined if the `callback` option is already defined.
+        '';
       };
 
       group = mkOption {
@@ -70,7 +73,7 @@
       once = mkOption {
         type = bool;
         default = false;
-        description = "Whether autocommand run only once.";
+        description = "Whether to run the autocommand only once.";
       };
 
       nested = mkOption {
@@ -87,7 +90,7 @@
         mkEnableOption ""
         // {
           default = true;
-          description = "Whether to enable this autogroup";
+          description = "Whether to enable this autocommand group.";
         };
 
       name = mkOption {
@@ -118,8 +121,8 @@ in {
         autocommands together. Groups allow multiple autocommands to be cleared
         or redefined collectively, preventing duplicate definitions.
 
-        Each autogroup consists of a name, a boolean indicating whether to clear
-        existing autocommands, and a list of associated autocommands.
+        Each autogroup consists of a name and a boolean indicating whether to clear
+        existing autocommands.
       '';
     };
 
@@ -129,8 +132,8 @@ in {
       description = ''
         A list of Neovim autocommands to be registered.
 
-        Each entry defines an autocommand, specifying events, patterns, optional
-        callbacks, commands, groups, and execution settings.
+        Each entry defines an autocommand, specifying events, patterns, a callback or Vim
+        command, an optional group, a description, and execution settings.
       '';
     };
   };

From 46979fd94fc544b64819b7aaa7cb73c2d3ea0292 Mon Sep 17 00:00:00 2001
From: raf <raf@notashelf.dev>
Date: Mon, 21 Apr 2025 06:54:30 +0000
Subject: [PATCH 144/202] docs: format options as inline code

---
 docs/release-notes/rl-0.8.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index f993a9e5..5dc3ca94 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -107,8 +107,8 @@
 - Add `LazyFile` user event.
 - Migrate language modules from none-ls to conform/nvim-lint
 - Add tsx support in conform and lint
-- Moved code setting additionalRuntimePaths and enableLuaLoader out of
-  luaConfigPre's default to prevent being overridden
+- Moved code setting `additionalRuntimePaths` and `enableLuaLoader` out of
+  `luaConfigPre`'s default to prevent being overridden
 
 [diniamo](https://github.com/diniamo):
 

From 4045c458dc3e3eaabbb94518a857651cff341542 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 21 Apr 2025 10:11:30 +0300
Subject: [PATCH 145/202] assistant/chatgpt: add missing dependencies

---
 modules/plugins/assistant/chatgpt/config.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/plugins/assistant/chatgpt/config.nix b/modules/plugins/assistant/chatgpt/config.nix
index 95a36acf..b1066e5a 100644
--- a/modules/plugins/assistant/chatgpt/config.nix
+++ b/modules/plugins/assistant/chatgpt/config.nix
@@ -30,7 +30,16 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["chatgpt-nvim"];
+      startPlugins = [
+        "chatgpt-nvim"
+
+        # Dependencies
+        "nui-nvim"
+        "plenary-nvim"
+      ];
+
+      # ChatGPT.nvim explicitly depends on Telescope.
+      telescope.enable = true;
 
       pluginRC.chagpt = entryAnywhere ''
         require("chatgpt").setup(${toLuaObject cfg.setupOpts})

From 9220c27e85d6d30166473999622aab5b387f3466 Mon Sep 17 00:00:00 2001
From: Farouk Brown <aionoid.xd@gmail.com>
Date: Tue, 22 Apr 2025 17:55:21 +0100
Subject: [PATCH 146/202] languages/render-markdown-nvim: add file_types as
 list

set file_types as listOf (nullOr str) to allow merging
---
 docs/release-notes/rl-0.8.md           |  4 ++++
 modules/plugins/languages/markdown.nix | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 5dc3ca94..06a3267a 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -344,3 +344,7 @@
 [howird](https://github.com/howird):
 
 - Change python dap adapter name from `python` to commonly expected `debugpy`.
+
+[aionoid](https://github.com/aionoid):
+
+- Fix [render-markdown.nvim] file_types option type to list, to accept merging.
diff --git a/modules/plugins/languages/markdown.nix b/modules/plugins/languages/markdown.nix
index 62081549..008192e3 100644
--- a/modules/plugins/languages/markdown.nix
+++ b/modules/plugins/languages/markdown.nix
@@ -9,7 +9,7 @@
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.lists) isList;
-  inherit (lib.types) bool enum either package listOf str;
+  inherit (lib.types) bool enum either package listOf str nullOr;
   inherit (lib.nvim.lua) expToLua toLuaObject;
   inherit (lib.nvim.types) diagnostics mkGrammarOption mkPluginSetupOption;
   inherit (lib.nvim.dag) entryAnywhere;
@@ -117,7 +117,13 @@ in {
             '';
           };
 
-        setupOpts = mkPluginSetupOption "render-markdown" {};
+        setupOpts = mkPluginSetupOption "render-markdown" {
+          file_types = lib.mkOption {
+            type = listOf (nullOr str);
+            default = [];
+            description = "List of buffer filetypes to enable this plugin in. This will cause the plugin to attach to new buffers who have any of these filetypes.";
+          };
+        };
       };
     };
 

From 95e2eec30b8d20c096c327ef5dd3887d7f859ae9 Mon Sep 17 00:00:00 2001
From: Farouk Brown <aionoid.xd@gmail.com>
Date: Tue, 22 Apr 2025 21:32:53 +0100
Subject: [PATCH 147/202] doc: format description to a multi-line string

---
 modules/plugins/languages/markdown.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/plugins/languages/markdown.nix b/modules/plugins/languages/markdown.nix
index 008192e3..21b4f4af 100644
--- a/modules/plugins/languages/markdown.nix
+++ b/modules/plugins/languages/markdown.nix
@@ -121,7 +121,12 @@ in {
           file_types = lib.mkOption {
             type = listOf (nullOr str);
             default = [];
-            description = "List of buffer filetypes to enable this plugin in. This will cause the plugin to attach to new buffers who have any of these filetypes.";
+            description = ''
+              List of buffer filetypes to enable this plugin in.
+
+              This will cause the plugin to attach to new buffers who
+              have any of these filetypes.
+            '';
           };
         };
       };

From 3e3d7171c1b8354065adf9890c2e2a469441f300 Mon Sep 17 00:00:00 2001
From: Farouk Brown <aionoid.xd@gmail.com>
Date: Tue, 22 Apr 2025 22:36:11 +0100
Subject: [PATCH 148/202] ref: change file_types type to nullOr(listOf str)

---
 modules/plugins/languages/markdown.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/plugins/languages/markdown.nix b/modules/plugins/languages/markdown.nix
index 21b4f4af..4563bc44 100644
--- a/modules/plugins/languages/markdown.nix
+++ b/modules/plugins/languages/markdown.nix
@@ -119,8 +119,8 @@ in {
 
         setupOpts = mkPluginSetupOption "render-markdown" {
           file_types = lib.mkOption {
-            type = listOf (nullOr str);
-            default = [];
+            type = nullOr (listOf str);
+            default = null;
             description = ''
               List of buffer filetypes to enable this plugin in.
 

From 8ab559ccfe1e834b1a043896db21bafd26902e2e Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 23 Apr 2025 16:02:39 +0300
Subject: [PATCH 149/202] mini/cursorword: init

---
 modules/plugins/mini/cursorword/config.nix    | 19 +++++++++++++++++++
 .../plugins/mini/cursorword/cursorword.nix    |  9 +++++++++
 modules/plugins/mini/cursorword/default.nix   |  6 ++++++
 modules/plugins/mini/default.nix              |  1 +
 npins/sources.json                            | 16 ++++++++++++++++
 5 files changed, 51 insertions(+)
 create mode 100644 modules/plugins/mini/cursorword/config.nix
 create mode 100644 modules/plugins/mini/cursorword/cursorword.nix
 create mode 100644 modules/plugins/mini/cursorword/default.nix

diff --git a/modules/plugins/mini/cursorword/config.nix b/modules/plugins/mini/cursorword/config.nix
new file mode 100644
index 00000000..bc5ab2cb
--- /dev/null
+++ b/modules/plugins/mini/cursorword/config.nix
@@ -0,0 +1,19 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.lua) toLuaObject;
+
+  cfg = config.vim.mini.cursorword;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-cursorword"];
+
+    pluginRC.mini-ai = entryAnywhere ''
+      require("mini.cursorword").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/cursorword/cursorword.nix b/modules/plugins/mini/cursorword/cursorword.nix
new file mode 100644
index 00000000..f2b8903a
--- /dev/null
+++ b/modules/plugins/mini/cursorword/cursorword.nix
@@ -0,0 +1,9 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.cursorword = {
+    enable = mkEnableOption "mini.cursorword";
+    setupOpts = mkPluginSetupOption "mini.cursorword" {};
+  };
+}
diff --git a/modules/plugins/mini/cursorword/default.nix b/modules/plugins/mini/cursorword/default.nix
new file mode 100644
index 00000000..f0aae6c8
--- /dev/null
+++ b/modules/plugins/mini/cursorword/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./cursorword.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 8f035285..f066b172 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -11,6 +11,7 @@
     ./colors
     ./comment
     ./completion
+    ./cursorword
     ./diff
     ./doc
     ./extra
diff --git a/npins/sources.json b/npins/sources.json
index 05a8c173..7339ce8a 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -1020,6 +1020,22 @@
       "url": "https://github.com/echasnovski/mini.completion/archive/35130cebc63ace7d6e4583f349af8cd3f3141af7.tar.gz",
       "hash": "0h5z5i62cc780bzw60rbizngvpyl4vk7j858pndyi2g572plz929"
     },
+    "mini-cursorword": {
+      "type": "GitRelease",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.cursorword"
+      },
+      "pre_releases": false,
+      "version_upper_bound": null,
+      "release_prefix": null,
+      "submodules": false,
+      "version": "v0.15.0",
+      "revision": "6683f04509c380e3147cca368f90bbdb99641775",
+      "url": "https://api.github.com/repos/echasnovski/mini.cursorword/tarball/v0.15.0",
+      "hash": "0vqr4hkzq13ap6giyyp8asn5g6nnm406piq1a07a5nmkfxiskp9v"
+    },
     "mini-diff": {
       "type": "Git",
       "repository": {

From 8b305e8ed199253262254a906ade3fdb872344ef Mon Sep 17 00:00:00 2001
From: Howard Nguyen-Huu <55764261+howird@users.noreply.github.com>
Date: Wed, 23 Apr 2025 14:52:21 -0400
Subject: [PATCH 150/202] fix: python dap configuration regression

---
 modules/plugins/languages/python.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix
index d6dec1c2..9905716e 100644
--- a/modules/plugins/languages/python.nix
+++ b/modules/plugins/languages/python.nix
@@ -125,7 +125,7 @@
           end
         end
 
-        dap.configurations.debugpy = {
+        dap.configurations.python = {
           {
             -- The first three options are required by nvim-dap
             type = 'debugpy'; -- the type here established the link to the adapter definition: `dap.adapters.debugpy`

From 990d3598b1891833e765a822c3e377b18cdbc75d Mon Sep 17 00:00:00 2001
From: Noah765 <noland62007@gmail.com>
Date: Wed, 23 Apr 2025 21:28:17 +0200
Subject: [PATCH 151/202] highlight: fix color type

The color options also allow color definitions in the form of color names.
---
 docs/release-notes/rl-0.8.md      | 1 +
 modules/neovim/init/highlight.nix | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 2800789f..e713db69 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -338,6 +338,7 @@
 - Add missing `flutter-tools.nvim` dependency `plenary.nvim`.
 - Add necessary dependency of `flutter-tools.nvim` on lsp.
 - Add the `vim.languages.dart.flutter-tools.flutterPackage` option.
+- Fix the type of the `highlight` color options.
 
 [howird](https://github.com/howird):
 
diff --git a/modules/neovim/init/highlight.nix b/modules/neovim/init/highlight.nix
index 7e992fd1..9c6b7214 100644
--- a/modules/neovim/init/highlight.nix
+++ b/modules/neovim/init/highlight.nix
@@ -5,15 +5,14 @@
 }: let
   inherit (lib.options) mkOption;
   inherit (lib.types) nullOr attrsOf listOf submodule bool ints str enum;
-  inherit (lib.strings) hasPrefix concatLines;
+  inherit (lib.strings) concatLines;
   inherit (lib.attrsets) mapAttrsToList;
   inherit (lib.nvim.dag) entryBetween;
   inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.types) hexColor;
 
   mkColorOption = target:
     mkOption {
-      type = nullOr hexColor;
+      type = nullOr str;
       default = null;
       example = "#ebdbb2";
       description = ''

From 8f73019907d667a9254b3244a9ef518742e03c2b Mon Sep 17 00:00:00 2001
From: Noah765 <noland62007@gmail.com>
Date: Thu, 24 Apr 2025 09:20:42 +0200
Subject: [PATCH 152/202] utility/sleuth: init

---
 docs/release-notes/rl-0.8.md               |  3 +++
 modules/plugins/utility/default.nix        |  1 +
 modules/plugins/utility/sleuth/config.nix  | 10 ++++++++++
 modules/plugins/utility/sleuth/default.nix |  6 ++++++
 modules/plugins/utility/sleuth/sleuth.nix  |  7 +++++++
 npins/sources.json                         | 13 +++++++++++++
 6 files changed, 40 insertions(+)
 create mode 100644 modules/plugins/utility/sleuth/config.nix
 create mode 100644 modules/plugins/utility/sleuth/default.nix
 create mode 100644 modules/plugins/utility/sleuth/sleuth.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 778fc37a..04e0eb64 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -337,10 +337,13 @@
 
 [Noah765](https://github.com/Noah765):
 
+[vim-sleuth]: https://github.com/tpope/vim-sleuth
+
 - Add missing `flutter-tools.nvim` dependency `plenary.nvim`.
 - Add necessary dependency of `flutter-tools.nvim` on lsp.
 - Add the `vim.languages.dart.flutter-tools.flutterPackage` option.
 - Fix the type of the `highlight` color options.
+- Add [vim-sleuth] plugin under `vim.utility.sleuth`.
 
 [howird](https://github.com/howird):
 
diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix
index 62b07574..e3ae7c5e 100644
--- a/modules/plugins/utility/default.nix
+++ b/modules/plugins/utility/default.nix
@@ -18,6 +18,7 @@
     ./oil-nvim
     ./outline
     ./preview
+    ./sleuth
     ./snacks-nvim
     ./surround
     ./telescope
diff --git a/modules/plugins/utility/sleuth/config.nix b/modules/plugins/utility/sleuth/config.nix
new file mode 100644
index 00000000..d25cc140
--- /dev/null
+++ b/modules/plugins/utility/sleuth/config.nix
@@ -0,0 +1,10 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  cfg = config.vim.utility.sleuth;
+in {
+  vim.startPlugins = mkIf cfg.enable ["vim-sleuth"];
+}
diff --git a/modules/plugins/utility/sleuth/default.nix b/modules/plugins/utility/sleuth/default.nix
new file mode 100644
index 00000000..04cb4158
--- /dev/null
+++ b/modules/plugins/utility/sleuth/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./config.nix
+    ./sleuth.nix
+  ];
+}
diff --git a/modules/plugins/utility/sleuth/sleuth.nix b/modules/plugins/utility/sleuth/sleuth.nix
new file mode 100644
index 00000000..a86d414d
--- /dev/null
+++ b/modules/plugins/utility/sleuth/sleuth.nix
@@ -0,0 +1,7 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
+in {
+  options.vim.utility.sleuth.enable = mkEnableOption ''
+    automatically adjusting options such as `shiftwidth` or `expandtab`, using `vim-sleuth`
+  '';
+}
diff --git a/npins/sources.json b/npins/sources.json
index 7339ce8a..90a54057 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -2407,6 +2407,19 @@
       "url": "https://github.com/tpope/vim-repeat/archive/65846025c15494983dafe5e3b46c8f88ab2e9635.tar.gz",
       "hash": "0n8sx6s2sbjb21dv9j6y5lyqda9vvxraffg2jz423daamn96dxqv"
     },
+    "vim-sleuth": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "tpope",
+        "repo": "vim-sleuth"
+      },
+      "branch": "master",
+      "submodules": false,
+      "revision": "be69bff86754b1aa5adcbb527d7fcd1635a84080",
+      "url": "https://github.com/tpope/vim-sleuth/archive/be69bff86754b1aa5adcbb527d7fcd1635a84080.tar.gz",
+      "hash": "0wqxdjgplf04nq428ialw1w03f8nh5vb629a17vl5gc9gf3zfanq"
+    },
     "vim-startify": {
       "type": "Git",
       "repository": {

From c7b7a5d6d4f64ab65da97a1536dcf5d47fc57717 Mon Sep 17 00:00:00 2001
From: Valyn Tyler <115489989+ValynTyler@users.noreply.github.com>
Date: Thu, 24 Apr 2025 19:57:19 +0300
Subject: [PATCH 153/202] fix: bad option in custom-config example

---
 docs/manual/installation/custom-configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/manual/installation/custom-configuration.md b/docs/manual/installation/custom-configuration.md
index 940f35a3..52f81573 100644
--- a/docs/manual/installation/custom-configuration.md
+++ b/docs/manual/installation/custom-configuration.md
@@ -39,7 +39,7 @@ An example flake that exposes your custom Neovim configuration might look like
                 theme.enable = true;
 
                 # Enable Treesitter
-                tree-sitter.enable = true;
+                treesitter.enable = true;
 
                 # Other options will go here. Refer to the config
                 # reference in Appendix B of the nvf manual.

From e60fd89a42645be5044b61061e4495d1dd79aade Mon Sep 17 00:00:00 2001
From: Brian E <72316548+Brian-ED@users.noreply.github.com>
Date: Thu, 24 Apr 2025 22:21:15 +0200
Subject: [PATCH 154/202] fixed typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

plural `way→→→→→→→←→→→→→→` to `ways`
---
 docs/manual/configuring/custom-plugins.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/manual/configuring/custom-plugins.md b/docs/manual/configuring/custom-plugins.md
index 79a691e2..c621e03c 100644
--- a/docs/manual/configuring/custom-plugins.md
+++ b/docs/manual/configuring/custom-plugins.md
@@ -15,7 +15,7 @@ plugin to the runtime, you need to add it to the [](#opt-vim.startPlugins) list
 in your configuration.
 
 Adding a plugin to `startPlugins` will not allow you to configure the plugin
-that you have added, but **nvf** provides multiple way of configuring any custom
+that you have added, but **nvf** provides multiple ways of configuring any custom
 plugins that you might have added to your configuration.
 
 ```{=include=} sections

From bb3ca63d21cd05c197e2df9da6ee2c7eaa8e7672 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 12 Apr 2025 20:50:05 +0300
Subject: [PATCH 155/202] lsp/null-ls: take a list instead of attrs for sources

---
 modules/plugins/lsp/null-ls/null-ls.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/plugins/lsp/null-ls/null-ls.nix b/modules/plugins/lsp/null-ls/null-ls.nix
index 3a10bac7..ba02df9c 100644
--- a/modules/plugins/lsp/null-ls/null-ls.nix
+++ b/modules/plugins/lsp/null-ls/null-ls.nix
@@ -1,6 +1,6 @@
 {lib, ...}: let
   inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) attrsOf str int nullOr;
+  inherit (lib.types) listOf str int nullOr;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.types) luaInline mkPluginSetupOption;
   inherit (lib.nvim.config) batchRenameOptions;
@@ -70,7 +70,7 @@ in {
       };
 
       sources = mkOption {
-        type = nullOr (attrsOf luaInline);
+        type = nullOr (listOf luaInline);
         default = null;
         description = "Sources for null-ls to register";
       };

From 6f2f28afb13ebbaee1d0a8f5dd390174b89f2998 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 27 Apr 2025 21:54:48 +0300
Subject: [PATCH 156/202] flake: bump inputs

---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3c089070..65243865 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1744597985,
-        "narHash": "sha256-lLYB9/tQ0OAKonL0Ku963nqOm0aE1TmLavrzmXAr5Zc=",
+        "lastModified": 1745705214,
+        "narHash": "sha256-XGfaHbFI4vvDuaoVO3IFYZKezXIO8rhUaMCGcjY71Ac=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "cbdcbb5f8eb24e25b932bbc87e29299a72e34b64",
+        "rev": "c1f4587db4c53dcefa432c46c7a899a116d8e924",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744868846,
-        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
+        "lastModified": 1745377448,
+        "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
+        "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c",
         "type": "github"
       },
       "original": {

From 3147ef13711464ec555f8897c1179c55ca76ec77 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 27 Apr 2025 22:32:50 +0300
Subject: [PATCH 157/202] pins: bump all plugins

---
 npins/sources.json | 234 ++++++++++++++++++++++-----------------------
 1 file changed, 117 insertions(+), 117 deletions(-)

diff --git a/npins/sources.json b/npins/sources.json
index 90a54057..04c35ede 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -9,9 +9,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "44684bf429dc40e97a6d00ffa09043ac3f692186",
-      "url": "https://github.com/stevearc/aerial.nvim/archive/44684bf429dc40e97a6d00ffa09043ac3f692186.tar.gz",
-      "hash": "02zd23np2pn7hivi8sl63lcdn85cfbvsapkyghkwh9prxg8a81zn"
+      "revision": "2e00d1d4248f08dddfceacb8d2996e51e13e00f6",
+      "url": "https://github.com/stevearc/aerial.nvim/archive/2e00d1d4248f08dddfceacb8d2996e51e13e00f6.tar.gz",
+      "hash": "18rhmpqs8440hn4g5786znj37fzb01wa3zws33rlq9vm6sfb0grw"
     },
     "alpha-nvim": {
       "type": "Git",
@@ -103,9 +103,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "ca538d15bd22fedd3408064d2b25ff8d56ec8ce8",
-      "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/ca538d15bd22fedd3408064d2b25ff8d56ec8ce8.tar.gz",
-      "hash": "1rg40x0lvz11rl95b3q3kqzb8ygvyvhcxiw255200ccxl6q21jg8"
+      "revision": "89c4d158bc6d6ca03b4059452f2f9ffaa850db8a",
+      "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/89c4d158bc6d6ca03b4059452f2f9ffaa850db8a.tar.gz",
+      "hash": "04xh5hzbzvm0nvipsy0cw7k1vb1kcrb09xiw0j66cqddjvvpv6zk"
     },
     "bufdelete-nvim": {
       "type": "Git",
@@ -272,9 +272,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "030f305930a25bd9e45b5e5252b47b7069fb800e",
-      "url": "https://github.com/olimorris/codecompanion.nvim/archive/030f305930a25bd9e45b5e5252b47b7069fb800e.tar.gz",
-      "hash": "1n59gkzfs05ybf7xvrbxacmwk8nbz8ybgdjwv8irdz5la5hi6wmn"
+      "revision": "c861811f8b825d30c0343951336d2bb8c8f6d990",
+      "url": "https://github.com/olimorris/codecompanion.nvim/archive/c861811f8b825d30c0343951336d2bb8c8f6d990.tar.gz",
+      "hash": "0a1mzwh07lhrx893w7xdlhgiivbrwqp7a0b9wkdrna99x8kd9d77"
     },
     "codewindow-nvim": {
       "type": "Git",
@@ -311,9 +311,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "6632e7d788a85bf8405ea0c812d343fc308b7b8c",
-      "url": "https://github.com/stevearc/conform.nvim/archive/6632e7d788a85bf8405ea0c812d343fc308b7b8c.tar.gz",
-      "hash": "0dv4h87jjb2dp6whgc7wvxisc7hcx1828ixzci80py8kjky013zw"
+      "revision": "372fc521f8421b7830ea6db4d6ea3bae1c77548c",
+      "url": "https://github.com/stevearc/conform.nvim/archive/372fc521f8421b7830ea6db4d6ea3bae1c77548c.tar.gz",
+      "hash": "0b6qbwyb6ashpia7pk0r5kp82pdrblhmhmx1fprgy7lmgnm8mw97"
     },
     "copilot-cmp": {
       "type": "Git",
@@ -337,9 +337,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "dc579f98536029610cfa32c6bad86c0d24363679",
-      "url": "https://github.com/zbirenbaum/copilot.lua/archive/dc579f98536029610cfa32c6bad86c0d24363679.tar.gz",
-      "hash": "16zx9a8f2mjmj7ibdsjyj0vqdsc10yl1vrna0kkkgccj957rd99x"
+      "revision": "a5c390f8d8e85b501b22dcb2f30e0cbbd69d5ff0",
+      "url": "https://github.com/zbirenbaum/copilot.lua/archive/a5c390f8d8e85b501b22dcb2f30e0cbbd69d5ff0.tar.gz",
+      "hash": "1pk6mh40kbja49xlsqv70wl3j89i6p996gf8z95b9b50pd2dsdgk"
     },
     "crates-nvim": {
       "type": "Git",
@@ -376,9 +376,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "000448d837f6e7a47f8f342f29526c4d7e49e9ce",
-      "url": "https://github.com/glepnir/dashboard-nvim/archive/000448d837f6e7a47f8f342f29526c4d7e49e9ce.tar.gz",
-      "hash": "11kh15qp819dhr2r3q78dv9pzxrswzzpjqmdpa5nlba9mvgjzzy3"
+      "revision": "b0551fae871fc39454a67cca1adcf76fbe2f61f9",
+      "url": "https://github.com/glepnir/dashboard-nvim/archive/b0551fae871fc39454a67cca1adcf76fbe2f61f9.tar.gz",
+      "hash": "0m67ij62dwnzyspyckhqvcsk81nvc16gx8zphghw4w2w4vl9lsrj"
     },
     "diffview-nvim": {
       "type": "Git",
@@ -454,9 +454,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "c43684448470e732387beccaff12e6667a534800",
-      "url": "https://github.com/Chaitanyabsprip/fastaction.nvim/archive/c43684448470e732387beccaff12e6667a534800.tar.gz",
-      "hash": "1ihh07j9q4089m4iw7sb33zg106g1m84bd2nk81gixfl76vg3vbi"
+      "revision": "2f2e8d7010a0e5e725957828476b4e1625eaf82c",
+      "url": "https://github.com/Chaitanyabsprip/fastaction.nvim/archive/2f2e8d7010a0e5e725957828476b4e1625eaf82c.tar.gz",
+      "hash": "0m2qplldlcgzb6n5lwnwiac5n56zpyf3df015abfwrwba95zflfv"
     },
     "fidget-nvim": {
       "type": "Git",
@@ -506,9 +506,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "31f2a2657b6261724313281fe0d8ba6f43f4a4fa",
-      "url": "https://github.com/rafamadriz/friendly-snippets/archive/31f2a2657b6261724313281fe0d8ba6f43f4a4fa.tar.gz",
-      "hash": "0rkz7zbv1maqhr22nxq39w7pahahcapfyc4rgscmr3bm4dcymk2a"
+      "revision": "fc8f183479a472df60aa86f00e295462f2308178",
+      "url": "https://github.com/rafamadriz/friendly-snippets/archive/fc8f183479a472df60aa86f00e295462f2308178.tar.gz",
+      "hash": "1clmyxkw0gk9p9j72d75byws75vi3r7d04wica2dq5i0zkk49b27"
     },
     "fzf-lua": {
       "type": "Git",
@@ -519,9 +519,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "ea2bda8a9717307affd921e1b540dc06acdf8ea8",
-      "url": "https://github.com/ibhagwan/fzf-lua/archive/ea2bda8a9717307affd921e1b540dc06acdf8ea8.tar.gz",
-      "hash": "0ba9ncwjv9kcnw7nimifyad54xdf1cacbdlc7hjyy2zlivf4pm3g"
+      "revision": "b11467c3fbfe48e4a815e4909f5c4e5b413ce6d0",
+      "url": "https://github.com/ibhagwan/fzf-lua/archive/b11467c3fbfe48e4a815e4909f5c4e5b413ce6d0.tar.gz",
+      "hash": "1yjfyz0fchibyb6wnnyxarn2v4fxxfvf9vy1pyvfc7mz5b4mzwc2"
     },
     "gesture-nvim": {
       "type": "Git",
@@ -584,9 +584,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "02eafb1273afec94447f66d1a43fc5e477c2ab8a",
-      "url": "https://github.com/lewis6991/gitsigns.nvim/archive/02eafb1273afec94447f66d1a43fc5e477c2ab8a.tar.gz",
-      "hash": "1m507jyyi1nny14q2bxydy6a54g28yq855g4yaj9jslz7dml2v4i"
+      "revision": "9cd665f46ab7af2e49d140d328b8e72ea1cf511b",
+      "url": "https://github.com/lewis6991/gitsigns.nvim/archive/9cd665f46ab7af2e49d140d328b8e72ea1cf511b.tar.gz",
+      "hash": "110ykgvd3hbjq8ilz1yvfcic1jpqzyz4r13dswmpv7nvsi7a2lb5"
     },
     "glow-nvim": {
       "type": "Git",
@@ -610,9 +610,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "a933d8666dad9363dc6908ae72cfc832299c2f59",
-      "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/a933d8666dad9363dc6908ae72cfc832299c2f59.tar.gz",
-      "hash": "02r2h0ip2vzmgmv9b36ff2r6br3ql0b9ggzl8ijsyjy7pgiij04y"
+      "revision": "c54db7f7e67832fbdd0ac14633f62c8a6997ddcf",
+      "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/c54db7f7e67832fbdd0ac14633f62c8a6997ddcf.tar.gz",
+      "hash": "0i7dh2d3l1w6bga6gpfssam7w1qkd84q3cxyscdfsf4j9z4b62l2"
     },
     "harpoon": {
       "type": "Git",
@@ -636,9 +636,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "797610ad83d2730d0a8659ecac5d98ccb476ac23",
-      "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/797610ad83d2730d0a8659ecac5d98ccb476ac23.tar.gz",
-      "hash": "1i1ivfhl34yi9xff5s1wkr252vlfjazsf75bjphbi4c50s64wbaa"
+      "revision": "fda0e5082ecc1c9e892f38b715d6f61e8829081d",
+      "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/fda0e5082ecc1c9e892f38b715d6f61e8829081d.tar.gz",
+      "hash": "0hi0ww7q0j042ssjk7x3d4s4vaninawpw3s0yrv1c4l1q5v6gnz1"
     },
     "highlight-undo-nvim": {
       "type": "Git",
@@ -704,9 +704,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "2e2d28b7734b5efdfc1219f4da8a46c761587bc2",
-      "url": "https://github.com/3rd/image.nvim/archive/2e2d28b7734b5efdfc1219f4da8a46c761587bc2.tar.gz",
-      "hash": "1k2bch2l9bvy4ian6l3jymddcy7p4mvblpmbq0qvn8rzxdi65fy1"
+      "revision": "4c51d6202628b3b51e368152c053c3fb5c5f76f2",
+      "url": "https://github.com/3rd/image.nvim/archive/4c51d6202628b3b51e368152c053c3fb5c5f76f2.tar.gz",
+      "hash": "16s1wsy9k72qiqzvwij67j2jzwgi6ggl6lhx9p6lfw8dpps3ayxg"
     },
     "indent-blankline-nvim": {
       "type": "Git",
@@ -743,9 +743,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "8a0efa79133fee211017d769c8031512192008b3",
-      "url": "https://github.com/ggandor/leap.nvim/archive/8a0efa79133fee211017d769c8031512192008b3.tar.gz",
-      "hash": "0pgg26r5rh1r2364yj05w4scarzy6zwsp6w7s9yxgfmk7l9x89yk"
+      "revision": "2b68ddc0802bd295e64c9e2e75f18f755e50dbcc",
+      "url": "https://github.com/ggandor/leap.nvim/archive/2b68ddc0802bd295e64c9e2e75f18f755e50dbcc.tar.gz",
+      "hash": "07bdhfsig70qblvk2x0n35i5apz3mjdr05ba3082mh438ikgfmvx"
     },
     "leetcode-nvim": {
       "type": "Git",
@@ -769,9 +769,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "15bb33cdb47e85278e168cad11acb1b6fa9c6488",
-      "url": "https://github.com/ray-x/lsp_signature.nvim/archive/15bb33cdb47e85278e168cad11acb1b6fa9c6488.tar.gz",
-      "hash": "0acynlgd7vg3cn08136ky1j2qayq1f7x6fl1562cby6hl47rsnck"
+      "revision": "a793d02b6a5e639fa9d3f2a89a839fa688ab2d0a",
+      "url": "https://github.com/ray-x/lsp_signature.nvim/archive/a793d02b6a5e639fa9d3f2a89a839fa688ab2d0a.tar.gz",
+      "hash": "0y5ffzj613kf0mq74yj248176fywn4vrsnn1fhip7j5yni1cyhzy"
     },
     "lspkind-nvim": {
       "type": "Git",
@@ -821,9 +821,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "86fe39534b7da729a1ac56c0466e76f2c663dc42",
-      "url": "https://github.com/hoob3rt/lualine.nvim/archive/86fe39534b7da729a1ac56c0466e76f2c663dc42.tar.gz",
-      "hash": "1kqdckylsjl1ibk4wm87y1yxxzxnjz87vwziaw4k6nw61rg0bq2x"
+      "revision": "15884cee63a8c205334ab13ab1c891cd4d27101a",
+      "url": "https://github.com/hoob3rt/lualine.nvim/archive/15884cee63a8c205334ab13ab1c891cd4d27101a.tar.gz",
+      "hash": "0c251ywx5gsqwafgn2pb7qrv43cimrxp4wwqhlxccizf3l6l9wy1"
     },
     "luasnip": {
       "type": "Git",
@@ -847,9 +847,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "c22bd7ef977a32b792ea70e203126a9063519a62",
-      "url": "https://github.com/nvim-neorocks/lz.n/archive/c22bd7ef977a32b792ea70e203126a9063519a62.tar.gz",
-      "hash": "0q8bz28dbmdsyndbnajw73x2cr8kpcx0fcj9lip9mr24vgx2vb8v"
+      "revision": "a10519ab5940a5364560043df9dc3db328e27f98",
+      "url": "https://github.com/nvim-neorocks/lz.n/archive/a10519ab5940a5364560043df9dc3db328e27f98.tar.gz",
+      "hash": "18q0hai33qrb950lg8w9nk83smqpp1ahiyrn6pv9dqyakbqhx1k1"
     },
     "lzn-auto-require": {
       "type": "Git",
@@ -990,9 +990,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "1c88ba8c79e5717acc82bf596f5722c724af570e",
-      "url": "https://github.com/echasnovski/mini.colors/archive/1c88ba8c79e5717acc82bf596f5722c724af570e.tar.gz",
-      "hash": "0dcv6z4z5gq73d2s2hbcg8l5y1jzxvdsq7wy6a2rxbjmjhg5j7is"
+      "revision": "c45b8ee96f0347134e34ba3f0adaf08a9a8826d3",
+      "url": "https://github.com/echasnovski/mini.colors/archive/c45b8ee96f0347134e34ba3f0adaf08a9a8826d3.tar.gz",
+      "hash": "1px2x50h613f3jahhr24bmkkwxpwnf68c5acz51r89rmj5dl5v9r"
     },
     "mini-comment": {
       "type": "Git",
@@ -1016,9 +1016,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "35130cebc63ace7d6e4583f349af8cd3f3141af7",
-      "url": "https://github.com/echasnovski/mini.completion/archive/35130cebc63ace7d6e4583f349af8cd3f3141af7.tar.gz",
-      "hash": "0h5z5i62cc780bzw60rbizngvpyl4vk7j858pndyi2g572plz929"
+      "revision": "f0c324ff2142b02871cfb43049461e4f3f022a11",
+      "url": "https://github.com/echasnovski/mini.completion/archive/f0c324ff2142b02871cfb43049461e4f3f022a11.tar.gz",
+      "hash": "0q8w733i3428gzz6bk4ldc57smj55916imnpzx33arhfdvmzp8l0"
     },
     "mini-cursorword": {
       "type": "GitRelease",
@@ -1214,9 +1214,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "52bf20e952a26820c25776c7b594f64b7a6dcb66",
-      "url": "https://github.com/echasnovski/mini.misc/archive/52bf20e952a26820c25776c7b594f64b7a6dcb66.tar.gz",
-      "hash": "0r2xmxlsq8ifq4ps54l7yjljczlp7ldxp8b30gjdkkrbbi1rkbvg"
+      "revision": "f7252c5b8ff27d0856b91a410efe8e528370d919",
+      "url": "https://github.com/echasnovski/mini.misc/archive/f7252c5b8ff27d0856b91a410efe8e528370d919.tar.gz",
+      "hash": "02jrwcmbi74512240p8grlc9awivyihl6s71d60s46nslgqlnsqf"
     },
     "mini-move": {
       "type": "Git",
@@ -1240,9 +1240,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "f4e892533c8821bc5e0f373b353022a42bd465f7",
-      "url": "https://github.com/echasnovski/mini.notify/archive/f4e892533c8821bc5e0f373b353022a42bd465f7.tar.gz",
-      "hash": "0ziqqd8zz2d28x7801g9h45jgcv5vxqx25wcyh3574zrd5aay5s7"
+      "revision": "3a06b21dd0b335b95d125eae813276113b5e9ce7",
+      "url": "https://github.com/echasnovski/mini.notify/archive/3a06b21dd0b335b95d125eae813276113b5e9ce7.tar.gz",
+      "hash": "13pa82zmz6w8is4gfh33fqcd2yx3f1bmd5r3q4sp1kfgf2c68c30"
     },
     "mini-operators": {
       "type": "Git",
@@ -1279,9 +1279,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "6cad781797f3a9b0e69f2e9a2d63de8b1c1824f5",
-      "url": "https://github.com/echasnovski/mini.pick/archive/6cad781797f3a9b0e69f2e9a2d63de8b1c1824f5.tar.gz",
-      "hash": "1nsnz9dys2nsjrpzm4d3dc4qjms5f7pqsxbgnvglibi9vizrkahx"
+      "revision": "417c273861971b451687e847383e61687463b06e",
+      "url": "https://github.com/echasnovski/mini.pick/archive/417c273861971b451687e847383e61687463b06e.tar.gz",
+      "hash": "0xyw2wns9fpv1yxzflb18mmfajihy45g163q4bka0vylj77858xa"
     },
     "mini-sessions": {
       "type": "Git",
@@ -1477,9 +1477,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "1ef260eb4f54515fe121a2267b477efb054d108a",
-      "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/1ef260eb4f54515fe121a2267b477efb054d108a.tar.gz",
-      "hash": "0j0gr2pisrj5vsiwsvrd3dkrdrd3q2742srk23rw2x0h055c0mxh"
+      "revision": "299e174c3b8373c9c1f9be0bc3967c852712d0f3",
+      "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/299e174c3b8373c9c1f9be0bc3967c852712d0f3.tar.gz",
+      "hash": "0vm7hbcqj548pvl9vfmzsgpx73lmrnmhp399bprizg87zn73m005"
     },
     "neocord": {
       "type": "Git",
@@ -1581,9 +1581,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "fb50cf17e926a037c9f8d96d8db29ddbd04965d4",
-      "url": "https://github.com/nvimtools/none-ls.nvim/archive/fb50cf17e926a037c9f8d96d8db29ddbd04965d4.tar.gz",
-      "hash": "07zfkjdqwlrm1d07za0payqs37gmn4x8m489438nv84sqqhnfrvd"
+      "revision": "751349f21bdf1acf7af091fead456866bf9a7e7d",
+      "url": "https://github.com/nvimtools/none-ls.nvim/archive/751349f21bdf1acf7af091fead456866bf9a7e7d.tar.gz",
+      "hash": "1zhqyjs914ib1yq42xq3aphw8pl4168h2k3ybm92z00ahi51kbqn"
     },
     "nord": {
       "type": "Git",
@@ -1607,9 +1607,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "8d3bce9764e627b62b07424e0df77f680d47ffdb",
-      "url": "https://github.com/MunifTanjim/nui.nvim/archive/8d3bce9764e627b62b07424e0df77f680d47ffdb.tar.gz",
-      "hash": "0ia8q5d4xcss45vw6jlaanyr0migy03cjzq9g0kipfyqxkcxi105"
+      "revision": "8d5b0b568517935d3c84f257f272ef004d9f5a59",
+      "url": "https://github.com/MunifTanjim/nui.nvim/archive/8d5b0b568517935d3c84f257f272ef004d9f5a59.tar.gz",
+      "hash": "0z5md64qly2dzm9pq46ldid45l44mfwqk3r1hirk8lj6djyrxv9m"
     },
     "nvim-autopairs": {
       "type": "Git",
@@ -1685,9 +1685,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "98bf130702eaafad8567c0e3ea1171c2552d58bb",
-      "url": "https://github.com/mfussenegger/nvim-dap/archive/98bf130702eaafad8567c0e3ea1171c2552d58bb.tar.gz",
-      "hash": "045sajd5amwxq4964yj4lbh20daa0g8473a0ggbwggxpq6qz2678"
+      "revision": "8df427aeba0a06c6577dc3ab82de3076964e3b8d",
+      "url": "https://github.com/mfussenegger/nvim-dap/archive/8df427aeba0a06c6577dc3ab82de3076964e3b8d.tar.gz",
+      "hash": "13d04z1dnkrhslq6s1xba5myqkgxar3i3p2lhqvpawicbba8yp22"
     },
     "nvim-dap-go": {
       "type": "Git",
@@ -1711,9 +1711,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "881a69e25bd6658864fab47450025490b74be878",
-      "url": "https://github.com/rcarriga/nvim-dap-ui/archive/881a69e25bd6658864fab47450025490b74be878.tar.gz",
-      "hash": "040xa1jg5591czydjsxf9rwk3g805nxgaaqn5zkgkxr3igc2rvsy"
+      "revision": "73a26abf4941aa27da59820fd6b028ebcdbcf932",
+      "url": "https://github.com/rcarriga/nvim-dap-ui/archive/73a26abf4941aa27da59820fd6b028ebcdbcf932.tar.gz",
+      "hash": "1h71y3pjbbgh8kgghs0sb721bl9pd7l7ak3mj1j27fv6x6kbmgar"
     },
     "nvim-docs-view": {
       "type": "Git",
@@ -1750,9 +1750,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "d698d3b6fd7b1b85657d05a2a31d843ddb682c63",
-      "url": "https://github.com/mfussenegger/nvim-lint/archive/d698d3b6fd7b1b85657d05a2a31d843ddb682c63.tar.gz",
-      "hash": "0m4hj1yc0s6cb3icshcr3qkd5wknksnnw97axjbacsan5vc6831z"
+      "revision": "9dfb77ef6c5092a19502883c02dc5a02ec648729",
+      "url": "https://github.com/mfussenegger/nvim-lint/archive/9dfb77ef6c5092a19502883c02dc5a02ec648729.tar.gz",
+      "hash": "0772bgl09jcrvvhvpic2b07qb21kf2pr479g792jlwbr5jfa1pa0"
     },
     "nvim-lspconfig": {
       "type": "Git",
@@ -1763,9 +1763,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "32b6a6449aaba11461fffbb596dd6310af79eea4",
-      "url": "https://github.com/neovim/nvim-lspconfig/archive/32b6a6449aaba11461fffbb596dd6310af79eea4.tar.gz",
-      "hash": "0rbqg3xdsdfklcsadzbbphzrgwa2c54lsipfqd67jq2p4baxsgxn"
+      "revision": "641e567f975feab3815b47c7d29e6148e07afa77",
+      "url": "https://github.com/neovim/nvim-lspconfig/archive/641e567f975feab3815b47c7d29e6148e07afa77.tar.gz",
+      "hash": "1238hk6v3mm6hzjbipz60rva7crv95h2vzg6ph9wzplq52kzryav"
     },
     "nvim-metals": {
       "type": "Git",
@@ -1880,9 +1880,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "3a63717d3d332d8f39aaf65be7a0e4c2265af021",
-      "url": "https://github.com/nvim-tree/nvim-tree.lua/archive/3a63717d3d332d8f39aaf65be7a0e4c2265af021.tar.gz",
-      "hash": "1w5m090wwhbsdif0w2fhg8qvdjni0g95b13h0kh5kdm3a7avwsm0"
+      "revision": "582ae48c9e43d2bcd55dfcc8e2e7a1f29065d924",
+      "url": "https://github.com/nvim-tree/nvim-tree.lua/archive/582ae48c9e43d2bcd55dfcc8e2e7a1f29065d924.tar.gz",
+      "hash": "1xpal45q4mvplvgz06z4wzsq1ml5awv8v4m0k9jh9s4xlnc0va24"
     },
     "nvim-treesitter-context": {
       "type": "Git",
@@ -1919,9 +1919,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "17aa9cec9081351946743a7094c0c883b24ebe64",
-      "url": "https://github.com/kevinhwang91/nvim-ufo/archive/17aa9cec9081351946743a7094c0c883b24ebe64.tar.gz",
-      "hash": "14lz7bnwkv3gjpkh8zi9ki9xlxc979gfy3ii396fpa1l3jpys18q"
+      "revision": "d4c8bdb06b7a589f004a53bf710196967752c63d",
+      "url": "https://github.com/kevinhwang91/nvim-ufo/archive/d4c8bdb06b7a589f004a53bf710196967752c63d.tar.gz",
+      "hash": "11zcr6vvj6gm5di63w55ccvwf2x7his8v9v8bingsz6l6n79dk6v"
     },
     "nvim-web-devicons": {
       "type": "Git",
@@ -1932,9 +1932,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "855c97005c8eebcdd19846f2e54706bffd40ee96",
-      "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/855c97005c8eebcdd19846f2e54706bffd40ee96.tar.gz",
-      "hash": "1rxpc5k6jbz7078dmjyjg8kgs67q2815bs8fz0srfqwyhvkgi15s"
+      "revision": "50b5b06bff13a9b4eab946de7c7033649a6618a1",
+      "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/50b5b06bff13a9b4eab946de7c7033649a6618a1.tar.gz",
+      "hash": "1jsrwcsyjwlzk2l3x417pr6s6cq4zk6b6k417hhmrprrw66ajdb6"
     },
     "obsidian-nvim": {
       "type": "Git",
@@ -1958,9 +1958,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "302bbaceeafc690e6419e0c8296e804d60cb9446",
-      "url": "https://github.com/stevearc/oil.nvim/archive/302bbaceeafc690e6419e0c8296e804d60cb9446.tar.gz",
-      "hash": "155v10myfpahyf9hf2x3dmp8ljjqavmqg1958x255i9l5swqcp5g"
+      "revision": "685cdb4ffa74473d75a1b97451f8654ceeab0f4a",
+      "url": "https://github.com/stevearc/oil.nvim/archive/685cdb4ffa74473d75a1b97451f8654ceeab0f4a.tar.gz",
+      "hash": "1wqbsfh274wkyyx8nf5gbcnsk92y4bwsrwq2vl85x3cx73kkzlhv"
     },
     "omnisharp-extended-lsp-nvim": {
       "type": "Git",
@@ -1984,9 +1984,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "67a74c275d1116d575ab25485d1bfa6b2a9c38a6",
-      "url": "https://github.com/navarasu/onedark.nvim/archive/67a74c275d1116d575ab25485d1bfa6b2a9c38a6.tar.gz",
-      "hash": "1pfyz3ascxs3sxl878qcirp9jsz77kpl2ks3wxkcv8ql4psymc9l"
+      "revision": "0e5512d1bebd1f08954710086f87a5caa173a924",
+      "url": "https://github.com/navarasu/onedark.nvim/archive/0e5512d1bebd1f08954710086f87a5caa173a924.tar.gz",
+      "hash": "14ixrvcp3h06kngq5ji54lf2l10k33vrmzs609xf7sqdy6rflm4j"
     },
     "orgmode": {
       "type": "Git",
@@ -1997,9 +1997,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "8c17ffeb2d08f77a6fd098634f5f85034d88caf8",
-      "url": "https://github.com/nvim-orgmode/orgmode/archive/8c17ffeb2d08f77a6fd098634f5f85034d88caf8.tar.gz",
-      "hash": "1rx20i6y666n8a593b2fqw2gdxs96qhzgwrza6m8zfcavzkwh0r0"
+      "revision": "27ab1cf9e7ae142f9e9ffb218be50dd920f04cb3",
+      "url": "https://github.com/nvim-orgmode/orgmode/archive/27ab1cf9e7ae142f9e9ffb218be50dd920f04cb3.tar.gz",
+      "hash": "176v9y36258jm8h3aaph57wgr6s7rgmgdnq9hgwialwn4bygfym0"
     },
     "otter-nvim": {
       "type": "Git",
@@ -2127,9 +2127,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "dfc1299d9f32b53b34b7ac6c3a7553b5fd29977f",
-      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/dfc1299d9f32b53b34b7ac6c3a7553b5fd29977f.tar.gz",
-      "hash": "1r636cyjflhpybjwfi01blbwkrxwi4lvykffrjclwfaf4l4gwddd"
+      "revision": "78ffe3b0500bbc7e37fabde723d96661538e8b32",
+      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/78ffe3b0500bbc7e37fabde723d96661538e8b32.tar.gz",
+      "hash": "00dn9cpdvm7dy4xyhaij2rs0g0l926cqvjn03v06sray3adbyij5"
     },
     "rose-pine": {
       "type": "Git",
@@ -2179,9 +2179,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "69636cedf0d6aabf0eac3dfbce24883fe1051a3d",
-      "url": "https://github.com/mrcjkb/rustaceanvim/archive/69636cedf0d6aabf0eac3dfbce24883fe1051a3d.tar.gz",
-      "hash": "0g40qj67pazf428wdgzijvf1a4xr2l1nimxisyka52fpwi1rah4y"
+      "revision": "3f2b7a94b7fa3c0f301dfa9644c94b543000efc2",
+      "url": "https://github.com/mrcjkb/rustaceanvim/archive/3f2b7a94b7fa3c0f301dfa9644c94b543000efc2.tar.gz",
+      "hash": "1y3x6m3yglkyv37xgli9k3dlw59yy3jbsp1phx75xqma1480dzy5"
     },
     "smartcolumn-nvim": {
       "type": "Git",
@@ -2338,9 +2338,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "2503b188cd2a17ce44fdd21a944a93335e935215",
-      "url": "https://github.com/chomosuke/typst-preview.nvim/archive/2503b188cd2a17ce44fdd21a944a93335e935215.tar.gz",
-      "hash": "0l981pjiz2ycn6rw1xwvmhdjpml7nrrlymwfyc942inw173k1jsg"
+      "revision": "dea4525d5420b7c32eebda7de15a6beb9d6574fa",
+      "url": "https://github.com/chomosuke/typst-preview.nvim/archive/dea4525d5420b7c32eebda7de15a6beb9d6574fa.tar.gz",
+      "hash": "0y658l2ibq0x4cwa4rl3lab7aw4ba68xcrdnxp81p2rsk0d60qq4"
     },
     "vim-dirtytalk": {
       "type": "Git",
@@ -2377,9 +2377,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "1fa4b23409e22a03823648e344c77f260e2572cb",
-      "url": "https://github.com/RRethy/vim-illuminate/archive/1fa4b23409e22a03823648e344c77f260e2572cb.tar.gz",
-      "hash": "1z27z6mpj4jazmifyz5scrniqr7sgh9hbkqx4g27yk0dnn9cm9ff"
+      "revision": "f985f5a4fbc410c9e5367f6b5863a8fa502e516d",
+      "url": "https://github.com/RRethy/vim-illuminate/archive/f985f5a4fbc410c9e5367f6b5863a8fa502e516d.tar.gz",
+      "hash": "0igx2i4k59vadhw7kgqvxjw9594n8p2n9yqszif9by8xq5gsd7g6"
     },
     "vim-markdown": {
       "type": "Git",

From 1768791402ae4112c08f71c077f65d035d672126 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 16 Feb 2025 12:48:40 +0300
Subject: [PATCH 158/202] lib/languages: add `lspOptions` submodule type for
 freeform LSP config

---
 lib/languages.nix | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/lib/languages.nix b/lib/languages.nix
index a202ff14..19171cc8 100644
--- a/lib/languages.nix
+++ b/lib/languages.nix
@@ -1,9 +1,10 @@
-# From home-manager: https://github.com/nix-community/home-manager/blob/master/modules/lib/booleans.nix
 {lib}: let
   inherit (builtins) isString getAttr;
   inherit (lib.options) mkOption;
-  inherit (lib.types) bool;
+  inherit (lib.types) listOf bool str submodule attrsOf anything;
+  inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.nvim.types) luaInline;
 in {
   diagnosticsToLua = {
     lang,
@@ -32,4 +33,31 @@ in {
       type = bool;
       description = "Turn on ${desc} for enabled languages by default";
     };
+
+  lspOptions = submodule {
+    freeformType = attrsOf anything;
+    options = {
+      capabilities = mkOption {
+        type = luaInline;
+        default = mkLuaInline "capabilities";
+        description = "LSP capabilitiess to pass to lspconfig";
+      };
+
+      on_attach = mkOption {
+        type = luaInline;
+        default = mkLuaInline "default_on_attach";
+        description = "Function to execute when an LSP server attaches to a buffer";
+      };
+
+      filetypes = mkOption {
+        type = listOf str;
+        description = "Filetypes to auto-attach LSP in";
+      };
+
+      cmd = mkOption {
+        type = listOf str;
+        description = "Command used to start the LSP server";
+      };
+    };
+  };
 }

From 159a0339024a3b3e34fa97f46eacb3d41cdbaf34 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 5 Apr 2025 22:47:10 +0300
Subject: [PATCH 159/202] lib/languages: add `root_marker` to `lspOptions` type

---
 lib/languages.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/languages.nix b/lib/languages.nix
index 19171cc8..d7e30394 100644
--- a/lib/languages.nix
+++ b/lib/languages.nix
@@ -58,6 +58,14 @@ in {
         type = listOf str;
         description = "Command used to start the LSP server";
       };
+
+      root_markers = mkOption {
+        type = listOf str;
+        description = ''
+          "root markers" used to determine the root directory of the workspace, and
+          the filetypes associated with this LSP server.
+        '';
+      };
     };
   };
 }

From 35c432db3b76e898fec0f6e25f9e410e0807d9c4 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 5 Apr 2025 22:47:25 +0300
Subject: [PATCH 160/202] neovim/lsp: init

---
 modules/neovim/init/default.nix |  1 +
 modules/neovim/init/lsp.nix     | 44 +++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 modules/neovim/init/lsp.nix

diff --git a/modules/neovim/init/default.nix b/modules/neovim/init/default.nix
index 0e7a4c6b..7db6f2ef 100644
--- a/modules/neovim/init/default.nix
+++ b/modules/neovim/init/default.nix
@@ -5,6 +5,7 @@
     ./debug.nix
     ./diagnostics.nix
     ./highlight.nix
+    ./lsp.nix
     ./spellcheck.nix
   ];
 }
diff --git a/modules/neovim/init/lsp.nix b/modules/neovim/init/lsp.nix
new file mode 100644
index 00000000..5dfd7a74
--- /dev/null
+++ b/modules/neovim/init/lsp.nix
@@ -0,0 +1,44 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.options) mkOption;
+  inherit (lib.types) attrsOf;
+  inherit (lib.strings) concatLines;
+  inherit (lib.attrsets) mapAttrsToList attrNames filterAttrs;
+  inherit (lib.nvim.languages) lspOptions;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.lua) toLuaObject;
+
+  cfg = config.vim.lsp;
+
+  lspConfigurations =
+    mapAttrsToList (
+      name: value: ''
+        vim.lsp.config["${name}"] = ${toLuaObject value}
+      ''
+    )
+    cfg.servers;
+
+  enabledServers = filterAttrs (_: u: u.enable) cfg.servers;
+in {
+  options = {
+    vim.lsp.servers = mkOption {
+      type = attrsOf lspOptions;
+      default = {};
+      description = "";
+    };
+  };
+
+  config = mkIf (cfg.servers != {}) {
+    vim.luaConfigRC.lsp-servers = entryAnywhere ''
+      -- Individual LSP configurations managed by nvf.
+      ${(concatLines lspConfigurations)}
+
+      -- Enable configured LSPs explicitly
+      vim.lsp.enable(${toLuaObject (attrNames enabledServers)})
+    '';
+  };
+}

From 52fb95ea6b93f37f40dc710d4b6a9df8685051ba Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 5 Apr 2025 23:17:18 +0300
Subject: [PATCH 161/202] lib/languages: add explicit enable to LSP submodule

---
 lib/languages.nix | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/lib/languages.nix b/lib/languages.nix
index d7e30394..c4074144 100644
--- a/lib/languages.nix
+++ b/lib/languages.nix
@@ -1,11 +1,11 @@
 {lib}: let
   inherit (builtins) isString getAttr;
   inherit (lib.options) mkOption;
-  inherit (lib.types) listOf bool str submodule attrsOf anything;
-  inherit (lib.generators) mkLuaInline;
+  inherit (lib.types) listOf bool str submodule attrsOf anything either nullOr;
   inherit (lib.nvim.attrsets) mapListToAttrs;
   inherit (lib.nvim.types) luaInline;
 in {
+  # TODO: remove
   diagnosticsToLua = {
     lang,
     config,
@@ -37,30 +37,39 @@ in {
   lspOptions = submodule {
     freeformType = attrsOf anything;
     options = {
+      enable = mkOption {
+        type = bool;
+        default = true;
+        description = "Whether to enable this LSP server.";
+      };
+
       capabilities = mkOption {
-        type = luaInline;
-        default = mkLuaInline "capabilities";
+        type = nullOr (either luaInline (attrsOf anything));
+        default = null;
         description = "LSP capabilitiess to pass to lspconfig";
       };
 
       on_attach = mkOption {
-        type = luaInline;
-        default = mkLuaInline "default_on_attach";
+        type = nullOr luaInline;
+        default = null;
         description = "Function to execute when an LSP server attaches to a buffer";
       };
 
       filetypes = mkOption {
-        type = listOf str;
+        type = nullOr (listOf str);
+        default = null;
         description = "Filetypes to auto-attach LSP in";
       };
 
       cmd = mkOption {
-        type = listOf str;
+        type = nullOr (listOf str);
+        default = null;
         description = "Command used to start the LSP server";
       };
 
       root_markers = mkOption {
-        type = listOf str;
+        type = nullOr (listOf str);
+        default = null;
         description = ''
           "root markers" used to determine the root directory of the workspace, and
           the filetypes associated with this LSP server.

From ea9075a07f285f31bd22e56c2182a0b9d52c961a Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 6 Apr 2025 01:18:39 +0200
Subject: [PATCH 162/202] lsp: add default fallback config

---
 modules/neovim/init/lsp.nix | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/modules/neovim/init/lsp.nix b/modules/neovim/init/lsp.nix
index 5dfd7a74..6d3478c9 100644
--- a/modules/neovim/init/lsp.nix
+++ b/modules/neovim/init/lsp.nix
@@ -3,11 +3,13 @@
   lib,
   ...
 }: let
-  inherit (lib.modules) mkIf;
+  inherit (builtins) filter;
+  inherit (lib.modules) mkIf mkMerge mkDefault;
   inherit (lib.options) mkOption;
   inherit (lib.types) attrsOf;
   inherit (lib.strings) concatLines;
   inherit (lib.attrsets) mapAttrsToList attrNames filterAttrs;
+  inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.languages) lspOptions;
   inherit (lib.nvim.dag) entryAnywhere;
   inherit (lib.nvim.lua) toLuaObject;
@@ -32,13 +34,22 @@ in {
     };
   };
 
-  config = mkIf (cfg.servers != {}) {
-    vim.luaConfigRC.lsp-servers = entryAnywhere ''
-      -- Individual LSP configurations managed by nvf.
-      ${(concatLines lspConfigurations)}
+  config = mkMerge [
+    {
+      vim.lsp.servers."*" = {
+        capabilities = mkDefault (mkLuaInline "capabilities");
+        on_attach = mkDefault (mkLuaInline "default_on_attach");
+      };
+    }
 
-      -- Enable configured LSPs explicitly
-      vim.lsp.enable(${toLuaObject (attrNames enabledServers)})
-    '';
-  };
+    (mkIf (cfg.servers != {}) {
+      vim.luaConfigRC.lsp-servers = entryAnywhere ''
+        -- Individual LSP configurations managed by nvf.
+        ${(concatLines lspConfigurations)}
+
+        -- Enable configured LSPs explicitly
+        vim.lsp.enable(${toLuaObject (filter (name: name != "*") (attrNames enabledServers))})
+      '';
+    })
+  ];
 }

From 9bd2a6dcb4d8f6f7231aa86f075447255aea812a Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 27 Apr 2025 06:21:13 +0300
Subject: [PATCH 163/202] neovim/lsp: add LSP example; add description to
 servers option

---
 modules/neovim/init/lsp.nix | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/modules/neovim/init/lsp.nix b/modules/neovim/init/lsp.nix
index 6d3478c9..faef0f93 100644
--- a/modules/neovim/init/lsp.nix
+++ b/modules/neovim/init/lsp.nix
@@ -30,7 +30,34 @@ in {
     vim.lsp.servers = mkOption {
       type = attrsOf lspOptions;
       default = {};
-      description = "";
+      example = ''
+        {
+          "*" = {
+            root_markers = [".git"];
+            capabilities = {
+              textDocument = {
+                semanticTokens = {
+                  multilineTokenSupport = true;
+                };
+              };
+            };
+          };
+
+          "clangd" = {
+            filetypes = ["c"];
+          };
+        }
+      '';
+      description = ''
+        LSP configurations that will be managed using `vim.lsp.config()` and
+        related utilities added in Neovim 0.11. LSPs defined here will be
+        added to the resulting {file}`init.lua` using `vim.lsp.config` and
+        enabled through `vim.lsp.enable` below the configuration table.
+
+        You may review the generated configuration by running {command}`nvf-print-config`
+        in a shell. Please see {command}`:help lsp-config` for more details
+        on the underlying API.
+      '';
     };
   };
 
@@ -45,7 +72,7 @@ in {
     (mkIf (cfg.servers != {}) {
       vim.luaConfigRC.lsp-servers = entryAnywhere ''
         -- Individual LSP configurations managed by nvf.
-        ${(concatLines lspConfigurations)}
+        ${concatLines lspConfigurations}
 
         -- Enable configured LSPs explicitly
         vim.lsp.enable(${toLuaObject (filter (name: name != "*") (attrNames enabledServers))})

From c30f07fcd67a636e685259769bbb1ba18bbb8483 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 27 Apr 2025 06:25:19 +0300
Subject: [PATCH 164/202] languages: set `enableLSP` to true while `vim.lsp` is
 enabled

---
 modules/plugins/languages/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix
index c3312135..b889e60a 100644
--- a/modules/plugins/languages/default.nix
+++ b/modules/plugins/languages/default.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.nvim.languages) mkEnable;
 in {
   imports = [
@@ -47,7 +51,11 @@ in {
   ];
 
   options.vim.languages = {
-    enableLSP = mkEnable "LSP";
+    # LSPs are now built into Neovim, and we should enable them by default
+    # if `vim.lsp.enable` is true.
+    enableLSP = mkEnable "LSP" // {default = config.vim.lsp.enable;};
+
+    # Those are still managed by plugins, and should be enabled here.
     enableDAP = mkEnable "Debug Adapter";
     enableTreesitter = mkEnable "Treesitter";
     enableFormat = mkEnable "Formatting";

From ea90d2baf381b30f8ea4116438f2c04f61b5cc3b Mon Sep 17 00:00:00 2001
From: haskex <jhuan2024@hotmail.com>
Date: Mon, 28 Apr 2025 12:16:53 -0300
Subject: [PATCH 165/202] Added HardTime.nvim plugin and added
 vim.binds.hardtime.enable and .setupOpts options

---
 configuration.nix                             |  3 +++
 modules/plugins/utility/binds/default.nix     |  1 +
 .../plugins/utility/binds/hardtime/config.nix | 21 +++++++++++++++++++
 .../utility/binds/hardtime/default.nix        |  6 ++++++
 .../utility/binds/hardtime/hardtime.nix       | 10 +++++++++
 npins/sources.json                            | 13 ++++++++++++
 6 files changed, 54 insertions(+)
 create mode 100644 modules/plugins/utility/binds/hardtime/config.nix
 create mode 100644 modules/plugins/utility/binds/hardtime/default.nix
 create mode 100644 modules/plugins/utility/binds/hardtime/hardtime.nix

diff --git a/configuration.nix b/configuration.nix
index 011d6fae..f48af0b4 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -142,6 +142,9 @@ isMaximal: {
     binds = {
       whichKey.enable = true;
       cheatsheet.enable = true;
+
+      # Remove this after test
+      hardtime.enable = true;
     };
 
     telescope.enable = true;
diff --git a/modules/plugins/utility/binds/default.nix b/modules/plugins/utility/binds/default.nix
index 229423b8..43666cc9 100644
--- a/modules/plugins/utility/binds/default.nix
+++ b/modules/plugins/utility/binds/default.nix
@@ -2,5 +2,6 @@ _: {
   imports = [
     ./which-key
     ./cheatsheet
+    ./hardtime
   ];
 }
diff --git a/modules/plugins/utility/binds/hardtime/config.nix b/modules/plugins/utility/binds/hardtime/config.nix
new file mode 100644
index 00000000..7f2cde73
--- /dev/null
+++ b/modules/plugins/utility/binds/hardtime/config.nix
@@ -0,0 +1,21 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.lua) toLuaObject;
+  inherit (lib.nvim.dag) entryAnywhere;
+
+  cfg = config.vim.binds.hardtime;
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      startPlugins = ["hardtime-nvim"];
+
+      pluginRC.hardtime = entryAnywhere ''
+        require("hardtime").setup (${toLuaObject cfg.setupOpts})
+      '';
+    };
+  };
+}
diff --git a/modules/plugins/utility/binds/hardtime/default.nix b/modules/plugins/utility/binds/hardtime/default.nix
new file mode 100644
index 00000000..89aa11d3
--- /dev/null
+++ b/modules/plugins/utility/binds/hardtime/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./hardtime.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/utility/binds/hardtime/hardtime.nix b/modules/plugins/utility/binds/hardtime/hardtime.nix
new file mode 100644
index 00000000..c27c1c0d
--- /dev/null
+++ b/modules/plugins/utility/binds/hardtime/hardtime.nix
@@ -0,0 +1,10 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.binds.hardtime = {
+    enable = mkEnableOption "enable hardtime";
+
+    setupOpts = mkPluginSetupOption "hardtime-nvim" {};
+  };
+}
diff --git a/npins/sources.json b/npins/sources.json
index 90a54057..5fe087f5 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -614,6 +614,19 @@
       "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/a933d8666dad9363dc6908ae72cfc832299c2f59.tar.gz",
       "hash": "02r2h0ip2vzmgmv9b36ff2r6br3ql0b9ggzl8ijsyjy7pgiij04y"
     },
+    "hardtime-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "m4xshen",
+        "repo": "hardtime.nvim"
+      },
+      "branch": "main",
+      "submodules": false,
+      "revision": "9aaec65de041bddfc4c0af66919030d2950bcea8",
+      "url": "https://github.com/m4xshen/hardtime.nvim/archive/9aaec65de041bddfc4c0af66919030d2950bcea8.tar.gz",
+      "hash": "1rmcl200a4m3ip3xjzhh7ghhh2961xj2mw7yf0w44jpvs98gqb18"
+    },
     "harpoon": {
       "type": "Git",
       "repository": {

From 878cf96f717cf71f8be2732ebd21698aeff499fa Mon Sep 17 00:00:00 2001
From: haskex <jhuan2024@hotmail.com>
Date: Mon, 28 Apr 2025 18:27:43 -0300
Subject: [PATCH 166/202] Changing from 'hardtime.enable = true' to
 'hardtime.enable = isMaximal' in configuration.nix

---
 configuration.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index f48af0b4..dce9534a 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -142,9 +142,7 @@ isMaximal: {
     binds = {
       whichKey.enable = true;
       cheatsheet.enable = true;
-
-      # Remove this after test
-      hardtime.enable = true;
+      hardtime.enable = isMaximal;
     };
 
     telescope.enable = true;

From 5dff9537d1ccba729728c9633bddfee9dc82e4ca Mon Sep 17 00:00:00 2001
From: poz <poz@poz.pet>
Date: Thu, 1 May 2025 00:09:53 +0200
Subject: [PATCH 167/202] plugins/gitsigns: fix null-ls issue

---
 docs/release-notes/rl-0.8.md            | 4 ++++
 modules/plugins/git/gitsigns/config.nix | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index edf90e62..294fd17b 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -352,3 +352,7 @@
 [aionoid](https://github.com/aionoid):
 
 - Fix [render-markdown.nvim] file_types option type to list, to accept merging.
+
+[poz](https://poz.pet):
+
+- Fix gitsigns null-ls issue.
diff --git a/modules/plugins/git/gitsigns/config.nix b/modules/plugins/git/gitsigns/config.nix
index 99927546..f5d9f910 100644
--- a/modules/plugins/git/gitsigns/config.nix
+++ b/modules/plugins/git/gitsigns/config.nix
@@ -81,9 +81,11 @@ in {
     (mkIf cfg.codeActions.enable {
       vim.lsp.null-ls = {
         enable = true;
-        setupOpts.sources.gitsigns-ca = mkLuaInline ''
-          require("null-ls").builtins.code_actions.gitsigns
-        '';
+        setupOpts.sources = [
+          (mkLuaInline ''
+            require("null-ls").builtins.code_actions.gitsigns
+          '')
+        ];
       };
     })
   ]);

From eb4b990b4955fb0c51021e2513efc81fcb66a2a1 Mon Sep 17 00:00:00 2001
From: poz <poz@poz.pet>
Date: Thu, 1 May 2025 00:26:04 +0200
Subject: [PATCH 168/202] release-notes: update jacekpoz to poz

---
 docs/release-notes/rl-0.5.md | 2 +-
 docs/release-notes/rl-0.6.md | 2 +-
 docs/release-notes/rl-0.7.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/release-notes/rl-0.5.md b/docs/release-notes/rl-0.5.md
index 0ca02164..910c93d5 100644
--- a/docs/release-notes/rl-0.5.md
+++ b/docs/release-notes/rl-0.5.md
@@ -91,7 +91,7 @@ Release notes for release 0.5
 - Updated indent-blankine.nvim to v3 - this comes with a few option changes,
   which will be migrated with `renamedOptionModule`
 
-[jacekpoz](https://jacekpoz.pl):
+[poz](https://poz.pet):
 
 - Fixed scrollOffset not being used
 
diff --git a/docs/release-notes/rl-0.6.md b/docs/release-notes/rl-0.6.md
index 1807a3e9..309d6b16 100644
--- a/docs/release-notes/rl-0.6.md
+++ b/docs/release-notes/rl-0.6.md
@@ -69,7 +69,7 @@ vim.api.nvim_set_keymap('n', '<leader>a', ':lua camelToSnake()<CR>', { noremap =
 
 - Added rose-pine theme.
 
-[jacekpoz](https://jacekpoz.pl):
+[poz](https://poz.pet):
 
 - Added `vim.autocomplete.alwaysComplete`. Allows users to have the autocomplete
   window popup only when manually activated.
diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md
index d62e3619..ed9d2d81 100644
--- a/docs/release-notes/rl-0.7.md
+++ b/docs/release-notes/rl-0.7.md
@@ -162,7 +162,7 @@ The changes are, in no particular order:
 - Add [lz.n] support and lazy-load some builtin plugins.
 - Add simpler helper functions for making keymaps
 
-[jacekpoz](https://jacekpoz.pl):
+[poz](https://poz.pet):
 
 [ocaml-lsp]: https://github.com/ocaml/ocaml-lsp
 [new-file-template.nvim]: https://github.com/otavioschwanck/new-file-template.nvim

From 1f7405aaf7f9a70177a0f052df034f55f0591182 Mon Sep 17 00:00:00 2001
From: haskex <jhuan2024@hotmail.com>
Date: Wed, 30 Apr 2025 22:02:00 -0300
Subject: [PATCH 169/202] Changing options for hardtime plugin to
 hardtime-nvim, and adding the changelog

---
 configuration.nix                                   | 2 +-
 docs/release-notes/rl-0.8.md                        | 5 +++++
 modules/plugins/utility/binds/hardtime/config.nix   | 2 +-
 modules/plugins/utility/binds/hardtime/hardtime.nix | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index dce9534a..caefcc34 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -142,7 +142,7 @@ isMaximal: {
     binds = {
       whichKey.enable = true;
       cheatsheet.enable = true;
-      hardtime.enable = isMaximal;
+      hardtime-nvim.enable = isMaximal;
     };
 
     telescope.enable = true;
diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 294fd17b..3610aea8 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -356,3 +356,8 @@
 [poz](https://poz.pet):
 
 - Fix gitsigns null-ls issue.
+
+[Haskex](https://github.com/haskex):
+
+- Add Plugin [Hardtime.nvim](https://github.com/m4xshen/hardtime.nvim).
+- Add option `vim.binds.hardtime-nvim` with `enable` and `setupOpts` options.
diff --git a/modules/plugins/utility/binds/hardtime/config.nix b/modules/plugins/utility/binds/hardtime/config.nix
index 7f2cde73..e8c315ef 100644
--- a/modules/plugins/utility/binds/hardtime/config.nix
+++ b/modules/plugins/utility/binds/hardtime/config.nix
@@ -7,7 +7,7 @@
   inherit (lib.nvim.lua) toLuaObject;
   inherit (lib.nvim.dag) entryAnywhere;
 
-  cfg = config.vim.binds.hardtime;
+  cfg = config.vim.binds.hardtime-nvim;
 in {
   config = mkIf cfg.enable {
     vim = {
diff --git a/modules/plugins/utility/binds/hardtime/hardtime.nix b/modules/plugins/utility/binds/hardtime/hardtime.nix
index c27c1c0d..56833b48 100644
--- a/modules/plugins/utility/binds/hardtime/hardtime.nix
+++ b/modules/plugins/utility/binds/hardtime/hardtime.nix
@@ -2,8 +2,8 @@
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
-  options.vim.binds.hardtime = {
-    enable = mkEnableOption "enable hardtime";
+  options.vim.binds.hardtime-nvim = {
+    enable = mkEnableOption "Hardtime - A Plugin for Blocks key repeats in Neovim.";
 
     setupOpts = mkPluginSetupOption "hardtime-nvim" {};
   };

From cc2c412b884cbf2731296abecc3c97321b98db23 Mon Sep 17 00:00:00 2001
From: haskex <jhuan2024@hotmail.com>
Date: Thu, 1 May 2025 12:17:31 -0300
Subject: [PATCH 170/202] Changing plugin description and testing

---
 modules/plugins/utility/binds/hardtime/hardtime.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/utility/binds/hardtime/hardtime.nix b/modules/plugins/utility/binds/hardtime/hardtime.nix
index 56833b48..b671ddcd 100644
--- a/modules/plugins/utility/binds/hardtime/hardtime.nix
+++ b/modules/plugins/utility/binds/hardtime/hardtime.nix
@@ -3,7 +3,7 @@
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.binds.hardtime-nvim = {
-    enable = mkEnableOption "Hardtime - A Plugin for Blocks key repeats in Neovim.";
+    enable = mkEnableOption "hardtime helper for no repeat keybinds";
 
     setupOpts = mkPluginSetupOption "hardtime-nvim" {};
   };

From 028bd7b4cb2c6ce2070e5b3aba0680f107b86616 Mon Sep 17 00:00:00 2001
From: Jhuan Nycolas <168754963+haskex@users.noreply.github.com>
Date: Thu, 1 May 2025 15:10:00 -0300
Subject: [PATCH 171/202] Update rl-0.8.md

---
 docs/release-notes/rl-0.8.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 3610aea8..80a0300c 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -359,5 +359,6 @@
 
 [Haskex](https://github.com/haskex):
 
-- Add Plugin [Hardtime.nvim](https://github.com/m4xshen/hardtime.nvim).
-- Add option `vim.binds.hardtime-nvim` with `enable` and `setupOpts` options.
+[Hardtime.nvim]: https://github.com/m4xshen/hardtime.nvim
+
+- Add Plugin [Hardtime.nvim] under `vim.binds.hardtime-nvim` with `enable` and `setupOpts` options

From dda89a2d9cf4c112f50f1c31853245ef1391eda3 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 3 May 2025 04:01:04 +0300
Subject: [PATCH 172/202] wrapper/options: fix description for
 `enableLuaLoader`

---
 modules/wrapper/rc/options.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index 10abd77d..02729401 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -11,13 +11,14 @@ in {
       description = ''
         [official documentation]: https://neovim.io/doc/user/lua.html#vim.loader.enable()
 
-        the experimental Lua module loader to speed up the start up process
+        Whethere to enable the experimental Lua module loader to speed up the start
+        up process. If `true`, this will enable the experimental Lua module loader
+        which:
 
-        If `true`, this will enable the experimental Lua module loader which:
-          - overrides loadfile
-          - adds the lua loader using the byte-compilation cache
-          - adds the libs loader
-          - removes the default Neovim loader
+        * overrides loadfile
+        * adds the lua loader using the byte-compilation cache
+        * adds the libs loader
+        * removes the default Neovim loader
 
         ::: {.note}
         The Lua module loader is *disabled* by default. Before setting this option, please

From c7e49f370392a332cedb1855e3abb9406cae7c31 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 3 May 2025 08:40:51 +0300
Subject: [PATCH 173/202] flake: bump inputs

---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 65243865..307d3d7a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1745705214,
-        "narHash": "sha256-XGfaHbFI4vvDuaoVO3IFYZKezXIO8rhUaMCGcjY71Ac=",
+        "lastModified": 1746230955,
+        "narHash": "sha256-X32sM3RQ3X2y6PzfNnX3rhUAlhuITdDOdfSrwZXjlsQ=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "c1f4587db4c53dcefa432c46c7a899a116d8e924",
+        "rev": "2a1678ba8e4807bd855dd0da94ea2bef5bca733d",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745377448,
-        "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=",
+        "lastModified": 1746152631,
+        "narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c",
+        "rev": "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3",
         "type": "github"
       },
       "original": {

From eae1f306b88b6da72e7d2d79b9ffcb1527cf9c41 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 3 May 2025 08:40:58 +0300
Subject: [PATCH 174/202] pins: bump all plugins

---
 npins/sources.json | 164 ++++++++++++++++++++++-----------------------
 1 file changed, 82 insertions(+), 82 deletions(-)

diff --git a/npins/sources.json b/npins/sources.json
index 04c35ede..be2b74bb 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -50,10 +50,10 @@
       "version_upper_bound": null,
       "release_prefix": null,
       "submodules": false,
-      "version": "v1.1.1",
-      "revision": "fe2e1d3e4498d60c5ce7440ff60f79f0920e34bf",
-      "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v1.1.1",
-      "hash": "0l2m4162vk6xqrx5v0zh1b5p6wrr1jailq1995f101isyjygikan"
+      "version": "v1.2.0",
+      "revision": "d72a826e1961e14f91d8867d10a27a89c5cfe748",
+      "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v1.2.0",
+      "hash": "01phyx7y26p2123xpdp0zfp45rc8f014a8myxn2ga71m514vr9vc"
     },
     "blink-cmp-spell": {
       "type": "Git",
@@ -103,9 +103,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "89c4d158bc6d6ca03b4059452f2f9ffaa850db8a",
-      "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/89c4d158bc6d6ca03b4059452f2f9ffaa850db8a.tar.gz",
-      "hash": "04xh5hzbzvm0nvipsy0cw7k1vb1kcrb09xiw0j66cqddjvvpv6zk"
+      "revision": "0a2c3c1ce8c3c56e7490cae835a981d5dbeb472c",
+      "url": "https://github.com/mikavilpas/blink-ripgrep.nvim/archive/0a2c3c1ce8c3c56e7490cae835a981d5dbeb472c.tar.gz",
+      "hash": "11wc0qdalz7fb6zpdvrdib1bx3qyvcbn3hr0h57plspln55rjhl5"
     },
     "bufdelete-nvim": {
       "type": "Git",
@@ -129,9 +129,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429",
-      "url": "https://github.com/catppuccin/nvim/archive/5b5e3aef9ad7af84f463d17b5479f06b87d5c429.tar.gz",
-      "hash": "0jmrwag2dx4b1g9x32xwxcr8y0l159hqks09z5miy99wav6dy7z2"
+      "revision": "b7bbdf93b42866f166af98d39a2563eedb7cabac",
+      "url": "https://github.com/catppuccin/nvim/archive/b7bbdf93b42866f166af98d39a2563eedb7cabac.tar.gz",
+      "hash": "0f8wcpig84kihbz31w0hap4qs5gsdvch4sk2krn29v3k5bh3kcv0"
     },
     "ccc-nvim": {
       "type": "Git",
@@ -272,9 +272,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "c861811f8b825d30c0343951336d2bb8c8f6d990",
-      "url": "https://github.com/olimorris/codecompanion.nvim/archive/c861811f8b825d30c0343951336d2bb8c8f6d990.tar.gz",
-      "hash": "0a1mzwh07lhrx893w7xdlhgiivbrwqp7a0b9wkdrna99x8kd9d77"
+      "revision": "e55bbf5f6969ab41414d3fd68011366d3b80d024",
+      "url": "https://github.com/olimorris/codecompanion.nvim/archive/e55bbf5f6969ab41414d3fd68011366d3b80d024.tar.gz",
+      "hash": "12jas52gh1dl33ir0bkxpqnfxjdkwh7h03qvfk1b3qk2fmr0abqn"
     },
     "codewindow-nvim": {
       "type": "Git",
@@ -350,9 +350,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "73d2c590c74a0c582144987a4decb4a642755859",
-      "url": "https://github.com/Saecki/crates.nvim/archive/73d2c590c74a0c582144987a4decb4a642755859.tar.gz",
-      "hash": "08dyl4blgi0lb3s0jbl4jcpr4j1ncyrdvxjkrqmhqcg6bmwl7iqy"
+      "revision": "2c8f4fab02e3e9ea42c6ad9b547e4207a914a397",
+      "url": "https://github.com/Saecki/crates.nvim/archive/2c8f4fab02e3e9ea42c6ad9b547e4207a914a397.tar.gz",
+      "hash": "0ddlm94v3gh1znacghvfpfmkgv6js9i62gf7mlqcrpz8snpf879s"
     },
     "csharpls-extended-lsp-nvim": {
       "type": "Git",
@@ -363,9 +363,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "53c6dfc9790d262edd3d6a4483294bedf53d70f5",
-      "url": "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/archive/53c6dfc9790d262edd3d6a4483294bedf53d70f5.tar.gz",
-      "hash": "0hy3jaq5lq72yfvy77hijp8wzpbad7a1xfwrdljzbpm4w5j59dm2"
+      "revision": "c1edd1eaad2e649d3de8121337e3c515ac6db46e",
+      "url": "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/archive/c1edd1eaad2e649d3de8121337e3c515ac6db46e.tar.gz",
+      "hash": "03sjrkay6c6ivd9zpm7isa9izxsvspkvbvy7f61nl020splhbl9m"
     },
     "dashboard-nvim": {
       "type": "Git",
@@ -376,9 +376,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "b0551fae871fc39454a67cca1adcf76fbe2f61f9",
-      "url": "https://github.com/glepnir/dashboard-nvim/archive/b0551fae871fc39454a67cca1adcf76fbe2f61f9.tar.gz",
-      "hash": "0m67ij62dwnzyspyckhqvcsk81nvc16gx8zphghw4w2w4vl9lsrj"
+      "revision": "591b5b29e2f17b97496ec3179f6ecd08bb8502cc",
+      "url": "https://github.com/glepnir/dashboard-nvim/archive/591b5b29e2f17b97496ec3179f6ecd08bb8502cc.tar.gz",
+      "hash": "1f9ii3scd3zh4fch6h0mfmnfjx2fk6y4v3qc0cijk1vnyp2fm9qc"
     },
     "diffview-nvim": {
       "type": "Git",
@@ -454,9 +454,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "2f2e8d7010a0e5e725957828476b4e1625eaf82c",
-      "url": "https://github.com/Chaitanyabsprip/fastaction.nvim/archive/2f2e8d7010a0e5e725957828476b4e1625eaf82c.tar.gz",
-      "hash": "0m2qplldlcgzb6n5lwnwiac5n56zpyf3df015abfwrwba95zflfv"
+      "revision": "41545d9d02a53d03b5f4da5881e8f30a7dc16031",
+      "url": "https://github.com/Chaitanyabsprip/fastaction.nvim/archive/41545d9d02a53d03b5f4da5881e8f30a7dc16031.tar.gz",
+      "hash": "1is587xa1b2fim4s3qc13ggwgpm02y4dmh64l4xjh6gyilh3fmkb"
     },
     "fidget-nvim": {
       "type": "Git",
@@ -506,9 +506,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "fc8f183479a472df60aa86f00e295462f2308178",
-      "url": "https://github.com/rafamadriz/friendly-snippets/archive/fc8f183479a472df60aa86f00e295462f2308178.tar.gz",
-      "hash": "1clmyxkw0gk9p9j72d75byws75vi3r7d04wica2dq5i0zkk49b27"
+      "revision": "572f5660cf05f8cd8834e096d7b4c921ba18e175",
+      "url": "https://github.com/rafamadriz/friendly-snippets/archive/572f5660cf05f8cd8834e096d7b4c921ba18e175.tar.gz",
+      "hash": "08q7vs7p4grav819b6hl5y9zla8bbb461b6m1w0mjz6n6rqjjc0p"
     },
     "fzf-lua": {
       "type": "Git",
@@ -519,9 +519,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "b11467c3fbfe48e4a815e4909f5c4e5b413ce6d0",
-      "url": "https://github.com/ibhagwan/fzf-lua/archive/b11467c3fbfe48e4a815e4909f5c4e5b413ce6d0.tar.gz",
-      "hash": "1yjfyz0fchibyb6wnnyxarn2v4fxxfvf9vy1pyvfc7mz5b4mzwc2"
+      "revision": "1cc70fb29e63ff26acba1e0cbca04705f8a485f1",
+      "url": "https://github.com/ibhagwan/fzf-lua/archive/1cc70fb29e63ff26acba1e0cbca04705f8a485f1.tar.gz",
+      "hash": "032y3djil7bsb2h0sv5a0a1qg805j5p2jxxp01jcpmn870b6mcjd"
     },
     "gesture-nvim": {
       "type": "Git",
@@ -584,9 +584,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "9cd665f46ab7af2e49d140d328b8e72ea1cf511b",
-      "url": "https://github.com/lewis6991/gitsigns.nvim/archive/9cd665f46ab7af2e49d140d328b8e72ea1cf511b.tar.gz",
-      "hash": "110ykgvd3hbjq8ilz1yvfcic1jpqzyz4r13dswmpv7nvsi7a2lb5"
+      "revision": "1796c7cedfe7e5dd20096c5d7b8b753d8f8d22eb",
+      "url": "https://github.com/lewis6991/gitsigns.nvim/archive/1796c7cedfe7e5dd20096c5d7b8b753d8f8d22eb.tar.gz",
+      "hash": "0xzmj3z3rd1zxv5hc87ncmnrzm6653ffaif9xkpvnc3n8l81ybsn"
     },
     "glow-nvim": {
       "type": "Git",
@@ -610,9 +610,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "c54db7f7e67832fbdd0ac14633f62c8a6997ddcf",
-      "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/c54db7f7e67832fbdd0ac14633f62c8a6997ddcf.tar.gz",
-      "hash": "0i7dh2d3l1w6bga6gpfssam7w1qkd84q3cxyscdfsf4j9z4b62l2"
+      "revision": "91a0f8e460197a521d42a2e84a7a2a4010be4bbb",
+      "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/91a0f8e460197a521d42a2e84a7a2a4010be4bbb.tar.gz",
+      "hash": "1bmxps0wawyvwyzcwzdxbf1wcqx6v7h6afj3yzgb38gz649wr8q7"
     },
     "harpoon": {
       "type": "Git",
@@ -636,9 +636,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "fda0e5082ecc1c9e892f38b715d6f61e8829081d",
-      "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/fda0e5082ecc1c9e892f38b715d6f61e8829081d.tar.gz",
-      "hash": "0hi0ww7q0j042ssjk7x3d4s4vaninawpw3s0yrv1c4l1q5v6gnz1"
+      "revision": "3bec28d8b0006be596497a5e1a03bda6ef6131cf",
+      "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/3bec28d8b0006be596497a5e1a03bda6ef6131cf.tar.gz",
+      "hash": "1kf3w7x8awa4iiw7ab8xfjh6fq47yvv6h2rmfw0jf8s99fvgarj2"
     },
     "highlight-undo-nvim": {
       "type": "Git",
@@ -834,9 +834,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "c9b9a22904c97d0eb69ccb9bab76037838326817",
-      "url": "https://github.com/L3MON4D3/LuaSnip/archive/c9b9a22904c97d0eb69ccb9bab76037838326817.tar.gz",
-      "hash": "03anxdspqz7ylq4239jyr9y51mw5qw1lkccyvfhj6wfk43jjdryx"
+      "revision": "7351d673f430e89f11962dc45b7360d6a0a26d2d",
+      "url": "https://github.com/L3MON4D3/LuaSnip/archive/7351d673f430e89f11962dc45b7360d6a0a26d2d.tar.gz",
+      "hash": "0dd42ss93cppq3cp27336gail955lckqqc6bafkmawplxh93qn1q"
     },
     "lz-n": {
       "type": "Git",
@@ -1477,9 +1477,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "299e174c3b8373c9c1f9be0bc3967c852712d0f3",
-      "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/299e174c3b8373c9c1f9be0bc3967c852712d0f3.tar.gz",
-      "hash": "0vm7hbcqj548pvl9vfmzsgpx73lmrnmhp399bprizg87zn73m005"
+      "revision": "71bfdeddc90225e281ce34c378dc1b5914f5018d",
+      "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/71bfdeddc90225e281ce34c378dc1b5914f5018d.tar.gz",
+      "hash": "0cm4y2idpmf7i6daa4wl5b6n5ldzqr3pqmh29rc645c1xk2y0b80"
     },
     "neocord": {
       "type": "Git",
@@ -1503,9 +1503,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "35da593c55d78086a3203ee3e6d749fafe2e4e73",
-      "url": "https://github.com/nvim-neorg/neorg/archive/35da593c55d78086a3203ee3e6d749fafe2e4e73.tar.gz",
-      "hash": "0kxygwpfffa0blcy54g7cvm5laj77q0f72p69s43j9dpsps1h63y"
+      "revision": "8fdd9b2986acfb4ce310bebfc338111793862f00",
+      "url": "https://github.com/nvim-neorg/neorg/archive/8fdd9b2986acfb4ce310bebfc338111793862f00.tar.gz",
+      "hash": "0xv3aasbhambywp6idhz44nlsh3hlarw3j7wwx7wn1whm6xbwvf6"
     },
     "neorg-telescope": {
       "type": "Git",
@@ -1581,9 +1581,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "751349f21bdf1acf7af091fead456866bf9a7e7d",
-      "url": "https://github.com/nvimtools/none-ls.nvim/archive/751349f21bdf1acf7af091fead456866bf9a7e7d.tar.gz",
-      "hash": "1zhqyjs914ib1yq42xq3aphw8pl4168h2k3ybm92z00ahi51kbqn"
+      "revision": "a49f5a79cdb76e0dc1a98899c8598f4db014c5e7",
+      "url": "https://github.com/nvimtools/none-ls.nvim/archive/a49f5a79cdb76e0dc1a98899c8598f4db014c5e7.tar.gz",
+      "hash": "0x16saxsr3w3ivqpdjg05bkyfxzsiyfpsiwhyzsvqxg1qnkda3b2"
     },
     "nord": {
       "type": "Git",
@@ -1763,9 +1763,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "641e567f975feab3815b47c7d29e6148e07afa77",
-      "url": "https://github.com/neovim/nvim-lspconfig/archive/641e567f975feab3815b47c7d29e6148e07afa77.tar.gz",
-      "hash": "1238hk6v3mm6hzjbipz60rva7crv95h2vzg6ph9wzplq52kzryav"
+      "revision": "46434074f188e6bfccf9d9153dd8be6b1381498b",
+      "url": "https://github.com/neovim/nvim-lspconfig/archive/46434074f188e6bfccf9d9153dd8be6b1381498b.tar.gz",
+      "hash": "0h13n1vjw6v8gp41yfc6qffbwwrxw81vcilkmxx9sim6671w5pzp"
     },
     "nvim-metals": {
       "type": "Git",
@@ -1789,9 +1789,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "f22bac988f2dd073601d75ba39ea5636ab6e38cb",
-      "url": "https://github.com/SmiteshP/nvim-navbuddy/archive/f22bac988f2dd073601d75ba39ea5636ab6e38cb.tar.gz",
-      "hash": "034pmg403y0y1fxnb1jv291mr016bx1vn68y543v6v4dpbdlr7di"
+      "revision": "a34786c77a528519f6b8a142db7609f6e387842d",
+      "url": "https://github.com/SmiteshP/nvim-navbuddy/archive/a34786c77a528519f6b8a142db7609f6e387842d.tar.gz",
+      "hash": "0b6bazh531bixskpmmpkidqii4n3m7n2cp9bmzml5wb0wibazcac"
     },
     "nvim-navic": {
       "type": "Git",
@@ -1802,9 +1802,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "39231352aec0d1e09cebbffdd9dc20a5dc691ffe",
-      "url": "https://github.com/SmiteshP/nvim-navic/archive/39231352aec0d1e09cebbffdd9dc20a5dc691ffe.tar.gz",
-      "hash": "1xj2bzax8hynm2x9zbvsaxv1j22chklyygzm1kbqxxs077qn45ws"
+      "revision": "d0a8c17c4dc721b00bc2ac305c6ffbb036beeb74",
+      "url": "https://github.com/SmiteshP/nvim-navic/archive/d0a8c17c4dc721b00bc2ac305c6ffbb036beeb74.tar.gz",
+      "hash": "0mxsnwvrjirpy2ichsilx6207z55xi42syg5d3fdgs2r1p1npggc"
     },
     "nvim-neoclip-lua": {
       "type": "Git",
@@ -1919,9 +1919,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "d4c8bdb06b7a589f004a53bf710196967752c63d",
-      "url": "https://github.com/kevinhwang91/nvim-ufo/archive/d4c8bdb06b7a589f004a53bf710196967752c63d.tar.gz",
-      "hash": "11zcr6vvj6gm5di63w55ccvwf2x7his8v9v8bingsz6l6n79dk6v"
+      "revision": "cac999ec9f6302d2fd4ad8a846bf8f731af6e7cf",
+      "url": "https://github.com/kevinhwang91/nvim-ufo/archive/cac999ec9f6302d2fd4ad8a846bf8f731af6e7cf.tar.gz",
+      "hash": "14lvlv1wmbpw0dpyfz3gq7k760ip1903w5ibajqiaflw06afv4pn"
     },
     "nvim-web-devicons": {
       "type": "Git",
@@ -1932,9 +1932,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "50b5b06bff13a9b4eab946de7c7033649a6618a1",
-      "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/50b5b06bff13a9b4eab946de7c7033649a6618a1.tar.gz",
-      "hash": "1jsrwcsyjwlzk2l3x417pr6s6cq4zk6b6k417hhmrprrw66ajdb6"
+      "revision": "2c2b4eafce6cdd0cb165036faa17396eff18f847",
+      "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/2c2b4eafce6cdd0cb165036faa17396eff18f847.tar.gz",
+      "hash": "11yp02zg60gdmqa6rdk3rjn704k2kvjcs41w85y01b68k36w7pw2"
     },
     "obsidian-nvim": {
       "type": "Git",
@@ -1997,9 +1997,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "27ab1cf9e7ae142f9e9ffb218be50dd920f04cb3",
-      "url": "https://github.com/nvim-orgmode/orgmode/archive/27ab1cf9e7ae142f9e9ffb218be50dd920f04cb3.tar.gz",
-      "hash": "176v9y36258jm8h3aaph57wgr6s7rgmgdnq9hgwialwn4bygfym0"
+      "revision": "15d66ead1285d99f8a21c4ef4874ac62e9320fe6",
+      "url": "https://github.com/nvim-orgmode/orgmode/archive/15d66ead1285d99f8a21c4ef4874ac62e9320fe6.tar.gz",
+      "hash": "05h766qj1vid5rs1mv8aiv6rsfrp0md9605sfr9vycip1rd8csgy"
     },
     "otter-nvim": {
       "type": "Git",
@@ -2127,9 +2127,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "78ffe3b0500bbc7e37fabde723d96661538e8b32",
-      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/78ffe3b0500bbc7e37fabde723d96661538e8b32.tar.gz",
-      "hash": "00dn9cpdvm7dy4xyhaij2rs0g0l926cqvjn03v06sray3adbyij5"
+      "revision": "57c7f33f276876c994898683680da9e3a3590d0d",
+      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/57c7f33f276876c994898683680da9e3a3590d0d.tar.gz",
+      "hash": "1lfypdqyka5idrkr3w62vx7j6p75r3ld7sz5i40y41svglnxyrsj"
     },
     "rose-pine": {
       "type": "Git",
@@ -2140,9 +2140,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "96ff3993a67356ee85d1cdab9be652cdc1c5d1ac",
-      "url": "https://github.com/rose-pine/neovim/archive/96ff3993a67356ee85d1cdab9be652cdc1c5d1ac.tar.gz",
-      "hash": "0p712rivi5i3zlrigm86p8vrn1nvg4qils86snlw717cq3scj9gj"
+      "revision": "614892e32e94378d976a238f287532cfe790c1fe",
+      "url": "https://github.com/rose-pine/neovim/archive/614892e32e94378d976a238f287532cfe790c1fe.tar.gz",
+      "hash": "1pi5z81xkgkx8yyfjfjj0hg66v2zcj04gxxbf5q2lqz70xcs3cgk"
     },
     "rtp-nvim": {
       "type": "Git",
@@ -2179,9 +2179,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "3f2b7a94b7fa3c0f301dfa9644c94b543000efc2",
-      "url": "https://github.com/mrcjkb/rustaceanvim/archive/3f2b7a94b7fa3c0f301dfa9644c94b543000efc2.tar.gz",
-      "hash": "1y3x6m3yglkyv37xgli9k3dlw59yy3jbsp1phx75xqma1480dzy5"
+      "revision": "4b8c2edb55f548ed9c683f88dde2ffb235413b03",
+      "url": "https://github.com/mrcjkb/rustaceanvim/archive/4b8c2edb55f548ed9c683f88dde2ffb235413b03.tar.gz",
+      "hash": "0d3kwvwj5cppwypvg8iasn5f8rviqyskkgh1wafs7chjm32dm4gb"
     },
     "smartcolumn-nvim": {
       "type": "Git",
@@ -2377,9 +2377,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "f985f5a4fbc410c9e5367f6b5863a8fa502e516d",
-      "url": "https://github.com/RRethy/vim-illuminate/archive/f985f5a4fbc410c9e5367f6b5863a8fa502e516d.tar.gz",
-      "hash": "0igx2i4k59vadhw7kgqvxjw9594n8p2n9yqszif9by8xq5gsd7g6"
+      "revision": "fbc16dee336d8cc0d3d2382ea4a53f4a29725abf",
+      "url": "https://github.com/RRethy/vim-illuminate/archive/fbc16dee336d8cc0d3d2382ea4a53f4a29725abf.tar.gz",
+      "hash": "072kgd7h7cjq4hskczxl60nsx3jpww9l7ypafcwk833ypahz899i"
     },
     "vim-markdown": {
       "type": "Git",

From 5278dab32b343762246dd8bfeaa34f4a21887bd8 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 3 May 2025 08:41:27 +0300
Subject: [PATCH 175/202] blink: 1.0.0 -> 1.2.0

---
 flake/legacyPackages/blink-cmp.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake/legacyPackages/blink-cmp.nix b/flake/legacyPackages/blink-cmp.nix
index 435cb290..60dce9de 100644
--- a/flake/legacyPackages/blink-cmp.nix
+++ b/flake/legacyPackages/blink-cmp.nix
@@ -14,7 +14,7 @@
     env.RUSTC_BOOTSTRAP = true;
 
     useFetchCargoVendor = true;
-    cargoHash = "sha256-MWElqh7ENJ6CbLOnvz0DsP5YYu+e+y12GSUOfW1IKGU=";
+    cargoHash = "sha256-IDoDugtNWQovfSstbVMkKHLBXKa06lxRWmywu4zyS3M=";
 
     nativeBuildInputs = [gitMinimal];
   };

From f7c35ab3422b35f3af422f4f896bd79a9ba30ee4 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 3 May 2025 08:51:48 +0300
Subject: [PATCH 176/202] packages: switch to blink-cmp in maximal
 configuration

---
 configuration.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 011d6fae..10d6bbc7 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -23,7 +23,7 @@ isMaximal: {
       lightbulb.enable = true;
       lspsaga.enable = false;
       trouble.enable = true;
-      lspSignature.enable = true;
+      lspSignature.enable = !isMaximal; # conflicts with blink in maximal
       otter-nvim.enable = isMaximal;
       nvim-docs-view.enable = isMaximal;
     };
@@ -124,7 +124,15 @@ isMaximal: {
 
     autopairs.nvim-autopairs.enable = true;
 
-    autocomplete.nvim-cmp.enable = true;
+    # nvf provides various autocomplete options. The tried and tested nvim-cmp
+    # is enabled in default package, because it does not trigger a build. We
+    # enable blink-cmp in maximal because it needs to build its rust fuzzy
+    # matcher library.
+    autocomplete = {
+      nvim-cmp.enable = !isMaximal;
+      blink-cmp.enable = isMaximal;
+    };
+
     snippets.luasnip.enable = true;
 
     filetree = {

From c5b72f124fdba697603f39e5c8168eac5780fc93 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Sat, 3 May 2025 18:32:58 -0400
Subject: [PATCH 177/202] chore: update mnw
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'mnw':
    'github:Gerg-L/mnw/2a1678ba8e4807bd855dd0da94ea2bef5bca733d?narHash=sha256-X32sM3RQ3X2y6PzfNnX3rhUAlhuITdDOdfSrwZXjlsQ%3D' (2025-05-03)
  → 'github:Gerg-L/mnw/7b85a1922b0c5d78c03c4e53c82330715d1bf22b?narHash=sha256-g1XBeVvnM6P0QVxbjCEXyNl0aGd3YSf/hsVagUHB3qw%3D' (2025-05-03)
---
 flake.lock                       |  6 +++---
 modules/wrapper/build/config.nix | 13 +++++--------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 307d3d7a..65cee2ae 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1746230955,
-        "narHash": "sha256-X32sM3RQ3X2y6PzfNnX3rhUAlhuITdDOdfSrwZXjlsQ=",
+        "lastModified": 1746338991,
+        "narHash": "sha256-GbyoHjf14LOxZQc+0NFblI4xf/uwGrYo3W8lwE4HcwI=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "2a1678ba8e4807bd855dd0da94ea2bef5bca733d",
+        "rev": "c65407ee9387ef75985dad3e30f58c822c766ec1",
         "type": "github"
       },
       "original": {
diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix
index 3b147571..61ba1513 100644
--- a/modules/wrapper/build/config.nix
+++ b/modules/wrapper/build/config.nix
@@ -62,17 +62,14 @@
       filter (f: f != null) plugins
     );
 
-  # built (or "normalized") plugins that are modified
-  builtStartPlugins = buildConfigPlugins config.vim.startPlugins;
-  builtOptPlugins = map (package: package // {optional = true;}) (
-    buildConfigPlugins config.vim.optPlugins
-  );
-
   # Wrap the user's desired (unwrapped) Neovim package with arguments that'll be used to
   # generate a wrapped Neovim package.
-  neovim-wrapped = inputs.mnw.lib.wrap pkgs {
+  neovim-wrapped = inputs.mnw.lib.wrap {inherit pkgs;} {
     neovim = config.vim.package;
-    plugins = builtStartPlugins ++ builtOptPlugins;
+    plugins = {
+      start = buildConfigPlugins config.vim.startPlugins;
+      opt = buildConfigPlugins config.vim.optPlugins;
+    };
     appName = "nvf";
     extraBinPath = config.vim.extraPackages;
     initLua = config.vim.builtLuaConfigRC;

From 140cfea20505136b6306ddde31802842501da0d6 Mon Sep 17 00:00:00 2001
From: Noah765 <noland62007@gmail.com>
Date: Sun, 4 May 2025 15:00:21 +0200
Subject: [PATCH 178/202] ui/breadcrumbs: add missing navbuddy mappings

---
 modules/plugins/ui/breadcrumbs/breadcrumbs.nix | 18 ++++++++++++++++++
 modules/plugins/ui/breadcrumbs/config.nix      |  5 +++++
 2 files changed, 23 insertions(+)

diff --git a/modules/plugins/ui/breadcrumbs/breadcrumbs.nix b/modules/plugins/ui/breadcrumbs/breadcrumbs.nix
index 2faee6c8..716883aa 100644
--- a/modules/plugins/ui/breadcrumbs/breadcrumbs.nix
+++ b/modules/plugins/ui/breadcrumbs/breadcrumbs.nix
@@ -215,6 +215,24 @@ in {
           description = "move focused node up";
         };
 
+        togglePreview = mkOption {
+          type = str;
+          default = "s";
+          description = "show preview of current node";
+        };
+
+        vsplit = mkOption {
+          type = str;
+          default = "<C-v>";
+          description = "open selected node in a vertical split";
+        };
+
+        hsplit = mkOption {
+          type = str;
+          default = "<C-s>";
+          description = "open selected node in a horizontal split";
+        };
+
         telescope = mkOption {
           type = str;
           default = "t";
diff --git a/modules/plugins/ui/breadcrumbs/config.nix b/modules/plugins/ui/breadcrumbs/config.nix
index 747a7773..324501a5 100644
--- a/modules/plugins/ui/breadcrumbs/config.nix
+++ b/modules/plugins/ui/breadcrumbs/config.nix
@@ -64,6 +64,11 @@ in {
         ${cfg.navbuddy.mappings.moveDown} = mkLuaInline "actions.move_down()";
         ${cfg.navbuddy.mappings.moveUp} = mkLuaInline "actions.move_up()";
 
+        ${cfg.navbuddy.mappings.togglePreview} = mkLuaInline "actions.toggle_preview()";
+
+        ${cfg.navbuddy.mappings.vsplit} = mkLuaInline "actions.vsplit()";
+        ${cfg.navbuddy.mappings.hsplit} = mkLuaInline "actions.hsplit()";
+
         ${cfg.navbuddy.mappings.telescope} = mkLuaInline ''
           actions.telescope({
             layout_strategy = "horizontal",

From d783fa0b27886e833dbcdf9eb734bb76b97ec70b Mon Sep 17 00:00:00 2001
From: Noah765 <noland62007@gmail.com>
Date: Sun, 4 May 2025 15:29:27 +0200
Subject: [PATCH 179/202] ui/breadcrumbs: remove unused attribute

---
 modules/plugins/ui/breadcrumbs/breadcrumbs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/ui/breadcrumbs/breadcrumbs.nix b/modules/plugins/ui/breadcrumbs/breadcrumbs.nix
index 716883aa..0d5a3162 100644
--- a/modules/plugins/ui/breadcrumbs/breadcrumbs.nix
+++ b/modules/plugins/ui/breadcrumbs/breadcrumbs.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) nullOr listOf enum bool str int either;
+  inherit (lib.types) nullOr listOf enum bool str int;
   inherit (lib.modules) mkRenamedOptionModule;
   inherit (lib.nvim.types) mkPluginSetupOption borderType;
   mkSimpleIconOption = default:

From c2380761d1e230278c5f7bb34586e52dc22f263d Mon Sep 17 00:00:00 2001
From: Noah765 <noland62007@gmail.com>
Date: Sun, 4 May 2025 15:30:17 +0200
Subject: [PATCH 180/202] ui/breadcrumbs: clean up the option descriptions

---
 .../plugins/ui/breadcrumbs/breadcrumbs.nix    | 82 +++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/modules/plugins/ui/breadcrumbs/breadcrumbs.nix b/modules/plugins/ui/breadcrumbs/breadcrumbs.nix
index 0d5a3162..72351ecc 100644
--- a/modules/plugins/ui/breadcrumbs/breadcrumbs.nix
+++ b/modules/plugins/ui/breadcrumbs/breadcrumbs.nix
@@ -74,7 +74,7 @@ in {
           ::: {.note}
           This will pass `draw_empty` to the `nvim_navic` winbar
           component, which causes the component to be drawn even
-          if it's empty
+          if it's empty.
           :::
         '';
       };
@@ -86,163 +86,163 @@ in {
         close = mkOption {
           type = str;
           default = "<esc>";
-          description = "keybinding to close Navbuddy UI";
+          description = "Close and return the cursor to its original location.";
         };
 
         nextSibling = mkOption {
           type = str;
           default = "j";
-          description = "keybinding to navigate to the next sibling node";
+          description = "Navigate to the next sibling node.";
         };
 
         previousSibling = mkOption {
           type = str;
           default = "k";
-          description = "keybinding to navigate to the previous sibling node";
+          description = "Navigate to the previous sibling node.";
         };
 
         parent = mkOption {
           type = str;
           default = "h";
-          description = "keybinding to navigate to the parent node";
+          description = "Navigate to the parent node.";
         };
 
         children = mkOption {
           type = str;
           default = "l";
-          description = "keybinding to navigate to the child node";
+          description = "Navigate to the child node.";
         };
 
         root = mkOption {
           type = str;
           default = "0";
-          description = "keybinding to navigate to the root node";
+          description = "Navigate to the root node.";
         };
 
         visualName = mkOption {
           type = str;
           default = "v";
-          description = "visual selection of name";
+          description = "Select the name visually.";
         };
 
         visualScope = mkOption {
           type = str;
           default = "V";
-          description = "visual selection of scope";
+          description = "Select the scope visually.";
         };
 
         yankName = mkOption {
           type = str;
           default = "y";
-          description = "yank the name to system clipboard";
+          description = "Yank the name to system clipboard.";
         };
 
         yankScope = mkOption {
           type = str;
           default = "Y";
-          description = "yank the scope to system clipboard";
+          description = "Yank the scope to system clipboard.";
         };
 
         insertName = mkOption {
           type = str;
           default = "i";
-          description = "insert at start of name";
+          description = "Insert at the start of name.";
         };
 
         insertScope = mkOption {
           type = str;
           default = "I";
-          description = "insert at start of scope";
+          description = "Insert at the start of scope.";
         };
 
         appendName = mkOption {
           type = str;
           default = "a";
-          description = "insert at end of name";
+          description = "Insert at the end of name.";
         };
 
         appendScope = mkOption {
           type = str;
           default = "A";
-          description = "insert at end of scope";
+          description = "Insert at the end of scope.";
         };
 
         rename = mkOption {
           type = str;
           default = "r";
-          description = "rename the node";
+          description = "Rename the node.";
         };
 
         delete = mkOption {
           type = str;
           default = "d";
-          description = "delete the node";
+          description = "Delete the node.";
         };
 
         foldCreate = mkOption {
           type = str;
           default = "f";
-          description = "create a new fold";
+          description = "Create a new fold of the node.";
         };
 
         foldDelete = mkOption {
           type = str;
           default = "F";
-          description = "delete the current fold";
+          description = "Delete the current fold of the node.";
         };
 
         comment = mkOption {
           type = str;
           default = "c";
-          description = "comment the node";
+          description = "Comment the node.";
         };
 
         select = mkOption {
           type = str;
           default = "<enter>";
-          description = "goto selected symbol";
+          description = "Goto the node.";
         };
 
         moveDown = mkOption {
           type = str;
           default = "J";
-          description = "move focused node down";
+          description = "Move the node down.";
         };
 
         moveUp = mkOption {
           type = str;
           default = "K";
-          description = "move focused node up";
+          description = "Move the node up.";
         };
 
         togglePreview = mkOption {
           type = str;
           default = "s";
-          description = "show preview of current node";
+          description = "Toggle the preview.";
         };
 
         vsplit = mkOption {
           type = str;
           default = "<C-v>";
-          description = "open selected node in a vertical split";
+          description = "Open the node in a vertical split.";
         };
 
         hsplit = mkOption {
           type = str;
           default = "<C-s>";
-          description = "open selected node in a horizontal split";
+          description = "Open the node in a horizontal split.";
         };
 
         telescope = mkOption {
           type = str;
           default = "t";
-          description = "fuzzy finder at current level";
+          description = "Start fuzzy finder at the current level.";
         };
 
         help = mkOption {
           type = str;
           default = "g?";
-          description = "open mapping help window";
+          description = "Open the mappings help window.";
         };
       };
 
@@ -250,7 +250,7 @@ in {
         useDefaultMappings = mkOption {
           type = bool;
           default = true;
-          description = "use default Navbuddy keybindings (disables user-specified keybinds)";
+          description = "Add the default Navbuddy keybindings in addition to the keybinding added by this module.";
         };
 
         window = {
@@ -260,13 +260,13 @@ in {
           border = mkOption {
             type = borderType;
             default = config.vim.ui.borders.globalStyle;
-            description = "border style to use";
+            description = "The border style to use.";
           };
 
           scrolloff = mkOption {
             type = nullOr int;
             default = null;
-            description = "Scrolloff value within navbuddy window";
+            description = "The scrolloff value within a navbuddy window.";
           };
 
           sections = {
@@ -283,7 +283,7 @@ in {
               border = mkOption {
                 type = borderType;
                 default = config.vim.ui.borders.globalStyle;
-                description = "border style to use for the left section of Navbuddy UI";
+                description = "The border style to use for the left section of the Navbuddy UI.";
               };
             };
 
@@ -300,7 +300,7 @@ in {
               border = mkOption {
                 type = borderType;
                 default = config.vim.ui.borders.globalStyle;
-                description = "border style to use for the middle section of Navbuddy UI";
+                description = "The border style to use for the middle section of the Navbuddy UI.";
               };
             };
 
@@ -310,13 +310,13 @@ in {
               border = mkOption {
                 type = borderType;
                 default = config.vim.ui.borders.globalStyle;
-                description = "border style to use for the right section of Navbuddy UI";
+                description = "The border style to use for the right section of the Navbuddy UI.";
               };
 
               preview = mkOption {
                 type = enum ["leaf" "always" "never"];
                 default = "leaf";
-                description = "display mode of the preview on the right section";
+                description = "The display mode of the preview on the right section.";
               };
             };
           };
@@ -335,13 +335,13 @@ in {
           auto_attach = mkOption {
             type = bool;
             default = true;
-            description = "Whether to attach to LSP server manually";
+            description = "Whether to attach to LSP server manually.";
           };
 
           preference = mkOption {
             type = nullOr (listOf str);
             default = null;
-            description = "list of lsp server names in order of preference";
+            description = "The preference list ranking LSP servers.";
           };
         };
 
@@ -349,25 +349,25 @@ in {
           followNode = mkOption {
             type = bool;
             default = true;
-            description = "keep the current node in focus on the source buffer";
+            description = "Whether to keep the current node in focus in the source buffer.";
           };
 
           highlight = mkOption {
             type = bool;
             default = true;
-            description = "highlight the currently focused node";
+            description = "Whether to highlight the currently focused node in the source buffer.";
           };
 
           reorient = mkOption {
             type = enum ["smart" "top" "mid" "none"];
             default = "smart";
-            description = "reorient buffer after changing nodes";
+            description = "The mode for reorienting the source buffer after moving nodes.";
           };
 
           scrolloff = mkOption {
             type = nullOr int;
             default = null;
-            description = "scrolloff value when navbuddy is open";
+            description = "The scrolloff value in the source buffer when Navbuddy is open.";
           };
         };
 

From 1ed6fd9f58f4df669edc55284becd1a90e1b3a47 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 4 May 2025 17:58:22 +0300
Subject: [PATCH 181/202] languages: deprecate `vim.languages.enableLSP`

This change is done in favor of our intentions to use the new API Neovim has exposed, and the one we are exposing to match theirs.
---
 configuration.nix                       |  7 ++-
 flake/templates/standalone/flake.nix    | 12 ++++-
 modules/neovim/init/lsp.nix             | 65 +++++++++++++++----------
 modules/plugins/languages/asm.nix       |  2 +-
 modules/plugins/languages/astro.nix     |  2 +-
 modules/plugins/languages/bash.nix      |  2 +-
 modules/plugins/languages/clang.nix     |  2 +-
 modules/plugins/languages/csharp.nix    |  2 +-
 modules/plugins/languages/css.nix       |  2 +-
 modules/plugins/languages/cue.nix       |  2 +-
 modules/plugins/languages/dart.nix      |  2 +-
 modules/plugins/languages/default.nix   | 14 ++----
 modules/plugins/languages/elixir.nix    |  2 +-
 modules/plugins/languages/fsharp.nix    |  2 +-
 modules/plugins/languages/gleam.nix     |  2 +-
 modules/plugins/languages/go.nix        |  2 +-
 modules/plugins/languages/haskell.nix   |  2 +-
 modules/plugins/languages/hcl.nix       |  2 +-
 modules/plugins/languages/helm.nix      |  2 +-
 modules/plugins/languages/java.nix      |  2 +-
 modules/plugins/languages/julia.nix     |  2 +-
 modules/plugins/languages/kotlin.nix    |  2 +-
 modules/plugins/languages/lua.nix       |  2 +-
 modules/plugins/languages/markdown.nix  |  2 +-
 modules/plugins/languages/nim.nix       |  2 +-
 modules/plugins/languages/nix.nix       |  2 +-
 modules/plugins/languages/nu.nix        |  2 +-
 modules/plugins/languages/ocaml.nix     |  2 +-
 modules/plugins/languages/odin.nix      |  2 +-
 modules/plugins/languages/php.nix       |  2 +-
 modules/plugins/languages/python.nix    |  2 +-
 modules/plugins/languages/r.nix         |  2 +-
 modules/plugins/languages/ruby.nix      |  2 +-
 modules/plugins/languages/rust.nix      |  2 +-
 modules/plugins/languages/scala.nix     |  2 +-
 modules/plugins/languages/sql.nix       |  2 +-
 modules/plugins/languages/svelte.nix    |  2 +-
 modules/plugins/languages/tailwind.nix  |  2 +-
 modules/plugins/languages/terraform.nix |  2 +-
 modules/plugins/languages/ts.nix        |  2 +-
 modules/plugins/languages/typst.nix     |  2 +-
 modules/plugins/languages/vala.nix      |  2 +-
 modules/plugins/languages/wgsl.nix      |  2 +-
 modules/plugins/languages/yaml.nix      |  2 +-
 modules/plugins/languages/zig.nix       |  2 +-
 modules/plugins/lsp/module.nix          |  3 +-
 46 files changed, 102 insertions(+), 81 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 6629810d..6e3175ef 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -18,6 +18,10 @@ isMaximal: {
     };
 
     lsp = {
+      # This must be enabled for the language modules to hook into
+      # the LSP API.
+      enable = true;
+
       formatOnSave = true;
       lspkind.enable = false;
       lightbulb.enable = true;
@@ -38,8 +42,7 @@ isMaximal: {
     # This section does not include a comprehensive list of available language modules.
     # To list all available language module options, please visit the nvf manual.
     languages = {
-      enableLSP = true;
-      enableFormat = true;
+      enableFormat = true; #
       enableTreesitter = true;
       enableExtraDiagnostics = true;
 
diff --git a/flake/templates/standalone/flake.nix b/flake/templates/standalone/flake.nix
index 79617260..1057a6d5 100644
--- a/flake/templates/standalone/flake.nix
+++ b/flake/templates/standalone/flake.nix
@@ -26,12 +26,22 @@
         config.vim = {
           theme.enable = true;
 
+          lsp = {
+            # Enable LSP functionality globally. This is required for modules found
+            # in `vim.languages` to enable relevant LSPs.
+            enable = true;
+
+            # You may define your own LSP configurations using `vim.lsp.servers` in
+            # nvf without ever needing lspconfig to do it. This will use the native
+            # API provided by Neovim > 0.11
+            servers = {};
+          };
+
           # Language support and automatic configuration of companion plugins.
           # Note that enabling, e.g., languages.<lang>.diagnostics will automatically
           # enable top-level options such as enableLSP or enableExtraDiagnostics as
           # they are needed.
           languages = {
-            enableLSP = true;
             enableFormat = true;
             enableTreesitter = true;
             enableExtraDiagnostics = true;
diff --git a/modules/neovim/init/lsp.nix b/modules/neovim/init/lsp.nix
index faef0f93..b89c3fde 100644
--- a/modules/neovim/init/lsp.nix
+++ b/modules/neovim/init/lsp.nix
@@ -5,7 +5,7 @@
 }: let
   inherit (builtins) filter;
   inherit (lib.modules) mkIf mkMerge mkDefault;
-  inherit (lib.options) mkOption;
+  inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.types) attrsOf;
   inherit (lib.strings) concatLines;
   inherit (lib.attrsets) mapAttrsToList attrNames filterAttrs;
@@ -27,37 +27,48 @@
   enabledServers = filterAttrs (_: u: u.enable) cfg.servers;
 in {
   options = {
-    vim.lsp.servers = mkOption {
-      type = attrsOf lspOptions;
-      default = {};
-      example = ''
-        {
-          "*" = {
-            root_markers = [".git"];
-            capabilities = {
-              textDocument = {
-                semanticTokens = {
-                  multilineTokenSupport = true;
+    vim.lsp = {
+      enable = mkEnableOption ''
+        global LSP functionality for Neovim.
+
+        This option controls whether to enable LSP functionality within modules under
+        {option}`vim.languages`. You do not need to set this to `true` for language
+        servers defined in {option}`vim.lsp.servers` to take effect, since they are
+        enabled automatically.
+      '';
+
+      servers = mkOption {
+        type = attrsOf lspOptions;
+        default = {};
+        example = ''
+          {
+            "*" = {
+              root_markers = [".git"];
+              capabilities = {
+                textDocument = {
+                  semanticTokens = {
+                    multilineTokenSupport = true;
+                  };
                 };
               };
             };
-          };
 
-          "clangd" = {
-            filetypes = ["c"];
-          };
-        }
-      '';
-      description = ''
-        LSP configurations that will be managed using `vim.lsp.config()` and
-        related utilities added in Neovim 0.11. LSPs defined here will be
-        added to the resulting {file}`init.lua` using `vim.lsp.config` and
-        enabled through `vim.lsp.enable` below the configuration table.
+            "clangd" = {
+              filetypes = ["c"];
+            };
+          }
+        '';
+        description = ''
+          LSP configurations that will be managed using `vim.lsp.config()` and related
+          utilities added in Neovim 0.11. LSPs defined here will be added to the
+          resulting {file}`init.lua` using `vim.lsp.config` and enabled through
+          `vim.lsp.enable()` API from Neovim below the configuration table.
 
-        You may review the generated configuration by running {command}`nvf-print-config`
-        in a shell. Please see {command}`:help lsp-config` for more details
-        on the underlying API.
-      '';
+          You may review the generated configuration by running {command}`nvf-print-config`
+          in a shell. Please see {command}`:help lsp-config` for more details
+          on the underlying API.
+        '';
+      };
     };
   };
 
diff --git a/modules/plugins/languages/asm.nix b/modules/plugins/languages/asm.nix
index a0e96cef..9fe58a76 100644
--- a/modules/plugins/languages/asm.nix
+++ b/modules/plugins/languages/asm.nix
@@ -20,7 +20,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Assembly LSP support (asm-lsp)" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Assembly LSP support (asm-lsp)" // {default = config.vim.lsp.enable;};
 
       package = mkOption {
         type = package;
diff --git a/modules/plugins/languages/astro.nix b/modules/plugins/languages/astro.nix
index 2ecbbe47..b7a69bda 100644
--- a/modules/plugins/languages/astro.nix
+++ b/modules/plugins/languages/astro.nix
@@ -81,7 +81,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Astro LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Astro LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         type = enum (attrNames servers);
diff --git a/modules/plugins/languages/bash.nix b/modules/plugins/languages/bash.nix
index bfe01032..e02596cf 100644
--- a/modules/plugins/languages/bash.nix
+++ b/modules/plugins/languages/bash.nix
@@ -56,7 +56,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Enable Bash LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Enable Bash LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         description = "Bash LSP server to use";
diff --git a/modules/plugins/languages/clang.nix b/modules/plugins/languages/clang.nix
index bb30cc95..2db178e9 100644
--- a/modules/plugins/languages/clang.nix
+++ b/modules/plugins/languages/clang.nix
@@ -98,7 +98,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "clang LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "clang LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         description = "The clang LSP server to use";
diff --git a/modules/plugins/languages/csharp.nix b/modules/plugins/languages/csharp.nix
index af7f36e0..49ae4985 100644
--- a/modules/plugins/languages/csharp.nix
+++ b/modules/plugins/languages/csharp.nix
@@ -91,7 +91,7 @@ in {
       };
 
       lsp = {
-        enable = mkEnableOption "C# LSP support" // {default = config.vim.languages.enableLSP;};
+        enable = mkEnableOption "C# LSP support" // {default = config.vim.lsp.enable;};
         server = mkOption {
           description = "C# LSP server to use";
           type = enum (attrNames servers);
diff --git a/modules/plugins/languages/css.nix b/modules/plugins/languages/css.nix
index d103f241..0147fba3 100644
--- a/modules/plugins/languages/css.nix
+++ b/modules/plugins/languages/css.nix
@@ -80,7 +80,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "CSS LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "CSS LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         description = "CSS LSP server to use";
diff --git a/modules/plugins/languages/cue.nix b/modules/plugins/languages/cue.nix
index 313e3233..bd446cbf 100644
--- a/modules/plugins/languages/cue.nix
+++ b/modules/plugins/languages/cue.nix
@@ -21,7 +21,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "CUE LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "CUE LSP support" // {default = config.vim.lsp.enable;};
 
       package = mkOption {
         type = package;
diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix
index 7b9584b9..9cbd0783 100644
--- a/modules/plugins/languages/dart.nix
+++ b/modules/plugins/languages/dart.nix
@@ -77,7 +77,7 @@ in {
     flutter-tools = {
       enable = mkOption {
         type = bool;
-        default = config.vim.languages.enableLSP;
+        default = config.vim.lsp.enable;
         description = "Enable flutter-tools for flutter support";
       };
 
diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix
index b889e60a..25b99080 100644
--- a/modules/plugins/languages/default.nix
+++ b/modules/plugins/languages/default.nix
@@ -1,8 +1,5 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
+  inherit (lib.modules) mkRenamedOptionModule;
   inherit (lib.nvim.languages) mkEnable;
 in {
   imports = [
@@ -48,13 +45,12 @@ in {
     ./wgsl.nix
     ./yaml.nix
     ./ruby.nix
+
+    # This is now a hard deprecation.
+    (mkRenamedOptionModule ["vim" "languages" "enableLSP"] ["vim" "lsp" "enable"])
   ];
 
   options.vim.languages = {
-    # LSPs are now built into Neovim, and we should enable them by default
-    # if `vim.lsp.enable` is true.
-    enableLSP = mkEnable "LSP" // {default = config.vim.lsp.enable;};
-
     # Those are still managed by plugins, and should be enabled here.
     enableDAP = mkEnable "Debug Adapter";
     enableTreesitter = mkEnable "Treesitter";
diff --git a/modules/plugins/languages/elixir.nix b/modules/plugins/languages/elixir.nix
index 7b3a0256..241efd8e 100644
--- a/modules/plugins/languages/elixir.nix
+++ b/modules/plugins/languages/elixir.nix
@@ -53,7 +53,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Elixir LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Elixir LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         description = "Elixir LSP server to use";
diff --git a/modules/plugins/languages/fsharp.nix b/modules/plugins/languages/fsharp.nix
index 966b0349..6ed0ccab 100644
--- a/modules/plugins/languages/fsharp.nix
+++ b/modules/plugins/languages/fsharp.nix
@@ -51,7 +51,7 @@ in {
       };
 
       lsp = {
-        enable = mkEnableOption "F# LSP support" // {default = config.vim.languages.enableLSP;};
+        enable = mkEnableOption "F# LSP support" // {default = config.vim.lsp.enable;};
         server = mkOption {
           type = enum (attrNames servers);
           default = defaultServer;
diff --git a/modules/plugins/languages/gleam.nix b/modules/plugins/languages/gleam.nix
index 284d3443..272ef51e 100644
--- a/modules/plugins/languages/gleam.nix
+++ b/modules/plugins/languages/gleam.nix
@@ -41,7 +41,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Gleam LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Gleam LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         type = enum (attrNames servers);
diff --git a/modules/plugins/languages/go.nix b/modules/plugins/languages/go.nix
index 3f232669..bab0ff4a 100644
--- a/modules/plugins/languages/go.nix
+++ b/modules/plugins/languages/go.nix
@@ -67,7 +67,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Go LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Go LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         description = "Go LSP server to use";
diff --git a/modules/plugins/languages/haskell.nix b/modules/plugins/languages/haskell.nix
index ff6c7d78..f50c9f09 100644
--- a/modules/plugins/languages/haskell.nix
+++ b/modules/plugins/languages/haskell.nix
@@ -25,7 +25,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "LSP support for Haskell" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "LSP support for Haskell" // {default = config.vim.lsp.enable;};
       package = mkOption {
         description = "Haskell LSP package or command to run the Haskell LSP";
         example = ''[ (lib.getExe pkgs.haskellPackages.haskell-language-server) "--debug" ]'';
diff --git a/modules/plugins/languages/hcl.nix b/modules/plugins/languages/hcl.nix
index 3a3db782..e702170c 100644
--- a/modules/plugins/languages/hcl.nix
+++ b/modules/plugins/languages/hcl.nix
@@ -43,7 +43,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "HCL LSP support (terraform-ls)" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "HCL LSP support (terraform-ls)" // {default = config.vim.lsp.enable;};
       # TODO: (maybe, is it better?) it would be cooler to use vscode-extensions.hashicorp.hcl probably, shouldn't be too hard
       package = mkOption {
         type = package;
diff --git a/modules/plugins/languages/helm.nix b/modules/plugins/languages/helm.nix
index d3fd636e..ffe115c9 100644
--- a/modules/plugins/languages/helm.nix
+++ b/modules/plugins/languages/helm.nix
@@ -54,7 +54,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Helm LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Helm LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         description = "Helm LSP server to use";
diff --git a/modules/plugins/languages/java.nix b/modules/plugins/languages/java.nix
index dc46fcfe..2e26feea 100644
--- a/modules/plugins/languages/java.nix
+++ b/modules/plugins/languages/java.nix
@@ -23,7 +23,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Java LSP support (java-language-server)" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Java LSP support (java-language-server)" // {default = config.vim.lsp.enable;};
       package = mkOption {
         description = "java language server package, or the command to run as a list of strings";
         example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
diff --git a/modules/plugins/languages/julia.nix b/modules/plugins/languages/julia.nix
index aa537df9..8c48b070 100644
--- a/modules/plugins/languages/julia.nix
+++ b/modules/plugins/languages/julia.nix
@@ -78,7 +78,7 @@ in {
       lsp = {
         enable = mkOption {
           type = bool;
-          default = config.vim.languages.enableLSP;
+          default = config.vim.lsp.enable;
           description = ''
             Whether to enable Julia LSP support.
 
diff --git a/modules/plugins/languages/kotlin.nix b/modules/plugins/languages/kotlin.nix
index 2ddc63e9..1118afdf 100644
--- a/modules/plugins/languages/kotlin.nix
+++ b/modules/plugins/languages/kotlin.nix
@@ -30,7 +30,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Kotlin LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Kotlin LSP support" // {default = config.vim.lsp.enable;};
 
       package = mkOption {
         description = "kotlin_language_server package with Kotlin runtime";
diff --git a/modules/plugins/languages/lua.nix b/modules/plugins/languages/lua.nix
index d5be4905..9f56cbea 100644
--- a/modules/plugins/languages/lua.nix
+++ b/modules/plugins/languages/lua.nix
@@ -43,7 +43,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Lua LSP support via LuaLS" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Lua LSP support via LuaLS" // {default = config.vim.lsp.enable;};
 
       package = mkOption {
         description = "LuaLS package, or the command to run as a list of strings";
diff --git a/modules/plugins/languages/markdown.nix b/modules/plugins/languages/markdown.nix
index 4563bc44..eeb80e8d 100644
--- a/modules/plugins/languages/markdown.nix
+++ b/modules/plugins/languages/markdown.nix
@@ -67,7 +67,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Enable Markdown LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Enable Markdown LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         type = enum (attrNames servers);
diff --git a/modules/plugins/languages/nim.nix b/modules/plugins/languages/nim.nix
index 69288223..d9a29e37 100644
--- a/modules/plugins/languages/nim.nix
+++ b/modules/plugins/languages/nim.nix
@@ -54,7 +54,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Nim LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Nim LSP support" // {default = config.vim.lsp.enable;};
       server = mkOption {
         description = "Nim LSP server to use";
         type = str;
diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix
index ad16a34e..83022adf 100644
--- a/modules/plugins/languages/nix.nix
+++ b/modules/plugins/languages/nix.nix
@@ -143,7 +143,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Nix LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Nix LSP support" // {default = config.vim.lsp.enable;};
       server = mkOption {
         description = "Nix LSP server to use";
         type = enum (attrNames servers);
diff --git a/modules/plugins/languages/nu.nix b/modules/plugins/languages/nu.nix
index eab0385c..bd007fc8 100644
--- a/modules/plugins/languages/nu.nix
+++ b/modules/plugins/languages/nu.nix
@@ -40,7 +40,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Nu LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Nu LSP support" // {default = config.vim.lsp.enable;};
       server = mkOption {
         type = str;
         default = defaultServer;
diff --git a/modules/plugins/languages/ocaml.nix b/modules/plugins/languages/ocaml.nix
index 568b846e..995ca04d 100644
--- a/modules/plugins/languages/ocaml.nix
+++ b/modules/plugins/languages/ocaml.nix
@@ -49,7 +49,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "OCaml LSP support (ocaml-lsp)" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "OCaml LSP support (ocaml-lsp)" // {default = config.vim.lsp.enable;};
       server = mkOption {
         description = "OCaml LSP server to user";
         type = enum (attrNames servers);
diff --git a/modules/plugins/languages/odin.nix b/modules/plugins/languages/odin.nix
index 7a32db93..6d20351c 100644
--- a/modules/plugins/languages/odin.nix
+++ b/modules/plugins/languages/odin.nix
@@ -41,7 +41,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Odin LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Odin LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         type = enum (attrNames servers);
diff --git a/modules/plugins/languages/php.nix b/modules/plugins/languages/php.nix
index 4dccc8cd..61ff0425 100644
--- a/modules/plugins/languages/php.nix
+++ b/modules/plugins/languages/php.nix
@@ -95,7 +95,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "PHP LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "PHP LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         description = "PHP LSP server to use";
diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix
index 9905716e..bec7ec8b 100644
--- a/modules/plugins/languages/python.nix
+++ b/modules/plugins/languages/python.nix
@@ -169,7 +169,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Python LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Python LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         description = "Python LSP server to use";
diff --git a/modules/plugins/languages/r.nix b/modules/plugins/languages/r.nix
index fcadcc37..894c63f6 100644
--- a/modules/plugins/languages/r.nix
+++ b/modules/plugins/languages/r.nix
@@ -79,7 +79,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "R LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "R LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         description = "R LSP server to use";
diff --git a/modules/plugins/languages/ruby.nix b/modules/plugins/languages/ruby.nix
index 2f42aa4f..ab0e0905 100644
--- a/modules/plugins/languages/ruby.nix
+++ b/modules/plugins/languages/ruby.nix
@@ -57,7 +57,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Ruby LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Ruby LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         type = enum (attrNames servers);
diff --git a/modules/plugins/languages/rust.nix b/modules/plugins/languages/rust.nix
index 2181623a..677f7d3b 100644
--- a/modules/plugins/languages/rust.nix
+++ b/modules/plugins/languages/rust.nix
@@ -43,7 +43,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Rust LSP support (rust-analyzer with extra tools)" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Rust LSP support (rust-analyzer with extra tools)" // {default = config.vim.lsp.enable;};
       package = mkOption {
         description = "rust-analyzer package, or the command to run as a list of strings";
         example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
diff --git a/modules/plugins/languages/scala.nix b/modules/plugins/languages/scala.nix
index f769d092..b5382415 100644
--- a/modules/plugins/languages/scala.nix
+++ b/modules/plugins/languages/scala.nix
@@ -33,7 +33,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Scala LSP support (metals)" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Scala LSP support (metals)" // {default = config.vim.lsp.enable;};
       package = mkPackageOption pkgs "metals" {
         default = ["metals"];
       };
diff --git a/modules/plugins/languages/sql.nix b/modules/plugins/languages/sql.nix
index 277dbeef..add46c15 100644
--- a/modules/plugins/languages/sql.nix
+++ b/modules/plugins/languages/sql.nix
@@ -79,7 +79,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "SQL LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "SQL LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         description = "SQL LSP server to use";
diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix
index 536ff2c1..08a807c7 100644
--- a/modules/plugins/languages/svelte.nix
+++ b/modules/plugins/languages/svelte.nix
@@ -77,7 +77,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Svelte LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Svelte LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         description = "Svelte LSP server to use";
diff --git a/modules/plugins/languages/tailwind.nix b/modules/plugins/languages/tailwind.nix
index 594f6d9d..fbe707ba 100644
--- a/modules/plugins/languages/tailwind.nix
+++ b/modules/plugins/languages/tailwind.nix
@@ -35,7 +35,7 @@ in {
     enable = mkEnableOption "Tailwindcss language support";
 
     lsp = {
-      enable = mkEnableOption "Tailwindcss LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Tailwindcss LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         description = "Tailwindcss LSP server to use";
diff --git a/modules/plugins/languages/terraform.nix b/modules/plugins/languages/terraform.nix
index 33bb9357..095da072 100644
--- a/modules/plugins/languages/terraform.nix
+++ b/modules/plugins/languages/terraform.nix
@@ -20,7 +20,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Terraform LSP support (terraform-ls)" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Terraform LSP support (terraform-ls)" // {default = config.vim.lsp.enable;};
 
       package = mkOption {
         description = "terraform-ls package";
diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix
index df1353ab..5a1e5889 100644
--- a/modules/plugins/languages/ts.nix
+++ b/modules/plugins/languages/ts.nix
@@ -120,7 +120,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Typescript/Javascript LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Typescript/Javascript LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         description = "Typescript/Javascript LSP server to use";
diff --git a/modules/plugins/languages/typst.nix b/modules/plugins/languages/typst.nix
index 8c65ae2c..08a2252b 100644
--- a/modules/plugins/languages/typst.nix
+++ b/modules/plugins/languages/typst.nix
@@ -76,7 +76,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Typst LSP support (typst-lsp)" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Typst LSP support (typst-lsp)" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         description = "Typst LSP server to use";
diff --git a/modules/plugins/languages/vala.nix b/modules/plugins/languages/vala.nix
index da65a372..220926d0 100644
--- a/modules/plugins/languages/vala.nix
+++ b/modules/plugins/languages/vala.nix
@@ -50,7 +50,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Vala LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Vala LSP support" // {default = config.vim.lsp.enable;};
       server = mkOption {
         description = "Vala LSP server to use";
         type = enum (attrNames servers);
diff --git a/modules/plugins/languages/wgsl.nix b/modules/plugins/languages/wgsl.nix
index 7c8a1016..f374543e 100644
--- a/modules/plugins/languages/wgsl.nix
+++ b/modules/plugins/languages/wgsl.nix
@@ -42,7 +42,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "WGSL LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "WGSL LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         type = enum (attrNames servers);
diff --git a/modules/plugins/languages/yaml.nix b/modules/plugins/languages/yaml.nix
index c84b17cd..7a1a4552 100644
--- a/modules/plugins/languages/yaml.nix
+++ b/modules/plugins/languages/yaml.nix
@@ -55,7 +55,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "YAML LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "YAML LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         type = enum (attrNames servers);
diff --git a/modules/plugins/languages/zig.nix b/modules/plugins/languages/zig.nix
index 2aa0e2b6..89307eab 100644
--- a/modules/plugins/languages/zig.nix
+++ b/modules/plugins/languages/zig.nix
@@ -72,7 +72,7 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Zig LSP support" // {default = config.vim.languages.enableLSP;};
+      enable = mkEnableOption "Zig LSP support" // {default = config.vim.lsp.enable;};
 
       server = mkOption {
         type = enum (attrNames servers);
diff --git a/modules/plugins/lsp/module.nix b/modules/plugins/lsp/module.nix
index f408d873..6b63d725 100644
--- a/modules/plugins/lsp/module.nix
+++ b/modules/plugins/lsp/module.nix
@@ -3,11 +3,12 @@
   inherit (lib.nvim.binds) mkMappingOption;
 in {
   options.vim.lsp = {
-    enable = mkEnableOption "LSP, also enabled automatically through null-ls and lspconfig options";
     formatOnSave = mkEnableOption "format on save";
+
     inlayHints = {
       enable = mkEnableOption "inlay hints";
     };
+
     mappings = {
       goToDefinition =
         mkMappingOption "Go to definition"

From b61893971636ac268aa72d30a309b1fabfc7d709 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 4 May 2025 17:58:22 +0300
Subject: [PATCH 182/202] languages: deprecate `vim.languages.enableLSP`

This change is done in favor of our intentions to use the new API Neovim has exposed, and the one we are exposing to match theirs.
---
 modules/plugins/lsp/lspconfig/config.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/plugins/lsp/lspconfig/config.nix b/modules/plugins/lsp/lspconfig/config.nix
index 1c1f0a0a..16cba488 100644
--- a/modules/plugins/lsp/lspconfig/config.nix
+++ b/modules/plugins/lsp/lspconfig/config.nix
@@ -14,8 +14,6 @@ in {
   config = mkIf cfg.lspconfig.enable (mkMerge [
     {
       vim = {
-        lsp.enable = true;
-
         startPlugins = ["nvim-lspconfig"];
 
         pluginRC.lspconfig = entryAfter ["lsp-setup"] ''

From f558b7bc00aaef79ba3f60f4075ffde127bbfaf3 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 4 May 2025 18:25:53 +0300
Subject: [PATCH 183/202] docs: remove broken mentinos in old release notes

---
 docs/release-notes/rl-0.3.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/release-notes/rl-0.3.md b/docs/release-notes/rl-0.3.md
index 87ae5648..089f01f7 100644
--- a/docs/release-notes/rl-0.3.md
+++ b/docs/release-notes/rl-0.3.md
@@ -50,9 +50,8 @@ soon.
 
 - A new section has been added for language support: `vim.languages.<language>`.
 
-  - The options [](#opt-vim.languages.enableLSP),
-    [](#opt-vim.languages.enableTreesitter), etc. will enable the respective
-    section for all languages that have been enabled.
+  - The options `enableLSP` [](#opt-vim.languages.enableTreesitter), etc. will
+    enable the respective section for all languages that have been enabled.
   - All LSP languages have been moved here
   - `plantuml` and `markdown` have been moved here
   - A new section has been added for `html`. The old

From e752f59994e8f5c912dc2ca7c23d2ae2a5f193fd Mon Sep 17 00:00:00 2001
From: taylrfnt <taylr.fnt@gmail.com>
Date: Sun, 4 May 2025 19:05:09 -0500
Subject: [PATCH 184/202] nvimtree: add missing icon placement options

- Address missing `right_align` option in existing icon placement
  attributes
- Add the missing placement options from https://github.com/nvim-tree/nvim-tree.lua/blob/582ae48c9e43d2bcd55dfcc8e2e7a1f29065d924/lua/nvim-tree.lua#L595-L599
- Update the `mkOption` arguments to adhere to the requested style
  guide:
```
1. type
2. default
3. (optional) example
4. description
```
---
 .../plugins/filetree/nvimtree/nvimtree.nix    | 41 +++++++++++++++++--
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/modules/plugins/filetree/nvimtree/nvimtree.nix b/modules/plugins/filetree/nvimtree/nvimtree.nix
index 9c443a6e..c3beb38f 100644
--- a/modules/plugins/filetree/nvimtree/nvimtree.nix
+++ b/modules/plugins/filetree/nvimtree/nvimtree.nix
@@ -683,15 +683,48 @@ in {
               };
 
               git_placement = mkOption {
-                type = enum ["before" "after" "signcolumn"];
-                description = "Place where the git icons will be rendered. `signcolumn` requires `view.signcolumn` to be enabled.";
+                type = enum ["before" "after" "signcolumn" "right_align"];
                 default = "before";
+                description = ''
+                  Place where the git icons will be rendered.
+                  `signcolumn` requires `view.signcolumn` to be enabled.
+                '';
               };
 
               modified_placement = mkOption {
-                type = enum ["before" "after" "signcolumn"];
-                description = "Place where the modified icons will be rendered. `signcolumn` requires `view.signcolumn` to be enabled.";
+                type = enum ["before" "after" "signcolumn" "right_align"];
                 default = "after";
+                description = ''
+                  Place where the modified icons will be rendered.
+                  `signcolumn` requires `view.signcolumn` to be enabled.
+                '';
+              };
+
+              hidden_placement = mkOption {
+                type = enum ["before" "after" "signcolumn" "right_align"];
+                default = "after";
+                description = ''
+                  Place where the hidden icons will be rendered.
+                  `signcolumn` requires `view.signcolumn` to be enabled.
+                '';
+              };
+
+              diagnostics_placement = mkOption {
+                type = enum ["before" "after" "signcolumn" "right_align"];
+                default = "after";
+                description = ''
+                  Place where the diagnostics icons will be rendered.
+                  `signcolumn` requires `view.signcolumn` to be enabled.
+                '';
+              };
+
+              bookmarks_placement = mkOption {
+                type = enum ["before" "after" "signcolumn" "right_align"];
+                default = "after";
+                description = ''
+                  Place where the bookmark icons will be rendered.
+                  `signcolumn` requires `view.signcolumn` to be enabled.
+                '';
               };
 
               padding = mkOption {

From ee0a7e704824b73015234b4e97eab5a59efae364 Mon Sep 17 00:00:00 2001
From: taylrfnt <taylr.fnt@gmail.com>
Date: Sun, 4 May 2025 21:11:30 -0500
Subject: [PATCH 185/202] changelog: update with summary of changes
 (non-breaking)

Add a summary of the (non-breaking) changes to the nvim-tree plugin
options per contributing guidelines.
---
 docs/release-notes/rl-0.8.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 80a0300c..e0c06fc8 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -362,3 +362,11 @@
 [Hardtime.nvim]: https://github.com/m4xshen/hardtime.nvim
 
 - Add Plugin [Hardtime.nvim] under `vim.binds.hardtime-nvim` with `enable` and `setupOpts` options
+
+[taylrfnt](https://github.com/taylrfnt):
+
+[nvim-tree](https://github.com/nvim-tree/nvim-tree.lua):
+
+- Add missing `right_align` option for existing `renderer.icons` options.
+- Add missing `render.icons` options (`hidden_placement`,
+  `diagnostics_placement`, and `bookmarks_placement`).

From 9feb71594d00e5f40b16d39b06b3fd4bad7630a0 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Sat, 3 May 2025 17:52:36 -0400
Subject: [PATCH 186/202] refactor: nuke legacyPackages and overlays

rework blink-cmp package
---
 docs/default.nix                   |  1 +
 flake.nix                          |  3 ---
 flake/blink/default.nix            | 31 +++++++++++++++++++++++++
 flake/develop.nix                  |  3 ++-
 flake/legacyPackages.nix           | 35 ----------------------------
 flake/legacyPackages/blink-cmp.nix | 37 ------------------------------
 flake/overlays.nix                 | 19 ---------------
 flake/packages.nix                 | 15 ++++++++----
 lib/default.nix                    |  2 +-
 lib/types/default.nix              |  7 ++++--
 lib/types/plugins.nix              |  7 ++++--
 modules/plugins/languages/nix.nix  |  3 ++-
 modules/wrapper/build/config.nix   |  2 +-
 npins/sources.json                 | 16 -------------
 14 files changed, 59 insertions(+), 122 deletions(-)
 create mode 100644 flake/blink/default.nix
 delete mode 100644 flake/legacyPackages.nix
 delete mode 100644 flake/legacyPackages/blink-cmp.nix
 delete mode 100644 flake/overlays.nix

diff --git a/docs/default.nix b/docs/default.nix
index 98b29db0..49f90b80 100644
--- a/docs/default.nix
+++ b/docs/default.nix
@@ -12,6 +12,7 @@
     inherit
       (
         (lib.evalModules {
+          specialArgs = {inherit inputs;};
           modules =
             import ../modules/modules.nix {
               inherit lib pkgs;
diff --git a/flake.nix b/flake.nix
index 6e716581..e958f91c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,10 +18,7 @@
       systems = import inputs.systems;
       imports = [
         ./flake/templates
-
         ./flake/apps.nix
-        ./flake/legacyPackages.nix
-        ./flake/overlays.nix
         ./flake/packages.nix
         ./flake/develop.nix
       ];
diff --git a/flake/blink/default.nix b/flake/blink/default.nix
new file mode 100644
index 00000000..08c87073
--- /dev/null
+++ b/flake/blink/default.nix
@@ -0,0 +1,31 @@
+{
+  rustPlatform,
+  fetchFromGitHub,
+  writeShellScriptBin,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "blink-cmp";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "Saghen";
+    repo = "blink.cmp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-bKe8SSg1HPWE7b4iRQJwiOVCrvvgttuHCOIa4U/38AY=";
+  };
+
+  postInstall = ''
+    cp -r {lua,plugin} "$out"
+    mkdir -p "$out/target"
+    mv "$out/lib" "$out/target/release"
+  '';
+
+  cargoHash = "sha256-IDoDugtNWQovfSstbVMkKHLBXKa06lxRWmywu4zyS3M=";
+  useFetchCargoVendor = true;
+
+  nativeBuildInputs = [
+    (writeShellScriptBin "git" "exit 1")
+  ];
+
+  env.RUSTC_BOOTSTRAP = true;
+})
diff --git a/flake/develop.nix b/flake/develop.nix
index 71c13688..d92b8182 100644
--- a/flake/develop.nix
+++ b/flake/develop.nix
@@ -3,13 +3,14 @@
     pkgs,
     config,
     self',
+    inputs',
     ...
   }: {
     devShells = {
       default = self'.devShells.lsp;
       nvim-nix = pkgs.mkShellNoCC {packages = [config.packages.nix];};
       lsp = pkgs.mkShellNoCC {
-        packages = with pkgs; [nil statix deadnix alejandra npins];
+        packages = with pkgs; [inputs'.nil.packages.default statix deadnix alejandra npins];
       };
     };
 
diff --git a/flake/legacyPackages.nix b/flake/legacyPackages.nix
deleted file mode 100644
index 33aee0e3..00000000
--- a/flake/legacyPackages.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  inputs,
-  self,
-  ...
-}: {
-  perSystem = {
-    system,
-    inputs',
-    ...
-  }: {
-    legacyPackages = import inputs.nixpkgs {
-      inherit system;
-      overlays = [
-        inputs.self.overlays.default
-
-        (final: prev: {
-          # Build nil from source to get most recent
-          # features as they are added.
-          nil = inputs'.nil.packages.default;
-          blink-cmp = let
-            pin = self.pins.blink-cmp;
-          in
-            final.callPackage ./legacyPackages/blink-cmp.nix {
-              inherit (pin) version;
-              src = prev.fetchFromGitHub {
-                inherit (pin.repository) owner repo;
-                rev = pin.revision;
-                sha256 = pin.hash;
-              };
-            };
-        })
-      ];
-    };
-  };
-}
diff --git a/flake/legacyPackages/blink-cmp.nix b/flake/legacyPackages/blink-cmp.nix
deleted file mode 100644
index 60dce9de..00000000
--- a/flake/legacyPackages/blink-cmp.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  stdenv,
-  rustPlatform,
-  vimUtils,
-  gitMinimal,
-  src,
-  version,
-}: let
-  blink-fuzzy-lib = rustPlatform.buildRustPackage {
-    pname = "blink-fuzzy-lib";
-    inherit version src;
-
-    # TODO: remove this if plugin stops using nightly rust
-    env.RUSTC_BOOTSTRAP = true;
-
-    useFetchCargoVendor = true;
-    cargoHash = "sha256-IDoDugtNWQovfSstbVMkKHLBXKa06lxRWmywu4zyS3M=";
-
-    nativeBuildInputs = [gitMinimal];
-  };
-in
-  vimUtils.buildVimPlugin {
-    pname = "blink-cmp";
-    inherit version src;
-
-    # blink references a repro.lua which is placed outside the lua/ directory
-    doCheck = false;
-    preInstall = let
-      ext = stdenv.hostPlatform.extensions.sharedLibrary;
-    in ''
-      mkdir -p target/release
-      ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy${ext} target/release/libblink_cmp_fuzzy${ext}
-    '';
-
-    # Module for reproducing issues
-    nvimSkipModules = ["repro"];
-  }
diff --git a/flake/overlays.nix b/flake/overlays.nix
deleted file mode 100644
index 5d0ff6e8..00000000
--- a/flake/overlays.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: let
-  inherit (lib.nvim) neovimConfiguration;
-
-  buildPkg = pkgs: modules: (neovimConfiguration {inherit pkgs modules;}).neovim;
-
-  nixConfig = import ../configuration.nix false;
-  maximalConfig = import ../configuration.nix true;
-in {
-  flake.overlays.default = final: _prev: {
-    inherit neovimConfiguration;
-    neovim-nix = buildPkg final [nixConfig];
-    neovim-maximal = buildPkg final [maximalConfig];
-    devPkg = buildPkg pkgs [nixConfig {config.vim.languages.html.enable = pkgs.lib.mkForce true;}];
-  };
-}
diff --git a/flake/packages.nix b/flake/packages.nix
index 7abe5ec0..d6afbbf8 100644
--- a/flake/packages.nix
+++ b/flake/packages.nix
@@ -1,4 +1,4 @@
-{inputs, ...}: {
+{inputs, ...} @ args: {
   perSystem = {
     config,
     pkgs,
@@ -6,8 +6,15 @@
     ...
   }: let
     docs = import ../docs {inherit pkgs inputs lib;};
+    buildPkg = maximal:
+      (args.config.flake.lib.nvim.neovimConfiguration {
+        inherit pkgs;
+        modules = [(import ../configuration.nix maximal)];
+      }).neovim;
   in {
     packages = {
+      blink-cmp = pkgs.callPackage ./blink {};
+
       inherit (docs.manual) htmlOpenTool;
       # Documentation
       docs = docs.manual.html;
@@ -61,9 +68,9 @@
         '';
 
       # Exposed neovim configurations
-      nix = config.legacyPackages.neovim-nix;
-      maximal = config.legacyPackages.neovim-maximal;
-      default = config.legacyPackages.neovim-nix;
+      nix = buildPkg false;
+      maximal = buildPkg true;
+      default = config.packages.nix;
     };
   };
 }
diff --git a/lib/default.nix b/lib/default.nix
index 952278a8..c4388e82 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -4,7 +4,7 @@
   lib,
   ...
 }: {
-  types = import ./types {inherit lib;};
+  types = import ./types {inherit lib self;};
   config = import ./config.nix {inherit lib;};
   binds = import ./binds.nix {inherit lib;};
   dag = import ./dag.nix {inherit lib;};
diff --git a/lib/types/default.nix b/lib/types/default.nix
index c6239227..044a8221 100644
--- a/lib/types/default.nix
+++ b/lib/types/default.nix
@@ -1,6 +1,9 @@
-{lib}: let
+{
+  lib,
+  self,
+}: let
   typesDag = import ./dag.nix {inherit lib;};
-  typesPlugin = import ./plugins.nix {inherit lib;};
+  typesPlugin = import ./plugins.nix {inherit lib self;};
   typesLanguage = import ./languages.nix {inherit lib;};
   customTypes = import ./custom.nix {inherit lib;};
 in {
diff --git a/lib/types/plugins.nix b/lib/types/plugins.nix
index fc2bd083..4be39289 100644
--- a/lib/types/plugins.nix
+++ b/lib/types/plugins.nix
@@ -1,4 +1,7 @@
-{lib}: let
+{
+  lib,
+  self,
+}: let
   inherit (lib.options) mkOption;
   inherit (lib.attrsets) attrNames mapAttrs' filterAttrs nameValuePair;
   inherit (lib.strings) hasPrefix removePrefix;
@@ -12,7 +15,7 @@
     mapAttrs' (n: v: nameValuePair (removePrefix prefix n) {src = v;}) (filterAttrs (n: _: hasPrefix prefix n) inputs);
 
   #  Get the names of all npins
-  pluginInputNames = attrNames (lib.importJSON ../../npins/sources.json).pins;
+  pluginInputNames = ["blink-cmp"] ++ attrNames self.pins;
 
   # You can either use the name of the plugin or a package.
   pluginType = nullOr (
diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix
index 83022adf..aceee70d 100644
--- a/modules/plugins/languages/nix.nix
+++ b/modules/plugins/languages/nix.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   lib,
+  inputs,
   ...
 }: let
   inherit (builtins) attrNames;
@@ -27,7 +28,7 @@
     else ''{"${package}/bin/${defaultCmd}"}'';
   servers = {
     nil = {
-      package = pkgs.nil;
+      package = inputs.nil.packages.${pkgs.stdenv.system}.nil;
       internalFormatter = true;
       lspConfig = ''
         lspconfig.nil_ls.setup{
diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix
index 61ba1513..00ad2305 100644
--- a/modules/wrapper/build/config.nix
+++ b/modules/wrapper/build/config.nix
@@ -51,7 +51,7 @@
       doCheck = false;
     };
 
-    inherit (inputs.self.legacyPackages.${pkgs.stdenv.system}) blink-cmp;
+    inherit (inputs.self.packages.${pkgs.stdenv.system}) blink-cmp;
   };
 
   buildConfigPlugins = plugins:
diff --git a/npins/sources.json b/npins/sources.json
index a2122460..8e82850a 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -39,22 +39,6 @@
       "url": "https://github.com/rrethy/base16-nvim/archive/965160025d0facbe9caa863e5beef2a7a488e9d1.tar.gz",
       "hash": "02w1mn15gydma9canvqrlwf4l5z76s1vs01zanipwwflvwclsb8f"
     },
-    "blink-cmp": {
-      "type": "GitRelease",
-      "repository": {
-        "type": "GitHub",
-        "owner": "saghen",
-        "repo": "blink.cmp"
-      },
-      "pre_releases": false,
-      "version_upper_bound": null,
-      "release_prefix": null,
-      "submodules": false,
-      "version": "v1.2.0",
-      "revision": "d72a826e1961e14f91d8867d10a27a89c5cfe748",
-      "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v1.2.0",
-      "hash": "01phyx7y26p2123xpdp0zfp45rc8f014a8myxn2ga71m514vr9vc"
-    },
     "blink-cmp-spell": {
       "type": "Git",
       "repository": {

From e9e57caa1806f0693d4888c98b077f65ca267913 Mon Sep 17 00:00:00 2001
From: Noah765 <noland62007@gmail.com>
Date: Mon, 5 May 2025 09:46:49 +0200
Subject: [PATCH 187/202] languages/dart: fix infinite recursion

The default value of the flutter-tools.enable option conflicted with the
lsp.enable definition, which was conditionally defined based on
flutter-tools.enable. However, the lsp.enable definition isn't required
for flutter-tools' LSP functionality, so it can be removed.
---
 modules/plugins/languages/dart.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix
index 9cbd0783..c2a1810d 100644
--- a/modules/plugins/languages/dart.nix
+++ b/modules/plugins/languages/dart.nix
@@ -143,8 +143,6 @@ in {
     })
 
     (mkIf ftcfg.enable {
-      lsp.enable = true;
-
       startPlugins = [
         (
           if ftcfg.enableNoResolvePatch

From 7d191a350df23f2cb3f9110105d3b787559f9479 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 5 May 2025 10:45:33 +0300
Subject: [PATCH 188/202] ci: backport & labeler config

---
 .github/labels.yml             | 55 ++++++++++++++++++++++++++++++++++
 .github/workflows/backport.yml | 33 ++++++++++++++++++++
 .github/workflows/labeler.yml  | 21 +++++++++++++
 3 files changed, 109 insertions(+)
 create mode 100644 .github/labels.yml
 create mode 100644 .github/workflows/backport.yml
 create mode 100644 .github/workflows/labeler.yml

diff --git a/.github/labels.yml b/.github/labels.yml
new file mode 100644
index 00000000..e799004f
--- /dev/null
+++ b/.github/labels.yml
@@ -0,0 +1,55 @@
+# This file is used by .github/workflows/labels.yml
+"topic: plugins":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - modules/plugins/**/*
+
+"topic: modules":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - modules/**/*
+
+"topic: dependencies":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - npins
+        - flake.lock
+
+"topic: CI":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - .github/workflows/*.yml
+        - .github/typos.toml
+        . .github/dependabot.yml
+
+"topic: meta":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - .github/CODEOWNERS
+        - LICENSE
+        - .github/README.md
+        - .github/funding.yml
+        - .github/assets
+        - .github/*_TEMPLATE
+        - .gitignore
+        - .editorconfig
+        - release.json
+
+"topic: documentation":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - docs/**/*
+        - .github/CONTRIBUTING.md
+        - .github/README.md
+"topic: packaging":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+          - flake.nix
+          - flake/packages.nix
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
new file mode 100644
index 00000000..0a558fb8
--- /dev/null
+++ b/.github/workflows/backport.yml
@@ -0,0 +1,33 @@
+name: Backport PR on Label
+
+on:
+  pull_request_target:
+    types:
+      - labeled
+
+# Permissions needed for the korthout/backport-action to create branches and PRs
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  backport:
+    name: Create Backport PR
+    runs-on: ubuntu-latest
+    if: |
+      github.event.pull_request.merged == true && startsWith(github.event.label.name, 'backport-')
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Backport Action
+        uses: korthout/backport-action@v3
+        with:
+          # Regex pattern for labels that should trigger a backport AND extracts the target branch
+          # from the name (e.g. v0.x or v0.x.y; we use zerover). This action will ONLY proceed if
+          # the label that triggered the workflow fully matches this pattern.
+          # Example matching labels: "backport-v0.1", "backport-v0.10.1"
+          # Example non-matching labels: "backport-foo", "backport-v1.0"
+          label_pattern: '^backport-(v0\.\d+(\.\d+)?)$'
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
new file mode 100644
index 00000000..96d5c7be
--- /dev/null
+++ b/.github/workflows/labeler.yml
@@ -0,0 +1,21 @@
+name: "Label PR"
+
+on:
+  pull_request_target:
+    types: [edited, opened, synchronize, reopened]
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  labels:
+    name: "Label PR"
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.pull_request.title, '[skip ci]')"
+    steps:
+      - uses: actions/labeler@v5
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          configuration-path: .github/labeler.yml
+          sync-labels: true

From 5221dc27ddcabaca9eb54f20577b1de955e325ee Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 5 May 2025 10:58:58 +0300
Subject: [PATCH 189/202] ci: fix labeler config path

---
 .github/workflows/labeler.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 96d5c7be..fc2e0d65 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -17,5 +17,5 @@ jobs:
       - uses: actions/labeler@v5
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          configuration-path: .github/labeler.yml
+          configuration-path: .github/labels.yml
           sync-labels: true

From 3c672f64fc2e7a19aa33000733b5fc84e29f41b8 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 7 Mar 2025 16:20:46 +0300
Subject: [PATCH 190/202] docs/custom-plugins: avoid using `with` scopes in the
 manual

---
 .../configuring/custom-plugins/configuring.md | 20 ++++++++++---------
 .../custom-plugins/non-lazy-method.md         |  8 ++++----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/docs/manual/configuring/custom-plugins/configuring.md b/docs/manual/configuring/custom-plugins/configuring.md
index 5106d29b..42af11be 100644
--- a/docs/manual/configuring/custom-plugins/configuring.md
+++ b/docs/manual/configuring/custom-plugins/configuring.md
@@ -32,16 +32,18 @@ that the `extraPlugins` option has its own DAG scope), and the its setup code
 respectively. For example:
 
 ```nix
-config.vim.extraPlugins = with pkgs.vimPlugins; {
-  aerial = {
-    package = aerial-nvim;
-    setup = "require('aerial').setup {}";
-  };
+{pkgs, ...}: {
+  config.vim.extraPlugins = {
+    aerial = {
+      package = pkgs.vimPlugins.aerial-nvim;
+      setup = "require('aerial').setup {}";
+    };
 
-  harpoon = {
-    package = harpoon;
-    setup = "require('harpoon').setup {}";
-    after = ["aerial"]; # place harpoon configuration after aerial
+    harpoon = {
+      package = pkgs.vimPlugins.harpoon;
+      setup = "require('harpoon').setup {}";
+      after = ["aerial"]; # place harpoon configuration after aerial
+    };
   };
 }
 ```
diff --git a/docs/manual/configuring/custom-plugins/non-lazy-method.md b/docs/manual/configuring/custom-plugins/non-lazy-method.md
index 351af2eb..d8477283 100644
--- a/docs/manual/configuring/custom-plugins/non-lazy-method.md
+++ b/docs/manual/configuring/custom-plugins/non-lazy-method.md
@@ -5,10 +5,10 @@ under `vim.extraPlugins`. Instead of using DAGs exposed by the library, you may
 use the extra plugin module as follows:
 
 ```nix
-{
-  config.vim.extraPlugins = with pkgs.vimPlugins; {
+{pkgs, ...}: {
+  config.vim.extraPlugins = {
     aerial = {
-      package = aerial-nvim;
+      package = pkgs.vimPlugins.aerial-nvim;
       setup = ''
         require('aerial').setup {
           -- some lua configuration here
@@ -17,7 +17,7 @@ use the extra plugin module as follows:
     };
 
     harpoon = {
-      package = harpoon;
+      package = pkgs.vimPlugins.harpoon;
       setup = "require('harpoon').setup {}";
       after = ["aerial"];
     };

From 37750d9befcff9ee621c1cc15a8f5fc2d0f5133b Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 12 Mar 2025 03:53:16 +0300
Subject: [PATCH 191/202] docs/manual: document building plugins from source

---
 docs/manual/tips.md                |   3 +-
 docs/manual/tips/plugin-sources.md | 131 +++++++++++++++++++++++++++++
 2 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 docs/manual/tips/plugin-sources.md

diff --git a/docs/manual/tips.md b/docs/manual/tips.md
index 6e6dc9c2..f52cbca2 100644
--- a/docs/manual/tips.md
+++ b/docs/manual/tips.md
@@ -1,7 +1,8 @@
 # Helpful Tips {#ch-helpful-tips}
 
 ```{=include=} chapters
-tips/pure-lua-config.md
 tips/debugging-nvf.md
 tips/offline-docs.md
+tips/pure-lua-config.md
+tips/plugin-sources.md
 ```
diff --git a/docs/manual/tips/plugin-sources.md b/docs/manual/tips/plugin-sources.md
new file mode 100644
index 00000000..7cf6a470
--- /dev/null
+++ b/docs/manual/tips/plugin-sources.md
@@ -0,0 +1,131 @@
+# Adding Plugins From Different Sources {#sec-plugin-sources}
+
+**nvf** attempts to avoid depending on Nixpkgs for Neovim plugins. For the most
+part, this is accomplished by defining each plugin's source and building them
+from source.
+
+[npins]: https://github.com/andir/npins
+
+To define plugin sources, we use [npins] and pin each plugin source using
+builtin fetchers. You are not bound by this restriction. In your own
+configuration, any kind of fetcher or plugin source is fine.
+
+## Nixpkgs & Friends {#ch-plugins-from-nixpkgs}
+
+`vim.startPlugins` and `vim.optPlugins` options take either a **string**, in
+which case a plugin from nvf's internal plugins registry will be used, or a
+**package**. If your plugin does not require any setup, or ordering for it s
+configuration, then it is possible to add it to `vim.startPlugins` to load it on
+startup.
+
+```nix
+{pkgs, ...}: {
+  # Aerial does require some setup. In the case you pass a plugin that *does*
+  # require manual setup, then you must also call the setup function.
+  vim.startPlugins = [pkgs.vimPlugins.aerial-nvim];
+}
+```
+
+[`vim.extraPlugins`]: https://notashelf.github.io/nvf/options.html#opt-vim.extraPlugins
+
+This will fetch aerial.nvim from nixpkgs, and add it to Neovim's runtime path to
+be loaded manually. Although for plugins that require manual setup, you are
+encouraged to use [`vim.extraPlugins`].
+
+```nix
+{
+  vim.extraPlugins = {
+    aerial = {
+      package = pkgs.vimPlugins.aerial-nvim;
+      setup = "require('aerial').setup {}";
+    };
+  };
+}
+```
+
+[custom plugins section]: https://notashelf.github.io/nvf/index.xhtml#ch-custom-plugins
+
+More details on the extraPlugins API is documented in the
+[custom plugins section].
+
+## Building Your Own Plugins {#ch-plugins-from-source}
+
+In the case a plugin is not available in Nixpkgs, or the Nixpkgs package is
+outdated (or, more likely, broken) it is possible to build the plugins from
+source using a tool, such as [npins]. You may also use your _flake inputs_ as
+sources.
+
+Example using plugin inputs:
+
+```nix
+{
+  # In your flake.nix
+  inputs = {
+    aerial-nvim = {
+      url = "github:stevearc/aerial.nvim"
+      flake = false;
+    };
+  };
+
+  # Make sure that 'inputs' is properly propagated into Nvf, for example, through
+  # specialArgs.
+  outputs = { ... };
+}
+```
+
+In the case, you may use the input directly for the plugin's source attribute in
+`buildVimPlugin`.
+
+```nix
+# Make sure that 'inputs' is properly propagated! It will be missing otherwise
+# and the resulting errors might be too obscure.
+{inputs, ...}: let
+  aerial-from-source = pkgs.vimUtils.buildVimPlugin {
+      name = "aerial-nvim";
+      src = inputs.aerial-nvim;
+    };
+in {
+  vim.extraPlugins = {
+    aerial = {
+      package = aerial-from-source;
+      setup = "require('aerial').setup {}";
+    };
+  };
+}
+```
+
+Alternatively, if you do not want to keep track of the source using flake inputs
+or npins, you may call `fetchFromGitHub` (or other fetchers) directly. An
+example would look like this.
+
+```nix
+regexplainer = buildVimPlugin {
+  name = "nvim-regexplainer";
+  src = fetchFromGitHub {
+    owner = "bennypowers";
+    repo = "nvim-regexplainer";
+    rev = "4250c8f3c1307876384e70eeedde5149249e154f";
+    hash = "sha256-15DLbKtOgUPq4DcF71jFYu31faDn52k3P1x47GL3+b0=";
+  };
+
+  # The 'buildVimPlugin' imposes some "require checks" on all plugins build from
+  # source. Failing tests, if they are not relevant, can be disabled using the
+  # 'nvimSkipModule' argument to the 'buildVimPlugin' function.
+  nvimSkipModule = [
+    "regexplainer"
+    "regexplainer.buffers.init"
+    "regexplainer.buffers.popup"
+    "regexplainer.buffers.register"
+    "regexplainer.buffers.shared"
+    "regexplainer.buffers.split"
+    "regexplainer.component.descriptions"
+    "regexplainer.component.init"
+    "regexplainer.renderers.narrative.init"
+    "regexplainer.renderers.narrative.narrative"
+    "regexplainer.renderers.init"
+    "regexplainer.utils.defer"
+    "regexplainer.utils.init"
+    "regexplainer.utils.treesitter"
+  ];
+}
+```

From f1d72cf0764db282a937d756b9a027978ae96e8f Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 5 May 2025 14:57:32 +0300
Subject: [PATCH 192/202] docs: clarify wording; add examples and remove
 redundancies

---
 docs/manual/configuring.md                    |  11 ++
 docs/manual/configuring/autocmds.md           | 119 ++++++++++++++++++
 docs/manual/configuring/custom-package.md     |   4 +-
 docs/manual/configuring/custom-plugins.md     |  35 ++++--
 .../configuring/custom-plugins/configuring.md |  46 ++++---
 .../configuring/custom-plugins/lazy-method.md |  13 +-
 .../custom-plugins/legacy-method.md           |  29 +++--
 .../custom-plugins/non-lazy-method.md         |   9 +-
 docs/manual/configuring/languages/lsp.md      |  19 +--
 docs/manual/default-configs.md                |  10 --
 docs/manual/default-configs/maximal.md        |  11 --
 docs/manual/default-configs/nix.md            |   9 --
 docs/manual/manual.md                         |   1 -
 docs/manual/tips.md                           |   6 +
 docs/manual/try-it-out.md                     |  30 ++++-
 15 files changed, 262 insertions(+), 90 deletions(-)
 create mode 100644 docs/manual/configuring/autocmds.md
 delete mode 100644 docs/manual/default-configs.md
 delete mode 100644 docs/manual/default-configs/maximal.md
 delete mode 100644 docs/manual/default-configs/nix.md

diff --git a/docs/manual/configuring.md b/docs/manual/configuring.md
index f891c7a6..28c7e66a 100644
--- a/docs/manual/configuring.md
+++ b/docs/manual/configuring.md
@@ -1,5 +1,15 @@
 # Configuring nvf {#ch-configuring}
 
+[helpful tips section]: #ch-helpful-tips
+
+nvf allows for _very_ extensive configuration in Neovim through the Nix module
+interface. The below chapters describe several of the options exposed in nvf for
+your convenience. You might also be interested in the [helpful tips section] for
+more advanced or unusual configuration options supported by nvf.
+
+Note that this section does not cover module _options_. For an overview of all
+module options provided by nvf, please visit the [appendix](/options.html)
+
 ```{=include=} chapters
 configuring/custom-package.md
 configuring/custom-plugins.md
@@ -7,4 +17,5 @@ configuring/overriding-plugins.md
 configuring/languages.md
 configuring/dags.md
 configuring/dag-entries.md
+configuring/autocmds.md
 ```
diff --git a/docs/manual/configuring/autocmds.md b/docs/manual/configuring/autocmds.md
new file mode 100644
index 00000000..be10e726
--- /dev/null
+++ b/docs/manual/configuring/autocmds.md
@@ -0,0 +1,119 @@
+# Autocommands and Autogroups {#ch-autocmds-augroups}
+
+This module allows you to declaratively configure Neovim autocommands and
+autogroups within your Nix configuration.
+
+## Autogroups (`vim.augroups`) {#sec-vim-augroups}
+
+Autogroups (`augroup`) organize related autocommands. This allows them to be
+managed collectively, such as clearing them all at once to prevent duplicates.
+Each entry in the list is a submodule with the following options:
+
+| Option   | Type   | Default | Description                                                                                          | Example           |
+| :------- | :----- | :------ | :--------------------------------------------------------------------------------------------------- | :---------------- |
+| `enable` | `bool` | `true`  | Enables or disables this autogroup definition.                                                       | `true`            |
+| `name`   | `str`  | _None_  | **Required.** The unique name for the autogroup.                                                     | `"MyFormatGroup"` |
+| `clear`  | `bool` | `true`  | Clears any existing autocommands within this group before adding new ones defined in `vim.autocmds`. | `true`            |
+
+**Example:**
+
+```nix
+{
+  vim.augroups = [
+    {
+      name = "MyCustomAuGroup";
+      clear = true; # Clear previous autocommands in this group on reload
+    }
+    {
+      name = "Formatting";
+      # clear defaults to true
+    }
+  ];
+}
+```
+
+## Autocommands (`vim.autocmds`) {#sec-vim-autocmds}
+
+Autocommands (`autocmd`) trigger actions based on events happening within Neovim
+(e.g., saving a file, entering a buffer). Each entry in the list is a submodule
+with the following options:
+
+| Option     | Type                  | Default | Description                                                                                                                                                                      | Example                                                          |
+| :--------- | :-------------------- | :------ | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------- |
+| `enable`   | `bool`                | `true`  | Enables or disables this autocommand definition.                                                                                                                                 | `true`                                                           |
+| `event`    | `nullOr (listOf str)` | `null`  | **Required.** List of Neovim events that trigger this autocommand (e.g., `BufWritePre`, `FileType`).                                                                             | `[ "BufWritePre" ]`                                              |
+| `pattern`  | `nullOr (listOf str)` | `null`  | List of file patterns (globs) to match against (e.g., `*.py`, `*`). If `null`, matches all files for the given event.                                                            | `[ "*.lua", "*.nix" ]`                                           |
+| `callback` | `nullOr luaInline`    | `null`  | A Lua function to execute when the event triggers. Use `lib.nvim.types.luaInline` or `lib.options.literalExpression "mkLuaInline '''...'''"`. **Cannot be used with `command`.** | `lib.nvim.types.luaInline "function() print('File saved!') end"` |
+| `command`  | `nullOr str`          | `null`  | A Vimscript command to execute when the event triggers. **Cannot be used with `callback`.**                                                                                      | `"echo 'File saved!'"`                                           |
+| `group`    | `nullOr str`          | `null`  | The name of an `augroup` (defined in `vim.augroups`) to associate this autocommand with.                                                                                         | `"MyCustomAuGroup"`                                              |
+| `desc`     | `nullOr str`          | `null`  | A description for the autocommand (useful for introspection).                                                                                                                    | `"Format buffer on save"`                                        |
+| `once`     | `bool`                | `false` | If `true`, the autocommand runs only once and then automatically removes itself.                                                                                                 | `false`                                                          |
+| `nested`   | `bool`                | `false` | If `true`, allows this autocommand to trigger other autocommands.                                                                                                                | `false`                                                          |
+
+:::{.warning}
+
+You cannot define both `callback` (for Lua functions) and `command` (for
+Vimscript) for the same autocommand. Choose one.
+
+:::
+
+**Examples:**
+
+```nix
+{ lib, ... }:
+{
+  vim.augroups = [ { name = "UserSetup"; } ];
+
+  vim.autocmds = [
+    # Example 1: Using a Lua callback
+    {
+      event = [ "BufWritePost" ];
+      pattern = [ "*.lua" ];
+      group = "UserSetup";
+      desc = "Notify after saving Lua file";
+      callback = lib.nvim.types.luaInline ''
+        function()
+          vim.notify("Lua file saved!", vim.log.levels.INFO)
+        end
+      '';
+    }
+
+    # Example 2: Using a Vim command
+    {
+      event = [ "FileType" ];
+      pattern = [ "markdown" ];
+      group = "UserSetup";
+      desc = "Set spellcheck for Markdown";
+      command = "setlocal spell";
+    }
+
+    # Example 3: Autocommand without a specific group
+    {
+      event = [ "BufEnter" ];
+      pattern = [ "*.log" ];
+      desc = "Disable line numbers in log files";
+      command = "setlocal nonumber";
+      # No 'group' specified
+    }
+
+    # Example 4: Using Lua for callback
+    {
+      event = [ "BufWinEnter" ];
+      pattern = [ "*" ];
+      desc = "Simple greeting on entering a buffer window";
+      callback = lib.generators.mkLuaInline ''
+        function(args)
+          print("Entered buffer: " .. args.buf)
+        end
+      '';
+      
+      # Run only once per session trigger
+      once = true; 
+    }
+  ];
+}
+```
+
+These definitions are automatically translated into the necessary Lua code to
+configure `vim.api.nvim_create_augroup` and `vim.api.nvim_create_autocmd` when
+Neovim starts.
diff --git a/docs/manual/configuring/custom-package.md b/docs/manual/configuring/custom-package.md
index 51d996b6..3e9e324a 100644
--- a/docs/manual/configuring/custom-package.md
+++ b/docs/manual/configuring/custom-package.md
@@ -1,12 +1,12 @@
 # Custom Neovim Package {#ch-custom-package}
 
 As of v0.5, you may now specify the Neovim package that will be wrapped with
-your configuration. This is done with the `vim.package` option.
+your configuration. This is done with the [](#opt-vim.package) option.
 
 ```nix
 {inputs, pkgs, ...}: {
   # using the neovim-nightly overlay
-  vim.package = inputs.neovim-overlay.packages.${pkgs.system}.neovim;
+  vim.package = inputs.neovim-overlay.packages.${pkgs.stdenv.system}.neovim;
 }
 ```
 
diff --git a/docs/manual/configuring/custom-plugins.md b/docs/manual/configuring/custom-plugins.md
index c621e03c..bf986a0f 100644
--- a/docs/manual/configuring/custom-plugins.md
+++ b/docs/manual/configuring/custom-plugins.md
@@ -1,22 +1,33 @@
 # Custom Plugins {#ch-custom-plugins}
 
-**nvf**, by default, exposes a wide variety of plugins as module options for
-your convenience and bundles necessary dependencies into **nvf**'s runtime. In
-case a plugin is not available in **nvf**, you may consider making a pull
-request to **nvf** to include it as a module or you may add it to your
-configuration locally.
+**nvf** exposes a very wide variety of plugins by default, which are consumed by
+module options. This is done for your convenience, and to bundle all necessary
+dependencies into **nvf**'s runtime with full control of versioning, testing and
+dependencies. In the case a plugin you need is _not_ available, you may consider
+making a pull request to add the package you're looking for, or you may add it
+to your configuration locally. The below section describes how new plugins may
+be added to the user's configuration.
 
 ## Adding Plugins {#ch-adding-plugins}
 
-There are multiple ways of adding custom plugins to your **nvf** configuration.
+Per **nvf**'s design choices, there are several ways of adding custom plugins to
+your configuration as you need them. As we aim for extensive configuration, it
+is possible to add custom plugins (from nixpkgs, pinning tools, flake inputs,
+etc.) to your Neovim configuration before they are even implemented in **nvf**
+as a module.
 
-You can use custom plugins, before they are implemented in the flake. To add a
-plugin to the runtime, you need to add it to the [](#opt-vim.startPlugins) list
-in your configuration.
+:::{.info}
 
-Adding a plugin to `startPlugins` will not allow you to configure the plugin
-that you have added, but **nvf** provides multiple ways of configuring any custom
-plugins that you might have added to your configuration.
+To add a plugin to your runtime, you will need to add it to
+[](#opt-vim.startPlugins) list in your configuration. This is akin to cloning a
+plugin to `~/.config/nvim`, but they are only ever placed in the Nix store and
+never exposed to the outside world for purity and full isolation.
+
+:::
+
+As you would configure a cloned plugin, you must configure the new plugins that
+you've added to `startPlugins.` **nvf** provides multiple ways of configuring
+any custom plugins that you might have added to your configuration.
 
 ```{=include=} sections
 custom-plugins/configuring.md
diff --git a/docs/manual/configuring/custom-plugins/configuring.md b/docs/manual/configuring/custom-plugins/configuring.md
index 42af11be..a4b3ce19 100644
--- a/docs/manual/configuring/custom-plugins/configuring.md
+++ b/docs/manual/configuring/custom-plugins/configuring.md
@@ -1,13 +1,20 @@
 # Configuring {#sec-configuring-plugins}
 
 Just making the plugin to your Neovim configuration available might not always
-be enough. In that case, you can write custom lua config using either
-`config.vim.lazy.plugins.*.setupOpts` `config.vim.extraPlugins.*.setup` or
-`config.vim.luaConfigRC`.
+be enough., for example, if the plugin requires a setup table. In that case, you
+can write custom Lua configuration using one of
 
-The first option uses an extended version of `lz.n`'s PluginSpec. `setupModule`
-and `setupOpt` can be used if the plugin uses a `require('module').setup(...)`
-pattern. Otherwise, the `before` and `after` hooks should do what you need.
+- `config.vim.lazy.plugins.*.setupOpts`
+- `config.vim.extraPlugins.*.setup`
+- `config.vim.luaConfigRC`.
+
+## Lazy Plugins {#ch-vim-lazy-plugins}
+
+`config.vim.lazy.plugins.*.setupOpts` is useful for lazy-loading plugins, and
+uses an extended version of `lz.n's` `PluginSpec` to expose a familiar
+interface. `setupModule` and `setupOpt` can be used if the plugin uses a
+`require('module').setup(...)` pattern. Otherwise, the `before` and `after`
+hooks should do what you need.
 
 ```nix
 {
@@ -25,7 +32,9 @@ pattern. Otherwise, the `before` and `after` hooks should do what you need.
 }
 ```
 
-The second option uses an attribute set, which maps DAG section names to a
+## Standard API {#ch-vim-extra-plugins}
+
+`vim.extraPlugins` uses an attribute set, which maps DAG section names to a
 custom type, which has the fields `package`, `after`, `setup`. They allow you to
 set the package of the plugin, the sections its setup code should be after (note
 that the `extraPlugins` option has its own DAG scope), and the its setup code
@@ -48,29 +57,36 @@ respectively. For example:
 }
 ```
 
-The third option also uses an attribute set, but this one is resolved as a DAG
+### Setup using luaConfigRC {#setup-using-luaconfigrc}
+
+`vim.luaConfigRC` also uses an attribute set, but this one is resolved as a DAG
 directly. The attribute names denote the section names, and the values lua code.
 For example:
 
 ```nix
 {
-  # this will create an "aquarium" section in your init.lua with the contents of your custom config
-  # which will be *appended* to the rest of your configuration, inside your init.vim
+  # This will create a section called "aquarium" in the 'init.lua' with the
+  # contents of your custom configuration. By default 'entryAnywhere' is implied
+  # in DAGs, so this will be inserted to an arbitrary position. In the case you 
+  # wish to control the position of this section with more precision, please
+  # look into the DAGs section of the manual.
   config.vim.luaConfigRC.aquarium = "vim.cmd('colorscheme aquiarum')";
 }
 ```
 
 <!-- deno-fmt-ignore-start -->
+[DAG system]: #ch-using-dags
+[DAG section]: #ch-dag-entries
 
 ::: {.note}
-One of the greatest strengths of nvf is the ability to order
-snippets of configuration via the DAG system. It will allow specifying positions
-of individual sections of configuration as needed. nvf provides helper functions
+One of the **greatest strengths** of **nvf** is the ability to order
+configuration snippets precisely using the [DAG system]. DAGs
+are a very powerful mechanism that allows specifying positions
+of individual sections of configuration as needed. We provide helper functions
 in the extended library, usually under `inputs.nvf.lib.nvim.dag` that you may
 use.
 
-Please refer to the [DAG section](#ch-dag-entries) in the nvf manual
+Please refer to the [DAG section] in the nvf manual
 to find out more about the DAG system.
 :::
-
 <!-- deno-fmt-ignore-end -->
diff --git a/docs/manual/configuring/custom-plugins/lazy-method.md b/docs/manual/configuring/custom-plugins/lazy-method.md
index ae766535..c16966b8 100644
--- a/docs/manual/configuring/custom-plugins/lazy-method.md
+++ b/docs/manual/configuring/custom-plugins/lazy-method.md
@@ -1,7 +1,8 @@
 # Lazy Method {#sec-lazy-method}
 
-As of version **0.7**, we exposed an API for configuring lazy-loaded plugins via
-`lz.n` and `lzn-auto-require`.
+As of version **0.7**, an API is exposed to allow configuring lazy-loaded
+plugins via `lz.n` and `lzn-auto-require`. Below is a comprehensive example of
+how it may be loaded to lazy-load an arbitrary plugin.
 
 ```nix
 {
@@ -41,7 +42,8 @@ As of version **0.7**, we exposed an API for configuring lazy-loaded plugins via
 
 ## LazyFile event {#sec-lazyfile-event}
 
-You can use the `LazyFile` user event to load a plugin when a file is opened:
+**nvf** re-implements `LazyFile` as a familiar user event to load a plugin when
+a file is opened:
 
 ```nix
 {
@@ -55,5 +57,6 @@ You can use the `LazyFile` user event to load a plugin when a file is opened:
 }
 ```
 
-You can consider `LazyFile` as an alias to
-`["BufReadPost" "BufNewFile" "BufWritePre"]`
+You can consider the `LazyFile` event as an alias to the combination of
+`"BufReadPost"`, `"BufNewFile"` and `"BufWritePre"`, i.e., a list containing all
+three of those events: `["BufReadPost" "BufNewFile" "BufWritePre"]`
diff --git a/docs/manual/configuring/custom-plugins/legacy-method.md b/docs/manual/configuring/custom-plugins/legacy-method.md
index b2bddf43..6c399aaf 100644
--- a/docs/manual/configuring/custom-plugins/legacy-method.md
+++ b/docs/manual/configuring/custom-plugins/legacy-method.md
@@ -1,26 +1,31 @@
 # Legacy Method {#sec-legacy-method}
 
-Prior to version v0.5, the method of adding new plugins was adding the plugin
-package to `vim.startPlugins` and add its configuration as a DAG under one of
-`vim.configRC` or `vim.luaConfigRC`. Users who have not yet updated to 0.5, or
-prefer a more hands-on approach may use the old method where the load order of
-the plugins is determined by DAGs.
+Prior to version **0.5**, the method of adding new plugins was adding the plugin
+package to [](#opt-vim.startPlugins) and adding its configuration as a DAG under
+one of `vim.configRC` or [](#opt-vim.luaConfigRC). While `configRC` has been
+deprecated, users who have not yet updated to 0.5 or those who prefer a more
+hands-on approach may choose to use the old method where the load order of the
+plugins is explicitly determined by DAGs without internal abstractions.
 
-## Adding plugins {#sec-adding-plugins}
+## Adding New Plugins {#sec-adding-new-plugins}
 
-To add a plugin not available in nvf as a module to your configuration, you may
-add it to [](#opt-vim.startPlugins) in order to make it available to Neovim at
-runtime.
+To add a plugin not available in **nvf** as a module to your configuration using
+the legacy method, you must add it to [](#opt-vim.startPlugins) in order to make
+it available to Neovim at runtime.
 
 ```nix
 {pkgs, ...}: {
   # Add a Neovim plugin from Nixpkgs to the runtime.
+  # This does not need to come explicitly from packages. 'vim.startPlugins'
+  # takes a list of *string* (to load internal plugins) or *package* to load
+  # a Neovim package from any source.
   vim.startPlugins = [pkgs.vimPlugins.aerial-nvim];
 }
 ```
 
-And to configure the added plugin, you can use the `luaConfigRC` option to
-provide configuration as a DAG using the **nvf** extended library.
+Once the package is available in Neovim's runtime, you may use the `luaConfigRC`
+option to provide configuration as a DAG using the **nvf** extended library in
+order to configure the added plugin,
 
 ```nix
 {inputs, ...}: let
@@ -29,6 +34,8 @@ provide configuration as a DAG using the **nvf** extended library.
   # to specialArgs, the 'inputs' prefix may be omitted.
   inherit (inputs.nvf.lib.nvim.dag) entryAnywhere;
 in {
+  # luaConfigRC takes Lua configuration verbatim and inserts it at an arbitrary
+  # position by default or if 'entryAnywhere' is used.
   vim.luaConfigRC.aerial-nvim= entryAnywhere ''
     require('aerial').setup {
       -- your configuration here
diff --git a/docs/manual/configuring/custom-plugins/non-lazy-method.md b/docs/manual/configuring/custom-plugins/non-lazy-method.md
index d8477283..24ef7688 100644
--- a/docs/manual/configuring/custom-plugins/non-lazy-method.md
+++ b/docs/manual/configuring/custom-plugins/non-lazy-method.md
@@ -1,8 +1,9 @@
 # Non-lazy Method {#sec-non-lazy-method}
 
-As of version **0.5**, we have a more extensive API for configuring plugins,
-under `vim.extraPlugins`. Instead of using DAGs exposed by the library, you may
-use the extra plugin module as follows:
+As of version **0.5**, we have a more extensive API for configuring plugins that
+should be preferred over the legacy method. This API is available as
+[](#opt-vim.extraPlugins). Instead of using DAGs exposed by the library
+_directly_, you may use the extra plugin module as follows:
 
 ```nix
 {pkgs, ...}: {
@@ -24,3 +25,5 @@ use the extra plugin module as follows:
   };
 }
 ```
+
+This provides a level of abstraction over the DAG system for faster iteration.
diff --git a/docs/manual/configuring/languages/lsp.md b/docs/manual/configuring/languages/lsp.md
index 6d6ed5bc..2ddc08b5 100644
--- a/docs/manual/configuring/languages/lsp.md
+++ b/docs/manual/configuring/languages/lsp.md
@@ -1,17 +1,22 @@
 # LSP Custom Packages/Command {#sec-languages-custom-lsp-packages}
 
-In any of the `opt.languages.<language>.lsp.package` options you can provide
-your own LSP package, or provide the command to launch the language server, as a
-list of strings. You can use this to skip automatic installation of a language
-server, and instead use the one found in your `$PATH` during runtime, for
-example:
+One of the strengths of **nvf** is convenient aliases to quickly configure LSP
+servers through the Nix module system. By default the LSP packages for relevant
+language modules will be pulled into the closure. If this is not desirable, you
+may provide **a custom LSP package** (e.g., a Bash script that calls a command)
+or **a list of strings** to be interpreted as the command to launch the language
+server. By using a list of strings, you can use this to skip automatic
+installation of a language server, and instead use the one found in your `$PATH`
+during runtime, for example:
 
 ```nix
 vim.languages.java = {
   lsp = {
     enable = true;
-    # this expects jdt-language-server to be in your PATH
-    # or in `vim.extraPackages`
+
+    # This expects 'jdt-language-server' to be in your PATH or in
+    # 'vim.extraPackages.' There are no additional checks performed to see
+    # if the command provided is valid.
     package = ["jdt-language-server" "-data" "~/.cache/jdtls/workspace"];
   };
 }
diff --git a/docs/manual/default-configs.md b/docs/manual/default-configs.md
deleted file mode 100644
index 96ffa81a..00000000
--- a/docs/manual/default-configs.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Default Configs {#ch-default-configs}
-
-While you can configure **nvf** yourself using the builder, you can also use the
-pre-built configs that are available. Here are a few default configurations you
-can use.
-
-```{=include=} chapters
-default-configs/maximal.md
-default-configs/nix.md
-```
diff --git a/docs/manual/default-configs/maximal.md b/docs/manual/default-configs/maximal.md
deleted file mode 100644
index e1f5273e..00000000
--- a/docs/manual/default-configs/maximal.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Maximal {#sec-default-maximal}
-
-```bash
-$ nix run github:notashelf/nvf#maximal -- test.nix
-```
-
-It is the same fully configured Neovim as with the [Nix](#sec-default-nix)
-configuration, but with every supported language enabled.
-
-::: {.note} Running the maximal config will download _a lot_ of packages as it
-is downloading language servers, formatters, and more. :::
diff --git a/docs/manual/default-configs/nix.md b/docs/manual/default-configs/nix.md
deleted file mode 100644
index 5210ef39..00000000
--- a/docs/manual/default-configs/nix.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Nix {#sec-default-nix}
-
-```bash
-$ nix run github:notashelf/nvf#nix test.nix
-```
-
-Enables all the of Neovim plugins, with language support for specifically Nix.
-This lets you see what a fully configured neovim setup looks like without
-downloading a whole bunch of language servers and associated tools.
diff --git a/docs/manual/manual.md b/docs/manual/manual.md
index fd225766..18932896 100644
--- a/docs/manual/manual.md
+++ b/docs/manual/manual.md
@@ -8,7 +8,6 @@ try-it-out.md
 ```
 
 ```{=include=} parts
-default-configs.md
 installation.md
 configuring.md
 tips.md
diff --git a/docs/manual/tips.md b/docs/manual/tips.md
index f52cbca2..01bddc40 100644
--- a/docs/manual/tips.md
+++ b/docs/manual/tips.md
@@ -1,5 +1,11 @@
 # Helpful Tips {#ch-helpful-tips}
 
+This section provides helpful tips that may be considered "unorthodox" or "too
+advanced" for some users. We will cover basic debugging steps, offline
+documentation, configuring **nvf** with pure Lua and using custom plugin sources
+in **nvf** in this section. For general configuration tips, please see previous
+chapters.
+
 ```{=include=} chapters
 tips/debugging-nvf.md
 tips/offline-docs.md
diff --git a/docs/manual/try-it-out.md b/docs/manual/try-it-out.md
index 8244c2b7..8714be80 100644
--- a/docs/manual/try-it-out.md
+++ b/docs/manual/try-it-out.md
@@ -26,7 +26,12 @@ $ nix run github:notashelf/nvf#nix
 $ nix run github:notashelf/nvf#maximal
 ```
 
-### Available Configs {#sec-available-configs}
+### Available Configurations {#sec-available-configs}
+
+:::{.info}
+
+The below configurations are provided for demonstration purposes, and are
+**not** designed to be installed as is. You may
 
 #### Nix {#sec-configs-nix}
 
@@ -34,15 +39,32 @@ $ nix run github:notashelf/nvf#maximal
 a set of visual and functional plugins. By running `nix run .#`, which is the
 default package, you will build Neovim with this config.
 
+```bash
+$ nix run github:notashelf/nvf#nix test.nix
+```
+
+This command will start Neovim with some opinionated plugin configurations, and
+is designed specifically for Nix. the `nix` configuration lets you see how a
+fully configured Neovim setup _might_ look like without downloading too many
+packages or shell utilities.
+
 #### Maximal {#sec-configs-maximal}
 
 `Maximal` is the ultimate configuration that will enable support for more
 commonly used language as well as additional complementary plugins. Keep in
 mind, however, that this will pull a lot of dependencies.
 
-::: {.tip}
+```bash
+$ nix run github:notashelf/nvf#maximal -- test.nix
+```
 
-You are _strongly_ recommended to use the binary cache if you would like to try
-the Maximal configuration.
+It uses the same configuration template with the [Nix](#sec-configs-nix)
+configuration, but supports many more languages, and enables more utility,
+companion or fun plugins.
+
+::: {.warning}
+
+Running the maximal config will download _a lot_ of packages as it is
+downloading language servers, formatters, and more.
 
 :::

From 61be6cf4053537b1d0cf709b3283143e1f1b4b65 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Mon, 5 May 2025 22:30:27 +0200
Subject: [PATCH 193/202] cmp: use normal priority for default values

After this change, user configs should be "appended" to default ones
instead of overriding them
---
 modules/plugins/completion/nvim-cmp/config.nix   | 5 +++++
 modules/plugins/completion/nvim-cmp/nvim-cmp.nix | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/plugins/completion/nvim-cmp/config.nix b/modules/plugins/completion/nvim-cmp/config.nix
index 749ebb7c..cf27caaf 100644
--- a/modules/plugins/completion/nvim-cmp/config.nix
+++ b/modules/plugins/completion/nvim-cmp/config.nix
@@ -60,6 +60,11 @@ in {
         enableSharedCmpSources = true;
 
         nvim-cmp = {
+          sources = {
+            nvim-cmp = null;
+            buffer = "[Buffer]";
+            path = "[Path]";
+          };
           sourcePlugins = ["cmp-buffer" "cmp-path"];
 
           setupOpts = {
diff --git a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
index 2c8c77d3..8105ed00 100644
--- a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
+++ b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
@@ -98,11 +98,15 @@ in {
 
     sources = mkOption {
       type = attrsOf (nullOr str);
-      default = {
+      defaultText = literalMD ''
+        These sources are included by default:
+
+        ```nix
         nvim-cmp = null;
         buffer = "[Buffer]";
         path = "[Path]";
-      };
+        ```
+      '';
       example = {
         nvim-cmp = null;
         buffer = "[Buffer]";

From 9e9458710229d95bc19512c29cfea2b85c377b75 Mon Sep 17 00:00:00 2001
From: myu <contact@memyu.com>
Date: Mon, 5 May 2025 20:02:37 -0400
Subject: [PATCH 194/202] tabline/bufferline: fix typo in the word "indicator"

---
 modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
index 14243670..ff255c6c 100644
--- a/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
+++ b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
@@ -109,7 +109,7 @@ in {
             type = nullOr str;
             default = null;
             description = ''
-              The indicatotor icon to use for the current buffer.
+              The indicator icon to use for the current buffer.
 
               ::: {.warning}
               This **must** be omitted while style is not `icon`

From f07468e13a994b04ec3b9cd41777429942cdc8b1 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 6 May 2025 12:06:33 +0300
Subject: [PATCH 195/202] ci: fix labeler config

---
 .github/labels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/labels.yml b/.github/labels.yml
index e799004f..34c3bf2c 100644
--- a/.github/labels.yml
+++ b/.github/labels.yml
@@ -24,7 +24,7 @@
       - any-glob-to-any-file:
         - .github/workflows/*.yml
         - .github/typos.toml
-        . .github/dependabot.yml
+        - .github/dependabot.yml
 
 "topic: meta":
   - any:

From 99f1200c8db9295e556255e49175a6d2a5c02fbd Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 6 May 2025 20:58:31 +0300
Subject: [PATCH 196/202] revert "Merge pull request #884 from
 horriblename/cmp-sources-normal-prio"

Reverts commit d3c7f7125c5302721d711d1dc4e025c63c5e09a4, reversing
changes made to f07468e13a994b04ec3b9cd41777429942cdc8b1.
---
 modules/plugins/completion/nvim-cmp/config.nix   | 5 -----
 modules/plugins/completion/nvim-cmp/nvim-cmp.nix | 8 ++------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/modules/plugins/completion/nvim-cmp/config.nix b/modules/plugins/completion/nvim-cmp/config.nix
index cf27caaf..749ebb7c 100644
--- a/modules/plugins/completion/nvim-cmp/config.nix
+++ b/modules/plugins/completion/nvim-cmp/config.nix
@@ -60,11 +60,6 @@ in {
         enableSharedCmpSources = true;
 
         nvim-cmp = {
-          sources = {
-            nvim-cmp = null;
-            buffer = "[Buffer]";
-            path = "[Path]";
-          };
           sourcePlugins = ["cmp-buffer" "cmp-path"];
 
           setupOpts = {
diff --git a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
index 8105ed00..2c8c77d3 100644
--- a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
+++ b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
@@ -98,15 +98,11 @@ in {
 
     sources = mkOption {
       type = attrsOf (nullOr str);
-      defaultText = literalMD ''
-        These sources are included by default:
-
-        ```nix
+      default = {
         nvim-cmp = null;
         buffer = "[Buffer]";
         path = "[Path]";
-        ```
-      '';
+      };
       example = {
         nvim-cmp = null;
         buffer = "[Buffer]";

From edbfc120af31ab01eb92f32df6052c100ba4e218 Mon Sep 17 00:00:00 2001
From: tebro <git@tebro.simplelogin.com>
Date: Thu, 8 May 2025 20:59:27 +0300
Subject: [PATCH 197/202] Add .eslintrc.cjs as eslint config file option

---
 modules/plugins/languages/ts.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix
index 5a1e5889..b9971488 100644
--- a/modules/plugins/languages/ts.nix
+++ b/modules/plugins/languages/ts.nix
@@ -101,6 +101,7 @@
           "eslint.config.js"
           "eslint.config.mjs"
           ".eslintrc"
+          ".eslintrc.cjs"
           ".eslintrc.json"
           ".eslintrc.js"
           ".eslintrc.yml"

From 09f2e1d5245c5e9d35e6b451d47affec0c006157 Mon Sep 17 00:00:00 2001
From: Noah765 <99338019+Noah765@users.noreply.github.com>
Date: Fri, 9 May 2025 01:33:01 +0200
Subject: [PATCH 198/202] lsp: fix toggleFormatOnSave (#869)

Co-authored-by: Ching Pei Yang <59727193+horriblename@users.noreply.github.com>
Co-authored-by: raf <raf@notashelf.dev>
---
 modules/plugins/lsp/config.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/plugins/lsp/config.nix b/modules/plugins/lsp/config.nix
index 3702ac5f..c2320aaf 100644
--- a/modules/plugins/lsp/config.nix
+++ b/modules/plugins/lsp/config.nix
@@ -84,13 +84,13 @@ in {
               group = augroup,
               buffer = bufnr,
               callback = function()
+                if vim.b.disableFormatSave then
+                  return
+                end
+
                 ${
           if config.vim.lsp.null-ls.enable
           then ''
-            if vim.b.disableFormatSave then
-              return
-            end
-
             local function is_null_ls_formatting_enabled(bufnr)
                 local file_type = vim.api.nvim_buf_get_option(bufnr, "filetype")
                 local generators = require("null-ls.generators").get_available(

From 22f57045275e2e2ca27e070372c8c16664705df7 Mon Sep 17 00:00:00 2001
From: Venkatesan Ravi <venkyrocker7777@gmail.com>
Date: Mon, 31 Mar 2025 21:06:54 +0000
Subject: [PATCH 199/202] Make conform respect config.vim.lsp.formatOnSave and
 config.vim.lsp.mappings.toggleFormatOnSave

---
 .../formatter/conform-nvim/conform-nvim.nix   | 67 ++++++++++++-------
 1 file changed, 42 insertions(+), 25 deletions(-)

diff --git a/modules/plugins/formatter/conform-nvim/conform-nvim.nix b/modules/plugins/formatter/conform-nvim/conform-nvim.nix
index 727985a3..cfe89bf3 100644
--- a/modules/plugins/formatter/conform-nvim/conform-nvim.nix
+++ b/modules/plugins/formatter/conform-nvim/conform-nvim.nix
@@ -1,12 +1,9 @@
-{
-  pkgs,
-  lib,
-  ...
-}: let
-  inherit (lib.options) mkOption mkEnableOption literalExpression;
-  inherit (lib.types) attrs enum nullOr;
-  inherit (lib.nvim.types) mkPluginSetupOption;
-  inherit (lib.nvim.lua) mkLuaInline;
+{lib, ...}: let
+  inherit (lib.generators) mkLuaInline;
+  inherit (lib.options) mkOption mkEnableOption literalMD;
+  inherit (lib.types) attrs either nullOr;
+  inherit (lib.nvim.lua) toLuaObject;
+  inherit (lib.nvim.types) luaInline mkPluginSetupOption;
 in {
   options.vim.formatter.conform-nvim = {
     enable = mkEnableOption "lightweight yet powerful formatter plugin for Neovim [conform-nvim]";
@@ -31,26 +28,46 @@ in {
       };
 
       format_on_save = mkOption {
-        type = nullOr attrs;
-        default = {
-          lsp_format = "fallback";
-          timeout_ms = 500;
-        };
+        type = nullOr (either attrs luaInline);
+        default = mkLuaInline ''
+          function()
+            if not vim.g.formatsave or vim.b.disableFormatSave then
+              return
+            else
+              return {lsp_format = "fallback", timeout_ms = 500}
+            end
+          end
+        '';
+        defaultText = literalMD ''
+          enabled by default, and respects {option}`vim.lsp.formatOnSave` and
+          {option}`vim.lsp.mappings.toggleFormatSave`
+        '';
         description = ''
-          Table that will be passed to `conform.format()`. If this
-          is set, Conform will run the formatter on save.
+          Attribute set or Lua function that will be passed to
+          `conform.format()`. If this is set, Conform will run the formatter
+          on save.
         '';
       };
 
-      format_after_save = mkOption {
-        type = nullOr attrs;
-        default = {lsp_format = "fallback";};
-        description = ''
-          Table that will be passed to `conform.format()`. If this
-          is set, Conform will run the formatter asynchronously after
-          save.
-        '';
-      };
+      format_after_save = let
+        defaultFormatAfterSaveOpts = {lsp_format = "fallback";};
+      in
+        mkOption {
+          type = nullOr (either attrs luaInline);
+          default = mkLuaInline ''
+            function()
+              if not vim.g.formatsave or vim.b.disableFormatSave then
+                return
+              else
+                return ${toLuaObject defaultFormatAfterSaveOpts}
+              end
+            end
+          '';
+          description = ''
+            Table or function(luainline) that will be passed to `conform.format()`. If this
+            is set, Conform will run the formatter asynchronously after save.
+          '';
+        };
     };
   };
 }

From 4f0cc5725a7bdf2a9e880d5a59f360968419e8ea Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Fri, 9 May 2025 03:56:41 +0200
Subject: [PATCH 200/202] lsp: prefer conform for format on save

---
 modules/plugins/lsp/config.nix | 120 +++++++++++++++------------------
 1 file changed, 54 insertions(+), 66 deletions(-)

diff --git a/modules/plugins/lsp/config.nix b/modules/plugins/lsp/config.nix
index c2320aaf..8d4a3c8e 100644
--- a/modules/plugins/lsp/config.nix
+++ b/modules/plugins/lsp/config.nix
@@ -6,6 +6,7 @@
 }: let
   inherit (lib.generators) mkLuaInline;
   inherit (lib.modules) mkIf;
+  inherit (lib.lists) optional;
   inherit (lib.strings) optionalString;
   inherit (lib.trivial) boolToString;
   inherit (lib.nvim.binds) addDescriptionsToMappings;
@@ -14,7 +15,10 @@
   usingNvimCmp = config.vim.autocomplete.nvim-cmp.enable;
   usingBlinkCmp = config.vim.autocomplete.blink-cmp.enable;
   self = import ./module.nix {inherit config lib pkgs;};
+  conformCfg = config.vim.formatter.conform-nvim;
+  conformFormatOnSave = conformCfg.enable && conformCfg.setupOpts.format_on_save != null;
 
+  augroup = "nvf_lsp";
   mappingDefinitions = self.options.vim.lsp.mappings;
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
   mkBinding = binding: action:
@@ -29,24 +33,59 @@ in {
         sourcePlugins = ["cmp-nvim-lsp"];
       };
 
+      augroups = [{name = augroup;}];
       autocmds =
-        if cfg.inlayHints.enable
-        then [
-          {
-            callback = mkLuaInline ''
-              function(event)
-                local bufnr = event.buf
-                local client = vim.lsp.get_client_by_id(event.data.client_id)
-                if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then
-                  vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = bufnr }), { bufnr = bufnr })
+        (optional cfg.inlayHints.enable {
+          group = augroup;
+          event = ["LspAttach"];
+          desc = "LSP on-attach enable inlay hints autocmd";
+          callback = mkLuaInline ''
+            function(event)
+              local bufnr = event.buf
+              local client = vim.lsp.get_client_by_id(event.data.client_id)
+              if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then
+                vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = bufnr }), { bufnr = bufnr })
+              end
+            end
+          '';
+        })
+        ++ (optional (!conformFormatOnSave) {
+          group = augroup;
+          event = ["BufWritePre"];
+          desc = "LSP on-attach create format on save autocmd";
+          callback = mkLuaInline ''
+            function(ev)
+              if vim.b.disableFormatSave or not vim.g.formatsave then
+                return
+              end
+
+              local bufnr = ev.buf
+
+              ${optionalString cfg.null-ls.enable ''
+              -- prefer null_ls formatter
+              do
+                local clients = vim.lsp.get_clients({
+                  bufnr = bufnr,
+                  name = "null-ls",
+                  method = "textDocument/formatting",
+                })
+                if clients[1] then
+                  vim.lsp.buf.format({ bufnr = bufnr, id = clients[1].id })
+                  return
                 end
               end
-            '';
-            desc = "LSP on-attach enable inlay hints autocmd";
-            event = ["LspAttach"];
-          }
-        ]
-        else [];
+            ''}
+
+              local clients = vim.lsp.get_clients({
+                bufnr = bufnr,
+                method = "textDocument/formatting",
+              })
+              if clients[1] then
+                vim.lsp.buf.format({ bufnr = bufnr, id = clients[1].id })
+              end
+            end
+          '';
+        });
 
       pluginRC.lsp-setup = ''
         vim.g.formatsave = ${boolToString cfg.formatOnSave};
@@ -74,60 +113,9 @@ in {
           ${mkBinding mappings.toggleFormatOnSave "function() vim.b.disableFormatSave = not vim.b.disableFormatSave end"}
         end
 
-        -- Enable formatting
-        local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
-
-        format_callback = function(client, bufnr)
-          if vim.g.formatsave then
-            vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
-            vim.api.nvim_create_autocmd("BufWritePre", {
-              group = augroup,
-              buffer = bufnr,
-              callback = function()
-                if vim.b.disableFormatSave then
-                  return
-                end
-
-                ${
-          if config.vim.lsp.null-ls.enable
-          then ''
-            local function is_null_ls_formatting_enabled(bufnr)
-                local file_type = vim.api.nvim_buf_get_option(bufnr, "filetype")
-                local generators = require("null-ls.generators").get_available(
-                    file_type,
-                    require("null-ls.methods").internal.FORMATTING
-                )
-                return #generators > 0
-            end
-
-            if is_null_ls_formatting_enabled(bufnr) then
-               vim.lsp.buf.format({
-                  bufnr = bufnr,
-                  filter = function(client)
-                    return client.name == "null-ls"
-                  end
-                })
-            else
-                vim.lsp.buf.format({
-                  bufnr = bufnr,
-                })
-            end
-          ''
-          else "
-              vim.lsp.buf.format({
-                bufnr = bufnr,
-              })
-        "
-        }
-              end,
-            })
-          end
-        end
-
         ${optionalString config.vim.ui.breadcrumbs.enable ''local navic = require("nvim-navic")''}
         default_on_attach = function(client, bufnr)
           attach_keymaps(client, bufnr)
-          format_callback(client, bufnr)
           ${optionalString config.vim.ui.breadcrumbs.enable ''
           -- let navic attach to buffers
           if client.server_capabilities.documentSymbolProvider then

From 955f2046cf7f6518ae7aab044af2318f7b80cd18 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Fri, 9 May 2025 04:02:10 +0200
Subject: [PATCH 201/202] lsp: add TODO

---
 modules/plugins/lsp/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/plugins/lsp/config.nix b/modules/plugins/lsp/config.nix
index 8d4a3c8e..e7b67c8e 100644
--- a/modules/plugins/lsp/config.nix
+++ b/modules/plugins/lsp/config.nix
@@ -126,6 +126,7 @@ in {
 
         local capabilities = vim.lsp.protocol.make_client_capabilities()
         ${optionalString usingNvimCmp ''
+          -- TODO(horriblename): migrate to vim.lsp.config['*']
           -- HACK: copied from cmp-nvim-lsp. If we ever lazy load lspconfig we
           -- should re-evaluate whether we can just use `default_capabilities`
           capabilities = {

From 29f6940868c30a75494bf6586b8314538bd395ad Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Fri, 9 May 2025 04:16:30 +0200
Subject: [PATCH 202/202] docs: update release notes

---
 docs/release-notes/rl-0.8.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index e0c06fc8..6581a277 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -109,6 +109,7 @@
 - Add tsx support in conform and lint
 - Moved code setting `additionalRuntimePaths` and `enableLuaLoader` out of
   `luaConfigPre`'s default to prevent being overridden
+- Use conform over custom autocmds for LSP format on save
 
 [diniamo](https://github.com/diniamo):
 
@@ -312,6 +313,8 @@
 - Fix fzf-lua having a hard dependency on fzf.
 - Enable inlay hints support - `config.vim.lsp.inlayHints`.
 - Add `neo-tree`, `snacks.picker` extensions to `lualine`.
+- Add support for `vim.lsp.formatOnSave` and
+  `vim.lsp.mappings.toggleFormatOnSave`
 
 [tebuevd](https://github.com/tebuevd):
 
@@ -361,7 +364,8 @@
 
 [Hardtime.nvim]: https://github.com/m4xshen/hardtime.nvim
 
-- Add Plugin [Hardtime.nvim] under `vim.binds.hardtime-nvim` with `enable` and `setupOpts` options
+- Add Plugin [Hardtime.nvim] under `vim.binds.hardtime-nvim` with `enable` and
+  `setupOpts` options
 
 [taylrfnt](https://github.com/taylrfnt):