lib/vim-plugin: drop config arg

Instead, access it via an imported module

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

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

plugins/completion/cmp/sources/_mk-cmp-plugin.nix

@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
@@ -13,7 +12,7 @@
   imports ? [ ],
   ...
 }@args:
-helpers.vim-plugin.mkVimPlugin config (
+helpers.vim-plugin.mkVimPlugin (
   builtins.removeAttrs args [
     "pluginName"
     "sourceName"

plugins/completion/codeium-vim.nix

@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
@@ -35,7 +34,7 @@ let
     };
   };
 in
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "codeium-vim";
   originalName = "codeium.vim";
   defaultPackage = pkgs.vimPlugins.codeium-vim;

plugins/completion/copilot-vim.nix

@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   helpers,
   pkgs,
   ...
 }:
 with lib;
 with helpers.vim-plugin;
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "copilot-vim";
   originalName = "copilot.vim";
   defaultPackage = pkgs.vimPlugins.copilot-vim;

plugins/git/committia.nix

@@ -1,10 +1,9 @@
 {
-  config,
   helpers,
   pkgs,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "committia";
   originalName = "committia.vim";
   defaultPackage = pkgs.vimPlugins.committia-vim;

plugins/git/fugitive.nix

@@ -1,11 +1,10 @@
 {
-  config,
   lib,
   helpers,
   pkgs,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "fugitive";
   originalName = "vim-fugitive";
   defaultPackage = pkgs.vimPlugins.vim-fugitive;

plugins/git/gitignore.nix

@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
 # We use `mkVimPlugin` to avoid having a `settings` option.
 # Indeed, this plugin is not configurable in the common sense (no `setup` function).
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "gitignore";
   originalName = "gitignore.nvim";
   defaultPackage = pkgs.vimPlugins.gitignore-nvim;

plugins/git/lazygit.nix

@@ -1,12 +1,11 @@
 {
-  config,
   lib,
   helpers,
   pkgs,
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "lazygit";
   originalName = "lazygit.nvim";
   defaultPackage = pkgs.vimPlugins.lazygit-nvim;

plugins/languages/godot.nix

@@ -1,12 +1,11 @@
 {
-  config,
   lib,
   helpers,
   pkgs,
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "godot";
   originalName = "vim-godot";
   defaultPackage = pkgs.vimPlugins.vim-godot;

plugins/languages/haskell-scope-highlighting.nix

@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "haskell-scope-highlighting";
   originalName = "haskell-scope-highlighting.nvim";
   defaultPackage = pkgs.vimPlugins.haskell-scope-highlighting-nvim;

plugins/languages/julia/julia-cell.nix

@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
@@ -37,7 +36,7 @@ let
   };
 in
 with lib;
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "julia-cell";
   originalName = "vim-julia-cell";
   defaultPackage = pkgs.vimPlugins.vim-julia-cell;

plugins/languages/ledger.nix

@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   helpers,
   pkgs,
   ...
 }:
 with lib;
 with helpers.vim-plugin;
-mkVimPlugin config {
+mkVimPlugin {
   name = "ledger";
   originalName = "vim-ledger";
   defaultPackage = pkgs.vimPlugins.vim-ledger;

plugins/languages/markdown/markdown-preview.nix

@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   helpers,
   pkgs,
   ...
 }:
 with lib;
 with helpers.vim-plugin;
-mkVimPlugin config {
+mkVimPlugin {
   name = "markdown-preview";
   originalName = "markdown-preview.nvim";
   defaultPackage = pkgs.vimPlugins.markdown-preview-nvim;

plugins/languages/nix.nix

@@ -1,11 +1,10 @@
 {
-  config,
   lib,
   helpers,
   pkgs,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "nix";
   originalName = "vim-nix";
   defaultPackage = pkgs.vimPlugins.vim-nix;

plugins/languages/parinfer-rust.nix

@@ -1,11 +1,10 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "parinfer-rust";
   defaultPackage = pkgs.vimPlugins.parinfer-rust;
   globalPrefix = "parinfer_";

plugins/languages/tagbar.nix

@@ -1,11 +1,10 @@
 {
   helpers,
-  config,
   pkgs,
   lib,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "tagbar";
   defaultPackage = pkgs.vimPlugins.tagbar;
   globalPrefix = "tagbar_";

plugins/languages/texpresso.nix

@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
 # This plugin has no configuration, so we use `mkVimPlugin` without the `globalPrefix` argument to
 # avoid the creation of the `settings` option.
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "texpresso";
   originalName = "texpresso.vim";
   defaultPackage = pkgs.vimPlugins.texpresso-vim;

plugins/languages/typst/typst-vim.nix

@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "typst-vim";
   originalName = "typst.vim";
   defaultPackage = pkgs.vimPlugins.typst-vim;

plugins/languages/vim-slime.nix

@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   helpers,
   pkgs,
   ...
 }:
 with lib;
 with helpers.vim-plugin;
-mkVimPlugin config {
+mkVimPlugin {
   name = "vim-slime";
   defaultPackage = pkgs.vimPlugins.vim-slime;
   globalPrefix = "slime_";

plugins/languages/vimtex.nix

@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "vimtex";
   defaultPackage = pkgs.vimPlugins.vimtex;
   globalPrefix = "vimtex_";

plugins/languages/zig.nix

@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   helpers,
   pkgs,
   ...
 }:
 with lib;
 with helpers.vim-plugin;
-mkVimPlugin config {
+mkVimPlugin {
   name = "zig";
   originalName = "zig.vim";
   defaultPackage = pkgs.vimPlugins.zig-vim;

plugins/lsp/schemastore.nix

@@ -6,7 +6,7 @@
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "schemastore";
   originalName = "SchemaStore.nvim";
   defaultPackage = pkgs.vimPlugins.SchemaStore-nvim;

plugins/statuslines/airline.nix

@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   helpers,
   pkgs,
   ...
 }:
 with lib;
 with helpers.vim-plugin;
-mkVimPlugin config {
+mkVimPlugin {
   name = "airline";
   originalName = "vim-airline";
   defaultPackage = pkgs.vimPlugins.vim-airline;

plugins/utils/bufdelete.nix

@@ -1,12 +1,11 @@
 {
-  config,
   helpers,
   pkgs,
   lib,
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "bufdelete";
   originalName = "bufdelete.nvim";
   defaultPackage = pkgs.vimPlugins.bufdelete-nvim;

plugins/utils/direnv.nix

@@ -1,12 +1,11 @@
 {
-  config,
   helpers,
   pkgs,
   lib,
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "direnv";
   originalName = "direnv.vim";
   defaultPackage = pkgs.vimPlugins.direnv-vim;

plugins/utils/emmet.nix

@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   helpers,
   pkgs,
   ...
 }:
 with lib;
 with helpers.vim-plugin;
-mkVimPlugin config {
+mkVimPlugin {
   name = "emmet";
   originalName = "emmet-vim";
   defaultPackage = pkgs.vimPlugins.emmet-vim;

plugins/utils/endwise.nix

@@ -1,11 +1,10 @@
 {
-  config,
   lib,
   pkgs,
   helpers,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "endwise";
   originalName = "vim-endwise";
   defaultPackage = pkgs.vimPlugins.vim-endwise;

plugins/utils/goyo.nix

@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   helpers,
   pkgs,
   ...
 }:
 with helpers.vim-plugin;
 with lib;
-mkVimPlugin config {
+mkVimPlugin {
   name = "goyo";
   originalName = "goyo.vim";
   defaultPackage = pkgs.vimPlugins.goyo-vim;

plugins/utils/improved-search.nix

@@ -1,14 +1,13 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
 # This plugin is only configured through keymaps, so we use `mkVimPlugin` without the
 # `globalPrefix` argument to avoid the creation of the `settings` option.
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "improved-search";
   originalName = "improved-search.nvim";
   defaultPackage = pkgs.vimPlugins.improved-search-nvim;

plugins/utils/instant.nix

@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   helpers,
   pkgs,
   ...
 }:
 with lib;
 with helpers.vim-plugin;
-mkVimPlugin config {
+mkVimPlugin {
   name = "instant";
   originalName = "instant.nvim";
   defaultPackage = pkgs.vimPlugins.instant-nvim;

plugins/utils/magma-nvim.nix

@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   helpers,
   pkgs,
   ...
 }:
 with lib;
 with helpers.vim-plugin;
-mkVimPlugin config {
+mkVimPlugin {
   name = "magma-nvim";
   originalName = "magma-nvim";
   defaultPackage = pkgs.vimPlugins.magma-nvim-goose;

plugins/utils/molten.nix

@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   helpers,
   pkgs,
   ...
 }:
 with lib;
 with helpers.vim-plugin;
-mkVimPlugin config {
+mkVimPlugin {
   name = "molten";
   originalName = "molten-nvim";
   defaultPackage = pkgs.vimPlugins.molten-nvim;

plugins/utils/sandwich.nix

@@ -1,12 +1,11 @@
 {
   lib,
-  config,
   helpers,
   pkgs,
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "sandwich";
   originalName = "vim-sandwich";
   defaultPackage = pkgs.vimPlugins.vim-sandwich;

plugins/utils/sleuth.nix

@@ -1,11 +1,10 @@
 {
-  config,
   lib,
   helpers,
   pkgs,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "sleuth";
   originalName = "vim-sleuth";
   defaultPackage = pkgs.vimPlugins.vim-sleuth;

plugins/utils/startify/default.nix

@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   helpers,
   pkgs,
   ...
 }:
 with lib;
 with helpers.vim-plugin;
-mkVimPlugin config {
+mkVimPlugin {
   name = "startify";
   originalName = "vim-startify";
   defaultPackage = pkgs.vimPlugins.vim-startify;

plugins/utils/surround.nix

@@ -1,11 +1,10 @@
 {
-  config,
   lib,
   helpers,
   pkgs,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "surround";
   originalName = "surround.vim";
   defaultPackage = pkgs.vimPlugins.vim-surround;

plugins/utils/tmux-navigator.nix

@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "tmux-navigator";
   originalName = "vim-tmux-navigator";
   defaultPackage = pkgs.vimPlugins.vim-tmux-navigator;

plugins/utils/undotree.nix

@@ -1,13 +1,12 @@
 {
   lib,
-  config,
   helpers,
   pkgs,
   ...
 }:
 with lib;
 with helpers.vim-plugin;
-mkVimPlugin config {
+mkVimPlugin {
   name = "undotree";
   defaultPackage = pkgs.vimPlugins.undotree;
   globalPrefix = "undotree_";

plugins/utils/vim-css-color.nix

@@ -1,10 +1,9 @@
 {
-  config,
   helpers,
   pkgs,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "vim-css-color";
   defaultPackage = pkgs.vimPlugins.vim-css-color;
 

plugins/utils/wakatime.nix

@@ -1,12 +1,11 @@
 {
   lib,
   helpers,
-  config,
   pkgs,
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin config {
+helpers.vim-plugin.mkVimPlugin {
   name = "wakatime";
   originalName = "vim-wakatime";
   defaultPackage = pkgs.vimPlugins.vim-wakatime;