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

fish: fix regression due to changes in Nixpkgs

Browse source 
Fixes #1701
Fixes #1702
This commit is contained in:
meck 2021-01-07 14:46:03 +01:00 committed by Robert Helgesson
parent cb1ed0d2f3
commit e8358125d9
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/programs/fish.nix
View file

@ -343,7 +343,12 @@ in {
# if we haven't sourced the general config, do it # if we haven't sourced the general config, do it
if not set -q __fish_general_config_sourced if not set -q __fish_general_config_sourced
set -p fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions set --prepend fish_function_path ${
if pkgs ? fishPlugins && pkgs.fishPlugins ? foreign-env then
"${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d"
else
"${pkgs.fish-foreign-env}/share/fish-foreign-env/functions"
}
fenv source ${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh > /dev/null fenv source ${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh > /dev/null
set -e fish_function_path[1] set -e fish_function_path[1]