Use recursive flatten

josh · Sep 24, 2024 · c431ee3 · c431ee3
1 parent 0cd76f9
commit c431ee3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/flake.nix b/flake.nix
@@ -152,7 +152,7 @@
           formatting = treefmtEval.${pkgs.system}.config.build.check self;
 
           plugins = pkgs.runCommandLocal "plugins" {
-            buildInputs = lib.attrDerivations plugins;
+            buildInputs = lib.flattenDerivations plugins;
           } ''echo "ok" >$out'';
 
           help = pkgs.runCommandLocal "nvim-help" { } ''
@@ -172,6 +172,9 @@
           '';
 
           LazyVim-extras-catppuccin = plugins.LazyVim.extras."lazyvim.plugins".catppuccin;
+          # LazyVim-extras-all = pkgs.runCommandLocal "LazyVim-extras-all" {
+          #   buildInputs = lib.flattenDerivations plugins.LazyVim.extras;
+          # } ''echo "ok" >$out'';
         }
       );
     };

diff --git a/lib.nix b/lib.nix
@@ -2,9 +2,6 @@
 let
   inherit (nixpkgs) lib;
 
-  # attrDerivations :: AttrSet -> [ Derivation ]
-  attrDerivations = attrset: builtins.filter lib.attrsets.isDerivation (builtins.attrValues attrset);
-
   # flattenDerivations :: AttrSet -> [ Derivation ]
   flattenDerivations =
     attrset:
@@ -122,7 +119,6 @@ let
 in
 {
   inherit
-    attrDerivations
     flattenDerivations
     defaultLazyOpts
     makeLazyNeovimConfig