diff --git a/modules/common/default.nix b/modules/common/default.nix
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -33,10 +33,10 @@ ];
     allowUnfree = true;
   };
 
-  programs.bash.enable = true;
+  programs.zsh.enable = true;
   programs.fish.enable = true;
   environment.shells = with pkgs; [
-    bashInteractive
+    zsh
     fish
   ];
 }
diff --git a/modules/home-manager/users/devin/programs/fish.nix b/modules/home-manager/users/devin/programs/fish.nix
--- a/modules/home-manager/users/devin/programs/fish.nix
+++ b/modules/home-manager/users/devin/programs/fish.nix
@@ -18,10 +18,10 @@ ];
   };
 
   programs = {
-    bash = {
+    zsh = {
       enable = true;
-      initExtra = ''
-        if [[ $- == *i* ]] && command -v fish >/dev/null; then
+      initContent = ''
+        if [[ -o interactive ]] && command -v fish >/dev/null; then
           exec fish
         fi
       '';
diff --git a/modules/users/devin/default.nix b/modules/users/devin/default.nix
--- a/modules/users/devin/default.nix
+++ b/modules/users/devin/default.nix
@@ -15,7 +15,7 @@ home =
         if pkgs.stdenv.hostPlatform.isDarwin
         then "/Users/devin"
         else "/home/devin";
-      shell = pkgs.bash;
+      shell = pkgs.zsh;
       openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILyOJLlmq653uVs/1KdVnaMzi+EolB7EJMJ7AdBxVi6m devin@devins.page"];
     }
     // lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {