diff --git a/hosts/dnsc-server/default.nix b/hosts/dnsc-server/default.nix
index a49fd7f..fabbaf7 100644
--- a/hosts/dnsc-server/default.nix
+++ b/hosts/dnsc-server/default.nix
@@ -34,6 +34,17 @@
   };
   nix.settings.auto-optimise-store = true;
 
+  # Launch fish shell
+  programs.bash = {
+    interactiveShellInit = ''
+    if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+    then
+      shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+      exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+    fi
+    '';
+  };
+
   # Networking
   networking.hostName = "dnsc-server";
   networking.hostId = "380f584e";
diff --git a/hosts/dnsc-vps-sm/default.nix b/hosts/dnsc-vps-sm/default.nix
index 6bf5a44..9838f6c 100644
--- a/hosts/dnsc-vps-sm/default.nix
+++ b/hosts/dnsc-vps-sm/default.nix
@@ -39,6 +39,17 @@
   };
   nix.settings.auto-optimise-store = true;
 
+  # Launch fish shell
+  programs.bash = {
+    interactiveShellInit = ''
+    if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+    then
+      shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+      exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+    fi
+    '';
+  };
+
   # Networking
   networking.hostName = "dnsc-vps-sm";
   networking.hostId = "380f585f";