diff --git a/nixos/nixos.nix b/nixos/nixos.nix
index b4398ca..ff472dd 100644
--- a/nixos/nixos.nix
+++ b/nixos/nixos.nix
@@ -16,14 +16,12 @@ in
     ./nvidia.nix
     ./audio.nix
     ./services.nix
+    ./shell.nix
     ./hyprland.nix
   ];
 
-  environment.shells = with pkgs; [ zsh ];
-  programs.zsh.enable = true;
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.${username} = {
-    shell = pkgs.zsh;
     isNormalUser = true;
     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
     packages = with pkgs; [
diff --git a/nixos/shell.nix b/nixos/shell.nix
new file mode 100644
index 0000000..a58fba0
--- /dev/null
+++ b/nixos/shell.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.shells = with pkgs; [ zsh ];
+  programs.zsh.enable = true;
+  users.defaultUserShell = pkgs.zsh;
+}