From 8f59f0225cd5b06a314ca3e6edf5d419c5d0ef08 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Thu, 22 Jun 2023 12:17:21 +0200
Subject: [PATCH] Git: better diff tool configuration

---
 hm_modules/git.nix | 2 ++
 odin/hm.nix        | 2 +-
 thor/hm.nix        | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hm_modules/git.nix b/hm_modules/git.nix
index db27394..d531394 100644
--- a/hm_modules/git.nix
+++ b/hm_modules/git.nix
@@ -36,6 +36,7 @@ let
     "gcpa" = "git cherry-pick --abort";
     "gcpc" = "git cherry-pick --continue";
     "gd" = "git diff";
+    "gdtd" = "git difftool -g --dir-diff";
     "gdca" = "git diff --cached";
     "gdcw" = "git diff --cached --word-diff";
     "gdct" = "git describe --tags $(git rev-list --tags --max-count=1)";
@@ -106,6 +107,7 @@ in
       # delta.side-by-side = true;
       diff.colorMoved = "default";
       diff.guitool = "meld";
+      diff.tool = "meld";
       # init.defaultBranch = "main";
       merge.conflictstyle = "diff3";
       merge.guitool = "meld";
diff --git a/odin/hm.nix b/odin/hm.nix
index 0b24c17..a4e28cc 100644
--- a/odin/hm.nix
+++ b/odin/hm.nix
@@ -18,7 +18,7 @@
         # signal-desktop
         # slack
         # wineFull
-        arandr authenticator authy cava discord dmenu droidcam easyeffects evince evolution gallery-dl google-chrome gucharmap handbrake httpie inkscape keyboard-switch krita meld openvpn p7zip pavucontrol pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop thunderbird transmission-gtk virt-manager virt-viewer wireguard-tools xournalpp zoom-us;
+        arandr authenticator authy cava discord dmenu droidcam easyeffects evince evolution gallery-dl google-chrome gucharmap handbrake httpie inkscape keyboard-switch krita openvpn p7zip pavucontrol pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop thunderbird transmission-gtk virt-manager virt-viewer wireguard-tools xournalpp zoom-us;
       inherit (pkgs.gnome)
         # geary
         # gnome-boxes
diff --git a/thor/hm.nix b/thor/hm.nix
index e941751..09c8654 100644
--- a/thor/hm.nix
+++ b/thor/hm.nix
@@ -19,7 +19,7 @@
         # signal-desktop
         # slack
         # wineFull
-        arandr authenticator authy discord dmenu docker-compose docker-machine droidcam easyeffects evince filelight gallery-dl google-chrome gucharmap handbrake httpie inkscape krita meld openvpn p7zip pavucontrol pcsx2 pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop thunderbird transmission-gtk virt-manager virt-viewer wireguard-tools xournalpp zoom-us;
+        arandr authenticator authy discord dmenu docker-compose docker-machine droidcam easyeffects evince filelight gallery-dl google-chrome gucharmap handbrake httpie inkscape krita openvpn p7zip pavucontrol pcsx2 pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop thunderbird transmission-gtk virt-manager virt-viewer wireguard-tools xournalpp zoom-us;
       inherit (pkgs.gnome)
         # geary
         # gnome-boxes