Merge pull request #40223 from jD91mZM2/shouldnt-we-just-use-the-pam-…

…environment-file-instead zsh: move setEnvironment stuff to zprofile
NixOS · May 16, 2018 · 485fe9e · 485fe9e
2 parents 11e908e + 77a6cbb
commit 485fe9e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
@@ -108,8 +108,6 @@ in
         if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
         export __ETC_ZSHENV_SOURCED=1
 
-        ${config.system.build.setEnvironment.text}
-
         ${cfge.shellInit}
 
         ${cfg.shellInit}
@@ -129,6 +127,8 @@ in
         if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi
         __ETC_ZPROFILE_SOURCED=1
 
+        ${config.system.build.setEnvironment.text}
+
         ${cfge.loginShellInit}
 
         ${cfg.loginShellInit}