~protesilaos/modus-themes

Add mappings for ANSI colors v1 PROPOSED

Illia Ostapyshyn: 1
 Add mappings for ANSI colors

 5 files changed, 121 insertions(+), 37 deletions(-)
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~protesilaos/modus-themes/patches/39390/mbox | git am -3
Learn more about email & git

[PATCH] Add mappings for ANSI colors Export this patch

---
 modus-operandi-theme.el        | 21 +++++++++-
 modus-operandi-tinted-theme.el | 21 +++++++++-
 modus-themes.el                | 74 +++++++++++++++++++---------------
 modus-vivendi-theme.el         | 21 +++++++++-
 modus-vivendi-tinted-theme.el  | 21 +++++++++-
 5 files changed, 121 insertions(+), 37 deletions(-)

diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
index 0705f92..ec76c7c 100644
--- a/modus-operandi-theme.el
+++ b/modus-operandi-theme.el
@@ -372,7 +372,26 @@ which corresponds to a minimum contrast in relative luminance of
      (overline-heading-5 unspecified)
      (overline-heading-6 unspecified)
      (overline-heading-7 unspecified)
      (overline-heading-8 unspecified))
      (overline-heading-8 unspecified)

;;;; ANSI Color mappings

      (ansi-black          "black")
      (ansi-red            red)
      (ansi-green          green)
      (ansi-yellow         yellow)
      (ansi-blue           blue)
      (ansi-magenta        magenta)
      (ansi-cyan           cyan)
      (ansi-white          "gray65")
      (ansi-bright-black   "gray35")
      (ansi-bright-red     red-warmer)
      (ansi-bright-green   green-warmer)
      (ansi-bright-yellow  yellow-warmer)
      (ansi-bright-blue    blue-warmer)
      (ansi-bright-magenta magenta-warmer)
      (ansi-bright-cyan    cyan-warmer)
      (ansi-bright-white   "white"))
    "The entire palette of the `modus-operandi' theme.

Named colors have the form (COLOR-NAME HEX-VALUE) with the former
diff --git a/modus-operandi-tinted-theme.el b/modus-operandi-tinted-theme.el
index 4bb820c..c06512c 100644
--- a/modus-operandi-tinted-theme.el
+++ b/modus-operandi-tinted-theme.el
@@ -371,7 +371,26 @@ which corresponds to a minimum contrast in relative luminance of
      (overline-heading-5 unspecified)
      (overline-heading-6 unspecified)
      (overline-heading-7 unspecified)
      (overline-heading-8 unspecified))
      (overline-heading-8 unspecified)

;;;; ANSI Color mappings

      (ansi-black          "black")
      (ansi-red            red)
      (ansi-green          green)
      (ansi-yellow         yellow)
      (ansi-blue           blue)
      (ansi-magenta        magenta)
      (ansi-cyan           cyan)
      (ansi-white          "gray65")
      (ansi-bright-black   "gray35")
      (ansi-bright-red     red-warmer)
      (ansi-bright-green   green-warmer)
      (ansi-bright-yellow  yellow-warmer)
      (ansi-bright-blue    blue-warmer)
      (ansi-bright-magenta magenta-warmer)
      (ansi-bright-cyan    cyan-warmer)
      (ansi-bright-white   "white"))
    "The entire palette of the `modus-operandi-tinted' theme.

