public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos: zsh: move NixOS-specific variables from /etc/zshrc to /etc/zshenv

Browse Source 
We want these to be set even when /etc/zshrc loading is disabled.
This commit is contained in:
Jan Malakhovski 2019-08-24 05:36:02 +00:00
parent 20b5f89384
commit f70e3f3738
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/programs/zsh/zsh.nix
View File

@ -147,6 +147,13 @@ in
. ${config.system.build.setEnvironment} . ${config.system.build.setEnvironment}
fi fi
HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
# Tell zsh how to find installed completions
for p in ''${(z)NIX_PROFILES}; do
fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
done
${cfge.shellInit} ${cfge.shellInit}
${cfg.shellInit} ${cfg.shellInit}
@ -192,13 +199,6 @@ in
HISTSIZE=${toString cfg.histSize} HISTSIZE=${toString cfg.histSize}
HISTFILE=${cfg.histFile} HISTFILE=${cfg.histFile}
HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
# Tell zsh how to find installed completions
for p in ''${(z)NIX_PROFILES}; do
fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
done
${optionalString cfg.enableGlobalCompInit "autoload -U compinit && compinit"} ${optionalString cfg.enableGlobalCompInit "autoload -U compinit && compinit"}
${cfge.interactiveShellInit} ${cfge.interactiveShellInit}