diff --git a/configuration.nix b/configuration.nix
index b995889..f6b5495 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -72,6 +72,7 @@
     freetube
     nextcloud-client
     discord
+    nix-prefetch-github # Cmd to get rev and hash from GitHub
   ];
 
   nix.settings.experimental-features = [
diff --git a/home/default.nix b/home/default.nix
index 0cfcee7..0a35eba 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -9,6 +9,7 @@ in
 {
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
+    ./fish.nix
     ./nixvim
     ./rofi
     ./wlogout
@@ -37,11 +38,6 @@ in
     home-manager.enable = true;
 
     kitty.enable = true;
-
-    starship = {
-      enable = true;
-      settings = (with builtins; fromTOML (readFile ./starship.toml)) // { };
-    };
   };
 
   services = {
diff --git a/home/fish.nix b/home/fish.nix
new file mode 100644
index 0000000..c82cd98
--- /dev/null
+++ b/home/fish.nix
@@ -0,0 +1,26 @@
+{ pkgs, ... }:
+
+{
+  programs = {
+    fish = {
+      enable = true;
+      plugins = [
+        {
+          # !! to get the previous command
+          name = "fishbang";
+          src = pkgs.fetchFromGitHub {
+            owner = "BrewingWeasel";
+            repo = "fishbang";
+            rev = "50389667eb9ac79edcff9b987c83e1de8ac93921";
+            hash = "sha256-IneNWyfo29C7FDA5b6pTZRX3HpP6y/dRM6GXuLq2+zc=";
+          };
+        }
+      ];
+    };
+
+    starship = {
+      enable = true;
+      settings = (with builtins; fromTOML (readFile ./starship.toml)) // { };
+    };
+  };
+}
diff --git a/terminal/shell.nix b/terminal/shell.nix
index 13b4c70..1121878 100644
--- a/terminal/shell.nix
+++ b/terminal/shell.nix
@@ -17,8 +17,12 @@
       enable = true;
       # Start starship when creating a new shell
       interactiveShellInit = ''
-        	starship init fish | source
+        starship init fish | source
       '';
+      shellAliases = {
+        # Transfer shell config to target device
+        ssh = "kitty +kitten ssh";
+      };
     };
   };
 }