Named colors have the form (COLOR-NAME HEX-VALUE) with the former
diff --git a/modus-themes.el b/modus-themes.el
index d723e9b..0f505f5 100644
--- a/modus-themes.el
+++ b/modus-themes.el
@@ -1715,23 +1715,23 @@ FG and BG are the main colors."
    `(annotate-highlight-secondary ((,c :background ,bg-magenta-subtle :underline ,magenta-intense)))
;;;;; ansi-color
    ;; Those are in Emacs28.
    `(ansi-color-black ((,c :background "black" :foreground "black")))
    `(ansi-color-blue ((,c :background ,blue :foreground ,blue)))
    `(ansi-color-black ((,c :background ,ansi-black :foreground ,ansi-black)))
    `(ansi-color-blue ((,c :background ,ansi-blue :foreground ,ansi-blue)))
    `(ansi-color-bold ((,c :inherit bold)))
    `(ansi-color-bright-black ((,c :background "gray35" :foreground "gray35")))
    `(ansi-color-bright-blue ((,c :background ,blue-warmer :foreground ,blue-warmer)))
    `(ansi-color-bright-cyan ((,c :background ,cyan-cooler :foreground ,cyan-cooler)))
    `(ansi-color-bright-green ((,c :background ,green-cooler :foreground ,green-cooler)))
    `(ansi-color-bright-magenta ((,c :background ,magenta-cooler :foreground ,magenta-cooler)))
    `(ansi-color-bright-red ((,c :background ,red-warmer :foreground ,red-warmer)))
    `(ansi-color-bright-white ((,c :background "white" :foreground "white")))
    `(ansi-color-bright-yellow ((,c :background ,yellow-warmer :foreground ,yellow-warmer)))
    `(ansi-color-cyan ((,c :background ,cyan :foreground ,cyan)))
    `(ansi-color-green ((,c :background ,green :foreground ,green)))
    `(ansi-color-magenta ((,c :background ,magenta :foreground ,magenta)))
    `(ansi-color-red ((,c :background ,red :foreground ,red)))
    `(ansi-color-white ((,c :background "gray65" :foreground "gray65")))
    `(ansi-color-yellow ((,c :background ,yellow :foreground ,yellow)))
    `(ansi-color-bright-black ((,c :background ,ansi-bright-black :foreground ,ansi-bright-black)))
    `(ansi-color-bright-blue ((,c :background ,ansi-bright-blue :foreground ,ansi-bright-blue)))
    `(ansi-color-bright-cyan ((,c :background ,ansi-bright-cyan :foreground ,ansi-bright-cyan)))
    `(ansi-color-bright-green ((,c :background ,ansi-bright-green :foreground ,ansi-bright-green)))
    `(ansi-color-bright-magenta ((,c :background ,ansi-bright-magenta :foreground ,ansi-bright-magenta)))
    `(ansi-color-bright-red ((,c :background ,ansi-bright-red :foreground ,ansi-bright-red)))
    `(ansi-color-bright-white ((,c :background ,ansi-bright-white :foreground ,ansi-bright-white)))
    `(ansi-color-bright-yellow ((,c :background ,ansi-bright-yellow :foreground ,ansi-bright-yellow)))
    `(ansi-color-cyan ((,c :background ,ansi-cyan :foreground ,ansi-cyan)))
    `(ansi-color-green ((,c :background ,ansi-green :foreground ,ansi-green)))
    `(ansi-color-magenta ((,c :background ,ansi-magenta :foreground ,ansi-magenta)))
    `(ansi-color-red ((,c :background ,ansi-red :foreground ,ansi-red)))
    `(ansi-color-white ((,c :background ,ansi-white :foreground ,ansi-white)))
    `(ansi-color-yellow ((,c :background ,ansi-yellow :foreground ,ansi-yellow)))
;;;;; anzu
    `(anzu-match-1 ((,c :inherit modus-themes-subtle-cyan)))
    `(anzu-match-2 ((,c :inherit modus-themes-search-current)))
