git: add difftastic as git difftool

tiborpilz · Mar 22, 2024 · d8c8dc1 · d8c8dc1
1 parent e33caee
commit d8c8dc1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/home/config/doom/config.org b/home/config/doom/config.org
@@ -1130,6 +1130,10 @@ Add some keybindings und ~SPC g~ (Git)
       :desc "List all owned projects" "g l o" #'lab-list-all-owned-projects)
 #+end_src
 
+**** Delta as Git Diff
+#+begin_src elisp :tangle packages.el
+(package! diff-ansi)
+#+end_src
 *** Documentation
 **** Devdocs
 Devdocs (https://elpa.gnu.org/packages/devdocs.html) is a package for viewing

diff --git a/home/config/doom/init.el b/home/config/doom/init.el
@@ -76,7 +76,6 @@
        (dired +icons)          ; making dired pretty [functional]
        electric          ; smarter, keyword-based electric-indent
        (ibuffer +icons)         ; interactive buffer management
-       tramp
        undo              ; persistent, smarter undo for your inevitable mistakes
        vc                ; version-control and Emacs, sitting in a tree
 
@@ -116,8 +115,8 @@
        ;;upload            ; map local to remote projects via ssh/ftp
 
        :os
-       (macos)  ; improve compatibility with macOS
-       (tty +osc)               ; improve the terminal Emacs experience
+       (macos)             ; improve compatibility with macOS
+       (tty +osc)          ; improve the terminal Emacs experience
 
        :lang
        ;;agda              ; types of types of types of types...

diff --git a/home/config/doom/packages.el b/home/config/doom/packages.el
@@ -30,6 +30,8 @@
 
 (package! lab)
 
+(package! diff-ansi)
+
 (package! devdocs)
 
 (package! gptel)

diff --git a/home/config/git/config b/home/config/git/config
@@ -10,6 +10,15 @@
 	required = true
 [core]
   editor = vim
+[diff]
+	tool = difftastic
+	external = difft
+[difftool]
+	prompt = false
+[difftool "difftastic"]
+	cmd = difft "$LOCAL" "$REMOTE"
+[pager]
+	difftool = true
 [merge]
 	tool = diffconflicts
 [mergetool]

diff --git a/home/modules/shell/git.nix b/home/modules/shell/git.nix
@@ -18,6 +18,7 @@ in
       gitAndTools.git-open
       gitAndTools.diff-so-fancy
       gitAndTools.git-crypt
+      difftastic
       act
     ];