diff --git a/home/katkak/home.nix b/home/katkak/home.nix
index 239a41f..b7d4558 100644
--- a/home/katkak/home.nix
+++ b/home/katkak/home.nix
@@ -68,6 +68,24 @@
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 
+  programs.zsh = {
+    enable = true;
+
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+
+    oh-my-zsh = {
+      enable = true;
+
+      plugins = [
+        "git"
+      ];
+
+      theme = "fishy";
+    };
+  };
+
   programs.neovim = {
     enable = true;
     viAlias = true;
diff --git a/hosts/shared/default.nix b/hosts/shared/default.nix
index 70f0e26..ec62c49 100644
--- a/hosts/shared/default.nix
+++ b/hosts/shared/default.nix
@@ -18,15 +18,24 @@
     tmux
   ];
 
-  users.users."katkak" = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" ];
+  users = {
+    defaultUserShell = pkgs.zsh;
+
+    users."katkak" = {
+      isNormalUser = true;
+      extraGroups = [ "wheel" ];
+      useDefaultShell = true;
+    };
   };
 
   programs.direnv = {
     enable = true;
   };
 
+  programs.zsh = {
+    enable = true;
+  };
+
   services.openssh = {
     enable = true;
   };