@@ -3515,14 +3515,22 @@ FG and BG are the main colors."
;;;;; term
    `(term ((,c :background ,bg-main :foreground ,fg-main)))
    `(term-bold ((,c :inherit bold)))
    `(term-color-black ((,c :background "gray35" :foreground "gray35")))
    `(term-color-blue ((,c :background ,blue :foreground ,blue)))
    `(term-color-cyan ((,c :background ,cyan :foreground ,cyan)))
    `(term-color-green ((,c :background ,green :foreground ,green)))
    `(term-color-magenta ((,c :background ,magenta :foreground ,magenta)))
    `(term-color-red ((,c :background ,red :foreground ,red)))
    `(term-color-white ((,c :background "gray65" :foreground "gray65")))
    `(term-color-yellow ((,c :background ,yellow :foreground ,yellow)))
    `(term-color-black ((,c :background ,ansi-black :foreground ,ansi-black)))
    `(term-color-blue ((,c :background ,ansi-blue :foreground ,ansi-blue)))
    `(term-color-bright-black ((,c :background ,ansi-bright-black :foreground ,ansi-bright-black)))
    `(term-color-bright-blue ((,c :background ,ansi-bright-blue :foreground ,ansi-bright-blue)))
    `(term-color-bright-cyan ((,c :background ,ansi-bright-cyan :foreground ,ansi-bright-cyan)))
    `(term-color-bright-green ((,c :background ,ansi-bright-green :foreground ,ansi-bright-green)))
    `(term-color-bright-magenta ((,c :background ,ansi-bright-magenta :foreground ,ansi-bright-magenta)))
    `(term-color-bright-red ((,c :background ,ansi-bright-red :foreground ,ansi-bright-red)))
    `(term-color-bright-white ((,c :background ,ansi-bright-white :foreground ,ansi-bright-white)))
    `(term-color-bright-yellow ((,c :background ,ansi-bright-yellow :foreground ,ansi-bright-yellow)))
    `(term-color-cyan ((,c :background ,ansi-cyan :foreground ,ansi-cyan)))
    `(term-color-green ((,c :background ,ansi-green :foreground ,ansi-green)))
    `(term-color-magenta ((,c :background ,ansi-magenta :foreground ,ansi-magenta)))
    `(term-color-red ((,c :background ,ansi-red :foreground ,ansi-red)))
    `(term-color-white ((,c :background ,ansi-white :foreground ,ansi-white)))
    `(term-color-yellow ((,c :background ,ansi-yellow :foreground ,ansi-yellow)))
    `(term-underline ((,c :underline t)))
;;;;; textsec
    `(textsec-suspicious (( )))
@@ -3653,17 +3661,17 @@ FG and BG are the main colors."
    `(vr/match-1 ((,c :inherit modus-themes-intense-yellow)))
    `(vr/match-separator-face ((,c :inherit bold :background ,bg-active)))
;;;;; vterm
    `(vterm-color-black ((,c :background "gray35" :foreground "gray35")))
    `(vterm-color-blue ((,c :background ,blue :foreground ,blue)))
    `(vterm-color-cyan ((,c :background ,cyan :foreground ,cyan)))
    `(vterm-color-black ((,c :background ,ansi-bright-black :foreground ,ansi-black)))
    `(vterm-color-blue ((,c :background ,ansi-bright-blue :foreground ,ansi-blue)))
    `(vterm-color-cyan ((,c :background ,ansi-bright-cyan :foreground ,ansi-cyan)))
    `(vterm-color-default ((,c :background ,bg-main :foreground ,fg-main)))
    `(vterm-color-green ((,c :background ,green :foreground ,green)))
    `(vterm-color-green ((,c :background ,ansi-bright-green :foreground ,ansi-green)))
    `(vterm-color-inverse-video ((,c :background ,bg-main :inverse-video t)))
    `(vterm-color-magenta ((,c :background ,magenta :foreground ,magenta)))
    `(vterm-color-red ((,c :background ,red :foreground ,red)))
    `(vterm-color-magenta ((,c :background ,ansi-bright-magenta :foreground ,ansi-magenta)))
    `(vterm-color-red ((,c :background ,ansi-bright-red :foreground ,ansi-red)))
    `(vterm-color-underline ((,c :underline t)))
    `(vterm-color-white ((,c :background "gray65" :foreground "gray65")))
    `(vterm-color-yellow ((,c :background ,yellow :foreground ,yellow)))
    `(vterm-color-white ((,c :background ,ansi-bright-white :foreground ,ansi-white)))
    `(vterm-color-yellow ((,c :background ,ansi-bright-yellow :foreground ,ansi-yellow)))
;;;;; vundo
    `(vundo-highlight ((,c :inherit (bold vundo-node) :foreground ,red-intense)))
