eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-23 11:39:46 +01:00
Code Issues Releases Wiki Activity

fish: remove superfluous config guard

Browse source
This commit is contained in:
Kid 2021-07-29 19:37:16 +08:00 committed by Robert Helgesson
parent 81ec2aed8a
commit 9b04ff5e3b
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
1 changed files with 9 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
modules/programs/fish.nix
View file

@ -340,41 +340,24 @@ in {
# ~/.config/fish/config.fish: DO NOT EDIT -- this file has been generated # ~/.config/fish/config.fish: DO NOT EDIT -- this file has been generated
# automatically by home-manager. # automatically by home-manager.
# if we haven't sourced the general config, do it # Only execute this file once per shell.
if not set -q __fish_general_config_sourced set -q __fish_home_manager_config_sourced; and exit
set -g __fish_home_manager_config_sourced 1
set --prepend fish_function_path ${ set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
if pkgs ? fishPlugins && pkgs.fishPlugins ? foreign-env then fenv source ${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh > /dev/null
"${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d" set -e fish_function_path[1]
else
"${pkgs.fish-foreign-env}/share/fish-foreign-env/functions"
}
fenv source ${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh > /dev/null
set -e fish_function_path[1]
${cfg.shellInit} ${cfg.shellInit}
# and leave a note so we don't source this config section again from
# this very shell (children will source the general config anew)
set -g __fish_general_config_sourced 1
end status --is-login; and begin
# if we haven't sourced the login config, do it
status --is-login; and not set -q __fish_login_config_sourced
and begin
# Login shell initialisation # Login shell initialisation
${cfg.loginShellInit} ${cfg.loginShellInit}
# and leave a note so we don't source this config section again from
# this very shell (children will source the general config anew)
set -g __fish_login_config_sourced 1
end end
# if we haven't sourced the interactive config, do it status --is-interactive; and begin
status --is-interactive; and not set -q __fish_interactive_config_sourced
and begin
# Abbreviations # Abbreviations
${abbrsStr} ${abbrsStr}
@ -388,11 +371,6 @@ in {
# Interactive shell intialisation # Interactive shell intialisation
${cfg.interactiveShellInit} ${cfg.interactiveShellInit}
# and leave a note so we don't source this config section again from
# this very shell (children will source the general config anew,
# allowing configuration changes in, e.g, aliases, to propagate)
set -g __fish_interactive_config_sourced 1
end end
''; '';
} }