harald/nixcfg
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: harald:30754f521152314a10dccc6d07a4c7ee8b40c01c
Branches Tags
harald:main
harald:b24.05
..
compare: harald:d49029f7cda5f3603f661906f76e123987f5786c
Branches Tags
harald:main
harald:b24.05

2 commits
30754f5211 ... d49029f7cd

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
1 changed files with 1 additions and 3 deletions
Show stats Expand all files Collapse all files

4
modules/nixos/user/default.nix
View file

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