;;;;; wcheck-mode
@@ -3801,7 +3809,7 @@ FG and BG are the main colors."
  '(
;;;; ansi-colors
    `(ansi-color-faces-vector [default bold shadow italic underline success warning error])
    `(ansi-color-names-vector ["gray35" ,red ,green ,yellow ,blue ,magenta ,cyan "gray65"])
    `(ansi-color-names-vector [,ansi-black ,ansi-red ,ansi-green ,ansi-yellow ,ansi-blue ,ansi-magenta ,ansi-cyan ,ansi-white])
;;;; chart
    `(chart-face-color-list
      '( ,bg-graph-red-0 ,bg-graph-green-0 ,bg-graph-yellow-0 ,bg-graph-blue-0 ,bg-graph-magenta-0 ,bg-graph-cyan-0
diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el
index 5012f8f..6e4e1f3 100644
--- a/modus-vivendi-theme.el
+++ b/modus-vivendi-theme.el
@@ -371,7 +371,26 @@ which corresponds to a minimum contrast in relative luminance of
      (overline-heading-5 unspecified)
      (overline-heading-6 unspecified)
      (overline-heading-7 unspecified)
      (overline-heading-8 unspecified))
      (overline-heading-8 unspecified)

;;;; ANSI Color mappings

      (ansi-black          "black")
      (ansi-red            red)
      (ansi-green          green)
      (ansi-yellow         yellow)
      (ansi-blue           blue)
      (ansi-magenta        magenta)
      (ansi-cyan           cyan)
      (ansi-white          "gray65")
      (ansi-bright-black   "gray35")
      (ansi-bright-red     red-warmer)
      (ansi-bright-green   green-warmer)
      (ansi-bright-yellow  yellow-warmer)
      (ansi-bright-blue    blue-warmer)
      (ansi-bright-magenta magenta-warmer)
      (ansi-bright-cyan    cyan-warmer)
      (ansi-bright-white   "white"))
    "The entire palette of the `modus-vivendi' theme.

Named colors have the form (COLOR-NAME HEX-VALUE) with the former
diff --git a/modus-vivendi-tinted-theme.el b/modus-vivendi-tinted-theme.el
index 79e7fc9..1fc2915 100644
--- a/modus-vivendi-tinted-theme.el
+++ b/modus-vivendi-tinted-theme.el
@@ -371,7 +371,26 @@ which corresponds to a minimum contrast in relative luminance of
      (overline-heading-5 unspecified)
      (overline-heading-6 unspecified)
      (overline-heading-7 unspecified)
      (overline-heading-8 unspecified))
      (overline-heading-8 unspecified)

;;;; ANSI Color mappings

      (ansi-black          "black")
      (ansi-red            red)
      (ansi-green          green)
      (ansi-yellow         yellow)
      (ansi-blue           blue)
      (ansi-magenta        magenta)
      (ansi-cyan           cyan)
      (ansi-white          "gray65")
      (ansi-bright-black   "gray35")
      (ansi-bright-red     red-warmer)
      (ansi-bright-green   green-warmer)
      (ansi-bright-yellow  yellow-warmer)
      (ansi-bright-blue    blue-warmer)
      (ansi-bright-magenta magenta-warmer)
      (ansi-bright-cyan    cyan-warmer)
      (ansi-bright-white   "white"))
    "The entire palette of the `modus-vivendi-tinted' theme.

Named colors have the form (COLOR-NAME HEX-VALUE) with the former
-- 
2.39.2