diff --git a/lib/neovim-plugin.nix b/lib/neovim-plugin.nix
index 7edc362d..0f5d7817 100644
--- a/lib/neovim-plugin.nix
+++ b/lib/neovim-plugin.nix
@@ -14,7 +14,6 @@ with lib;
   };
 
   mkNeovimPlugin =
-    config:
     {
       name,
       maintainers,
@@ -71,7 +70,32 @@ with lib;
         ++ (optional deprecateExtraOptions (
           mkRenamedOptionModule (basePluginPath ++ [ "extraOptions" ]) settingsPath
         ))
-        ++ (nixvim.mkSettingsRenamedOptionModules basePluginPath settingsPath optionsRenamedToSettings);
+        ++ (nixvim.mkSettingsRenamedOptionModules basePluginPath settingsPath optionsRenamedToSettings)
+        ++ [
+          (
+            { config, ... }:
+            {
+              config =
+                let
+                  cfg = config.${namespace}.${name};
+                  extraConfigNamespace = if isColorscheme then "extraConfigLuaPre" else "extraConfigLua";
+                in
+                mkIf cfg.enable (mkMerge [
+                  {
+                    extraPlugins = (optional installPackage cfg.package) ++ extraPlugins;
+                    inherit extraPackages;
+                  }
+                  (optionalAttrs callSetup {
+                    ${extraConfigNamespace} = ''
+                      require('${luaName}')${setup}(${optionalString (cfg ? settings) (helpers.toLuaObject cfg.settings)})
+                    '';
+                  })
+                  (optionalAttrs (isColorscheme && (colorscheme != null)) { colorscheme = mkDefault colorscheme; })
+                  (extraConfig cfg)
+                ]);
+            }
+          )
+        ];
 
       options.${namespace}.${name} =
         {
@@ -87,24 +111,5 @@ with lib;
           };
         }
         // extraOptions;
-
-      config =
-        let
-          cfg = config.${namespace}.${name};
-          extraConfigNamespace = if isColorscheme then "extraConfigLuaPre" else "extraConfigLua";
-        in
-        mkIf cfg.enable (mkMerge [
-          {
-            extraPlugins = (optional installPackage cfg.package) ++ extraPlugins;
-            inherit extraPackages;
-          }
-          (optionalAttrs callSetup {
-            ${extraConfigNamespace} = ''
-              require('${luaName}')${setup}(${optionalString (cfg ? settings) (helpers.toLuaObject cfg.settings)})
-            '';
-          })
-          (optionalAttrs (isColorscheme && (colorscheme != null)) { colorscheme = mkDefault colorscheme; })
-          (extraConfig cfg)
-        ]);
     };
 }
diff --git a/plugins/TEMPLATE.nix b/plugins/TEMPLATE.nix
index 8b932e3a..9d423698 100644
--- a/plugins/TEMPLATE.nix
+++ b/plugins/TEMPLATE.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "my-plugin";
   originalName = "my-plugin.nvim"; # TODO replace (or remove entirely if it is the same as `name`)
   defaultPackage = pkgs.vimPlugins.my-plugin-nvim; # TODO replace
diff --git a/plugins/ai/chatgpt.nix b/plugins/ai/chatgpt.nix
index c8402956..b2b15fda 100644
--- a/plugins/ai/chatgpt.nix
+++ b/plugins/ai/chatgpt.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "chatgpt";
   originalName = "ChatGPT.nvim";
   defaultPackage = pkgs.vimPlugins.ChatGPT-nvim;
diff --git a/plugins/ai/copilot-chat.nix b/plugins/ai/copilot-chat.nix
index 95c1933a..82fbed7f 100644
--- a/plugins/ai/copilot-chat.nix
+++ b/plugins/ai/copilot-chat.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "copilot-chat";
   originalName = "CopilotChat.nvim";
   luaName = "CopilotChat";
diff --git a/plugins/bufferlines/barbar.nix b/plugins/bufferlines/barbar.nix
index 33d44a33..2a063371 100644
--- a/plugins/bufferlines/barbar.nix
+++ b/plugins/bufferlines/barbar.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
@@ -51,7 +50,7 @@ let
     orderByWindowNumber = "OrderByWindowNumber";
   };
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "barbar";
   originalName = "barbar.nvim";
   defaultPackage = pkgs.vimPlugins.barbar-nvim;
diff --git a/plugins/bufferlines/bufferline.nix b/plugins/bufferlines/bufferline.nix
index bf250585..f451ea2b 100644
--- a/plugins/bufferlines/bufferline.nix
+++ b/plugins/bufferlines/bufferline.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
@@ -8,7 +7,7 @@ let
   inherit (lib.nixvim) defaultNullOpts nixvimTypes mkSettingsRenamedOptionModules;
   types = nixvimTypes;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "bufferline";
   originalName = "bufferline.nvim";
   defaultPackage = pkgs.vimPlugins.bufferline-nvim;
diff --git a/plugins/colorschemes/ayu.nix b/plugins/colorschemes/ayu.nix
index 6039b0e4..754e9008 100644
--- a/plugins/colorschemes/ayu.nix
+++ b/plugins/colorschemes/ayu.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
 let
   inherit (lib.nixvim) defaultNullOpts toLuaObject;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "ayu";
   isColorscheme = true;
   originalName = "neovim-ayu";
