modules/performance: handle plugin configs when combining plugins

modules/top-level/output.nix

@@ -80,7 +80,7 @@ in
         let
           defaultPlugin = {
             plugin = null;
-            config = "";
+            config = null;
             optional = false;
           };
         in
@@ -129,25 +129,36 @@ in
               deps = map (p: p.plugin.python3Dependencies or (_: [ ])) startPlugins;
             in
             ps: builtins.concatMap (f: f ps) deps;
+
+          # Combined plugin
+          combinedPlugin = pkgs.vimUtils.toVimPlugin (
+            pkgs.buildEnv {
+              name = "plugin-pack";
+              paths = overriddenPlugins;
+              inherit (config.performance.combinePlugins) pathsToLink;
+              # Remove empty directories and activate vimGenDocHook
+              postBuild = ''
+                find $out -type d -empty -delete
+                runHook preFixup
+              '';
+              passthru = {
+                inherit python3Dependencies;
+              };
+            }
+          );
+
+          # Combined plugin configs
+          combinedConfig = builtins.concatStringsSep "\n" (
+            builtins.concatMap (x: lib.optional (x.config != null && x.config != "") x.config) startPlugins
+          );
         in
-        pkgs.vimUtils.toVimPlugin (
+        normalize {
-          pkgs.buildEnv {
+          plugin = combinedPlugin;
-            name = "plugin-pack";
+          config = combinedConfig;
-            paths = overriddenPlugins;
+        };
-            inherit (config.performance.combinePlugins) pathsToLink;
-            # Remove empty directories and activate vimGenDocHook
-            postBuild = ''
-              find $out -type d -empty -delete
-              runHook preFixup
-            '';
-            passthru = {
-              inherit python3Dependencies;
-            };
-          }
-        );
 
       # Combined plugins
-      combinedPlugins = [ (normalize pluginPack) ] ++ optPlugins;
+      combinedPlugins = [ pluginPack ] ++ optPlugins;
 
       # Plugins to use in finalPackage
       plugins = if config.performance.combinePlugins.enable then combinedPlugins else normalizedPlugins;

tests/test-sources/modules/performance/combine-plugins.nix

@@ -1,4 +1,7 @@
 { pkgs, ... }:
+let
+  pluginCount = pkg: type: builtins.length pkg.packpathDirs.myNeovimPackages.${type};
+in
 {
   # Test basic functionality
   default.module =
@@ -25,7 +28,7 @@
       '';
       assertions = [
         {
-          assertion = builtins.length config.finalPackage.packpathDirs.myNeovimPackages.start == 1;
+          assertion = pluginCount config.finalPackage "start" == 1;
           message = "More than one plugin is defined in packpathDirs, expected one plugin pack.";
         }
       ];
@@ -42,7 +45,7 @@
       ];
       assertions = [
         {
-          assertion = builtins.length config.finalPackage.packpathDirs.myNeovimPackages.start >= 2;
+          assertion = pluginCount config.finalPackage "start" >= 2;
           message = "Only one plugin is defined in packpathDirs, expected at least two.";
         }
       ];
@@ -69,7 +72,7 @@
       '';
       assertions = [
         {
-          assertion = builtins.length config.finalPackage.packpathDirs.myNeovimPackages.start == 1;
+          assertion = pluginCount config.finalPackage "start" == 1;
           message = "More than one plugin is defined in packpathDirs.";
         }
       ];
@@ -97,7 +100,7 @@
       '';
       assertions = [
         {
-          assertion = builtins.length config.finalPackage.packpathDirs.myNeovimPackages.start == 1;
+          assertion = pluginCount config.finalPackage "start" == 1;
           message = "More than one plugin is defined in packpathDirs.";
         }
       ];
@@ -124,7 +127,7 @@
       '';
       assertions = [
         {
-          assertion = builtins.length config.finalPackage.packpathDirs.myNeovimPackages.start == 1;
+          assertion = pluginCount config.finalPackage "start" == 1;
           message = "More than one plugin is defined in packpathDirs.";
         }
       ];
@@ -176,19 +179,58 @@
           "plenary-nvim is duplicated"
         )
       '';
-      assertions =
+      assertions = [
-        let
+        {
-          packages = config.finalPackage.packpathDirs.myNeovimPackages;
+          assertion = pluginCount config.finalPackage "start" == 1;
-        in
+          message = "More than one start plugin is defined in packpathDirs";
-        [
+        }
-          {
+        {
-            assertion = builtins.length packages.start == 1;
+          assertion = pluginCount config.finalPackage "opt" == 2;
-            message = "More than one start plugin is defined in packpathDirs";
+          message = "Less than two opt plugins are defined in packpathDirs";
-          }
+        }
-          {
+      ];
-            assertion = builtins.length packages.opt == 2;
+    };
-            message = "Less than two opt plugins are defined in packpathDirs";
+
-          }
+  # Test that plugin configs are handled
-        ];
+  configs.module =
+    { config, ... }:
+    {
+      performance.combinePlugins.enable = true;
+      extraPlugins = with pkgs.vimPlugins; [
+        # A plugin without config
+        plenary-nvim
+        # Plugins with configs
+        {
+          plugin = nvim-treesitter;
+          config = "let g:treesitter_config = 1";
+        }
+        {
+          plugin = nvim-lspconfig;
+          config = "let g:lspconfig_config = 1";
+        }
+        # Optional plugin with config
+        {
+          plugin = telescope-nvim;
+          optional = true;
+          config = "let g:telescope_config = 1";
+        }
+      ];
+      extraConfigLuaPost = ''
+        -- Plugins are loadable
+        require("plenary")
+        require("nvim-treesitter")
+        require("lspconfig")
+
+        -- Configs are evaluated
+        assert(vim.g.treesitter_config == 1, "nvim-treesitter config isn't evaluated")
+        assert(vim.g.lspconfig_config == 1, "nvim-lspconfig config isn't evaluated")
+        assert(vim.g.telescope_config == 1, "telescope-nvim config isn't evaluated")
+      '';
+      assertions = [
+        {
+          assertion = pluginCount config.finalPackage "start" == 1;
+          message = "More than one start plugin is defined in packpathDirs";
+        }
+      ];
     };
 }