diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 3d11f15..2d08b42 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -26,7 +26,7 @@
 [url "git@github.com:lunarway"]
 	insteadOf = https://github.com/lunarway
 [core]
-  pager = delta
+#  pager = delta
 	excludeFiles = cover.cov
 	excludeFile = cover.cov
 [push]
@@ -35,15 +35,27 @@
 [gpg]
 	program = /opt/homebrew/bin/gpg
 {{ end }}
-[interactive]
-  diffFilter = delta --color-only
-[add.interactive]
-  useBuiltin = false # required for git 2.37.0
-[delta]
-  navigate = true    # use n and N to move between diff sections
-  light = false      # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
+#[interactive]
+#  diffFilter = delta --color-only
+# [add.interactive]
+#  useBuiltin = false # required for git 2.37.0
+# [delta]
+#  navigate = true    # use n and N to move between diff sections
+#  light = false      # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
 [merge]
   conflictstyle = diff3
+
 [diff]
   colorMoved = default
+  tool = difftastic
+  external = difft
+
+[difftool]
+        prompt = false
+
+[difftool "difftastic"]
+        cmd = difft "$LOCAL" "$REMOTE"
+
+[pager]
+        difftool = true