Skip to content

Commit

Permalink
Merge pull request #1019 from qowoz/flatten
Browse files Browse the repository at this point in the history
`mapAttrsFlatten` -> `mapAttrsToList`
  • Loading branch information
emilazy committed Jul 27, 2024
2 parents 72bbc11 + e88eb66 commit 980c706
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion modules/environment/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion modules/programs/fish.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);

Expand Down

0 comments on commit 980c706

Please sign in to comment.