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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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