diff --git a/plugins/colorschemes/base16/default.nix b/plugins/colorschemes/base16/default.nix
index da9b370c..c73581d6 100644
--- a/plugins/colorschemes/base16/default.nix
+++ b/plugins/colorschemes/base16/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
@@ -11,7 +10,7 @@ let
   luaName = "base16-colorscheme";
   originalName = "base16.nvim";
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   inherit name luaName originalName;
   setup = ".with_config";
   defaultPackage = pkgs.vimPlugins.base16-nvim;
diff --git a/plugins/colorschemes/catppuccin.nix b/plugins/colorschemes/catppuccin.nix
index b4555014..9fa32fa2 100644
--- a/plugins/colorschemes/catppuccin.nix
+++ b/plugins/colorschemes/catppuccin.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
@@ -8,7 +7,7 @@ let
   inherit (lib.nixvim) defaultNullOpts mkNullOrOption mkNullOrStrLuaFnOr;
   inherit (lib) types;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "catppuccin";
   isColorscheme = true;
   defaultPackage = pkgs.vimPlugins.catppuccin-nvim;
diff --git a/plugins/colorschemes/cyberdream.nix b/plugins/colorschemes/cyberdream.nix
index 3f1f40ef..fbd762e4 100644
--- a/plugins/colorschemes/cyberdream.nix
+++ b/plugins/colorschemes/cyberdream.nix
@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   pkgs,
   ...
@@ -7,7 +6,7 @@
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "cyberdream";
   isColorscheme = true;
   originalName = "cyberdream.nvim";
diff --git a/plugins/colorschemes/gruvbox.nix b/plugins/colorschemes/gruvbox.nix
index 8e518998..93a2c5f3 100644
--- a/plugins/colorschemes/gruvbox.nix
+++ b/plugins/colorschemes/gruvbox.nix
@@ -1,10 +1,9 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "gruvbox";
   isColorscheme = true;
   originalName = "gruvbox.nvim";
diff --git a/plugins/colorschemes/kanagawa.nix b/plugins/colorschemes/kanagawa.nix
index 7e6e8cf0..6e4e3e67 100644
--- a/plugins/colorschemes/kanagawa.nix
+++ b/plugins/colorschemes/kanagawa.nix
@@ -1,14 +1,13 @@
 {
   lib,
   pkgs,
-  config,
   ...
 }:
 let
   inherit (lib.nixvim) defaultNullOpts;
   inherit (lib) types;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "kanagawa";
   isColorscheme = true;
   originalName = "kanagawa.nvim";
diff --git a/plugins/colorschemes/modus.nix b/plugins/colorschemes/modus.nix
index 26c62120..bc25d45b 100644
--- a/plugins/colorschemes/modus.nix
+++ b/plugins/colorschemes/modus.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "modus";
   luaName = "modus-themes";
   originalName = "modus-themes.nvim";
diff --git a/plugins/colorschemes/nightfox.nix b/plugins/colorschemes/nightfox.nix
index f35711fb..91ea533d 100644
--- a/plugins/colorschemes/nightfox.nix
+++ b/plugins/colorschemes/nightfox.nix
@@ -1,14 +1,13 @@
 {
   lib,
   pkgs,
-  config,
   ...
 }:
 let
   inherit (lib.nixvim) defaultNullOpts mkNullOrOption;
   inherit (lib) types;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "nightfox";
   isColorscheme = true;
   originalName = "nightfox.nvim";
diff --git a/plugins/colorschemes/onedark.nix b/plugins/colorschemes/onedark.nix
index 92464271..62fd158e 100644
--- a/plugins/colorschemes/onedark.nix
+++ b/plugins/colorschemes/onedark.nix
@@ -1,10 +1,9 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "onedark";
   isColorscheme = true;
   originalName = "onedark.nvim";
diff --git a/plugins/colorschemes/palette.nix b/plugins/colorschemes/palette.nix
index 4cb938d5..bf26ba0c 100644
--- a/plugins/colorschemes/palette.nix
+++ b/plugins/colorschemes/palette.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "palette";
   isColorscheme = true;
   originalName = "palette.nvim";
diff --git a/plugins/colorschemes/poimandres.nix b/plugins/colorschemes/poimandres.nix
index abc11d9e..8fe350f3 100644
--- a/plugins/colorschemes/poimandres.nix
+++ b/plugins/colorschemes/poimandres.nix
@@ -1,13 +1,12 @@
 {
   lib,
   pkgs,
-  config,
   ...
 }:
 let
   inherit (lib.nixvim) defaultNullOpts mkNullOrOption;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "poimandres";
   isColorscheme = true;
   originalName = "poimandres.nvim";
diff --git a/plugins/colorschemes/rose-pine.nix b/plugins/colorschemes/rose-pine.nix
index 8d65cc85..dfa3ebee 100644
--- a/plugins/colorschemes/rose-pine.nix
+++ b/plugins/colorschemes/rose-pine.nix
@@ -1,13 +1,12 @@
 {
   lib,
   pkgs,
-  config,
   ...
 }:
 let
   inherit (lib.nixvim) defaultNullOpts mkNullOrOption;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "rose-pine";
   isColorscheme = true;
   defaultPackage = pkgs.vimPlugins.rose-pine;
diff --git a/plugins/colorschemes/tokyonight.nix b/plugins/colorschemes/tokyonight.nix
index 7f5605c7..c2dd2fcf 100644
--- a/plugins/colorschemes/tokyonight.nix
+++ b/plugins/colorschemes/tokyonight.nix
@@ -1,13 +1,12 @@
 {
   lib,
   pkgs,
-  config,
   ...
 }:
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "tokyonight";
   isColorscheme = true;
   originalName = "tokyonight.nvim";
