Merge fa660627fc into fd65c83956

modules/default.nix

@@ -9,7 +9,7 @@ inputs: {
   inherit (pkgs) vimPlugins;
   inherit (lib.strings) isString toString;
   inherit (lib.lists) filter map concatLists;
-  inherit (lib.attrsets) recursiveUpdate;
+  inherit (lib.attrsets) recursiveUpdate getAttr;
   inherit (builtins) baseNameOf;
 
   # import modules.nix with `check`, `pkgs` and `lib` as arguments
@@ -32,21 +32,14 @@ inputs: {
   # build a vim plugin with the given name and arguments
   # if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug
   # instead
-  buildPlug = attrs: let
+  buildPlug = {pname, ...} @ attrs: let
-    src = inputs."plugin-${attrs.pname}";
+    src = getAttr ("plugin-" + pname) inputs;
   in
     pkgs.stdenvNoCC.mkDerivation ({
         version = src.shortRev or src.shortDirtyRev or "dirty";
 
         inherit src;
 
-        nativeBuildInputs = with pkgs.vimUtils; [
-          vimCommandCheckHook
-          vimGenDocHook
-          neovimRequireCheckHook
-        ];
-        passthru.vimPlugin = true;
-
         buildPhase = lib.optionalString vimOptions.byteCompileLua ''
           runHook preBuild
           find . -type f -name '*.lua' -exec luajit -bd -- {} {} \;
@@ -66,25 +59,30 @@ inputs: {
 
   buildTreesitterPlug = grammars: vimPlugins.nvim-treesitter.withPlugins (_: grammars);
 
-  pluginBuilders = {
-    nvim-treesitter = buildTreesitterPlug vimOptions.treesitter.grammars;
-    flutter-tools-patched =
-      buildPlug
-      {
-        pname = "flutter-tools";
-        patches = [../patches/flutter-tools.patch];
-      };
-  };
-
   buildConfigPlugins = plugins:
     map
-    (
+    (plug: (
-      plug:
+      if (isString plug)
-        if (isString plug)
+      then
-        then pluginBuilders.${plug} or (buildPlug {pname = plug;})
+        (
-        else plug
+          if (plug == "nvim-treesitter")
-    )
+          then (buildTreesitterPlug vimOptions.treesitter.grammars)
-    (filter (f: f != null) plugins);
+          else if (plug == "flutter-tools-patched")
+          then
+            (
+              buildPlug
+              {
+                pname = "flutter-tools";
+                patches = [../patches/flutter-tools.patch];
+              }
+            )
+          else buildPlug {pname = plug;}
+        )
+      else plug
+    ))
+    (filter
+      (f: f != null)
+      plugins);
 
   # built (or "normalized") plugins that are modified
   builtStartPlugins = buildConfigPlugins vimOptions.startPlugins;