Compare commits

..

2 commits

Author SHA1 Message Date
Harald Hoyer d49029f7cd flake update
Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
2024-03-25 11:15:27 +01:00
Harald Hoyer 97696ec554 different fish exec workaround
Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
2024-03-25 11:15:05 +01:00

View file

@ -78,9 +78,7 @@ in
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
then
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
SHELL=/run/current-system/sw/bin/fish exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
else
[[ $SHELL == *fish ]] && SHELL=/run/current-system/sw/bin/bash
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
fi
'';
};