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

Compare commits

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

2 commits
d49029f7cd ... 30754f5211

Author SHA1 Message Date
Harald Hoyer 30754f5211 different fish exec workaround 
Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
 2024-03-25 11:40:05 +01:00
Harald Hoyer d94278f8ac flake update 
Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
 2024-03-25 11:39:54 +01:00
2 changed files with 11 additions and 4 deletions
Show stats Expand all files Collapse all files

6
flake.lock
View file

@ -2507,11 +2507,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1710806803, "lastModified": 1711163522,
"narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

@ -73,8 +73,15 @@ in
}".source = }".source =
cfg.icon; cfg.icon;
}; };
extraOptions.programs.bash.initExtra = '' extraOptions.programs.bash.initExtra = ''
[[ $WANT_BASH ]] || exec ${pkgs.fish}/bin/fish -l 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
fi
''; '';
}; };