diff --git a/home-manager/common/software/cli/starship.nix b/home-manager/common/software/cli/starship.nix
index 6647babc..51a074d1 100644
--- a/home-manager/common/software/cli/starship.nix
+++ b/home-manager/common/software/cli/starship.nix
@@ -19,6 +19,7 @@ in
   programs.starship = {
     enable = true;
     enableBashIntegration = true;
+    enableFishIntegration = true;
     settings = {
       format = lib.concatStrings [
 #         "[](${usernameBG})"
diff --git a/nixos/common/services/forgejo-runner.nix b/nixos/common/services/forgejo-runner.nix
index e3f59a97..9aad5193 100644
--- a/nixos/common/services/forgejo-runner.nix
+++ b/nixos/common/services/forgejo-runner.nix
@@ -30,7 +30,8 @@
                 # Extras
                 sudo
                 tailscale
+                fish
             ];
         };
     };
-}
\ No newline at end of file
+}
diff --git a/nixos/common/software/packages.nix b/nixos/common/software/packages.nix
index 07dee248..0a97868f 100644
--- a/nixos/common/software/packages.nix
+++ b/nixos/common/software/packages.nix
@@ -41,6 +41,7 @@
     busybox      # Linux utilities
     ethtool      # Ethernet troubleshooting
     fd           # alternative to "Find"
-    lazygit      # Decent Git TUI 
+    lazygit      # Decent Git TUI
+    fish         # Shell
   ];
 }
diff --git a/nixos/minimal.nix b/nixos/minimal.nix
index 11b49296..c97a12b7 100644
--- a/nixos/minimal.nix
+++ b/nixos/minimal.nix
@@ -43,6 +43,7 @@
     sshpass
     fd
     eza
+    fish
   ];
 
   # Select internationalisation properties.
diff --git a/nixos/small.nix b/nixos/small.nix
index 8bb1ed5c..26616c8a 100644
--- a/nixos/small.nix
+++ b/nixos/small.nix
@@ -36,6 +36,7 @@
     sshpass
     cryptsetup
     fd 
+    fish
   ];
 
   # Select internationalisation properties.
diff --git a/nixos/users/albert/default.nix b/nixos/users/albert/default.nix
index 2306a07b..e241d388 100644
--- a/nixos/users/albert/default.nix
+++ b/nixos/users/albert/default.nix
@@ -17,6 +17,7 @@ in {
         ++ ifExists [ "docker"    ]
         ++ ifExists [ "podman"    ]
         ++ ifExists [ "syncthing" ];
+      # shell = pkgs.fish;
       # mkpasswd -m sha-512
       hashedPassword = "$y$j9T$wKLsIWaA4Gf63RvjedwLJ0$EHKL6BBJV0CAxEKcHHjaBqW085KJ/MGvmbyWzmcWOy6";
       packages = [ pkgs.home-manager ];