diff --git a/plugins/colorschemes/vscode.nix b/plugins/colorschemes/vscode.nix
index b56c2f65..49368107 100644
--- a/plugins/colorschemes/vscode.nix
+++ b/plugins/colorschemes/vscode.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
 let
   inherit (lib.nixvim) defaultNullOpts toLuaObject;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "vscode";
   isColorscheme = true;
   originalName = "vscode-nvim";
diff --git a/plugins/completion/cmp/default.nix b/plugins/completion/cmp/default.nix
index 0f1d4352..11b16069 100644
--- a/plugins/completion/cmp/default.nix
+++ b/plugins/completion/cmp/default.nix
@@ -2,14 +2,13 @@
   lib,
   helpers,
   pkgs,
-  config,
   ...
-}@args:
+}:
 let
   cmpOptions = import ./options { inherit lib helpers; };
 in
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "cmp";
   originalName = "nvim-cmp";
   defaultPackage = pkgs.vimPlugins.nvim-cmp;
diff --git a/plugins/completion/coq.nix b/plugins/completion/coq.nix
index 89f31ccc..8dd6a7fd 100644
--- a/plugins/completion/coq.nix
+++ b/plugins/completion/coq.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "coq-nvim";
   originalName = "coq_nvim";
   defaultPackage = pkgs.vimPlugins.coq_nvim;
diff --git a/plugins/filetrees/yazi.nix b/plugins/filetrees/yazi.nix
index 42c62407..2c53d307 100644
--- a/plugins/filetrees/yazi.nix
+++ b/plugins/filetrees/yazi.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
@@ -8,7 +7,7 @@ let
   inherit (lib.nixvim) defaultNullOpts;
   types = lib.nixvim.nixvimTypes;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "yazi";
   originalName = "yazi.nvim";
   defaultPackage = pkgs.vimPlugins.yazi-nvim;
diff --git a/plugins/git/git-conflict.nix b/plugins/git/git-conflict.nix
index ca1c3523..be1274d0 100644
--- a/plugins/git/git-conflict.nix
+++ b/plugins/git/git-conflict.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "git-conflict";
   originalName = "git-conflict.nvim";
   defaultPackage = pkgs.vimPlugins.git-conflict-nvim;
diff --git a/plugins/git/gitblame.nix b/plugins/git/gitblame.nix
index f910c128..1bfbb52f 100644
--- a/plugins/git/gitblame.nix
+++ b/plugins/git/gitblame.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
@@ -8,7 +7,7 @@ let
   inherit (lib.nixvim) defaultNullOpts mkPackageOption;
   types = lib.nixvim.nixvimTypes;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "gitblame";
   originalName = "git-blame.nvim";
   defaultPackage = pkgs.vimPlugins.git-blame-nvim;
diff --git a/plugins/git/gitsigns/default.nix b/plugins/git/gitsigns/default.nix
index b77762bd..730049f6 100644
--- a/plugins/git/gitsigns/default.nix
+++ b/plugins/git/gitsigns/default.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "gitsigns";
   originalName = "gitsigns.nvim";
   defaultPackage = pkgs.vimPlugins.gitsigns-nvim;
diff --git a/plugins/git/neogit/default.nix b/plugins/git/neogit/default.nix
index 6ebe9e2f..534d59bb 100644
--- a/plugins/git/neogit/default.nix
+++ b/plugins/git/neogit/default.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "neogit";
   defaultPackage = pkgs.vimPlugins.neogit;
 
diff --git a/plugins/git/octo.nix b/plugins/git/octo.nix
index 500c75e7..e8e893cf 100644
--- a/plugins/git/octo.nix
+++ b/plugins/git/octo.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "octo";
   originalName = "octo.nvim";
   defaultPackage = pkgs.vimPlugins.octo-nvim;
diff --git a/plugins/languages/cmake-tools.nix b/plugins/languages/cmake-tools.nix
index 82fb2303..3e4efc21 100644
--- a/plugins/languages/cmake-tools.nix
+++ b/plugins/languages/cmake-tools.nix
@@ -1,11 +1,10 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "cmake-tools";
   originalName = "cmake-tools.nvim";
   defaultPackage = pkgs.vimPlugins.cmake-tools-nvim;
diff --git a/plugins/languages/debugprint.nix b/plugins/languages/debugprint.nix
index 91801e19..6389002e 100644
--- a/plugins/languages/debugprint.nix
+++ b/plugins/languages/debugprint.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "debugprint";
   originalName = "debugprint.nvim";
   defaultPackage = pkgs.vimPlugins.debugprint-nvim;
diff --git a/plugins/languages/ltex-extra.nix b/plugins/languages/ltex-extra.nix
index 123cb74f..905cb323 100644
--- a/plugins/languages/ltex-extra.nix
+++ b/plugins/languages/ltex-extra.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "ltex-extra";
   originalName = "ltex_extra.nvim";
   defaultPackage = pkgs.vimPlugins.ltex_extra-nvim;
diff --git a/plugins/languages/markdown/glow.nix b/plugins/languages/markdown/glow.nix
index f9b6c725..e7908587 100644
--- a/plugins/languages/markdown/glow.nix
+++ b/plugins/languages/markdown/glow.nix
@@ -1,11 +1,10 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "glow";
   originalName = "glow.nvim";
   defaultPackage = pkgs.vimPlugins.glow-nvim;
