From eee459367cb4ad63ecc967395a96e14805bfa913 Mon Sep 17 00:00:00 2001 From: guangtao Date: Tue, 20 Feb 2024 18:45:05 -0800 Subject: [PATCH] fix: add missing key --- local/lock/flake.lock | 12 ++++++------ src/errors/requiredInputsLazily.nix | 4 ++-- src/lib/omnibus/inputsToPaths.nix | 2 +- .../homeProfiles/presets/starship/starship.toml | 3 +++ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/local/lock/flake.lock b/local/lock/flake.lock index 8a5855a..fb3d50b 100644 --- a/local/lock/flake.lock +++ b/local/lock/flake.lock @@ -1030,11 +1030,11 @@ ] }, "locked": { - "lastModified": 1706802240, - "narHash": "sha256-wMjvtBszSiEFzT5YJ8LkRAJa1qrTdabSHfyJmV1SVyI=", + "lastModified": 1708365605, + "narHash": "sha256-ghahJtlSmBi99bAWko8VeTLRgHdGoxCjhYCT4LzWQkw=", "owner": "tweag", "repo": "nickel", - "rev": "201741a312b3c8c7ea8e0d6f6b5979fe6ba5d2f7", + "rev": "0b294a20e8f928503b0a05462cc1c035c0785a9c", "type": "github" }, "original": { @@ -2263,11 +2263,11 @@ "yants": "yants" }, "locked": { - "lastModified": 1708355225, - "narHash": "sha256-gY+W86qCSwMuOqM/HSgK9nittcWKvjEb+TpmZnJQTnE=", + "lastModified": 1708473028, + "narHash": "sha256-z5/UbogAnRVlyT2qZPqUUb5yPLgGxO+iWAy4pxBjDAQ=", "owner": "divnix", "repo": "std", - "rev": "85d3d38c57b0214f21daaa0fb64f16e6a6b4ccc2", + "rev": "151ecce8eecc8d0fd15d9fcd75d59a45ebdcd7ee", "type": "github" }, "original": { diff --git a/src/errors/requiredInputsLazily.nix b/src/errors/requiredInputsLazily.nix index 936841b..96fab71 100644 --- 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 index 26a18c8..7cf83ac 100644 --- a/src/lib/omnibus/inputsToPaths.nix +++ b/src/lib/omnibus/inputsToPaths.nix @@ -57,7 +57,7 @@ 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: v.outPath or v.sourceInfo.outPath or v.path)) (l.mapAttrs ( _: v: if lib.strings.isStorePath v then getTopLevelPath (toString v) else [ ] )) diff --git a/units/nixos/homeProfiles/presets/starship/starship.toml b/units/nixos/homeProfiles/presets/starship/starship.toml index fb54365..b306890 100644 --- 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