From 1dbb5631f6d77b1af625b6e3404094f3198e68f6 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sun, 24 Oct 2021 03:53:59 +0100 Subject: [PATCH] feat(version-control/magit): add magit-delta package Disabled by default, as the syntax highlighting can make code harder to read in the diff. Hence disabled by default, and easy to toggle on if I want to try it. --- modules/version-control/siren-magit.el | 24 ++++++++++++++++++++++++ straight/versions/default.el | 1 + 2 files changed, 25 insertions(+) diff --git a/modules/version-control/siren-magit.el b/modules/version-control/siren-magit.el index adc457f..29bc1ac 100644 --- a/modules/version-control/siren-magit.el +++ b/modules/version-control/siren-magit.el @@ -66,5 +66,29 @@ (transient-values-file (expand-file-name "transient/values.el" siren-cache-dir))) +(use-package magit-delta + :hook + (magit-mode . siren-setup-magit-delta) + + :custom + (magit-delta-default-dark-theme "OneHalfDark") + (magit-delta-default-light-theme "OneHalfLight") + (siren-magit-delta-auto-enable nil) + + :init + (defgroup siren-magit-delta nil + "Siren specific options for magit-delta." + :group 'magit-delta) + + (defcustom siren-magit-delta-auto-enable t + "Automatically enable magit-delta-mode when delta executable is available." + :type 'boolean + :group 'siren-magit-delta) + + (defun siren-setup-magit-delta () + (let ((delta (executable-find "delta"))) + (when delta + (magit-delta-mode (if siren-magit-delta-auto-enable +1 -1)))))) + (provide 'siren-magit) ;;; siren-magit.el ends here diff --git a/straight/versions/default.el b/straight/versions/default.el index 9319d4c..5891b04 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -115,6 +115,7 @@ ("lsp-ui" . "69880741041d5c61abcef941d06234f7cbd545b0") ("lua-mode" . "5a9bee8d5fc978dc64fcb677167417010321ba65") ("magit" . "5b0d1ce31e3d41397255f6de6bb5a7b75ef78fff") + ("magit-delta" . "56cdffd377279589aa0cb1df99455c098f1848cf") ("magit-popup" . "d8585fa39f88956963d877b921322530257ba9f5") ("makefile-executor.el" . "d0a34c355fb80a8616ae7ed5eebbda8507aa14ac") ("marginalia" . "56ac0265b37d5331bb3d2520245df8a900cb326c")