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

Compare commits

base: harald:f9b03ff4426d69b3a8c98b0b603a1007755024c5
Branches Tags
harald:main
harald:b24.05
..
compare: harald:d49029f7cda5f3603f661906f76e123987f5786c
Branches Tags
harald:main
harald:b24.05

2 commits
f9b03ff442 ... 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
2 changed files with 12 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": {

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

@ -73,6 +73,14 @@ in
}".source = }".source =
cfg.icon; cfg.icon;
}; };
extraOptions.programs.bash.initExtra = ''
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=""
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
fi
'';
}; };
users.users.${cfg.name} = users.users.${cfg.name} =
@ -85,7 +93,7 @@ in
home = "/home/${cfg.name}"; home = "/home/${cfg.name}";
group = "users"; group = "users";
shell = pkgs.fish; shell = pkgs.bash;
# Arbitrary user ID to use for the user. Since I only # Arbitrary user ID to use for the user. Since I only
# have a single user on my machines this won't ever collide. # have a single user on my machines this won't ever collide.