diff --git a/templates/nix-config/configuration.nix b/templates/nix-config/configuration.nix
index caa25e0..6668019 100644
--- a/templates/nix-config/configuration.nix
+++ b/templates/nix-config/configuration.nix
@@ -10,6 +10,7 @@
     ./misc/mail.nix
     ./misc/networking.nix
     ./misc/smart.nix
+    ./misc/terminal.nix
 #    ./disks/pcr-check.nix
 #    ./disks/snapraid.nix
 #    ./pcie-coral/coral.nix
@@ -141,6 +142,7 @@
 
   # User account
   users.users.numbus-admin = {
+    shell = pkgs.fish;
     isNormalUser = true;
     description = "Numbus Admin";
     extraGroups = [ "wheel" ];
@@ -152,16 +154,6 @@
     autoSubUidGidRange = true;
   };
 
-  # Login message
-  environment.loginShellInit = ''
-    if [ "$(id -u)" -eq 1000 ]; then
-      if [ -n "$SSH_TTY" ]; then
-        fastfetch
-	      echo -e "\n\nWelcome to your Numbus-Server !\n\n- This system is managed by NixOS\n- All changes are futile\n- Please consider buying support if you can't get your server running\n- Have a nice day and enjoy !"
-      fi
-    fi
-  '';
-
   # Enable auto updates
   system.autoUpgrade = {
     enable = true;
diff --git a/templates/nix-config/misc/terminal.nix b/templates/nix-config/misc/terminal.nix
new file mode 100644
index 0000000..87fb74c
--- /dev/null
+++ b/templates/nix-config/misc/terminal.nix
@@ -0,0 +1,43 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    fish
+    fishPlugins.fzf-fish
+    fishPlugins.grc
+    grc
+    fzf
+  ];
+
+  programs.fish = {
+    enable = true;
+    interactiveShellInit = ''
+      set fish_greeting # Disable greeting
+      fastfetch
+      echo -e "\n\nWelcome to your Numbus-Server !\n\n- This system is managed by NixOS\n- All changes are futile\n- Please consider buying support if you can't get your server running\n- Have a nice day and enjoy !"
+    '';
+    shellAliases = {
+      nixup = "cd /etc/nixos/ && sudo nix flake update && sudo nixos-rebuild --flake . switch --upgrade && cd -";
+      nixwitch = "cd /etc/nix && sudo nix flake update && sudo nixos-rebuild --flake . switch && cd -";
+      systraefik = "sudo systemctl status traefik.service";
+      syspi-hole = "sudo systemctl status pi-hole.service";
+      syspassbolt = "sudo systemctl status passbolt.service";
+      sysnextcloud = "sudo systemctl status nextcloud.service";
+      sysit-tools = "sudo systemctl status it-tools.service";
+      sysimmich = "sudo systemctl status immich.service";
+      syshome-assistant = "sudo systemctl status home-assistant.service";
+      sysgitea = "sudo systemctl status gitea.service";
+      sysfrigate = "sudo systemctl status frigate.service";
+    };
+  };
+
+#  # Login message
+#  environment.loginShellInit = ''
+#    if [ "$(id -u)" -eq 1000 ]; then
+#      if [ -n "$SSH_TTY" ]; then
+#        fastfetch
+#	      echo -e "\n\nWelcome to your Numbus-Server !\n\n- This system is managed by NixOS\n- All changes are futile\n- Please consider buying support if you can't get your server running\n- Have a nice day and enjoy !"
+#      fi
+#    fi
+#  '';
+}
\ No newline at end of file