diff --git a/m/common/base.nix b/m/common/base.nix
index ba53802..2e06175 100644
--- a/m/common/base.nix
+++ b/m/common/base.nix
@@ -18,5 +18,6 @@
     ./base/users.nix
     ./base/watchdog.nix
     ./base/zsh.nix
+    ./base/fish.nix
   ];
 }
diff --git a/m/common/base/fish.nix b/m/common/base/fish.nix
new file mode 100644
index 0000000..21fdf98
--- /dev/null
+++ b/m/common/base/fish.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.fish.enable = true;
+}
diff --git a/m/common/base/users.nix b/m/common/base/users.nix
index 6717fef..ec2be4d 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 = {