From 1baceeb2592ffcda8dcf72655e4125cfbc89f02f Mon Sep 17 00:00:00 2001
From: Jonathan Leech-Pepin <jonathan@leechpepin.com>
Date: Tue, 20 May 2025 12:53:03 -0400
Subject: [PATCH] Fix setup to avoid git diff on age encrypted files

---
 .gitattributes | 10 +++++-----
 justfile       |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index f20021f..f498e22 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,6 @@
-.wakatime.cfg                           filter=ageEncrypt
-**/.kube/config                         filter=ageEncrypt
-**/.tabby-client/agent/config.toml      filter=ageEncrypt
-gpg/.gnupg/private-keys-v1.d/*          filter=ageEncrypt
-msmtp/.config/msmtp/config              filter=ageEncrypt
+.wakatime.cfg                           filter=ageEncrypt diff=ageEncrypt
+**/.kube/config                         filter=ageEncrypt diff=ageEncrypt
+**/.tabby-client/agent/config.toml      filter=ageEncrypt diff=ageEncrypt
+gpg/.gnupg/private-keys-v1.d/*          filter=ageEncrypt diff=ageEncrypt
+msmtp/.config/msmtp/config              filter=ageEncrypt diff=ageEncrypt
 emborg/.config/emborg/*                 filter=setHostname
diff --git a/justfile b/justfile
index 6e78996..f936be9 100644
--- a/justfile
+++ b/justfile
@@ -4,6 +4,7 @@ default:
 install_git_filters:
     @git config filter.ageEncrypt.clean   "age -a -R key.pub"
     @git config filter.ageEncrypt.smudge  "age -d -i key.txt"
+    @git config diff.ageEncrypt.textconv  "cat"
     @git config filter.setHostname.clean  'sed -e "s/$(hostname)/<<hostname>>/g"'
     @git config filter.setHostname.smudge 'sed -e "s/<<hostname>>/$(hostname)/g"'