diff --git a/m/common/base.nix b/m/common/base.nix
index ba53802e..567b6659 100644
--- a/m/common/base.nix
+++ b/m/common/base.nix
@@ -7,6 +7,7 @@
     ./base/august-shutdown.nix
     ./base/boot.nix
     ./base/env.nix
+    ./base/fish.nix
     ./base/fs.nix
     ./base/hw.nix
     ./base/net.nix
diff --git a/m/common/base/fish.nix b/m/common/base/fish.nix
new file mode 100644
index 00000000..958da570
--- /dev/null
+++ b/m/common/base/fish.nix
@@ -0,0 +1,3 @@
+{
+  programs.fish.enable = true;
+}
diff --git a/m/common/base/users.nix b/m/common/base/users.nix
index f83b8215..d1e4cc41 100644
--- a/m/common/base/users.nix
+++ b/m/common/base/users.nix
@@ -87,6 +87,7 @@
         openssh.authorizedKeys.keys = [
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIIFiqXqt88VuUfyANkZyLJNiuroIITaGlOOTMhVDKjf abonerib@bsc"
         ];
+        shell = pkgs.fish;
       };
 
       vlopez = {