diff --git a/configuration.nix b/configuration.nix
index 424d7173..6f26f040 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -15,7 +15,6 @@ isMaximal: {
 
     spellcheck = {
       enable = true;
-      programmingWordlist.enable = isMaximal;
     };
 
     lsp = {
@@ -163,7 +162,6 @@ isMaximal: {
       enable = true;
       gitsigns.enable = true;
       gitsigns.codeActions.enable = false; # throws an annoying debug message
-      neogit.enable = isMaximal;
     };
 
     minimap = {
diff --git a/docs/manual/tips/pure-lua-config.md b/docs/manual/tips/pure-lua-config.md
index 1dca8296..eb8881e9 100644
--- a/docs/manual/tips/pure-lua-config.md
+++ b/docs/manual/tips/pure-lua-config.md
@@ -23,7 +23,7 @@ manner.
   # 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 = {
-    additionalRuntimePaths = [
+    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.
@@ -41,7 +41,7 @@ directory, and call it with [](#opt-vim.luaConfigRC).
 ```nix
 {pkgs, ...}: {
   vim = {
-    additionalRuntimePaths = [
+    additionalRuntimeDirectories = [
       # You can list more than one file here.
       ./nvim-custom-1
 
diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index f3ab8701..90db7b68 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -24,10 +24,6 @@
   module interface. You may set [](#opt-vim.clipboard.registers) appropriately
   to configure Neovim to use the system clipboard.
 
-- Changed which-key group used for gitsigns from `<leader>g` to `<leader>h` to
-  align with the "hunks" themed mapping and avoid conflict with the new [neogit]
-  group.
-
 [NotAShelf](https://github.com/notashelf):
 
 [typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim
@@ -437,12 +433,10 @@
 
 [solarized.nvim]: https://github.com/maxmx03/solarized.nvim
 [smart-splits.nvim]: https://github.com/mrjones2014/smart-splits.nvim
-[neogit]: https://github.com/NeogitOrg/neogit
 
 - Add [solarized.nvim] theme with support for multiple variants
+
 - Add [smart-splits.nvim] for navigating between Neovim windows and terminal multiplexer panes.
   Available at `vim.utility.smart-splits`.
-- Restore vim-dirtytalk plugin and fix ordering with spellcheck in generated config.
-- Fix lualine separator options
-- Add [neogit], an interactive and powerful Git interface for Neovim, inspired by Magit
-- Allow deregistering which-key binds or groups by setting them to `null`
\ No newline at end of file
+
+- Allow deregistering which-key binds or groups by setting them to `null`
diff --git a/flake.lock b/flake.lock
index fb0c5599..bd1dc28d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -51,6 +51,26 @@
         "type": "github"
       }
     },
+    "nil": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1750047244,
+        "narHash": "sha256-vluLARrk4485npdyHOj8XKr0yk6H22pNf+KVRNL+i/Y=",
+        "owner": "oxalica",
+        "repo": "nil",
+        "rev": "870a4b1b5f12004832206703ac15aa85c42c247b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "nil",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1750215678,
@@ -87,6 +107,7 @@
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
         "mnw": "mnw",
+        "nil": "nil",
         "nixpkgs": "nixpkgs",
         "systems": "systems_2"
       }
diff --git a/flake.nix b/flake.nix
index 16d4b0c7..12ace081 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,5 +82,12 @@
 
     # Alternate neovim-wrapper
     mnw.url = "github:Gerg-L/mnw";
+
+    ## Language servers (use master instead of nixpkgs)
+    # Nix LSP
+    nil = {
+      url = "github:oxalica/nil";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 }
diff --git a/flake/develop.nix b/flake/develop.nix
index aae9d92f..d92b8182 100644
--- a/flake/develop.nix
+++ b/flake/develop.nix
@@ -10,7 +10,7 @@
       default = self'.devShells.lsp;
       nvim-nix = pkgs.mkShellNoCC {packages = [config.packages.nix];};
       lsp = pkgs.mkShellNoCC {
-        packages = with pkgs; [nil statix deadnix alejandra npins];
+        packages = with pkgs; [inputs'.nil.packages.default statix deadnix alejandra npins];
       };
     };
 
diff --git a/lib/lua.nix b/lib/lua.nix
index 4106a4c2..e3f94498 100644
--- a/lib/lua.nix
+++ b/lib/lua.nix
@@ -2,7 +2,7 @@
 {lib}: let
   inherit (builtins) hasAttr head throw typeOf isList isAttrs isBool isInt isString isPath isFloat toJSON;
   inherit (lib.attrsets) mapAttrsToList filterAttrs;
-  inherit (lib.strings) concatStringsSep concatMapStringsSep stringToCharacters;
+  inherit (lib.strings) concatStringsSep concatMapStringsSep stringToCharacters concatLines;
   inherit (lib.trivial) boolToString warn;
 in rec {
   # Convert a null value to lua's nil
diff --git a/lib/stdlib-extended.nix b/lib/stdlib-extended.nix
index 403c7b28..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, ...} @ args:
+{
+  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
diff --git a/modules/modules.nix b/modules/modules.nix
index 1eca042a..97bfa211 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -38,7 +38,7 @@
       "runner"
       "session"
       "snippets"
-      "spellcheck"
+      # "spellcheck" # FIXME: see neovim/init/spellcheck.nix
       "statusline"
       "tabline"
       "terminal"
diff --git a/modules/neovim/init/clipboard.nix b/modules/neovim/init/clipboard.nix
index 132079b4..011effaf 100644
--- a/modules/neovim/init/clipboard.nix
+++ b/modules/neovim/init/clipboard.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.options) mkOption mkEnableOption mkPackageOption;
-  inherit (lib.types) str submodule;
+  inherit (lib.types) nullOr either str listOf submodule;
   inherit (lib.attrsets) mapAttrs mapAttrsToList filterAttrs;
   cfg = config.vim.clipboard;
 in {
@@ -20,7 +20,7 @@ in {
         '';
 
         registers = mkOption {
-          type = str;
+          type = either str (listOf str);
           default = "";
           example = "unnamedplus";
           description = ''
@@ -33,8 +33,8 @@ in {
             `"+"` ({command}`:h quoteplus`) instead of register `"*"` for all yank, delete,
             change and put operations which would normally go to the unnamed register.
 
-            When `unnamed` and `unnamedplus` is included simultaneously as `"unnamed,unnamedplus"`,
-            yank and delete operations (but not put) will additionally copy the text into register `"*"`.
+            When `unnamed` and `unnamedplus` is included simultaneously yank and delete
+            operations (but not put) will additionally copy the text into register `"*"`.
 
             Please see  {command}`:h clipboard` for more details.
 
diff --git a/modules/neovim/init/diagnostics.nix b/modules/neovim/init/diagnostics.nix
index 8a8e7b38..18717edf 100644
--- a/modules/neovim/init/diagnostics.nix
+++ b/modules/neovim/init/diagnostics.nix
@@ -57,21 +57,14 @@
       signs = mkOption {
         type = diagnosticType;
         default = false;
-        example = literalExpression ''
-          signs.text = lib.generators.mkLuaInline '''
-            {
-              [vim.diagnostic.severity.ERROR] = "󰅚 ",
-              [vim.diagnostic.severity.WARN] = "󰀪 ",
-            }
-          ''';
-        '';
+        example = {
+          signs.text = {
+            "vim.diagnostic.severity.ERROR" = "󰅚 ";
+            "vim.diagnostic.severity.WARN" = "󰀪 ";
+          };
+        };
         description = ''
           Use signs for diagnostics. See {command}`:help diagnostic-signs`.
-
-          :::{.note}
-          The code presented in that example section uses Lua expressions as object keys which
-          only translate well if you use `lib.generators.mkLuaInline` as in the example.
-          :::
         '';
       };
 
diff --git a/modules/neovim/init/spellcheck.nix b/modules/neovim/init/spellcheck.nix
index 5c593a65..fb0f86ea 100644
--- a/modules/neovim/init/spellcheck.nix
+++ b/modules/neovim/init/spellcheck.nix
@@ -94,8 +94,6 @@ in {
       Enabling this option will unconditionally set
       {option}`vim.spellcheck.enable` to true as vim-dirtytalk
       depends on spellchecking having been set up.
-
-      Run {command}`:DirtytalkUpdate` on first use to download the spellfile.
       :::
     '';
   };
diff --git a/modules/neovim/mappings/config.nix b/modules/neovim/mappings/config.nix
index a62a6ca2..230df030 100644
--- a/modules/neovim/mappings/config.nix
+++ b/modules/neovim/mappings/config.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.modules) mkMerge;
+  inherit (lib.modules) mkIf mkMerge;
   inherit (lib.trivial) pipe;
   inherit (lib.attrsets) mapAttrsToList;
   inherit (lib.lists) flatten;
diff --git a/modules/plugins/assistant/copilot/config.nix b/modules/plugins/assistant/copilot/config.nix
index 39b0d0ff..525fe3bd 100644
--- a/modules/plugins/assistant/copilot/config.nix
+++ b/modules/plugins/assistant/copilot/config.nix
@@ -5,6 +5,7 @@
 }: let
   inherit (builtins) toJSON;
   inherit (lib.modules) mkIf;
+  inherit (lib.strings) optionalString;
 
   cfg = config.vim.assistant.copilot;
 
diff --git a/modules/plugins/completion/blink-cmp/blink-cmp.nix b/modules/plugins/completion/blink-cmp/blink-cmp.nix
index d07c777e..d9e9945b 100644
--- a/modules/plugins/completion/blink-cmp/blink-cmp.nix
+++ b/modules/plugins/completion/blink-cmp/blink-cmp.nix
@@ -1,6 +1,7 @@
 {lib, ...}: let
   inherit (lib.options) mkEnableOption mkOption literalMD;
   inherit (lib.types) bool listOf str either attrsOf submodule enum anything int nullOr;
+  inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.types) mkPluginSetupOption luaInline pluginType;
   inherit (lib.nvim.binds) mkMappingOption;
   inherit (lib.nvim.config) mkBool;
diff --git a/modules/plugins/completion/nvim-cmp/config.nix b/modules/plugins/completion/nvim-cmp/config.nix
index 9cceb0b7..749ebb7c 100644
--- a/modules/plugins/completion/nvim-cmp/config.nix
+++ b/modules/plugins/completion/nvim-cmp/config.nix
@@ -3,10 +3,11 @@
   config,
   ...
 }: let
-  inherit (lib.modules) mkIf;
+  inherit (lib.modules) mkIf mkMerge;
   inherit (lib.strings) optionalString;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.lua) toLuaObject;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
   inherit (builtins) attrNames typeOf tryEval concatStringsSep;
 
   borders = config.vim.ui.borders.plugins.nvim-cmp;
diff --git a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
index 4391a144..2c8c77d3 100644
--- a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
+++ b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
@@ -3,7 +3,7 @@
   config,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption literalMD;
+  inherit (lib.options) mkEnableOption mkOption literalExpression literalMD;
   inherit (lib.types) str attrsOf nullOr either listOf;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.binds) mkMappingOption;
diff --git a/modules/plugins/dashboard/alpha/config.nix b/modules/plugins/dashboard/alpha/config.nix
index 7a29bd0b..804189b9 100644
--- a/modules/plugins/dashboard/alpha/config.nix
+++ b/modules/plugins/dashboard/alpha/config.nix
@@ -4,6 +4,7 @@
   ...
 }: let
   inherit (lib.modules) mkIf;
+  inherit (lib.nvim.dag) entryAnywhere;
   inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.dashboard.alpha;
diff --git a/modules/plugins/git/default.nix b/modules/plugins/git/default.nix
index 5b30b74a..06c80f35 100644
--- a/modules/plugins/git/default.nix
+++ b/modules/plugins/git/default.nix
@@ -6,7 +6,6 @@ in {
     ./vim-fugitive
     ./git-conflict
     ./gitlinker-nvim
-    ./neogit
   ];
 
   options.vim.git = {
diff --git a/modules/plugins/git/gitsigns/config.nix b/modules/plugins/git/gitsigns/config.nix
index e89eebcf..f5d9f910 100644
--- a/modules/plugins/git/gitsigns/config.nix
+++ b/modules/plugins/git/gitsigns/config.nix
@@ -69,7 +69,7 @@ in {
         };
 
         binds.whichKey.register = pushDownDefault {
-          "<leader>h" = "+Gitsigns";
+          "<leader>g" = "+Gitsigns";
         };
 
         pluginRC.gitsigns = entryAnywhere ''
diff --git a/modules/plugins/git/neogit/config.nix b/modules/plugins/git/neogit/config.nix
deleted file mode 100644
index 20928857..00000000
--- a/modules/plugins/git/neogit/config.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  options,
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib.modules) mkIf;
-  inherit (lib.nvim.binds) pushDownDefault mkKeymap;
-
-  cfg = config.vim.git.neogit;
-
-  keys = cfg.mappings;
-  inherit (options.vim.git.neogit) mappings;
-in {
-  config = mkIf cfg.enable {
-    vim = {
-      startPlugins = ["plenary-nvim"];
-
-      lazy.plugins.neogit = {
-        package = "neogit";
-        setupModule = "neogit";
-        inherit (cfg) setupOpts;
-
-        cmd = ["Neogit"];
-
-        keys = [
-          (mkKeymap "n" keys.open "<Cmd>Neogit<CR>" {desc = mappings.open.description;})
-          (mkKeymap "n" keys.commit "<Cmd>Neogit commit<CR>" {desc = mappings.commit.description;})
-          (mkKeymap "n" keys.pull "<Cmd>Neogit pull<CR>" {desc = mappings.pull.description;})
-          (mkKeymap "n" keys.push "<Cmd>Neogit push<CR>" {desc = mappings.push.description;})
-        ];
-      };
-
-      binds.whichKey.register = pushDownDefault {
-        "<leader>g" = "+Git";
-      };
-    };
-  };
-}
diff --git a/modules/plugins/git/neogit/default.nix b/modules/plugins/git/neogit/default.nix
deleted file mode 100644
index d3f82759..00000000
--- a/modules/plugins/git/neogit/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./config.nix
-    ./neogit.nix
-  ];
-}
diff --git a/modules/plugins/git/neogit/neogit.nix b/modules/plugins/git/neogit/neogit.nix
deleted file mode 100644
index fa988a32..00000000
--- a/modules/plugins/git/neogit/neogit.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{lib, ...}: let
-  inherit (lib.options) mkEnableOption;
-  inherit (lib.nvim.binds) mkMappingOption;
-  inherit (lib.nvim.types) mkPluginSetupOption;
-in {
-  options.vim.git.neogit = {
-    enable = mkEnableOption "An Interactive and powerful Git interface [Neogit]";
-    setupOpts = mkPluginSetupOption "neogit" {};
-
-    mappings = {
-      open = mkMappingOption "Git Status [Neogit]" "<leader>gs";
-      commit = mkMappingOption "Git Commit [Neogit]" "<leader>gc";
-      pull = mkMappingOption "Git pull [Neogit]" "<leader>gp";
-      push = mkMappingOption "Git push [Neogit]" "<leader>gP";
-    };
-  };
-}
diff --git a/modules/plugins/languages/astro.nix b/modules/plugins/languages/astro.nix
index 21b6e5a3..e1ae8f9d 100644
--- a/modules/plugins/languages/astro.nix
+++ b/modules/plugins/languages/astro.nix
@@ -10,6 +10,7 @@
   inherit (lib.lists) isList;
   inherit (lib.meta) getExe;
   inherit (lib.types) enum either listOf package str;
+  inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.types) mkGrammarOption diagnostics;
 
diff --git a/modules/plugins/languages/bash.nix b/modules/plugins/languages/bash.nix
index 9a5e3e13..e02596cf 100644
--- a/modules/plugins/languages/bash.nix
+++ b/modules/plugins/languages/bash.nix
@@ -66,7 +66,7 @@ in {
 
       package = mkOption {
         description = "bash-language-server package, or the command to run as a list of strings";
-        example = literalExpression ''[lib.getExe pkgs.bash-language-server "start"]'';
+        example = literalExpression ''[lib.getExe pkgs.nodePackages.bash-language-server "start"]'';
         type = either package (listOf str);
         default = pkgs.bash-language-server;
       };
diff --git a/modules/plugins/languages/nim.nix b/modules/plugins/languages/nim.nix
index 6e5885e2..d9a29e37 100644
--- a/modules/plugins/languages/nim.nix
+++ b/modules/plugins/languages/nim.nix
@@ -6,6 +6,7 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.types) enum either listOf package str;
diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix
index 83022adf..aceee70d 100644
--- a/modules/plugins/languages/nix.nix
+++ b/modules/plugins/languages/nix.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   lib,
+  inputs,
   ...
 }: let
   inherit (builtins) attrNames;
@@ -27,7 +28,7 @@
     else ''{"${package}/bin/${defaultCmd}"}'';
   servers = {
     nil = {
-      package = pkgs.nil;
+      package = inputs.nil.packages.${pkgs.stdenv.system}.nil;
       internalFormatter = true;
       lspConfig = ''
         lspconfig.nil_ls.setup{
diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix
index 4cc9ffe9..4eb84176 100644
--- a/modules/plugins/languages/svelte.nix
+++ b/modules/plugins/languages/svelte.nix
@@ -9,6 +9,7 @@
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.meta) getExe;
+  inherit (lib.generators) mkLuaInline;
   inherit (lib.types) enum either listOf package str;
   inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.types) mkGrammarOption diagnostics;
@@ -18,7 +19,7 @@
   defaultServer = "svelte";
   servers = {
     svelte = {
-      package = pkgs.svelte-language-server;
+      package = pkgs.nodePackages.svelte-language-server;
       lspConfig = ''
         lspconfig.svelte.setup {
           capabilities = capabilities;
diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix
index 6064da98..2939e2f3 100644
--- a/modules/plugins/languages/ts.nix
+++ b/modules/plugins/languages/ts.nix
@@ -9,6 +9,7 @@
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.meta) getExe;
+  inherit (lib.generators) mkLuaInline;
   inherit (lib.types) enum either listOf package str bool;
   inherit (lib.nvim.lua) expToLua toLuaObject;
   inherit (lib.nvim.types) mkGrammarOption diagnostics mkPluginSetupOption;
diff --git a/modules/plugins/languages/yaml.nix b/modules/plugins/languages/yaml.nix
index a75a921f..7a1a4552 100644
--- a/modules/plugins/languages/yaml.nix
+++ b/modules/plugins/languages/yaml.nix
@@ -28,7 +28,7 @@
   defaultServer = "yaml-language-server";
   servers = {
     yaml-language-server = {
-      package = pkgs.yaml-language-server;
+      package = pkgs.nodePackages.yaml-language-server;
       lspConfig = ''
 
 
diff --git a/modules/plugins/mini/ai/ai.nix b/modules/plugins/mini/ai/ai.nix
index d4c43941..d0da31d7 100644
--- a/modules/plugins/mini/ai/ai.nix
+++ b/modules/plugins/mini/ai/ai.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/align/align.nix b/modules/plugins/mini/align/align.nix
index 56a68c1f..96c82947 100644
--- a/modules/plugins/mini/align/align.nix
+++ b/modules/plugins/mini/align/align.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/animate/animate.nix b/modules/plugins/mini/animate/animate.nix
index d35f7461..fb17c0bd 100644
--- a/modules/plugins/mini/animate/animate.nix
+++ b/modules/plugins/mini/animate/animate.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/basics/basics.nix b/modules/plugins/mini/basics/basics.nix
index 9bac3b1c..e855caa6 100644
--- a/modules/plugins/mini/basics/basics.nix
+++ b/modules/plugins/mini/basics/basics.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/bracketed/bracketed.nix b/modules/plugins/mini/bracketed/bracketed.nix
index 454328e9..3152f046 100644
--- a/modules/plugins/mini/bracketed/bracketed.nix
+++ b/modules/plugins/mini/bracketed/bracketed.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/bufremove/bufremove.nix b/modules/plugins/mini/bufremove/bufremove.nix
index 82819df9..5e04609d 100644
--- a/modules/plugins/mini/bufremove/bufremove.nix
+++ b/modules/plugins/mini/bufremove/bufremove.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/clue/clue.nix b/modules/plugins/mini/clue/clue.nix
index 825aa697..50d33c65 100644
--- a/modules/plugins/mini/clue/clue.nix
+++ b/modules/plugins/mini/clue/clue.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/colors/colors.nix b/modules/plugins/mini/colors/colors.nix
index b65c86aa..7d56cd49 100644
--- a/modules/plugins/mini/colors/colors.nix
+++ b/modules/plugins/mini/colors/colors.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
 in {
   options.vim.mini.colors = {
diff --git a/modules/plugins/mini/comment/comment.nix b/modules/plugins/mini/comment/comment.nix
index e3e03833..c46c0a58 100644
--- a/modules/plugins/mini/comment/comment.nix
+++ b/modules/plugins/mini/comment/comment.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/completion/completion.nix b/modules/plugins/mini/completion/completion.nix
index 7c70e5e2..fc36ed84 100644
--- a/modules/plugins/mini/completion/completion.nix
+++ b/modules/plugins/mini/completion/completion.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/diff/diff.nix b/modules/plugins/mini/diff/diff.nix
index 9df564a4..4a72fda2 100644
--- a/modules/plugins/mini/diff/diff.nix
+++ b/modules/plugins/mini/diff/diff.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/doc/doc.nix b/modules/plugins/mini/doc/doc.nix
index 2b302475..8699fa11 100644
--- a/modules/plugins/mini/doc/doc.nix
+++ b/modules/plugins/mini/doc/doc.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/extra/extra.nix b/modules/plugins/mini/extra/extra.nix
index f0c4133e..c697fdd6 100644
--- a/modules/plugins/mini/extra/extra.nix
+++ b/modules/plugins/mini/extra/extra.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
 in {
   options.vim.mini.extra = {
diff --git a/modules/plugins/mini/files/files.nix b/modules/plugins/mini/files/files.nix
index 80d68589..4ba5fcc4 100644
--- a/modules/plugins/mini/files/files.nix
+++ b/modules/plugins/mini/files/files.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/fuzzy/fuzzy.nix b/modules/plugins/mini/fuzzy/fuzzy.nix
index 64a3f42f..977a1763 100644
--- a/modules/plugins/mini/fuzzy/fuzzy.nix
+++ b/modules/plugins/mini/fuzzy/fuzzy.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/git/git.nix b/modules/plugins/mini/git/git.nix
index 6c64bbf7..ebbf4282 100644
--- a/modules/plugins/mini/git/git.nix
+++ b/modules/plugins/mini/git/git.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/hipatterns/hipatterns.nix b/modules/plugins/mini/hipatterns/hipatterns.nix
index 943ad9e5..019626cf 100644
--- a/modules/plugins/mini/hipatterns/hipatterns.nix
+++ b/modules/plugins/mini/hipatterns/hipatterns.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/hues/hues.nix b/modules/plugins/mini/hues/hues.nix
index 060d0eca..13de5116 100644
--- a/modules/plugins/mini/hues/hues.nix
+++ b/modules/plugins/mini/hues/hues.nix
@@ -1,5 +1,10 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.strings) hasPrefix;
   inherit (lib.nvim.types) mkPluginSetupOption;
   inherit (lib.nvim.types) hexColor;
 in {
diff --git a/modules/plugins/mini/icons/icons.nix b/modules/plugins/mini/icons/icons.nix
index 4f201cc1..27928a93 100644
--- a/modules/plugins/mini/icons/icons.nix
+++ b/modules/plugins/mini/icons/icons.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/jump/jump.nix b/modules/plugins/mini/jump/jump.nix
index 5a6b0d08..1e16ae7a 100644
--- a/modules/plugins/mini/jump/jump.nix
+++ b/modules/plugins/mini/jump/jump.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/jump2d/jump2d.nix b/modules/plugins/mini/jump2d/jump2d.nix
index f1e76570..59f7c2ba 100644
--- a/modules/plugins/mini/jump2d/jump2d.nix
+++ b/modules/plugins/mini/jump2d/jump2d.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/map/map.nix b/modules/plugins/mini/map/map.nix
index 31735d08..2d42fe70 100644
--- a/modules/plugins/mini/map/map.nix
+++ b/modules/plugins/mini/map/map.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/misc/misc.nix b/modules/plugins/mini/misc/misc.nix
index 4e82dd6f..1f4dcf55 100644
--- a/modules/plugins/mini/misc/misc.nix
+++ b/modules/plugins/mini/misc/misc.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/move/move.nix b/modules/plugins/mini/move/move.nix
index 4e598126..ec9eccac 100644
--- a/modules/plugins/mini/move/move.nix
+++ b/modules/plugins/mini/move/move.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/operators/operators.nix b/modules/plugins/mini/operators/operators.nix
index 1401e939..639229bf 100644
--- a/modules/plugins/mini/operators/operators.nix
+++ b/modules/plugins/mini/operators/operators.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/pairs/pairs.nix b/modules/plugins/mini/pairs/pairs.nix
index da599cc5..926c93d3 100644
--- a/modules/plugins/mini/pairs/pairs.nix
+++ b/modules/plugins/mini/pairs/pairs.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/pick/pick.nix b/modules/plugins/mini/pick/pick.nix
index 159d007b..d8ccbfd5 100644
--- a/modules/plugins/mini/pick/pick.nix
+++ b/modules/plugins/mini/pick/pick.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/sessions/sessions.nix b/modules/plugins/mini/sessions/sessions.nix
index 61f235a8..0ceba595 100644
--- a/modules/plugins/mini/sessions/sessions.nix
+++ b/modules/plugins/mini/sessions/sessions.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/snippets/snippets.nix b/modules/plugins/mini/snippets/snippets.nix
index 05109e87..d7f0355c 100644
--- a/modules/plugins/mini/snippets/snippets.nix
+++ b/modules/plugins/mini/snippets/snippets.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/splitjoin/splitjoin.nix b/modules/plugins/mini/splitjoin/splitjoin.nix
index b553bbb3..44b2f23f 100644
--- a/modules/plugins/mini/splitjoin/splitjoin.nix
+++ b/modules/plugins/mini/splitjoin/splitjoin.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/starter/starter.nix b/modules/plugins/mini/starter/starter.nix
index d0041382..df550857 100644
--- a/modules/plugins/mini/starter/starter.nix
+++ b/modules/plugins/mini/starter/starter.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/statusline/statusline.nix b/modules/plugins/mini/statusline/statusline.nix
index 23f43af1..2c850ae1 100644
--- a/modules/plugins/mini/statusline/statusline.nix
+++ b/modules/plugins/mini/statusline/statusline.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/surround/surround.nix b/modules/plugins/mini/surround/surround.nix
index 537293a8..726bf3f9 100644
--- a/modules/plugins/mini/surround/surround.nix
+++ b/modules/plugins/mini/surround/surround.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/tabline/tabline.nix b/modules/plugins/mini/tabline/tabline.nix
index ae924e27..936273db 100644
--- a/modules/plugins/mini/tabline/tabline.nix
+++ b/modules/plugins/mini/tabline/tabline.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/test/test.nix b/modules/plugins/mini/test/test.nix
index f6ca5f51..28135a26 100644
--- a/modules/plugins/mini/test/test.nix
+++ b/modules/plugins/mini/test/test.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/trailspace/trailspace.nix b/modules/plugins/mini/trailspace/trailspace.nix
index 5d540d41..19757bfb 100644
--- a/modules/plugins/mini/trailspace/trailspace.nix
+++ b/modules/plugins/mini/trailspace/trailspace.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/mini/visits/visits.nix b/modules/plugins/mini/visits/visits.nix
index 5f9c6c1f..c01e8ebf 100644
--- a/modules/plugins/mini/visits/visits.nix
+++ b/modules/plugins/mini/visits/visits.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/modules/plugins/spellcheck/vim-dirtytalk/config.nix b/modules/plugins/spellcheck/vim-dirtytalk/config.nix
index 7fd32d61..51ccfb81 100644
--- a/modules/plugins/spellcheck/vim-dirtytalk/config.nix
+++ b/modules/plugins/spellcheck/vim-dirtytalk/config.nix
@@ -17,7 +17,7 @@ in {
       # like to append programming to spelllangs as soon as
       # possible while the plugin is enabled and the state
       # directory can be found.
-      luaConfigRC.vim-dirtytalk = entryAfter ["spellcheck"] ''
+      pluginRC.vim-dirtytalk = entryAfter ["spellcheck"] ''
         -- If Neovim can find (or access) the state directory
         -- then append "programming" wordlist from vim-dirtytalk
         -- to spelllang table. If path cannot be found, display
diff --git a/modules/plugins/statusline/lualine/config.nix b/modules/plugins/statusline/lualine/config.nix
index 010b6cd2..89dcbbe5 100644
--- a/modules/plugins/statusline/lualine/config.nix
+++ b/modules/plugins/statusline/lualine/config.nix
@@ -63,8 +63,8 @@ in {
           options = {
             icons_enabled = mkDefault cfg.icons.enable;
             theme = mkDefault cfg.theme;
-            component_separators = mkDefault cfg.componentSeparator;
-            section_separators = mkDefault cfg.sectionSeparator;
+            component_separators = mkDefault [cfg.componentSeparator.left cfg.componentSeparator.right];
+            section_separators = mkDefault [cfg.sectionSeparator.left cfg.sectionSeparator.right];
             globalstatus = mkDefault cfg.globalStatus;
             refresh = mkDefault cfg.refresh;
             always_divide_middle = mkDefault cfg.alwaysDivideMiddle;
diff --git a/modules/plugins/utility/leetcode-nvim/leetcode-nvim.nix b/modules/plugins/utility/leetcode-nvim/leetcode-nvim.nix
index feb61570..f71da02a 100644
--- a/modules/plugins/utility/leetcode-nvim/leetcode-nvim.nix
+++ b/modules/plugins/utility/leetcode-nvim/leetcode-nvim.nix
@@ -1,6 +1,6 @@
 {lib, ...}: let
   inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) enum str;
+  inherit (lib.types) enum str bool;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.types) mkPluginSetupOption luaInline;
 in {
diff --git a/modules/plugins/utility/motion/flash/config.nix b/modules/plugins/utility/motion/flash/config.nix
index 83ddd0b9..3adf0de8 100644
--- a/modules/plugins/utility/motion/flash/config.nix
+++ b/modules/plugins/utility/motion/flash/config.nix
@@ -5,6 +5,8 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.binds) mkKeymap;
+  inherit (lib.nvim.lua) toLuaObject;
+  inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.utility.motion.flash-nvim;
 in {
diff --git a/modules/plugins/utility/smart-splits/config.nix b/modules/plugins/utility/smart-splits/config.nix
index 82c43bac..c175d7ac 100644
--- a/modules/plugins/utility/smart-splits/config.nix
+++ b/modules/plugins/utility/smart-splits/config.nix
@@ -1,4 +1,5 @@
 {
+  pkgs,
   config,
   options,
   lib,
diff --git a/modules/plugins/visuals/cinnamon-nvim/cinnamon-nvim.nix b/modules/plugins/visuals/cinnamon-nvim/cinnamon-nvim.nix
index 2173e3be..109b06f0 100644
--- a/modules/plugins/visuals/cinnamon-nvim/cinnamon-nvim.nix
+++ b/modules/plugins/visuals/cinnamon-nvim/cinnamon-nvim.nix
@@ -1,7 +1,7 @@
 {lib, ...}: let
   inherit (lib.modules) mkRemovedOptionModule;
   inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) attrs;
+  inherit (lib.types) submodule attrs attrsOf;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   imports = [
diff --git a/modules/plugins/visuals/nvim-web-devicons/nvim-web-devicons.nix b/modules/plugins/visuals/nvim-web-devicons/nvim-web-devicons.nix
index 6ff22614..2796a5e6 100644
--- a/modules/plugins/visuals/nvim-web-devicons/nvim-web-devicons.nix
+++ b/modules/plugins/visuals/nvim-web-devicons/nvim-web-devicons.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.modules) mkRenamedOptionModule;
   inherit (lib.options) mkOption mkEnableOption literalExpression;
   inherit (lib.types) nullOr attrsOf attrs enum;
diff --git a/modules/plugins/visuals/rainbow-delimiters/rainbow-delimiters.nix b/modules/plugins/visuals/rainbow-delimiters/rainbow-delimiters.nix
index 4f316cf3..3fed4a64 100644
--- a/modules/plugins/visuals/rainbow-delimiters/rainbow-delimiters.nix
+++ b/modules/plugins/visuals/rainbow-delimiters/rainbow-delimiters.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
diff --git a/npins/sources.json b/npins/sources.json
index 6b51ae44..455e1bd6 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -1530,22 +1530,6 @@
       "url": "https://github.com/IogaMaster/neocord/archive/2ebf3792a8100376bb65fd66d5dbf60f50af7529.tar.gz",
       "hash": "1ycx26ppfb5djxji1mwamr7ra29z8sm0fs9a6hhwn0l69x06x353"
     },
-    "neogit": {
-      "type": "GitRelease",
-      "repository": {
-        "type": "GitHub",
-        "owner": "NeogitOrg",
-        "repo": "neogit"
-      },
-      "pre_releases": false,
-      "version_upper_bound": null,
-      "release_prefix": null,
-      "submodules": false,
-      "version": "v2.0.0",
-      "revision": "7f97dbfc5af3b898c6660d927c23e3a96a5bd069",
-      "url": "https://api.github.com/repos/NeogitOrg/neogit/tarball/v2.0.0",
-      "hash": "0nyv64ai3765if7bdfyx01a0xmsmhm8cjvxyvh2s40bzvkx8xy17"
-    },
     "neorg": {
       "type": "Git",
       "repository": {