LnL7/nix-darwin
1
1
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-08-17 00:20:44 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #471 from tianyaochou/fix-alias-shell-escape

Browse Source 
add escape to shell aliases
This commit is contained in:
Domen Kožar 2022-08-22 09:52:46 +02:00 committed by GitHub
commit b344a20e80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/environment/default.nix
View File

@ -9,7 +9,8 @@ let
mapAttrsToList (n: v: ''export ${n}="${v}"'') cfg.variables;
aliasCommands =
mapAttrsFlatten (n: v: ''alias ${n}="${v}"'') cfg.shellAliases;
mapAttrsFlatten (n: v: ''alias ${n}=${escapeShellArg v}'')
(filterAttrs (k: v: v != null) cfg.shellAliases);
makeDrvBinPath = concatMapStringsSep ":" (p: if isDerivation p then "${p}/bin" else p);
in

3
modules/programs/fish.nix
View File

@ -9,7 +9,8 @@ let
cfg = config.programs.fish;
fishAliases = concatStringsSep "\n" (
mapAttrsFlatten (k: v: "alias ${k} '${v}'") cfg.shellAliases
mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}")
(filterAttrs (k: v: v != null) cfg.shellAliases)
);
envShellInit = pkgs.writeText "shellInit" cfge.shellInit;

2
tests/programs-zsh.nix
View File

@ -43,6 +43,6 @@
echo >&2 "checking zsh variables in /etc/zprofile"
grep 'FOO="42"' ${config.out}/etc/zprofile
echo >&2 "checking shell aliases in /etc/zprofile"
grep 'alias ls="ls -G"' ${config.out}/etc/zprofile
grep "alias ls='ls -G'" ${config.out}/etc/zprofile
'';
}