diff options
| author | Gregor Kleen <pngwjpgh@users.noreply.github.com> | 2018-05-19 10:14:45 +0200 |
|---|---|---|
| committer | Gregor Kleen <pngwjpgh@users.noreply.github.com> | 2018-05-19 10:17:41 +0200 |
| commit | effb02131cd9f028c77f8c96ffccfbbaa05e020b (patch) | |
| tree | 45c1ac9acc2f805a9974df1de6feebcd4477d597 /nixos/modules/programs/zsh/zsh.nix | |
| parent | 301072dc271edc84f722e1bac508f4ed0d4700d3 (diff) | |
| download | nixpkgs-effb02131cd9f028c77f8c96ffccfbbaa05e020b.tar nixpkgs-effb02131cd9f028c77f8c96ffccfbbaa05e020b.tar.gz nixpkgs-effb02131cd9f028c77f8c96ffccfbbaa05e020b.tar.bz2 nixpkgs-effb02131cd9f028c77f8c96ffccfbbaa05e020b.tar.lz nixpkgs-effb02131cd9f028c77f8c96ffccfbbaa05e020b.tar.xz nixpkgs-effb02131cd9f028c77f8c96ffccfbbaa05e020b.tar.zst nixpkgs-effb02131cd9f028c77f8c96ffccfbbaa05e020b.zip | |
Revert "zsh: move setEnvironment stuff to zprofile"
This reverts commit 77a6cbb1c1feeb6b6424d35319ac6226c780b34a.
Diffstat (limited to 'nixos/modules/programs/zsh/zsh.nix')
| -rw-r--r-- | nixos/modules/programs/zsh/zsh.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index b88f54678ee..f689250dc61 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -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} |