colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fish: use the subcommand style for the status command

Browse Source 
The flag style has been deprecated and will eventually be removed.
This commit is contained in:
r-vdp 2023-10-19 08:40:56 +02:00
parent 458ef9126a
commit 97e3336a5b
No known key found for this signature in database
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/programs/fish.nix
View File

@ -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}

2
pkgs/shells/fish/default.nix
View File

@ -79,7 +79,7 @@ let
# note that this is required:
# 1. For all shells, not just login shells (mosh needs this as do some other command-line utilities)
# 2. Before the shell is initialized, so that config snippets can find the commands they use on the PATH
builtin status --is-login
builtin status is-login
or test -z "$__fish_nixos_env_preinit_sourced" -a -z "$ETC_PROFILE_SOURCED" -a -z "$ETC_ZSHENV_SOURCED"
${if fishEnvPreInit != null then ''
and begin

2
pkgs/shells/fish/wrapper.nix
View File

@ -18,7 +18,7 @@ let
name = "wrapfish.aliases.fish";
destination = "/share/fish/vendor_conf.d/aliases.fish";
text = ''
status --is-interactive; and begin
status is-interactive; and begin
# Aliases
${aliasesStr}
end