From 0650aa31acfd0a6903522494d4d66c91c05af9c4 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 3 Dec 2024 00:40:28 +0300
Subject: [PATCH 001/202] modules/neovim: deprecate `vim.enableEditorconfig`
 option

Deprecate shorthand EditorConfig toggle, and encourage the more powerful `vim.globals` option.
---
 docs/release-notes/rl-0.7.md   | 13 ++++++++-----
 modules/extra/deprecations.nix |  5 ++++-
 modules/neovim/init/basic.nix  | 10 ----------
 modules/wrapper/rc/options.nix | 15 +++++++++++++++
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md
index 59267ddf..fd3764ac 100644
--- a/docs/release-notes/rl-0.7.md
+++ b/docs/release-notes/rl-0.7.md
@@ -28,11 +28,11 @@ configuration formats.
 
 ### `vim.maps` rewrite {#sec-vim-maps-rewrite}
 
-Instead of specifying map modes using submodules (eg.: `vim.maps.normal`), a new
-`vim.keymaps` submodule with support for a `mode` option has been introduced. It
-can be either a string, or a list of strings, where a string represents the
-short-name of the map mode(s), that the mapping should be set for. See
-`:help map-modes` for more information.
+Instead of specifying map modes using submodules (e.g.: `vim.maps.normal`), a
+new `vim.keymaps` submodule with support for a `mode` option has been
+introduced. It can be either a string, or a list of strings, where a string
+represents the short-name of the map mode(s), that the mapping should be set
+for. See `:help map-modes` for more information.
 
 For example:
 
@@ -334,6 +334,9 @@ The changes are, in no particular order:
   `vim.options` as default values. Some are left as they don't have a direct
   equivalent, but expect a switch eventually.
 
+- Deprecated `vim.enableEditorconfig` in favor of
+  [](#opt-vim.globals.editorconfig).
+
 [ppenguin](https://github.com/ppenguin):
 
 - Telescope:
diff --git a/modules/extra/deprecations.nix b/modules/extra/deprecations.nix
index e4cb193f..9fd52938 100644
--- a/modules/extra/deprecations.nix
+++ b/modules/extra/deprecations.nix
@@ -84,9 +84,12 @@ in {
         `tabstop` and `shiftwidth` manually in `vim.options` or per-filetype in a
         `ftplugin` directory added to your runtime path.
       '')
+
+      # 2024-12-02
+      (mkRenamedOptionModule ["vim" "enableEditorconfig"] ["vim" "globals" "editorconfig"])
     ]
 
-    # 2024-12-1
+    # 2024-12-01
     # Migrated via batchRenameOptions. Further batch renames must be below this line.
     renamedVimOpts
   ];
diff --git a/modules/neovim/init/basic.nix b/modules/neovim/init/basic.nix
index 9370fa8f..1b45feaa 100644
--- a/modules/neovim/init/basic.nix
+++ b/modules/neovim/init/basic.nix
@@ -70,12 +70,6 @@ in {
       description = "Set how bells are handled. Options: on, visual or none";
     };
 
-    enableEditorconfig = mkOption {
-      type = bool;
-      default = true;
-      description = "Follow editorconfig rules in current directory";
-    };
-
     searchCase = mkOption {
       type = enum ["ignore" "smart" "sensitive"];
       default = "sensitive";
@@ -112,10 +106,6 @@ in {
       expandtab = true;
     };
 
-    globals = pushDownDefault {
-      editorconfig = cfg.enableEditorconfig;
-    };
-
     # Options that are more difficult to set through 'vim.options'. Fear not, though
     # as the Lua DAG is still as powerful as it could be.
     luaConfigRC.basic = entryAfter ["globalsScript"] ''
diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index ab541419..fc9938ba 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -121,6 +121,21 @@ in {
             default = ",";
             description = "The key used for `<localleader>` mappings";
           };
+
+          editorconfig = mkOption {
+            type = bool;
+            default = true;
+            description = ''
+              Whether to enable EditorConfig integration in Neovim.
+
+              This defaults to true as it is enabled by default in stock
+              Neovim, setting this option to false disables EditorConfig
+              integration entirely.
+
+              See [Neovim documentation](https://neovim.io/doc/user/editorconfig.html)
+              for more details on configuring EditorConfig behaviour.
+            '';
+          };
         };
       };
 

From 5a5f49f85f1d667c78e731592c93084176683ae0 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 3 Dec 2024 00:52:08 +0300
Subject: [PATCH 002/202] lib/languages: re-add `toVimBool`

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

diff --git a/lib/languages.nix b/lib/languages.nix
index 52f1b5b8..56c225d6 100644
--- a/lib/languages.nix
+++ b/lib/languages.nix
@@ -6,7 +6,12 @@
   inherit (lib.nvim.attrsets) mapListToAttrs;
 in {
   # Converts a boolean to a yes/no string. This is used in lots of
-  # configuration formats.
+  # configuration formats, and is not covered by `toLuaObject`
+  toVimBool = bool:
+    if bool
+    then "yes"
+    else "no";
+
   diagnosticsToLua = {
     lang,
     config,
@@ -30,8 +35,8 @@ in {
 
   mkEnable = desc:
     mkOption {
-      description = "Turn on ${desc} for enabled languages by default";
-      type = bool;
       default = false;
+      type = bool;
+      description = "Turn on ${desc} for enabled languages by default";
     };
 }

From 07f50e84eb99d2454250b1076449a8667f19b4de Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 3 Dec 2024 00:53:22 +0300
Subject: [PATCH 003/202] modules/neovim: deprecate `vim.showSignColumn`

Prefer the type-safe `vim.options` equivalent.
---
 modules/extra/deprecations.nix |  6 +++++
 modules/neovim/init/basic.nix  | 40 +++++++++++++---------------------
 modules/wrapper/rc/options.nix |  8 +++++++
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/modules/extra/deprecations.nix b/modules/extra/deprecations.nix
index 9fd52938..8d27d7ac 100644
--- a/modules/extra/deprecations.nix
+++ b/modules/extra/deprecations.nix
@@ -14,6 +14,7 @@
     splitRight = "splitright";
     autoIndent = "autoindent";
     wordWrap = "wrap";
+    showSignColumn = "signcolumn";
   };
 in {
   imports = concatLists [
@@ -35,23 +36,28 @@ in {
         vim.autopairs.enable has been removed in favor of per-plugin modules.
         You can enable nvim-autopairs with vim.autopairs.nvim-autopairs.enable instead.
       '')
+
       (mkRemovedOptionModule ["vim" "autopairs" "type"] ''
         vim.autopairs.type has been removed in favor of per-plugin modules.
         You can enable nvim-autopairs with vim.autopairs.nvim-autopairs.enable instead.
       '')
+
       (mkRemovedOptionModule ["vim" "autocomplete" "enable"] ''
         vim.autocomplete.enable has been removed in favor of per-plugin modules.
         You can enable nvim-cmp with vim.autocomplete.nvim-cmp.enable instead.
       '')
+
       (mkRemovedOptionModule ["vim" "autocomplete" "type"] ''
         vim.autocomplete.type has been removed in favor of per-plugin modules.
         You can enable nvim-cmp with vim.autocomplete.nvim-cmp.enable instead.
       '')
+
       (mkRemovedOptionModule ["vim" "autocomplete" "sources"] ''
         vim.autocomplete.sources has been removed in favor of per-plugin modules.
         You can add nvim-cmp sources with vim.autocomplete.nvim-cmp.sources
         instead.
       '')
+
       (mkRemovedOptionModule ["vim" "snippets" "vsnip" "enable"] ''
         vim.snippets.vsnip.enable has been removed in favor of the more modern luasnip.
       '')
diff --git a/modules/neovim/init/basic.nix b/modules/neovim/init/basic.nix
index 1b45feaa..ef899cf4 100644
--- a/modules/neovim/init/basic.nix
+++ b/modules/neovim/init/basic.nix
@@ -58,12 +58,6 @@ in {
       description = "Prevent swapfile and backupfile from being created";
     };
 
-    showSignColumn = mkOption {
-      type = bool;
-      default = true;
-      description = "Show the sign column";
-    };
-
     bell = mkOption {
       type = enum ["none" "visual" "on"];
       default = "none";
@@ -109,74 +103,70 @@ in {
     # Options that are more difficult to set through 'vim.options'. Fear not, though
     # as the Lua DAG is still as powerful as it could be.
     luaConfigRC.basic = entryAfter ["globalsScript"] ''
-      -- Settings that are set for everything
-      vim.opt.shortmess:append("c")
+       -- Settings that are set for everything
+       vim.opt.shortmess:append("c")
 
-      ${optionalString cfg.undoFile.enable ''
+       ${optionalString cfg.undoFile.enable ''
         vim.o.undofile = true
         vim.o.undodir = ${toLuaObject cfg.undoFile.path}
       ''}
 
-      ${optionalString cfg.showSignColumn ''
-        vim.o.signcolumn = "yes"
-      ''}
-
       ${optionalString cfg.preventJunkFiles ''
         vim.o.swapfile = false
         vim.o.backup = false
         vim.o.writebackup = false
       ''}
 
-      ${optionalString (cfg.bell == "none") ''
+       ${optionalString (cfg.bell == "none") ''
         vim.o.errorbells = false
         vim.o.visualbell = false
       ''}
 
-      ${optionalString (cfg.bell == "on") ''
+       ${optionalString (cfg.bell == "on") ''
         vim.o.visualbell = false
       ''}
 
-      ${optionalString (cfg.bell == "visual") ''
+       ${optionalString (cfg.bell == "visual") ''
         vim.o.errorbells = false
       ''}
 
-      ${optionalString (cfg.lineNumberMode == "relative") ''
+       ${optionalString (cfg.lineNumberMode == "relative") ''
         vim.o.relativenumber = true
       ''}
 
-      ${optionalString (cfg.lineNumberMode == "number") ''
+       ${optionalString (cfg.lineNumberMode == "number") ''
         vim.o.number = true
       ''}
 
-      ${optionalString (cfg.lineNumberMode == "relNumber") ''
+       ${optionalString (cfg.lineNumberMode == "relNumber") ''
         vim.o.number = true
         vim.o.relativenumber = true
       ''}
 
-      ${optionalString cfg.useSystemClipboard ''
+       ${optionalString cfg.useSystemClipboard ''
         vim.opt.clipboard:append("unnamedplus")
       ''}
 
-      ${optionalString cfg.syntaxHighlighting ''
+       ${optionalString cfg.syntaxHighlighting ''
         vim.cmd("syntax on")
       ''}
 
-      ${optionalString cfg.hideSearchHighlight ''
+       ${optionalString cfg.hideSearchHighlight ''
         vim.o.hlsearch = false
         vim.o.incsearch = true
       ''}
 
-      ${optionalString (cfg.searchCase == "ignore") ''
+       ${optionalString (cfg.searchCase == "ignore") ''
         vim.o.smartcase = false
         vim.o.ignorecase = true
       ''}
 
-      ${optionalString (cfg.searchCase == "smart") ''
+       ${optionalString (cfg.searchCase == "smart") ''
         vim.o.smartcase = true
         vim.o.ignorecase = true
       ''}
 
-      ${optionalString (cfg.searchCase == "sensitive") ''
+       ${optionalString (cfg.searchCase == "sensitive") ''
         vim.o.smartcase = false
         vim.o.ignorecase = false
       ''}
diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index fc9938ba..1a7ea8b1 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -6,6 +6,7 @@
   inherit (lib.options) mkOption mkEnableOption literalMD literalExpression;
   inherit (lib.strings) optionalString;
   inherit (lib.types) str bool int enum attrsOf lines listOf either path submodule anything;
+  inherit (lib.nvim.languages) toVimBool;
   inherit (lib.nvim.types) dagOf;
   inherit (lib.nvim.lua) listToLuaTable;
 
@@ -227,6 +228,13 @@ in {
             default = true;
             description = "Enable word wrapping.";
           };
+
+          signcolumn = mkOption {
+            type = bool;
+            default = true;
+            apply = x: toVimBool x; # convert to a yes/no str
+            description = "Show the sign column";
+          };
         };
       };
 

From c19c925f1dd8d86e82f6fe78ca2e42ff8883bcb1 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 3 Dec 2024 01:03:45 +0300
Subject: [PATCH 004/202] modules/neovim: avoid interpolating strings for
 `vim.preventJunkFiles`

---
 modules/neovim/init/basic.nix | 42 +++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/modules/neovim/init/basic.nix b/modules/neovim/init/basic.nix
index ef899cf4..f91ea9a1 100644
--- a/modules/neovim/init/basic.nix
+++ b/modules/neovim/init/basic.nix
@@ -95,78 +95,78 @@ in {
     # and 'vim.globals' (vim.g). Future options, if possible, should be added here instead of the
     # luaConfigRC section below.
     options = pushDownDefault {
+      # Options that are always set, with a lower priority
       encoding = "utf-8";
       hidden = true;
       expandtab = true;
+
+      # Junkfile Behaviour
+      swapfile = !cfg.preventJunkFiles;
+      backup = !cfg.preventJunkFiles;
+      writebackup = !cfg.preventJunkFiles;
     };
 
     # Options that are more difficult to set through 'vim.options'. Fear not, though
     # as the Lua DAG is still as powerful as it could be.
     luaConfigRC.basic = entryAfter ["globalsScript"] ''
-       -- Settings that are set for everything
-       vim.opt.shortmess:append("c")
+      -- Settings that are set for everything
+      vim.opt.shortmess:append("c")
 
-       ${optionalString cfg.undoFile.enable ''
+      ${optionalString cfg.undoFile.enable ''
         vim.o.undofile = true
         vim.o.undodir = ${toLuaObject cfg.undoFile.path}
       ''}
 
-      ${optionalString cfg.preventJunkFiles ''
-        vim.o.swapfile = false
-        vim.o.backup = false
-        vim.o.writebackup = false
-      ''}
-
-       ${optionalString (cfg.bell == "none") ''
+      ${optionalString (cfg.bell == "none") ''
         vim.o.errorbells = false
         vim.o.visualbell = false
       ''}
 
-       ${optionalString (cfg.bell == "on") ''
+      ${optionalString (cfg.bell == "on") ''
         vim.o.visualbell = false
       ''}
 
-       ${optionalString (cfg.bell == "visual") ''
+      ${optionalString (cfg.bell == "visual") ''
         vim.o.errorbells = false
       ''}
 
-       ${optionalString (cfg.lineNumberMode == "relative") ''
+      ${optionalString (cfg.lineNumberMode == "relative") ''
         vim.o.relativenumber = true
       ''}
 
-       ${optionalString (cfg.lineNumberMode == "number") ''
+      ${optionalString (cfg.lineNumberMode == "number") ''
         vim.o.number = true
       ''}
 
-       ${optionalString (cfg.lineNumberMode == "relNumber") ''
+      ${optionalString (cfg.lineNumberMode == "relNumber") ''
         vim.o.number = true
         vim.o.relativenumber = true
       ''}
 
-       ${optionalString cfg.useSystemClipboard ''
+      ${optionalString cfg.useSystemClipboard ''
         vim.opt.clipboard:append("unnamedplus")
       ''}
 
-       ${optionalString cfg.syntaxHighlighting ''
+      ${optionalString cfg.syntaxHighlighting ''
         vim.cmd("syntax on")
       ''}
 
-       ${optionalString cfg.hideSearchHighlight ''
+      ${optionalString cfg.hideSearchHighlight ''
         vim.o.hlsearch = false
         vim.o.incsearch = true
       ''}
 
-       ${optionalString (cfg.searchCase == "ignore") ''
+      ${optionalString (cfg.searchCase == "ignore") ''
         vim.o.smartcase = false
         vim.o.ignorecase = true
       ''}
 
-       ${optionalString (cfg.searchCase == "smart") ''
+      ${optionalString (cfg.searchCase == "smart") ''
         vim.o.smartcase = true
         vim.o.ignorecase = true
       ''}
 
-       ${optionalString (cfg.searchCase == "sensitive") ''
+      ${optionalString (cfg.searchCase == "sensitive") ''
         vim.o.smartcase = false
         vim.o.ignorecase = false
       ''}

From 66005a51c380cc8ca3597b1e092cb343d900ad93 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 11 Dec 2024 00:08:48 +0300
Subject: [PATCH 005/202] wrappr/rc: allow strings in `vim.options.signcolumn`

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

diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index 1a7ea8b1..980c9497 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -6,6 +6,7 @@
   inherit (lib.options) mkOption mkEnableOption literalMD literalExpression;
   inherit (lib.strings) optionalString;
   inherit (lib.types) str bool int enum attrsOf lines listOf either path submodule anything;
+  inherit (lib.trivial) isBool;
   inherit (lib.nvim.languages) toVimBool;
   inherit (lib.nvim.types) dagOf;
   inherit (lib.nvim.lua) listToLuaTable;
@@ -230,9 +231,12 @@ in {
           };
 
           signcolumn = mkOption {
-            type = bool;
+            type = either str bool;
             default = true;
-            apply = x: toVimBool x; # convert to a yes/no str
+            apply = x:
+              if isBool x
+              then toVimBool x # convert to a yes/no str
+              else x;
             description = "Show the sign column";
           };
         };

From 8febf44422f4404dcc1838ee55972733e092866c Mon Sep 17 00:00:00 2001
From: raf <raf@notashelf.dev>
Date: Tue, 31 Dec 2024 07:02:13 +0300
Subject: [PATCH 006/202] languages/markdown: add `render-markdown.nvim` as an
 extension (#517)

---
 docs/release-notes/rl-0.8.md           |  4 +++
 flake.lock                             | 17 +++++++++++
 flake.nix                              |  5 ++++
 modules/plugins/languages/markdown.nix | 40 +++++++++++++++++++++++---
 4 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 567e4e6e..e41911ba 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -3,12 +3,16 @@
 [NotAShelf](https://github.com/notashelf):
 
 [typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim
+[render-markdown.nvim]: https://github.com/MeanderingProgrammer/render-markdown.nvim
 
 - Add [typst-preview.nvim] under
   `languages.typst.extensions.typst-preview-nvim`.
 
 - Add a search widget to the options page in the nvf manual.
 
+- Add [render-markdown.nvim] under
+  `languages.markdown.extensions.render-markdown-nvim`
+
 [amadaluzia](https://github.com/amadaluzia):
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
diff --git a/flake.lock b/flake.lock
index fd404df6..0a7ee1a5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1694,6 +1694,22 @@
         "type": "github"
       }
     },
+    "plugin-render-markdown-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1735525479,
+        "narHash": "sha256-ncFqBv0JITX3pTsLON+HctLUaKXhLRMBUrRWmI8KOSA=",
+        "owner": "MeanderingProgrammer",
+        "repo": "render-markdown.nvim",
+        "rev": "6fbd1491abc104409f119685de5353c35c97c005",
+        "type": "github"
+      },
+      "original": {
+        "owner": "MeanderingProgrammer",
+        "repo": "render-markdown.nvim",
+        "type": "github"
+      }
+    },
     "plugin-rose-pine": {
       "flake": false,
       "locked": {
@@ -2170,6 +2186,7 @@
         "plugin-precognition-nvim": "plugin-precognition-nvim",
         "plugin-project-nvim": "plugin-project-nvim",
         "plugin-registers": "plugin-registers",
+        "plugin-render-markdown-nvim": "plugin-render-markdown-nvim",
         "plugin-rose-pine": "plugin-rose-pine",
         "plugin-rtp-nvim": "plugin-rtp-nvim",
         "plugin-run-nvim": "plugin-run-nvim",
diff --git a/flake.nix b/flake.nix
index 161ba43f..0fd3cc8c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -488,6 +488,11 @@
       flake = false;
     };
 
+    plugin-render-markdown-nvim = {
+      url = "github:MeanderingProgrammer/render-markdown.nvim";
+      flake = false;
+    };
+
     # Minimap
     plugin-minimap-vim = {
       url = "github:wfxr/minimap.vim";
diff --git a/modules/plugins/languages/markdown.nix b/modules/plugins/languages/markdown.nix
index e0164771..ab184835 100644
--- a/modules/plugins/languages/markdown.nix
+++ b/modules/plugins/languages/markdown.nix
@@ -4,13 +4,14 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames concatLists;
+  inherit (builtins) attrNames;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.lists) isList;
+  inherit (lib.lists) isList concatLists;
   inherit (lib.types) bool enum either package listOf str;
-  inherit (lib.nvim.lua) expToLua;
-  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua toLuaObject;
+  inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
+  inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.languages.markdown;
   defaultServer = "marksman";
@@ -98,6 +99,29 @@ in {
         description = "Extra filetypes to format with the Markdown formatter";
       };
     };
+
+    extensions = {
+      render-markdown-nvim = {
+        enable =
+          mkEnableOption ""
+          // {
+            description = ''
+              [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;
+          };
+        };
+      };
+    };
   };
 
   config = mkIf cfg.enable (mkMerge [
@@ -115,5 +139,13 @@ in {
       vim.lsp.null-ls.enable = true;
       vim.lsp.null-ls.sources.markdown-format = formats.${cfg.format.type}.nullConfig;
     })
+
+    # Extensions
+    (mkIf cfg.extensions.render-markdown-nvim.enable {
+      vim.startPlugins = ["render-markdown-nvim"];
+      vim.pluginRC.render-markdown-nvim = entryAnywhere ''
+        require("render-markdown").setup(${toLuaObject cfg.extensions.render-markdown-nvim.setupOpts})
+      '';
+    })
   ]);
 }

From f9d1684b5fdd33fbf03069d25105d5147f1b65e1 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 22 Dec 2024 21:46:17 +0100
Subject: [PATCH 007/202] wrapper: rename build dir to environemnt

---
 modules/modules.nix                                | 2 +-
 modules/wrapper/{build => environment}/config.nix  | 0
 modules/wrapper/{build => environment}/default.nix | 0
 modules/wrapper/{build => environment}/options.nix | 0
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename modules/wrapper/{build => environment}/config.nix (100%)
 rename modules/wrapper/{build => environment}/default.nix (100%)
 rename modules/wrapper/{build => environment}/options.nix (100%)

diff --git a/modules/modules.nix b/modules/modules.nix
index bc441e96..ee37a0e7 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -48,7 +48,7 @@
     # The neovim wrapper, used to build a wrapped neovim package
     # using the configuration passed in `neovim` and `plugins` modules.
     wrapper = map (p: ./wrapper + "/${p}") [
-      "build"
+      "environment"
       "rc"
       "warnings"
       "lazy"
diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/environment/config.nix
similarity index 100%
rename from modules/wrapper/build/config.nix
rename to modules/wrapper/environment/config.nix
diff --git a/modules/wrapper/build/default.nix b/modules/wrapper/environment/default.nix
similarity index 100%
rename from modules/wrapper/build/default.nix
rename to modules/wrapper/environment/default.nix
diff --git a/modules/wrapper/build/options.nix b/modules/wrapper/environment/options.nix
similarity index 100%
rename from modules/wrapper/build/options.nix
rename to modules/wrapper/environment/options.nix

From 26398b6b14bfdf9de261300fde56111ce9c0edcb Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 22 Dec 2024 21:49:11 +0100
Subject: [PATCH 008/202] wrapper: add built package as option

---
 modules/modules.nix                           |   1 +
 modules/wrapper/build/config.nix              | 111 ++++++++++++++++++
 modules/wrapper/build/default.nix             |   6 +
 modules/wrapper/build/options.nix             |  12 ++
 .../build/patches}/flutter-tools.patch        |   0
 5 files changed, 130 insertions(+)
 create mode 100644 modules/wrapper/build/config.nix
 create mode 100644 modules/wrapper/build/default.nix
 create mode 100644 modules/wrapper/build/options.nix
 rename {patches => modules/wrapper/build/patches}/flutter-tools.patch (100%)

diff --git a/modules/modules.nix b/modules/modules.nix
index ee37a0e7..6e05c592 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -48,6 +48,7 @@
     # The neovim wrapper, used to build a wrapped neovim package
     # using the configuration passed in `neovim` and `plugins` modules.
     wrapper = map (p: ./wrapper + "/${p}") [
+      "build"
       "environment"
       "rc"
       "warnings"
diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix
new file mode 100644
index 00000000..1faa2ccc
--- /dev/null
+++ b/modules/wrapper/build/config.nix
@@ -0,0 +1,111 @@
+{
+  inputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}
+: let
+  inherit (pkgs) vimPlugins;
+  inherit (lib.strings) isString;
+  inherit (lib.lists) filter map;
+
+  # alias to the internal configuration
+  vimOptions = config.vim;
+
+  noBuildPlug = {pname, ...} @ attrs: let
+    src = inputs."plugin-${attrs.pname}";
+  in
+    {
+      version = src.shortRev or src.shortDirtyRev or "dirty";
+      outPath = src;
+      passthru.vimPlugin = false;
+    }
+    // attrs;
+
+  # build a vim plugin with the given name and arguments
+  # if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug
+  # instead
+  buildPlug = attrs: let
+    src = inputs."plugin-${attrs.pname}";
+  in
+    pkgs.vimUtils.buildVimPlugin (
+      {
+        version = src.shortRev or src.shortDirtyRev or "dirty";
+        inherit src;
+      }
+      // attrs
+    );
+
+  buildTreesitterPlug = grammars: vimPlugins.nvim-treesitter.withPlugins (_: grammars);
+
+  pluginBuilders = {
+    nvim-treesitter = buildTreesitterPlug vimOptions.treesitter.grammars;
+    flutter-tools-patched = buildPlug {
+      pname = "flutter-tools";
+      patches = [./patches/flutter-tools.patch];
+    };
+  };
+
+  buildConfigPlugins = plugins:
+    map (
+      plug:
+        if (isString plug)
+        then pluginBuilders.${plug} or (noBuildPlug {pname = plug;})
+        else plug
+    ) (filter (f: f != null) plugins);
+
+  # built (or "normalized") plugins that are modified
+  builtStartPlugins = buildConfigPlugins vimOptions.startPlugins;
+  builtOptPlugins = map (package: package // {optional = true;}) (buildConfigPlugins vimOptions.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}) vimOptions.luaPackages;
+  extraPython3Packages = ps: map (x: ps.${x}) vimOptions.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 {
+    neovim = vimOptions.package;
+    plugins = builtStartPlugins ++ builtOptPlugins;
+    appName = "nvf";
+    extraBinPath = vimOptions.extraPackages;
+    initLua = vimOptions.builtLuaConfigRC;
+    luaFiles = vimOptions.extraLuaFiles;
+
+    inherit (vimOptions) viAlias vimAlias withRuby withNodeJs withPython3;
+    inherit extraLuaPackages extraPython3Packages;
+  };
+
+  dummyInit = pkgs.writeText "nvf-init.lua" vimOptions.builtLuaConfigRC;
+  # Additional helper scripts for printing and displaying nvf configuration
+  # in your commandline.
+  printConfig = pkgs.writers.writeDashBin "nvf-print-config" "cat ${dummyInit}";
+  printConfigPath = pkgs.writers.writeDashBin "nvf-print-config-path" "echo -n ${dummyInit}";
+
+  # Expose wrapped neovim-package for userspace
+  # or module consumption.
+  neovim = pkgs.symlinkJoin {
+    name = "nvf-with-helpers";
+    paths = [neovim-wrapped printConfig printConfigPath];
+    postBuild = "echo Helpers added";
+
+    # Allow evaluating vimOptions, i.e., config.vim from the packages' passthru
+    # attribute. For example, packages.x86_64-linux.neovim.passthru.neovimConfig
+    # will return the configuration in full.
+    passthru.neovimConfig = vimOptions;
+
+    meta =
+      neovim-wrapped.meta
+      // {
+        description = "Wrapped Neovim package with helper scripts to print the config (path)";
+      };
+  };
+in {
+  config.vim.build = {
+    finalPackage = neovim;
+  };
+}
diff --git a/modules/wrapper/build/default.nix b/modules/wrapper/build/default.nix
new file mode 100644
index 00000000..0ebefe45
--- /dev/null
+++ b/modules/wrapper/build/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./options.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/wrapper/build/options.nix b/modules/wrapper/build/options.nix
new file mode 100644
index 00000000..fa1db61e
--- /dev/null
+++ b/modules/wrapper/build/options.nix
@@ -0,0 +1,12 @@
+{lib, ...}: let
+  inherit (lib.types) package;
+  inherit (lib.options) mkOption;
+in {
+  options.vim.build = {
+    finalPackage = mkOption {
+      type = package;
+      readOnly = true;
+      description = "final output package";
+    };
+  };
+}
diff --git a/patches/flutter-tools.patch b/modules/wrapper/build/patches/flutter-tools.patch
similarity index 100%
rename from patches/flutter-tools.patch
rename to modules/wrapper/build/patches/flutter-tools.patch

From 7d043e5f14cb6e2639f6266adbb9381cdc6cf6bf Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 22 Dec 2024 21:50:13 +0100
Subject: [PATCH 009/202] home-manager: use proper submodule type for settings

---
 flake.nix                      |  2 +-
 flake/modules/home-manager.nix | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0fd3cc8c..7cbcfeeb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,7 @@
         };
 
         homeManagerModules = {
-          nvf = import ./flake/modules/home-manager.nix self.packages lib;
+          nvf = import ./flake/modules/home-manager.nix self.packages lib inputs;
           default = self.homeManagerModules.nvf;
           neovim-flake =
             lib.warn ''
diff --git a/flake/modules/home-manager.nix b/flake/modules/home-manager.nix
index 77b8448c..d1e85368 100644
--- a/flake/modules/home-manager.nix
+++ b/flake/modules/home-manager.nix
@@ -1,5 +1,5 @@
 # Home Manager module
-packages: lib: {
+packages: lib: inputs: {
   config,
   pkgs,
   ...
@@ -8,15 +8,19 @@ packages: lib: {
   inherit (lib.modules) mkIf mkAliasOptionModule;
   inherit (lib.lists) optional;
   inherit (lib.options) mkOption mkEnableOption literalExpression;
-  inherit (lib.types) attrsOf anything bool;
-  inherit (lib.nvim) neovimConfiguration;
-  inherit (lib.nvim.types) anythingConcatLists;
+  inherit (lib.types) anything bool submoduleWith;
 
   cfg = config.programs.nvf;
 
-  neovimConfigured = neovimConfiguration {
-    inherit pkgs;
-    modules = [cfg.settings];
+  nvfModule = submoduleWith {
+    description = "Nvf module";
+    class = "nvf";
+    specialArgs = {
+      inherit pkgs lib inputs;
+    };
+    modules = [
+      {imports = import ../../modules/modules.nix {inherit pkgs lib;};}
+    ];
   };
 in {
   imports = [
@@ -55,7 +59,7 @@ in {
     };
 
     settings = mkOption {
-      type = attrsOf anythingConcatLists;
+      type = nvfModule;
       default = {};
       description = "Attribute set of nvf preferences.";
       example = literalExpression ''
@@ -78,7 +82,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    programs.nvf.finalPackage = neovimConfigured.neovim;
+    programs.nvf.finalPackage = cfg.settings.vim.build.finalPackage;
 
     home = {
       sessionVariables = mkIf cfg.defaultEditor {EDITOR = "nvim";};

From 8c1352502a3cb7a30c8cc015fb65f3b6c884a28d Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 22 Dec 2024 21:59:24 +0100
Subject: [PATCH 010/202] module: remove redundant code

the bulk of the build step is moved to modules/wrapper/build
---
 modules/default.nix | 105 ++++----------------------------------------
 1 file changed, 9 insertions(+), 96 deletions(-)

diff --git a/modules/default.nix b/modules/default.nix
index a2f8730d..a207e0d1 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -9,9 +9,8 @@
   extraModules ? [],
   configuration ? {},
 }: let
-  inherit (pkgs) vimPlugins;
-  inherit (lib.strings) isString toString;
-  inherit (lib.lists) filter map concatLists;
+  inherit (lib.strings) toString;
+  inherit (lib.lists) concatLists;
 
   # import modules.nix with `check`, `pkgs` and `lib` as arguments
   # check can be disabled while calling this file is called
@@ -21,7 +20,12 @@
   # evaluate the extended library with the modules
   # optionally with any additional modules passed by the user
   module = lib.evalModules {
-    specialArgs = extraSpecialArgs // {modulesPath = toString ./.;};
+    specialArgs =
+      extraSpecialArgs
+      // {
+        inherit inputs;
+        modulesPath = toString ./.;
+      };
     modules = concatLists [
       nvimModules
       modules
@@ -36,102 +40,11 @@
         extraModules))
     ];
   };
-
-  # alias to the internal configuration
-  vimOptions = module.config.vim;
-
-  noBuildPlug = {pname, ...} @ attrs: let
-    src = inputs."plugin-${attrs.pname}";
-  in
-    {
-      version = src.shortRev or src.shortDirtyRev or "dirty";
-      outPath = src;
-      passthru.vimPlugin = false;
-    }
-    // attrs;
-
-  # build a vim plugin with the given name and arguments
-  # if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug
-  # instead
-  buildPlug = attrs: let
-    src = inputs."plugin-${attrs.pname}";
-  in
-    pkgs.vimUtils.buildVimPlugin (
-      {
-        version = src.shortRev or src.shortDirtyRev or "dirty";
-        inherit src;
-      }
-      // attrs
-    );
-
-  buildTreesitterPlug = grammars: vimPlugins.nvim-treesitter.withPlugins (_: grammars);
-
-  pluginBuilders = {
-    nvim-treesitter = buildTreesitterPlug vimOptions.treesitter.grammars;
-    flutter-tools-patched = buildPlug {
-      pname = "flutter-tools";
-      patches = [../patches/flutter-tools.patch];
-    };
-  };
-
-  buildConfigPlugins = plugins:
-    map (
-      plug:
-        if (isString plug)
-        then pluginBuilders.${plug} or (noBuildPlug {pname = plug;})
-        else plug
-    ) (filter (f: f != null) plugins);
-
-  # built (or "normalized") plugins that are modified
-  builtStartPlugins = buildConfigPlugins vimOptions.startPlugins;
-  builtOptPlugins = map (package: package // {optional = true;}) (buildConfigPlugins vimOptions.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}) vimOptions.luaPackages;
-  extraPython3Packages = ps: map (x: ps.${x}) vimOptions.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 {
-    neovim = vimOptions.package;
-    plugins = builtStartPlugins ++ builtOptPlugins;
-    appName = "nvf";
-    extraBinPath = vimOptions.extraPackages;
-    initLua = vimOptions.builtLuaConfigRC;
-    luaFiles = vimOptions.extraLuaFiles;
-
-    inherit (vimOptions) viAlias vimAlias withRuby withNodeJs withPython3;
-    inherit extraLuaPackages extraPython3Packages;
-  };
-
-  dummyInit = pkgs.writeText "nvf-init.lua" vimOptions.builtLuaConfigRC;
-  # Additional helper scripts for printing and displaying nvf configuration
-  # in your commandline.
-  printConfig = pkgs.writers.writeDashBin "nvf-print-config" "cat ${dummyInit}";
-  printConfigPath = pkgs.writers.writeDashBin "nvf-print-config-path" "echo -n ${dummyInit}";
 in {
   inherit (module) options config;
   inherit (module._module.args) pkgs;
 
   # Expose wrapped neovim-package for userspace
   # or module consumption.
-  neovim = pkgs.symlinkJoin {
-    name = "nvf-with-helpers";
-    paths = [neovim-wrapped printConfig printConfigPath];
-    postBuild = "echo Helpers added";
-
-    # Allow evaluating vimOptions, i.e., config.vim from the packages' passthru
-    # attribute. For example, packages.x86_64-linux.neovim.passthru.neovimConfig
-    # will return the configuration in full.
-    passthru.neovimConfig = vimOptions;
-
-    meta =
-      neovim-wrapped.meta
-      // {
-        description = "Wrapped Neovim package with helper scripts to print the config (path)";
-      };
-  };
+  neovim = module.config.vim.build.finalPackage;
 }

From 98b36e08f0311a9c95076cd28cd483ed398ddb1e Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 22 Dec 2024 23:05:06 +0100
Subject: [PATCH 011/202] nixos: use proper submodule type for settings

---
 flake.nix               |  2 +-
 flake/modules/nixos.nix | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7cbcfeeb..36929113 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,7 +42,7 @@
         };
 
         nixosModules = {
-          nvf = import ./flake/modules/nixos.nix self.packages lib;
+          nvf = import ./flake/modules/nixos.nix self.packages lib inputs;
           default = self.nixosModules.nvf;
           neovim-flake =
             lib.warn ''
diff --git a/flake/modules/nixos.nix b/flake/modules/nixos.nix
index 022b3d94..b4957700 100644
--- a/flake/modules/nixos.nix
+++ b/flake/modules/nixos.nix
@@ -1,5 +1,5 @@
 # NixOS module
-packages: lib: {
+packages: lib: inputs: {
   config,
   pkgs,
   ...
@@ -8,15 +8,19 @@ packages: lib: {
   inherit (lib.modules) mkIf mkOverride mkAliasOptionModule;
   inherit (lib.lists) optional;
   inherit (lib.options) mkOption mkEnableOption literalExpression;
-  inherit (lib.types) attrsOf anything bool;
-  inherit (lib.nvim) neovimConfiguration;
-  inherit (lib.nvim.types) anythingConcatLists;
+  inherit (lib.types) anything bool submoduleWith;
 
   cfg = config.programs.nvf;
 
-  neovimConfigured = neovimConfiguration {
-    inherit pkgs;
-    modules = [cfg.settings];
+  nvfModule = submoduleWith {
+    description = "Nvf module";
+    class = "nvf";
+    specialArgs = {
+      inherit pkgs lib inputs;
+    };
+    modules = [
+      {imports = import ../../modules/modules.nix {inherit pkgs lib;};}
+    ];
   };
 in {
   imports = [
@@ -55,7 +59,7 @@ in {
     };
 
     settings = mkOption {
-      type = attrsOf anythingConcatLists;
+      type = nvfModule;
       default = {};
       description = "Attribute set of nvf preferences.";
       example = literalExpression ''
@@ -78,7 +82,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    programs.nvf.finalPackage = neovimConfigured.neovim;
+    programs.nvf.finalPackage = cfg.settings.vim.build.finalPackage;
 
     environment = {
       variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "nvim");

From 411e641eab7634ec20c2328b004879acd3d0539e Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 22 Dec 2024 23:00:26 +0100
Subject: [PATCH 012/202] lib: remove anythingConcatLists

---
 lib/types/custom.nix  | 55 +++----------------------------------------
 lib/types/default.nix |  2 +-
 2 files changed, 4 insertions(+), 53 deletions(-)

diff --git a/lib/types/custom.nix b/lib/types/custom.nix
index 3d4a2bcb..c42cd2ce 100644
--- a/lib/types/custom.nix
+++ b/lib/types/custom.nix
@@ -1,57 +1,8 @@
 {lib}: let
-  inherit (lib.options) showOption showFiles getFiles mergeOneOption mergeEqualOption;
-  inherit (lib.strings) isString isStringLike;
-  inherit (lib.types) anything attrsOf listOf mkOptionType;
-  inherit (lib.nvim.types) anythingConcatLists;
-  inherit (builtins) typeOf isAttrs any head concatLists stringLength match;
+  inherit (lib.options) mergeEqualOption;
+  inherit (lib.strings) isString stringLength match;
+  inherit (lib.types) listOf mkOptionType;
 in {
-  # HACK: Does this break anything in our case?
-  # A modified version of the nixpkgs anything type that concatenates lists
-  # This isn't the default because the order in which the lists are concatenated depends on the order in which the modules are imported,
-  # which makes it non-deterministic
-  anythingConcatLists =
-    anything
-    // {
-      merge = loc: defs: let
-        getType = value:
-          if isAttrs value && isStringLike value
-          then "stringCoercibleSet"
-          else typeOf value;
-
-        # Throw an error if not all defs have the same type
-        checkType = getType (head defs).value;
-        commonType =
-          if any (def: getType def.value != checkType) defs
-          then throw "The option `${showOption loc}' has conflicting option types in ${showFiles (getFiles defs)}"
-          else checkType;
-
-        mergeFunctions = {
-          # Recursively merge attribute sets
-          set = (attrsOf anythingConcatLists).merge;
-
-          # Overridden behavior for lists, that concatenates lists
-          list = _: defs: concatLists (map (e: e.value) defs);
-
-          # This means it's a package, only accept a single definition
-          stringCoercibleSet = mergeOneOption;
-
-          # This works by passing the argument to the functions,
-          # and merging their returns values instead
-          lambda = loc: defs: arg:
-            anythingConcatLists.merge
-            (loc ++ ["<function body>"])
-            (map (def: {
-                inherit (def) file;
-                value = def.value arg;
-              })
-              defs);
-        };
-      in
-        # Merge the defs with the correct function from above, if available
-        # otherwise only allow equal values
-        (mergeFunctions.${commonType} or mergeEqualOption) loc defs;
-    };
-
   mergelessListOf = elemType: let
     super = listOf elemType;
   in
diff --git a/lib/types/default.nix b/lib/types/default.nix
index 73b35956..c1c16715 100644
--- a/lib/types/default.nix
+++ b/lib/types/default.nix
@@ -11,5 +11,5 @@ in {
   inherit (typesDag) dagOf;
   inherit (typesPlugin) pluginsOpt extraPluginType mkPluginSetupOption luaInline pluginType borderType;
   inherit (typesLanguage) diagnostics mkGrammarOption;
-  inherit (customTypes) anythingConcatLists char hexColor mergelessListOf;
+  inherit (customTypes) char hexColor mergelessListOf;
 }

From 9ccd0bfd4eda390415b8664f4155f148e4bbf13c Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 29 Dec 2024 18:20:51 +0100
Subject: [PATCH 013/202] home-manager: remove redundant import module

---
 flake/modules/home-manager.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/flake/modules/home-manager.nix b/flake/modules/home-manager.nix
index d1e85368..c109e774 100644
--- a/flake/modules/home-manager.nix
+++ b/flake/modules/home-manager.nix
@@ -18,9 +18,7 @@ packages: lib: inputs: {
     specialArgs = {
       inherit pkgs lib inputs;
     };
-    modules = [
-      {imports = import ../../modules/modules.nix {inherit pkgs lib;};}
-    ];
+    modules = import ../../modules/modules.nix {inherit pkgs lib;};
   };
 in {
   imports = [

From 59bf01bbe09d4f85543c106dc47da0cde45d22c1 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 29 Dec 2024 18:25:20 +0100
Subject: [PATCH 014/202] nixos: remove redundant import module

---
 flake/modules/nixos.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/flake/modules/nixos.nix b/flake/modules/nixos.nix
index b4957700..b53d4fc9 100644
--- a/flake/modules/nixos.nix
+++ b/flake/modules/nixos.nix
@@ -18,9 +18,7 @@ packages: lib: inputs: {
     specialArgs = {
       inherit pkgs lib inputs;
     };
-    modules = [
-      {imports = import ../../modules/modules.nix {inherit pkgs lib;};}
-    ];
+    modules = import ../../modules/modules.nix {inherit pkgs lib;};
   };
 in {
   imports = [

From fcbc49e2e56b701bc42e6e02459e321be1f64faf Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 29 Dec 2024 18:46:55 +0100
Subject: [PATCH 015/202] home-manager: use attr for long function args

---
 flake.nix                      | 2 +-
 flake/modules/home-manager.nix | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index 36929113..53e592aa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,7 @@
         };
 
         homeManagerModules = {
-          nvf = import ./flake/modules/home-manager.nix self.packages lib inputs;
+          nvf = import ./flake/modules/home-manager.nix {inherit lib self;};
           default = self.homeManagerModules.nvf;
           neovim-flake =
             lib.warn ''
diff --git a/flake/modules/home-manager.nix b/flake/modules/home-manager.nix
index c109e774..715f7537 100644
--- a/flake/modules/home-manager.nix
+++ b/flake/modules/home-manager.nix
@@ -1,9 +1,13 @@
 # Home Manager module
-packages: lib: inputs: {
+{
+  self,
+  lib,
+}: {
   config,
   pkgs,
   ...
 }: let
+  inherit (self) packages inputs;
   inherit (lib) maintainers;
   inherit (lib.modules) mkIf mkAliasOptionModule;
   inherit (lib.lists) optional;

From ecc9b60a2d1555ef04490fe25444636b0907cde2 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 29 Dec 2024 18:47:22 +0100
Subject: [PATCH 016/202] nixos: use attrset for long function args

---
 flake.nix               | 2 +-
 flake/modules/nixos.nix | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index 53e592aa..d5a7b709 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,7 +42,7 @@
         };
 
         nixosModules = {
-          nvf = import ./flake/modules/nixos.nix self.packages lib inputs;
+          nvf = import ./flake/modules/nixos.nix {inherit lib self;};
           default = self.nixosModules.nvf;
           neovim-flake =
             lib.warn ''
diff --git a/flake/modules/nixos.nix b/flake/modules/nixos.nix
index b53d4fc9..ecc173a1 100644
--- a/flake/modules/nixos.nix
+++ b/flake/modules/nixos.nix
@@ -1,9 +1,13 @@
 # NixOS module
-packages: lib: inputs: {
+{
+  self,
+  lib,
+}: {
   config,
   pkgs,
   ...
 }: let
+  inherit (self) inputs packages;
   inherit (lib) maintainers;
   inherit (lib.modules) mkIf mkOverride mkAliasOptionModule;
   inherit (lib.lists) optional;

From af0eed84e06784b6c86abe78be5ed454ac2a5ea0 Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Wed, 1 Jan 2025 12:59:13 +0100
Subject: [PATCH 017/202] wrapper/build: improve noBuildPlug

---
 modules/wrapper/build/config.nix | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix
index 1faa2ccc..ee5b4fda 100644
--- a/modules/wrapper/build/config.nix
+++ b/modules/wrapper/build/config.nix
@@ -9,30 +9,35 @@
   inherit (pkgs) vimPlugins;
   inherit (lib.strings) isString;
   inherit (lib.lists) filter map;
+  inherit (builtins) path;
 
   # alias to the internal configuration
   vimOptions = config.vim;
 
-  noBuildPlug = {pname, ...} @ attrs: let
-    src = inputs."plugin-${attrs.pname}";
-  in
-    {
-      version = src.shortRev or src.shortDirtyRev or "dirty";
-      outPath = src;
-      passthru.vimPlugin = false;
-    }
-    // attrs;
+  noBuildPlug = pname: let
+    input = inputs."plugin-${pname}";
+    version = input.shortRev or input.shortDirtyRev or "dirty";
+  in {
+    # vim.lazy.plugins relies on pname, so we only set that here
+    # version isn't needed for anything, but inherit it anyway for correctness
+    inherit pname version;
+    outPath = path {
+      name = "${pname}-0-unstable-${version}";
+      path = input.outPath;
+    };
+    passthru.vimPlugin = false;
+  };
 
   # build a vim plugin with the given name and arguments
   # if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug
   # instead
   buildPlug = attrs: let
-    src = inputs."plugin-${attrs.pname}";
+    input = inputs."plugin-${attrs.pname}";
   in
     pkgs.vimUtils.buildVimPlugin (
       {
-        version = src.shortRev or src.shortDirtyRev or "dirty";
-        inherit src;
+        version = input.shortRev or input.shortDirtyRev or "dirty";
+        src = input.outPath;
       }
       // attrs
     );
@@ -51,7 +56,7 @@
     map (
       plug:
         if (isString plug)
-        then pluginBuilders.${plug} or (noBuildPlug {pname = plug;})
+        then pluginBuilders.${plug} or (noBuildPlug plug)
         else plug
     ) (filter (f: f != null) plugins);
 

From fcc6aa485cca678c063cca1b85bafe78af8d1e49 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 4 Jan 2025 15:29:11 +0300
Subject: [PATCH 018/202] utility/wakatime: move plugin options to
 `vim.globals`; cleanup

---
 modules/plugins/utility/wakatime/config.nix       | 14 +++++++++-----
 modules/plugins/utility/wakatime/default.nix      |  2 +-
 modules/plugins/utility/wakatime/vim-wakatime.nix | 14 ++++++++++----
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/modules/plugins/utility/wakatime/config.nix b/modules/plugins/utility/wakatime/config.nix
index a1892e7b..675f0034 100644
--- a/modules/plugins/utility/wakatime/config.nix
+++ b/modules/plugins/utility/wakatime/config.nix
@@ -1,18 +1,22 @@
 {
   config,
-  lib,
   pkgs,
+  lib,
   ...
 }: let
   inherit (lib.modules) mkIf;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.utility.vim-wakatime;
 in {
   config = mkIf cfg.enable {
-    vim.startPlugins = [pkgs.vimPlugins.vim-wakatime];
+    vim = {
+      startPlugins = [pkgs.vimPlugins.vim-wakatime];
 
-    vim.pluginRC.vim-wakatime = mkIf (cfg.cli-package != null) ''
-      vim.g.wakatime_CLIPath = "${cfg.cli-package}"
-    '';
+      # Wakatime configuration is stored as vim globals.
+      globals = {
+        "wakatime_CLIPath" = mkIf (cfg.cli-package != null) "${getExe cfg.cli-package}";
+      };
+    };
   };
 }
diff --git a/modules/plugins/utility/wakatime/default.nix b/modules/plugins/utility/wakatime/default.nix
index d6d67d57..c72189d5 100644
--- a/modules/plugins/utility/wakatime/default.nix
+++ b/modules/plugins/utility/wakatime/default.nix
@@ -1,4 +1,4 @@
-_: {
+{
   imports = [
     ./config.nix
     ./vim-wakatime.nix
diff --git a/modules/plugins/utility/wakatime/vim-wakatime.nix b/modules/plugins/utility/wakatime/vim-wakatime.nix
index 6b853821..04f27868 100644
--- a/modules/plugins/utility/wakatime/vim-wakatime.nix
+++ b/modules/plugins/utility/wakatime/vim-wakatime.nix
@@ -1,18 +1,24 @@
 {
-  lib,
   pkgs,
+  lib,
   ...
 }: let
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.types) nullOr package;
 in {
   options.vim.utility.vim-wakatime = {
-    enable = mkEnableOption "vim-wakatime: live code statistics";
+    enable = mkEnableOption ''
+      automatic time tracking and metrics generated from your programming activity [vim-wakatime]
+    '';
 
     cli-package = mkOption {
       type = nullOr package;
-      default = pkgs.wakatime;
-      description = "The package that should be used for wakatime-cli. Set as null to use the default path in `$XDG_DATA_HOME`";
+      default = pkgs.wakatime-cli;
+      example = null;
+      description = ''
+        The package that should be used for wakatime-cli.
+        Set as null to use the default path in {env}`$XDG_DATA_HOME`
+      '';
     };
   };
 }

From eb6e8b17b7beffd3792d898e30b0e9cd80de06ae Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 4 Jan 2025 15:35:55 +0300
Subject: [PATCH 019/202] docs: clean up module installation chapters

---
 docs/manual/installation/modules/home-manager.md | 9 ++++++---
 docs/manual/installation/modules/nixos.md        | 7 +++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/manual/installation/modules/home-manager.md b/docs/manual/installation/modules/home-manager.md
index a2170159..cf56acc3 100644
--- a/docs/manual/installation/modules/home-manager.md
+++ b/docs/manual/installation/modules/home-manager.md
@@ -44,12 +44,15 @@ Followed by importing the home-manager module somewhere in your configuration.
   };
 
   outputs = { nixpkgs, home-manager, nvf, ... }: let
-  system = "x86_64-linux"; in {
+    system = "x86_64-linux";
+    pkgs = nixpkgs.legacyPackages.${system};
+  in {
     # ↓ this is your home output in the flake schema, expected by home-manager
-    "your-username@your-hostname" = home-manager.lib.homeManagerConfiguration
+    "your-username@your-hostname" = home-manager.lib.homeManagerConfiguration {
+      inherit pkgs;
       modules = [
         nvf.homeManagerModules.default # <- this imports the home-manager module that provides the options
-        ./home.nix # <- your home entrypoint
+        ./home.nix # <- your home entrypoint, `programs.nvf.*` may be defined here
       ];
     };
   };
diff --git a/docs/manual/installation/modules/nixos.md b/docs/manual/installation/modules/nixos.md
index d8be2035..ae5ce939 100644
--- a/docs/manual/installation/modules/nixos.md
+++ b/docs/manual/installation/modules/nixos.md
@@ -42,13 +42,12 @@ Followed by importing the NixOS module somewhere in your configuration.
     nvf.url = "github:notashelf/nvf";
   };
 
-  outputs = { nixpkgs, nvf, ... }: let
-  system = "x86_64-linux"; in {
+  outputs = { nixpkgs, nvf, ... }: {
     # ↓ this is your host output in the flake schema
-    nixosConfigurations."yourUsername»" = nixpkgs.lib.nixosSystem {
+    nixosConfigurations."your-hostname" = nixpkgs.lib.nixosSystem {
       modules = [
         nvf.nixosModules.default # <- this imports the NixOS module that provides the options
-        ./configuration.nix # <- your host entrypoint
+        ./configuration.nix # <- your host entrypoint, `programs.nvf.*` may be defined here
       ];
     };
   };

From b67759273b2c2066e39f45f734a6b84c1a14ebe6 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 4 Jan 2025 15:52:27 +0300
Subject: [PATCH 020/202] neovim/spellcheck: convert to `vim.options`

---
 modules/neovim/init/spellcheck.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/neovim/init/spellcheck.nix b/modules/neovim/init/spellcheck.nix
index 5d6f5bed..f8d784da 100644
--- a/modules/neovim/init/spellcheck.nix
+++ b/modules/neovim/init/spellcheck.nix
@@ -124,7 +124,6 @@ in {
               nvim --headless --clean \
                 --cmd "mkspell $out/spell/$name.add.spl $spellfile" -Es -n
             done
-
           '';
       in
         mkIf (cfg.extraSpellWords != {}) [
@@ -133,10 +132,12 @@ in {
           compileJoinedSpellfiles.outPath
         ];
 
-      luaConfigRC.spellcheck = entryAfter ["basic"] ''
-        vim.opt.spell = true
-        vim.opt.spelllang = ${listToLuaTable cfg.languages}
+      options = {
+        spell = true;
+        spelllang = cfg.languages;
+      };
 
+      luaConfigRC.spellcheck = entryAfter ["basic"] ''
         -- Disable spellchecking for certain filetypes
         -- as configured by `vim.spellcheck.ignoredFiletypes`
         vim.api.nvim_create_augroup("nvf_autocmds", {clear = false})

From 85347de09d6eaa03989a98885781f9c8fd31830b Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 4 Jan 2025 16:08:11 +0300
Subject: [PATCH 021/202] utility/gesture-nvim: convert to `vim.options`

---
 .../utility/gestures/gesture-nvim/config.nix  | 74 ++++++++++---------
 .../utility/gestures/gesture-nvim/default.nix |  2 +-
 2 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/modules/plugins/utility/gestures/gesture-nvim/config.nix b/modules/plugins/utility/gestures/gesture-nvim/config.nix
index 2996f7d2..9838c178 100644
--- a/modules/plugins/utility/gestures/gesture-nvim/config.nix
+++ b/modules/plugins/utility/gestures/gesture-nvim/config.nix
@@ -15,43 +15,47 @@
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
-    vim.startPlugins = ["gesture-nvim"];
+    vim = {
+      startPlugins = ["gesture-nvim"];
 
-    vim.maps.normal = mkMerge [
-      (mkSetLuaBinding mappings.draw "require('gesture').draw")
-      (mkSetLuaBinding mappings.finish "require('gesture').finish")
-      (mkIf (mappings.draw.value == "<RightDrag>") {
-        "<RightMouse>" = {action = "<Nop>";};
-      })
-    ];
+      maps.normal = mkMerge [
+        (mkSetLuaBinding mappings.draw "require('gesture').draw")
+        (mkSetLuaBinding mappings.finish "require('gesture').finish")
+        (mkIf (mappings.draw.value == "<RightDrag>") {
+          "<RightMouse>" = {action = "<Nop>";};
+        })
+      ];
 
-    vim.pluginRC.gesture-nvim = entryAnywhere ''
-      vim.opt.mouse = "a"
+      options.mouse = "a";
+      pluginRC.gesture-nvim = entryAnywhere ''
+        local gesture = require("gesture")
+        gesture.register({
+          name = "scroll to bottom",
+          inputs = { gesture.up(), gesture.down() },
+          action = "normal! G",
+        })
 
-      local gesture = require("gesture")
-      gesture.register({
-        name = "scroll to bottom",
-        inputs = { gesture.up(), gesture.down() },
-        action = "normal! G",
-      })
-      gesture.register({
-        name = "next tab",
-        inputs = { gesture.right() },
-        action = "tabnext",
-      })
-      gesture.register({
-        name = "previous tab",
-        inputs = { gesture.left() },
-        action = function(ctx) -- also can use callable
-          vim.cmd.tabprevious()
-        end,
-      })
-      gesture.register({
-        name = "go back",
-        inputs = { gesture.right(), gesture.left() },
-        -- map to `<C-o>` keycode
-        action = [[lua vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("<C-o>", true, false, true), "n", true)]],
-      })
-    '';
+        gesture.register({
+          name = "next tab",
+          inputs = { gesture.right() },
+          action = "tabnext",
+        })
+
+        gesture.register({
+          name = "previous tab",
+          inputs = { gesture.left() },
+          action = function(ctx) -- also can use callable
+            vim.cmd.tabprevious()
+          end,
+        })
+
+        gesture.register({
+          name = "go back",
+          inputs = { gesture.right(), gesture.left() },
+          -- map to `<C-o>` keycode
+          action = [[lua vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("<C-o>", true, false, true), "n", true)]],
+        })
+      '';
+    };
   };
 }
diff --git a/modules/plugins/utility/gestures/gesture-nvim/default.nix b/modules/plugins/utility/gestures/gesture-nvim/default.nix
index 27e7e09f..4c7987e7 100644
--- a/modules/plugins/utility/gestures/gesture-nvim/default.nix
+++ b/modules/plugins/utility/gestures/gesture-nvim/default.nix
@@ -1,4 +1,4 @@
-_: {
+{
   imports = [
     ./gesture-nvim.nix
     ./config.nix

From 5749739e4b67c955f06efca03a9962bc55038dfc Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 4 Jan 2025 16:08:53 +0300
Subject: [PATCH 022/202] wrapper/rc: clean up option documentation

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

diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index 980c9497..20eb50e7 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkOption mkEnableOption literalMD literalExpression;
+  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.trivial) isBool;
@@ -19,7 +19,7 @@ in {
       default = false;
       example = true;
       description = ''
-        [{option}`official documentation`]: https://neovim.io/doc/user/lua.html#vim.loader.enable()
+        [official documentation]: https://neovim.io/doc/user/lua.html#vim.loader.enable()
 
         the experimental Lua module loader to speed up the start up process
 
@@ -31,7 +31,7 @@ in {
 
         ::: {.note}
         The Lua module loader is *disabled* by default. Before setting this option, please
-        take a look at the [{option}`official documentation`]. This option may be enabled by
+        take a look at the {option}`[official documentation]`. This option may be enabled by
         default in the future.
         :::
       '';
@@ -83,7 +83,7 @@ in {
           ./nvim/my-lua-file.lua
 
           # source type path - pure and reproducible
-          (builtins.source {
+          (builtins.path {
             path = ./nvim/my-lua-file.lua;
             name = "my-lua-file";
           })
@@ -274,7 +274,11 @@ in {
           vim.opt.runtimepath:append(${listToLuaTable cfg.additionalRuntimePaths})
         ''}
 
-        ${optionalString cfg.enableLuaLoader "vim.loader.enable()"}
+        ${optionalString cfg.enableLuaLoader ''
+          if vim.loader then
+            vim.loader.enable()
+          end
+        ''}
       '';
 
       defaultText = literalMD ''
@@ -284,7 +288,7 @@ in {
         if [](#opt-vim.enableLuaLoader) is set to true.
       '';
 
-      example = literalExpression ''"$${builtins.readFile ./my-lua-config-pre.lua}"'';
+      example = literalExpression ''''${builtins.readFile ./my-lua-config-pre.lua}'';
 
       description = ''
         Verbatim lua code that will be inserted **before**

From 9584fe25e29fe7c6540f4cac55381e9ba25cf43d Mon Sep 17 00:00:00 2001
From: raf <raf@notashelf.dev>
Date: Sun, 5 Jan 2025 11:35:09 +0300
Subject: [PATCH 023/202] docs: add helpful tips section (#520)

---
 docs/manual/manual.md             |  1 +
 docs/manual/tips.md               |  6 ++++++
 docs/manual/tips/debugging-nvf.md | 19 +++++++++++++++++++
 docs/manual/tips/offline-docs.md  | 11 +++++++++++
 4 files changed, 37 insertions(+)
 create mode 100644 docs/manual/tips.md
 create mode 100644 docs/manual/tips/debugging-nvf.md
 create mode 100644 docs/manual/tips/offline-docs.md

diff --git a/docs/manual/manual.md b/docs/manual/manual.md
index fd7ddcd9..fd225766 100644
--- a/docs/manual/manual.md
+++ b/docs/manual/manual.md
@@ -11,6 +11,7 @@ try-it-out.md
 default-configs.md
 installation.md
 configuring.md
+tips.md
 ```
 
 ```{=include=} chapters
diff --git a/docs/manual/tips.md b/docs/manual/tips.md
new file mode 100644
index 00000000..0d2637f1
--- /dev/null
+++ b/docs/manual/tips.md
@@ -0,0 +1,6 @@
+# Helpful Tips {#ch-helpful-tips}
+
+```{=include=} chapters
+tips/debugging-nvf.md
+tips/offline-docs.md
+```
diff --git a/docs/manual/tips/debugging-nvf.md b/docs/manual/tips/debugging-nvf.md
new file mode 100644
index 00000000..a642b0a7
--- /dev/null
+++ b/docs/manual/tips/debugging-nvf.md
@@ -0,0 +1,19 @@
+# Debugging nvf {#sec-debugging-nvf}
+
+There may be instances where the your Nix configuration evaluates to invalid
+Lua, or times when you will be asked to provide your built Lua configuration for
+easier debugging by nvf maintainers. nvf provides two helpful utilities out of
+the box.
+
+**nvf-print-config** and **nvf-print-config-path** will be bundled with nvf as
+lightweight utilities to help you view or share your built configuration when
+necessary.
+
+To view your configuration with syntax highlighting, you may use the
+[bat pager](https://github.com/sharkdp/bat).
+
+```bash
+nvf-print-config | bat --language=lua
+```
+
+Alternatively, `cat` or `less` may also be used.
diff --git a/docs/manual/tips/offline-docs.md b/docs/manual/tips/offline-docs.md
new file mode 100644
index 00000000..ed11d965
--- /dev/null
+++ b/docs/manual/tips/offline-docs.md
@@ -0,0 +1,11 @@
+# Offline Documentation {#sec-offline-documentation}
+
+[https://notashelf.github.io/nvf/options.html]: https://notashelf.github.io/nvf/options.html
+
+The manpages provided by nvf contains an offline version of the option search
+normally available at [https://notashelf.github.io/nvf/options.html]. You may
+use the `man 5 nvf` command to view option documentation from the comfort of
+your terminal.
+
+Note that this is only available for NixOS and Home-Manager module
+installations.

From b7bea89d9ab669c8ead928c5e087dedcfbb32202 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 5 Jan 2025 11:36:01 +0300
Subject: [PATCH 024/202] docs: update contributors section; add maintainers

---
 .github/README.md | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/.github/README.md b/.github/README.md
index 5d10c73f..0c2036d2 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -206,6 +206,16 @@ features.
 
 ## Credits
 
+### Co-Maintainers
+
+Alongside myself, nvf is developed by those talented folk:
+
+- [**@horriblename**](https://github.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.
+
 ### Contributors
 
 [mnw]: https://github.com/gerg-l/mnw
@@ -213,21 +223,19 @@ features.
 nvf would not be what it is today without the awesome people below. Special,
 heart-felt thanks to
 
-- [@fufexan](https://github.com/fufexan) - For the transition to flake-parts and
-  invaluable Nix assistance.
-- [@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
+- [**@fufexan**](https://github.com/fufexan) - For the transition to flake-parts
+  and invaluable Nix assistance.
+- [**@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.
-- [@horriblename](https://github.com/horriblename) - For actively implementing
-  planned features and quality of life updates.
-- [@Yavko](https://github.com/Yavko) - For the amazing **nvf** logo
-- [@FrothyMarrow](https://github.com/FrothyMarrow) - For seeing mistakes that I
-  could not.
-- [@Diniamo](https://github.com/Diniamo) - For actively submitting pull
-  requests, issues and assistance with maintenance of nvf.
-- [@Gerg-l](https://github.com/gerg-l) - For the modern Neovim wrapper, [mnw],
-  and occasional code improvements.
+- [**@Yavko**](https://github.com/Yavko) - For the amazing **nvf** logo
+- [**@FrothyMarrow**](https://github.com/FrothyMarrow) - For seeing mistakes
+  that I could not.
+- [**@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.
 
 and everyone who has submitted issues or pull requests!
 

From 9888a277adc8a34aa13e9f6bb75c9c86b4f2919a Mon Sep 17 00:00:00 2001
From: raf <raf@notashelf.dev>
Date: Mon, 6 Jan 2025 03:54:38 +0300
Subject: [PATCH 025/202] git/gitsigns: migrate to `setupOpts` (#524)

* git/gitsigns: add `setupOpts` module option for user-specified setup table

* docs: update v0.8 release notes
---
 docs/release-notes/rl-0.8.md              | 3 +++
 modules/plugins/git/gitsigns/config.nix   | 3 ++-
 modules/plugins/git/gitsigns/gitsigns.nix | 2 ++
 3 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 e41911ba..16ec2863 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -13,6 +13,9 @@
 - Add [render-markdown.nvim] under
   `languages.markdown.extensions.render-markdown-nvim`
 
+- Implement [](#opt-vim.git.gitsigns.setupOpts) for user-specified setup table
+  in gitsigns configuration.
+
 [amadaluzia](https://github.com/amadaluzia):
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
diff --git a/modules/plugins/git/gitsigns/config.nix b/modules/plugins/git/gitsigns/config.nix
index 039ab635..9aee73b7 100644
--- a/modules/plugins/git/gitsigns/config.nix
+++ b/modules/plugins/git/gitsigns/config.nix
@@ -7,6 +7,7 @@
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.nvim.binds) addDescriptionsToMappings mkSetExprBinding mkSetLuaBinding pushDownDefault;
   inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.git.gitsigns;
 
@@ -70,7 +71,7 @@ in {
         };
 
         pluginRC.gitsigns = entryAnywhere ''
-          require('gitsigns').setup{}
+          require('gitsigns').setup(${toLuaObject cfg.setupOpts})
         '';
       };
     }
diff --git a/modules/plugins/git/gitsigns/gitsigns.nix b/modules/plugins/git/gitsigns/gitsigns.nix
index ef880bce..9c2375d8 100644
--- a/modules/plugins/git/gitsigns/gitsigns.nix
+++ b/modules/plugins/git/gitsigns/gitsigns.nix
@@ -6,6 +6,7 @@
   inherit (lib.options) mkEnableOption;
   inherit (lib.modules) mkRenamedOptionModule;
   inherit (lib.nvim.binds) mkMappingOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   imports = [
     (mkRenamedOptionModule ["vim" "git" "gitsigns" "codeActions" "vim" "gitsigns" "codeActions"] ["vim" "git" "gitsigns" "codeActions" "enable"])
@@ -13,6 +14,7 @@ in {
 
   options.vim.git.gitsigns = {
     enable = mkEnableOption "gitsigns" // {default = config.vim.git.enable;};
+    setupOpts = mkPluginSetupOption "gitsigns" {};
 
     codeActions.enable = mkEnableOption "gitsigns codeactions through null-ls";
 

From ee4c072ba326b1e7765e500b2aac3281ffb0019f Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Mon, 6 Jan 2025 11:44:38 +0100
Subject: [PATCH 026/202] flake: add aerial.nvim

---
 flake.lock | 17 +++++++++++++++++
 flake.nix  |  5 +++++
 2 files changed, 22 insertions(+)

diff --git a/flake.lock b/flake.lock
index 0a7ee1a5..4b56f7fa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -156,6 +156,22 @@
         "type": "sourcehut"
       }
     },
+    "plugin-aerial-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1736064692,
+        "narHash": "sha256-7YQtkUTACTMfAGoqoFDPmRrqtw+ypxDbeLCTB3sy4Us=",
+        "owner": "stevearc",
+        "repo": "aerial.nvim",
+        "rev": "b3ec25ca8c347fafa976484a6cace162239112e1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "stevearc",
+        "repo": "aerial.nvim",
+        "type": "github"
+      }
+    },
     "plugin-alpha-nvim": {
       "flake": false,
       "locked": {
@@ -2090,6 +2106,7 @@
         "nil": "nil",
         "nixpkgs": "nixpkgs",
         "nmd": "nmd",
+        "plugin-aerial-nvim": "plugin-aerial-nvim",
         "plugin-alpha-nvim": "plugin-alpha-nvim",
         "plugin-base16": "plugin-base16",
         "plugin-bufdelete-nvim": "plugin-bufdelete-nvim",
diff --git a/flake.nix b/flake.nix
index d5a7b709..f5014afe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -730,5 +730,10 @@
       url = "github:mrcjkb/haskell-tools.nvim";
       flake = false;
     };
+
+    plugin-aerial-nvim = {
+      url = "github:stevearc/aerial.nvim";
+      flake = false;
+    };
   };
 }

From 92e38fbfae40ce5aee381f5034a603ad05616be0 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Mon, 6 Jan 2025 11:44:48 +0100
Subject: [PATCH 027/202] aerial: init

---
 modules/plugins/utility/default.nix           |  1 +
 .../outline/aerial-nvim/aerial-nvim.nix       | 14 +++++++
 .../utility/outline/aerial-nvim/config.nix    | 42 +++++++++++++++++++
 .../utility/outline/aerial-nvim/default.nix   |  6 +++
 modules/plugins/utility/outline/default.nix   |  5 +++
 5 files changed, 68 insertions(+)
 create mode 100644 modules/plugins/utility/outline/aerial-nvim/aerial-nvim.nix
 create mode 100644 modules/plugins/utility/outline/aerial-nvim/config.nix
 create mode 100644 modules/plugins/utility/outline/aerial-nvim/default.nix
 create mode 100644 modules/plugins/utility/outline/default.nix

diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix
index 835ebf6e..686295e2 100644
--- a/modules/plugins/utility/default.nix
+++ b/modules/plugins/utility/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./outline
     ./binds
     ./ccc
     ./gestures
diff --git a/modules/plugins/utility/outline/aerial-nvim/aerial-nvim.nix b/modules/plugins/utility/outline/aerial-nvim/aerial-nvim.nix
new file mode 100644
index 00000000..beede428
--- /dev/null
+++ b/modules/plugins/utility/outline/aerial-nvim/aerial-nvim.nix
@@ -0,0 +1,14 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+  inherit (lib.nvim.binds) mkMappingOption;
+in {
+  options.vim.utility.outline.aerial-nvim = {
+    enable = mkEnableOption "Aerial.nvim";
+    setupOpts = mkPluginSetupOption "aerial.nvim" {};
+
+    mappings = {
+      toggle = mkMappingOption "Toggle aerial window" "gO";
+    };
+  };
+}
diff --git a/modules/plugins/utility/outline/aerial-nvim/config.nix b/modules/plugins/utility/outline/aerial-nvim/config.nix
new file mode 100644
index 00000000..803302f7
--- /dev/null
+++ b/modules/plugins/utility/outline/aerial-nvim/config.nix
@@ -0,0 +1,42 @@
+{
+  options,
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.binds) mkKeymap;
+
+  cfg = config.vim.utility.outline.aerial-nvim;
+  inherit (options.vim.utility.outline.aerial-nvim) mappings;
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      lazy.plugins.aerial-nvim = {
+        package = "aerial-nvim";
+
+        setupModule = "aerial";
+        inherit (cfg) setupOpts;
+
+        cmd = [
+          "AerialClose"
+          "AerialCloseAll"
+          "AerialGo"
+          "AerialInfo"
+          "AerialNavClose"
+          "AerialNavOpen"
+          "AerialNavToggle"
+          "AerialNext"
+          "AerialOpen"
+          "AerialOpenAll"
+          "AerialPrev"
+          "AerialToggle"
+        ];
+
+        keys = [
+          (mkKeymap "n" cfg.mappings.toggle ":AerialToggle<CR>" {desc = mappings.toggle.description;})
+        ];
+      };
+    };
+  };
+}
diff --git a/modules/plugins/utility/outline/aerial-nvim/default.nix b/modules/plugins/utility/outline/aerial-nvim/default.nix
new file mode 100644
index 00000000..ea782c89
--- /dev/null
+++ b/modules/plugins/utility/outline/aerial-nvim/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./aerial-nvim.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/utility/outline/default.nix b/modules/plugins/utility/outline/default.nix
new file mode 100644
index 00000000..d8262edd
--- /dev/null
+++ b/modules/plugins/utility/outline/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./aerial-nvim
+  ];
+}

From c071f2caa22dddc61d9c6b9ee59a8397a4a64c36 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Mon, 6 Jan 2025 11:45:02 +0100
Subject: [PATCH 028/202] nvimtree: remove unnecessary import

---
 modules/plugins/filetree/nvimtree/config.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/plugins/filetree/nvimtree/config.nix b/modules/plugins/filetree/nvimtree/config.nix
index 11fa9fed..0d0381a0 100644
--- a/modules/plugins/filetree/nvimtree/config.nix
+++ b/modules/plugins/filetree/nvimtree/config.nix
@@ -1,7 +1,7 @@
 {
+  options,
   config,
   lib,
-  pkgs,
   ...
 }: let
   inherit (lib.strings) optionalString;
@@ -11,8 +11,7 @@
   inherit (lib.nvim.binds) pushDownDefault;
 
   cfg = config.vim.filetree.nvimTree;
-  self = import ./nvimtree.nix {inherit pkgs lib;};
-  inherit (self.options.vim.filetree.nvimTree) mappings;
+  inherit (options.vim.filetree.nvimTree) mappings;
 in {
   config = mkIf cfg.enable {
     vim = {

From de02e2fa577005885966f136a7d32ecf79db4b55 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Mon, 6 Jan 2025 11:58:08 +0100
Subject: [PATCH 029/202] docs: update release notes

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

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 16ec2863..eb7ca0db 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -28,3 +28,9 @@
 
 - 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)
+
+- Add [aerial.nvim]

From 2728e65a5ea3ec46812c1ac035abc5b0fadb45a2 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 7 Jan 2025 04:19:57 +0300
Subject: [PATCH 030/202] docs/installation: mark additional inputs as
 'optional'

---
 docs/manual/installation/modules/home-manager.md | 14 ++++++++++----
 docs/manual/installation/modules/nixos.md        | 10 ++++++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/docs/manual/installation/modules/home-manager.md b/docs/manual/installation/modules/home-manager.md
index cf56acc3..34f2757e 100644
--- a/docs/manual/installation/modules/home-manager.md
+++ b/docs/manual/installation/modules/home-manager.md
@@ -10,12 +10,18 @@ To use it, we first add the input flake.
 ```nix
 {
   inputs = {
+    # Optional, if you intend to follow nvf's obsidian-nvim input
+    # you must also add it as a flake input.
     obsidian-nvim.url = "github:epwalsh/obsidian.nvim";
+
+    # Required, nvf works best and only directly supports flakes
     nvf = {
       url = "github:notashelf/nvf";
-      # you can override input nixpkgs
+      # You can override the input nixpkgs to follow your system's
+      # instance of nixpkgs. This is safe to do as nvf does not depend
+      # on a binary cache.
       inputs.nixpkgs.follows = "nixpkgs";
-      # you can also override individual plugins
+      # Optionally, you can also override individual plugins
       # for example:
       inputs.obsidian-nvim.follows = "obsidian-nvim"; # <- this will use the obsidian-nvim from your inputs
     };
@@ -27,8 +33,8 @@ Followed by importing the home-manager module somewhere in your configuration.
 
 ```nix
 {
-  # assuming nvf is in your inputs and inputs is in the argset
-  # see example below
+  # Assuming "nvf" is in your inputs and inputs is in the argument set.
+  # See example installation below
   imports = [ inputs.nvf.homeManagerModules.default ];
 }
 ```
diff --git a/docs/manual/installation/modules/nixos.md b/docs/manual/installation/modules/nixos.md
index ae5ce939..bcf7472b 100644
--- a/docs/manual/installation/modules/nixos.md
+++ b/docs/manual/installation/modules/nixos.md
@@ -10,12 +10,18 @@ To use it, we first add the input flake.
 ```nix
 {
   inputs = {
+    # Optional, if you intend to follow nvf's obsidian-nvim input
+    # you must also add it as a flake input.
     obsidian-nvim.url = "github:epwalsh/obsidian.nvim";
+
+    # Required, nvf works best and only directly supports flakes
     nvf = {
       url = "github:notashelf/nvf";
-      # you can override input nixpkgs
+      # You can override the input nixpkgs to follow your system's
+      # instance of nixpkgs. This is safe to do as nvf does not depend
+      # on a binary cache.
       inputs.nixpkgs.follows = "nixpkgs";
-      # you can also override individual plugins
+      # Optionally, you can also override individual plugins
       # for example:
       inputs.obsidian-nvim.follows = "obsidian-nvim"; # <- this will use the obsidian-nvim from your inputs
     };

From aa7b55fa49a55f12e72807466e905a204c32384a Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 7 Jan 2025 06:10:15 +0300
Subject: [PATCH 031/202] docs: liberapay URL for @horriblename

---
 .github/README.md | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/README.md b/.github/README.md
index 0c2036d2..9a059419 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -210,12 +210,16 @@ features.
 
 Alongside myself, nvf is developed by those talented folk:
 
-- [**@horriblename**](https://github.com/horriblename) - For actively
-  implementing planned features and quality of life updates.
+- [**@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.
 
+Please do remember to extend your thanks (financially or otherwise) if this
+project has been helpful to you.
+
 ### Contributors
 
 [mnw]: https://github.com/gerg-l/mnw
@@ -245,17 +249,17 @@ This configuration borrows from and is based on a few other configurations,
 including:
 
 - [@jordanisaacs's](https://github.com/jordanisaacs)
-  [neovim-flake](https://github.com/jordanisaacs/neovim-flake) that this flake
-  is originally based on.
-- [@sioodmy's](https://github.com/sioodmy)
-  [dotfiles](https://github.com/sioodmy/dotfiles) that inspired the design
-  choices for UI and plugin defaults.
+  [**neovim-flake**](https://github.com/jordanisaacs/neovim-flake) that this
+  flake is originally based on.
 - [@wiltaylor's](https://github.com/wiltaylor)
   [neovim-flake](https://github.com/wiltaylor/neovim-flake) for plugin and
   design ideas.
 - [@gvolpe's](https://github.com/gvolpe)
   [neovim-flake](https://github.com/gvolpe/neovim-flake) for plugin, design and
   nix concepts.
+- [@sioodmy's](https://github.com/sioodmy)
+  [dotfiles](https://github.com/sioodmy/dotfiles) that inspired the design
+  choices for UI and plugin defaults.
 
 I am grateful for their previous work and inspiration, and I wholeheartedly
 recommend checking their work out.
@@ -263,12 +267,12 @@ recommend checking their work out.
 
 ## License
 
-Following the license of the
-[original neovim-flake](https://github.com/jordanisaacs/neovim-flake), nvf has
-been made available under the [**MIT License**](LICENSE). However, all assets
-and documentation are published under the
+Following the license of
+[the original neovim-flake](https://github.com/jordanisaacs/neovim-flake), nvf
+has been made available under the [**MIT License**](LICENSE). However, all
+assets and documentation are published under the
 [**CC BY License**](https://github.com/NotAShelf/nvf/blob/main/.github/assets/LICENSE)
-under explicit permission by the artist.
+under explicit permission by the author or authors.
 
 <h6 align="center">Yes, this includes the logo work too. Stop taking artwork that is not yours!</h6>
 

From 356f92053c9a23adaef66092d3d6e1d48923a9a8 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 7 Jan 2025 06:12:13 +0300
Subject: [PATCH 032/202] neovim/init: merge conditionals in options set

---
 modules/neovim/init/basic.nix  | 93 +++++++++++++++++-----------------
 modules/wrapper/rc/options.nix |  3 +-
 2 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/modules/neovim/init/basic.nix b/modules/neovim/init/basic.nix
index f91ea9a1..532ebcea 100644
--- a/modules/neovim/init/basic.nix
+++ b/modules/neovim/init/basic.nix
@@ -5,6 +5,7 @@
 }: let
   inherit (lib.options) mkOption mkEnableOption literalMD;
   inherit (lib.strings) optionalString;
+  inherit (lib.attrsets) optionalAttrs;
   inherit (lib.types) enum bool str int either;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.dag) entryAfter;
@@ -94,55 +95,55 @@ in {
     # Set options that were previously interpolated in 'luaConfigRC.basic' as vim.options (vim.o)
     # and 'vim.globals' (vim.g). Future options, if possible, should be added here instead of the
     # luaConfigRC section below.
-    options = pushDownDefault {
-      # Options that are always set, with a lower priority
-      encoding = "utf-8";
-      hidden = true;
-      expandtab = true;
+    options = pushDownDefault (lib.mergeAttrsList [
+      {
+        # Options that are always set, with a lower priority
+        encoding = "utf-8";
+        hidden = true;
+        expandtab = true;
 
-      # Junkfile Behaviour
-      swapfile = !cfg.preventJunkFiles;
-      backup = !cfg.preventJunkFiles;
-      writebackup = !cfg.preventJunkFiles;
-    };
+        # Junkfile Behaviour
+        swapfile = !cfg.preventJunkFiles;
+        backup = !cfg.preventJunkFiles;
+        writebackup = !cfg.preventJunkFiles;
+      }
 
-    # Options that are more difficult to set through 'vim.options'. Fear not, though
-    # as the Lua DAG is still as powerful as it could be.
+      (optionalAttrs cfg.undoFile.enable {
+        undofile = true;
+        undodir = cfg.undoFile.path;
+      })
+
+      (optionalAttrs (cfg.bell == "none") {
+        errorbells = false;
+        visualbell = false;
+      })
+
+      (optionalAttrs (cfg.bell == "on") {
+        visualbell = false;
+      })
+
+      (optionalAttrs (cfg.bell == "visual") {
+        visualbell = false;
+      })
+
+      (optionalAttrs (cfg.lineNumberMode == "relative") {
+        relativenumber = true;
+      })
+
+      (optionalAttrs (cfg.lineNumberMode == "number") {
+        number = true;
+      })
+
+      (optionalAttrs (cfg.lineNumberMode == "relNumber") {
+        number = true;
+        relativenumber = true;
+      })
+    ]);
+
+    # Options that are more difficult to set through 'vim.options'. Namely, appending values
+    # to pre-set Neovim options. Fear not, though as the Lua DAG is still as powerful as it
+    # could be.
     luaConfigRC.basic = entryAfter ["globalsScript"] ''
-      -- Settings that are set for everything
-      vim.opt.shortmess:append("c")
-
-      ${optionalString cfg.undoFile.enable ''
-        vim.o.undofile = true
-        vim.o.undodir = ${toLuaObject cfg.undoFile.path}
-      ''}
-
-      ${optionalString (cfg.bell == "none") ''
-        vim.o.errorbells = false
-        vim.o.visualbell = false
-      ''}
-
-      ${optionalString (cfg.bell == "on") ''
-        vim.o.visualbell = false
-      ''}
-
-      ${optionalString (cfg.bell == "visual") ''
-        vim.o.errorbells = false
-      ''}
-
-      ${optionalString (cfg.lineNumberMode == "relative") ''
-        vim.o.relativenumber = true
-      ''}
-
-      ${optionalString (cfg.lineNumberMode == "number") ''
-        vim.o.number = true
-      ''}
-
-      ${optionalString (cfg.lineNumberMode == "relNumber") ''
-        vim.o.number = true
-        vim.o.relativenumber = true
-      ''}
-
       ${optionalString cfg.useSystemClipboard ''
         vim.opt.clipboard:append("unnamedplus")
       ''}
diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index 8fff005d..d82fc741 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -235,7 +235,8 @@ in {
               if isBool x
               then toVimBool x # convert to a yes/no str
               else x;
-            description = "Show the sign column"
+            description = "Show the sign column";
+          };
 
           tabstop = mkOption {
             type = int;

From 752915e639a1c70002c885dba530a685b5174d08 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Tue, 7 Jan 2025 06:46:12 +0100
Subject: [PATCH 033/202] telescope: workaround nixpkgs extensions loading
 early

force a reload when telescope is loaded to workaround #535
---
 modules/plugins/utility/telescope/config.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/plugins/utility/telescope/config.nix b/modules/plugins/utility/telescope/config.nix
index 76cfa8bd..95f81327 100644
--- a/modules/plugins/utility/telescope/config.nix
+++ b/modules/plugins/utility/telescope/config.nix
@@ -22,6 +22,12 @@ in {
         package = "telescope";
         setupModule = "telescope";
         inherit (cfg) setupOpts;
+
+        # HACK: workaround until https://github.com/NotAShelf/nvf/issues/535 gets resolved
+        before = ''
+          vim.g.loaded_telescope = nil
+        '';
+
         after = ''
           local telescope = require("telescope")
           ${optionalString config.vim.ui.noice.enable "telescope.load_extension('noice')"}

From 7dbe7a08b332e82f9d3f9a8f26ca9a6f0b2777aa Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 8 Jan 2025 21:13:09 +0300
Subject: [PATCH 034/202] wrapper/build: disable failing require hook checks
 for flutter-tools

---
 modules/plugins/languages/dart.nix |  1 -
 modules/wrapper/build/config.nix   | 11 +++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix
index ee069a7d..e2b3182e 100644
--- a/modules/plugins/languages/dart.nix
+++ b/modules/plugins/languages/dart.nix
@@ -130,7 +130,6 @@ in {
 
     (mkIf cfg.lsp.enable {
       vim.lsp.lspconfig.enable = true;
-
       vim.lsp.lspconfig.sources.dart-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix
index ee5b4fda..46d99b36 100644
--- a/modules/wrapper/build/config.nix
+++ b/modules/wrapper/build/config.nix
@@ -49,6 +49,17 @@
     flutter-tools-patched = buildPlug {
       pname = "flutter-tools";
       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"
+      ];
     };
   };
 

From a26cdd2d25cc677978f0cada818c4d94b691e0da Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <59727193+horriblename@users.noreply.github.com>
Date: Thu, 9 Jan 2025 08:56:51 +0100
Subject: [PATCH 035/202] ui/nvim-ufo: init (#537)

* flake: add nvim-ufo

* ui/nvim-ufo: init

* docs: update relase notes
---
 docs/release-notes/rl-0.8.md             |  2 ++
 flake.lock                               | 34 ++++++++++++++++++++++++
 flake.nix                                | 10 +++++++
 modules/plugins/ui/default.nix           |  1 +
 modules/plugins/ui/nvim-ufo/config.nix   | 20 ++++++++++++++
 modules/plugins/ui/nvim-ufo/default.nix  |  6 +++++
 modules/plugins/ui/nvim-ufo/nvim-ufo.nix |  9 +++++++
 7 files changed, 82 insertions(+)
 create mode 100644 modules/plugins/ui/nvim-ufo/config.nix
 create mode 100644 modules/plugins/ui/nvim-ufo/default.nix
 create mode 100644 modules/plugins/ui/nvim-ufo/nvim-ufo.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index eb7ca0db..036b673c 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -32,5 +32,7 @@
 [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]
diff --git a/flake.lock b/flake.lock
index 4b56f7fa..d4e745c1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1518,6 +1518,22 @@
         "type": "github"
       }
     },
+    "plugin-nvim-ufo": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1735147722,
+        "narHash": "sha256-etyfm4KpwjYN+kkotOMl0LgbQniILmqMqab4acMtTlw=",
+        "owner": "kevinhwang91",
+        "repo": "nvim-ufo",
+        "rev": "32cb247b893a384f1888b9cd737264159ecf183c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kevinhwang91",
+        "repo": "nvim-ufo",
+        "type": "github"
+      }
+    },
     "plugin-nvim-web-devicons": {
       "flake": false,
       "locked": {
@@ -1694,6 +1710,22 @@
         "type": "github"
       }
     },
+    "plugin-promise-async": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1722813441,
+        "narHash": "sha256-9eM66brPjiFlY64vmBetRYrKnpDyN7+/URMm4GsGimA=",
+        "owner": "kevinhwang91",
+        "repo": "promise-async",
+        "rev": "119e8961014c9bfaf1487bf3c2a393d254f337e2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kevinhwang91",
+        "repo": "promise-async",
+        "type": "github"
+      }
+    },
     "plugin-registers": {
       "flake": false,
       "locked": {
@@ -2191,6 +2223,7 @@
         "plugin-nvim-tree-lua": "plugin-nvim-tree-lua",
         "plugin-nvim-treesitter-context": "plugin-nvim-treesitter-context",
         "plugin-nvim-ts-autotag": "plugin-nvim-ts-autotag",
+        "plugin-nvim-ufo": "plugin-nvim-ufo",
         "plugin-nvim-web-devicons": "plugin-nvim-web-devicons",
         "plugin-obsidian-nvim": "plugin-obsidian-nvim",
         "plugin-omnisharp-extended": "plugin-omnisharp-extended",
@@ -2202,6 +2235,7 @@
         "plugin-plenary-nvim": "plugin-plenary-nvim",
         "plugin-precognition-nvim": "plugin-precognition-nvim",
         "plugin-project-nvim": "plugin-project-nvim",
+        "plugin-promise-async": "plugin-promise-async",
         "plugin-registers": "plugin-registers",
         "plugin-render-markdown-nvim": "plugin-render-markdown-nvim",
         "plugin-rose-pine": "plugin-rose-pine",
diff --git a/flake.nix b/flake.nix
index f5014afe..c1fe0688 100644
--- a/flake.nix
+++ b/flake.nix
@@ -720,6 +720,16 @@
       flake = false;
     };
 
+    plugin-promise-async = {
+      url = "github:kevinhwang91/promise-async";
+      flake = false;
+    };
+
+    plugin-nvim-ufo = {
+      url = "github:kevinhwang91/nvim-ufo";
+      flake = false;
+    };
+
     plugin-new-file-template-nvim = {
       # (required by new-file-template.nvim)
       url = "github:otavioschwanck/new-file-template.nvim";
diff --git a/modules/plugins/ui/default.nix b/modules/plugins/ui/default.nix
index 34076600..e9489e9b 100644
--- a/modules/plugins/ui/default.nix
+++ b/modules/plugins/ui/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ./noice
     ./modes
+    ./nvim-ufo
     ./notifications
     ./smartcolumn
     ./colorizer
diff --git a/modules/plugins/ui/nvim-ufo/config.nix b/modules/plugins/ui/nvim-ufo/config.nix
new file mode 100644
index 00000000..7b40386f
--- /dev/null
+++ b/modules/plugins/ui/nvim-ufo/config.nix
@@ -0,0 +1,20 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+
+  cfg = config.vim.ui.nvim-ufo;
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      startPlugins = ["promise-async"];
+      lazy.plugins.nvim-ufo = {
+        package = "nvim-ufo";
+        setupModule = "ufo";
+        inherit (cfg) setupOpts;
+      };
+    };
+  };
+}
diff --git a/modules/plugins/ui/nvim-ufo/default.nix b/modules/plugins/ui/nvim-ufo/default.nix
new file mode 100644
index 00000000..9f541f97
--- /dev/null
+++ b/modules/plugins/ui/nvim-ufo/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./nvim-ufo.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/ui/nvim-ufo/nvim-ufo.nix b/modules/plugins/ui/nvim-ufo/nvim-ufo.nix
new file mode 100644
index 00000000..d5ad4933
--- /dev/null
+++ b/modules/plugins/ui/nvim-ufo/nvim-ufo.nix
@@ -0,0 +1,9 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.ui.nvim-ufo = {
+    enable = mkEnableOption "nvim-ufo";
+    setupOpts = mkPluginSetupOption "nvim-ufo" {};
+  };
+}

From ea056532bcd5d71e86a2ab071061634d0d606e6a Mon Sep 17 00:00:00 2001
From: Artur Manuel <amad@atl.tools>
Date: Thu, 9 Jan 2025 12:28:13 +0000
Subject: [PATCH 036/202] languages/haskell: specify lsp flag (#540)

Co-authored-by: Artur Manuel <balkenix@outlook.com>
---
 modules/plugins/languages/haskell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/languages/haskell.nix b/modules/plugins/languages/haskell.nix
index 62f4cd41..ff6c7d78 100644
--- a/modules/plugins/languages/haskell.nix
+++ b/modules/plugins/languages/haskell.nix
@@ -71,7 +71,7 @@ in {
                 cmd = ${
                 if isList cfg.lsp.package
                 then expToLua cfg.lsp.package
-                else ''{"${cfg.lsp.package}/bin/haskell-language-server-wrapper"}''
+                else ''{"${cfg.lsp.package}/bin/haskell-language-server-wrapper", "--lsp"}''
               },
                 on_attach = function(client, bufnr, ht)
                   default_on_attach(client, bufnr, ht)

From b0fb0a93cb757291bf4537d1cce8c58c77675e30 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 10 Jan 2025 08:25:08 +0100
Subject: [PATCH 037/202] notes/obsidian: remove default dir-value

---
 modules/plugins/notes/obsidian/obsidian.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/modules/plugins/notes/obsidian/obsidian.nix b/modules/plugins/notes/obsidian/obsidian.nix
index 2dae5a9c..2da2127b 100644
--- a/modules/plugins/notes/obsidian/obsidian.nix
+++ b/modules/plugins/notes/obsidian/obsidian.nix
@@ -24,12 +24,6 @@ in {
       enable = mkEnableOption "complementary neovim plugins for Obsidian editor";
 
       setupOpts = mkPluginSetupOption "Obsidian.nvim" {
-        dir = mkOption {
-          type = str;
-          default = "~/my-vault";
-          description = "Obsidian vault directory";
-        };
-
         daily_notes = {
           folder = mkOption {
             type = nullOr str;

From 8448a6ca0f0facafac5235f54db62c89134875f1 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 10 Jan 2025 10:36:01 +0300
Subject: [PATCH 038/202] wrapper/rc: change `vim.options.mouse` to a string
 type

As the mouse option in neovim allows combining those values.
---
 docs/release-notes/rl-0.8.md   |  5 +++++
 modules/wrapper/rc/options.nix | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 036b673c..ed627475 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -16,6 +16,11 @@
 - Implement [](#opt-vim.git.gitsigns.setupOpts) for user-specified setup table
   in gitsigns configuration.
 
+- [](#opt-vim.options.mouse) no longer compares values to an enum of available
+  mouse modes. This means you can provide any string without the module system
+  warning you that it is invalid. Do keep in mind that this value is no longer
+  checked, so you will be responsible for ensuring its validity.
+
 [amadaluzia](https://github.com/amadaluzia):
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index d82fc741..36296f02 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -167,16 +167,25 @@ in {
           };
 
           mouse = mkOption {
-            type = enum ["a" "n" "v" "i" "c"];
-            default = "a";
+            type = str;
+            default = "nvi";
+            example = "a";
             description = ''
               Set modes for mouse support.
 
-              * a - all
               * n - normal
               * v - visual
               * i - insert
-              * c - command
+              * c - command-line
+              * h - all modes when editing a help file
+              * a - all modes
+              * r - for hit-enter and more-prompt prompt
+
+              [neovim documentation]: https://neovim.io/doc/user/options.html#'mouse'"
+
+              This option takes a string to ensure proper conversion to the corresponding Lua type.
+              As such, we do not check the value passed to this option. Please ensure that any value
+              that is set here is a valid value as per [neovim documentation].
             '';
           };
 

From 6f1293053c0348c6901660c20deff5304433e028 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 10 Jan 2025 10:45:34 +0300
Subject: [PATCH 039/202] docs: update v0.8 release notes

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

diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md
index fd3764ac..32186a8f 100644
--- a/docs/release-notes/rl-0.7.md
+++ b/docs/release-notes/rl-0.7.md
@@ -334,9 +334,6 @@ The changes are, in no particular order:
   `vim.options` as default values. Some are left as they don't have a direct
   equivalent, but expect a switch eventually.
 
-- Deprecated `vim.enableEditorconfig` in favor of
-  [](#opt-vim.globals.editorconfig).
-
 [ppenguin](https://github.com/ppenguin):
 
 - Telescope:
diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index ed627475..cff78de9 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -21,6 +21,9 @@
   warning you that it is invalid. Do keep in mind that this value is no longer
   checked, so you will be responsible for ensuring its validity.
 
+- Deprecated `vim.enableEditorconfig` in favor of
+  [](#opt-vim.globals.editorconfig).
+
 [amadaluzia](https://github.com/amadaluzia):
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim

From 6852120514356fb75a161b73f31f3ce864f6dbef Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 10 Jan 2025 08:53:22 +0100
Subject: [PATCH 040/202] notes/obsidian: add changelog entry

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

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 036b673c..a7e9df87 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -36,3 +36,9 @@
 
 - Add [aerial.nvim]
 - Add [nvim-ufo]
+
+[LilleAila](https://github.com/LilleAila):
+
+[obsidian.nvim](https://github.com/epwalsh/obsidian.nvim)
+
+- Remove `vim.notes.obsidian.setupOpts.dir`. Fixes issue with setting the workspace directory.

From 4e949b3df8d152d9802f44b3fc32da3dc7aaa7fb Mon Sep 17 00:00:00 2001
From: raf <raf@notashelf.dev>
Date: Fri, 10 Jan 2025 08:09:52 +0000
Subject: [PATCH 041/202] docs: remove redundant obsidian.nvim link

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

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index a7e9df87..e83a978d 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -39,6 +39,5 @@
 
 [LilleAila](https://github.com/LilleAila):
 
-[obsidian.nvim](https://github.com/epwalsh/obsidian.nvim)
-
-- Remove `vim.notes.obsidian.setupOpts.dir`. Fixes issue with setting the workspace directory.
+- Remove `vim.notes.obsidian.setupOpts.dir`, which was set by default. 
+  Fixes issue with setting the workspace directory.

From c734a81e4051cb65d48adbc7c826e5f234df1144 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 10 Jan 2025 12:52:11 +0300
Subject: [PATCH 042/202] languages/nix: deprecate `rnix` language server
 option

Abandoned, archived and wildly outdated.
---
 flake.lock                        | 73 -------------------------------
 flake.nix                         |  1 -
 flake/legacyPackages.nix          |  4 +-
 modules/plugins/languages/nix.nix | 30 ++++++-------
 4 files changed, 16 insertions(+), 92 deletions(-)

diff --git a/flake.lock b/flake.lock
index d4e745c1..da38b967 100644
--- a/flake.lock
+++ b/flake.lock
@@ -51,27 +51,6 @@
         "type": "github"
       }
     },
-    "naersk": {
-      "inputs": {
-        "nixpkgs": [
-          "rnix-lsp",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1655042882,
-        "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
     "nil": {
       "inputs": {
         "flake-utils": [
@@ -124,22 +103,6 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1656753965,
-        "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nmd": {
       "flake": false,
       "locked": {
@@ -2110,26 +2073,6 @@
         "type": "github"
       }
     },
-    "rnix-lsp": {
-      "inputs": {
-        "naersk": "naersk",
-        "nixpkgs": "nixpkgs_2",
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1669555118,
-        "narHash": "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=",
-        "owner": "nix-community",
-        "repo": "rnix-lsp",
-        "rev": "95d40673fe43642e2e1144341e86d0036abd95d9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "rnix-lsp",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -2260,7 +2203,6 @@
         "plugin-vim-repeat": "plugin-vim-repeat",
         "plugin-vim-startify": "plugin-vim-startify",
         "plugin-which-key": "plugin-which-key",
-        "rnix-lsp": "rnix-lsp",
         "systems": "systems_2"
       }
     },
@@ -2314,21 +2256,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "utils": {
-      "locked": {
-        "lastModified": 1656928814,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index c1fe0688..89690cad 100644
--- a/flake.nix
+++ b/flake.nix
@@ -89,7 +89,6 @@
     };
 
     # Language servers (use master instead of nixpkgs)
-    rnix-lsp.url = "github:nix-community/rnix-lsp";
     nil = {
       url = "github:oxalica/nil";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/flake/legacyPackages.nix b/flake/legacyPackages.nix
index 389ca0ce..b77d057a 100644
--- a/flake/legacyPackages.nix
+++ b/flake/legacyPackages.nix
@@ -8,8 +8,10 @@
       inherit system;
       overlays = [
         inputs.self.overlays.default
+
         (_: _: {
-          rnix-lsp = inputs'.rnix-lsp.defaultPackage;
+          # Build nil from source to get most recent
+          # features as they are added.
           nil = inputs'.nil.packages.default;
         })
       ];
diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix
index ffb69e92..1120633c 100644
--- a/modules/plugins/languages/nix.nix
+++ b/modules/plugins/languages/nix.nix
@@ -26,22 +26,6 @@
     then expToLua package
     else ''{"${package}/bin/${defaultCmd}"}'';
   servers = {
-    rnix = {
-      package = pkgs.rnix-lsp;
-      internalFormatter = cfg.format.type == "nixpkgs-fmt";
-      lspConfig = ''
-        lspconfig.rnix.setup{
-          capabilities = capabilities,
-        ${
-          if (cfg.format.enable && cfg.format.type == "nixpkgs-fmt")
-          then useFormat
-          else noFormat
-        },
-          cmd = ${packageToCmd cfg.lsp.package "rnix-lsp"},
-        }
-      '';
-    };
-
     nil = {
       package = pkgs.nil;
       internalFormatter = true;
@@ -165,6 +149,7 @@ in {
         type = enum (attrNames formats);
         default = defaultFormat;
       };
+
       package = mkOption {
         description = "Nix formatter package";
         type = package;
@@ -188,7 +173,18 @@ in {
       assertions = [
         {
           assertion = cfg.format.type != "nixpkgs-fmt";
-          message = "nixpkgs-fmt has been archived upstream. Please use one of the following instead: ${concatStringsSep ", " (attrNames formats)}";
+          message = ''
+            nixpkgs-fmt has been archived upstream. Please use one of the following available formatters:
+            ${concatStringsSep ", " (attrNames formats)}
+          '';
+        }
+
+        {
+          assertion = cfg.lsp.server != "rnix";
+          message = ''
+            rnix-lsp has been archived upstream. Please use one of the following available language servers:
+            ${concatStringsSep ", " (attrNames servers)}
+          '';
         }
       ];
       vim.pluginRC.nix = ''

From c5f16b96c0b1663e6d48ce30aa145cfec3f3698e Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 10 Jan 2025 12:52:49 +0300
Subject: [PATCH 043/202] docs: update v0.8 release notes

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

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 5cb58b5a..c65defeb 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -21,9 +21,11 @@
   warning you that it is invalid. Do keep in mind that this value is no longer
   checked, so you will be responsible for ensuring its validity.
 
-- Deprecated `vim.enableEditorconfig` in favor of
+- Deprecate `vim.enableEditorconfig` in favor of
   [](#opt-vim.globals.editorconfig).
 
+- Deprecate rnix-lsp as it has been abandoned and archived upstream.
+
 [amadaluzia](https://github.com/amadaluzia):
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
@@ -47,5 +49,5 @@
 
 [LilleAila](https://github.com/LilleAila):
 
-- Remove `vim.notes.obsidian.setupOpts.dir`, which was set by default. 
-  Fixes issue with setting the workspace directory.
+- Remove `vim.notes.obsidian.setupOpts.dir`, which was set by default. Fixes
+  issue with setting the workspace directory.

From 6097f7eb11880c2111d4ff27dbbbef8d24adf32e Mon Sep 17 00:00:00 2001
From: raf <raf@notashelf.dev>
Date: Fri, 10 Jan 2025 13:35:14 +0300
Subject: [PATCH 044/202] ci: build previews for the website on documentation
 changes (#494)

---
 .github/workflows/docs-preview.yml | 172 +++++++++++++++++++++++++++++
 1 file changed, 172 insertions(+)
 create mode 100644 .github/workflows/docs-preview.yml

diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml
new file mode 100644
index 00000000..dc5f6543
--- /dev/null
+++ b/.github/workflows/docs-preview.yml
@@ -0,0 +1,172 @@
+name: Build and Preview Manual
+
+on:
+  workflow_dispatch:
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+    paths:
+      - ".github/workflows/docs-preview.yml"
+      - "modules/**"
+      - "docs/**"
+
+# Defining permissions here passes it to all workflows.
+# https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/controlling-permissions-for-github_token
+permissions:
+  contents: write
+  pull-requests: write
+  issues: write
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-preview:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-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 .#docs-html --print-build-logs
+
+      - name: Deploy to GitHub Pages preview
+        run: |
+          PR_NUMBER=${{ github.event.pull_request.number }}
+          BRANCH_NAME="gh-pages"
+          PREVIEW_DIR="docs-preview-${PR_NUMBER}"
+
+          # Clone the gh-pages branch and move to the preview subdirectory
+          git clone --single-branch --branch $BRANCH_NAME https://github.com/${{ github.repository }} gh-pages
+          cd gh-pages
+
+          mkdir -p $PREVIEW_DIR
+
+          # Copy the build files to the preview subdirectory
+          cp -rvf ../result/share/doc/nvf/* ./$PREVIEW_DIR
+
+          # Configure git to use the GitHub Actions token for authentication
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "actions@github.com"
+
+          # Set the GitHub token for authentication
+          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
+
+          # Add and commit the changes
+          git add --all
+          git commit -m "Deploy PR #${PR_NUMBER} preview" || echo "No changes to commit"
+          git push --force origin $BRANCH_NAME
+
+  comment-url:
+    needs: build-preview
+    runs-on: ubuntu-latest
+    steps:
+      - name: Prepare Environment
+        id: prelude
+        run: |
+          PR_NUMBER=${{ github.event.pull_request.number }}
+          URL="https://${{ github.repository_owner }}.github.io/nvf/docs-preview-${PR_NUMBER}/"
+
+          # Propagate non-interpolatable environment vars
+          echo "URL=$URL" >> "$GITHUB_OUTPUT"
+          echo "REV=$GITHUB_SHA" >> "$GITHUB_OUTPUT"
+          echo "ACTOR=$GITHUB_ACTOR" >> "$GITHUB_OUTPUT"
+          echo "REF=$GITHUB_HEAD_REF" >> "$GITHUB_OUTPUT"
+          echo "RUNS=$GITHUB_RUN_NUMBER" >> "$GITHUB_OUTPUT"
+
+          echo "Live Preview URL: $URL"
+          echo "Rev: $GITHUB_SHA"
+          echo "Actor: $GITHUB_ACTOR"
+          echo "Ref: "$GITHUB_HEAD_REF"
+          echo "Reruns: "$GITHUB_RUN_NUMBER"
+
+          echo "### :rocket: Live Preview Deployed " >> "$GITHUB_STEP_SUMMARY"
+          echo "Preview can be found at ${URL}" >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Find Comment
+        uses: peter-evans/find-comment@v3
+        id: fc
+        with:
+          comment-author: "github-actions[bot]"
+          issue-number: ${{ github.event.pull_request.number }}
+          body-includes: "Live preview deployed"
+
+      - name: Post live preview comment
+        uses: peter-evans/create-or-update-comment@v4
+        env:
+          COMMENT_ID: ${{ steps.fc.outputs.comment-id }}
+          URL: ${{ steps.prelude.outputs.URL }}
+          GITHUB_SHA: ${{ steps.prelude.outputs.REV }}
+          ACTOR: ${{ steps.prelude.outputs.ACTOR }}
+          REF: ${{ steps.prelude.outputs.REF }}
+          RUNS: ${{ steps.prelude.outputs.RUNS }}
+        with:
+          comment-id: ${{ env.COMMENT_ID }}
+          issue-number: ${{ github.event.pull_request.number }} # issue number also applies to pull requests
+          edit-mode: replace # replace previous body
+          body: |
+            ### :rocket: Live preview deployed from ${{ env.GITHUB_SHA }}
+
+            View it [here](${{ env.URL }}):
+
+            <details>
+              <summary><strong>Debug Information</strong></summary>
+              <p>Triggered by: ${{ env.ACTOR }}</p>
+              <p><code>HEAD</code> at: ${{ env.REF }}</p>
+              <p>Reruns: ${{ env.RUNS }}</p>
+            </details>
+
+  cleanup:
+    if: ${{ github.event.pull_request.merged == true || github.event.pull_request.state == 'closed' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Delete preview for closed/merged PR
+        run: |
+          PR_NUMBER=${{ github.event.pull_request.number }}
+          BRANCH_NAME="gh-pages"
+          PREVIEW_DIR="docs-preview-${PR_NUMBER}"
+
+          # Clone the gh-pages branch
+          git clone --single-branch --branch $BRANCH_NAME https://github.com/${{ github.repository }} gh-pages
+          cd gh-pages
+
+          # Check if the preview directory exists, and delete it if it does
+          if [ -d "$PREVIEW_DIR" ]; then
+            echo "Deleting preview directory $PREVIEW_DIR"
+            rm -rf $PREVIEW_DIR
+          else
+            echo "Preview directory $PREVIEW_DIR does not exist. Skipping deletion."
+          fi
+
+          # Configure git to use the GitHub Actions token for authentication
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "actions@github.com"
+
+          # Set the GitHub token for authentication
+          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
+
+          # Add and commit the changes (only if there's something to delete)
+          git add .
+          git diff --quiet || git commit -m "Remove preview for PR #${PR_NUMBER}"
+          git push origin $BRANCH_NAME
+
+  cleanup-comment:
+    needs: cleanup
+    runs-on: ubuntu-latest
+    steps:
+      - name: Post cleanup verification
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            ✅ Preview has been deleted successfully!

From 9c8fbc774ffcba67b517649795eba9bc4a99a4f0 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 10 Jan 2025 13:56:24 +0300
Subject: [PATCH 045/202] ci/docs-preview: double check preview directory
 deletion

---
 .github/workflows/docs-preview.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml
index dc5f6543..c38be9da 100644
--- a/.github/workflows/docs-preview.yml
+++ b/.github/workflows/docs-preview.yml
@@ -164,6 +164,19 @@ jobs:
     needs: cleanup
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Double check preview directory deletion
+        run: |
+          # Check if the preview directory exists, and delete it if it does
+          if [ -d "docs-preview-${{ github.event.pull_request.number }}" ]; then
+            echo "Something went wrong, preview directory is not deleted."
+            exit 1
+          else
+            echo "Preview directory has been deleted successfully, proceeding."
+          fi
+
       - name: Post cleanup verification
         uses: peter-evans/create-or-update-comment@v4
         with:

From 38257935494d93756d3404ab153c54ff6e2c5892 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 10 Jan 2025 11:20:54 +0300
Subject: [PATCH 046/202] various: address diniamo's review comments

---
 configuration.nix                  |  2 +-
 docs/release-notes/rl-0.7.md       |  2 +-
 modules/neovim/init/spellcheck.nix | 15 +++++++++++----
 modules/wrapper/rc/options.nix     | 15 ++++++---------
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 3be1d39b..15f85480 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -13,7 +13,7 @@ isMaximal: {
     };
 
     spellcheck = {
-      enable = isMaximal;
+      enable = true;
     };
 
     lsp = {
diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md
index 32186a8f..d62e3619 100644
--- a/docs/release-notes/rl-0.7.md
+++ b/docs/release-notes/rl-0.7.md
@@ -28,7 +28,7 @@ configuration formats.
 
 ### `vim.maps` rewrite {#sec-vim-maps-rewrite}
 
-Instead of specifying map modes using submodules (e.g.: `vim.maps.normal`), a
+Instead of specifying map modes using submodules (e.g., `vim.maps.normal`), a
 new `vim.keymaps` submodule with support for a `mode` option has been
 introduced. It can be either a string, or a list of strings, where a string
 represents the short-name of the map mode(s), that the mapping should be set
diff --git a/modules/neovim/init/spellcheck.nix b/modules/neovim/init/spellcheck.nix
index f8d784da..fb0f86ea 100644
--- a/modules/neovim/init/spellcheck.nix
+++ b/modules/neovim/init/spellcheck.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib.modules) mkIf mkRenamedOptionModule;
   inherit (lib.options) mkOption mkEnableOption literalExpression;
-  inherit (lib.strings) concatLines;
+  inherit (lib.strings) concatLines concatStringsSep optionalString;
   inherit (lib.attrsets) mapAttrsToList;
   inherit (lib.types) listOf str attrsOf;
   inherit (lib.nvim.lua) listToLuaTable;
@@ -134,10 +134,17 @@ in {
 
       options = {
         spell = true;
-        spelllang = cfg.languages;
+
+        # Workaround for Neovim's spelllang setup. It can be
+        #  - a string, e.g., "en"
+        #  - multiple strings, separated with commas, e.g., "en,de"
+        # toLuaObject cannot generate the correct type here, unless we take a string here.
+        spelllang = concatStringsSep "," cfg.languages;
       };
 
-      luaConfigRC.spellcheck = entryAfter ["basic"] ''
+      # Register an autocommand to disable spellchecking in buffers with given filetypes.
+      # If the list is empty, the autocommand does not need to be registered.
+      luaConfigRC.spellcheck = entryAfter ["basic"] (optionalString (cfg.ignoredFiletypes != []) ''
         -- Disable spellchecking for certain filetypes
         -- as configured by `vim.spellcheck.ignoredFiletypes`
         vim.api.nvim_create_augroup("nvf_autocmds", {clear = false})
@@ -148,7 +155,7 @@ in {
             vim.opt_local.spell = false
           end,
         })
-      '';
+      '');
     };
   };
 }
diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index 36296f02..21d0e26e 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -238,13 +238,10 @@ in {
           };
 
           signcolumn = mkOption {
-            type = either str bool;
-            default = true;
-            apply = x:
-              if isBool x
-              then toVimBool x # convert to a yes/no str
-              else x;
-            description = "Show the sign column";
+            type = str;
+            default = "yes";
+            example = "no";
+            description = "Whether to show the sign column";
           };
 
           tabstop = mkOption {
@@ -313,7 +310,7 @@ in {
         if [](#opt-vim.enableLuaLoader) is set to true.
       '';
 
-      example = literalExpression ''''${builtins.readFile ./my-lua-config-pre.lua}'';
+      example = literalExpression "\${builtins.readFile ./my-lua-config-pre.lua}";
 
       description = ''
         Verbatim lua code that will be inserted **before**
@@ -357,7 +354,7 @@ in {
     luaConfigPost = mkOption {
       type = str;
       default = "";
-      example = literalExpression ''"$${builtins.readFile ./my-lua-config-post.lua}"'';
+      example = literalExpression "\${builtins.readFile ./my-lua-config-post.lua}";
       description = ''
         Verbatim lua code that will be inserted **after**
         the result of the `luaConfigRc` DAG has been resolved

From ab3a68fe1ad37efdc559a331ebf02cc48c60af37 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 10 Jan 2025 11:21:51 +0300
Subject: [PATCH 047/202] lib: remove `toVimBool`

---
 lib/languages.nix              | 7 -------
 modules/wrapper/rc/options.nix | 2 --
 2 files changed, 9 deletions(-)

diff --git a/lib/languages.nix b/lib/languages.nix
index 56c225d6..a202ff14 100644
--- a/lib/languages.nix
+++ b/lib/languages.nix
@@ -5,13 +5,6 @@
   inherit (lib.types) bool;
   inherit (lib.nvim.attrsets) mapListToAttrs;
 in {
-  # Converts a boolean to a yes/no string. This is used in lots of
-  # configuration formats, and is not covered by `toLuaObject`
-  toVimBool = bool:
-    if bool
-    then "yes"
-    else "no";
-
   diagnosticsToLua = {
     lang,
     config,
diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index 21d0e26e..4cd3026f 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -6,8 +6,6 @@
   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.trivial) isBool;
-  inherit (lib.nvim.languages) toVimBool;
   inherit (lib.nvim.types) dagOf;
   inherit (lib.nvim.lua) listToLuaTable;
 

From 6e98b894b73e77067ebc607baef3913441609396 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Sat, 11 Jan 2025 12:48:41 +0100
Subject: [PATCH 048/202] languages/markdown: add prettierd formatter

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

diff --git a/modules/plugins/languages/markdown.nix b/modules/plugins/languages/markdown.nix
index ab184835..ac098a1c 100644
--- a/modules/plugins/languages/markdown.nix
+++ b/modules/plugins/languages/markdown.nix
@@ -46,6 +46,18 @@
         )
       '';
     };
+    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 {
   options.vim.languages.markdown = {

From 98a79590474c3a6bdf41b6cfb9af161cf48823c3 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Sat, 11 Jan 2025 14:02:21 +0100
Subject: [PATCH 049/202] snippets/luasnip: add setupOpts

Also fixed a bug where the plugin previously would not get loaded, as
lazy was set to true without a trigger event.
---
 modules/plugins/snippets/luasnip/config.nix  | 12 ++++++------
 modules/plugins/snippets/luasnip/luasnip.nix |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/plugins/snippets/luasnip/config.nix b/modules/plugins/snippets/luasnip/config.nix
index 927b21fd..60a5ca6d 100644
--- a/modules/plugins/snippets/luasnip/config.nix
+++ b/modules/plugins/snippets/luasnip/config.nix
@@ -9,12 +9,12 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      lazy.plugins = {
-        luasnip = {
-          package = "luasnip";
-          lazy = true;
-          after = cfg.loaders;
-        };
+      lazy.plugins.luasnip = {
+        package = "luasnip";
+        event = "BufEnter";
+        after = cfg.loaders;
+        setupModule = "luasnip";
+        inherit (cfg) setupOpts;
       };
       startPlugins = cfg.providers;
       autocomplete.nvim-cmp = {
diff --git a/modules/plugins/snippets/luasnip/luasnip.nix b/modules/plugins/snippets/luasnip/luasnip.nix
index d9563a5b..edfd72b9 100644
--- a/modules/plugins/snippets/luasnip/luasnip.nix
+++ b/modules/plugins/snippets/luasnip/luasnip.nix
@@ -1,7 +1,7 @@
 {lib, ...}: let
   inherit (lib.options) mkEnableOption mkOption literalExpression literalMD;
   inherit (lib.types) listOf lines;
-  inherit (lib.nvim.types) pluginType;
+  inherit (lib.nvim.types) pluginType mkPluginSetupOption;
 in {
   options.vim.snippets.luasnip = {
     enable = mkEnableOption "luasnip";
@@ -32,5 +32,7 @@ in {
         ```
       '';
     };
+
+    setupOpts = mkPluginSetupOption "LuaSnip" {};
   };
 }

From 69cb99dc2bf6f57af48fdea98a6c653f214d4d67 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Sat, 11 Jan 2025 14:04:40 +0100
Subject: [PATCH 050/202] snippets/luasnip: add example option to setupOpts

---
 modules/plugins/snippets/luasnip/luasnip.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/plugins/snippets/luasnip/luasnip.nix b/modules/plugins/snippets/luasnip/luasnip.nix
index edfd72b9..6b189b61 100644
--- a/modules/plugins/snippets/luasnip/luasnip.nix
+++ b/modules/plugins/snippets/luasnip/luasnip.nix
@@ -33,6 +33,8 @@ in {
       '';
     };
 
-    setupOpts = mkPluginSetupOption "LuaSnip" {};
+    setupOpts = mkPluginSetupOption "LuaSnip" {
+      enable_autosnippets = mkEnableOption "autosnippets";
+    };
   };
 }

From 7012938e21ec105813ba857cf4ae8e0a632ae472 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Sat, 11 Jan 2025 14:06:14 +0100
Subject: [PATCH 051/202] snippets/luasnip: add changelog entry

---
 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 c65defeb..f79eb940 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -51,3 +51,5 @@
 
 - Remove `vim.notes.obsidian.setupOpts.dir`, which was set by default. Fixes
   issue with setting the workspace directory.
+- Add `vim.snippets.luasnip.setupOpts`, which was previously missing.
+- Add a trigger event for luasnip lazy-loading

From 983a81c96c1a30119b01977163270273e8c1395f Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Sat, 11 Jan 2025 15:32:35 +0100
Subject: [PATCH 052/202] languages/markdown: add prettierd to changelog

---
 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 c65defeb..62e83a0e 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -51,3 +51,4 @@
 
 - Remove `vim.notes.obsidian.setupOpts.dir`, which was set by default. Fixes
   issue with setting the workspace directory.
+- Add `"prettierd"` as a formatter option in `vim.languages.markdown.format.type`.

From 9818d199378ff70c7bf77d0988e9da05fc27f1a4 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Sun, 12 Jan 2025 09:58:55 +0100
Subject: [PATCH 053/202] snippets/luasnip: revert adding lazy event

---
 docs/release-notes/rl-0.8.md                | 1 -
 modules/plugins/snippets/luasnip/config.nix | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index f79eb940..3c07aa09 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -52,4 +52,3 @@
 - Remove `vim.notes.obsidian.setupOpts.dir`, which was set by default. Fixes
   issue with setting the workspace directory.
 - Add `vim.snippets.luasnip.setupOpts`, which was previously missing.
-- Add a trigger event for luasnip lazy-loading
diff --git a/modules/plugins/snippets/luasnip/config.nix b/modules/plugins/snippets/luasnip/config.nix
index 60a5ca6d..0f887e5f 100644
--- a/modules/plugins/snippets/luasnip/config.nix
+++ b/modules/plugins/snippets/luasnip/config.nix
@@ -11,7 +11,7 @@ in {
     vim = {
       lazy.plugins.luasnip = {
         package = "luasnip";
-        event = "BufEnter";
+        lazy = true;
         after = cfg.loaders;
         setupModule = "luasnip";
         inherit (cfg) setupOpts;

From c59f8922b298d471b561a49573f739dd9529b1f6 Mon Sep 17 00:00:00 2001
From: LilleAila <67327023+LilleAila@users.noreply.github.com>
Date: Sun, 12 Jan 2025 11:39:41 +0100
Subject: [PATCH 054/202] snippets/luasnip: add whitespace, organize options

Co-authored-by: diniamo <55629891+diniamo@users.noreply.github.com>
---
 modules/plugins/snippets/luasnip/config.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/plugins/snippets/luasnip/config.nix b/modules/plugins/snippets/luasnip/config.nix
index 0f887e5f..a3767aa7 100644
--- a/modules/plugins/snippets/luasnip/config.nix
+++ b/modules/plugins/snippets/luasnip/config.nix
@@ -11,10 +11,13 @@ in {
     vim = {
       lazy.plugins.luasnip = {
         package = "luasnip";
+        
         lazy = true;
-        after = cfg.loaders;
+        
         setupModule = "luasnip";
         inherit (cfg) setupOpts;
+        
+        after = cfg.loaders;
       };
       startPlugins = cfg.providers;
       autocomplete.nvim-cmp = {

From fedbee3a30e9b0043b77bb1c705dd83c0860dbc6 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Sun, 12 Jan 2025 12:48:44 +0100
Subject: [PATCH 055/202] snippets/luasnip: fix formatting

---
 modules/plugins/snippets/luasnip/config.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/plugins/snippets/luasnip/config.nix b/modules/plugins/snippets/luasnip/config.nix
index a3767aa7..b05f9f27 100644
--- a/modules/plugins/snippets/luasnip/config.nix
+++ b/modules/plugins/snippets/luasnip/config.nix
@@ -11,12 +11,12 @@ in {
     vim = {
       lazy.plugins.luasnip = {
         package = "luasnip";
-        
+
         lazy = true;
-        
+
         setupModule = "luasnip";
         inherit (cfg) setupOpts;
-        
+
         after = cfg.loaders;
       };
       startPlugins = cfg.providers;

From bbca939cedd09b423820e20d387fc42e85589a5d Mon Sep 17 00:00:00 2001
From: kaktu5 <108426150+kaktu5@users.noreply.github.com>
Date: Sat, 11 Jan 2025 21:57:18 +0100
Subject: [PATCH 056/202] languages/wgsl: init module

Adds Treesitter and LSP support for WebGPU Shading Language
---
 docs/release-notes/rl-0.8.md          |  4 ++
 modules/plugins/languages/default.nix |  1 +
 modules/plugins/languages/wgsl.nix    | 79 +++++++++++++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 modules/plugins/languages/wgsl.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 62e83a0e..93f6c1da 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -52,3 +52,7 @@
 - Remove `vim.notes.obsidian.setupOpts.dir`, which was set by default. Fixes
   issue with setting the workspace directory.
 - Add `"prettierd"` as a formatter option in `vim.languages.markdown.format.type`.
+
+[kaktu5](https://github.com/kaktu5):
+
+- Add WGSL support under `vim.languages.wgsl`.
diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix
index ee9f55e1..bf9194f2 100644
--- a/modules/plugins/languages/default.nix
+++ b/modules/plugins/languages/default.nix
@@ -38,6 +38,7 @@ in {
     ./julia.nix
     ./nu.nix
     ./odin.nix
+    ./wgsl.nix
   ];
 
   options.vim.languages = {
diff --git a/modules/plugins/languages/wgsl.nix b/modules/plugins/languages/wgsl.nix
new file mode 100644
index 00000000..7c8a1016
--- /dev/null
+++ b/modules/plugins/languages/wgsl.nix
@@ -0,0 +1,79 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (builtins) attrNames;
+  inherit (lib.lists) isList;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.options) literalExpression mkEnableOption mkOption;
+  inherit (lib.types) either enum listOf package str;
+
+  cfg = config.vim.languages.wgsl;
+
+  defaultServer = "wgsl-analyzer";
+  servers = {
+    wgsl-analyzer = {
+      package = pkgs.wgsl-analyzer;
+      internalFormatter = true;
+      lspConfig = ''
+        lspconfig.wgsl_analyzer.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else "{'${cfg.lsp.package}/bin/wgsl_analyzer'}"
+        }
+        }
+      '';
+    };
+  };
+in {
+  options.vim.languages.wgsl = {
+    enable = mkEnableOption "WGSL language support";
+
+    treesitter = {
+      enable = mkEnableOption "WGSL treesitter" // {default = config.vim.languages.enableTreesitter;};
+      package = mkGrammarOption pkgs "wgsl";
+    };
+
+    lsp = {
+      enable = mkEnableOption "WGSL LSP support" // {default = config.vim.languages.enableLSP;};
+
+      server = mkOption {
+        type = enum (attrNames servers);
+        default = defaultServer;
+        description = "WGSL LSP server to use";
+      };
+
+      package = mkOption {
+        description = "wgsl-analyzer package, or the command to run as a list of strings";
+        example = literalExpression "[(lib.getExe pkgs.wgsl-analyzer)]";
+        type = either package (listOf str);
+        default = pkgs.wgsl-analyzer;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter = {
+        enable = true;
+        grammars = [cfg.treesitter.package];
+      };
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim = {
+        lsp.lspconfig = {
+          enable = true;
+          sources.wgsl_analyzer = servers.${cfg.lsp.server}.lspConfig;
+        };
+      };
+    })
+  ]);
+}

From 149d68b3e815e101d113a497bee5c96452391cdb Mon Sep 17 00:00:00 2001
From: tomasguinzburg <tomasguinzburg@gmail.com>
Date: Sun, 12 Jan 2025 23:33:26 +0100
Subject: [PATCH 057/202] languages/ruby: add ruby support

---
 configuration.nix                     |   1 +
 docs/release-notes/rl-0.8.md          |   6 +
 modules/plugins/languages/default.nix |   1 +
 modules/plugins/languages/ruby.nix    | 152 ++++++++++++++++++++++++++
 4 files changed, 160 insertions(+)
 create mode 100644 modules/plugins/languages/ruby.nix

diff --git a/configuration.nix b/configuration.nix
index 15f85480..2159edc8 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -80,6 +80,7 @@ isMaximal: {
       ocaml.enable = false;
       elixir.enable = false;
       haskell.enable = false;
+      ruby.enable = false;
 
       tailwind.enable = false;
       svelte.enable = false;
diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index cfa70cd5..d15c6842 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -57,3 +57,9 @@
 [kaktu5](https://github.com/kaktu5):
 
 - Add WGSL support under `vim.languages.wgsl`.
+
+[tomasguinzburg](https://github.com/tomasguinzburg):
+
+[solargraph]: https://github.com/castwide/solargraph
+
+- Add Ruby support under `vim.languages.ruby` using [solargraph].
diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix
index bf9194f2..219e04fb 100644
--- a/modules/plugins/languages/default.nix
+++ b/modules/plugins/languages/default.nix
@@ -39,6 +39,7 @@ in {
     ./nu.nix
     ./odin.nix
     ./wgsl.nix
+    ./ruby.nix
   ];
 
   options.vim.languages = {
diff --git a/modules/plugins/languages/ruby.nix b/modules/plugins/languages/ruby.nix
new file mode 100644
index 00000000..33f11d5d
--- /dev/null
+++ b/modules/plugins/languages/ruby.nix
@@ -0,0 +1,152 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (builtins) attrNames;
+  inherit (lib.options) mkEnableOption mkOption;
+  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;
+
+  defaultServer = "rubyserver";
+  servers = {
+    rubyserver = {
+      package = pkgs.rubyPackages.solargraph;
+      lspConfig = ''
+        lspconfig.solargraph.setup {
+          capabilities = capabilities,
+          on_attach = attach_keymaps,
+          flags = {
+            debounce_text_changes = 150,
+          },
+          cmd = { "${pkgs.solargraph}/bin/solargraph", "stdio" }
+        }
+      '';
+    };
+  };
+
+  # testing
+
+  defaultFormat = "rubocop";
+  formats = {
+    rubocop = {
+      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
+            ),
+          })
+        )
+      '';
+    };
+  };
+
+  defaultDiagnosticsProvider = ["rubocop"];
+  diagnosticsProviders = {
+    rubocop = {
+      package = pkgs.rubyPackages.rubocop;
+      nullConfig = pkg: ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.diagnostics.rubocop.with({
+            command = "${lib.getExe pkg}",
+          })
+        )
+      '';
+    };
+  };
+in {
+  options.vim.languages.ruby = {
+    enable = mkEnableOption "Ruby language support";
+
+    treesitter = {
+      enable = mkEnableOption "Ruby treesitter" // {default = config.vim.languages.enableTreesitter;};
+      package = mkGrammarOption pkgs "ruby";
+    };
+
+    lsp = {
+      enable = mkEnableOption "Ruby LSP support" // {default = config.vim.languages.enableLSP;};
+
+      server = mkOption {
+        type = enum (attrNames servers);
+        default = defaultServer;
+        description = "Ruby LSP server to use";
+      };
+
+      package = mkOption {
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
+        description = "Ruby LSP server package, or the command to run as a list of strings";
+      };
+    };
+
+    format = {
+      enable = mkEnableOption "Ruby formatter support" // {default = config.vim.languages.enableFormat;};
+
+      type = mkOption {
+        type = enum (attrNames formats);
+        default = defaultFormat;
+        description = "Ruby formatter to use";
+      };
+
+      package = mkOption {
+        type = package;
+        default = formats.${cfg.format.type}.package;
+        description = "Ruby formatter package";
+      };
+    };
+
+    extraDiagnostics = {
+      enable =
+        mkEnableOption "Ruby extra diagnostics support"
+        // {default = config.vim.languages.enableExtraDiagnostics;};
+
+      types = diagnostics {
+        langDesc = "Ruby";
+        inherit diagnosticsProviders;
+        inherit defaultDiagnosticsProvider;
+      };
+    };
+  };
+
+  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.ruby-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+
+    (mkIf cfg.format.enable {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources.ruby-format = formats.${cfg.format.type}.nullConfig;
+    })
+
+    (mkIf cfg.extraDiagnostics.enable {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources = diagnosticsToLua {
+        lang = "ruby";
+        config = cfg.extraDiagnostics.types;
+        inherit diagnosticsProviders;
+      };
+    })
+  ]);
+}

From 9142a5b9dd7dacf54825d2fcd730604457535ebc Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 14 Jan 2025 16:01:56 +0300
Subject: [PATCH 058/202] docs: update contribution guidelines

Update URL for nixpkgs flavoured markdown, add mkOption argument ordering
---
 docs/manual/hacking/guidelines.md | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/docs/manual/hacking/guidelines.md b/docs/manual/hacking/guidelines.md
index 882deea8..a1db27e8 100644
--- a/docs/manual/hacking/guidelines.md
+++ b/docs/manual/hacking/guidelines.md
@@ -14,14 +14,11 @@ necessarily) before you start developing.
 
 ## Adding Documentation {#sec-guidelines-documentation}
 
-Most, if not all, changes warrant changes to the documentation. Module options
-should be documented with
-[Nixpkgs-flavoured Markdown](https://nixos.org/manual/nixpkgs/unstable/#sec-contributing-markup),
-albeit with exceptions.
+[Nixpkgs Flavoured Markdown]: https://github.com/NixOS/nixpkgs/blob/master/doc/README.md#syntax
 
-::: {.note} As of **v0.5**, **nvf** is itself documented using full markdown in
-both module options and the manual. With **v0.6**, this manual has also been
-converted to markdown in full. :::
+Almost all changes warrant updates to the documentation: at the very least, you
+must update the changelog. Both the manual and module options use
+[Nixpkgs Flavoured Markdown].
 
 The HTML version of this manual containing both the module option descriptions
 and the documentation of **nvf** (such as this page) can be generated and opened
@@ -117,10 +114,11 @@ applies to string literals and module descriptions and documentation.
 
 ### Nix {#sec-code-style-nix}
 
-**nvf** is formatted by the
-[alejandra](https://github.com/kamadorueda/alejandra) tool and the formatting is
-checked in the pull request and push workflows. Run the `nix fmt` command inside
-the project repository before submitting your pull request.
+[alejandra]: https://github.com/kamadorueda/alejandra
+
+**nvf** is formatted by the [alejandra] tool and the formatting is checked in
+the pull request and push workflows. Run the `nix fmt` command inside the
+project repository before submitting your pull request.
 
 While Alejandra is mostly opinionated on how code looks after formatting,
 certain changes are done at the user's discretion based on how the original code
@@ -138,10 +136,14 @@ module = {
     # same as parent modules, unfold submodules
     subModule = {
         # this is an option that contains more than one nested value
+        # Note: try to be careful about the ordering of `mkOption` arguments.
+        # General rule of thumb is to order from least to most likely to change.
+        # This is, for most cases, type < default < description.
+        # Example, if present, would be between default and description
         someOtherValue = mkOption {
             type = lib.types.bool;
-            description = "Some other description";
             default = true;
+            description = "Some other description";
         };
     };
 }

From dcb9b16f81f6b766e0219bbef58c207240d01c6f Mon Sep 17 00:00:00 2001
From: Thales Menato <8753631+thamenato@users.noreply.github.com>
Date: Tue, 14 Jan 2025 21:03:03 -0500
Subject: [PATCH 059/202] feat: add ruff to formatters

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

diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix
index 61aedcee..876093c0 100644
--- a/modules/plugins/languages/python.nix
+++ b/modules/plugins/languages/python.nix
@@ -106,6 +106,18 @@
         )
       '';
     };
+
+    ruff = {
+      package = pkgs.ruff;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.ruff.with({
+            command = "${cfg.format.package}/bin/ruff",
+          })
+        )
+      '';
+    };
   };
 
   defaultDebugger = "debugpy";

From ecf832681c79e9852b474cfa270c1f8d06891959 Mon Sep 17 00:00:00 2001
From: Thales Menato <8753631+thamenato@users.noreply.github.com>
Date: Tue, 14 Jan 2025 21:23:11 -0500
Subject: [PATCH 060/202] fix: ruff command

feat: add ruff

ruff
---
 modules/plugins/languages/python.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix
index 876093c0..a36e174f 100644
--- a/modules/plugins/languages/python.nix
+++ b/modules/plugins/languages/python.nix
@@ -108,7 +108,13 @@
     };
 
     ruff = {
-      package = pkgs.ruff;
+      package = pkgs.writeShellApplication {
+        name =  "ruff";
+        runtimeInputs = [pkgs.ruff];
+        text = ''
+          ruff format -
+        '';
+      };
       nullConfig = ''
         table.insert(
           ls_sources,

From 3f43edd635f688a541fe230b7fcc38580a6bb6b1 Mon Sep 17 00:00:00 2001
From: Thales Menato <8753631+thamenato@users.noreply.github.com>
Date: Wed, 15 Jan 2025 07:24:04 -0500
Subject: [PATCH 061/202] fix: run nix fmt

---
 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 a36e174f..0a3c6c8a 100644
--- a/modules/plugins/languages/python.nix
+++ b/modules/plugins/languages/python.nix
@@ -109,7 +109,7 @@
 
     ruff = {
       package = pkgs.writeShellApplication {
-        name =  "ruff";
+        name = "ruff";
         runtimeInputs = [pkgs.ruff];
         text = ''
           ruff format -

From f6d249d0768b62bba332e1866f5b1ed4b7b46220 Mon Sep 17 00:00:00 2001
From: Thales Menato <8753631+thamenato@users.noreply.github.com>
Date: Wed, 15 Jan 2025 07:33:27 -0500
Subject: [PATCH 062/202] docs: update changelog

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

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index d15c6842..edb3e7b3 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -41,8 +41,8 @@
 
 [horriblename](https://github.com/horriblename):
 
-[aerial.nvim](https://github.com/stevearc/aerial.nvim)
-[nvim-ufo](https://github.com/kevinhwang91/nvim-ufo)
+[aerial.nvim]: (https://github.com/stevearc/aerial.nvim)
+[nvim-ufo]: (https://github.com/kevinhwang91/nvim-ufo)
 
 - Add [aerial.nvim]
 - Add [nvim-ufo]
@@ -52,7 +52,8 @@
 - Remove `vim.notes.obsidian.setupOpts.dir`, which was set by default. Fixes
   issue with setting the workspace directory.
 - Add `vim.snippets.luasnip.setupOpts`, which was previously missing.
-- Add `"prettierd"` as a formatter option in `vim.languages.markdown.format.type`.
+- Add `"prettierd"` as a formatter option in
+  `vim.languages.markdown.format.type`.
 
 [kaktu5](https://github.com/kaktu5):
 
@@ -63,3 +64,9 @@
 [solargraph]: https://github.com/castwide/solargraph
 
 - Add Ruby support under `vim.languages.ruby` using [solargraph].
+
+[thamenato](https://github.com/thamenato):
+
+[ruff]: (https://github.com/astral-sh/ruff)
+
+- Add [ruff] as a formatter option in `vim.languages.python.format.type`.

From 952a3f1ad01d6f3eb28a90bd3c87b872c801a925 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Thu, 16 Jan 2025 08:23:19 +0100
Subject: [PATCH 063/202] collections/mini: init

---
 flake.lock                                    | 17 ++++++++++
 flake.nix                                     |  6 ++++
 modules/modules.nix                           |  1 +
 modules/plugins/collections/default.nix       |  5 +++
 .../plugins/collections/mini-nvim/config.nix  | 32 +++++++++++++++++++
 .../plugins/collections/mini-nvim/default.nix |  6 ++++
 .../collections/mini-nvim/mini-nvim.nix       | 28 ++++++++++++++++
 7 files changed, 95 insertions(+)
 create mode 100644 modules/plugins/collections/default.nix
 create mode 100644 modules/plugins/collections/mini-nvim/config.nix
 create mode 100644 modules/plugins/collections/mini-nvim/default.nix
 create mode 100644 modules/plugins/collections/mini-nvim/mini-nvim.nix

diff --git a/flake.lock b/flake.lock
index da38b967..448bd8b2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -936,6 +936,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1736875588,
+        "narHash": "sha256-v5cMB/IK+muogipWPtU7rFTfYWO7wr+VyGfqPU/fE70=",
+        "owner": "echasnovski",
+        "repo": "mini.nvim",
+        "rev": "9e603a31d3fbc7ee61c9b556cd84e97fa2dcff53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.nvim",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2132,6 +2148,7 @@
         "plugin-lz-n": "plugin-lz-n",
         "plugin-lzn-auto-require": "plugin-lzn-auto-require",
         "plugin-mind-nvim": "plugin-mind-nvim",
+        "plugin-mini-nvim": "plugin-mini-nvim",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 89690cad..4d6873ea 100644
--- a/flake.nix
+++ b/flake.nix
@@ -744,5 +744,11 @@
       url = "github:stevearc/aerial.nvim";
       flake = false;
     };
+
+    # Plugin collections
+    plugin-mini-nvim = {
+      url = "github:echasnovski/mini.nvim";
+      flake = false;
+    };
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 6e05c592..19860884 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -19,6 +19,7 @@
     plugins = map (p: ./plugins + "/${p}") [
       "assistant"
       "autopairs"
+      "collections"
       "comments"
       "completion"
       "dashboard"
diff --git a/modules/plugins/collections/default.nix b/modules/plugins/collections/default.nix
new file mode 100644
index 00000000..7f5524a6
--- /dev/null
+++ b/modules/plugins/collections/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./mini-nvim
+  ];
+}
diff --git a/modules/plugins/collections/mini-nvim/config.nix b/modules/plugins/collections/mini-nvim/config.nix
new file mode 100644
index 00000000..c04c8191
--- /dev/null
+++ b/modules/plugins/collections/mini-nvim/config.nix
@@ -0,0 +1,32 @@
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}: let
+  inherit (lib) mkMerge;
+  inherit (lib.modules) mkIf;
+  inherit (lib.strings) concatStringsSep;
+  inherit (lib.attrsets) mapAttrsToList;
+  inherit (lib.nvim.lua) toLuaObject;
+
+  cfg = config.vim.collections.mini-nvim;
+in {
+  config = mkIf cfg.enable {
+    vim.lazy.plugins."mini-nvim" = {
+      package = "mini-nvim";
+      # package = pkgs.vimPlugins.mini-nvim;
+      # package = pkgs.vimUtils.buildVimPlugin {
+      #   name = "mini-nvim";
+      #   src = inputs.plugin-mini-nvim;
+      # };
+      lazy = false;
+      after = concatStringsSep "\n" (mapAttrsToList (name: value: ''
+          require("mini.${name}").setup(${toLuaObject value.setupOpts})
+        '')
+        cfg.modules);
+    };
+  };
+}
diff --git a/modules/plugins/collections/mini-nvim/default.nix b/modules/plugins/collections/mini-nvim/default.nix
new file mode 100644
index 00000000..91faca27
--- /dev/null
+++ b/modules/plugins/collections/mini-nvim/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./config.nix
+    ./mini-nvim.nix
+  ];
+}
diff --git a/modules/plugins/collections/mini-nvim/mini-nvim.nix b/modules/plugins/collections/mini-nvim/mini-nvim.nix
new file mode 100644
index 00000000..b9764eed
--- /dev/null
+++ b/modules/plugins/collections/mini-nvim/mini-nvim.nix
@@ -0,0 +1,28 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption mkOption literalExpression;
+  inherit (lib.types) attrsOf submodule;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.collections.mini-nvim = {
+    enable = mkEnableOption "mini.nvim, a collection of quality-of-life modules";
+    modules = mkOption {
+      type = attrsOf (submodule {
+        options = {
+          setupOpts = mkPluginSetupOption "mini.nvim plugin" {};
+        };
+      });
+      default = {};
+      example =
+        literalExpression
+        ''
+          {
+            files = {};
+            sessions = {
+              autoread = true;
+              autowrite = true;
+            };
+          }
+        '';
+    };
+  };
+}

From 9c09915170353fc4f6bf4fc55376a33db4cbe15e Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 17:36:47 +0100
Subject: [PATCH 064/202] Revert "collections/mini: init"

This reverts commit 952a3f1ad01d6f3eb28a90bd3c87b872c801a925.
---
 flake.lock                                    | 17 ----------
 flake.nix                                     |  6 ----
 modules/modules.nix                           |  1 -
 modules/plugins/collections/default.nix       |  5 ---
 .../plugins/collections/mini-nvim/config.nix  | 32 -------------------
 .../plugins/collections/mini-nvim/default.nix |  6 ----
 .../collections/mini-nvim/mini-nvim.nix       | 28 ----------------
 7 files changed, 95 deletions(-)
 delete mode 100644 modules/plugins/collections/default.nix
 delete mode 100644 modules/plugins/collections/mini-nvim/config.nix
 delete mode 100644 modules/plugins/collections/mini-nvim/default.nix
 delete mode 100644 modules/plugins/collections/mini-nvim/mini-nvim.nix

diff --git a/flake.lock b/flake.lock
index 448bd8b2..da38b967 100644
--- a/flake.lock
+++ b/flake.lock
@@ -936,22 +936,6 @@
         "type": "github"
       }
     },
-    "plugin-mini-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736875588,
-        "narHash": "sha256-v5cMB/IK+muogipWPtU7rFTfYWO7wr+VyGfqPU/fE70=",
-        "owner": "echasnovski",
-        "repo": "mini.nvim",
-        "rev": "9e603a31d3fbc7ee61c9b556cd84e97fa2dcff53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.nvim",
-        "type": "github"
-      }
-    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2148,7 +2132,6 @@
         "plugin-lz-n": "plugin-lz-n",
         "plugin-lzn-auto-require": "plugin-lzn-auto-require",
         "plugin-mind-nvim": "plugin-mind-nvim",
-        "plugin-mini-nvim": "plugin-mini-nvim",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 4d6873ea..89690cad 100644
--- a/flake.nix
+++ b/flake.nix
@@ -744,11 +744,5 @@
       url = "github:stevearc/aerial.nvim";
       flake = false;
     };
-
-    # Plugin collections
-    plugin-mini-nvim = {
-      url = "github:echasnovski/mini.nvim";
-      flake = false;
-    };
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 19860884..6e05c592 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -19,7 +19,6 @@
     plugins = map (p: ./plugins + "/${p}") [
       "assistant"
       "autopairs"
-      "collections"
       "comments"
       "completion"
       "dashboard"
diff --git a/modules/plugins/collections/default.nix b/modules/plugins/collections/default.nix
deleted file mode 100644
index 7f5524a6..00000000
--- a/modules/plugins/collections/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./mini-nvim
-  ];
-}
diff --git a/modules/plugins/collections/mini-nvim/config.nix b/modules/plugins/collections/mini-nvim/config.nix
deleted file mode 100644
index c04c8191..00000000
--- a/modules/plugins/collections/mini-nvim/config.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  options,
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}: let
-  inherit (lib) mkMerge;
-  inherit (lib.modules) mkIf;
-  inherit (lib.strings) concatStringsSep;
-  inherit (lib.attrsets) mapAttrsToList;
-  inherit (lib.nvim.lua) toLuaObject;
-
-  cfg = config.vim.collections.mini-nvim;
-in {
-  config = mkIf cfg.enable {
-    vim.lazy.plugins."mini-nvim" = {
-      package = "mini-nvim";
-      # package = pkgs.vimPlugins.mini-nvim;
-      # package = pkgs.vimUtils.buildVimPlugin {
-      #   name = "mini-nvim";
-      #   src = inputs.plugin-mini-nvim;
-      # };
-      lazy = false;
-      after = concatStringsSep "\n" (mapAttrsToList (name: value: ''
-          require("mini.${name}").setup(${toLuaObject value.setupOpts})
-        '')
-        cfg.modules);
-    };
-  };
-}
diff --git a/modules/plugins/collections/mini-nvim/default.nix b/modules/plugins/collections/mini-nvim/default.nix
deleted file mode 100644
index 91faca27..00000000
--- a/modules/plugins/collections/mini-nvim/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./config.nix
-    ./mini-nvim.nix
-  ];
-}
diff --git a/modules/plugins/collections/mini-nvim/mini-nvim.nix b/modules/plugins/collections/mini-nvim/mini-nvim.nix
deleted file mode 100644
index b9764eed..00000000
--- a/modules/plugins/collections/mini-nvim/mini-nvim.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{lib, ...}: let
-  inherit (lib.options) mkEnableOption mkOption literalExpression;
-  inherit (lib.types) attrsOf submodule;
-  inherit (lib.nvim.types) mkPluginSetupOption;
-in {
-  options.vim.collections.mini-nvim = {
-    enable = mkEnableOption "mini.nvim, a collection of quality-of-life modules";
-    modules = mkOption {
-      type = attrsOf (submodule {
-        options = {
-          setupOpts = mkPluginSetupOption "mini.nvim plugin" {};
-        };
-      });
-      default = {};
-      example =
-        literalExpression
-        ''
-          {
-            files = {};
-            sessions = {
-              autoread = true;
-              autowrite = true;
-            };
-          }
-        '';
-    };
-  };
-}

From ae3340f2d1ea173cf8946d5657c25fb20f25bea6 Mon Sep 17 00:00:00 2001
From: tomasguinzburg <tomasguinzburg@gmail.com>
Date: Fri, 17 Jan 2025 09:54:51 +0100
Subject: [PATCH 065/202] feat: add nord theme

added nord theme from github.com/gbprod/nord.nvim
fixed a typo
---
 docs/release-notes/rl-0.8.md                    |  2 ++
 flake.lock                                      | 17 +++++++++++++++++
 flake.nix                                       |  7 ++++++-
 .../statusline/lualine/supported_themes.nix     |  1 +
 modules/plugins/theme/supported-themes.nix      | 10 ++++++++++
 5 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index edb3e7b3..465bf5c9 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -62,8 +62,10 @@
 [tomasguinzburg](https://github.com/tomasguinzburg):
 
 [solargraph]: https://github.com/castwide/solargraph
+[gbprod/nord.nvim]: https://github.com/gbprod/nord.nvim
 
 - Add Ruby support under `vim.languages.ruby` using [solargraph].
+- Add `nord` theme from [gbprod/nord.nvim].
 
 [thamenato](https://github.com/thamenato):
 
diff --git a/flake.lock b/flake.lock
index da38b967..918b0ce1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1097,6 +1097,22 @@
         "type": "github"
       }
     },
+    "plugin-nord": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1737019140,
+        "narHash": "sha256-ZhDS7Y90DKp+jkUqcoQRf/zHy4DVgSDQXrnl3sBYJXs=",
+        "owner": "gbprod",
+        "repo": "nord.nvim",
+        "rev": "b0f3ed242fd8e5bafa7231367821d46c6c835dd8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gbprod",
+        "repo": "nord.nvim",
+        "type": "github"
+      }
+    },
     "plugin-nui-nvim": {
       "flake": false,
       "locked": {
@@ -2142,6 +2158,7 @@
         "plugin-new-file-template-nvim": "plugin-new-file-template-nvim",
         "plugin-noice-nvim": "plugin-noice-nvim",
         "plugin-none-ls": "plugin-none-ls",
+        "plugin-nord": "plugin-nord",
         "plugin-nui-nvim": "plugin-nui-nvim",
         "plugin-nvim-autopairs": "plugin-nvim-autopairs",
         "plugin-nvim-bufferline-lua": "plugin-nvim-bufferline-lua",
diff --git a/flake.nix b/flake.nix
index 89690cad..02ceb667 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
     self,
     ...
   } @ inputs: let
-    # call the extedended library with `inputs`
+    # call the extended library with `inputs`
     # inputs is used to get the original standard library, and to pass inputs to the plugin autodiscovery function
     lib = import ./lib/stdlib-extended.nix inputs;
   in
@@ -419,6 +419,11 @@
       flake = false;
     };
 
+    plugin-nord = {
+      url = "github:gbprod/nord.nvim";
+      flake = false;
+    };
+
     # Rust crates
     plugin-crates-nvim = {
       url = "github:Saecki/crates.nvim";
diff --git a/modules/plugins/statusline/lualine/supported_themes.nix b/modules/plugins/statusline/lualine/supported_themes.nix
index b00fe82b..3528b24f 100644
--- a/modules/plugins/statusline/lualine/supported_themes.nix
+++ b/modules/plugins/statusline/lualine/supported_themes.nix
@@ -4,4 +4,5 @@
   "catppuccin"
   "oxocarbon"
   "gruvbox"
+  "nord"
 ]
diff --git a/modules/plugins/theme/supported-themes.nix b/modules/plugins/theme/supported-themes.nix
index e185eb0d..cf72024a 100644
--- a/modules/plugins/theme/supported-themes.nix
+++ b/modules/plugins/theme/supported-themes.nix
@@ -177,4 +177,14 @@ in {
     '';
     styles = ["main" "moon" "dawn"];
   };
+  nord = {
+    setup = {transparent ? false, ...}: ''
+      require("nord").setup({
+        transparent = ${boolToString transparent},
+        search = "vscode", -- [vim|vscode]
+      })
+
+      vim.cmd.colorscheme("nord")
+    '';
+  };
 }

From 8923d3b891b4f6ad0dfeb14aa8c049987cdecdbc Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 18:57:59 +0100
Subject: [PATCH 066/202] mini/ai: init

---
 docs/release-notes/rl-0.8.md        |  2 ++
 flake.lock                          | 17 +++++++++++++++++
 flake.nix                           |  6 ++++++
 modules/modules.nix                 |  1 +
 modules/plugins/mini/ai/ai.nix      | 13 +++++++++++++
 modules/plugins/mini/ai/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/ai/default.nix |  6 ++++++
 modules/plugins/mini/default.nix    |  5 +++++
 8 files changed, 69 insertions(+)
 create mode 100644 modules/plugins/mini/ai/ai.nix
 create mode 100644 modules/plugins/mini/ai/config.nix
 create mode 100644 modules/plugins/mini/ai/default.nix
 create mode 100644 modules/plugins/mini/default.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index d15c6842..067782d8 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -53,6 +53,8 @@
   issue with setting the workspace directory.
 - Add `vim.snippets.luasnip.setupOpts`, which was previously missing.
 - Add `"prettierd"` as a formatter option in `vim.languages.markdown.format.type`.
+- Add the following plugins from [mini.nvim](https://github.com/echasnovski/mini.nvim)
+  - `mini.ai`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index da38b967..351eae83 100644
--- a/flake.lock
+++ b/flake.lock
@@ -936,6 +936,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-ai": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733662803,
+        "narHash": "sha256-b/776l9nYM9e2atzXrvOk9dCxjzIuW/+iINC/yPv88Y=",
+        "owner": "echasnovski",
+        "repo": "mini.ai",
+        "rev": "ebb04799794a7f94628153991e6334c3304961b8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.ai",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2132,6 +2148,7 @@
         "plugin-lz-n": "plugin-lz-n",
         "plugin-lzn-auto-require": "plugin-lzn-auto-require",
         "plugin-mind-nvim": "plugin-mind-nvim",
+        "plugin-mini-ai": "plugin-mini-ai",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 89690cad..c236e71a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -744,5 +744,11 @@
       url = "github:stevearc/aerial.nvim";
       flake = false;
     };
+
+    # Mini.nvim
+    plugin-mini-ai = {
+      url = "github:echasnovski/mini.ai";
+      flake = false;
+    };
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 6e05c592..65b0c966 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -27,6 +27,7 @@
       "git"
       "languages"
       "lsp"
+      "mini"
       "minimap"
       "notes"
       "projects"
diff --git a/modules/plugins/mini/ai/ai.nix b/modules/plugins/mini/ai/ai.nix
new file mode 100644
index 00000000..c8e60b8e
--- /dev/null
+++ b/modules/plugins/mini/ai/ai.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.ai = {
+    enable = mkEnableOption "mini.ai";
+    setupOpts = mkPluginSetupOption "mini.ai" {};
+  };
+}
diff --git a/modules/plugins/mini/ai/config.nix b/modules/plugins/mini/ai/config.nix
new file mode 100644
index 00000000..7385e1b1
--- /dev/null
+++ b/modules/plugins/mini/ai/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.ai;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-ai"];
+
+    pluginRC.mini-ai = entryAnywhere ''
+      require("mini.ai").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/ai/default.nix b/modules/plugins/mini/ai/default.nix
new file mode 100644
index 00000000..57da6c08
--- /dev/null
+++ b/modules/plugins/mini/ai/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./ai.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
new file mode 100644
index 00000000..f3632321
--- /dev/null
+++ b/modules/plugins/mini/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./ai
+  ];
+}

From c8d727f2e94293e95d0a836dcf9fcdd593a39f39 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 19:00:43 +0100
Subject: [PATCH 067/202] mini/align: init

---
 docs/release-notes/rl-0.8.md           |  1 +
 flake.lock                             | 17 +++++++++++++++++
 flake.nix                              |  5 +++++
 modules/plugins/mini/align/align.nix   | 13 +++++++++++++
 modules/plugins/mini/align/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/align/default.nix |  6 ++++++
 modules/plugins/mini/default.nix       |  1 +
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/align/align.nix
 create mode 100644 modules/plugins/mini/align/config.nix
 create mode 100644 modules/plugins/mini/align/default.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 067782d8..28b9408a 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -55,6 +55,7 @@
 - Add `"prettierd"` as a formatter option in `vim.languages.markdown.format.type`.
 - Add the following plugins from [mini.nvim](https://github.com/echasnovski/mini.nvim)
   - `mini.ai`
+  - `mini.align`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 351eae83..5bcb6a8c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -952,6 +952,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-align": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1735582248,
+        "narHash": "sha256-oHub8dEihIx4kcP3CD9GXG1SUObJUVpH4bg2Z6PmadQ=",
+        "owner": "echasnovski",
+        "repo": "mini.align",
+        "rev": "e715137aece7d05734403d793b8b6b64486bc812",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.align",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2149,6 +2165,7 @@
         "plugin-lzn-auto-require": "plugin-lzn-auto-require",
         "plugin-mind-nvim": "plugin-mind-nvim",
         "plugin-mini-ai": "plugin-mini-ai",
+        "plugin-mini-align": "plugin-mini-align",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index c236e71a..1586e384 100644
--- a/flake.nix
+++ b/flake.nix
@@ -750,5 +750,10 @@
       url = "github:echasnovski/mini.ai";
       flake = false;
     };
+
+    plugin-mini-align = {
+      url = "github:echasnovski/mini.align";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/align/align.nix b/modules/plugins/mini/align/align.nix
new file mode 100644
index 00000000..c21e9532
--- /dev/null
+++ b/modules/plugins/mini/align/align.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.align = {
+    enable = mkEnableOption "mini.align";
+    setupOpts = mkPluginSetupOption "mini.align" {};
+  };
+}
diff --git a/modules/plugins/mini/align/config.nix b/modules/plugins/mini/align/config.nix
new file mode 100644
index 00000000..0a7a5a69
--- /dev/null
+++ b/modules/plugins/mini/align/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.align;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-align"];
+
+    pluginRC.mini-align = entryAnywhere ''
+      require("mini.align").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/align/default.nix b/modules/plugins/mini/align/default.nix
new file mode 100644
index 00000000..9ddaff69
--- /dev/null
+++ b/modules/plugins/mini/align/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./align.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index f3632321..051274cb 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
     ./ai
+    ./align
   ];
 }

From a1a0ab89b6d725f52f42efdcd86b27024afb651f Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 19:03:44 +0100
Subject: [PATCH 068/202] mini/animate: init

---
 docs/release-notes/rl-0.8.md             |  1 +
 flake.lock                               | 17 +++++++++++++++++
 flake.nix                                |  5 +++++
 modules/plugins/mini/animate/animate.nix | 13 +++++++++++++
 modules/plugins/mini/animate/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/animate/default.nix |  6 ++++++
 modules/plugins/mini/default.nix         |  1 +
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/animate/animate.nix
 create mode 100644 modules/plugins/mini/animate/config.nix
 create mode 100644 modules/plugins/mini/animate/default.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 28b9408a..969dfd45 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -56,6 +56,7 @@
 - Add the following plugins from [mini.nvim](https://github.com/echasnovski/mini.nvim)
   - `mini.ai`
   - `mini.align`
+  - `mini.animate`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 5bcb6a8c..27777b4b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -968,6 +968,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-animate": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733078395,
+        "narHash": "sha256-ZePmJuHCCymTgaK46nSg5tRloxs+UKrVgVmT++rGKpc=",
+        "owner": "echasnovski",
+        "repo": "mini.animate",
+        "rev": "d14190ac3040116540889e2ebc25f488b195799e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.animate",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2166,6 +2182,7 @@
         "plugin-mind-nvim": "plugin-mind-nvim",
         "plugin-mini-ai": "plugin-mini-ai",
         "plugin-mini-align": "plugin-mini-align",
+        "plugin-mini-animate": "plugin-mini-animate",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 1586e384..36683e91 100644
--- a/flake.nix
+++ b/flake.nix
@@ -755,5 +755,10 @@
       url = "github:echasnovski/mini.align";
       flake = false;
     };
+
+    plugin-mini-animate = {
+      url = "github:echasnovski/mini.animate";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/animate/animate.nix b/modules/plugins/mini/animate/animate.nix
new file mode 100644
index 00000000..6be633b5
--- /dev/null
+++ b/modules/plugins/mini/animate/animate.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.animate = {
+    enable = mkEnableOption "mini.animate";
+    setupOpts = mkPluginSetupOption "mini.animate" {};
+  };
+}
diff --git a/modules/plugins/mini/animate/config.nix b/modules/plugins/mini/animate/config.nix
new file mode 100644
index 00000000..e9cf2813
--- /dev/null
+++ b/modules/plugins/mini/animate/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.animate;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-animate"];
+
+    pluginRC.mini-animate = entryAnywhere ''
+      require("mini.animate").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/animate/default.nix b/modules/plugins/mini/animate/default.nix
new file mode 100644
index 00000000..5390fae1
--- /dev/null
+++ b/modules/plugins/mini/animate/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./animate.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 051274cb..6a4e3720 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -2,5 +2,6 @@
   imports = [
     ./ai
     ./align
+    ./animate
   ];
 }

From c52e3c0507f8096d93cd43ad1f29cba22349a27c Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 19:08:50 +0100
Subject: [PATCH 069/202] mini/base16: init

---
 docs/release-notes/rl-0.8.md               |  1 +
 flake.lock                                 | 17 +++++++++++++++++
 flake.nix                                  |  5 +++++
 modules/plugins/mini/default.nix           |  1 +
 modules/plugins/theme/supported-themes.nix |  8 ++++++++
 5 files changed, 32 insertions(+)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 969dfd45..e654f595 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -57,6 +57,7 @@
   - `mini.ai`
   - `mini.align`
   - `mini.animate`
+  - `mini.base16`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 27777b4b..862e7550 100644
--- a/flake.lock
+++ b/flake.lock
@@ -984,6 +984,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-base16": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1734960100,
+        "narHash": "sha256-VGs4k/xDujPcA0Nv5T18ybSv1iqnzg0AFmaweRdhvDM=",
+        "owner": "echasnovski",
+        "repo": "mini.base16",
+        "rev": "23453dacc1606e5d42238d82f0b42a2985386b62",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.base16",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2183,6 +2199,7 @@
         "plugin-mini-ai": "plugin-mini-ai",
         "plugin-mini-align": "plugin-mini-align",
         "plugin-mini-animate": "plugin-mini-animate",
+        "plugin-mini-base16": "plugin-mini-base16",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 36683e91..b5b9629e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -760,5 +760,10 @@
       url = "github:echasnovski/mini.animate";
       flake = false;
     };
+
+    plugin-mini-base16 = {
+      url = "github:echasnovski/mini.base16";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 6a4e3720..ecf80efd 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -3,5 +3,6 @@
     ./ai
     ./align
     ./animate
+    # ./base16 # NOTE: configured in theme/
   ];
 }
diff --git a/modules/plugins/theme/supported-themes.nix b/modules/plugins/theme/supported-themes.nix
index e185eb0d..87266e71 100644
--- a/modules/plugins/theme/supported-themes.nix
+++ b/modules/plugins/theme/supported-themes.nix
@@ -12,6 +12,14 @@ in {
       require('base16-colorscheme').setup(${toLuaObject base16-colors})
     '';
   };
+  mini-base16 = {
+    setup = {base16-colors, ...}: ''
+      -- Base16 theme
+      require('mini.base16').setup({
+        palette = ${toLuaObject base16-colors}
+      })
+    '';
+  };
   onedark = {
     setup = {style ? "dark", ...}: ''
       -- OneDark theme

From be5ab793424e6d26c2a7eadae0ba71900a9def30 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 19:11:31 +0100
Subject: [PATCH 070/202] mini/basics: init

---
 docs/release-notes/rl-0.8.md            |  1 +
 flake.lock                              | 17 +++++++++++++++++
 flake.nix                               |  5 +++++
 modules/plugins/mini/basics/basics.nix  | 13 +++++++++++++
 modules/plugins/mini/basics/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/basics/default.nix |  6 ++++++
 modules/plugins/mini/default.nix        |  1 +
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/basics/basics.nix
 create mode 100644 modules/plugins/mini/basics/config.nix
 create mode 100644 modules/plugins/mini/basics/default.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index e654f595..7523aa22 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -58,6 +58,7 @@
   - `mini.align`
   - `mini.animate`
   - `mini.base16`
+  - `mini.basics`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 862e7550..2c580ea0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1000,6 +1000,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-basics": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1730194519,
+        "narHash": "sha256-R8POaMcgb6SBOxIpanZsswieywapnU7zDNjQMRTkR8U=",
+        "owner": "echasnovski",
+        "repo": "mini.basics",
+        "rev": "67c10b3436d5d3b892715137f4773e71c6753b13",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.basics",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2200,6 +2216,7 @@
         "plugin-mini-align": "plugin-mini-align",
         "plugin-mini-animate": "plugin-mini-animate",
         "plugin-mini-base16": "plugin-mini-base16",
+        "plugin-mini-basics": "plugin-mini-basics",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index b5b9629e..c14323b2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -765,5 +765,10 @@
       url = "github:echasnovski/mini.base16";
       flake = false;
     };
+
+    plugin-mini-basics = {
+      url = "github:echasnovski/mini.basics";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/basics/basics.nix b/modules/plugins/mini/basics/basics.nix
new file mode 100644
index 00000000..b2a4ff30
--- /dev/null
+++ b/modules/plugins/mini/basics/basics.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.basics = {
+    enable = mkEnableOption "mini.basics";
+    setupOpts = mkPluginSetupOption "mini.basics" {};
+  };
+}
diff --git a/modules/plugins/mini/basics/config.nix b/modules/plugins/mini/basics/config.nix
new file mode 100644
index 00000000..9893ef42
--- /dev/null
+++ b/modules/plugins/mini/basics/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.basics;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-basics"];
+
+    pluginRC.mini-basics = entryAnywhere ''
+      require("mini.basics").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/basics/default.nix b/modules/plugins/mini/basics/default.nix
new file mode 100644
index 00000000..15bf750b
--- /dev/null
+++ b/modules/plugins/mini/basics/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./basics.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index ecf80efd..8ec59e16 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -4,5 +4,6 @@
     ./align
     ./animate
     # ./base16 # NOTE: configured in theme/
+    ./basics
   ];
 }

From eaae68aea27193429b414cfbaef2f46620ebaa15 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 19:14:30 +0100
Subject: [PATCH 071/202] mini/bracketed: init

---
 docs/release-notes/rl-0.8.md                 |  1 +
 flake.lock                                   | 17 +++++++++++++++++
 flake.nix                                    |  5 +++++
 modules/plugins/mini/bracketed/bracketed.nix | 13 +++++++++++++
 modules/plugins/mini/bracketed/config.nix    | 19 +++++++++++++++++++
 modules/plugins/mini/bracketed/default.nix   |  6 ++++++
 modules/plugins/mini/default.nix             |  1 +
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/bracketed/bracketed.nix
 create mode 100644 modules/plugins/mini/bracketed/config.nix
 create mode 100644 modules/plugins/mini/bracketed/default.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 7523aa22..3d55f630 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -59,6 +59,7 @@
   - `mini.animate`
   - `mini.base16`
   - `mini.basics`
+  - `mini.bracketed`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 2c580ea0..5fe53f6a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1016,6 +1016,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-bracketed": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1737036218,
+        "narHash": "sha256-y+tGFF1H37ES/hnEtr3GJK3GeB6D5s8ZdSpvzl+lh3s=",
+        "owner": "echasnovski",
+        "repo": "mini.bracketed",
+        "rev": "0091e11fabe34973fc038a8d0d0485202742e403",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.bracketed",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2217,6 +2233,7 @@
         "plugin-mini-animate": "plugin-mini-animate",
         "plugin-mini-base16": "plugin-mini-base16",
         "plugin-mini-basics": "plugin-mini-basics",
+        "plugin-mini-bracketed": "plugin-mini-bracketed",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index c14323b2..2875a010 100644
--- a/flake.nix
+++ b/flake.nix
@@ -770,5 +770,10 @@
       url = "github:echasnovski/mini.basics";
       flake = false;
     };
+
+    plugin-mini-bracketed = {
+      url = "github:echasnovski/mini.bracketed";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/bracketed/bracketed.nix b/modules/plugins/mini/bracketed/bracketed.nix
new file mode 100644
index 00000000..950f4e7f
--- /dev/null
+++ b/modules/plugins/mini/bracketed/bracketed.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.bracketed = {
+    enable = mkEnableOption "mini.bracketed";
+    setupOpts = mkPluginSetupOption "mini.bracketed" {};
+  };
+}
diff --git a/modules/plugins/mini/bracketed/config.nix b/modules/plugins/mini/bracketed/config.nix
new file mode 100644
index 00000000..09c6262f
--- /dev/null
+++ b/modules/plugins/mini/bracketed/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.bracketed;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-bracketed"];
+
+    pluginRC.mini-bracketed = entryAnywhere ''
+      require("mini.bracketed").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/bracketed/default.nix b/modules/plugins/mini/bracketed/default.nix
new file mode 100644
index 00000000..057dbd31
--- /dev/null
+++ b/modules/plugins/mini/bracketed/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./bracketed.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 8ec59e16..dce0e081 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -5,5 +5,6 @@
     ./animate
     # ./base16 # NOTE: configured in theme/
     ./basics
+    ./bracketed
   ];
 }

From beedffcb5be18e0f2e813252412e0f84a4e44bb4 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 19:17:05 +0100
Subject: [PATCH 072/202] mini/bufremove: init

---
 docs/release-notes/rl-0.8.md                 |  1 +
 flake.lock                                   | 17 +++++++++++++++++
 flake.nix                                    |  5 +++++
 modules/plugins/mini/bufremove/bufremove.nix | 13 +++++++++++++
 modules/plugins/mini/bufremove/config.nix    | 19 +++++++++++++++++++
 modules/plugins/mini/bufremove/default.nix   |  6 ++++++
 modules/plugins/mini/default.nix             |  1 +
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/bufremove/bufremove.nix
 create mode 100644 modules/plugins/mini/bufremove/config.nix
 create mode 100644 modules/plugins/mini/bufremove/default.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 3d55f630..5624aa07 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -60,6 +60,7 @@
   - `mini.base16`
   - `mini.basics`
   - `mini.bracketed`
+  - `mini.bufremove`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 5fe53f6a..d5305234 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1032,6 +1032,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-bufremove": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1730726192,
+        "narHash": "sha256-CB6ZIlrCQlh2W44Knnb10REDcvj4jcYkW/9CiOaoH2E=",
+        "owner": "echasnovski",
+        "repo": "mini.bufremove",
+        "rev": "285bdac9596ee7375db50c0f76ed04336dcd2685",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.bufremove",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2234,6 +2250,7 @@
         "plugin-mini-base16": "plugin-mini-base16",
         "plugin-mini-basics": "plugin-mini-basics",
         "plugin-mini-bracketed": "plugin-mini-bracketed",
+        "plugin-mini-bufremove": "plugin-mini-bufremove",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 2875a010..01f9bead 100644
--- a/flake.nix
+++ b/flake.nix
@@ -775,5 +775,10 @@
       url = "github:echasnovski/mini.bracketed";
       flake = false;
     };
+
+    plugin-mini-bufremove = {
+      url = "github:echasnovski/mini.bufremove";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/bufremove/bufremove.nix b/modules/plugins/mini/bufremove/bufremove.nix
new file mode 100644
index 00000000..79b84936
--- /dev/null
+++ b/modules/plugins/mini/bufremove/bufremove.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.bufremove = {
+    enable = mkEnableOption "mini.bufremove";
+    setupOpts = mkPluginSetupOption "mini.bufremove" {};
+  };
+}
diff --git a/modules/plugins/mini/bufremove/config.nix b/modules/plugins/mini/bufremove/config.nix
new file mode 100644
index 00000000..b65b261a
--- /dev/null
+++ b/modules/plugins/mini/bufremove/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.bufremove;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-bufremove"];
+
+    pluginRC.mini-bufremove = entryAnywhere ''
+      require("mini.bufremove").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/bufremove/default.nix b/modules/plugins/mini/bufremove/default.nix
new file mode 100644
index 00000000..7f4e79f9
--- /dev/null
+++ b/modules/plugins/mini/bufremove/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./bufremove.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index dce0e081..da5ccb83 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -6,5 +6,6 @@
     # ./base16 # NOTE: configured in theme/
     ./basics
     ./bracketed
+    ./bufremove
   ];
 }

From 3d47d3f8c3b2c0bd9eb3de0588343003736a6f39 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 19:19:20 +0100
Subject: [PATCH 073/202] mini/clue: init

---
 docs/release-notes/rl-0.8.md          |  1 +
 flake.lock                            | 17 +++++++++++++++++
 flake.nix                             |  5 +++++
 modules/plugins/mini/clue/clue.nix    | 13 +++++++++++++
 modules/plugins/mini/clue/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/clue/default.nix |  6 ++++++
 modules/plugins/mini/default.nix      |  1 +
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/clue/clue.nix
 create mode 100644 modules/plugins/mini/clue/config.nix
 create mode 100644 modules/plugins/mini/clue/default.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 5624aa07..559c4c4b 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -61,6 +61,7 @@
   - `mini.basics`
   - `mini.bracketed`
   - `mini.bufremove`
+  - `mini.clue`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index d5305234..238f06b8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1048,6 +1048,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-clue": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1737130586,
+        "narHash": "sha256-/0DpZV/jXuhaqBz5j4JN3xmofATlwPMHNSm/uTXALg0=",
+        "owner": "echasnovski",
+        "repo": "mini.clue",
+        "rev": "63e42dad781b9ed4845d90ef1da8c52dfb6dce3f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.clue",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2251,6 +2267,7 @@
         "plugin-mini-basics": "plugin-mini-basics",
         "plugin-mini-bracketed": "plugin-mini-bracketed",
         "plugin-mini-bufremove": "plugin-mini-bufremove",
+        "plugin-mini-clue": "plugin-mini-clue",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 01f9bead..b88b9d8a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -780,5 +780,10 @@
       url = "github:echasnovski/mini.bufremove";
       flake = false;
     };
+
+    plugin-mini-clue = {
+      url = "github:echasnovski/mini.clue";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/clue/clue.nix b/modules/plugins/mini/clue/clue.nix
new file mode 100644
index 00000000..de4cf2ee
--- /dev/null
+++ b/modules/plugins/mini/clue/clue.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.clue = {
+    enable = mkEnableOption "mini.clue";
+    setupOpts = mkPluginSetupOption "mini.clue" {};
+  };
+}
diff --git a/modules/plugins/mini/clue/config.nix b/modules/plugins/mini/clue/config.nix
new file mode 100644
index 00000000..efdc2946
--- /dev/null
+++ b/modules/plugins/mini/clue/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.clue;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-clue"];
+
+    pluginRC.mini-clue = entryAnywhere ''
+      require("mini.clue").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/clue/default.nix b/modules/plugins/mini/clue/default.nix
new file mode 100644
index 00000000..55ac57e7
--- /dev/null
+++ b/modules/plugins/mini/clue/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./clue.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index da5ccb83..8c3a9a4a 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -7,5 +7,6 @@
     ./basics
     ./bracketed
     ./bufremove
+    ./clue
   ];
 }

From 86fc7a3764b9bb3d328284bdbec4dd25cee7175d Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 19:23:03 +0100
Subject: [PATCH 074/202] mini/colors: init

---
 docs/release-notes/rl-0.8.md            |  1 +
 flake.lock                              | 17 +++++++++++++++++
 flake.nix                               |  5 +++++
 modules/plugins/mini/colors/colors.nix  | 11 +++++++++++
 modules/plugins/mini/colors/config.nix  | 18 ++++++++++++++++++
 modules/plugins/mini/colors/default.nix |  6 ++++++
 modules/plugins/mini/default.nix        |  1 +
 7 files changed, 59 insertions(+)
 create mode 100644 modules/plugins/mini/colors/colors.nix
 create mode 100644 modules/plugins/mini/colors/config.nix
 create mode 100644 modules/plugins/mini/colors/default.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 559c4c4b..16bae05c 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -62,6 +62,7 @@
   - `mini.bracketed`
   - `mini.bufremove`
   - `mini.clue`
+  - `mini.colors`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 238f06b8..5ff55331 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1064,6 +1064,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-colors": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1730726192,
+        "narHash": "sha256-B2JahCUhKpYwOJrl+BhSp3UQFiyyMGJAYKGK+uMv3fk=",
+        "owner": "echasnovski",
+        "repo": "mini.colors",
+        "rev": "d64b1c0f520579d905f97208eca85329e664ab88",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.colors",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2268,6 +2284,7 @@
         "plugin-mini-bracketed": "plugin-mini-bracketed",
         "plugin-mini-bufremove": "plugin-mini-bufremove",
         "plugin-mini-clue": "plugin-mini-clue",
+        "plugin-mini-colors": "plugin-mini-colors",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index b88b9d8a..11d9a5a3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -785,5 +785,10 @@
       url = "github:echasnovski/mini.clue";
       flake = false;
     };
+
+    plugin-mini-colors = {
+      url = "github:echasnovski/mini.colors";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/colors/colors.nix b/modules/plugins/mini/colors/colors.nix
new file mode 100644
index 00000000..81fe5840
--- /dev/null
+++ b/modules/plugins/mini/colors/colors.nix
@@ -0,0 +1,11 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+in {
+  options.vim.mini.colors = {
+    enable = mkEnableOption "mini.colors";
+  };
+}
diff --git a/modules/plugins/mini/colors/config.nix b/modules/plugins/mini/colors/config.nix
new file mode 100644
index 00000000..60953c16
--- /dev/null
+++ b/modules/plugins/mini/colors/config.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.dag) entryAnywhere;
+
+  cfg = config.vim.mini.colors;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-colors"];
+
+    pluginRC.mini-colors = entryAnywhere ''
+      require("mini.colors").setup()
+    '';
+  };
+}
diff --git a/modules/plugins/mini/colors/default.nix b/modules/plugins/mini/colors/default.nix
new file mode 100644
index 00000000..4eed4770
--- /dev/null
+++ b/modules/plugins/mini/colors/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./colors.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 8c3a9a4a..748cd2f8 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -8,5 +8,6 @@
     ./bracketed
     ./bufremove
     ./clue
+    ./colors
   ];
 }

From 68483183c11d6303e559567f63b8490d92892a02 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 19:25:56 +0100
Subject: [PATCH 075/202] mini/comment: init

---
 docs/release-notes/rl-0.8.md             |  1 +
 flake.lock                               | 17 +++++++++++++++++
 flake.nix                                |  5 +++++
 modules/plugins/mini/comment/comment.nix | 13 +++++++++++++
 modules/plugins/mini/comment/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/comment/default.nix |  6 ++++++
 modules/plugins/mini/default.nix         |  1 +
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/comment/comment.nix
 create mode 100644 modules/plugins/mini/comment/config.nix
 create mode 100644 modules/plugins/mini/comment/default.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 16bae05c..a9c796f1 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -63,6 +63,7 @@
   - `mini.bufremove`
   - `mini.clue`
   - `mini.colors`
+  - `mini.comment`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 5ff55331..9a0a76b1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1080,6 +1080,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-comment": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1736611383,
+        "narHash": "sha256-vAgBDSVtXCP+rlu+cmXdoZQBGShyH7KfL8E/gvDMfnM=",
+        "owner": "echasnovski",
+        "repo": "mini.comment",
+        "rev": "6e1f9a8ebbf6f693fa3787ceda8ca3bf3cb6aec7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.comment",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2285,6 +2301,7 @@
         "plugin-mini-bufremove": "plugin-mini-bufremove",
         "plugin-mini-clue": "plugin-mini-clue",
         "plugin-mini-colors": "plugin-mini-colors",
+        "plugin-mini-comment": "plugin-mini-comment",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 11d9a5a3..ef61bd9c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -790,5 +790,10 @@
       url = "github:echasnovski/mini.colors";
       flake = false;
     };
+
+    plugin-mini-comment = {
+      url = "github:echasnovski/mini.comment";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/comment/comment.nix b/modules/plugins/mini/comment/comment.nix
new file mode 100644
index 00000000..2231a360
--- /dev/null
+++ b/modules/plugins/mini/comment/comment.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.comment = {
+    enable = mkEnableOption "mini.comment";
+    setupOpts = mkPluginSetupOption "mini.comment" {};
+  };
+}
diff --git a/modules/plugins/mini/comment/config.nix b/modules/plugins/mini/comment/config.nix
new file mode 100644
index 00000000..7babd8a9
--- /dev/null
+++ b/modules/plugins/mini/comment/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.comment;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-comment"];
+
+    pluginRC.mini-comment = entryAnywhere ''
+      require("mini.comment").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/comment/default.nix b/modules/plugins/mini/comment/default.nix
new file mode 100644
index 00000000..0a0e6d99
--- /dev/null
+++ b/modules/plugins/mini/comment/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./comment.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 748cd2f8..dd3bbf58 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -9,5 +9,6 @@
     ./bufremove
     ./clue
     ./colors
+    ./comment
   ];
 }

From 887e563076a1a1c33fafc2c1b98dcf7a01c5ac7b Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 19:28:07 +0100
Subject: [PATCH 076/202] mini/completion: init

---
 docs/release-notes/rl-0.8.md                  |  1 +
 flake.lock                                    | 17 +++++++++++++++++
 flake.nix                                     |  5 +++++
 .../plugins/mini/completion/completion.nix    | 13 +++++++++++++
 modules/plugins/mini/completion/config.nix    | 19 +++++++++++++++++++
 modules/plugins/mini/completion/default.nix   |  6 ++++++
 modules/plugins/mini/default.nix              |  1 +
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/completion/completion.nix
 create mode 100644 modules/plugins/mini/completion/config.nix
 create mode 100644 modules/plugins/mini/completion/default.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index a9c796f1..ea0f7d50 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -64,6 +64,7 @@
   - `mini.clue`
   - `mini.colors`
   - `mini.comment`
+  - `mini.completion`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 9a0a76b1..86ca362b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1096,6 +1096,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-completion": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1732271068,
+        "narHash": "sha256-dlQCfHUQX9rPiSYZSRipezHX0CG/redbV2g7cpwwExY=",
+        "owner": "echasnovski",
+        "repo": "mini.completion",
+        "rev": "6eb9546685c4e1c4af2365b87166d4afa39d8a1b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.completion",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2302,6 +2318,7 @@
         "plugin-mini-clue": "plugin-mini-clue",
         "plugin-mini-colors": "plugin-mini-colors",
         "plugin-mini-comment": "plugin-mini-comment",
+        "plugin-mini-completion": "plugin-mini-completion",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index ef61bd9c..87b54693 100644
--- a/flake.nix
+++ b/flake.nix
@@ -795,5 +795,10 @@
       url = "github:echasnovski/mini.comment";
       flake = false;
     };
+
+    plugin-mini-completion = {
+      url = "github:echasnovski/mini.completion";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/completion/completion.nix b/modules/plugins/mini/completion/completion.nix
new file mode 100644
index 00000000..a5f8caa5
--- /dev/null
+++ b/modules/plugins/mini/completion/completion.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.completion = {
+    enable = mkEnableOption "mini.completion";
+    setupOpts = mkPluginSetupOption "mini.completion" {};
+  };
+}
diff --git a/modules/plugins/mini/completion/config.nix b/modules/plugins/mini/completion/config.nix
new file mode 100644
index 00000000..e0d0b904
--- /dev/null
+++ b/modules/plugins/mini/completion/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.completion;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-completion"];
+
+    pluginRC.mini-completion = entryAnywhere ''
+      require("mini.completion").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/completion/default.nix b/modules/plugins/mini/completion/default.nix
new file mode 100644
index 00000000..1251f751
--- /dev/null
+++ b/modules/plugins/mini/completion/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./completion.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index dd3bbf58..0564a46a 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -10,5 +10,6 @@
     ./clue
     ./colors
     ./comment
+    ./completion
   ];
 }

From 4b4423af91d2ba6600752cb64e28dfb8749e5f07 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 19:32:56 +0100
Subject: [PATCH 077/202] mini/diff: init

---
 docs/release-notes/rl-0.8.md          |  1 +
 flake.lock                            | 17 +++++++++++++++++
 flake.nix                             |  5 +++++
 modules/plugins/mini/default.nix      |  1 +
 modules/plugins/mini/diff/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/diff/default.nix |  6 ++++++
 modules/plugins/mini/diff/diff.nix    | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/diff/config.nix
 create mode 100644 modules/plugins/mini/diff/default.nix
 create mode 100644 modules/plugins/mini/diff/diff.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index ea0f7d50..54ce0492 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -65,6 +65,7 @@
   - `mini.colors`
   - `mini.comment`
   - `mini.completion`
+  - `mini.diff`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 86ca362b..37011895 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1112,6 +1112,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-diff": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1735324663,
+        "narHash": "sha256-dRvW/1lfVShiHmRU0mQA5g5xDyQ0EVtVLLZ0y6WSedg=",
+        "owner": "echasnovski",
+        "repo": "mini.diff",
+        "rev": "00f072250061ef498f91ed226918c9ec31a416a4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.diff",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2319,6 +2335,7 @@
         "plugin-mini-colors": "plugin-mini-colors",
         "plugin-mini-comment": "plugin-mini-comment",
         "plugin-mini-completion": "plugin-mini-completion",
+        "plugin-mini-diff": "plugin-mini-diff",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 87b54693..36ca93c5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -800,5 +800,10 @@
       url = "github:echasnovski/mini.completion";
       flake = false;
     };
+
+    plugin-mini-diff = {
+      url = "github:echasnovski/mini.diff";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 0564a46a..b8e665bf 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -11,5 +11,6 @@
     ./colors
     ./comment
     ./completion
+    ./diff
   ];
 }
diff --git a/modules/plugins/mini/diff/config.nix b/modules/plugins/mini/diff/config.nix
new file mode 100644
index 00000000..6c5969f6
--- /dev/null
+++ b/modules/plugins/mini/diff/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.diff;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-diff"];
+
+    pluginRC.mini-diff = entryAnywhere ''
+      require("mini.diff").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/diff/default.nix b/modules/plugins/mini/diff/default.nix
new file mode 100644
index 00000000..c77c8c67
--- /dev/null
+++ b/modules/plugins/mini/diff/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./diff.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/diff/diff.nix b/modules/plugins/mini/diff/diff.nix
new file mode 100644
index 00000000..8438cec9
--- /dev/null
+++ b/modules/plugins/mini/diff/diff.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.diff = {
+    enable = mkEnableOption "mini.diff";
+    setupOpts = mkPluginSetupOption "mini.diff" {};
+  };
+}

From 753eb3e99d3de030ee0030624f2f32d1c308aed0 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 20:14:59 +0100
Subject: [PATCH 078/202] mini/doc: init

---
 docs/release-notes/rl-0.8.md         |  1 +
 flake.lock                           | 17 +++++++++++++++++
 flake.nix                            |  5 +++++
 modules/plugins/mini/default.nix     |  1 +
 modules/plugins/mini/doc/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/doc/default.nix |  6 ++++++
 modules/plugins/mini/doc/doc.nix     | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/doc/config.nix
 create mode 100644 modules/plugins/mini/doc/default.nix
 create mode 100644 modules/plugins/mini/doc/doc.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 54ce0492..51a9d8db 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -66,6 +66,7 @@
   - `mini.comment`
   - `mini.completion`
   - `mini.diff`
+  - `mini.doc`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 37011895..3ddb9ac8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1128,6 +1128,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-doc": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1723308950,
+        "narHash": "sha256-Q3DAEV1ZHS+lFhZKFCNoIjn41ksk7WRrVP2b2d6uSss=",
+        "owner": "echasnovski",
+        "repo": "mini.doc",
+        "rev": "bb73a3d1ff390f7e2740027ea2567017099a237c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.doc",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2336,6 +2352,7 @@
         "plugin-mini-comment": "plugin-mini-comment",
         "plugin-mini-completion": "plugin-mini-completion",
         "plugin-mini-diff": "plugin-mini-diff",
+        "plugin-mini-doc": "plugin-mini-doc",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 36ca93c5..7e8323ed 100644
--- a/flake.nix
+++ b/flake.nix
@@ -805,5 +805,10 @@
       url = "github:echasnovski/mini.diff";
       flake = false;
     };
+
+    plugin-mini-doc = {
+      url = "github:echasnovski/mini.doc";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index b8e665bf..fb4f7000 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -12,5 +12,6 @@
     ./comment
     ./completion
     ./diff
+    ./doc
   ];
 }
diff --git a/modules/plugins/mini/doc/config.nix b/modules/plugins/mini/doc/config.nix
new file mode 100644
index 00000000..e9df43b8
--- /dev/null
+++ b/modules/plugins/mini/doc/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.doc;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-doc"];
+
+    pluginRC.mini-doc = entryAnywhere ''
+      require("mini.doc").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/doc/default.nix b/modules/plugins/mini/doc/default.nix
new file mode 100644
index 00000000..bccfa883
--- /dev/null
+++ b/modules/plugins/mini/doc/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./doc.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/doc/doc.nix b/modules/plugins/mini/doc/doc.nix
new file mode 100644
index 00000000..f1e65730
--- /dev/null
+++ b/modules/plugins/mini/doc/doc.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.doc = {
+    enable = mkEnableOption "mini.doc";
+    setupOpts = mkPluginSetupOption "mini.doc" {};
+  };
+}

From 3533d5bcbd76bb3eb0f48ca9b44f4cca1e147e94 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 20:17:19 +0100
Subject: [PATCH 079/202] mini/extra: init

---
 docs/release-notes/rl-0.8.md           |  1 +
 flake.lock                             | 17 +++++++++++++++++
 flake.nix                              |  5 +++++
 modules/plugins/mini/default.nix       |  1 +
 modules/plugins/mini/extra/config.nix  | 18 ++++++++++++++++++
 modules/plugins/mini/extra/default.nix |  6 ++++++
 modules/plugins/mini/extra/extra.nix   | 11 +++++++++++
 7 files changed, 59 insertions(+)
 create mode 100644 modules/plugins/mini/extra/config.nix
 create mode 100644 modules/plugins/mini/extra/default.nix
 create mode 100644 modules/plugins/mini/extra/extra.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 51a9d8db..0e87c9c5 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -67,6 +67,7 @@
   - `mini.completion`
   - `mini.diff`
   - `mini.doc`
+  - `mini.extra`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 3ddb9ac8..7442f67e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1144,6 +1144,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-extra": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1736279066,
+        "narHash": "sha256-lUJrviUjAmJ70g2y93aNw3e1mHGHoB9lbh44HGP7zQs=",
+        "owner": "echasnovski",
+        "repo": "mini.extra",
+        "rev": "477e3dda7b597b49bc1373951ea7da4da834c352",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.extra",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2353,6 +2369,7 @@
         "plugin-mini-completion": "plugin-mini-completion",
         "plugin-mini-diff": "plugin-mini-diff",
         "plugin-mini-doc": "plugin-mini-doc",
+        "plugin-mini-extra": "plugin-mini-extra",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 7e8323ed..ca26f859 100644
--- a/flake.nix
+++ b/flake.nix
@@ -810,5 +810,10 @@
       url = "github:echasnovski/mini.doc";
       flake = false;
     };
+
+    plugin-mini-extra = {
+      url = "github:echasnovski/mini.extra";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index fb4f7000..d945a222 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -13,5 +13,6 @@
     ./completion
     ./diff
     ./doc
+    ./extra
   ];
 }
diff --git a/modules/plugins/mini/extra/config.nix b/modules/plugins/mini/extra/config.nix
new file mode 100644
index 00000000..c430847d
--- /dev/null
+++ b/modules/plugins/mini/extra/config.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.dag) entryAnywhere;
+
+  cfg = config.vim.mini.extra;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-extra"];
+
+    pluginRC.mini-extra = entryAnywhere ''
+      require("mini.extra").setup()
+    '';
+  };
+}
diff --git a/modules/plugins/mini/extra/default.nix b/modules/plugins/mini/extra/default.nix
new file mode 100644
index 00000000..73992e72
--- /dev/null
+++ b/modules/plugins/mini/extra/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./extra.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/extra/extra.nix b/modules/plugins/mini/extra/extra.nix
new file mode 100644
index 00000000..c57e6cdc
--- /dev/null
+++ b/modules/plugins/mini/extra/extra.nix
@@ -0,0 +1,11 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+in {
+  options.vim.mini.extra = {
+    enable = mkEnableOption "mini.extra";
+  };
+}

From 7472cac221bbd7777c7ad832d5883013e6279ae0 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 20:19:02 +0100
Subject: [PATCH 080/202] mini/files: init

---
 docs/release-notes/rl-0.8.md           |  1 +
 flake.lock                             | 17 +++++++++++++++++
 flake.nix                              |  5 +++++
 modules/plugins/mini/default.nix       |  1 +
 modules/plugins/mini/files/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/files/default.nix |  6 ++++++
 modules/plugins/mini/files/files.nix   | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/files/config.nix
 create mode 100644 modules/plugins/mini/files/default.nix
 create mode 100644 modules/plugins/mini/files/files.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 0e87c9c5..1d76bfa2 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -68,6 +68,7 @@
   - `mini.diff`
   - `mini.doc`
   - `mini.extra`
+  - `mini.files`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 7442f67e..c8652ec2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1160,6 +1160,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-files": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1736535707,
+        "narHash": "sha256-UHW78m4BiYMMrABwdkyyzQUENgQrVFbWJnmNdRMtr0w=",
+        "owner": "echasnovski",
+        "repo": "mini.files",
+        "rev": "d0f03a5c38836fd2cce3dc80734124959002078c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.files",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2370,6 +2386,7 @@
         "plugin-mini-diff": "plugin-mini-diff",
         "plugin-mini-doc": "plugin-mini-doc",
         "plugin-mini-extra": "plugin-mini-extra",
+        "plugin-mini-files": "plugin-mini-files",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index ca26f859..ea1d9e90 100644
--- a/flake.nix
+++ b/flake.nix
@@ -815,5 +815,10 @@
       url = "github:echasnovski/mini.extra";
       flake = false;
     };
+
+    plugin-mini-files = {
+      url = "github:echasnovski/mini.files";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index d945a222..515b5cb4 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -14,5 +14,6 @@
     ./diff
     ./doc
     ./extra
+    ./files
   ];
 }
diff --git a/modules/plugins/mini/files/config.nix b/modules/plugins/mini/files/config.nix
new file mode 100644
index 00000000..eb195f8d
--- /dev/null
+++ b/modules/plugins/mini/files/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.files;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-files"];
+
+    pluginRC.mini-files = entryAnywhere ''
+      require("mini.files").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/files/default.nix b/modules/plugins/mini/files/default.nix
new file mode 100644
index 00000000..6c0ebbc0
--- /dev/null
+++ b/modules/plugins/mini/files/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./files.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/files/files.nix b/modules/plugins/mini/files/files.nix
new file mode 100644
index 00000000..f9c3f8ca
--- /dev/null
+++ b/modules/plugins/mini/files/files.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.files = {
+    enable = mkEnableOption "mini.files";
+    setupOpts = mkPluginSetupOption "mini.files" {};
+  };
+}

From 173ea3f43cfe16640dfa810170177a8e6c2cf105 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 20:21:12 +0100
Subject: [PATCH 081/202] mini/fuzzy: init

---
 docs/release-notes/rl-0.8.md           |  1 +
 flake.lock                             | 17 +++++++++++++++++
 flake.nix                              |  5 +++++
 modules/plugins/mini/default.nix       |  1 +
 modules/plugins/mini/fuzzy/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/fuzzy/default.nix |  6 ++++++
 modules/plugins/mini/fuzzy/fuzzy.nix   | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/fuzzy/config.nix
 create mode 100644 modules/plugins/mini/fuzzy/default.nix
 create mode 100644 modules/plugins/mini/fuzzy/fuzzy.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 1d76bfa2..5c0fb555 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -69,6 +69,7 @@
   - `mini.doc`
   - `mini.extra`
   - `mini.files`
+  - `mini.fuzzy`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index c8652ec2..7ac9b0e5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1176,6 +1176,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-fuzzy": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1730726192,
+        "narHash": "sha256-XvDkDfwPcBxySuz58f2mpWTeo8EsOnMvZUcNI8HNZg8=",
+        "owner": "echasnovski",
+        "repo": "mini.fuzzy",
+        "rev": "faa5a6c0d29c28012c90bd011162963a58715428",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.fuzzy",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2387,6 +2403,7 @@
         "plugin-mini-doc": "plugin-mini-doc",
         "plugin-mini-extra": "plugin-mini-extra",
         "plugin-mini-files": "plugin-mini-files",
+        "plugin-mini-fuzzy": "plugin-mini-fuzzy",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index ea1d9e90..73eef497 100644
--- a/flake.nix
+++ b/flake.nix
@@ -820,5 +820,10 @@
       url = "github:echasnovski/mini.files";
       flake = false;
     };
+
+    plugin-mini-fuzzy = {
+      url = "github:echasnovski/mini.fuzzy";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 515b5cb4..69dd8ce6 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -15,5 +15,6 @@
     ./doc
     ./extra
     ./files
+    ./fuzzy
   ];
 }
diff --git a/modules/plugins/mini/fuzzy/config.nix b/modules/plugins/mini/fuzzy/config.nix
new file mode 100644
index 00000000..0397f4b9
--- /dev/null
+++ b/modules/plugins/mini/fuzzy/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.fuzzy;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-fuzzy"];
+
+    pluginRC.mini-fuzzy = entryAnywhere ''
+      require("mini.fuzzy").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/fuzzy/default.nix b/modules/plugins/mini/fuzzy/default.nix
new file mode 100644
index 00000000..126d348f
--- /dev/null
+++ b/modules/plugins/mini/fuzzy/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./fuzzy.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/fuzzy/fuzzy.nix b/modules/plugins/mini/fuzzy/fuzzy.nix
new file mode 100644
index 00000000..c5c486fc
--- /dev/null
+++ b/modules/plugins/mini/fuzzy/fuzzy.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.fuzzy = {
+    enable = mkEnableOption "mini.fuzzy";
+    setupOpts = mkPluginSetupOption "mini.fuzzy" {};
+  };
+}

From c4905362303a735a951d6afc9c6d6b5e75f9096c Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 20:23:40 +0100
Subject: [PATCH 082/202] mini/git: init

---
 docs/release-notes/rl-0.8.md         |  1 +
 flake.lock                           | 17 +++++++++++++++++
 flake.nix                            |  5 +++++
 modules/plugins/mini/default.nix     |  1 +
 modules/plugins/mini/git/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/git/default.nix |  6 ++++++
 modules/plugins/mini/git/git.nix     | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/git/config.nix
 create mode 100644 modules/plugins/mini/git/default.nix
 create mode 100644 modules/plugins/mini/git/git.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 5c0fb555..a2bc984e 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -70,6 +70,7 @@
   - `mini.extra`
   - `mini.files`
   - `mini.fuzzy`
+  - `mini.git`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 7ac9b0e5..5feff935 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1192,6 +1192,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-git": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1736535710,
+        "narHash": "sha256-rXuKopyZBCBbpKuytCdm8keruSNK1ohk2NdeZv1wifI=",
+        "owner": "echasnovski",
+        "repo": "mini-git",
+        "rev": "fc13dde6cfe87cf25a4fd1ee177c0d157468436b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini-git",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2404,6 +2420,7 @@
         "plugin-mini-extra": "plugin-mini-extra",
         "plugin-mini-files": "plugin-mini-files",
         "plugin-mini-fuzzy": "plugin-mini-fuzzy",
+        "plugin-mini-git": "plugin-mini-git",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 73eef497..519fc5dd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -825,5 +825,10 @@
       url = "github:echasnovski/mini.fuzzy";
       flake = false;
     };
+
+    plugin-mini-git = {
+      url = "github:echasnovski/mini-git";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 69dd8ce6..df37de8e 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -16,5 +16,6 @@
     ./extra
     ./files
     ./fuzzy
+    ./git
   ];
 }
diff --git a/modules/plugins/mini/git/config.nix b/modules/plugins/mini/git/config.nix
new file mode 100644
index 00000000..41a3d6cb
--- /dev/null
+++ b/modules/plugins/mini/git/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.git;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-git"];
+
+    pluginRC.mini-git = entryAnywhere ''
+      require("mini.git").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/git/default.nix b/modules/plugins/mini/git/default.nix
new file mode 100644
index 00000000..e7622aa0
--- /dev/null
+++ b/modules/plugins/mini/git/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./git.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/git/git.nix b/modules/plugins/mini/git/git.nix
new file mode 100644
index 00000000..f77a7502
--- /dev/null
+++ b/modules/plugins/mini/git/git.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.git = {
+    enable = mkEnableOption "mini.git";
+    setupOpts = mkPluginSetupOption "mini.git" {};
+  };
+}

From fca63ede6c94f617ac2edb2539b76c51bf6f87c3 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 20:26:09 +0100
Subject: [PATCH 083/202] mini/hipatterns: init

---
 docs/release-notes/rl-0.8.md                  |  1 +
 flake.lock                                    | 17 +++++++++++++++++
 flake.nix                                     |  5 +++++
 modules/plugins/mini/default.nix              |  1 +
 modules/plugins/mini/hipatterns/config.nix    | 19 +++++++++++++++++++
 modules/plugins/mini/hipatterns/default.nix   |  6 ++++++
 .../plugins/mini/hipatterns/hipatterns.nix    | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/hipatterns/config.nix
 create mode 100644 modules/plugins/mini/hipatterns/default.nix
 create mode 100644 modules/plugins/mini/hipatterns/hipatterns.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index a2bc984e..25fa9b5f 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -71,6 +71,7 @@
   - `mini.files`
   - `mini.fuzzy`
   - `mini.git`
+  - `mini.hipatterns`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 5feff935..1fc26c13 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1208,6 +1208,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-hipatterns": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733141274,
+        "narHash": "sha256-zJ8OMzfcBh9NtSg2FHDjB5DFX9C2qZRo8t8lc097sCI=",
+        "owner": "echasnovski",
+        "repo": "mini.hipatterns",
+        "rev": "f34975103a38b3f608219a1324cdfc58ea660b8b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.hipatterns",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2421,6 +2437,7 @@
         "plugin-mini-files": "plugin-mini-files",
         "plugin-mini-fuzzy": "plugin-mini-fuzzy",
         "plugin-mini-git": "plugin-mini-git",
+        "plugin-mini-hipatterns": "plugin-mini-hipatterns",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 519fc5dd..c2bc4ade 100644
--- a/flake.nix
+++ b/flake.nix
@@ -830,5 +830,10 @@
       url = "github:echasnovski/mini-git";
       flake = false;
     };
+
+    plugin-mini-hipatterns = {
+      url = "github:echasnovski/mini.hipatterns";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index df37de8e..bc18dbbc 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -17,5 +17,6 @@
     ./files
     ./fuzzy
     ./git
+    ./hipatterns
   ];
 }
diff --git a/modules/plugins/mini/hipatterns/config.nix b/modules/plugins/mini/hipatterns/config.nix
new file mode 100644
index 00000000..37876778
--- /dev/null
+++ b/modules/plugins/mini/hipatterns/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.hipatterns;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-hipatterns"];
+
+    pluginRC.mini-hipatterns = entryAnywhere ''
+      require("mini.hipatterns").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/hipatterns/default.nix b/modules/plugins/mini/hipatterns/default.nix
new file mode 100644
index 00000000..29cd9d7f
--- /dev/null
+++ b/modules/plugins/mini/hipatterns/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./hipatterns.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/hipatterns/hipatterns.nix b/modules/plugins/mini/hipatterns/hipatterns.nix
new file mode 100644
index 00000000..31921a89
--- /dev/null
+++ b/modules/plugins/mini/hipatterns/hipatterns.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.hipatterns = {
+    enable = mkEnableOption "mini.hipatterns";
+    setupOpts = mkPluginSetupOption "mini.hipatterns" {};
+  };
+}

From 755052cea97f1cc7475a2ca121602f0a98147f07 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 20:32:10 +0100
Subject: [PATCH 084/202] mini/hues: init

---
 docs/release-notes/rl-0.8.md          |  1 +
 flake.lock                            | 17 ++++++++++++++
 flake.nix                             |  5 ++++
 modules/plugins/mini/default.nix      |  1 +
 modules/plugins/mini/hues/config.nix  | 19 +++++++++++++++
 modules/plugins/mini/hues/default.nix |  6 +++++
 modules/plugins/mini/hues/hues.nix    | 33 +++++++++++++++++++++++++++
 7 files changed, 82 insertions(+)
 create mode 100644 modules/plugins/mini/hues/config.nix
 create mode 100644 modules/plugins/mini/hues/default.nix
 create mode 100644 modules/plugins/mini/hues/hues.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 25fa9b5f..1c843924 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -72,6 +72,7 @@
   - `mini.fuzzy`
   - `mini.git`
   - `mini.hipatterns`
+  - `mini.hues`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 1fc26c13..edb5d0c2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1224,6 +1224,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-hues": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1734960100,
+        "narHash": "sha256-4y79ejOkRL/fajZ4jC8t4K6EgNbnTsH++mIjmo6G3q0=",
+        "owner": "echasnovski",
+        "repo": "mini.hues",
+        "rev": "ae6ad4c666ff42c1102344fe1eba18bb486f2e46",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.hues",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2438,6 +2454,7 @@
         "plugin-mini-fuzzy": "plugin-mini-fuzzy",
         "plugin-mini-git": "plugin-mini-git",
         "plugin-mini-hipatterns": "plugin-mini-hipatterns",
+        "plugin-mini-hues": "plugin-mini-hues",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index c2bc4ade..98057d45 100644
--- a/flake.nix
+++ b/flake.nix
@@ -835,5 +835,10 @@
       url = "github:echasnovski/mini.hipatterns";
       flake = false;
     };
+
+    plugin-mini-hues = {
+      url = "github:echasnovski/mini.hues";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index bc18dbbc..39c05cfe 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -18,5 +18,6 @@
     ./fuzzy
     ./git
     ./hipatterns
+    ./hues
   ];
 }
diff --git a/modules/plugins/mini/hues/config.nix b/modules/plugins/mini/hues/config.nix
new file mode 100644
index 00000000..90eea737
--- /dev/null
+++ b/modules/plugins/mini/hues/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.hues;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-hues"];
+
+    pluginRC.mini-hues = entryAnywhere ''
+      require("mini.hues").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/hues/default.nix b/modules/plugins/mini/hues/default.nix
new file mode 100644
index 00000000..3eba39a6
--- /dev/null
+++ b/modules/plugins/mini/hues/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./hues.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/hues/hues.nix b/modules/plugins/mini/hues/hues.nix
new file mode 100644
index 00000000..f848923a
--- /dev/null
+++ b/modules/plugins/mini/hues/hues.nix
@@ -0,0 +1,33 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.strings) hasPrefix;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+  inherit (lib.nvim.types) hexColor;
+in {
+  options.vim.mini.hues = {
+    enable = mkEnableOption "mini.hues";
+    setupOpts = mkPluginSetupOption "mini.hues" {
+      background = mkOption {
+        description = "The background color to use";
+        type = hexColor;
+        apply = v:
+          if hasPrefix "#" v
+          then v
+          else "#${v}";
+      };
+
+      foreground = mkOption {
+        description = "The foreground color to use";
+        type = hexColor;
+        apply = v:
+          if hasPrefix "#" v
+          then v
+          else "#${v}";
+      };
+    };
+  };
+}

From f31b2e06cb37df853b364eb1d95930ea383b193a Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 20:34:02 +0100
Subject: [PATCH 085/202] mini/icons: init

---
 docs/release-notes/rl-0.8.md           |  1 +
 flake.lock                             | 17 +++++++++++++++++
 flake.nix                              |  5 +++++
 modules/plugins/mini/default.nix       |  1 +
 modules/plugins/mini/icons/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/icons/default.nix |  6 ++++++
 modules/plugins/mini/icons/icons.nix   | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/icons/config.nix
 create mode 100644 modules/plugins/mini/icons/default.nix
 create mode 100644 modules/plugins/mini/icons/icons.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 1c843924..e9c1300d 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -73,6 +73,7 @@
   - `mini.git`
   - `mini.hipatterns`
   - `mini.hues`
+  - `mini.icons`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index edb5d0c2..13ed65d9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1240,6 +1240,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-icons": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1737036219,
+        "narHash": "sha256-w0PxiTj9uiUffZXkMM18IO/b/zPpdRKW9ydyhvXRoqE=",
+        "owner": "echasnovski",
+        "repo": "mini.icons",
+        "rev": "910db5df9724d65371182948f921fce23c2c881e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.icons",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2455,6 +2471,7 @@
         "plugin-mini-git": "plugin-mini-git",
         "plugin-mini-hipatterns": "plugin-mini-hipatterns",
         "plugin-mini-hues": "plugin-mini-hues",
+        "plugin-mini-icons": "plugin-mini-icons",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 98057d45..cb820687 100644
--- a/flake.nix
+++ b/flake.nix
@@ -840,5 +840,10 @@
       url = "github:echasnovski/mini.hues";
       flake = false;
     };
+
+    plugin-mini-icons = {
+      url = "github:echasnovski/mini.icons";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 39c05cfe..23b12820 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -19,5 +19,6 @@
     ./git
     ./hipatterns
     ./hues
+    ./icons
   ];
 }
diff --git a/modules/plugins/mini/icons/config.nix b/modules/plugins/mini/icons/config.nix
new file mode 100644
index 00000000..aa446935
--- /dev/null
+++ b/modules/plugins/mini/icons/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.icons;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-icons"];
+
+    pluginRC.mini-icons = entryAnywhere ''
+      require("mini.icons").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/icons/default.nix b/modules/plugins/mini/icons/default.nix
new file mode 100644
index 00000000..f0b16ce8
--- /dev/null
+++ b/modules/plugins/mini/icons/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./icons.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/icons/icons.nix b/modules/plugins/mini/icons/icons.nix
new file mode 100644
index 00000000..096fa9c2
--- /dev/null
+++ b/modules/plugins/mini/icons/icons.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.icons = {
+    enable = mkEnableOption "mini.icons";
+    setupOpts = mkPluginSetupOption "mini.icons" {};
+  };
+}

From be7d94960538ebb5a0d89dec0b6db841ef435ee9 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 20:35:56 +0100
Subject: [PATCH 086/202] mini/indentscope: init

---
 docs/release-notes/rl-0.8.md                  |  1 +
 flake.lock                                    | 17 +++++++++++++++++
 flake.nix                                     |  5 +++++
 modules/plugins/mini/default.nix              |  1 +
 modules/plugins/mini/indentscope/config.nix   | 19 +++++++++++++++++++
 modules/plugins/mini/indentscope/default.nix  |  6 ++++++
 .../plugins/mini/indentscope/indentscope.nix  | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/indentscope/config.nix
 create mode 100644 modules/plugins/mini/indentscope/default.nix
 create mode 100644 modules/plugins/mini/indentscope/indentscope.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index e9c1300d..b87f6431 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -74,6 +74,7 @@
   - `mini.hipatterns`
   - `mini.hues`
   - `mini.icons`
+  - `mini.indentscope`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 13ed65d9..a8d4c17d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1256,6 +1256,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-indentscope": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1737036220,
+        "narHash": "sha256-Mrzc7oHXxyEGqdE003qiC9unScyb7i5A6+l8Do7yxws=",
+        "owner": "echasnovski",
+        "repo": "mini.indentscope",
+        "rev": "613df2830d7faeae7483ba2e736683154b95921e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.indentscope",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2472,6 +2488,7 @@
         "plugin-mini-hipatterns": "plugin-mini-hipatterns",
         "plugin-mini-hues": "plugin-mini-hues",
         "plugin-mini-icons": "plugin-mini-icons",
+        "plugin-mini-indentscope": "plugin-mini-indentscope",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index cb820687..cefd3a24 100644
--- a/flake.nix
+++ b/flake.nix
@@ -845,5 +845,10 @@
       url = "github:echasnovski/mini.icons";
       flake = false;
     };
+
+    plugin-mini-indentscope = {
+      url = "github:echasnovski/mini.indentscope";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 23b12820..73ff0951 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -20,5 +20,6 @@
     ./hipatterns
     ./hues
     ./icons
+    ./indentscope
   ];
 }
diff --git a/modules/plugins/mini/indentscope/config.nix b/modules/plugins/mini/indentscope/config.nix
new file mode 100644
index 00000000..2e6ec03d
--- /dev/null
+++ b/modules/plugins/mini/indentscope/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.indentscope;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-indentscope"];
+
+    pluginRC.mini-indentscope = entryAnywhere ''
+      require("mini.indentscope").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/indentscope/default.nix b/modules/plugins/mini/indentscope/default.nix
new file mode 100644
index 00000000..487c248c
--- /dev/null
+++ b/modules/plugins/mini/indentscope/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./indentscope.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/indentscope/indentscope.nix b/modules/plugins/mini/indentscope/indentscope.nix
new file mode 100644
index 00000000..8307a88c
--- /dev/null
+++ b/modules/plugins/mini/indentscope/indentscope.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.indentscope = {
+    enable = mkEnableOption "mini.indentscope";
+    setupOpts = mkPluginSetupOption "mini.indentscope" {};
+  };
+}

From 36f535c4ef907cf629633b72b65a71c503bc226a Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 20:37:22 +0100
Subject: [PATCH 087/202] mini/jump: init

---
 docs/release-notes/rl-0.8.md          |  1 +
 flake.lock                            | 17 +++++++++++++++++
 flake.nix                             |  5 +++++
 modules/plugins/mini/default.nix      |  1 +
 modules/plugins/mini/jump/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/jump/default.nix |  6 ++++++
 modules/plugins/mini/jump/jump.nix    | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/jump/config.nix
 create mode 100644 modules/plugins/mini/jump/default.nix
 create mode 100644 modules/plugins/mini/jump/jump.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index b87f6431..243ade98 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -75,6 +75,7 @@
   - `mini.hues`
   - `mini.icons`
   - `mini.indentscope`
+  - `mini.jump`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index a8d4c17d..f5c97e34 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1272,6 +1272,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-jump": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733662809,
+        "narHash": "sha256-qMP9ezk4xZov5S4vrUFM62lnc4YkEaZL1EVzdXwDq1Q=",
+        "owner": "echasnovski",
+        "repo": "mini.jump",
+        "rev": "bb93d998c9db6936697746330411f5fb9957145e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.jump",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2489,6 +2505,7 @@
         "plugin-mini-hues": "plugin-mini-hues",
         "plugin-mini-icons": "plugin-mini-icons",
         "plugin-mini-indentscope": "plugin-mini-indentscope",
+        "plugin-mini-jump": "plugin-mini-jump",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index cefd3a24..f47e2324 100644
--- a/flake.nix
+++ b/flake.nix
@@ -850,5 +850,10 @@
       url = "github:echasnovski/mini.indentscope";
       flake = false;
     };
+
+    plugin-mini-jump = {
+      url = "github:echasnovski/mini.jump";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 73ff0951..11bb1ace 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -21,5 +21,6 @@
     ./hues
     ./icons
     ./indentscope
+    ./jump
   ];
 }
diff --git a/modules/plugins/mini/jump/config.nix b/modules/plugins/mini/jump/config.nix
new file mode 100644
index 00000000..665f96fd
--- /dev/null
+++ b/modules/plugins/mini/jump/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.jump;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-jump"];
+
+    pluginRC.mini-jump = entryAnywhere ''
+      require("mini.jump").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/jump/default.nix b/modules/plugins/mini/jump/default.nix
new file mode 100644
index 00000000..cb1f9cb3
--- /dev/null
+++ b/modules/plugins/mini/jump/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./jump.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/jump/jump.nix b/modules/plugins/mini/jump/jump.nix
new file mode 100644
index 00000000..ca9563d3
--- /dev/null
+++ b/modules/plugins/mini/jump/jump.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.jump = {
+    enable = mkEnableOption "mini.jump";
+    setupOpts = mkPluginSetupOption "mini.jump" {};
+  };
+}

From e58472cee7077ecff39108e46ed23451f12f399a Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 20:39:31 +0100
Subject: [PATCH 088/202] mini/jump2d: init

---
 docs/release-notes/rl-0.8.md            |  1 +
 flake.lock                              | 17 +++++++++++++++++
 flake.nix                               |  5 +++++
 modules/plugins/mini/default.nix        |  1 +
 modules/plugins/mini/jump2d/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/jump2d/default.nix |  6 ++++++
 modules/plugins/mini/jump2d/jump2d.nix  | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/jump2d/config.nix
 create mode 100644 modules/plugins/mini/jump2d/default.nix
 create mode 100644 modules/plugins/mini/jump2d/jump2d.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 243ade98..62343038 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -76,6 +76,7 @@
   - `mini.icons`
   - `mini.indentscope`
   - `mini.jump`
+  - `mini.jump2d`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index f5c97e34..4660fe7c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1288,6 +1288,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-jump2d": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733662811,
+        "narHash": "sha256-+DihKCh6GYwin3H9YD+q30MLMRNXvvb1GtKnfBinGjc=",
+        "owner": "echasnovski",
+        "repo": "mini.jump2d",
+        "rev": "88077058297e80f1c76a18ed801ae9d7064187c6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.jump2d",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2506,6 +2522,7 @@
         "plugin-mini-icons": "plugin-mini-icons",
         "plugin-mini-indentscope": "plugin-mini-indentscope",
         "plugin-mini-jump": "plugin-mini-jump",
+        "plugin-mini-jump2d": "plugin-mini-jump2d",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index f47e2324..09baf235 100644
--- a/flake.nix
+++ b/flake.nix
@@ -855,5 +855,10 @@
       url = "github:echasnovski/mini.jump";
       flake = false;
     };
+
+    plugin-mini-jump2d = {
+      url = "github:echasnovski/mini.jump2d";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 11bb1ace..2f4683c6 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -22,5 +22,6 @@
     ./icons
     ./indentscope
     ./jump
+    ./jump2d
   ];
 }
diff --git a/modules/plugins/mini/jump2d/config.nix b/modules/plugins/mini/jump2d/config.nix
new file mode 100644
index 00000000..da4ba55f
--- /dev/null
+++ b/modules/plugins/mini/jump2d/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.jump2d;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-jump2d"];
+
+    pluginRC.mini-jump2d = entryAnywhere ''
+      require("mini.jump2d").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/jump2d/default.nix b/modules/plugins/mini/jump2d/default.nix
new file mode 100644
index 00000000..9065e4d6
--- /dev/null
+++ b/modules/plugins/mini/jump2d/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./jump2d.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/jump2d/jump2d.nix b/modules/plugins/mini/jump2d/jump2d.nix
new file mode 100644
index 00000000..c25c6902
--- /dev/null
+++ b/modules/plugins/mini/jump2d/jump2d.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.jump2d = {
+    enable = mkEnableOption "mini.jump2d";
+    setupOpts = mkPluginSetupOption "mini.jump2d" {};
+  };
+}

From c9d39cb758d58dea234e559b527a669ae78a4be7 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 20:41:08 +0100
Subject: [PATCH 089/202] mini/map: init

---
 docs/release-notes/rl-0.8.md         |  1 +
 flake.lock                           | 17 +++++++++++++++++
 flake.nix                            |  5 +++++
 modules/plugins/mini/default.nix     |  1 +
 modules/plugins/mini/map/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/map/default.nix |  6 ++++++
 modules/plugins/mini/map/map.nix     | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/map/config.nix
 create mode 100644 modules/plugins/mini/map/default.nix
 create mode 100644 modules/plugins/mini/map/map.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 62343038..642dcc1b 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -77,6 +77,7 @@
   - `mini.indentscope`
   - `mini.jump`
   - `mini.jump2d`
+  - `mini.map`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 4660fe7c..4e9aec66 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1304,6 +1304,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-map": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1725613927,
+        "narHash": "sha256-dL+d92+GLAILQ/A1JVCwoe3B5WtwVK01tPuC+fOTB5A=",
+        "owner": "echasnovski",
+        "repo": "mini.map",
+        "rev": "4c58e755d75f9999abcd3b3c6e934734b6a8b098",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.map",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2523,6 +2539,7 @@
         "plugin-mini-indentscope": "plugin-mini-indentscope",
         "plugin-mini-jump": "plugin-mini-jump",
         "plugin-mini-jump2d": "plugin-mini-jump2d",
+        "plugin-mini-map": "plugin-mini-map",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 09baf235..75efb0d1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -860,5 +860,10 @@
       url = "github:echasnovski/mini.jump2d";
       flake = false;
     };
+
+    plugin-mini-map = {
+      url = "github:echasnovski/mini.map";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 2f4683c6..f7c8cf8b 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -23,5 +23,6 @@
     ./indentscope
     ./jump
     ./jump2d
+    ./map
   ];
 }
diff --git a/modules/plugins/mini/map/config.nix b/modules/plugins/mini/map/config.nix
new file mode 100644
index 00000000..7a299eb8
--- /dev/null
+++ b/modules/plugins/mini/map/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.map;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-map"];
+
+    pluginRC.mini-map = entryAnywhere ''
+      require("mini.map").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/map/default.nix b/modules/plugins/mini/map/default.nix
new file mode 100644
index 00000000..71110431
--- /dev/null
+++ b/modules/plugins/mini/map/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./map.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/map/map.nix b/modules/plugins/mini/map/map.nix
new file mode 100644
index 00000000..554e2072
--- /dev/null
+++ b/modules/plugins/mini/map/map.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.map = {
+    enable = mkEnableOption "mini.map";
+    setupOpts = mkPluginSetupOption "mini.map" {};
+  };
+}

From 9a27dafe67076b07c888e00010d940e9766c1918 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 20:43:25 +0100
Subject: [PATCH 090/202] mini/misc: init

---
 docs/release-notes/rl-0.8.md          |  1 +
 flake.lock                            | 17 +++++++++++++++++
 flake.nix                             |  5 +++++
 modules/plugins/mini/default.nix      |  1 +
 modules/plugins/mini/misc/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/misc/default.nix |  6 ++++++
 modules/plugins/mini/misc/misc.nix    | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/misc/config.nix
 create mode 100644 modules/plugins/mini/misc/default.nix
 create mode 100644 modules/plugins/mini/misc/misc.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 642dcc1b..1d2308ab 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -78,6 +78,7 @@
   - `mini.jump`
   - `mini.jump2d`
   - `mini.map`
+  - `mini.misc`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 4e9aec66..39acee39 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1320,6 +1320,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-misc": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1734103112,
+        "narHash": "sha256-qnYa4IZk14MGZArmVpn15l+P9cwtFWomBVxRuYHVyXc=",
+        "owner": "echasnovski",
+        "repo": "mini.misc",
+        "rev": "645fb9367c19bb485902e54e5451425981498601",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.misc",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2540,6 +2556,7 @@
         "plugin-mini-jump": "plugin-mini-jump",
         "plugin-mini-jump2d": "plugin-mini-jump2d",
         "plugin-mini-map": "plugin-mini-map",
+        "plugin-mini-misc": "plugin-mini-misc",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 75efb0d1..d6a57ee7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -865,5 +865,10 @@
       url = "github:echasnovski/mini.map";
       flake = false;
     };
+
+    plugin-mini-misc = {
+      url = "github:echasnovski/mini.misc";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index f7c8cf8b..093ae3a4 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -24,5 +24,6 @@
     ./jump
     ./jump2d
     ./map
+    ./misc
   ];
 }
diff --git a/modules/plugins/mini/misc/config.nix b/modules/plugins/mini/misc/config.nix
new file mode 100644
index 00000000..9a9a6ae4
--- /dev/null
+++ b/modules/plugins/mini/misc/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.misc;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-misc"];
+
+    pluginRC.mini-misc = entryAnywhere ''
+      require("mini.misc").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/misc/default.nix b/modules/plugins/mini/misc/default.nix
new file mode 100644
index 00000000..9f64fd19
--- /dev/null
+++ b/modules/plugins/mini/misc/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./misc.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/misc/misc.nix b/modules/plugins/mini/misc/misc.nix
new file mode 100644
index 00000000..7b36e9fd
--- /dev/null
+++ b/modules/plugins/mini/misc/misc.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.misc = {
+    enable = mkEnableOption "mini.misc";
+    setupOpts = mkPluginSetupOption "mini.misc" {};
+  };
+}

From 6060ae41829a548d317f5f08e239f4018bda4f07 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 20:57:49 +0100
Subject: [PATCH 091/202] mini/move: init

---
 docs/release-notes/rl-0.8.md          |  1 +
 flake.lock                            | 17 +++++++++++++++++
 flake.nix                             |  5 +++++
 modules/plugins/mini/default.nix      |  1 +
 modules/plugins/mini/move/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/move/default.nix |  6 ++++++
 modules/plugins/mini/move/move.nix    | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/move/config.nix
 create mode 100644 modules/plugins/mini/move/default.nix
 create mode 100644 modules/plugins/mini/move/move.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 1d2308ab..824dc305 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -79,6 +79,7 @@
   - `mini.jump2d`
   - `mini.map`
   - `mini.misc`
+  - `mini.move`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 39acee39..03d1e0b5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1336,6 +1336,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-move": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1723711319,
+        "narHash": "sha256-nX0eAlhMnKhAftgM6qeHUuawagumLQMPKDkqZNPLljg=",
+        "owner": "echasnovski",
+        "repo": "mini.move",
+        "rev": "4caa1c212f5ca3d1633d21cfb184808090ed74b1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.move",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2557,6 +2573,7 @@
         "plugin-mini-jump2d": "plugin-mini-jump2d",
         "plugin-mini-map": "plugin-mini-map",
         "plugin-mini-misc": "plugin-mini-misc",
+        "plugin-mini-move": "plugin-mini-move",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index d6a57ee7..def1cd8c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -870,5 +870,10 @@
       url = "github:echasnovski/mini.misc";
       flake = false;
     };
+
+    plugin-mini-move = {
+      url = "github:echasnovski/mini.move";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 093ae3a4..a1c5a191 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -25,5 +25,6 @@
     ./jump2d
     ./map
     ./misc
+    ./move
   ];
 }
diff --git a/modules/plugins/mini/move/config.nix b/modules/plugins/mini/move/config.nix
new file mode 100644
index 00000000..8bf22526
--- /dev/null
+++ b/modules/plugins/mini/move/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.move;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-move"];
+
+    pluginRC.mini-move = entryAnywhere ''
+      require("mini.move").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/move/default.nix b/modules/plugins/mini/move/default.nix
new file mode 100644
index 00000000..83caee30
--- /dev/null
+++ b/modules/plugins/mini/move/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./move.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/move/move.nix b/modules/plugins/mini/move/move.nix
new file mode 100644
index 00000000..e97e837b
--- /dev/null
+++ b/modules/plugins/mini/move/move.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.move = {
+    enable = mkEnableOption "mini.move";
+    setupOpts = mkPluginSetupOption "mini.move" {};
+  };
+}

From 2691dbd351666893ddb99363749c7dd32bad85aa Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:00:20 +0100
Subject: [PATCH 092/202] mini/notify: init

---
 docs/release-notes/rl-0.8.md            |  1 +
 flake.lock                              | 17 +++++++++++++++++
 flake.nix                               |  5 +++++
 modules/plugins/mini/default.nix        |  1 +
 modules/plugins/mini/notify/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/notify/default.nix |  6 ++++++
 modules/plugins/mini/notify/notify.nix  | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/notify/config.nix
 create mode 100644 modules/plugins/mini/notify/default.nix
 create mode 100644 modules/plugins/mini/notify/notify.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 824dc305..d15e5609 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -80,6 +80,7 @@
   - `mini.map`
   - `mini.misc`
   - `mini.move`
+  - `mini.notify`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 03d1e0b5..6a35b799 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1352,6 +1352,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-notify": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1736790793,
+        "narHash": "sha256-q27j14OV6LAfoxeqBG75GSiqtqmW37GOPHpmA2fD4gs=",
+        "owner": "echasnovski",
+        "repo": "mini.notify",
+        "rev": "05e598d5b349bd66404d576e6a4d4340aea5f194",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.notify",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2574,6 +2590,7 @@
         "plugin-mini-map": "plugin-mini-map",
         "plugin-mini-misc": "plugin-mini-misc",
         "plugin-mini-move": "plugin-mini-move",
+        "plugin-mini-notify": "plugin-mini-notify",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index def1cd8c..368fc4f7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -875,5 +875,10 @@
       url = "github:echasnovski/mini.move";
       flake = false;
     };
+
+    plugin-mini-notify = {
+      url = "github:echasnovski/mini.notify";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index a1c5a191..315d3b0c 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -26,5 +26,6 @@
     ./map
     ./misc
     ./move
+    ./notify
   ];
 }
diff --git a/modules/plugins/mini/notify/config.nix b/modules/plugins/mini/notify/config.nix
new file mode 100644
index 00000000..2a5ff46e
--- /dev/null
+++ b/modules/plugins/mini/notify/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.notify;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-notify"];
+
+    pluginRC.mini-notify = entryAnywhere ''
+      require("mini.notify").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/notify/default.nix b/modules/plugins/mini/notify/default.nix
new file mode 100644
index 00000000..0f809b7a
--- /dev/null
+++ b/modules/plugins/mini/notify/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./notify.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/notify/notify.nix b/modules/plugins/mini/notify/notify.nix
new file mode 100644
index 00000000..76e8c135
--- /dev/null
+++ b/modules/plugins/mini/notify/notify.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.notify = {
+    enable = mkEnableOption "mini.notify";
+    setupOpts = mkPluginSetupOption "mini.notify" {};
+  };
+}

From 088083c68a6c58ffa11e55a533a5522bb00fbdb1 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:02:20 +0100
Subject: [PATCH 093/202] mini/operators: init

---
 docs/release-notes/rl-0.8.md                 |  1 +
 flake.lock                                   | 17 +++++++++++++++++
 flake.nix                                    |  5 +++++
 modules/plugins/mini/default.nix             |  1 +
 modules/plugins/mini/operators/config.nix    | 19 +++++++++++++++++++
 modules/plugins/mini/operators/default.nix   |  6 ++++++
 modules/plugins/mini/operators/operators.nix | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/operators/config.nix
 create mode 100644 modules/plugins/mini/operators/default.nix
 create mode 100644 modules/plugins/mini/operators/operators.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index d15e5609..59c11377 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -81,6 +81,7 @@
   - `mini.misc`
   - `mini.move`
   - `mini.notify`
+  - `mini.operators`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 6a35b799..28e25927 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1368,6 +1368,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-operators": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1731776514,
+        "narHash": "sha256-+Zhy0AhuMPSHnM6dqbV45Aa7dS7XJ4mpfcHApSbuy8A=",
+        "owner": "echasnovski",
+        "repo": "mini.operators",
+        "rev": "7cb4dc66c51a3d736d347bbc517dc73dc7d28888",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.operators",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2591,6 +2607,7 @@
         "plugin-mini-misc": "plugin-mini-misc",
         "plugin-mini-move": "plugin-mini-move",
         "plugin-mini-notify": "plugin-mini-notify",
+        "plugin-mini-operators": "plugin-mini-operators",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 368fc4f7..f5ea0e15 100644
--- a/flake.nix
+++ b/flake.nix
@@ -880,5 +880,10 @@
       url = "github:echasnovski/mini.notify";
       flake = false;
     };
+
+    plugin-mini-operators = {
+      url = "github:echasnovski/mini.operators";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 315d3b0c..0ed41e59 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -27,5 +27,6 @@
     ./misc
     ./move
     ./notify
+    ./operators
   ];
 }
diff --git a/modules/plugins/mini/operators/config.nix b/modules/plugins/mini/operators/config.nix
new file mode 100644
index 00000000..bb374377
--- /dev/null
+++ b/modules/plugins/mini/operators/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.operators;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-operators"];
+
+    pluginRC.mini-operators = entryAnywhere ''
+      require("mini.operators").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/operators/default.nix b/modules/plugins/mini/operators/default.nix
new file mode 100644
index 00000000..1c77bc65
--- /dev/null
+++ b/modules/plugins/mini/operators/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./operators.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/operators/operators.nix b/modules/plugins/mini/operators/operators.nix
new file mode 100644
index 00000000..c60ad6b5
--- /dev/null
+++ b/modules/plugins/mini/operators/operators.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.operators = {
+    enable = mkEnableOption "mini.operators";
+    setupOpts = mkPluginSetupOption "mini.operators" {};
+  };
+}

From 226c25d45dce4ebc1c8b285b8e6bd74e9bbc9083 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:03:56 +0100
Subject: [PATCH 094/202] mini/pairs: init

---
 docs/release-notes/rl-0.8.md           |  1 +
 flake.lock                             | 17 +++++++++++++++++
 flake.nix                              |  5 +++++
 modules/plugins/mini/default.nix       |  1 +
 modules/plugins/mini/pairs/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/pairs/default.nix |  6 ++++++
 modules/plugins/mini/pairs/pairs.nix   | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/pairs/config.nix
 create mode 100644 modules/plugins/mini/pairs/default.nix
 create mode 100644 modules/plugins/mini/pairs/pairs.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 59c11377..003c2639 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -82,6 +82,7 @@
   - `mini.move`
   - `mini.notify`
   - `mini.operators`
+  - `mini.pairs`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 28e25927..2f01ce02 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1384,6 +1384,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-pairs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1728656795,
+        "narHash": "sha256-PtHxLKU1smVTx655r5SINxuz5CJmZWnBW70T8zJ/oxM=",
+        "owner": "echasnovski",
+        "repo": "mini.pairs",
+        "rev": "7e834c5937d95364cc1740e20d673afe2d034cdb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.pairs",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2608,6 +2624,7 @@
         "plugin-mini-move": "plugin-mini-move",
         "plugin-mini-notify": "plugin-mini-notify",
         "plugin-mini-operators": "plugin-mini-operators",
+        "plugin-mini-pairs": "plugin-mini-pairs",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index f5ea0e15..01836677 100644
--- a/flake.nix
+++ b/flake.nix
@@ -885,5 +885,10 @@
       url = "github:echasnovski/mini.operators";
       flake = false;
     };
+
+    plugin-mini-pairs = {
+      url = "github:echasnovski/mini.pairs";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 0ed41e59..161ae000 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -28,5 +28,6 @@
     ./move
     ./notify
     ./operators
+    ./pairs
   ];
 }
diff --git a/modules/plugins/mini/pairs/config.nix b/modules/plugins/mini/pairs/config.nix
new file mode 100644
index 00000000..ce02dee0
--- /dev/null
+++ b/modules/plugins/mini/pairs/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.pairs;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-pairs"];
+
+    pluginRC.mini-pairs = entryAnywhere ''
+      require("mini.pairs").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/pairs/default.nix b/modules/plugins/mini/pairs/default.nix
new file mode 100644
index 00000000..a0563bb0
--- /dev/null
+++ b/modules/plugins/mini/pairs/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./pairs.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/pairs/pairs.nix b/modules/plugins/mini/pairs/pairs.nix
new file mode 100644
index 00000000..db43027b
--- /dev/null
+++ b/modules/plugins/mini/pairs/pairs.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.pairs = {
+    enable = mkEnableOption "mini.pairs";
+    setupOpts = mkPluginSetupOption "mini.pairs" {};
+  };
+}

From af36e185b56649977df3c96d918a9c53dff81ce5 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:05:49 +0100
Subject: [PATCH 095/202] mini/pick: init

---
 docs/release-notes/rl-0.8.md          |  1 +
 flake.lock                            | 17 +++++++++++++++++
 flake.nix                             |  5 +++++
 modules/plugins/mini/default.nix      |  1 +
 modules/plugins/mini/pick/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/pick/default.nix |  6 ++++++
 modules/plugins/mini/pick/pick.nix    | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/pick/config.nix
 create mode 100644 modules/plugins/mini/pick/default.nix
 create mode 100644 modules/plugins/mini/pick/pick.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 003c2639..800720f6 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -83,6 +83,7 @@
   - `mini.notify`
   - `mini.operators`
   - `mini.pairs`
+  - `mini.pick`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 2f01ce02..51932306 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1400,6 +1400,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-pick": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1736696004,
+        "narHash": "sha256-Q4GD0WzUYNtoBMx8pIl6fX5glKn1oflS4HZVC+w/eAM=",
+        "owner": "echasnovski",
+        "repo": "mini.pick",
+        "rev": "09ade94d2c9c5133db9ae00f3693d82eae78e9be",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.pick",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2625,6 +2641,7 @@
         "plugin-mini-notify": "plugin-mini-notify",
         "plugin-mini-operators": "plugin-mini-operators",
         "plugin-mini-pairs": "plugin-mini-pairs",
+        "plugin-mini-pick": "plugin-mini-pick",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 01836677..f6fec140 100644
--- a/flake.nix
+++ b/flake.nix
@@ -890,5 +890,10 @@
       url = "github:echasnovski/mini.pairs";
       flake = false;
     };
+
+    plugin-mini-pick = {
+      url = "github:echasnovski/mini.pick";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 161ae000..97607284 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -29,5 +29,6 @@
     ./notify
     ./operators
     ./pairs
+    ./pick
   ];
 }
diff --git a/modules/plugins/mini/pick/config.nix b/modules/plugins/mini/pick/config.nix
new file mode 100644
index 00000000..6d82a8ea
--- /dev/null
+++ b/modules/plugins/mini/pick/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.pick;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-pick"];
+
+    pluginRC.mini-pick = entryAnywhere ''
+      require("mini.pick").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/pick/default.nix b/modules/plugins/mini/pick/default.nix
new file mode 100644
index 00000000..37d1760c
--- /dev/null
+++ b/modules/plugins/mini/pick/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./pick.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/pick/pick.nix b/modules/plugins/mini/pick/pick.nix
new file mode 100644
index 00000000..8f93ac35
--- /dev/null
+++ b/modules/plugins/mini/pick/pick.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.pick = {
+    enable = mkEnableOption "mini.pick";
+    setupOpts = mkPluginSetupOption "mini.pick" {};
+  };
+}

From 39d8f52f0e120a693e16bb9fecc30e048694305f Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:08:34 +0100
Subject: [PATCH 096/202] mini/sessions: init

---
 docs/release-notes/rl-0.8.md               |  1 +
 flake.lock                                 | 17 +++++++++++++++++
 flake.nix                                  |  5 +++++
 modules/plugins/mini/default.nix           |  1 +
 modules/plugins/mini/sessions/config.nix   | 19 +++++++++++++++++++
 modules/plugins/mini/sessions/default.nix  |  6 ++++++
 modules/plugins/mini/sessions/sessions.nix | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/sessions/config.nix
 create mode 100644 modules/plugins/mini/sessions/default.nix
 create mode 100644 modules/plugins/mini/sessions/sessions.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 800720f6..51947a42 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -84,6 +84,7 @@
   - `mini.operators`
   - `mini.pairs`
   - `mini.pick`
+  - `mini.sessions`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 51932306..5060c260 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1416,6 +1416,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-sessions": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1735582250,
+        "narHash": "sha256-vyn8MGyOWFgJ5QVvjYb7K1cKDtg9qWnWYMNf80+kpHk=",
+        "owner": "echasnovski",
+        "repo": "mini.sessions",
+        "rev": "71c9ae596664ac110560d27eb928fc24e22bc53d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.sessions",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2642,6 +2658,7 @@
         "plugin-mini-operators": "plugin-mini-operators",
         "plugin-mini-pairs": "plugin-mini-pairs",
         "plugin-mini-pick": "plugin-mini-pick",
+        "plugin-mini-sessions": "plugin-mini-sessions",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index f6fec140..abc6edbf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -895,5 +895,10 @@
       url = "github:echasnovski/mini.pick";
       flake = false;
     };
+
+    plugin-mini-sessions = {
+      url = "github:echasnovski/mini.sessions";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 97607284..0a7be1af 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -30,5 +30,6 @@
     ./operators
     ./pairs
     ./pick
+    ./sessions
   ];
 }
diff --git a/modules/plugins/mini/sessions/config.nix b/modules/plugins/mini/sessions/config.nix
new file mode 100644
index 00000000..233d6b06
--- /dev/null
+++ b/modules/plugins/mini/sessions/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.sessions;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-sessions"];
+
+    pluginRC.mini-sessions = entryAnywhere ''
+      require("mini.sessions").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/sessions/default.nix b/modules/plugins/mini/sessions/default.nix
new file mode 100644
index 00000000..6de787e7
--- /dev/null
+++ b/modules/plugins/mini/sessions/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./sessions.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/sessions/sessions.nix b/modules/plugins/mini/sessions/sessions.nix
new file mode 100644
index 00000000..9a3737d6
--- /dev/null
+++ b/modules/plugins/mini/sessions/sessions.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.sessions = {
+    enable = mkEnableOption "mini.sessions";
+    setupOpts = mkPluginSetupOption "mini.sessions" {};
+  };
+}

From 7fc00f75f6209aa7f7fb7b66b3d95275312b80c6 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:10:12 +0100
Subject: [PATCH 097/202] mini/snippets: init

---
 docs/release-notes/rl-0.8.md               |  1 +
 flake.lock                                 | 17 +++++++++++++++++
 flake.nix                                  |  5 +++++
 modules/plugins/mini/default.nix           |  1 +
 modules/plugins/mini/snippets/config.nix   | 19 +++++++++++++++++++
 modules/plugins/mini/snippets/default.nix  |  6 ++++++
 modules/plugins/mini/snippets/snippets.nix | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/snippets/config.nix
 create mode 100644 modules/plugins/mini/snippets/default.nix
 create mode 100644 modules/plugins/mini/snippets/snippets.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 51947a42..7d8d29a5 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -85,6 +85,7 @@
   - `mini.pairs`
   - `mini.pick`
   - `mini.sessions`
+  - `mini.snippets`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 5060c260..bd5abc35 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1432,6 +1432,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-snippets": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1736611383,
+        "narHash": "sha256-How9m7KTo66FrwjZQlgZRmJ5toFKn/+GnUbx/0va3lM=",
+        "owner": "echasnovski",
+        "repo": "mini.snippets",
+        "rev": "72920f62e3dd1330720e94e8f5d42592f3a1ecf8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.snippets",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2659,6 +2675,7 @@
         "plugin-mini-pairs": "plugin-mini-pairs",
         "plugin-mini-pick": "plugin-mini-pick",
         "plugin-mini-sessions": "plugin-mini-sessions",
+        "plugin-mini-snippets": "plugin-mini-snippets",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index abc6edbf..742ed211 100644
--- a/flake.nix
+++ b/flake.nix
@@ -900,5 +900,10 @@
       url = "github:echasnovski/mini.sessions";
       flake = false;
     };
+
+    plugin-mini-snippets = {
+      url = "github:echasnovski/mini.snippets";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 0a7be1af..aab04a89 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -31,5 +31,6 @@
     ./pairs
     ./pick
     ./sessions
+    ./snippets
   ];
 }
diff --git a/modules/plugins/mini/snippets/config.nix b/modules/plugins/mini/snippets/config.nix
new file mode 100644
index 00000000..9dc7aab1
--- /dev/null
+++ b/modules/plugins/mini/snippets/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.snippets;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-snippets"];
+
+    pluginRC.mini-snippets = entryAnywhere ''
+      require("mini.snippets").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/snippets/default.nix b/modules/plugins/mini/snippets/default.nix
new file mode 100644
index 00000000..e636d458
--- /dev/null
+++ b/modules/plugins/mini/snippets/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./snippets.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/snippets/snippets.nix b/modules/plugins/mini/snippets/snippets.nix
new file mode 100644
index 00000000..5dbb1557
--- /dev/null
+++ b/modules/plugins/mini/snippets/snippets.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.snippets = {
+    enable = mkEnableOption "mini.snippets";
+    setupOpts = mkPluginSetupOption "mini.snippets" {};
+  };
+}

From 52bc5f23ee4851a5d4c51d21c6e12972954e370a Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:12:03 +0100
Subject: [PATCH 098/202] mini/splitjoin: init

---
 docs/release-notes/rl-0.8.md                 |  1 +
 flake.lock                                   | 17 +++++++++++++++++
 flake.nix                                    |  5 +++++
 modules/plugins/mini/default.nix             |  1 +
 modules/plugins/mini/splitjoin/config.nix    | 19 +++++++++++++++++++
 modules/plugins/mini/splitjoin/default.nix   |  6 ++++++
 modules/plugins/mini/splitjoin/splitjoin.nix | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/splitjoin/config.nix
 create mode 100644 modules/plugins/mini/splitjoin/default.nix
 create mode 100644 modules/plugins/mini/splitjoin/splitjoin.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 7d8d29a5..eb019afa 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -86,6 +86,7 @@
   - `mini.pick`
   - `mini.sessions`
   - `mini.snippets`
+  - `mini.splitjoin`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index bd5abc35..b74f5905 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1448,6 +1448,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-splitjoin": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1719822504,
+        "narHash": "sha256-LDIbh5KfupTI4zkYOlLmVCd3DuZRhx5lTASN53VG34g=",
+        "owner": "echasnovski",
+        "repo": "mini.splitjoin",
+        "rev": "3e92f6764e770ba392325cad3a4497adcada695f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.splitjoin",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2676,6 +2692,7 @@
         "plugin-mini-pick": "plugin-mini-pick",
         "plugin-mini-sessions": "plugin-mini-sessions",
         "plugin-mini-snippets": "plugin-mini-snippets",
+        "plugin-mini-splitjoin": "plugin-mini-splitjoin",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 742ed211..be51c405 100644
--- a/flake.nix
+++ b/flake.nix
@@ -905,5 +905,10 @@
       url = "github:echasnovski/mini.snippets";
       flake = false;
     };
+
+    plugin-mini-splitjoin = {
+      url = "github:echasnovski/mini.splitjoin";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index aab04a89..92bd13ce 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -32,5 +32,6 @@
     ./pick
     ./sessions
     ./snippets
+    ./splitjoin
   ];
 }
diff --git a/modules/plugins/mini/splitjoin/config.nix b/modules/plugins/mini/splitjoin/config.nix
new file mode 100644
index 00000000..b4b93f3f
--- /dev/null
+++ b/modules/plugins/mini/splitjoin/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.splitjoin;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-splitjoin"];
+
+    pluginRC.mini-splitjoin = entryAnywhere ''
+      require("mini.splitjoin").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/splitjoin/default.nix b/modules/plugins/mini/splitjoin/default.nix
new file mode 100644
index 00000000..0560f936
--- /dev/null
+++ b/modules/plugins/mini/splitjoin/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./splitjoin.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/splitjoin/splitjoin.nix b/modules/plugins/mini/splitjoin/splitjoin.nix
new file mode 100644
index 00000000..ae4f9420
--- /dev/null
+++ b/modules/plugins/mini/splitjoin/splitjoin.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.splitjoin = {
+    enable = mkEnableOption "mini.splitjoin";
+    setupOpts = mkPluginSetupOption "mini.splitjoin" {};
+  };
+}

From f7abf7577c23115df57e57b99548f5571d12aa82 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:13:58 +0100
Subject: [PATCH 099/202] mini/starter: init

---
 docs/release-notes/rl-0.8.md             |  1 +
 flake.lock                               | 17 +++++++++++++++++
 flake.nix                                |  5 +++++
 modules/plugins/mini/default.nix         |  1 +
 modules/plugins/mini/starter/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/starter/default.nix |  6 ++++++
 modules/plugins/mini/starter/starter.nix | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/starter/config.nix
 create mode 100644 modules/plugins/mini/starter/default.nix
 create mode 100644 modules/plugins/mini/starter/starter.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index eb019afa..c7e0dbe6 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -87,6 +87,7 @@
   - `mini.sessions`
   - `mini.snippets`
   - `mini.splitjoin`
+  - `mini.starter`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index b74f5905..8cb6430b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1464,6 +1464,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-starter": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1736858747,
+        "narHash": "sha256-pJYkZUo+L3IeGCRdTipqTzMv+HatpNnyRxshaygKtIw=",
+        "owner": "echasnovski",
+        "repo": "mini.starter",
+        "rev": "4b257cfc93241e8c8cde3f9302d1616ad4e0d036",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.starter",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2693,6 +2709,7 @@
         "plugin-mini-sessions": "plugin-mini-sessions",
         "plugin-mini-snippets": "plugin-mini-snippets",
         "plugin-mini-splitjoin": "plugin-mini-splitjoin",
+        "plugin-mini-starter": "plugin-mini-starter",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index be51c405..716c1247 100644
--- a/flake.nix
+++ b/flake.nix
@@ -910,5 +910,10 @@
       url = "github:echasnovski/mini.splitjoin";
       flake = false;
     };
+
+    plugin-mini-starter = {
+      url = "github:echasnovski/mini.starter";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 92bd13ce..8cc30c8a 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -33,5 +33,6 @@
     ./sessions
     ./snippets
     ./splitjoin
+    ./starter
   ];
 }
diff --git a/modules/plugins/mini/starter/config.nix b/modules/plugins/mini/starter/config.nix
new file mode 100644
index 00000000..35b5c950
--- /dev/null
+++ b/modules/plugins/mini/starter/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.starter;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-starter"];
+
+    pluginRC.mini-starter = entryAnywhere ''
+      require("mini.starter").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/starter/default.nix b/modules/plugins/mini/starter/default.nix
new file mode 100644
index 00000000..0c98acc6
--- /dev/null
+++ b/modules/plugins/mini/starter/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./starter.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/starter/starter.nix b/modules/plugins/mini/starter/starter.nix
new file mode 100644
index 00000000..cb42061d
--- /dev/null
+++ b/modules/plugins/mini/starter/starter.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.starter = {
+    enable = mkEnableOption "mini.starter";
+    setupOpts = mkPluginSetupOption "mini.starter" {};
+  };
+}

From d1fa88595b969f2b0a284e5330e2ada2cf10d6d0 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:16:11 +0100
Subject: [PATCH 100/202] mini/statusline: init

---
 docs/release-notes/rl-0.8.md                  |  1 +
 flake.lock                                    | 17 +++++++++++++++++
 flake.nix                                     |  5 +++++
 modules/plugins/mini/default.nix              |  1 +
 modules/plugins/mini/statusline/config.nix    | 19 +++++++++++++++++++
 modules/plugins/mini/statusline/default.nix   |  6 ++++++
 .../plugins/mini/statusline/statusline.nix    | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/statusline/config.nix
 create mode 100644 modules/plugins/mini/statusline/default.nix
 create mode 100644 modules/plugins/mini/statusline/statusline.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index c7e0dbe6..54ff3b0c 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -88,6 +88,7 @@
   - `mini.snippets`
   - `mini.splitjoin`
   - `mini.starter`
+  - `mini.statusline`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 8cb6430b..cd751c01 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1480,6 +1480,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-statusline": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1735582251,
+        "narHash": "sha256-AQ2N93JDjtFpgerWTzRspmxrl9oQuALbeCUxBO4ZPqo=",
+        "owner": "echasnovski",
+        "repo": "mini.statusline",
+        "rev": "1b0edf76fe2af015f8c989385ff949f1db7aade2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.statusline",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2710,6 +2726,7 @@
         "plugin-mini-snippets": "plugin-mini-snippets",
         "plugin-mini-splitjoin": "plugin-mini-splitjoin",
         "plugin-mini-starter": "plugin-mini-starter",
+        "plugin-mini-statusline": "plugin-mini-statusline",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 716c1247..83a9d88a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -915,5 +915,10 @@
       url = "github:echasnovski/mini.starter";
       flake = false;
     };
+
+    plugin-mini-statusline = {
+      url = "github:echasnovski/mini.statusline";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 8cc30c8a..d68660fd 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -34,5 +34,6 @@
     ./snippets
     ./splitjoin
     ./starter
+    ./statusline
   ];
 }
diff --git a/modules/plugins/mini/statusline/config.nix b/modules/plugins/mini/statusline/config.nix
new file mode 100644
index 00000000..9f89b8a4
--- /dev/null
+++ b/modules/plugins/mini/statusline/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.statusline;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-statusline"];
+
+    pluginRC.mini-statusline = entryAnywhere ''
+      require("mini.statusline").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/statusline/default.nix b/modules/plugins/mini/statusline/default.nix
new file mode 100644
index 00000000..9fd274e2
--- /dev/null
+++ b/modules/plugins/mini/statusline/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./statusline.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/statusline/statusline.nix b/modules/plugins/mini/statusline/statusline.nix
new file mode 100644
index 00000000..9e1301cf
--- /dev/null
+++ b/modules/plugins/mini/statusline/statusline.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.statusline = {
+    enable = mkEnableOption "mini.statusline";
+    setupOpts = mkPluginSetupOption "mini.statusline" {};
+  };
+}

From 8809ecd689071dc2eb39aebd45ea3576fd0360e4 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:18:42 +0100
Subject: [PATCH 101/202] mini/surround: init

---
 docs/release-notes/rl-0.8.md               |  1 +
 flake.lock                                 | 17 +++++++++++++++++
 flake.nix                                  |  5 +++++
 modules/plugins/mini/default.nix           |  1 +
 modules/plugins/mini/surround/config.nix   | 19 +++++++++++++++++++
 modules/plugins/mini/surround/default.nix  |  6 ++++++
 modules/plugins/mini/surround/surround.nix | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/surround/config.nix
 create mode 100644 modules/plugins/mini/surround/default.nix
 create mode 100644 modules/plugins/mini/surround/surround.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 54ff3b0c..0c38c1ad 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -89,6 +89,7 @@
   - `mini.splitjoin`
   - `mini.starter`
   - `mini.statusline`
+  - `mini.surround`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index cd751c01..3c754e31 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1496,6 +1496,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-surround": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733662812,
+        "narHash": "sha256-okWJlG0KOdg1ShvkIIMnPSoOzGd7K84eDcp5kx6eVP8=",
+        "owner": "echasnovski",
+        "repo": "mini.surround",
+        "rev": "aa5e245829dd12d8ff0c96ef11da28681d6049aa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.surround",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2727,6 +2743,7 @@
         "plugin-mini-splitjoin": "plugin-mini-splitjoin",
         "plugin-mini-starter": "plugin-mini-starter",
         "plugin-mini-statusline": "plugin-mini-statusline",
+        "plugin-mini-surround": "plugin-mini-surround",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 83a9d88a..0c030c5f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -920,5 +920,10 @@
       url = "github:echasnovski/mini.statusline";
       flake = false;
     };
+
+    plugin-mini-surround = {
+      url = "github:echasnovski/mini.surround";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index d68660fd..0acb6344 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -35,5 +35,6 @@
     ./splitjoin
     ./starter
     ./statusline
+    ./surround
   ];
 }
diff --git a/modules/plugins/mini/surround/config.nix b/modules/plugins/mini/surround/config.nix
new file mode 100644
index 00000000..a0264685
--- /dev/null
+++ b/modules/plugins/mini/surround/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.surround;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-surround"];
+
+    pluginRC.mini-surround = entryAnywhere ''
+      require("mini.surround").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/surround/default.nix b/modules/plugins/mini/surround/default.nix
new file mode 100644
index 00000000..95d7a2f5
--- /dev/null
+++ b/modules/plugins/mini/surround/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./surround.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/surround/surround.nix b/modules/plugins/mini/surround/surround.nix
new file mode 100644
index 00000000..f4c1c199
--- /dev/null
+++ b/modules/plugins/mini/surround/surround.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.surround = {
+    enable = mkEnableOption "mini.surround";
+    setupOpts = mkPluginSetupOption "mini.surround" {};
+  };
+}

From 400c7b84e36d8e187deddc20ecd861941357865c Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:20:20 +0100
Subject: [PATCH 102/202] mini/tabline: init

---
 docs/release-notes/rl-0.8.md             |  1 +
 flake.lock                               | 17 +++++++++++++++++
 flake.nix                                |  5 +++++
 modules/plugins/mini/default.nix         |  1 +
 modules/plugins/mini/tabline/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/tabline/default.nix |  6 ++++++
 modules/plugins/mini/tabline/tabline.nix | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/tabline/config.nix
 create mode 100644 modules/plugins/mini/tabline/default.nix
 create mode 100644 modules/plugins/mini/tabline/tabline.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 0c38c1ad..313d2e41 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -90,6 +90,7 @@
   - `mini.starter`
   - `mini.statusline`
   - `mini.surround`
+  - `mini.tabline`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 3c754e31..a1996572 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1512,6 +1512,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-tabline": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1729176541,
+        "narHash": "sha256-nucUqSN8w2xBnDp1dFBgRVVvfVoqZMdx7Zj78wdFAP0=",
+        "owner": "echasnovski",
+        "repo": "mini.tabline",
+        "rev": "06ef4ecaeca2e362c7d31113435d86d144b3cbbe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.tabline",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2744,6 +2760,7 @@
         "plugin-mini-starter": "plugin-mini-starter",
         "plugin-mini-statusline": "plugin-mini-statusline",
         "plugin-mini-surround": "plugin-mini-surround",
+        "plugin-mini-tabline": "plugin-mini-tabline",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 0c030c5f..d81a87d4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -925,5 +925,10 @@
       url = "github:echasnovski/mini.surround";
       flake = false;
     };
+
+    plugin-mini-tabline = {
+      url = "github:echasnovski/mini.tabline";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 0acb6344..e18ecbba 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -36,5 +36,6 @@
     ./starter
     ./statusline
     ./surround
+    ./tabline
   ];
 }
diff --git a/modules/plugins/mini/tabline/config.nix b/modules/plugins/mini/tabline/config.nix
new file mode 100644
index 00000000..b807e563
--- /dev/null
+++ b/modules/plugins/mini/tabline/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.tabline;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-tabline"];
+
+    pluginRC.mini-tabline = entryAnywhere ''
+      require("mini.tabline").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/tabline/default.nix b/modules/plugins/mini/tabline/default.nix
new file mode 100644
index 00000000..38462e0f
--- /dev/null
+++ b/modules/plugins/mini/tabline/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./tabline.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/tabline/tabline.nix b/modules/plugins/mini/tabline/tabline.nix
new file mode 100644
index 00000000..7dc48222
--- /dev/null
+++ b/modules/plugins/mini/tabline/tabline.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.tabline = {
+    enable = mkEnableOption "mini.tabline";
+    setupOpts = mkPluginSetupOption "mini.tabline" {};
+  };
+}

From ae767781869c1484a166db7cc44d5c4a7f7a0f85 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:22:23 +0100
Subject: [PATCH 103/202] mini/test: init

---
 docs/release-notes/rl-0.8.md          |  1 +
 flake.lock                            | 17 +++++++++++++++++
 flake.nix                             |  5 +++++
 modules/plugins/mini/default.nix      |  1 +
 modules/plugins/mini/test/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/test/default.nix |  6 ++++++
 modules/plugins/mini/test/test.nix    | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/test/config.nix
 create mode 100644 modules/plugins/mini/test/default.nix
 create mode 100644 modules/plugins/mini/test/test.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 313d2e41..379195b7 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -91,6 +91,7 @@
   - `mini.statusline`
   - `mini.surround`
   - `mini.tabline`
+  - `mini.test`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index a1996572..fb274a3e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1528,6 +1528,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-test": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1729520957,
+        "narHash": "sha256-NtsX441k84owAAJywq4G2rMvV6d7UR2K75G8oKam+gs=",
+        "owner": "echasnovski",
+        "repo": "mini.test",
+        "rev": "86a64d5a4bf9d73ebf5875edaae0d878f64f5e48",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.test",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2761,6 +2777,7 @@
         "plugin-mini-statusline": "plugin-mini-statusline",
         "plugin-mini-surround": "plugin-mini-surround",
         "plugin-mini-tabline": "plugin-mini-tabline",
+        "plugin-mini-test": "plugin-mini-test",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index d81a87d4..b6262653 100644
--- a/flake.nix
+++ b/flake.nix
@@ -930,5 +930,10 @@
       url = "github:echasnovski/mini.tabline";
       flake = false;
     };
+
+    plugin-mini-test = {
+      url = "github:echasnovski/mini.test";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index e18ecbba..1025a927 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -37,5 +37,6 @@
     ./statusline
     ./surround
     ./tabline
+    ./test
   ];
 }
diff --git a/modules/plugins/mini/test/config.nix b/modules/plugins/mini/test/config.nix
new file mode 100644
index 00000000..bff42966
--- /dev/null
+++ b/modules/plugins/mini/test/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.test;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-test"];
+
+    pluginRC.mini-test = entryAnywhere ''
+      require("mini.test").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/test/default.nix b/modules/plugins/mini/test/default.nix
new file mode 100644
index 00000000..e78c7250
--- /dev/null
+++ b/modules/plugins/mini/test/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./test.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/test/test.nix b/modules/plugins/mini/test/test.nix
new file mode 100644
index 00000000..fba4db0b
--- /dev/null
+++ b/modules/plugins/mini/test/test.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.test = {
+    enable = mkEnableOption "mini.test";
+    setupOpts = mkPluginSetupOption "mini.test" {};
+  };
+}

From 0994337d02996490c990c5ae9dc931134fbbb4b1 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:23:56 +0100
Subject: [PATCH 104/202] mini/trailspace: init

---
 docs/release-notes/rl-0.8.md                  |  1 +
 flake.lock                                    | 17 +++++++++++++++++
 flake.nix                                     |  5 +++++
 modules/plugins/mini/default.nix              |  1 +
 modules/plugins/mini/trailspace/config.nix    | 19 +++++++++++++++++++
 modules/plugins/mini/trailspace/default.nix   |  6 ++++++
 .../plugins/mini/trailspace/trailspace.nix    | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/trailspace/config.nix
 create mode 100644 modules/plugins/mini/trailspace/default.nix
 create mode 100644 modules/plugins/mini/trailspace/trailspace.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 379195b7..1d683202 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -92,6 +92,7 @@
   - `mini.surround`
   - `mini.tabline`
   - `mini.test`
+  - `mini.trailspace`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index fb274a3e..c7a57499 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1544,6 +1544,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-trailspace": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1725613928,
+        "narHash": "sha256-JKYvFz8g8kVZvxE44RhwoHXQykghXx7ebW/Mj1ZdJIw=",
+        "owner": "echasnovski",
+        "repo": "mini.trailspace",
+        "rev": "3a328e62559c33014e422fb9ae97afc4208208b1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.trailspace",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2778,6 +2794,7 @@
         "plugin-mini-surround": "plugin-mini-surround",
         "plugin-mini-tabline": "plugin-mini-tabline",
         "plugin-mini-test": "plugin-mini-test",
+        "plugin-mini-trailspace": "plugin-mini-trailspace",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index b6262653..106d2bdd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -935,5 +935,10 @@
       url = "github:echasnovski/mini.test";
       flake = false;
     };
+
+    plugin-mini-trailspace = {
+      url = "github:echasnovski/mini.trailspace";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 1025a927..89d28999 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -38,5 +38,6 @@
     ./surround
     ./tabline
     ./test
+    ./trailspace
   ];
 }
diff --git a/modules/plugins/mini/trailspace/config.nix b/modules/plugins/mini/trailspace/config.nix
new file mode 100644
index 00000000..6ed9ba8a
--- /dev/null
+++ b/modules/plugins/mini/trailspace/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.trailspace;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-trailspace"];
+
+    pluginRC.mini-trailspace = entryAnywhere ''
+      require("mini.trailspace").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/trailspace/default.nix b/modules/plugins/mini/trailspace/default.nix
new file mode 100644
index 00000000..7e9adcba
--- /dev/null
+++ b/modules/plugins/mini/trailspace/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./trailspace.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/trailspace/trailspace.nix b/modules/plugins/mini/trailspace/trailspace.nix
new file mode 100644
index 00000000..003e159c
--- /dev/null
+++ b/modules/plugins/mini/trailspace/trailspace.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.trailspace = {
+    enable = mkEnableOption "mini.trailspace";
+    setupOpts = mkPluginSetupOption "mini.trailspace" {};
+  };
+}

From e8e5594fb9a9b68a5b42062318c88bc9aaf2dfa6 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:25:28 +0100
Subject: [PATCH 105/202] mini/visits: init

---
 docs/release-notes/rl-0.8.md            |  1 +
 flake.lock                              | 17 +++++++++++++++++
 flake.nix                               |  5 +++++
 modules/plugins/mini/default.nix        |  1 +
 modules/plugins/mini/visits/config.nix  | 19 +++++++++++++++++++
 modules/plugins/mini/visits/default.nix |  6 ++++++
 modules/plugins/mini/visits/visits.nix  | 13 +++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 modules/plugins/mini/visits/config.nix
 create mode 100644 modules/plugins/mini/visits/default.nix
 create mode 100644 modules/plugins/mini/visits/visits.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 1d683202..421b7916 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -93,6 +93,7 @@
   - `mini.tabline`
   - `mini.test`
   - `mini.trailspace`
+  - `mini.visits`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index c7a57499..148cc4e1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1560,6 +1560,22 @@
         "type": "github"
       }
     },
+    "plugin-mini-visits": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1737036221,
+        "narHash": "sha256-Q+m1gZ5Obu6Zzo87Djt6VCX76ZjdOiLb0j771jP8uQE=",
+        "owner": "echasnovski",
+        "repo": "mini.visits",
+        "rev": "90f20ba6ab7d3d7cb984fffddd82f5f6c7a6bea7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "echasnovski",
+        "repo": "mini.visits",
+        "type": "github"
+      }
+    },
     "plugin-minimap-vim": {
       "flake": false,
       "locked": {
@@ -2795,6 +2811,7 @@
         "plugin-mini-tabline": "plugin-mini-tabline",
         "plugin-mini-test": "plugin-mini-test",
         "plugin-mini-trailspace": "plugin-mini-trailspace",
+        "plugin-mini-visits": "plugin-mini-visits",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",
         "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
diff --git a/flake.nix b/flake.nix
index 106d2bdd..99eeada4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -940,5 +940,10 @@
       url = "github:echasnovski/mini.trailspace";
       flake = false;
     };
+
+    plugin-mini-visits = {
+      url = "github:echasnovski/mini.visits";
+      flake = false;
+    };
   };
 }
diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix
index 89d28999..8f035285 100644
--- a/modules/plugins/mini/default.nix
+++ b/modules/plugins/mini/default.nix
@@ -39,5 +39,6 @@
     ./tabline
     ./test
     ./trailspace
+    ./visits
   ];
 }
diff --git a/modules/plugins/mini/visits/config.nix b/modules/plugins/mini/visits/config.nix
new file mode 100644
index 00000000..424a81c2
--- /dev/null
+++ b/modules/plugins/mini/visits/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.visits;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["mini-visits"];
+
+    pluginRC.mini-visits = entryAnywhere ''
+      require("mini.visits").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}
diff --git a/modules/plugins/mini/visits/default.nix b/modules/plugins/mini/visits/default.nix
new file mode 100644
index 00000000..192eca9e
--- /dev/null
+++ b/modules/plugins/mini/visits/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./visits.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/mini/visits/visits.nix b/modules/plugins/mini/visits/visits.nix
new file mode 100644
index 00000000..0560533e
--- /dev/null
+++ b/modules/plugins/mini/visits/visits.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.mini.visits = {
+    enable = mkEnableOption "mini.visits";
+    setupOpts = mkPluginSetupOption "mini.visits" {};
+  };
+}

From f1f89a5c490d7ffaaff65d64632bc949c4e8de47 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:29:48 +0100
Subject: [PATCH 106/202] mini/*: remove unused inherits

---
 modules/plugins/mini/ai/ai.nix                   | 2 +-
 modules/plugins/mini/align/align.nix             | 2 +-
 modules/plugins/mini/animate/animate.nix         | 2 +-
 modules/plugins/mini/basics/basics.nix           | 2 +-
 modules/plugins/mini/bracketed/bracketed.nix     | 2 +-
 modules/plugins/mini/bufremove/bufremove.nix     | 2 +-
 modules/plugins/mini/clue/clue.nix               | 2 +-
 modules/plugins/mini/colors/colors.nix           | 2 +-
 modules/plugins/mini/comment/comment.nix         | 2 +-
 modules/plugins/mini/completion/completion.nix   | 2 +-
 modules/plugins/mini/diff/diff.nix               | 2 +-
 modules/plugins/mini/doc/doc.nix                 | 2 +-
 modules/plugins/mini/extra/extra.nix             | 2 +-
 modules/plugins/mini/files/files.nix             | 2 +-
 modules/plugins/mini/fuzzy/fuzzy.nix             | 2 +-
 modules/plugins/mini/git/git.nix                 | 2 +-
 modules/plugins/mini/hipatterns/hipatterns.nix   | 2 +-
 modules/plugins/mini/icons/icons.nix             | 2 +-
 modules/plugins/mini/indentscope/indentscope.nix | 2 +-
 modules/plugins/mini/jump/jump.nix               | 2 +-
 modules/plugins/mini/jump2d/jump2d.nix           | 2 +-
 modules/plugins/mini/map/map.nix                 | 2 +-
 modules/plugins/mini/misc/misc.nix               | 2 +-
 modules/plugins/mini/move/move.nix               | 2 +-
 modules/plugins/mini/notify/notify.nix           | 2 +-
 modules/plugins/mini/operators/operators.nix     | 2 +-
 modules/plugins/mini/pairs/pairs.nix             | 2 +-
 modules/plugins/mini/pick/pick.nix               | 2 +-
 modules/plugins/mini/sessions/sessions.nix       | 2 +-
 modules/plugins/mini/snippets/snippets.nix       | 2 +-
 modules/plugins/mini/splitjoin/splitjoin.nix     | 2 +-
 modules/plugins/mini/starter/starter.nix         | 2 +-
 modules/plugins/mini/statusline/statusline.nix   | 2 +-
 modules/plugins/mini/surround/surround.nix       | 2 +-
 modules/plugins/mini/tabline/tabline.nix         | 2 +-
 modules/plugins/mini/test/test.nix               | 2 +-
 modules/plugins/mini/trailspace/trailspace.nix   | 2 +-
 modules/plugins/mini/visits/visits.nix           | 2 +-
 38 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/modules/plugins/mini/ai/ai.nix b/modules/plugins/mini/ai/ai.nix
index c8e60b8e..d0da31d7 100644
--- a/modules/plugins/mini/ai/ai.nix
+++ b/modules/plugins/mini/ai/ai.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.ai = {
diff --git a/modules/plugins/mini/align/align.nix b/modules/plugins/mini/align/align.nix
index c21e9532..96c82947 100644
--- a/modules/plugins/mini/align/align.nix
+++ b/modules/plugins/mini/align/align.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.align = {
diff --git a/modules/plugins/mini/animate/animate.nix b/modules/plugins/mini/animate/animate.nix
index 6be633b5..fb17c0bd 100644
--- a/modules/plugins/mini/animate/animate.nix
+++ b/modules/plugins/mini/animate/animate.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.animate = {
diff --git a/modules/plugins/mini/basics/basics.nix b/modules/plugins/mini/basics/basics.nix
index b2a4ff30..e855caa6 100644
--- a/modules/plugins/mini/basics/basics.nix
+++ b/modules/plugins/mini/basics/basics.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.basics = {
diff --git a/modules/plugins/mini/bracketed/bracketed.nix b/modules/plugins/mini/bracketed/bracketed.nix
index 950f4e7f..3152f046 100644
--- a/modules/plugins/mini/bracketed/bracketed.nix
+++ b/modules/plugins/mini/bracketed/bracketed.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.bracketed = {
diff --git a/modules/plugins/mini/bufremove/bufremove.nix b/modules/plugins/mini/bufremove/bufremove.nix
index 79b84936..5e04609d 100644
--- a/modules/plugins/mini/bufremove/bufremove.nix
+++ b/modules/plugins/mini/bufremove/bufremove.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.bufremove = {
diff --git a/modules/plugins/mini/clue/clue.nix b/modules/plugins/mini/clue/clue.nix
index de4cf2ee..50d33c65 100644
--- a/modules/plugins/mini/clue/clue.nix
+++ b/modules/plugins/mini/clue/clue.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.clue = {
diff --git a/modules/plugins/mini/colors/colors.nix b/modules/plugins/mini/colors/colors.nix
index 81fe5840..7d56cd49 100644
--- a/modules/plugins/mini/colors/colors.nix
+++ b/modules/plugins/mini/colors/colors.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
 in {
   options.vim.mini.colors = {
     enable = mkEnableOption "mini.colors";
diff --git a/modules/plugins/mini/comment/comment.nix b/modules/plugins/mini/comment/comment.nix
index 2231a360..c46c0a58 100644
--- a/modules/plugins/mini/comment/comment.nix
+++ b/modules/plugins/mini/comment/comment.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.comment = {
diff --git a/modules/plugins/mini/completion/completion.nix b/modules/plugins/mini/completion/completion.nix
index a5f8caa5..fc36ed84 100644
--- a/modules/plugins/mini/completion/completion.nix
+++ b/modules/plugins/mini/completion/completion.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.completion = {
diff --git a/modules/plugins/mini/diff/diff.nix b/modules/plugins/mini/diff/diff.nix
index 8438cec9..4a72fda2 100644
--- a/modules/plugins/mini/diff/diff.nix
+++ b/modules/plugins/mini/diff/diff.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.diff = {
diff --git a/modules/plugins/mini/doc/doc.nix b/modules/plugins/mini/doc/doc.nix
index f1e65730..8699fa11 100644
--- a/modules/plugins/mini/doc/doc.nix
+++ b/modules/plugins/mini/doc/doc.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.doc = {
diff --git a/modules/plugins/mini/extra/extra.nix b/modules/plugins/mini/extra/extra.nix
index c57e6cdc..c697fdd6 100644
--- a/modules/plugins/mini/extra/extra.nix
+++ b/modules/plugins/mini/extra/extra.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
 in {
   options.vim.mini.extra = {
     enable = mkEnableOption "mini.extra";
diff --git a/modules/plugins/mini/files/files.nix b/modules/plugins/mini/files/files.nix
index f9c3f8ca..4ba5fcc4 100644
--- a/modules/plugins/mini/files/files.nix
+++ b/modules/plugins/mini/files/files.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.files = {
diff --git a/modules/plugins/mini/fuzzy/fuzzy.nix b/modules/plugins/mini/fuzzy/fuzzy.nix
index c5c486fc..977a1763 100644
--- a/modules/plugins/mini/fuzzy/fuzzy.nix
+++ b/modules/plugins/mini/fuzzy/fuzzy.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.fuzzy = {
diff --git a/modules/plugins/mini/git/git.nix b/modules/plugins/mini/git/git.nix
index f77a7502..ebbf4282 100644
--- a/modules/plugins/mini/git/git.nix
+++ b/modules/plugins/mini/git/git.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.git = {
diff --git a/modules/plugins/mini/hipatterns/hipatterns.nix b/modules/plugins/mini/hipatterns/hipatterns.nix
index 31921a89..019626cf 100644
--- a/modules/plugins/mini/hipatterns/hipatterns.nix
+++ b/modules/plugins/mini/hipatterns/hipatterns.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.hipatterns = {
diff --git a/modules/plugins/mini/icons/icons.nix b/modules/plugins/mini/icons/icons.nix
index 096fa9c2..27928a93 100644
--- a/modules/plugins/mini/icons/icons.nix
+++ b/modules/plugins/mini/icons/icons.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.icons = {
diff --git a/modules/plugins/mini/indentscope/indentscope.nix b/modules/plugins/mini/indentscope/indentscope.nix
index 8307a88c..6feffaee 100644
--- a/modules/plugins/mini/indentscope/indentscope.nix
+++ b/modules/plugins/mini/indentscope/indentscope.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.indentscope = {
diff --git a/modules/plugins/mini/jump/jump.nix b/modules/plugins/mini/jump/jump.nix
index ca9563d3..1e16ae7a 100644
--- a/modules/plugins/mini/jump/jump.nix
+++ b/modules/plugins/mini/jump/jump.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.jump = {
diff --git a/modules/plugins/mini/jump2d/jump2d.nix b/modules/plugins/mini/jump2d/jump2d.nix
index c25c6902..59f7c2ba 100644
--- a/modules/plugins/mini/jump2d/jump2d.nix
+++ b/modules/plugins/mini/jump2d/jump2d.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.jump2d = {
diff --git a/modules/plugins/mini/map/map.nix b/modules/plugins/mini/map/map.nix
index 554e2072..2d42fe70 100644
--- a/modules/plugins/mini/map/map.nix
+++ b/modules/plugins/mini/map/map.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.map = {
diff --git a/modules/plugins/mini/misc/misc.nix b/modules/plugins/mini/misc/misc.nix
index 7b36e9fd..1f4dcf55 100644
--- a/modules/plugins/mini/misc/misc.nix
+++ b/modules/plugins/mini/misc/misc.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.misc = {
diff --git a/modules/plugins/mini/move/move.nix b/modules/plugins/mini/move/move.nix
index e97e837b..ec9eccac 100644
--- a/modules/plugins/mini/move/move.nix
+++ b/modules/plugins/mini/move/move.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.move = {
diff --git a/modules/plugins/mini/notify/notify.nix b/modules/plugins/mini/notify/notify.nix
index 76e8c135..e98f6e71 100644
--- a/modules/plugins/mini/notify/notify.nix
+++ b/modules/plugins/mini/notify/notify.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.notify = {
diff --git a/modules/plugins/mini/operators/operators.nix b/modules/plugins/mini/operators/operators.nix
index c60ad6b5..639229bf 100644
--- a/modules/plugins/mini/operators/operators.nix
+++ b/modules/plugins/mini/operators/operators.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.operators = {
diff --git a/modules/plugins/mini/pairs/pairs.nix b/modules/plugins/mini/pairs/pairs.nix
index db43027b..926c93d3 100644
--- a/modules/plugins/mini/pairs/pairs.nix
+++ b/modules/plugins/mini/pairs/pairs.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.pairs = {
diff --git a/modules/plugins/mini/pick/pick.nix b/modules/plugins/mini/pick/pick.nix
index 8f93ac35..d8ccbfd5 100644
--- a/modules/plugins/mini/pick/pick.nix
+++ b/modules/plugins/mini/pick/pick.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.pick = {
diff --git a/modules/plugins/mini/sessions/sessions.nix b/modules/plugins/mini/sessions/sessions.nix
index 9a3737d6..0ceba595 100644
--- a/modules/plugins/mini/sessions/sessions.nix
+++ b/modules/plugins/mini/sessions/sessions.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.sessions = {
diff --git a/modules/plugins/mini/snippets/snippets.nix b/modules/plugins/mini/snippets/snippets.nix
index 5dbb1557..d7f0355c 100644
--- a/modules/plugins/mini/snippets/snippets.nix
+++ b/modules/plugins/mini/snippets/snippets.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.snippets = {
diff --git a/modules/plugins/mini/splitjoin/splitjoin.nix b/modules/plugins/mini/splitjoin/splitjoin.nix
index ae4f9420..44b2f23f 100644
--- a/modules/plugins/mini/splitjoin/splitjoin.nix
+++ b/modules/plugins/mini/splitjoin/splitjoin.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.splitjoin = {
diff --git a/modules/plugins/mini/starter/starter.nix b/modules/plugins/mini/starter/starter.nix
index cb42061d..df550857 100644
--- a/modules/plugins/mini/starter/starter.nix
+++ b/modules/plugins/mini/starter/starter.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.starter = {
diff --git a/modules/plugins/mini/statusline/statusline.nix b/modules/plugins/mini/statusline/statusline.nix
index 9e1301cf..2c850ae1 100644
--- a/modules/plugins/mini/statusline/statusline.nix
+++ b/modules/plugins/mini/statusline/statusline.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.statusline = {
diff --git a/modules/plugins/mini/surround/surround.nix b/modules/plugins/mini/surround/surround.nix
index f4c1c199..726bf3f9 100644
--- a/modules/plugins/mini/surround/surround.nix
+++ b/modules/plugins/mini/surround/surround.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.surround = {
diff --git a/modules/plugins/mini/tabline/tabline.nix b/modules/plugins/mini/tabline/tabline.nix
index 7dc48222..936273db 100644
--- a/modules/plugins/mini/tabline/tabline.nix
+++ b/modules/plugins/mini/tabline/tabline.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.tabline = {
diff --git a/modules/plugins/mini/test/test.nix b/modules/plugins/mini/test/test.nix
index fba4db0b..28135a26 100644
--- a/modules/plugins/mini/test/test.nix
+++ b/modules/plugins/mini/test/test.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.test = {
diff --git a/modules/plugins/mini/trailspace/trailspace.nix b/modules/plugins/mini/trailspace/trailspace.nix
index 003e159c..19757bfb 100644
--- a/modules/plugins/mini/trailspace/trailspace.nix
+++ b/modules/plugins/mini/trailspace/trailspace.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.trailspace = {
diff --git a/modules/plugins/mini/visits/visits.nix b/modules/plugins/mini/visits/visits.nix
index 0560533e..c01e8ebf 100644
--- a/modules/plugins/mini/visits/visits.nix
+++ b/modules/plugins/mini/visits/visits.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.mini.visits = {

From 5f00d7d0d216c4f49e7e96b65232d0b64665dc93 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:32:36 +0100
Subject: [PATCH 107/202] mini/deps: add missing changelog entry

---
 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 421b7916..b75fc410 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -65,6 +65,7 @@
   - `mini.colors`
   - `mini.comment`
   - `mini.completion`
+  - `mini.deps`
   - `mini.diff`
   - `mini.doc`
   - `mini.extra`

From e7649d1ec546b4dad1c1ef7a1e3f28b4a9b4551e Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 18 Jan 2025 20:45:47 +0300
Subject: [PATCH 108/202] meta: remove stale donation links

---
 .github/FUNDING.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 739d2d2c..97a82378 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,4 +1 @@
 github: NotAShelf
-ko_fi: NotAShelf
-liberapay: NotAShelf
-

From 420082852636b812c9e9c6bdd4b6ecdc072030b6 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 18 Jan 2025 20:19:08 +0300
Subject: [PATCH 109/202] languages/nix: remove hardcoded indentation options

---
 modules/plugins/languages/nix.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix
index 1120633c..4056a415 100644
--- a/modules/plugins/languages/nix.nix
+++ b/modules/plugins/languages/nix.nix
@@ -187,17 +187,6 @@ in {
           '';
         }
       ];
-      vim.pluginRC.nix = ''
-        vim.api.nvim_create_autocmd("FileType", {
-          pattern = "nix",
-          callback = function(opts)
-            local bo = vim.bo[opts.buf]
-            bo.tabstop = 2
-            bo.shiftwidth = 2
-            bo.softtabstop = 2
-          end
-        })
-      '';
     }
 
     (mkIf cfg.treesitter.enable {

From 7d0c56d74cd1ecbc5e01d14d81941708619e1aed Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 18 Jan 2025 20:20:15 +0300
Subject: [PATCH 110/202] docs: update v0.8 release notes

---
 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 465bf5c9..e854eebc 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -26,6 +26,11 @@
 
 - Deprecate rnix-lsp as it has been abandoned and archived upstream.
 
+- Hardcoded indentation values for the Nix language module have been removed. To
+  replicate previous behaviour, you must either consolidate Nix indentation in
+  your Editorconfig configuration, or use an autocommand to set indentation
+  values for buffers with the Nix filetype.
+
 [amadaluzia](https://github.com/amadaluzia):
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim

From f279e3a5856fb090b28f5ff69b8ce09e51349b67 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:53:44 +0100
Subject: [PATCH 111/202] utility/fzf-lua: init

---
 flake.lock                                  | 17 +++++++++++++++++
 flake.nix                                   |  7 ++++++-
 modules/plugins/utility/default.nix         |  1 +
 modules/plugins/utility/fzf-lua/config.nix  | 16 ++++++++++++++++
 modules/plugins/utility/fzf-lua/default.nix |  6 ++++++
 modules/plugins/utility/fzf-lua/fzf-lua.nix | 18 ++++++++++++++++++
 6 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 modules/plugins/utility/fzf-lua/config.nix
 create mode 100644 modules/plugins/utility/fzf-lua/default.nix
 create mode 100644 modules/plugins/utility/fzf-lua/fzf-lua.nix

diff --git a/flake.lock b/flake.lock
index 918b0ce1..e28d03b5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -599,6 +599,22 @@
         "type": "github"
       }
     },
+    "plugin-fzf-lua": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1737131132,
+        "narHash": "sha256-0IdADUsIr+SZ0ort92jPPfGIH1EdcwELYz+TCmDCPPI=",
+        "owner": "ibhagwan",
+        "repo": "fzf-lua",
+        "rev": "fbe21aeb147b3dc8b188b5753a8e288ecedcee5e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ibhagwan",
+        "repo": "fzf-lua",
+        "type": "github"
+      }
+    },
     "plugin-gesture-nvim": {
       "flake": false,
       "locked": {
@@ -2127,6 +2143,7 @@
         "plugin-fidget-nvim": "plugin-fidget-nvim",
         "plugin-flutter-tools": "plugin-flutter-tools",
         "plugin-friendly-snippets": "plugin-friendly-snippets",
+        "plugin-fzf-lua": "plugin-fzf-lua",
         "plugin-gesture-nvim": "plugin-gesture-nvim",
         "plugin-gitsigns-nvim": "plugin-gitsigns-nvim",
         "plugin-glow-nvim": "plugin-glow-nvim",
diff --git a/flake.nix b/flake.nix
index 02ceb667..19443813 100644
--- a/flake.nix
+++ b/flake.nix
@@ -236,12 +236,17 @@
       flake = false;
     };
 
-    # Telescope
+    # Pickers
     plugin-telescope = {
       url = "github:nvim-telescope/telescope.nvim";
       flake = false;
     };
 
+    plugin-fzf-lua = {
+      url = "github:ibhagwan/fzf-lua";
+      flake = false;
+    };
+
     # Runners
     plugin-run-nvim = {
       url = "github:diniamo/run.nvim";
diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix
index 686295e2..8b25ea8f 100644
--- a/modules/plugins/utility/default.nix
+++ b/modules/plugins/utility/default.nix
@@ -14,5 +14,6 @@
     ./wakatime
     ./surround
     ./preview
+    ./fzf-lua
   ];
 }
diff --git a/modules/plugins/utility/fzf-lua/config.nix b/modules/plugins/utility/fzf-lua/config.nix
new file mode 100644
index 00000000..558f3cd1
--- /dev/null
+++ b/modules/plugins/utility/fzf-lua/config.nix
@@ -0,0 +1,16 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+
+  cfg = config.vim.fzf-lua;
+in {
+  vim.lazy.plugins."fzf-lua" = mkIf cfg.enable {
+    package = "fzf-lua";
+    cmd = ["FzfLua"];
+    setupModule = "fzf-lua";
+    inherit (cfg) setupOpts;
+  };
+}
diff --git a/modules/plugins/utility/fzf-lua/default.nix b/modules/plugins/utility/fzf-lua/default.nix
new file mode 100644
index 00000000..e5147e44
--- /dev/null
+++ b/modules/plugins/utility/fzf-lua/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./fzf-lua.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/utility/fzf-lua/fzf-lua.nix b/modules/plugins/utility/fzf-lua/fzf-lua.nix
new file mode 100644
index 00000000..099911be
--- /dev/null
+++ b/modules/plugins/utility/fzf-lua/fzf-lua.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.nvim.types) mkPluginSetupOption borderType;
+in {
+  options.vim.fzf-lua = {
+    enable = mkEnableOption "fzf-lua";
+    setupOpts = mkPluginSetupOption "mini.ai" {
+      winopts.border = mkOption {
+        type = borderType;
+        default = config.vim.ui.borders.globalStyle;
+      };
+    };
+  };
+}

From ce7017cf5ba6ea53359d002c8433e18b1a6dd83b Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 21:55:06 +0100
Subject: [PATCH 112/202] utility/fzf-lua: add changelog

---
 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 e854eebc..9271e796 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -59,6 +59,7 @@
 - Add `vim.snippets.luasnip.setupOpts`, which was previously missing.
 - Add `"prettierd"` as a formatter option in
   `vim.languages.markdown.format.type`.
+- Add [fzf-lua](https://github.com/ibhagwan/fzf-lua) in `vim.fzf-lua`
 
 [kaktu5](https://github.com/kaktu5):
 

From 775963dd9dcd3b82746a558b12dad445288ecc9e Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Fri, 17 Jan 2025 22:02:25 +0100
Subject: [PATCH 113/202] utility/fzf-lua: add border option description

---
 modules/plugins/utility/fzf-lua/fzf-lua.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/plugins/utility/fzf-lua/fzf-lua.nix b/modules/plugins/utility/fzf-lua/fzf-lua.nix
index 099911be..3b45ab02 100644
--- a/modules/plugins/utility/fzf-lua/fzf-lua.nix
+++ b/modules/plugins/utility/fzf-lua/fzf-lua.nix
@@ -12,6 +12,7 @@ in {
       winopts.border = mkOption {
         type = borderType;
         default = config.vim.ui.borders.globalStyle;
+        description = "Border type for the fzf-lua picker window";
       };
     };
   };

From ba55a1b54a5b5c4d0cc0d035132a9bc9c0733db6 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Sat, 18 Jan 2025 10:10:59 +0100
Subject: [PATCH 114/202] utility/fzf-lua: add profile option, fix name

---
 modules/plugins/utility/fzf-lua/config.nix  |  2 +-
 modules/plugins/utility/fzf-lua/fzf-lua.nix | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/modules/plugins/utility/fzf-lua/config.nix b/modules/plugins/utility/fzf-lua/config.nix
index 558f3cd1..85425fc7 100644
--- a/modules/plugins/utility/fzf-lua/config.nix
+++ b/modules/plugins/utility/fzf-lua/config.nix
@@ -11,6 +11,6 @@ in {
     package = "fzf-lua";
     cmd = ["FzfLua"];
     setupModule = "fzf-lua";
-    inherit (cfg) setupOpts;
+    setupOpts = cfg.setupOpts // {"@1" = cfg.profile;};
   };
 }
diff --git a/modules/plugins/utility/fzf-lua/fzf-lua.nix b/modules/plugins/utility/fzf-lua/fzf-lua.nix
index 3b45ab02..5657f666 100644
--- a/modules/plugins/utility/fzf-lua/fzf-lua.nix
+++ b/modules/plugins/utility/fzf-lua/fzf-lua.nix
@@ -3,17 +3,35 @@
   lib,
   ...
 }: let
+  inherit (lib.types) nullOr enum;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.nvim.types) mkPluginSetupOption borderType;
 in {
   options.vim.fzf-lua = {
     enable = mkEnableOption "fzf-lua";
-    setupOpts = mkPluginSetupOption "mini.ai" {
+    setupOpts = mkPluginSetupOption "fzf-lua" {
       winopts.border = mkOption {
         type = borderType;
         default = config.vim.ui.borders.globalStyle;
         description = "Border type for the fzf-lua picker window";
       };
     };
+    profile = mkOption {
+      type = enum [
+        "default"
+        "default-title"
+        "fzf-native"
+        "fzf-tmux"
+        "fzf-vim"
+        "max-perf"
+        "telescope"
+        "skim"
+        "borderless"
+        "borderless-full"
+        "border-fused"
+      ];
+      default = "default";
+      description = "The configuration profile ot use";
+    };
   };
 }

From f338fd3411589b16340b7560eb7476f1438fa536 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Sat, 18 Jan 2025 10:12:33 +0100
Subject: [PATCH 115/202] utility/fzf-lua: fix typo in profile description

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

diff --git a/modules/plugins/utility/fzf-lua/fzf-lua.nix b/modules/plugins/utility/fzf-lua/fzf-lua.nix
index 5657f666..c700add7 100644
--- a/modules/plugins/utility/fzf-lua/fzf-lua.nix
+++ b/modules/plugins/utility/fzf-lua/fzf-lua.nix
@@ -31,7 +31,7 @@ in {
         "border-fused"
       ];
       default = "default";
-      description = "The configuration profile ot use";
+      description = "The configuration profile to use";
     };
   };
 }

From ae81ab2c5f1ead51b79510fef46f96f8f76cb5f5 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Sun, 19 Jan 2025 10:15:51 +0100
Subject: [PATCH 116/202] mini/notify: set vim.notify, assert nvim-notify

---
 modules/plugins/mini/notify/config.nix |  7 +++---
 modules/plugins/mini/notify/notify.nix | 34 +++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/modules/plugins/mini/notify/config.nix b/modules/plugins/mini/notify/config.nix
index 2a5ff46e..6872092c 100644
--- a/modules/plugins/mini/notify/config.nix
+++ b/modules/plugins/mini/notify/config.nix
@@ -3,17 +3,18 @@
   lib,
   ...
 }: let
-  inherit (lib.modules) mkIf;
+  inherit (lib.modules) mkIf mkAssert;
   inherit (lib.nvim.dag) entryAnywhere;
   inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.mini.notify;
 in {
-  vim = mkIf cfg.enable {
+  vim = mkIf cfg.enable (mkAssert (!config.vim.notify.nvim-notify.enable) "Mini.notify is incompatible with nvim-notify!" {
     startPlugins = ["mini-notify"];
 
     pluginRC.mini-notify = entryAnywhere ''
       require("mini.notify").setup(${toLuaObject cfg.setupOpts})
+      vim.notify = MiniNotify.make_notify(${toLuaObject cfg.notifyOpts})
     '';
-  };
+  });
 }
diff --git a/modules/plugins/mini/notify/notify.nix b/modules/plugins/mini/notify/notify.nix
index e98f6e71..628be47a 100644
--- a/modules/plugins/mini/notify/notify.nix
+++ b/modules/plugins/mini/notify/notify.nix
@@ -3,11 +3,39 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption;
-  inherit (lib.nvim.types) mkPluginSetupOption;
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.types) int str;
+  inherit (lib.nvim.types) mkPluginSetupOption borderType;
+
+  mkNotifyOpt = name: duration: hl_group: {
+    duration = mkOption {
+      type = int;
+      default = duration;
+      description = "The duration of the ${name} notification";
+    };
+    hl_group = mkOption {
+      type = str;
+      default = hl_group;
+      description = "The highlight group of the ${name} notification";
+    };
+  };
 in {
   options.vim.mini.notify = {
     enable = mkEnableOption "mini.notify";
-    setupOpts = mkPluginSetupOption "mini.notify" {};
+    setupOpts = mkPluginSetupOption "mini.notify" {
+      window.config.border = mkOption {
+        type = borderType;
+        default = config.vim.ui.borders.globalStyle;
+        description = "The border type for the mini.notify-notifications";
+      };
+    };
+    notifyOpts = mkPluginSetupOption "mini.notify notifications" {
+      ERROR = mkNotifyOpt "error" 5000 "DiagnosticError";
+      WARN = mkNotifyOpt "warn" 5000 "DiagnosticWarn";
+      INFO = mkNotifyOpt "info" 5000 "DiagnosticInfo";
+      DEBUG = mkNotifyOpt "debug" 0 "DiagnosticHint";
+      TRACE = mkNotifyOpt "trace" 0 "DiagnosticOk";
+      OFF = mkNotifyOpt "off" 0 "MiniNotifyNormal";
+    };
   };
 }

From e331f009d5e43339815331c0f02906b3e4039190 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Sun, 19 Jan 2025 10:19:34 +0100
Subject: [PATCH 117/202] mini/hues: more descriptive color options

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

diff --git a/modules/plugins/mini/hues/hues.nix b/modules/plugins/mini/hues/hues.nix
index f848923a..13de5116 100644
--- a/modules/plugins/mini/hues/hues.nix
+++ b/modules/plugins/mini/hues/hues.nix
@@ -12,21 +12,13 @@ in {
     enable = mkEnableOption "mini.hues";
     setupOpts = mkPluginSetupOption "mini.hues" {
       background = mkOption {
-        description = "The background color to use";
+        description = "The hex color for the background color of the color scheme, prefixed with #";
         type = hexColor;
-        apply = v:
-          if hasPrefix "#" v
-          then v
-          else "#${v}";
       };
 
       foreground = mkOption {
-        description = "The foreground color to use";
+        description = "The hex color for the foreground color of the color scheme, prefixed with #";
         type = hexColor;
-        apply = v:
-          if hasPrefix "#" v
-          then v
-          else "#${v}";
       };
     };
   };

From abd9176a2ad6eaa0ad6fff3ae2cee9c7c5f8dd0e Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 19 Jan 2025 13:09:47 +0300
Subject: [PATCH 118/202] ci/docs-preview: use `pull_request_target`

Run code with access to the tokens on the target branch, *after* approval.
---
 .github/workflows/docs-preview.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml
index c38be9da..e6d2e662 100644
--- a/.github/workflows/docs-preview.yml
+++ b/.github/workflows/docs-preview.yml
@@ -2,7 +2,7 @@ name: Build and Preview Manual
 
 on:
   workflow_dispatch:
-  pull_request:
+  pull_request_target:
     types: [opened, synchronize, reopened, closed]
     paths:
       - ".github/workflows/docs-preview.yml"

From db8a586b7ed5a59995e13e5dab63b39a204946a3 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 19 Jan 2025 13:21:51 +0300
Subject: [PATCH 119/202] neovim/init: enable `preventJunkFiles` by default

---
 modules/neovim/init/basic.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/neovim/init/basic.nix b/modules/neovim/init/basic.nix
index 532ebcea..b4677de9 100644
--- a/modules/neovim/init/basic.nix
+++ b/modules/neovim/init/basic.nix
@@ -55,8 +55,14 @@ in {
 
     preventJunkFiles = mkOption {
       type = bool;
-      default = false;
-      description = "Prevent swapfile and backupfile from being created";
+      default = true;
+      example = false;
+      description = ''
+        Prevent swapfile and backupfile from being created.
+
+        `false` is the default Neovim behaviour. If you wish to create
+        backup and swapfiles, set this option to `false`.
+      '';
     };
 
     bell = mkOption {

From dfd4dc8494be4f09076ce8b1239177c8a5d10420 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Sun, 19 Jan 2025 12:52:45 +0100
Subject: [PATCH 120/202] visuals/rainbow-delimiters: init

---
 docs/release-notes/rl-0.8.md                   |  1 +
 flake.lock                                     | 17 +++++++++++++++++
 flake.nix                                      |  5 +++++
 modules/plugins/visuals/default.nix            |  1 +
 .../visuals/rainbow-delimiters/config.nix      | 18 ++++++++++++++++++
 .../visuals/rainbow-delimiters/default.nix     |  6 ++++++
 .../rainbow-delimiters/rainbow-delimiters.nix  | 13 +++++++++++++
 7 files changed, 61 insertions(+)
 create mode 100644 modules/plugins/visuals/rainbow-delimiters/config.nix
 create mode 100644 modules/plugins/visuals/rainbow-delimiters/default.nix
 create mode 100644 modules/plugins/visuals/rainbow-delimiters/rainbow-delimiters.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 42927baf..a164d776 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -102,6 +102,7 @@
   - `mini.trailspace`
   - `mini.visits`
 - Add [fzf-lua](https://github.com/ibhagwan/fzf-lua) in `vim.fzf-lua`
+- Add [rainbow-delimiters](https://github.com/HiPhish/rainbow-delimiters.nvim) in `vim.visuals.rainbow-delimiters`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/flake.lock b/flake.lock
index 7b7f0bab..c328bda1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2361,6 +2361,22 @@
         "type": "github"
       }
     },
+    "plugin-rainbow-delimiters": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1736686348,
+        "narHash": "sha256-zWHXYs3XdnoszqOFY3hA2L5mNn1a44OAeKv3lL3EMEw=",
+        "owner": "HiPhish",
+        "repo": "rainbow-delimiters.nvim",
+        "rev": "85b80abaa09cbbc039e3095b2f515b3cf8cadd11",
+        "type": "github"
+      },
+      "original": {
+        "owner": "HiPhish",
+        "repo": "rainbow-delimiters.nvim",
+        "type": "github"
+      }
+    },
     "plugin-registers": {
       "flake": false,
       "locked": {
@@ -2893,6 +2909,7 @@
         "plugin-precognition-nvim": "plugin-precognition-nvim",
         "plugin-project-nvim": "plugin-project-nvim",
         "plugin-promise-async": "plugin-promise-async",
+        "plugin-rainbow-delimiters": "plugin-rainbow-delimiters",
         "plugin-registers": "plugin-registers",
         "plugin-render-markdown-nvim": "plugin-render-markdown-nvim",
         "plugin-rose-pine": "plugin-rose-pine",
diff --git a/flake.nix b/flake.nix
index 05b6fc4b..5d4728f6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -502,6 +502,11 @@
       flake = false;
     };
 
+    plugin-rainbow-delimiters = {
+      url = "github:HiPhish/rainbow-delimiters.nvim";
+      flake = false;
+    };
+
     # Minimap
     plugin-minimap-vim = {
       url = "github:wfxr/minimap.vim";
diff --git a/modules/plugins/visuals/default.nix b/modules/plugins/visuals/default.nix
index 0843654e..3a44aa45 100644
--- a/modules/plugins/visuals/default.nix
+++ b/modules/plugins/visuals/default.nix
@@ -15,6 +15,7 @@ in {
     ./nvim-cursorline
     ./nvim-scrollbar
     ./nvim-web-devicons
+    ./rainbow-delimiters
     ./tiny-devicons-auto-colors
   ];
 }
diff --git a/modules/plugins/visuals/rainbow-delimiters/config.nix b/modules/plugins/visuals/rainbow-delimiters/config.nix
new file mode 100644
index 00000000..361a0426
--- /dev/null
+++ b/modules/plugins/visuals/rainbow-delimiters/config.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.lua) toLuaObject;
+  cfg = config.vim.visuals.rainbow-delimiters;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["rainbow-delimiters"];
+
+    pluginRC.rainbow-delimiters = entryAnywhere ''
+      vim.g.rainbow_delimiters = ${toLuaObject cfg.setupOpts}
+    '';
+  };
+}
diff --git a/modules/plugins/visuals/rainbow-delimiters/default.nix b/modules/plugins/visuals/rainbow-delimiters/default.nix
new file mode 100644
index 00000000..50aaad0e
--- /dev/null
+++ b/modules/plugins/visuals/rainbow-delimiters/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./rainbow-delimiters.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/visuals/rainbow-delimiters/rainbow-delimiters.nix b/modules/plugins/visuals/rainbow-delimiters/rainbow-delimiters.nix
new file mode 100644
index 00000000..3fed4a64
--- /dev/null
+++ b/modules/plugins/visuals/rainbow-delimiters/rainbow-delimiters.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.visuals.rainbow-delimiters = {
+    enable = mkEnableOption "rainbow-delimiters";
+    setupOpts = mkPluginSetupOption "rainbow-delimiters" {};
+  };
+}

From fcb6f82892ad1c5831cb369a0328f2abb677f47f Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Sun, 19 Jan 2025 18:01:43 +0100
Subject: [PATCH 121/202] highlight: init

---
 docs/release-notes/rl-0.8.md      |   1 +
 modules/neovim/init/default.nix   |   1 +
 modules/neovim/init/highlight.nix | 106 ++++++++++++++++++++++++++++++
 3 files changed, 108 insertions(+)
 create mode 100644 modules/neovim/init/highlight.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 42927baf..f835abf1 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -102,6 +102,7 @@
   - `mini.trailspace`
   - `mini.visits`
 - Add [fzf-lua](https://github.com/ibhagwan/fzf-lua) in `vim.fzf-lua`
+- Add options to define highlights under `vim.highlight`
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/modules/neovim/init/default.nix b/modules/neovim/init/default.nix
index 11d9cf59..b0c7e0ce 100644
--- a/modules/neovim/init/default.nix
+++ b/modules/neovim/init/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ./basic.nix
     ./debug.nix
+    ./highlight.nix
     ./spellcheck.nix
   ];
 }
diff --git a/modules/neovim/init/highlight.nix b/modules/neovim/init/highlight.nix
new file mode 100644
index 00000000..d00fe74a
--- /dev/null
+++ b/modules/neovim/init/highlight.nix
@@ -0,0 +1,106 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkOption literalExpression;
+  inherit (lib.types) nullOr attrsOf listOf submodule bool ints str;
+  inherit (lib.strings) hasPrefix concatStringsSep;
+  inherit (lib.attrsets) mapAttrsToList;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.lua) toLuaObject;
+  inherit (lib.nvim.types) hexColor;
+
+  mkColorOption = target:
+    mkOption {
+      type = nullOr hexColor;
+      default = null;
+      description = ''
+        The ${target} color to use. Written as color name or hex "#RRGGBB".
+      '';
+      example = "#ebdbb2";
+    };
+
+  mkBoolOption = name:
+    mkOption {
+      type = nullOr bool;
+      default = null;
+      description = ''Whether to enable ${name}'';
+      example = false;
+    };
+
+  cfg = config.vim.highlight;
+in {
+  options.vim.highlight = mkOption {
+    type = attrsOf (submodule {
+      # See :h nvim_set_hl
+      options = {
+        bg = mkColorOption "background";
+        fg = mkColorOption "foreground";
+        sp = mkColorOption "special";
+        blend = mkOption {
+          type = nullOr (ints.between 0 100);
+          default = null;
+          description = "Blend as an integer between 0 and 100";
+        };
+        bold = mkBoolOption "bold";
+        standout = mkBoolOption "standout";
+        underline = mkBoolOption "underline";
+        undercurl = mkBoolOption "undercurl";
+        underdouble = mkBoolOption "underdouble";
+        underdotted = mkBoolOption "underdotted";
+        underdashed = mkBoolOption "underdashed";
+        strikethrough = mkBoolOption "strikethrough";
+        italic = mkBoolOption "italic";
+        reverse = mkBoolOption "reverse";
+        nocombine = mkBoolOption "nocombine";
+        link = mkOption {
+          type = nullOr str;
+          default = null;
+          description = "The name of another highlight group to link to";
+        };
+        default = mkOption {
+          type = nullOr bool;
+          default = null;
+          description = "Don't override existing definition";
+        };
+        ctermfg = mkOption {
+          type = nullOr str;
+          default = null;
+          description = "The cterm foreground color to use";
+        };
+        ctermbg = mkOption {
+          type = nullOr str;
+          default = null;
+          description = "The cterm background color to use";
+        };
+        cterm = mkOption {
+          type = nullOr (listOf str);
+          default = null;
+          description = "The cterm arguments to use. See :h highlight-args";
+        };
+        force = mkBoolOption "force update";
+      };
+    });
+    default = {};
+    description = "Custom highlight to apply";
+    example = literalExpression ''
+      {
+        SignColumn = {
+          bg = "#282828";
+        };
+      }
+    '';
+  };
+
+  config = {
+    vim.luaConfigRC.highlight = let
+      highlights =
+        mapAttrsToList (
+          name: value: ''vim.api.nvim_set_hl(0, ${toLuaObject name}, ${toLuaObject value})''
+        )
+        cfg;
+    in
+      entryAnywhere (concatStringsSep "\n" highlights);
+  };
+}

From 5e3a0dcdc32259e50a78d763a6f5720b73b1de5e Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Sun, 19 Jan 2025 18:11:12 +0100
Subject: [PATCH 122/202] highlight: cterm as enum

---
 modules/neovim/init/highlight.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/modules/neovim/init/highlight.nix b/modules/neovim/init/highlight.nix
index d00fe74a..8c110cac 100644
--- a/modules/neovim/init/highlight.nix
+++ b/modules/neovim/init/highlight.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib.options) mkOption literalExpression;
-  inherit (lib.types) nullOr attrsOf listOf submodule bool ints str;
+  inherit (lib.types) nullOr attrsOf listOf submodule bool ints str enum;
   inherit (lib.strings) hasPrefix concatStringsSep;
   inherit (lib.attrsets) mapAttrsToList;
   inherit (lib.nvim.dag) entryAnywhere;
@@ -75,7 +75,22 @@ in {
           description = "The cterm background color to use";
         };
         cterm = mkOption {
-          type = nullOr (listOf str);
+          type = nullOr (listOf (enum [
+            "bold"
+            "underline"
+            "undercurl"
+            "underdouble"
+            "underdotted"
+            "underdashed"
+            "strikethrough"
+            "reverse"
+            "inverse"
+            "italic"
+            "standout"
+            "altfont"
+            "nocombine"
+            "NONE"
+          ]));
           default = null;
           description = "The cterm arguments to use. See :h highlight-args";
         };

From 653e5d6a176378386e803c767aa8da4dbdd96f11 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Sun, 19 Jan 2025 19:36:32 +0100
Subject: [PATCH 123/202] highlight: implement suggestions

---
 docs/release-notes/rl-0.8.md      |  2 +-
 modules/neovim/init/highlight.nix | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index f835abf1..7fe3d2e5 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -102,7 +102,7 @@
   - `mini.trailspace`
   - `mini.visits`
 - Add [fzf-lua](https://github.com/ibhagwan/fzf-lua) in `vim.fzf-lua`
-- Add options to define highlights under `vim.highlight`
+- Add options to define highlights under [](#opt-vim.highlight)
 
 [kaktu5](https://github.com/kaktu5):
 
diff --git a/modules/neovim/init/highlight.nix b/modules/neovim/init/highlight.nix
index 8c110cac..606f1c05 100644
--- a/modules/neovim/init/highlight.nix
+++ b/modules/neovim/init/highlight.nix
@@ -3,11 +3,11 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkOption literalExpression;
+  inherit (lib.options) mkOption;
   inherit (lib.types) nullOr attrsOf listOf submodule bool ints str enum;
-  inherit (lib.strings) hasPrefix concatStringsSep;
+  inherit (lib.strings) hasPrefix concatLines;
   inherit (lib.attrsets) mapAttrsToList;
-  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.dag) entryBetween;
   inherit (lib.nvim.lua) toLuaObject;
   inherit (lib.nvim.types) hexColor;
 
@@ -15,18 +15,18 @@
     mkOption {
       type = nullOr hexColor;
       default = null;
+      example = "#ebdbb2";
       description = ''
         The ${target} color to use. Written as color name or hex "#RRGGBB".
       '';
-      example = "#ebdbb2";
     };
 
   mkBoolOption = name:
     mkOption {
       type = nullOr bool;
       default = null;
-      description = ''Whether to enable ${name}'';
       example = false;
+      description = "Whether to enable ${name}";
     };
 
   cfg = config.vim.highlight;
@@ -98,14 +98,14 @@ in {
       };
     });
     default = {};
-    description = "Custom highlight to apply";
-    example = literalExpression ''
+    example = ''
       {
         SignColumn = {
           bg = "#282828";
         };
       }
     '';
+    description = "Custom highlights to apply";
   };
 
   config = {
@@ -116,6 +116,6 @@ in {
         )
         cfg;
     in
-      entryAnywhere (concatStringsSep "\n" highlights);
+      entryBetween ["lazyConfigs" "pluginConfigs" "extraPluginConfigs"] ["theme"] (concatLines highlights);
   };
 }

From 28bbe89fbc92ff6a1b6c180d9812ee6ddf706207 Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Mon, 20 Jan 2025 14:16:45 +0100
Subject: [PATCH 124/202] highlight: example without ''

---
 modules/neovim/init/highlight.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/neovim/init/highlight.nix b/modules/neovim/init/highlight.nix
index 606f1c05..8c7eca82 100644
--- a/modules/neovim/init/highlight.nix
+++ b/modules/neovim/init/highlight.nix
@@ -98,13 +98,11 @@ in {
       };
     });
     default = {};
-    example = ''
-      {
-        SignColumn = {
-          bg = "#282828";
-        };
-      }
-    '';
+    example = {
+      SignColumn = {
+        bg = "#282828";
+      };
+    };
     description = "Custom highlights to apply";
   };
 

From f58f41629f82ea7c88a84333ba261369194fe7de Mon Sep 17 00:00:00 2001
From: LilleAila <olai.solsvik@gmail.com>
Date: Mon, 20 Jan 2025 14:28:36 +0100
Subject: [PATCH 125/202] highlight: :h reference in single quotes

---
 modules/neovim/init/highlight.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neovim/init/highlight.nix b/modules/neovim/init/highlight.nix
index 8c7eca82..7e992fd1 100644
--- a/modules/neovim/init/highlight.nix
+++ b/modules/neovim/init/highlight.nix
@@ -92,7 +92,7 @@ in {
             "NONE"
           ]));
           default = null;
-          description = "The cterm arguments to use. See :h highlight-args";
+          description = "The cterm arguments to use. See ':h highlight-args'";
         };
         force = mkBoolOption "force update";
       };

From 4b6021073cd9aa09f75c4c2e89fa18cd3224793a Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 22 Jan 2025 12:16:03 +0300
Subject: [PATCH 126/202] flake: bump nixpkgs

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

diff --git a/flake.lock b/flake.lock
index c328bda1..ee19b7c8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -77,11 +77,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1735523292,
-        "narHash": "sha256-opBsbR/nrGxiiF6XzlVluiHYb6yN/hEwv+lBWTy9xoM=",
+        "lastModified": 1737370608,
+        "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6d97d419e5a9b36e6293887a89a078cf85f5a61b",
+        "rev": "300081d0cc72df578b02d914df941b8ec62240e6",
         "type": "github"
       },
       "original": {

From 547cbd28b61b605fa7e308f0575d1f4acb7f3aac Mon Sep 17 00:00:00 2001
From: ARCIII <88923299+ArmandoCIII@users.noreply.github.com>
Date: Sat, 25 Jan 2025 08:17:48 -0500
Subject: [PATCH 127/202] languages/zig: add dap support (#581)

* languages/zig: Added dap support

Implemented DAP support for zig. Included comment regarding redundant
`dap.adapters.lldb` code when both clang and zig dap modules are
enabled.

* languages/zig: Added dap support cleanup

Cleaned up code from the zig dap implementation for consistency.
---
 docs/release-notes/rl-0.8.md      |  5 +++
 modules/plugins/languages/zig.nix | 61 ++++++++++++++++++++++++++++++-
 2 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 95bb6661..b06a071f 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -122,3 +122,8 @@
 [ruff]: (https://github.com/astral-sh/ruff)
 
 - Add [ruff] as a formatter option in `vim.languages.python.format.type`.
+
+[ARCIII](https://github.com/ArmandoCIII):
+
+- Add `vim.languages.zig.dap` support through pkgs.lldb dap adapter.
+  Code Inspiration from `vim.languages.clang.dap` implementation.
diff --git a/modules/plugins/languages/zig.nix b/modules/plugins/languages/zig.nix
index 1b9a588b..2aa0e2b6 100644
--- a/modules/plugins/languages/zig.nix
+++ b/modules/plugins/languages/zig.nix
@@ -8,10 +8,12 @@
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge mkDefault;
   inherit (lib.lists) isList;
-  inherit (lib.types) either listOf package str enum;
+  inherit (lib.types) bool either listOf package str enum;
   inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.types) mkGrammarOption;
 
+  cfg = config.vim.languages.zig;
+
   defaultServer = "zls";
   servers = {
     zls = {
@@ -31,7 +33,35 @@
     };
   };
 
-  cfg = config.vim.languages.zig;
+  # TODO: dap.adapter.lldb is duplicated when enabling the
+  # vim.languages.clang.dap module. This does not cause
+  # breakage... but could be cleaner.
+  defaultDebugger = "lldb-vscode";
+  debuggers = {
+    lldb-vscode = {
+      package = pkgs.lldb;
+      dapConfig = ''
+        dap.adapters.lldb = {
+          type = 'executable',
+          command = '${cfg.dap.package}/bin/lldb-dap',
+          name = 'lldb'
+        }
+        dap.configurations.zig = {
+          {
+            name = 'Launch',
+            type = 'lldb',
+            request = 'launch',
+            program = function()
+              return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
+            end,
+            cwd = "''${workspaceFolder}",
+            stopOnEntry = false,
+            args = {},
+          },
+        }
+      '';
+    };
+  };
 in {
   options.vim.languages.zig = {
     enable = mkEnableOption "Zig language support";
@@ -56,6 +86,26 @@ in {
         default = pkgs.zls;
       };
     };
+
+    dap = {
+      enable = mkOption {
+        type = bool;
+        default = config.vim.languages.enableDAP;
+        description = "Enable Zig Debug Adapter";
+      };
+
+      debugger = mkOption {
+        type = enum (attrNames debuggers);
+        default = defaultDebugger;
+        description = "Zig debugger to use";
+      };
+
+      package = mkOption {
+        type = package;
+        default = debuggers.${cfg.dap.debugger}.package;
+        description = "Zig debugger package.";
+      };
+    };
   };
 
   config = mkIf cfg.enable (mkMerge [
@@ -77,5 +127,12 @@ in {
         globals.zig_fmt_autosave = mkDefault 0;
       };
     })
+
+    (mkIf cfg.dap.enable {
+      vim = {
+        debugger.nvim-dap.enable = true;
+        debugger.nvim-dap.sources.zig-debugger = debuggers.${cfg.dap.debugger}.dapConfig;
+      };
+    })
   ]);
 }

From 9a9340960609a25762379113f6634c317decffc6 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 19 Jan 2025 20:26:52 +0300
Subject: [PATCH 128/202] lsp/lightbulb: cleanup; modularize autocommand
 behaviour

---
 docs/release-notes/rl-0.8.md                | 16 +++++++++---
 modules/plugins/lsp/lightbulb/config.nix    | 27 +++++++++++++++++----
 modules/plugins/lsp/lightbulb/lightbulb.nix | 22 +++++++++++++++--
 3 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index b06a071f..f5e9d0a0 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -31,6 +31,12 @@
   your Editorconfig configuration, or use an autocommand to set indentation
   values for buffers with the Nix filetype.
 
+- Add [](#opt-vim.lsp.lightbulb.autocmd.enable) for manually managing the
+  previously managed lightbulb autocommand.
+  - A warning will occur if [](#opt-vim.lsp.lightbulb.autocmd.enable) and
+    `vim.lsp.lightbulb.setupOpts.autocmd.enabled` are both set at the same time.
+    Pick only one.
+
 [amadaluzia](https://github.com/amadaluzia):
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
@@ -59,7 +65,8 @@
 - Add `vim.snippets.luasnip.setupOpts`, which was previously missing.
 - Add `"prettierd"` as a formatter option in
   `vim.languages.markdown.format.type`.
-- Add the following plugins from [mini.nvim](https://github.com/echasnovski/mini.nvim)
+- Add the following plugins from
+  [mini.nvim](https://github.com/echasnovski/mini.nvim)
   - `mini.ai`
   - `mini.align`
   - `mini.animate`
@@ -102,7 +109,8 @@
   - `mini.trailspace`
   - `mini.visits`
 - Add [fzf-lua](https://github.com/ibhagwan/fzf-lua) in `vim.fzf-lua`
-- Add [rainbow-delimiters](https://github.com/HiPhish/rainbow-delimiters.nvim) in `vim.visuals.rainbow-delimiters`
+- Add [rainbow-delimiters](https://github.com/HiPhish/rainbow-delimiters.nvim)
+  in `vim.visuals.rainbow-delimiters`
 - Add options to define highlights under [](#opt-vim.highlight)
 
 [kaktu5](https://github.com/kaktu5):
@@ -125,5 +133,5 @@
 
 [ARCIII](https://github.com/ArmandoCIII):
 
-- Add `vim.languages.zig.dap` support through pkgs.lldb dap adapter.
-  Code Inspiration from `vim.languages.clang.dap` implementation.
+- Add `vim.languages.zig.dap` support through pkgs.lldb dap adapter. Code
+  Inspiration from `vim.languages.clang.dap` implementation.
diff --git a/modules/plugins/lsp/lightbulb/config.nix b/modules/plugins/lsp/lightbulb/config.nix
index f17b8ad9..17e740ad 100644
--- a/modules/plugins/lsp/lightbulb/config.nix
+++ b/modules/plugins/lsp/lightbulb/config.nix
@@ -4,6 +4,7 @@
   ...
 }: let
   inherit (lib.modules) mkIf;
+  inherit (lib.strings) optionalString;
   inherit (lib.nvim.dag) entryAnywhere;
   inherit (lib.nvim.lua) toLuaObject;
 
@@ -12,13 +13,29 @@ in {
   config = mkIf (cfg.enable && cfg.lightbulb.enable) {
     vim = {
       startPlugins = ["nvim-lightbulb"];
-
       pluginRC.lightbulb = entryAnywhere ''
-        vim.api.nvim_command('autocmd CursorHold,CursorHoldI * lua require\'nvim-lightbulb\'.update_lightbulb()')
-
-        -- Enable trouble diagnostics viewer
-        require'nvim-lightbulb'.setup(${toLuaObject cfg.lightbulb.setupOpts})
+        local nvim_lightbulb = require("nvim-lightbulb")
+        nvim_lightbulb.setup(${toLuaObject cfg.lightbulb.setupOpts})
+        ${optionalString cfg.lightbulb.autocmd.enable ''
+          vim.api.nvim_create_autocmd(${toLuaObject cfg.lightbulb.autocmd.events}, {
+            pattern = ${toLuaObject cfg.lightbulb.autocmd.pattern},
+            callback = function()
+              nvim_lightbulb.update_lightbulb()
+            end,
+          })
+        ''}
       '';
     };
+
+    warnings = [
+      # This could have been an assertion, but the chances of collision is very low and asserting here
+      # might be too dramatic. Let's only warn the user, *in case* this occurs and is not intended. No
+      # error will be thrown if 'lightbulb.setupOpts.autocmd.enable' has not been set by the user.
+      (mkIf (cfg.lightbulb.autocmd.enable -> (cfg.lightbulb.setupOpts.autocmd.enabled or false)) ''
+        Both 'vim.lsp.lightbulb.autocmd.enable' and 'vim.lsp.lightbulb.setupOpts.autocmd.enable' are set
+        simultaneously. This might have performance implications due to frequent updates. Please set only
+        one option to handle nvim-lightbulb autocmd.
+      '')
+    ];
   };
 }
diff --git a/modules/plugins/lsp/lightbulb/lightbulb.nix b/modules/plugins/lsp/lightbulb/lightbulb.nix
index 4341cac6..012d54aa 100644
--- a/modules/plugins/lsp/lightbulb/lightbulb.nix
+++ b/modules/plugins/lsp/lightbulb/lightbulb.nix
@@ -1,11 +1,29 @@
 {lib, ...}: let
-  inherit (lib.options) mkEnableOption;
-  inherit (lib.nvim.types) mkPluginSetupOption;
+  inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.types) listOf str either;
+  inherit (lib.nvim.types) mkPluginSetupOption luaInline;
 in {
   options.vim.lsp = {
     lightbulb = {
       enable = mkEnableOption "Lightbulb for code actions. Requires an emoji font";
       setupOpts = mkPluginSetupOption "nvim-lightbulb" {};
+      autocmd = {
+        enable = mkEnableOption "updating lightbulb glyph automatically" // {default = true;};
+        events = mkOption {
+          type = listOf str;
+          default = ["CursorHold" "CursorHoldI"];
+          description = "Events on which to update nvim-lightbulb glyphs";
+        };
+
+        pattern = mkOption {
+          type = either str luaInline;
+          default = "*";
+          description = ''
+            File patterns or buffer names to match, determining which files or buffers trigger
+            glyph updates.
+          '';
+        };
+      };
     };
   };
 }

From a5b7b17947e42d3a990d2db8361d794987b1d963 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 25 Jan 2025 17:21:08 +0300
Subject: [PATCH 129/202] docs: improve manpages; mention helpful utilities

---
 docs/man/header.5 | 15 +++++++++------
 docs/man/nvf.1    | 41 ++++++++++++++++++++++++++++++-----------
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/docs/man/header.5 b/docs/man/header.5
index a28fc3dd..556a113a 100644
--- a/docs/man/header.5
+++ b/docs/man/header.5
@@ -1,13 +1,16 @@
-.TH "nvf" "5" "01/01/1980" "nvf"
+.TH "nvf" "5" "January 1, 1980" "nvf"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
 .\" enable line breaks after slashes
 .cflags 4 /
+
 .SH "NAME"
-nvf configuration specification
-.SH "OPTIONS"
-.PP
-You can use the following options to configure nvf:
-.PP
+nvf \- Configuration specification for the nvf.
+
+.SH "DESCRIPTION"
+The nvf configuration specification provides a declarative structure for configuring Neovim using Nix with few
+lines of Nix. This document outlines the available options and their usage to create modular, reusable, and
+reproducible configurations using nvf's module system options. For tips, tricks and possible quirks with available
+plugins please visit https://notashelf.github.io/nvf/
diff --git a/docs/man/nvf.1 b/docs/man/nvf.1
index 0f1e36dc..d7519651 100644
--- a/docs/man/nvf.1
+++ b/docs/man/nvf.1
@@ -1,5 +1,5 @@
 .Dd January 1, 1980
-.Dt nvf 1
+.Dt NVF 1
 .Os nvf
 .\" disable hyphenation
 .nh
@@ -7,27 +7,46 @@
 .ad l
 .\" enable line breaks after slashes
 .cflags 4 /
+
 .Sh NAME
 .Nm nvf
-.Nd A highly modular, extensible and distro-agnostic Neovim configuration framework for Nix/NixOS.
-.
+.Nd A modular, extensible, and distro-agnostic Neovim configuration framework for Nix/NixOS.
+
+.Sh DESCRIPTION
+.Nm nvf
+is a highly modular, configurable, extensible, and easy-to-use Neovim configuration in Nix.
+Designed for flexibility and ease of use, nvf allows you to easily configure your fully featured
+Neovim instance with a few lines of Nix.
+
+.Sh COMMANDS
+The following commands are bundled with nvf to allow easier debugging of your configuration.
+
+.Bl -tag -width Ds
+.It Nm nvf-print-config
+Outputs the full configuration of the current `nvf` setup. This command is useful for debugging
+or inspecting the applied configuration.
+.Pp
+.It Nm nvf-print-config-path
+Prints the file path to the configuration file currently in use. This command is helpful for locating
+the source configuration file for troubleshooting or easily sharing it via online paste utilities.
+.El
+
 .Sh BUGS
 .Pp
-Please report any bugs that you might encounter on the
-\m[blue]\fBproject issue tracker\fR\m[]\&.
+Please report any bugs on the project issue tracker:
+.Lk https://github.com/notashelf/nvf/issues
 
 .Sh SEE ALSO
 .Pp
-\fBnvf\fR(5)
+.Fn nvf 5
 
 .Sh AUTHOR
 .Pp
-\fBnvf contributors\fR
+.Fn nvf contributors
 .RS 4
-Author.
+Primary contributors and maintainers of the project.
 .RE
 
 .Sh COPYRIGHT
-.br
-Copyright \(co 2023\(en2024 nvf contributors
-.br
+.Pp
+Copyright (c) 2023–2025 nvf contributors.

From 0fbcf1ca6f6bb6eb7b2aa779559c294d8b0b9951 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 26 Jan 2025 13:45:58 +0300
Subject: [PATCH 130/202] utility/yanky-nvim: init

---
 configuration.nix                             |  1 +
 docs/release-notes/rl-0.8.md                  |  4 +++
 flake.lock                                    | 17 ++++++++++
 flake.nix                                     |  5 +++
 modules/plugins/utility/default.nix           | 18 +++++------
 modules/plugins/utility/yanky-nvim/config.nix | 32 +++++++++++++++++++
 .../plugins/utility/yanky-nvim/default.nix    |  6 ++++
 .../plugins/utility/yanky-nvim/yanky-nvim.nix | 28 ++++++++++++++++
 8 files changed, 102 insertions(+), 9 deletions(-)
 create mode 100644 modules/plugins/utility/yanky-nvim/config.nix
 create mode 100644 modules/plugins/utility/yanky-nvim/default.nix
 create mode 100644 modules/plugins/utility/yanky-nvim/yanky-nvim.nix

diff --git a/configuration.nix b/configuration.nix
index 2159edc8..594e292f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -175,6 +175,7 @@ isMaximal: {
       icon-picker.enable = isMaximal;
       surround.enable = isMaximal;
       diffview-nvim.enable = true;
+      yanky-nvim.enable = false;
       motion = {
         hop.enable = true;
         leap.enable = true;
diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index f5e9d0a0..661aee1d 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -4,6 +4,7 @@
 
 [typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim
 [render-markdown.nvim]: https://github.com/MeanderingProgrammer/render-markdown.nvim
+[yanky.nvim]: https://github.com/gbprod/yanky.nvim
 
 - Add [typst-preview.nvim] under
   `languages.typst.extensions.typst-preview-nvim`.
@@ -33,10 +34,13 @@
 
 - Add [](#opt-vim.lsp.lightbulb.autocmd.enable) for manually managing the
   previously managed lightbulb autocommand.
+
   - A warning will occur if [](#opt-vim.lsp.lightbulb.autocmd.enable) and
     `vim.lsp.lightbulb.setupOpts.autocmd.enabled` are both set at the same time.
     Pick only one.
 
+- Add [yanky.nvim] to available plugins, under `vim.utility.yanky-nvim`.
+
 [amadaluzia](https://github.com/amadaluzia):
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
diff --git a/flake.lock b/flake.lock
index ee19b7c8..2b0136fd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2761,6 +2761,22 @@
         "type": "github"
       }
     },
+    "plugin-yanky-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1737126873,
+        "narHash": "sha256-Gt8kb6sZoNIM2SDWUPyAF5Tw99qMZl+ltUCfyMXgJsU=",
+        "owner": "gbprod",
+        "repo": "yanky.nvim",
+        "rev": "d2696b30e389dced94d5acab728f524a25f308d2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gbprod",
+        "repo": "yanky.nvim",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -2934,6 +2950,7 @@
         "plugin-vim-repeat": "plugin-vim-repeat",
         "plugin-vim-startify": "plugin-vim-startify",
         "plugin-which-key": "plugin-which-key",
+        "plugin-yanky-nvim": "plugin-yanky-nvim",
         "systems": "systems_2"
       }
     },
diff --git a/flake.nix b/flake.nix
index 5d4728f6..52635132 100644
--- a/flake.nix
+++ b/flake.nix
@@ -590,6 +590,11 @@
       flake = false;
     };
 
+    plugin-yanky-nvim = {
+      url = "github:gbprod/yanky.nvim";
+      flake = false;
+    };
+
     # Note-taking
     plugin-obsidian-nvim = {
       url = "github:epwalsh/obsidian.nvim";
diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix
index 8b25ea8f..65ef8680 100644
--- a/modules/plugins/utility/default.nix
+++ b/modules/plugins/utility/default.nix
@@ -1,19 +1,19 @@
 {
   imports = [
-    ./outline
     ./binds
     ./ccc
+    ./diffview
+    ./fzf-lua
     ./gestures
-    ./motion
-    ./new-file-template
-    ./telescope
     ./icon-picker
     ./images
-    ./telescope
-    ./diffview
-    ./wakatime
-    ./surround
+    ./motion
+    ./new-file-template
+    ./outline
     ./preview
-    ./fzf-lua
+    ./surround
+    ./telescope
+    ./wakatime
+    ./yanky-nvim
   ];
 }
diff --git a/modules/plugins/utility/yanky-nvim/config.nix b/modules/plugins/utility/yanky-nvim/config.nix
new file mode 100644
index 00000000..138fd07d
--- /dev/null
+++ b/modules/plugins/utility/yanky-nvim/config.nix
@@ -0,0 +1,32 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.lists) optionals concatLists;
+  inherit (lib.nvim.lua) toLuaObject;
+  inherit (lib.nvim.dag) entryAnywhere;
+
+  cfg = config.vim.utility.yanky-nvim;
+  usingSqlite = cfg.setupOpts.ring.storage == "sqlite";
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      # TODO: this could probably be lazyloaded. I'm not yet sure which event is
+      # ideal, so it's loaded normally for now.
+      startPlugins = concatLists [
+        ["yanky-nvim"]
+
+        # If using the sqlite backend, sqlite-lua must be loaded
+        # alongside yanky.
+        (optionals usingSqlite [pkgs.vimPlugins.sqlite-lua])
+      ];
+
+      pluginRC.yanky-nvim = entryAnywhere ''
+        require("yanky").setup(${toLuaObject cfg.setupOpts});
+      '';
+    };
+  };
+}
diff --git a/modules/plugins/utility/yanky-nvim/default.nix b/modules/plugins/utility/yanky-nvim/default.nix
new file mode 100644
index 00000000..05cb2bea
--- /dev/null
+++ b/modules/plugins/utility/yanky-nvim/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./config.nix
+    ./yanky-nvim.nix
+  ];
+}
diff --git a/modules/plugins/utility/yanky-nvim/yanky-nvim.nix b/modules/plugins/utility/yanky-nvim/yanky-nvim.nix
new file mode 100644
index 00000000..95d6a211
--- /dev/null
+++ b/modules/plugins/utility/yanky-nvim/yanky-nvim.nix
@@ -0,0 +1,28 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.types) enum;
+in {
+  options.vim.utility.yanky-nvim = {
+    enable = mkEnableOption ''
+      improved Yank and Put functionalities for Neovim  [yanky-nvim]
+    '';
+
+    setupOpts = {
+      ring.storage = mkOption {
+        type = enum ["shada" "sqlite" "memory"];
+        default = "shada";
+        example = "sqlite";
+        description = ''
+          storage mode for ring values.
+
+          - shada: this will save pesistantly using Neovim ShaDa feature.
+            This means that history will be persisted between each session of Neovim.
+          - memory: each Neovim instance will have his own history and it will be
+            lost between sessions.
+          - sqlite: more reliable than `shada`, requires `sqlite.lua` as a dependency.
+            nvf will add this dependency to `PATH` automatically.
+        '';
+      };
+    };
+  };
+}

From ee89d9d5bc441dcb5de6068450d53275b852d9e5 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 30 Jan 2025 14:12:58 +0300
Subject: [PATCH 131/202] flake: bump rustaceanvim

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

diff --git a/flake.lock b/flake.lock
index 2b0136fd..81738ba6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2460,11 +2460,11 @@
     "plugin-rustaceanvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1735431742,
-        "narHash": "sha256-ucZXGbxHtbSKf5n11lL3vb6rD2BxJacIDOgcx32PLzA=",
+        "lastModified": 1738187731,
+        "narHash": "sha256-Z4aCPO4MR0Q2ZojT6YBGSa8fb7u5Nd+4Z/rekqhXqDY=",
         "owner": "mrcjkb",
         "repo": "rustaceanvim",
-        "rev": "51c097ebfb65d83baa71f48000b1e5c0a8dcc4fb",
+        "rev": "4a2f2d2cc04f5b0aa0981f98bb7d002c898318ad",
         "type": "github"
       },
       "original": {

From e5f6aa23ea63dcbf6c918157cf5b9c818286e958 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 31 Jan 2025 01:19:48 +0300
Subject: [PATCH 132/202] flake: change nvim-colorizer URL to the new repo

---
 flake.lock | 10 +++++-----
 flake.nix  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 81738ba6..8e5a40d7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1836,15 +1836,15 @@
     "plugin-nvim-colorizer-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1735384185,
-        "narHash": "sha256-quqs3666vQc/4ticc/Z5BHzGxV6UUVE9jVGT07MEMQQ=",
-        "owner": "NvChad",
+        "lastModified": 1738229011,
+        "narHash": "sha256-IEgZnIUeNXRKZ4eV1+KknluyKZj68HBWe1EW+LueuGA=",
+        "owner": "catgoose",
         "repo": "nvim-colorizer.lua",
-        "rev": "8a65c448122fc8fac9c67b2e857b6e830a4afd0b",
+        "rev": "9b5fe0450bfb2521c6cea29391e5ec571f129136",
         "type": "github"
       },
       "original": {
-        "owner": "NvChad",
+        "owner": "catgoose",
         "repo": "nvim-colorizer.lua",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 52635132..eb7f5904 100644
--- a/flake.nix
+++ b/flake.nix
@@ -645,7 +645,7 @@
     };
 
     plugin-nvim-colorizer-lua = {
-      url = "github:NvChad/nvim-colorizer.lua";
+      url = "github:catgoose/nvim-colorizer.lua";
       flake = false;
     };
 

From 944327329712eda9eec8a86a972e0abd7ea368e6 Mon Sep 17 00:00:00 2001
From: Etherbloom <etherbloom+github@mailbox.org>
Date: Sun, 2 Feb 2025 15:02:26 +0100
Subject: [PATCH 133/202] languages/ts: register javascript with prettier
 formatter (#595)

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

diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix
index 2530d352..50e6d91c 100644
--- a/modules/plugins/languages/ts.nix
+++ b/modules/plugins/languages/ts.nix
@@ -82,7 +82,7 @@
           ls_sources,
           null_ls.builtins.formatting.prettier.with({
             command = "${cfg.format.package}/bin/prettier",
-            filetypes = { "typescript" },
+            filetypes = { "typescript", "javascript" },
           })
         )
       '';

From 90abd270a68f8de59363ff8c63dcc7e7d561f92c Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 28 Jan 2025 16:17:02 +0300
Subject: [PATCH 134/202] meta: include hacking guidelines in PR template

---
 .../pull_request_template.md                    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
index b2a26919..66fe9c0f 100644
--- a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
+++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
@@ -7,14 +7,17 @@ or dependency in this section.
 If your pull request aims to fix an open issue or a please bug, please also link the relevant issue
 below this line. You may attach an issue to your pull request with `Fixes #<issue number>` outside
 this comment, and it will be closed when your pull request is merged.
+
+A developer package template is provided in flake/develop.nix. If working on a module, you may use
+it to test your changes with minimal dependency changes.
 -->
 
 ## Sanity Checking
 
 <!--
 Please check all that apply. As before, this section is not a hard requirement but checklists with more checked
-items are likely to be merged faster. You may save some time in maintainer review by performing self-reviews here
-before submitting your pull request.
+items are likely to be merged faster. You may save some time in maintainer reviews by performing self-reviews
+here before submitting your pull request.
 
 If your pull request includes any change or unexpected behaviour not covered below, please do make sure to include
 it above in your description.
@@ -22,9 +25,11 @@ it above in your description.
 
 [editorconfig]: https://editorconfig.org
 [changelog]: https://github.com/NotAShelf/nvf/tree/main/docs/release-notes
+[hacking nvf]: https://notashelf.github.io/nvf/index.xhtml#sec-guidelines
 
 - [ ] I have updated the [changelog] as per my changes
 - [ ] I have tested, and self-reviewed my code
+- [ ] My changes fit guidelines found in [hacking nvf]
 - Style and consistency
   - [ ] I ran **Alejandra** to format my code (`nix fmt`)
   - [ ] My code conforms to the [editorconfig] configuration of the project
@@ -34,9 +39,10 @@ it above in your description.
   - [ ] I have added a section in the manual
   - [ ] _(For breaking changes)_ I have included a migration guide
 - Package(s) built:
-  - [ ] `.#nix` (default package)
+  - [ ] `.#nix` _(default package)_
   - [ ] `.#maximal`
-  - [ ] `.#docs-html` (manual, must build)
+  - [ ] `.#docs-html` _(manual, must build)_
+  - [ ] `.#docs-linkcheck` _(optional, please build if adding links)_
 - Tested on platform(s)
   - [ ] `x86_64-linux`
   - [ ] `aarch64-linux`
@@ -46,7 +52,8 @@ it above in your description.
 <!--
 If your changes touch upon a portion of the codebase that you do not understand well, please make sure to consult
 the maintainers on your changes. In most cases, making an issue before creating your PR will help you avoid duplicate
-efforts in the long run.
+efforts in the long run. `git blame` might help you find out who is the "author" or the "maintainer" of a current
+module by showing who worked on it the most.
 -->
 
 ---

From 7b886c98795147464ab69e55d0d19ce4653c773f Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 28 Jan 2025 16:17:52 +0300
Subject: [PATCH 135/202] docs/options: mention manpages for offline viewing

---
 docs/manual/options.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/manual/options.md b/docs/manual/options.md
index 3b70484f..b386347d 100644
--- a/docs/manual/options.md
+++ b/docs/manual/options.md
@@ -4,6 +4,10 @@ Below are the module options provided by nvf, in no particular order. Most
 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.
+
 <!--
 In the manual, individual options may be referenced in Hyperlinks as follows:
 [](#opt-vim.*) If changing the prefix here, do keep in mind the #opt- suffix will have

From 91df9c81c4c42579c1e58e411e21e67d8d7eea2a Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 1 Feb 2025 06:52:27 +0300
Subject: [PATCH 136/202] manual/tips: init pure-lua configuration

---
 docs/manual/tips/lua-configuration.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 docs/manual/tips/lua-configuration.md

diff --git a/docs/manual/tips/lua-configuration.md b/docs/manual/tips/lua-configuration.md
new file mode 100644
index 00000000..fe88b9f2
--- /dev/null
+++ b/docs/manual/tips/lua-configuration.md
@@ -0,0 +1,7 @@
+# Lua Configuration {#sec-lua-configuration}
+
+It is not understandable that not everyone is comfortable using Nix for their
+configurations, or that some users might want to bring their previous Neovim
+configurations along while migrating. nvf offers multiple ways of using Lua for
+your configurations, including a way to re-use your imperative Neovim
+configuration.

From faea8c1900466ab7b0a7047b9e55ee7360c975a2 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 3 Feb 2025 11:11:04 +0300
Subject: [PATCH 137/202] meta: specify indentation for json files

---
 .editorconfig | 2 +-
 release.json  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 43456223..c92fdf7f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,7 +14,7 @@ indent_style = space
 indent_size = 2
 trim_trailing_whitespace = false
 
-[*.{js,nix,yml,yaml}]
+[*.{js,json,nix,yml,yaml}]
 indent_style = space
 indent_size = 2
 tab_width = 2
diff --git a/release.json b/release.json
index a80b41ea..1de9e327 100644
--- a/release.json
+++ b/release.json
@@ -1,4 +1,4 @@
 {
-	"release": "v0.8",
-	"isReleaseBranch": false
+  "release": "v0.8",
+  "isReleaseBranch": false
 }

From 2c2c714f8e1188261679238708c6e0fa7735e4f5 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 3 Feb 2025 11:14:55 +0300
Subject: [PATCH 138/202] meta: reword demo disclaimer in `configuration.nix`

---
 configuration.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 594e292f..15138a2b 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,6 +1,7 @@
 # This is the sample configuration for nvf, aiming to give you a feel of the default options
-# while certain plugins are enabled. While it may act as one, this is not an overview of nvf's
-# module options. To find a complete overview of nvf's options and examples, visit the manual.
+# while certain plugins are enabled. While it may partially act as one, this is *not* quite
+# an overview of nvf's module options. To find a complete and curated list of nvf module
+# options, examples, instruction tutorials and more; please visit the online manual.
 # https://notashelf.github.io/nvf/options.html
 isMaximal: {
   config.vim = {

From ef1fa6bf2551e260b05f913610ecacaebe8262d5 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 3 Feb 2025 11:15:32 +0300
Subject: [PATCH 139/202] flake/packages: fix wrapped `docs-html` package

---
 flake/packages.nix | 62 ++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/flake/packages.nix b/flake/packages.nix
index cf1f81ac..7abe5ec0 100644
--- a/flake/packages.nix
+++ b/flake/packages.nix
@@ -19,9 +19,11 @@
       in
         pkgs.testers.lycheeLinkCheck {
           inherit site;
+
           remap = {
             "https://notashelf.github.io/nvf/" = site;
           };
+
           extraConfig = {
             exclude = [];
             include_mail = true;
@@ -29,43 +31,39 @@
           };
         };
 
-      # Build and open the built manual in your system browser
-      docs-html-wrapped = pkgs.writeScriptBin "docs-html-wrapped" ''
-        #!${pkgs.stdenv.shell}
-        # use xdg-open to open the docs in the browser
-        ${pkgs.xdg-utils}/bin/xdg-open ${docs.manual.html}
-      '';
+      # Helper utility for building the HTML manual and opening it in the
+      # browser with $BROWSER or using xdg-open as a fallback tool.
+      # Adapted from Home-Manager, available under the MIT license.
+      docs-html-wrapped = let
+        xdg-open = lib.getExe' pkgs.xdg-utils "xdg-open";
+        docs-html = docs.manual.html + /share/doc/nvf;
+      in
+        pkgs.writeShellScriptBin "docs-html-wrapped" ''
+          set -euo pipefail
+
+          if [[ ! -v BROWSER || -z $BROWSER ]]; then
+            for candidate in xdg-open open w3m; do
+            BROWSER="$(type -P $candidate || true)"
+              if [[ -x $BROWSER ]]; then
+                break;
+              fi
+            done
+          fi
+
+          if [[ ! -v BROWSER || -z $BROWSER ]]; then
+            echo "$0: unable to start a web browser; please set \$BROWSER"
+            echo "$0: Trying xdg-open as a fallback"
+            ${xdg-open} ${docs-html}/index.xhtml
+          else
+            echo "\$BROWSER is set. Attempting to open manual"
+            exec "$BROWSER" "${docs-html}/index.xhtml"
+          fi
+        '';
 
       # Exposed neovim configurations
       nix = config.legacyPackages.neovim-nix;
       maximal = config.legacyPackages.neovim-maximal;
       default = config.legacyPackages.neovim-nix;
-
-      # Published docker images
-      docker-nix = let
-        inherit (pkgs) bash gitFull buildEnv;
-        inherit (config.legacyPackages) neovim-nix;
-      in
-        pkgs.dockerTools.buildImage {
-          name = "nvf";
-          tag = "latest";
-
-          copyToRoot = buildEnv {
-            name = "neovim-root";
-            pathsToLink = ["/bin"];
-            paths = [
-              neovim-nix
-              gitFull
-              bash
-            ];
-          };
-
-          config = {
-            Cmd = ["${neovim-nix}/bin/nvim"];
-            WorkingDir = "/home/neovim/demo";
-            Volumes = {"/home/neovim/demo" = {};};
-          };
-        };
     };
   };
 }

From 9f1bd7fb35ed8c03211840f8c8332f0bbcf5fca1 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 3 Feb 2025 14:43:59 +0300
Subject: [PATCH 140/202] docs/tips: document pure-lua/hybrid setups

---
 docs/manual/tips.md                 |  1 +
 docs/manual/tips/debugging-nvf.md   |  6 +++
 docs/manual/tips/pure-lua-config.md | 61 +++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 docs/manual/tips/pure-lua-config.md

diff --git a/docs/manual/tips.md b/docs/manual/tips.md
index 0d2637f1..6e6dc9c2 100644
--- a/docs/manual/tips.md
+++ b/docs/manual/tips.md
@@ -1,6 +1,7 @@
 # Helpful Tips {#ch-helpful-tips}
 
 ```{=include=} chapters
+tips/pure-lua-config.md
 tips/debugging-nvf.md
 tips/offline-docs.md
 ```
diff --git a/docs/manual/tips/debugging-nvf.md b/docs/manual/tips/debugging-nvf.md
index a642b0a7..ed0214ae 100644
--- a/docs/manual/tips/debugging-nvf.md
+++ b/docs/manual/tips/debugging-nvf.md
@@ -17,3 +17,9 @@ nvf-print-config | bat --language=lua
 ```
 
 Alternatively, `cat` or `less` may also be used.
+
+## Accessing `neovimConfig` {#sec-accessing-config}
+
+It is also possible to access the configuration for the wrapped package. The
+_built_ Neovim package will contain a `neovimConfig` attribute in its
+`passthru`.
diff --git a/docs/manual/tips/pure-lua-config.md b/docs/manual/tips/pure-lua-config.md
new file mode 100644
index 00000000..f31d4220
--- /dev/null
+++ b/docs/manual/tips/pure-lua-config.md
@@ -0,0 +1,61 @@
+# Pure Lua Configuration {#pure-lua-config}
+
+We recognize that you might not always want to configure your setup purely in
+Nix, sometimes doing things in Lua is simply the "superior" option. In such a
+case you might want to configure your Neovim instance using Lua, and nothing but
+Lua. It is also possible to mix Lua and Nix configurations through the following
+method.
+
+## Custom Configuration Directory {#custom-config-dir}
+
+[Neovim 0.9]: https://github.com/neovim/neovim/pull/22128
+
+As of [Neovim 0.9], `$NVIM_APPNAME` is a variable expected by Neovim to decide
+on the configuration directory. nvf sets this variable as `"nvf"`, meaning
+`~/.config/nvf` will be regarded as _the_ configuration directory by Neovim,
+similar to how `~/.config/nvim` behaves in regular installations. This allows
+some degree[^1] of Lua configuration, backed by our low-level wrapper
+[mnw](https://github.com/Gerg-L/mnw). Creating a `lua/` directory located in
+`$NVIM_APPNAME` ("nvf" by default) and placing your configuration in, e.g.,
+`~/.config/nvf/lua/myconfig` will allow you to `require` it as a part of the Lua
+module system through nvf's module system.
+
+Let's assume your `~/.config/nvf/lua/myconfig/init.lua` consists of the
+following:
+
+```lua
+vim.keymap.set("n", " ", "<Nop>", { silent = true, remap = false })
+vim.g.mapleader = " "
+```
+
+The following Nix configuration via [](#opt-vim.luaConfigRC) will allow loading
+this
+
+```nix
+{
+  # The attribute name "myconfig-dir" here is arbitrary. It is required to be
+  # a *named* attribute by the DAG system, but the name is entirely up to you.
+  vim.luaConfigRC.myconfig-dir = ''
+    require("myconfig")
+
+    -- Any additional Lua
+  '';
+}
+```
+
+[DAG system]: https://notashelf.github.io/nvf/index.xhtml#ch-using-dags
+
+After you load your custom configuration, you may use an `init.lua` located in
+your custom configuration directory to configure Neovim exactly as you would
+without a wrapper like nvf. If you want to place your `require` call in a
+specific position (i.e., before or after options you set in nvf) the
+[DAG system] will let you place your configuration in a location of your
+choosing.
+
+[top-level DAG system]: https://notashelf.github.io/nvf/index.xhtml#ch-vim-luaconfigrc
+
+[^1]: You might sometimes face "overrides" set by nvf. Those should be very
+    rare, and almost always exclusive to `vim.globals` or `vim.options`. In such
+    a case, simply placing the `require` call for your configuration _after_
+    `optionsScript` in the [top-level DAG system] will allow you to override
+    previous options.

From a26e93c410c1e1f3d6b2b16d7e043b5ead597544 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 3 Feb 2025 14:45:45 +0300
Subject: [PATCH 141/202] docs/README: mention pure-lua/hybrid configurations
 in intro

---
 .github/README.md                     | 66 ++++++++++++++++++++-------
 docs/manual/tips/lua-configuration.md |  7 ---
 2 files changed, 49 insertions(+), 24 deletions(-)
 delete mode 100644 docs/manual/tips/lua-configuration.md

diff --git a/.github/README.md b/.github/README.md
index 9a059419..e873d12d 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -67,6 +67,9 @@
 [standalone]: https://notashelf.github.io/nvf/index.xhtml#ch-standalone-installation
 [NixOS module]: https://notashelf.github.io/nvf/index.xhtml#ch-standalone-nixos
 [Home-Manager module]: https://notashelf.github.io/nvf/index.xhtml#ch-standalone-hm
+[release notes]: https://notashelf.github.io/nvf/release-notes.html
+[discussions tab]: https://github.com/notashelf/nvf/discussions
+[FAQ section]: #frequently-asked-questions
 
 - **Simple**: One language to rule them all! Use Nix to configure everything,
   with optional Lua support for robust configurability!
@@ -79,11 +82,27 @@
   customizable through the Nix module system.
   - Not comfortable with a full-nix config or want to bring your Lua config? You
     can do just that, no unnecessary restrictions.
-  - Lazyloading? We got it! Lazyload both internal and external plugins at will.
+  - Lazyloading 💤? We got it! Lazyload both internal and external plugins at
+    will.
+  - nvf exposes everything you need to avoid a vendor lock-in. Which means you
+    can add new modules, plugins and so on without relying on us adding a module
+    for them! Though, of course, feel free to request them.
+  - Use plugins from anywhere.
 - **Well-documented**: Documentation is priority. You will _never_ face
   undocumented, obscure behaviour.
+  - Changes, breaking or otherwise, will be communicated in the [release notes]
+  - Refer to the [FAQ section] for answers to common questions. Your question
+    not there? Head to the to the [discussions tab]!
 - **Idiomatic**: nvf does things ✨ _the right way_ ✨ - the codebase is, and
   will, remain maintainable for myself and any contributors.
+- **Community-Led**: we would like nvf to be fully capable of accomplishing what
+  you really want it to do. If you have a use case that is not made possible by
+  nvf, please open an issue (or a pull request!)
+  - Your feedback is more than welcome! Feedback is what _drives_ nvf forward.
+    If you have anything to say, or ask, please let us know.
+  - Pull requests are _always_ welcome. If you think the project can benefit
+    from something you did locally, but are not quite sure how to upstream,
+    please feel free to contact us! We'll help you get it done.
 
 ## Get Started
 
@@ -173,36 +192,49 @@ fix.
 [list of open pull requests]: https://github.com/NotAShelf/nvf/pulls
 
 **Q**: What platforms are supported?
-<br/> **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.
+
+**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.
 
 **Q**: Can you add _X_?
-<br/> **A**: Maybe! It is not one of our goals to support each and every Neovim
+
+**A**: Maybe! It is not one of our goals to support each and every Neovim
 plugin, however, I am always open to new modules and plugin setup additions to
 **nvf**. Use the appropriate [issue template] and I will consider a module
 addition. As mentioned before, pull requests to add new features are also
 welcome.
 
 **Q**: A plugin I need is not available in **nvf**. What to do?
-<br/> **A**: **nvf** exposes several APIs for you to be able to add your own
-plugin configurations! Please see the documentation on how you may do this.
+
+**A**: **nvf** exposes several APIs for you to be able to add your own plugin
+configurations! Please see the documentation on how you may do this.
 
 **Q**: Main branch is awfully silent, is the project dead?
-<br/> **A**: No! Sometimes we branch out (e.g. `v0.6`) to avoid breaking
-userspace and work in a separate branch until we make sure the new additions are
-implemented in the most comfortable way possible for the end user. If you have
-not noticed any activity on the main branch, consider taking a look at the
+
+**A**: No! Sometimes we branch out (e.g. `v0.6`) to avoid breaking userspace and
+work in a separate branch until we make sure the new additions are implemented
+in the most comfortable way possible for the end user. If you have not noticed
+any activity on the main branch, consider taking a look at the
 [list of branches] or the [list of open pull requests]. You may also consider
 _testing_ those release branches to get access to new features ahead of time and
 better prepare to breaking changes.
 
 **Q**: Will you support non-flake installations?
-<br/> **A**: Quite possibly. **nvf** started as "neovim-flake", which does mean
-it is and will remain flakes-first but we might consider non-flakes
-compatibility. Though keep in mind that **nvf** under non-flake environments
-would lose customizability of plugin inputs, which is one of our primary
-features.
+
+**A**: Quite possibly. **nvf** started as "neovim-flake", which does mean it is
+and will remain flakes-first but we might consider non-flakes compatibility.
+Though keep in mind that **nvf** under non-flake environments would lose
+customizability of plugin inputs, which is one of our primary features.
+
+**Q**: I prefer working with Lua, can I use nvf as a plugin manager while I use
+an imperative path (e.g., `~/.config/nvim`) for my Neovim configuration instead
+of a configuration generated from Nix?
+
+**A**: Yes! Add `"~/.config.nvim"` to `vim.additionalRuntimePaths = [ ... ]` and
+any plugins you want to load to `vim.startPlugins`. This will load your
+configuration from `~/.config/nvim`. You may still use `vim.*` to modify
+Neovim's behaviour with Nix.
 
 ## Credits
 
@@ -245,7 +277,7 @@ and everyone who has submitted issues or pull requests!
 
 ### Inspiration
 
-This configuration borrows from and is based on a few other configurations,
+This configuration borrows from, and is based on a few other configurations,
 including:
 
 - [@jordanisaacs's](https://github.com/jordanisaacs)
diff --git a/docs/manual/tips/lua-configuration.md b/docs/manual/tips/lua-configuration.md
deleted file mode 100644
index fe88b9f2..00000000
--- a/docs/manual/tips/lua-configuration.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Lua Configuration {#sec-lua-configuration}
-
-It is not understandable that not everyone is comfortable using Nix for their
-configurations, or that some users might want to bring their previous Neovim
-configurations along while migrating. nvf offers multiple ways of using Lua for
-your configurations, including a way to re-use your imperative Neovim
-configuration.

From 199babe62cc790fe08dcee0eac5e54c0c28b6eb1 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 3 Feb 2025 14:47:35 +0300
Subject: [PATCH 142/202] flake: add standalone template

---
 flake.nix                            |  2 +
 flake/templates/default.nix          | 17 ++++++++
 flake/templates/standalone/flake.nix | 64 ++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 flake/templates/default.nix
 create mode 100644 flake/templates/standalone/flake.nix

diff --git a/flake.nix b/flake.nix
index eb7f5904..a9d158a3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,8 @@
       # «https://github.com/nix-systems/nix-systems»
       systems = import inputs.systems;
       imports = [
+        ./flake/templates
+
         ./flake/apps.nix
         ./flake/legacyPackages.nix
         ./flake/overlays.nix
diff --git a/flake/templates/default.nix b/flake/templates/default.nix
new file mode 100644
index 00000000..58cd7fa7
--- /dev/null
+++ b/flake/templates/default.nix
@@ -0,0 +1,17 @@
+{
+  flake.templates = {
+    standalone = {
+      path = ./standalone;
+      description = "Standalone flake template for nvf";
+      welcomeText = ''
+        Template flake.nix has been created in flake.nix!
+
+        Note that this is a very basic example to bootstrap nvf for you. Please edit your
+        configuration as described in the nvf manual before using this template. The
+        configured packages will be ran with 'nix run .' or 'nix run .#neovimConfigured'
+
+        Happy editing!
+      '';
+    };
+  };
+}
diff --git a/flake/templates/standalone/flake.nix b/flake/templates/standalone/flake.nix
new file mode 100644
index 00000000..79617260
--- /dev/null
+++ b/flake/templates/standalone/flake.nix
@@ -0,0 +1,64 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nvf.url = "github:notashelf/nvf";
+  };
+
+  outputs = {
+    self,
+    nixpkgs,
+    ...
+  } @ inputs: let
+    # An abstraction over systems to easily provide the same package
+    # for multiple systems. This is preferable to abstraction libraries.
+    forEachSystem = nixpkgs.lib.genAttrs ["x86_64-linux"];
+  in {
+    packages = forEachSystem (system: let
+      pkgs = inputs.nixpkgs.legacyPackages.${system};
+
+      # A module to be evaluated via lib.evalModules inside nvf's module system.
+      # All options supported by nvf will go under config.vim to create the final
+      # wrapped package. You may also add some new *options* under options.* to
+      # expand the module system.
+      configModule = {
+        # You may browse available options for nvf on the online manual. Please see
+        # <https://notashelf.github.io/nvf/options.html>
+        config.vim = {
+          theme.enable = true;
+
+          # 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;
+
+            # Nix language and diagnostics.
+            nix.enable = true;
+          };
+        };
+      };
+
+      # Evaluate any and all modules to create the wrapped Neovim package.
+      neovimConfigured = inputs.nvf.lib.neovimConfiguration {
+        inherit pkgs;
+
+        modules = [
+          # Configuration module to be imported. You may define multiple modules
+          # or even import them from other files (e.g., ./modules/lsp.nix) to
+          # better modularize your configuration.
+          configModule
+        ];
+      };
+    in {
+      # Packages to be exposed under packages.<system>. Those can accessed
+      # directly from package outputs in other flakes if this flake is added
+      # as an input. You may run those packages with 'nix run .#<package>'
+      default = self.packages.${system}.neovim;
+      neovimConfigured = neovimConfigured.neovim;
+    });
+  };
+}

From c9ac830a2d89038036f99923130f02b400e7ba4f Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 3 Feb 2025 14:56:49 +0300
Subject: [PATCH 143/202] lib: filter empty/null DAGs

---
 lib/dag.nix | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/lib/dag.nix b/lib/dag.nix
index d0659fee..cbf52083 100644
--- a/lib/dag.nix
+++ b/lib/dag.nix
@@ -24,7 +24,7 @@ in {
   entryAfter, and entryBefore to a topologically sorted list of
   entries.
 
-  Internally this function uses the `toposort` function in
+  Internally this function uses the `topoSort` function in
   `<nixpkgs/lib/lists.nix>` and its value is accordingly.
 
   Specifically, the result on success is
@@ -136,16 +136,26 @@ in {
   entriesAfter = tag: entriesBetween tag [];
   entriesBefore = tag: before: entriesBetween tag before [];
 
-  # mkLuarcSection and mkVimrcSection take a section DAG
-  # and return a string containing a comment to identify
+  # mkLuarcSection takes a section DAG, containing 'name' and 'data' fields
+  # then returns a string containing a comment to identify the section, and
+  # the data contained within the section.
   # the section, and the data contained within the section
   #
-  # all operations are done without any modifications
-  # to the inputted section data
-  mkLuarcSection = section: ''
-    -- SECTION: ${section.name}
-    ${section.data}
-  '';
+  # All operations are done without any modifications to the inputted section
+  # data, but if a non-string is passed to name or data, then it will try to
+  # coerce it into a string, which may fail. Setting data to "" or null will
+  # return an empty string.
+  #
+  # section.data should never be null, though taking 'null' as a value that
+  # can "clear" the DAG might come in handy for filtering sections more easily.
+  # Or perhaps simply unsetting them from an user perspective.
+  mkLuarcSection = section:
+    if section.data == "" || section.data == null
+    then ""
+    else ''
+      -- SECTION: ${section.name}
+      ${section.data}
+    '';
 
   resolveDag = {
     name,

From 7443f0a470fb057c6ccd7a5f78370e3d9135e400 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 3 Feb 2025 15:18:27 +0300
Subject: [PATCH 144/202] docs/manual: release TOC depth

---
 docs/manual.nix                     |  2 +-
 docs/manual/options.md              |  2 +-
 docs/manual/tips/pure-lua-config.md | 21 ++++++++-------------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/docs/manual.nix b/docs/manual.nix
index 4becdf2d..50a5dab4 100644
--- a/docs/manual.nix
+++ b/docs/manual.nix
@@ -102,7 +102,7 @@ in
         --script script/anchor-use.js \
         --script script/anchor-min.js \
         --script script/search.js \
-        --toc-depth 2 \
+        --toc-depth 1 \
         --section-toc-depth 1 \
         manual.md \
         "$dest/index.xhtml"
diff --git a/docs/manual/options.md b/docs/manual/options.md
index b386347d..61282dfa 100644
--- a/docs/manual/options.md
+++ b/docs/manual/options.md
@@ -1,4 +1,4 @@
-# Neovim Flake Configuration Options {#ch-options}
+# nvf Configuration Options {#ch-options}
 
 Below are the module options provided by nvf, in no particular order. Most
 options will include useful comments, warnings or setup tips on how a module
diff --git a/docs/manual/tips/pure-lua-config.md b/docs/manual/tips/pure-lua-config.md
index f31d4220..bf84888b 100644
--- a/docs/manual/tips/pure-lua-config.md
+++ b/docs/manual/tips/pure-lua-config.md
@@ -1,4 +1,4 @@
-# Pure Lua Configuration {#pure-lua-config}
+# Pure Lua Configuration {#sec-pure-lua-config}
 
 We recognize that you might not always want to configure your setup purely in
 Nix, sometimes doing things in Lua is simply the "superior" option. In such a
@@ -6,15 +6,15 @@ case you might want to configure your Neovim instance using Lua, and nothing but
 Lua. It is also possible to mix Lua and Nix configurations through the following
 method.
 
-## Custom Configuration Directory {#custom-config-dir}
+## Custom Configuration Directory {#sec-custom-config-dir}
 
 [Neovim 0.9]: https://github.com/neovim/neovim/pull/22128
 
-As of [Neovim 0.9], `$NVIM_APPNAME` is a variable expected by Neovim to decide
-on the configuration directory. nvf sets this variable as `"nvf"`, meaning
-`~/.config/nvf` will be regarded as _the_ configuration directory by Neovim,
-similar to how `~/.config/nvim` behaves in regular installations. This allows
-some degree[^1] of Lua configuration, backed by our low-level wrapper
+As of [Neovim 0.9], {var}`$NVIM_APPNAME` is a variable expected by Neovim to
+decide on the configuration directory. nvf sets this variable as `"nvf"`,
+meaning `~/.config/nvf` will be regarded as _the_ configuration directory by
+Neovim, similar to how `~/.config/nvim` behaves in regular installations. This
+allows some degree of Lua configuration, backed by our low-level wrapper
 [mnw](https://github.com/Gerg-L/mnw). Creating a `lua/` directory located in
 `$NVIM_APPNAME` ("nvf" by default) and placing your configuration in, e.g.,
 `~/.config/nvf/lua/myconfig` will allow you to `require` it as a part of the Lua
@@ -24,6 +24,7 @@ Let's assume your `~/.config/nvf/lua/myconfig/init.lua` consists of the
 following:
 
 ```lua
+-- init.lua
 vim.keymap.set("n", " ", "<Nop>", { silent = true, remap = false })
 vim.g.mapleader = " "
 ```
@@ -53,9 +54,3 @@ specific position (i.e., before or after options you set in nvf) the
 choosing.
 
 [top-level DAG system]: https://notashelf.github.io/nvf/index.xhtml#ch-vim-luaconfigrc
-
-[^1]: You might sometimes face "overrides" set by nvf. Those should be very
-    rare, and almost always exclusive to `vim.globals` or `vim.options`. In such
-    a case, simply placing the `require` call for your configuration _after_
-    `optionsScript` in the [top-level DAG system] will allow you to override
-    previous options.

From 3843e14b3adfc2086511cd19c84aadd78322621b Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 5 Feb 2025 10:31:24 +0300
Subject: [PATCH 145/202] docs/README: mention DAGs in features section

---
 .github/README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/README.md b/.github/README.md
index e873d12d..468e5739 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -50,6 +50,7 @@
 [Contribute]: #contributing
 [FAQ]: #frequently-asked-questions
 [Credits]: #credits
+[License]: #license
 
 **[<kbd><br> Features <br></kbd>][Features]**
 **[<kbd><br> Get Started <br></kbd>][Get Started]**
@@ -70,6 +71,7 @@
 [release notes]: https://notashelf.github.io/nvf/release-notes.html
 [discussions tab]: https://github.com/notashelf/nvf/discussions
 [FAQ section]: #frequently-asked-questions
+[DAG]: https://en.wikipedia.org/wiki/Directed_acyclic_graph
 
 - **Simple**: One language to rule them all! Use Nix to configure everything,
   with optional Lua support for robust configurability!
@@ -87,7 +89,10 @@
   - nvf exposes everything you need to avoid a vendor lock-in. Which means you
     can add new modules, plugins and so on without relying on us adding a module
     for them! Though, of course, feel free to request them.
-  - Use plugins from anywhere.
+  - Use plugins from anywhere. Inputs, npins, nixpkgs... You name it.
+  - nvf allows _ordering configuration bits_ using [DAG] (_Directed acyclic
+    graph_)s. It has never been easier to construct an editor configuration
+    deterministically!
 - **Well-documented**: Documentation is priority. You will _never_ face
   undocumented, obscure behaviour.
   - Changes, breaking or otherwise, will be communicated in the [release notes]

From b3154b6da736dd3c37fcb8e994158c625fb7cb1b Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 5 Feb 2025 10:32:48 +0300
Subject: [PATCH 146/202] docs/tips: distinguish pure and impure installation
 methods for raw lua

---
 docs/manual/tips/pure-lua-config.md | 67 +++++++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/docs/manual/tips/pure-lua-config.md b/docs/manual/tips/pure-lua-config.md
index bf84888b..eb8881e9 100644
--- a/docs/manual/tips/pure-lua-config.md
+++ b/docs/manual/tips/pure-lua-config.md
@@ -3,10 +3,71 @@
 We recognize that you might not always want to configure your setup purely in
 Nix, sometimes doing things in Lua is simply the "superior" option. In such a
 case you might want to configure your Neovim instance using Lua, and nothing but
-Lua. It is also possible to mix Lua and Nix configurations through the following
-method.
+Lua. It is also possible to mix Lua and Nix configurations.
 
-## Custom Configuration Directory {#sec-custom-config-dir}
+Pure Lua or hybrid Lua/Nix configurations can be achieved in two different ways.
+_Purely_, by modifying Neovim's runtime directory or _impurely_ by placing Lua
+configuration in a directory found in `$HOME`. For your convenience, this
+section will document both methods as they can be used.
+
+## Pure Runtime Directory {#sec-pure-nvf-runtime}
+
+As of 0.6, nvf allows you to modify Neovim's runtime path to suit your needs.
+One of the ways the new runtime option is to add a configuration **located
+relative to your `flake.nix`**, which must be version controlled in pure flakes
+manner.
+
+```nix
+{
+  # Let us assume we are in the repository root, i.e., the same directory as the
+  # flake.nix. For the sake of the argument, we will assume that the Neovim lua
+  # configuration is in a nvim/ directory relative to flake.nix.
+  vim = {
+    additionalRuntimeDirectories = [
+      # This will be added to Neovim's runtime paths. Conceptually, this behaves
+      # very similarly to ~/.config/nvim but you may not place a top-level
+      # init.lua to be able to require it directly.
+      ./nvim
+    ];
+  };
+}
+```
+
+This will add the `nvim` directory, or rather, the _store path_ that will be
+realised after your flake gets copied to the Nix store, to Neovim's runtime
+directory. You may now create a `lua/myconfig` directory within this nvim
+directory, and call it with [](#opt-vim.luaConfigRC).
+
+```nix
+{pkgs, ...}: {
+  vim = {
+    additionalRuntimeDirectories = [
+      # You can list more than one file here.
+      ./nvim-custom-1
+
+      # To make sure list items are ordered, use lib.mkBefore or lib.mkAfter
+      # Simply placing list items in a given order will **not** ensure that
+      # this list  will be deterministic.
+      ./nvim-custom-2
+    ];
+
+    startPlugins = [pkgs.vimPlugins.gitsigns];
+
+    # Neovim supports in-line syntax highlighting for multi-line strings.
+    # Simply place the filetype in a /* comment */ before the line.
+    luaConfigRC.myconfig = /* lua */ ''
+      -- Call the Lua module from ./nvim/lua/myconfig
+      require("myconfig")
+
+      -- Any additional Lua configuration that you might want *after* your own
+      -- configuration. For example, a plugin setup call.
+      require('gitsigns').setup({})
+    '';
+  };
+}
+```
+
+## Impure Absolute Directory {#sec-impure-absolute-dir}
 
 [Neovim 0.9]: https://github.com/neovim/neovim/pull/22128
 

From 328b309af129286622e4a8cb403dcaa12df79a9e Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 6 Feb 2025 10:14:23 +0300
Subject: [PATCH 147/202] docs/readme: mention home-baked module options

---
 .github/README.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/README.md b/.github/README.md
index 468e5739..01395211 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -86,18 +86,19 @@
     can do just that, no unnecessary restrictions.
   - Lazyloading 💤? We got it! Lazyload both internal and external plugins at
     will.
-  - nvf exposes everything you need to avoid a vendor lock-in. Which means you
-    can add new modules, plugins and so on without relying on us adding a module
-    for them! Though, of course, feel free to request them.
-  - Use plugins from anywhere. Inputs, npins, nixpkgs... You name it.
   - nvf allows _ordering configuration bits_ using [DAG] (_Directed acyclic
     graph_)s. It has never been easier to construct an editor configuration
     deterministically!
+  - nvf exposes everything you need to avoid a vendor lock-in. Which means you
+    can add new modules, plugins and so on without relying on us adding a module
+    for them! Though, of course, feel free to request them.
+    - Use plugins from anywhere. Inputs, npins, nixpkgs... You name it.
+    - Add your own modules, with ease. It's all built-in!
 - **Well-documented**: Documentation is priority. You will _never_ face
   undocumented, obscure behaviour.
   - Changes, breaking or otherwise, will be communicated in the [release notes]
-  - Refer to the [FAQ section] for answers to common questions. Your question
-    not there? Head to the to the [discussions tab]!
+  - Refer to the [FAQ section] for answers to common questions.
+    - Your question not there? Head to the to the [discussions tab]!
 - **Idiomatic**: nvf does things ✨ _the right way_ ✨ - the codebase is, and
   will, remain maintainable for myself and any contributors.
 - **Community-Led**: we would like nvf to be fully capable of accomplishing what

From e9e7bfba53304bc3621abb8ae743e6b170e71fd9 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 6 Feb 2025 19:18:38 +0800
Subject: [PATCH 148/202] telescope: remove invalid option

---
 modules/plugins/utility/telescope/telescope.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/plugins/utility/telescope/telescope.nix b/modules/plugins/utility/telescope/telescope.nix
index cf9c5cd8..0665eb11 100644
--- a/modules/plugins/utility/telescope/telescope.nix
+++ b/modules/plugins/utility/telescope/telescope.nix
@@ -87,11 +87,6 @@
                 type = float;
                 default = 0.55;
               };
-              results_width = mkOption {
-                description = "";
-                type = float;
-                default = 0.8;
-              };
             };
             vertical = {
               mirror = mkOption {

From 2dde21e19c879d9c7b079a0629e27327739ebf28 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 11 Jan 2025 20:55:21 +0100
Subject: [PATCH 149/202] flake: add and package blink.cmp

---
 flake.lock                                   | 34 ++++++++++++++++++++
 flake.nix                                    | 10 ++++++
 modules/wrapper/build/config.nix             |  4 +++
 modules/wrapper/build/packages/blink-cmp.nix | 34 ++++++++++++++++++++
 4 files changed, 82 insertions(+)
 create mode 100644 modules/wrapper/build/packages/blink-cmp.nix

diff --git a/flake.lock b/flake.lock
index 8e5a40d7..457ec862 100644
--- a/flake.lock
+++ b/flake.lock
@@ -167,6 +167,38 @@
         "type": "github"
       }
     },
+    "plugin-blink-cmp": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1736295934,
+        "narHash": "sha256-MfHI4efAdaoCU8si6YFdznZmSTprthDq3YKuF91z7ss=",
+        "owner": "saghen",
+        "repo": "blink.cmp",
+        "rev": "1cc3b1a908fbcfd15451c4772759549724f38524",
+        "type": "github"
+      },
+      "original": {
+        "owner": "saghen",
+        "repo": "blink.cmp",
+        "type": "github"
+      }
+    },
+    "plugin-blink-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1734896240,
+        "narHash": "sha256-Rrrh+O3FbBnaAnCHwPuQyfhH+XueSkQp6ipEkn6esGY=",
+        "owner": "saghen",
+        "repo": "blink.compat",
+        "rev": "74b251a1e9478c4fa6d7c6bc2921d7124e6f6cbb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "saghen",
+        "repo": "blink.compat",
+        "type": "github"
+      }
+    },
     "plugin-bufdelete-nvim": {
       "flake": false,
       "locked": {
@@ -2788,6 +2820,8 @@
         "plugin-aerial-nvim": "plugin-aerial-nvim",
         "plugin-alpha-nvim": "plugin-alpha-nvim",
         "plugin-base16": "plugin-base16",
+        "plugin-blink-cmp": "plugin-blink-cmp",
+        "plugin-blink-compat": "plugin-blink-compat",
         "plugin-bufdelete-nvim": "plugin-bufdelete-nvim",
         "plugin-catppuccin": "plugin-catppuccin",
         "plugin-ccc": "plugin-ccc",
diff --git a/flake.nix b/flake.nix
index a9d158a3..57b92e2f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -294,6 +294,16 @@
       flake = false;
     };
 
+    plugin-blink-cmp = {
+      url = "github:saghen/blink.cmp";
+      flake = false;
+    };
+
+    plugin-blink-compat = {
+      url = "github:saghen/blink.compat";
+      flake = false;
+    };
+
     plugin-nvim-cmp = {
       url = "github:hrsh7th/nvim-cmp";
       flake = false;
diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix
index 46d99b36..6a1c031b 100644
--- a/modules/wrapper/build/config.nix
+++ b/modules/wrapper/build/config.nix
@@ -61,6 +61,10 @@
         "flutter-tools.dev_tools"
       ];
     };
+    blink-cmp = pkgs.callPackage ./packages/blink-cmp.nix {
+      src = inputs.plugin-blink-cmp;
+      version = inputs.plugin-blink-cmp.shortRev or inputs.plugin-blink-cmp.shortDirtyRev or "dirty";
+    };
   };
 
   buildConfigPlugins = plugins:
diff --git a/modules/wrapper/build/packages/blink-cmp.nix b/modules/wrapper/build/packages/blink-cmp.nix
new file mode 100644
index 00000000..537995f8
--- /dev/null
+++ b/modules/wrapper/build/packages/blink-cmp.nix
@@ -0,0 +1,34 @@
+{
+  rustPlatform,
+  hostPlatform,
+  vimUtils,
+  git,
+  src,
+  version,
+}: let
+  blink-fuzzy-lib = rustPlatform.buildRustPackage {
+    pname = "blink-fuzzy-lib";
+    inherit version src;
+
+    nativeBuildInputs = [git];
+    cargoLock = {
+      lockFile = "${src}/Cargo.lock";
+      allowBuiltinFetchGit = true;
+    };
+  };
+  libExt =
+    if hostPlatform.isDarwin
+    then "dylib"
+    else "so";
+in
+  vimUtils.buildVimPlugin {
+    pname = "blink-cmp";
+    inherit version src;
+
+    # blink references a repro.lua which is placed outside the lua/ directory
+    doCheck = false;
+    preInstall = ''
+      mkdir -p target/release
+      ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.${libExt} target/release/libblink_cmp_fuzzy.${libExt}
+    '';
+  }

From d2424e7913e6adfd01321558d403655269ad6b4c Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 11 Jan 2025 21:02:01 +0100
Subject: [PATCH 150/202] blink: init

---
 .../completion/blink-cmp/blink-cmp.nix        | 120 ++++++++++++++++++
 .../plugins/completion/blink-cmp/config.nix   |  90 +++++++++++++
 .../plugins/completion/blink-cmp/default.nix  |   6 +
 modules/plugins/completion/default.nix        |   1 +
 4 files changed, 217 insertions(+)
 create mode 100644 modules/plugins/completion/blink-cmp/blink-cmp.nix
 create mode 100644 modules/plugins/completion/blink-cmp/config.nix
 create mode 100644 modules/plugins/completion/blink-cmp/default.nix

diff --git a/modules/plugins/completion/blink-cmp/blink-cmp.nix b/modules/plugins/completion/blink-cmp/blink-cmp.nix
new file mode 100644
index 00000000..e56ac4cc
--- /dev/null
+++ b/modules/plugins/completion/blink-cmp/blink-cmp.nix
@@ -0,0 +1,120 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption mkOption literalMD;
+  inherit (lib.types) listOf str either attrsOf submodule enum anything int nullOr;
+  inherit (lib.generators) mkLuaInline;
+  inherit (lib.nvim.types) mkPluginSetupOption luaInline;
+  inherit (lib.nvim.binds) mkMappingOption;
+  inherit (lib.nvim.config) mkBool;
+
+  keymapType = submodule {
+    freeformType = attrsOf (listOf (either str luaInline));
+    options = {
+      preset = mkOption {
+        type = enum ["default" "none" "super-tab" "enter"];
+        default = "none";
+        description = "keymap presets";
+      };
+    };
+  };
+
+  providerType = submodule {
+    freeformType = anything;
+    options = {
+      module = mkOption {
+        type = str;
+        description = "module of the provider";
+      };
+    };
+  };
+in {
+  options.vim.autocomplete.blink-cmp = {
+    enable = mkEnableOption "blink.cmp";
+    setupOpts = mkPluginSetupOption "blink.cmp" {
+      sources = {
+        default = mkOption {
+          type = listOf str;
+          default = ["lsp" "path" "snippets" "buffer"];
+          description = "Default list of sources to enable for completion.";
+        };
+
+        cmdline = mkOption {
+          type = nullOr (listOf str);
+          default = [];
+          description = "List of sources to enable for cmdline. Null means use default source list.";
+        };
+
+        providers = mkOption {
+          type = attrsOf providerType;
+          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.
+          '';
+        };
+      };
+
+      completion = {
+        documentation = {
+          auto_show = mkBool true "Show documentation whenever an item is selected";
+          auto_show_delay_ms = mkOption {
+            type = int;
+            default = 200;
+            description = "Delay before auto show triggers";
+          };
+        };
+      };
+
+      keymap = mkOption {
+        type = keymapType;
+        default = {};
+        description = "blink.cmp keymap";
+        example = literalMD ''
+          ```nix
+          vim.autocomplete.blink-cmp.setupOpts.keymap = {
+            preset = "none";
+
+            "<Up>" = ["select_prev" "fallback"];
+            "<C-n>" = [
+              (lib.generators.mkLuaInline ''''
+                function(cmp)
+                  if some_condition then return end -- runs the next command
+                    return true -- doesn't run the next command
+                  end,
+              '''')
+              "select_next"
+            ];
+          };
+          ```
+        '';
+      };
+
+      fuzzy = {
+        prebuilt_binaries = {
+          download = mkBool false ''
+            Auto-downloads prebuilt binaries. Do not enable, it doesn't work on nix
+          '';
+        };
+      };
+    };
+
+    mappings = {
+      complete = mkMappingOption "Complete [blink.cmp]" "<C-Space>";
+      confirm = mkMappingOption "Confirm [blink.cmp]" "<CR>";
+      next = mkMappingOption "Next item [blink.cmp]" "<Tab>";
+      previous = mkMappingOption "Previous item [blink.cmp]" "<S-Tab>";
+      close = mkMappingOption "Close [blink.cmp]" "<C-e>";
+      scrollDocsUp = mkMappingOption "Scroll docs up [blink.cmp]" "<C-d>";
+      scrollDocsDown = mkMappingOption "Scroll docs down [blink.cmp]" "<C-f>";
+    };
+  };
+}
diff --git a/modules/plugins/completion/blink-cmp/config.nix b/modules/plugins/completion/blink-cmp/config.nix
new file mode 100644
index 00000000..1141b7e9
--- /dev/null
+++ b/modules/plugins/completion/blink-cmp/config.nix
@@ -0,0 +1,90 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.strings) optionalString;
+  inherit (lib.generators) mkLuaInline;
+  inherit (lib.nvim.lua) toLuaObject;
+  inherit (builtins) concatStringsSep typeOf tryEval attrNames mapAttrs;
+
+  cfg = config.vim.autocomplete.blink-cmp;
+  cmpCfg = config.vim.autocomplete.nvim-cmp;
+  inherit (cfg) mappings;
+
+  getPluginName = plugin:
+    if typeOf plugin == "string"
+    then plugin
+    else if (plugin ? pname && (tryEval plugin.pname).success)
+    then plugin.pname
+    else plugin.name;
+in {
+  vim = mkIf cfg.enable {
+    startPlugins = ["blink-compat"];
+    lazy.plugins = {
+      blink-cmp = {
+        package = "blink-cmp";
+        setupModule = "blink.cmp";
+        inherit (cfg) setupOpts;
+
+        # TODO: lazy disabled until lspconfig is lazy loaded
+        #
+        # event = ["InsertEnter" "CmdlineEnter"];
+
+        after = ''
+          ${optionalString config.vim.lazy.enable
+            (concatStringsSep "\n" (map
+              (package: "require('lz.n').trigger_load(${toLuaObject (getPluginName package)})")
+              cmpCfg.sourcePlugins))}
+        '';
+      };
+    };
+
+    autocomplete = {
+      blink-cmp.setupOpts = {
+        sources = {
+          default = ["lsp" "path" "snippets" "buffer"] ++ (attrNames cmpCfg.sources);
+          providers =
+            mapAttrs (name: _: {
+              inherit name;
+              module = "blink.compat.source";
+            })
+            cmpCfg.sources;
+        };
+        snippets = mkIf config.vim.snippets.luasnip.enable {
+          preset = "luasnip";
+        };
+
+        keymap = {
+          ${mappings.complete} = ["show" "fallback"];
+          ${mappings.close} = ["hide" "fallback"];
+          ${mappings.scrollDocsUp} = ["scroll_documentation_up" "fallback"];
+          ${mappings.scrollDocsDown} = ["scroll_documentation_down" "fallback"];
+          ${mappings.confirm} = ["accept" "fallback"];
+
+          ${mappings.next} = [
+            "select_next"
+            "snippet_forward"
+            (mkLuaInline ''
+              function(cmp)
+                local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+                has_words_before = col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
+
+                if has_words_before then
+                  return cmp.show()
+                end
+              end
+            '')
+            "fallback"
+          ];
+          ${mappings.previous} = [
+            "select_prev"
+            "snippet_backward"
+            "fallback"
+          ];
+        };
+      };
+    };
+  };
+}
diff --git a/modules/plugins/completion/blink-cmp/default.nix b/modules/plugins/completion/blink-cmp/default.nix
new file mode 100644
index 00000000..3e2d7e6b
--- /dev/null
+++ b/modules/plugins/completion/blink-cmp/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./blink-cmp.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/completion/default.nix b/modules/plugins/completion/default.nix
index 0cae45f6..0c0a61a0 100644
--- a/modules/plugins/completion/default.nix
+++ b/modules/plugins/completion/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
     ./nvim-cmp
+    ./blink-cmp
   ];
 }

From 214e2d597efb16e2528f9e7c5817d048151c0caf Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 11 Jan 2025 21:03:21 +0100
Subject: [PATCH 151/202] lsp: add blink integration

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

diff --git a/modules/plugins/lsp/config.nix b/modules/plugins/lsp/config.nix
index e73a5387..0fa16e47 100644
--- a/modules/plugins/lsp/config.nix
+++ b/modules/plugins/lsp/config.nix
@@ -11,6 +11,7 @@
 
   cfg = config.vim.lsp;
   usingNvimCmp = config.vim.autocomplete.nvim-cmp.enable;
+  usingBlinkCmp = config.vim.autocomplete.blink-cmp.enable;
   self = import ./module.nix {inherit config lib pkgs;};
 
   mappingDefinitions = self.options.vim.lsp.mappings;
@@ -22,7 +23,7 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      autocomplete.nvim-cmp = {
+      autocomplete.nvim-cmp = mkIf usingNvimCmp {
         sources = {nvim_lsp = "[LSP]";};
         sourcePlugins = ["cmp-nvim-lsp"];
       };
@@ -170,6 +171,10 @@ in {
             },
           }
         ''}
+
+        ${optionalString usingBlinkCmp ''
+          capabilities = require('blink.cmp').get_lsp_capabilities()
+        ''}
       '';
     };
   };

From 102d103986dd977267197c568e620eadadbd1167 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 11 Jan 2025 21:03:48 +0100
Subject: [PATCH 152/202] lsp-signature: assert against using with blink

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

diff --git a/modules/plugins/lsp/lsp-signature/config.nix b/modules/plugins/lsp/lsp-signature/config.nix
index c9940534..535b2534 100644
--- a/modules/plugins/lsp/lsp-signature/config.nix
+++ b/modules/plugins/lsp/lsp-signature/config.nix
@@ -10,6 +10,16 @@
   cfg = config.vim.lsp;
 in {
   config = mkIf (cfg.enable && cfg.lspSignature.enable) {
+    assertions = [
+      {
+        assertion = !config.vim.autocomplete.blink-cmp.enable;
+        message = ''
+          lsp-signature does not work with blink.cmp. Please use blink.cmp's builtin signature feature:
+
+          vim.autocomplete.blink-cmp.setupOpts.signature.enabled = true;
+        '';
+      }
+    ];
     vim = {
       startPlugins = [
         "lsp-signature"

From 5a42eff8fda6ef52fd0d0a7ce0a7e7540702fc21 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 11 Jan 2025 21:04:16 +0100
Subject: [PATCH 153/202] luasnip: only add cmp source if cmp enabled

---
 modules/plugins/snippets/luasnip/config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/snippets/luasnip/config.nix b/modules/plugins/snippets/luasnip/config.nix
index b05f9f27..11be37c1 100644
--- a/modules/plugins/snippets/luasnip/config.nix
+++ b/modules/plugins/snippets/luasnip/config.nix
@@ -20,7 +20,7 @@ in {
         after = cfg.loaders;
       };
       startPlugins = cfg.providers;
-      autocomplete.nvim-cmp = {
+      autocomplete.nvim-cmp = mkIf config.vim.autocomplete.nvim-cmp.enable {
         sources = {luasnip = "[LuaSnip]";};
         sourcePlugins = ["cmp-luasnip"];
       };

From 2a9a662f450a9a3fce1f0e651fa794a77c96f532 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 11 Jan 2025 21:04:50 +0100
Subject: [PATCH 154/202] treesitter: disable on blink.cmp

---
 modules/plugins/treesitter/config.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/plugins/treesitter/config.nix b/modules/plugins/treesitter/config.nix
index 566a716e..14aba5e1 100644
--- a/modules/plugins/treesitter/config.nix
+++ b/modules/plugins/treesitter/config.nix
@@ -20,7 +20,8 @@ in {
     vim = {
       startPlugins = ["nvim-treesitter"];
 
-      autocomplete.nvim-cmp = {
+      # cmp-treesitter doesn't work on blink.cmp
+      autocomplete.nvim-cmp = mkIf config.vim.autocomplete.nvim-cmp.enable {
         sources = {treesitter = "[Treesitter]";};
         sourcePlugins = ["cmp-treesitter"];
       };

From 00e9f27aca2db51c02a94cae713c5709fb14f631 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 11 Jan 2025 21:06:05 +0100
Subject: [PATCH 155/202] obsidian: enable cmp source on blink.cmp

---
 modules/plugins/notes/obsidian/obsidian.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/plugins/notes/obsidian/obsidian.nix b/modules/plugins/notes/obsidian/obsidian.nix
index 2da2127b..17369b88 100644
--- a/modules/plugins/notes/obsidian/obsidian.nix
+++ b/modules/plugins/notes/obsidian/obsidian.nix
@@ -7,6 +7,8 @@
   inherit (lib.types) bool str nullOr;
   inherit (lib.modules) mkRenamedOptionModule;
   inherit (lib.nvim.types) mkPluginSetupOption;
+
+  autocompleteCfg = config.vim.autocomplete;
 in {
   imports = let
     renamedSetupOption = oldPath: newPath:
@@ -42,7 +44,7 @@ in {
             # If using nvim-cmp, otherwise set to false
             type = bool;
             description = "If using nvim-cmp, otherwise set to false";
-            default = config.vim.autocomplete.nvim-cmp.enable;
+            default = autocompleteCfg.nvim-cmp.enable || autocompleteCfg.blink-cmp.enable;
           };
         };
       };

From 9e2ddbba4992d00974203c07f2ac25c8883d82a7 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 11 Jan 2025 21:06:15 +0100
Subject: [PATCH 156/202] docs: update release notes

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

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 661aee1d..361b7cda 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -47,6 +47,12 @@
 
 - Add Haskell support under `vim.languages.haskell` using [haskell-tools.nvim].
 
+[horriblename](https://github.com/horriblename):
+
+[blink.cmp]: https://github.com/saghen/blink.cmp
+
+- Add [blink.cmp] support
+
 [diniamo](https://github.com/diniamo):
 
 - Add Odin support under `vim.languages.odin`.

From 122f3b3f350b3e98feb56ff0d6dcb76372b2d413 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 11 Jan 2025 21:32:30 +0100
Subject: [PATCH 157/202] lspkind: integration with blink.cmp

---
 modules/plugins/lsp/lspkind/config.nix | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/modules/plugins/lsp/lspkind/config.nix b/modules/plugins/lsp/lspkind/config.nix
index 2ef20ff8..abe14524 100644
--- a/modules/plugins/lsp/lspkind/config.nix
+++ b/modules/plugins/lsp/lspkind/config.nix
@@ -8,16 +8,18 @@
   inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.lsp.lspkind;
+  usingCmp = config.vim.autocomplete.nvim-cmp.enable;
+  usingBlink = config.vim.autocomplete.blink-cmp.enable;
 in {
   config = mkIf cfg.enable {
     assertions = [
       {
-        assertion = config.vim.autocomplete.nvim-cmp.enable;
+        assertion = usingCmp || usingBlink;
         message = ''
           While lspkind supports Neovim's native lsp upstream, using that over
-          nvim-cmp isn't recommended, nor supported by nvf.
+          nvim-cmp/blink.cmp isn't recommended, nor supported by nvf.
 
-          Please migrate to nvim-cmp if you want to use lspkind.
+          Please migrate to nvim-cmp/blink.cmp if you want to use lspkind.
         '';
       }
     ];
@@ -26,9 +28,19 @@ in {
       startPlugins = ["lspkind"];
 
       lsp.lspkind.setupOpts.before = config.vim.autocomplete.nvim-cmp.format;
-      autocomplete.nvim-cmp.setupOpts.formatting.format = mkForce (mkLuaInline ''
-        require("lspkind").cmp_format(${toLuaObject cfg.setupOpts})
-      '');
+      autocomplete = {
+        nvim-cmp = mkIf usingCmp {
+          setupOpts.formatting.format = mkForce (mkLuaInline ''
+            require("lspkind").cmp_format(${toLuaObject cfg.setupOpts})
+          '');
+        };
+
+        blink-cmp = mkIf usingBlink {
+          setupOpts.appearance.kind_icons = mkLuaInline ''
+            require("lspkind").symbol_map
+          '';
+        };
+      };
     };
   };
 }

From 9dccd4b4a8d8b7c11461032cd18965b10f8e7907 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 11 Jan 2025 21:46:49 +0100
Subject: [PATCH 158/202] autocomplete: move shared code into common parent

---
 .../plugins/completion/blink-cmp/config.nix   |   1 +
 modules/plugins/completion/config.nix         |  34 +++
 modules/plugins/completion/default.nix        |   3 +
 modules/plugins/completion/module.nix         |   7 +
 .../plugins/completion/nvim-cmp/config.nix    | 201 +++++++++---------
 5 files changed, 140 insertions(+), 106 deletions(-)
 create mode 100644 modules/plugins/completion/config.nix
 create mode 100644 modules/plugins/completion/module.nix

diff --git a/modules/plugins/completion/blink-cmp/config.nix b/modules/plugins/completion/blink-cmp/config.nix
index 1141b7e9..914821f9 100644
--- a/modules/plugins/completion/blink-cmp/config.nix
+++ b/modules/plugins/completion/blink-cmp/config.nix
@@ -42,6 +42,7 @@ in {
     };
 
     autocomplete = {
+      enableSharedCmpSources = true;
       blink-cmp.setupOpts = {
         sources = {
           default = ["lsp" "path" "snippets" "buffer"] ++ (attrNames cmpCfg.sources);
diff --git a/modules/plugins/completion/config.nix b/modules/plugins/completion/config.nix
new file mode 100644
index 00000000..8fc09201
--- /dev/null
+++ b/modules/plugins/completion/config.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (builtins) typeOf tryEval;
+
+  cfg = config.vim.autocomplete;
+  getPluginName = plugin:
+    if typeOf plugin == "string"
+    then plugin
+    else if (plugin ? pname && (tryEval plugin.pname).success)
+    then plugin.pname
+    else plugin.name;
+in {
+  config.vim = mkIf cfg.enableSharedCmpSources {
+    startPlugins = ["rtp-nvim"];
+    lazy.plugins =
+      mapListToAttrs (package: {
+        name = getPluginName package;
+        value = {
+          inherit package;
+          lazy = true;
+          after = ''
+            local path = vim.fn.globpath(vim.o.packpath, 'pack/*/opt/${getPluginName package}')
+            require("rtp_nvim").source_after_plugin_dir(path)
+          '';
+        };
+      })
+      cfg.nvim-cmp.sourcePlugins;
+  };
+}
diff --git a/modules/plugins/completion/default.nix b/modules/plugins/completion/default.nix
index 0c0a61a0..bf737580 100644
--- a/modules/plugins/completion/default.nix
+++ b/modules/plugins/completion/default.nix
@@ -1,5 +1,8 @@
 {
   imports = [
+    ./module.nix
+    ./config.nix
+
     ./nvim-cmp
     ./blink-cmp
   ];
diff --git a/modules/plugins/completion/module.nix b/modules/plugins/completion/module.nix
new file mode 100644
index 00000000..eb2a32f1
--- /dev/null
+++ b/modules/plugins/completion/module.nix
@@ -0,0 +1,7 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
+in {
+  options.vim.autocomplete = {
+    enableSharedCmpSources = mkEnableOption "sources shared by blink.cmp and nvim-cmp";
+  };
+}
diff --git a/modules/plugins/completion/nvim-cmp/config.nix b/modules/plugins/completion/nvim-cmp/config.nix
index cfd3e53a..ce058876 100644
--- a/modules/plugins/completion/nvim-cmp/config.nix
+++ b/modules/plugins/completion/nvim-cmp/config.nix
@@ -24,114 +24,103 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["rtp-nvim"];
-      lazy.plugins = mkMerge [
-        (mapListToAttrs (package: {
-            name = getPluginName package;
-            value = {
-              inherit package;
-              lazy = true;
-              after = ''
-                local path = vim.fn.globpath(vim.o.packpath, 'pack/*/opt/${getPluginName package}')
-                require("rtp_nvim").source_after_plugin_dir(path)
+      lazy.plugins = {
+        nvim-cmp = {
+          package = "nvim-cmp";
+          after = ''
+            ${optionalString luasnipEnable "local luasnip = require('luasnip')"}
+            local cmp = require("cmp")
+
+            local kinds = require("cmp.types").lsp.CompletionItemKind
+            local deprio = function(kind)
+              return function(e1, e2)
+                if e1:get_kind() == kind then
+                  return false
+                end
+                if e2:get_kind() == kind then
+                  return true
+                end
+                return nil
+              end
+            end
+
+            cmp.setup(${toLuaObject cfg.setupOpts})
+
+            ${optionalString config.vim.lazy.enable
+              (concatStringsSep "\n" (map
+                (package: "require('lz.n').trigger_load(${toLuaObject (getPluginName package)})")
+                cfg.sourcePlugins))}
+          '';
+
+          event = ["InsertEnter" "CmdlineEnter"];
+        };
+      };
+
+      autocomplete = {
+        enableSharedCmpSources = true;
+
+        nvim-cmp = {
+          sources = {
+            nvim-cmp = null;
+            buffer = "[Buffer]";
+            path = "[Path]";
+          };
+
+          sourcePlugins = ["cmp-buffer" "cmp-path"];
+
+          setupOpts = {
+            sources = map (s: {name = s;}) (attrNames cfg.sources);
+
+            window = mkIf borders.enable {
+              completion.border = borders.style;
+              documentation.border = borders.style;
+            };
+
+            formatting.format = cfg.format;
+
+            # `cmp` and `luasnip` are defined above, in the `nvim-cmp` section
+            mapping = {
+              ${mappings.complete} = mkLuaInline "cmp.mapping.complete()";
+              ${mappings.close} = mkLuaInline "cmp.mapping.abort()";
+              ${mappings.scrollDocsUp} = mkLuaInline "cmp.mapping.scroll_docs(-4)";
+              ${mappings.scrollDocsDown} = mkLuaInline "cmp.mapping.scroll_docs(4)";
+              ${mappings.confirm} = mkLuaInline "cmp.mapping.confirm({ select = true })";
+
+              ${mappings.next} = mkLuaInline ''
+                cmp.mapping(function(fallback)
+                  local has_words_before = function()
+                    local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+                    return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
+                  end
+
+                  if cmp.visible() then
+                    cmp.select_next_item()
+                    ${optionalString luasnipEnable ''
+                  elseif luasnip.locally_jumpable(1) then
+                    luasnip.jump(1)
+                ''}
+                  elseif has_words_before() then
+                    cmp.complete()
+                  else
+                    fallback()
+                  end
+                end)
+              '';
+
+              ${mappings.previous} = mkLuaInline ''
+                cmp.mapping(function(fallback)
+                  if cmp.visible() then
+                    cmp.select_prev_item()
+                    ${optionalString luasnipEnable ''
+                  elseif luasnip.locally_jumpable(-1) then
+                    luasnip.jump(-1)
+                ''}
+                  else
+                    fallback()
+                  end
+                end)
               '';
             };
-          })
-          cfg.sourcePlugins)
-        {
-          nvim-cmp = {
-            package = "nvim-cmp";
-            after = ''
-              ${optionalString luasnipEnable "local luasnip = require('luasnip')"}
-              local cmp = require("cmp")
-
-              local kinds = require("cmp.types").lsp.CompletionItemKind
-              local deprio = function(kind)
-                return function(e1, e2)
-                  if e1:get_kind() == kind then
-                    return false
-                  end
-                  if e2:get_kind() == kind then
-                    return true
-                  end
-                  return nil
-                end
-              end
-
-              cmp.setup(${toLuaObject cfg.setupOpts})
-
-              ${optionalString config.vim.lazy.enable
-                (concatStringsSep "\n" (map
-                  (package: "require('lz.n').trigger_load(${toLuaObject (getPluginName package)})")
-                  cfg.sourcePlugins))}
-            '';
-
-            event = ["InsertEnter" "CmdlineEnter"];
-          };
-        }
-      ];
-
-      autocomplete.nvim-cmp = {
-        sources = {
-          nvim-cmp = null;
-          buffer = "[Buffer]";
-          path = "[Path]";
-        };
-
-        sourcePlugins = ["cmp-buffer" "cmp-path"];
-
-        setupOpts = {
-          sources = map (s: {name = s;}) (attrNames cfg.sources);
-
-          window = mkIf borders.enable {
-            completion.border = borders.style;
-            documentation.border = borders.style;
-          };
-
-          formatting.format = cfg.format;
-
-          # `cmp` and `luasnip` are defined above, in the `nvim-cmp` section
-          mapping = {
-            ${mappings.complete} = mkLuaInline "cmp.mapping.complete()";
-            ${mappings.close} = mkLuaInline "cmp.mapping.abort()";
-            ${mappings.scrollDocsUp} = mkLuaInline "cmp.mapping.scroll_docs(-4)";
-            ${mappings.scrollDocsDown} = mkLuaInline "cmp.mapping.scroll_docs(4)";
-            ${mappings.confirm} = mkLuaInline "cmp.mapping.confirm({ select = true })";
-
-            ${mappings.next} = mkLuaInline ''
-              cmp.mapping(function(fallback)
-                local has_words_before = function()
-                  local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-                  return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
-                end
-
-                if cmp.visible() then
-                  cmp.select_next_item()
-                  ${optionalString luasnipEnable ''
-                elseif luasnip.locally_jumpable(1) then
-                  luasnip.jump(1)
-              ''}
-                elseif has_words_before() then
-                  cmp.complete()
-                else
-                  fallback()
-                end
-              end)
-            '';
-
-            ${mappings.previous} = mkLuaInline ''
-              cmp.mapping(function(fallback)
-                if cmp.visible() then
-                  cmp.select_prev_item()
-                  ${optionalString luasnipEnable ''
-                elseif luasnip.locally_jumpable(-1) then
-                  luasnip.jump(-1)
-              ''}
-                else
-                  fallback()
-                end
-              end)
-            '';
           };
         };
       };

From 8a069a683569aca2b8579789943c517a14e80201 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <59727193+horriblename@users.noreply.github.com>
Date: Tue, 21 Jan 2025 13:35:01 +0800
Subject: [PATCH 159/202] blink: move package into legacyPackage

---
 flake/legacyPackages.nix                                    | 6 +++++-
 .../build/packages => flake/legacyPackages}/blink-cmp.nix   | 4 ++++
 modules/wrapper/build/config.nix                            | 5 +----
 3 files changed, 10 insertions(+), 5 deletions(-)
 rename {modules/wrapper/build/packages => flake/legacyPackages}/blink-cmp.nix (87%)

diff --git a/flake/legacyPackages.nix b/flake/legacyPackages.nix
index b77d057a..5b6ccb6d 100644
--- a/flake/legacyPackages.nix
+++ b/flake/legacyPackages.nix
@@ -9,10 +9,14 @@
       overlays = [
         inputs.self.overlays.default
 
-        (_: _: {
+        (final: _: {
           # Build nil from source to get most recent
           # features as they are added.
           nil = inputs'.nil.packages.default;
+          blink-cmp = final.callPackage ./legacyPackages/blink-cmp.nix {
+            src = inputs.plugin-blink-cmp;
+            version = inputs.plugin-blink-cmp.shortRev or inputs.plugin-blink-cmp.shortDirtyRev or "dirty";
+          };
         })
       ];
     };
diff --git a/modules/wrapper/build/packages/blink-cmp.nix b/flake/legacyPackages/blink-cmp.nix
similarity index 87%
rename from modules/wrapper/build/packages/blink-cmp.nix
rename to flake/legacyPackages/blink-cmp.nix
index 537995f8..002269b9 100644
--- a/modules/wrapper/build/packages/blink-cmp.nix
+++ b/flake/legacyPackages/blink-cmp.nix
@@ -10,6 +10,10 @@
     pname = "blink-fuzzy-lib";
     inherit version src;
 
+    env = {
+      # TODO: remove this if plugin stops using nightly rust
+      RUSTC_BOOTSTRAP = true;
+    };
     nativeBuildInputs = [git];
     cargoLock = {
       lockFile = "${src}/Cargo.lock";
diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix
index 6a1c031b..88745fb5 100644
--- a/modules/wrapper/build/config.nix
+++ b/modules/wrapper/build/config.nix
@@ -61,10 +61,7 @@
         "flutter-tools.dev_tools"
       ];
     };
-    blink-cmp = pkgs.callPackage ./packages/blink-cmp.nix {
-      src = inputs.plugin-blink-cmp;
-      version = inputs.plugin-blink-cmp.shortRev or inputs.plugin-blink-cmp.shortDirtyRev or "dirty";
-    };
+    inherit (pkgs) blink-cmp;
   };
 
   buildConfigPlugins = plugins:

From 88fdf831566087e6bd6eb50f1cceedf658367d7f Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Tue, 21 Jan 2025 15:51:09 +0800
Subject: [PATCH 160/202] overlay: use overlayed pkgs in .#nix and .#maximal

---
 flake/overlays.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake/overlays.nix b/flake/overlays.nix
index 1381e7ba..5d0ff6e8 100644
--- a/flake/overlays.nix
+++ b/flake/overlays.nix
@@ -10,10 +10,10 @@
   nixConfig = import ../configuration.nix false;
   maximalConfig = import ../configuration.nix true;
 in {
-  flake.overlays.default = _final: prev: {
+  flake.overlays.default = final: _prev: {
     inherit neovimConfiguration;
-    neovim-nix = buildPkg prev [nixConfig];
-    neovim-maximal = buildPkg prev [maximalConfig];
+    neovim-nix = buildPkg final [nixConfig];
+    neovim-maximal = buildPkg final [maximalConfig];
     devPkg = buildPkg pkgs [nixConfig {config.vim.languages.html.enable = pkgs.lib.mkForce true;}];
   };
 }

From 132c3da8ece1f2518992257985a612690b2eeb90 Mon Sep 17 00:00:00 2001
From: Anthony Rodriguez <anthony@nezia.dev>
Date: Thu, 6 Feb 2025 13:08:31 +0100
Subject: [PATCH 161/202] languages/nix: add nixd

This adds the [nixd](https://github.com/nix-community/nixd) language
server.
---
 docs/release-notes/rl-0.8.md      |  4 ++++
 modules/plugins/languages/nix.nix | 34 +++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 661aee1d..3a09171b 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -139,3 +139,7 @@
 
 - Add `vim.languages.zig.dap` support through pkgs.lldb dap adapter. Code
   Inspiration from `vim.languages.clang.dap` implementation.
+
+[nezia1](https://github.com/nezia1)
+
+- Add support for [nixd](https://github.com/nix-community/nixd) language server.
diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix
index 4056a415..d6ca6d32 100644
--- a/modules/plugins/languages/nix.nix
+++ b/modules/plugins/languages/nix.nix
@@ -59,6 +59,40 @@
         }
       '';
     };
+
+    nixd = {
+      package = pkgs.nixd;
+      internalFormatter = true;
+      lspConfig = ''
+        lspconfig.nixd.setup{
+          capabilities = capabilities,
+        ${
+          if cfg.format.enable
+          then useFormat
+          else noFormat
+        },
+          cmd = ${packageToCmd cfg.lsp.package "nixd"},
+        ${optionalString cfg.format.enable ''
+          settings = {
+            nixd = {
+          ${optionalString (cfg.format.type == "alejandra")
+            ''
+              formatting = {
+                command = {"${cfg.format.package}/bin/alejandra", "--quiet"},
+              },
+            ''}
+          ${optionalString (cfg.format.type == "nixfmt")
+            ''
+              formatting = {
+                command = {"${cfg.format.package}/bin/nixfmt"},
+              },
+            ''}
+            },
+          },
+        ''}
+        }
+      '';
+    };
   };
 
   defaultFormat = "alejandra";

From 75b402e9f03ebf0ad83dd72f3825a700de956ede Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 7 Feb 2025 15:49:24 +0300
Subject: [PATCH 162/202] neovim/init: deprecate `vim.disableArrows`; add
 missing rename

---
 modules/extra/deprecations.nix | 12 +++++++++++-
 modules/neovim/init/basic.nix  |  6 ------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/modules/extra/deprecations.nix b/modules/extra/deprecations.nix
index 8d27d7ac..541d2894 100644
--- a/modules/extra/deprecations.nix
+++ b/modules/extra/deprecations.nix
@@ -4,6 +4,7 @@
   inherit (lib.nvim.config) batchRenameOptions;
 
   renamedVimOpts = batchRenameOptions ["vim"] ["vim" "options"] {
+    # 2024-12-01
     colourTerm = "termguicolors";
     mouseSupport = "mouse";
     cmdHeight = "cmdheight";
@@ -15,6 +16,9 @@
     autoIndent = "autoindent";
     wordWrap = "wrap";
     showSignColumn = "signcolumn";
+
+    # 2025-02-07
+    scrollOf = "scrolloff";
   };
 in {
   imports = concatLists [
@@ -93,9 +97,15 @@ in {
 
       # 2024-12-02
       (mkRenamedOptionModule ["vim" "enableEditorconfig"] ["vim" "globals" "editorconfig"])
+
+      # 2025-02-06
+      (mkRemovedOptionModule ["vim" "disableArrows"] ''
+        Top-level convenience options are now in the process of being removed from nvf as
+        their behaviour was abstract, and confusing. Please use 'vim.options' or 'vim.luaConfigRC'
+        to replicate previous behaviour.
+      '')
     ]
 
-    # 2024-12-01
     # Migrated via batchRenameOptions. Further batch renames must be below this line.
     renamedVimOpts
   ];
diff --git a/modules/neovim/init/basic.nix b/modules/neovim/init/basic.nix
index b4677de9..47bfe500 100644
--- a/modules/neovim/init/basic.nix
+++ b/modules/neovim/init/basic.nix
@@ -16,12 +16,6 @@
   cfg = config.vim;
 in {
   options.vim = {
-    disableArrows = mkOption {
-      type = bool;
-      default = false;
-      description = "Set to prevent arrow keys from moving cursor";
-    };
-
     hideSearchHighlight = mkOption {
       type = bool;
       default = false;

From e5ced28b67492838c6756534b9ca4a99a56cc350 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 7 Feb 2025 16:02:50 +0300
Subject: [PATCH 163/202] ci: remove magic-nix-cache

---
 .github/workflows/cachix.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index 4aa0b215..cac8ee51 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -35,7 +35,6 @@ jobs:
 
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - uses: cachix/cachix-action@v15
         with:

From 3f9078d7d94d7f163d165af327f2676a8217af1e Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 7 Feb 2025 17:00:45 +0300
Subject: [PATCH 164/202] neovim/mappings: remove remnants of
 `vim.disableArrows`

---
 modules/neovim/mappings/config.nix | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/modules/neovim/mappings/config.nix b/modules/neovim/mappings/config.nix
index 4d7f2417..230df030 100644
--- a/modules/neovim/mappings/config.nix
+++ b/modules/neovim/mappings/config.nix
@@ -26,34 +26,6 @@
 in {
   config = {
     vim.keymaps = mkMerge [
-      (
-        mkIf cfg.disableArrows [
-          {
-            key = "<up>";
-            mode = ["n" "i"];
-            action = "<nop>";
-            noremap = false;
-          }
-          {
-            key = "<down>";
-            mode = ["n" "i"];
-            action = "<nop>";
-            noremap = false;
-          }
-          {
-            key = "<left>";
-            mode = ["n" "i"];
-            action = "<nop>";
-            noremap = false;
-          }
-          {
-            key = "<right>";
-            mode = ["n" "i"];
-            action = "<nop>";
-            noremap = false;
-          }
-        ]
-      )
       (
         pipe cfg.maps
         [

From 316d4a0825edde5fa84c0cbd32413f4096aee254 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 8 Feb 2025 10:46:02 +0300
Subject: [PATCH 165/202] modules/extra: fix `scrolOf` typo

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

diff --git a/modules/extra/deprecations.nix b/modules/extra/deprecations.nix
index 541d2894..5efe2ae2 100644
--- a/modules/extra/deprecations.nix
+++ b/modules/extra/deprecations.nix
@@ -18,7 +18,7 @@
     showSignColumn = "signcolumn";
 
     # 2025-02-07
-    scrollOf = "scrolloff";
+    scrollOff = "scrolloff";
   };
 in {
   imports = concatLists [

From 2476d7e78fba5488a64620f3d2335ce19f1f0fbb Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 1 Feb 2025 07:31:07 +0300
Subject: [PATCH 166/202] flake: add conform-nvim and nvim-lint

---
 flake.lock | 34 ++++++++++++++++++++++++++++++++++
 flake.nix  | 12 ++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/flake.lock b/flake.lock
index 457ec862..87476e17 100644
--- a/flake.lock
+++ b/flake.lock
@@ -423,6 +423,22 @@
         "type": "github"
       }
     },
+    "plugin-conform-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1737787854,
+        "narHash": "sha256-k/m2gmups5DWChd/vg7X3/3qkcEvfeKS9mc8MFZRx9E=",
+        "owner": "stevearc",
+        "repo": "conform.nvim",
+        "rev": "363243c03102a531a8203311d4f2ae704c620d9b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "stevearc",
+        "repo": "conform.nvim",
+        "type": "github"
+      }
+    },
     "plugin-copilot-cmp": {
       "flake": false,
       "locked": {
@@ -1977,6 +1993,22 @@
         "type": "github"
       }
     },
+    "plugin-nvim-lint": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1737487916,
+        "narHash": "sha256-DKfivSjBFra/iXIuYQa7Mv5f2LglNbQTr8bQ+sCm8to=",
+        "owner": "mfussenegger",
+        "repo": "nvim-lint",
+        "rev": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mfussenegger",
+        "repo": "nvim-lint",
+        "type": "github"
+      }
+    },
     "plugin-nvim-lspconfig": {
       "flake": false,
       "locked": {
@@ -2836,6 +2868,7 @@
         "plugin-cmp-treesitter": "plugin-cmp-treesitter",
         "plugin-codewindow-nvim": "plugin-codewindow-nvim",
         "plugin-comment-nvim": "plugin-comment-nvim",
+        "plugin-conform-nvim": "plugin-conform-nvim",
         "plugin-copilot-cmp": "plugin-copilot-cmp",
         "plugin-copilot-lua": "plugin-copilot-lua",
         "plugin-crates-nvim": "plugin-crates-nvim",
@@ -2933,6 +2966,7 @@
         "plugin-nvim-dap-ui": "plugin-nvim-dap-ui",
         "plugin-nvim-docs-view": "plugin-nvim-docs-view",
         "plugin-nvim-lightbulb": "plugin-nvim-lightbulb",
+        "plugin-nvim-lint": "plugin-nvim-lint",
         "plugin-nvim-lspconfig": "plugin-nvim-lspconfig",
         "plugin-nvim-metals": "plugin-nvim-metals",
         "plugin-nvim-navbuddy": "plugin-nvim-navbuddy",
diff --git a/flake.nix b/flake.nix
index 57b92e2f..7a2f4bd4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -227,6 +227,18 @@
       flake = false;
     };
 
+    # Formatters
+    plugin-conform-nvim = {
+      url = "github:stevearc/conform.nvim";
+      flake = false;
+    };
+
+    # Diagnostics
+    plugin-nvim-lint = {
+      url = "github:mfussenegger/nvim-lint";
+      flake = false;
+    };
+
     # Copying/Registers
     plugin-registers = {
       url = "github:tversteeg/registers.nvim";

From 021f2531cc784a102472cc2957ea30740a2bd4c7 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 1 Feb 2025 07:31:29 +0300
Subject: [PATCH 167/202] diagnostics/nvim-lint: init

---
 modules/plugins/diagnostics/default.nix       |  3 +++
 .../plugins/diagnostics/nvim-lint/config.nix  | 20 ++++++++++++++
 .../plugins/diagnostics/nvim-lint/default.nix |  6 +++++
 .../diagnostics/nvim-lint/nvim-lint.nix       | 27 +++++++++++++++++++
 4 files changed, 56 insertions(+)
 create mode 100644 modules/plugins/diagnostics/default.nix
 create mode 100644 modules/plugins/diagnostics/nvim-lint/config.nix
 create mode 100644 modules/plugins/diagnostics/nvim-lint/default.nix
 create mode 100644 modules/plugins/diagnostics/nvim-lint/nvim-lint.nix

diff --git a/modules/plugins/diagnostics/default.nix b/modules/plugins/diagnostics/default.nix
new file mode 100644
index 00000000..3789640d
--- /dev/null
+++ b/modules/plugins/diagnostics/default.nix
@@ -0,0 +1,3 @@
+{
+  imports = [./nvim-lint];
+}
diff --git a/modules/plugins/diagnostics/nvim-lint/config.nix b/modules/plugins/diagnostics/nvim-lint/config.nix
new file mode 100644
index 00000000..dac2c2f4
--- /dev/null
+++ b/modules/plugins/diagnostics/nvim-lint/config.nix
@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  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").setup(${toLuaObject cfg.setupOpts})
+      '';
+    };
+  };
+}
diff --git a/modules/plugins/diagnostics/nvim-lint/default.nix b/modules/plugins/diagnostics/nvim-lint/default.nix
new file mode 100644
index 00000000..00c526f1
--- /dev/null
+++ b/modules/plugins/diagnostics/nvim-lint/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./nvim-lint.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
new file mode 100644
index 00000000..2211211e
--- /dev/null
+++ b/modules/plugins/diagnostics/nvim-lint/nvim-lint.nix
@@ -0,0 +1,27 @@
+{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.
+        '';
+      };
+    };
+  };
+}

From 5554c867ee69597ee1b91ba73e030cbe245ea175 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 1 Feb 2025 07:31:51 +0300
Subject: [PATCH 168/202] formatter/conform-nvim: init

---
 .../plugins/formatter/conform-nvim/config.nix | 20 +++++++
 .../formatter/conform-nvim/conform-nvim.nix   | 56 +++++++++++++++++++
 .../formatter/conform-nvim/default.nix        |  6 ++
 modules/plugins/formatter/default.nix         |  3 +
 4 files changed, 85 insertions(+)
 create mode 100644 modules/plugins/formatter/conform-nvim/config.nix
 create mode 100644 modules/plugins/formatter/conform-nvim/conform-nvim.nix
 create mode 100644 modules/plugins/formatter/conform-nvim/default.nix
 create mode 100644 modules/plugins/formatter/default.nix

diff --git a/modules/plugins/formatter/conform-nvim/config.nix b/modules/plugins/formatter/conform-nvim/config.nix
new file mode 100644
index 00000000..0b83d813
--- /dev/null
+++ b/modules/plugins/formatter/conform-nvim/config.nix
@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.lua) toLuaObject;
+
+  cfg = config.vim.formatter.conform-nvim;
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      startPlugins = ["conform-nvim"];
+      pluginRC.conform-nvim = entryAnywhere ''
+        require("conform").setup(${toLuaObject cfg.setupOpts})
+      '';
+    };
+  };
+}
diff --git a/modules/plugins/formatter/conform-nvim/conform-nvim.nix b/modules/plugins/formatter/conform-nvim/conform-nvim.nix
new file mode 100644
index 00000000..423a4f44
--- /dev/null
+++ b/modules/plugins/formatter/conform-nvim/conform-nvim.nix
@@ -0,0 +1,56 @@
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkOption mkEnableOption literalExpression;
+  inherit (lib.types) attrs enum;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+  inherit (lib.nvim.lua) mkLuaInline;
+in {
+  options.vim.formatter.conform-nvim = {
+    enable = mkEnableOption "lightweight yet powerful formatter plugin for Neovim [conform-nvim]";
+    setupOpts = mkPluginSetupOption "conform.nvim" {
+      formatters_by_ft = mkOption {
+        type = attrs;
+        default = {};
+        example = {lua = ["stylua"];};
+        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.
+        '';
+      };
+
+      default_format_opts = mkOption {
+        type = attrs;
+        default = {lsp_format = "fallback";};
+        description = "Default values when calling `conform.format()`";
+      };
+
+      format_on_save = mkOption {
+        type = attrs;
+        default = {
+          lsp_format = "fallback";
+          timeout_ms = 500;
+        };
+        description = ''
+          Table that will be passed to `conform.format()`. If this
+          is set, Conform will run the formatter on save.
+        '';
+      };
+
+      format_after_save = mkOption {
+        type = 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.
+        '';
+      };
+    };
+  };
+}
diff --git a/modules/plugins/formatter/conform-nvim/default.nix b/modules/plugins/formatter/conform-nvim/default.nix
new file mode 100644
index 00000000..56c90f3f
--- /dev/null
+++ b/modules/plugins/formatter/conform-nvim/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./conform-nvim.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/formatter/default.nix b/modules/plugins/formatter/default.nix
new file mode 100644
index 00000000..f57ad66a
--- /dev/null
+++ b/modules/plugins/formatter/default.nix
@@ -0,0 +1,3 @@
+{
+  imports = [./conform-nvim];
+}

From 5b5fd3db14241fb741af403631fea25673580acd Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 1 Feb 2025 07:32:11 +0300
Subject: [PATCH 169/202] modules: import diagnostics and formatter modules

---
 modules/modules.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/modules.nix b/modules/modules.nix
index 65b0c966..c7e198dd 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -23,7 +23,9 @@
       "completion"
       "dashboard"
       "debugger"
+      "diagnostics"
       "filetree"
+      "formatter"
       "git"
       "languages"
       "lsp"

From 7510ef2c1342b4c7f7f3abebf71da08b9606f9ea Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 5 Feb 2025 06:52:24 +0300
Subject: [PATCH 170/202] flake: move all plugin inputs to npins

---
 flake.lock         | 2892 --------------------------------------------
 flake.nix          |  895 +-------------
 npins/default.nix  |   80 ++
 npins/sources.json | 2015 ++++++++++++++++++++++++++++++
 4 files changed, 2097 insertions(+), 3785 deletions(-)
 create mode 100644 npins/default.nix
 create mode 100644 npins/sources.json

diff --git a/flake.lock b/flake.lock
index 87476e17..c1cda841 100644
--- a/flake.lock
+++ b/flake.lock
@@ -119,2728 +119,6 @@
         "type": "sourcehut"
       }
     },
-    "plugin-aerial-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736064692,
-        "narHash": "sha256-7YQtkUTACTMfAGoqoFDPmRrqtw+ypxDbeLCTB3sy4Us=",
-        "owner": "stevearc",
-        "repo": "aerial.nvim",
-        "rev": "b3ec25ca8c347fafa976484a6cace162239112e1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "stevearc",
-        "repo": "aerial.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-alpha-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731604504,
-        "narHash": "sha256-sNi5qarejYqM4/J7lBZI3gjVLxer5FBPq8K6qjqcMjA=",
-        "owner": "goolord",
-        "repo": "alpha-nvim",
-        "rev": "de72250e054e5e691b9736ee30db72c65d560771",
-        "type": "github"
-      },
-      "original": {
-        "owner": "goolord",
-        "repo": "alpha-nvim",
-        "type": "github"
-      }
-    },
-    "plugin-base16": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1716483968,
-        "narHash": "sha256-GRF/6AobXHamw8TZ3FjL7SI6ulcpwpcohsIuZeCSh2A=",
-        "owner": "rrethy",
-        "repo": "base16-nvim",
-        "rev": "6ac181b5733518040a33017dde654059cd771b7c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rrethy",
-        "repo": "base16-nvim",
-        "type": "github"
-      }
-    },
-    "plugin-blink-cmp": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736295934,
-        "narHash": "sha256-MfHI4efAdaoCU8si6YFdznZmSTprthDq3YKuF91z7ss=",
-        "owner": "saghen",
-        "repo": "blink.cmp",
-        "rev": "1cc3b1a908fbcfd15451c4772759549724f38524",
-        "type": "github"
-      },
-      "original": {
-        "owner": "saghen",
-        "repo": "blink.cmp",
-        "type": "github"
-      }
-    },
-    "plugin-blink-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734896240,
-        "narHash": "sha256-Rrrh+O3FbBnaAnCHwPuQyfhH+XueSkQp6ipEkn6esGY=",
-        "owner": "saghen",
-        "repo": "blink.compat",
-        "rev": "74b251a1e9478c4fa6d7c6bc2921d7124e6f6cbb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "saghen",
-        "repo": "blink.compat",
-        "type": "github"
-      }
-    },
-    "plugin-bufdelete-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1708814161,
-        "narHash": "sha256-ljUNfmpImtxFCS19HC9kFlaLlqaPDltKtnx1+/6Y33U=",
-        "owner": "famiu",
-        "repo": "bufdelete.nvim",
-        "rev": "f6bcea78afb3060b198125256f897040538bcb81",
-        "type": "github"
-      },
-      "original": {
-        "owner": "famiu",
-        "repo": "bufdelete.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-catppuccin": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735299190,
-        "narHash": "sha256-lwQLmqm01FihJdad4QRMK23MTrouyOokyuX/3enWjzs=",
-        "owner": "catppuccin",
-        "repo": "nvim",
-        "rev": "f67b886d65a029f12ffa298701fb8f1efd89295d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "nvim",
-        "type": "github"
-      }
-    },
-    "plugin-ccc": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1727935067,
-        "narHash": "sha256-OhdR2sAQV5PvlhaKQ6rYneMmvQiN3QfymOeanpAs9wY=",
-        "owner": "uga-rosa",
-        "repo": "ccc.nvim",
-        "rev": "7c639042583c7bdc7ce2e37e5a0e0aa6d0659c6a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "uga-rosa",
-        "repo": "ccc.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-cellular-automaton": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1719777869,
-        "narHash": "sha256-nIv7ISRk0+yWd1lGEwAV6u1U7EFQj/T9F8pU6O0Wf0s=",
-        "owner": "Eandrju",
-        "repo": "cellular-automaton.nvim",
-        "rev": "11aea08aa084f9d523b0142c2cd9441b8ede09ed",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Eandrju",
-        "repo": "cellular-automaton.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-chatgpt": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1728720509,
-        "narHash": "sha256-+YVXAkG4pp7RGs8lGnNFc0kQcUV3O3kYBQaQ5Qa4wB0=",
-        "owner": "jackMort",
-        "repo": "ChatGPT.nvim",
-        "rev": "5b6d296eefc75331e2ff9f0adcffbd7d27862dd6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jackMort",
-        "repo": "ChatGPT.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-cheatsheet-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1640255456,
-        "narHash": "sha256-TYkGB7cON2t4GwMaR9H1MDG2j3btBv2AR37ade8kqTY=",
-        "owner": "sudormrfbin",
-        "repo": "cheatsheet.nvim",
-        "rev": "9716f9aaa94dd1fd6ce59b5aae0e5f25e2a463ef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "sudormrfbin",
-        "repo": "cheatsheet.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-cinnamon-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1722992123,
-        "narHash": "sha256-kccQ4iFMSQ8kvE7hYz90hBrsDLo7VohFj/6lEZZiAO8=",
-        "owner": "declancm",
-        "repo": "cinnamon.nvim",
-        "rev": "450cb3247765fed7871b41ef4ce5fa492d834215",
-        "type": "github"
-      },
-      "original": {
-        "owner": "declancm",
-        "repo": "cinnamon.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-cmp-buffer": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1660101488,
-        "narHash": "sha256-dG4U7MtnXThoa/PD+qFtCt76MQ14V1wX8GMYcvxEnbM=",
-        "owner": "hrsh7th",
-        "repo": "cmp-buffer",
-        "rev": "3022dbc9166796b644a841a02de8dd1cc1d311fa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hrsh7th",
-        "repo": "cmp-buffer",
-        "type": "github"
-      }
-    },
-    "plugin-cmp-luasnip": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1730707109,
-        "narHash": "sha256-86lKQPPyqFz8jzuLajjHMKHrYnwW6+QOcPyQEx6B+gw=",
-        "owner": "saadparwaiz1",
-        "repo": "cmp_luasnip",
-        "rev": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90",
-        "type": "github"
-      },
-      "original": {
-        "owner": "saadparwaiz1",
-        "repo": "cmp_luasnip",
-        "type": "github"
-      }
-    },
-    "plugin-cmp-nvim-lsp": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733823748,
-        "narHash": "sha256-iaihXNCF5bB5MdeoosD/kc3QtpA/QaIDZVLiLIurBSM=",
-        "owner": "hrsh7th",
-        "repo": "cmp-nvim-lsp",
-        "rev": "99290b3ec1322070bcfb9e846450a46f6efa50f0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hrsh7th",
-        "repo": "cmp-nvim-lsp",
-        "type": "github"
-      }
-    },
-    "plugin-cmp-path": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1664784283,
-        "narHash": "sha256-thppiiV3wjIaZnAXmsh7j3DUc6ceSCvGzviwFUnoPaI=",
-        "owner": "hrsh7th",
-        "repo": "cmp-path",
-        "rev": "91ff86cd9c29299a64f968ebb45846c485725f23",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hrsh7th",
-        "repo": "cmp-path",
-        "type": "github"
-      }
-    },
-    "plugin-cmp-treesitter": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1715596479,
-        "narHash": "sha256-8WAk9S+/7vSz7bVHdEzjbKUokU144fvnByIeJ1gAWhU=",
-        "owner": "ray-x",
-        "repo": "cmp-treesitter",
-        "rev": "958fcfa0d8ce46d215e19cc3992c542f576c4123",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ray-x",
-        "repo": "cmp-treesitter",
-        "type": "github"
-      }
-    },
-    "plugin-codewindow-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1717593052,
-        "narHash": "sha256-HAqVTAkFZ1/vBiBP/QDE1fmwOl/PbznAxz/jmUFxs88=",
-        "owner": "gorbit99",
-        "repo": "codewindow.nvim",
-        "rev": "dd7017617962943eb1d152fc58940f11c6775a4a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gorbit99",
-        "repo": "codewindow.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-comment-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1717957420,
-        "narHash": "sha256-h0kPue5Eqd5aeu4VoLH45pF0DmWWo1d8SnLICSQ63zc=",
-        "owner": "numToStr",
-        "repo": "Comment.nvim",
-        "rev": "e30b7f2008e52442154b66f7c519bfd2f1e32acb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numToStr",
-        "repo": "Comment.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-conform-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1737787854,
-        "narHash": "sha256-k/m2gmups5DWChd/vg7X3/3qkcEvfeKS9mc8MFZRx9E=",
-        "owner": "stevearc",
-        "repo": "conform.nvim",
-        "rev": "363243c03102a531a8203311d4f2ae704c620d9b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "stevearc",
-        "repo": "conform.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-copilot-cmp": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733947099,
-        "narHash": "sha256-erRL8bY/zuwuCZfttw+avTrFV7pjv2H6v73NzY2bymM=",
-        "owner": "zbirenbaum",
-        "repo": "copilot-cmp",
-        "rev": "15fc12af3d0109fa76b60b5cffa1373697e261d1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zbirenbaum",
-        "repo": "copilot-cmp",
-        "type": "github"
-      }
-    },
-    "plugin-copilot-lua": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734926641,
-        "narHash": "sha256-c2UE0dLBtoYMvMxg+jXzfsD+wN9sZLvftJq4gGmooZU=",
-        "owner": "zbirenbaum",
-        "repo": "copilot.lua",
-        "rev": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zbirenbaum",
-        "repo": "copilot.lua",
-        "type": "github"
-      }
-    },
-    "plugin-crates-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1727384188,
-        "narHash": "sha256-DIG0MXRTit4iEVoLlgsTK4znjam/QDjeZEpIDn6KHiE=",
-        "owner": "Saecki",
-        "repo": "crates.nvim",
-        "rev": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Saecki",
-        "repo": "crates.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-csharpls-extended": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734491815,
-        "narHash": "sha256-jO/vuNgP8JAOIturzPFvxMLL5y+6YTYsUxjWwX6Nyso=",
-        "owner": "Decodetalkers",
-        "repo": "csharpls-extended-lsp.nvim",
-        "rev": "4f56c06215d10c4fcfee8a7f04ba766c114aece0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Decodetalkers",
-        "repo": "csharpls-extended-lsp.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-dashboard-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1730526793,
-        "narHash": "sha256-Qi8kmC3U8Tvxh0pWIBtN3DuWJioEGWn7FqQ8lQwauRo=",
-        "owner": "glepnir",
-        "repo": "dashboard-nvim",
-        "rev": "ae309606940d26d8c9df8b048a6e136b6bbec478",
-        "type": "github"
-      },
-      "original": {
-        "owner": "glepnir",
-        "repo": "dashboard-nvim",
-        "type": "github"
-      }
-    },
-    "plugin-diffview-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1718279802,
-        "narHash": "sha256-SX+ybIzL/w6uyCy4iZKnWnzTFwqB1oXSgyYVAdpdKi8=",
-        "owner": "sindrets",
-        "repo": "diffview.nvim",
-        "rev": "4516612fe98ff56ae0415a259ff6361a89419b0a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "sindrets",
-        "repo": "diffview.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-dracula": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734597715,
-        "narHash": "sha256-9iRI5NW3mcVzduitY4sr679dRWAWVbZuCAEfgM1OIOs=",
-        "owner": "Mofiqul",
-        "repo": "dracula.nvim",
-        "rev": "515acae4fd294fcefa5b15237a333c2606e958d1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mofiqul",
-        "repo": "dracula.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-dressing-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734804193,
-        "narHash": "sha256-N4hB5wDgoqXrXxSfzDCrqmdDtdVvq+PtOS7FBPH7qXE=",
-        "owner": "stevearc",
-        "repo": "dressing.nvim",
-        "rev": "3a45525bb182730fe462325c99395529308f431e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "stevearc",
-        "repo": "dressing.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-elixir-tools": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735076861,
-        "narHash": "sha256-CoGTVSKifjqshk8hYaQfFYTYgEGsIb1hKdz6fIS81iU=",
-        "owner": "elixir-tools",
-        "repo": "elixir-tools.nvim",
-        "rev": "803fa69dbb457305cff98e3997bed2c4b51aea7c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "elixir-tools",
-        "repo": "elixir-tools.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-fastaction-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734546047,
-        "narHash": "sha256-1GSxTyXqufjkRtNK3drWlCn/mGJ9mM9bHMR6ZwWT6X8=",
-        "owner": "Chaitanyabsprip",
-        "repo": "fastaction.nvim",
-        "rev": "886e22d85e13115808e81ca367d5aaba02d9a25b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Chaitanyabsprip",
-        "repo": "fastaction.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-fidget-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734334336,
-        "narHash": "sha256-o0za2NxFtzHZa7PRIm9U/P1/fwJrxS1G79ukdGLhJ4Q=",
-        "owner": "j-hui",
-        "repo": "fidget.nvim",
-        "rev": "9238947645ce17d96f30842e61ba81147185b657",
-        "type": "github"
-      },
-      "original": {
-        "owner": "j-hui",
-        "repo": "fidget.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-flutter-tools": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735420417,
-        "narHash": "sha256-xfSdPhrSUwBYdE9ZA8GgwFvR70nOp+snbNrFHeIfwOM=",
-        "owner": "akinsho",
-        "repo": "flutter-tools.nvim",
-        "rev": "a526c30f1941a7472509aaedda13758f943c968e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "akinsho",
-        "repo": "flutter-tools.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-friendly-snippets": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733106470,
-        "narHash": "sha256-I8SRZxnoNC6SOWW+scoA77Jwyxcb4eUczppLdyOiZe0=",
-        "owner": "rafamadriz",
-        "repo": "friendly-snippets",
-        "rev": "efff286dd74c22f731cdec26a70b46e5b203c619",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rafamadriz",
-        "repo": "friendly-snippets",
-        "type": "github"
-      }
-    },
-    "plugin-fzf-lua": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1737131132,
-        "narHash": "sha256-0IdADUsIr+SZ0ort92jPPfGIH1EdcwELYz+TCmDCPPI=",
-        "owner": "ibhagwan",
-        "repo": "fzf-lua",
-        "rev": "fbe21aeb147b3dc8b188b5753a8e288ecedcee5e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ibhagwan",
-        "repo": "fzf-lua",
-        "type": "github"
-      }
-    },
-    "plugin-gesture-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731669851,
-        "narHash": "sha256-LTkttlDmKO9ngzrJrMWeeG9R0Bz/PoroCAF2URhUEbM=",
-        "owner": "notomo",
-        "repo": "gesture.nvim",
-        "rev": "dbd839bda337cb73911aeef06897eb29cb99f76f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "notomo",
-        "repo": "gesture.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-gitsigns-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732361574,
-        "narHash": "sha256-H7A+AxioiedSuC+jqRwP4c7DjZR/0j4o/fTUasT2urc=",
-        "owner": "lewis6991",
-        "repo": "gitsigns.nvim",
-        "rev": "5f808b5e4fef30bd8aca1b803b4e555da07fc412",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lewis6991",
-        "repo": "gitsigns.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-glow-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1703345545,
-        "narHash": "sha256-GsNcASzVvY0066kak2nvUY5luzanoBclqcUOsODww8g=",
-        "owner": "ellisonleao",
-        "repo": "glow.nvim",
-        "rev": "238070a686c1da3bccccf1079700eb4b5e19aea4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ellisonleao",
-        "repo": "glow.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-gruvbox": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732485864,
-        "narHash": "sha256-qasIg1nvAlUWUUzSZLF36jnoNm8PmQa3owgh0tKGgHk=",
-        "owner": "ellisonleao",
-        "repo": "gruvbox.nvim",
-        "rev": "68c3460a5d1d1a362318960035c9f3466d5011f5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ellisonleao",
-        "repo": "gruvbox.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-haskell-tools-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734222260,
-        "narHash": "sha256-gZVN9ADPO5wFOaf19FydCneb7aKTT9K1vcLoBURPEjk=",
-        "owner": "mrcjkb",
-        "repo": "haskell-tools.nvim",
-        "rev": "943b77b68a79d3991523ba4d373063c9355c6f55",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mrcjkb",
-        "repo": "haskell-tools.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-highlight-undo": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732378966,
-        "narHash": "sha256-b0JrMu3vbbYgyHPs9hyayMzUypFwugEAxvZOcuRMc/o=",
-        "owner": "tzachar",
-        "repo": "highlight-undo.nvim",
-        "rev": "5f588b420179a31d7073854bfd07ed9d5f364645",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tzachar",
-        "repo": "highlight-undo.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-hop-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1694283445,
-        "narHash": "sha256-SnuFeD/lrMxKtpBRPgIwdG0kVF7BWe02PiV7URVDASI=",
-        "owner": "phaazon",
-        "repo": "hop.nvim",
-        "rev": "1a1eceafe54b5081eae4cb91c723abd1d450f34b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "phaazon",
-        "repo": "hop.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-icon-picker-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1704321319,
-        "narHash": "sha256-VZKsVeSmPR3AA8267Mtd5sSTZl2CAqnbgqceCptgp4w=",
-        "owner": "ziontee113",
-        "repo": "icon-picker.nvim",
-        "rev": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ziontee113",
-        "repo": "icon-picker.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-image-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735173549,
-        "narHash": "sha256-Sjbmf4BmjkjAorT3tojbC7JivJagFamAVgzwcCipa8k=",
-        "owner": "3rd",
-        "repo": "image.nvim",
-        "rev": "b991fc7f845bc6ab40c6ec00b39750dcd5190010",
-        "type": "github"
-      },
-      "original": {
-        "owner": "3rd",
-        "repo": "image.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-indent-blankline": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733296464,
-        "narHash": "sha256-H3lUQZDvgj3a2STYeMUDiOYPe7rfsy08tJ4SlDd+LuE=",
-        "owner": "lukas-reineke",
-        "repo": "indent-blankline.nvim",
-        "rev": "259357fa4097e232730341fa60988087d189193a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lukas-reineke",
-        "repo": "indent-blankline.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-leap-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1722337962,
-        "narHash": "sha256-PFD/UliAHKk2ga+7p/GmoZGqZFWenIVLkzmO+FkhvrY=",
-        "owner": "ggandor",
-        "repo": "leap.nvim",
-        "rev": "c6bfb191f1161fbabace1f36f578a20ac6c7642c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ggandor",
-        "repo": "leap.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-lsp-lines": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734793049,
-        "narHash": "sha256-jHiIZemneQACTDYZXBJqX2/PRTBoxq403ILvt1Ej1ZM=",
-        "owner": "~whynothugo",
-        "repo": "lsp_lines.nvim",
-        "rev": "a92c755f182b89ea91bd8a6a2227208026f27b4d",
-        "type": "sourcehut"
-      },
-      "original": {
-        "owner": "~whynothugo",
-        "repo": "lsp_lines.nvim",
-        "type": "sourcehut"
-      }
-    },
-    "plugin-lsp-signature": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726445971,
-        "narHash": "sha256-W6bN3R10B84noK7MOzvUOIc82WwyojIS97iFL/dO5yk=",
-        "owner": "ray-x",
-        "repo": "lsp_signature.nvim",
-        "rev": "fc38521ea4d9ec8dbd4c2819ba8126cea743943b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ray-x",
-        "repo": "lsp_signature.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-lspkind": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733408701,
-        "narHash": "sha256-OCvKUBGuzwy8OWOL1x3Z3fo+0+GyBMI9TX41xSveqvE=",
-        "owner": "onsails",
-        "repo": "lspkind-nvim",
-        "rev": "d79a1c3299ad0ef94e255d045bed9fa26025dab6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "onsails",
-        "repo": "lspkind-nvim",
-        "type": "github"
-      }
-    },
-    "plugin-lspsaga": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1670360222,
-        "narHash": "sha256-7ENInq3LAPPTdm0Fb7klOc630j8m4LRj1kLZZFYLh68=",
-        "owner": "tami5",
-        "repo": "lspsaga.nvim",
-        "rev": "5faeec9f2508d2d49a66c0ac0d191096b4e3fa81",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tami5",
-        "repo": "lspsaga.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-lua-utils-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1708177208,
-        "narHash": "sha256-9ildzQEMkXKZ3LHq+khGFgRQFxlIXQclQ7QU3fcU1C4=",
-        "owner": "nvim-neorg",
-        "repo": "lua-utils.nvim",
-        "rev": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-neorg",
-        "repo": "lua-utils.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-lualine": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731050126,
-        "narHash": "sha256-IN6Qz3jGxUcylYiRTyd8j6me3pAoqJsJXtFUvph/6EI=",
-        "owner": "hoob3rt",
-        "repo": "lualine.nvim",
-        "rev": "2a5bae925481f999263d6f5ed8361baef8df4f83",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hoob3rt",
-        "repo": "lualine.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-luasnip": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733162004,
-        "narHash": "sha256-efDe3RXncnNVkj37AmIv8oj0DKurB50Dziao5FGTLP4=",
-        "owner": "L3MON4D3",
-        "repo": "LuaSnip",
-        "rev": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "L3MON4D3",
-        "repo": "LuaSnip",
-        "type": "github"
-      }
-    },
-    "plugin-lz-n": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735437369,
-        "narHash": "sha256-6NIXqwmX7RgwiZVEzmTnkJgmrPqFNx12ayIcRgNIaEs=",
-        "owner": "nvim-neorocks",
-        "repo": "lz.n",
-        "rev": "32be28a221b9c98e56841458e4b20c150a4169c4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-neorocks",
-        "repo": "lz.n",
-        "type": "github"
-      }
-    },
-    "plugin-lzn-auto-require": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731009187,
-        "narHash": "sha256-KC1z+zC9vKODllZVpBu+udzM12oYJaS8e6LdXWtQ89U=",
-        "owner": "horriblename",
-        "repo": "lzn-auto-require",
-        "rev": "a075ed51976323fd7fc44ccfca89fe0449a08cca",
-        "type": "github"
-      },
-      "original": {
-        "owner": "horriblename",
-        "ref": "require-rewrite",
-        "repo": "lzn-auto-require",
-        "type": "github"
-      }
-    },
-    "plugin-mind-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1679526071,
-        "narHash": "sha256-JIhAhQYGLLRucwlhzfckQYU5qjqbHtNH52JlGS5a79w=",
-        "owner": "phaazon",
-        "repo": "mind.nvim",
-        "rev": "002137dd7cf97865ebd01b6a260209d2daf2da66",
-        "type": "github"
-      },
-      "original": {
-        "owner": "phaazon",
-        "repo": "mind.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-mini-ai": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733662803,
-        "narHash": "sha256-b/776l9nYM9e2atzXrvOk9dCxjzIuW/+iINC/yPv88Y=",
-        "owner": "echasnovski",
-        "repo": "mini.ai",
-        "rev": "ebb04799794a7f94628153991e6334c3304961b8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.ai",
-        "type": "github"
-      }
-    },
-    "plugin-mini-align": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735582248,
-        "narHash": "sha256-oHub8dEihIx4kcP3CD9GXG1SUObJUVpH4bg2Z6PmadQ=",
-        "owner": "echasnovski",
-        "repo": "mini.align",
-        "rev": "e715137aece7d05734403d793b8b6b64486bc812",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.align",
-        "type": "github"
-      }
-    },
-    "plugin-mini-animate": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733078395,
-        "narHash": "sha256-ZePmJuHCCymTgaK46nSg5tRloxs+UKrVgVmT++rGKpc=",
-        "owner": "echasnovski",
-        "repo": "mini.animate",
-        "rev": "d14190ac3040116540889e2ebc25f488b195799e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.animate",
-        "type": "github"
-      }
-    },
-    "plugin-mini-base16": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734960100,
-        "narHash": "sha256-VGs4k/xDujPcA0Nv5T18ybSv1iqnzg0AFmaweRdhvDM=",
-        "owner": "echasnovski",
-        "repo": "mini.base16",
-        "rev": "23453dacc1606e5d42238d82f0b42a2985386b62",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.base16",
-        "type": "github"
-      }
-    },
-    "plugin-mini-basics": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1730194519,
-        "narHash": "sha256-R8POaMcgb6SBOxIpanZsswieywapnU7zDNjQMRTkR8U=",
-        "owner": "echasnovski",
-        "repo": "mini.basics",
-        "rev": "67c10b3436d5d3b892715137f4773e71c6753b13",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.basics",
-        "type": "github"
-      }
-    },
-    "plugin-mini-bracketed": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1737036218,
-        "narHash": "sha256-y+tGFF1H37ES/hnEtr3GJK3GeB6D5s8ZdSpvzl+lh3s=",
-        "owner": "echasnovski",
-        "repo": "mini.bracketed",
-        "rev": "0091e11fabe34973fc038a8d0d0485202742e403",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.bracketed",
-        "type": "github"
-      }
-    },
-    "plugin-mini-bufremove": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1730726192,
-        "narHash": "sha256-CB6ZIlrCQlh2W44Knnb10REDcvj4jcYkW/9CiOaoH2E=",
-        "owner": "echasnovski",
-        "repo": "mini.bufremove",
-        "rev": "285bdac9596ee7375db50c0f76ed04336dcd2685",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.bufremove",
-        "type": "github"
-      }
-    },
-    "plugin-mini-clue": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1737130586,
-        "narHash": "sha256-/0DpZV/jXuhaqBz5j4JN3xmofATlwPMHNSm/uTXALg0=",
-        "owner": "echasnovski",
-        "repo": "mini.clue",
-        "rev": "63e42dad781b9ed4845d90ef1da8c52dfb6dce3f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.clue",
-        "type": "github"
-      }
-    },
-    "plugin-mini-colors": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1730726192,
-        "narHash": "sha256-B2JahCUhKpYwOJrl+BhSp3UQFiyyMGJAYKGK+uMv3fk=",
-        "owner": "echasnovski",
-        "repo": "mini.colors",
-        "rev": "d64b1c0f520579d905f97208eca85329e664ab88",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.colors",
-        "type": "github"
-      }
-    },
-    "plugin-mini-comment": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736611383,
-        "narHash": "sha256-vAgBDSVtXCP+rlu+cmXdoZQBGShyH7KfL8E/gvDMfnM=",
-        "owner": "echasnovski",
-        "repo": "mini.comment",
-        "rev": "6e1f9a8ebbf6f693fa3787ceda8ca3bf3cb6aec7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.comment",
-        "type": "github"
-      }
-    },
-    "plugin-mini-completion": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732271068,
-        "narHash": "sha256-dlQCfHUQX9rPiSYZSRipezHX0CG/redbV2g7cpwwExY=",
-        "owner": "echasnovski",
-        "repo": "mini.completion",
-        "rev": "6eb9546685c4e1c4af2365b87166d4afa39d8a1b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.completion",
-        "type": "github"
-      }
-    },
-    "plugin-mini-diff": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735324663,
-        "narHash": "sha256-dRvW/1lfVShiHmRU0mQA5g5xDyQ0EVtVLLZ0y6WSedg=",
-        "owner": "echasnovski",
-        "repo": "mini.diff",
-        "rev": "00f072250061ef498f91ed226918c9ec31a416a4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.diff",
-        "type": "github"
-      }
-    },
-    "plugin-mini-doc": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1723308950,
-        "narHash": "sha256-Q3DAEV1ZHS+lFhZKFCNoIjn41ksk7WRrVP2b2d6uSss=",
-        "owner": "echasnovski",
-        "repo": "mini.doc",
-        "rev": "bb73a3d1ff390f7e2740027ea2567017099a237c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.doc",
-        "type": "github"
-      }
-    },
-    "plugin-mini-extra": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736279066,
-        "narHash": "sha256-lUJrviUjAmJ70g2y93aNw3e1mHGHoB9lbh44HGP7zQs=",
-        "owner": "echasnovski",
-        "repo": "mini.extra",
-        "rev": "477e3dda7b597b49bc1373951ea7da4da834c352",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.extra",
-        "type": "github"
-      }
-    },
-    "plugin-mini-files": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736535707,
-        "narHash": "sha256-UHW78m4BiYMMrABwdkyyzQUENgQrVFbWJnmNdRMtr0w=",
-        "owner": "echasnovski",
-        "repo": "mini.files",
-        "rev": "d0f03a5c38836fd2cce3dc80734124959002078c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.files",
-        "type": "github"
-      }
-    },
-    "plugin-mini-fuzzy": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1730726192,
-        "narHash": "sha256-XvDkDfwPcBxySuz58f2mpWTeo8EsOnMvZUcNI8HNZg8=",
-        "owner": "echasnovski",
-        "repo": "mini.fuzzy",
-        "rev": "faa5a6c0d29c28012c90bd011162963a58715428",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.fuzzy",
-        "type": "github"
-      }
-    },
-    "plugin-mini-git": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736535710,
-        "narHash": "sha256-rXuKopyZBCBbpKuytCdm8keruSNK1ohk2NdeZv1wifI=",
-        "owner": "echasnovski",
-        "repo": "mini-git",
-        "rev": "fc13dde6cfe87cf25a4fd1ee177c0d157468436b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini-git",
-        "type": "github"
-      }
-    },
-    "plugin-mini-hipatterns": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733141274,
-        "narHash": "sha256-zJ8OMzfcBh9NtSg2FHDjB5DFX9C2qZRo8t8lc097sCI=",
-        "owner": "echasnovski",
-        "repo": "mini.hipatterns",
-        "rev": "f34975103a38b3f608219a1324cdfc58ea660b8b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.hipatterns",
-        "type": "github"
-      }
-    },
-    "plugin-mini-hues": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734960100,
-        "narHash": "sha256-4y79ejOkRL/fajZ4jC8t4K6EgNbnTsH++mIjmo6G3q0=",
-        "owner": "echasnovski",
-        "repo": "mini.hues",
-        "rev": "ae6ad4c666ff42c1102344fe1eba18bb486f2e46",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.hues",
-        "type": "github"
-      }
-    },
-    "plugin-mini-icons": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1737036219,
-        "narHash": "sha256-w0PxiTj9uiUffZXkMM18IO/b/zPpdRKW9ydyhvXRoqE=",
-        "owner": "echasnovski",
-        "repo": "mini.icons",
-        "rev": "910db5df9724d65371182948f921fce23c2c881e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.icons",
-        "type": "github"
-      }
-    },
-    "plugin-mini-indentscope": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1737036220,
-        "narHash": "sha256-Mrzc7oHXxyEGqdE003qiC9unScyb7i5A6+l8Do7yxws=",
-        "owner": "echasnovski",
-        "repo": "mini.indentscope",
-        "rev": "613df2830d7faeae7483ba2e736683154b95921e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.indentscope",
-        "type": "github"
-      }
-    },
-    "plugin-mini-jump": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733662809,
-        "narHash": "sha256-qMP9ezk4xZov5S4vrUFM62lnc4YkEaZL1EVzdXwDq1Q=",
-        "owner": "echasnovski",
-        "repo": "mini.jump",
-        "rev": "bb93d998c9db6936697746330411f5fb9957145e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.jump",
-        "type": "github"
-      }
-    },
-    "plugin-mini-jump2d": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733662811,
-        "narHash": "sha256-+DihKCh6GYwin3H9YD+q30MLMRNXvvb1GtKnfBinGjc=",
-        "owner": "echasnovski",
-        "repo": "mini.jump2d",
-        "rev": "88077058297e80f1c76a18ed801ae9d7064187c6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.jump2d",
-        "type": "github"
-      }
-    },
-    "plugin-mini-map": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1725613927,
-        "narHash": "sha256-dL+d92+GLAILQ/A1JVCwoe3B5WtwVK01tPuC+fOTB5A=",
-        "owner": "echasnovski",
-        "repo": "mini.map",
-        "rev": "4c58e755d75f9999abcd3b3c6e934734b6a8b098",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.map",
-        "type": "github"
-      }
-    },
-    "plugin-mini-misc": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734103112,
-        "narHash": "sha256-qnYa4IZk14MGZArmVpn15l+P9cwtFWomBVxRuYHVyXc=",
-        "owner": "echasnovski",
-        "repo": "mini.misc",
-        "rev": "645fb9367c19bb485902e54e5451425981498601",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.misc",
-        "type": "github"
-      }
-    },
-    "plugin-mini-move": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1723711319,
-        "narHash": "sha256-nX0eAlhMnKhAftgM6qeHUuawagumLQMPKDkqZNPLljg=",
-        "owner": "echasnovski",
-        "repo": "mini.move",
-        "rev": "4caa1c212f5ca3d1633d21cfb184808090ed74b1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.move",
-        "type": "github"
-      }
-    },
-    "plugin-mini-notify": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736790793,
-        "narHash": "sha256-q27j14OV6LAfoxeqBG75GSiqtqmW37GOPHpmA2fD4gs=",
-        "owner": "echasnovski",
-        "repo": "mini.notify",
-        "rev": "05e598d5b349bd66404d576e6a4d4340aea5f194",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.notify",
-        "type": "github"
-      }
-    },
-    "plugin-mini-operators": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731776514,
-        "narHash": "sha256-+Zhy0AhuMPSHnM6dqbV45Aa7dS7XJ4mpfcHApSbuy8A=",
-        "owner": "echasnovski",
-        "repo": "mini.operators",
-        "rev": "7cb4dc66c51a3d736d347bbc517dc73dc7d28888",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.operators",
-        "type": "github"
-      }
-    },
-    "plugin-mini-pairs": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1728656795,
-        "narHash": "sha256-PtHxLKU1smVTx655r5SINxuz5CJmZWnBW70T8zJ/oxM=",
-        "owner": "echasnovski",
-        "repo": "mini.pairs",
-        "rev": "7e834c5937d95364cc1740e20d673afe2d034cdb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.pairs",
-        "type": "github"
-      }
-    },
-    "plugin-mini-pick": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736696004,
-        "narHash": "sha256-Q4GD0WzUYNtoBMx8pIl6fX5glKn1oflS4HZVC+w/eAM=",
-        "owner": "echasnovski",
-        "repo": "mini.pick",
-        "rev": "09ade94d2c9c5133db9ae00f3693d82eae78e9be",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.pick",
-        "type": "github"
-      }
-    },
-    "plugin-mini-sessions": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735582250,
-        "narHash": "sha256-vyn8MGyOWFgJ5QVvjYb7K1cKDtg9qWnWYMNf80+kpHk=",
-        "owner": "echasnovski",
-        "repo": "mini.sessions",
-        "rev": "71c9ae596664ac110560d27eb928fc24e22bc53d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.sessions",
-        "type": "github"
-      }
-    },
-    "plugin-mini-snippets": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736611383,
-        "narHash": "sha256-How9m7KTo66FrwjZQlgZRmJ5toFKn/+GnUbx/0va3lM=",
-        "owner": "echasnovski",
-        "repo": "mini.snippets",
-        "rev": "72920f62e3dd1330720e94e8f5d42592f3a1ecf8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.snippets",
-        "type": "github"
-      }
-    },
-    "plugin-mini-splitjoin": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1719822504,
-        "narHash": "sha256-LDIbh5KfupTI4zkYOlLmVCd3DuZRhx5lTASN53VG34g=",
-        "owner": "echasnovski",
-        "repo": "mini.splitjoin",
-        "rev": "3e92f6764e770ba392325cad3a4497adcada695f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.splitjoin",
-        "type": "github"
-      }
-    },
-    "plugin-mini-starter": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736858747,
-        "narHash": "sha256-pJYkZUo+L3IeGCRdTipqTzMv+HatpNnyRxshaygKtIw=",
-        "owner": "echasnovski",
-        "repo": "mini.starter",
-        "rev": "4b257cfc93241e8c8cde3f9302d1616ad4e0d036",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.starter",
-        "type": "github"
-      }
-    },
-    "plugin-mini-statusline": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735582251,
-        "narHash": "sha256-AQ2N93JDjtFpgerWTzRspmxrl9oQuALbeCUxBO4ZPqo=",
-        "owner": "echasnovski",
-        "repo": "mini.statusline",
-        "rev": "1b0edf76fe2af015f8c989385ff949f1db7aade2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.statusline",
-        "type": "github"
-      }
-    },
-    "plugin-mini-surround": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733662812,
-        "narHash": "sha256-okWJlG0KOdg1ShvkIIMnPSoOzGd7K84eDcp5kx6eVP8=",
-        "owner": "echasnovski",
-        "repo": "mini.surround",
-        "rev": "aa5e245829dd12d8ff0c96ef11da28681d6049aa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.surround",
-        "type": "github"
-      }
-    },
-    "plugin-mini-tabline": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1729176541,
-        "narHash": "sha256-nucUqSN8w2xBnDp1dFBgRVVvfVoqZMdx7Zj78wdFAP0=",
-        "owner": "echasnovski",
-        "repo": "mini.tabline",
-        "rev": "06ef4ecaeca2e362c7d31113435d86d144b3cbbe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.tabline",
-        "type": "github"
-      }
-    },
-    "plugin-mini-test": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1729520957,
-        "narHash": "sha256-NtsX441k84owAAJywq4G2rMvV6d7UR2K75G8oKam+gs=",
-        "owner": "echasnovski",
-        "repo": "mini.test",
-        "rev": "86a64d5a4bf9d73ebf5875edaae0d878f64f5e48",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.test",
-        "type": "github"
-      }
-    },
-    "plugin-mini-trailspace": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1725613928,
-        "narHash": "sha256-JKYvFz8g8kVZvxE44RhwoHXQykghXx7ebW/Mj1ZdJIw=",
-        "owner": "echasnovski",
-        "repo": "mini.trailspace",
-        "rev": "3a328e62559c33014e422fb9ae97afc4208208b1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.trailspace",
-        "type": "github"
-      }
-    },
-    "plugin-mini-visits": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1737036221,
-        "narHash": "sha256-Q+m1gZ5Obu6Zzo87Djt6VCX76ZjdOiLb0j771jP8uQE=",
-        "owner": "echasnovski",
-        "repo": "mini.visits",
-        "rev": "90f20ba6ab7d3d7cb984fffddd82f5f6c7a6bea7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "echasnovski",
-        "repo": "mini.visits",
-        "type": "github"
-      }
-    },
-    "plugin-minimap-vim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1710689313,
-        "narHash": "sha256-GR8VAHla5HWry1TAZQv0Xp7iG256vIGeQcBGMxyt310=",
-        "owner": "wfxr",
-        "repo": "minimap.vim",
-        "rev": "395378137e6180762d5b963ca9ad5ac2db5d3283",
-        "type": "github"
-      },
-      "original": {
-        "owner": "wfxr",
-        "repo": "minimap.vim",
-        "type": "github"
-      }
-    },
-    "plugin-modes-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734414076,
-        "narHash": "sha256-ShIK8ROowT1yFHgSIVHUFnnQOEMr3YPIqw4ixzR8w8M=",
-        "owner": "mvllow",
-        "repo": "modes.nvim",
-        "rev": "c7a4b1b383606832aab150902719bd5eb5cdb2b0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mvllow",
-        "repo": "modes.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-neo-tree-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735302061,
-        "narHash": "sha256-tZMneZsEbB5bgZgYq4ZWwK25B3vcnn80Q7diKcRoEv4=",
-        "owner": "nvim-neo-tree",
-        "repo": "neo-tree.nvim",
-        "rev": "a9f8943b4c31f8460d25c71e0f463d65e9775f1c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-neo-tree",
-        "repo": "neo-tree.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-neocord": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733429637,
-        "narHash": "sha256-g/pq6hFo7duonIl1wWoxbJUTh/IRTH3hHEoQUdoiqKE=",
-        "owner": "IogaMaster",
-        "repo": "neocord",
-        "rev": "4d55d8dab2d5f2f272192add7a2c21982039c699",
-        "type": "github"
-      },
-      "original": {
-        "owner": "IogaMaster",
-        "repo": "neocord",
-        "type": "github"
-      }
-    },
-    "plugin-neodev-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1720260306,
-        "narHash": "sha256-hOjzlo/IqmV8tYjGwfmcCPEmHYsWnEIwtHZdhpwA1kM=",
-        "owner": "folke",
-        "repo": "neodev.nvim",
-        "rev": "46aa467dca16cf3dfe27098042402066d2ae242d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "folke",
-        "repo": "neodev.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-neorg": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734188232,
-        "narHash": "sha256-xH87caxEebrWLwY/v3xyyOy6PTG/ZqX2OfCdwg/RqDY=",
-        "owner": "nvim-neorg",
-        "repo": "neorg",
-        "rev": "6b945909d84b5aeadc875f9b3f529ec44b9bc60f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-neorg",
-        "repo": "neorg",
-        "type": "github"
-      }
-    },
-    "plugin-neorg-telescope": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1722358034,
-        "narHash": "sha256-ei4uUqpIQjGKzu5ryu0Hlmis9TS9FJsYnjt4J4QdWlw=",
-        "owner": "nvim-neorg",
-        "repo": "neorg-telescope",
-        "rev": "ddb2556644cae922699a239bbb0fe16e25b084b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-neorg",
-        "repo": "neorg-telescope",
-        "type": "github"
-      }
-    },
-    "plugin-new-file-template-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1721518222,
-        "narHash": "sha256-g0IjJrHRXw7U9goVLzVYUyHBSsDZGHMpi3YZPhg64zA=",
-        "owner": "otavioschwanck",
-        "repo": "new-file-template.nvim",
-        "rev": "6ac66669dbf2dc5cdee184a4fe76d22465ca67e8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "otavioschwanck",
-        "repo": "new-file-template.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-noice-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734026622,
-        "narHash": "sha256-OpwgNTGunmy6Y7D/k0T+DFK/WJ8MeVTGWwjiPTQlvEY=",
-        "owner": "folke",
-        "repo": "noice.nvim",
-        "rev": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "folke",
-        "repo": "noice.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-none-ls": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1708525772,
-        "narHash": "sha256-VCDUKiy9C3Bu9suf2bI6XSis1+j01oFC3GFPyQxi74c=",
-        "owner": "nvimtools",
-        "repo": "none-ls.nvim",
-        "rev": "bb680d752cec37949faca7a1f509e2fe67ab418a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvimtools",
-        "repo": "none-ls.nvim",
-        "rev": "bb680d752cec37949faca7a1f509e2fe67ab418a",
-        "type": "github"
-      }
-    },
-    "plugin-nord": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1737019140,
-        "narHash": "sha256-ZhDS7Y90DKp+jkUqcoQRf/zHy4DVgSDQXrnl3sBYJXs=",
-        "owner": "gbprod",
-        "repo": "nord.nvim",
-        "rev": "b0f3ed242fd8e5bafa7231367821d46c6c835dd8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gbprod",
-        "repo": "nord.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-nui-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733856815,
-        "narHash": "sha256-6U7E/i5FuNXQy+sF4C5DVxuTPqNKD5wxUgFohpOjm9Q=",
-        "owner": "MunifTanjim",
-        "repo": "nui.nvim",
-        "rev": "53e907ffe5eedebdca1cd503b00aa8692068ca46",
-        "type": "github"
-      },
-      "original": {
-        "owner": "MunifTanjim",
-        "repo": "nui.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-autopairs": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731803843,
-        "narHash": "sha256-LbaxiU3ienVBcMKrug3Coppc4R+MD2rjREw7rHQim1w=",
-        "owner": "windwp",
-        "repo": "nvim-autopairs",
-        "rev": "b464658e9b880f463b9f7e6ccddd93fb0013f559",
-        "type": "github"
-      },
-      "original": {
-        "owner": "windwp",
-        "repo": "nvim-autopairs",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-bufferline-lua": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732824069,
-        "narHash": "sha256-zqz2GMius0gLxtgxt12RmLUVQFVaWe+MQaGCfUGr6bI=",
-        "owner": "akinsho",
-        "repo": "nvim-bufferline.lua",
-        "rev": "261a72b90d6db4ed8014f7bda976bcdc9dd7ce76",
-        "type": "github"
-      },
-      "original": {
-        "owner": "akinsho",
-        "repo": "nvim-bufferline.lua",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-cmp": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734672427,
-        "narHash": "sha256-Z/Qy2ErbCa7dbjZVuJUkMmb4d24amNunNgRcbCGPfOg=",
-        "owner": "hrsh7th",
-        "repo": "nvim-cmp",
-        "rev": "b555203ce4bd7ff6192e759af3362f9d217e8c89",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hrsh7th",
-        "repo": "nvim-cmp",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-colorizer-lua": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1738229011,
-        "narHash": "sha256-IEgZnIUeNXRKZ4eV1+KknluyKZj68HBWe1EW+LueuGA=",
-        "owner": "catgoose",
-        "repo": "nvim-colorizer.lua",
-        "rev": "9b5fe0450bfb2521c6cea29391e5ec571f129136",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catgoose",
-        "repo": "nvim-colorizer.lua",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-cursorline": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1650034925,
-        "narHash": "sha256-Uhw65p1KBjs8KsVOmTzuiu3XKclxBob8AVdWEt30C/8=",
-        "owner": "yamatsum",
-        "repo": "nvim-cursorline",
-        "rev": "804f0023692653b2b2368462d67d2a87056947f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "yamatsum",
-        "repo": "nvim-cursorline",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-dap": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735568902,
-        "narHash": "sha256-5iaXim9bDvSAI6jUXgu2OEk/KivfAsMTRry+UTHs2Gk=",
-        "owner": "mfussenegger",
-        "repo": "nvim-dap",
-        "rev": "ffb077e65259f13be096ea6d603e3575a76b214a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mfussenegger",
-        "repo": "nvim-dap",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-dap-go": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1727922873,
-        "narHash": "sha256-wcGp5df1ER5T5oLVitWE02OywgJs3V4pazcGU5qVaUY=",
-        "owner": "leoluz",
-        "repo": "nvim-dap-go",
-        "rev": "6aa88167ea1224bcef578e8c7160fe8afbb44848",
-        "type": "github"
-      },
-      "original": {
-        "owner": "leoluz",
-        "repo": "nvim-dap-go",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-dap-ui": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735324898,
-        "narHash": "sha256-psIBQpx3tV2UWm5hZTMPBANcXHPAX24dIuDq8Qcscxs=",
-        "owner": "rcarriga",
-        "repo": "nvim-dap-ui",
-        "rev": "e94d98649dccb6a3884b66aabc2e07beb279e535",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rcarriga",
-        "repo": "nvim-dap-ui",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-docs-view": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733658747,
-        "narHash": "sha256-b5aH8Tj+tMk0BjNCgdeCEeR26oQ9NCobj98P7IDgIPY=",
-        "owner": "amrbashir",
-        "repo": "nvim-docs-view",
-        "rev": "1b97f8f954d74c46061bf289b6cea9232484c12c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "amrbashir",
-        "repo": "nvim-docs-view",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-lightbulb": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734997673,
-        "narHash": "sha256-byvgRJvvt5rhiUVWdreY2jELXoPVld5EKQlOXwjNgWE=",
-        "owner": "kosayoda",
-        "repo": "nvim-lightbulb",
-        "rev": "3ac0791be37ba9cc7939f1ad90ebc5e75abf4eea",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kosayoda",
-        "repo": "nvim-lightbulb",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-lint": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1737487916,
-        "narHash": "sha256-DKfivSjBFra/iXIuYQa7Mv5f2LglNbQTr8bQ+sCm8to=",
-        "owner": "mfussenegger",
-        "repo": "nvim-lint",
-        "rev": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mfussenegger",
-        "repo": "nvim-lint",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-lspconfig": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735439232,
-        "narHash": "sha256-6a1HjpLYdZ+ZmWM1B0tv631A3EHHstPrjaV15UnVtoY=",
-        "owner": "neovim",
-        "repo": "nvim-lspconfig",
-        "rev": "8b15a1a597a59f4f5306fad9adfe99454feab743",
-        "type": "github"
-      },
-      "original": {
-        "owner": "neovim",
-        "repo": "nvim-lspconfig",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-metals": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735386491,
-        "narHash": "sha256-G9V7fX65uW4z7kiuiP8mLtEjLoTJ1mkltj51OlN5/oM=",
-        "owner": "scalameta",
-        "repo": "nvim-metals",
-        "rev": "e6b02c99161b43c67cfe1d6e5f9a9b9a0bb4701c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "scalameta",
-        "repo": "nvim-metals",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-navbuddy": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1716111817,
-        "narHash": "sha256-sZ1M27qNbLMHKR4Zu0NfJoBcQxJbhmW7Cx74Acirlww=",
-        "owner": "SmiteshP",
-        "repo": "nvim-navbuddy",
-        "rev": "f22bac988f2dd073601d75ba39ea5636ab6e38cb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SmiteshP",
-        "repo": "nvim-navbuddy",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-navic": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1701345631,
-        "narHash": "sha256-0p5n/V8Jlj9XyxV/fuMwsbQ7oV5m9H2GqZZEA/njxCQ=",
-        "owner": "SmiteshP",
-        "repo": "nvim-navic",
-        "rev": "8649f694d3e76ee10c19255dece6411c29206a54",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SmiteshP",
-        "repo": "nvim-navic",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-neoclip": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734898459,
-        "narHash": "sha256-RCMZi1DM9JFrXWQ5w2wOjFzpANkiukn+RvHB9swMtbk=",
-        "owner": "AckslD",
-        "repo": "nvim-neoclip.lua",
-        "rev": "5e5e010251281f4aea69cfc1d4976ffe6065cf0f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "AckslD",
-        "repo": "nvim-neoclip.lua",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-nio": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1720707425,
-        "narHash": "sha256-i6imNTb1xrfBlaeOyxyIwAZ/+o6ew9C4/z34a7/BgFg=",
-        "owner": "nvim-neotest",
-        "repo": "nvim-nio",
-        "rev": "a428f309119086dc78dd4b19306d2d67be884eee",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-neotest",
-        "repo": "nvim-nio",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-notify": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735562588,
-        "narHash": "sha256-9jDpoLLto9WgTsV399WeE2XGrTJXWTYbcJ+zOFWldAA=",
-        "owner": "rcarriga",
-        "repo": "nvim-notify",
-        "rev": "c3797193536711b5d8983975791c4b11dc35ab3a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rcarriga",
-        "repo": "nvim-notify",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-scrollbar": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1729162132,
-        "narHash": "sha256-/nB7eP2Rz/A9zMXrNEH4FReo6eZS0C/SEGvKhxV7AUA=",
-        "owner": "petertriho",
-        "repo": "nvim-scrollbar",
-        "rev": "6994eb9f73d5fdc36ee2c8717940e8c853e51a49",
-        "type": "github"
-      },
-      "original": {
-        "owner": "petertriho",
-        "repo": "nvim-scrollbar",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-session-manager": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1728423652,
-        "narHash": "sha256-W9jtfVXHC8MQJwdbxakNqhd+xh/auQb3U09XKdN2Wzw=",
-        "owner": "Shatur",
-        "repo": "neovim-session-manager",
-        "rev": "ce43f2eb2a52492157d7742e5f684b9a42bb3e5c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Shatur",
-        "repo": "neovim-session-manager",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-surround": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732818349,
-        "narHash": "sha256-sC+V86FEDfIapY4Qy0Ch2dTUpqe+C/xEUR/iSIEY6LA=",
-        "owner": "kylechui",
-        "repo": "nvim-surround",
-        "rev": "9f0cb495f25bff32c936062d85046fbda0c43517",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kylechui",
-        "repo": "nvim-surround",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-tree-lua": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734820548,
-        "narHash": "sha256-4PmP31vYPH9xw4AjV5rDSKvcvZGTnIaPfR4Bwc0lAiA=",
-        "owner": "nvim-tree",
-        "repo": "nvim-tree.lua",
-        "rev": "68fc4c20f5803444277022c681785c5edd11916d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-tree",
-        "repo": "nvim-tree.lua",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-treesitter-context": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734710732,
-        "narHash": "sha256-TIFMPKzD2ero1eK9aVfY1iKEvf/Sw8SL/9mk9omCQ3c=",
-        "owner": "nvim-treesitter",
-        "repo": "nvim-treesitter-context",
-        "rev": "2bcf700b59bc92850ca83a1c02e86ba832e0fae0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-treesitter",
-        "repo": "nvim-treesitter-context",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-ts-autotag": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733164313,
-        "narHash": "sha256-v2NTFBIzKTYizUPWB3uhpnTGVZWaelhE3MT5+BDA6Do=",
-        "owner": "windwp",
-        "repo": "nvim-ts-autotag",
-        "rev": "1cca23c9da708047922d3895a71032bc0449c52d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "windwp",
-        "repo": "nvim-ts-autotag",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-ufo": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735147722,
-        "narHash": "sha256-etyfm4KpwjYN+kkotOMl0LgbQniILmqMqab4acMtTlw=",
-        "owner": "kevinhwang91",
-        "repo": "nvim-ufo",
-        "rev": "32cb247b893a384f1888b9cd737264159ecf183c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kevinhwang91",
-        "repo": "nvim-ufo",
-        "type": "github"
-      }
-    },
-    "plugin-nvim-web-devicons": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735569123,
-        "narHash": "sha256-h9rY6F+2sBlG9PFN34/0ZTkY66oCeCIPe/HEadM03K4=",
-        "owner": "nvim-tree",
-        "repo": "nvim-web-devicons",
-        "rev": "4adeeaa7a32d46cf3b5833341358c797304f950a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-tree",
-        "repo": "nvim-web-devicons",
-        "type": "github"
-      }
-    },
-    "plugin-obsidian-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1722536347,
-        "narHash": "sha256-mbq7fAPmlwOAbWlN3lGX9WGBKTV8cAPZx8pnRCyszJc=",
-        "owner": "epwalsh",
-        "repo": "obsidian.nvim",
-        "rev": "14e0427bef6c55da0d63f9a313fd9941be3a2479",
-        "type": "github"
-      },
-      "original": {
-        "owner": "epwalsh",
-        "repo": "obsidian.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-omnisharp-extended": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732802864,
-        "narHash": "sha256-lA22ncMWHz2oVcZMPQGpLL3UjjXOXGxhtXR1LX5cX3A=",
-        "owner": "Hoffs",
-        "repo": "omnisharp-extended-lsp.nvim",
-        "rev": "4916fa12e5b28d21a1f031f0bdd10aa15a75d85d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Hoffs",
-        "repo": "omnisharp-extended-lsp.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-onedark": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731171496,
-        "narHash": "sha256-NLHq9SUUo81m50NPQe8852uZbo4Mo4No10N3ptX43t0=",
-        "owner": "navarasu",
-        "repo": "onedark.nvim",
-        "rev": "67a74c275d1116d575ab25485d1bfa6b2a9c38a6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "navarasu",
-        "repo": "onedark.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-orgmode-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734770880,
-        "narHash": "sha256-E1YJeTay1tX2PgiXwV/DRgrlYHIGUe9/uTA+6ORIhBw=",
-        "owner": "nvim-orgmode",
-        "repo": "orgmode",
-        "rev": "bf657742f7cb56211f99946ff64f5f87d7d7f0d0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-orgmode",
-        "repo": "orgmode",
-        "type": "github"
-      }
-    },
-    "plugin-otter-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735130975,
-        "narHash": "sha256-NPBGcLi1lEmpGGbGs58Xzw1IriOyKTMQdwIdVFsbVDM=",
-        "owner": "jmbuhr",
-        "repo": "otter.nvim",
-        "rev": "e8c662e1aefa8b483cfba6e00729a39a363dcecc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jmbuhr",
-        "repo": "otter.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-oxocarbon": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1724853107,
-        "narHash": "sha256-Hi/nATEvZ4a6Yxc66KtuJqss6kQV19cmtIlhCw6alOI=",
-        "owner": "nyoom-engineering",
-        "repo": "oxocarbon.nvim",
-        "rev": "004777819ba294423b638a35a75c9f0c7be758ed",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nyoom-engineering",
-        "repo": "oxocarbon.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-pathlib-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1724943804,
-        "narHash": "sha256-YhCJeNKlcjgg3q51UWFhuIEPzNueC8YTpeuPPJDndvw=",
-        "owner": "pysan3",
-        "repo": "pathlib.nvim",
-        "rev": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pysan3",
-        "repo": "pathlib.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-plenary-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726602776,
-        "narHash": "sha256-bmmPekAvuBvLQmrnnX0n+FRBqfVxBsObhxIEkDGAla4=",
-        "owner": "nvim-lua",
-        "repo": "plenary.nvim",
-        "rev": "2d9b06177a975543726ce5c73fca176cedbffe9d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-lua",
-        "repo": "plenary.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-precognition-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732647805,
-        "narHash": "sha256-m3dKoKxCd/QODM+EL89c3RVOoZnuA4nrBG0KhPZ/o9Y=",
-        "owner": "tris203",
-        "repo": "precognition.nvim",
-        "rev": "531971e6d883e99b1572bf47294e22988d8fbec0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tris203",
-        "repo": "precognition.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-project-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1680567592,
-        "narHash": "sha256-avV3wMiDbraxW4mqlEsKy0oeewaRj9Q33K8NzWoaptU=",
-        "owner": "ahmedkhalf",
-        "repo": "project.nvim",
-        "rev": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ahmedkhalf",
-        "repo": "project.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-promise-async": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1722813441,
-        "narHash": "sha256-9eM66brPjiFlY64vmBetRYrKnpDyN7+/URMm4GsGimA=",
-        "owner": "kevinhwang91",
-        "repo": "promise-async",
-        "rev": "119e8961014c9bfaf1487bf3c2a393d254f337e2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kevinhwang91",
-        "repo": "promise-async",
-        "type": "github"
-      }
-    },
-    "plugin-rainbow-delimiters": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736686348,
-        "narHash": "sha256-zWHXYs3XdnoszqOFY3hA2L5mNn1a44OAeKv3lL3EMEw=",
-        "owner": "HiPhish",
-        "repo": "rainbow-delimiters.nvim",
-        "rev": "85b80abaa09cbbc039e3095b2f515b3cf8cadd11",
-        "type": "github"
-      },
-      "original": {
-        "owner": "HiPhish",
-        "repo": "rainbow-delimiters.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-registers": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1730794647,
-        "narHash": "sha256-M7uR3yXYUQ4I8Gt8P6k25q67UNwksRDPKGrS/FCqrt0=",
-        "owner": "tversteeg",
-        "repo": "registers.nvim",
-        "rev": "c217f8f369e0886776cda6c94eab839b30a8940d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tversteeg",
-        "repo": "registers.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-render-markdown-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735525479,
-        "narHash": "sha256-ncFqBv0JITX3pTsLON+HctLUaKXhLRMBUrRWmI8KOSA=",
-        "owner": "MeanderingProgrammer",
-        "repo": "render-markdown.nvim",
-        "rev": "6fbd1491abc104409f119685de5353c35c97c005",
-        "type": "github"
-      },
-      "original": {
-        "owner": "MeanderingProgrammer",
-        "repo": "render-markdown.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-rose-pine": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733845819,
-        "narHash": "sha256-ejh9UXQbLc8Ie6wF7zszzL1gaJzr16gcu0dUWqTo8AM=",
-        "owner": "rose-pine",
-        "repo": "neovim",
-        "rev": "91548dca53b36dbb9d36c10f114385f759731be1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rose-pine",
-        "repo": "neovim",
-        "type": "github"
-      }
-    },
-    "plugin-rtp-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1724409589,
-        "narHash": "sha256-lmJbiD7I7MTEEpukESs67uAmLyn+p66hrUKLbEHp0Kw=",
-        "owner": "nvim-neorocks",
-        "repo": "rtp.nvim",
-        "rev": "494ddfc888bb466555d90ace731856de1320fe45",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-neorocks",
-        "repo": "rtp.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-run-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735501787,
-        "narHash": "sha256-CFOyOARCLQiMOhFPeqz8n2ULyaaRxRZrOk0FCibjuIM=",
-        "owner": "diniamo",
-        "repo": "run.nvim",
-        "rev": "9015c9cece816ccf10a185b420f6e345fd990802",
-        "type": "github"
-      },
-      "original": {
-        "owner": "diniamo",
-        "repo": "run.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-rustaceanvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1738187731,
-        "narHash": "sha256-Z4aCPO4MR0Q2ZojT6YBGSa8fb7u5Nd+4Z/rekqhXqDY=",
-        "owner": "mrcjkb",
-        "repo": "rustaceanvim",
-        "rev": "4a2f2d2cc04f5b0aa0981f98bb7d002c898318ad",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mrcjkb",
-        "repo": "rustaceanvim",
-        "type": "github"
-      }
-    },
-    "plugin-smartcolumn": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734696989,
-        "narHash": "sha256-6RodA5BQnL6tB3RCE5G2RiXqBvM3VP3HYZ+T3AxIF7Q=",
-        "owner": "m4xshen",
-        "repo": "smartcolumn.nvim",
-        "rev": "f14fbea6f86cd29df5042897ca9e3ba10ba4d27f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "m4xshen",
-        "repo": "smartcolumn.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-sqls-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733090837,
-        "narHash": "sha256-o5uD6shPkweuE+k/goBX42W3I2oojXVijfJC7L50sGU=",
-        "owner": "nanotee",
-        "repo": "sqls.nvim",
-        "rev": "a514379f5f89bf72955ed3bf5c1c31a40b8a1472",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nanotee",
-        "repo": "sqls.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-tabular": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1720022617,
-        "narHash": "sha256-qmDpdg3Tl3W4JSovRb4ODlrKMjRL5CaVI05YBn0Q0LI=",
-        "owner": "godlygeek",
-        "repo": "tabular",
-        "rev": "12437cd1b53488e24936ec4b091c9324cafee311",
-        "type": "github"
-      },
-      "original": {
-        "owner": "godlygeek",
-        "repo": "tabular",
-        "type": "github"
-      }
-    },
-    "plugin-telescope": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732884846,
-        "narHash": "sha256-npb61MZYAotz71Co5G1dUeIqWt7GVeqZNz0A2Yz2dy4=",
-        "owner": "nvim-telescope",
-        "repo": "telescope.nvim",
-        "rev": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-telescope",
-        "repo": "telescope.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-tiny-devicons-auto-colors": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733445616,
-        "narHash": "sha256-klUZKvdYhwO3sq4Su4sBFDcNSAYXh53O72vg4+ZOrhI=",
-        "owner": "rachartier",
-        "repo": "tiny-devicons-auto-colors.nvim",
-        "rev": "c8f63933ee013c1e0a26091d58131e060546f01f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rachartier",
-        "repo": "tiny-devicons-auto-colors.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-todo-comments": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726481242,
-        "narHash": "sha256-EH4Sy7qNkzOgA1INFzrtsRfD79TgMqSbKUdundyw22w=",
-        "owner": "folke",
-        "repo": "todo-comments.nvim",
-        "rev": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "folke",
-        "repo": "todo-comments.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-toggleterm-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735340326,
-        "narHash": "sha256-oeNIb+QHa/9yGZz/2u9LYIdKluel0bcQkaIqOuQUkis=",
-        "owner": "akinsho",
-        "repo": "toggleterm.nvim",
-        "rev": "344fc1810292785b3d962ddac2de57669e1a7ff9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "akinsho",
-        "repo": "toggleterm.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-tokyonight": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734211493,
-        "narHash": "sha256-TJ/a6N6Cc1T0wdMxMopma1NtwL7rMYbZ6F0zFI1zaIA=",
-        "owner": "folke",
-        "repo": "tokyonight.nvim",
-        "rev": "45d22cf0e1b93476d3b6d362d720412b3d34465c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "folke",
-        "repo": "tokyonight.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-trouble": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732701472,
-        "narHash": "sha256-JhnERZfma2JHFEn/DElVmrSU5KxM2asx3SJ+86lCfoo=",
-        "owner": "folke",
-        "repo": "trouble.nvim",
-        "rev": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "folke",
-        "repo": "trouble.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-ts-error-translator": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731721659,
-        "narHash": "sha256-fi68jJVNTL2WlTehcl5Q8tijAeu2usjIsWXjcuixkCM=",
-        "owner": "dmmulroy",
-        "repo": "ts-error-translator.nvim",
-        "rev": "47e5ba89f71b9e6c72eaaaaa519dd59bd6897df4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "dmmulroy",
-        "repo": "ts-error-translator.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-typst-preview-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734839452,
-        "narHash": "sha256-d6Tv7xZRghYYDfABk/p2e9qTm4qnWHM+ejKDCcR0TfY=",
-        "owner": "chomosuke",
-        "repo": "typst-preview.nvim",
-        "rev": "c1100e8788baabe8ca8f8cd7fd63d3d479e49e36",
-        "type": "github"
-      },
-      "original": {
-        "owner": "chomosuke",
-        "repo": "typst-preview.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-vim-dirtytalk": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1713047519,
-        "narHash": "sha256-azU5jkv/fD/qDDyCU1bPNXOH6rmbDauG9jDNrtIXc0Y=",
-        "owner": "psliwka",
-        "repo": "vim-dirtytalk",
-        "rev": "aa57ba902b04341a04ff97214360f56856493583",
-        "type": "github"
-      },
-      "original": {
-        "owner": "psliwka",
-        "repo": "vim-dirtytalk",
-        "type": "github"
-      }
-    },
-    "plugin-vim-fugitive": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735457366,
-        "narHash": "sha256-45zsqKavWoclA67MC54bAel1nE8CLHtSdullHByiRS8=",
-        "owner": "tpope",
-        "repo": "vim-fugitive",
-        "rev": "174230d6a7f2df94705a7ffd8d5413e27ec10a80",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tpope",
-        "repo": "vim-fugitive",
-        "type": "github"
-      }
-    },
-    "plugin-vim-illuminate": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1715960194,
-        "narHash": "sha256-DdJzTHxoOv+vjFymETa2MgXpM/qDwvZjpoo1W8OOBj0=",
-        "owner": "RRethy",
-        "repo": "vim-illuminate",
-        "rev": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "RRethy",
-        "repo": "vim-illuminate",
-        "type": "github"
-      }
-    },
-    "plugin-vim-markdown": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726813437,
-        "narHash": "sha256-ZCCSjZ5Xok4rnIwfa4VUEaz6d3oW9066l0EkoqiTppM=",
-        "owner": "preservim",
-        "repo": "vim-markdown",
-        "rev": "8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51",
-        "type": "github"
-      },
-      "original": {
-        "owner": "preservim",
-        "repo": "vim-markdown",
-        "type": "github"
-      }
-    },
-    "plugin-vim-repeat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1720473942,
-        "narHash": "sha256-G/dmkq1KtSHIl+I5p3LfO6mGPS3eyLRbEEsuLbTpGlk=",
-        "owner": "tpope",
-        "repo": "vim-repeat",
-        "rev": "65846025c15494983dafe5e3b46c8f88ab2e9635",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tpope",
-        "repo": "vim-repeat",
-        "type": "github"
-      }
-    },
-    "plugin-vim-startify": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1695213983,
-        "narHash": "sha256-W5N/Dqxf9hSXEEJsrEkXInFwBXNBJe9Dzx9TVS12mPk=",
-        "owner": "mhinz",
-        "repo": "vim-startify",
-        "rev": "4e089dffdad46f3f5593f34362d530e8fe823dcf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mhinz",
-        "repo": "vim-startify",
-        "type": "github"
-      }
-    },
-    "plugin-which-key": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734253151,
-        "narHash": "sha256-f/+sYMDEguB5ZDiYiQAsDvdF/2cVcWnLBU+9qwigk4s=",
-        "owner": "folke",
-        "repo": "which-key.nvim",
-        "rev": "8ab96b38a2530eacba5be717f52e04601eb59326",
-        "type": "github"
-      },
-      "original": {
-        "owner": "folke",
-        "repo": "which-key.nvim",
-        "type": "github"
-      }
-    },
-    "plugin-yanky-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1737126873,
-        "narHash": "sha256-Gt8kb6sZoNIM2SDWUPyAF5Tw99qMZl+ltUCfyMXgJsU=",
-        "owner": "gbprod",
-        "repo": "yanky.nvim",
-        "rev": "d2696b30e389dced94d5acab728f524a25f308d2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gbprod",
-        "repo": "yanky.nvim",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -2849,176 +127,6 @@
         "nil": "nil",
         "nixpkgs": "nixpkgs",
         "nmd": "nmd",
-        "plugin-aerial-nvim": "plugin-aerial-nvim",
-        "plugin-alpha-nvim": "plugin-alpha-nvim",
-        "plugin-base16": "plugin-base16",
-        "plugin-blink-cmp": "plugin-blink-cmp",
-        "plugin-blink-compat": "plugin-blink-compat",
-        "plugin-bufdelete-nvim": "plugin-bufdelete-nvim",
-        "plugin-catppuccin": "plugin-catppuccin",
-        "plugin-ccc": "plugin-ccc",
-        "plugin-cellular-automaton": "plugin-cellular-automaton",
-        "plugin-chatgpt": "plugin-chatgpt",
-        "plugin-cheatsheet-nvim": "plugin-cheatsheet-nvim",
-        "plugin-cinnamon-nvim": "plugin-cinnamon-nvim",
-        "plugin-cmp-buffer": "plugin-cmp-buffer",
-        "plugin-cmp-luasnip": "plugin-cmp-luasnip",
-        "plugin-cmp-nvim-lsp": "plugin-cmp-nvim-lsp",
-        "plugin-cmp-path": "plugin-cmp-path",
-        "plugin-cmp-treesitter": "plugin-cmp-treesitter",
-        "plugin-codewindow-nvim": "plugin-codewindow-nvim",
-        "plugin-comment-nvim": "plugin-comment-nvim",
-        "plugin-conform-nvim": "plugin-conform-nvim",
-        "plugin-copilot-cmp": "plugin-copilot-cmp",
-        "plugin-copilot-lua": "plugin-copilot-lua",
-        "plugin-crates-nvim": "plugin-crates-nvim",
-        "plugin-csharpls-extended": "plugin-csharpls-extended",
-        "plugin-dashboard-nvim": "plugin-dashboard-nvim",
-        "plugin-diffview-nvim": "plugin-diffview-nvim",
-        "plugin-dracula": "plugin-dracula",
-        "plugin-dressing-nvim": "plugin-dressing-nvim",
-        "plugin-elixir-tools": "plugin-elixir-tools",
-        "plugin-fastaction-nvim": "plugin-fastaction-nvim",
-        "plugin-fidget-nvim": "plugin-fidget-nvim",
-        "plugin-flutter-tools": "plugin-flutter-tools",
-        "plugin-friendly-snippets": "plugin-friendly-snippets",
-        "plugin-fzf-lua": "plugin-fzf-lua",
-        "plugin-gesture-nvim": "plugin-gesture-nvim",
-        "plugin-gitsigns-nvim": "plugin-gitsigns-nvim",
-        "plugin-glow-nvim": "plugin-glow-nvim",
-        "plugin-gruvbox": "plugin-gruvbox",
-        "plugin-haskell-tools-nvim": "plugin-haskell-tools-nvim",
-        "plugin-highlight-undo": "plugin-highlight-undo",
-        "plugin-hop-nvim": "plugin-hop-nvim",
-        "plugin-icon-picker-nvim": "plugin-icon-picker-nvim",
-        "plugin-image-nvim": "plugin-image-nvim",
-        "plugin-indent-blankline": "plugin-indent-blankline",
-        "plugin-leap-nvim": "plugin-leap-nvim",
-        "plugin-lsp-lines": "plugin-lsp-lines",
-        "plugin-lsp-signature": "plugin-lsp-signature",
-        "plugin-lspkind": "plugin-lspkind",
-        "plugin-lspsaga": "plugin-lspsaga",
-        "plugin-lua-utils-nvim": "plugin-lua-utils-nvim",
-        "plugin-lualine": "plugin-lualine",
-        "plugin-luasnip": "plugin-luasnip",
-        "plugin-lz-n": "plugin-lz-n",
-        "plugin-lzn-auto-require": "plugin-lzn-auto-require",
-        "plugin-mind-nvim": "plugin-mind-nvim",
-        "plugin-mini-ai": "plugin-mini-ai",
-        "plugin-mini-align": "plugin-mini-align",
-        "plugin-mini-animate": "plugin-mini-animate",
-        "plugin-mini-base16": "plugin-mini-base16",
-        "plugin-mini-basics": "plugin-mini-basics",
-        "plugin-mini-bracketed": "plugin-mini-bracketed",
-        "plugin-mini-bufremove": "plugin-mini-bufremove",
-        "plugin-mini-clue": "plugin-mini-clue",
-        "plugin-mini-colors": "plugin-mini-colors",
-        "plugin-mini-comment": "plugin-mini-comment",
-        "plugin-mini-completion": "plugin-mini-completion",
-        "plugin-mini-diff": "plugin-mini-diff",
-        "plugin-mini-doc": "plugin-mini-doc",
-        "plugin-mini-extra": "plugin-mini-extra",
-        "plugin-mini-files": "plugin-mini-files",
-        "plugin-mini-fuzzy": "plugin-mini-fuzzy",
-        "plugin-mini-git": "plugin-mini-git",
-        "plugin-mini-hipatterns": "plugin-mini-hipatterns",
-        "plugin-mini-hues": "plugin-mini-hues",
-        "plugin-mini-icons": "plugin-mini-icons",
-        "plugin-mini-indentscope": "plugin-mini-indentscope",
-        "plugin-mini-jump": "plugin-mini-jump",
-        "plugin-mini-jump2d": "plugin-mini-jump2d",
-        "plugin-mini-map": "plugin-mini-map",
-        "plugin-mini-misc": "plugin-mini-misc",
-        "plugin-mini-move": "plugin-mini-move",
-        "plugin-mini-notify": "plugin-mini-notify",
-        "plugin-mini-operators": "plugin-mini-operators",
-        "plugin-mini-pairs": "plugin-mini-pairs",
-        "plugin-mini-pick": "plugin-mini-pick",
-        "plugin-mini-sessions": "plugin-mini-sessions",
-        "plugin-mini-snippets": "plugin-mini-snippets",
-        "plugin-mini-splitjoin": "plugin-mini-splitjoin",
-        "plugin-mini-starter": "plugin-mini-starter",
-        "plugin-mini-statusline": "plugin-mini-statusline",
-        "plugin-mini-surround": "plugin-mini-surround",
-        "plugin-mini-tabline": "plugin-mini-tabline",
-        "plugin-mini-test": "plugin-mini-test",
-        "plugin-mini-trailspace": "plugin-mini-trailspace",
-        "plugin-mini-visits": "plugin-mini-visits",
-        "plugin-minimap-vim": "plugin-minimap-vim",
-        "plugin-modes-nvim": "plugin-modes-nvim",
-        "plugin-neo-tree-nvim": "plugin-neo-tree-nvim",
-        "plugin-neocord": "plugin-neocord",
-        "plugin-neodev-nvim": "plugin-neodev-nvim",
-        "plugin-neorg": "plugin-neorg",
-        "plugin-neorg-telescope": "plugin-neorg-telescope",
-        "plugin-new-file-template-nvim": "plugin-new-file-template-nvim",
-        "plugin-noice-nvim": "plugin-noice-nvim",
-        "plugin-none-ls": "plugin-none-ls",
-        "plugin-nord": "plugin-nord",
-        "plugin-nui-nvim": "plugin-nui-nvim",
-        "plugin-nvim-autopairs": "plugin-nvim-autopairs",
-        "plugin-nvim-bufferline-lua": "plugin-nvim-bufferline-lua",
-        "plugin-nvim-cmp": "plugin-nvim-cmp",
-        "plugin-nvim-colorizer-lua": "plugin-nvim-colorizer-lua",
-        "plugin-nvim-cursorline": "plugin-nvim-cursorline",
-        "plugin-nvim-dap": "plugin-nvim-dap",
-        "plugin-nvim-dap-go": "plugin-nvim-dap-go",
-        "plugin-nvim-dap-ui": "plugin-nvim-dap-ui",
-        "plugin-nvim-docs-view": "plugin-nvim-docs-view",
-        "plugin-nvim-lightbulb": "plugin-nvim-lightbulb",
-        "plugin-nvim-lint": "plugin-nvim-lint",
-        "plugin-nvim-lspconfig": "plugin-nvim-lspconfig",
-        "plugin-nvim-metals": "plugin-nvim-metals",
-        "plugin-nvim-navbuddy": "plugin-nvim-navbuddy",
-        "plugin-nvim-navic": "plugin-nvim-navic",
-        "plugin-nvim-neoclip": "plugin-nvim-neoclip",
-        "plugin-nvim-nio": "plugin-nvim-nio",
-        "plugin-nvim-notify": "plugin-nvim-notify",
-        "plugin-nvim-scrollbar": "plugin-nvim-scrollbar",
-        "plugin-nvim-session-manager": "plugin-nvim-session-manager",
-        "plugin-nvim-surround": "plugin-nvim-surround",
-        "plugin-nvim-tree-lua": "plugin-nvim-tree-lua",
-        "plugin-nvim-treesitter-context": "plugin-nvim-treesitter-context",
-        "plugin-nvim-ts-autotag": "plugin-nvim-ts-autotag",
-        "plugin-nvim-ufo": "plugin-nvim-ufo",
-        "plugin-nvim-web-devicons": "plugin-nvim-web-devicons",
-        "plugin-obsidian-nvim": "plugin-obsidian-nvim",
-        "plugin-omnisharp-extended": "plugin-omnisharp-extended",
-        "plugin-onedark": "plugin-onedark",
-        "plugin-orgmode-nvim": "plugin-orgmode-nvim",
-        "plugin-otter-nvim": "plugin-otter-nvim",
-        "plugin-oxocarbon": "plugin-oxocarbon",
-        "plugin-pathlib-nvim": "plugin-pathlib-nvim",
-        "plugin-plenary-nvim": "plugin-plenary-nvim",
-        "plugin-precognition-nvim": "plugin-precognition-nvim",
-        "plugin-project-nvim": "plugin-project-nvim",
-        "plugin-promise-async": "plugin-promise-async",
-        "plugin-rainbow-delimiters": "plugin-rainbow-delimiters",
-        "plugin-registers": "plugin-registers",
-        "plugin-render-markdown-nvim": "plugin-render-markdown-nvim",
-        "plugin-rose-pine": "plugin-rose-pine",
-        "plugin-rtp-nvim": "plugin-rtp-nvim",
-        "plugin-run-nvim": "plugin-run-nvim",
-        "plugin-rustaceanvim": "plugin-rustaceanvim",
-        "plugin-smartcolumn": "plugin-smartcolumn",
-        "plugin-sqls-nvim": "plugin-sqls-nvim",
-        "plugin-tabular": "plugin-tabular",
-        "plugin-telescope": "plugin-telescope",
-        "plugin-tiny-devicons-auto-colors": "plugin-tiny-devicons-auto-colors",
-        "plugin-todo-comments": "plugin-todo-comments",
-        "plugin-toggleterm-nvim": "plugin-toggleterm-nvim",
-        "plugin-tokyonight": "plugin-tokyonight",
-        "plugin-trouble": "plugin-trouble",
-        "plugin-ts-error-translator": "plugin-ts-error-translator",
-        "plugin-typst-preview-nvim": "plugin-typst-preview-nvim",
-        "plugin-vim-dirtytalk": "plugin-vim-dirtytalk",
-        "plugin-vim-fugitive": "plugin-vim-fugitive",
-        "plugin-vim-illuminate": "plugin-vim-illuminate",
-        "plugin-vim-markdown": "plugin-vim-markdown",
-        "plugin-vim-repeat": "plugin-vim-repeat",
-        "plugin-vim-startify": "plugin-vim-startify",
-        "plugin-which-key": "plugin-which-key",
-        "plugin-yanky-nvim": "plugin-yanky-nvim",
         "systems": "systems_2"
       }
     },
diff --git a/flake.nix b/flake.nix
index 7a2f4bd4..28acb8b0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,6 +53,8 @@
             ''
             self.nixosModules.nvf;
         };
+
+        pins = import ./npins;
       };
 
       perSystem = {pkgs, ...}: {
@@ -96,898 +98,5 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
-
-    ## Plugins
-    # Lazy loading
-    plugin-lz-n = {
-      url = "github:nvim-neorocks/lz.n";
-      flake = false;
-    };
-
-    plugin-lzn-auto-require = {
-      url = "github:horriblename/lzn-auto-require/require-rewrite";
-      flake = false;
-    };
-
-    plugin-rtp-nvim = {
-      url = "github:nvim-neorocks/rtp.nvim";
-      flake = false;
-    };
-
-    # LSP plugins
-    plugin-nvim-lspconfig = {
-      url = "github:neovim/nvim-lspconfig";
-      flake = false;
-    };
-
-    plugin-lspsaga = {
-      url = "github:tami5/lspsaga.nvim";
-      flake = false;
-    };
-
-    plugin-lspkind = {
-      url = "github:onsails/lspkind-nvim";
-      flake = false;
-    };
-
-    plugin-trouble = {
-      url = "github:folke/trouble.nvim";
-      flake = false;
-    };
-
-    plugin-nvim-treesitter-context = {
-      url = "github:nvim-treesitter/nvim-treesitter-context";
-      flake = false;
-    };
-
-    plugin-nvim-lightbulb = {
-      url = "github:kosayoda/nvim-lightbulb";
-      flake = false;
-    };
-
-    plugin-fastaction-nvim = {
-      url = "github:Chaitanyabsprip/fastaction.nvim";
-      flake = false;
-    };
-
-    plugin-lsp-signature = {
-      url = "github:ray-x/lsp_signature.nvim";
-      flake = false;
-    };
-
-    plugin-lsp-lines = {
-      url = "sourcehut:~whynothugo/lsp_lines.nvim";
-      flake = false;
-    };
-
-    plugin-none-ls = {
-      # https://github.com/nvimtools/none-ls.nvim/issues/58
-      url = "github:nvimtools/none-ls.nvim/bb680d752cec37949faca7a1f509e2fe67ab418a";
-      flake = false;
-    };
-
-    plugin-nvim-docs-view = {
-      url = "github:amrbashir/nvim-docs-view";
-      flake = false;
-    };
-
-    plugin-otter-nvim = {
-      url = "github:jmbuhr/otter.nvim";
-      flake = false;
-    };
-
-    # Language support
-    plugin-sqls-nvim = {
-      url = "github:nanotee/sqls.nvim";
-      flake = false;
-    };
-
-    plugin-rustaceanvim = {
-      url = "github:mrcjkb/rustaceanvim";
-      flake = false;
-    };
-
-    plugin-flutter-tools = {
-      url = "github:akinsho/flutter-tools.nvim";
-      flake = false;
-    };
-
-    plugin-neodev-nvim = {
-      url = "github:folke/neodev.nvim";
-      flake = false;
-    };
-
-    plugin-elixir-tools = {
-      url = "github:elixir-tools/elixir-tools.nvim";
-      flake = false;
-    };
-
-    plugin-ts-error-translator = {
-      url = "github:dmmulroy/ts-error-translator.nvim";
-      flake = false;
-    };
-
-    plugin-typst-preview-nvim = {
-      url = "github:chomosuke/typst-preview.nvim";
-      flake = false;
-    };
-
-    plugin-nvim-metals = {
-      url = "github:scalameta/nvim-metals";
-      flake = false;
-    };
-
-    plugin-omnisharp-extended = {
-      url = "github:Hoffs/omnisharp-extended-lsp.nvim";
-      flake = false;
-    };
-
-    plugin-csharpls-extended = {
-      url = "github:Decodetalkers/csharpls-extended-lsp.nvim";
-      flake = false;
-    };
-
-    # Formatters
-    plugin-conform-nvim = {
-      url = "github:stevearc/conform.nvim";
-      flake = false;
-    };
-
-    # Diagnostics
-    plugin-nvim-lint = {
-      url = "github:mfussenegger/nvim-lint";
-      flake = false;
-    };
-
-    # Copying/Registers
-    plugin-registers = {
-      url = "github:tversteeg/registers.nvim";
-      flake = false;
-    };
-
-    plugin-nvim-neoclip = {
-      url = "github:AckslD/nvim-neoclip.lua";
-      flake = false;
-    };
-
-    # Pickers
-    plugin-telescope = {
-      url = "github:nvim-telescope/telescope.nvim";
-      flake = false;
-    };
-
-    plugin-fzf-lua = {
-      url = "github:ibhagwan/fzf-lua";
-      flake = false;
-    };
-
-    # Runners
-    plugin-run-nvim = {
-      url = "github:diniamo/run.nvim";
-      flake = false;
-    };
-
-    # Debuggers
-    plugin-nvim-dap = {
-      url = "github:mfussenegger/nvim-dap";
-      flake = false;
-    };
-
-    plugin-nvim-dap-ui = {
-      url = "github:rcarriga/nvim-dap-ui";
-      flake = false;
-    };
-
-    plugin-nvim-dap-go = {
-      url = "github:leoluz/nvim-dap-go";
-      flake = false;
-    };
-
-    # Filetrees
-    plugin-nvim-tree-lua = {
-      url = "github:nvim-tree/nvim-tree.lua";
-      flake = false;
-    };
-
-    plugin-neo-tree-nvim = {
-      url = "github:nvim-neo-tree/neo-tree.nvim";
-      flake = false;
-    };
-
-    # Tablines
-    plugin-nvim-bufferline-lua = {
-      url = "github:akinsho/nvim-bufferline.lua";
-      flake = false;
-    };
-
-    # Statuslines
-    plugin-lualine = {
-      url = "github:hoob3rt/lualine.nvim";
-      flake = false;
-    };
-
-    plugin-blink-cmp = {
-      url = "github:saghen/blink.cmp";
-      flake = false;
-    };
-
-    plugin-blink-compat = {
-      url = "github:saghen/blink.compat";
-      flake = false;
-    };
-
-    plugin-nvim-cmp = {
-      url = "github:hrsh7th/nvim-cmp";
-      flake = false;
-    };
-
-    plugin-cmp-buffer = {
-      url = "github:hrsh7th/cmp-buffer";
-      flake = false;
-    };
-
-    plugin-cmp-nvim-lsp = {
-      url = "github:hrsh7th/cmp-nvim-lsp";
-      flake = false;
-    };
-
-    plugin-cmp-path = {
-      url = "github:hrsh7th/cmp-path";
-      flake = false;
-    };
-
-    plugin-cmp-treesitter = {
-      url = "github:ray-x/cmp-treesitter";
-      flake = false;
-    };
-
-    plugin-cmp-luasnip = {
-      url = "github:saadparwaiz1/cmp_luasnip";
-      flake = false;
-    };
-
-    # snippets
-    plugin-luasnip = {
-      url = "github:L3MON4D3/LuaSnip";
-      flake = false;
-    };
-
-    plugin-friendly-snippets = {
-      url = "github:rafamadriz/friendly-snippets";
-      flake = false;
-    };
-
-    # Presence
-    plugin-neocord = {
-      url = "github:IogaMaster/neocord";
-      flake = false; # uses flake-utils, avoid the flake
-    };
-
-    # Autopairs
-    plugin-nvim-autopairs = {
-      url = "github:windwp/nvim-autopairs";
-      flake = false;
-    };
-
-    plugin-nvim-ts-autotag = {
-      url = "github:windwp/nvim-ts-autotag";
-      flake = false;
-    };
-
-    # Commenting
-    plugin-comment-nvim = {
-      url = "github:numToStr/Comment.nvim";
-      flake = false;
-    };
-
-    plugin-todo-comments = {
-      url = "github:folke/todo-comments.nvim";
-      flake = false;
-    };
-
-    # Buffer tools
-    plugin-bufdelete-nvim = {
-      url = "github:famiu/bufdelete.nvim";
-      flake = false;
-    };
-
-    # Dashboard Utilities
-    plugin-dashboard-nvim = {
-      url = "github:glepnir/dashboard-nvim";
-      flake = false;
-    };
-
-    plugin-alpha-nvim = {
-      url = "github:goolord/alpha-nvim";
-      flake = false;
-    };
-
-    plugin-vim-startify = {
-      url = "github:mhinz/vim-startify";
-      flake = false;
-    };
-
-    # Themes
-    plugin-base16 = {
-      url = "github:rrethy/base16-nvim";
-      flake = false;
-    };
-
-    plugin-tokyonight = {
-      url = "github:folke/tokyonight.nvim";
-      flake = false;
-    };
-
-    plugin-onedark = {
-      url = "github:navarasu/onedark.nvim";
-      flake = false;
-    };
-
-    plugin-catppuccin = {
-      url = "github:catppuccin/nvim";
-      flake = false;
-    };
-
-    plugin-dracula = {
-      url = "github:Mofiqul/dracula.nvim";
-      flake = false;
-    };
-
-    plugin-oxocarbon = {
-      url = "github:nyoom-engineering/oxocarbon.nvim";
-      flake = false;
-    };
-
-    plugin-gruvbox = {
-      url = "github:ellisonleao/gruvbox.nvim";
-      flake = false;
-    };
-
-    plugin-rose-pine = {
-      url = "github:rose-pine/neovim";
-      flake = false;
-    };
-
-    plugin-nord = {
-      url = "github:gbprod/nord.nvim";
-      flake = false;
-    };
-
-    # Rust crates
-    plugin-crates-nvim = {
-      url = "github:Saecki/crates.nvim";
-      flake = false;
-    };
-
-    # Project Management
-    plugin-project-nvim = {
-      url = "github:ahmedkhalf/project.nvim";
-      flake = false;
-    };
-
-    # Visuals
-    plugin-nvim-cursorline = {
-      url = "github:yamatsum/nvim-cursorline";
-      flake = false;
-    };
-
-    plugin-nvim-scrollbar = {
-      url = "github:petertriho/nvim-scrollbar";
-      flake = false;
-    };
-
-    plugin-cinnamon-nvim = {
-      url = "github:declancm/cinnamon.nvim";
-      flake = false;
-    };
-
-    plugin-cellular-automaton = {
-      url = "github:Eandrju/cellular-automaton.nvim";
-      flake = false;
-    };
-
-    plugin-indent-blankline = {
-      url = "github:lukas-reineke/indent-blankline.nvim";
-      flake = false;
-    };
-
-    plugin-nvim-web-devicons = {
-      url = "github:nvim-tree/nvim-web-devicons";
-      flake = false;
-    };
-
-    plugin-tiny-devicons-auto-colors = {
-      url = "github:rachartier/tiny-devicons-auto-colors.nvim";
-      flake = false;
-    };
-
-    plugin-gitsigns-nvim = {
-      url = "github:lewis6991/gitsigns.nvim";
-      flake = false;
-    };
-
-    plugin-vim-fugitive = {
-      url = "github:tpope/vim-fugitive";
-      flake = false;
-    };
-
-    plugin-fidget-nvim = {
-      url = "github:j-hui/fidget.nvim";
-      flake = false;
-    };
-
-    plugin-highlight-undo = {
-      url = "github:tzachar/highlight-undo.nvim";
-      flake = false;
-    };
-
-    plugin-render-markdown-nvim = {
-      url = "github:MeanderingProgrammer/render-markdown.nvim";
-      flake = false;
-    };
-
-    plugin-rainbow-delimiters = {
-      url = "github:HiPhish/rainbow-delimiters.nvim";
-      flake = false;
-    };
-
-    # Minimap
-    plugin-minimap-vim = {
-      url = "github:wfxr/minimap.vim";
-      flake = false;
-    };
-
-    plugin-codewindow-nvim = {
-      url = "github:gorbit99/codewindow.nvim";
-      flake = false;
-    };
-
-    # Notifications
-    plugin-nvim-notify = {
-      url = "github:rcarriga/nvim-notify";
-      flake = false;
-    };
-
-    # Utilities
-    plugin-ccc = {
-      url = "github:uga-rosa/ccc.nvim";
-      flake = false;
-    };
-
-    plugin-diffview-nvim = {
-      url = "github:sindrets/diffview.nvim";
-      flake = false;
-    };
-
-    plugin-icon-picker-nvim = {
-      url = "github:ziontee113/icon-picker.nvim";
-      flake = false;
-    };
-
-    plugin-which-key = {
-      url = "github:folke/which-key.nvim";
-      flake = false;
-    };
-
-    plugin-cheatsheet-nvim = {
-      url = "github:sudormrfbin/cheatsheet.nvim";
-      flake = false;
-    };
-
-    plugin-gesture-nvim = {
-      url = "github:notomo/gesture.nvim";
-      flake = false;
-    };
-
-    plugin-hop-nvim = {
-      url = "github:phaazon/hop.nvim";
-      flake = false;
-    };
-
-    plugin-leap-nvim = {
-      url = "github:ggandor/leap.nvim";
-      flake = false;
-    };
-
-    plugin-smartcolumn = {
-      url = "github:m4xshen/smartcolumn.nvim";
-      flake = false;
-    };
-
-    plugin-nvim-surround = {
-      url = "github:kylechui/nvim-surround";
-      flake = false;
-    };
-
-    plugin-glow-nvim = {
-      url = "github:ellisonleao/glow.nvim";
-      flake = false;
-    };
-
-    plugin-image-nvim = {
-      url = "github:3rd/image.nvim";
-      flake = false;
-    };
-
-    plugin-precognition-nvim = {
-      url = "github:tris203/precognition.nvim";
-      flake = false;
-    };
-
-    plugin-yanky-nvim = {
-      url = "github:gbprod/yanky.nvim";
-      flake = false;
-    };
-
-    # Note-taking
-    plugin-obsidian-nvim = {
-      url = "github:epwalsh/obsidian.nvim";
-      flake = false;
-    };
-
-    plugin-orgmode-nvim = {
-      url = "github:nvim-orgmode/orgmode";
-      flake = false;
-    };
-
-    plugin-mind-nvim = {
-      url = "github:phaazon/mind.nvim";
-      flake = false;
-    };
-
-    # Spellchecking
-    plugin-vim-dirtytalk = {
-      url = "github:psliwka/vim-dirtytalk";
-      flake = false;
-    };
-
-    # Terminal
-    plugin-toggleterm-nvim = {
-      url = "github:akinsho/toggleterm.nvim";
-      flake = false;
-    };
-
-    # UI
-    plugin-nvim-navbuddy = {
-      url = "github:SmiteshP/nvim-navbuddy";
-      flake = false;
-    };
-
-    plugin-nvim-navic = {
-      url = "github:SmiteshP/nvim-navic";
-      flake = false;
-    };
-
-    plugin-noice-nvim = {
-      url = "github:folke/noice.nvim";
-      flake = false;
-    };
-
-    plugin-modes-nvim = {
-      url = "github:mvllow/modes.nvim";
-      flake = false;
-    };
-
-    plugin-nvim-colorizer-lua = {
-      url = "github:catgoose/nvim-colorizer.lua";
-      flake = false;
-    };
-
-    plugin-vim-illuminate = {
-      url = "github:RRethy/vim-illuminate";
-      flake = false;
-    };
-
-    # Assistant
-    plugin-chatgpt = {
-      url = "github:jackMort/ChatGPT.nvim";
-      flake = false;
-    };
-
-    plugin-copilot-lua = {
-      url = "github:zbirenbaum/copilot.lua";
-      flake = false;
-    };
-
-    plugin-copilot-cmp = {
-      url = "github:zbirenbaum/copilot-cmp";
-      flake = false;
-    };
-
-    # Session management
-    plugin-nvim-session-manager = {
-      url = "github:Shatur/neovim-session-manager";
-      flake = false;
-    };
-
-    # Dependencies
-    plugin-plenary-nvim = {
-      # (required by crates-nvim)
-      url = "github:nvim-lua/plenary.nvim";
-      flake = false;
-    };
-
-    plugin-dressing-nvim = {
-      # (required by icon-picker-nvim)
-      url = "github:stevearc/dressing.nvim";
-      flake = false;
-    };
-
-    plugin-vim-markdown = {
-      # (required by obsidian-nvim)
-      url = "github:preservim/vim-markdown";
-      flake = false;
-    };
-
-    plugin-tabular = {
-      # (required by vim-markdown)
-      url = "github:godlygeek/tabular";
-      flake = false;
-    };
-
-    plugin-lua-utils-nvim = {
-      url = "github:nvim-neorg/lua-utils.nvim";
-      flake = false;
-    };
-
-    plugin-pathlib-nvim = {
-      url = "github:pysan3/pathlib.nvim";
-      flake = false;
-    };
-
-    plugin-neorg = {
-      url = "github:nvim-neorg/neorg";
-      flake = false;
-    };
-
-    plugin-neorg-telescope = {
-      url = "github:nvim-neorg/neorg-telescope";
-      flake = false;
-    };
-
-    plugin-nui-nvim = {
-      # (required by noice.nvim)
-      url = "github:MunifTanjim/nui.nvim";
-      flake = false;
-    };
-
-    plugin-vim-repeat = {
-      # (required by leap.nvim)
-      url = "github:tpope/vim-repeat";
-      flake = false;
-    };
-
-    plugin-nvim-nio = {
-      # (required by nvim-dap-ui)
-      url = "github:nvim-neotest/nvim-nio";
-      flake = false;
-    };
-
-    plugin-promise-async = {
-      url = "github:kevinhwang91/promise-async";
-      flake = false;
-    };
-
-    plugin-nvim-ufo = {
-      url = "github:kevinhwang91/nvim-ufo";
-      flake = false;
-    };
-
-    plugin-new-file-template-nvim = {
-      # (required by new-file-template.nvim)
-      url = "github:otavioschwanck/new-file-template.nvim";
-      flake = false;
-    };
-
-    plugin-haskell-tools-nvim = {
-      url = "github:mrcjkb/haskell-tools.nvim";
-      flake = false;
-    };
-
-    plugin-aerial-nvim = {
-      url = "github:stevearc/aerial.nvim";
-      flake = false;
-    };
-
-    # Mini.nvim
-    plugin-mini-ai = {
-      url = "github:echasnovski/mini.ai";
-      flake = false;
-    };
-
-    plugin-mini-align = {
-      url = "github:echasnovski/mini.align";
-      flake = false;
-    };
-
-    plugin-mini-animate = {
-      url = "github:echasnovski/mini.animate";
-      flake = false;
-    };
-
-    plugin-mini-base16 = {
-      url = "github:echasnovski/mini.base16";
-      flake = false;
-    };
-
-    plugin-mini-basics = {
-      url = "github:echasnovski/mini.basics";
-      flake = false;
-    };
-
-    plugin-mini-bracketed = {
-      url = "github:echasnovski/mini.bracketed";
-      flake = false;
-    };
-
-    plugin-mini-bufremove = {
-      url = "github:echasnovski/mini.bufremove";
-      flake = false;
-    };
-
-    plugin-mini-clue = {
-      url = "github:echasnovski/mini.clue";
-      flake = false;
-    };
-
-    plugin-mini-colors = {
-      url = "github:echasnovski/mini.colors";
-      flake = false;
-    };
-
-    plugin-mini-comment = {
-      url = "github:echasnovski/mini.comment";
-      flake = false;
-    };
-
-    plugin-mini-completion = {
-      url = "github:echasnovski/mini.completion";
-      flake = false;
-    };
-
-    plugin-mini-diff = {
-      url = "github:echasnovski/mini.diff";
-      flake = false;
-    };
-
-    plugin-mini-doc = {
-      url = "github:echasnovski/mini.doc";
-      flake = false;
-    };
-
-    plugin-mini-extra = {
-      url = "github:echasnovski/mini.extra";
-      flake = false;
-    };
-
-    plugin-mini-files = {
-      url = "github:echasnovski/mini.files";
-      flake = false;
-    };
-
-    plugin-mini-fuzzy = {
-      url = "github:echasnovski/mini.fuzzy";
-      flake = false;
-    };
-
-    plugin-mini-git = {
-      url = "github:echasnovski/mini-git";
-      flake = false;
-    };
-
-    plugin-mini-hipatterns = {
-      url = "github:echasnovski/mini.hipatterns";
-      flake = false;
-    };
-
-    plugin-mini-hues = {
-      url = "github:echasnovski/mini.hues";
-      flake = false;
-    };
-
-    plugin-mini-icons = {
-      url = "github:echasnovski/mini.icons";
-      flake = false;
-    };
-
-    plugin-mini-indentscope = {
-      url = "github:echasnovski/mini.indentscope";
-      flake = false;
-    };
-
-    plugin-mini-jump = {
-      url = "github:echasnovski/mini.jump";
-      flake = false;
-    };
-
-    plugin-mini-jump2d = {
-      url = "github:echasnovski/mini.jump2d";
-      flake = false;
-    };
-
-    plugin-mini-map = {
-      url = "github:echasnovski/mini.map";
-      flake = false;
-    };
-
-    plugin-mini-misc = {
-      url = "github:echasnovski/mini.misc";
-      flake = false;
-    };
-
-    plugin-mini-move = {
-      url = "github:echasnovski/mini.move";
-      flake = false;
-    };
-
-    plugin-mini-notify = {
-      url = "github:echasnovski/mini.notify";
-      flake = false;
-    };
-
-    plugin-mini-operators = {
-      url = "github:echasnovski/mini.operators";
-      flake = false;
-    };
-
-    plugin-mini-pairs = {
-      url = "github:echasnovski/mini.pairs";
-      flake = false;
-    };
-
-    plugin-mini-pick = {
-      url = "github:echasnovski/mini.pick";
-      flake = false;
-    };
-
-    plugin-mini-sessions = {
-      url = "github:echasnovski/mini.sessions";
-      flake = false;
-    };
-
-    plugin-mini-snippets = {
-      url = "github:echasnovski/mini.snippets";
-      flake = false;
-    };
-
-    plugin-mini-splitjoin = {
-      url = "github:echasnovski/mini.splitjoin";
-      flake = false;
-    };
-
-    plugin-mini-starter = {
-      url = "github:echasnovski/mini.starter";
-      flake = false;
-    };
-
-    plugin-mini-statusline = {
-      url = "github:echasnovski/mini.statusline";
-      flake = false;
-    };
-
-    plugin-mini-surround = {
-      url = "github:echasnovski/mini.surround";
-      flake = false;
-    };
-
-    plugin-mini-tabline = {
-      url = "github:echasnovski/mini.tabline";
-      flake = false;
-    };
-
-    plugin-mini-test = {
-      url = "github:echasnovski/mini.test";
-      flake = false;
-    };
-
-    plugin-mini-trailspace = {
-      url = "github:echasnovski/mini.trailspace";
-      flake = false;
-    };
-
-    plugin-mini-visits = {
-      url = "github:echasnovski/mini.visits";
-      flake = false;
-    };
   };
 }
diff --git a/npins/default.nix b/npins/default.nix
new file mode 100644
index 00000000..5e7d086e
--- /dev/null
+++ b/npins/default.nix
@@ -0,0 +1,80 @@
+# Generated by npins. Do not modify; will be overwritten regularly
+let
+  data = builtins.fromJSON (builtins.readFile ./sources.json);
+  version = data.version;
+
+  mkSource =
+    spec:
+    assert spec ? type;
+    let
+      path =
+        if spec.type == "Git" then
+          mkGitSource spec
+        else if spec.type == "GitRelease" then
+          mkGitSource spec
+        else if spec.type == "PyPi" then
+          mkPyPiSource spec
+        else if spec.type == "Channel" then
+          mkChannelSource spec
+        else
+          builtins.throw "Unknown source type ${spec.type}";
+    in
+    spec // { outPath = path; };
+
+  mkGitSource =
+    {
+      repository,
+      revision,
+      url ? null,
+      hash,
+      branch ? null,
+      ...
+    }:
+    assert repository ? type;
+    # At the moment, either it is a plain git repository (which has an url), or it is a GitHub/GitLab repository
+    # In the latter case, there we will always be an url to the tarball
+    if url != null then
+      (builtins.fetchTarball {
+        inherit url;
+        sha256 = hash; # FIXME: check nix version & use SRI hashes
+      })
+    else
+      assert repository.type == "Git";
+      let
+        urlToName =
+          url: rev:
+          let
+            matched = builtins.match "^.*/([^/]*)(\\.git)?$" repository.url;
+
+            short = builtins.substring 0 7 rev;
+
+            appendShort = if (builtins.match "[a-f0-9]*" rev) != null then "-${short}" else "";
+          in
+          "${if matched == null then "source" else builtins.head matched}${appendShort}";
+        name = urlToName repository.url revision;
+      in
+      builtins.fetchGit {
+        url = repository.url;
+        rev = revision;
+        inherit name;
+        # hash = hash;
+      };
+
+  mkPyPiSource =
+    { url, hash, ... }:
+    builtins.fetchurl {
+      inherit url;
+      sha256 = hash;
+    };
+
+  mkChannelSource =
+    { url, hash, ... }:
+    builtins.fetchTarball {
+      inherit url;
+      sha256 = hash;
+    };
+in
+if version == 3 then
+  builtins.mapAttrs (_: mkSource) data.pins
+else
+  throw "Unsupported format version ${toString version} in sources.json. Try running `npins upgrade`"
diff --git a/npins/sources.json b/npins/sources.json
new file mode 100644
index 00000000..b201e331
--- /dev/null
+++ b/npins/sources.json
@@ -0,0 +1,2015 @@
+{
+  "pins": {
+    "ChatGPT.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "jackMort",
+        "repo": "ChatGPT.nvim"
+      },
+      "branch": "main",
+      "revision": "5b6d296eefc75331e2ff9f0adcffbd7d27862dd6",
+      "url": "https://github.com/jackMort/ChatGPT.nvim/archive/5b6d296eefc75331e2ff9f0adcffbd7d27862dd6.tar.gz",
+      "hash": "07f0p03fb4060lc7jfvp8mqi0jbk8mril9fg3b8rx9mq8415g1gr"
+    },
+    "Comment.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "numToStr",
+        "repo": "Comment.nvim"
+      },
+      "branch": "main",
+      "revision": "e30b7f2008e52442154b66f7c519bfd2f1e32acb",
+      "url": "https://github.com/numToStr/Comment.nvim/archive/e30b7f2008e52442154b66f7c519bfd2f1e32acb.tar.gz",
+      "hash": "0dyz78j0kj3j99y5g8wncl7794g6z2qs05gfg9ddxaa4xswhyjc7"
+    },
+    "LuaSnip": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "L3MON4D3",
+        "repo": "LuaSnip"
+      },
+      "branch": "main",
+      "revision": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d",
+      "url": "https://github.com/L3MON4D3/LuaSnip/archive/33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d.tar.gz",
+      "hash": "1zicjd8y9a16rq1rs1xbmc6g927j5xi05yrxj9ap6wp72pfxxw3r"
+    },
+    "aerial.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "stevearc",
+        "repo": "aerial.nvim"
+      },
+      "branch": "main",
+      "revision": "b3ec25ca8c347fafa976484a6cace162239112e1",
+      "url": "https://github.com/stevearc/aerial.nvim/archive/b3ec25ca8c347fafa976484a6cace162239112e1.tar.gz",
+      "hash": "0jz169xhg4xhg3di19xj1yvyl6lrrx8a0aka00gk62f08j8jv17d"
+    },
+    "alpha-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "goolord",
+        "repo": "alpha-nvim"
+      },
+      "branch": "main",
+      "revision": "de72250e054e5e691b9736ee30db72c65d560771",
+      "url": "https://github.com/goolord/alpha-nvim/archive/de72250e054e5e691b9736ee30db72c65d560771.tar.gz",
+      "hash": "0c1jkhxamfn2md7m1r5b2wpxa26y90b98yzjwf68m3fymalvkn5h"
+    },
+    "base16-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "rrethy",
+        "repo": "base16-nvim"
+      },
+      "branch": "main",
+      "revision": "6ac181b5733518040a33017dde654059cd771b7c",
+      "url": "https://github.com/rrethy/base16-nvim/archive/6ac181b5733518040a33017dde654059cd771b7c.tar.gz",
+      "hash": "0q47jbh6abn2hql9ghi9ayx3l8pdrdcdrnf4qfk7cp0v1bl7y48r"
+    },
+    "bufdelete.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "famiu",
+        "repo": "bufdelete.nvim"
+      },
+      "branch": "main",
+      "revision": "f6bcea78afb3060b198125256f897040538bcb81",
+      "url": "https://github.com/famiu/bufdelete.nvim/archive/f6bcea78afb3060b198125256f897040538bcb81.tar.gz",
+      "hash": "0xfzk3zgnxbwnr55n3lglsb8nmhnchpiqz9d152xr6j8d9z0sdcn"
+    },
+    "ccc.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "uga-rosa",
+        "repo": "ccc.nvim"
+      },
+      "branch": "main",
+      "revision": "7c639042583c7bdc7ce2e37e5a0e0aa6d0659c6a",
+      "url": "https://github.com/uga-rosa/ccc.nvim/archive/7c639042583c7bdc7ce2e37e5a0e0aa6d0659c6a.tar.gz",
+      "hash": "01pp5j89x6p7k3r0gpcd12yjdqwxv2m472hnjvpr6mqhq3d525rs"
+    },
+    "cellular-automaton.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "Eandrju",
+        "repo": "cellular-automaton.nvim"
+      },
+      "branch": "main",
+      "revision": "11aea08aa084f9d523b0142c2cd9441b8ede09ed",
+      "url": "https://github.com/Eandrju/cellular-automaton.nvim/archive/11aea08aa084f9d523b0142c2cd9441b8ede09ed.tar.gz",
+      "hash": "0jvz2vnyhm6a2zyz93sh87n59vga2l016ijrfybfrlv44hhzp2ww"
+    },
+    "cheatsheet.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "sudormrfbin",
+        "repo": "cheatsheet.nvim"
+      },
+      "branch": "main",
+      "revision": "9716f9aaa94dd1fd6ce59b5aae0e5f25e2a463ef",
+      "url": "https://github.com/sudormrfbin/cheatsheet.nvim/archive/9716f9aaa94dd1fd6ce59b5aae0e5f25e2a463ef.tar.gz",
+      "hash": "0dm94kppbnky8y0gs1pdfs7vcc9hyp8lf6h33dw6ndqfnw3hd2ad"
+    },
+    "cinnamon.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "declancm",
+        "repo": "cinnamon.nvim"
+      },
+      "branch": "main",
+      "revision": "450cb3247765fed7871b41ef4ce5fa492d834215",
+      "url": "https://github.com/declancm/cinnamon.nvim/archive/450cb3247765fed7871b41ef4ce5fa492d834215.tar.gz",
+      "hash": "1vq0cab139gyix2qhmivp86fq6l4fhzn7qafphj0yjac47i11iwi"
+    },
+    "cmp-buffer": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "hrsh7th",
+        "repo": "cmp-buffer"
+      },
+      "branch": "main",
+      "revision": "3022dbc9166796b644a841a02de8dd1cc1d311fa",
+      "url": "https://github.com/hrsh7th/cmp-buffer/archive/3022dbc9166796b644a841a02de8dd1cc1d311fa.tar.gz",
+      "hash": "1cwx8ky74633y0bmqmvq1lqzmphadnhzmhzkddl3hpb7rgn18vkl"
+    },
+    "cmp-nvim-lsp": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "hrsh7th",
+        "repo": "cmp-nvim-lsp"
+      },
+      "branch": "main",
+      "revision": "99290b3ec1322070bcfb9e846450a46f6efa50f0",
+      "url": "https://github.com/hrsh7th/cmp-nvim-lsp/archive/99290b3ec1322070bcfb9e846450a46f6efa50f0.tar.gz",
+      "hash": "08q5mf5jrqjjcl1s4h9zj2vd1kcizz0a5a6p65wv1rc5s1fa3a49"
+    },
+    "cmp-path": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "hrsh7th",
+        "repo": "cmp-path"
+      },
+      "branch": "main",
+      "revision": "91ff86cd9c29299a64f968ebb45846c485725f23",
+      "url": "https://github.com/hrsh7th/cmp-path/archive/91ff86cd9c29299a64f968ebb45846c485725f23.tar.gz",
+      "hash": "18ixx14ibc7qrv32nj0ylxrx8w4ggg49l5vhcqd35hkp4n56j6mn"
+    },
+    "cmp-treesitter": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "ray-x",
+        "repo": "cmp-treesitter"
+      },
+      "branch": "main",
+      "revision": "958fcfa0d8ce46d215e19cc3992c542f576c4123",
+      "url": "https://github.com/ray-x/cmp-treesitter/archive/958fcfa0d8ce46d215e19cc3992c542f576c4123.tar.gz",
+      "hash": "05as01c2f7i20zkzpqbq9n8ji9bcwd678ixmxnrz9vmz5zsj8q7i"
+    },
+    "cmp_luasnip": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "saadparwaiz1",
+        "repo": "cmp_luasnip"
+      },
+      "branch": "main",
+      "revision": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90",
+      "url": "https://github.com/saadparwaiz1/cmp_luasnip/archive/98d9cb5c2c38532bd9bdb481067b20fea8f32e90.tar.gz",
+      "hash": "037sh4g1747wf07f9sqngiifp89hqww6m2rvizy5ra7jyd04magk"
+    },
+    "codewindow.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "gorbit99",
+        "repo": "codewindow.nvim"
+      },
+      "branch": "main",
+      "revision": "dd7017617962943eb1d152fc58940f11c6775a4a",
+      "url": "https://github.com/gorbit99/codewindow.nvim/archive/dd7017617962943eb1d152fc58940f11c6775a4a.tar.gz",
+      "hash": "1kxkf50rkqrzqz03jvygbwxb1yfmqh0gskr00vpmyrq51569a2hw"
+    },
+    "conform.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "stevearc",
+        "repo": "conform.nvim"
+      },
+      "branch": "main",
+      "revision": "363243c03102a531a8203311d4f2ae704c620d9b",
+      "url": "https://github.com/stevearc/conform.nvim/archive/363243c03102a531a8203311d4f2ae704c620d9b.tar.gz",
+      "hash": "1lf7a5b30g37ys9f4z9gq68ymzfzsw7bwzqp1bb91cx9df1bdyck"
+    },
+    "copilot-cmp": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "zbirenbaum",
+        "repo": "copilot-cmp"
+      },
+      "branch": "main",
+      "revision": "15fc12af3d0109fa76b60b5cffa1373697e261d1",
+      "url": "https://github.com/zbirenbaum/copilot-cmp/archive/15fc12af3d0109fa76b60b5cffa1373697e261d1.tar.gz",
+      "hash": "0qyakf6wvkdxpzx63gv3p9bwafmxk87vgvcp14pfrkiznvqlpd3s"
+    },
+    "copilot.lua": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "zbirenbaum",
+        "repo": "copilot.lua"
+      },
+      "branch": "main",
+      "revision": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9",
+      "url": "https://github.com/zbirenbaum/copilot.lua/archive/886ee73b6d464b2b3e3e6a7ff55ce87feac423a9.tar.gz",
+      "hash": "15d1m1lq1f4snkgvnr3cvz0gxh3yycszlq6cph68ddn1sb8h8rbk"
+    },
+    "crates.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "Saecki",
+        "repo": "crates.nvim"
+      },
+      "branch": "main",
+      "revision": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785",
+      "url": "https://github.com/Saecki/crates.nvim/archive/8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785.tar.gz",
+      "hash": "088yi9z0wj2ackg3hh5zm66yg31b2c5rc2ss24idx2jkfhqv908c"
+    },
+    "csharpls-extended-lsp.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "Decodetalkers",
+        "repo": "csharpls-extended-lsp.nvim"
+      },
+      "branch": "main",
+      "revision": "4f56c06215d10c4fcfee8a7f04ba766c114aece0",
+      "url": "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/archive/4f56c06215d10c4fcfee8a7f04ba766c114aece0.tar.gz",
+      "hash": "1jnaimzc3mhqacn3cqds5zkwphn4dzqwrayv48791w0gv2wfzvwc"
+    },
+    "dashboard-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "glepnir",
+        "repo": "dashboard-nvim"
+      },
+      "branch": "main",
+      "revision": "ae309606940d26d8c9df8b048a6e136b6bbec478",
+      "url": "https://github.com/glepnir/dashboard-nvim/archive/ae309606940d26d8c9df8b048a6e136b6bbec478.tar.gz",
+      "hash": "06mr3869ag542vxnj68458k9cfyw9ldj0mjahzqkpwfl5nc28bs2"
+    },
+    "diffview.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "sindrets",
+        "repo": "diffview.nvim"
+      },
+      "branch": "main",
+      "revision": "4516612fe98ff56ae0415a259ff6361a89419b0a",
+      "url": "https://github.com/sindrets/diffview.nvim/archive/4516612fe98ff56ae0415a259ff6361a89419b0a.tar.gz",
+      "hash": "0brabpd02596hg98bml118bx6z2sly98kf1cr2p0xzybiinb4zs9"
+    },
+    "dracula.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "Mofiqul",
+        "repo": "dracula.nvim"
+      },
+      "branch": "main",
+      "revision": "515acae4fd294fcefa5b15237a333c2606e958d1",
+      "url": "https://github.com/Mofiqul/dracula.nvim/archive/515acae4fd294fcefa5b15237a333c2606e958d1.tar.gz",
+      "hash": "1sr09v6q07q111pbcm8nc12mvgzb5f5n7bg8frrwb6dpspj4h97n"
+    },
+    "dressing.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "stevearc",
+        "repo": "dressing.nvim"
+      },
+      "branch": "main",
+      "revision": "3a45525bb182730fe462325c99395529308f431e",
+      "url": "https://github.com/stevearc/dressing.nvim/archive/3a45525bb182730fe462325c99395529308f431e.tar.gz",
+      "hash": "0wd9zgqh9i9f77ny7avgsnsl6rxamcqcr7qlbzmsb8p003kl321p"
+    },
+    "elixir-tools.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "elixir-tools",
+        "repo": "elixir-tools.nvim"
+      },
+      "branch": "main",
+      "revision": "803fa69dbb457305cff98e3997bed2c4b51aea7c",
+      "url": "https://github.com/elixir-tools/elixir-tools.nvim/archive/803fa69dbb457305cff98e3997bed2c4b51aea7c.tar.gz",
+      "hash": "09fnpj27rynw55hvs8dc860di10m3yj628aghsn3lzm249ar708a"
+    },
+    "fastaction.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "Chaitanyabsprip",
+        "repo": "fastaction.nvim"
+      },
+      "branch": "main",
+      "revision": "886e22d85e13115808e81ca367d5aaba02d9a25b",
+      "url": "https://github.com/Chaitanyabsprip/fastaction.nvim/archive/886e22d85e13115808e81ca367d5aaba02d9a25b.tar.gz",
+      "hash": "0zz9jc2nfyn43idwz63xcacgyaclsvddsjnk8vjgifga4m7v2r6l"
+    },
+    "fidget.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "j-hui",
+        "repo": "fidget.nvim"
+      },
+      "branch": "main",
+      "revision": "9238947645ce17d96f30842e61ba81147185b657",
+      "url": "https://github.com/j-hui/fidget.nvim/archive/9238947645ce17d96f30842e61ba81147185b657.tar.gz",
+      "hash": "1117w5i7996vxx32vibb09zpzzgwaipj5ldkdgck3ds5vkcdlk53"
+    },
+    "flutter-tools.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "akinsho",
+        "repo": "flutter-tools.nvim"
+      },
+      "branch": "main",
+      "revision": "a526c30f1941a7472509aaedda13758f943c968e",
+      "url": "https://github.com/akinsho/flutter-tools.nvim/archive/a526c30f1941a7472509aaedda13758f943c968e.tar.gz",
+      "hash": "1qy03zi1vifsdhkyp9yf97px2ny0l30h6nagfic00lyj38z9vx65"
+    },
+    "friendly-snippets": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "rafamadriz",
+        "repo": "friendly-snippets"
+      },
+      "branch": "main",
+      "revision": "efff286dd74c22f731cdec26a70b46e5b203c619",
+      "url": "https://github.com/rafamadriz/friendly-snippets/archive/efff286dd74c22f731cdec26a70b46e5b203c619.tar.gz",
+      "hash": "1vb5l8ipfjwsrqffbq8v2z5p1cpg035b3gk57692wd7835kr3i13"
+    },
+    "fzf-lua": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "ibhagwan",
+        "repo": "fzf-lua"
+      },
+      "branch": "main",
+      "revision": "fbe21aeb147b3dc8b188b5753a8e288ecedcee5e",
+      "url": "https://github.com/ibhagwan/fzf-lua/archive/fbe21aeb147b3dc8b188b5753a8e288ecedcee5e.tar.gz",
+      "hash": "1wiwq9h0m4rzcc5h2wqxa4gqiw9xrxlggvcasacy9bq89c6l11yh"
+    },
+    "gesture.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "notomo",
+        "repo": "gesture.nvim"
+      },
+      "branch": "main",
+      "revision": "dbd839bda337cb73911aeef06897eb29cb99f76f",
+      "url": "https://github.com/notomo/gesture.nvim/archive/dbd839bda337cb73911aeef06897eb29cb99f76f.tar.gz",
+      "hash": "1cqiahc52xh113l8lgpz3k852vvqkv2srj9shdkyya76a2v2sf9d"
+    },
+    "gitsigns.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "lewis6991",
+        "repo": "gitsigns.nvim"
+      },
+      "branch": "main",
+      "revision": "5f808b5e4fef30bd8aca1b803b4e555da07fc412",
+      "url": "https://github.com/lewis6991/gitsigns.nvim/archive/5f808b5e4fef30bd8aca1b803b4e555da07fc412.tar.gz",
+      "hash": "1dxsyv26mm7lzll3xlkzjj6w7kp11wfak8rgp19fg2d8301kxc0z"
+    },
+    "glow.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "ellisonleao",
+        "repo": "glow.nvim"
+      },
+      "branch": "main",
+      "revision": "238070a686c1da3bccccf1079700eb4b5e19aea4",
+      "url": "https://github.com/ellisonleao/glow.nvim/archive/238070a686c1da3bccccf1079700eb4b5e19aea4.tar.gz",
+      "hash": "1j63y3hb03n5m4jig8576sxnb3jixxlr66m9xcs8vgfm5h0mrhqs"
+    },
+    "gruvbox.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "ellisonleao",
+        "repo": "gruvbox.nvim"
+      },
+      "branch": "main",
+      "revision": "68c3460a5d1d1a362318960035c9f3466d5011f5",
+      "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/68c3460a5d1d1a362318960035c9f3466d5011f5.tar.gz",
+      "hash": "0yc0hv9d4888lfvhd68gdwvfhfgafyqn9ljca4b5a0pgb61hiax9"
+    },
+    "haskell-tools.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "mrcjkb",
+        "repo": "haskell-tools.nvim"
+      },
+      "branch": "main",
+      "revision": "943b77b68a79d3991523ba4d373063c9355c6f55",
+      "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/943b77b68a79d3991523ba4d373063c9355c6f55.tar.gz",
+      "hash": "0f8j9x20bs62pnsx4kwklbnrnxqakmfg9xd7742rqfyg03s4v5c1"
+    },
+    "highlight-undo.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "tzachar",
+        "repo": "highlight-undo.nvim"
+      },
+      "branch": "main",
+      "revision": "5f588b420179a31d7073854bfd07ed9d5f364645",
+      "url": "https://github.com/tzachar/highlight-undo.nvim/archive/5f588b420179a31d7073854bfd07ed9d5f364645.tar.gz",
+      "hash": "1ykk9kj74kpnqq003fkhj75d9k68k8fgdv3kr0hbcvggxlr6nhkg"
+    },
+    "hop.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "phaazon",
+        "repo": "hop.nvim"
+      },
+      "branch": "main",
+      "revision": "1a1eceafe54b5081eae4cb91c723abd1d450f34b",
+      "url": "https://github.com/phaazon/hop.nvim/archive/1a1eceafe54b5081eae4cb91c723abd1d450f34b.tar.gz",
+      "hash": "08h18cam2yr57qvfsnf1bra28vbl6013wlchnr5crb757xw8aysa"
+    },
+    "icon-picker.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "ziontee113",
+        "repo": "icon-picker.nvim"
+      },
+      "branch": "main",
+      "revision": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3",
+      "url": "https://github.com/ziontee113/icon-picker.nvim/archive/3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3.tar.gz",
+      "hash": "1357c2dhl7m7hbdsj0l2bmk97i76bp5yrfnd0g01sgd6wiasr4jm"
+    },
+    "image.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "3rd",
+        "repo": "image.nvim"
+      },
+      "branch": "main",
+      "revision": "b991fc7f845bc6ab40c6ec00b39750dcd5190010",
+      "url": "https://github.com/3rd/image.nvim/archive/b991fc7f845bc6ab40c6ec00b39750dcd5190010.tar.gz",
+      "hash": "1jbbm4l71w0cas0aj5d0jsy65chbvf4bdxxllb04i3k6h1zycdja"
+    },
+    "indent-blankline.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "lukas-reineke",
+        "repo": "indent-blankline.nvim"
+      },
+      "branch": "main",
+      "revision": "259357fa4097e232730341fa60988087d189193a",
+      "url": "https://github.com/lukas-reineke/indent-blankline.nvim/archive/259357fa4097e232730341fa60988087d189193a.tar.gz",
+      "hash": "1q9fgqvr84lynhy2vcyzp9xhzrl80g2pin14v7d3v0pgj10m8y8z"
+    },
+    "leap.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "ggandor",
+        "repo": "leap.nvim"
+      },
+      "branch": "main",
+      "revision": "c6bfb191f1161fbabace1f36f578a20ac6c7642c",
+      "url": "https://github.com/ggandor/leap.nvim/archive/c6bfb191f1161fbabace1f36f578a20ac6c7642c.tar.gz",
+      "hash": "1dmy45czi3irjd5qb74yamjam4d1lvqsgfxgh4vaj740b19gyl1w"
+    },
+    "lsp_signature.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "ray-x",
+        "repo": "lsp_signature.nvim"
+      },
+      "branch": "main",
+      "revision": "fc38521ea4d9ec8dbd4c2819ba8126cea743943b",
+      "url": "https://github.com/ray-x/lsp_signature.nvim/archive/fc38521ea4d9ec8dbd4c2819ba8126cea743943b.tar.gz",
+      "hash": "0ag79vvjz1dqyw9358ijdkckr1rqshxkpk5fl0kww1vl3pfwv9jv"
+    },
+    "lspkind-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "onsails",
+        "repo": "lspkind-nvim"
+      },
+      "branch": "main",
+      "revision": "d79a1c3299ad0ef94e255d045bed9fa26025dab6",
+      "url": "https://github.com/onsails/lspkind-nvim/archive/d79a1c3299ad0ef94e255d045bed9fa26025dab6.tar.gz",
+      "hash": "1wdavqmwadby9lyw415jw79kxynxv4fxg2v376y0rkxf258clarq"
+    },
+    "lspsaga.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "tami5",
+        "repo": "lspsaga.nvim"
+      },
+      "branch": "main",
+      "revision": "5faeec9f2508d2d49a66c0ac0d191096b4e3fa81",
+      "url": "https://github.com/tami5/lspsaga.nvim/archive/5faeec9f2508d2d49a66c0ac0d191096b4e3fa81.tar.gz",
+      "hash": "1bw71db69na2sriv9q167z9bgkir4nwny1bdfv9z606bmng4hhzc"
+    },
+    "lua-utils.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nvim-neorg",
+        "repo": "lua-utils.nvim"
+      },
+      "branch": "main",
+      "revision": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd",
+      "url": "https://github.com/nvim-neorg/lua-utils.nvim/archive/e565749421f4bbb5d2e85e37c3cef9d56553d8bd.tar.gz",
+      "hash": "0bnl2kvxs55l8cjhfpa834bm010n8r4gmsmivjcp548c076msagn"
+    },
+    "lualine.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "hoob3rt",
+        "repo": "lualine.nvim"
+      },
+      "branch": "main",
+      "revision": "2a5bae925481f999263d6f5ed8361baef8df4f83",
+      "url": "https://github.com/hoob3rt/lualine.nvim/archive/2a5bae925481f999263d6f5ed8361baef8df4f83.tar.gz",
+      "hash": "0hp8gycbwm6ibq4rpa18j3g9xacgghklz4c8jlr4gif6g37r1pi0"
+    },
+    "lz.n": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nvim-neorocks",
+        "repo": "lz.n"
+      },
+      "branch": "main",
+      "revision": "32be28a221b9c98e56841458e4b20c150a4169c4",
+      "url": "https://github.com/nvim-neorocks/lz.n/archive/32be28a221b9c98e56841458e4b20c150a4169c4.tar.gz",
+      "hash": "0jv8901lc712ddv1sdw5zan2d64hwxjcwi4mi4q1ivcp16miglp8"
+    },
+    "lzn-auto-require": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "horriblename",
+        "repo": "lzn-auto-require"
+      },
+      "branch": "main",
+      "revision": "a075ed51976323fd7fc44ccfca89fe0449a08cca",
+      "url": "https://github.com/horriblename/lzn-auto-require/archive/a075ed51976323fd7fc44ccfca89fe0449a08cca.tar.gz",
+      "hash": "1mgka1mmvpd2gfya898qdbbwrp5rpqds8manjs1s7g5x63xp6b98"
+    },
+    "mind.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "phaazon",
+        "repo": "mind.nvim"
+      },
+      "branch": "main",
+      "revision": "002137dd7cf97865ebd01b6a260209d2daf2da66",
+      "url": "https://github.com/phaazon/mind.nvim/archive/002137dd7cf97865ebd01b6a260209d2daf2da66.tar.gz",
+      "hash": "1p7gb8p1jrb2wx3x67lv7am3k1a14kvwsq89fdpb8b060s2l1214"
+    },
+    "mini-git": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini-git"
+      },
+      "branch": "main",
+      "revision": "fc13dde6cfe87cf25a4fd1ee177c0d157468436b",
+      "url": "https://github.com/echasnovski/mini-git/archive/fc13dde6cfe87cf25a4fd1ee177c0d157468436b.tar.gz",
+      "hash": "1wl9f3yncpnpv1j8imja4fwsnizjcqkv9cmblidj014rkji8lyxd"
+    },
+    "mini.ai": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.ai"
+      },
+      "branch": "main",
+      "revision": "ebb04799794a7f94628153991e6334c3304961b8",
+      "url": "https://github.com/echasnovski/mini.ai/archive/ebb04799794a7f94628153991e6334c3304961b8.tar.gz",
+      "hash": "1ipkxwizyhl3i3z6zff87k345mwkrsxmwwxbv5gcyq37bzmgpzkg"
+    },
+    "mini.align": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.align"
+      },
+      "branch": "main",
+      "revision": "e715137aece7d05734403d793b8b6b64486bc812",
+      "url": "https://github.com/echasnovski/mini.align/archive/e715137aece7d05734403d793b8b6b64486bc812.tar.gz",
+      "hash": "1m39wsinfdmqw53mllf9wr854vaw8qzhixy3j5w8r112s7qrnyx0"
+    },
+    "mini.animate": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.animate"
+      },
+      "branch": "main",
+      "revision": "d14190ac3040116540889e2ebc25f488b195799e",
+      "url": "https://github.com/echasnovski/mini.animate/archive/d14190ac3040116540889e2ebc25f488b195799e.tar.gz",
+      "hash": "15raqvmgp4srh7asll1y3finbm76l1sfmf52h69jj2y2w4kfdqv5"
+    },
+    "mini.base16": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.base16"
+      },
+      "branch": "main",
+      "revision": "23453dacc1606e5d42238d82f0b42a2985386b62",
+      "url": "https://github.com/echasnovski/mini.base16/archive/23453dacc1606e5d42238d82f0b42a2985386b62.tar.gz",
+      "hash": "0cxwc4bpkc362q00vkm75bbazd69ghyyavs30gf37fj3zj9khssl"
+    },
+    "mini.basics": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.basics"
+      },
+      "branch": "main",
+      "revision": "67c10b3436d5d3b892715137f4773e71c6753b13",
+      "url": "https://github.com/echasnovski/mini.basics/archive/67c10b3436d5d3b892715137f4773e71c6753b13.tar.gz",
+      "hash": "1ia7wha33l6q1krlx7d90v5rw25kdiv6la8j7f0s8vr0qxlcxhs7"
+    },
+    "mini.bracketed": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.bracketed"
+      },
+      "branch": "main",
+      "revision": "0091e11fabe34973fc038a8d0d0485202742e403",
+      "url": "https://github.com/echasnovski/mini.bracketed/archive/0091e11fabe34973fc038a8d0d0485202742e403.tar.gz",
+      "hash": "0yw7lmgwwvraflcwzrl33rwcdb94qsyvdi0rzq9b3ps7bla4dsyb"
+    },
+    "mini.bufremove": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.bufremove"
+      },
+      "branch": "main",
+      "revision": "285bdac9596ee7375db50c0f76ed04336dcd2685",
+      "url": "https://github.com/echasnovski/mini.bufremove/archive/285bdac9596ee7375db50c0f76ed04336dcd2685.tar.gz",
+      "hash": "0q8zm3k8hhpzbcjcd3gqz1r064fiymv9w2lfbdv5hhn2b8i9j7h8"
+    },
+    "mini.clue": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.clue"
+      },
+      "branch": "main",
+      "revision": "63e42dad781b9ed4845d90ef1da8c52dfb6dce3f",
+      "url": "https://github.com/echasnovski/mini.clue/archive/63e42dad781b9ed4845d90ef1da8c52dfb6dce3f.tar.gz",
+      "hash": "039fq0svkgr96l3z7h750iyah6fz9n18zy8wm1dfhpp3bxjyjh7z"
+    },
+    "mini.colors": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.colors"
+      },
+      "branch": "main",
+      "revision": "d64b1c0f520579d905f97208eca85329e664ab88",
+      "url": "https://github.com/echasnovski/mini.colors/archive/d64b1c0f520579d905f97208eca85329e664ab88.tar.gz",
+      "hash": "1yfx5zizm2m1c1064c5j5hb10xd7a8cgircs70q9cai14n25lqh7"
+    },
+    "mini.comment": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.comment"
+      },
+      "branch": "main",
+      "revision": "6e1f9a8ebbf6f693fa3787ceda8ca3bf3cb6aec7",
+      "url": "https://github.com/echasnovski/mini.comment/archive/6e1f9a8ebbf6f693fa3787ceda8ca3bf3cb6aec7.tar.gz",
+      "hash": "0wvyrkq84gy15ygv47vj50ch3551vmjp5gjvmvz26p3d4l6h225w"
+    },
+    "mini.completion": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.completion"
+      },
+      "branch": "main",
+      "revision": "6eb9546685c4e1c4af2365b87166d4afa39d8a1b",
+      "url": "https://github.com/echasnovski/mini.completion/archive/6eb9546685c4e1c4af2365b87166d4afa39d8a1b.tar.gz",
+      "hash": "05hk62f74fv8axdygbdz478dfcbvm4c4j696i77xlpqhfmy04m3n"
+    },
+    "mini.diff": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.diff"
+      },
+      "branch": "main",
+      "revision": "00f072250061ef498f91ed226918c9ec31a416a4",
+      "url": "https://github.com/echasnovski/mini.diff/archive/00f072250061ef498f91ed226918c9ec31a416a4.tar.gz",
+      "hash": "1n3rjajwnx5n5iamn49l4h7p23p601jd4m343ri2hmazb7zxc6vm"
+    },
+    "mini.doc": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.doc"
+      },
+      "branch": "main",
+      "revision": "bb73a3d1ff390f7e2740027ea2567017099a237c",
+      "url": "https://github.com/echasnovski/mini.doc/archive/bb73a3d1ff390f7e2740027ea2567017099a237c.tar.gz",
+      "hash": "1jsamvgdk6zxaimn9v949gbghf92d0ii8jhn2sjjy7arbl8w0w23"
+    },
+    "mini.extra": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.extra"
+      },
+      "branch": "main",
+      "revision": "477e3dda7b597b49bc1373951ea7da4da834c352",
+      "url": "https://github.com/echasnovski/mini.extra/archive/477e3dda7b597b49bc1373951ea7da4da834c352.tar.gz",
+      "hash": "02ydzdiiqf0ydrjiz847f6cbaxy3imvggchds9xn40i34nz6nhlm"
+    },
+    "mini.files": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.files"
+      },
+      "branch": "main",
+      "revision": "d0f03a5c38836fd2cce3dc80734124959002078c",
+      "url": "https://github.com/echasnovski/mini.files/archive/d0f03a5c38836fd2cce3dc80734124959002078c.tar.gz",
+      "hash": "0k5g5l9pb3br4vb5cm1b0hv081fdn967cw00mh687281dvrbnxah"
+    },
+    "mini.fuzzy": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.fuzzy"
+      },
+      "branch": "main",
+      "revision": "faa5a6c0d29c28012c90bd011162963a58715428",
+      "url": "https://github.com/echasnovski/mini.fuzzy/archive/faa5a6c0d29c28012c90bd011162963a58715428.tar.gz",
+      "hash": "03v6rp0j63a7clpp6ficq6ixwr55lvyz3ygc99r1qw0gzh6y9w2y"
+    },
+    "mini.hipatterns": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.hipatterns"
+      },
+      "branch": "main",
+      "revision": "f34975103a38b3f608219a1324cdfc58ea660b8b",
+      "url": "https://github.com/echasnovski/mini.hipatterns/archive/f34975103a38b3f608219a1324cdfc58ea660b8b.tar.gz",
+      "hash": "08mhgd7p69fzy9l99adns1gwb407wdq18di8nm6iy1nw6wrhx7yc"
+    },
+    "mini.hues": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.hues"
+      },
+      "branch": "main",
+      "revision": "ae6ad4c666ff42c1102344fe1eba18bb486f2e46",
+      "url": "https://github.com/echasnovski/mini.hues/archive/ae6ad4c666ff42c1102344fe1eba18bb486f2e46.tar.gz",
+      "hash": "1bfyhs79l8v2zbzc2kp7ss089bp05lpqqy1ndbgvyi546dxgsbp3"
+    },
+    "mini.icons": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.icons"
+      },
+      "branch": "main",
+      "revision": "910db5df9724d65371182948f921fce23c2c881e",
+      "url": "https://github.com/echasnovski/mini.icons/archive/910db5df9724d65371182948f921fce23c2c881e.tar.gz",
+      "hash": "18d2s7sqcwi7yyb14xg96gzxpvr0gk6k1r4mglgjbfpx724z2hy3"
+    },
+    "mini.indentscope": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.indentscope"
+      },
+      "branch": "main",
+      "revision": "613df2830d7faeae7483ba2e736683154b95921e",
+      "url": "https://github.com/echasnovski/mini.indentscope/archive/613df2830d7faeae7483ba2e736683154b95921e.tar.gz",
+      "hash": "02y7ya70wz79xd02xvlvri4sgnqbl9xd6d6im4323iyph7pdrg1j"
+    },
+    "mini.jump": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.jump"
+      },
+      "branch": "main",
+      "revision": "bb93d998c9db6936697746330411f5fb9957145e",
+      "url": "https://github.com/echasnovski/mini.jump/archive/bb93d998c9db6936697746330411f5fb9957145e.tar.gz",
+      "hash": "0m5b0dy7aws5si5sc494hrrnfsgb9i0ssbrfwlprmi9q75xzvhx8"
+    },
+    "mini.jump2d": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.jump2d"
+      },
+      "branch": "main",
+      "revision": "88077058297e80f1c76a18ed801ae9d7064187c6",
+      "url": "https://github.com/echasnovski/mini.jump2d/archive/88077058297e80f1c76a18ed801ae9d7064187c6.tar.gz",
+      "hash": "0dqslwc7r9yj3bszdgjp2cqhnhyzm8zn1zbikwi8q6bs50la2f7q"
+    },
+    "mini.map": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.map"
+      },
+      "branch": "main",
+      "revision": "4c58e755d75f9999abcd3b3c6e934734b6a8b098",
+      "url": "https://github.com/echasnovski/mini.map/archive/4c58e755d75f9999abcd3b3c6e934734b6a8b098.tar.gz",
+      "hash": "1407jgrzk0pvnhsssm3hdgjw3vd1n182adgh8c5h4b46dzvrvgvl"
+    },
+    "mini.misc": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.misc"
+      },
+      "branch": "main",
+      "revision": "645fb9367c19bb485902e54e5451425981498601",
+      "url": "https://github.com/echasnovski/mini.misc/archive/645fb9367c19bb485902e54e5451425981498601.tar.gz",
+      "hash": "0xy9sn0vjlaw0lk6l59drksqypz6yncmdrhach387mv4hvh1lxma"
+    },
+    "mini.move": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.move"
+      },
+      "branch": "main",
+      "revision": "4caa1c212f5ca3d1633d21cfb184808090ed74b1",
+      "url": "https://github.com/echasnovski/mini.move/archive/4caa1c212f5ca3d1633d21cfb184808090ed74b1.tar.gz",
+      "hash": "0f4nrg9n8air507h6bd61dmb1rjjhykyl36qgr0ai72cb011wzcx"
+    },
+    "mini.notify": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.notify"
+      },
+      "branch": "main",
+      "revision": "05e598d5b349bd66404d576e6a4d4340aea5f194",
+      "url": "https://github.com/echasnovski/mini.notify/archive/05e598d5b349bd66404d576e6a4d4340aea5f194.tar.gz",
+      "hash": "02z2qdkh6rks7j7b3pwnm6vala0rz5p09ahplcgv1s4mhgby6vmb"
+    },
+    "mini.operators": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.operators"
+      },
+      "branch": "main",
+      "revision": "7cb4dc66c51a3d736d347bbc517dc73dc7d28888",
+      "url": "https://github.com/echasnovski/mini.operators/archive/7cb4dc66c51a3d736d347bbc517dc73dc7d28888.tar.gz",
+      "hash": "1h6bxqkabh61gnlqj9yp5rsvn1p4g2ssk7ffkj3z8c3f1387567r"
+    },
+    "mini.pairs": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.pairs"
+      },
+      "branch": "main",
+      "revision": "7e834c5937d95364cc1740e20d673afe2d034cdb",
+      "url": "https://github.com/echasnovski/mini.pairs/archive/7e834c5937d95364cc1740e20d673afe2d034cdb.tar.gz",
+      "hash": "04x3gwrg64xxbg0njrb64bjb66rpi2aayydfqx9nbcimllng3l9y"
+    },
+    "mini.pick": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.pick"
+      },
+      "branch": "main",
+      "revision": "09ade94d2c9c5133db9ae00f3693d82eae78e9be",
+      "url": "https://github.com/echasnovski/mini.pick/archive/09ade94d2c9c5133db9ae00f3693d82eae78e9be.tar.gz",
+      "hash": "00vq7zn0nmbnw19gk8gmm6a60zkxga4s8z6c0ildnq6ldk8q70a3"
+    },
+    "mini.sessions": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.sessions"
+      },
+      "branch": "main",
+      "revision": "71c9ae596664ac110560d27eb928fc24e22bc53d",
+      "url": "https://github.com/echasnovski/mini.sessions/archive/71c9ae596664ac110560d27eb928fc24e22bc53d.tar.gz",
+      "hash": "0yd4li7z6py3c3b6ka9xv070lmrbzf38svq5wl4mhn4fdhqgqadz"
+    },
+    "mini.snippets": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.snippets"
+      },
+      "branch": "main",
+      "revision": "72920f62e3dd1330720e94e8f5d42592f3a1ecf8",
+      "url": "https://github.com/echasnovski/mini.snippets/archive/72920f62e3dd1330720e94e8f5d42592f3a1ecf8.tar.gz",
+      "hash": "0lyyv95zzwa6kn3gz7sah6v7jqj635c45n88my2sx8wknadkv30y"
+    },
+    "mini.splitjoin": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.splitjoin"
+      },
+      "branch": "main",
+      "revision": "3e92f6764e770ba392325cad3a4497adcada695f",
+      "url": "https://github.com/echasnovski/mini.splitjoin/archive/3e92f6764e770ba392325cad3a4497adcada695f.tar.gz",
+      "hash": "126z8rsyg3849ijix1siwq77f9slwr93l61rwg499flzja3incic"
+    },
+    "mini.starter": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.starter"
+      },
+      "branch": "main",
+      "revision": "4b257cfc93241e8c8cde3f9302d1616ad4e0d036",
+      "url": "https://github.com/echasnovski/mini.starter/archive/4b257cfc93241e8c8cde3f9302d1616ad4e0d036.tar.gz",
+      "hash": "135l18l6n88v8zrdk95dfvw2ycsgd8m4wp9430g74bry99jj95m4"
+    },
+    "mini.statusline": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.statusline"
+      },
+      "branch": "main",
+      "revision": "1b0edf76fe2af015f8c989385ff949f1db7aade2",
+      "url": "https://github.com/echasnovski/mini.statusline/archive/1b0edf76fe2af015f8c989385ff949f1db7aade2.tar.gz",
+      "hash": "1aiy37p08c95g3dh5f0hvabnnv56dhs4zmpah5lx33j3fbvqs381"
+    },
+    "mini.surround": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.surround"
+      },
+      "branch": "main",
+      "revision": "aa5e245829dd12d8ff0c96ef11da28681d6049aa",
+      "url": "https://github.com/echasnovski/mini.surround/archive/aa5e245829dd12d8ff0c96ef11da28681d6049aa.tar.gz",
+      "hash": "1zslkqg96yfa1lgcwavvcz60waix4y1j1r0v98sxhf8adna8jid2"
+    },
+    "mini.tabline": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.tabline"
+      },
+      "branch": "main",
+      "revision": "06ef4ecaeca2e362c7d31113435d86d144b3cbbe",
+      "url": "https://github.com/echasnovski/mini.tabline/archive/06ef4ecaeca2e362c7d31113435d86d144b3cbbe.tar.gz",
+      "hash": "1z808l3z7ywqxmqwfr1ab9ynyma5c1878x9ski0nrhvw4fli9rwy"
+    },
+    "mini.test": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.test"
+      },
+      "branch": "main",
+      "revision": "86a64d5a4bf9d73ebf5875edaae0d878f64f5e48",
+      "url": "https://github.com/echasnovski/mini.test/archive/86a64d5a4bf9d73ebf5875edaae0d878f64f5e48.tar.gz",
+      "hash": "02zslska1g4ixy51slbvlxbjzcys0spc4wh200q8mwv4ipiignrn"
+    },
+    "mini.trailspace": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.trailspace"
+      },
+      "branch": "main",
+      "revision": "3a328e62559c33014e422fb9ae97afc4208208b1",
+      "url": "https://github.com/echasnovski/mini.trailspace/archive/3a328e62559c33014e422fb9ae97afc4208208b1.tar.gz",
+      "hash": "1314bmb8zk3gdpg1wpr1935d0xd0f0cf2f0ipxclbwi07wbjz9i4"
+    },
+    "mini.visits": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.visits"
+      },
+      "branch": "main",
+      "revision": "90f20ba6ab7d3d7cb984fffddd82f5f6c7a6bea7",
+      "url": "https://github.com/echasnovski/mini.visits/archive/90f20ba6ab7d3d7cb984fffddd82f5f6c7a6bea7.tar.gz",
+      "hash": "00drzhrxdyrysbdj4fnxk3lzn9alg8xhwfwgrscywvjfks0vbsa3"
+    },
+    "minimap.vim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "wfxr",
+        "repo": "minimap.vim"
+      },
+      "branch": "main",
+      "revision": "395378137e6180762d5b963ca9ad5ac2db5d3283",
+      "url": "https://github.com/wfxr/minimap.vim/archive/395378137e6180762d5b963ca9ad5ac2db5d3283.tar.gz",
+      "hash": "0pfzmlf36in086g83g3sdqdy57jyyh5nbh2lrfmpbr2sg401a7qr"
+    },
+    "modes.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "mvllow",
+        "repo": "modes.nvim"
+      },
+      "branch": "main",
+      "revision": "c7a4b1b383606832aab150902719bd5eb5cdb2b0",
+      "url": "https://github.com/mvllow/modes.nvim/archive/c7a4b1b383606832aab150902719bd5eb5cdb2b0.tar.gz",
+      "hash": "1hy3ghscf8hfmg487p9b8cwd0y8nsi8j24kq2ir3vhd82gqhl4ja"
+    },
+    "neo-tree.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nvim-neo-tree",
+        "repo": "neo-tree.nvim"
+      },
+      "branch": "main",
+      "revision": "a9f8943b4c31f8460d25c71e0f463d65e9775f1c",
+      "url": "https://github.com/nvim-neo-tree/neo-tree.nvim/archive/a9f8943b4c31f8460d25c71e0f463d65e9775f1c.tar.gz",
+      "hash": "1zhjd322jqmp8cs7z7nwgc3vkbf0as3an64qh5diwv04kdwjg4xm"
+    },
+    "neocord": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "IogaMaster",
+        "repo": "neocord"
+      },
+      "branch": "main",
+      "revision": "4d55d8dab2d5f2f272192add7a2c21982039c699",
+      "url": "https://github.com/IogaMaster/neocord/archive/4d55d8dab2d5f2f272192add7a2c21982039c699.tar.gz",
+      "hash": "18d84bd5242a3khpsk0iya3i75bc65mc2xc9kjldpvb827m6myl3"
+    },
+    "neodev.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "folke",
+        "repo": "neodev.nvim"
+      },
+      "branch": "main",
+      "revision": "46aa467dca16cf3dfe27098042402066d2ae242d",
+      "url": "https://github.com/folke/neodev.nvim/archive/46aa467dca16cf3dfe27098042402066d2ae242d.tar.gz",
+      "hash": "0hyn02f8cpbnnhq4570nicfjdw88kkww3il8nmy6ban8iybg7s44"
+    },
+    "neorg": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nvim-neorg",
+        "repo": "neorg"
+      },
+      "branch": "main",
+      "revision": "6b945909d84b5aeadc875f9b3f529ec44b9bc60f",
+      "url": "https://github.com/nvim-neorg/neorg/archive/6b945909d84b5aeadc875f9b3f529ec44b9bc60f.tar.gz",
+      "hash": "0dm8s47w57gh77vaarmz64yvmv68f9ybygq65zbblya4miqknzy4"
+    },
+    "neorg-telescope": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nvim-neorg",
+        "repo": "neorg-telescope"
+      },
+      "branch": "main",
+      "revision": "ddb2556644cae922699a239bbb0fe16e25b084b7",
+      "url": "https://github.com/nvim-neorg/neorg-telescope/archive/ddb2556644cae922699a239bbb0fe16e25b084b7.tar.gz",
+      "hash": "0p2s3n22fy1vkqc9n55x6kssqs4n0znwlszfrs532hj8m992wbks"
+    },
+    "neovim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "rose-pine",
+        "repo": "neovim"
+      },
+      "branch": "main",
+      "revision": "91548dca53b36dbb9d36c10f114385f759731be1",
+      "url": "https://github.com/rose-pine/neovim/archive/91548dca53b36dbb9d36c10f114385f759731be1.tar.gz",
+      "hash": "00zhx2j5lm27pcfaimzbkil61gfc6cxyy1dcgc4cyb8vfi8psf3s"
+    },
+    "neovim-session-manager": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "Shatur",
+        "repo": "neovim-session-manager"
+      },
+      "branch": "main",
+      "revision": "ce43f2eb2a52492157d7742e5f684b9a42bb3e5c",
+      "url": "https://github.com/Shatur/neovim-session-manager/archive/ce43f2eb2a52492157d7742e5f684b9a42bb3e5c.tar.gz",
+      "hash": "0g2vfv9jjmsgagvhdffs3z37w5xa1nlwanq74w8c62y7amyyvn2v"
+    },
+    "new-file-template.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "otavioschwanck",
+        "repo": "new-file-template.nvim"
+      },
+      "branch": "main",
+      "revision": "6ac66669dbf2dc5cdee184a4fe76d22465ca67e8",
+      "url": "https://github.com/otavioschwanck/new-file-template.nvim/archive/6ac66669dbf2dc5cdee184a4fe76d22465ca67e8.tar.gz",
+      "hash": "0c7378c3w6bniclp666rq15c28akb0sjy58ayva0wpyin4k26hl3"
+    },
+    "nixpkgs": {
+      "type": "Channel",
+      "name": "nixpkgs-unstable",
+      "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre747727.f7384aacd0ec/nixexprs.tar.xz",
+      "hash": "12g53dydivr7wibcc7nz4kghg2mcw4jy4vp30qfwsx15pwsihizw"
+    },
+    "noice.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "folke",
+        "repo": "noice.nvim"
+      },
+      "branch": "main",
+      "revision": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f",
+      "url": "https://github.com/folke/noice.nvim/archive/eaed6cc9c06aa2013b5255349e4f26a6b17ab70f.tar.gz",
+      "hash": "0imw4ls3vqh8bg358y8ckxcbylhczr297zxhcfx6r7mf64sj171s"
+    },
+    "none-ls.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nvimtools",
+        "repo": "none-ls.nvim"
+      },
+      "branch": "main",
+      "revision": "bb680d752cec37949faca7a1f509e2fe67ab418a",
+      "url": "https://github.com/nvimtools/none-ls.nvim/archive/bb680d752cec37949faca7a1f509e2fe67ab418a.tar.gz",
+      "hash": "11zgc86cjkv1vi183mplx3bsqa2x7ardk7ybyrp702xx5hmd882l"
+    },
+    "nord.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "gbprod",
+        "repo": "nord.nvim"
+      },
+      "branch": "main",
+      "revision": "b0f3ed242fd8e5bafa7231367821d46c6c835dd8",
+      "url": "https://github.com/gbprod/nord.nvim/archive/b0f3ed242fd8e5bafa7231367821d46c6c835dd8.tar.gz",
+      "hash": "0yr5b30dxrdrbv8210fmh35wgz3z26274aj5irzal33liznx4436"
+    },
+    "nui.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "MunifTanjim",
+        "repo": "nui.nvim"
+      },
+      "branch": "main",
+      "revision": "53e907ffe5eedebdca1cd503b00aa8692068ca46",
+      "url": "https://github.com/MunifTanjim/nui.nvim/archive/53e907ffe5eedebdca1cd503b00aa8692068ca46.tar.gz",
+      "hash": "1m4vlf9qcs01a8qrq3salcz966sp8cpf01gbrg8dbf255vzc8kp9"
+    },
+    "nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "catppuccin",
+        "repo": "nvim"
+      },
+      "branch": "main",
+      "revision": "f67b886d65a029f12ffa298701fb8f1efd89295d",
+      "url": "https://github.com/catppuccin/nvim/archive/f67b886d65a029f12ffa298701fb8f1efd89295d.tar.gz",
+      "hash": "0fwgsvlxvzz5r8jfmj1fp97cqv9b9h2f37fn4nhmim5lm6d0n14p"
+    },
+    "nvim-autopairs": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "windwp",
+        "repo": "nvim-autopairs"
+      },
+      "branch": "main",
+      "revision": "b464658e9b880f463b9f7e6ccddd93fb0013f559",
+      "url": "https://github.com/windwp/nvim-autopairs/archive/b464658e9b880f463b9f7e6ccddd93fb0013f559.tar.gz",
+      "hash": "0p4v49saqfsc8kinl3wc3zhmr6m2q86vmay2f10payp29n4v3did"
+    },
+    "nvim-bufferline.lua": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "akinsho",
+        "repo": "nvim-bufferline.lua"
+      },
+      "branch": "main",
+      "revision": "261a72b90d6db4ed8014f7bda976bcdc9dd7ce76",
+      "url": "https://github.com/akinsho/nvim-bufferline.lua/archive/261a72b90d6db4ed8014f7bda976bcdc9dd7ce76.tar.gz",
+      "hash": "1cp9md0pv0m1866fynasam01bdcqj5fvfcfqqq5licxfr0cgdb6f"
+    },
+    "nvim-cmp": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "hrsh7th",
+        "repo": "nvim-cmp"
+      },
+      "branch": "main",
+      "revision": "b555203ce4bd7ff6192e759af3362f9d217e8c89",
+      "url": "https://github.com/hrsh7th/nvim-cmp/archive/b555203ce4bd7ff6192e759af3362f9d217e8c89.tar.gz",
+      "hash": "1s3wiwhnqp046skxp60sdrvzhrij4javhm9ndvfsw2fv9bc35x37"
+    },
+    "nvim-colorizer.lua": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "catgoose",
+        "repo": "nvim-colorizer.lua"
+      },
+      "branch": "main",
+      "revision": "9b5fe0450bfb2521c6cea29391e5ec571f129136",
+      "url": "https://github.com/catgoose/nvim-colorizer.lua/archive/9b5fe0450bfb2521c6cea29391e5ec571f129136.tar.gz",
+      "hash": "0q5qksxzh5jigdb71w7sk0lv4nwylkidg5c7cx578d8yhnf1jj10"
+    },
+    "nvim-cursorline": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "yamatsum",
+        "repo": "nvim-cursorline"
+      },
+      "branch": "main",
+      "revision": "804f0023692653b2b2368462d67d2a87056947f9",
+      "url": "https://github.com/yamatsum/nvim-cursorline/archive/804f0023692653b2b2368462d67d2a87056947f9.tar.gz",
+      "hash": "1zqbykfi4mjp07y8c1kir4lxgvcaxqy9jkn558y3n1jakpk3l72j"
+    },
+    "nvim-dap": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "mfussenegger",
+        "repo": "nvim-dap"
+      },
+      "branch": "main",
+      "revision": "ffb077e65259f13be096ea6d603e3575a76b214a",
+      "url": "https://github.com/mfussenegger/nvim-dap/archive/ffb077e65259f13be096ea6d603e3575a76b214a.tar.gz",
+      "hash": "0sfqxhqm3gmw8q9w60nz5cm3yj9qnq5mxm584f0g83jvdy59f9p6"
+    },
+    "nvim-dap-go": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "leoluz",
+        "repo": "nvim-dap-go"
+      },
+      "branch": "main",
+      "revision": "6aa88167ea1224bcef578e8c7160fe8afbb44848",
+      "url": "https://github.com/leoluz/nvim-dap-go/archive/6aa88167ea1224bcef578e8c7160fe8afbb44848.tar.gz",
+      "hash": "0ik9jnd561ipdclmxpbc0b1b4qykhkaqmmc2wr9iw4gmszjskhf1"
+    },
+    "nvim-dap-ui": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "rcarriga",
+        "repo": "nvim-dap-ui"
+      },
+      "branch": "main",
+      "revision": "e94d98649dccb6a3884b66aabc2e07beb279e535",
+      "url": "https://github.com/rcarriga/nvim-dap-ui/archive/e94d98649dccb6a3884b66aabc2e07beb279e535.tar.gz",
+      "hash": "06vk5h3z3sp048fnwpy0fdf5q0q41wrnaqbfbaa5vdbpki103hm6"
+    },
+    "nvim-docs-view": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "amrbashir",
+        "repo": "nvim-docs-view"
+      },
+      "branch": "main",
+      "revision": "1b97f8f954d74c46061bf289b6cea9232484c12c",
+      "url": "https://github.com/amrbashir/nvim-docs-view/archive/1b97f8f954d74c46061bf289b6cea9232484c12c.tar.gz",
+      "hash": "1xi0w20fq3yziwdjld1xhkm7dr0ihbbq2hik0qsckd7y73qqg5kg"
+    },
+    "nvim-lightbulb": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "kosayoda",
+        "repo": "nvim-lightbulb"
+      },
+      "branch": "main",
+      "revision": "3ac0791be37ba9cc7939f1ad90ebc5e75abf4eea",
+      "url": "https://github.com/kosayoda/nvim-lightbulb/archive/3ac0791be37ba9cc7939f1ad90ebc5e75abf4eea.tar.gz",
+      "hash": "0qc1rl45ykh9552dx5fmhdg0ncfsk2vpcmj5i7hrmdzgkd2f0avg"
+    },
+    "nvim-lint": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "mfussenegger",
+        "repo": "nvim-lint"
+      },
+      "branch": "main",
+      "revision": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87",
+      "url": "https://github.com/mfussenegger/nvim-lint/archive/789b7ada1b4f00e08d026dffde410dcfa6a0ba87.tar.gz",
+      "hash": "1npjlv0gml66mw9v8d95p3c5zzijpc362bkji6zvc5n152yy59qc"
+    },
+    "nvim-lspconfig": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "neovim",
+        "repo": "nvim-lspconfig"
+      },
+      "branch": "main",
+      "revision": "8b15a1a597a59f4f5306fad9adfe99454feab743",
+      "url": "https://github.com/neovim/nvim-lspconfig/archive/8b15a1a597a59f4f5306fad9adfe99454feab743.tar.gz",
+      "hash": "11mnsm4yaxd5ipmx7cn787f40zgbdx5hfdb3k6cryxfqja74gbg9"
+    },
+    "nvim-metals": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "scalameta",
+        "repo": "nvim-metals"
+      },
+      "branch": "main",
+      "revision": "e6b02c99161b43c67cfe1d6e5f9a9b9a0bb4701c",
+      "url": "https://github.com/scalameta/nvim-metals/archive/e6b02c99161b43c67cfe1d6e5f9a9b9a0bb4701c.tar.gz",
+      "hash": "10zyg59klx9ynqjnkmn9hhp27l9f4vzqibj8xqrnxfdrgryppm8v"
+    },
+    "nvim-navbuddy": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "SmiteshP",
+        "repo": "nvim-navbuddy"
+      },
+      "branch": "main",
+      "revision": "f22bac988f2dd073601d75ba39ea5636ab6e38cb",
+      "url": "https://github.com/SmiteshP/nvim-navbuddy/archive/f22bac988f2dd073601d75ba39ea5636ab6e38cb.tar.gz",
+      "hash": "034pmg403y0y1fxnb1jv291mr016bx1vn68y543v6v4dpbdlr7di"
+    },
+    "nvim-navic": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "SmiteshP",
+        "repo": "nvim-navic"
+      },
+      "branch": "main",
+      "revision": "8649f694d3e76ee10c19255dece6411c29206a54",
+      "url": "https://github.com/SmiteshP/nvim-navic/archive/8649f694d3e76ee10c19255dece6411c29206a54.tar.gz",
+      "hash": "0964wgwh6i4nm637vx36bshkpd5i63ipwzqmrdbkz5h9bzyng7nj"
+    },
+    "nvim-neoclip.lua": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "AckslD",
+        "repo": "nvim-neoclip.lua"
+      },
+      "branch": "main",
+      "revision": "5e5e010251281f4aea69cfc1d4976ffe6065cf0f",
+      "url": "https://github.com/AckslD/nvim-neoclip.lua/archive/5e5e010251281f4aea69cfc1d4976ffe6065cf0f.tar.gz",
+      "hash": "1fdm1k6gdhgi8vz4kfi2v40fjp4c1rnc6fb4bmmr3x6ca25ij8s4"
+    },
+    "nvim-nio": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nvim-neotest",
+        "repo": "nvim-nio"
+      },
+      "branch": "main",
+      "revision": "a428f309119086dc78dd4b19306d2d67be884eee",
+      "url": "https://github.com/nvim-neotest/nvim-nio/archive/a428f309119086dc78dd4b19306d2d67be884eee.tar.gz",
+      "hash": "0n40q6znpy1xzywd1hwyivx7y1n0i0fcp3m7jp0vgipm6qssda4b"
+    },
+    "nvim-notify": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "rcarriga",
+        "repo": "nvim-notify"
+      },
+      "branch": "main",
+      "revision": "c3797193536711b5d8983975791c4b11dc35ab3a",
+      "url": "https://github.com/rcarriga/nvim-notify/archive/c3797193536711b5d8983975791c4b11dc35ab3a.tar.gz",
+      "hash": "003llmakicwzf0dkcnap6anwcr8kkvazfxy59shdb8zdnahfjc7n"
+    },
+    "nvim-scrollbar": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "petertriho",
+        "repo": "nvim-scrollbar"
+      },
+      "branch": "main",
+      "revision": "6994eb9f73d5fdc36ee2c8717940e8c853e51a49",
+      "url": "https://github.com/petertriho/nvim-scrollbar/archive/6994eb9f73d5fdc36ee2c8717940e8c853e51a49.tar.gz",
+      "hash": "0h01gcaqgjkb2392zl2jwvlsh5qmz10k9sy5rhyz1kwizmw7nw7y"
+    },
+    "nvim-surround": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "kylechui",
+        "repo": "nvim-surround"
+      },
+      "branch": "main",
+      "revision": "9f0cb495f25bff32c936062d85046fbda0c43517",
+      "url": "https://github.com/kylechui/nvim-surround/archive/9f0cb495f25bff32c936062d85046fbda0c43517.tar.gz",
+      "hash": "1c78320liqhza52gq2xylykd9m6rl50cn44flldg43a4l7rrabxh"
+    },
+    "nvim-tree.lua": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nvim-tree",
+        "repo": "nvim-tree.lua"
+      },
+      "branch": "main",
+      "revision": "68fc4c20f5803444277022c681785c5edd11916d",
+      "url": "https://github.com/nvim-tree/nvim-tree.lua/archive/68fc4c20f5803444277022c681785c5edd11916d.tar.gz",
+      "hash": "08024p6w208ygn7qd74kj6yxras8qfd5f8w0qdqpyg6qbggqzyg0"
+    },
+    "nvim-treesitter-context": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nvim-treesitter",
+        "repo": "nvim-treesitter-context"
+      },
+      "branch": "main",
+      "revision": "2bcf700b59bc92850ca83a1c02e86ba832e0fae0",
+      "url": "https://github.com/nvim-treesitter/nvim-treesitter-context/archive/2bcf700b59bc92850ca83a1c02e86ba832e0fae0.tar.gz",
+      "hash": "0xs3ha4zd96rzy5w9hyjzyyq88nnv1bnkgg2splfmnf3mhy4r0ac"
+    },
+    "nvim-ts-autotag": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "windwp",
+        "repo": "nvim-ts-autotag"
+      },
+      "branch": "main",
+      "revision": "1cca23c9da708047922d3895a71032bc0449c52d",
+      "url": "https://github.com/windwp/nvim-ts-autotag/archive/1cca23c9da708047922d3895a71032bc0449c52d.tar.gz",
+      "hash": "0fp8q08giyf4vi25hylsjmawcx56l5xhgmj3rli3ca9k28a56qxz"
+    },
+    "nvim-ufo": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "kevinhwang91",
+        "repo": "nvim-ufo"
+      },
+      "branch": "main",
+      "revision": "32cb247b893a384f1888b9cd737264159ecf183c",
+      "url": "https://github.com/kevinhwang91/nvim-ufo/archive/32cb247b893a384f1888b9cd737264159ecf183c.tar.gz",
+      "hash": "0p2f5p1nky56m666lbl8g111pf6h4piv8a29z86kdhm9hadrzp3s"
+    },
+    "nvim-web-devicons": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nvim-tree",
+        "repo": "nvim-web-devicons"
+      },
+      "branch": "main",
+      "revision": "4adeeaa7a32d46cf3b5833341358c797304f950a",
+      "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/4adeeaa7a32d46cf3b5833341358c797304f950a.tar.gz",
+      "hash": "1bnw6k9nki7igc7j4y02mbmihfb5yj7xykgiyi31kc5nbzldinl7"
+    },
+    "obsidian.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "epwalsh",
+        "repo": "obsidian.nvim"
+      },
+      "branch": "main",
+      "revision": "14e0427bef6c55da0d63f9a313fd9941be3a2479",
+      "url": "https://github.com/epwalsh/obsidian.nvim/archive/14e0427bef6c55da0d63f9a313fd9941be3a2479.tar.gz",
+      "hash": "15ycmhn48ryaqzch6w3w6llq2qgmjx8xwkb9dn0075z60dybpflr"
+    },
+    "omnisharp-extended-lsp.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "Hoffs",
+        "repo": "omnisharp-extended-lsp.nvim"
+      },
+      "branch": "main",
+      "revision": "4916fa12e5b28d21a1f031f0bdd10aa15a75d85d",
+      "url": "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/archive/4916fa12e5b28d21a1f031f0bdd10aa15a75d85d.tar.gz",
+      "hash": "0w2zbiz2sxblnmhnqp6f6n7d9g9cm40ksk66anl3s7qnqffvc3cl"
+    },
+    "onedark.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "navarasu",
+        "repo": "onedark.nvim"
+      },
+      "branch": "main",
+      "revision": "67a74c275d1116d575ab25485d1bfa6b2a9c38a6",
+      "url": "https://github.com/navarasu/onedark.nvim/archive/67a74c275d1116d575ab25485d1bfa6b2a9c38a6.tar.gz",
+      "hash": "1pfyz3ascxs3sxl878qcirp9jsz77kpl2ks3wxkcv8ql4psymc9l"
+    },
+    "orgmode": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nvim-orgmode",
+        "repo": "orgmode"
+      },
+      "branch": "main",
+      "revision": "bf657742f7cb56211f99946ff64f5f87d7d7f0d0",
+      "url": "https://github.com/nvim-orgmode/orgmode/archive/bf657742f7cb56211f99946ff64f5f87d7d7f0d0.tar.gz",
+      "hash": "074493jfhgihp5zyyl86f9hfa2j6qdgw35q87vvdbmmj6rwhjmhk"
+    },
+    "otter.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "jmbuhr",
+        "repo": "otter.nvim"
+      },
+      "branch": "main",
+      "revision": "e8c662e1aefa8b483cfba6e00729a39a363dcecc",
+      "url": "https://github.com/jmbuhr/otter.nvim/archive/e8c662e1aefa8b483cfba6e00729a39a363dcecc.tar.gz",
+      "hash": "0csl3ddm8782fw836adj4fp4h3fg2ygv7ik632llk55mp1q4dw1l"
+    },
+    "oxocarbon.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nyoom-engineering",
+        "repo": "oxocarbon.nvim"
+      },
+      "branch": "main",
+      "revision": "004777819ba294423b638a35a75c9f0c7be758ed",
+      "url": "https://github.com/nyoom-engineering/oxocarbon.nvim/archive/004777819ba294423b638a35a75c9f0c7be758ed.tar.gz",
+      "hash": "1qllk870nqc9nhkdgmqm8km2rar6dsmyhfhpcfx8crrg640yfbqy"
+    },
+    "pathlib.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "pysan3",
+        "repo": "pathlib.nvim"
+      },
+      "branch": "main",
+      "revision": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1",
+      "url": "https://github.com/pysan3/pathlib.nvim/archive/57e5598af6fe253761c1b48e0b59b7cd6699e2c1.tar.gz",
+      "hash": "1z3nwy83r3zbll9wc2wyvg60z0dqc5hm2xdfvqh3hwm5s9w8j432"
+    },
+    "plenary.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nvim-lua",
+        "repo": "plenary.nvim"
+      },
+      "branch": "main",
+      "revision": "2d9b06177a975543726ce5c73fca176cedbffe9d",
+      "url": "https://github.com/nvim-lua/plenary.nvim/archive/2d9b06177a975543726ce5c73fca176cedbffe9d.tar.gz",
+      "hash": "1blmh0qr010jhydw61kiynll2m7q4xyrvrva8b5ipf1g81x8ysbf"
+    },
+    "precognition.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "tris203",
+        "repo": "precognition.nvim"
+      },
+      "branch": "main",
+      "revision": "531971e6d883e99b1572bf47294e22988d8fbec0",
+      "url": "https://github.com/tris203/precognition.nvim/archive/531971e6d883e99b1572bf47294e22988d8fbec0.tar.gz",
+      "hash": "1mm3gzv882kd0kmqj0zfk6hlw5fxbk7jz16g1h7g8xs2mjh4lxwv"
+    },
+    "project.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "ahmedkhalf",
+        "repo": "project.nvim"
+      },
+      "branch": "main",
+      "revision": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb",
+      "url": "https://github.com/ahmedkhalf/project.nvim/archive/8c6bad7d22eef1b71144b401c9f74ed01526a4fb.tar.gz",
+      "hash": "1md639mcs3dgvhvx93wi0rxiwjnb195r9al9bfqvcvl3r307gxba"
+    },
+    "promise-async": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "kevinhwang91",
+        "repo": "promise-async"
+      },
+      "branch": "main",
+      "revision": "119e8961014c9bfaf1487bf3c2a393d254f337e2",
+      "url": "https://github.com/kevinhwang91/promise-async/archive/119e8961014c9bfaf1487bf3c2a393d254f337e2.tar.gz",
+      "hash": "0q4a0rmy09hka6zvydzjj2gcm2j5mlbrhbxfcdjj33ngpblkmqzm"
+    },
+    "rainbow-delimiters.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "HiPhish",
+        "repo": "rainbow-delimiters.nvim"
+      },
+      "branch": "main",
+      "revision": "85b80abaa09cbbc039e3095b2f515b3cf8cadd11",
+      "url": "https://github.com/HiPhish/rainbow-delimiters.nvim/archive/85b80abaa09cbbc039e3095b2f515b3cf8cadd11.tar.gz",
+      "hash": "0k1hqjyr9xxbg2087qssglv6dgnq81w671d3rqn7lxnprmidfqfd"
+    },
+    "registers.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "tversteeg",
+        "repo": "registers.nvim"
+      },
+      "branch": "main",
+      "revision": "c217f8f369e0886776cda6c94eab839b30a8940d",
+      "url": "https://github.com/tversteeg/registers.nvim/archive/c217f8f369e0886776cda6c94eab839b30a8940d.tar.gz",
+      "hash": "1pdfm98grlka537i1c94vi8bpbp66slkyz3by040wlfq4pgr3frk"
+    },
+    "render-markdown.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "MeanderingProgrammer",
+        "repo": "render-markdown.nvim"
+      },
+      "branch": "main",
+      "revision": "6fbd1491abc104409f119685de5353c35c97c005",
+      "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/6fbd1491abc104409f119685de5353c35c97c005.tar.gz",
+      "hash": "081r1a7rhmmla80i6bg1lmld9lkjhzgkh2rvlpvka889zl36mhcx"
+    },
+    "rtp.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nvim-neorocks",
+        "repo": "rtp.nvim"
+      },
+      "branch": "main",
+      "revision": "494ddfc888bb466555d90ace731856de1320fe45",
+      "url": "https://github.com/nvim-neorocks/rtp.nvim/archive/494ddfc888bb466555d90ace731856de1320fe45.tar.gz",
+      "hash": "1b6hx50nr2s2mnhsx9zy54pjdq7f78mi394v2b2c9v687s45nqln"
+    },
+    "run.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "diniamo",
+        "repo": "run.nvim"
+      },
+      "branch": "main",
+      "revision": "9015c9cece816ccf10a185b420f6e345fd990802",
+      "url": "https://github.com/diniamo/run.nvim/archive/9015c9cece816ccf10a185b420f6e345fd990802.tar.gz",
+      "hash": "10xqwck0l1ad79midicilv4hnrczzjn7lkqi7a60hba20hwb4lq8"
+    },
+    "rustaceanvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "mrcjkb",
+        "repo": "rustaceanvim"
+      },
+      "branch": "main",
+      "revision": "4a2f2d2cc04f5b0aa0981f98bb7d002c898318ad",
+      "url": "https://github.com/mrcjkb/rustaceanvim/archive/4a2f2d2cc04f5b0aa0981f98bb7d002c898318ad.tar.gz",
+      "hash": "0dm8ayl95ppscywdyddrpdpizbs98s0fklw8cqv48iqcxqy851k7"
+    },
+    "smartcolumn.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "m4xshen",
+        "repo": "smartcolumn.nvim"
+      },
+      "branch": "main",
+      "revision": "f14fbea6f86cd29df5042897ca9e3ba10ba4d27f",
+      "url": "https://github.com/m4xshen/smartcolumn.nvim/archive/f14fbea6f86cd29df5042897ca9e3ba10ba4d27f.tar.gz",
+      "hash": "1d0p906dr4wzc73zsm1pyc3fl9a6ns8i6hkl0ynvx72hj01is6p9"
+    },
+    "sqls.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nanotee",
+        "repo": "sqls.nvim"
+      },
+      "branch": "main",
+      "revision": "a514379f5f89bf72955ed3bf5c1c31a40b8a1472",
+      "url": "https://github.com/nanotee/sqls.nvim/archive/a514379f5f89bf72955ed3bf5c1c31a40b8a1472.tar.gz",
+      "hash": "0rdhfjzfqhpjimi7b398d8ivfrg3ay084gz92fp0g4sgr3m876x3"
+    },
+    "tabular": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "godlygeek",
+        "repo": "tabular"
+      },
+      "branch": "main",
+      "revision": "12437cd1b53488e24936ec4b091c9324cafee311",
+      "url": "https://github.com/godlygeek/tabular/archive/12437cd1b53488e24936ec4b091c9324cafee311.tar.gz",
+      "hash": "1cnh21yhcn2f4fajdr2b6hrclnhf1sz4abra4nw7b5yk1mvfjq5a"
+    },
+    "telescope.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nvim-telescope",
+        "repo": "telescope.nvim"
+      },
+      "branch": "main",
+      "revision": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc",
+      "url": "https://github.com/nvim-telescope/telescope.nvim/archive/2eca9ba22002184ac05eddbe47a7fe2d5a384dfc.tar.gz",
+      "hash": "0bkpys6dj01x6ycylmf6vrd2mqjibmny9a2hxxrqn0jqqvagm5ly"
+    },
+    "tiny-devicons-auto-colors.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "rachartier",
+        "repo": "tiny-devicons-auto-colors.nvim"
+      },
+      "branch": "main",
+      "revision": "c8f63933ee013c1e0a26091d58131e060546f01f",
+      "url": "https://github.com/rachartier/tiny-devicons-auto-colors.nvim/archive/c8f63933ee013c1e0a26091d58131e060546f01f.tar.gz",
+      "hash": "04mf9vkf7q3bxz79v1qp0r40sdql065vn4mfnavh71sqywm1jmcj"
+    },
+    "todo-comments.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "folke",
+        "repo": "todo-comments.nvim"
+      },
+      "branch": "main",
+      "revision": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0",
+      "url": "https://github.com/folke/todo-comments.nvim/archive/ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0.tar.gz",
+      "hash": "0v6vn3f9svj756ds8cp0skpw65xixlx1f3aj0fh374wdpb5i4zhh"
+    },
+    "toggleterm.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "akinsho",
+        "repo": "toggleterm.nvim"
+      },
+      "branch": "main",
+      "revision": "344fc1810292785b3d962ddac2de57669e1a7ff9",
+      "url": "https://github.com/akinsho/toggleterm.nvim/archive/344fc1810292785b3d962ddac2de57669e1a7ff9.tar.gz",
+      "hash": "0awj2kj3lam2j48bgld5wyb4m1v09gpxmzww35rgysq7wipliqx1"
+    },
+    "tokyonight.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "folke",
+        "repo": "tokyonight.nvim"
+      },
+      "branch": "main",
+      "revision": "45d22cf0e1b93476d3b6d362d720412b3d34465c",
+      "url": "https://github.com/folke/tokyonight.nvim/archive/45d22cf0e1b93476d3b6d362d720412b3d34465c.tar.gz",
+      "hash": "1038ff6i8csxx3cqccgbpv06slvbcs534cfkq7s58ww2vvldm7sc"
+    },
+    "trouble.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "folke",
+        "repo": "trouble.nvim"
+      },
+      "branch": "main",
+      "revision": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6",
+      "url": "https://github.com/folke/trouble.nvim/archive/46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6.tar.gz",
+      "hash": "12ky8alz6zi2vlqspnacmkj99d4sam4hrzs92i3n4sz6jx2w8696"
+    },
+    "ts-error-translator.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "dmmulroy",
+        "repo": "ts-error-translator.nvim"
+      },
+      "branch": "main",
+      "revision": "47e5ba89f71b9e6c72eaaaaa519dd59bd6897df4",
+      "url": "https://github.com/dmmulroy/ts-error-translator.nvim/archive/47e5ba89f71b9e6c72eaaaaa519dd59bd6897df4.tar.gz",
+      "hash": "08whn7l75qv5n74cifmnxc0s7n7ja1g7589pjnbbsk2djn6bqbky"
+    },
+    "typst-preview.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "chomosuke",
+        "repo": "typst-preview.nvim"
+      },
+      "branch": "main",
+      "revision": "c1100e8788baabe8ca8f8cd7fd63d3d479e49e36",
+      "url": "https://github.com/chomosuke/typst-preview.nvim/archive/c1100e8788baabe8ca8f8cd7fd63d3d479e49e36.tar.gz",
+      "hash": "1xjdfk20k0rjg8z76n57iadr7nkvfvx960gh1lc1d0ji2vpyz93p"
+    },
+    "vim-dirtytalk": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "psliwka",
+        "repo": "vim-dirtytalk"
+      },
+      "branch": "main",
+      "revision": "aa57ba902b04341a04ff97214360f56856493583",
+      "url": "https://github.com/psliwka/vim-dirtytalk/archive/aa57ba902b04341a04ff97214360f56856493583.tar.gz",
+      "hash": "0ikk2z9axk9hys3an3cvp7m8fwrmrxb570iw1km3yz7z9f73jdbb"
+    },
+    "vim-fugitive": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "tpope",
+        "repo": "vim-fugitive"
+      },
+      "branch": "main",
+      "revision": "174230d6a7f2df94705a7ffd8d5413e27ec10a80",
+      "url": "https://github.com/tpope/vim-fugitive/archive/174230d6a7f2df94705a7ffd8d5413e27ec10a80.tar.gz",
+      "hash": "0bs5l8f1qrg9fr97nb029yf7bs813fg0pk5f0cjqfnmglslfr773"
+    },
+    "vim-illuminate": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "RRethy",
+        "repo": "vim-illuminate"
+      },
+      "branch": "main",
+      "revision": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa",
+      "url": "https://github.com/RRethy/vim-illuminate/archive/5eeb7951fc630682c322e88a9bbdae5c224ff0aa.tar.gz",
+      "hash": "0g86iv1mndcalrizdhl3z8ryj19jnqv139jwijpzyfk8gi677lhd"
+    },
+    "vim-markdown": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "preservim",
+        "repo": "vim-markdown"
+      },
+      "branch": "main",
+      "revision": "8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51",
+      "url": "https://github.com/preservim/vim-markdown/archive/8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51.tar.gz",
+      "hash": "14x6jfla4921jyx4xxqng9vzmb0iaj2nn7wckhmlx8jpks6r4834"
+    },
+    "vim-repeat": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "tpope",
+        "repo": "vim-repeat"
+      },
+      "branch": "main",
+      "revision": "65846025c15494983dafe5e3b46c8f88ab2e9635",
+      "url": "https://github.com/tpope/vim-repeat/archive/65846025c15494983dafe5e3b46c8f88ab2e9635.tar.gz",
+      "hash": "0n8sx6s2sbjb21dv9j6y5lyqda9vvxraffg2jz423daamn96dxqv"
+    },
+    "vim-startify": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "mhinz",
+        "repo": "vim-startify"
+      },
+      "branch": "main",
+      "revision": "4e089dffdad46f3f5593f34362d530e8fe823dcf",
+      "url": "https://github.com/mhinz/vim-startify/archive/4e089dffdad46f3f5593f34362d530e8fe823dcf.tar.gz",
+      "hash": "1ycqfqnmalqzrx1yy9a1fc2p0w922x4sqv2222bi9xjzmh77z4sv"
+    },
+    "which-key.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "folke",
+        "repo": "which-key.nvim"
+      },
+      "branch": "main",
+      "revision": "8ab96b38a2530eacba5be717f52e04601eb59326",
+      "url": "https://github.com/folke/which-key.nvim/archive/8ab96b38a2530eacba5be717f52e04601eb59326.tar.gz",
+      "hash": "12wkl04apgag0p5njw8mczzlbxqf5h08k61qciwy10n4q1harzvz"
+    },
+    "yanky.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "gbprod",
+        "repo": "yanky.nvim"
+      },
+      "branch": "main",
+      "revision": "d2696b30e389dced94d5acab728f524a25f308d2",
+      "url": "https://github.com/gbprod/yanky.nvim/archive/d2696b30e389dced94d5acab728f524a25f308d2.tar.gz",
+      "hash": "1i96w32wi7s0nnjmyrlcvbvz150ph3y51mi0v46d580rmdpj9pqs"
+    }
+  },
+  "version": 3
+}
\ No newline at end of file

From 8adc4c352a0eec2be3d2889dac1c7cc4bfcfe264 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 6 Feb 2025 17:43:54 +0300
Subject: [PATCH 171/202] treewide: Use nixpkgs fetchers for npins

plugins: switch from neodev to lazydev
---
 .editorconfig                                 |   3 +
 .github/typos.toml                            |   3 +
 docs/manual/configuring.md                    |   2 +-
 docs/manual/configuring/custom-inputs.md      |  53 --
 docs/manual/configuring/overriding-plugins.md |  35 +
 docs/manual/hacking/additional-plugins.md     |  47 +-
 .../installation/custom-configuration.md      |  32 +-
 .../installation/modules/home-manager.md      |   7 +-
 docs/manual/installation/standalone/nixos.md  |  52 +-
 flake.lock                                    |  17 +
 flake.nix                                     |   9 +-
 flake/develop.nix                             |   2 +-
 flake/legacyPackages.nix                      |   4 +-
 lib/default.nix                               |   6 +-
 lib/stdlib-extended.nix                       |   8 +-
 lib/types/default.nix                         |   8 +-
 lib/types/plugins.nix                         |  15 +-
 modules/default.nix                           |   3 +-
 modules/plugins/languages/lua.nix             |  23 +-
 modules/plugins/lsp/lsp-signature/config.nix  |   2 +-
 modules/plugins/lsp/null-ls/config.nix        |   2 +-
 .../plugins/notes/todo-comments/config.nix    |   2 +-
 modules/plugins/statusline/lualine/config.nix |   2 +-
 modules/plugins/ui/smartcolumn/config.nix     |   2 +-
 .../utility/binds/which-key/config.nix        |   2 +-
 .../plugins/visuals/highlight-undo/config.nix |   2 +-
 .../visuals/indent-blankline/config.nix       |   2 +-
 modules/wrapper/build/config.nix              |  60 +-
 modules/wrapper/environment/options.nix       |  16 +
 npins/default.nix                             |  80 --
 npins/sources.json                            | 795 +++++++++---------
 npins/sources.nix                             |  85 ++
 32 files changed, 700 insertions(+), 681 deletions(-)
 delete mode 100644 docs/manual/configuring/custom-inputs.md
 create mode 100644 docs/manual/configuring/overriding-plugins.md
 delete mode 100644 npins/default.nix
 create mode 100644 npins/sources.nix

diff --git a/.editorconfig b/.editorconfig
index c92fdf7f..2f767ae8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -26,3 +26,6 @@ trim_trailing_whitespace = unset
 
 [*.lock]
 indent_size = unset
+
+[npins/sources.json]
+insert_final_newline = unset
diff --git a/.github/typos.toml b/.github/typos.toml
index df76201c..2ea46a8c 100644
--- a/.github/typos.toml
+++ b/.github/typos.toml
@@ -1,2 +1,5 @@
 
 default.extend-ignore-words-re = ["(?i)(noice)", "befores", "annote", "viw"]
+files.extend-exclude = [
+"npins/sources.json"
+]
diff --git a/docs/manual/configuring.md b/docs/manual/configuring.md
index 3ac261fe..f891c7a6 100644
--- a/docs/manual/configuring.md
+++ b/docs/manual/configuring.md
@@ -3,7 +3,7 @@
 ```{=include=} chapters
 configuring/custom-package.md
 configuring/custom-plugins.md
-configuring/custom-inputs.md
+configuring/overriding-plugins.md
 configuring/languages.md
 configuring/dags.md
 configuring/dag-entries.md
diff --git a/docs/manual/configuring/custom-inputs.md b/docs/manual/configuring/custom-inputs.md
deleted file mode 100644
index 4f2a523b..00000000
--- a/docs/manual/configuring/custom-inputs.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Custom Inputs {#ch-custom-inputs}
-
-One of the greatest strengths of **nvf** is its ability to get plugins from
-flake inputs and build them locally from any given source. For plugins that do
-not require any kind of additional building step, this is a powerful method of
-adding plugins to your configuration that are not packaged in nixpkgs, or those
-you want to track from source without relying on nixpkgs.
-
-The [additional plugins section](#sec-additional-plugins) details the addition
-of new plugins to nvf under regular circumstances, i.e. while making a pull
-request to the project. You may _override_ those plugin inputs in your own
-`flake.nix` to change source versions, e.g., to use newer versions of plugins
-that are not yet updated in **nvf**.
-
-```nix
-{
-
-  inputs = {
-    # ...
-
-    # The name here is arbitrary, you can name it whatever.
-    # This will add a plugin input called "your-neodev-input"
-    # that you can reference in a `follows` line.
-    your-neodev-input = {
-      url = "github:folke/neodev.nvim";
-      flake = false;
-    };
-
-    nvf = {
-      url = "github:notashelf/nvf";
-
-      # The name of the input must match for the follows line
-      # plugin-neodev-nvim is what the input is called inside nvf
-      # so you must match the exact name here.
-      inputs.plugin-neodev-nvim.follows = "your-neodev-input";
-    };
-    # ...
-  };
-}
-```
-
-This will override the source for the `neodev.nvim` plugin that is used in nvf
-with your own input. You can update your new input via `nix flake update` or
-more specifically `nix flake update <name of your input>` to keep it up to date.
-
-::: {.warning}
-
-While updating plugin inputs, make sure that any configuration that has been
-deprecated in newer versions is changed in the plugin's `setupOpts`. If you
-depend on a new version, requesting a version bump in the issues section is a
-more reliable option.
-
-:::
diff --git a/docs/manual/configuring/overriding-plugins.md b/docs/manual/configuring/overriding-plugins.md
new file mode 100644
index 00000000..bb698666
--- /dev/null
+++ b/docs/manual/configuring/overriding-plugins.md
@@ -0,0 +1,35 @@
+# Overriding plugins {#ch-overriding-plugins}
+
+The [additional plugins section](#sec-additional-plugins) details the addition
+of new plugins to nvf under regular circumstances, i.e. while making a pull
+request to the project. You may _override_ those plugins in your config
+to change source versions, e.g., to use newer versions of plugins
+that are not yet updated in **nvf**.
+
+```nix
+vim.pluginOverrides = {
+  lazydev-nvim = pkgs.fetchFromGitHub {
+    owner = "folke";
+    repo = "lazydev.nvim";
+    rev = "";
+    hash = "";
+  };
+ # It's also possible to use a flake input
+ lazydev-nvim = inputs.lazydev-nvim;
+ # Or a local path 
+ lazydev-nvim = ./lazydev;
+ # Or a npins pin... etc
+};
+```
+
+This will override the source for the `neodev.nvim` plugin that is used in nvf
+with your own plugin.
+
+::: {.warning}
+
+While updating plugin inputs, make sure that any configuration that has been
+deprecated in newer versions is changed in the plugin's `setupOpts`. If you
+depend on a new version, requesting a version bump in the issues section is a
+more reliable option.
+
+:::
diff --git a/docs/manual/hacking/additional-plugins.md b/docs/manual/hacking/additional-plugins.md
index e67fa96b..08cae680 100644
--- a/docs/manual/hacking/additional-plugins.md
+++ b/docs/manual/hacking/additional-plugins.md
@@ -1,36 +1,25 @@
 # Adding Plugins {#sec-additional-plugins}
 
-To add a new Neovim plugin, first add the source url in the inputs section of
-`flake.nix` with the prefix `plugin-`
+To add a new Neovim plugin, use `npins`
+
+Use:
+
+`nix-shell -p npins` or `nix shell nixpkgs#npins`
+
+Then run:
+
+`npins --name <plugin name> github <owner> <repo> -b <branch>`
+
+Be sure to replace any non-alphanumeric characters with `-` for `--name`
+
+For example 
+
+`npins --name lazydev-nvim github folke laztdev.nvim -b main`
+
+You can now reference this plugin as a **string**.
 
 ```nix
-{
-  inputs = {
-    # ...
-    plugin-neodev-nvim = {
-      url = "github:folke/neodev.nvim";
-      flake = false;
-    };
-    # ...
-  };
-}
-```
-
-Prepending `plugin-` to the name of the input will allow nvf to automatically
-discover inputs that are marked as plugins, and make them available in
-`vim.startPlugins` or other areas that require a very specific plugin type as it
-is defined in `@NVF_REPO@/lib/types/plugins.nix`
-
-The addition of the `plugin-` prefix will allow **nvf** to autodiscover the
-input from the flake inputs automatically, allowing you to refer to it in areas
-that require a very specific plugin type as defined in `lib/types/plugins.nix`
-
-You can now reference this plugin using its string name, the plugin will be
-built with the name and source URL from the flake input, allowing you to refer
-to it as a **string**.
-
-```nix
-config.vim.startPlugins = ["neodev-nvim"];
+config.vim.startPlugins = ["lazydev-nvim"];
 ```
 
 ## Modular setup options {#sec-modular-setup-options}
diff --git a/docs/manual/installation/custom-configuration.md b/docs/manual/installation/custom-configuration.md
index b6c27163..940f35a3 100644
--- a/docs/manual/installation/custom-configuration.md
+++ b/docs/manual/installation/custom-configuration.md
@@ -23,15 +23,17 @@ An example flake that exposes your custom Neovim configuration might look like
     nvf.url = "github:notashelf/nvf";
   };
 
-  outputs = {
-    self,
-    nixpkgs,
-    ...
-  } @ inputs: {
-    packages."x86_64-linux" = let
-        neovimConfigured = (inputs.nvf.lib.neovimConfiguration {
-          inherit (nixpkgs.legacyPackages."x86_64-linux") pkgs;
-          modules = [{
+  outputs = {nixpkgs, ...} @ inputs: {
+    packages.x86_64-linux = {
+      # Set the default package to the wrapped instance of Neovim.
+      # This will allow running your Neovim configuration with
+      # `nix run` and in addition, sharing your configuration with
+      # other users in case your repository is public.
+      default =
+        (inputs.nvf.lib.neovimConfiguration {
+          pkgs = nixpkgs.legacyPackages.x86_64-linux;
+          modules = [
+            {
               config.vim = {
                 # Enable custom theming options
                 theme.enable = true;
@@ -43,14 +45,10 @@ An example flake that exposes your custom Neovim configuration might look like
                 # reference in Appendix B of the nvf manual.
                 # ...
               };
-          }];
-        });
-    in {
-      # Set the default package to the wrapped instance of Neovim.
-      # This will allow running your Neovim configuration with
-      # `nix run` and in addition, sharing your configuration with
-      # other users in case your repository is public.
-      default = neovimConfigured.neovim;
+            }
+          ];
+        })
+        .neovim;
     };
   };
 }
diff --git a/docs/manual/installation/modules/home-manager.md b/docs/manual/installation/modules/home-manager.md
index 34f2757e..2b359af5 100644
--- a/docs/manual/installation/modules/home-manager.md
+++ b/docs/manual/installation/modules/home-manager.md
@@ -49,13 +49,10 @@ Followed by importing the home-manager module somewhere in your configuration.
     nvf.url = "github:notashelf/nvf";
   };
 
-  outputs = { nixpkgs, home-manager, nvf, ... }: let
-    system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system};
-  in {
+  outputs = { nixpkgs, home-manager, nvf, ... }: {
     # ↓ this is your home output in the flake schema, expected by home-manager
     "your-username@your-hostname" = home-manager.lib.homeManagerConfiguration {
-      inherit pkgs;
+      pkgs = nixpkgs.legacyPackages.x86_64-linux;
       modules = [
         nvf.homeManagerModules.default # <- this imports the home-manager module that provides the options
         ./home.nix # <- your home entrypoint, `programs.nvf.*` may be defined here
diff --git a/docs/manual/installation/standalone/nixos.md b/docs/manual/installation/standalone/nixos.md
index a78c8dee..267d15b7 100644
--- a/docs/manual/installation/standalone/nixos.md
+++ b/docs/manual/installation/standalone/nixos.md
@@ -16,26 +16,32 @@ the default theme enabled. You may use other options inside `config.vim` in
     nvf.url = "github:notashelf/nvf";
   };
 
-  outputs = {nixpkgs, nvf, ...}: let
-    system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system};
-    configModule = {
-      # Add any custom options (and do feel free to upstream them!)
-      # options = { ... };
-
-      config.vim = {
-        theme.enable = true;
-        # and more options as you see fit...
-      };
-    };
-
-    customNeovim = nvf.lib.neovimConfiguration {
-      inherit pkgs;
-      modules = [configModule];
-    };
-  in {
+  outputs = {
+    nixpkgs,
+    nvf,
+    self,
+    ...
+  }: {
     # This will make the package available as a flake output under 'packages'
-    packages.${system}.my-neovim = customNeovim.neovim;
+    packages.x86_64-linux.my-neovim =
+      (nvf.lib.neovimConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        modules = [
+          # Or move this to a separate file and add it's path here instead
+          # IE: ./nvf_module.nix
+          (
+            {pkgs, ...}: {
+              # Add any custom options (and do feel free to upstream them!)
+              # options = { ... };
+              config.vim = {
+                theme.enable = true;
+                # and more options as you see fit...
+              };
+            }
+          )
+        ];
+      })
+      .neovim;
 
     # Example nixosConfiguration using the configured Neovim package
     nixosConfigurations = {
@@ -43,11 +49,13 @@ the default theme enabled. You may use other options inside `config.vim` in
         # ...
         modules = [
           # This will make wrapped neovim available in your system packages
-          {environment.systemPackages = [customNeovim.neovim];}
+          # Can also move this to another config file if you pass inputs/self around with specialArgs
+          ({pkgs, ...}: {
+            environment.systemPackages = [self.packages.${pkgs.stdenv.system}.neovim];
+          })
         ];
         # ...
       };
     };
   };
-}
-```
+}```
diff --git a/flake.lock b/flake.lock
index c1cda841..9221f43f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "blink-cmp": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1739129359,
+        "narHash": "sha256-nUrXXiJ7NRxS21H53U323lwEKdo08Y011l8XskXC/vw=",
+        "owner": "saghen",
+        "repo": "blink.cmp",
+        "rev": "b2485c76cb7877de6fe9c8670af59ba3d72fd74d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "saghen",
+        "repo": "blink.cmp",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -121,6 +137,7 @@
     },
     "root": {
       "inputs": {
+        "blink-cmp": "blink-cmp",
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
         "mnw": "mnw",
diff --git a/flake.nix b/flake.nix
index 28acb8b0..1c559bd7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,7 @@
   } @ inputs: let
     # call the extended library with `inputs`
     # inputs is used to get the original standard library, and to pass inputs to the plugin autodiscovery function
-    lib = import ./lib/stdlib-extended.nix inputs;
+    lib = import ./lib/stdlib-extended.nix {inherit inputs self;};
   in
     flake-parts.lib.mkFlake {
       inherit inputs;
@@ -54,7 +54,7 @@
             self.nixosModules.nvf;
         };
 
-        pins = import ./npins;
+        inherit (lib.importJSON ./npins/sources.json) pins;
       };
 
       perSystem = {pkgs, ...}: {
@@ -98,5 +98,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
+
+    blink-cmp = {
+      url = "github:saghen/blink.cmp";
+      flake = false;
+    };
   };
 }
diff --git a/flake/develop.nix b/flake/develop.nix
index 7b645288..71c13688 100644
--- a/flake/develop.nix
+++ b/flake/develop.nix
@@ -9,7 +9,7 @@
       default = self'.devShells.lsp;
       nvim-nix = pkgs.mkShellNoCC {packages = [config.packages.nix];};
       lsp = pkgs.mkShellNoCC {
-        packages = with pkgs; [nil statix deadnix alejandra];
+        packages = with pkgs; [nil statix deadnix alejandra npins];
       };
     };
 
diff --git a/flake/legacyPackages.nix b/flake/legacyPackages.nix
index 5b6ccb6d..d5b5aacd 100644
--- a/flake/legacyPackages.nix
+++ b/flake/legacyPackages.nix
@@ -14,8 +14,8 @@
           # features as they are added.
           nil = inputs'.nil.packages.default;
           blink-cmp = final.callPackage ./legacyPackages/blink-cmp.nix {
-            src = inputs.plugin-blink-cmp;
-            version = inputs.plugin-blink-cmp.shortRev or inputs.plugin-blink-cmp.shortDirtyRev or "dirty";
+            src = inputs.blink-cmp;
+            version = inputs.blink-cmp.shortRev or inputs.blink-cmp.shortDirtyRev or "dirty";
           };
         })
       ];
diff --git a/lib/default.nix b/lib/default.nix
index e6ccd2a7..952278a8 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,10 +1,10 @@
 {
+  self,
   inputs,
   lib,
   ...
 }: {
-  types = import ./types {inherit inputs lib;};
-
+  types = import ./types {inherit lib;};
   config = import ./config.nix {inherit lib;};
   binds = import ./binds.nix {inherit lib;};
   dag = import ./dag.nix {inherit lib;};
@@ -12,5 +12,5 @@
   lists = import ./lists.nix {inherit lib;};
   attrsets = import ./attrsets.nix {inherit lib;};
   lua = import ./lua.nix {inherit lib;};
-  neovimConfiguration = import ../modules {inherit inputs lib;};
+  neovimConfiguration = import ../modules {inherit self inputs lib;};
 }
diff --git a/lib/stdlib-extended.nix b/lib/stdlib-extended.nix
index 0f30815a..a85160c3 100644
--- a/lib/stdlib-extended.nix
+++ b/lib/stdlib-extended.nix
@@ -1,6 +1,10 @@
 # Convenience function that returns the given Nixpkgs standard library
 # extended with our functions using `lib.extend`.
-inputs:
+{
+  inputs,
+  self,
+  ...
+} @ args:
 inputs.nixpkgs.lib.extend (self: super: {
   # WARNING: New functions should not be added here, but to files
   # imported by `./default.nix` under their own categories. If your
@@ -12,7 +16,7 @@ inputs.nixpkgs.lib.extend (self: super: {
   # E.g. for an input called `nvf`, `inputs.nvf.lib.nvim` will return the set
   # below.
   nvim = import ./. {
-    inherit inputs;
+    inherit (args) inputs self;
     lib = self;
   };
 
diff --git a/lib/types/default.nix b/lib/types/default.nix
index c1c16715..c6239227 100644
--- a/lib/types/default.nix
+++ b/lib/types/default.nix
@@ -1,10 +1,6 @@
-{
-  inputs,
-  lib,
-  ...
-}: let
+{lib}: let
   typesDag = import ./dag.nix {inherit lib;};
-  typesPlugin = import ./plugins.nix {inherit inputs lib;};
+  typesPlugin = import ./plugins.nix {inherit lib;};
   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 656b7ab8..fc2bd083 100644
--- a/lib/types/plugins.nix
+++ b/lib/types/plugins.nix
@@ -1,12 +1,8 @@
-{
-  inputs,
-  lib,
-  ...
-}: let
+{lib}: let
   inherit (lib.options) mkOption;
   inherit (lib.attrsets) attrNames mapAttrs' filterAttrs nameValuePair;
   inherit (lib.strings) hasPrefix removePrefix;
-  inherit (lib.types) submodule either package enum str lines attrsOf anything listOf nullOr;
+  inherit (lib.types) submodule either package enum str lines anything listOf nullOr;
 
   # Get the names of all flake inputs that start with the given prefix.
   fromInputs = {
@@ -15,11 +11,8 @@
   }:
     mapAttrs' (n: v: nameValuePair (removePrefix prefix n) {src = v;}) (filterAttrs (n: _: hasPrefix prefix n) inputs);
 
-  #  Get the names of all flake inputs that start with the given prefix.
-  pluginInputNames = attrNames (fromInputs {
-    inherit inputs;
-    prefix = "plugin-";
-  });
+  #  Get the names of all npins
+  pluginInputNames = attrNames (lib.importJSON ../../npins/sources.json).pins;
 
   # You can either use the name of the plugin or a package.
   pluginType = nullOr (
diff --git a/modules/default.nix b/modules/default.nix
index a207e0d1..a479bae2 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,4 +1,5 @@
 {
+  self,
   inputs,
   lib,
 }: {
@@ -23,7 +24,7 @@
     specialArgs =
       extraSpecialArgs
       // {
-        inherit inputs;
+        inherit self inputs;
         modulesPath = toString ./.;
       };
     modules = concatLists [
diff --git a/modules/plugins/languages/lua.nix b/modules/plugins/languages/lua.nix
index 5ceed3ee..4ad49784 100644
--- a/modules/plugins/languages/lua.nix
+++ b/modules/plugins/languages/lua.nix
@@ -8,7 +8,6 @@
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
   inherit (lib.lists) isList;
-  inherit (lib.strings) optionalString;
   inherit (lib.types) either listOf package str;
   inherit (lib.nvim.types) mkGrammarOption;
   inherit (lib.nvim.lua) expToLua;
@@ -16,6 +15,12 @@
 
   cfg = config.vim.languages.lua;
 in {
+  imports = [
+    (lib.mkRemovedOptionModule ["vim" "languages" "lua" "lsp" "neodev"] ''
+      neodev has been replaced by lazydev
+    '')
+  ];
+
   options.vim.languages.lua = {
     enable = mkEnableOption "Lua language support";
     treesitter = {
@@ -32,7 +37,7 @@ in {
         default = pkgs.lua-language-server;
       };
 
-      neodev.enable = mkEnableOption "neodev.nvim integration, useful for neovim plugin developers";
+      lazydev.enable = mkEnableOption "lazydev.nvim integration, useful for neovim plugin developers";
     };
   };
 
@@ -49,7 +54,6 @@ in {
           lspconfig.lua_ls.setup {
             capabilities = capabilities;
             on_attach = default_on_attach;
-            ${optionalString cfg.lsp.neodev.enable "before_init = require('neodev.lsp').before_init;"}
             cmd = ${
             if isList cfg.lsp.package
             then expToLua cfg.lsp.package
@@ -59,10 +63,15 @@ in {
         '';
       })
 
-      (mkIf cfg.lsp.neodev.enable {
-        vim.startPlugins = ["neodev-nvim"];
-        vim.pluginRC.neodev = entryBefore ["lua-lsp"] ''
-          require("neodev").setup({})
+      (mkIf cfg.lsp.lazydev.enable {
+        vim.startPlugins = ["lazydev-nvim"];
+        vim.pluginRC.lazydev = entryBefore ["lua-lsp"] ''
+          require("lazydev").setup({
+            enabled = function(root_dir)
+              return not vim.uv.fs_stat(root_dir .. "/.luarc.json")
+            end,
+            library = { { path = "''${3rd}/luv/library", words = { "vim%.uv" } } },
+          })
         '';
       })
     ]))
diff --git a/modules/plugins/lsp/lsp-signature/config.nix b/modules/plugins/lsp/lsp-signature/config.nix
index 535b2534..da8828d4 100644
--- a/modules/plugins/lsp/lsp-signature/config.nix
+++ b/modules/plugins/lsp/lsp-signature/config.nix
@@ -22,7 +22,7 @@ in {
     ];
     vim = {
       startPlugins = [
-        "lsp-signature"
+        "lsp-signature-nvim"
       ];
 
       lsp.lspSignature.setupOpts = {
diff --git a/modules/plugins/lsp/null-ls/config.nix b/modules/plugins/lsp/null-ls/config.nix
index 8e776ed3..549ef0b7 100644
--- a/modules/plugins/lsp/null-ls/config.nix
+++ b/modules/plugins/lsp/null-ls/config.nix
@@ -14,7 +14,7 @@ in {
     {
       vim = {
         startPlugins = [
-          "none-ls"
+          "none-ls-nvim"
           "plenary-nvim"
         ];
 
diff --git a/modules/plugins/notes/todo-comments/config.nix b/modules/plugins/notes/todo-comments/config.nix
index 645f6770..b03efce4 100644
--- a/modules/plugins/notes/todo-comments/config.nix
+++ b/modules/plugins/notes/todo-comments/config.nix
@@ -15,7 +15,7 @@ in {
   config = mkIf cfg.enable {
     vim = {
       startPlugins = [
-        "todo-comments"
+        "todo-comments-nvim"
       ];
 
       maps.normal = mkMerge [
diff --git a/modules/plugins/statusline/lualine/config.nix b/modules/plugins/statusline/lualine/config.nix
index ac587c03..facfcebb 100644
--- a/modules/plugins/statusline/lualine/config.nix
+++ b/modules/plugins/statusline/lualine/config.nix
@@ -34,7 +34,7 @@ in {
     })
     (mkIf cfg.enable {
       vim = {
-        startPlugins = ["lualine"];
+        startPlugins = ["lualine-nvim"];
         pluginRC.lualine = entryAnywhere ''
           local lualine = require('lualine')
           lualine.setup ${toLuaObject cfg.setupOpts}
diff --git a/modules/plugins/ui/smartcolumn/config.nix b/modules/plugins/ui/smartcolumn/config.nix
index f38edfdf..9f6f10e2 100644
--- a/modules/plugins/ui/smartcolumn/config.nix
+++ b/modules/plugins/ui/smartcolumn/config.nix
@@ -11,7 +11,7 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["smartcolumn"];
+      startPlugins = ["smartcolumn-nvim"];
 
       pluginRC.smartcolumn = entryAnywhere ''
         require("smartcolumn").setup(${toLuaObject cfg.setupOpts})
diff --git a/modules/plugins/utility/binds/which-key/config.nix b/modules/plugins/utility/binds/which-key/config.nix
index 01a29fbf..68dbbfbf 100644
--- a/modules/plugins/utility/binds/which-key/config.nix
+++ b/modules/plugins/utility/binds/which-key/config.nix
@@ -14,7 +14,7 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["which-key"];
+      startPlugins = ["which-key-nvim"];
 
       pluginRC.whichkey = entryAnywhere ''
         local wk = require("which-key")
diff --git a/modules/plugins/visuals/highlight-undo/config.nix b/modules/plugins/visuals/highlight-undo/config.nix
index d41c6a69..09ae49be 100644
--- a/modules/plugins/visuals/highlight-undo/config.nix
+++ b/modules/plugins/visuals/highlight-undo/config.nix
@@ -11,7 +11,7 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["highlight-undo"];
+      startPlugins = ["highlight-undo-nvim"];
 
       pluginRC.highlight-undo = entryAnywhere ''
         require("highlight-undo").setup(${toLuaObject cfg.setupOpts})
diff --git a/modules/plugins/visuals/indent-blankline/config.nix b/modules/plugins/visuals/indent-blankline/config.nix
index 581bd136..78ebf68c 100644
--- a/modules/plugins/visuals/indent-blankline/config.nix
+++ b/modules/plugins/visuals/indent-blankline/config.nix
@@ -11,7 +11,7 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["indent-blankline"];
+      startPlugins = ["indent-blankline-nvim"];
 
       pluginRC.indent-blankline = entryAnywhere ''
         require("ibl").setup(${toLuaObject cfg.setupOpts})
diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix
index 88745fb5..64734f3b 100644
--- a/modules/wrapper/build/config.nix
+++ b/modules/wrapper/build/config.nix
@@ -1,29 +1,27 @@
 {
   inputs,
-  lib,
   config,
   pkgs,
+  lib,
   ...
-}
-: let
+}: let
   inherit (pkgs) vimPlugins;
   inherit (lib.strings) isString;
   inherit (lib.lists) filter map;
   inherit (builtins) path;
 
-  # alias to the internal configuration
-  vimOptions = config.vim;
+  getPin = name: ((pkgs.callPackages ../../../npins/sources.nix {}) // config.vim.pluginOverrides).${name};
 
   noBuildPlug = pname: let
-    input = inputs."plugin-${pname}";
-    version = input.shortRev or input.shortDirtyRev or "dirty";
+    pin = getPin pname;
+    version = pin.revision or "dirty";
   in {
     # vim.lazy.plugins relies on pname, so we only set that here
     # version isn't needed for anything, but inherit it anyway for correctness
     inherit pname version;
     outPath = path {
       name = "${pname}-0-unstable-${version}";
-      path = input.outPath;
+      path = pin.outPath;
     };
     passthru.vimPlugin = false;
   };
@@ -32,12 +30,12 @@
   # if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug
   # instead
   buildPlug = attrs: let
-    input = inputs."plugin-${attrs.pname}";
+    pin = getPin attrs.pname;
   in
     pkgs.vimUtils.buildVimPlugin (
       {
-        version = input.shortRev or input.shortDirtyRev or "dirty";
-        src = input.outPath;
+        version = pin.revision or "dirty";
+        src = pin.outPath;
       }
       // attrs
     );
@@ -45,7 +43,7 @@
   buildTreesitterPlug = grammars: vimPlugins.nvim-treesitter.withPlugins (_: grammars);
 
   pluginBuilders = {
-    nvim-treesitter = buildTreesitterPlug vimOptions.treesitter.grammars;
+    nvim-treesitter = buildTreesitterPlug config.vim.treesitter.grammars;
     flutter-tools-patched = buildPlug {
       pname = "flutter-tools";
       patches = [./patches/flutter-tools.patch];
@@ -65,39 +63,41 @@
   };
 
   buildConfigPlugins = plugins:
-    map (
-      plug:
-        if (isString plug)
-        then pluginBuilders.${plug} or (noBuildPlug plug)
-        else plug
-    ) (filter (f: f != null) plugins);
+    map (plug:
+      if (isString plug)
+      then pluginBuilders.${plug} or (noBuildPlug plug)
+      else plug) (
+      filter (f: f != null) plugins
+    );
 
   # built (or "normalized") plugins that are modified
-  builtStartPlugins = buildConfigPlugins vimOptions.startPlugins;
-  builtOptPlugins = map (package: package // {optional = true;}) (buildConfigPlugins vimOptions.optPlugins);
+  builtStartPlugins = buildConfigPlugins config.vim.startPlugins;
+  builtOptPlugins = map (package: package // {optional = true;}) (
+    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}) vimOptions.luaPackages;
-  extraPython3Packages = ps: map (x: ps.${x}) vimOptions.python3Packages;
+  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 {
-    neovim = vimOptions.package;
+    neovim = config.vim.package;
     plugins = builtStartPlugins ++ builtOptPlugins;
     appName = "nvf";
-    extraBinPath = vimOptions.extraPackages;
-    initLua = vimOptions.builtLuaConfigRC;
-    luaFiles = vimOptions.extraLuaFiles;
+    extraBinPath = config.vim.extraPackages;
+    initLua = config.vim.builtLuaConfigRC;
+    luaFiles = config.vim.extraLuaFiles;
 
-    inherit (vimOptions) viAlias vimAlias withRuby withNodeJs withPython3;
+    inherit (config.vim) viAlias vimAlias withRuby withNodeJs withPython3;
     inherit extraLuaPackages extraPython3Packages;
   };
 
-  dummyInit = pkgs.writeText "nvf-init.lua" vimOptions.builtLuaConfigRC;
+  dummyInit = pkgs.writeText "nvf-init.lua" config.vim.builtLuaConfigRC;
   # Additional helper scripts for printing and displaying nvf configuration
   # in your commandline.
   printConfig = pkgs.writers.writeDashBin "nvf-print-config" "cat ${dummyInit}";
@@ -110,10 +110,10 @@
     paths = [neovim-wrapped printConfig printConfigPath];
     postBuild = "echo Helpers added";
 
-    # Allow evaluating vimOptions, i.e., config.vim from the packages' passthru
+    # Allow evaluating config.vim, i.e., config.vim from the packages' passthru
     # attribute. For example, packages.x86_64-linux.neovim.passthru.neovimConfig
     # will return the configuration in full.
-    passthru.neovimConfig = vimOptions;
+    passthru.neovimConfig = config.vim;
 
     meta =
       neovim-wrapped.meta
diff --git a/modules/wrapper/environment/options.nix b/modules/wrapper/environment/options.nix
index 6a8d085f..c401f506 100644
--- a/modules/wrapper/environment/options.nix
+++ b/modules/wrapper/environment/options.nix
@@ -140,5 +140,21 @@ in {
       example = ''["pynvim"]'';
       description = "List of python packages to install";
     };
+
+    pluginOverrides = mkOption {
+      type = attrsOf package;
+      default = {};
+      example = ''
+        {
+          lazydev-nvim = pkgs.fetchFromGitHub {
+            owner = "folke";
+            repo = "lazydev.nvim";
+            rev = "";
+            hash = "";
+          };
+        }
+      '';
+      description = "Attribute set of plugins to override default values";
+    };
   };
 }
diff --git a/npins/default.nix b/npins/default.nix
deleted file mode 100644
index 5e7d086e..00000000
--- a/npins/default.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-# Generated by npins. Do not modify; will be overwritten regularly
-let
-  data = builtins.fromJSON (builtins.readFile ./sources.json);
-  version = data.version;
-
-  mkSource =
-    spec:
-    assert spec ? type;
-    let
-      path =
-        if spec.type == "Git" then
-          mkGitSource spec
-        else if spec.type == "GitRelease" then
-          mkGitSource spec
-        else if spec.type == "PyPi" then
-          mkPyPiSource spec
-        else if spec.type == "Channel" then
-          mkChannelSource spec
-        else
-          builtins.throw "Unknown source type ${spec.type}";
-    in
-    spec // { outPath = path; };
-
-  mkGitSource =
-    {
-      repository,
-      revision,
-      url ? null,
-      hash,
-      branch ? null,
-      ...
-    }:
-    assert repository ? type;
-    # At the moment, either it is a plain git repository (which has an url), or it is a GitHub/GitLab repository
-    # In the latter case, there we will always be an url to the tarball
-    if url != null then
-      (builtins.fetchTarball {
-        inherit url;
-        sha256 = hash; # FIXME: check nix version & use SRI hashes
-      })
-    else
-      assert repository.type == "Git";
-      let
-        urlToName =
-          url: rev:
-          let
-            matched = builtins.match "^.*/([^/]*)(\\.git)?$" repository.url;
-
-            short = builtins.substring 0 7 rev;
-
-            appendShort = if (builtins.match "[a-f0-9]*" rev) != null then "-${short}" else "";
-          in
-          "${if matched == null then "source" else builtins.head matched}${appendShort}";
-        name = urlToName repository.url revision;
-      in
-      builtins.fetchGit {
-        url = repository.url;
-        rev = revision;
-        inherit name;
-        # hash = hash;
-      };
-
-  mkPyPiSource =
-    { url, hash, ... }:
-    builtins.fetchurl {
-      inherit url;
-      sha256 = hash;
-    };
-
-  mkChannelSource =
-    { url, hash, ... }:
-    builtins.fetchTarball {
-      inherit url;
-      sha256 = hash;
-    };
-in
-if version == 3 then
-  builtins.mapAttrs (_: mkSource) data.pins
-else
-  throw "Unsupported format version ${toString version} in sources.json. Try running `npins upgrade`"
diff --git a/npins/sources.json b/npins/sources.json
index b201e331..70df6065 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -1,42 +1,6 @@
 {
   "pins": {
-    "ChatGPT.nvim": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "jackMort",
-        "repo": "ChatGPT.nvim"
-      },
-      "branch": "main",
-      "revision": "5b6d296eefc75331e2ff9f0adcffbd7d27862dd6",
-      "url": "https://github.com/jackMort/ChatGPT.nvim/archive/5b6d296eefc75331e2ff9f0adcffbd7d27862dd6.tar.gz",
-      "hash": "07f0p03fb4060lc7jfvp8mqi0jbk8mril9fg3b8rx9mq8415g1gr"
-    },
-    "Comment.nvim": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "numToStr",
-        "repo": "Comment.nvim"
-      },
-      "branch": "main",
-      "revision": "e30b7f2008e52442154b66f7c519bfd2f1e32acb",
-      "url": "https://github.com/numToStr/Comment.nvim/archive/e30b7f2008e52442154b66f7c519bfd2f1e32acb.tar.gz",
-      "hash": "0dyz78j0kj3j99y5g8wncl7794g6z2qs05gfg9ddxaa4xswhyjc7"
-    },
-    "LuaSnip": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "L3MON4D3",
-        "repo": "LuaSnip"
-      },
-      "branch": "main",
-      "revision": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d",
-      "url": "https://github.com/L3MON4D3/LuaSnip/archive/33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d.tar.gz",
-      "hash": "1zicjd8y9a16rq1rs1xbmc6g927j5xi05yrxj9ap6wp72pfxxw3r"
-    },
-    "aerial.nvim": {
+    "aerial-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -72,7 +36,19 @@
       "url": "https://github.com/rrethy/base16-nvim/archive/6ac181b5733518040a33017dde654059cd771b7c.tar.gz",
       "hash": "0q47jbh6abn2hql9ghi9ayx3l8pdrdcdrnf4qfk7cp0v1bl7y48r"
     },
-    "bufdelete.nvim": {
+    "blink-compat": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "saghen",
+        "repo": "blink.compat"
+      },
+      "branch": "main",
+      "revision": "3f39cba0a30a7e7d7c2f63605e88ede464c7d39d",
+      "url": "https://github.com/saghen/blink.compat/archive/3f39cba0a30a7e7d7c2f63605e88ede464c7d39d.tar.gz",
+      "hash": "1a970v4b73jimjq7cmf61yycbd5j2x0vr14c6gbpblcaxkqby4bv"
+    },
+    "bufdelete-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -84,7 +60,19 @@
       "url": "https://github.com/famiu/bufdelete.nvim/archive/f6bcea78afb3060b198125256f897040538bcb81.tar.gz",
       "hash": "0xfzk3zgnxbwnr55n3lglsb8nmhnchpiqz9d152xr6j8d9z0sdcn"
     },
-    "ccc.nvim": {
+    "catppuccin": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "catppuccin",
+        "repo": "nvim"
+      },
+      "branch": "main",
+      "revision": "f67b886d65a029f12ffa298701fb8f1efd89295d",
+      "url": "https://github.com/catppuccin/nvim/archive/f67b886d65a029f12ffa298701fb8f1efd89295d.tar.gz",
+      "hash": "0fwgsvlxvzz5r8jfmj1fp97cqv9b9h2f37fn4nhmim5lm6d0n14p"
+    },
+    "ccc-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -96,7 +84,7 @@
       "url": "https://github.com/uga-rosa/ccc.nvim/archive/7c639042583c7bdc7ce2e37e5a0e0aa6d0659c6a.tar.gz",
       "hash": "01pp5j89x6p7k3r0gpcd12yjdqwxv2m472hnjvpr6mqhq3d525rs"
     },
-    "cellular-automaton.nvim": {
+    "cellular-automaton-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -108,7 +96,19 @@
       "url": "https://github.com/Eandrju/cellular-automaton.nvim/archive/11aea08aa084f9d523b0142c2cd9441b8ede09ed.tar.gz",
       "hash": "0jvz2vnyhm6a2zyz93sh87n59vga2l016ijrfybfrlv44hhzp2ww"
     },
-    "cheatsheet.nvim": {
+    "chatgpt-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "jackMort",
+        "repo": "ChatGPT.nvim"
+      },
+      "branch": "main",
+      "revision": "5b6d296eefc75331e2ff9f0adcffbd7d27862dd6",
+      "url": "https://github.com/jackMort/ChatGPT.nvim/archive/5b6d296eefc75331e2ff9f0adcffbd7d27862dd6.tar.gz",
+      "hash": "07f0p03fb4060lc7jfvp8mqi0jbk8mril9fg3b8rx9mq8415g1gr"
+    },
+    "cheatsheet-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -120,7 +120,7 @@
       "url": "https://github.com/sudormrfbin/cheatsheet.nvim/archive/9716f9aaa94dd1fd6ce59b5aae0e5f25e2a463ef.tar.gz",
       "hash": "0dm94kppbnky8y0gs1pdfs7vcc9hyp8lf6h33dw6ndqfnw3hd2ad"
     },
-    "cinnamon.nvim": {
+    "cinnamon-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -144,6 +144,18 @@
       "url": "https://github.com/hrsh7th/cmp-buffer/archive/3022dbc9166796b644a841a02de8dd1cc1d311fa.tar.gz",
       "hash": "1cwx8ky74633y0bmqmvq1lqzmphadnhzmhzkddl3hpb7rgn18vkl"
     },
+    "cmp-luasnip": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "saadparwaiz1",
+        "repo": "cmp_luasnip"
+      },
+      "branch": "main",
+      "revision": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90",
+      "url": "https://github.com/saadparwaiz1/cmp_luasnip/archive/98d9cb5c2c38532bd9bdb481067b20fea8f32e90.tar.gz",
+      "hash": "037sh4g1747wf07f9sqngiifp89hqww6m2rvizy5ra7jyd04magk"
+    },
     "cmp-nvim-lsp": {
       "type": "Git",
       "repository": {
@@ -180,19 +192,7 @@
       "url": "https://github.com/ray-x/cmp-treesitter/archive/958fcfa0d8ce46d215e19cc3992c542f576c4123.tar.gz",
       "hash": "05as01c2f7i20zkzpqbq9n8ji9bcwd678ixmxnrz9vmz5zsj8q7i"
     },
-    "cmp_luasnip": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "saadparwaiz1",
-        "repo": "cmp_luasnip"
-      },
-      "branch": "main",
-      "revision": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90",
-      "url": "https://github.com/saadparwaiz1/cmp_luasnip/archive/98d9cb5c2c38532bd9bdb481067b20fea8f32e90.tar.gz",
-      "hash": "037sh4g1747wf07f9sqngiifp89hqww6m2rvizy5ra7jyd04magk"
-    },
-    "codewindow.nvim": {
+    "codewindow-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -204,17 +204,17 @@
       "url": "https://github.com/gorbit99/codewindow.nvim/archive/dd7017617962943eb1d152fc58940f11c6775a4a.tar.gz",
       "hash": "1kxkf50rkqrzqz03jvygbwxb1yfmqh0gskr00vpmyrq51569a2hw"
     },
-    "conform.nvim": {
+    "comment-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
-        "owner": "stevearc",
-        "repo": "conform.nvim"
+        "owner": "numToStr",
+        "repo": "Comment.nvim"
       },
       "branch": "main",
-      "revision": "363243c03102a531a8203311d4f2ae704c620d9b",
-      "url": "https://github.com/stevearc/conform.nvim/archive/363243c03102a531a8203311d4f2ae704c620d9b.tar.gz",
-      "hash": "1lf7a5b30g37ys9f4z9gq68ymzfzsw7bwzqp1bb91cx9df1bdyck"
+      "revision": "e30b7f2008e52442154b66f7c519bfd2f1e32acb",
+      "url": "https://github.com/numToStr/Comment.nvim/archive/e30b7f2008e52442154b66f7c519bfd2f1e32acb.tar.gz",
+      "hash": "0dyz78j0kj3j99y5g8wncl7794g6z2qs05gfg9ddxaa4xswhyjc7"
     },
     "copilot-cmp": {
       "type": "Git",
@@ -228,7 +228,7 @@
       "url": "https://github.com/zbirenbaum/copilot-cmp/archive/15fc12af3d0109fa76b60b5cffa1373697e261d1.tar.gz",
       "hash": "0qyakf6wvkdxpzx63gv3p9bwafmxk87vgvcp14pfrkiznvqlpd3s"
     },
-    "copilot.lua": {
+    "copilot-lua": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -240,7 +240,7 @@
       "url": "https://github.com/zbirenbaum/copilot.lua/archive/886ee73b6d464b2b3e3e6a7ff55ce87feac423a9.tar.gz",
       "hash": "15d1m1lq1f4snkgvnr3cvz0gxh3yycszlq6cph68ddn1sb8h8rbk"
     },
-    "crates.nvim": {
+    "crates-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -252,7 +252,7 @@
       "url": "https://github.com/Saecki/crates.nvim/archive/8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785.tar.gz",
       "hash": "088yi9z0wj2ackg3hh5zm66yg31b2c5rc2ss24idx2jkfhqv908c"
     },
-    "csharpls-extended-lsp.nvim": {
+    "csharpls-extended-lsp-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -276,7 +276,7 @@
       "url": "https://github.com/glepnir/dashboard-nvim/archive/ae309606940d26d8c9df8b048a6e136b6bbec478.tar.gz",
       "hash": "06mr3869ag542vxnj68458k9cfyw9ldj0mjahzqkpwfl5nc28bs2"
     },
-    "diffview.nvim": {
+    "diffview-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -288,7 +288,7 @@
       "url": "https://github.com/sindrets/diffview.nvim/archive/4516612fe98ff56ae0415a259ff6361a89419b0a.tar.gz",
       "hash": "0brabpd02596hg98bml118bx6z2sly98kf1cr2p0xzybiinb4zs9"
     },
-    "dracula.nvim": {
+    "dracula-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -300,7 +300,7 @@
       "url": "https://github.com/Mofiqul/dracula.nvim/archive/515acae4fd294fcefa5b15237a333c2606e958d1.tar.gz",
       "hash": "1sr09v6q07q111pbcm8nc12mvgzb5f5n7bg8frrwb6dpspj4h97n"
     },
-    "dressing.nvim": {
+    "dressing-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -312,7 +312,7 @@
       "url": "https://github.com/stevearc/dressing.nvim/archive/3a45525bb182730fe462325c99395529308f431e.tar.gz",
       "hash": "0wd9zgqh9i9f77ny7avgsnsl6rxamcqcr7qlbzmsb8p003kl321p"
     },
-    "elixir-tools.nvim": {
+    "elixir-tools-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -324,7 +324,7 @@
       "url": "https://github.com/elixir-tools/elixir-tools.nvim/archive/803fa69dbb457305cff98e3997bed2c4b51aea7c.tar.gz",
       "hash": "09fnpj27rynw55hvs8dc860di10m3yj628aghsn3lzm249ar708a"
     },
-    "fastaction.nvim": {
+    "fastaction-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -336,7 +336,7 @@
       "url": "https://github.com/Chaitanyabsprip/fastaction.nvim/archive/886e22d85e13115808e81ca367d5aaba02d9a25b.tar.gz",
       "hash": "0zz9jc2nfyn43idwz63xcacgyaclsvddsjnk8vjgifga4m7v2r6l"
     },
-    "fidget.nvim": {
+    "fidget-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -348,7 +348,7 @@
       "url": "https://github.com/j-hui/fidget.nvim/archive/9238947645ce17d96f30842e61ba81147185b657.tar.gz",
       "hash": "1117w5i7996vxx32vibb09zpzzgwaipj5ldkdgck3ds5vkcdlk53"
     },
-    "flutter-tools.nvim": {
+    "flutter-tools-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -384,7 +384,7 @@
       "url": "https://github.com/ibhagwan/fzf-lua/archive/fbe21aeb147b3dc8b188b5753a8e288ecedcee5e.tar.gz",
       "hash": "1wiwq9h0m4rzcc5h2wqxa4gqiw9xrxlggvcasacy9bq89c6l11yh"
     },
-    "gesture.nvim": {
+    "gesture-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -396,7 +396,7 @@
       "url": "https://github.com/notomo/gesture.nvim/archive/dbd839bda337cb73911aeef06897eb29cb99f76f.tar.gz",
       "hash": "1cqiahc52xh113l8lgpz3k852vvqkv2srj9shdkyya76a2v2sf9d"
     },
-    "gitsigns.nvim": {
+    "gitsigns-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -408,7 +408,7 @@
       "url": "https://github.com/lewis6991/gitsigns.nvim/archive/5f808b5e4fef30bd8aca1b803b4e555da07fc412.tar.gz",
       "hash": "1dxsyv26mm7lzll3xlkzjj6w7kp11wfak8rgp19fg2d8301kxc0z"
     },
-    "glow.nvim": {
+    "glow-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -420,7 +420,7 @@
       "url": "https://github.com/ellisonleao/glow.nvim/archive/238070a686c1da3bccccf1079700eb4b5e19aea4.tar.gz",
       "hash": "1j63y3hb03n5m4jig8576sxnb3jixxlr66m9xcs8vgfm5h0mrhqs"
     },
-    "gruvbox.nvim": {
+    "gruvbox-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -432,7 +432,7 @@
       "url": "https://github.com/ellisonleao/gruvbox.nvim/archive/68c3460a5d1d1a362318960035c9f3466d5011f5.tar.gz",
       "hash": "0yc0hv9d4888lfvhd68gdwvfhfgafyqn9ljca4b5a0pgb61hiax9"
     },
-    "haskell-tools.nvim": {
+    "haskell-tools-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -444,7 +444,7 @@
       "url": "https://github.com/mrcjkb/haskell-tools.nvim/archive/943b77b68a79d3991523ba4d373063c9355c6f55.tar.gz",
       "hash": "0f8j9x20bs62pnsx4kwklbnrnxqakmfg9xd7742rqfyg03s4v5c1"
     },
-    "highlight-undo.nvim": {
+    "highlight-undo-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -456,7 +456,7 @@
       "url": "https://github.com/tzachar/highlight-undo.nvim/archive/5f588b420179a31d7073854bfd07ed9d5f364645.tar.gz",
       "hash": "1ykk9kj74kpnqq003fkhj75d9k68k8fgdv3kr0hbcvggxlr6nhkg"
     },
-    "hop.nvim": {
+    "hop-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -468,7 +468,7 @@
       "url": "https://github.com/phaazon/hop.nvim/archive/1a1eceafe54b5081eae4cb91c723abd1d450f34b.tar.gz",
       "hash": "08h18cam2yr57qvfsnf1bra28vbl6013wlchnr5crb757xw8aysa"
     },
-    "icon-picker.nvim": {
+    "icon-picker-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -480,7 +480,7 @@
       "url": "https://github.com/ziontee113/icon-picker.nvim/archive/3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3.tar.gz",
       "hash": "1357c2dhl7m7hbdsj0l2bmk97i76bp5yrfnd0g01sgd6wiasr4jm"
     },
-    "image.nvim": {
+    "image-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -492,7 +492,7 @@
       "url": "https://github.com/3rd/image.nvim/archive/b991fc7f845bc6ab40c6ec00b39750dcd5190010.tar.gz",
       "hash": "1jbbm4l71w0cas0aj5d0jsy65chbvf4bdxxllb04i3k6h1zycdja"
     },
-    "indent-blankline.nvim": {
+    "indent-blankline-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -504,7 +504,19 @@
       "url": "https://github.com/lukas-reineke/indent-blankline.nvim/archive/259357fa4097e232730341fa60988087d189193a.tar.gz",
       "hash": "1q9fgqvr84lynhy2vcyzp9xhzrl80g2pin14v7d3v0pgj10m8y8z"
     },
-    "leap.nvim": {
+    "lazydev-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "folke",
+        "repo": "lazydev.nvim"
+      },
+      "branch": "main",
+      "revision": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc",
+      "url": "https://github.com/folke/lazydev.nvim/archive/a1b78b2ac6f978c72e76ea90ae92a94edf380cfc.tar.gz",
+      "hash": "1ch75kwgyzpplvlp04h6aa4yymkjcwsfkwgzwicnqpsxylsw6z9r"
+    },
+    "leap-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -516,7 +528,18 @@
       "url": "https://github.com/ggandor/leap.nvim/archive/c6bfb191f1161fbabace1f36f578a20ac6c7642c.tar.gz",
       "hash": "1dmy45czi3irjd5qb74yamjam4d1lvqsgfxgh4vaj740b19gyl1w"
     },
-    "lsp_signature.nvim": {
+    "lsp-lines": {
+      "type": "Git",
+      "repository": {
+        "type": "Git",
+        "url": "https://git.sr.ht/~whynothugo/lsp_lines.nvim"
+      },
+      "branch": "main",
+      "revision": "a92c755f182b89ea91bd8a6a2227208026f27b4d",
+      "url": null,
+      "hash": "14ym4d8vgvw2vhsaxik8612wyvszd895q69n9h100yd7x5jqhy4c"
+    },
+    "lsp-signature-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -540,7 +563,7 @@
       "url": "https://github.com/onsails/lspkind-nvim/archive/d79a1c3299ad0ef94e255d045bed9fa26025dab6.tar.gz",
       "hash": "1wdavqmwadby9lyw415jw79kxynxv4fxg2v376y0rkxf258clarq"
     },
-    "lspsaga.nvim": {
+    "lspsaga-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -552,7 +575,7 @@
       "url": "https://github.com/tami5/lspsaga.nvim/archive/5faeec9f2508d2d49a66c0ac0d191096b4e3fa81.tar.gz",
       "hash": "1bw71db69na2sriv9q167z9bgkir4nwny1bdfv9z606bmng4hhzc"
     },
-    "lua-utils.nvim": {
+    "lua-utils-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -564,7 +587,7 @@
       "url": "https://github.com/nvim-neorg/lua-utils.nvim/archive/e565749421f4bbb5d2e85e37c3cef9d56553d8bd.tar.gz",
       "hash": "0bnl2kvxs55l8cjhfpa834bm010n8r4gmsmivjcp548c076msagn"
     },
-    "lualine.nvim": {
+    "lualine-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -576,7 +599,19 @@
       "url": "https://github.com/hoob3rt/lualine.nvim/archive/2a5bae925481f999263d6f5ed8361baef8df4f83.tar.gz",
       "hash": "0hp8gycbwm6ibq4rpa18j3g9xacgghklz4c8jlr4gif6g37r1pi0"
     },
-    "lz.n": {
+    "luasnip": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "L3MON4D3",
+        "repo": "LuaSnip"
+      },
+      "branch": "main",
+      "revision": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d",
+      "url": "https://github.com/L3MON4D3/LuaSnip/archive/33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d.tar.gz",
+      "hash": "1zicjd8y9a16rq1rs1xbmc6g927j5xi05yrxj9ap6wp72pfxxw3r"
+    },
+    "lz-n": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -600,7 +635,7 @@
       "url": "https://github.com/horriblename/lzn-auto-require/archive/a075ed51976323fd7fc44ccfca89fe0449a08cca.tar.gz",
       "hash": "1mgka1mmvpd2gfya898qdbbwrp5rpqds8manjs1s7g5x63xp6b98"
     },
-    "mind.nvim": {
+    "mind-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -612,6 +647,198 @@
       "url": "https://github.com/phaazon/mind.nvim/archive/002137dd7cf97865ebd01b6a260209d2daf2da66.tar.gz",
       "hash": "1p7gb8p1jrb2wx3x67lv7am3k1a14kvwsq89fdpb8b060s2l1214"
     },
+    "mini-ai": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.ai"
+      },
+      "branch": "main",
+      "revision": "ebb04799794a7f94628153991e6334c3304961b8",
+      "url": "https://github.com/echasnovski/mini.ai/archive/ebb04799794a7f94628153991e6334c3304961b8.tar.gz",
+      "hash": "1ipkxwizyhl3i3z6zff87k345mwkrsxmwwxbv5gcyq37bzmgpzkg"
+    },
+    "mini-align": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.align"
+      },
+      "branch": "main",
+      "revision": "e715137aece7d05734403d793b8b6b64486bc812",
+      "url": "https://github.com/echasnovski/mini.align/archive/e715137aece7d05734403d793b8b6b64486bc812.tar.gz",
+      "hash": "1m39wsinfdmqw53mllf9wr854vaw8qzhixy3j5w8r112s7qrnyx0"
+    },
+    "mini-animate": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.animate"
+      },
+      "branch": "main",
+      "revision": "d14190ac3040116540889e2ebc25f488b195799e",
+      "url": "https://github.com/echasnovski/mini.animate/archive/d14190ac3040116540889e2ebc25f488b195799e.tar.gz",
+      "hash": "15raqvmgp4srh7asll1y3finbm76l1sfmf52h69jj2y2w4kfdqv5"
+    },
+    "mini-base16": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.base16"
+      },
+      "branch": "main",
+      "revision": "23453dacc1606e5d42238d82f0b42a2985386b62",
+      "url": "https://github.com/echasnovski/mini.base16/archive/23453dacc1606e5d42238d82f0b42a2985386b62.tar.gz",
+      "hash": "0cxwc4bpkc362q00vkm75bbazd69ghyyavs30gf37fj3zj9khssl"
+    },
+    "mini-basics": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.basics"
+      },
+      "branch": "main",
+      "revision": "67c10b3436d5d3b892715137f4773e71c6753b13",
+      "url": "https://github.com/echasnovski/mini.basics/archive/67c10b3436d5d3b892715137f4773e71c6753b13.tar.gz",
+      "hash": "1ia7wha33l6q1krlx7d90v5rw25kdiv6la8j7f0s8vr0qxlcxhs7"
+    },
+    "mini-bracketed": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.bracketed"
+      },
+      "branch": "main",
+      "revision": "0091e11fabe34973fc038a8d0d0485202742e403",
+      "url": "https://github.com/echasnovski/mini.bracketed/archive/0091e11fabe34973fc038a8d0d0485202742e403.tar.gz",
+      "hash": "0yw7lmgwwvraflcwzrl33rwcdb94qsyvdi0rzq9b3ps7bla4dsyb"
+    },
+    "mini-bufremove": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.bufremove"
+      },
+      "branch": "main",
+      "revision": "285bdac9596ee7375db50c0f76ed04336dcd2685",
+      "url": "https://github.com/echasnovski/mini.bufremove/archive/285bdac9596ee7375db50c0f76ed04336dcd2685.tar.gz",
+      "hash": "0q8zm3k8hhpzbcjcd3gqz1r064fiymv9w2lfbdv5hhn2b8i9j7h8"
+    },
+    "mini-clue": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.clue"
+      },
+      "branch": "main",
+      "revision": "63e42dad781b9ed4845d90ef1da8c52dfb6dce3f",
+      "url": "https://github.com/echasnovski/mini.clue/archive/63e42dad781b9ed4845d90ef1da8c52dfb6dce3f.tar.gz",
+      "hash": "039fq0svkgr96l3z7h750iyah6fz9n18zy8wm1dfhpp3bxjyjh7z"
+    },
+    "mini-colors": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.colors"
+      },
+      "branch": "main",
+      "revision": "d64b1c0f520579d905f97208eca85329e664ab88",
+      "url": "https://github.com/echasnovski/mini.colors/archive/d64b1c0f520579d905f97208eca85329e664ab88.tar.gz",
+      "hash": "1yfx5zizm2m1c1064c5j5hb10xd7a8cgircs70q9cai14n25lqh7"
+    },
+    "mini-comment": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.comment"
+      },
+      "branch": "main",
+      "revision": "6e1f9a8ebbf6f693fa3787ceda8ca3bf3cb6aec7",
+      "url": "https://github.com/echasnovski/mini.comment/archive/6e1f9a8ebbf6f693fa3787ceda8ca3bf3cb6aec7.tar.gz",
+      "hash": "0wvyrkq84gy15ygv47vj50ch3551vmjp5gjvmvz26p3d4l6h225w"
+    },
+    "mini-completion": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.completion"
+      },
+      "branch": "main",
+      "revision": "6eb9546685c4e1c4af2365b87166d4afa39d8a1b",
+      "url": "https://github.com/echasnovski/mini.completion/archive/6eb9546685c4e1c4af2365b87166d4afa39d8a1b.tar.gz",
+      "hash": "05hk62f74fv8axdygbdz478dfcbvm4c4j696i77xlpqhfmy04m3n"
+    },
+    "mini-diff": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.diff"
+      },
+      "branch": "main",
+      "revision": "00f072250061ef498f91ed226918c9ec31a416a4",
+      "url": "https://github.com/echasnovski/mini.diff/archive/00f072250061ef498f91ed226918c9ec31a416a4.tar.gz",
+      "hash": "1n3rjajwnx5n5iamn49l4h7p23p601jd4m343ri2hmazb7zxc6vm"
+    },
+    "mini-doc": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.doc"
+      },
+      "branch": "main",
+      "revision": "bb73a3d1ff390f7e2740027ea2567017099a237c",
+      "url": "https://github.com/echasnovski/mini.doc/archive/bb73a3d1ff390f7e2740027ea2567017099a237c.tar.gz",
+      "hash": "1jsamvgdk6zxaimn9v949gbghf92d0ii8jhn2sjjy7arbl8w0w23"
+    },
+    "mini-extra": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.extra"
+      },
+      "branch": "main",
+      "revision": "477e3dda7b597b49bc1373951ea7da4da834c352",
+      "url": "https://github.com/echasnovski/mini.extra/archive/477e3dda7b597b49bc1373951ea7da4da834c352.tar.gz",
+      "hash": "02ydzdiiqf0ydrjiz847f6cbaxy3imvggchds9xn40i34nz6nhlm"
+    },
+    "mini-files": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.files"
+      },
+      "branch": "main",
+      "revision": "d0f03a5c38836fd2cce3dc80734124959002078c",
+      "url": "https://github.com/echasnovski/mini.files/archive/d0f03a5c38836fd2cce3dc80734124959002078c.tar.gz",
+      "hash": "0k5g5l9pb3br4vb5cm1b0hv081fdn967cw00mh687281dvrbnxah"
+    },
+    "mini-fuzzy": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "echasnovski",
+        "repo": "mini.fuzzy"
+      },
+      "branch": "main",
+      "revision": "faa5a6c0d29c28012c90bd011162963a58715428",
+      "url": "https://github.com/echasnovski/mini.fuzzy/archive/faa5a6c0d29c28012c90bd011162963a58715428.tar.gz",
+      "hash": "03v6rp0j63a7clpp6ficq6ixwr55lvyz3ygc99r1qw0gzh6y9w2y"
+    },
     "mini-git": {
       "type": "Git",
       "repository": {
@@ -624,199 +851,7 @@
       "url": "https://github.com/echasnovski/mini-git/archive/fc13dde6cfe87cf25a4fd1ee177c0d157468436b.tar.gz",
       "hash": "1wl9f3yncpnpv1j8imja4fwsnizjcqkv9cmblidj014rkji8lyxd"
     },
-    "mini.ai": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "echasnovski",
-        "repo": "mini.ai"
-      },
-      "branch": "main",
-      "revision": "ebb04799794a7f94628153991e6334c3304961b8",
-      "url": "https://github.com/echasnovski/mini.ai/archive/ebb04799794a7f94628153991e6334c3304961b8.tar.gz",
-      "hash": "1ipkxwizyhl3i3z6zff87k345mwkrsxmwwxbv5gcyq37bzmgpzkg"
-    },
-    "mini.align": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "echasnovski",
-        "repo": "mini.align"
-      },
-      "branch": "main",
-      "revision": "e715137aece7d05734403d793b8b6b64486bc812",
-      "url": "https://github.com/echasnovski/mini.align/archive/e715137aece7d05734403d793b8b6b64486bc812.tar.gz",
-      "hash": "1m39wsinfdmqw53mllf9wr854vaw8qzhixy3j5w8r112s7qrnyx0"
-    },
-    "mini.animate": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "echasnovski",
-        "repo": "mini.animate"
-      },
-      "branch": "main",
-      "revision": "d14190ac3040116540889e2ebc25f488b195799e",
-      "url": "https://github.com/echasnovski/mini.animate/archive/d14190ac3040116540889e2ebc25f488b195799e.tar.gz",
-      "hash": "15raqvmgp4srh7asll1y3finbm76l1sfmf52h69jj2y2w4kfdqv5"
-    },
-    "mini.base16": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "echasnovski",
-        "repo": "mini.base16"
-      },
-      "branch": "main",
-      "revision": "23453dacc1606e5d42238d82f0b42a2985386b62",
-      "url": "https://github.com/echasnovski/mini.base16/archive/23453dacc1606e5d42238d82f0b42a2985386b62.tar.gz",
-      "hash": "0cxwc4bpkc362q00vkm75bbazd69ghyyavs30gf37fj3zj9khssl"
-    },
-    "mini.basics": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "echasnovski",
-        "repo": "mini.basics"
-      },
-      "branch": "main",
-      "revision": "67c10b3436d5d3b892715137f4773e71c6753b13",
-      "url": "https://github.com/echasnovski/mini.basics/archive/67c10b3436d5d3b892715137f4773e71c6753b13.tar.gz",
-      "hash": "1ia7wha33l6q1krlx7d90v5rw25kdiv6la8j7f0s8vr0qxlcxhs7"
-    },
-    "mini.bracketed": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "echasnovski",
-        "repo": "mini.bracketed"
-      },
-      "branch": "main",
-      "revision": "0091e11fabe34973fc038a8d0d0485202742e403",
-      "url": "https://github.com/echasnovski/mini.bracketed/archive/0091e11fabe34973fc038a8d0d0485202742e403.tar.gz",
-      "hash": "0yw7lmgwwvraflcwzrl33rwcdb94qsyvdi0rzq9b3ps7bla4dsyb"
-    },
-    "mini.bufremove": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "echasnovski",
-        "repo": "mini.bufremove"
-      },
-      "branch": "main",
-      "revision": "285bdac9596ee7375db50c0f76ed04336dcd2685",
-      "url": "https://github.com/echasnovski/mini.bufremove/archive/285bdac9596ee7375db50c0f76ed04336dcd2685.tar.gz",
-      "hash": "0q8zm3k8hhpzbcjcd3gqz1r064fiymv9w2lfbdv5hhn2b8i9j7h8"
-    },
-    "mini.clue": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "echasnovski",
-        "repo": "mini.clue"
-      },
-      "branch": "main",
-      "revision": "63e42dad781b9ed4845d90ef1da8c52dfb6dce3f",
-      "url": "https://github.com/echasnovski/mini.clue/archive/63e42dad781b9ed4845d90ef1da8c52dfb6dce3f.tar.gz",
-      "hash": "039fq0svkgr96l3z7h750iyah6fz9n18zy8wm1dfhpp3bxjyjh7z"
-    },
-    "mini.colors": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "echasnovski",
-        "repo": "mini.colors"
-      },
-      "branch": "main",
-      "revision": "d64b1c0f520579d905f97208eca85329e664ab88",
-      "url": "https://github.com/echasnovski/mini.colors/archive/d64b1c0f520579d905f97208eca85329e664ab88.tar.gz",
-      "hash": "1yfx5zizm2m1c1064c5j5hb10xd7a8cgircs70q9cai14n25lqh7"
-    },
-    "mini.comment": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "echasnovski",
-        "repo": "mini.comment"
-      },
-      "branch": "main",
-      "revision": "6e1f9a8ebbf6f693fa3787ceda8ca3bf3cb6aec7",
-      "url": "https://github.com/echasnovski/mini.comment/archive/6e1f9a8ebbf6f693fa3787ceda8ca3bf3cb6aec7.tar.gz",
-      "hash": "0wvyrkq84gy15ygv47vj50ch3551vmjp5gjvmvz26p3d4l6h225w"
-    },
-    "mini.completion": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "echasnovski",
-        "repo": "mini.completion"
-      },
-      "branch": "main",
-      "revision": "6eb9546685c4e1c4af2365b87166d4afa39d8a1b",
-      "url": "https://github.com/echasnovski/mini.completion/archive/6eb9546685c4e1c4af2365b87166d4afa39d8a1b.tar.gz",
-      "hash": "05hk62f74fv8axdygbdz478dfcbvm4c4j696i77xlpqhfmy04m3n"
-    },
-    "mini.diff": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "echasnovski",
-        "repo": "mini.diff"
-      },
-      "branch": "main",
-      "revision": "00f072250061ef498f91ed226918c9ec31a416a4",
-      "url": "https://github.com/echasnovski/mini.diff/archive/00f072250061ef498f91ed226918c9ec31a416a4.tar.gz",
-      "hash": "1n3rjajwnx5n5iamn49l4h7p23p601jd4m343ri2hmazb7zxc6vm"
-    },
-    "mini.doc": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "echasnovski",
-        "repo": "mini.doc"
-      },
-      "branch": "main",
-      "revision": "bb73a3d1ff390f7e2740027ea2567017099a237c",
-      "url": "https://github.com/echasnovski/mini.doc/archive/bb73a3d1ff390f7e2740027ea2567017099a237c.tar.gz",
-      "hash": "1jsamvgdk6zxaimn9v949gbghf92d0ii8jhn2sjjy7arbl8w0w23"
-    },
-    "mini.extra": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "echasnovski",
-        "repo": "mini.extra"
-      },
-      "branch": "main",
-      "revision": "477e3dda7b597b49bc1373951ea7da4da834c352",
-      "url": "https://github.com/echasnovski/mini.extra/archive/477e3dda7b597b49bc1373951ea7da4da834c352.tar.gz",
-      "hash": "02ydzdiiqf0ydrjiz847f6cbaxy3imvggchds9xn40i34nz6nhlm"
-    },
-    "mini.files": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "echasnovski",
-        "repo": "mini.files"
-      },
-      "branch": "main",
-      "revision": "d0f03a5c38836fd2cce3dc80734124959002078c",
-      "url": "https://github.com/echasnovski/mini.files/archive/d0f03a5c38836fd2cce3dc80734124959002078c.tar.gz",
-      "hash": "0k5g5l9pb3br4vb5cm1b0hv081fdn967cw00mh687281dvrbnxah"
-    },
-    "mini.fuzzy": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "echasnovski",
-        "repo": "mini.fuzzy"
-      },
-      "branch": "main",
-      "revision": "faa5a6c0d29c28012c90bd011162963a58715428",
-      "url": "https://github.com/echasnovski/mini.fuzzy/archive/faa5a6c0d29c28012c90bd011162963a58715428.tar.gz",
-      "hash": "03v6rp0j63a7clpp6ficq6ixwr55lvyz3ygc99r1qw0gzh6y9w2y"
-    },
-    "mini.hipatterns": {
+    "mini-hipatterns": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -828,7 +863,7 @@
       "url": "https://github.com/echasnovski/mini.hipatterns/archive/f34975103a38b3f608219a1324cdfc58ea660b8b.tar.gz",
       "hash": "08mhgd7p69fzy9l99adns1gwb407wdq18di8nm6iy1nw6wrhx7yc"
     },
-    "mini.hues": {
+    "mini-hues": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -840,7 +875,7 @@
       "url": "https://github.com/echasnovski/mini.hues/archive/ae6ad4c666ff42c1102344fe1eba18bb486f2e46.tar.gz",
       "hash": "1bfyhs79l8v2zbzc2kp7ss089bp05lpqqy1ndbgvyi546dxgsbp3"
     },
-    "mini.icons": {
+    "mini-icons": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -852,7 +887,7 @@
       "url": "https://github.com/echasnovski/mini.icons/archive/910db5df9724d65371182948f921fce23c2c881e.tar.gz",
       "hash": "18d2s7sqcwi7yyb14xg96gzxpvr0gk6k1r4mglgjbfpx724z2hy3"
     },
-    "mini.indentscope": {
+    "mini-indentscope": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -864,7 +899,7 @@
       "url": "https://github.com/echasnovski/mini.indentscope/archive/613df2830d7faeae7483ba2e736683154b95921e.tar.gz",
       "hash": "02y7ya70wz79xd02xvlvri4sgnqbl9xd6d6im4323iyph7pdrg1j"
     },
-    "mini.jump": {
+    "mini-jump": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -876,7 +911,7 @@
       "url": "https://github.com/echasnovski/mini.jump/archive/bb93d998c9db6936697746330411f5fb9957145e.tar.gz",
       "hash": "0m5b0dy7aws5si5sc494hrrnfsgb9i0ssbrfwlprmi9q75xzvhx8"
     },
-    "mini.jump2d": {
+    "mini-jump2d": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -888,7 +923,7 @@
       "url": "https://github.com/echasnovski/mini.jump2d/archive/88077058297e80f1c76a18ed801ae9d7064187c6.tar.gz",
       "hash": "0dqslwc7r9yj3bszdgjp2cqhnhyzm8zn1zbikwi8q6bs50la2f7q"
     },
-    "mini.map": {
+    "mini-map": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -900,7 +935,7 @@
       "url": "https://github.com/echasnovski/mini.map/archive/4c58e755d75f9999abcd3b3c6e934734b6a8b098.tar.gz",
       "hash": "1407jgrzk0pvnhsssm3hdgjw3vd1n182adgh8c5h4b46dzvrvgvl"
     },
-    "mini.misc": {
+    "mini-misc": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -912,7 +947,7 @@
       "url": "https://github.com/echasnovski/mini.misc/archive/645fb9367c19bb485902e54e5451425981498601.tar.gz",
       "hash": "0xy9sn0vjlaw0lk6l59drksqypz6yncmdrhach387mv4hvh1lxma"
     },
-    "mini.move": {
+    "mini-move": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -924,7 +959,7 @@
       "url": "https://github.com/echasnovski/mini.move/archive/4caa1c212f5ca3d1633d21cfb184808090ed74b1.tar.gz",
       "hash": "0f4nrg9n8air507h6bd61dmb1rjjhykyl36qgr0ai72cb011wzcx"
     },
-    "mini.notify": {
+    "mini-notify": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -936,7 +971,7 @@
       "url": "https://github.com/echasnovski/mini.notify/archive/05e598d5b349bd66404d576e6a4d4340aea5f194.tar.gz",
       "hash": "02z2qdkh6rks7j7b3pwnm6vala0rz5p09ahplcgv1s4mhgby6vmb"
     },
-    "mini.operators": {
+    "mini-operators": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -948,7 +983,7 @@
       "url": "https://github.com/echasnovski/mini.operators/archive/7cb4dc66c51a3d736d347bbc517dc73dc7d28888.tar.gz",
       "hash": "1h6bxqkabh61gnlqj9yp5rsvn1p4g2ssk7ffkj3z8c3f1387567r"
     },
-    "mini.pairs": {
+    "mini-pairs": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -960,7 +995,7 @@
       "url": "https://github.com/echasnovski/mini.pairs/archive/7e834c5937d95364cc1740e20d673afe2d034cdb.tar.gz",
       "hash": "04x3gwrg64xxbg0njrb64bjb66rpi2aayydfqx9nbcimllng3l9y"
     },
-    "mini.pick": {
+    "mini-pick": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -972,7 +1007,7 @@
       "url": "https://github.com/echasnovski/mini.pick/archive/09ade94d2c9c5133db9ae00f3693d82eae78e9be.tar.gz",
       "hash": "00vq7zn0nmbnw19gk8gmm6a60zkxga4s8z6c0ildnq6ldk8q70a3"
     },
-    "mini.sessions": {
+    "mini-sessions": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -984,7 +1019,7 @@
       "url": "https://github.com/echasnovski/mini.sessions/archive/71c9ae596664ac110560d27eb928fc24e22bc53d.tar.gz",
       "hash": "0yd4li7z6py3c3b6ka9xv070lmrbzf38svq5wl4mhn4fdhqgqadz"
     },
-    "mini.snippets": {
+    "mini-snippets": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -996,7 +1031,7 @@
       "url": "https://github.com/echasnovski/mini.snippets/archive/72920f62e3dd1330720e94e8f5d42592f3a1ecf8.tar.gz",
       "hash": "0lyyv95zzwa6kn3gz7sah6v7jqj635c45n88my2sx8wknadkv30y"
     },
-    "mini.splitjoin": {
+    "mini-splitjoin": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1008,7 +1043,7 @@
       "url": "https://github.com/echasnovski/mini.splitjoin/archive/3e92f6764e770ba392325cad3a4497adcada695f.tar.gz",
       "hash": "126z8rsyg3849ijix1siwq77f9slwr93l61rwg499flzja3incic"
     },
-    "mini.starter": {
+    "mini-starter": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1020,7 +1055,7 @@
       "url": "https://github.com/echasnovski/mini.starter/archive/4b257cfc93241e8c8cde3f9302d1616ad4e0d036.tar.gz",
       "hash": "135l18l6n88v8zrdk95dfvw2ycsgd8m4wp9430g74bry99jj95m4"
     },
-    "mini.statusline": {
+    "mini-statusline": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1032,7 +1067,7 @@
       "url": "https://github.com/echasnovski/mini.statusline/archive/1b0edf76fe2af015f8c989385ff949f1db7aade2.tar.gz",
       "hash": "1aiy37p08c95g3dh5f0hvabnnv56dhs4zmpah5lx33j3fbvqs381"
     },
-    "mini.surround": {
+    "mini-surround": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1044,7 +1079,7 @@
       "url": "https://github.com/echasnovski/mini.surround/archive/aa5e245829dd12d8ff0c96ef11da28681d6049aa.tar.gz",
       "hash": "1zslkqg96yfa1lgcwavvcz60waix4y1j1r0v98sxhf8adna8jid2"
     },
-    "mini.tabline": {
+    "mini-tabline": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1056,7 +1091,7 @@
       "url": "https://github.com/echasnovski/mini.tabline/archive/06ef4ecaeca2e362c7d31113435d86d144b3cbbe.tar.gz",
       "hash": "1z808l3z7ywqxmqwfr1ab9ynyma5c1878x9ski0nrhvw4fli9rwy"
     },
-    "mini.test": {
+    "mini-test": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1068,7 +1103,7 @@
       "url": "https://github.com/echasnovski/mini.test/archive/86a64d5a4bf9d73ebf5875edaae0d878f64f5e48.tar.gz",
       "hash": "02zslska1g4ixy51slbvlxbjzcys0spc4wh200q8mwv4ipiignrn"
     },
-    "mini.trailspace": {
+    "mini-trailspace": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1080,7 +1115,7 @@
       "url": "https://github.com/echasnovski/mini.trailspace/archive/3a328e62559c33014e422fb9ae97afc4208208b1.tar.gz",
       "hash": "1314bmb8zk3gdpg1wpr1935d0xd0f0cf2f0ipxclbwi07wbjz9i4"
     },
-    "mini.visits": {
+    "mini-visits": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1092,7 +1127,7 @@
       "url": "https://github.com/echasnovski/mini.visits/archive/90f20ba6ab7d3d7cb984fffddd82f5f6c7a6bea7.tar.gz",
       "hash": "00drzhrxdyrysbdj4fnxk3lzn9alg8xhwfwgrscywvjfks0vbsa3"
     },
-    "minimap.vim": {
+    "minimap-vim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1104,7 +1139,7 @@
       "url": "https://github.com/wfxr/minimap.vim/archive/395378137e6180762d5b963ca9ad5ac2db5d3283.tar.gz",
       "hash": "0pfzmlf36in086g83g3sdqdy57jyyh5nbh2lrfmpbr2sg401a7qr"
     },
-    "modes.nvim": {
+    "modes-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1116,7 +1151,7 @@
       "url": "https://github.com/mvllow/modes.nvim/archive/c7a4b1b383606832aab150902719bd5eb5cdb2b0.tar.gz",
       "hash": "1hy3ghscf8hfmg487p9b8cwd0y8nsi8j24kq2ir3vhd82gqhl4ja"
     },
-    "neo-tree.nvim": {
+    "neo-tree-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1140,18 +1175,6 @@
       "url": "https://github.com/IogaMaster/neocord/archive/4d55d8dab2d5f2f272192add7a2c21982039c699.tar.gz",
       "hash": "18d84bd5242a3khpsk0iya3i75bc65mc2xc9kjldpvb827m6myl3"
     },
-    "neodev.nvim": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "folke",
-        "repo": "neodev.nvim"
-      },
-      "branch": "main",
-      "revision": "46aa467dca16cf3dfe27098042402066d2ae242d",
-      "url": "https://github.com/folke/neodev.nvim/archive/46aa467dca16cf3dfe27098042402066d2ae242d.tar.gz",
-      "hash": "0hyn02f8cpbnnhq4570nicfjdw88kkww3il8nmy6ban8iybg7s44"
-    },
     "neorg": {
       "type": "Git",
       "repository": {
@@ -1176,18 +1199,6 @@
       "url": "https://github.com/nvim-neorg/neorg-telescope/archive/ddb2556644cae922699a239bbb0fe16e25b084b7.tar.gz",
       "hash": "0p2s3n22fy1vkqc9n55x6kssqs4n0znwlszfrs532hj8m992wbks"
     },
-    "neovim": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "rose-pine",
-        "repo": "neovim"
-      },
-      "branch": "main",
-      "revision": "91548dca53b36dbb9d36c10f114385f759731be1",
-      "url": "https://github.com/rose-pine/neovim/archive/91548dca53b36dbb9d36c10f114385f759731be1.tar.gz",
-      "hash": "00zhx2j5lm27pcfaimzbkil61gfc6cxyy1dcgc4cyb8vfi8psf3s"
-    },
     "neovim-session-manager": {
       "type": "Git",
       "repository": {
@@ -1200,7 +1211,7 @@
       "url": "https://github.com/Shatur/neovim-session-manager/archive/ce43f2eb2a52492157d7742e5f684b9a42bb3e5c.tar.gz",
       "hash": "0g2vfv9jjmsgagvhdffs3z37w5xa1nlwanq74w8c62y7amyyvn2v"
     },
-    "new-file-template.nvim": {
+    "new-file-template-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1212,13 +1223,7 @@
       "url": "https://github.com/otavioschwanck/new-file-template.nvim/archive/6ac66669dbf2dc5cdee184a4fe76d22465ca67e8.tar.gz",
       "hash": "0c7378c3w6bniclp666rq15c28akb0sjy58ayva0wpyin4k26hl3"
     },
-    "nixpkgs": {
-      "type": "Channel",
-      "name": "nixpkgs-unstable",
-      "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre747727.f7384aacd0ec/nixexprs.tar.xz",
-      "hash": "12g53dydivr7wibcc7nz4kghg2mcw4jy4vp30qfwsx15pwsihizw"
-    },
-    "noice.nvim": {
+    "noice-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1230,7 +1235,7 @@
       "url": "https://github.com/folke/noice.nvim/archive/eaed6cc9c06aa2013b5255349e4f26a6b17ab70f.tar.gz",
       "hash": "0imw4ls3vqh8bg358y8ckxcbylhczr297zxhcfx6r7mf64sj171s"
     },
-    "none-ls.nvim": {
+    "none-ls-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1242,7 +1247,7 @@
       "url": "https://github.com/nvimtools/none-ls.nvim/archive/bb680d752cec37949faca7a1f509e2fe67ab418a.tar.gz",
       "hash": "11zgc86cjkv1vi183mplx3bsqa2x7ardk7ybyrp702xx5hmd882l"
     },
-    "nord.nvim": {
+    "nord-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1254,7 +1259,7 @@
       "url": "https://github.com/gbprod/nord.nvim/archive/b0f3ed242fd8e5bafa7231367821d46c6c835dd8.tar.gz",
       "hash": "0yr5b30dxrdrbv8210fmh35wgz3z26274aj5irzal33liznx4436"
     },
-    "nui.nvim": {
+    "nui-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1266,18 +1271,6 @@
       "url": "https://github.com/MunifTanjim/nui.nvim/archive/53e907ffe5eedebdca1cd503b00aa8692068ca46.tar.gz",
       "hash": "1m4vlf9qcs01a8qrq3salcz966sp8cpf01gbrg8dbf255vzc8kp9"
     },
-    "nvim": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "catppuccin",
-        "repo": "nvim"
-      },
-      "branch": "main",
-      "revision": "f67b886d65a029f12ffa298701fb8f1efd89295d",
-      "url": "https://github.com/catppuccin/nvim/archive/f67b886d65a029f12ffa298701fb8f1efd89295d.tar.gz",
-      "hash": "0fwgsvlxvzz5r8jfmj1fp97cqv9b9h2f37fn4nhmim5lm6d0n14p"
-    },
     "nvim-autopairs": {
       "type": "Git",
       "repository": {
@@ -1290,7 +1283,7 @@
       "url": "https://github.com/windwp/nvim-autopairs/archive/b464658e9b880f463b9f7e6ccddd93fb0013f559.tar.gz",
       "hash": "0p4v49saqfsc8kinl3wc3zhmr6m2q86vmay2f10payp29n4v3did"
     },
-    "nvim-bufferline.lua": {
+    "nvim-bufferline-lua": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1314,17 +1307,17 @@
       "url": "https://github.com/hrsh7th/nvim-cmp/archive/b555203ce4bd7ff6192e759af3362f9d217e8c89.tar.gz",
       "hash": "1s3wiwhnqp046skxp60sdrvzhrij4javhm9ndvfsw2fv9bc35x37"
     },
-    "nvim-colorizer.lua": {
+    "nvim-colorizer-lua": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
-        "owner": "catgoose",
+        "owner": "NvChad",
         "repo": "nvim-colorizer.lua"
       },
       "branch": "main",
-      "revision": "9b5fe0450bfb2521c6cea29391e5ec571f129136",
-      "url": "https://github.com/catgoose/nvim-colorizer.lua/archive/9b5fe0450bfb2521c6cea29391e5ec571f129136.tar.gz",
-      "hash": "0q5qksxzh5jigdb71w7sk0lv4nwylkidg5c7cx578d8yhnf1jj10"
+      "revision": "8a65c448122fc8fac9c67b2e857b6e830a4afd0b",
+      "url": "https://github.com/NvChad/nvim-colorizer.lua/archive/8a65c448122fc8fac9c67b2e857b6e830a4afd0b.tar.gz",
+      "hash": "011i0jrx74siilym2lclbv2wcz04g7v7776qw8zhggdsmvgsrsma"
     },
     "nvim-cursorline": {
       "type": "Git",
@@ -1398,18 +1391,6 @@
       "url": "https://github.com/kosayoda/nvim-lightbulb/archive/3ac0791be37ba9cc7939f1ad90ebc5e75abf4eea.tar.gz",
       "hash": "0qc1rl45ykh9552dx5fmhdg0ncfsk2vpcmj5i7hrmdzgkd2f0avg"
     },
-    "nvim-lint": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "mfussenegger",
-        "repo": "nvim-lint"
-      },
-      "branch": "main",
-      "revision": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87",
-      "url": "https://github.com/mfussenegger/nvim-lint/archive/789b7ada1b4f00e08d026dffde410dcfa6a0ba87.tar.gz",
-      "hash": "1npjlv0gml66mw9v8d95p3c5zzijpc362bkji6zvc5n152yy59qc"
-    },
     "nvim-lspconfig": {
       "type": "Git",
       "repository": {
@@ -1458,7 +1439,7 @@
       "url": "https://github.com/SmiteshP/nvim-navic/archive/8649f694d3e76ee10c19255dece6411c29206a54.tar.gz",
       "hash": "0964wgwh6i4nm637vx36bshkpd5i63ipwzqmrdbkz5h9bzyng7nj"
     },
-    "nvim-neoclip.lua": {
+    "nvim-neoclip-lua": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1518,7 +1499,7 @@
       "url": "https://github.com/kylechui/nvim-surround/archive/9f0cb495f25bff32c936062d85046fbda0c43517.tar.gz",
       "hash": "1c78320liqhza52gq2xylykd9m6rl50cn44flldg43a4l7rrabxh"
     },
-    "nvim-tree.lua": {
+    "nvim-tree-lua": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1578,7 +1559,7 @@
       "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/4adeeaa7a32d46cf3b5833341358c797304f950a.tar.gz",
       "hash": "1bnw6k9nki7igc7j4y02mbmihfb5yj7xykgiyi31kc5nbzldinl7"
     },
-    "obsidian.nvim": {
+    "obsidian-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1590,7 +1571,7 @@
       "url": "https://github.com/epwalsh/obsidian.nvim/archive/14e0427bef6c55da0d63f9a313fd9941be3a2479.tar.gz",
       "hash": "15ycmhn48ryaqzch6w3w6llq2qgmjx8xwkb9dn0075z60dybpflr"
     },
-    "omnisharp-extended-lsp.nvim": {
+    "omnisharp-extended-lsp-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1602,7 +1583,7 @@
       "url": "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/archive/4916fa12e5b28d21a1f031f0bdd10aa15a75d85d.tar.gz",
       "hash": "0w2zbiz2sxblnmhnqp6f6n7d9g9cm40ksk66anl3s7qnqffvc3cl"
     },
-    "onedark.nvim": {
+    "onedark-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1626,7 +1607,7 @@
       "url": "https://github.com/nvim-orgmode/orgmode/archive/bf657742f7cb56211f99946ff64f5f87d7d7f0d0.tar.gz",
       "hash": "074493jfhgihp5zyyl86f9hfa2j6qdgw35q87vvdbmmj6rwhjmhk"
     },
-    "otter.nvim": {
+    "otter-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1638,7 +1619,7 @@
       "url": "https://github.com/jmbuhr/otter.nvim/archive/e8c662e1aefa8b483cfba6e00729a39a363dcecc.tar.gz",
       "hash": "0csl3ddm8782fw836adj4fp4h3fg2ygv7ik632llk55mp1q4dw1l"
     },
-    "oxocarbon.nvim": {
+    "oxocarbon-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1650,7 +1631,7 @@
       "url": "https://github.com/nyoom-engineering/oxocarbon.nvim/archive/004777819ba294423b638a35a75c9f0c7be758ed.tar.gz",
       "hash": "1qllk870nqc9nhkdgmqm8km2rar6dsmyhfhpcfx8crrg640yfbqy"
     },
-    "pathlib.nvim": {
+    "pathlib-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1662,7 +1643,7 @@
       "url": "https://github.com/pysan3/pathlib.nvim/archive/57e5598af6fe253761c1b48e0b59b7cd6699e2c1.tar.gz",
       "hash": "1z3nwy83r3zbll9wc2wyvg60z0dqc5hm2xdfvqh3hwm5s9w8j432"
     },
-    "plenary.nvim": {
+    "plenary-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1674,7 +1655,7 @@
       "url": "https://github.com/nvim-lua/plenary.nvim/archive/2d9b06177a975543726ce5c73fca176cedbffe9d.tar.gz",
       "hash": "1blmh0qr010jhydw61kiynll2m7q4xyrvrva8b5ipf1g81x8ysbf"
     },
-    "precognition.nvim": {
+    "precognition-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1686,7 +1667,7 @@
       "url": "https://github.com/tris203/precognition.nvim/archive/531971e6d883e99b1572bf47294e22988d8fbec0.tar.gz",
       "hash": "1mm3gzv882kd0kmqj0zfk6hlw5fxbk7jz16g1h7g8xs2mjh4lxwv"
     },
-    "project.nvim": {
+    "project-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1710,7 +1691,7 @@
       "url": "https://github.com/kevinhwang91/promise-async/archive/119e8961014c9bfaf1487bf3c2a393d254f337e2.tar.gz",
       "hash": "0q4a0rmy09hka6zvydzjj2gcm2j5mlbrhbxfcdjj33ngpblkmqzm"
     },
-    "rainbow-delimiters.nvim": {
+    "rainbow-delimiters-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1722,7 +1703,7 @@
       "url": "https://github.com/HiPhish/rainbow-delimiters.nvim/archive/85b80abaa09cbbc039e3095b2f515b3cf8cadd11.tar.gz",
       "hash": "0k1hqjyr9xxbg2087qssglv6dgnq81w671d3rqn7lxnprmidfqfd"
     },
-    "registers.nvim": {
+    "registers-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1734,7 +1715,7 @@
       "url": "https://github.com/tversteeg/registers.nvim/archive/c217f8f369e0886776cda6c94eab839b30a8940d.tar.gz",
       "hash": "1pdfm98grlka537i1c94vi8bpbp66slkyz3by040wlfq4pgr3frk"
     },
-    "render-markdown.nvim": {
+    "render-markdown-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1746,7 +1727,19 @@
       "url": "https://github.com/MeanderingProgrammer/render-markdown.nvim/archive/6fbd1491abc104409f119685de5353c35c97c005.tar.gz",
       "hash": "081r1a7rhmmla80i6bg1lmld9lkjhzgkh2rvlpvka889zl36mhcx"
     },
-    "rtp.nvim": {
+    "rose-pine": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "rose-pine",
+        "repo": "neovim"
+      },
+      "branch": "main",
+      "revision": "91548dca53b36dbb9d36c10f114385f759731be1",
+      "url": "https://github.com/rose-pine/neovim/archive/91548dca53b36dbb9d36c10f114385f759731be1.tar.gz",
+      "hash": "00zhx2j5lm27pcfaimzbkil61gfc6cxyy1dcgc4cyb8vfi8psf3s"
+    },
+    "rtp-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1758,7 +1751,7 @@
       "url": "https://github.com/nvim-neorocks/rtp.nvim/archive/494ddfc888bb466555d90ace731856de1320fe45.tar.gz",
       "hash": "1b6hx50nr2s2mnhsx9zy54pjdq7f78mi394v2b2c9v687s45nqln"
     },
-    "run.nvim": {
+    "run-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1778,11 +1771,11 @@
         "repo": "rustaceanvim"
       },
       "branch": "main",
-      "revision": "4a2f2d2cc04f5b0aa0981f98bb7d002c898318ad",
-      "url": "https://github.com/mrcjkb/rustaceanvim/archive/4a2f2d2cc04f5b0aa0981f98bb7d002c898318ad.tar.gz",
-      "hash": "0dm8ayl95ppscywdyddrpdpizbs98s0fklw8cqv48iqcxqy851k7"
+      "revision": "51c097ebfb65d83baa71f48000b1e5c0a8dcc4fb",
+      "url": "https://github.com/mrcjkb/rustaceanvim/archive/51c097ebfb65d83baa71f48000b1e5c0a8dcc4fb.tar.gz",
+      "hash": "0c1gixywf7781h4af9bic07spgmxyx9ddxcrgy5b9da7phcmgimr"
     },
-    "smartcolumn.nvim": {
+    "smartcolumn-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1794,7 +1787,7 @@
       "url": "https://github.com/m4xshen/smartcolumn.nvim/archive/f14fbea6f86cd29df5042897ca9e3ba10ba4d27f.tar.gz",
       "hash": "1d0p906dr4wzc73zsm1pyc3fl9a6ns8i6hkl0ynvx72hj01is6p9"
     },
-    "sqls.nvim": {
+    "sqls-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1818,7 +1811,7 @@
       "url": "https://github.com/godlygeek/tabular/archive/12437cd1b53488e24936ec4b091c9324cafee311.tar.gz",
       "hash": "1cnh21yhcn2f4fajdr2b6hrclnhf1sz4abra4nw7b5yk1mvfjq5a"
     },
-    "telescope.nvim": {
+    "telescope": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1830,7 +1823,7 @@
       "url": "https://github.com/nvim-telescope/telescope.nvim/archive/2eca9ba22002184ac05eddbe47a7fe2d5a384dfc.tar.gz",
       "hash": "0bkpys6dj01x6ycylmf6vrd2mqjibmny9a2hxxrqn0jqqvagm5ly"
     },
-    "tiny-devicons-auto-colors.nvim": {
+    "tiny-devicons-auto-colors-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1842,7 +1835,7 @@
       "url": "https://github.com/rachartier/tiny-devicons-auto-colors.nvim/archive/c8f63933ee013c1e0a26091d58131e060546f01f.tar.gz",
       "hash": "04mf9vkf7q3bxz79v1qp0r40sdql065vn4mfnavh71sqywm1jmcj"
     },
-    "todo-comments.nvim": {
+    "todo-comments-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1854,7 +1847,7 @@
       "url": "https://github.com/folke/todo-comments.nvim/archive/ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0.tar.gz",
       "hash": "0v6vn3f9svj756ds8cp0skpw65xixlx1f3aj0fh374wdpb5i4zhh"
     },
-    "toggleterm.nvim": {
+    "toggleterm-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1866,7 +1859,7 @@
       "url": "https://github.com/akinsho/toggleterm.nvim/archive/344fc1810292785b3d962ddac2de57669e1a7ff9.tar.gz",
       "hash": "0awj2kj3lam2j48bgld5wyb4m1v09gpxmzww35rgysq7wipliqx1"
     },
-    "tokyonight.nvim": {
+    "tokyonight-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1878,7 +1871,7 @@
       "url": "https://github.com/folke/tokyonight.nvim/archive/45d22cf0e1b93476d3b6d362d720412b3d34465c.tar.gz",
       "hash": "1038ff6i8csxx3cqccgbpv06slvbcs534cfkq7s58ww2vvldm7sc"
     },
-    "trouble.nvim": {
+    "trouble": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1890,7 +1883,7 @@
       "url": "https://github.com/folke/trouble.nvim/archive/46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6.tar.gz",
       "hash": "12ky8alz6zi2vlqspnacmkj99d4sam4hrzs92i3n4sz6jx2w8696"
     },
-    "ts-error-translator.nvim": {
+    "ts-error-translator-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1902,7 +1895,7 @@
       "url": "https://github.com/dmmulroy/ts-error-translator.nvim/archive/47e5ba89f71b9e6c72eaaaaa519dd59bd6897df4.tar.gz",
       "hash": "08whn7l75qv5n74cifmnxc0s7n7ja1g7589pjnbbsk2djn6bqbky"
     },
-    "typst-preview.nvim": {
+    "typst-preview-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1986,7 +1979,7 @@
       "url": "https://github.com/mhinz/vim-startify/archive/4e089dffdad46f3f5593f34362d530e8fe823dcf.tar.gz",
       "hash": "1ycqfqnmalqzrx1yy9a1fc2p0w922x4sqv2222bi9xjzmh77z4sv"
     },
-    "which-key.nvim": {
+    "which-key-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
diff --git a/npins/sources.nix b/npins/sources.nix
new file mode 100644
index 00000000..daa176a0
--- /dev/null
+++ b/npins/sources.nix
@@ -0,0 +1,85 @@
+# Based off of:
+# https://github.com/NixOS/nixpkgs/blob/776c3bee4769c616479393aeefceefeda16b6fcb/pkgs/tools/nix/npins/source.nix
+{
+  lib,
+  fetchurl,
+  fetchgit,
+  fetchzip,
+}:
+builtins.mapAttrs
+(
+  _: let
+    getZip = {
+      url,
+      hash,
+      ...
+    }:
+      fetchzip {
+        inherit url;
+        sha256 = hash;
+        extension = "tar";
+      };
+    mkGitSource = {
+      repository,
+      revision,
+      url ? null,
+      hash,
+      ...
+    } @ attrs:
+      assert repository ? type;
+        if url != null
+        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;
+              appendShort =
+                if (builtins.match "[a-f0-9]*" rev) != null
+                then "-${short}"
+                else "";
+            in "${
+              if matched == null
+              then "source"
+              else builtins.head matched
+            }${appendShort}";
+            name = urlToName repository.url revision;
+          in
+            fetchgit {
+              inherit name;
+              inherit (repository) url;
+              rev = revision;
+              sha256 = hash;
+            };
+
+    mkPyPiSource = {
+      url,
+      hash,
+      ...
+    }:
+      fetchurl {
+        inherit url;
+        sha256 = hash;
+      };
+  in
+    spec:
+      assert spec ? type; let
+        func =
+          {
+            Git = mkGitSource;
+            GitRelease = mkGitSource;
+            PyPi = mkPyPiSource;
+            Channel = getZip;
+          }
+          .${spec.type}
+          or (builtins.throw "Unknown source type ${spec.type}");
+      in
+        spec // {outPath = func spec;}
+)
+(
+  let
+    json = lib.importJSON ./sources.json;
+  in
+    assert lib.assertMsg (json.version == 3) "Npins version mismatch!";
+      json.pins
+)

From b9562b33147b19207c50d726a04fd0c9e2d21040 Mon Sep 17 00:00:00 2001
From: alfarel <alfarelcynthesis@proton.me>
Date: Tue, 11 Feb 2025 09:58:52 -0500
Subject: [PATCH 172/202] rainbow-delimiters: fix startPlugins name

---
 modules/plugins/visuals/rainbow-delimiters/config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/visuals/rainbow-delimiters/config.nix b/modules/plugins/visuals/rainbow-delimiters/config.nix
index 361a0426..79996aea 100644
--- a/modules/plugins/visuals/rainbow-delimiters/config.nix
+++ b/modules/plugins/visuals/rainbow-delimiters/config.nix
@@ -9,7 +9,7 @@
   cfg = config.vim.visuals.rainbow-delimiters;
 in {
   vim = mkIf cfg.enable {
-    startPlugins = ["rainbow-delimiters"];
+    startPlugins = ["rainbow-delimiters-nvim"];
 
     pluginRC.rainbow-delimiters = entryAnywhere ''
       vim.g.rainbow_delimiters = ${toLuaObject cfg.setupOpts}

From 5671d7b42cf796819cb5412fc5509c4ee1bee230 Mon Sep 17 00:00:00 2001
From: Lin Xianyi <iynaix@gmail.com>
Date: Fri, 7 Feb 2025 10:59:42 +0800
Subject: [PATCH 173/202] languages/nix: add lsp options support for nixd

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

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 3a09171b..768f2476 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -143,3 +143,8 @@
 [nezia1](https://github.com/nezia1)
 
 - Add support for [nixd](https://github.com/nix-community/nixd) language server.
+
+[iynaix](https://github.com/iynaix)
+
+- Add lsp options support for [nixd](https://github.com/nix-community/nixd)
+  language server.
diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix
index d6ca6d32..1ae2693e 100644
--- a/modules/plugins/languages/nix.nix
+++ b/modules/plugins/languages/nix.nix
@@ -10,9 +10,9 @@
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.strings) optionalString;
-  inherit (lib.types) enum either listOf package str;
+  inherit (lib.types) anything attrsOf enum either listOf nullOr package str;
   inherit (lib.nvim.types) mkGrammarOption diagnostics;
-  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.lua) expToLua toLuaObject;
   inherit (lib.nvim.languages) diagnosticsToLua;
 
   cfg = config.vim.languages.nix;
@@ -87,6 +87,7 @@
                 command = {"${cfg.format.package}/bin/nixfmt"},
               },
             ''}
+          options = ${toLuaObject cfg.lsp.options},
             },
           },
         ''}
@@ -173,6 +174,12 @@ in {
         type = either package (listOf str);
         default = servers.${cfg.lsp.server}.package;
       };
+
+      options = mkOption {
+        type = nullOr (attrsOf anything);
+        default = null;
+        description = "Options to pass to nixd LSP server";
+      };
     };
 
     format = {

From c4cb29b7a3484198fd6352afe7440799c4f1128d Mon Sep 17 00:00:00 2001
From: Alfarel <alfarelcynthesis@proton.me>
Date: Tue, 11 Feb 2025 17:21:16 +0000
Subject: [PATCH 174/202] docs: add missing npins subcommand (#623)

---
 docs/manual/hacking/additional-plugins.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/manual/hacking/additional-plugins.md b/docs/manual/hacking/additional-plugins.md
index 08cae680..0ed252c7 100644
--- a/docs/manual/hacking/additional-plugins.md
+++ b/docs/manual/hacking/additional-plugins.md
@@ -8,13 +8,13 @@ Use:
 
 Then run:
 
-`npins --name <plugin name> github <owner> <repo> -b <branch>`
+`npins add --name <plugin name> github <owner> <repo> -b <branch>`
 
 Be sure to replace any non-alphanumeric characters with `-` for `--name`
 
 For example 
 
-`npins --name lazydev-nvim github folke laztdev.nvim -b main`
+`npins add --name lazydev-nvim github folke lazydev.nvim -b main`
 
 You can now reference this plugin as a **string**.
 

From 7eb1780ab63c49c6062111eb30c7aad48ad35b30 Mon Sep 17 00:00:00 2001
From: Filip Hoffmann <folosp@protonmail.com>
Date: Tue, 11 Feb 2025 18:46:49 +0100
Subject: [PATCH 175/202] lsp/lspkind: fix plugin name (#626)

* lsp/lspkind: fix plugin name

* docs: update changelog

---------

Co-authored-by: raf <raf@notashelf.dev>
---
 docs/release-notes/rl-0.8.md           | 3 +++
 modules/plugins/lsp/lspkind/config.nix | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 9ffd68fd..a265c7cf 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -150,6 +150,9 @@
 
 - Add support for [nixd](https://github.com/nix-community/nixd) language server.
 
+[folospior](https://github.com/folospior)
+
+- Fix plugin name for lsp/lspkind.
 [iynaix](https://github.com/iynaix)
 
 - Add lsp options support for [nixd](https://github.com/nix-community/nixd)
diff --git a/modules/plugins/lsp/lspkind/config.nix b/modules/plugins/lsp/lspkind/config.nix
index abe14524..982caff2 100644
--- a/modules/plugins/lsp/lspkind/config.nix
+++ b/modules/plugins/lsp/lspkind/config.nix
@@ -25,7 +25,7 @@ in {
     ];
 
     vim = {
-      startPlugins = ["lspkind"];
+      startPlugins = ["lspkind-nvim"];
 
       lsp.lspkind.setupOpts.before = config.vim.autocomplete.nvim-cmp.format;
       autocomplete = {

From 0c6308313ba3f4054726cc9114c553710e37b791 Mon Sep 17 00:00:00 2001
From: Alex Colby <alexanderdcolby@gmail.com>
Date: Tue, 11 Feb 2025 18:38:02 +0000
Subject: [PATCH 176/202] flake: update npins pins for themes (#627)

* fix: corrects theme names in `npins/sources.json`

See:
- [themes broken](https://github.com/NotAShelf/nvf/issues/619)
- [lspkind broken](https://github.com/NotAShelf/nvf/issues/624)

* release-notes: adds fix to plugin theme names
---
 docs/release-notes/rl-0.8.md |  5 +++++
 npins/sources.json           | 16 ++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index a265c7cf..5ff8c5f2 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -153,7 +153,12 @@
 [folospior](https://github.com/folospior)
 
 - Fix plugin name for lsp/lspkind.
+
 [iynaix](https://github.com/iynaix)
 
 - Add lsp options support for [nixd](https://github.com/nix-community/nixd)
   language server.
+
+[Mr-Helpful](https://github.com/Mr-Helpful)
+
+- Corrects pin names used for nvim themes
diff --git a/npins/sources.json b/npins/sources.json
index 70df6065..ed83c54f 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -24,7 +24,7 @@
       "url": "https://github.com/goolord/alpha-nvim/archive/de72250e054e5e691b9736ee30db72c65d560771.tar.gz",
       "hash": "0c1jkhxamfn2md7m1r5b2wpxa26y90b98yzjwf68m3fymalvkn5h"
     },
-    "base16-nvim": {
+    "base16": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -288,7 +288,7 @@
       "url": "https://github.com/sindrets/diffview.nvim/archive/4516612fe98ff56ae0415a259ff6361a89419b0a.tar.gz",
       "hash": "0brabpd02596hg98bml118bx6z2sly98kf1cr2p0xzybiinb4zs9"
     },
-    "dracula-nvim": {
+    "dracula": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -420,7 +420,7 @@
       "url": "https://github.com/ellisonleao/glow.nvim/archive/238070a686c1da3bccccf1079700eb4b5e19aea4.tar.gz",
       "hash": "1j63y3hb03n5m4jig8576sxnb3jixxlr66m9xcs8vgfm5h0mrhqs"
     },
-    "gruvbox-nvim": {
+    "gruvbox": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1247,7 +1247,7 @@
       "url": "https://github.com/nvimtools/none-ls.nvim/archive/bb680d752cec37949faca7a1f509e2fe67ab418a.tar.gz",
       "hash": "11zgc86cjkv1vi183mplx3bsqa2x7ardk7ybyrp702xx5hmd882l"
     },
-    "nord-nvim": {
+    "nord": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1583,7 +1583,7 @@
       "url": "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/archive/4916fa12e5b28d21a1f031f0bdd10aa15a75d85d.tar.gz",
       "hash": "0w2zbiz2sxblnmhnqp6f6n7d9g9cm40ksk66anl3s7qnqffvc3cl"
     },
-    "onedark-nvim": {
+    "onedark": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1619,7 +1619,7 @@
       "url": "https://github.com/jmbuhr/otter.nvim/archive/e8c662e1aefa8b483cfba6e00729a39a363dcecc.tar.gz",
       "hash": "0csl3ddm8782fw836adj4fp4h3fg2ygv7ik632llk55mp1q4dw1l"
     },
-    "oxocarbon-nvim": {
+    "oxocarbon": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1859,7 +1859,7 @@
       "url": "https://github.com/akinsho/toggleterm.nvim/archive/344fc1810292785b3d962ddac2de57669e1a7ff9.tar.gz",
       "hash": "0awj2kj3lam2j48bgld5wyb4m1v09gpxmzww35rgysq7wipliqx1"
     },
-    "tokyonight-nvim": {
+    "tokyonight": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -2005,4 +2005,4 @@
     }
   },
   "version": 3
-}
\ No newline at end of file
+}

From d4a1fb26f1db41869cb960db7c1bc73831e754a7 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 11 Feb 2025 21:49:51 +0300
Subject: [PATCH 177/202] utility/ccc: fix npins name incompat

---
 modules/plugins/utility/ccc/config.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/plugins/utility/ccc/config.nix b/modules/plugins/utility/ccc/config.nix
index ab2d1788..33948562 100644
--- a/modules/plugins/utility/ccc/config.nix
+++ b/modules/plugins/utility/ccc/config.nix
@@ -9,9 +9,7 @@
   cfg = config.vim.utility.ccc;
 in {
   config = mkIf cfg.enable {
-    vim.startPlugins = [
-      "ccc"
-    ];
+    vim.startPlugins = ["ccc-nvim"];
 
     vim.pluginRC.ccc = entryAnywhere ''
       local ccc = require("ccc")

From 14d25e4153781cdac2cbe0c7415e1bd445c2008e Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 11 Feb 2025 22:03:29 +0300
Subject: [PATCH 178/202] pins: yanky.nvim -> yanky-nvim

---
 npins/sources.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npins/sources.json b/npins/sources.json
index ed83c54f..929da85c 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -1991,7 +1991,7 @@
       "url": "https://github.com/folke/which-key.nvim/archive/8ab96b38a2530eacba5be717f52e04601eb59326.tar.gz",
       "hash": "12wkl04apgag0p5njw8mczzlbxqf5h08k61qciwy10n4q1harzvz"
     },
-    "yanky.nvim": {
+    "yanky-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",

From fd8e97a2ff4088fd428056eaceaafab799e7aeda Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 11 Feb 2025 22:04:59 +0300
Subject: [PATCH 179/202] visuals/cellular-automaton: fix npins name incompat

---
 modules/plugins/visuals/cellular-automaton/config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/visuals/cellular-automaton/config.nix b/modules/plugins/visuals/cellular-automaton/config.nix
index 2c0c4669..10c305b3 100644
--- a/modules/plugins/visuals/cellular-automaton/config.nix
+++ b/modules/plugins/visuals/cellular-automaton/config.nix
@@ -13,7 +13,7 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["cellular-automaton"];
+      startPlugins = ["cellular-automaton-nvim"];
 
       maps.normal = mkBinding cfg.mappings.makeItRain "<cmd>CellularAutomaton make_it_rain<CR>" "Make it rain";
 

From dad18b322618310c1c62e9411fced2e20d11de7d Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 11 Feb 2025 22:06:10 +0300
Subject: [PATCH 180/202] assistant/chatgpt: fix npins name incompat

---
 modules/plugins/assistant/chatgpt/config.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/plugins/assistant/chatgpt/config.nix b/modules/plugins/assistant/chatgpt/config.nix
index 3caa221f..95a36acf 100644
--- a/modules/plugins/assistant/chatgpt/config.nix
+++ b/modules/plugins/assistant/chatgpt/config.nix
@@ -30,17 +30,19 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = [
-        "chatgpt"
-      ];
+      startPlugins = ["chatgpt-nvim"];
+
       pluginRC.chagpt = entryAnywhere ''
         require("chatgpt").setup(${toLuaObject cfg.setupOpts})
       '';
-      maps.normal = mkMerge [
-        (mkSetBinding mappings.chatGpt "<cmd>ChatGPT<CR>")
-        maps
-      ];
-      maps.visual = maps;
+
+      maps = {
+        visual = maps;
+        normal = mkMerge [
+          (mkSetBinding mappings.chatGpt "<cmd>ChatGPT<CR>")
+          maps
+        ];
+      };
     };
   };
 }

From f62de17141c251a6c055c8d3160e9ae0547314ed Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 11 Feb 2025 22:07:47 +0300
Subject: [PATCH 181/202] languages/csharp: fix npins name incompat

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

diff --git a/modules/plugins/languages/csharp.nix b/modules/plugins/languages/csharp.nix
index 5011c5cc..af7f36e0 100644
--- a/modules/plugins/languages/csharp.nix
+++ b/modules/plugins/languages/csharp.nix
@@ -75,8 +75,8 @@
   };
 
   extraServerPlugins = {
-    omnisharp = ["omnisharp-extended"];
-    csharp_ls = ["csharpls-extended"];
+    omnisharp = ["omnisharp-extended-lsp-nvim"];
+    csharp_ls = ["csharpls-extended-lsp-nvim"];
   };
 
   cfg = config.vim.languages.csharp;

From 6538fadb655dee5f4d78faf5b3f83a384bebd093 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 11 Feb 2025 22:08:29 +0300
Subject: [PATCH 182/202] languages/elixir: fix npins name incompat

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

diff --git a/modules/plugins/languages/elixir.nix b/modules/plugins/languages/elixir.nix
index 145746a7..f8f338b1 100644
--- a/modules/plugins/languages/elixir.nix
+++ b/modules/plugins/languages/elixir.nix
@@ -112,7 +112,7 @@ in {
     })
 
     (mkIf cfg.elixir-tools.enable {
-      vim.startPlugins = ["elixir-tools"];
+      vim.startPlugins = ["elixir-tools-nvim"];
       vim.pluginRC.elixir-tools = entryAnywhere ''
         local elixir = require("elixir")
         local elixirls = require("elixir.elixirls")

From d221c4b49a86df8b057c85831fe972d1f3c9532c Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 11 Feb 2025 22:13:58 +0300
Subject: [PATCH 183/202] session/nvim-session-manager: fix npins name incompat

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

diff --git a/modules/plugins/session/nvim-session-manager/config.nix b/modules/plugins/session/nvim-session-manager/config.nix
index 5d345c71..3585b715 100644
--- a/modules/plugins/session/nvim-session-manager/config.nix
+++ b/modules/plugins/session/nvim-session-manager/config.nix
@@ -15,7 +15,7 @@ in {
     vim = {
       startPlugins =
         [
-          "nvim-session-manager"
+          "neovim-session-manager"
           "plenary-nvim"
         ]
         ++ optionals cfg.usePicker ["dressing-nvim"];

From 678598167ca8ef169fac31d52b4b1f2b001d5646 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 11 Feb 2025 22:17:12 +0300
Subject: [PATCH 184/202] notes/orgmode: fix npins name incompat

---
 modules/plugins/notes/orgmode/config.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/plugins/notes/orgmode/config.nix b/modules/plugins/notes/orgmode/config.nix
index 36e08088..3f1b7eaf 100644
--- a/modules/plugins/notes/orgmode/config.nix
+++ b/modules/plugins/notes/orgmode/config.nix
@@ -13,9 +13,7 @@ in {
   config = mkIf cfg.enable (mkMerge [
     {
       vim = {
-        startPlugins = [
-          "orgmode-nvim"
-        ];
+        startPlugins = ["orgmode"];
 
         binds.whichKey.register = pushDownDefault {
           "<leader>o" = "+Notes";

From 033a47a7d619fcb403a1f045c5a8abeff5fdf661 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 11 Feb 2025 22:17:27 +0300
Subject: [PATCH 185/202] visuals/tiny-deviocns-auto-colors: fix npins name
 incompat

---
 modules/plugins/visuals/tiny-devicons-auto-colors/config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/visuals/tiny-devicons-auto-colors/config.nix b/modules/plugins/visuals/tiny-devicons-auto-colors/config.nix
index a7fd3752..5b2102ce 100644
--- a/modules/plugins/visuals/tiny-devicons-auto-colors/config.nix
+++ b/modules/plugins/visuals/tiny-devicons-auto-colors/config.nix
@@ -11,7 +11,7 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["tiny-devicons-auto-colors" "nvim-web-devicons"];
+      startPlugins = ["tiny-devicons-auto-colors-nvim" "nvim-web-devicons"];
 
       pluginRC.tiny-devicons-auto-colors = entryAnywhere ''
         require("tiny-devicons-auto-colors").setup(${toLuaObject cfg.setupOpts})

From c96f5f0d8c1c1a96a442319f468857f1bc6b75e6 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 11 Feb 2025 22:18:38 +0300
Subject: [PATCH 186/202] languages/ts: fix npins name incompat

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

diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix
index 50e6d91c..c9070554 100644
--- a/modules/plugins/languages/ts.nix
+++ b/modules/plugins/languages/ts.nix
@@ -230,7 +230,7 @@ in {
 
     # Extensions
     (mkIf cfg.extensions."ts-error-translator".enable {
-      vim.startPlugins = ["ts-error-translator"];
+      vim.startPlugins = ["ts-error-translator-nvim"];
       vim.pluginRC.ts-error-translator = entryAnywhere ''
         require("ts-error-translator").setup(${toLuaObject cfg.extensions.ts-error-translator.setupOpts})
       '';

From 80a4ab903ca4fdf573d37095fbb72d09d804be27 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 12 Feb 2025 14:36:06 +0300
Subject: [PATCH 187/202] flake: use npins for blink-cmp source

---
 flake.lock                         | 17 -----------------
 flake.nix                          |  5 -----
 flake/legacyPackages.nix           | 23 +++++++++++++++++------
 flake/legacyPackages/blink-cmp.nix |  8 ++++----
 npins/sources.json                 | 15 +++++++++++++++
 5 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9221f43f..c1cda841 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,21 +1,5 @@
 {
   "nodes": {
-    "blink-cmp": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739129359,
-        "narHash": "sha256-nUrXXiJ7NRxS21H53U323lwEKdo08Y011l8XskXC/vw=",
-        "owner": "saghen",
-        "repo": "blink.cmp",
-        "rev": "b2485c76cb7877de6fe9c8670af59ba3d72fd74d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "saghen",
-        "repo": "blink.cmp",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -137,7 +121,6 @@
     },
     "root": {
       "inputs": {
-        "blink-cmp": "blink-cmp",
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
         "mnw": "mnw",
diff --git a/flake.nix b/flake.nix
index 1c559bd7..acef6382 100644
--- a/flake.nix
+++ b/flake.nix
@@ -98,10 +98,5 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
-
-    blink-cmp = {
-      url = "github:saghen/blink.cmp";
-      flake = false;
-    };
   };
 }
diff --git a/flake/legacyPackages.nix b/flake/legacyPackages.nix
index d5b5aacd..33aee0e3 100644
--- a/flake/legacyPackages.nix
+++ b/flake/legacyPackages.nix
@@ -1,4 +1,8 @@
-{inputs, ...}: {
+{
+  inputs,
+  self,
+  ...
+}: {
   perSystem = {
     system,
     inputs',
@@ -9,14 +13,21 @@
       overlays = [
         inputs.self.overlays.default
 
-        (final: _: {
+        (final: prev: {
           # Build nil from source to get most recent
           # features as they are added.
           nil = inputs'.nil.packages.default;
-          blink-cmp = final.callPackage ./legacyPackages/blink-cmp.nix {
-            src = inputs.blink-cmp;
-            version = inputs.blink-cmp.shortRev or inputs.blink-cmp.shortDirtyRev or "dirty";
-          };
+          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
index 002269b9..924cb4cc 100644
--- a/flake/legacyPackages/blink-cmp.nix
+++ b/flake/legacyPackages/blink-cmp.nix
@@ -10,16 +10,16 @@
     pname = "blink-fuzzy-lib";
     inherit version src;
 
-    env = {
-      # TODO: remove this if plugin stops using nightly rust
-      RUSTC_BOOTSTRAP = true;
-    };
+    # TODO: remove this if plugin stops using nightly rust
+    env.RUSTC_BOOTSTRAP = true;
+
     nativeBuildInputs = [git];
     cargoLock = {
       lockFile = "${src}/Cargo.lock";
       allowBuiltinFetchGit = true;
     };
   };
+
   libExt =
     if hostPlatform.isDarwin
     then "dylib"
diff --git a/npins/sources.json b/npins/sources.json
index 929da85c..2bcda9ea 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -36,6 +36,21 @@
       "url": "https://github.com/rrethy/base16-nvim/archive/6ac181b5733518040a33017dde654059cd771b7c.tar.gz",
       "hash": "0q47jbh6abn2hql9ghi9ayx3l8pdrdcdrnf4qfk7cp0v1bl7y48r"
     },
+    "blink-cmp": {
+      "type": "GitRelease",
+      "repository": {
+        "type": "GitHub",
+        "owner": "saghen",
+        "repo": "blink.cmp"
+      },
+      "pre_releases": false,
+      "version_upper_bound": null,
+      "release_prefix": null,
+      "version": "v0.11.0",
+      "revision": "7a70199efe4e333a3693ba3e56ddbec3b9c9c330",
+      "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v0.11.0",
+      "hash": "1j3sj03i72iw5npwwksc7w7axv8z0nbgi11adkfng9ak73kn1gdq"
+    },
     "blink-compat": {
       "type": "Git",
       "repository": {

From 6e7e91fc111218917d67b9ee44f718633bddac33 Mon Sep 17 00:00:00 2001
From: Hamburgir <shantnuprofid@gmail.com>
Date: Wed, 12 Feb 2025 17:24:22 +0530
Subject: [PATCH 188/202] languages/flutter: update package name to match pin
 (#630)

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

diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix
index e2b3182e..4f8a7028 100644
--- a/modules/plugins/languages/dart.nix
+++ b/modules/plugins/languages/dart.nix
@@ -137,7 +137,7 @@ in {
       vim.startPlugins =
         if ftcfg.enableNoResolvePatch
         then ["flutter-tools-patched"]
-        else ["flutter-tools"];
+        else ["flutter-tools-nvim"];
 
       vim.pluginRC.flutter-tools = entryAnywhere ''
         require('flutter-tools').setup {

From 63c032cf87c083717acb86b5d2e388f776cdff12 Mon Sep 17 00:00:00 2001
From: Gerg-L <88247690+Gerg-L@users.noreply.github.com>
Date: Thu, 13 Feb 2025 03:18:02 +0000
Subject: [PATCH 189/202] flake: fix using blink-cmp package (#632)

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

diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix
index 64734f3b..1f14b3a6 100644
--- a/modules/wrapper/build/config.nix
+++ b/modules/wrapper/build/config.nix
@@ -59,7 +59,7 @@
         "flutter-tools.dev_tools"
       ];
     };
-    inherit (pkgs) blink-cmp;
+    inherit (inputs.self.legacyPackages.${pkgs.stdenv.system}) blink-cmp;
   };
 
   buildConfigPlugins = plugins:

From 9b200831281d1c338fc81afaea2516793da3f2f5 Mon Sep 17 00:00:00 2001
From: Ian Allaway <66171552+harmanhobbit@users.noreply.github.com>
Date: Thu, 13 Feb 2025 04:38:51 +0000
Subject: [PATCH 190/202] nvim-surround: fix typo in description (#631)

Removed extra 'e' from the word upstream in description

Co-authored-by: raf <raf@notashelf.dev>
---
 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 d74966af..96ff5efb 100644
--- a/modules/plugins/utility/surround/surround.nix
+++ b/modules/plugins/utility/surround/surround.nix
@@ -38,7 +38,7 @@ in {
       default = false;
       description = ''
         nvim-surround: add/change/delete surrounding delimiter pairs with ease.
-        Note that the default mappings deviate from upstreeam to avoid conflicts
+        Note that the default mappings deviate from upstream to avoid conflicts
         with nvim-leap.
       '';
     };

From e49228d642b82d6e840fe9b041c4b05d267d0b58 Mon Sep 17 00:00:00 2001
From: Alfarel <alfarelcynthesis@proton.me>
Date: Thu, 13 Feb 2025 15:17:13 +0000
Subject: [PATCH 191/202] npins: add conform-nvim, nvim-lint (#634)

---
 npins/sources.json | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/npins/sources.json b/npins/sources.json
index 2bcda9ea..9bd3f725 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -231,6 +231,18 @@
       "url": "https://github.com/numToStr/Comment.nvim/archive/e30b7f2008e52442154b66f7c519bfd2f1e32acb.tar.gz",
       "hash": "0dyz78j0kj3j99y5g8wncl7794g6z2qs05gfg9ddxaa4xswhyjc7"
     },
+    "conform-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "stevearc",
+        "repo": "conform.nvim"
+      },
+      "branch": "master",
+      "revision": "363243c03102a531a8203311d4f2ae704c620d9b",
+      "url": "https://github.com/stevearc/conform.nvim/archive/363243c03102a531a8203311d4f2ae704c620d9b.tar.gz",
+      "hash": "1lf7a5b30g37ys9f4z9gq68ymzfzsw7bwzqp1bb91cx9df1bdyck"
+    },
     "copilot-cmp": {
       "type": "Git",
       "repository": {
@@ -1406,6 +1418,18 @@
       "url": "https://github.com/kosayoda/nvim-lightbulb/archive/3ac0791be37ba9cc7939f1ad90ebc5e75abf4eea.tar.gz",
       "hash": "0qc1rl45ykh9552dx5fmhdg0ncfsk2vpcmj5i7hrmdzgkd2f0avg"
     },
+    "nvim-lint": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "mfussenegger",
+        "repo": "nvim-lint"
+      },
+      "branch": "master",
+      "revision": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8",
+      "url": "https://github.com/mfussenegger/nvim-lint/archive/6e9dd545a1af204c4022a8fcd99727ea41ffdcc8.tar.gz",
+      "hash": "0b318dahzf9kd043mjsa41rj44zfbs7k8i4bz0rqhcqipr19rwhk"
+    },
     "nvim-lspconfig": {
       "type": "Git",
       "repository": {

From a86df770c137a95bfff1648555a498119ed3d076 Mon Sep 17 00:00:00 2001
From: Ben Mayer <90480641+Libadoxon@users.noreply.github.com>
Date: Fri, 14 Feb 2025 12:57:21 +0100
Subject: [PATCH 192/202] plugins/git: add git-conflict-nvim (#637)

* plugins/git: add git-conflict-nvim; modularize

* plugins/git: build git-conflict-nvim ourselves
---
 docs/release-notes/rl-0.8.md                  |  4 ++
 modules/plugins/git/default.nix               |  2 +
 modules/plugins/git/git-conflict/config.nix   | 40 +++++++++++++++++++
 modules/plugins/git/git-conflict/default.nix  |  6 +++
 .../plugins/git/git-conflict/git-conflict.nix | 23 +++++++++++
 npins/sources.json                            | 14 ++++++-
 6 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 modules/plugins/git/git-conflict/config.nix
 create mode 100644 modules/plugins/git/git-conflict/default.nix
 create mode 100644 modules/plugins/git/git-conflict/git-conflict.nix

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 5ff8c5f2..c9b4892a 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -162,3 +162,7 @@
 [Mr-Helpful](https://github.com/Mr-Helpful)
 
 - Corrects pin names used for nvim themes
+
+[Libadoxon](https://github.com/Libadoxon)
+
+- Add [git-conflict](https://github.com/akinsho/git-conflict.nvim) plugin for resolving git conflicts
diff --git a/modules/plugins/git/default.nix b/modules/plugins/git/default.nix
index 525cbcf7..6ed92217 100644
--- a/modules/plugins/git/default.nix
+++ b/modules/plugins/git/default.nix
@@ -4,6 +4,7 @@ in {
   imports = [
     ./gitsigns
     ./vim-fugitive
+    ./git-conflict
   ];
 
   options.vim.git = {
@@ -13,6 +14,7 @@ in {
       Enabling this option will enable the following plugins:
       * gitsigns
       * vim-fugitive
+      * git-conflict
     '';
   };
 }
diff --git a/modules/plugins/git/git-conflict/config.nix b/modules/plugins/git/git-conflict/config.nix
new file mode 100644
index 00000000..bc9905d6
--- /dev/null
+++ b/modules/plugins/git/git-conflict/config.nix
@@ -0,0 +1,40 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.nvim.binds) addDescriptionsToMappings mkSetBinding;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.lua) toLuaObject;
+
+  cfg = config.vim.git.git-conflict;
+
+  self = import ./git-conflict.nix {inherit lib config;};
+  gcMappingDefinitions = self.options.vim.git.git-conflict.mappings;
+
+  gcMappings = addDescriptionsToMappings cfg.mappings gcMappingDefinitions;
+in {
+  config = mkIf cfg.enable (mkMerge [
+    {
+      vim = {
+        startPlugins = ["git-conflict-nvim"];
+
+        maps = {
+          normal = mkMerge [
+            (mkSetBinding gcMappings.ours "<Plug>(git-conflict-ours)")
+            (mkSetBinding gcMappings.theirs "<Plug>(git-conflict-theirs)")
+            (mkSetBinding gcMappings.both "<Plug>(git-conflict-both)")
+            (mkSetBinding gcMappings.none "<Plug>(git-conflict-none)")
+            (mkSetBinding gcMappings.prevConflict "<Plug>(git-conflict-prev-conflict)")
+            (mkSetBinding gcMappings.nextConflict "<Plug>(git-conflict-next-conflict)")
+          ];
+        };
+
+        pluginRC.git-conflict = entryAnywhere ''
+          require('git-conflict').setup(${toLuaObject ({default_mappings = false;} // cfg.setupOpts)})
+        '';
+      };
+    }
+  ]);
+}
diff --git a/modules/plugins/git/git-conflict/default.nix b/modules/plugins/git/git-conflict/default.nix
new file mode 100644
index 00000000..89093a72
--- /dev/null
+++ b/modules/plugins/git/git-conflict/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./config.nix
+    ./git-conflict.nix
+  ];
+}
diff --git a/modules/plugins/git/git-conflict/git-conflict.nix b/modules/plugins/git/git-conflict/git-conflict.nix
new file mode 100644
index 00000000..bffb926c
--- /dev/null
+++ b/modules/plugins/git/git-conflict/git-conflict.nix
@@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.binds) mkMappingOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.git.git-conflict = {
+    enable = mkEnableOption "git-conflict" // {default = config.vim.git.enable;};
+    setupOpts = mkPluginSetupOption "git-conflict" {};
+
+    mappings = {
+      ours = mkMappingOption "Choose Ours [Git-Conflict]" "co";
+      theirs = mkMappingOption "Choose Theirs [Git-Conflict]" "ct";
+      both = mkMappingOption "Choose Both [Git-Conflict]" "cb";
+      none = mkMappingOption "Choose None [Git-Conflict]" "c0";
+      prevConflict = mkMappingOption "Go to the previous Conflict [Git-Conflict]" "]x";
+      nextConflict = mkMappingOption "Go to the next Conflict [Git-Conflict]" "[x";
+    };
+  };
+}
diff --git a/npins/sources.json b/npins/sources.json
index 9bd3f725..82eb60d4 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -423,6 +423,18 @@
       "url": "https://github.com/notomo/gesture.nvim/archive/dbd839bda337cb73911aeef06897eb29cb99f76f.tar.gz",
       "hash": "1cqiahc52xh113l8lgpz3k852vvqkv2srj9shdkyya76a2v2sf9d"
     },
+    "git-conflict-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "akinsho",
+        "repo": "git-conflict.nvim"
+      },
+      "branch": "main",
+      "revision": "a1badcd070d176172940eb55d9d59029dad1c5a6",
+      "url": "https://github.com/akinsho/git-conflict.nvim/archive/a1badcd070d176172940eb55d9d59029dad1c5a6.tar.gz",
+      "hash": "05rnwhm1fmg3yb7j2xc9nmw262jc687qxhwabn97qarrk2da0r0a"
+    },
     "gitsigns-nvim": {
       "type": "Git",
       "repository": {
@@ -2044,4 +2056,4 @@
     }
   },
   "version": 3
-}
+}
\ No newline at end of file

From 4196be3ac8d374450314f8595f30d0b86accba11 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 14 Feb 2025 14:59:52 +0300
Subject: [PATCH 193/202] ci: get rid of magic-nix-cache

---
 .github/workflows/check-docs.yml   | 3 +--
 .github/workflows/check.yml        | 2 --
 .github/workflows/docs-preview.yml | 1 -
 .github/workflows/editorconfig.yml | 1 -
 .github/workflows/manual.yml       | 1 -
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/check-docs.yml b/.github/workflows/check-docs.yml
index b543c813..4d133ecd 100644
--- a/.github/workflows/check-docs.yml
+++ b/.github/workflows/check-docs.yml
@@ -21,7 +21,6 @@ jobs:
     steps:
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Checkout
         uses: actions/checkout@v4
@@ -42,13 +41,13 @@ jobs:
         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
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 8101b8b1..7a7677eb 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -19,7 +19,6 @@ jobs:
 
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Check Flake
         run: nix flake check
@@ -33,6 +32,5 @@ jobs:
 
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - run: nix run nixpkgs#alejandra -- -c .
diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml
index e6d2e662..f8f45d05 100644
--- a/.github/workflows/docs-preview.yml
+++ b/.github/workflows/docs-preview.yml
@@ -26,7 +26,6 @@ jobs:
     steps:
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml
index d411c89f..3d8ca360 100644
--- a/.github/workflows/editorconfig.yml
+++ b/.github/workflows/editorconfig.yml
@@ -30,7 +30,6 @@ jobs:
 
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Checking EditorConfig
         shell: bash
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
index 5b66c8a6..1c8ab746 100644
--- a/.github/workflows/manual.yml
+++ b/.github/workflows/manual.yml
@@ -45,7 +45,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.7
       - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
       - run: |
           nix build .#docs -Lv
           cp -r result/share/doc/nvf public

From 06444754089517680da5cdef6008b920e30c1f30 Mon Sep 17 00:00:00 2001
From: ARCIII <88923299+ArmandoCIII@users.noreply.github.com>
Date: Sun, 16 Feb 2025 03:10:32 -0500
Subject: [PATCH 194/202] utility/leetcode-nvim: init (#636)

* utility/leetcode-nvim: init

* utility/leetcode.nvim: Clean Code

Cleaned code upon PR review comments
---
 configuration.nix                             |  1 +
 docs/release-notes/rl-0.8.md                  |  4 +
 modules/plugins/utility/default.nix           |  1 +
 .../plugins/utility/leetcode-nvim/config.nix  | 26 +++++++
 .../plugins/utility/leetcode-nvim/default.nix |  6 ++
 .../utility/leetcode-nvim/leetcode-nvim.nix   | 74 +++++++++++++++++++
 npins/sources.json                            | 12 +++
 7 files changed, 124 insertions(+)
 create mode 100644 modules/plugins/utility/leetcode-nvim/config.nix
 create mode 100644 modules/plugins/utility/leetcode-nvim/default.nix
 create mode 100644 modules/plugins/utility/leetcode-nvim/leetcode-nvim.nix

diff --git a/configuration.nix b/configuration.nix
index 15138a2b..c7b0f288 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -177,6 +177,7 @@ isMaximal: {
       surround.enable = isMaximal;
       diffview-nvim.enable = true;
       yanky-nvim.enable = false;
+      leetcode-nvim.enable = isMaximal;
       motion = {
         hop.enable = true;
         leap.enable = true;
diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index c9b4892a..621e976f 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -143,8 +143,12 @@
 
 [ARCIII](https://github.com/ArmandoCIII):
 
+[leetcode.nvim]: https://github.com/kawre/leetcode.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`.
+
 
 [nezia1](https://github.com/nezia1)
 
diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix
index 65ef8680..372a4f53 100644
--- a/modules/plugins/utility/default.nix
+++ b/modules/plugins/utility/default.nix
@@ -15,5 +15,6 @@
     ./telescope
     ./wakatime
     ./yanky-nvim
+    ./leetcode-nvim
   ];
 }
diff --git a/modules/plugins/utility/leetcode-nvim/config.nix b/modules/plugins/utility/leetcode-nvim/config.nix
new file mode 100644
index 00000000..be002727
--- /dev/null
+++ b/modules/plugins/utility/leetcode-nvim/config.nix
@@ -0,0 +1,26 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+
+  cfg = config.vim.utility.leetcode-nvim;
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      startPlugins = [
+        "leetcode-nvim"
+        "plenary-nvim"
+        "fzf-lua"
+        "nui-nvim"
+      ];
+
+      lazy.plugins.leetcode-nvim = {
+        package = "leetcode-nvim";
+        setupModule = "leetcode";
+        inherit (cfg) setupOpts;
+      };
+    };
+  };
+}
diff --git a/modules/plugins/utility/leetcode-nvim/default.nix b/modules/plugins/utility/leetcode-nvim/default.nix
new file mode 100644
index 00000000..4dffd9f8
--- /dev/null
+++ b/modules/plugins/utility/leetcode-nvim/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./leetcode-nvim.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/utility/leetcode-nvim/leetcode-nvim.nix b/modules/plugins/utility/leetcode-nvim/leetcode-nvim.nix
new file mode 100644
index 00000000..f71da02a
--- /dev/null
+++ b/modules/plugins/utility/leetcode-nvim/leetcode-nvim.nix
@@ -0,0 +1,74 @@
+{lib, ...}: let
+  inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.types) enum str bool;
+  inherit (lib.generators) mkLuaInline;
+  inherit (lib.nvim.types) mkPluginSetupOption luaInline;
+in {
+  options.vim.utility = {
+    leetcode-nvim = {
+      enable = mkEnableOption "complementary neovim plugin for leetcode.nvim";
+
+      setupOpts = mkPluginSetupOption "leetcode-nvim" {
+        logging = mkEnableOption "logging for leetcode.nvim status notifications." // {default = true;};
+        image_support = mkEnableOption "question description images using image.nvim (image-nvim must be enabled).";
+
+        lang = mkOption {
+          type = enum [
+            "cpp"
+            "java"
+            "python"
+            "python3"
+            "c"
+            "csharp"
+            "javascript"
+            "typescript"
+            "php"
+            "swift"
+            "kotlin"
+            "dart"
+            "golang"
+            "ruby"
+            "scala"
+            "rust"
+            "racket"
+            "erlang"
+            "elixir"
+            "bash"
+          ];
+          default = "python3";
+          description = "Language to start your session with";
+        };
+
+        arg = mkOption {
+          type = str;
+          default = "leetcode.nvim";
+          description = "Argument for Neovim";
+        };
+
+        cn = {
+          enabled = mkEnableOption "leetcode.cn instead of leetcode.com";
+          translator = mkEnableOption "translator" // {default = true;};
+          translate_problems = mkEnableOption "translation for problem questions" // {default = true;};
+        };
+
+        storage = {
+          home = mkOption {
+            type = luaInline;
+            default = mkLuaInline "vim.fn.stdpath(\"data\") .. \"/leetcode\"";
+            description = "Home storage directory";
+          };
+
+          cache = mkOption {
+            type = luaInline;
+            default = mkLuaInline "vim.fn.stdpath(\"cache\") .. \"/leetcode\"";
+            description = "Cache storage directory";
+          };
+        };
+
+        plugins = {
+          non_standalone = mkEnableOption "leetcode.nvim in a non-standalone mode";
+        };
+      };
+    };
+  };
+}
diff --git a/npins/sources.json b/npins/sources.json
index 82eb60d4..d6fb562f 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -567,6 +567,18 @@
       "url": "https://github.com/ggandor/leap.nvim/archive/c6bfb191f1161fbabace1f36f578a20ac6c7642c.tar.gz",
       "hash": "1dmy45czi3irjd5qb74yamjam4d1lvqsgfxgh4vaj740b19gyl1w"
     },
+    "leetcode-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "kawre",
+        "repo": "leetcode.nvim"
+      },
+      "branch": "master",
+      "revision": "db7e1cd6b9191b34b4c1f2f96e4e3949cde9f951",
+      "url": "https://github.com/kawre/leetcode.nvim/archive/db7e1cd6b9191b34b4c1f2f96e4e3949cde9f951.tar.gz",
+      "hash": "1d3lb7625b2qdzqm74mzrac66rxqc0qgjd3mb37l4v8wqyiyv6pp"
+    },
     "lsp-lines": {
       "type": "Git",
       "repository": {

From 72ae20dc3dd2a7d78a8cdc2e24cc4c3ac178f104 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <59727193+horriblename@users.noreply.github.com>
Date: Sun, 16 Feb 2025 12:35:13 +0100
Subject: [PATCH 195/202] blink: fix missing inputs.self in HM and NixOS
 modules (#644)

* home-manager: fix missing inputs.self

some options in nvf module uses inputs.self but it's not exposed in the
inputs we pass to home-manager module:

example flake.nix:

```
{
	inputs = { /* ... */ };
	outputs = {nixpkgs, ...}@inputs: {
		testing = {
			a = inputs.self             # valid
			b = inputs.self.inputs      # valid
			c = inputs.self.inputs.self # does not exist

			# prior to this change, inputs.self.inputs was passed to the hm
			# module, which lacks the self attr
			#
			# This change passes in the "top-level" inputs instead.
		};
	};
}
```

* nixos: fix missing inputs.self

see previous commit for details
---
 flake.nix                      | 4 ++--
 flake/modules/home-manager.nix | 6 +++---
 flake/modules/nixos.nix        | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index acef6382..30b71f80 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,7 +33,7 @@
         };
 
         homeManagerModules = {
-          nvf = import ./flake/modules/home-manager.nix {inherit lib self;};
+          nvf = import ./flake/modules/home-manager.nix {inherit lib inputs;};
           default = self.homeManagerModules.nvf;
           neovim-flake =
             lib.warn ''
@@ -44,7 +44,7 @@
         };
 
         nixosModules = {
-          nvf = import ./flake/modules/nixos.nix {inherit lib self;};
+          nvf = import ./flake/modules/nixos.nix {inherit lib inputs;};
           default = self.nixosModules.nvf;
           neovim-flake =
             lib.warn ''
diff --git a/flake/modules/home-manager.nix b/flake/modules/home-manager.nix
index 715f7537..3b75e49a 100644
--- a/flake/modules/home-manager.nix
+++ b/flake/modules/home-manager.nix
@@ -1,13 +1,13 @@
 # Home Manager module
 {
-  self,
+  inputs,
   lib,
 }: {
   config,
   pkgs,
   ...
 }: let
-  inherit (self) packages inputs;
+  inherit (inputs.self) packages;
   inherit (lib) maintainers;
   inherit (lib.modules) mkIf mkAliasOptionModule;
   inherit (lib.lists) optional;
@@ -19,7 +19,7 @@
   nvfModule = submoduleWith {
     description = "Nvf module";
     class = "nvf";
-    specialArgs = {
+    specialArgs = lib.trace (builtins.attrNames inputs) {
       inherit pkgs lib inputs;
     };
     modules = import ../../modules/modules.nix {inherit pkgs lib;};
diff --git a/flake/modules/nixos.nix b/flake/modules/nixos.nix
index ecc173a1..8f95a12a 100644
--- a/flake/modules/nixos.nix
+++ b/flake/modules/nixos.nix
@@ -1,13 +1,13 @@
 # NixOS module
 {
-  self,
+  inputs,
   lib,
 }: {
   config,
   pkgs,
   ...
 }: let
-  inherit (self) inputs packages;
+  inherit (inputs.self) packages;
   inherit (lib) maintainers;
   inherit (lib.modules) mkIf mkOverride mkAliasOptionModule;
   inherit (lib.lists) optional;

From 14ca70e490e34f6e45fcfaf0510493cc042a750a Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 16 Feb 2025 13:13:35 +0100
Subject: [PATCH 196/202] home-manager: forgot to remove trace

---
 flake/modules/home-manager.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake/modules/home-manager.nix b/flake/modules/home-manager.nix
index 3b75e49a..f305558b 100644
--- a/flake/modules/home-manager.nix
+++ b/flake/modules/home-manager.nix
@@ -19,7 +19,7 @@
   nvfModule = submoduleWith {
     description = "Nvf module";
     class = "nvf";
-    specialArgs = lib.trace (builtins.attrNames inputs) {
+    specialArgs = {
       inherit pkgs lib inputs;
     };
     modules = import ../../modules/modules.nix {inherit pkgs lib;};

From e42bcbe1ecb3392ecd8a7638edf991b9628f4d55 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 17 Feb 2025 03:17:48 +0300
Subject: [PATCH 197/202] lsp/lspsaga: fix npins name incompat

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

diff --git a/modules/plugins/lsp/lspsaga/config.nix b/modules/plugins/lsp/lspsaga/config.nix
index 66050877..3af6b7f1 100644
--- a/modules/plugins/lsp/lspsaga/config.nix
+++ b/modules/plugins/lsp/lspsaga/config.nix
@@ -16,7 +16,7 @@
 in {
   config = mkIf (cfg.enable && cfg.lspsaga.enable) {
     vim = {
-      startPlugins = ["lspsaga"];
+      startPlugins = ["lspsaga-nvim"];
 
       maps = {
         visual = mkSetLuaBinding mappings.codeAction "require('lspsaga.codeaction').range_code_action";

From 54476b5a8bea713eb0480b4f3a66478cc15ef813 Mon Sep 17 00:00:00 2001
From: Ben Mayer <90480641+Libadoxon@users.noreply.github.com>
Date: Thu, 20 Feb 2025 17:50:26 +0100
Subject: [PATCH 198/202] languages/go: add gofmt, golines and gofumpt
 formatter (#654)

---
 docs/release-notes/rl-0.8.md     |  1 +
 modules/plugins/languages/go.nix | 58 ++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 621e976f..63be2209 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -170,3 +170,4 @@
 [Libadoxon](https://github.com/Libadoxon)
 
 - Add [git-conflict](https://github.com/akinsho/git-conflict.nvim) plugin for resolving git conflicts
+- Add formatters for go: [gofmt](https://go.dev/blog/gofmt), [golines](https://github.com/segmentio/golines) and [gofumpt](https://github.com/mvdan/gofumpt)
diff --git a/modules/plugins/languages/go.nix b/modules/plugins/languages/go.nix
index e0eded0d..3ac9ae77 100644
--- a/modules/plugins/languages/go.nix
+++ b/modules/plugins/languages/go.nix
@@ -34,6 +34,43 @@
     };
   };
 
+  defaultFormat = "gofmt";
+  formats = {
+    gofmt = {
+      package = pkgs.go;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.gofmt.with({
+            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",
+          })
+        )
+      '';
+    };
+    golines = {
+      package = pkgs.golines;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.golines.with({
+            command = "${cfg.format.package}/bin/golines",
+          })
+        )
+      '';
+    };
+  };
+
   defaultDebugger = "delve";
   debuggers = {
     delve = {
@@ -67,6 +104,22 @@ in {
       };
     };
 
+    format = {
+      enable = mkEnableOption "Go formatting" // {default = config.vim.languages.enableFormat;};
+
+      type = mkOption {
+        description = "Go formatter to use";
+        type = enum (attrNames formats);
+        default = defaultFormat;
+      };
+
+      package = mkOption {
+        description = "Go formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
+      };
+    };
+
     dap = {
       enable = mkOption {
         description = "Enable Go Debug Adapter via nvim-dap-go plugin";
@@ -99,6 +152,11 @@ in {
       vim.lsp.lspconfig.sources.go-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
+    (mkIf cfg.format.enable {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources.go-format = formats.${cfg.format.type}.nullConfig;
+    })
+
     (mkIf cfg.dap.enable {
       vim = {
         startPlugins = ["nvim-dap-go"];

From 4aac51ec19fef16703bc6f3c27f2482071025b12 Mon Sep 17 00:00:00 2001
From: MaxMur <31189199+TheMaxMur@users.noreply.github.com>
Date: Fri, 21 Feb 2025 16:29:45 +0300
Subject: [PATCH 199/202] languages/flutter: Update pin name for match (#658)

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

diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix
index 1f14b3a6..d145f798 100644
--- a/modules/wrapper/build/config.nix
+++ b/modules/wrapper/build/config.nix
@@ -45,7 +45,7 @@
   pluginBuilders = {
     nvim-treesitter = buildTreesitterPlug config.vim.treesitter.grammars;
     flutter-tools-patched = buildPlug {
-      pname = "flutter-tools";
+      pname = "flutter-tools-nvim";
       patches = [./patches/flutter-tools.patch];
 
       # Disable failing require check hook checks

From 5fbc72d697e53c8d4ff3cb8b7bbc60b6c96ffd02 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <59727193+horriblename@users.noreply.github.com>
Date: Fri, 21 Feb 2025 14:44:05 +0100
Subject: [PATCH 200/202] git/git-conflict: avoid shadowing builtin keybinds
 (#651)

* git/git-conflict: avoid shadowing builtin keybinds

* docs: update release notes

---------

Co-authored-by: raf <me@notashelf.dev>
---
 docs/release-notes/rl-0.8.md                      | 5 +++++
 modules/plugins/git/git-conflict/git-conflict.nix | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 63be2209..93e93e8d 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -1,5 +1,10 @@
 # Release 0.8 {#sec-release-0.8}
 
+## Breaking changes
+
+- `git-conflict` keybinds are now prefixed with `<leader>` to avoid conflicting
+  with builtins
+
 [NotAShelf](https://github.com/notashelf):
 
 [typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim
diff --git a/modules/plugins/git/git-conflict/git-conflict.nix b/modules/plugins/git/git-conflict/git-conflict.nix
index bffb926c..44ab79c5 100644
--- a/modules/plugins/git/git-conflict/git-conflict.nix
+++ b/modules/plugins/git/git-conflict/git-conflict.nix
@@ -12,10 +12,10 @@ in {
     setupOpts = mkPluginSetupOption "git-conflict" {};
 
     mappings = {
-      ours = mkMappingOption "Choose Ours [Git-Conflict]" "co";
-      theirs = mkMappingOption "Choose Theirs [Git-Conflict]" "ct";
-      both = mkMappingOption "Choose Both [Git-Conflict]" "cb";
-      none = mkMappingOption "Choose None [Git-Conflict]" "c0";
+      ours = mkMappingOption "Choose Ours [Git-Conflict]" "<leader>co";
+      theirs = mkMappingOption "Choose Theirs [Git-Conflict]" "<leader>ct";
+      both = mkMappingOption "Choose Both [Git-Conflict]" "<leader>cb";
+      none = mkMappingOption "Choose None [Git-Conflict]" "<leader>c0";
       prevConflict = mkMappingOption "Go to the previous Conflict [Git-Conflict]" "]x";
       nextConflict = mkMappingOption "Go to the next Conflict [Git-Conflict]" "[x";
     };

From b9941583fdf452566d5694eb8106a19202ec3f62 Mon Sep 17 00:00:00 2001
From: Joe Hanson <joe@veri.dev>
Date: Sat, 22 Feb 2025 10:41:38 -0600
Subject: [PATCH 201/202] utility/multicursors-nvim: init #610)

* feat: add multicursors-nvim plugin

multicursors-nvim with hydra dependency and static config.

* add most used default options

* add more descriptions and refine

* disable debug mode

* maximal by default

* add multicursors addition to changelog

* Update modules/plugins/hydra/hydra.nix

place hydra plugin in utility folder

Co-authored-by: raf <raf@notashelf.dev>

* clean up hydra config and implementation

* mention hydra dependency addition

* update to using npins instead of flake based additions.

---------

Co-authored-by: raf <raf@notashelf.dev>
Co-authored-by: raf <me@notashelf.dev>
---
 configuration.nix                             |   2 +-
 docs/release-notes/rl-0.8.md                  |   6 +
 modules/plugins/hydra/config.nix              |  22 +++
 modules/plugins/hydra/default.nix             |   6 +
 modules/plugins/hydra/hydra.nix               |   7 +
 modules/plugins/utility/default.nix           |   1 +
 .../plugins/utility/multicursors/config.nix   |  36 +++++
 .../plugins/utility/multicursors/default.nix  |   6 +
 .../utility/multicursors/multicursors.nix     | 126 ++++++++++++++++++
 npins/sources.json                            |  30 +++++
 10 files changed, 241 insertions(+), 1 deletion(-)
 create mode 100644 modules/plugins/hydra/config.nix
 create mode 100644 modules/plugins/hydra/default.nix
 create mode 100644 modules/plugins/hydra/hydra.nix
 create mode 100644 modules/plugins/utility/multicursors/config.nix
 create mode 100644 modules/plugins/utility/multicursors/default.nix
 create mode 100644 modules/plugins/utility/multicursors/multicursors.nix

diff --git a/configuration.nix b/configuration.nix
index c7b0f288..35dffca5 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -183,7 +183,7 @@ isMaximal: {
         leap.enable = true;
         precognition.enable = isMaximal;
       };
-
+      multicursors.enable = isMaximal;
       images = {
         image-nvim.enable = false;
       };
diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 93e93e8d..a5a791d8 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -159,6 +159,12 @@
 
 - Add support for [nixd](https://github.com/nix-community/nixd) language server.
 
+[jahanson](https://github.com/jahanson):
+
+- Add [multicursors.nvim](https://github.com/smoka7/multicursors.nvim) to
+  available plugins, under `vim.utility.multicursors`.
+- Add [hydra.nvim](https://github.com/nvimtools/hydra.nvim) as dependency for
+  `multicursors.nvim` and lazy loads by default.
 [folospior](https://github.com/folospior)
 
 - Fix plugin name for lsp/lspkind.
diff --git a/modules/plugins/hydra/config.nix b/modules/plugins/hydra/config.nix
new file mode 100644
index 00000000..bc5b2de8
--- /dev/null
+++ b/modules/plugins/hydra/config.nix
@@ -0,0 +1,22 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  cfg = config.vim.hydra;
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      startPlugins = [];
+      lazy.plugins.hydra = {
+        package = "hydra.nvim";
+        setupModule = "hydra";
+        inherit (cfg) setupOpts;
+
+        event = ["DeferredUIEnter"];
+        cmd = ["MCstart" "MCvisual" "MCclear" "MCpattern" "MCvisualPattern" "MCunderCursor"];
+      };
+    };
+  };
+}
diff --git a/modules/plugins/hydra/default.nix b/modules/plugins/hydra/default.nix
new file mode 100644
index 00000000..d35f4d7c
--- /dev/null
+++ b/modules/plugins/hydra/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./hydra.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/hydra/hydra.nix b/modules/plugins/hydra/hydra.nix
new file mode 100644
index 00000000..59287a7b
--- /dev/null
+++ b/modules/plugins/hydra/hydra.nix
@@ -0,0 +1,7 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
+in {
+  options.vim.utility.hydra = {
+    enable = mkEnableOption "utility for creating custom submodes and menus [nvimtools/hydra.nvim]";
+  };
+}
diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix
index 372a4f53..4abb4515 100644
--- a/modules/plugins/utility/default.nix
+++ b/modules/plugins/utility/default.nix
@@ -8,6 +8,7 @@
     ./icon-picker
     ./images
     ./motion
+    ./multicursors
     ./new-file-template
     ./outline
     ./preview
diff --git a/modules/plugins/utility/multicursors/config.nix b/modules/plugins/utility/multicursors/config.nix
new file mode 100644
index 00000000..8eaa3e28
--- /dev/null
+++ b/modules/plugins/utility/multicursors/config.nix
@@ -0,0 +1,36 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  cfg = config.vim.utility.multicursors;
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      startPlugins = ["hydra-nvim"];
+      lazy.plugins."multicursors-nvim" = {
+        package = "multicursors-nvim";
+        setupModule = "multicursors";
+        inherit (cfg) setupOpts;
+
+        event = ["DeferredUIEnter"];
+        cmd = ["MCstart" "MCvisual" "MCclear" "MCpattern" "MCvisualPattern" "MCunderCursor"];
+        keys = [
+          {
+            mode = ["v" "n"];
+            key = "<leader>mcs";
+            action = ":MCstart<cr>";
+            desc = "Create a selection for selected text or word under the cursor [multicursors.nvim]";
+          }
+          {
+            mode = ["v" "n"];
+            key = "<leader>mcp";
+            action = ":MCpattern<cr>";
+            desc = "Create a selection for pattern entered [multicursors.nvim]";
+          }
+        ];
+      };
+    };
+  };
+}
diff --git a/modules/plugins/utility/multicursors/default.nix b/modules/plugins/utility/multicursors/default.nix
new file mode 100644
index 00000000..a1ddac8e
--- /dev/null
+++ b/modules/plugins/utility/multicursors/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./multicursors.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/utility/multicursors/multicursors.nix b/modules/plugins/utility/multicursors/multicursors.nix
new file mode 100644
index 00000000..d533b8a9
--- /dev/null
+++ b/modules/plugins/utility/multicursors/multicursors.nix
@@ -0,0 +1,126 @@
+{lib, ...}: let
+  inherit (lib.types) bool int str;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+  inherit (lib.options) mkOption mkEnableOption;
+  hintConfig = {lib, ...}: {
+    options = {
+      float_opts = mkOption {
+        description = "The options for the floating hint window";
+        type = lib.types.submodule {
+          options = {
+            border = mkOption {
+              type = lib.types.str;
+              default = "none";
+              description = "The border style for the hint window";
+            };
+          };
+        };
+      };
+      position = mkOption {
+        type = lib.types.str;
+        default = "bottom";
+        description = "The position of the hint window";
+      };
+    };
+  };
+  generateHints = {lib, ...}: {
+    options = {
+      normal = mkOption {
+        type = lib.types.bool;
+        description = "Generate hints for the normal mode";
+        default = true;
+      };
+      insert = mkOption {
+        type = lib.types.bool;
+        description = "Generate hints for the insert mode";
+        default = true;
+      };
+      extend = mkOption {
+        type = lib.types.bool;
+        description = "Generate hints for the extend mode";
+        default = true;
+      };
+      config = mkOption {
+        description = "The configuration for generating hints for multicursors.nvim";
+        type = lib.types.submodule {
+          options = {
+            column_count = mkOption {
+              type = lib.types.nullOr int;
+              description = "The number of columns to use for the hint window";
+              default = null;
+            };
+            max_hint_length = mkOption {
+              type = int;
+              description = "The maximum length of the hint";
+              default = 25;
+            };
+          };
+        };
+        default = {
+          column_count = null;
+          max_hint_length = 25;
+        };
+      };
+    };
+  };
+in {
+  options.vim.utility.multicursors = {
+    enable = mkEnableOption "multicursors.nvim plugin (vscode like multiple cursors)";
+
+    setupOpts = mkPluginSetupOption "multicursors" {
+      DEBUG_MODE = mkOption {
+        type = bool;
+        default = false;
+        description = "Enable debug mode.";
+      };
+      create_commands = mkOption {
+        type = bool;
+        default = true;
+        description = "Create Multicursor user commands";
+      };
+      updatetime = mkOption {
+        type = int;
+        default = 50;
+        description = "The time in milliseconds to wait before updating the cursor in insert mode";
+      };
+      nowait = mkOption {
+        type = bool;
+        description = "Don't wait for the cursor to move before updating the cursor";
+        default = true;
+      };
+      mode_keys = mkOption {
+        type = lib.types.attrsOf str;
+        description = "The keys to use for each mode";
+        default = {
+          insert = "i";
+          append = "a";
+          change = "c";
+          extend = "e";
+        };
+      };
+      hint_config = mkOption {
+        type = lib.types.submodule hintConfig;
+        description = "The configuration for the hint window";
+        default = {
+          float_opts = {
+            border = "none";
+          };
+          position = "bottom";
+        };
+      };
+      generate_hints = mkOption {
+        type = lib.types.submodule generateHints;
+        description = "The configuration for generating hints";
+        default = {
+          normal = true;
+          insert = true;
+          extend = true;
+          config = {
+            column_count = null;
+            max_hint_length = 25;
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/npins/sources.json b/npins/sources.json
index d6fb562f..4bbaa056 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -507,6 +507,21 @@
       "url": "https://github.com/phaazon/hop.nvim/archive/1a1eceafe54b5081eae4cb91c723abd1d450f34b.tar.gz",
       "hash": "08h18cam2yr57qvfsnf1bra28vbl6013wlchnr5crb757xw8aysa"
     },
+    "hydra-nvim": {
+      "type": "GitRelease",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nvimtools",
+        "repo": "hydra.nvim"
+      },
+      "pre_releases": false,
+      "version_upper_bound": null,
+      "release_prefix": null,
+      "version": "v1.0.2",
+      "revision": "8578056a2226ed49fc608167edc143a87f75d809",
+      "url": "https://api.github.com/repos/nvimtools/hydra.nvim/tarball/v1.0.2",
+      "hash": "13f04pmqrfl65xx9bfkdak6ll57s94anaw7nqd0fm5hp50b7c6j3"
+    },
     "icon-picker-nvim": {
       "type": "Git",
       "repository": {
@@ -1202,6 +1217,21 @@
       "url": "https://github.com/mvllow/modes.nvim/archive/c7a4b1b383606832aab150902719bd5eb5cdb2b0.tar.gz",
       "hash": "1hy3ghscf8hfmg487p9b8cwd0y8nsi8j24kq2ir3vhd82gqhl4ja"
     },
+    "multicursors-nvim": {
+      "type": "GitRelease",
+      "repository": {
+        "type": "GitHub",
+        "owner": "smoka7",
+        "repo": "multicursors.nvim"
+      },
+      "pre_releases": false,
+      "version_upper_bound": null,
+      "release_prefix": null,
+      "version": "v2.0.0",
+      "revision": "782820896b1691ed664e4c24f1cd9793dcb33dfb",
+      "url": "https://api.github.com/repos/smoka7/multicursors.nvim/tarball/v2.0.0",
+      "hash": "171aysqsyapw434xkibxv69p5fkwha4addkqfdssdm0wq9n9cm4q"
+    },
     "neo-tree-nvim": {
       "type": "Git",
       "repository": {

From b248b5af59ffdfaf9f6fdd400a114f60718f0b31 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 22 Feb 2025 20:08:06 +0300
Subject: [PATCH 202/202] utility/multicursors: stylistic changes after #610

---
 configuration.nix                             |  7 +-
 .../utility/multicursors/multicursors.nix     | 68 +++++++++++--------
 2 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 35dffca5..692337db 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -173,17 +173,18 @@ isMaximal: {
     utility = {
       ccc.enable = false;
       vim-wakatime.enable = false;
-      icon-picker.enable = isMaximal;
-      surround.enable = isMaximal;
       diffview-nvim.enable = true;
       yanky-nvim.enable = false;
+      icon-picker.enable = isMaximal;
+      surround.enable = isMaximal;
       leetcode-nvim.enable = isMaximal;
+      multicursors.enable = isMaximal;
+
       motion = {
         hop.enable = true;
         leap.enable = true;
         precognition.enable = isMaximal;
       };
-      multicursors.enable = isMaximal;
       images = {
         image-nvim.enable = false;
       };
diff --git a/modules/plugins/utility/multicursors/multicursors.nix b/modules/plugins/utility/multicursors/multicursors.nix
index d533b8a9..5ba35daf 100644
--- a/modules/plugins/utility/multicursors/multicursors.nix
+++ b/modules/plugins/utility/multicursors/multicursors.nix
@@ -1,61 +1,69 @@
 {lib, ...}: let
-  inherit (lib.types) bool int str;
-  inherit (lib.nvim.types) mkPluginSetupOption;
   inherit (lib.options) mkOption mkEnableOption;
-  hintConfig = {lib, ...}: {
+  inherit (lib.types) attrsOf nullOr bool int str submodule;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+
+  hintConfig = {
     options = {
       float_opts = mkOption {
         description = "The options for the floating hint window";
-        type = lib.types.submodule {
+        type = submodule {
           options = {
             border = mkOption {
-              type = lib.types.str;
+              type = str;
               default = "none";
               description = "The border style for the hint window";
             };
           };
         };
       };
+
       position = mkOption {
-        type = lib.types.str;
+        type = str;
         default = "bottom";
         description = "The position of the hint window";
       };
     };
   };
-  generateHints = {lib, ...}: {
+
+  generateHints = {
     options = {
       normal = mkOption {
-        type = lib.types.bool;
+        type = bool;
+        default = true;
         description = "Generate hints for the normal mode";
-        default = true;
       };
+
       insert = mkOption {
-        type = lib.types.bool;
+        type = bool;
+        default = true;
         description = "Generate hints for the insert mode";
-        default = true;
       };
+
       extend = mkOption {
-        type = lib.types.bool;
-        description = "Generate hints for the extend mode";
+        type = bool;
         default = true;
+        description = "Generate hints for the extend mode";
       };
+
       config = mkOption {
         description = "The configuration for generating hints for multicursors.nvim";
-        type = lib.types.submodule {
+        type = submodule {
           options = {
             column_count = mkOption {
-              type = lib.types.nullOr int;
-              description = "The number of columns to use for the hint window";
+              type = nullOr int;
               default = null;
+              description = "The number of columns to use for the hint window";
             };
+
             max_hint_length = mkOption {
               type = int;
-              description = "The maximum length of the hint";
               default = 25;
+              description = "The maximum length of the hint";
             };
           };
         };
+
         default = {
           column_count = null;
           max_hint_length = 25;
@@ -65,7 +73,7 @@
   };
 in {
   options.vim.utility.multicursors = {
-    enable = mkEnableOption "multicursors.nvim plugin (vscode like multiple cursors)";
+    enable = mkEnableOption "vscode like multiple cursors [multicursor.nvim]";
 
     setupOpts = mkPluginSetupOption "multicursors" {
       DEBUG_MODE = mkOption {
@@ -73,44 +81,47 @@ in {
         default = false;
         description = "Enable debug mode.";
       };
+
       create_commands = mkOption {
         type = bool;
         default = true;
         description = "Create Multicursor user commands";
       };
+
       updatetime = mkOption {
         type = int;
         default = 50;
         description = "The time in milliseconds to wait before updating the cursor in insert mode";
       };
+
       nowait = mkOption {
         type = bool;
-        description = "Don't wait for the cursor to move before updating the cursor";
         default = true;
+        description = "Don't wait for the cursor to move before updating the cursor";
       };
+
       mode_keys = mkOption {
-        type = lib.types.attrsOf str;
-        description = "The keys to use for each mode";
+        type = attrsOf str;
         default = {
           insert = "i";
           append = "a";
           change = "c";
           extend = "e";
         };
+        description = "The keys to use for each mode";
       };
+
       hint_config = mkOption {
-        type = lib.types.submodule hintConfig;
-        description = "The configuration for the hint window";
+        type = submodule hintConfig;
         default = {
-          float_opts = {
-            border = "none";
-          };
+          float_opts.border = "none";
           position = "bottom";
         };
+        description = "The configuration for the hint window";
       };
+
       generate_hints = mkOption {
-        type = lib.types.submodule generateHints;
-        description = "The configuration for generating hints";
+        type = submodule generateHints;
         default = {
           normal = true;
           insert = true;
@@ -120,6 +131,7 @@ in {
             max_hint_length = 25;
           };
         };
+        description = "The configuration for generating hints";
       };
     };
   };