From ccbc3e18f711c39482e9ed6045ed99b4da889a59 Mon Sep 17 00:00:00 2001
From: Anton Bobov <anton@bobov.name>
Date: Fri, 7 Aug 2026 15:21:21 +0500
Subject: git: update diff aliases to use global DFT_BACKGROUND

---
 files/.gitconfig              | 6 +++---
 files/.zsh/rc/S20_environment | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'files')

diff --git a/files/.gitconfig b/files/.gitconfig
index cb51eed..1574600 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -81,10 +81,10 @@
 
   # Diff
   dc = diff --find-copies-harder --cached
-  ddiff = "!f() { DFT_BACKGROUND=light git -c diff.external=difft diff $@; }; f"
+  ddiff = -c diff.external=difft diff
   di = diff --find-copies-harder
   diffstat = diff --stat -r
-  dshow = "!f() { DFT_BACKGROUND=light git -c diff.external=difft show --ext-diff $@; }; f"
+  dshow = -c diff.external=difft show --ext-diff
 
   # GUI Tools
   history-all = "!gitk --all $( git fsck | awk '/dangling commit/ {print $3}'; git log -g --pretty='format:%H')"
@@ -93,7 +93,7 @@
   kb = !sh -c 'gitk --branches' -
 
   # Log & History
-  dlog = "!f() { DFT_BACKGROUND=light git -c diff.external=difft log -p --ext-diff $@; }; f"
+  dlog = -c diff.external=difft log -p --ext-diff
   l = lg -10
   lg = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%aN>%Creset' --abbrev-commit --date=relative
   rl = reflog --date=relative
diff --git a/files/.zsh/rc/S20_environment b/files/.zsh/rc/S20_environment
index d950397..1a38041 100644
--- a/files/.zsh/rc/S20_environment
+++ b/files/.zsh/rc/S20_environment
@@ -46,4 +46,7 @@ export PS4='+ ${BASH_SOURCE:-}:${FUNCNAME[0]:-}:L${LINENO:-}:   '
 # Allow pip to only run in a virtual environment; exit with an error otherwise.
 export PIP_REQUIRE_VIRTUALENV=true
 
+# difft settings
+export DFT_BACKGROUND=light
+
 # vim: et ft=zsh :
-- 
cgit v1.2.3