diff --git a/flake.lock b/flake.lock index 7960637..cb96378 100644 --- a/flake.lock +++ b/flake.lock @@ -2507,11 +2507,11 @@ }, "unstable": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "type": "github" }, "original": { diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix index 766f3f3..2769936 100644 --- a/modules/nixos/user/default.nix +++ b/modules/nixos/user/default.nix @@ -73,14 +73,6 @@ in }".source = 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} = @@ -93,7 +85,7 @@ in home = "/home/${cfg.name}"; group = "users"; - shell = pkgs.bash; + shell = pkgs.fish; # Arbitrary user ID to use for the user. Since I only # have a single user on my machines this won't ever collide.