diff options
| author | Emily <vcs@emily.moe> | 2024-07-27 12:38:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-27 12:38:35 +0100 |
| commit | 980c7066fc8f1cc020b503e2592ea67efdfac227 (patch) | |
| tree | e6604fd2a08e8def1dd2e038c71f9b11416f4f31 /modules | |
| parent | 72bbc11aedcaba6f9a748786bb0aff9213d8fb36 (diff) | |
| parent | e88eb66c2b5e7066786f5d6343f3737567a71734 (diff) | |
Merge pull request #1019 from qowoz/flatten
`mapAttrsFlatten` -> `mapAttrsToList`
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/environment/default.nix | 2 | ||||
| -rw-r--r-- | modules/programs/fish.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/environment/default.nix b/modules/environment/default.nix index bb99622..3b97a3e 100644 --- a/modules/environment/default.nix +++ b/modules/environment/default.nix @@ -9,7 +9,7 @@ let mapAttrsToList (n: v: ''export ${n}="${v}"'') cfg.variables; aliasCommands = - mapAttrsFlatten (n: v: ''alias ${n}=${escapeShellArg v}'') + mapAttrsToList (n: v: ''alias ${n}=${escapeShellArg v}'') (filterAttrs (k: v: v != null) cfg.shellAliases); makeDrvBinPath = concatMapStringsSep ":" (p: if isDerivation p then "${p}/bin" else p); diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix index 77276e6..4b76e02 100644 --- a/modules/programs/fish.nix +++ b/modules/programs/fish.nix @@ -9,7 +9,7 @@ let cfg = config.programs.fish; fishAliases = concatStringsSep "\n" ( - mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}") + mapAttrsToList (k: v: "alias ${k} ${escapeShellArg v}") (filterAttrs (k: v: v != null) cfg.shellAliases) ); |