diff --git a/hosts/nixos-common.nix b/hosts/nixos-common.nix
index 59e94d7..5e065c3 100644
--- a/hosts/nixos-common.nix
+++ b/hosts/nixos-common.nix
@@ -13,7 +13,7 @@
     "/etc/ssh/agenix_key"
   ];
 
-  programs.zsh.enable = true;
+  programs.fish.enable = true;
   environment.systemPackages = with pkgs; [
     git
     micro
diff --git a/users/teidesu/server.nix b/users/teidesu/server.nix
index 3d1c781..16b658a 100644
--- a/users/teidesu/server.nix
+++ b/users/teidesu/server.nix
@@ -4,7 +4,7 @@
   users.users.teidesu = {
     isNormalUser = true;
     extraGroups = [ "wheel" "kvm" "docker" "pipewire" ];
-    shell = pkgs.zsh;
+    shell = pkgs.fish;
 
     openssh.authorizedKeys.keyFiles = [
       (abs "ssh/teidesu.pub")