diff --git a/configurations/nixos/vixen/default.nix b/configurations/nixos/vixen/default.nix index c7b6b38..95fcf69 100644 --- 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 index 27d0945..15942d4 100644 --- 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;