diff --git a/plugins/languages/markdown/markview.nix b/plugins/languages/markdown/markview.nix
index c8b2d0a3..ac9b6bd9 100644
--- a/plugins/languages/markdown/markview.nix
+++ b/plugins/languages/markdown/markview.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
@@ -8,7 +7,7 @@ let
   inherit (lib.nixvim) defaultNullOpts;
   inherit (lib) types;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "markview";
   originalName = "markview.nvim";
   defaultPackage = pkgs.vimPlugins.markview-nvim;
diff --git a/plugins/languages/markdown/preview.nix b/plugins/languages/markdown/preview.nix
index 03a523a9..9ea8e62c 100644
--- a/plugins/languages/markdown/preview.nix
+++ b/plugins/languages/markdown/preview.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "preview";
   originalName = "Preview.nvim";
   defaultPackage = pkgs.vimPlugins.Preview-nvim;
diff --git a/plugins/languages/nvim-orgmode.nix b/plugins/languages/nvim-orgmode.nix
index 53166456..70430ba0 100644
--- a/plugins/languages/nvim-orgmode.nix
+++ b/plugins/languages/nvim-orgmode.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "orgmode";
   originalName = "nvim-orgmode";
   defaultPackage = pkgs.vimPlugins.orgmode;
diff --git a/plugins/languages/otter.nix b/plugins/languages/otter.nix
index 59d4cb8c..f3df1eeb 100644
--- a/plugins/languages/otter.nix
+++ b/plugins/languages/otter.nix
@@ -5,7 +5,7 @@
   pkgs,
   ...
 }:
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "otter";
   originalName = "otter.nvim";
   defaultPackage = pkgs.vimPlugins.otter-nvim;
diff --git a/plugins/languages/python/jupytext.nix b/plugins/languages/python/jupytext.nix
index d36f2515..77b4a206 100644
--- a/plugins/languages/python/jupytext.nix
+++ b/plugins/languages/python/jupytext.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "jupytext";
   originalName = "jupytext.nvim";
   defaultPackage = pkgs.vimPlugins.jupytext-nvim;
diff --git a/plugins/languages/qmk.nix b/plugins/languages/qmk.nix
index 1b4dd71b..23c45639 100644
--- a/plugins/languages/qmk.nix
+++ b/plugins/languages/qmk.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "qmk";
   originalName = "qmk.nvim";
   defaultPackage = pkgs.vimPlugins.qmk-nvim;
diff --git a/plugins/languages/rust/rustaceanvim/default.nix b/plugins/languages/rust/rustaceanvim/default.nix
index 6afba9eb..2bb16f4d 100644
--- a/plugins/languages/rust/rustaceanvim/default.nix
+++ b/plugins/languages/rust/rustaceanvim/default.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "rustaceanvim";
   defaultPackage = pkgs.vimPlugins.rustaceanvim;
 
diff --git a/plugins/languages/sniprun.nix b/plugins/languages/sniprun.nix
index 8f73ef62..e31508d2 100644
--- a/plugins/languages/sniprun.nix
+++ b/plugins/languages/sniprun.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "sniprun";
   defaultPackage = pkgs.vimPlugins.sniprun;
   url = "https://github.com/michaelb/sniprun";
diff --git a/plugins/languages/treesitter/treesitter-context.nix b/plugins/languages/treesitter/treesitter-context.nix
index bf3a5933..950bfc96 100644
--- a/plugins/languages/treesitter/treesitter-context.nix
+++ b/plugins/languages/treesitter/treesitter-context.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "treesitter-context";
   originalName = "nvim-treesitter-context";
   defaultPackage = pkgs.vimPlugins.nvim-treesitter-context;
diff --git a/plugins/languages/treesitter/treesitter.nix b/plugins/languages/treesitter/treesitter.nix
index 2d6a4814..5f510e4e 100644
--- a/plugins/languages/treesitter/treesitter.nix
+++ b/plugins/languages/treesitter/treesitter.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "treesitter";
   originalName = "nvim-treesitter";
   luaName = "nvim-treesitter.configs";
diff --git a/plugins/languages/treesitter/ts-autotag.nix b/plugins/languages/treesitter/ts-autotag.nix
index e8065b14..67f064d9 100644
--- a/plugins/languages/treesitter/ts-autotag.nix
+++ b/plugins/languages/treesitter/ts-autotag.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "ts-autotag";
   originalName = "nvim-ts-autotag";
   luaName = "nvim-ts-autotag";
diff --git a/plugins/lsp/conform-nvim.nix b/plugins/lsp/conform-nvim.nix
index bf952294..0648adae 100644
--- a/plugins/lsp/conform-nvim.nix
+++ b/plugins/lsp/conform-nvim.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
@@ -8,7 +7,7 @@ let
   inherit (lib) types;
   inherit (lib.nixvim) defaultNullOpts mkRaw;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "conform-nvim";
   luaName = "conform";
   originalName = "conform.nvim";
diff --git a/plugins/lsp/lsp-lines.nix b/plugins/lsp/lsp-lines.nix
index 440593b9..e9044d36 100644
--- a/plugins/lsp/lsp-lines.nix
+++ b/plugins/lsp/lsp-lines.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "lsp-lines";
   luaName = "lsp_lines";
   originalName = "lsp_lines.nvim";
