BREAKING: Make proof-of-concept for the redesign on top of the modus-themes

I still need to re-implement the relevant commands to switch themes,
but this is already an important step forward.

1 files changed, 84 insertions, 205 deletions

diff --git a/ef-eagle-theme.el b/ef-eagle-theme.el
index 2767495..70dbb94 100644
--- a/ef-eagle-theme.el
+++ b/ef-eagle-theme.el
@@ -36,137 +36,83 @@
 (eval-and-compile
   (require 'ef-themes)
 
-;;;###theme-autoload
-  (deftheme ef-eagle
-    "Legible light theme with brown, red, and desaturated colors."
-    :background-mode 'light
-    :kind 'color-scheme
-    :family 'ef)
-
-  (defconst ef-eagle-palette
-    '(
-;;; Basic values
-
-      (bg-main     "#f1ecd0")
-      (fg-main     "#231a1f")
-      (bg-dim      "#e4dbc0")
-      (fg-dim      "#685f53")
-      (bg-alt      "#cec8ae")
-      (fg-alt      "#524874")
-
-      (bg-active   "#aea88e")
+  (defconst ef-eagle-partial
+    '((cursor "#774400")
+      (bg-main "#f1ecd0")
+      (bg-dim "#e4dbc0")
+      (bg-alt "#cec8ae")
+      (fg-main "#231a1f")
+      (fg-dim "#685f53")
+      (fg-alt "#524874")
+      (bg-active "#aea88e")
       (bg-inactive "#e7e0ca")
-
-;;; Basic hues for foreground values
-
-      (red             "#882000")
-      (red-warmer      "#9a0000")
-      (red-cooler      "#8f0038")
-      (red-faint       "#702f1f")
-      (green           "#226022")
-      (green-warmer    "#3a7800")
-      (green-cooler    "#006e50")
-      (green-faint     "#42573f")
-      (yellow          "#6b4500")
-      (yellow-warmer   "#843300")
-      (yellow-cooler   "#775228")
-      (yellow-faint    "#6a5937")
-      (blue            "#113384")
-      (blue-warmer     "#3a3da0")
-      (blue-cooler     "#000080")
-      (blue-faint      "#2f3460")
-      (magenta         "#822478")
-      (magenta-warmer  "#960f4f")
-      (magenta-cooler  "#50119f")
-      (magenta-faint   "#603a6f")
-      (cyan            "#125a7f")
-      (cyan-warmer     "#4a5d90")
-      (cyan-cooler     "#00676f")
-      (cyan-faint      "#304f60")
-
-;;; Basic hues for background values
-
-      (bg-red-intense     "#f08f88")
-      (bg-green-intense   "#96df8f")
-      (bg-yellow-intense  "#efbf00")
-      (bg-blue-intense    "#cfceff")
+      (border "#7f785f")
+
+      (red "#882000")
+      (red-warmer "#9a0000")
+      (red-cooler "#8f0038")
+      (red-faint "#702f1f")
+      (green "#226022")
+      (green-warmer "#3a7800")
+      (green-cooler "#006e50")
+      (green-faint "#42573f")
+      (yellow "#6b4500")
+      (yellow-warmer "#843300")
+      (yellow-cooler "#775228")
+      (yellow-faint "#6a5937")
+      (blue "#113384")
+      (blue-warmer "#3a3da0")
+      (blue-cooler "#000080")
+      (blue-faint "#2f3460")
+      (magenta "#822478")
+      (magenta-warmer "#960f4f")
+      (magenta-cooler "#50119f")
+      (magenta-faint "#603a6f")
+      (cyan "#125a7f")
+      (cyan-warmer "#4a5d90")
+      (cyan-cooler "#00676f")
+      (cyan-faint "#304f60")
+
+      (bg-red-intense "#f08f88")
+      (bg-green-intense "#96df8f")
+      (bg-yellow-intense "#efbf00")
+      (bg-blue-intense "#cfceff")
       (bg-magenta-intense "#dfafff")
-      (bg-cyan-intense    "#a0ddd0")
-
-      (bg-red-subtle      "#efcabf")
-      (bg-green-subtle    "#c3e6a0")
-      (bg-yellow-subtle   "#efe07f")
-      (bg-blue-subtle     "#c7dbe8")
-      (bg-magenta-subtle  "#e3d0e7")
-      (bg-cyan-subtle     "#bfe0d0")
-
-;;; Diffs
-
-      (bg-added          "#b0e7b0")
-      (bg-added-faint    "#d0e7c2")
-      (bg-added-refine   "#9ad590")
-      (fg-added          "#005200")
-
-      (bg-changed        "#f5e690")
-      (bg-changed-faint  "#f5edaf")
+      (bg-cyan-intense "#a0ddd0")
+
+      (bg-red-subtle "#efcabf")
+      (bg-green-subtle "#c3e6a0")
+      (bg-yellow-subtle "#efe07f")
+      (bg-blue-subtle "#c7dbe8")
+      (bg-magenta-subtle "#e3d0e7")
+      (bg-cyan-subtle "#bfe0d0")
+
+      (bg-added "#b0e7b0")
+      (bg-added-faint "#d0e7c2")
+      (bg-added-refine "#9ad590")
+      (fg-added "#005200")
+
+      (bg-changed "#f5e690")
+      (bg-changed-faint "#f5edaf")
       (bg-changed-refine "#edd482")
-      (fg-changed        "#553d00")
+      (fg-changed "#553d00")
 
-      (bg-removed        "#f8c8a6")
-      (bg-removed-faint  "#f0d9bc")
+      (bg-removed "#f8c8a6")
+      (bg-removed-faint "#f0d9bc")
       (bg-removed-refine "#f0aa90")
-      (fg-removed        "#8f1013")
-
-;;; Graphs
-
-      (bg-graph-red-0     "#ef7969")
-      (bg-graph-red-1     "#ffaab4")
-      (bg-graph-green-0   "#45c050")
-      (bg-graph-green-1   "#75ef30")
-      (bg-graph-yellow-0  "#ffcf00")
-      (bg-graph-yellow-1  "#f9ff00")
-      (bg-graph-blue-0    "#7f90ff")
-      (bg-graph-blue-1    "#a6c0ff")
-      (bg-graph-magenta-0 "#e07fff")
-      (bg-graph-magenta-1 "#fad0ff")
-      (bg-graph-cyan-0    "#70d3f0")
-      (bg-graph-cyan-1    "#afefff")
-
-;;; Special hues
-
-      (bg-mode-line       "#cfab80")
-      (fg-mode-line       "#2f1005")
-      (bg-completion      "#dfc8af")
-      (bg-hover           "#c0cbd7")
-      (bg-hover-secondary "#c5d8a2")
-      (bg-hl-line         "#ecdfba")
-      (bg-paren           "#9fd0cc")
-      (bg-err             "#f2d4b5") ; check with err
-      (bg-warning         "#e7de80") ; check with warning
-      (bg-info            "#cdeeb0") ; check with info
-
-      (border        "#7f785f")
-      (cursor        "#774400")
-      (fg-intense    "#000000")
-
-      (modeline-err     "#800000")
-      (modeline-warning "#66008f")
-      (modeline-info    "#1f407f")
-
-      (underline-err     "#ef0f1f")
-      (underline-warning "#bf5f00")
-      (underline-info    "#02af52")
-
-      (bg-char-0 "#7feaff")
-      (bg-char-1 "#f0a0f0")
-      (bg-char-2 "#d0e000")
+      (fg-removed "#8f1013")
 
-;;; Mappings
-
-;;;; General mappings
-
-      (bg-fringe unspecified)
-      (fg-fringe unspecified)
+      (bg-mode-line-active "#cfab80")
+      (fg-mode-line-active "#2f1005")
+      (bg-completion "#dfc8af")
+      (bg-hover "#c0cbd7")
+      (bg-hover-secondary "#c5d8a2")
+      (bg-hl-line "#ecdfba")
+      (bg-paren-match "#9fd0cc")
+      (bg-region "#ddc5af")
+      (bg-err "#f2d4b5") ; check with err
+      (bg-warning "#e7de80") ; check with warning
+      (bg-info "#cdeeb0") ; check with info
 
       (err red-warmer)
       (warning yellow-warmer)
@@ -178,12 +124,7 @@
       (keybind red-warmer)
       (identifier cyan-faint)
       (prompt yellow-warmer)
-
-      (bg-region "#ddc5af")
-      (fg-region unspecified)
-
-;;;; Code mappings
-
+      
       (builtin yellow-cooler)
       (comment yellow-faint)
       (constant green-cooler)
@@ -197,15 +138,11 @@
       (rx-escape magenta-warmer) ; compare with `string'
       (rx-construct blue-cooler)
 
-;;;; Accent mappings
-
       (accent-0 red)
       (accent-1 green-cooler)
       (accent-2 blue)
       (accent-3 red-warmer)
 
-;;;; Date mappings
-
       (date-common red-faint)
       (date-deadline red-cooler)
       (date-deadline-subtle red)
@@ -218,8 +155,6 @@
       (date-weekday red)
       (date-weekend cyan)
 
-;;;; Prose mappings
-
       (prose-code green-cooler)
       (prose-done green-warmer)
       (prose-macro blue)
@@ -231,8 +166,6 @@
       (prose-todo red-warmer)
       (prose-verbatim red-cooler)
 
-;;;; Mail mappings
-
       (mail-cite-0 red)
       (mail-cite-1 yellow)
       (mail-cite-2 green)
@@ -242,8 +175,6 @@
       (mail-subject red-warmer)
       (mail-other yellow-warmer)
 
-;;;; Search mappings
-
       (bg-search-match bg-warning)
       (bg-search-current bg-yellow-intense)
       (bg-search-lazy bg-cyan-intense)
@@ -254,62 +185,8 @@
       (bg-search-rx-group-2 bg-red-subtle)
       (bg-search-rx-group-3 bg-cyan-subtle)
 
-;;;; Space mappings
-
-      (bg-space unspecified)
-      (fg-space border)
       (bg-space-err bg-yellow-intense)
 
-;;;; Tab mappings
-
-      (bg-tab-bar      bg-alt)
-      (bg-tab-current  bg-main)
-      (bg-tab-other    bg-active)
-
-;;;; Terminal mappings
-
-      (bg-term-black           "black")
-      (fg-term-black           "black")
-      (bg-term-black-bright    "gray35")
-      (fg-term-black-bright    "gray35")
-
-      (bg-term-red             red-cooler)
-      (fg-term-red             red-cooler)
-      (bg-term-red-bright      red-warmer)
-      (fg-term-red-bright      red-warmer)
-
-      (bg-term-green           green)
-      (fg-term-green           green)
-      (bg-term-green-bright    green-warmer)
-      (fg-term-green-bright    green-warmer)
-
-      (bg-term-yellow          yellow)
-      (fg-term-yellow          yellow)
-      (bg-term-yellow-bright   yellow-cooler)
-      (fg-term-yellow-bright   yellow-cooler)
-
-      (bg-term-blue            blue-warmer)
-      (fg-term-blue            blue-warmer)
-      (bg-term-blue-bright     blue-cooler)
-      (fg-term-blue-bright     blue-cooler)
-
-      (bg-term-magenta         magenta)
-      (fg-term-magenta         magenta)
-      (bg-term-magenta-bright  magenta-cooler)
-      (fg-term-magenta-bright  magenta-cooler)
-
-      (bg-term-cyan            cyan)
-      (fg-term-cyan            cyan)
-      (bg-term-cyan-bright     cyan-cooler)
-      (fg-term-cyan-bright     cyan-cooler)
-
-      (bg-term-white           "gray65")
-      (fg-term-white           "gray65")
-      (bg-term-white-bright    "white")
-      (fg-term-white-bright    "white")
-
-;;;; Rainbow mappings
-
       (rainbow-0 red)
       (rainbow-1 cyan-faint)
       (rainbow-2 red-faint)
@@ -319,13 +196,7 @@
       (rainbow-6 blue-faint)
       (rainbow-7 yellow-warmer)
       (rainbow-8 green))
-    "The `ef-eagle' palette.
-Color values have the form (COLOR-NAME HEX-VALUE) with the former
-as a symbol and the latter as a string.
-
-Semantic color mappings have the form (MAPPING-NAME COLOR-NAME)
-with both as symbols.  The latter is a color that already exists
-in the palette and is associated with a HEX-VALUE.")
+    "Legible light beige theme with brown, red, and desatured colors.")
 
   (defcustom ef-eagle-palette-overrides nil
     "Overrides for `ef-eagle-palette'.
@@ -344,8 +215,16 @@ further details)."
   :type '(repeat (list symbol (choice symbol string)))
   :link '(info-link "(ef-themes) Palette overrides"))
 
-  (ef-themes-theme ef-eagle ef-eagle-palette ef-eagle-palette-overrides)
-
-  (provide-theme 'ef-eagle))
+  (defconst ef-themes-eagle-palette
+    (append ef-themes-common-palette-overrides ef-eagle-partial ef-themes-palette-common))
+
+  (modus-themes-theme
+    ef-eagle
+    ef-themes
+    "Legible light beige theme with brown, red, and desatured colors."
+    light
+    modus-operandi-palette
+    ef-themes-eagle-palette
+    ef-themes-eagle-palette-overrides))
 
 ;;; ef-eagle-theme.el ends here