srid: use zsh everywhere

srid · Oct 26, 2024 · 2996dd6 · 2996dd6
1 parent 34ab0b4
commit 2996dd6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/configurations/nixos/vixen/default.nix b/configurations/nixos/vixen/default.nix
@@ -21,7 +21,6 @@ in
   services.fprintd.enable = true;
 
   programs.nix-ld.enable = true; # for vscode server
-  programs.zsh.enable = true;
 
   # Workaround the annoying `Failed to start Network Manager Wait Online` error on switch.
   # https://github.com/NixOS/nixpkgs/issues/180175

diff --git a/modules/nixos/shared/primary-as-admin.nix b/modules/nixos/shared/primary-as-admin.nix
@@ -12,12 +12,15 @@
       root.openssh.authorizedKeys.keys = myKeys;
       ${me.username} = {
         openssh.authorizedKeys.keys = myKeys;
+        shell = pkgs.zsh;
       } // lib.optionalAttrs pkgs.stdenv.isLinux {
         isNormalUser = true;
         extraGroups = [ "networkmanager" "wheel" ];
       };
     };
 
+  programs.zsh.enable = lib.mkIf pkgs.stdenv.isLinux true;
+
   # Make me a sudoer without password
   security = lib.optionalAttrs pkgs.stdenv.isLinux {
     sudo.execWheelOnly = true;