From f811c9e6589ae9dd282519c0ba38b6521e52bb9f Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 12 Dec 2023 00:59:34 +0100 Subject: [PATCH] Add `difftastic` --- init.el | 11 +++++++++++ packages/packages.nix | 1 + 2 files changed, 12 insertions(+) diff --git a/init.el b/init.el index ebd1ced..e6f8dc3 100644 --- a/init.el +++ b/init.el @@ -424,6 +424,17 @@ (magit-todos-mode +1) :bind (("C-c o g" . magit))) +(use-package difftastic + :demand t + :bind (:map magit-blame-read-only-mode-map + ("D" . difftastic-magit-show) + ("S" . difftastic-magit-show)) + :config + (eval-after-load 'magit-diff + '(transient-append-suffix 'magit-diff '(-1 -1) + [("D" "Difftastic diff (dwim)" difftastic-magit-diff) + ("S" "Difftastic show" difftastic-magit-show)]))) + (use-package sideline :delight :hook (flymake-mode . sideline-mode) diff --git a/packages/packages.nix b/packages/packages.nix index 6436daa..cfae2bb 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -66,6 +66,7 @@ with epkgs; let magit magit-delta magit-todos + difftastic with-editor diff-hl corfu