diff --git a/nix/modules/fish/default.nix b/nix/modules/fish/default.nix
index 27f0c16..2ff106d 100644
--- a/nix/modules/fish/default.nix
+++ b/nix/modules/fish/default.nix
@@ -67,6 +67,13 @@ let tide_conf = builtins.readFile ./tide_config.fish; in
         command ssh $argv
       end
 
+      # Kitty integration
+      if set -q KITTY_INSTALLATION_DIR
+          set --global KITTY_SHELL_INTEGRATION enabled
+          source "$KITTY_INSTALLATION_DIR/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish"
+          set --prepend fish_complete_path "$KITTY_INSTALLATION_DIR/shell-integration/fish/vendor_completions.d"
+      end
+
       ${builtins.readFile ./tide_config.fish}
       '';
 
diff --git a/nix/modules/kitty/default.nix b/nix/modules/kitty/default.nix
index 59319f8..20e6b00 100644
--- a/nix/modules/kitty/default.nix
+++ b/nix/modules/kitty/default.nix
@@ -11,6 +11,7 @@
       background_opacity = "1.0";
       macos_option_as_alt = "left";
       enable_audio_bell = "no";
+      shell_integration = "disabled";
     };
 
     font = {