diff options
| author | rnhmjoj <micheleguerinirocco@me.com> | 2016-05-26 00:09:16 +0200 |
|---|---|---|
| committer | rnhmjoj <micheleguerinirocco@me.com> | 2016-05-26 00:10:22 +0200 |
| commit | 17ec9368cd9716e91689744bb6fedc97a02b6ef3 (patch) | |
| tree | 425649f3edbf7c4ed6c5801efaa6c72dc0f706b8 /nixos | |
| parent | c6b3aca4e277c7ab6d1cdd3f07038a22ac27b06a (diff) | |
| download | nixlib-17ec9368cd9716e91689744bb6fedc97a02b6ef3.tar nixlib-17ec9368cd9716e91689744bb6fedc97a02b6ef3.tar.gz nixlib-17ec9368cd9716e91689744bb6fedc97a02b6ef3.tar.bz2 nixlib-17ec9368cd9716e91689744bb6fedc97a02b6ef3.tar.lz nixlib-17ec9368cd9716e91689744bb6fedc97a02b6ef3.tar.xz nixlib-17ec9368cd9716e91689744bb6fedc97a02b6ef3.tar.zst nixlib-17ec9368cd9716e91689744bb6fedc97a02b6ef3.zip | |
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 ''; |