diff --git a/home/base.nix b/home/base.nix
index e60f095..7cbb05e 100644
--- a/home/base.nix
+++ b/home/base.nix
@@ -44,20 +44,36 @@
     flavor = "mocha";
   };
 
-  programs.bash = {
+#  programs.bash = {
+#    enable = true;
+#    enableCompletion = true;
+#    historyIgnore = [
+#      "ls"
+#      "ls -a"
+#      "ls -l"
+#      "ls -la"
+#      "cd"
+#      "exit"
+#    ];
+#  };
+
+  programs.zsh = {
     enable = true;
     enableCompletion = true;
-    bashrcExtra = ''
-      export SSH_AUTH_SOCK=/home/chase/.bitwarden-ssh-agent.sock
-    '';
-    historyIgnore = [
-      "ls"
-      "ls -a"
-      "ls -l"
-      "ls -la"
-      "cd"
-      "exit"
-    ];
+    enableBashCompletion = true;
+    autosuggestion.enable = true;
+    history = {
+      append = true;
+      extended = true;
+      ignoreDups = true;
+      ignorePatterns = [
+        "ls *"
+        "cd *"
+        "gs"
+        "exit"
+      ];
+    };
+    syntaxHighlighting.enable = true;
   };
 
   programs.bat.enable = true;
diff --git a/nixos/base.nix b/nixos/base.nix
index 9632c2d..89b8001 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -56,11 +56,11 @@
   };
 
   # Configure keymap
-  console.keyMap = "jp106";
+  console.keyMap = lib.mkDefault "jp106";
 
   services.xserver.xkb = {
     layout = lib.mkDefault "jp";
-    model = "jp106";
+    model = lib.mkDefault "jp106";
   };
 
   # Enable CUPS to print documents.
@@ -80,6 +80,17 @@
     blesh.enable = true;
   };
 
+  # zsh config
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    enableBashCompletion = true;
+    enableAutosuggestions = true;
+    syntaxHighlighting = {
+      enable = true;
+    };
+  };
+
   # Define a user account
   users.users.chase = {
     isNormalUser = true;
@@ -95,6 +106,10 @@
       "video"
       "wheel"
     ];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFSQX+s8Krl312DcnUtoEWOA2silcUnt5URtyVZz8Yek"
+    ];
+    shell = pkgs.zsh;
   };
 
   # Install git and enable cache