deps: add difftastic + use difft for git diff & show

Author: nokazn

modules/packages/cli.nix

@@ -50,6 +50,7 @@ with pkgs; lib.attrValues {
   alternative = [
     bat # A cat(1) clone with syntax highlighting and Git integration
     colordiff # Compare FILES line by line.hto
+    difftastic # A syntax-aware diff
     eza # A modern replacement for the venerable file-listing command-line program
     fd # A simple, fast and user-friendly alternative to 'find'
     ripgrep # An interactive replacer for ripgrep that makes it easy to find and replace across files on the command line

unix/.gitconfig

@@ -15,6 +15,9 @@
 	excludesFile = ~/.config/git/ignore
 	attributesFile = ~/.config/git/attributes
 
+[diff]
+	external = difft
+
 [init]
 	defaultBranch = main
 
@@ -133,7 +136,7 @@
 	remote-set-url-me = !git remote set-url origin [email protected]:\"$(git config --global user.name)\"/\"$(basename $(pwd))\"
 	res = restore
 	s = status --show-stash
-	sh = show
+	sh = show --ext-diff
 	ss = status --show-stash -s
 	st = stash
 	stm = stash -m
@@ -155,5 +158,9 @@
 	line-numbers = true
 	side-by-side = true
 
+[difftool]
+    # Run the difftool immediately, don't ask 'are you sure' each time.
+    prompt = false
+
 [http]
-	sslVerify = false
+		sslVerify = false