diff --git a/home-manager/cli.nix b/home-manager/cli.nix
index eb6e912..74d2d7d 100644
--- a/home-manager/cli.nix
+++ b/home-manager/cli.nix
@@ -5,6 +5,20 @@
   pkgs,
   ...
 }:
+let
+  shellAliases = {
+    ls = "eza";
+    lsa = "ls -A";
+    ll = "ls -lh";
+    lla = "ls -lAh";
+    h = "hx";
+    g = "git";
+    cd = "z";
+    tree = "eza --tree";
+    ".." = "cd ..";
+    "..." = "cd ../..";
+  };
+in
 {
   imports = [
     self.homeManagerModules.dotfiles
@@ -45,18 +59,12 @@
   programs.zsh = {
     enable = true;
     syntaxHighlighting.enable = true;
-    shellAliases = {
-      ls = "eza";
-      lsa = "ls -A";
-      ll = "ls -lh";
-      lla = "ls -lAh";
-      h = "hx";
-      g = "git";
-      cd = "z";
-      tree = "eza --tree";
-      ".." = "cd ..";
-      "..." = "cd ../..";
-    };
+    inherit shellAliases;
+  };
+
+  programs.fish = {
+    enable = true;
+    inherit shellAliases;
   };
 
   xdg.configFile."git".source = "${config.dotfiles.path}/.config/git";
diff --git a/modules/user-rpqt.nix b/modules/user-rpqt.nix
index 86b2cf4..4c1d0bb 100644
--- a/modules/user-rpqt.nix
+++ b/modules/user-rpqt.nix
@@ -8,7 +8,7 @@
 
     description = "Romain Paquet";
 
-    shell = pkgs.zsh;
+    shell = pkgs.fish;
 
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGa8R8obgptefcp27Cdp9bc2fiyc9x0oTfMsTPFp2ktE rpqt@haze"
@@ -17,5 +17,5 @@
     extraGroups = [ "wheel" ];
   };
 
-  programs.zsh.enable = true;
+  programs.fish.enable = true;
 }