From 66333448eba91b8cf43f67241e41c70feec70cde Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sun, 29 Mar 2026 08:11:33 +0300
Subject: add git difftool keybindings and external diff command

---
 fish/conf.d/config.fish | 1 +
 helix/config.toml       | 2 +-
 lazygit/config.yml      | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/fish/conf.d/config.fish b/fish/conf.d/config.fish
index c5f7c99..d1e5386 100644
--- a/fish/conf.d/config.fish
+++ b/fish/conf.d/config.fish
@@ -16,6 +16,7 @@ abbr -a no 'grep -E -i -v'
 abbr -a not 'grep -E -i -v'
 abbr -a gl 'git log --pretty=oneline --graph --decorate --all'
 abbr -a gp 'begin; git commit -a; and git pull; and git push; end'
+abbr -a gdt 'git difftool'
 
 for dir in ~/.config/fish/conf.d.work ~/.config/fish/conf.d.local
     if test -d $dir
diff --git a/helix/config.toml b/helix/config.toml
index d9cfc9a..bb83f6f 100644
--- a/helix/config.toml
+++ b/helix/config.toml
@@ -72,7 +72,7 @@ C-p = { c = ":pipe ai correct this sentence and only print out the corrected tex
 C-a = ":pipe hexai-tmux-action"
 
 # Git commands
-C-g = { d = ":run-shell-command git diff", p = ":run-shell-command git pull", u = ":run-shell-command git push", t = ":run-shell-command tmux new-window -n hx-git-tig tig", c = ":run-shell-command tmux split-window -v 'git commit -a'", l = [ ":write-all", ":insert-output lazygit >/dev/tty", ":redraw", ":reload-all" ] }
+C-g = { d = ":run-shell-command git diff", D = ":run-shell-command git difftool", p = ":run-shell-command git pull", u = ":run-shell-command git push", t = ":run-shell-command tmux new-window -n hx-git-tig tig", c = ":run-shell-command tmux split-window -v 'git commit -a'", l = [ ":write-all", ":insert-output lazygit >/dev/tty", ":redraw", ":reload-all" ] }
 
 # Build commands
 C-l = { m = ":run-shell-command make", d = ":run-shell-command go-task dev", r = ":run-shell-command tmux new-window -n hx-go-task-run 'go-task run'" }
diff --git a/lazygit/config.yml b/lazygit/config.yml
index fa99cab..5277d0f 100644
--- a/lazygit/config.yml
+++ b/lazygit/config.yml
@@ -1,2 +1,5 @@
 gui:
   scrollHeight: 10
+git:
+  paging:
+    externalDiffCommand: "difft --color=always"
-- 
cgit v1.2.3