lib/neovim-plugin: drop config arg

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)
-        ]);
     };
 }

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

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;

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";

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;

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;

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";

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;

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;

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";

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";

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";

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";

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";

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";

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";

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";

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;

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";

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";

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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";

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;

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";

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";

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";

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";

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;

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;
 

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;

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;
 

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";

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 ];

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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 ];

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;

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";

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;

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;

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;

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;

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";

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;

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;

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;

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;
 

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;

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;
 

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;

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;

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;

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";

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 ];

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;

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;
 

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;
 

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;

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;

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;

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";

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;

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;

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;

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;

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;

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;

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;

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;

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;