diff --git a/common.nix b/common.nix
index d9fd532..794424c 100644
--- a/common.nix
+++ b/common.nix
@@ -106,5 +106,6 @@
     networking.firewall.allowedTCPPorts = lib.mkDefault [22];
 
     programs.fish.enable = lib.mkDefault true;
+    users.defaultUserShell = lib.mkOverride 900 pkgs.fish;
   };
 }
diff --git a/home-manager/common.nix b/home-manager/common.nix
index b8f2578..dd0df65 100644
--- a/home-manager/common.nix
+++ b/home-manager/common.nix
@@ -8,7 +8,6 @@ inputs: {
 
   programs.direnv = {
     enable = lib.mkDefault true;
-    enableZshIntegration = true;
     nix-direnv.enable = lib.mkDefault true;
     stdlib = ''
       : ''${XDG_CACHE_HOME:=$HOME/.cache}
@@ -75,14 +74,8 @@ inputs: {
     enable = true;
   };
 
-  programs.elvish = {
+  programs.fish = {
     enable = true;
-    starship = true;
-    zoxide = true;
-    direnv = true;
-    initExtra = ''
-      use readline-binding
-    '';
   };
 
   programs.firefox = {