diff --git a/nix/modules/fish/default.nix b/nix/modules/fish/default.nix
index 036c8b8..803afbb 100644
--- a/nix/modules/fish/default.nix
+++ b/nix/modules/fish/default.nix
@@ -59,6 +59,16 @@ let tide_conf = builtins.readFile ./tide_config.fish; in
 
       fzf_configure_bindings --history=\cr --directory=\ef --git_status=\es
 
+      #
+      function ssh --wraps ssh
+        set _SSH_CMD (which ssh)
+        if test $TERM = xterm-kitty
+          TERM=xterm-256color $_SSH_CMD $argv
+        else
+          $_SSH_CMD $argv
+        end
+      end
+
       ${builtins.readFile ./tide_config.fish}
       '';
 
@@ -69,12 +79,4 @@ let tide_conf = builtins.readFile ./tide_config.fish; in
       pulsefix = "pulseaudio --kill; pulseaudio --start";
     };
   };
-
-  # TODO -- port from Xonsh config
-  # if $TERM == "xterm-kitty":
-  #     # Wrap ssh with environment variable because servers tend to deal poorly with kitty
-  #     def xterm_ssh(args):
-  #         $TERM="xterm-256color" ssh @(args)
-  #
-  #     aliases["ssh"] = xterm_ssh
 }