summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--user/emacs/init.el6
-rw-r--r--user/settings/emacs.nix1
2 files changed, 7 insertions, 0 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el
index af60817a..785a9f53 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -1124,6 +1124,12 @@ paths for the same project."
   :config (progn
             (magit-todos-mode +1)))
 
+(use-package difftastic)
+(use-package difftastic-bindings
+  :after magit
+  :config (progn
+            (difftastic-bindings-mode +1)))
+
 (use-package git-gutter-fringe
   :defer 5
   :config (progn
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index 72c2ee52..aeb5c454 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -83,6 +83,7 @@ in
         consult-lsp
         crux
         dired-git-info
+        difftastic
         docker-compose-mode
         doom-themes
         dtrt-indent