diff --git a/modules/cli/default.nix b/modules/cli/default.nix
index fe2e9a2..71b7dc2 100644
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -43,8 +43,7 @@
       rm = "rm -i";
       mv = "mv -i";
 
-      # HACK to fix kitty not being recongized
-      ssh = "TERM=xterm-color command ssh";
+      ssh = "kitty +kitten ssh";
 
       nix-switch = "doas nixos-rebuild switch --flake ~/.dotfiles";
       nix-boot = "doas nixos-rebuild boot --flake ~/.dotfiles";
diff --git a/modules/desktop/apps/kitty.nix b/modules/desktop/apps/kitty.nix
index 1d785cd..f596689 100644
--- a/modules/desktop/apps/kitty.nix
+++ b/modules/desktop/apps/kitty.nix
@@ -9,6 +9,7 @@
         enable_audio_bell = false;
         cursor_shape = "underline";
         window_padding_width = 3;
+        confirm_os_window_close = 0;
       };
       keybindings = {
         "ctrl+plus" = "change_font_size all +2.0";
@@ -19,5 +20,10 @@
         size = 10;
       };
     };
+    xdg.configFile."kitty/ssh.conf" = {
+      text = ''
+        env TERM=xterm-color
+      '';
+    };
   };
 }