From 182c735acc2f61d6c22e4a5bc14372c922413956 Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Fri, 3 Feb 2023 12:55:33 +0100
Subject: Allow using kitty as a git difftool

Get rid of annoying syntax highlighting in "kitty +kitten diff". This
doesn't work properly with my terminal colour scheme; "bw" is the
least intrusive.
---
 tw/home/files/zshrc | 1 +
 tw/home/lap.scm     | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'tw')

diff --git a/tw/home/files/zshrc b/tw/home/files/zshrc
index 5d26d9d3..2aac6a63 100644
--- a/tw/home/files/zshrc
+++ b/tw/home/files/zshrc
@@ -105,6 +105,7 @@ alias ga='git add'
 alias gb='git branch'
 alias gc='git commit'
 alias gd='git diff'
+alias gdk='git difftool --no-symlinks --dir-diff'
 alias gds='git diff --staged'
 alias gf='git fetch'
 alias gfa='git fetch --all --prune --tags'
diff --git a/tw/home/lap.scm b/tw/home/lap.scm
index ad5301ef..ab692cf9 100644
--- a/tw/home/lap.scm
+++ b/tw/home/lap.scm
@@ -296,7 +296,11 @@
          ;; TODO: "kdeglobals" works for some programs (e.g. kdeconnect-app),
          ;; but not for others (e.g. nheko, kdeconnect-settings)...
          ("kdeglobals" ,catppuccin-kdeglobals)
-         ("kitty/diff.conf" ,catppuccin-kitty-diff)
+         ("kitty/diff.conf"
+          ,(combined-text-file "kitty-diff.conf"
+             (plain-file "kitty-diff-custom.conf"
+                         "pygments_style = bw\n")
+             catppuccin-kitty-diff))
          ("kitty/kitty.conf"
           ,(combined-text-file "kitty.conf"
              (local-file "files/kitty.conf")
-- 
cgit v1.2.3