diff options
| author | Sam Grayson <sam@samgrayson.me> | 2023-10-25 23:09:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-25 23:09:33 -0500 |
| commit | 14ffe0e240a19beafd39921ed0f9351fa63b6a7e (patch) | |
| tree | db13b8508985ad3da040e60583df1cbfa37a38ab /nixos/modules/programs/fish.nix | |
| parent | da32d38b1c52ba6d324ae382ec9d852b7c9da0f0 (diff) | |
| parent | 77ed358e3d7945116cd0641d10928b5ee14c4db1 (diff) | |
| download | nixlib-14ffe0e240a19beafd39921ed0f9351fa63b6a7e.tar nixlib-14ffe0e240a19beafd39921ed0f9351fa63b6a7e.tar.gz nixlib-14ffe0e240a19beafd39921ed0f9351fa63b6a7e.tar.bz2 nixlib-14ffe0e240a19beafd39921ed0f9351fa63b6a7e.tar.lz nixlib-14ffe0e240a19beafd39921ed0f9351fa63b6a7e.tar.xz nixlib-14ffe0e240a19beafd39921ed0f9351fa63b6a7e.tar.zst nixlib-14ffe0e240a19beafd39921ed0f9351fa63b6a7e.zip | |
Merge branch 'NixOS:master' into patch-1
Diffstat (limited to 'nixos/modules/programs/fish.nix')
| -rw-r--r-- | nixos/modules/programs/fish.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index b500b8f24b2c..e6ac6e9957ba 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -208,7 +208,7 @@ in end # if we haven't sourced the login config, do it - status --is-login; and not set -q __fish_nixos_login_config_sourced + status is-login; and not set -q __fish_nixos_login_config_sourced and begin ${sourceEnv "loginShellInit"} @@ -220,7 +220,7 @@ in end # if we haven't sourced the interactive config, do it - status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced + status is-interactive; and not set -q __fish_nixos_interactive_config_sourced and begin ${fishAbbrs} ${fishAliases} |