diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index 61266f3..1a395c4 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -34,7 +34,7 @@
       ];
       home = "/home/srv";
       isNormalUser = true;
-      shell = pkgs.bash;
+      shell = pkgs.fish;
     };
   };
 
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index fa41e28..9dae32a 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -9,9 +9,9 @@ in
 
   bat.enable = lib.mkDefault true;
   eza.enable = lib.mkDefault true;
+  fish.enable = lib.mkDefault true;
   gh.enable = lib.mkDefault true;
   git.enable = lib.mkDefault true;
-  nushell.enable = lib.mkDefault true;
   yazi.enable = lib.mkDefault true;
   zoxide.enable = lib.mkDefault true;
 }
diff --git a/modules/home-manager/features/nushell.nix b/modules/home-manager/features/fish.nix
similarity index 68%
rename from modules/home-manager/features/nushell.nix
rename to modules/home-manager/features/fish.nix
index 820b0ee..d80d2ed 100644
--- a/modules/home-manager/features/nushell.nix
+++ b/modules/home-manager/features/fish.nix
@@ -1,21 +1,18 @@
 { config, lib, ... }:
 let
-  feature = "nushell";
+  feature = "fish";
 in
 {
   config = lib.mkIf config.${feature}.enable {
-    home.shell.enableNushellIntegration = true;
-    programs.nushell = {
+    home.shell.enableFishIntegration = true;
+    programs.fish = {
       enable = true;
-      environmentVariables = {
-
-      };
-      settings = {
-
-      };
+      interactiveShellInit = ''
+        set fish_greeting
+      '';
       shellAliases = {
         cat = "bat";
-        cd = "zoxide";
+        cd = "j";
         g = "lazygit";
         l = "eza";
         la = "eza -a";
diff --git a/modules/home-manager/features/zellij.nix b/modules/home-manager/features/zellij.nix
index 7141d04..5313695 100644
--- a/modules/home-manager/features/zellij.nix
+++ b/modules/home-manager/features/zellij.nix
@@ -13,6 +13,7 @@ in
       settings = {
         theme = "catppuccin-mocha";
         show_startup_tips = false;
+        default_shell = "fish";
       };
     };
   };