diff --git a/plugins/lsp/lsp-status.nix b/plugins/lsp/lsp-status.nix
index 45bdbcec..bb1e4ace 100644
--- a/plugins/lsp/lsp-status.nix
+++ b/plugins/lsp/lsp-status.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "lsp-status";
   originalName = "lsp-status.nvim";
   defaultPackage = pkgs.vimPlugins.lsp-status-nvim;
diff --git a/plugins/lsp/nvim-lightbulb.nix b/plugins/lsp/nvim-lightbulb.nix
index 0524cbe2..1e138fb9 100644
--- a/plugins/lsp/nvim-lightbulb.nix
+++ b/plugins/lsp/nvim-lightbulb.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "nvim-lightbulb";
   defaultPackage = pkgs.vimPlugins.nvim-lightbulb;
 
diff --git a/plugins/lsp/trouble.nix b/plugins/lsp/trouble.nix
index 42383b9d..717aba2e 100644
--- a/plugins/lsp/trouble.nix
+++ b/plugins/lsp/trouble.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "trouble";
   originalName = "trouble-nvim";
   defaultPackage = pkgs.vimPlugins.trouble-nvim;
diff --git a/plugins/neotest/default.nix b/plugins/neotest/default.nix
index 85c910bb..2a800bb3 100644
--- a/plugins/neotest/default.nix
+++ b/plugins/neotest/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
@@ -8,7 +7,7 @@ with lib;
 let
   inherit (lib.nixvim) mkRaw;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "neotest";
   defaultPackage = pkgs.vimPlugins.neotest;
 
diff --git a/plugins/none-ls/default.nix b/plugins/none-ls/default.nix
index 7b63befe..cf7175f9 100644
--- a/plugins/none-ls/default.nix
+++ b/plugins/none-ls/default.nix
@@ -7,7 +7,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "none-ls";
   originalName = "none-ls.nvim";
   luaName = "null-ls";
diff --git a/plugins/pluginmanagers/lz-n.nix b/plugins/pluginmanagers/lz-n.nix
index 3645f339..0f745609 100644
--- a/plugins/pluginmanagers/lz-n.nix
+++ b/plugins/pluginmanagers/lz-n.nix
@@ -1,7 +1,6 @@
 {
   lib,
   options,
-  config,
   pkgs,
   ...
 }:
