From 20705949f101952182694be8e7ccd890f61824c2 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 19 Apr 2025 22:11:57 -0700
Subject: [PATCH] kitty: add git diff integration (#6855)

Kitty supports a diff tool integration. This allows enabling it easily
for a user.
---
 modules/programs/kitty.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix
index 4802a5eac..0f6864cc2 100644
--- a/modules/programs/kitty.nix
+++ b/modules/programs/kitty.nix
@@ -248,6 +248,8 @@ in
       );
     };
 
+    enableGitIntegration = lib.mkEnableOption "git integration";
+
     extraConfig = mkOption {
       default = "";
       type = types.lines;
@@ -329,5 +331,22 @@ in
     programs.fish.interactiveShellInit = mkIf cfg.shellIntegration.enableFishIntegration shellIntegrationInit.fish;
 
     programs.zsh.initContent = mkIf cfg.shellIntegration.enableZshIntegration shellIntegrationInit.zsh;
+
+    programs.git.iniContent = lib.mkIf cfg.enableGitIntegration {
+      diff = {
+        tool = lib.mkDefault "kitty";
+        guitool = lib.mkDefault "kitty.gui";
+      };
+      difftool = {
+        prompt = lib.mkDefault false;
+        trustExistCode = lib.mkDefault true;
+        kitty = {
+          cmd = "kitten diff $LOCAL $REMOTE";
+        };
+        "kitty.gui" = {
+          cmd = "kitten diff $LOCAL $REMOTE";
+        };
+      };
+    };
   };
 }