chore(lib): adjust order

tao3k · Feb 20, 2024 · ce35a44 · ce35a44
1 parent 2ede5bd
commit ce35a44
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/src/errors/requiredInputsLazily.nix b/src/errors/requiredInputsLazily.nix
@@ -1,6 +1,6 @@
 { super, lib }:
-inputs: _pop: listInputs:
+inputs: popName: listInputs:
 let
-  getRequiredInput = key: (super.requiredInputs inputs "test" [ key ]).${key};
+  getRequiredInput = key: (super.requiredInputs inputs popName [ key ]).${key};
 in
 lib.genAttrs listInputs (name: getRequiredInput name)
diff --git a/src/lib/omnibus/inputsToPaths.nix b/src/lib/omnibus/inputsToPaths.nix
@@ -57,7 +57,9 @@ let
     inputs:
     l.pipe inputs [
       (l.filterAttrs (_: v: l.isAttrs v && (v ? sourceInfo.outPath || v ? outPath)))
-      (l.mapAttrs (_: v: v.sourceInfo.outPath or v.outPath or v.path))
+      (l.mapAttrs (
+        _: v: if !v ? _type then v.outPath or v.path or v.sourceInfo.outPath else ""
+      ))
       (l.mapAttrs (
         _: v: if lib.strings.isStorePath v then getTopLevelPath (toString v) else [ ]
       ))

diff --git a/tests/_snapshots/lib b/tests/_snapshots/lib
@@ -1,6 +1,7 @@
 #pretty
 {
   inputsToPaths = [
+    "/nix/store/w065s95yy5k456kwa1h6bg9mc46gy89n-tracing-log-0.4.0"
     "/nix/store/w065s95yy5k456kwa1h6bg9mc46gy89n-tracing-log-0.2.0"
     "/nix/store/w065s95yy5k456kwa1h6bg9mc46gy89n-tracing-log-0.3.0"
   ];

diff --git a/tests/lib/expr.nix b/tests/lib/expr.nix
@@ -25,9 +25,10 @@ in
           outPath = "<PATH-a.b>";
         };
         c = {
-          outPath = "<PATH-a.c>";
+          outPath = "/nix/store/w065s95yy5k456kwa1h6bg9mc46gy89n-tracing-log-0.4.0";
         };
       };
+      _type = "flake";
       outPath = "/nix/store/w065s95yy5k456kwa1h6bg9mc46gy89n-tracing-log-0.3.0";
     };
   };

diff --git a/units/nixos/homeProfiles/presets/starship/starship.toml b/units/nixos/homeProfiles/presets/starship/starship.toml
@@ -3,3 +3,6 @@ add_newline = true
 
 [character]
 success_symbol = "[λ](bold blue)"
+
+[git_status]
+ignore_submodules = true