dotfiles

commit 4d3573234058c5f6b6d341f4a736d0985ff034b4
parent 9700b7bc4f2c198ef73276dddb77b37077214a1d
Author: Kévin Le Gouguec <kevin.legouguec@gmail.com>
Date:   Sat,  9 May 2026 11:45:31 +0200

Theme Magit faces for conflict markers

Also switch from yellow to magenta for "base", in Magit & Smerge, to
match Ediff.

Also drop inheritance with -added & -removed, since we cannot use
inheritance for -base anyway.

Diffstat:
M
.config/emacs/eighters-theme.el
 | 
14
+++++++++-----

1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/.config/emacs/eighters-theme.el b/.config/emacs/eighters-theme.el
@@ -530,7 +530,7 @@
   `(ediff-fine-diff-C ((t (:inherit diff-refine-changed))))
   `(ediff-fine-diff-Ancestor ((t (:background ,bg-magenta))))
   `(smerge-markers ((t (:background ,bg-hl-dim :foreground ,fg-dim))))
-  `(smerge-base ((t (:background ,bg-yellow-dim))))
+  `(smerge-base ((t (:background ,bg-magenta-dim))))
   `(smerge-refine-shadow-cursor ((t (:box (:color ,fg-dimmer :line-width (-1 . -1))))))
   ;; Do *NOT* customize smerge-refined-changed, because that tells
   ;; smerge to use it for both removed and added sections.
@@ -601,14 +601,18 @@
   `(magit-diff-hunk-heading-selection ((t (:foreground ,fg-cyan :background ,bg-cyan-dim))))
   `(magit-diff-lines-heading ((t (:foreground ,fg-cyan :inverse-video t))))
 ;;;;; Diffs.
-  `(magit-diff-base ((t (:foreground ,fg-dim :inherit diff-changed))))
-  `(magit-diff-base-highlight ((t (:background ,bg-yellow-dim))))
-  `(magit-diff-removed ((t (:foreground ,fg-dim :inherit diff-removed))))
+  `(magit-diff-base ((t (:foreground ,fg-dim :background ,bg-magenta-dimmer))))
+  `(magit-diff-base-highlight ((t (:background ,bg-magenta-dim))))
+  `(magit-diff-removed ((t (:foreground ,fg-dim :background ,bg-red-dimmer))))
   `(magit-diff-removed-highlight ((t (:background ,bg-red-dim))))
   `(magit-diffstat-removed ((t (:foreground ,fg-red))))
-  `(magit-diff-added ((t (:foreground ,fg-dim :inherit diff-added))))
+  `(magit-diff-added ((t (:foreground ,fg-dim :background ,bg-blue-dimmer))))
   `(magit-diff-added-highlight ((t (:background ,bg-blue-dim))))
   `(magit-diffstat-added ((t (:foreground ,fg-blue))))
+;;;;;; Conflicts.
+  `(magit-diff-our-heading ((t (:foreground ,fg-red :background ,bg-red :weight bold))))
+  `(magit-diff-base-heading ((t (:foreground ,fg-magenta :background ,bg-magenta :weight bold))))
+  `(magit-diff-their-heading ((t (:foreground ,fg-blue :background ,bg-blue :weight bold))))
 ;;;;; Git commit.
   `(git-commit-comment-action ((t (:inherit eighters-title-3))))
   `(git-commit-comment-branch-local ((t (:inherit magit-branch-local))))