diff --git a/hosts/default.nix b/hosts/default.nix
index 39f0bb6..3ef0d38 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -85,7 +85,7 @@ in
   };
 
   programs = {
-    fish.enable = lib.mkDefault true;
+    zsh.enable = lib.mkDefault true;
     gnupg.agent = {
       enable = lib.mkDefault true;
       # pinentryPackage = pkgs.pinentry-curses;
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 25d226b..c413fab 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -173,8 +173,8 @@ in
       borgbackup
       clinfo
       efibootmgr
-      fishPlugins.bass
-      fishPlugins.sponge
+      # fishPlugins.bass
+      # fishPlugins.sponge
       gparted
       kmod
       lact
@@ -209,7 +209,7 @@ in
       "networkmanager"
       "ratbagd"
     ]; # Enable ‘sudo’ for the user.
-    shell = pkgs.fish;
+    shell = pkgs.zsh;
   };
 
   services = {
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index 5ce0ce2..c23361a 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -10,9 +10,29 @@
   programs.home-manager.enable = true;
 
   programs = {
-    fish.enable = true;
+    fish.enable = false;
     mangohud.enable = true;
     java.enable = true;
+
+    zsh = {
+      enable = true;
+      enableCompletion = true;
+      autosuggestion.enable = true;
+      syntaxHighlighting.enable = true;
+
+      shellAliases = {
+        ll = "ls -alh";
+        update = "sudo nixos-rebuild switch";
+        nas-update = "nixos-rebuild switch --use-remote-sudo --target-host admin@jallen-nas.local --build-host localhost --flake ~/nix-config/flake.nix#jallen-nas";
+        nas-ssh = "ssh admin@jallen-nas.local";
+      };
+
+      oh-my-zsh = {
+        enable = true;
+        plugins = [ "git" ];
+        theme = "fishy";
+      };
+    };
   };
 
   programs.git = {
diff --git a/hosts/nas/configuration.nix b/hosts/nas/configuration.nix
index 1e67712..4d13cdb 100644
--- a/hosts/nas/configuration.nix
+++ b/hosts/nas/configuration.nix
@@ -407,7 +407,7 @@ in
 
   # Configure programs
   programs = {
-    fish.enable = true;
+    fish.enable = false;
     virt-manager.enable = true;
     nix-ld.enable = true;
   };
@@ -490,7 +490,7 @@ in
         "jallen-nas"
       ]; # Enable ‘sudo’ for the user.
       initialHashedPassword = password;
-      shell = pkgs.fish;
+      shell = pkgs.zsh;
       openssh.authorizedKeys.keys = [
         # macBook
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCw9zq8DLGByI5v2gAn95hKNyOsm3g61a2buxu2BBMFysQJgmZPCCLUqRJKhSM5Vm/JOgsAmdpRBRZQoHD+6S844CJHb4v4VIbjkyQgYCuM7Rst2IOZ5QybvsA2/D0nwytZ+HXQqDj2AagUYDbz0gyyIHkDQ5YGBMkvkWz/h1Vci6aoBM7VihEDM4KlWoTVuPeASGM8r5IZ2FS83Djbqo4ov6AYvLMrKB9Z7hmFgH6R3LE0gxOkzbGVXtSuvJyrjvgytoT22UhATjjxSQ9D+YJXXkQoB3lUdg8OoIquUPjMZpl4mR8ffvseWPfcvD1XlD5t+TOHFqKpESO547tlOBYhdpew+NSgAXpamCU6oyV8tDCywLQu2ucxHRn78u6WXzWHkDtffdhzmk6TZaPhWqVHuTGjR4higBgGqUfSaKOMszt+FDRZAr3HtuQ2+zJ8bowK9fW5OqilTtK2HtQqroD9ApegDNbqOz6kGy5IycSXvqPURy/M4lxZxbtBPuemcJs= mattjallen@MacBook-Pro.local"
diff --git a/hosts/nas/home.nix b/hosts/nas/home.nix
index 34d66db..695eded 100644
--- a/hosts/nas/home.nix
+++ b/hosts/nas/home.nix
@@ -7,9 +7,26 @@
   programs.home-manager.enable = true;
 
   programs = {
-    fish.enable = true;
+    fish.enable = false;
     mangohud.enable = true;
     java.enable = true;
+
+    zsh = {
+      enable = true;
+      enableCompletion = true;
+      autosuggestion.enable = true;
+      syntaxHighlighting.enable = true;
+
+      shellAliases = {
+        update = "sudo nixos-rebuild switch";
+      };
+
+      oh-my-zsh = {
+        enable = true;
+        plugins = [ "git" ];
+        theme = "fishy";
+      };
+    };
   };
 
   programs.git = {