@@ -9,7 +8,7 @@ with lib;
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-nixvim.neovim-plugin.mkNeovimPlugin config {
+nixvim.neovim-plugin.mkNeovimPlugin {
   name = "lz-n";
   originalName = "lz.n";
   maintainers = [ maintainers.psfloyd ];
diff --git a/plugins/snippets/nvim-snippets.nix b/plugins/snippets/nvim-snippets.nix
index 64f8d5f9..4c12bc86 100644
--- a/plugins/snippets/nvim-snippets.nix
+++ b/plugins/snippets/nvim-snippets.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
@@ -8,7 +7,7 @@ let
   inherit (lib) types;
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "nvim-snippets";
   luaName = "snippets";
   defaultPackage = pkgs.vimPlugins.nvim-snippets;
diff --git a/plugins/statuslines/lightline.nix b/plugins/statuslines/lightline.nix
index 588b205c..40dfede7 100644
--- a/plugins/statuslines/lightline.nix
+++ b/plugins/statuslines/lightline.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  config,
   options,
   pkgs,
   ...
@@ -9,7 +8,7 @@ let
   inherit (lib) types;
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "lightline";
   originalName = "lightline.vim";
   defaultPackage = pkgs.vimPlugins.lightline-vim;
diff --git a/plugins/telescope/default.nix b/plugins/telescope/default.nix
index b5d972e6..db3361c5 100644
--- a/plugins/telescope/default.nix
+++ b/plugins/telescope/default.nix
@@ -14,7 +14,7 @@ let
     ;
 in
 # TODO:add support for additional filetypes. This requires autocommands!
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "telescope";
   originalName = "telescope.nvim";
   defaultPackage = pkgs.vimPlugins.telescope-nvim;
diff --git a/plugins/ui/edgy.nix b/plugins/ui/edgy.nix
index 0a9b8f28..6c0714fc 100644
--- a/plugins/ui/edgy.nix
+++ b/plugins/ui/edgy.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "edgy";
   originalName = "edgy.nvim";
   defaultPackage = pkgs.vimPlugins.edgy-nvim;
diff --git a/plugins/ui/headlines.nix b/plugins/ui/headlines.nix
index 6c47d33b..351cbcb0 100644
--- a/plugins/ui/headlines.nix
+++ b/plugins/ui/headlines.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "headlines";
   originalName = "headlines.nvim";
   defaultPackage = pkgs.vimPlugins.headlines-nvim;
diff --git a/plugins/ui/neoscroll.nix b/plugins/ui/neoscroll.nix
index 9afdd16f..b91ee299 100644
--- a/plugins/ui/neoscroll.nix
+++ b/plugins/ui/neoscroll.nix
@@ -1,12 +1,11 @@
 {
   pkgs,
-  config,
   lib,
   helpers,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "neoscroll";
   originalName = "neoscroll.nvim";
   defaultPackage = pkgs.vimPlugins.neoscroll-nvim;
diff --git a/plugins/ui/specs.nix b/plugins/ui/specs.nix
index 5ee7736c..91cddc71 100644
--- a/plugins/ui/specs.nix
+++ b/plugins/ui/specs.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "specs";
   originalName = "specs.nvim";
   defaultPackage = pkgs.vimPlugins.specs-nvim;
diff --git a/plugins/ui/statuscol.nix b/plugins/ui/statuscol.nix
index ba03da5c..e432db8d 100644
--- a/plugins/ui/statuscol.nix
+++ b/plugins/ui/statuscol.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "statuscol";
   originalName = "statuscol.nvim";
   defaultPackage = pkgs.vimPlugins.statuscol-nvim;
diff --git a/plugins/ui/transparent.nix b/plugins/ui/transparent.nix
index 2b3a3dcf..cf56c2ae 100644
--- a/plugins/ui/transparent.nix
+++ b/plugins/ui/transparent.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "transparent";
   originalName = "transparent.nvim";
   defaultPackage = pkgs.vimPlugins.transparent-nvim;
diff --git a/plugins/ui/twilight.nix b/plugins/ui/twilight.nix
index fa6f253a..cd845ba7 100644
--- a/plugins/ui/twilight.nix
+++ b/plugins/ui/twilight.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "twilight";
   originalName = "twilight.nvim";
   defaultPackage = pkgs.vimPlugins.twilight-nvim;
diff --git a/plugins/ui/virt-column.nix b/plugins/ui/virt-column.nix
index 648ef9b9..20817297 100644
--- a/plugins/ui/virt-column.nix
+++ b/plugins/ui/virt-column.nix
@@ -2,11 +2,10 @@
   lib,
   helpers,
   pkgs,
-  config,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "virt-column";
   originalName = "virt-column.nvim";
   defaultPackage = pkgs.vimPlugins.virt-column-nvim;
diff --git a/plugins/ui/zen-mode.nix b/plugins/ui/zen-mode.nix
index 199375cf..4c9b99c3 100644
--- a/plugins/ui/zen-mode.nix
+++ b/plugins/ui/zen-mode.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "zen-mode";
   originalName = "zen-mode.nvim";
   defaultPackage = pkgs.vimPlugins.zen-mode-nvim;
diff --git a/plugins/utils/arrow.nix b/plugins/utils/arrow.nix
index d087bb68..b7cb495f 100644
--- a/plugins/utils/arrow.nix
+++ b/plugins/utils/arrow.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "arrow";
   originalName = "arrow.nvim";
   defaultPackage = pkgs.vimPlugins.arrow-nvim;
diff --git a/plugins/utils/auto-save.nix b/plugins/utils/auto-save.nix
index 06c8b606..cc473597 100644
--- a/plugins/utils/auto-save.nix
+++ b/plugins/utils/auto-save.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "auto-save";
   originalName = "auto-save.nvim";
   defaultPackage = pkgs.vimPlugins.auto-save-nvim;
diff --git a/plugins/utils/bacon.nix b/plugins/utils/bacon.nix
index fc03249f..03b172dd 100644
--- a/plugins/utils/bacon.nix
+++ b/plugins/utils/bacon.nix
@@ -1,10 +1,9 @@
 {
   helpers,
   pkgs,
-  config,
   ...
 }:
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "bacon";
   defaultPackage = pkgs.vimPlugins.nvim-bacon;
   maintainers = [ helpers.maintainers.alisonjenkins ];
diff --git a/plugins/utils/baleia.nix b/plugins/utils/baleia.nix
index 19e8299f..6f955643 100644
--- a/plugins/utils/baleia.nix
+++ b/plugins/utils/baleia.nix
@@ -1,10 +1,9 @@
 {
   helpers,
   pkgs,
-  config,
   ...
 }:
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "baleia";
   originalName = "baleia.nvim";
   defaultPackage = pkgs.vimPlugins.baleia-nvim;
diff --git a/plugins/utils/better-escape.nix b/plugins/utils/better-escape.nix
index 6bca183d..98c76539 100644
--- a/plugins/utils/better-escape.nix
+++ b/plugins/utils/better-escape.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "better-escape";
   originalName = "better-escape.nvim";
   luaName = "better_escape";
diff --git a/plugins/utils/ccc.nix b/plugins/utils/ccc.nix
index a91cf07b..11d64cf5 100644
--- a/plugins/utils/ccc.nix
+++ b/plugins/utils/ccc.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "ccc";
   originalName = "ccc.nvim";
   defaultPackage = pkgs.vimPlugins.ccc-nvim;
diff --git a/plugins/utils/cloak.nix b/plugins/utils/cloak.nix
index dfc74cdb..13a93187 100644
--- a/plugins/utils/cloak.nix
+++ b/plugins/utils/cloak.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "cloak";
   originalName = "cloak.nvim";
   defaultPackage = pkgs.vimPlugins.cloak-nvim;
diff --git a/plugins/utils/codesnap.nix b/plugins/utils/codesnap.nix
index e9d5cdbd..09238141 100644
--- a/plugins/utils/codesnap.nix
+++ b/plugins/utils/codesnap.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "codesnap";
   originalName = "codesnap.nvim";
   defaultPackage = pkgs.vimPlugins.codesnap-nvim;
diff --git a/plugins/utils/comment-box.nix b/plugins/utils/comment-box.nix
index bfa6c27f..68637a1d 100644
--- a/plugins/utils/comment-box.nix
+++ b/plugins/utils/comment-box.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "comment-box";
   originalName = "comment-box.nvim";
   defaultPackage = pkgs.vimPlugins.comment-box-nvim;
diff --git a/plugins/utils/comment.nix b/plugins/utils/comment.nix
index a33acbb4..b9089c66 100644
--- a/plugins/utils/comment.nix
+++ b/plugins/utils/comment.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "comment";
   originalName = "Comment.nvim";
   luaName = "Comment";
diff --git a/plugins/utils/competitest.nix b/plugins/utils/competitest.nix
index 7c2a6f21..88395042 100644
--- a/plugins/utils/competitest.nix
+++ b/plugins/utils/competitest.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "competitest";
   originalName = "competitest.nvim";
   defaultPackage = pkgs.vimPlugins.competitest-nvim;
diff --git a/plugins/utils/dashboard.nix b/plugins/utils/dashboard.nix
index 42390afc..1b00c0fb 100644
--- a/plugins/utils/dashboard.nix
+++ b/plugins/utils/dashboard.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "dashboard";
   originalName = "dashboard-nvim";
   defaultPackage = pkgs.vimPlugins.dashboard-nvim;
diff --git a/plugins/utils/dressing.nix b/plugins/utils/dressing.nix
index 8b8b1c97..44b9df20 100644
--- a/plugins/utils/dressing.nix
+++ b/plugins/utils/dressing.nix
@@ -1,12 +1,11 @@
 {
-  config,
   lib,
   helpers,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "dressing";
   originalName = "dressing.nvim";
   defaultPackage = pkgs.vimPlugins.dressing-nvim;
diff --git a/plugins/utils/firenvim.nix b/plugins/utils/firenvim.nix
index 0e3b1985..087a866e 100644
--- a/plugins/utils/firenvim.nix
+++ b/plugins/utils/firenvim.nix
@@ -9,7 +9,7 @@ let
   inherit (lib.nixvim) defaultNullOpts;
   types = lib.nixvim.nixvimTypes;
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "firenvim";
   defaultPackage = pkgs.vimPlugins.firenvim;
 
diff --git a/plugins/utils/flash.nix b/plugins/utils/flash.nix
index da5c041f..76778663 100644
--- a/plugins/utils/flash.nix
+++ b/plugins/utils/flash.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "flash";
   originalName = "flash.nvim";
   defaultPackage = pkgs.vimPlugins.flash-nvim;
diff --git a/plugins/utils/fzf-lua.nix b/plugins/utils/fzf-lua.nix
index 15dff0e0..5b23db1b 100644
--- a/plugins/utils/fzf-lua.nix
+++ b/plugins/utils/fzf-lua.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  config,
   options,
   pkgs,
   ...
@@ -31,7 +30,7 @@ let
     };
   };
 in
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "fzf-lua";
   defaultPackage = pkgs.vimPlugins.fzf-lua;
 
diff --git a/plugins/utils/guess-indent.nix b/plugins/utils/guess-indent.nix
index be7952e4..999eeb42 100644
--- a/plugins/utils/guess-indent.nix
+++ b/plugins/utils/guess-indent.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "guess-indent";
   originalName = "guess-indent.nvim";
   defaultPackage = pkgs.vimPlugins.guess-indent-nvim;
diff --git a/plugins/utils/hop.nix b/plugins/utils/hop.nix
index e5d9152a..56d5fda8 100644
--- a/plugins/utils/hop.nix
+++ b/plugins/utils/hop.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "hop";
   originalName = "hop.nvim";
   defaultPackage = pkgs.vimPlugins.hop-nvim;
diff --git a/plugins/utils/hydra/default.nix b/plugins/utils/hydra/default.nix
index 338fe8b0..ef524057 100644
--- a/plugins/utils/hydra/default.nix
+++ b/plugins/utils/hydra/default.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "hydra";
   originalName = "hydra.nvim";
   defaultPackage = pkgs.vimPlugins.hydra-nvim;
diff --git a/plugins/utils/indent-blankline.nix b/plugins/utils/indent-blankline.nix
index ab4bfa2f..227cc7ba 100644
--- a/plugins/utils/indent-blankline.nix
+++ b/plugins/utils/indent-blankline.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "indent-blankline";
   originalName = "indent-blankline.nvim";
   luaName = "ibl";
diff --git a/plugins/utils/indent-o-matic.nix b/plugins/utils/indent-o-matic.nix
index 21ea2932..9ff6efbd 100644
--- a/plugins/utils/indent-o-matic.nix
+++ b/plugins/utils/indent-o-matic.nix
@@ -2,11 +2,10 @@
   lib,
   helpers,
   pkgs,
-  config,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "indent-o-matic";
   defaultPackage = pkgs.vimPlugins.indent-o-matic;
   maintainers = [ helpers.maintainers.alisonjenkins ];
diff --git a/plugins/utils/neoclip.nix b/plugins/utils/neoclip.nix
index d459105b..848bbd56 100644
--- a/plugins/utils/neoclip.nix
+++ b/plugins/utils/neoclip.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "neoclip";
   originalName = "nvim-neoclip.lua";
   defaultPackage = pkgs.vimPlugins.nvim-neoclip-lua;
diff --git a/plugins/utils/neocord.nix b/plugins/utils/neocord.nix
index b0910260..4fcd89b4 100644
--- a/plugins/utils/neocord.nix
+++ b/plugins/utils/neocord.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "neocord";
   defaultPackage = pkgs.vimPlugins.neocord;
 
diff --git a/plugins/utils/nvim-autopairs.nix b/plugins/utils/nvim-autopairs.nix
index c33cf74c..9345af3f 100644
--- a/plugins/utils/nvim-autopairs.nix
+++ b/plugins/utils/nvim-autopairs.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "nvim-autopairs";
   defaultPackage = pkgs.vimPlugins.nvim-autopairs;
 
diff --git a/plugins/utils/obsidian/default.nix b/plugins/utils/obsidian/default.nix
index 523b4df9..53113735 100644
--- a/plugins/utils/obsidian/default.nix
+++ b/plugins/utils/obsidian/default.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "obsidian";
   originalName = "obsidian.nvim";
   defaultPackage = pkgs.vimPlugins.obsidian-nvim;
diff --git a/plugins/utils/oil.nix b/plugins/utils/oil.nix
index f8012060..1d219f8a 100644
--- a/plugins/utils/oil.nix
+++ b/plugins/utils/oil.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "oil";
   originalName = "oil.nvim";
   defaultPackage = pkgs.vimPlugins.oil-nvim;
diff --git a/plugins/utils/refactoring.nix b/plugins/utils/refactoring.nix
index bb227c29..aebdf9fb 100644
--- a/plugins/utils/refactoring.nix
+++ b/plugins/utils/refactoring.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "refactoring";
   originalName = "refactoring.nvim";
   defaultPackage = pkgs.vimPlugins.refactoring-nvim;
diff --git a/plugins/utils/rest.nix b/plugins/utils/rest.nix
index 2f2169b0..a879c3ce 100644
--- a/plugins/utils/rest.nix
+++ b/plugins/utils/rest.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "rest";
   originalName = "rest.nvim";
   luaName = "rest-nvim";
diff --git a/plugins/utils/scope.nix b/plugins/utils/scope.nix
index dd924835..b3a8de1c 100644
--- a/plugins/utils/scope.nix
+++ b/plugins/utils/scope.nix
@@ -1,10 +1,9 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "scope";
   originalName = "scope.nvim";
   defaultPackage = pkgs.vimPlugins.scope-nvim;
diff --git a/plugins/utils/smart-splits.nix b/plugins/utils/smart-splits.nix
index 9c48fa30..afce5143 100644
--- a/plugins/utils/smart-splits.nix
+++ b/plugins/utils/smart-splits.nix
@@ -1,11 +1,10 @@
 {
-  config,
   lib,
   pkgs,
   helpers,
   ...
 }:
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "smart-splits";
   originalName = "smart-splits.nvim";
   defaultPackage = pkgs.vimPlugins.smart-splits-nvim;
diff --git a/plugins/utils/spectre.nix b/plugins/utils/spectre.nix
index 2e4b176f..02b6b3eb 100644
--- a/plugins/utils/spectre.nix
+++ b/plugins/utils/spectre.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "spectre";
   originalName = "nvim-spectre";
   defaultPackage = pkgs.vimPlugins.nvim-spectre;
diff --git a/plugins/utils/todo-comments.nix b/plugins/utils/todo-comments.nix
index 32ab3df5..e0e85a6e 100644
--- a/plugins/utils/todo-comments.nix
+++ b/plugins/utils/todo-comments.nix
@@ -16,7 +16,7 @@ let
   types = lib.nixvim.nixvimTypes;
 
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "todo-comments";
   originalName = "todo-comments.nvim";
   defaultPackage = pkgs.vimPlugins.todo-comments-nvim;
diff --git a/plugins/utils/toggleterm.nix b/plugins/utils/toggleterm.nix
index 6dd808d6..2d62520a 100644
--- a/plugins/utils/toggleterm.nix
+++ b/plugins/utils/toggleterm.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "toggleterm";
   originalName = "toggleterm.nvim";
   defaultPackage = pkgs.vimPlugins.toggleterm-nvim;
diff --git a/plugins/utils/trim.nix b/plugins/utils/trim.nix
index 34a2f661..ac6eaf48 100644
--- a/plugins/utils/trim.nix
+++ b/plugins/utils/trim.nix
@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "trim";
   originalName = "trim.nvim";
   defaultPackage = pkgs.vimPlugins.trim-nvim;
diff --git a/plugins/utils/which-key.nix b/plugins/utils/which-key.nix
index ba422ecf..60022d05 100644
--- a/plugins/utils/which-key.nix
+++ b/plugins/utils/which-key.nix
@@ -1,7 +1,6 @@
 {
   lib,
   pkgs,
-  config,
   options,
   ...
 }:
@@ -77,7 +76,7 @@ let
   ];
 
 in
-lib.nixvim.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "which-key";
   originalName = "which-key.nvim";
   defaultPackage = pkgs.vimPlugins.which-key-nvim;
diff --git a/plugins/utils/yanky.nix b/plugins/utils/yanky.nix
index 637d7030..d0f33651 100644
--- a/plugins/utils/yanky.nix
+++ b/plugins/utils/yanky.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "yanky";
   originalName = "yanky.nvim";
   defaultPackage = pkgs.vimPlugins.yanky-nvim;
diff --git a/plugins/utils/zellij.nix b/plugins/utils/zellij.nix
index 4f3a136c..d88e8859 100644
--- a/plugins/utils/zellij.nix
+++ b/plugins/utils/zellij.nix
@@ -1,11 +1,10 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "zellij";
   originalName = "zellij.nvim";
   defaultPackage = pkgs.vimPlugins.zellij-nvim;
diff --git a/plugins/utils/zk.nix b/plugins/utils/zk.nix
index 90b0d974..8414f429 100644
--- a/plugins/utils/zk.nix
+++ b/plugins/utils/zk.nix
@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+helpers.neovim-plugin.mkNeovimPlugin {
   name = "zk";
   originalName = "zk.nvim";
   defaultPackage = pkgs.vimPlugins.zk-nvim;