diff --git a/modules/hosts/john-p14s/configuration.nix b/modules/hosts/john-p14s/configuration.nix
index 9bc0298..c6f7587 100644
--- a/modules/hosts/john-p14s/configuration.nix
+++ b/modules/hosts/john-p14s/configuration.nix
@@ -117,6 +117,7 @@
           my-vscode.enable = true;
           mysops.hostSecretFile = "${flakeDir}/modules/hosts/john-p14s/secrets.yaml";
           homeManagerFlakeDir = "${flakeDir}";
+          shell.program = "zsh";
           home.packages = with pkgs; [
             bash
             discord
diff --git a/modules/nix-tools/user.nix b/modules/nix-tools/user.nix
index 15e614c..b25dc96 100644
--- a/modules/nix-tools/user.nix
+++ b/modules/nix-tools/user.nix
@@ -3,10 +3,11 @@
 { self, ... }:
 {
   config.flake.factory.user = username: isAdmin: {
-    nixos."${username}" = { lib, pkgs, ... }: {
+    nixos."${username}" = { config, lib, pkgs, ... }: {
       users.users."${username}" = {
         isNormalUser = true;
         home = "/home/${username}";
+        shell = lib.mkIf config.programs.zsh.enable pkgs.zsh;
         extraGroups = [
           "input"
           "networkmanager"