diff --git a/modules/terminal/fish-config/bulkpaste.fish b/modules/terminal/fish-functions/bulkpaste.fish
similarity index 100%
rename from modules/terminal/fish-config/bulkpaste.fish
rename to modules/terminal/fish-functions/bulkpaste.fish
diff --git a/modules/terminal/fish-config/copy.fish b/modules/terminal/fish-functions/copy.fish
similarity index 100%
rename from modules/terminal/fish-config/copy.fish
rename to modules/terminal/fish-functions/copy.fish
diff --git a/modules/terminal/fish-config/files.fish b/modules/terminal/fish-functions/files.fish
similarity index 100%
rename from modules/terminal/fish-config/files.fish
rename to modules/terminal/fish-functions/files.fish
diff --git a/modules/terminal/fish-config/fmf.fish b/modules/terminal/fish-functions/fmf.fish
similarity index 100%
rename from modules/terminal/fish-config/fmf.fish
rename to modules/terminal/fish-functions/fmf.fish
diff --git a/modules/terminal/fish-config/histdelete.fish b/modules/terminal/fish-functions/histdelete.fish
similarity index 100%
rename from modules/terminal/fish-config/histdelete.fish
rename to modules/terminal/fish-functions/histdelete.fish
diff --git a/modules/terminal/fish-config/move.fish b/modules/terminal/fish-functions/move.fish
similarity index 100%
rename from modules/terminal/fish-config/move.fish
rename to modules/terminal/fish-functions/move.fish
diff --git a/modules/terminal/fish-config/nshell.fish b/modules/terminal/fish-functions/nshell.fish
similarity index 100%
rename from modules/terminal/fish-config/nshell.fish
rename to modules/terminal/fish-functions/nshell.fish
diff --git a/modules/terminal/fish-config/ranger.fish b/modules/terminal/fish-functions/ranger.fish
similarity index 100%
rename from modules/terminal/fish-config/ranger.fish
rename to modules/terminal/fish-functions/ranger.fish
diff --git a/modules/terminal/fish-config/run.fish b/modules/terminal/fish-functions/run.fish
similarity index 100%
rename from modules/terminal/fish-config/run.fish
rename to modules/terminal/fish-functions/run.fish
diff --git a/modules/terminal/fish-config/runl.fish b/modules/terminal/fish-functions/runl.fish
similarity index 100%
rename from modules/terminal/fish-config/runl.fish
rename to modules/terminal/fish-functions/runl.fish
diff --git a/modules/terminal/fish-config/secret.fish b/modules/terminal/fish-functions/secret.fish
similarity index 100%
rename from modules/terminal/fish-config/secret.fish
rename to modules/terminal/fish-functions/secret.fish
diff --git a/modules/terminal/fish-config/show_colour.fish b/modules/terminal/fish-functions/show_colour.fish
similarity index 100%
rename from modules/terminal/fish-config/show_colour.fish
rename to modules/terminal/fish-functions/show_colour.fish
diff --git a/modules/terminal/fish-config/sudo.fish b/modules/terminal/fish-functions/sudo.fish
similarity index 100%
rename from modules/terminal/fish-config/sudo.fish
rename to modules/terminal/fish-functions/sudo.fish
diff --git a/modules/terminal/fish-config/tmux-updater.fish b/modules/terminal/fish-functions/tmux-updater.fish
similarity index 100%
rename from modules/terminal/fish-config/tmux-updater.fish
rename to modules/terminal/fish-functions/tmux-updater.fish
diff --git a/modules/terminal/fish-config/yazi.fish b/modules/terminal/fish-functions/yazi.fish
similarity index 100%
rename from modules/terminal/fish-config/yazi.fish
rename to modules/terminal/fish-functions/yazi.fish
diff --git a/modules/terminal/fish.nix b/modules/terminal/fish.nix
index f8f0464..d782b25 100644
--- a/modules/terminal/fish.nix
+++ b/modules/terminal/fish.nix
@@ -2,7 +2,7 @@
 
 let
   # automatically discover functions in the relative fish functions directory
-  fishFuncDir = ./fish-config/functions;
+  fishFuncDir = ./fish-functions;
   fishFuncs = lib.attrsets.mapAttrs'
     (name: _: lib.nameValuePair (lib.strings.removeSuffix ".fish" "${name}") ({
       body = builtins.readFile (fishFuncDir + "/${name}");
@@ -82,6 +82,4 @@ in
     };
   };
   home-manager.users."djai".home.shell.enableFishIntegration = true;
-
-  home.file.".config/fish/themes".source = config.lib.file.mkOutOfStoreSymLink ./fish-config/themes/;
 }
diff --git a/modules/terminal/kitty.nix b/modules/terminal/kitty.nix
index 0132941..672f53d 100644
--- a/modules/terminal/kitty.nix
+++ b/modules/terminal/kitty.nix
@@ -43,4 +43,8 @@
           return 'args' not in pcmd['payload']
       return False
   '';
+
+  home-manager.users."djai".home.file.".config/kitty/ssh.conf".text = ''
+    copy .config/fish .config/kitty .config/starship.toml .config/tmux
+  '';
 }