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

lib/vim-plugin.nix

@@ -2,7 +2,6 @@
 with lib;
 {
   mkVimPlugin =
-    config:
     {
       name,
       url ? if defaultPackage != null then defaultPackage.meta.homepage else null,
@@ -30,10 +29,6 @@ with lib;
     let
       namespace = if isColorscheme then "colorschemes" else "plugins";
 
-      cfg = config.${namespace}.${name};
-
-      globals = cfg.settings or { };
-
       # does this evaluate package?
       packageOption =
         if defaultPackage == null then
@@ -58,6 +53,27 @@ with lib;
           '';
         };
       };
+
+      modules = [
+        (
+          { config, ... }:
+          let
+            cfg = config.${namespace}.${name};
+          in
+          {
+            config = mkIf cfg.enable (mkMerge [
+              {
+                inherit extraPackages;
+                globals = mapAttrs' (n: nameValuePair (globalPrefix + n)) (cfg.settings or { });
+                # does this evaluate package? it would not be desired to evaluate package if we use another package.
+                extraPlugins = extraPlugins ++ optional (defaultPackage != null) cfg.package;
+              }
+              (optionalAttrs (isColorscheme && (colorscheme != null)) { colorscheme = mkDefault colorscheme; })
+              (extraConfig cfg)
+            ]);
+          }
+        )
+      ];
     in
     {
       meta = {
@@ -86,17 +102,8 @@ with lib;
         ++ (optional (deprecateExtraConfig && createSettingsOption) (
           mkRenamedOptionModule (basePluginPath ++ [ "extraConfig" ]) settingsPath
         ))
-        ++ (nixvim.mkSettingsRenamedOptionModules basePluginPath settingsPath optionsRenamedToSettings);
+        ++ (nixvim.mkSettingsRenamedOptionModules basePluginPath settingsPath optionsRenamedToSettings)
+        ++ modules;
 
-      config = mkIf cfg.enable (mkMerge [
-        {
-          inherit extraPackages;
-          globals = mapAttrs' (n: nameValuePair (globalPrefix + n)) globals;
-          # does this evaluate package? it would not be desired to evaluate package if we use another package.
-          extraPlugins = extraPlugins ++ optional (defaultPackage != null) cfg.package;
-        }
-        (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,14 +1,13 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
 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,14 +1,13 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
 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,13 +1,12 @@
 {
-  config,
   lib,
   pkgs,
   ...
 }:
 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/everforest.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
@@ -15,7 +14,7 @@ let
     ] pluginDefault desc;
 
 in
-lib.nixvim.vim-plugin.mkVimPlugin config {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "everforest";
   isColorscheme = true;
   defaultPackage = pkgs.vimPlugins.everforest;

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/melange.nix

@@ -1,10 +1,9 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin config {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "melange";
   isColorscheme = true;
   originalName = "melange-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/nord.nix

@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
 let
   inherit (lib.nixvim) defaultNullOpts;
 in
-lib.nixvim.vim-plugin.mkVimPlugin config {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "nord";
   isColorscheme = true;
   originalName = "nord.nvim";

plugins/colorschemes/one.nix

@@ -1,10 +1,9 @@
 {
   lib,
-  config,
   pkgs,
   ...
 }:
-lib.nixvim.vim-plugin.mkVimPlugin config {
+lib.nixvim.vim-plugin.mkVimPlugin {
   name = "one";
   isColorscheme = true;
   originalName = "vim-one";

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