@@ -112,7 +112,7 @@ in
112112 environment.etc."fish/nixos-env-preinit.fish".text = ''
113113 # This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently
114114 # unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish
115− set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $__fish_datadir/functions
115+ set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d $__fish_datadir/functions
116116
117117 # source the NixOS environment config
118118 if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]
@@ -128,7 +128,7 @@ in
128128
129129 # if we haven't sourced the general config, do it
130130 if not set -q __fish_nixos_general_config_sourced
131− set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
131+ set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
132132 fenv source /etc/fish/foreign-env/shellInit > /dev/null
133133 set -e fish_function_path[1]
134134
@@ -142,7 +142,7 @@ in
142142 # if we haven't sourced the login config, do it
143143 status --is-login; and not set -q __fish_nixos_login_config_sourced
144144 and begin
145− set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
145+ set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
146146 fenv source /etc/fish/foreign-env/loginShellInit > /dev/null
147147 set -e fish_function_path[1]
148148
@@ -158,7 +158,7 @@ in
158158 and begin
159159 ${fishAliases}
160160
161− set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
161+ set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
162162 fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null
163163 set -e fish_function_path[1]
164164