diff --git a/system/home/shell/default.nix b/system/home/shell/default.nix
index ae1e052f..b4cdde9f 100644
--- a/system/home/shell/default.nix
+++ b/system/home/shell/default.nix
@@ -14,7 +14,11 @@
     protondown = "sudo wg-quick down protonvpn";
   };
   programs = {
+    # Shells
     bash.enable = true;
+    fish.enable = true;
+    nushell.enable = true;
+    # CLI programs and utilities
     carapace.enable = true;
     fd.enable = true;
     jq.enable = true;
@@ -68,36 +72,5 @@
         visible-stats = "On";
       };
     };
-    zsh = {
-      enable = true;
-      enableCompletion = true;
-      autocd = true;
-      autosuggestion.enable = true;
-      defaultKeymap = "emacs";
-      syntaxHighlighting = {
-        enable = true;
-        highlighters = [
-          "brackets"
-          "cursor"
-        ];
-      };
-      historySubstringSearch.enable = true;
-      history = {
-        extended = true;
-        share = true;
-        ignoreDups = true;
-        ignoreAllDups = true;
-        ignoreSpace = true;
-        expireDuplicatesFirst = true;
-      };
-      initExtra = ''
-        ## completion config and styling
-        zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
-        zstyle ':completion:*' menu 'select=long-list'
-
-        ## transient prompt
-        source ${./transient.zsh}
-      '';
-    };
   };
 }
diff --git a/system/home/shell/starship.nix b/system/home/shell/starship.nix
index 2d831b24..3f27a4c4 100644
--- a/system/home/shell/starship.nix
+++ b/system/home/shell/starship.nix
@@ -142,12 +142,11 @@
       shell = {
         disabled = false;
         format = "using [$indicator]($style)";
-        bash_indicator = "  ";
-        zsh_indicator = "󰰶  ";
-        fish_indicator = "󰈺  ";
-        powershell_indicator = "  ";
-        cmd_indicator = "  ";
-        unknown_indicator = "  ";
+        bash_indicator = " ";
+        fish_indicator = "󰈺 ";
+        powershell_indicator = " ";
+        cmd_indicator = " ";
+        unknown_indicator = " ";
       };
       status = {
         disabled = false;
diff --git a/system/home/terminal/alacritty.nix b/system/home/terminal/alacritty.nix
index 92d6107d..a7acd634 100644
--- a/system/home/terminal/alacritty.nix
+++ b/system/home/terminal/alacritty.nix
@@ -3,7 +3,7 @@
   programs.alacritty = {
     enable = true;
     settings = {
-      shell = "${config.programs.zsh.package}/bin/zsh";
+      shell = "${config.programs.fish.package}/bin/fish";
       window = {
         dynamic_title = true;
         padding = {