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-dream-theme.el b/ef-dream-theme.el
index b9a06c3..f5ef999 100644
--- a/ef-dream-theme.el
+++ b/ef-dream-theme.el
@@ -36,137 +36,83 @@
 (eval-and-compile
   (require 'ef-themes)
 
-;;;###theme-autoload
-  (deftheme ef-dream
-    "Legible dark theme with gold and nuanced colors."
-    :background-mode 'dark
-    :kind 'color-scheme
-    :family 'ef)
-
-  (defconst ef-dream-palette
-    '(
-;;; Basic values
-
-      (bg-main     "#232025")
-      (fg-main     "#efd5c5")
-      (bg-dim      "#322f34")
-      (fg-dim      "#8f8886")
-      (bg-alt      "#3b393e")
-      (fg-alt      "#b0a0cf")
-
-      (bg-active   "#5b595e")
+  (defconst ef-dream-partial
+    '((cursor "#f3c09a")
+      (bg-main "#232025")
+      (bg-dim "#322f34")
+      (bg-alt "#3b393e")
+      (fg-main "#efd5c5")
+      (fg-dim "#8f8886")
+      (fg-alt "#b0a0cf")
+      (bg-active "#5b595e")
       (bg-inactive "#2a272c")
-
-;;; Basic hues for foreground values
-
-      (red             "#ff6f6f")
-      (red-warmer      "#ff7a5f")
-      (red-cooler      "#e47980")
-      (red-faint       "#f3a0a0")
-      (green           "#51b04f")
-      (green-warmer    "#7fce5f")
-      (green-cooler    "#3fc489")
-      (green-faint     "#a9c99f")
-      (yellow          "#c0b24f")
-      (yellow-warmer   "#d09950")
-      (yellow-cooler   "#deb07a")
-      (yellow-faint    "#caa89f")
-      (blue            "#57b0ff")
-      (blue-warmer     "#80aadf")
-      (blue-cooler     "#12b4ff")
-      (blue-faint      "#a0a0cf")
-      (magenta         "#ffaacf")
-      (magenta-warmer  "#f498c0")
-      (magenta-cooler  "#d0b0ff")
-      (magenta-faint   "#e3b0c0")
-      (cyan            "#6fb3c0")
-      (cyan-warmer     "#8fcfd0")
-      (cyan-cooler     "#65c5a8")
-      (cyan-faint      "#99bfcf")
-
-;;; Basic hues for background values
-
-      (bg-red-intense     "#a02f50")
-      (bg-green-intense   "#30682f")
-      (bg-yellow-intense  "#8f665f")
-      (bg-blue-intense    "#4f509f")
+      (border "#635850")
+
+      (red "#ff6f6f")
+      (red-warmer "#ff7a5f")
+      (red-cooler "#e47980")
+      (red-faint "#f3a0a0")
+      (green "#51b04f")
+      (green-warmer "#7fce5f")
+      (green-cooler "#3fc489")
+      (green-faint "#a9c99f")
+      (yellow "#c0b24f")
+      (yellow-warmer "#d09950")
+      (yellow-cooler "#deb07a")
+      (yellow-faint "#caa89f")
+      (blue "#57b0ff")
+      (blue-warmer "#80aadf")
+      (blue-cooler "#12b4ff")
+      (blue-faint "#a0a0cf")
+      (magenta "#ffaacf")
+      (magenta-warmer "#f498c0")
+      (magenta-cooler "#d0b0ff")
+      (magenta-faint "#e3b0c0")
+      (cyan "#6fb3c0")
+      (cyan-warmer "#8fcfd0")
+      (cyan-cooler "#65c5a8")
+      (cyan-faint "#99bfcf")
+
+      (bg-red-intense "#a02f50")
+      (bg-green-intense "#30682f")
+      (bg-yellow-intense "#8f665f")
+      (bg-blue-intense "#4f509f")
       (bg-magenta-intense "#885997")
-      (bg-cyan-intense    "#0280b9")
-
-      (bg-red-subtle      "#6f202a")
-      (bg-green-subtle    "#2a532f")
-      (bg-yellow-subtle   "#62432a")
-      (bg-blue-subtle     "#3a3e73")
-      (bg-magenta-subtle  "#66345a")
-      (bg-cyan-subtle     "#334d69")
-
-;;; Diffs
-
-      (bg-added          "#304a4f")
-      (bg-added-faint    "#16383f")
-      (bg-added-refine   "#2f6767")
-      (fg-added          "#a0d0f0")
-
-      (bg-changed        "#51512f")
-      (bg-changed-faint  "#40332f")
+      (bg-cyan-intense "#0280b9")
+
+      (bg-red-subtle "#6f202a")
+      (bg-green-subtle "#2a532f")
+      (bg-yellow-subtle "#62432a")
+      (bg-blue-subtle "#3a3e73")
+      (bg-magenta-subtle "#66345a")
+      (bg-cyan-subtle "#334d69")
+
+      (bg-added "#304a4f")
+      (bg-added-faint "#16383f")
+      (bg-added-refine "#2f6767")
+      (fg-added "#a0d0f0")
+
+      (bg-changed "#51512f")
+      (bg-changed-faint "#40332f")
       (bg-changed-refine "#64651f")
-      (fg-changed        "#dada90")
+      (fg-changed "#dada90")
 
-      (bg-removed        "#5a3142")
-      (bg-removed-faint  "#4a2034")
+      (bg-removed "#5a3142")
+      (bg-removed-faint "#4a2034")
       (bg-removed-refine "#782a4a")
-      (fg-removed        "#f0bfcf")
-
-;;; Graphs
-
-      (bg-graph-red-0     "#b52c2c")
-      (bg-graph-red-1     "#702020")
-      (bg-graph-green-0   "#0fed00")
-      (bg-graph-green-1   "#007800")
-      (bg-graph-yellow-0  "#f1e00a")
-      (bg-graph-yellow-1  "#b08940")
-      (bg-graph-blue-0    "#2fafef")
-      (bg-graph-blue-1    "#1f2f8f")
-      (bg-graph-magenta-0 "#bf94fe")
-      (bg-graph-magenta-1 "#5f509f")
-      (bg-graph-cyan-0    "#47dfea")
-      (bg-graph-cyan-1    "#00808f")
-
-;;; Special hues
-
-      (bg-mode-line       "#675072")
-      (fg-mode-line       "#fedeff")
-      (bg-completion      "#503240")
-      (bg-hover           "#957856")
-      (bg-hover-secondary "#665f7a")
-      (bg-hl-line         "#412f4f")
-      (bg-paren           "#885566")
-      (bg-err             "#501a2d") ; check with err
-      (bg-warning         "#4e3930") ; check with warning
-      (bg-info            "#0f3f4f") ; check with info
-
-      (border        "#635850")
-      (cursor        "#f3c09a")
-      (fg-intense    "#ffffff")
-
-      (modeline-err     "#ffbfbf")
-      (modeline-warning "#dfd443")
-      (modeline-info    "#7fefff")
-
-      (underline-err     "#c04f9f")
-      (underline-warning "#c0b000")
-      (underline-info    "#229fb2")
-
-      (bg-char-0 "#0050af")
-      (bg-char-1 "#7f1f7f")
-      (bg-char-2 "#6f6600")
+      (fg-removed "#f0bfcf")
 
-;;; Mappings
-
-;;;; General mappings
-
-      (bg-fringe unspecified)
-      (fg-fringe unspecified)
+      (bg-mode-line-active "#675072")
+      (fg-mode-line-active "#fedeff")
+      (bg-completion "#503240")
+      (bg-hover "#957856")
+      (bg-hover-secondary "#665f7a")
+      (bg-hl-line "#412f4f")
+      (bg-paren-match "#885566")
+      (bg-region "#544a50")
+      (bg-err "#501a2d") ; check with err
+      (bg-warning "#4e3930") ; check with warning
+      (bg-info "#0f3f4f") ; check with info
 
       (err magenta-warmer)
       (warning yellow-warmer)
@@ -178,12 +124,7 @@
       (keybind cyan)
       (identifier yellow-cooler)
       (prompt magenta)
-
-      (bg-region "#544a50")
-      (fg-region unspecified)
-
-;;;; Code mappings
-
+      
       (builtin magenta-faint)
       (comment blue-faint)
       (constant blue-warmer)
@@ -197,15 +138,11 @@
       (rx-escape cyan-cooler) ; compare with `string'
       (rx-construct red-cooler)
 
-;;;; Accent mappings
-
       (accent-0 yellow-cooler)
       (accent-1 red-cooler)
       (accent-2 magenta-warmer)
       (accent-3 blue-warmer)
 
-;;;; Date mappings
-
       (date-common magenta-faint)
       (date-deadline red-cooler)
       (date-deadline-subtle red-faint)
@@ -218,8 +155,6 @@
       (date-weekday magenta)
       (date-weekend blue-faint)
 
-;;;; Prose mappings
-
       (prose-code blue-warmer)
       (prose-done cyan-warmer)
       (prose-macro green-cooler)
@@ -231,8 +166,6 @@
       (prose-todo yellow-warmer)
       (prose-verbatim magenta-warmer)
 
-;;;; Mail mappings
-
       (mail-cite-0 yellow-cooler)
       (mail-cite-1 red-cooler)
       (mail-cite-2 cyan-faint)
@@ -242,8 +175,6 @@
       (mail-subject magenta-warmer)
       (mail-other magenta-faint)
 
-;;;; Search mappings
-
       (bg-search-match bg-warning)
       (bg-search-current bg-yellow-intense)
       (bg-search-lazy bg-blue-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)
-      (fg-term-red             red)
-      (bg-term-red-bright      red-warmer)
-      (fg-term-red-bright      red-warmer)
-
-      (bg-term-green           green-warmer)
-      (fg-term-green           green-warmer)
-      (bg-term-green-bright    green-cooler)
-      (fg-term-green-bright    green-cooler)
-
-      (bg-term-yellow          yellow)
-      (fg-term-yellow          yellow)
-      (bg-term-yellow-bright   yellow-warmer)
-      (fg-term-yellow-bright   yellow-warmer)
-
-      (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 yellow-cooler)
       (rainbow-1 magenta)
       (rainbow-2 blue-warmer)
@@ -319,13 +196,7 @@
       (rainbow-6 cyan)
       (rainbow-7 yellow)
       (rainbow-8 red-faint))
-    "The `ef-dream' 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 dark purple grey theme with gold and nuanced colors.")
 
   (defcustom ef-dream-palette-overrides nil
     "Overrides for `ef-dream-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-dream ef-dream-palette ef-dream-palette-overrides)
-
-  (provide-theme 'ef-dream))
+  (defconst ef-themes-dream-palette
+    (append ef-themes-common-palette-overrides ef-dream-partial ef-themes-palette-common))
+
+  (modus-themes-theme
+    ef-dream
+    ef-themes
+    "Legible dark purple grey theme with gold and nuanced colors."
+    dark
+    modus-vivendi-palette
+    ef-themes-dream-palette
+    ef-themes-dream-palette-overrides))
 
 ;;; ef-dream-theme.el ends here