movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge branch 'master' into staging

Browse source
This commit is contained in:
Robert Schütz 2018-05-19 11:12:19 +02:00
commit 90c0100139
24 changed files with 563 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/programs/zsh/zsh.nix
View file

@ -108,6 +108,8 @@ in
if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
export __ETC_ZSHENV_SOURCED=1
${config.system.build.setEnvironment.text}
${cfge.shellInit}
${cfg.shellInit}
@ -127,8 +129,6 @@ in
if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi
__ETC_ZPROFILE_SOURCED=1
${config.system.build.setEnvironment.text}
${cfge.loginShellInit}
${cfg.loginShellInit}