diff options
| author | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-05-28 00:53:12 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-05-28 00:53:12 +0200 |
| commit | 44548c8a9ea15e6190d0406e794f464e5d16b91a (patch) | |
| tree | 480d9357c34409db2f754ba69b38af9dcf70ca2d /nixos | |
| parent | 852fa5cc599ed6ffdbf8db948471d80df64a658a (diff) | |
| parent | 17ec9368cd9716e91689744bb6fedc97a02b6ef3 (diff) | |
| download | nixlib-44548c8a9ea15e6190d0406e794f464e5d16b91a.tar nixlib-44548c8a9ea15e6190d0406e794f464e5d16b91a.tar.gz nixlib-44548c8a9ea15e6190d0406e794f464e5d16b91a.tar.bz2 nixlib-44548c8a9ea15e6190d0406e794f464e5d16b91a.tar.lz nixlib-44548c8a9ea15e6190d0406e794f464e5d16b91a.tar.xz nixlib-44548c8a9ea15e6190d0406e794f464e5d16b91a.tar.zst nixlib-44548c8a9ea15e6190d0406e794f464e5d16b91a.zip | |
Merge pull request #15596 from rnhmjoj/master
fish: 2.2.0 -> 2.3.0
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/programs/fish.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 7a4b78118ce6..a99c98e166dc 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -84,19 +84,19 @@ in set fish_function_path $fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions - fenv source ${config.system.build.setEnvironment} 1> /dev/null - fenv source /etc/fish/foreign-env/shellInit 1> /dev/null + fenv source ${config.system.build.setEnvironment} > /dev/null ^&1 + fenv source /etc/fish/foreign-env/shellInit > /dev/null ${cfg.shellInit} - if builtin status --is-login - fenv source /etc/fish/foreign-env/loginShellInit 1> /dev/null + if status --is-login + fenv source /etc/fish/foreign-env/loginShellInit > /dev/null ${cfg.loginShellInit} end - if builtin status --is-interactive + if status --is-interactive ${fishAliases} - fenv source /etc/fish/foreign-env/interactiveShellInit 1> /dev/null + fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null ${cfg.interactiveShellInit} end ''; |