diff options
35 files changed, 2888 insertions, 9515 deletions
diff --git a/ef-arbutus-theme.el b/ef-arbutus-theme.el index 15a850d..1a17337 100644 --- a/ef-arbutus-theme.el +++ b/ef-arbutus-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-arbutus - "Legible light theme with red and green colors." - :background-mode 'light - :kind 'color-scheme - :family 'ef) - - (defconst ef-arbutus-palette - '( -;;; Basic values - - (bg-main "#ffead8") - (fg-main "#393330") - (bg-dim "#f0d8cf") - (fg-dim "#6e678f") - (bg-alt "#e7d2cb") - (fg-alt "#8a5f4a") - - (bg-active "#c7b2ab") + (defconst ef-arbutus-partial + '((cursor "#208f10") + (bg-main "#ffead8") + (bg-dim "#f0d8cf") + (bg-alt "#e7d2cb") + (fg-main "#393330") + (fg-dim "#6e678f") + (fg-alt "#8a5f4a") + (bg-active "#c7b2ab") (bg-inactive "#f7e2d2") - -;;; Basic hues for foreground values - - (red "#b0000f") - (red-warmer "#b20f00") - (red-cooler "#aa184f") - (red-faint "#8f2f30") - (green "#007000") - (green-warmer "#557000") - (green-cooler "#00704f") - (green-faint "#3f712f") - (yellow "#906200") - (yellow-warmer "#b44405") - (yellow-cooler "#8a6340") - (yellow-faint "#8d6068") - (blue "#375cc6") - (blue-warmer "#5f55df") - (blue-cooler "#265fbf") - (blue-faint "#4a659f") - (magenta "#a23ea4") - (magenta-warmer "#bf2c90") - (magenta-cooler "#6448ca") - (magenta-faint "#845592") - (cyan "#3f69af") - (cyan-warmer "#4060a0") - (cyan-cooler "#0f7688") - (cyan-faint "#546f70") - -;;; Basic hues for background values - - (bg-red-intense "#ff8f88") - (bg-green-intense "#96df80") - (bg-yellow-intense "#efbf00") - (bg-blue-intense "#afbeff") + (border "#c0b4a6") + + (red "#b0000f") + (red-warmer "#b20f00") + (red-cooler "#aa184f") + (red-faint "#8f2f30") + (green "#007000") + (green-warmer "#557000") + (green-cooler "#00704f") + (green-faint "#3f712f") + (yellow "#906200") + (yellow-warmer "#b44405") + (yellow-cooler "#8a6340") + (yellow-faint "#8d6068") + (blue "#375cc6") + (blue-warmer "#5f55df") + (blue-cooler "#265fbf") + (blue-faint "#4a659f") + (magenta "#a23ea4") + (magenta-warmer "#bf2c90") + (magenta-cooler "#6448ca") + (magenta-faint "#845592") + (cyan "#3f69af") + (cyan-warmer "#4060a0") + (cyan-cooler "#0f7688") + (cyan-faint "#546f70") + + (bg-red-intense "#ff8f88") + (bg-green-intense "#96df80") + (bg-yellow-intense "#efbf00") + (bg-blue-intense "#afbeff") (bg-magenta-intense "#bf9fff") - (bg-cyan-intense "#88d4f0") - - (bg-red-subtle "#f9c2bf") - (bg-green-subtle "#c4eda0") - (bg-yellow-subtle "#efe76f") - (bg-blue-subtle "#cfdff0") - (bg-magenta-subtle "#f0d0f0") - (bg-cyan-subtle "#bfe8eb") - -;;; Diffs - - (bg-added "#d0e6b0") - (bg-added-faint "#e2efc0") - (bg-added-refine "#bbd799") - (fg-added "#005000") - - (bg-changed "#f5e690") - (bg-changed-faint "#f5edaf") + (bg-cyan-intense "#88d4f0") + + (bg-red-subtle "#f9c2bf") + (bg-green-subtle "#c4eda0") + (bg-yellow-subtle "#efe76f") + (bg-blue-subtle "#cfdff0") + (bg-magenta-subtle "#f0d0f0") + (bg-cyan-subtle "#bfe8eb") + + (bg-added "#d0e6b0") + (bg-added-faint "#e2efc0") + (bg-added-refine "#bbd799") + (fg-added "#005000") + + (bg-changed "#f5e690") + (bg-changed-faint "#f5edaf") (bg-changed-refine "#edd482") - (fg-changed "#553d00") + (fg-changed "#553d00") - (bg-removed "#f8c6b6") - (bg-removed-faint "#f5d0b0") + (bg-removed "#f8c6b6") + (bg-removed-faint "#f5d0b0") (bg-removed-refine "#f0aaa9") - (fg-removed "#8f1313") - -;;; 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 "#e9a0a0") - (fg-mode-line "#40231f") - (bg-completion "#f3c4c4") - (bg-hover "#afdeaf") - (bg-hover-secondary "#f5bfc5") - (bg-hl-line "#fad8bf") - (bg-paren "#efafbf") - (bg-err "#ffd4b5") ; check with err - (bg-warning "#efe48f") ; check with warning - (bg-info "#d0f0bc") ; check with info - - (border "#c0b4a6") - (cursor "#208f10") - (fg-intense "#000000") + (fg-removed "#8f1313") - (modeline-err "#900000") - (modeline-warning "#70008f") - (modeline-info "#00448f") - - (underline-err "#ef0f1f") - (underline-warning "#bf5f00") - (underline-info "#02af52") - - (bg-char-0 "#7feaff") - (bg-char-1 "#f0a0f0") - (bg-char-2 "#d0e000") - -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#e9a0a0") + (fg-mode-line-active "#40231f") + (bg-completion "#f3c4c4") + (bg-hover "#afdeaf") + (bg-hover-secondary "#f5bfc5") + (bg-hl-line "#fad8bf") + (bg-paren-match "#efafbf") + (bg-region "#dbe0c0") + (bg-err "#ffd4b5") ; check with err + (bg-warning "#efe48f") ; check with warning + (bg-info "#d0f0bc") ; check with info (err red-warmer) (warning yellow) @@ -179,11 +125,6 @@ (identifier magenta-faint) (prompt red-faint) - (bg-region "#dbe0c0") - (fg-region unspecified) - -;;;; Code mappings - (builtin green-cooler) (comment fg-dim) (constant magenta) @@ -197,15 +138,11 @@ (rx-escape yellow-warmer) ; compare with `string' (rx-construct cyan-cooler) -;;;; Accent mappings - (accent-0 green) (accent-1 red) (accent-2 cyan) (accent-3 yellow-warmer) -;;;; Date mappings - (date-common green-faint) (date-deadline red-cooler) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday green-cooler) (date-weekend red) -;;;; Prose mappings - (prose-code magenta-warmer) (prose-done green) (prose-macro yellow-warmer) @@ -231,8 +166,6 @@ (prose-todo yellow-warmer) (prose-verbatim blue-cooler) -;;;; Mail mappings - (mail-cite-0 green-cooler) (mail-cite-1 green-warmer) (mail-cite-2 red-cooler) @@ -242,8 +175,6 @@ (mail-subject red) (mail-other red-warmer) -;;;; 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-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-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 green) (rainbow-1 red-faint) (rainbow-2 green-cooler) @@ -319,13 +196,7 @@ (rainbow-6 yellow-cooler) (rainbow-7 red-cooler) (rainbow-8 cyan)) - "The `ef-arbutus' 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 pink theme with red and green colors.") (defcustom ef-arbutus-palette-overrides nil "Overrides for `ef-arbutus-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-arbutus ef-arbutus-palette ef-arbutus-palette-overrides) - - (provide-theme 'ef-arbutus)) + (defconst ef-arbutus-palette + (append ef-themes-common-palette-overrides ef-arbutus-palette ef-themes-palette-common)) + + (modus-themes-theme + ef-arbutus + modus-themes + "Legible light pink theme with red and green colors." + light + modus-operandi-palette + ef-arbutus-palette + ef-arbutus-palette-overrides)) ;;; ef-arbutus-theme.el ends here diff --git a/ef-autumn-theme.el b/ef-autumn-theme.el index 845946b..3a0d06e 100644 --- a/ef-autumn-theme.el +++ b/ef-autumn-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-autumn - "Legible dark theme with warm, varied colors (red, yellow, green, teal)." - :background-mode 'dark - :kind 'color-scheme - :family 'ef) - - (defconst ef-autumn-palette - '( -;;; Basic values - - (bg-main "#0f0e06") - (fg-main "#cfbcba") - (bg-dim "#26211d") - (fg-dim "#887c8a") - (bg-alt "#36322f") - (fg-alt "#70a89f") - - (bg-active "#56524f") + (defconst ef-autumn-partial + '((cursor "#ffaa33") + (bg-main "#0f0e06") + (bg-dim "#26211d") + (bg-alt "#36322f") + (fg-main "#cfbcba") + (fg-dim "#887c8a") + (fg-alt "#70a89f") + (bg-active "#56524f") (bg-inactive "#15140d") - -;;; Basic hues for foreground values - - (red "#ef656a") - (red-warmer "#f06a3f") - (red-cooler "#ff7a7f") - (red-faint "#df7f7f") - (green "#2fa526") - (green-warmer "#64aa0f") - (green-cooler "#00b066") - (green-faint "#5f9f6f") - (yellow "#c48702") - (yellow-warmer "#d0730f") - (yellow-cooler "#df8f6f") - (yellow-faint "#cf9f7f") - (blue "#379cf6") - (blue-warmer "#6a88ff") - (blue-cooler "#029fff") - (blue-faint "#6a84af") - (magenta "#d570af") - (magenta-warmer "#e580ea") - (magenta-cooler "#af8aff") - (magenta-faint "#c590af") - (cyan "#4fb0cf") - (cyan-warmer "#6fafff") - (cyan-cooler "#3dbbb0") - (cyan-faint "#82a0af") - -;;; Basic hues for background values - - (bg-red-intense "#b02930") - (bg-green-intense "#4a7000") - (bg-yellow-intense "#8f5040") - (bg-blue-intense "#4648d0") + (border "#58514f") + + (red "#ef656a") + (red-warmer "#f06a3f") + (red-cooler "#ff7a7f") + (red-faint "#df7f7f") + (green "#2fa526") + (green-warmer "#64aa0f") + (green-cooler "#00b066") + (green-faint "#5f9f6f") + (yellow "#c48702") + (yellow-warmer "#d0730f") + (yellow-cooler "#df8f6f") + (yellow-faint "#cf9f7f") + (blue "#379cf6") + (blue-warmer "#6a88ff") + (blue-cooler "#029fff") + (blue-faint "#6a84af") + (magenta "#d570af") + (magenta-warmer "#e580ea") + (magenta-cooler "#af8aff") + (magenta-faint "#c590af") + (cyan "#4fb0cf") + (cyan-warmer "#6fafff") + (cyan-cooler "#3dbbb0") + (cyan-faint "#82a0af") + + (bg-red-intense "#b02930") + (bg-green-intense "#4a7000") + (bg-yellow-intense "#8f5040") + (bg-blue-intense "#4648d0") (bg-magenta-intense "#804fd5") - (bg-cyan-intense "#2270be") - - (bg-red-subtle "#651f2a") - (bg-green-subtle "#11422f") - (bg-yellow-subtle "#583020") - (bg-blue-subtle "#2f3069") - (bg-magenta-subtle "#542657") - (bg-cyan-subtle "#123e55") - -;;; Diffs - - (bg-added "#17360f") - (bg-added-faint "#0a2900") - (bg-added-refine "#204810") - (fg-added "#a0e0a0") - - (bg-changed "#363300") - (bg-changed-faint "#2a1f00") + (bg-cyan-intense "#2270be") + + (bg-red-subtle "#651f2a") + (bg-green-subtle "#11422f") + (bg-yellow-subtle "#583020") + (bg-blue-subtle "#2f3069") + (bg-magenta-subtle "#542657") + (bg-cyan-subtle "#123e55") + + (bg-added "#17360f") + (bg-added-faint "#0a2900") + (bg-added-refine "#204810") + (fg-added "#a0e0a0") + + (bg-changed "#363300") + (bg-changed-faint "#2a1f00") (bg-changed-refine "#4a4a00") - (fg-changed "#efef80") + (fg-changed "#efef80") - (bg-removed "#4b120a") - (bg-removed-faint "#3a0a00") + (bg-removed "#4b120a") + (bg-removed-faint "#3a0a00") (bg-removed-refine "#6f1a16") - (fg-removed "#ffbfbf") - -;;; 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 "#692a12") - (fg-mode-line "#feeeca") - (bg-completion "#36213a") - (bg-hover "#265f4a") - (bg-hover-secondary "#55345a") - (bg-hl-line "#302a3a") - (bg-paren "#2f6c4a") - (bg-err "#461204") ; check with err - (bg-warning "#353504") ; check with warning - (bg-info "#1f3b0a") ; check with info - - (border "#58514f") - (cursor "#ffaa33") - (fg-intense "#ffffff") - - (modeline-err "#ff9fbf") - (modeline-warning "#dfcf33") - (modeline-info "#4fdf5f") - - (underline-err "#df2f2f") - (underline-warning "#c0b000") - (underline-info "#22b022") - - (bg-char-0 "#0050af") - (bg-char-1 "#7f1f7f") - (bg-char-2 "#625a00") + (fg-removed "#ffbfbf") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#692a12") + (fg-mode-line-active "#feeeca") + (bg-completion "#36213a") + (bg-hover "#265f4a") + (bg-hover-secondary "#55345a") + (bg-hl-line "#302a3a") + (bg-paren-match "#2f6c4a") + (bg-region "#3f1324") + (bg-err "#461204") ; check with err + (bg-warning "#353504") ; check with warning + (bg-info "#1f3b0a") ; check with info (err red-warmer) (warning yellow) @@ -178,12 +124,7 @@ (keybind red-warmer) (identifier magenta-faint) (prompt cyan-cooler) - - (bg-region "#3f1324") - (fg-region unspecified) - -;;;; Code mappings - + (builtin red-cooler) (comment yellow-faint) (constant green-warmer) @@ -197,15 +138,11 @@ (rx-escape green-cooler) ; compare with `string' (rx-construct magenta-cooler) -;;;; Accent mappings - (accent-0 green-cooler) (accent-1 yellow-warmer) (accent-2 cyan-cooler) (accent-3 magenta-cooler) -;;;; Date mappings - (date-common yellow-cooler) (date-deadline red-warmer) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code yellow-warmer) (prose-done green-cooler) (prose-macro cyan-cooler) @@ -231,8 +166,6 @@ (prose-todo red-warmer) (prose-verbatim green-cooler) -;;;; Mail mappings - (mail-cite-0 yellow-warmer) (mail-cite-1 green-warmer) (mail-cite-2 red) @@ -242,8 +175,6 @@ (mail-subject green-cooler) (mail-other yellow) -;;;; 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-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-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-warmer) - (fg-term-cyan-bright cyan-warmer) - - (bg-term-white "gray65") - (fg-term-white "gray65") - (bg-term-white-bright "white") - (fg-term-white-bright "white") - -;;;; Rainbow mappings - (rainbow-0 yellow-warmer) (rainbow-1 green-warmer) (rainbow-2 red) @@ -319,13 +196,7 @@ (rainbow-6 red-cooler) (rainbow-7 green) (rainbow-8 yellow)) - "The `ef-autumn' 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 brown-black theme with warm colors (red, yellow, green, teal).") (defcustom ef-autumn-palette-overrides nil "Overrides for `ef-autumn-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-autumn ef-autumn-palette ef-autumn-palette-overrides) - - (provide-theme 'ef-autumn)) + (defconst ef-themes-autumn-palette + (append ef-themes-common-palette-overrides ef-autumn-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-autumn + ef-themes + "Legible dark brown-black theme with warm colors (red, yellow, green, teal)." + dark + modus-vivendi-palette + ef-themes-autumn-palette + ef-themes-autumn-palette-overrides)) ;;; ef-autumn-theme.el ends here diff --git a/ef-bio-theme.el b/ef-bio-theme.el index ec7bf2d..3e1f4fb 100644 --- a/ef-bio-theme.el +++ b/ef-bio-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-bio - "Legible dark theme with green, teal, blue, purple colors." - :background-mode 'dark - :kind 'color-scheme - :family 'ef) - - (defconst ef-bio-palette - '( -;;; Basic values - - (bg-main "#111111") - (fg-main "#cfdfd5") - (bg-dim "#222522") - (fg-dim "#808f80") - (bg-alt "#303230") - (fg-alt "#8fcfaf") - - (bg-active "#505250") - (bg-inactive "#161916") - -;;; Basic hues for foreground values - - (red "#ef6560") - (red-warmer "#f47360") - (red-cooler "#ff778f") - (red-faint "#d56f72") - (green "#3fb83f") - (green-warmer "#7fc500") - (green-cooler "#00c089") - (green-faint "#7fc07f") - (yellow "#d4aa02") - (yellow-warmer "#e09a0f") - (yellow-cooler "#cfc04f") - (yellow-faint "#b7a07f") - (blue "#37aff6") - (blue-warmer "#78afff") - (blue-cooler "#32cfef") - (blue-faint "#6ab4cf") - (magenta "#d38faf") - (magenta-warmer "#e490df") - (magenta-cooler "#af9fff") - (magenta-faint "#caa5bf") - (cyan "#6fc5ef") - (cyan-warmer "#7fcfdf") - (cyan-cooler "#5dc0aa") - (cyan-faint "#7fb4cf") - -;;; Basic hues for background values - - (bg-red-intense "#b02930") - (bg-green-intense "#407430") - (bg-yellow-intense "#8f5040") - (bg-blue-intense "#4648d0") + (defconst ef-bio-partial + '((cursor "#35f038") + (bg-main "#111111") + (bg-dim "#222522") + (bg-alt "#303230") + (fg-main "#cfdfd5") + (fg-dim "#808f80") + (fg-alt "#8fcfaf") + (bg-active "#505250") + (bg-inactive "#161916") + (border "#525959") + + (red "#ef6560") + (red-warmer "#f47360") + (red-cooler "#ff778f") + (red-faint "#d56f72") + (green "#3fb83f") + (green-warmer "#7fc500") + (green-cooler "#00c089") + (green-faint "#7fc07f") + (yellow "#d4aa02") + (yellow-warmer "#e09a0f") + (yellow-cooler "#cfc04f") + (yellow-faint "#b7a07f") + (blue "#37aff6") + (blue-warmer "#78afff") + (blue-cooler "#32cfef") + (blue-faint "#6ab4cf") + (magenta "#d38faf") + (magenta-warmer "#e490df") + (magenta-cooler "#af9fff") + (magenta-faint "#caa5bf") + (cyan "#6fc5ef") + (cyan-warmer "#7fcfdf") + (cyan-cooler "#5dc0aa") + (cyan-faint "#7fb4cf") + + (bg-red-intense "#b02930") + (bg-green-intense "#407430") + (bg-yellow-intense "#8f5040") + (bg-blue-intense "#4648d0") (bg-magenta-intense "#a04fc5") - (bg-cyan-intense "#2270be") - - (bg-red-subtle "#65201a") - (bg-green-subtle "#0a4425") - (bg-yellow-subtle "#523324") - (bg-blue-subtle "#1a3863") - (bg-magenta-subtle "#572853") - (bg-cyan-subtle "#113e57") - -;;; Diffs - - (bg-added "#003b1f") - (bg-added-faint "#002a10") - (bg-added-refine "#03512f") - (fg-added "#a0e0a0") - - (bg-changed "#363300") - (bg-changed-faint "#2a1f00") + (bg-cyan-intense "#2270be") + + (bg-red-subtle "#65201a") + (bg-green-subtle "#0a4425") + (bg-yellow-subtle "#523324") + (bg-blue-subtle "#1a3863") + (bg-magenta-subtle "#572853") + (bg-cyan-subtle "#113e57") + + (bg-added "#003b1f") + (bg-added-faint "#002a10") + (bg-added-refine "#03512f") + (fg-added "#a0e0a0") + + (bg-changed "#363300") + (bg-changed-faint "#2a1f00") (bg-changed-refine "#4a4a00") - (fg-changed "#efef80") + (fg-changed "#efef80") - (bg-removed "#4e1119") - (bg-removed-faint "#380a0f") + (bg-removed "#4e1119") + (bg-removed-faint "#380a0f") (bg-removed-refine "#751a1f") - (fg-removed "#ffbfbf") - -;;; 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 "#00552f") - (fg-mode-line "#d0ffe0") - (bg-completion "#0f3c2f") - (bg-hover "#4f3f9a") - (bg-hover-secondary "#003e5f") - (bg-hl-line "#00331f") - (bg-paren "#664950") - (bg-err "#48100f") ; check with err - (bg-warning "#3b3400") ; check with warning - (bg-info "#1a3b0f") ; check with info - - (border "#525959") - (cursor "#35f038") - (fg-intense "#ffffff") - - (modeline-err "#ff9fbf") - (modeline-warning "#dfcf33") - (modeline-info "#7fdfff") - - (underline-err "#df2f2f") - (underline-warning "#c0b000") - (underline-info "#22b022") - - (bg-char-0 "#0050af") - (bg-char-1 "#7f1f7f") - (bg-char-2 "#625a00") - -;;; Mappings + (fg-removed "#ffbfbf") -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#00552f") + (fg-mode-line-active "#d0ffe0") + (bg-completion "#0f3c2f") + (bg-hover "#4f3f9a") + (bg-hover-secondary "#003e5f") + (bg-hl-line "#00331f") + (bg-paren-match "#664950") + (bg-region "#3a3027") + (bg-err "#48100f") ; check with err + (bg-warning "#3b3400") ; check with warning + (bg-info "#1a3b0f") ; check with info (err red) (warning yellow-cooler) @@ -178,12 +124,7 @@ (keybind green) (identifier magenta-faint) (prompt cyan-cooler) - - (bg-region "#3a3027") - (fg-region unspecified) - -;;;; Code mappings - + (builtin green) (comment yellow-faint) (constant blue) @@ -197,15 +138,11 @@ (rx-escape yellow-cooler) ; compare with `string' (rx-construct green) -;;;; Accent mappings - (accent-0 green-cooler) (accent-1 blue-warmer) (accent-2 magenta-warmer) (accent-3 green-warmer) -;;;; Date mappings - (date-common cyan-cooler) (date-deadline red-cooler) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code blue-warmer) (prose-done green) (prose-macro magenta-warmer) @@ -231,8 +166,6 @@ (prose-todo red) (prose-verbatim green-cooler) -;;;; Mail mappings - (mail-cite-0 green-cooler) (mail-cite-1 blue-warmer) (mail-cite-2 green-warmer) @@ -242,8 +175,6 @@ (mail-subject blue) (mail-other green-warmer) -;;;; 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) - (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-warmer) - (fg-term-yellow-bright yellow-warmer) - - (bg-term-blue blue) - (fg-term-blue blue) - (bg-term-blue-bright blue-warmer) - (fg-term-blue-bright blue-warmer) - - (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 green-cooler) (rainbow-1 green-warmer) (rainbow-2 cyan-cooler) @@ -319,13 +196,7 @@ (rainbow-6 blue) (rainbow-7 cyan) (rainbow-8 magenta)) - "The `ef-bio' 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 green-black theme with green, teal, blue, purple colors.") (defcustom ef-bio-palette-overrides nil "Overrides for `ef-bio-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-bio ef-bio-palette ef-bio-palette-overrides) - - (provide-theme 'ef-bio)) + (defconst ef-themes-bio-palette + (append ef-themes-common-palette-overrides ef-bio-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-bio + ef-themes + "Legible dark green-black theme with green, teal, blue, purple colors." + dark + modus-vivendi-palette + ef-themes-bio-palette + ef-themes-bio-palette-overrides)) ;;; ef-bio-theme.el ends here diff --git a/ef-cherie-theme.el b/ef-cherie-theme.el index 0210d94..d24761d 100644 --- a/ef-cherie-theme.el +++ b/ef-cherie-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-cherie - "Legible dark theme with warm colors (mostly pink, magenta, gold)" - :background-mode 'dark - :kind 'color-scheme - :family 'ef) - - (defconst ef-cherie-palette - '( -;;; Basic values - - (bg-main "#190a0f") - (fg-main "#d3cfcf") - (bg-dim "#291f26") - (fg-dim "#808898") - (bg-alt "#392a2f") - (fg-alt "#bf9cdf") - - (bg-active "#594a4f") - (bg-inactive "#1e1216") - -;;; Basic hues for foreground values - - (red "#ff7359") - (red-warmer "#ff656f") - (red-cooler "#ff78aa") - (red-faint "#e47f72") - (green "#60b444") - (green-warmer "#80b25f") - (green-cooler "#60bf88") - (green-faint "#61a06c") - (yellow "#e5b76f") - (yellow-warmer "#ea9955") - (yellow-cooler "#f59280") - (yellow-faint "#bf9f8f") - (blue "#8fa5f6") - (blue-warmer "#a897ef") - (blue-cooler "#7fa5ff") - (blue-faint "#7f9ab4") - (magenta "#ef80bf") - (magenta-warmer "#f470df") - (magenta-cooler "#df7fff") - (magenta-faint "#cc9bcf") - (cyan "#8fbaef") - (cyan-warmer "#9ac0e4") - (cyan-cooler "#8fcfdf") - (cyan-faint "#aac0cf") - -;;; Basic hues for background values - - (bg-red-intense "#b02930") - (bg-green-intense "#2a7140") - (bg-yellow-intense "#8f5040") - (bg-blue-intense "#4648d0") + (defconst ef-cherie-partial + '((cursor "#ff5aaf") + (bg-main "#190a0f") + (bg-dim "#291f26") + (bg-alt "#392a2f") + (fg-main "#d3cfcf") + (fg-dim "#808898") + (fg-alt "#bf9cdf") + (bg-active "#594a4f") + (bg-inactive "#1e1216") + (border "#695960") + + (red "#ff7359") + (red-warmer "#ff656f") + (red-cooler "#ff78aa") + (red-faint "#e47f72") + (green "#60b444") + (green-warmer "#80b25f") + (green-cooler "#60bf88") + (green-faint "#61a06c") + (yellow "#e5b76f") + (yellow-warmer "#ea9955") + (yellow-cooler "#f59280") + (yellow-faint "#bf9f8f") + (blue "#8fa5f6") + (blue-warmer "#a897ef") + (blue-cooler "#7fa5ff") + (blue-faint "#7f9ab4") + (magenta "#ef80bf") + (magenta-warmer "#f470df") + (magenta-cooler "#df7fff") + (magenta-faint "#cc9bcf") + (cyan "#8fbaef") + (cyan-warmer "#9ac0e4") + (cyan-cooler "#8fcfdf") + (cyan-faint "#aac0cf") + + (bg-red-intense "#b02930") + (bg-green-intense "#2a7140") + (bg-yellow-intense "#8f5040") + (bg-blue-intense "#4648d0") (bg-magenta-intense "#804fd5") - (bg-cyan-intense "#2270cf") - - (bg-red-subtle "#65102a") - (bg-green-subtle "#0a422f") - (bg-yellow-subtle "#523324") - (bg-blue-subtle "#2a3463") - (bg-magenta-subtle "#562654") - (bg-cyan-subtle "#133d58") - -;;; Diffs - - (bg-added "#00351f") - (bg-added-faint "#002410") - (bg-added-refine "#034d2f") - (fg-added "#a0e0a0") - - (bg-changed "#363300") - (bg-changed-faint "#2a1f00") + (bg-cyan-intense "#2270cf") + + (bg-red-subtle "#65102a") + (bg-green-subtle "#0a422f") + (bg-yellow-subtle "#523324") + (bg-blue-subtle "#2a3463") + (bg-magenta-subtle "#562654") + (bg-cyan-subtle "#133d58") + + (bg-added "#00351f") + (bg-added-faint "#002410") + (bg-added-refine "#034d2f") + (fg-added "#a0e0a0") + + (bg-changed "#363300") + (bg-changed-faint "#2a1f00") (bg-changed-refine "#4a4a00") - (fg-changed "#efef80") + (fg-changed "#efef80") - (bg-removed "#510c28") - (bg-removed-faint "#340a14") + (bg-removed "#510c28") + (bg-removed-faint "#340a14") (bg-removed-refine "#701a35") - (fg-removed "#ffbfbf") - -;;; 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 "#771a4f") - (fg-mode-line "#ffcfdf") - (bg-completion "#4a1937") - (bg-hover "#303f6f") - (bg-hover-secondary "#66364f") - (bg-hl-line "#401f33") - (bg-paren "#3f5f75") - (bg-err "#461017") ; check with err - (bg-warning "#3a3004") ; check with warning - (bg-info "#00352a") ; check with info - - (border "#695960") - (cursor "#ff5aaf") - (fg-intense "#ffffff") - - (modeline-err "#ff9f1f") - (modeline-warning "#c0bf30") - (modeline-info "#6fefaf") - - (underline-err "#df2f2f") - (underline-warning "#c0b000") - (underline-info "#22b022") - - (bg-char-0 "#0050af") - (bg-char-1 "#7f1f7f") - (bg-char-2 "#625a00") - -;;; Mappings + (fg-removed "#ffbfbf") -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#771a4f") + (fg-mode-line-active "#ffcfdf") + (bg-completion "#4a1937") + (bg-hover "#303f6f") + (bg-hover-secondary "#66364f") + (bg-hl-line "#401f33") + (bg-paren-match "#3f5f75") + (bg-region "#232f3f") + (bg-err "#461017") ; check with err + (bg-warning "#3a3004") ; check with warning + (bg-info "#00352a") ; check with info (err red-warmer) (warning yellow-warmer) @@ -178,12 +124,7 @@ (keybind yellow-warmer) (identifier magenta-faint) (prompt magenta-warmer) - - (bg-region "#232f3f") - (fg-region unspecified) - -;;;; Code mappings - + (builtin blue-warmer) (comment yellow-faint) (constant red-cooler) @@ -197,15 +138,11 @@ (rx-escape cyan-warmer) ; compare with `string' (rx-construct red) -;;;; Accent mappings - (accent-0 magenta-warmer) (accent-1 yellow) (accent-2 blue-warmer) (accent-3 red) -;;;; Date mappings - (date-common magenta) (date-deadline red-warmer) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code yellow) (prose-done green) (prose-macro blue-warmer) @@ -231,8 +166,6 @@ (prose-todo red-warmer) (prose-verbatim magenta-warmer) -;;;; Mail mappings - (mail-cite-0 magenta) (mail-cite-1 yellow) (mail-cite-2 blue-warmer) @@ -242,8 +175,6 @@ (mail-subject red) (mail-other yellow-warmer) -;;;; 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) - (fg-term-green green) - (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) - (fg-term-blue blue) - (bg-term-blue-bright blue-warmer) - (fg-term-blue-bright blue-warmer) - - (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 magenta-warmer) (rainbow-1 yellow) (rainbow-2 magenta) @@ -319,13 +196,7 @@ (rainbow-6 red-cooler) (rainbow-7 cyan-warmer) (rainbow-8 magenta-cooler)) - "The `ef-cherie' 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-black theme with warm colors (mostly pink, magenta, gold).") (defcustom ef-cherie-palette-overrides nil "Overrides for `ef-cherie-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-cherie ef-cherie-palette ef-cherie-palette-overrides) - - (provide-theme 'ef-cherie)) + (defconst ef-themes-cherie-palette + (append ef-themes-common-palette-overrides ef-cherie-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-cherie + ef-themes + "Legible dark purple-black theme with warm colors (mostly pink, magenta, gold)." + dark + modus-vivendi-palette + ef-themes-cherie-palette + ef-themes-cherie-palette-overrides)) ;;; ef-cherie-theme.el ends here diff --git a/ef-cyprus-theme.el b/ef-cyprus-theme.el index 0fafed9..a05e7dc 100644 --- a/ef-cyprus-theme.el +++ b/ef-cyprus-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-cyprus - "Legible light theme with green, yellow, teal, red colors." - :background-mode 'light - :kind 'color-scheme - :family 'ef) - - (defconst ef-cyprus-palette - '( -;;; Basic values - - (bg-main "#fcf7ef") - (fg-main "#242521") - (bg-dim "#f0ece0") - (fg-dim "#59786f") - (bg-alt "#e5e3d8") - (fg-alt "#7f475a") - - (bg-active "#c5c3b8") + (defconst ef-cyprus-partial + '((cursor "#007f00") + (bg-main "#fcf7ef") + (bg-dim "#f0ece0") + (bg-alt "#e5e3d8") + (fg-main "#242521") + (fg-dim "#59786f") + (fg-alt "#7f475a") + (bg-active "#c5c3b8") (bg-inactive "#f8f3ea") - -;;; Basic hues for foreground values - - (red "#9f0d0f") - (red-warmer "#dd0020") - (red-cooler "#ca3400") - (red-faint "#b05350") - (green "#006f00") - (green-warmer "#557400") - (green-cooler "#00824f") - (green-faint "#3a6f48") - (yellow "#a7601f") - (yellow-warmer "#bf4400") - (yellow-cooler "#a2604f") - (yellow-faint "#8f6f4a") - (blue "#375cc6") - (blue-warmer "#444fcf") - (blue-cooler "#065fbf") - (blue-faint "#4a659f") - (magenta "#9a456f") - (magenta-warmer "#bf456a") - (magenta-cooler "#8448aa") - (magenta-faint "#804f60") - (cyan "#1f70af") - (cyan-warmer "#3f6faf") - (cyan-cooler "#007a9f") - (cyan-faint "#4f677f") - -;;; Basic hues for background values - - (bg-red-intense "#ff8f88") - (bg-green-intense "#96df80") - (bg-yellow-intense "#efbf00") - (bg-blue-intense "#cfceff") + (border "#c4c0b6") + + (red "#9f0d0f") + (red-warmer "#dd0020") + (red-cooler "#ca3400") + (red-faint "#b05350") + (green "#006f00") + (green-warmer "#557400") + (green-cooler "#00824f") + (green-faint "#3a6f48") + (yellow "#a7601f") + (yellow-warmer "#bf4400") + (yellow-cooler "#a2604f") + (yellow-faint "#8f6f4a") + (blue "#375cc6") + (blue-warmer "#444fcf") + (blue-cooler "#065fbf") + (blue-faint "#4a659f") + (magenta "#9a456f") + (magenta-warmer "#bf456a") + (magenta-cooler "#8448aa") + (magenta-faint "#804f60") + (cyan "#1f70af") + (cyan-warmer "#3f6faf") + (cyan-cooler "#007a9f") + (cyan-faint "#4f677f") + + (bg-red-intense "#ff8f88") + (bg-green-intense "#96df80") + (bg-yellow-intense "#efbf00") + (bg-blue-intense "#cfceff") (bg-magenta-intense "#df9fff") - (bg-cyan-intense "#88cfd0") - - (bg-red-subtle "#ffc6bf") - (bg-green-subtle "#c4f2af") - (bg-yellow-subtle "#f0f07f") - (bg-blue-subtle "#ccdfff") - (bg-magenta-subtle "#fad3ff") - (bg-cyan-subtle "#bfefff") - -;;; Diffs - - (bg-added "#c1f2d1") - (bg-added-faint "#d8f8e1") - (bg-added-refine "#b1e4c1") - (fg-added "#005000") - - (bg-changed "#ffdfb9") - (bg-changed-faint "#ffefcb") + (bg-cyan-intense "#88cfd0") + + (bg-red-subtle "#ffc6bf") + (bg-green-subtle "#c4f2af") + (bg-yellow-subtle "#f0f07f") + (bg-blue-subtle "#ccdfff") + (bg-magenta-subtle "#fad3ff") + (bg-cyan-subtle "#bfefff") + + (bg-added "#c1f2d1") + (bg-added-faint "#d8f8e1") + (bg-added-refine "#b1e4c1") + (fg-added "#005000") + + (bg-changed "#ffdfb9") + (bg-changed-faint "#ffefcb") (bg-changed-refine "#ffcfa0") - (fg-changed "#553d00") + (fg-changed "#553d00") - (bg-removed "#ffd3d4") - (bg-removed-faint "#ffe6e1") + (bg-removed "#ffd3d4") + (bg-removed-faint "#ffe6e1") (bg-removed-refine "#f6c0c9") - (fg-removed "#8f1313") - -;;; 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 "#c0df6f") - (fg-mode-line "#142010") - (bg-completion "#e6e4bf") - (bg-hover "#efc26f") - (bg-hover-secondary "#afc0f0") - (bg-hl-line "#f0e0d4") - (bg-paren "#9fcfdf") - (bg-err "#ffd4bf") ; check with err - (bg-warning "#f0e8ba") ; check with warning - (bg-info "#d0efbf") ; check with info - - (border "#c4c0b6") - (cursor "#007f00") - (fg-intense "#000000") - - (modeline-err "#950f0f") - (modeline-warning "#7f00af") - (modeline-info "#0040af") - - (underline-err "#ef0f1f") - (underline-warning "#bf5f00") - (underline-info "#02af5f") - - (bg-char-0 "#7feaff") - (bg-char-1 "#ffaaff") - (bg-char-2 "#dff000") + (fg-removed "#8f1313") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#c0df6f") + (fg-mode-line-active "#142010") + (bg-completion "#e6e4bf") + (bg-hover "#efc26f") + (bg-hover-secondary "#afc0f0") + (bg-hl-line "#f0e0d4") + (bg-paren-match "#9fcfdf") + (bg-region "#e0e7e5") + (bg-err "#ffd4bf") ; check with err + (bg-warning "#f0e8ba") ; check with warning + (bg-info "#d0efbf") ; check with info (err red-warmer) (warning yellow) @@ -178,12 +124,7 @@ (keybind red) (identifier green-faint) (prompt green) - - (bg-region "#e0e7e5") - (fg-region unspecified) - -;;;; Code mappings - + (builtin green-warmer) (comment yellow-faint) (constant green-cooler) @@ -197,15 +138,11 @@ (rx-escape magenta-cooler) ; compare with `string' (rx-construct cyan-cooler) -;;;; Accent mappings - (accent-0 green) (accent-1 red-cooler) (accent-2 cyan-cooler) (accent-3 yellow) -;;;; Date mappings - (date-common yellow-cooler) (date-deadline red-cooler) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code red-cooler) (prose-done green) (prose-macro cyan-cooler) @@ -231,8 +166,6 @@ (prose-todo red-warmer) (prose-verbatim green) -;;;; Mail mappings - (mail-cite-0 green-warmer) (mail-cite-1 yellow-cooler) (mail-cite-2 cyan) @@ -242,8 +175,6 @@ (mail-subject yellow-warmer) (mail-other green) -;;;; 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) - (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-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-warmer) - (fg-term-cyan cyan-warmer) - (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) (rainbow-1 green-warmer) (rainbow-2 yellow-warmer) @@ -319,13 +196,7 @@ (rainbow-6 yellow-cooler) (rainbow-7 cyan-cooler) (rainbow-8 red)) - "The `ef-cyprus' 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 ochre theme with green, yellow, teal, red colors.") (defcustom ef-cyprus-palette-overrides nil "Overrides for `ef-cyprus-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-cyprus ef-cyprus-palette ef-cyprus-palette-overrides) - - (provide-theme 'ef-cyprus)) + (defconst ef-themes-cyprus-palette + (append ef-themes-common-palette-overrides ef-cyprus-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-cyprus + ef-themes + "Legible light ochre theme with green, yellow, teal, red colors." + light + modus-operandi-palette + ef-themes-cyprus-palette + ef-themes-cyprus-palette-overrides)) ;;; ef-cyprus-theme.el ends here diff --git a/ef-dark-theme.el b/ef-dark-theme.el index dea1645..9acb7e0 100644 --- a/ef-dark-theme.el +++ b/ef-dark-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-dark - "Legible dark theme with blue, magenta, cyan, purple colors." - :background-mode 'dark - :kind 'color-scheme - :family 'ef) - - (defconst ef-dark-palette - '( -;;; Basic values - - (bg-main "#000000") - (fg-main "#d0d0d0") - (bg-dim "#1a1a1a") - (fg-dim "#857f8f") - (bg-alt "#2b2b2b") - (fg-alt "#89afef") - - (bg-active "#4b4b4b") + (defconst ef-dark-partial + '((cursor "#ff76ff") + (bg-main "#000000") + (bg-dim "#1a1a1a") + (bg-alt "#2b2b2b") + (fg-main "#d0d0d0") + (fg-dim "#857f8f") + (fg-alt "#89afef") + (bg-active "#4b4b4b") (bg-inactive "#121212") - -;;; Basic hues for foreground values - - (red "#ef6560") - (red-warmer "#f47360") - (red-cooler "#ff5a7a") - (red-faint "#d56f72") - (green "#0faa26") - (green-warmer "#6aad0f") - (green-cooler "#00a692") - (green-faint "#61a06c") - (yellow "#bf9032") - (yellow-warmer "#d1843f") - (yellow-cooler "#df8a5a") - (yellow-faint "#cf9f8f") - (blue "#3f95f6") - (blue-warmer "#6a9fff") - (blue-cooler "#029fff") - (blue-faint "#7a94df") - (magenta "#d369af") - (magenta-warmer "#e580ea") - (magenta-cooler "#af85ff") - (magenta-faint "#c58faf") - (cyan "#4fbaef") - (cyan-warmer "#6fafff") - (cyan-cooler "#1dbfcf") - (cyan-faint "#8aa0df") - -;;; Basic hues for background values - - (bg-red-intense "#b02930") - (bg-green-intense "#337133") - (bg-yellow-intense "#8f5040") - (bg-blue-intense "#4648d0") + (border "#4f4f5f") + + (red "#ef6560") + (red-warmer "#f47360") + (red-cooler "#ff5a7a") + (red-faint "#d56f72") + (green "#0faa26") + (green-warmer "#6aad0f") + (green-cooler "#00a692") + (green-faint "#61a06c") + (yellow "#bf9032") + (yellow-warmer "#d1843f") + (yellow-cooler "#df8a5a") + (yellow-faint "#cf9f8f") + (blue "#3f95f6") + (blue-warmer "#6a9fff") + (blue-cooler "#029fff") + (blue-faint "#7a94df") + (magenta "#d369af") + (magenta-warmer "#e580ea") + (magenta-cooler "#af85ff") + (magenta-faint "#c58faf") + (cyan "#4fbaef") + (cyan-warmer "#6fafff") + (cyan-cooler "#1dbfcf") + (cyan-faint "#8aa0df") + + (bg-red-intense "#b02930") + (bg-green-intense "#337133") + (bg-yellow-intense "#8f5040") + (bg-blue-intense "#4648d0") (bg-magenta-intense "#804fdd") - (bg-cyan-intense "#2270cf") - - (bg-red-subtle "#72002a") - (bg-green-subtle "#00422a") - (bg-yellow-subtle "#603000") - (bg-blue-subtle "#2f2f74") - (bg-magenta-subtle "#572060") - (bg-cyan-subtle "#004065") - -;;; Diffs - - (bg-added "#00381f") - (bg-added-faint "#002910") - (bg-added-refine "#034f2f") - (fg-added "#a0e0a0") - - (bg-changed "#363300") - (bg-changed-faint "#2a1f00") + (bg-cyan-intense "#2270cf") + + (bg-red-subtle "#72002a") + (bg-green-subtle "#00422a") + (bg-yellow-subtle "#603000") + (bg-blue-subtle "#2f2f74") + (bg-magenta-subtle "#572060") + (bg-cyan-subtle "#004065") + + (bg-added "#00381f") + (bg-added-faint "#002910") + (bg-added-refine "#034f2f") + (fg-added "#a0e0a0") + + (bg-changed "#363300") + (bg-changed-faint "#2a1f00") (bg-changed-refine "#4a4a00") - (fg-changed "#efef80") + (fg-changed "#efef80") - (bg-removed "#4f1119") - (bg-removed-faint "#380a0f") + (bg-removed "#4f1119") + (bg-removed-faint "#380a0f") (bg-removed-refine "#781a1f") - (fg-removed "#ffbfbf") - -;;; 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 "#2a2a75") - (fg-mode-line "#e0e0ff") - (bg-completion "#0f2d4a") - (bg-hover "#004a5f") - (bg-hover-secondary "#551f5a") - (bg-hl-line "#002435") - (bg-paren "#20577a") - (bg-err "#461210") ; check with err - (bg-warning "#3a3004") ; check with warning - (bg-info "#10350a") ; check with info - - (border "#4f4f5f") - (cursor "#ff76ff") - (fg-intense "#ffffff") - - (modeline-err "#ff80af") - (modeline-warning "#dfcf33") - (modeline-info "#2fc82f") - - (underline-err "#df2f2f") - (underline-warning "#c0b000") - (underline-info "#22b022") + (fg-removed "#ffbfbf") - (bg-char-0 "#0050af") - (bg-char-1 "#7f1f7f") - (bg-char-2 "#625a00") - -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#2a2a75") + (fg-mode-line-active "#e0e0ff") + (bg-completion "#0f2d4a") + (bg-hover "#004a5f") + (bg-hover-secondary "#551f5a") + (bg-hl-line "#002435") + (bg-paren-match "#20577a") + (bg-region "#2a234a") + (bg-err "#461210") ; check with err + (bg-warning "#3a3004") ; check with warning + (bg-info "#10350a") ; check with info (err red-warmer) (warning yellow) @@ -178,12 +124,7 @@ (keybind blue-cooler) (identifier magenta-faint) (prompt green-cooler) - - (bg-region "#2a234a") - (fg-region unspecified) - -;;;; Code mappings - + (builtin magenta) (comment yellow-faint) (constant blue-cooler) @@ -197,15 +138,11 @@ (rx-escape green-warmer) ; compare with `string' (rx-construct red) -;;;; Accent mappings - (accent-0 blue) (accent-1 magenta-warmer) (accent-2 green-cooler) (accent-3 red) -;;;; Date mappings - (date-common green-cooler) (date-deadline red-warmer) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code magenta-warmer) (prose-done green) (prose-macro green-cooler) @@ -231,8 +166,6 @@ (prose-todo red-warmer) (prose-verbatim blue) -;;;; Mail mappings - (mail-cite-0 blue) (mail-cite-1 magenta-warmer) (mail-cite-2 green-cooler) @@ -242,8 +175,6 @@ (mail-subject blue-cooler) (mail-other cyan) -;;;; 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) - (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) - (fg-term-blue blue) - (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-warmer) - (fg-term-cyan cyan-warmer) - (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 green-cooler) (rainbow-1 blue) (rainbow-2 magenta-warmer) @@ -319,13 +196,7 @@ (rainbow-6 red-cooler) (rainbow-7 green-warmer) (rainbow-8 yellow)) - "The `ef-dark' 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 theme with blue, magenta, cyan, purple colors.") (defcustom ef-dark-palette-overrides nil "Overrides for `ef-dark-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-dark ef-dark-palette ef-dark-palette-overrides) + (defconst ef-themes-dark-palette + (append ef-themes-common-palette-overrides ef-dark-partial ef-themes-palette-common)) - (provide-theme 'ef-dark)) + (modus-themes-theme + ef-dark + ef-themes + "Legible dark theme with blue, magenta, cyan, purple colors." + dark + modus-vivendi-palette + ef-themes-dark-palette + ef-themes-dark-palette-overrides)) ;;; ef-dark-theme.el ends here diff --git a/ef-day-theme.el b/ef-day-theme.el index 50fb4f1..4e76aad 100644 --- a/ef-day-theme.el +++ b/ef-day-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-day - "Legible light theme with warm, varied colors (yellow, red, green, purple)." - :background-mode 'light - :kind 'color-scheme - :family 'ef) - - (defconst ef-day-palette - '( -;;; Basic values - - (bg-main "#fff5ea") - (fg-main "#584141") - (bg-dim "#f2e9db") - (fg-dim "#63728f") - (bg-alt "#e9e0d8") - (fg-alt "#8f5f4a") - - (bg-active "#c9c0b8") + (defconst ef-day-partial + '((cursor "#cf1f00") + (bg-main "#fff5ea") + (bg-dim "#f2e9db") + (bg-alt "#e9e0d8") + (fg-main "#584141") + (fg-dim "#63728f") + (fg-alt "#8f5f4a") + (bg-active "#c9c0b8") (bg-inactive "#f7efe6") - -;;; Basic hues for foreground values - - (red "#ba2d2f") - (red-warmer "#ce3f00") - (red-cooler "#cf2f4f") - (red-faint "#b05350") - (green "#007a0a") - (green-warmer "#5f7200") - (green-cooler "#0f7f5f") - (green-faint "#527545") - (yellow "#a45a22") - (yellow-warmer "#b75515") - (yellow-cooler "#aa4f30") - (yellow-faint "#9a625a") - (blue "#375cc6") - (blue-warmer "#5f5fdf") - (blue-cooler "#265fbf") - (blue-faint "#4a659f") - (magenta "#ca3e54") - (magenta-warmer "#cb2f80") - (magenta-cooler "#8448aa") - (magenta-faint "#a04450") - (cyan "#3f60af") - (cyan-warmer "#3f6faf") - (cyan-cooler "#0f7b8f") - (cyan-faint "#4f6f8f") - -;;; Basic hues for background values - - (bg-red-intense "#ff8f88") - (bg-green-intense "#96df80") - (bg-yellow-intense "#efbf00") - (bg-blue-intense "#cfceff") + (border "#c8bdb6") + + (red "#ba2d2f") + (red-warmer "#ce3f00") + (red-cooler "#cf2f4f") + (red-faint "#b05350") + (green "#007a0a") + (green-warmer "#5f7200") + (green-cooler "#0f7f5f") + (green-faint "#527545") + (yellow "#a45a22") + (yellow-warmer "#b75515") + (yellow-cooler "#aa4f30") + (yellow-faint "#9a625a") + (blue "#375cc6") + (blue-warmer "#5f5fdf") + (blue-cooler "#265fbf") + (blue-faint "#4a659f") + (magenta "#ca3e54") + (magenta-warmer "#cb2f80") + (magenta-cooler "#8448aa") + (magenta-faint "#a04450") + (cyan "#3f60af") + (cyan-warmer "#3f6faf") + (cyan-cooler "#0f7b8f") + (cyan-faint "#4f6f8f") + + (bg-red-intense "#ff8f88") + (bg-green-intense "#96df80") + (bg-yellow-intense "#efbf00") + (bg-blue-intense "#cfceff") (bg-magenta-intense "#df9fff") - (bg-cyan-intense "#88cfd0") - - (bg-red-subtle "#ffc6bf") - (bg-green-subtle "#c4f2af") - (bg-yellow-subtle "#f0f07f") - (bg-blue-subtle "#ccdfff") - (bg-magenta-subtle "#fad3ff") - (bg-cyan-subtle "#bfefff") - -;;; Diffs - - (bg-added "#ccefcf") - (bg-added-faint "#e0f3e0") - (bg-added-refine "#bae0c0") - (fg-added "#005000") - - (bg-changed "#ffe5b9") - (bg-changed-faint "#ffefc5") + (bg-cyan-intense "#88cfd0") + + (bg-red-subtle "#ffc6bf") + (bg-green-subtle "#c4f2af") + (bg-yellow-subtle "#f0f07f") + (bg-blue-subtle "#ccdfff") + (bg-magenta-subtle "#fad3ff") + (bg-cyan-subtle "#bfefff") + + (bg-added "#ccefcf") + (bg-added-faint "#e0f3e0") + (bg-added-refine "#bae0c0") + (fg-added "#005000") + + (bg-changed "#ffe5b9") + (bg-changed-faint "#ffefc5") (bg-changed-refine "#ffd09f") - (fg-changed "#553d00") + (fg-changed "#553d00") - (bg-removed "#ffd4d8") - (bg-removed-faint "#ffe3e3") + (bg-removed "#ffd4d8") + (bg-removed-faint "#ffe3e3") (bg-removed-refine "#ffc0ca") - (fg-removed "#8f1313") - -;;; 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 "#ffaf72") - (fg-mode-line "#542f38") - (bg-completion "#ffd5d3") - (bg-hover "#b0e0df") - (bg-hover-secondary "#febccf") - (bg-hl-line "#f9e2b2") - (bg-paren "#8fcfdf") - (bg-err "#ffdde5") ; check with err - (bg-warning "#ffe0aa") ; check with warning - (bg-info "#ddf5cc") ; check with info - - (border "#c8bdb6") - (cursor "#cf1f00") - (fg-intense "#000000") - - (modeline-err "#900000") - (modeline-warning "#66008f") - (modeline-info "#1f409f") - - (underline-err "#ef0f1f") - (underline-warning "#bf5f00") - (underline-info "#02af52") - - (bg-char-0 "#7feaff") - (bg-char-1 "#f0a0f0") - (bg-char-2 "#d0e000") + (fg-removed "#8f1313") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#ffaf72") + (fg-mode-line-active "#542f38") + (bg-completion "#ffd5d3") + (bg-hover "#b0e0df") + (bg-hover-secondary "#febccf") + (bg-hl-line "#f9e2b2") + (bg-paren-match "#8fcfdf") + (bg-region "#f0d2df") + (bg-err "#ffdde5") ; check with err + (bg-warning "#ffe0aa") ; check with warning + (bg-info "#ddf5cc") ; check with info (err red-warmer) (warning yellow) @@ -178,12 +124,7 @@ (keybind red-warmer) (identifier magenta-faint) (prompt yellow) - - (bg-region "#f0d2df") - (fg-region unspecified) - -;;;; Code mappings - + (builtin red-cooler) (comment green-faint) (constant red-warmer) @@ -197,15 +138,11 @@ (rx-escape blue) ; compare with `string' (rx-construct magenta-warmer) -;;;; Accent mappings - (accent-0 red) (accent-1 green-cooler) (accent-2 yellow) (accent-3 magenta-warmer) -;;;; Date mappings - (date-common cyan-cooler) (date-deadline red) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code green-cooler) (prose-done green) (prose-macro yellow) @@ -231,8 +166,6 @@ (prose-todo red-warmer) (prose-verbatim red) -;;;; Mail mappings - (mail-cite-0 red) (mail-cite-1 green-cooler) (mail-cite-2 yellow) @@ -242,8 +175,6 @@ (mail-subject red-warmer) (mail-other green-warmer) -;;;; 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) - (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) - (fg-term-blue blue) - (bg-term-blue-bright blue-warmer) - (fg-term-blue-bright blue-warmer) - - (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) (rainbow-1 red) (rainbow-2 green-warmer) @@ -319,13 +196,7 @@ (rainbow-6 magenta-cooler) (rainbow-7 red-cooler) (rainbow-8 green-cooler)) - "The `ef-day' 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 sandy theme with warm, varied colors (yellow, red, green, purple).") (defcustom ef-day-palette-overrides nil "Overrides for `ef-day-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-day ef-day-palette ef-day-palette-overrides) - - (provide-theme 'ef-day)) + (defconst ef-themes-day-palette + (append ef-themes-common-palette-overrides ef-day-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-day + ef-themes + "Legible light sandy theme with warm, varied colors (yellow, red, green, purple)." + light + modus-operandi-palette + ef-themes-day-palette + ef-themes-day-palette-overrides)) ;;; ef-day-theme.el ends here diff --git a/ef-deuteranopia-dark-theme.el b/ef-deuteranopia-dark-theme.el index 8ca5b1b..ebe8b04 100644 --- a/ef-deuteranopia-dark-theme.el +++ b/ef-deuteranopia-dark-theme.el @@ -39,137 +39,83 @@ ;; Most of the colors here, like the red and green hues, are defined ;; simply to preserve compatibility with the rest of the project. We ;; don't actually rely on them for anything critical. -;;;###theme-autoload - (deftheme ef-deuteranopia-dark - "Legible dark theme, optimized for red-green color deficiency." - :background-mode 'dark - :kind 'color-scheme - :family 'ef) - - (defconst ef-deuteranopia-dark-palette - '( -;;; Basic values - - (bg-main "#000a1f") - (fg-main "#ddddee") - (bg-dim "#121f34") - (fg-dim "#7f8797") - (bg-alt "#243145") - (fg-alt "#90afef") - - (bg-active "#445165") + (defconst ef-deuteranopia-dark-partial + '((cursor "#ffff00") + (bg-main "#000a1f") + (bg-dim "#121f34") + (bg-alt "#243145") + (fg-main "#ddddee") + (fg-dim "#7f8797") + (fg-alt "#90afef") + (bg-active "#445165") (bg-inactive "#0d1429") - -;;; Basic hues for foreground values - - (red "#cf8560") - (red-warmer "#e47360") - (red-cooler "#cf7a7a") - (red-faint "#b57f82") - (green "#3faa26") - (green-warmer "#7aad0f") - (green-cooler "#3fa672") - (green-faint "#61a06c") - (yellow "#aa9f32") - (yellow-warmer "#cfaf00") - (yellow-cooler "#bfaf7a") - (yellow-faint "#af9a6a") - (blue "#3f90f0") - (blue-warmer "#6a9fff") - (blue-cooler "#009fff") - (blue-faint "#7a94df") - (magenta "#b379bf") - (magenta-warmer "#af80ea") - (magenta-cooler "#9f95ff") - (magenta-faint "#c59fcf") - (cyan "#5faaef") - (cyan-warmer "#7fafff") - (cyan-cooler "#0db0ff") - (cyan-faint "#8aa0df") - -;;; Basic hues for background values - - (bg-red-intense "#8d7f00") - (bg-green-intense "#afcf20") - (bg-yellow-intense "#5f5f00") - (bg-blue-intense "#266fd0") + (border "#555a64") + + (red "#cf8560") + (red-warmer "#e47360") + (red-cooler "#cf7a7a") + (red-faint "#b57f82") + (green "#3faa26") + (green-warmer "#7aad0f") + (green-cooler "#3fa672") + (green-faint "#61a06c") + (yellow "#aa9f32") + (yellow-warmer "#cfaf00") + (yellow-cooler "#bfaf7a") + (yellow-faint "#af9a6a") + (blue "#3f90f0") + (blue-warmer "#6a9fff") + (blue-cooler "#009fff") + (blue-faint "#7a94df") + (magenta "#b379bf") + (magenta-warmer "#af80ea") + (magenta-cooler "#9f95ff") + (magenta-faint "#c59fcf") + (cyan "#5faaef") + (cyan-warmer "#7fafff") + (cyan-cooler "#0db0ff") + (cyan-faint "#8aa0df") + + (bg-red-intense "#8d7f00") + (bg-green-intense "#afcf20") + (bg-yellow-intense "#5f5f00") + (bg-blue-intense "#266fd0") (bg-magenta-intense "#6f60c0") - (bg-cyan-intense "#007fae") - - (bg-red-subtle "#5d3f00") - (bg-green-subtle "#345f20") - (bg-yellow-subtle "#575700") - (bg-blue-subtle "#264f70") - (bg-magenta-subtle "#4a4670") - (bg-cyan-subtle "#265560") - -;;; Diffs - - (bg-added "#00234f") - (bg-added-faint "#00143f") - (bg-added-refine "#03395f") - (fg-added "#c4d5ff") - - (bg-changed "#2f123f") - (bg-changed-faint "#1f022f") + (bg-cyan-intense "#007fae") + + (bg-red-subtle "#5d3f00") + (bg-green-subtle "#345f20") + (bg-yellow-subtle "#575700") + (bg-blue-subtle "#264f70") + (bg-magenta-subtle "#4a4670") + (bg-cyan-subtle "#265560") + + (bg-added "#00234f") + (bg-added-faint "#00143f") + (bg-added-refine "#03395f") + (fg-added "#c4d5ff") + + (bg-changed "#2f123f") + (bg-changed-faint "#1f022f") (bg-changed-refine "#3f224f") - (fg-changed "#e3cfff") + (fg-changed "#e3cfff") - (bg-removed "#323200") - (bg-removed-faint "#281a00") + (bg-removed "#323200") + (bg-removed-faint "#281a00") (bg-removed-refine "#484800") - (fg-removed "#d4d48f") - -;;; Graphs - - (bg-graph-red-0 "#bf6000") - (bg-graph-red-1 "#733500") - (bg-graph-green-0 "#6fbf8f") - (bg-graph-green-1 "#2f5f4f") - (bg-graph-yellow-0 "#c1c00a") - (bg-graph-yellow-1 "#7f6640") - (bg-graph-blue-0 "#0f90ef") - (bg-graph-blue-1 "#1f2f8f") - (bg-graph-magenta-0 "#7f7f8e") - (bg-graph-magenta-1 "#4f4f5f") - (bg-graph-cyan-0 "#376f9a") - (bg-graph-cyan-1 "#00404f") - -;;; Special hues - - (bg-mode-line "#003f8f") - (fg-mode-line "#ffffff") - (bg-completion "#343420") - (bg-hover "#4f4f00") - (bg-hover-secondary "#00405f") - (bg-hl-line "#2e2e1b") - (bg-paren "#0f4f9a") - (bg-err "#442f00") ; check with err - (bg-warning "#3a3a1f") ; check with warning - (bg-info "#002b60") ; check with info - - (border "#555a64") - (cursor "#ffff00") - (fg-intense "#ffffff") - - (modeline-err "#ffff00") - (modeline-warning "#ddb300") - (modeline-info "#aaaaff") - - (underline-err "#ffff00") - (underline-warning "#bfaf50") - (underline-info "#22cff2") + (fg-removed "#d4d48f") - (bg-char-0 "#0050af") - (bg-char-1 "#7f1f7f") - (bg-char-2 "#625a00") - -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#003f8f") + (fg-mode-line-active "#ffffff") + (bg-completion "#343420") + (bg-hover "#4f4f00") + (bg-hover-secondary "#00405f") + (bg-hl-line "#2e2e1b") + (bg-paren-match "#0f4f9a") + (bg-region "#223848") + (bg-err "#442f00") ; check with err + (bg-warning "#3a3a1f") ; check with warning + (bg-info "#002b60") ; check with info (err yellow-warmer) (warning yellow-cooler) @@ -181,12 +127,7 @@ (keybind yellow-warmer) (identifier cyan-faint) (prompt blue-cooler) - - (bg-region "#223848") - (fg-region unspecified) - -;;;; Code mappings - + (builtin blue-warmer) (comment yellow-faint) (constant blue-cooler) @@ -200,15 +141,11 @@ (rx-escape yellow-faint) ; compare with `string' (rx-construct yellow-warmer) -;;;; Accent mappings - (accent-0 blue-cooler) (accent-1 yellow-warmer) (accent-2 cyan-warmer) (accent-3 magenta-cooler) -;;;; Date mappings - (date-common yellow-cooler) (date-deadline yellow-warmer) (date-deadline-subtle red-faint) @@ -221,8 +158,6 @@ (date-weekday cyan) (date-weekend magenta-faint) -;;;; Prose mappings - (prose-code yellow-warmer) (prose-done blue-cooler) (prose-macro cyan-warmer) @@ -234,8 +169,6 @@ (prose-todo yellow-warmer) (prose-verbatim blue-cooler) -;;;; Mail mappings - (mail-cite-0 blue-warmer) (mail-cite-1 yellow) (mail-cite-2 blue-cooler) @@ -245,8 +178,6 @@ (mail-subject cyan-cooler) (mail-other cyan) -;;;; Search mappings - (bg-search-match bg-warning) (bg-search-current bg-yellow-intense) (bg-search-lazy bg-blue-intense) @@ -257,62 +188,8 @@ (bg-search-rx-group-2 bg-blue-subtle) (bg-search-rx-group-3 bg-yellow-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-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-warmer) (rainbow-1 blue) (rainbow-2 yellow-cooler) @@ -322,13 +199,7 @@ (rainbow-6 yellow-faint) (rainbow-7 blue-faint) (rainbow-8 magenta-faint)) - "The `ef-deuteranopia-dark' 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 theme, optimized for red-green color deficiency.") (defcustom ef-deuteranopia-dark-palette-overrides nil "Overrides for `ef-deuteranopia-dark-palette'. @@ -347,8 +218,16 @@ further details)." :type '(repeat (list symbol (choice symbol string))) :link '(info-link "(ef-themes) Palette overrides")) - (ef-themes-theme ef-deuteranopia-dark ef-deuteranopia-dark-palette ef-deuteranopia-dark-palette-overrides) + (defconst ef-themes-deuteranopia-dark-palette + (append ef-themes-common-palette-overrides ef-deuteranopia-dark-partial ef-themes-palette-common)) - (provide-theme 'ef-deuteranopia-dark)) + (modus-themes-theme + ef-deuteranopia-dark + ef-themes + "Legible dark theme, optimized for red-green color deficiency." + dark + modus-vivendi-deuteranopia-palette + ef-themes-deuteranopia-dark-palette + ef-themes-deuteranopia-dark-palette-overrides)) ;;; ef-deuteranopia-dark-theme.el ends here diff --git a/ef-deuteranopia-light-theme.el b/ef-deuteranopia-light-theme.el index ee8796a..b78f0d2 100644 --- a/ef-deuteranopia-light-theme.el +++ b/ef-deuteranopia-light-theme.el @@ -39,137 +39,83 @@ ;; Most of the colors here, like the red and green hues, are defined ;; simply to preserve compatibility with the rest of the project. We ;; don't actually rely on them for anything critical. -;;;###theme-autoload - (deftheme ef-deuteranopia-light - "Legible light theme, optimized for red-green color deficiency." - :background-mode 'light - :kind 'color-scheme - :family 'ef) - - (defconst ef-deuteranopia-light-palette - '( -;;; Basic values - - (bg-main "#f5f5ff") - (fg-main "#1a1a2f") - (bg-dim "#e8e8ea") - (fg-dim "#70627f") - (bg-alt "#d3d3e0") - (fg-alt "#196f70") - - (bg-active "#b3b3c0") + (defconst ef-deuteranopia-light-partial + '((cursor "#0000bb") + (bg-main "#f5f5ff") + (bg-dim "#e8e8ea") + (bg-alt "#d3d3e0") + (fg-main "#1a1a2f") + (fg-dim "#70627f") + (fg-alt "#196f70") + (bg-active "#b3b3c0") (bg-inactive "#efeff5") - -;;; Basic hues for foreground values - - (red "#d3303a") - (red-warmer "#e00033") - (red-cooler "#d50f7f") - (red-faint "#a04852") - (green "#217a3c") - (green-warmer "#4a7d00") - (green-cooler "#008058") - (green-faint "#61756c") - (yellow "#805d00") - (yellow-warmer "#965000") - (yellow-cooler "#765040") - (yellow-faint "#77604a") - (blue "#375cd8") - (blue-warmer "#4250ef") - (blue-cooler "#065fff") - (blue-faint "#6060d0") - (magenta "#ba35af") - (magenta-warmer "#cf25aa") - (magenta-cooler "#6052cf") - (magenta-faint "#9f5080") - (cyan "#1f6fbf") - (cyan-warmer "#3f6faf") - (cyan-cooler "#1477b2") - (cyan-faint "#506fa0") - -;;; Basic hues for background values - - (bg-red-intense "#cac200") - (bg-green-intense "#9aaf80") - (bg-yellow-intense "#fac200") - (bg-blue-intense "#cbcfff") + (border "#bcbcd0") + + (red "#d3303a") + (red-warmer "#e00033") + (red-cooler "#d50f7f") + (red-faint "#a04852") + (green "#217a3c") + (green-warmer "#4a7d00") + (green-cooler "#008058") + (green-faint "#61756c") + (yellow "#805d00") + (yellow-warmer "#965000") + (yellow-cooler "#765040") + (yellow-faint "#77604a") + (blue "#375cd8") + (blue-warmer "#4250ef") + (blue-cooler "#065fff") + (blue-faint "#6060d0") + (magenta "#ba35af") + (magenta-warmer "#cf25aa") + (magenta-cooler "#6052cf") + (magenta-faint "#9f5080") + (cyan "#1f6fbf") + (cyan-warmer "#3f6faf") + (cyan-cooler "#1477b2") + (cyan-faint "#506fa0") + + (bg-red-intense "#cac200") + (bg-green-intense "#9aaf80") + (bg-yellow-intense "#fac200") + (bg-blue-intense "#cbcfff") (bg-magenta-intense "#3fbfff") - (bg-cyan-intense "#98e8ff") - - (bg-red-subtle "#ead270") - (bg-green-subtle "#bae0a0") - (bg-yellow-subtle "#e6f270") - (bg-blue-subtle "#c0dfff") - (bg-magenta-subtle "#ccc8ff") - (bg-cyan-subtle "#afecf0") - -;;; Diffs - - (bg-added "#dbdbff") - (bg-added-faint "#e4e4ff") - (bg-added-refine "#c0c0ef") - (fg-added "#333399") - - (bg-changed "#eecfdf") - (bg-changed-faint "#f0dde5") + (bg-cyan-intense "#98e8ff") + + (bg-red-subtle "#ead270") + (bg-green-subtle "#bae0a0") + (bg-yellow-subtle "#e6f270") + (bg-blue-subtle "#c0dfff") + (bg-magenta-subtle "#ccc8ff") + (bg-cyan-subtle "#afecf0") + + (bg-added "#dbdbff") + (bg-added-faint "#e4e4ff") + (bg-added-refine "#c0c0ef") + (fg-added "#333399") + + (bg-changed "#eecfdf") + (bg-changed-faint "#f0dde5") (bg-changed-refine "#e0b0d0") - (fg-changed "#6f1343") + (fg-changed "#6f1343") - (bg-removed "#fff0af") - (bg-removed-faint "#efefcb") + (bg-removed "#fff0af") + (bg-removed-faint "#efefcb") (bg-removed-refine "#f0da88") - (fg-removed "#553d00") - -;;; Graphs - - (bg-graph-red-0 "#d0b029") - (bg-graph-red-1 "#e0cab4") - (bg-graph-green-0 "#8ac050") - (bg-graph-green-1 "#afdfa5") - (bg-graph-yellow-0 "#ffcf00") - (bg-graph-yellow-1 "#f9ff00") - (bg-graph-blue-0 "#7f9fff") - (bg-graph-blue-1 "#afd0ff") - (bg-graph-magenta-0 "#b0b0d0") - (bg-graph-magenta-1 "#d0dfdf") - (bg-graph-cyan-0 "#6faad9") - (bg-graph-cyan-1 "#bfe0ff") - -;;; Special hues - - (bg-mode-line "#99c7ff") - (fg-mode-line "#0a0a1f") - (bg-completion "#f0dacf") - (bg-hover "#eebb20") - (bg-hover-secondary "#afafef") - (bg-hl-line "#f3e0d5") - (bg-paren "#8fc0cf") - (bg-err "#f0e0a0") ; check with err - (bg-warning "#e3ea9a") ; check with warning - (bg-info "#d0dfff") ; check with info - - (border "#bcbcd0") - (cursor "#0000bb") - (fg-intense "#000000") - - (modeline-err "#000000") ; too dark to have red/yellow here - (modeline-warning "#0a0a1f") - (modeline-info "#2222c3") - - (underline-err "#c08f00") - (underline-warning "#6f3f00") - (underline-info "#025f92") + (fg-removed "#553d00") - (bg-char-0 "#7feaff") - (bg-char-1 "#ffaaff") - (bg-char-2 "#dff000") - -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#99c7ff") + (fg-mode-line-active "#0a0a1f") + (bg-completion "#f0dacf") + (bg-hover "#eebb20") + (bg-hover-secondary "#afafef") + (bg-hl-line "#f3e0d5") + (bg-paren-match "#8fc0cf") + (bg-region "#dadadf") + (bg-err "#f0e0a0") ; check with err + (bg-warning "#e3ea9a") ; check with warning + (bg-info "#d0dfff") ; check with info (err yellow-warmer) (warning yellow-cooler) @@ -181,12 +127,7 @@ (keybind yellow-warmer) (identifier cyan-faint) (prompt blue) - - (bg-region "#dadadf") - (fg-region unspecified) - -;;;; Code mappings - + (builtin cyan) (comment yellow-faint) (constant yellow-cooler) @@ -200,15 +141,11 @@ (rx-escape cyan-faint) ; compare with `string' (rx-construct blue-warmer) -;;;; Accent mappings - (accent-0 blue-cooler) (accent-1 yellow-warmer) (accent-2 cyan) (accent-3 yellow-cooler) -;;;; Date mappings - (date-common yellow-cooler) (date-deadline yellow-warmer) (date-deadline-subtle red-faint) @@ -221,8 +158,6 @@ (date-weekday cyan) (date-weekend magenta-faint) -;;;; Prose mappings - (prose-code yellow-warmer) (prose-done blue-cooler) (prose-macro cyan) @@ -234,8 +169,6 @@ (prose-todo yellow-warmer) (prose-verbatim blue-cooler) -;;;; Mail mappings - (mail-cite-0 blue-warmer) (mail-cite-1 yellow-cooler) (mail-cite-2 cyan-cooler) @@ -245,14 +178,8 @@ (mail-subject blue-cooler) (mail-other cyan) -;;;; Space mappings - - (bg-space unspecified) - (fg-space border) (bg-space-err bg-yellow-intense) -;;;; Search mappings - (bg-search-match bg-warning) (bg-search-current bg-yellow-intense) (bg-search-lazy bg-blue-intense) @@ -263,56 +190,6 @@ (bg-search-rx-group-2 bg-blue-subtle) (bg-search-rx-group-3 bg-yellow-subtle) -;;;; 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-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 blue) (rainbow-1 yellow) (rainbow-2 blue-warmer) @@ -322,13 +199,7 @@ (rainbow-6 blue-faint) (rainbow-7 yellow-faint) (rainbow-8 cyan)) - "The `ef-deuteranopia-light' 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 theme, optimized for red-green color deficiency.") (defcustom ef-deuteranopia-light-palette-overrides nil "Overrides for `ef-deuteranopia-light-palette'. @@ -347,8 +218,16 @@ further details)." :type '(repeat (list symbol (choice symbol string))) :link '(info-link "(ef-themes) Palette overrides")) - (ef-themes-theme ef-deuteranopia-light ef-deuteranopia-light-palette ef-deuteranopia-light-palette-overrides) + (defconst ef-themes-deuteranopia-light-palette + (append ef-themes-common-palette-overrides ef-deuteranopia-light-partial ef-themes-palette-common)) - (provide-theme 'ef-deuteranopia-light)) + (modus-themes-theme + ef-deuteranopia-light + ef-themes + "Legible light theme, optimized for red-green color deficiency." + light + modus-operandi-deuteranopia-palette + ef-themes-deuteranopia-light-palette + ef-themes-deuteranopia-light-palette-overrides)) ;;; ef-deuteranopia-light-theme.el ends here 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 diff --git a/ef-duo-dark-theme.el b/ef-duo-dark-theme.el index 6550361..9c1f018 100644 --- a/ef-duo-dark-theme.el +++ b/ef-duo-dark-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-duo-dark - "Legible dark theme with mostly blue and orange colors." - :background-mode 'dark - :kind 'color-scheme - :family 'ef) - - (defconst ef-duo-dark-palette - '( -;;; Basic values - - (bg-main "#070019") - (fg-main "#d0d0d0") - (bg-dim "#1d1a26") - (fg-dim "#857f8f") - (bg-alt "#2a2739") - (fg-alt "#89afef") - - (bg-active "#4a4759") + (defconst ef-duo-dark-partial + '((cursor "#ef6f11") + (bg-main "#070019") + (bg-dim "#1d1a26") + (bg-alt "#2a2739") + (fg-main "#d0d0d0") + (fg-dim "#857f8f") + (fg-alt "#89afef") + (bg-active "#4a4759") (bg-inactive "#13101f") - -;;; Basic hues for foreground values - - (red "#ef656a") - (red-warmer "#f47360") - (red-cooler "#ef798f") - (red-faint "#d08f72") - (green "#1fa526") - (green-warmer "#50a22f") - (green-cooler "#00b982") - (green-faint "#61a06c") - (yellow "#c48702") - (yellow-warmer "#d0730f") - (yellow-cooler "#df805f") - (yellow-faint "#9f8f6a") - (blue "#379cf6") - (blue-warmer "#6f80ff") - (blue-cooler "#029fff") - (blue-faint "#8a9fdf") - (magenta "#d369af") - (magenta-warmer "#e580ea") - (magenta-cooler "#af85ff") - (magenta-faint "#c57faf") - (cyan "#5faaef") - (cyan-warmer "#7fafff") - (cyan-cooler "#0dafdf") - (cyan-faint "#8aa0df") - -;;; Basic hues for background values - - (bg-red-intense "#cd2f30") - (bg-green-intense "#407720") - (bg-yellow-intense "#8f5040") - (bg-blue-intense "#4648d0") + (border "#545f6f") + + (red "#ef656a") + (red-warmer "#f47360") + (red-cooler "#ef798f") + (red-faint "#d08f72") + (green "#1fa526") + (green-warmer "#50a22f") + (green-cooler "#00b982") + (green-faint "#61a06c") + (yellow "#c48702") + (yellow-warmer "#d0730f") + (yellow-cooler "#df805f") + (yellow-faint "#9f8f6a") + (blue "#379cf6") + (blue-warmer "#6f80ff") + (blue-cooler "#029fff") + (blue-faint "#8a9fdf") + (magenta "#d369af") + (magenta-warmer "#e580ea") + (magenta-cooler "#af85ff") + (magenta-faint "#c57faf") + (cyan "#5faaef") + (cyan-warmer "#7fafff") + (cyan-cooler "#0dafdf") + (cyan-faint "#8aa0df") + + (bg-red-intense "#cd2f30") + (bg-green-intense "#407720") + (bg-yellow-intense "#8f5040") + (bg-blue-intense "#4648d0") (bg-magenta-intense "#b04fcf") - (bg-cyan-intense "#2270be") - - (bg-red-subtle "#72002a") - (bg-green-subtle "#00422a") - (bg-yellow-subtle "#603000") - (bg-blue-subtle "#242679") - (bg-magenta-subtle "#501f72") - (bg-cyan-subtle "#004065") - -;;; Diffs - - (bg-added "#002d1f") - (bg-added-faint "#001f18") - (bg-added-refine "#003b2f") - (fg-added "#a0e0a0") - - (bg-changed "#323200") - (bg-changed-faint "#2a2000") + (bg-cyan-intense "#2270be") + + (bg-red-subtle "#72002a") + (bg-green-subtle "#00422a") + (bg-yellow-subtle "#603000") + (bg-blue-subtle "#242679") + (bg-magenta-subtle "#501f72") + (bg-cyan-subtle "#004065") + + (bg-added "#002d1f") + (bg-added-faint "#001f18") + (bg-added-refine "#003b2f") + (fg-added "#a0e0a0") + + (bg-changed "#323200") + (bg-changed-faint "#2a2000") (bg-changed-refine "#444000") - (fg-changed "#efef80") + (fg-changed "#efef80") - (bg-removed "#3d091f") - (bg-removed-faint "#27040f") + (bg-removed "#3d091f") + (bg-removed-faint "#27040f") (bg-removed-refine "#5b0f26") - (fg-removed "#ffbfbf") - -;;; 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 "#352487") - (fg-mode-line "#dedeff") - (bg-completion "#2f1a5f") - (bg-hover "#664f4a") - (bg-hover-secondary "#264f4a") - (bg-hl-line "#301a4f") - (bg-paren "#2f608e") - (bg-err "#461210") ; check with err - (bg-warning "#3a3004") ; check with warning - (bg-info "#10350a") ; check with info - - (border "#545f6f") - (cursor "#ef6f11") - (fg-intense "#ffffff") - - (modeline-err "#ff8faf") - (modeline-warning "#dfcf00") - (modeline-info "#00e06f") - - (underline-err "#df2f2f") - (underline-warning "#c0b000") - (underline-info "#22b022") + (fg-removed "#ffbfbf") - (bg-char-0 "#0050af") - (bg-char-1 "#7f1f7f") - (bg-char-2 "#625a00") - -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#352487") + (fg-mode-line-active "#dedeff") + (bg-completion "#2f1a5f") + (bg-hover "#664f4a") + (bg-hover-secondary "#264f4a") + (bg-hl-line "#301a4f") + (bg-paren-match "#2f608e") + (bg-region "#042a50") + (bg-err "#461210") ; check with err + (bg-warning "#3a3004") ; check with warning + (bg-info "#10350a") ; check with info (err red) (warning yellow) @@ -178,12 +124,7 @@ (keybind blue-cooler) (identifier red-faint) (prompt yellow) - - (bg-region "#042a50") - (fg-region unspecified) - -;;;; Code mappings - + (builtin cyan) (comment red-faint) (constant blue) @@ -197,15 +138,11 @@ (rx-escape magenta-cooler) ; compare with `string' (rx-construct blue) -;;;; Accent mappings - (accent-0 blue-warmer) (accent-1 yellow-warmer) (accent-2 green-cooler) (accent-3 red) -;;;; Date mappings - (date-common cyan-cooler) (date-deadline red) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code yellow-warmer) (prose-done green) (prose-macro green-cooler) @@ -231,8 +166,6 @@ (prose-todo red) (prose-verbatim blue-warmer) -;;;; Mail mappings - (mail-cite-0 cyan) (mail-cite-1 yellow-cooler) (mail-cite-2 blue-warmer) @@ -242,8 +175,6 @@ (mail-subject yellow-warmer) (mail-other cyan-warmer) -;;;; 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 blue) (rainbow-1 yellow-warmer) (rainbow-2 blue-warmer) @@ -319,13 +196,7 @@ (rainbow-6 blue-cooler) (rainbow-7 red-cooler) (rainbow-8 green-cooler)) - "The `ef-duo-dark' 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 theme with mostly blue and orange colors.") (defcustom ef-duo-dark-palette-overrides nil "Overrides for `ef-duo-dark-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-duo-dark ef-duo-dark-palette ef-duo-dark-palette-overrides) + (defconst ef-themes-duo-dark-palette + (append ef-themes-common-palette-overrides ef-duo-dark-partial ef-themes-palette-common)) - (provide-theme 'ef-duo-dark)) + (modus-themes-theme + ef-duo-dark + ef-themes + "Legible dark theme with mostly blue and orange colors." + dark + modus-vivendi-palette + ef-themes-duo-dark-palette + ef-themes-duo-dark-palette-overrides)) ;;; ef-duo-dark-theme.el ends here diff --git a/ef-duo-light-theme.el b/ef-duo-light-theme.el index 792f8e6..10d2df1 100644 --- a/ef-duo-light-theme.el +++ b/ef-duo-light-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-duo-light - "Legible light theme with mostly blue and yellow colors." - :background-mode 'light - :kind 'color-scheme - :family 'ef) - - (defconst ef-duo-light-palette - '( -;;; Basic values - - (bg-main "#fff8f0") - (fg-main "#222222") - (bg-dim "#f6ece8") - (fg-dim "#63728f") - (bg-alt "#e7e0da") - (fg-alt "#856f4a") - - (bg-active "#c7c0ba") + (defconst ef-duo-light-partial + '((cursor "#1144ff") + (bg-main "#fff8f0") + (bg-dim "#f6ece8") + (bg-alt "#e7e0da") + (fg-main "#222222") + (fg-dim "#63728f") + (fg-alt "#856f4a") + (bg-active "#c7c0ba") (bg-inactive "#f9f2ef") - -;;; Basic hues for foreground values - - (red "#cc3333") - (red-warmer "#dd1100") - (red-cooler "#c04440") - (red-faint "#a2403f") - (green "#217a3c") - (green-warmer "#4a7d00") - (green-cooler "#008058") - (green-faint "#61756c") - (yellow "#8a5d00") - (yellow-warmer "#9f4a00") - (yellow-cooler "#8f5a3a") - (yellow-faint "#765640") - (blue "#375cd8") - (blue-warmer "#4250ef") - (blue-cooler "#065fff") - (blue-faint "#6060d0") - (magenta "#ba35af") - (magenta-warmer "#cf25aa") - (magenta-cooler "#6052cf") - (magenta-faint "#af569f") - (cyan "#1f6fbf") - (cyan-warmer "#3f70a0") - (cyan-cooler "#1f77bb") - (cyan-faint "#406f90") - -;;; Basic hues for background values - - (bg-red-intense "#ff8f88") - (bg-green-intense "#8adf80") - (bg-yellow-intense "#fac200") - (bg-blue-intense "#cbcfff") + (border "#baafba") + + (red "#cc3333") + (red-warmer "#dd1100") + (red-cooler "#c04440") + (red-faint "#a2403f") + (green "#217a3c") + (green-warmer "#4a7d00") + (green-cooler "#008058") + (green-faint "#61756c") + (yellow "#8a5d00") + (yellow-warmer "#9f4a00") + (yellow-cooler "#8f5a3a") + (yellow-faint "#765640") + (blue "#375cd8") + (blue-warmer "#4250ef") + (blue-cooler "#065fff") + (blue-faint "#6060d0") + (magenta "#ba35af") + (magenta-warmer "#cf25aa") + (magenta-cooler "#6052cf") + (magenta-faint "#af569f") + (cyan "#1f6fbf") + (cyan-warmer "#3f70a0") + (cyan-cooler "#1f77bb") + (cyan-faint "#406f90") + + (bg-red-intense "#ff8f88") + (bg-green-intense "#8adf80") + (bg-yellow-intense "#fac200") + (bg-blue-intense "#cbcfff") (bg-magenta-intense "#df8fff") - (bg-cyan-intense "#88c8ff") - - (bg-red-subtle "#ffcfbf") - (bg-green-subtle "#aff7c5") - (bg-yellow-subtle "#f9f376") - (bg-blue-subtle "#cfdff9") - (bg-magenta-subtle "#f9ddf0") - (bg-cyan-subtle "#bfeaf0") - -;;; Diffs - - (bg-added "#ccefcf") - (bg-added-faint "#e0f3e0") - (bg-added-refine "#bae0c0") - (fg-added "#005000") - - (bg-changed "#ffe5b9") - (bg-changed-faint "#ffefc5") + (bg-cyan-intense "#88c8ff") + + (bg-red-subtle "#ffcfbf") + (bg-green-subtle "#aff7c5") + (bg-yellow-subtle "#f9f376") + (bg-blue-subtle "#cfdff9") + (bg-magenta-subtle "#f9ddf0") + (bg-cyan-subtle "#bfeaf0") + + (bg-added "#ccefcf") + (bg-added-faint "#e0f3e0") + (bg-added-refine "#bae0c0") + (fg-added "#005000") + + (bg-changed "#ffe5b9") + (bg-changed-faint "#ffefc5") (bg-changed-refine "#ffd09f") - (fg-changed "#553d00") + (fg-changed "#553d00") - (bg-removed "#ffd4d8") - (bg-removed-faint "#ffe3e3") + (bg-removed "#ffd4d8") + (bg-removed-faint "#ffe3e3") (bg-removed-refine "#ffc0ca") - (fg-removed "#8f1313") - -;;; 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 "#f8cf8f") - (fg-mode-line "#111133") - (bg-completion "#fadacf") - (bg-hover "#b4cfff") - (bg-hover-secondary "#aaeccf") - (bg-hl-line "#f9e8c0") - (bg-paren "#afbfef") - (bg-err "#ffdfe6") ; check with err - (bg-warning "#ffe5ba") ; check with warning - (bg-info "#cff5d0") ; check with info - - (border "#baafba") - (cursor "#1144ff") - (fg-intense "#000000") - - (modeline-err "#950000") - (modeline-warning "#6f008f") - (modeline-info "#00409f") - - (underline-err "#ef0f1f") - (underline-warning "#bf5f00") - (underline-info "#02af52") + (fg-removed "#8f1313") - (bg-char-0 "#7feaff") - (bg-char-1 "#ffaaff") - (bg-char-2 "#dff000") - -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#f8cf8f") + (fg-mode-line-active "#111133") + (bg-completion "#fadacf") + (bg-hover "#b4cfff") + (bg-hover-secondary "#aaeccf") + (bg-hl-line "#f9e8c0") + (bg-paren-match "#afbfef") + (bg-region "#caeafa") + (bg-err "#ffdfe6") ; check with err + (bg-warning "#ffe5ba") ; check with warning + (bg-info "#cff5d0") ; check with info (err red) (warning yellow) @@ -178,12 +124,7 @@ (keybind blue-cooler) (identifier red-faint) (prompt blue-warmer) - - (bg-region "#caeafa") - (fg-region unspecified) - -;;;; Code mappings - + (builtin cyan-cooler) (comment red-faint) (constant blue) @@ -197,15 +138,11 @@ (rx-escape cyan) ; compare with `string' (rx-construct red-warmer) -;;;; Accent mappings - (accent-0 blue-warmer) (accent-1 yellow-warmer) (accent-2 green-cooler) (accent-3 red) -;;;; Date mappings - (date-common cyan-cooler) (date-deadline red) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code yellow-warmer) (prose-done green) (prose-macro green-cooler) @@ -231,8 +166,6 @@ (prose-todo red) (prose-verbatim blue-warmer) -;;;; Mail mappings - (mail-cite-0 blue) (mail-cite-1 yellow-cooler) (mail-cite-2 cyan-cooler) @@ -242,8 +175,6 @@ (mail-subject yellow-warmer) (mail-other cyan) -;;;; 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-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-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-warmer) - (fg-term-cyan cyan-warmer) - (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 blue) (rainbow-1 yellow-warmer) (rainbow-2 blue-warmer) @@ -319,13 +196,7 @@ (rainbow-6 cyan-warmer) (rainbow-7 yellow) (rainbow-8 green-cooler)) - "The `ef-duo-light' 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 theme with mostly blue and yellow colors.") (defcustom ef-duo-light-palette-overrides nil "Overrides for `ef-duo-light-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-duo-light ef-duo-light-palette ef-duo-light-palette-overrides) + (defconst ef-themes-duo-light-palette + (append ef-themes-common-palette-overrides ef-duo-light-partial ef-themes-palette-common)) - (provide-theme 'ef-duo-light)) + (modus-themes-theme + ef-duo-light + ef-themes + "Legible light theme with mostly blue and yellow colors." + light + modus-operandi-palette + ef-themes-duo-light-palette + ef-themes-duo-light-palette-overrides)) ;;; ef-duo-light-theme.el ends here 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 diff --git a/ef-elea-dark-theme.el b/ef-elea-dark-theme.el index 1c658f2..642ff37 100644 --- a/ef-elea-dark-theme.el +++ b/ef-elea-dark-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-elea-dark - "Legible dark theme with brown, magenta, and green colors." - :background-mode 'dark - :kind 'color-scheme - :family 'ef) - - (defconst ef-elea-dark-palette - '( -;;; Basic values - - (bg-main "#222524") - (fg-main "#eaf2ef") - (bg-dim "#303332") - (fg-dim "#969faf") - (bg-alt "#3e4140") - (fg-alt "#8fcfbb") - - (bg-active "#5e6160") - (bg-inactive "#2b2e2d") - -;;; Basic hues for foreground values - - (red "#ff656a") - (red-warmer "#ff7a5f") - (red-cooler "#fa7f88") - (red-faint "#eba8a8") - (green "#7fc87f") - (green-warmer "#7fca5a") - (green-cooler "#50cf89") - (green-faint "#a9c99f") - (yellow "#cac85f") - (yellow-warmer "#e0b02f") - (yellow-cooler "#cfb27f") - (yellow-faint "#cac89f") - (blue "#57aff6") - (blue-warmer "#78afff") - (blue-cooler "#62cfef") - (blue-faint "#6ab4ef") - (magenta "#f59acf") - (magenta-warmer "#fa90ea") - (magenta-cooler "#cfaaff") - (magenta-faint "#d0b9f0") - (cyan "#6fcfd2") - (cyan-warmer "#7fcfdf") - (cyan-cooler "#60d5c2") - (cyan-faint "#99bfcf") - -;;; Basic hues for background values - - (bg-red-intense "#bd1f30") - (bg-green-intense "#408420") - (bg-yellow-intense "#847020") - (bg-blue-intense "#2f5f9f") + (defconst ef-elea-dark-partial + '((cursor "#ef7fa8") + (bg-main "#222524") + (bg-dim "#303332") + (bg-alt "#3e4140") + (fg-main "#eaf2ef") + (fg-dim "#969faf") + (fg-alt "#8fcfbb") + (bg-active "#5e6160") + (bg-inactive "#2b2e2d") + (border "#5d5f63") + + (red "#ff656a") + (red-warmer "#ff7a5f") + (red-cooler "#fa7f88") + (red-faint "#eba8a8") + (green "#7fc87f") + (green-warmer "#7fca5a") + (green-cooler "#50cf89") + (green-faint "#a9c99f") + (yellow "#cac85f") + (yellow-warmer "#e0b02f") + (yellow-cooler "#cfb27f") + (yellow-faint "#cac89f") + (blue "#57aff6") + (blue-warmer "#78afff") + (blue-cooler "#62cfef") + (blue-faint "#6ab4ef") + (magenta "#f59acf") + (magenta-warmer "#fa90ea") + (magenta-cooler "#cfaaff") + (magenta-faint "#d0b9f0") + (cyan "#6fcfd2") + (cyan-warmer "#7fcfdf") + (cyan-cooler "#60d5c2") + (cyan-faint "#99bfcf") + + (bg-red-intense "#bd1f30") + (bg-green-intense "#408420") + (bg-yellow-intense "#847020") + (bg-blue-intense "#2f5f9f") (bg-magenta-intense "#b05fcf") - (bg-cyan-intense "#028099") - - (bg-red-subtle "#6c2a2a") - (bg-green-subtle "#2f532a") - (bg-yellow-subtle "#62432a") - (bg-blue-subtle "#26486c") - (bg-magenta-subtle "#59335b") - (bg-cyan-subtle "#204c60") - -;;; Diffs - - (bg-added "#20493f") - (bg-added-faint "#203a2f") - (bg-added-refine "#136244") - (fg-added "#a0e0a0") - - (bg-changed "#51512f") - (bg-changed-faint "#40332f") + (bg-cyan-intense "#028099") + + (bg-red-subtle "#6c2a2a") + (bg-green-subtle "#2f532a") + (bg-yellow-subtle "#62432a") + (bg-blue-subtle "#26486c") + (bg-magenta-subtle "#59335b") + (bg-cyan-subtle "#204c60") + + (bg-added "#20493f") + (bg-added-faint "#203a2f") + (bg-added-refine "#136244") + (fg-added "#a0e0a0") + + (bg-changed "#51512f") + (bg-changed-faint "#40332f") (bg-changed-refine "#61621f") - (fg-changed "#dada90") + (fg-changed "#dada90") - (bg-removed "#5e242f") - (bg-removed-faint "#4a242a") + (bg-removed "#5e242f") + (bg-removed-faint "#4a242a") (bg-removed-refine "#772a35") - (fg-removed "#ffbfbf") - -;;; 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 "#35605d") - (fg-mode-line "#ecf0ff") - (bg-completion "#37493f") - (bg-hover "#894f7a") - (bg-hover-secondary "#425d4a") - (bg-hl-line "#2f413f") - (bg-paren "#3f6f5f") - (bg-err "#551525") ; check with err - (bg-warning "#424223") ; check with warning - (bg-info "#104420") ; check with info - - (border "#5d5f63") - (cursor "#ef7fa8") - (fg-intense "#ffffff") - - (modeline-err "#ffbfbf") - (modeline-warning "#dfd443") - (modeline-info "#7fefff") - - (underline-err "#df2f2f") - (underline-warning "#c0b000") - (underline-info "#22b022") - - (bg-char-0 "#0050af") - (bg-char-1 "#7f1f7f") - (bg-char-2 "#6f6600") - -;;; Mappings + (fg-removed "#ffbfbf") -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#35605d") + (fg-mode-line-active "#ecf0ff") + (bg-completion "#37493f") + (bg-hover "#894f7a") + (bg-hover-secondary "#425d4a") + (bg-hl-line "#2f413f") + (bg-paren-match "#3f6f5f") + (bg-region "#543040") + (bg-err "#551525") ; check with err + (bg-warning "#424223") ; check with warning + (bg-info "#104420") ; check with info (err red-warmer) (warning yellow-warmer) @@ -178,12 +124,7 @@ (keybind magenta) (identifier magenta-faint) (prompt magenta-cooler) - - (bg-region "#543040") - (fg-region unspecified) - -;;;; Code mappings - + (builtin magenta-faint) (comment yellow-faint) (constant magenta-cooler) @@ -197,15 +138,11 @@ (rx-escape magenta-cooler) ; compare with `string' (rx-construct red) -;;;; Accent mappings - (accent-0 green-cooler) (accent-1 magenta) (accent-2 magenta-cooler) (accent-3 blue-warmer) -;;;; Date mappings - (date-common green-cooler) (date-deadline red) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday cyan-cooler) (date-weekend red-faint) -;;;; Prose mappings - (prose-code magenta) (prose-done green-warmer) (prose-macro magenta-cooler) @@ -231,8 +166,6 @@ (prose-todo red-warmer) (prose-verbatim cyan-cooler) -;;;; Mail mappings - (mail-cite-0 cyan-cooler) (mail-cite-1 magenta) (mail-cite-2 green-warmer) @@ -242,8 +175,6 @@ (mail-subject green-cooler) (mail-other green) -;;;; 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) - (fg-term-green green) - (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) - (fg-term-blue blue) - (bg-term-blue-bright blue-warmer) - (fg-term-blue-bright blue-warmer) - - (bg-term-magenta magenta) - (fg-term-magenta magenta) - (bg-term-magenta-bright magenta-cooler) - (fg-term-magenta-bright magenta-cooler) - - (bg-term-cyan cyan-warmer) - (fg-term-cyan cyan-warmer) - (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 green-warmer) (rainbow-1 red-faint) (rainbow-2 green-faint) @@ -319,13 +196,7 @@ (rainbow-6 green) (rainbow-7 yellow-cooler) (rainbow-8 blue-faint)) - "The `ef-elea-dark' 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 green theme with brown, magenta, and green colors.") (defcustom ef-elea-dark-palette-overrides nil "Overrides for `ef-elea-dark-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-elea-dark ef-elea-dark-palette ef-elea-dark-palette-overrides) - - (provide-theme 'ef-elea-dark)) + (defconst ef-themes-elea-dark-palette + (append ef-themes-common-palette-overrides ef-elea-dark-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-elea-dark + ef-themes + "Legible dark green theme with brown, magenta, and green colors." + dark + modus-vivendi-palette + ef-themes-elea-dark-palette + ef-themes-elea-dark-palette-overrides)) ;;; ef-elea-dark-theme.el ends here diff --git a/ef-elea-light-theme.el b/ef-elea-light-theme.el index f718048..b9d48e9 100644 --- a/ef-elea-light-theme.el +++ b/ef-elea-light-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-elea-light - "Legible light theme with brown, magenta, and green colors." - :background-mode 'light - :kind 'color-scheme - :family 'ef) - - (defconst ef-elea-light-palette - '( -;;; Basic values - - (bg-main "#edf5e2") - (fg-main "#221321") - (bg-dim "#e3e9d6") - (fg-dim "#676470") - (bg-alt "#d0d7ca") - (fg-alt "#5f5f1f") - - (bg-active "#b0b7aa") + (defconst ef-elea-light-partial + '((cursor "#770080") + (bg-main "#edf5e2") + (bg-dim "#e3e9d6") + (bg-alt "#d0d7ca") + (fg-main "#221321") + (fg-dim "#676470") + (fg-alt "#5f5f1f") + (bg-active "#b0b7aa") (bg-inactive "#e8eddc") - -;;; Basic hues for foreground values - - (red "#c3303a") - (red-warmer "#d00000") - (red-cooler "#b02440") - (red-faint "#894852") - (green "#00601f") - (green-warmer "#355500") - (green-cooler "#007047") - (green-faint "#306630") - (yellow "#9a501f") - (yellow-warmer "#b04300") - (yellow-cooler "#88541f") - (yellow-faint "#7f4f4a") - (blue "#375cc6") - (blue-warmer "#444fcf") - (blue-cooler "#162f8f") - (blue-faint "#3a5099") - (magenta "#80308f") - (magenta-warmer "#9f356a") - (magenta-cooler "#5032aa") - (magenta-faint "#6a4a9f") - (cyan "#1f70af") - (cyan-warmer "#3f6faf") - (cyan-cooler "#00677f") - (cyan-faint "#4f677f") - -;;; Basic hues for background values - - (bg-red-intense "#ff8f88") - (bg-green-intense "#a6df80") - (bg-yellow-intense "#efbf00") - (bg-blue-intense "#cfceff") + (border "#a5aaaf") + + (red "#c3303a") + (red-warmer "#d00000") + (red-cooler "#b02440") + (red-faint "#894852") + (green "#00601f") + (green-warmer "#355500") + (green-cooler "#007047") + (green-faint "#306630") + (yellow "#9a501f") + (yellow-warmer "#b04300") + (yellow-cooler "#88541f") + (yellow-faint "#7f4f4a") + (blue "#375cc6") + (blue-warmer "#444fcf") + (blue-cooler "#162f8f") + (blue-faint "#3a5099") + (magenta "#80308f") + (magenta-warmer "#9f356a") + (magenta-cooler "#5032aa") + (magenta-faint "#6a4a9f") + (cyan "#1f70af") + (cyan-warmer "#3f6faf") + (cyan-cooler "#00677f") + (cyan-faint "#4f677f") + + (bg-red-intense "#ff8f88") + (bg-green-intense "#a6df80") + (bg-yellow-intense "#efbf00") + (bg-blue-intense "#cfceff") (bg-magenta-intense "#df9fff") - (bg-cyan-intense "#88cbdc") - - (bg-red-subtle "#f0c6bf") - (bg-green-subtle "#c0e8a7") - (bg-yellow-subtle "#e4e48f") - (bg-blue-subtle "#c9d8f3") - (bg-magenta-subtle "#edd2f0") - (bg-cyan-subtle "#b7e4f0") - -;;; Diffs - - (bg-added "#c7e8ba") - (bg-added-faint "#def0cb") - (bg-added-refine "#bed9b0") - (fg-added "#005000") - - (bg-changed "#f5e8b0") - (bg-changed-faint "#f5f2bf") + (bg-cyan-intense "#88cbdc") + + (bg-red-subtle "#f0c6bf") + (bg-green-subtle "#c0e8a7") + (bg-yellow-subtle "#e4e48f") + (bg-blue-subtle "#c9d8f3") + (bg-magenta-subtle "#edd2f0") + (bg-cyan-subtle "#b7e4f0") + + (bg-added "#c7e8ba") + (bg-added-faint "#def0cb") + (bg-added-refine "#bed9b0") + (fg-added "#005000") + + (bg-changed "#f5e8b0") + (bg-changed-faint "#f5f2bf") (bg-changed-refine "#f0db9a") - (fg-changed "#553d00") + (fg-changed "#553d00") - (bg-removed "#f2d0c6") - (bg-removed-faint "#f0e0c0") + (bg-removed "#f2d0c6") + (bg-removed-faint "#f0e0c0") (bg-removed-refine "#efbfbd") - (fg-removed "#8f1313") - -;;; 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 "#a5c67f") - (fg-mode-line "#142810") - (bg-completion "#c2eaba") - (bg-hover "#dfbac0") - (bg-hover-secondary "#b5dfbf") - (bg-hl-line "#d0e7c4") - (bg-paren "#8ad3a2") - (bg-err "#f2d5b5") ; check with err - (bg-warning "#e8e8aa") ; check with warning - (bg-info "#b4efc6") ; check with info - - (border "#a5aaaf") - (cursor "#770080") - (fg-intense "#000000") - - (modeline-err "#950f0f") - (modeline-warning "#7000af") - (modeline-info "#0040af") - - (underline-err "#ef0f1f") - (underline-warning "#bf5f00") - (underline-info "#02af5f") - - (bg-char-0 "#7feaff") - (bg-char-1 "#f0a0f0") - (bg-char-2 "#d0e000") + (fg-removed "#8f1313") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#a5c67f") + (fg-mode-line-active "#142810") + (bg-completion "#c2eaba") + (bg-hover "#dfbac0") + (bg-hover-secondary "#b5dfbf") + (bg-hl-line "#d0e7c4") + (bg-paren-match-match "#8ad3a2") + (bg-region "#d9d2ef") + (bg-err "#f2d5b5") ; check with err + (bg-warning "#e8e8aa") ; check with warning + (bg-info "#b4efc6") ; check with info (err red-warmer) (warning yellow-warmer) @@ -178,12 +124,7 @@ (keybind magenta) (identifier magenta-faint) (prompt magenta-warmer) - - (bg-region "#d9d2ef") - (fg-region unspecified) - -;;;; Code mappings - + (builtin magenta-faint) (comment yellow-faint) (constant magenta-cooler) @@ -197,15 +138,11 @@ (rx-escape magenta-cooler) ; compare with `string' (rx-construct red) -;;;; Accent mappings - (accent-0 green-cooler) (accent-1 magenta-warmer) (accent-2 magenta-cooler) (accent-3 cyan) -;;;; Date mappings - (date-common green-cooler) (date-deadline red) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday cyan-cooler) (date-weekend red-faint) -;;;; Prose mappings - (prose-code magenta) (prose-done green-cooler) (prose-macro magenta-cooler) @@ -231,8 +166,6 @@ (prose-todo red) (prose-verbatim cyan-cooler) -;;;; Mail mappings - (mail-cite-0 cyan-cooler) (mail-cite-1 magenta) (mail-cite-2 green-warmer) @@ -242,8 +175,6 @@ (mail-subject green-cooler) (mail-other green) -;;;; 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) - (fg-term-green green) - (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-cooler) - (fg-term-yellow-bright yellow-cooler) - - (bg-term-blue blue) - (fg-term-blue blue) - (bg-term-blue-bright blue-warmer) - (fg-term-blue-bright blue-warmer) - - (bg-term-magenta magenta) - (fg-term-magenta magenta) - (bg-term-magenta-bright magenta-cooler) - (fg-term-magenta-bright magenta-cooler) - - (bg-term-cyan cyan-warmer) - (fg-term-cyan cyan-warmer) - (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 green-warmer) (rainbow-1 red-faint) (rainbow-2 green-faint) @@ -319,13 +196,7 @@ (rainbow-6 green) (rainbow-7 yellow) (rainbow-8 magenta-faint)) - "The `ef-elea-light' 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 green theme with brown, magenta, and green colors.") (defcustom ef-elea-light-palette-overrides nil "Overrides for `ef-elea-light-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-elea-light ef-elea-light-palette ef-elea-light-palette-overrides) - - (provide-theme 'ef-elea-light)) + (defconst ef-themes-elea-light-palette + (append ef-themes-common-palette-overrides ef-elea-light-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-elea-light + ef-themes + "Legible light green theme with brown, magenta, and green colors." + light + modus-operandi-palette + ef-themes-elea-light-palette + ef-themes-elea-light-palette-overrides)) ;;; ef-elea-light-theme.el ends here diff --git a/ef-frost-theme.el b/ef-frost-theme.el index b8b2761..f61fb89 100644 --- a/ef-frost-theme.el +++ b/ef-frost-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-frost - "Legible light theme with blue, cyan, teal, purple colors." - :background-mode 'light - :kind 'color-scheme - :family 'ef) - - (defconst ef-frost-palette - '( -;;; Basic values - - (bg-main "#fcffff") - (fg-main "#232323") - (bg-dim "#eaefef") - (fg-dim "#66657f") - (bg-alt "#d7dbdb") - (fg-alt "#204f9a") - - (bg-active "#b5b8b8") + (defconst ef-frost-partial + '((cursor "#0055bb") + (bg-main "#fcffff") + (bg-dim "#eaefef") + (bg-alt "#d7dbdb") + (fg-main "#232323") + (fg-dim "#66657f") + (fg-alt "#204f9a") + (bg-active "#b5b8b8") (bg-inactive "#f7f9f9") - -;;; Basic hues for foreground values - - (red "#c42d2f") - (red-warmer "#d03003") - (red-cooler "#cf2f4f") - (red-faint "#9a4366") - (green "#008a00") - (green-warmer "#468400") - (green-cooler "#00845f") - (green-faint "#517f3c") - (yellow "#aa6100") - (yellow-warmer "#b6532f") - (yellow-cooler "#996c4f") - (yellow-faint "#7a5f2f") - (blue "#004fc0") - (blue-warmer "#4244ef") - (blue-cooler "#065fff") - (blue-faint "#375cc8") - (magenta "#aa44c5") - (magenta-warmer "#c0469a") - (magenta-cooler "#7f5ae0") - (magenta-faint "#605f9f") - (cyan "#1f6fbf") - (cyan-warmer "#3a6dd2") - (cyan-cooler "#007a85") - (cyan-faint "#305f9f") - -;;; Basic hues for background values - - (bg-red-intense "#ff8f88") - (bg-green-intense "#8adf90") - (bg-yellow-intense "#fac200") - (bg-blue-intense "#cbcfff") + (border "#b0b7c0") + + (red "#c42d2f") + (red-warmer "#d03003") + (red-cooler "#cf2f4f") + (red-faint "#9a4366") + (green "#008a00") + (green-warmer "#468400") + (green-cooler "#00845f") + (green-faint "#517f3c") + (yellow "#aa6100") + (yellow-warmer "#b6532f") + (yellow-cooler "#996c4f") + (yellow-faint "#7a5f2f") + (blue "#004fc0") + (blue-warmer "#4244ef") + (blue-cooler "#065fff") + (blue-faint "#375cc8") + (magenta "#aa44c5") + (magenta-warmer "#c0469a") + (magenta-cooler "#7f5ae0") + (magenta-faint "#605f9f") + (cyan "#1f6fbf") + (cyan-warmer "#3a6dd2") + (cyan-cooler "#007a85") + (cyan-faint "#305f9f") + + (bg-red-intense "#ff8f88") + (bg-green-intense "#8adf90") + (bg-yellow-intense "#fac200") + (bg-blue-intense "#cbcfff") (bg-magenta-intense "#df8fff") - (bg-cyan-intense "#88c8ff") - - (bg-red-subtle "#ffcbdf") - (bg-green-subtle "#b3f6d0") - (bg-yellow-subtle "#f0f48f") - (bg-blue-subtle "#baeeff") - (bg-magenta-subtle "#f0ddff") - (bg-cyan-subtle "#c2eff2") - -;;; Diffs - - (bg-added "#c9ffea") - (bg-added-faint "#d7fff5") - (bg-added-refine "#b3efdf") - (fg-added "#004840") - - (bg-changed "#f4e8bd") - (bg-changed-faint "#f9efcb") + (bg-cyan-intense "#88c8ff") + + (bg-red-subtle "#ffcbdf") + (bg-green-subtle "#b3f6d0") + (bg-yellow-subtle "#f0f48f") + (bg-blue-subtle "#baeeff") + (bg-magenta-subtle "#f0ddff") + (bg-cyan-subtle "#c2eff2") + + (bg-added "#c9ffea") + (bg-added-faint "#d7fff5") + (bg-added-refine "#b3efdf") + (fg-added "#004840") + + (bg-changed "#f4e8bd") + (bg-changed-faint "#f9efcb") (bg-changed-refine "#efd299") - (fg-changed "#553d00") + (fg-changed "#553d00") - (bg-removed "#ffd6e0") - (bg-removed-faint "#ffe9e6") + (bg-removed "#ffd6e0") + (bg-removed-faint "#ffe9e6") (bg-removed-refine "#f5bfc8") - (fg-removed "#8f1313") - -;;; 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 "#9ad0ff") - (fg-mode-line "#051524") - (bg-completion "#cceff5") - (bg-hover "#eab5ff") - (bg-hover-secondary "#aae0bf") - (bg-hl-line "#dff6e4") - (bg-paren "#cab0ef") - (bg-err "#ffdfda") ; check with err - (bg-warning "#ffe9bf") ; check with warning - (bg-info "#ccefcf") ; check with info - - (border "#b0b7c0") - (cursor "#0055bb") - (fg-intense "#000000") - - (modeline-err "#a00000") - (modeline-warning "#7f1090") - (modeline-info "#0000af") - - (underline-err "#ef0f1f") - (underline-warning "#bf5f00") - (underline-info "#02af52") - - (bg-char-0 "#7feaff") - (bg-char-1 "#ffaaff") - (bg-char-2 "#dff000") + (fg-removed "#8f1313") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#9ad0ff") + (fg-mode-line-active "#051524") + (bg-completion "#cceff5") + (bg-hover "#eab5ff") + (bg-hover-secondary "#aae0bf") + (bg-hl-line "#dff6e4") + (bg-paren-match-match "#cab0ef") + (bg-region "#d4eaf3") + (bg-err "#ffdfda") ; check with err + (bg-warning "#ffe9bf") ; check with warning + (bg-info "#ccefcf") ; check with info (err red) (warning yellow-cooler) @@ -178,12 +124,7 @@ (keybind blue-cooler) (identifier magenta-faint) (prompt cyan) - - (bg-region "#d4eaf3") - (fg-region unspecified) - -;;;; Code mappings - + (builtin cyan) (comment yellow-faint) (constant blue-cooler) @@ -197,15 +138,11 @@ (rx-escape yellow-cooler) ; compare with `string' (rx-construct red-cooler) -;;;; Accent mappings - (accent-0 blue-warmer) (accent-1 green-cooler) (accent-2 magenta-warmer) (accent-3 blue-cooler) -;;;; Date mappings - (date-common cyan-cooler) (date-deadline red) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code green-cooler) (prose-done green) (prose-macro magenta-warmer) @@ -231,8 +166,6 @@ (prose-todo red) (prose-verbatim blue-warmer) -;;;; Mail mappings - (mail-cite-0 blue) (mail-cite-1 cyan-cooler) (mail-cite-2 yellow-cooler) @@ -242,8 +175,6 @@ (mail-subject blue-cooler) (mail-other cyan) -;;;; 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-cooler) - (fg-term-red-bright red-cooler) - - (bg-term-green green) - (fg-term-green green) - (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-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-warmer) - (fg-term-cyan cyan-warmer) - (bg-term-cyan-bright cyan) - (fg-term-cyan-bright cyan) - - (bg-term-white "gray65") - (fg-term-white "gray65") - (bg-term-white-bright "white") - (fg-term-white-bright "white") - -;;;; Rainbow mappings - (rainbow-0 cyan-cooler) (rainbow-1 blue) (rainbow-2 green-cooler) @@ -319,13 +196,7 @@ (rainbow-6 green-warmer) (rainbow-7 magenta) (rainbow-8 cyan-warmer)) - "The `ef-frost' 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 cool theme with blue, cyan, teal, purple colors.") (defcustom ef-frost-palette-overrides nil "Overrides for `ef-frost-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-frost ef-frost-palette ef-frost-palette-overrides) - - (provide-theme 'ef-frost)) + (defconst ef-themes-frost-palette + (append ef-themes-common-palette-overrides ef-frost-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-frost + ef-themes + "Legible light cool theme with blue, cyan, teal, purple colors." + light + modus-operandi-palette + ef-themes-frost-palette + ef-themes-frost-palette-overrides)) ;;; ef-frost-theme.el ends here diff --git a/ef-kassio-theme.el b/ef-kassio-theme.el index 6db39d5..4075f5d 100644 --- a/ef-kassio-theme.el +++ b/ef-kassio-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-kassio - "Legible light theme with blue, red, magenta, and earthly colors." - :background-mode 'light - :kind 'color-scheme - :family 'ef) - - (defconst ef-kassio-palette - '( -;;; Basic values - - (bg-main "#fff7f7") - (fg-main "#201f36") - (bg-dim "#efe7e7") - (fg-dim "#776f79") - (bg-alt "#e0dbdb") - (fg-alt "#af4988") - - (bg-active "#c0bbbb") + (defconst ef-kassio-partial + '((cursor "#d06f30") + (bg-main "#fff7f7") + (bg-dim "#efe7e7") + (bg-alt "#e0dbdb") + (fg-main "#201f36") + (fg-dim "#776f79") + (fg-alt "#af4988") + (bg-active "#c0bbbb") (bg-inactive "#f9eff3") - -;;; Basic hues for foreground values - - (red "#b00234") - (red-warmer "#e00033") - (red-cooler "#d5305f") - (red-faint "#af3f5f") - (green "#217a3c") - (green-warmer "#4a7d00") - (green-cooler "#008358") - (green-faint "#61756c") - (yellow "#9a6012") - (yellow-warmer "#b6530f") - (yellow-cooler "#a04646") - (yellow-faint "#a65d6a") - (blue "#3c3bbe") - (blue-warmer "#4250ef") - (blue-cooler "#065fff") - (blue-faint "#6060d0") - (magenta "#a01f64") - (magenta-warmer "#9f248a") - (magenta-cooler "#7022bf") - (magenta-faint "#954f90") - (cyan "#2f5f9f") - (cyan-warmer "#3f6faf") - (cyan-cooler "#1077ab") - (cyan-faint "#506fa0") - -;;; Basic hues for background values - - (bg-red-intense "#ff8f88") - (bg-green-intense "#8adf80") - (bg-yellow-intense "#fac200") - (bg-blue-intense "#cbcfff") + (border "#bab7bc") + + (red "#b00234") + (red-warmer "#e00033") + (red-cooler "#d5305f") + (red-faint "#af3f5f") + (green "#217a3c") + (green-warmer "#4a7d00") + (green-cooler "#008358") + (green-faint "#61756c") + (yellow "#9a6012") + (yellow-warmer "#b6530f") + (yellow-cooler "#a04646") + (yellow-faint "#a65d6a") + (blue "#3c3bbe") + (blue-warmer "#4250ef") + (blue-cooler "#065fff") + (blue-faint "#6060d0") + (magenta "#a01f64") + (magenta-warmer "#9f248a") + (magenta-cooler "#7022bf") + (magenta-faint "#954f90") + (cyan "#2f5f9f") + (cyan-warmer "#3f6faf") + (cyan-cooler "#1077ab") + (cyan-faint "#506fa0") + + (bg-red-intense "#ff8f88") + (bg-green-intense "#8adf80") + (bg-yellow-intense "#fac200") + (bg-blue-intense "#cbcfff") (bg-magenta-intense "#df8fff") - (bg-cyan-intense "#88c8ff") - - (bg-red-subtle "#facfbf") - (bg-green-subtle "#ccf0af") - (bg-yellow-subtle "#faf182") - (bg-blue-subtle "#cfdfff") - (bg-magenta-subtle "#ffd6f2") - (bg-cyan-subtle "#c2f2f4") - -;;; Diffs - - (bg-added "#c2efcf") - (bg-added-faint "#e0f3e0") - (bg-added-refine "#bae0c8") - (fg-added "#005000") - - (bg-changed "#ffe5b9") - (bg-changed-faint "#ffefc5") + (bg-cyan-intense "#88c8ff") + + (bg-red-subtle "#facfbf") + (bg-green-subtle "#ccf0af") + (bg-yellow-subtle "#faf182") + (bg-blue-subtle "#cfdfff") + (bg-magenta-subtle "#ffd6f2") + (bg-cyan-subtle "#c2f2f4") + + (bg-added "#c2efcf") + (bg-added-faint "#e0f3e0") + (bg-added-refine "#bae0c8") + (fg-added "#005000") + + (bg-changed "#ffe5b9") + (bg-changed-faint "#ffefc5") (bg-changed-refine "#ffd09f") - (fg-changed "#553d00") + (fg-changed "#553d00") - (bg-removed "#ffcfda") - (bg-removed-faint "#ffe3e3") + (bg-removed "#ffcfda") + (bg-removed-faint "#ffe3e3") (bg-removed-refine "#ffb9c9") - (fg-removed "#8f1313") - -;;; 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 "#e0bfba") - (fg-mode-line "#151515") - (bg-completion "#f2d5c9") - (bg-hover "#c0d0ff") - (bg-hover-secondary "#efd5ff") - (bg-hl-line "#f2e5d9") - (bg-paren "#b0dffa") - (bg-err "#ffdde5") ; check with err - (bg-warning "#ffe0aa") ; check with warning - (bg-info "#ddf5cc") ; check with info - - (border "#bab7bc") - (cursor "#d06f30") - (fg-intense "#000000") - - (modeline-err "#9f0000") - (modeline-warning "#5f0070") - (modeline-info "#002fa0") - - (underline-err "#ef0f1f") - (underline-warning "#bf5f00") - (underline-info "#02af52") - - (bg-char-0 "#7feaff") - (bg-char-1 "#ffaaff") - (bg-char-2 "#dff000") + (fg-removed "#8f1313") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#e0bfba") + (fg-mode-line-active "#151515") + (bg-completion "#f2d5c9") + (bg-hover "#c0d0ff") + (bg-hover-secondary "#efd5ff") + (bg-hl-line "#f2e5d9") + (bg-paren-match-match "#b0dffa") + (bg-region "#dfe4f4") + (bg-err "#ffdde5") ; check with err + (bg-warning "#ffe0aa") ; check with warning + (bg-info "#ddf5cc") ; check with info (err red-warmer) (warning yellow-warmer) @@ -178,12 +124,7 @@ (keybind red) (identifier yellow-cooler) (prompt blue-warmer) - - (bg-region "#dfe4f4") - (fg-region unspecified) - -;;;; Code mappings - + (builtin magenta) (comment cyan-faint) (constant magenta-cooler) @@ -197,15 +138,11 @@ (rx-escape cyan-cooler) ; compare with `string' (rx-construct red-cooler) -;;;; Accent mappings - (accent-0 blue) (accent-1 red) (accent-2 cyan-cooler) (accent-3 yellow-warmer) -;;;; Date mappings - (date-common cyan-cooler) (date-deadline red) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday blue) (date-weekend red) -;;;; Prose mappings - (prose-code magenta-warmer) (prose-done green-warmer) (prose-macro magenta-cooler) @@ -231,8 +166,6 @@ (prose-todo red-warmer) (prose-verbatim blue-warmer) -;;;; Mail mappings - (mail-cite-0 yellow-cooler) (mail-cite-1 magenta-warmer) (mail-cite-2 cyan-cooler) @@ -242,8 +175,6 @@ (mail-subject blue) (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) - (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) - (fg-term-blue blue) - (bg-term-blue-bright blue-warmer) - (fg-term-blue-bright blue-warmer) - - (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 blue) (rainbow-1 magenta) (rainbow-2 cyan) @@ -319,13 +196,7 @@ (rainbow-6 red-cooler) (rainbow-7 cyan-cooler) (rainbow-8 green-cooler)) - "The `ef-kassio' 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 grey theme with blue, red, magenta, and earthly colors.") (defcustom ef-kassio-palette-overrides nil "Overrides for `ef-kassio-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-kassio ef-kassio-palette ef-kassio-palette-overrides) - - (provide-theme 'ef-kassio)) + (defconst ef-themes-kassio-palette + (append ef-themes-common-palette-overrides ef-kassio-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-kassio + ef-themes + "Legible light grey theme with blue, red, magenta, and earthly colors." + light + modus-operandi-palette + ef-themes-kassio-palette + ef-themes-kassio-palette-overrides)) ;;; ef-kassio-theme.el ends here diff --git a/ef-light-theme.el b/ef-light-theme.el index c3252e1..220943a 100644 --- a/ef-light-theme.el +++ b/ef-light-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-light - "Legible light theme with blue, magenta, cyan, purple colors." - :background-mode 'light - :kind 'color-scheme - :family 'ef) - - (defconst ef-light-palette - '( -;;; Basic values - - (bg-main "#ffffff") - (fg-main "#202020") - (bg-dim "#efefef") - (fg-dim "#68759f") - (bg-alt "#dbdbdb") - (fg-alt "#397a70") - - (bg-active "#b3b3b3") + (defconst ef-light-partial + '((cursor "#0033cc") + (bg-main "#ffffff") + (bg-dim "#efefef") + (bg-alt "#dbdbdb") + (fg-main "#202020") + (fg-dim "#68759f") + (fg-alt "#397a70") + (bg-active "#b3b3b3") (bg-inactive "#f9f9f9") - -;;; Basic hues for foreground values - - (red "#d3303a") - (red-warmer "#e00033") - (red-cooler "#d51272") - (red-faint "#c24552") - (green "#217a3c") - (green-warmer "#4a7d00") - (green-cooler "#008858") - (green-faint "#61756c") - (yellow "#a45f22") - (yellow-warmer "#b6532f") - (yellow-cooler "#b65050") - (yellow-faint "#a65f6a") - (blue "#3740cf") - (blue-warmer "#4250ef") - (blue-cooler "#065fff") - (blue-faint "#4f54aa") - (magenta "#ba35af") - (magenta-warmer "#cf25aa") - (magenta-cooler "#6052cf") - (magenta-faint "#af5a80") - (cyan "#1f6fbf") - (cyan-warmer "#3f6faf") - (cyan-cooler "#1f77bb") - (cyan-faint "#506fa0") - -;;; Basic hues for background values - - (bg-red-intense "#ff8f88") - (bg-green-intense "#9adf90") - (bg-yellow-intense "#fac200") - (bg-blue-intense "#cbcfff") + (border "#bfc4da") + + (red "#d3303a") + (red-warmer "#e00033") + (red-cooler "#d51272") + (red-faint "#c24552") + (green "#217a3c") + (green-warmer "#4a7d00") + (green-cooler "#008858") + (green-faint "#61756c") + (yellow "#a45f22") + (yellow-warmer "#b6532f") + (yellow-cooler "#b65050") + (yellow-faint "#a65f6a") + (blue "#3740cf") + (blue-warmer "#4250ef") + (blue-cooler "#065fff") + (blue-faint "#4f54aa") + (magenta "#ba35af") + (magenta-warmer "#cf25aa") + (magenta-cooler "#6052cf") + (magenta-faint "#af5a80") + (cyan "#1f6fbf") + (cyan-warmer "#3f6faf") + (cyan-cooler "#1f77bb") + (cyan-faint "#506fa0") + + (bg-red-intense "#ff8f88") + (bg-green-intense "#9adf90") + (bg-yellow-intense "#fac200") + (bg-blue-intense "#cbcfff") (bg-magenta-intense "#df8fff") - (bg-cyan-intense "#88c8ff") - - (bg-red-subtle "#ffcfbf") - (bg-green-subtle "#b3fabf") - (bg-yellow-subtle "#fff576") - (bg-blue-subtle "#ccdfff") - (bg-magenta-subtle "#ffddff") - (bg-cyan-subtle "#bfefff") - -;;; Diffs - - (bg-added "#d0f0d0") - (bg-added-faint "#e5ffe5") - (bg-added-refine "#b2e8be") - (fg-added "#005000") - - (bg-changed "#f4e8bd") - (bg-changed-faint "#f9efcb") + (bg-cyan-intense "#88c8ff") + + (bg-red-subtle "#ffcfbf") + (bg-green-subtle "#b3fabf") + (bg-yellow-subtle "#fff576") + (bg-blue-subtle "#ccdfff") + (bg-magenta-subtle "#ffddff") + (bg-cyan-subtle "#bfefff") + + (bg-added "#d0f0d0") + (bg-added-faint "#e5ffe5") + (bg-added-refine "#b2e8be") + (fg-added "#005000") + + (bg-changed "#f4e8bd") + (bg-changed-faint "#f9efcb") (bg-changed-refine "#efd299") - (fg-changed "#553d00") + (fg-changed "#553d00") - (bg-removed "#ffd8d5") - (bg-removed-faint "#ffe9e9") + (bg-removed "#ffd8d5") + (bg-removed-faint "#ffe9e9") (bg-removed-refine "#f3b5af") - (fg-removed "#8f1313") - -;;; 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 "#b7c7ff") - (fg-mode-line "#151515") - (bg-completion "#bfe8ff") - (bg-hover "#aaeccf") - (bg-hover-secondary "#ccbfff") - (bg-hl-line "#e4efd8") - (bg-paren "#dfa0f3") - (bg-err "#ffd5ea") ; check with err - (bg-warning "#ffeabb") ; check with warning - (bg-info "#d0efda") ; check with info - - (border "#bfc4da") - (cursor "#0033cc") - (fg-intense "#000000") - - (modeline-err "#9f0000") - (modeline-warning "#5f0070") - (modeline-info "#002fa0") - - (underline-err "#ef0f1f") - (underline-warning "#bf5f00") - (underline-info "#02af52") + (fg-removed "#8f1313") - (bg-char-0 "#7feaff") - (bg-char-1 "#ffaaff") - (bg-char-2 "#dff000") - -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#b7c7ff") + (fg-mode-line-active "#151515") + (bg-completion "#bfe8ff") + (bg-hover "#aaeccf") + (bg-hover-secondary "#ccbfff") + (bg-hl-line "#e4efd8") + (bg-paren-match-match "#dfa0f3") + (bg-region "#bfefff") + (bg-err "#ffd5ea") ; check with err + (bg-warning "#ffeabb") ; check with warning + (bg-info "#d0efda") ; check with info (err red-warmer) (warning yellow-warmer) @@ -178,12 +124,7 @@ (keybind blue-cooler) (identifier magenta-faint) (prompt green-cooler) - - (bg-region "#bfefff") - (fg-region unspecified) - -;;;; Code mappings - + (builtin magenta) (comment yellow-faint) (constant blue-cooler) @@ -197,15 +138,11 @@ (rx-escape green-cooler) ; compare with `string' (rx-construct magenta) -;;;; Accent mappings - (accent-0 blue-warmer) (accent-1 magenta-warmer) (accent-2 green-cooler) (accent-3 yellow-warmer) -;;;; Date mappings - (date-common cyan-cooler) (date-deadline red) (date-deadline-subtle red-cooler) @@ -218,8 +155,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code magenta-warmer) (prose-done green) (prose-macro green-cooler) @@ -231,8 +166,6 @@ (prose-todo red-warmer) (prose-verbatim blue-warmer) -;;;; Mail mappings - (mail-cite-0 blue-warmer) (mail-cite-1 magenta) (mail-cite-2 cyan-cooler) @@ -242,8 +175,6 @@ (mail-subject blue-cooler) (mail-other cyan) -;;;; 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-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 green-cooler) (rainbow-1 blue-faint) (rainbow-2 magenta) @@ -319,13 +196,7 @@ (rainbow-6 red-cooler) (rainbow-7 green-cooler) (rainbow-8 yellow)) - "The `ef-light' 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 theme with blue, magenta, cyan, purple colors.") (defcustom ef-light-palette-overrides nil "Overrides for `ef-light-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-light ef-light-palette ef-light-palette-overrides) + (defconst ef-themes-light-palette + (append ef-themes-common-palette-overrides ef-light-partial ef-themes-palette-common)) - (provide-theme 'ef-light)) + (modus-themes-theme + ef-light + ef-themes + "Legible light theme with blue, magenta, cyan, purple colors." + light + modus-operandi-palette + ef-themes-light-palette + ef-themes-light-palette-overrides)) ;;; ef-light-theme.el ends here diff --git a/ef-maris-dark-theme.el b/ef-maris-dark-theme.el index 43e90bf..99d9f3f 100644 --- a/ef-maris-dark-theme.el +++ b/ef-maris-dark-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-maris-dark - "Legible dark theme with blue, cyan, and green colors." - :background-mode 'dark - :kind 'color-scheme - :family 'ef) - - (defconst ef-maris-dark-palette - '( -;;; Basic values - - (bg-main "#131c2b") - (fg-main "#eaedef") - (bg-dim "#1d2c39") - (fg-dim "#969faf") - (bg-alt "#2a3644") - (fg-alt "#90a0dc") - - (bg-active "#4a5664") - (bg-inactive "#1a2331") - -;;; Basic hues for foreground values - - (red "#ff6f6f") - (red-warmer "#ff7a5f") - (red-cooler "#ff7788") - (red-faint "#eaa4a4") - (green "#41bf4f") - (green-warmer "#7fce5f") - (green-cooler "#30c489") - (green-faint "#a9c99f") - (yellow "#d0d24f") - (yellow-warmer "#f0c060") - (yellow-cooler "#cab27f") - (yellow-faint "#cac89f") - (blue "#57b0ff") - (blue-warmer "#70a0ff") - (blue-cooler "#12b4ff") - (blue-faint "#9acfff") - (magenta "#f59acf") - (magenta-warmer "#fa90ea") - (magenta-cooler "#cf90ff") - (magenta-faint "#d4aaf0") - (cyan "#2fd0db") - (cyan-warmer "#7fcfdf") - (cyan-cooler "#65d5a8") - (cyan-faint "#99bfcf") - -;;; Basic hues for background values - - (bg-red-intense "#bd1f30") - (bg-green-intense "#107840") - (bg-yellow-intense "#847020") - (bg-blue-intense "#2f5f9f") + (defconst ef-maris-dark-partial + '((cursor "#8fdfff") + (bg-main "#131c2b") + (bg-dim "#1d2c39") + (bg-alt "#2a3644") + (fg-main "#eaedef") + (fg-dim "#969faf") + (fg-alt "#90a0dc") + (bg-active "#4a5664") + (bg-inactive "#1a2331") + (border "#595a63") + + (red "#ff6f6f") + (red-warmer "#ff7a5f") + (red-cooler "#ff7788") + (red-faint "#eaa4a4") + (green "#41bf4f") + (green-warmer "#7fce5f") + (green-cooler "#30c489") + (green-faint "#a9c99f") + (yellow "#d0d24f") + (yellow-warmer "#f0c060") + (yellow-cooler "#cab27f") + (yellow-faint "#cac89f") + (blue "#57b0ff") + (blue-warmer "#70a0ff") + (blue-cooler "#12b4ff") + (blue-faint "#9acfff") + (magenta "#f59acf") + (magenta-warmer "#fa90ea") + (magenta-cooler "#cf90ff") + (magenta-faint "#d4aaf0") + (cyan "#2fd0db") + (cyan-warmer "#7fcfdf") + (cyan-cooler "#65d5a8") + (cyan-faint "#99bfcf") + + (bg-red-intense "#bd1f30") + (bg-green-intense "#107840") + (bg-yellow-intense "#847020") + (bg-blue-intense "#2f5f9f") (bg-magenta-intense "#b05fcf") - (bg-cyan-intense "#0280b9") - - (bg-red-subtle "#6f293a") - (bg-green-subtle "#1f523a") - (bg-yellow-subtle "#604233") - (bg-blue-subtle "#284477") - (bg-magenta-subtle "#52336b") - (bg-cyan-subtle "#204c68") - -;;; Diffs - - (bg-added "#20493f") - (bg-added-faint "#163530") - (bg-added-refine "#136244") - (fg-added "#a0e0a0") - - (bg-changed "#51512f") - (bg-changed-faint "#40332f") + (bg-cyan-intense "#0280b9") + + (bg-red-subtle "#6f293a") + (bg-green-subtle "#1f523a") + (bg-yellow-subtle "#604233") + (bg-blue-subtle "#284477") + (bg-magenta-subtle "#52336b") + (bg-cyan-subtle "#204c68") + + (bg-added "#20493f") + (bg-added-faint "#163530") + (bg-added-refine "#136244") + (fg-added "#a0e0a0") + + (bg-changed "#51512f") + (bg-changed-faint "#40332f") (bg-changed-refine "#61621f") - (fg-changed "#dada90") + (fg-changed "#dada90") - (bg-removed "#5e242f") - (bg-removed-faint "#4a202d") + (bg-removed "#5e242f") + (bg-removed-faint "#4a202d") (bg-removed-refine "#772a35") - (fg-removed "#ffbfbf") - -;;; 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 "#2f527b") - (fg-mode-line "#ecf0ff") - (bg-completion "#204358") - (bg-hover "#684d54") - (bg-hover-secondary "#49516a") - (bg-hl-line "#243242") - (bg-paren "#6c5d54") - (bg-err "#551327") ; check with err - (bg-warning "#403f22") ; check with warning - (bg-info "#104324") ; check with info - - (border "#595a63") - (cursor "#8fdfff") - (fg-intense "#ffffff") - - (modeline-err "#ffbfbf") - (modeline-warning "#dfd443") - (modeline-info "#7fefff") - - (underline-err "#df2f2f") - (underline-warning "#c0b000") - (underline-info "#22b022") - - (bg-char-0 "#0050af") - (bg-char-1 "#7f1f7f") - (bg-char-2 "#6f6600") - -;;; Mappings + (fg-removed "#ffbfbf") -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#2f527b") + (fg-mode-line-active "#ecf0ff") + (bg-completion "#204358") + (bg-hover "#684d54") + (bg-hover-secondary "#49516a") + (bg-hl-line "#243242") + (bg-paren-match-match "#6c5d54") + (bg-region "#183c65") + (bg-err "#551327") ; check with err + (bg-warning "#403f22") ; check with warning + (bg-info "#104324") ; check with info (err red-warmer) (warning yellow-warmer) @@ -178,12 +124,7 @@ (keybind blue-cooler) (identifier magenta-faint) (prompt blue-warmer) - - (bg-region "#183c65") - (fg-region unspecified) - -;;;; Code mappings - + (builtin magenta-faint) (comment red-faint) (constant blue-cooler) @@ -197,15 +138,11 @@ (rx-escape yellow) ; compare with `string' (rx-construct red) -;;;; Accent mappings - (accent-0 blue-cooler) (accent-1 green-warmer) (accent-2 cyan) (accent-3 red-cooler) -;;;; Date mappings - (date-common cyan-cooler) (date-deadline red) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday cyan-warmer) (date-weekend red-faint) -;;;; Prose mappings - (prose-code cyan) (prose-done green-cooler) (prose-macro magenta-cooler) @@ -231,8 +166,6 @@ (prose-todo red-cooler) (prose-verbatim green-warmer) -;;;; Mail mappings - (mail-cite-0 cyan-cooler) (mail-cite-1 magenta) (mail-cite-2 blue-faint) @@ -242,8 +175,6 @@ (mail-subject green-warmer) (mail-other blue) -;;;; 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-cooler) - (fg-term-red-bright red-cooler) - - (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-warmer) - (fg-term-yellow-bright yellow-warmer) - - (bg-term-blue blue) - (fg-term-blue blue) - (bg-term-blue-bright blue-warmer) - (fg-term-blue-bright blue-warmer) - - (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 green-cooler) (rainbow-1 blue-warmer) (rainbow-2 green-warmer) @@ -319,13 +196,7 @@ (rainbow-6 magenta) (rainbow-7 cyan-cooler) (rainbow-8 yellow-cooler)) - "The `ef-maris-dark' 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 marine theme with blue, cyan, and green colors.") (defcustom ef-maris-dark-palette-overrides nil "Overrides for `ef-maris-dark-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-maris-dark ef-maris-dark-palette ef-maris-dark-palette-overrides) - - (provide-theme 'ef-maris-dark)) + (defconst ef-themes-maris-dark-palette + (append ef-themes-common-palette-overrides ef-maris-dark-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-maris-dark + ef-themes + "Legible dark marine theme with blue, cyan, and green colors." + dark + modus-vivendi-palette + ef-themes-maris-dark-palette + ef-themes-maris-dark-palette-overrides)) ;;; ef-maris-dark-theme.el ends here diff --git a/ef-maris-light-theme.el b/ef-maris-light-theme.el index 70df614..0a6aeef 100644 --- a/ef-maris-light-theme.el +++ b/ef-maris-light-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-maris-light - "Legible light theme with blue, cyan, and green colors." - :background-mode 'light - :kind 'color-scheme - :family 'ef) - - (defconst ef-maris-light-palette - '( -;;; Basic values - - (bg-main "#edf4f8") - (fg-main "#151a27") - (bg-dim "#e0e7ef") - (fg-dim "#676470") - (bg-alt "#cfd8e3") - (fg-alt "#3f4f99") - - (bg-active "#afb8c3") + (defconst ef-maris-light-partial + '((cursor "#036f99") + (bg-main "#edf4f8") + (bg-dim "#e0e7ef") + (bg-alt "#cfd8e3") + (fg-main "#151a27") + (fg-dim "#676470") + (fg-alt "#3f4f99") + (bg-active "#afb8c3") (bg-inactive "#e6ecf2") - -;;; Basic hues for foreground values - - (red "#c3303a") - (red-warmer "#d00000") - (red-cooler "#b02440") - (red-faint "#8b4052") - (green "#007010") - (green-warmer "#3a6f00") - (green-cooler "#007047") - (green-faint "#4a763f") - (yellow "#805a1f") - (yellow-warmer "#8b4400") - (yellow-cooler "#78542f") - (yellow-faint "#7f4f4a") - (blue "#375cc6") - (blue-warmer "#444fcf") - (blue-cooler "#003faf") - (blue-faint "#3a5099") - (magenta "#80308f") - (magenta-warmer "#9a3a6a") - (magenta-cooler "#5f2fba") - (magenta-faint "#6a4a9f") - (cyan "#1f66af") - (cyan-warmer "#305675") - (cyan-cooler "#006f70") - (cyan-faint "#3f627f") - -;;; Basic hues for background values - - (bg-red-intense "#ff8f88") - (bg-green-intense "#96df80") - (bg-yellow-intense "#efbf00") - (bg-blue-intense "#cfceff") + (border "#a2a6af") + + (red "#c3303a") + (red-warmer "#d00000") + (red-cooler "#b02440") + (red-faint "#8b4052") + (green "#007010") + (green-warmer "#3a6f00") + (green-cooler "#007047") + (green-faint "#4a763f") + (yellow "#805a1f") + (yellow-warmer "#8b4400") + (yellow-cooler "#78542f") + (yellow-faint "#7f4f4a") + (blue "#375cc6") + (blue-warmer "#444fcf") + (blue-cooler "#003faf") + (blue-faint "#3a5099") + (magenta "#80308f") + (magenta-warmer "#9a3a6a") + (magenta-cooler "#5f2fba") + (magenta-faint "#6a4a9f") + (cyan "#1f66af") + (cyan-warmer "#305675") + (cyan-cooler "#006f70") + (cyan-faint "#3f627f") + + (bg-red-intense "#ff8f88") + (bg-green-intense "#96df80") + (bg-yellow-intense "#efbf00") + (bg-blue-intense "#cfceff") (bg-magenta-intense "#df9fff") - (bg-cyan-intense "#88cfd0") - - (bg-red-subtle "#f0c6cf") - (bg-green-subtle "#b0ebca") - (bg-yellow-subtle "#e4e498") - (bg-blue-subtle "#ccd5f7") - (bg-magenta-subtle "#edd3f2") - (bg-cyan-subtle "#b2e6f0") - -;;; Diffs - - (bg-added "#b0e8ca") - (bg-added-faint "#c5f0e0") - (bg-added-refine "#a0d4b9") - (fg-added "#005000") - - (bg-changed "#f5e8b0") - (bg-changed-faint "#f5f2bf") + (bg-cyan-intense "#88cfd0") + + (bg-red-subtle "#f0c6cf") + (bg-green-subtle "#b0ebca") + (bg-yellow-subtle "#e4e498") + (bg-blue-subtle "#ccd5f7") + (bg-magenta-subtle "#edd3f2") + (bg-cyan-subtle "#b2e6f0") + + (bg-added "#b0e8ca") + (bg-added-faint "#c5f0e0") + (bg-added-refine "#a0d4b9") + (fg-added "#005000") + + (bg-changed "#f5e8b0") + (bg-changed-faint "#f5f2bf") (bg-changed-refine "#f0db9a") - (fg-changed "#553d00") + (fg-changed "#553d00") - (bg-removed "#f5c7d6") - (bg-removed-faint "#f0d6d6") + (bg-removed "#f5c7d6") + (bg-removed-faint "#f0d6d6") (bg-removed-refine "#efb1cd") - (fg-removed "#8f1313") - -;;; 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 "#a0c2ef") - (fg-mode-line "#142810") - (bg-completion "#cddbfa") - (bg-hover "#d2b4cf") - (bg-hover-secondary "#b7bbea") - (bg-hl-line "#dae5f0") - (bg-paren "#cab3b2") - (bg-err "#f2c2b5") ; check with err - (bg-warning "#e8df9a") ; check with warning - (bg-info "#a4e2cf") ; check with info - - (border "#a2a6af") - (cursor "#036f99") - (fg-intense "#000000") - - (modeline-err "#950f0f") - (modeline-warning "#7000af") - (modeline-info "#0040af") - - (underline-err "#ef0f1f") - (underline-warning "#bf5f00") - (underline-info "#02af5f") - - (bg-char-0 "#7feaff") - (bg-char-1 "#f0a0f0") - (bg-char-2 "#d0e000") + (fg-removed "#8f1313") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#a0c2ef") + (fg-mode-line-active "#142810") + (bg-completion "#cddbfa") + (bg-hover "#d2b4cf") + (bg-hover-secondary "#b7bbea") + (bg-hl-line "#dae5f0") + (bg-paren-match-match "#cab3b2") + (bg-region "#c8dcff") + (bg-err "#f2c2b5") ; check with err + (bg-warning "#e8df9a") ; check with warning + (bg-info "#a4e2cf") ; check with info (err red-warmer) (warning yellow-warmer) @@ -178,12 +124,7 @@ (keybind blue-cooler) (identifier magenta-faint) (prompt blue-warmer) - - (bg-region "#c8dcff") - (fg-region unspecified) - -;;;; Code mappings - + (builtin magenta-faint) (comment red-faint) (constant blue-cooler) @@ -197,15 +138,11 @@ (rx-escape yellow) ; compare with `string' (rx-construct red) -;;;; Accent mappings - (accent-0 blue-cooler) (accent-1 green) (accent-2 cyan) (accent-3 red-cooler) -;;;; Date mappings - (date-common cyan-cooler) (date-deadline red) (date-deadline-subtle red-cooler) @@ -218,8 +155,6 @@ (date-weekday cyan-warmer) (date-weekend red-faint) -;;;; Prose mappings - (prose-code cyan) (prose-done green-cooler) (prose-macro magenta-cooler) @@ -231,8 +166,6 @@ (prose-todo red-cooler) (prose-verbatim green-warmer) -;;;; Mail mappings - (mail-cite-0 cyan) (mail-cite-1 magenta) (mail-cite-2 blue-faint) @@ -242,8 +175,6 @@ (mail-subject green-warmer) (mail-other blue) -;;;; 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-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-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 green-cooler) (rainbow-1 blue-warmer) (rainbow-2 green-warmer) @@ -319,13 +196,7 @@ (rainbow-6 magenta) (rainbow-7 cyan-cooler) (rainbow-8 yellow-cooler)) - "The `ef-maris-light' 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 marine theme with blue, cyan, and green colors.") (defcustom ef-maris-light-palette-overrides nil "Overrides for `ef-maris-light-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-maris-light ef-maris-light-palette ef-maris-light-palette-overrides) - - (provide-theme 'ef-maris-light)) + (defconst ef-themes-maris-light-palette + (append ef-themes-common-palette-overrides ef-maris-light-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-maris-light + ef-themes + "Legible light marine theme with blue, cyan, and green colors." + light + modus-operandi-palette + ef-themes-maris-light-palette + ef-themes-maris-light-palette-overrides)) ;;; ef-maris-light-theme.el ends here diff --git a/ef-melissa-dark-theme.el b/ef-melissa-dark-theme.el index 40d1385..2329ae2 100644 --- a/ef-melissa-dark-theme.el +++ b/ef-melissa-dark-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-melissa-dark - "Legible dark theme with warm colors (yellow, red, green, cyan)." - :background-mode 'dark - :kind 'color-scheme - :family 'ef) - - (defconst ef-melissa-dark-palette - '( -;;; Basic values - - (bg-main "#352718") - (fg-main "#e8e4b1") - (bg-dim "#483426") - (fg-dim "#90918a") - (bg-alt "#59463f") - (fg-alt "#ccaa70") - - (bg-active "#79665f") + (defconst ef-melissa-dark-partial + '((cursor "#f9cf7a") + (bg-main "#352718") + (bg-dim "#483426") + (bg-alt "#59463f") + (fg-main "#e8e4b1") + (fg-dim "#90918a") + (fg-alt "#ccaa70") + (bg-active "#79665f") (bg-inactive "#3d2e1f") - -;;; Basic hues for foreground values - - (red "#ff7f7f") - (red-warmer "#ff7f4f") - (red-cooler "#ff8f98") - (red-faint "#e89a88") - (green "#6fd560") - (green-warmer "#a0d13a") - (green-cooler "#65d590") - (green-faint "#a0d26f") - (yellow "#e4b53f") - (yellow-warmer "#ffa21f") - (yellow-cooler "#e7a06f") - (yellow-faint "#eab780") - (blue "#57aff6") - (blue-warmer "#98bfff") - (blue-cooler "#62cfef") - (blue-faint "#6ab4ef") - (magenta "#f0aac5") - (magenta-warmer "#fa90aa") - (magenta-cooler "#c6a2fe") - (magenta-faint "#dfcfe0") - (cyan "#6fcad0") - (cyan-warmer "#7fc5df") - (cyan-cooler "#70e0cf") - (cyan-faint "#99bfcf") - -;;; Basic hues for background values - - (bg-red-intense "#b02930") - (bg-green-intense "#4a7100") - (bg-yellow-intense "#8f5040") - (bg-blue-intense "#4648d0") + (border "#6f5f58") + + (red "#ff7f7f") + (red-warmer "#ff7f4f") + (red-cooler "#ff8f98") + (red-faint "#e89a88") + (green "#6fd560") + (green-warmer "#a0d13a") + (green-cooler "#65d590") + (green-faint "#a0d26f") + (yellow "#e4b53f") + (yellow-warmer "#ffa21f") + (yellow-cooler "#e7a06f") + (yellow-faint "#eab780") + (blue "#57aff6") + (blue-warmer "#98bfff") + (blue-cooler "#62cfef") + (blue-faint "#6ab4ef") + (magenta "#f0aac5") + (magenta-warmer "#fa90aa") + (magenta-cooler "#c6a2fe") + (magenta-faint "#dfcfe0") + (cyan "#6fcad0") + (cyan-warmer "#7fc5df") + (cyan-cooler "#70e0cf") + (cyan-faint "#99bfcf") + + (bg-red-intense "#b02930") + (bg-green-intense "#4a7100") + (bg-yellow-intense "#8f5040") + (bg-blue-intense "#4648d0") (bg-magenta-intense "#a04fc5") - (bg-cyan-intense "#2270cf") - - (bg-red-subtle "#72292a") - (bg-green-subtle "#3f521a") - (bg-yellow-subtle "#604b13") - (bg-blue-subtle "#384862") - (bg-magenta-subtle "#613a50") - (bg-cyan-subtle "#2f4f4f") - -;;; Diffs - - (bg-added "#2f491f") - (bg-added-faint "#2f3b0f") - (bg-added-refine "#3f6234") - (fg-added "#a0e0a0") - - (bg-changed "#544a0f") - (bg-changed-faint "#43350f") + (bg-cyan-intense "#2270cf") + + (bg-red-subtle "#72292a") + (bg-green-subtle "#3f521a") + (bg-yellow-subtle "#604b13") + (bg-blue-subtle "#384862") + (bg-magenta-subtle "#613a50") + (bg-cyan-subtle "#2f4f4f") + + (bg-added "#2f491f") + (bg-added-faint "#2f3b0f") + (bg-added-refine "#3f6234") + (fg-added "#a0e0a0") + + (bg-changed "#544a0f") + (bg-changed-faint "#43350f") (bg-changed-refine "#615f1f") - (fg-changed "#dada90") + (fg-changed "#dada90") - (bg-removed "#622a1f") - (bg-removed-faint "#4b240a") + (bg-removed "#622a1f") + (bg-removed-faint "#4b240a") (bg-removed-refine "#7f3325") - (fg-removed "#ffbfbf") - -;;; 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 "#704f00") - (fg-mode-line "#f8efd8") - (bg-completion "#66421f") - (bg-hover "#60518f") - (bg-hover-secondary "#5a661f") - (bg-hl-line "#4f311f") - (bg-paren "#5f6f1f") - (bg-err "#571a05") ; check with err - (bg-warning "#4e4310") ; check with warning - (bg-info "#2f4302") ; check with info - - (border "#6f5f58") - (cursor "#f9cf7a") - (fg-intense "#ffffff") - - (modeline-err "#ffbfbf") - (modeline-warning "#dfd443") - (modeline-info "#7fefff") - - (underline-err "#df2f2f") - (underline-warning "#c0b000") - (underline-info "#22b022") - - (bg-char-0 "#0050af") - (bg-char-1 "#7f1f7f") - (bg-char-2 "#6f6600") + (fg-removed "#ffbfbf") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#704f00") + (fg-mode-line-active "#f8efd8") + (bg-completion "#66421f") + (bg-hover "#60518f") + (bg-hover-secondary "#5a661f") + (bg-hl-line "#4f311f") + (bg-paren-match-match "#5f6f1f") + (bg-region "#443a4f") + (bg-err "#571a05") ; check with err + (bg-warning "#4e4310") ; check with warning + (bg-info "#2f4302") ; check with info (err red-warmer) (warning yellow-warmer) @@ -178,12 +124,7 @@ (keybind yellow-warmer) (identifier red-faint) (prompt green-warmer) - - (bg-region "#443a4f") - (fg-region unspecified) - -;;;; Code mappings - + (builtin yellow-cooler) (comment yellow-faint) (constant blue-warmer) @@ -197,15 +138,11 @@ (rx-escape green) ; compare with `string' (rx-construct magenta-cooler) -;;;; Accent mappings - (accent-0 yellow-warmer) (accent-1 green-cooler) (accent-2 red) (accent-3 magenta-cooler) -;;;; Date mappings - (date-common green-warmer) (date-deadline red) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday green-warmer) (date-weekend red-cooler) -;;;; Prose mappings - (prose-code yellow-warmer) (prose-done green) (prose-macro green-warmer) @@ -231,8 +166,6 @@ (prose-todo red-warmer) (prose-verbatim red) -;;;; Mail mappings - (mail-cite-0 yellow-warmer) (mail-cite-1 blue-warmer) (mail-cite-2 red-cooler) @@ -242,8 +175,6 @@ (mail-subject green) (mail-other yellow-cooler) -;;;; 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-cooler) - (fg-term-red-bright red-cooler) - - (bg-term-green green) - (fg-term-green green) - (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-cooler) - (fg-term-yellow-bright yellow-cooler) - - (bg-term-blue blue) - (fg-term-blue blue) - (bg-term-blue-bright blue-warmer) - (fg-term-blue-bright blue-warmer) - - (bg-term-magenta magenta-warmer) - (fg-term-magenta magenta-warmer) - (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-warmer) (rainbow-1 yellow) (rainbow-2 green-warmer) @@ -319,13 +196,7 @@ (rainbow-6 green-cooler) (rainbow-7 magenta-warmer) (rainbow-8 cyan-cooler)) - "The `ef-melissa-dark' 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 honeybee theme with warm colors (yellow, red, green, cyan).") (defcustom ef-melissa-dark-palette-overrides nil "Overrides for `ef-melissa-dark-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-melissa-dark ef-melissa-dark-palette ef-melissa-dark-palette-overrides) - - (provide-theme 'ef-melissa-dark)) + (defconst ef-themes-melissa-dark-palette + (append ef-themes-common-palette-overrides ef-melissa-dark-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-melissa-dark + ef-themes + "Legible dark honeybee theme with warm colors (yellow, red, green, cyan)." + dark + modus-vivendi-palette + ef-themes-melissa-dark-palette + ef-themes-melissa-dark-palette-overrides)) ;;; ef-melissa-dark-theme.el ends here diff --git a/ef-melissa-light-theme.el b/ef-melissa-light-theme.el index 19d979e..bc72b3e 100644 --- a/ef-melissa-light-theme.el +++ b/ef-melissa-light-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-melissa-light - "Legible light theme with warm colors (yellow, red, green, cyan)." - :background-mode 'light - :kind 'color-scheme - :family 'ef) - - (defconst ef-melissa-light-palette - '( -;;; Basic values - - (bg-main "#fff6d8") - (fg-main "#484431") - (bg-dim "#f5e9cb") - (fg-dim "#68708a") - (bg-alt "#e7d7c6") - (fg-alt "#80431a") - - (bg-active "#c7b7a6") + (defconst ef-melissa-light-partial + '((cursor "#a07f00") + (bg-main "#fff6d8") + (bg-dim "#f5e9cb") + (bg-alt "#e7d7c6") + (fg-main "#484431") + (fg-dim "#68708a") + (fg-alt "#80431a") + (bg-active "#c7b7a6") (bg-inactive "#f9efd4") - -;;; Basic hues for foreground values - - (red "#ba2d2f") - (red-warmer "#c74400") - (red-cooler "#c02945") - (red-faint "#b05350") - (green "#007a0a") - (green-warmer "#5a7400") - (green-cooler "#008250") - (green-faint "#61756c") - (yellow "#a26310") - (yellow-warmer "#ba5205") - (yellow-cooler "#946830") - (yellow-faint "#7f6f1a") - (blue "#375cc6") - (blue-warmer "#5f5fdf") - (blue-cooler "#265fbf") - (blue-faint "#4a659f") - (magenta "#aa3e74") - (magenta-warmer "#b02f80") - (magenta-cooler "#6448ca") - (magenta-faint "#905ea0") - (cyan "#3f60af") - (cyan-warmer "#4060a0") - (cyan-cooler "#0f708a") - (cyan-faint "#4f6f8f") - -;;; Basic hues for background values - - (bg-red-intense "#ff8f88") - (bg-green-intense "#96df80") - (bg-yellow-intense "#efbf00") - (bg-blue-intense "#cfceff") + (border "#c5baa6") + + (red "#ba2d2f") + (red-warmer "#c74400") + (red-cooler "#c02945") + (red-faint "#b05350") + (green "#007a0a") + (green-warmer "#5a7400") + (green-cooler "#008250") + (green-faint "#61756c") + (yellow "#a26310") + (yellow-warmer "#ba5205") + (yellow-cooler "#946830") + (yellow-faint "#7f6f1a") + (blue "#375cc6") + (blue-warmer "#5f5fdf") + (blue-cooler "#265fbf") + (blue-faint "#4a659f") + (magenta "#aa3e74") + (magenta-warmer "#b02f80") + (magenta-cooler "#6448ca") + (magenta-faint "#905ea0") + (cyan "#3f60af") + (cyan-warmer "#4060a0") + (cyan-cooler "#0f708a") + (cyan-faint "#4f6f8f") + + (bg-red-intense "#ff8f88") + (bg-green-intense "#96df80") + (bg-yellow-intense "#efbf00") + (bg-blue-intense "#cfceff") (bg-magenta-intense "#df9fff") - (bg-cyan-intense "#88cfd0") - - (bg-red-subtle "#ffceb0") - (bg-green-subtle "#cbf09f") - (bg-yellow-subtle "#f4ed7e") - (bg-blue-subtle "#cce4f2") - (bg-magenta-subtle "#fad6ef") - (bg-cyan-subtle "#bfefef") - -;;; Diffs - - (bg-added "#d7ecb0") - (bg-added-faint "#eef3c2") - (bg-added-refine "#c9dda0") - (fg-added "#005000") - - (bg-changed "#f5e690") - (bg-changed-faint "#f5edaf") + (bg-cyan-intense "#88cfd0") + + (bg-red-subtle "#ffceb0") + (bg-green-subtle "#cbf09f") + (bg-yellow-subtle "#f4ed7e") + (bg-blue-subtle "#cce4f2") + (bg-magenta-subtle "#fad6ef") + (bg-cyan-subtle "#bfefef") + + (bg-added "#d7ecb0") + (bg-added-faint "#eef3c2") + (bg-added-refine "#c9dda0") + (fg-added "#005000") + + (bg-changed "#f5e690") + (bg-changed-faint "#f5edaf") (bg-changed-refine "#edd482") - (fg-changed "#553d00") + (fg-changed "#553d00") - (bg-removed "#f8d0b6") - (bg-removed-faint "#f5deb0") + (bg-removed "#f8d0b6") + (bg-removed-faint "#f5deb0") (bg-removed-refine "#f0bba9") - (fg-removed "#8f1313") - -;;; 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 "#f3cf72") - (fg-mode-line "#403328") - (bg-completion "#ffe2a8") - (bg-hover "#deb4f0") - (bg-hover-secondary "#c4d47a") - (bg-hl-line "#fae7b0") - (bg-paren "#afcf8f") - (bg-err "#ffd4b5") ; check with err - (bg-warning "#ffe89f") ; check with warning - (bg-info "#ddf5ac") ; check with info - - (border "#c5baa6") - (cursor "#a07f00") - (fg-intense "#000000") - - (modeline-err "#900000") - (modeline-warning "#66008f") - (modeline-info "#1f409f") - - (underline-err "#ef0f1f") - (underline-warning "#bf5f00") - (underline-info "#02af52") - - (bg-char-0 "#7feaff") - (bg-char-1 "#f0a0f0") - (bg-char-2 "#d0e000") + (fg-removed "#8f1313") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#f3cf72") + (fg-mode-line-active "#403328") + (bg-completion "#ffe2a8") + (bg-hover "#deb4f0") + (bg-hover-secondary "#c4d47a") + (bg-hl-line "#fae7b0") + (bg-paren-match-match "#afcf8f") + (bg-region "#f0d4d8") + (bg-err "#ffd4b5") ; check with err + (bg-warning "#ffe89f") ; check with warning + (bg-info "#ddf5ac") ; check with info (err red-warmer) (warning yellow-warmer) @@ -178,12 +124,7 @@ (keybind yellow-warmer) (identifier red-faint) (prompt green-warmer) - - (bg-region "#f0d4d8") - (fg-region unspecified) - -;;;; Code mappings - + (builtin yellow-cooler) (comment yellow-faint) (constant cyan) @@ -197,15 +138,11 @@ (rx-escape green) ; compare with `string' (rx-construct magenta-cooler) -;;;; Accent mappings - (accent-0 yellow-warmer) (accent-1 green-cooler) (accent-2 red) (accent-3 magenta-cooler) -;;;; Date mappings - (date-common green-warmer) (date-deadline red) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday green-warmer) (date-weekend red-faint) -;;;; Prose mappings - (prose-code yellow-warmer) (prose-done green) (prose-macro green-warmer) @@ -231,8 +166,6 @@ (prose-todo red-warmer) (prose-verbatim red) -;;;; Mail mappings - (mail-cite-0 yellow-warmer) (mail-cite-1 cyan-warmer) (mail-cite-2 red-cooler) @@ -242,8 +175,6 @@ (mail-subject green-warmer) (mail-other yellow-cooler) -;;;; 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) - (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-warmer) - (fg-term-yellow-bright yellow-warmer) - - (bg-term-blue blue) - (fg-term-blue blue) - (bg-term-blue-bright blue-warmer) - (fg-term-blue-bright blue-warmer) - - (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-warmer) (rainbow-1 yellow) (rainbow-2 green-warmer) @@ -319,13 +196,7 @@ (rainbow-6 green-cooler) (rainbow-7 magenta-warmer) (rainbow-8 cyan-cooler)) - "The `ef-melissa-light' 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 honeybee theme with warm colors (yellow, red, green, cyan).") (defcustom ef-melissa-light-palette-overrides nil "Overrides for `ef-melissa-light-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-melissa-light ef-melissa-light-palette ef-melissa-light-palette-overrides) - - (provide-theme 'ef-melissa-light)) + (defconst ef-themes-melissa-light-palette + (append ef-themes-common-palette-overrides ef-melissa-light-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-melissa-light + ef-themes + "Legible light honeybee theme with warm colors (yellow, red, green, cyan)." + light + modus-operandi-palette + ef-themes-melissa-light-palette + ef-themes-melissa-light-palette-overrides)) ;;; ef-melissa-light-theme.el ends here diff --git a/ef-night-theme.el b/ef-night-theme.el index 25bc91d..2196b72 100644 --- a/ef-night-theme.el +++ b/ef-night-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-night - "Legible dark theme with mostly green, blue, purple colors." - :background-mode 'dark - :kind 'color-scheme - :family 'ef) - - (defconst ef-night-palette - '( -;;; Basic values - - (bg-main "#000e17") - (fg-main "#afbcbf") - (bg-dim "#1a202b") - (fg-dim "#70819f") - (bg-alt "#242e39") - (fg-alt "#b0a0a0") - - (bg-active "#444e59") + (defconst ef-night-partial + '((cursor "#00ccff") + (bg-main "#000e17") + (bg-dim "#1a202b") + (bg-alt "#242e39") + (fg-main "#afbcbf") + (fg-dim "#70819f") + (fg-alt "#b0a0a0") + (bg-active "#444e59") (bg-inactive "#11141f") - -;;; Basic hues for foreground values - - (red "#ef656a") - (red-warmer "#f47360") - (red-cooler "#ef798f") - (red-faint "#d56f72") - (green "#1fa526") - (green-warmer "#50a22f") - (green-cooler "#00a972") - (green-faint "#61a06c") - (yellow "#c48502") - (yellow-warmer "#e6832f") - (yellow-cooler "#df8f6f") - (yellow-faint "#cf9f7f") - (blue "#379cf6") - (blue-warmer "#6a88ff") - (blue-cooler "#029fff") - (blue-faint "#7a94df") - (magenta "#d570af") - (magenta-warmer "#e580ea") - (magenta-cooler "#af8aff") - (magenta-faint "#c59fcf") - (cyan "#4fb0cf") - (cyan-warmer "#6fafff") - (cyan-cooler "#3dc0b0") - (cyan-faint "#92b4df") - -;;; Basic hues for background values - - (bg-red-intense "#bd1f30") - (bg-green-intense "#107440") - (bg-yellow-intense "#847020") - (bg-blue-intense "#2f5f9f") + (border "#3a4a66") + + (red "#ef656a") + (red-warmer "#f47360") + (red-cooler "#ef798f") + (red-faint "#d56f72") + (green "#1fa526") + (green-warmer "#50a22f") + (green-cooler "#00a972") + (green-faint "#61a06c") + (yellow "#c48502") + (yellow-warmer "#e6832f") + (yellow-cooler "#df8f6f") + (yellow-faint "#cf9f7f") + (blue "#379cf6") + (blue-warmer "#6a88ff") + (blue-cooler "#029fff") + (blue-faint "#7a94df") + (magenta "#d570af") + (magenta-warmer "#e580ea") + (magenta-cooler "#af8aff") + (magenta-faint "#c59fcf") + (cyan "#4fb0cf") + (cyan-warmer "#6fafff") + (cyan-cooler "#3dc0b0") + (cyan-faint "#92b4df") + + (bg-red-intense "#bd1f30") + (bg-green-intense "#107440") + (bg-yellow-intense "#847020") + (bg-blue-intense "#2f5f9f") (bg-magenta-intense "#804fd5") - (bg-cyan-intense "#0280b9") - - (bg-red-subtle "#6a1b2f") - (bg-green-subtle "#0a432f") - (bg-yellow-subtle "#533420") - (bg-blue-subtle "#1f3665") - (bg-magenta-subtle "#502555") - (bg-cyan-subtle "#113b5e") - -;;; Diffs - - (bg-added "#00371f") - (bg-added-faint "#002918") - (bg-added-refine "#004c2f") - (fg-added "#a0e0a0") - - (bg-changed "#363300") - (bg-changed-faint "#2a1f00") + (bg-cyan-intense "#0280b9") + + (bg-red-subtle "#6a1b2f") + (bg-green-subtle "#0a432f") + (bg-yellow-subtle "#533420") + (bg-blue-subtle "#1f3665") + (bg-magenta-subtle "#502555") + (bg-cyan-subtle "#113b5e") + + (bg-added "#00371f") + (bg-added-faint "#002918") + (bg-added-refine "#004c2f") + (fg-added "#a0e0a0") + + (bg-changed "#363300") + (bg-changed-faint "#2a1f00") (bg-changed-refine "#4a4a00") - (fg-changed "#efef80") + (fg-changed "#efef80") - (bg-removed "#450f1f") - (bg-removed-faint "#2f060f") + (bg-removed "#450f1f") + (bg-removed-faint "#2f060f") (bg-removed-refine "#641426") - (fg-removed "#ffbfbf") - -;;; 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 "#003a7f") - (fg-mode-line "#ceeeff") - (bg-completion "#00314f") - (bg-hover "#6f345a") - (bg-hover-secondary "#493737") - (bg-hl-line "#002255") - (bg-paren "#664950") - (bg-err "#471014") ; check with err - (bg-warning "#3b2f04") ; check with warning - (bg-info "#103512") ; check with info - - (border "#3a4a66") - (cursor "#00ccff") - (fg-intense "#ffffff") - - (modeline-err "#ff8faf") - (modeline-warning "#dfcf00") - (modeline-info "#00e06f") - - (underline-err "#df2f2f") - (underline-warning "#c0b000") - (underline-info "#22b022") - - (bg-char-0 "#0050af") - (bg-char-1 "#7f1f7f") - (bg-char-2 "#625a00") + (fg-removed "#ffbfbf") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#003a7f") + (fg-mode-line-active "#ceeeff") + (bg-completion "#00314f") + (bg-hover "#6f345a") + (bg-hover-secondary "#493737") + (bg-hl-line "#002255") + (bg-paren-match-match "#664950") + (bg-region "#253146") + (bg-err "#471014") ; check with err + (bg-warning "#3b2f04") ; check with warning + (bg-info "#103512") ; check with info (err red) (warning yellow-warmer) @@ -178,12 +124,7 @@ (keybind green-cooler) (identifier magenta-faint) (prompt cyan-warmer) - - (bg-region "#253146") - (fg-region unspecified) - -;;;; Code mappings - + (builtin green-cooler) (comment yellow-faint) (constant magenta-cooler) @@ -197,15 +138,11 @@ (rx-escape green) ; compare with `string' (rx-construct magenta-warmer) -;;;; Accent mappings - (accent-0 blue-cooler) (accent-1 magenta-warmer) (accent-2 cyan-cooler) (accent-3 red-cooler) -;;;; Date mappings - (date-common cyan) (date-deadline red) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code magenta-warmer) (prose-done green-cooler) (prose-macro cyan-cooler) @@ -231,8 +166,6 @@ (prose-todo red) (prose-verbatim blue-cooler) -;;;; Mail mappings - (mail-cite-0 blue) (mail-cite-1 magenta-warmer) (mail-cite-2 green-cooler) @@ -242,8 +175,6 @@ (mail-subject cyan-cooler) (mail-other cyan-warmer) -;;;; 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) - (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-warmer) - (fg-term-yellow-bright yellow-warmer) - - (bg-term-blue blue) - (fg-term-blue blue) - (bg-term-blue-bright blue-warmer) - (fg-term-blue-bright blue-warmer) - - (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 cyan-warmer) (rainbow-1 magenta-cooler) (rainbow-2 yellow-cooler) @@ -319,13 +196,7 @@ (rainbow-6 yellow) (rainbow-7 cyan) (rainbow-8 green-warmer)) - "The `ef-night' 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 sky blue theme with mostly green, blue, purple colors.") (defcustom ef-night-palette-overrides nil "Overrides for `ef-night-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-night ef-night-palette ef-night-palette-overrides) - - (provide-theme 'ef-night)) + (defconst ef-themes-night-palette + (append ef-themes-common-palette-overrides ef-night-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-night + ef-themes + "Legible dark sky blue theme with mostly green, blue, purple colors." + dark + modus-vivendi-palette + ef-themes-night-palette + ef-themes-night-palette-overrides)) ;;; ef-night-theme.el ends here diff --git a/ef-owl-theme.el b/ef-owl-theme.el index 3da6e8c..c0c10b6 100644 --- a/ef-owl-theme.el +++ b/ef-owl-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-owl - "Legible dark theme with blue, cyan, magenta and desaturated colors." - :background-mode 'dark - :kind 'color-scheme - :family 'ef) - - (defconst ef-owl-palette - '( -;;; Basic values - - (bg-main "#292c2f") - (fg-main "#d0d0d0") - (bg-dim "#373b3d") - (fg-dim "#857f8f") - (bg-alt "#40474b") - (fg-alt "#aab9af") - - (bg-active "#60676b") + (defconst ef-owl-partial + '((cursor "#afe6ef") + (bg-main "#292c2f") + (bg-dim "#373b3d") + (bg-alt "#40474b") + (fg-main "#d0d0d0") + (fg-dim "#857f8f") + (fg-alt "#aab9af") + (bg-active "#60676b") (bg-inactive "#333539") - -;;; Basic hues for foreground values - - (red "#d67869") - (red-warmer "#df885f") - (red-cooler "#e4959f") - (red-faint "#eba0af") - (green "#70bb70") - (green-warmer "#98c06f") - (green-cooler "#60bd90") - (green-faint "#9fb3a7") - (yellow "#c09f6f") - (yellow-warmer "#d1a45f") - (yellow-cooler "#cf9f90") - (yellow-faint "#cbb0a0") - (blue "#80a4e0") - (blue-warmer "#a0a0ef") - (blue-cooler "#72aff0") - (blue-faint "#aab2df") - (magenta "#e5a0ea") - (magenta-warmer "#d389af") - (magenta-cooler "#cfa0e8") - (magenta-faint "#e5bbd7") - (cyan "#8fb8ea") - (cyan-warmer "#99bfd0") - (cyan-cooler "#7ac0b9") - (cyan-faint "#a2c5d8") - -;;; Basic hues for background values - - (bg-red-intense "#a02f50") - (bg-green-intense "#30682f") - (bg-yellow-intense "#8f665f") - (bg-blue-intense "#4f509f") + (border "#4f5f66") + + (red "#d67869") + (red-warmer "#df885f") + (red-cooler "#e4959f") + (red-faint "#eba0af") + (green "#70bb70") + (green-warmer "#98c06f") + (green-cooler "#60bd90") + (green-faint "#9fb3a7") + (yellow "#c09f6f") + (yellow-warmer "#d1a45f") + (yellow-cooler "#cf9f90") + (yellow-faint "#cbb0a0") + (blue "#80a4e0") + (blue-warmer "#a0a0ef") + (blue-cooler "#72aff0") + (blue-faint "#aab2df") + (magenta "#e5a0ea") + (magenta-warmer "#d389af") + (magenta-cooler "#cfa0e8") + (magenta-faint "#e5bbd7") + (cyan "#8fb8ea") + (cyan-warmer "#99bfd0") + (cyan-cooler "#7ac0b9") + (cyan-faint "#a2c5d8") + + (bg-red-intense "#a02f50") + (bg-green-intense "#30682f") + (bg-yellow-intense "#8f665f") + (bg-blue-intense "#4f509f") (bg-magenta-intense "#885997") - (bg-cyan-intense "#4f70aa") - - (bg-red-subtle "#6f2f2f") - (bg-green-subtle "#2a533f") - (bg-yellow-subtle "#60452f") - (bg-blue-subtle "#3f4273") - (bg-magenta-subtle "#66395a") - (bg-cyan-subtle "#354f6f") - -;;; Diffs - - (bg-added "#304a3f") - (bg-added-faint "#1a3630") - (bg-added-refine "#2f6757") - (fg-added "#a0d0d0") - - (bg-changed "#51512f") - (bg-changed-faint "#40332f") + (bg-cyan-intense "#4f70aa") + + (bg-red-subtle "#6f2f2f") + (bg-green-subtle "#2a533f") + (bg-yellow-subtle "#60452f") + (bg-blue-subtle "#3f4273") + (bg-magenta-subtle "#66395a") + (bg-cyan-subtle "#354f6f") + + (bg-added "#304a3f") + (bg-added-faint "#1a3630") + (bg-added-refine "#2f6757") + (fg-added "#a0d0d0") + + (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 "#5b637e") - (fg-mode-line "#dadfe5") - (bg-completion "#354864") - (bg-hover "#8f7a7f") - (bg-hover-secondary "#415960") - (bg-hl-line "#344255") - (bg-paren "#706069") - (bg-err "#4f231f") ; check with err - (bg-warning "#3f3c2f") ; check with warning - (bg-info "#104032") ; check with info - - (border "#4f5f66") - (cursor "#afe6ef") - (fg-intense "#ffffff") - - (modeline-err "#ffd2ff") - (modeline-warning "#e4e947") - (modeline-info "#8defff") - - (underline-err "#df4f2f") - (underline-warning "#d4c000") - (underline-info "#22b022") - - (bg-char-0 "#0050af") - (bg-char-1 "#7f1f7f") - (bg-char-2 "#625a00") + (fg-removed "#f0bfcf") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#5b637e") + (fg-mode-line-active "#dadfe5") + (bg-completion "#354864") + (bg-hover "#8f7a7f") + (bg-hover-secondary "#415960") + (bg-hl-line "#344255") + (bg-paren-match-match "#706069") + (bg-region "#404f66") + (bg-err "#4f231f") ; check with err + (bg-warning "#3f3c2f") ; check with warning + (bg-info "#104032") ; check with info (err red-warmer) (warning yellow-warmer) @@ -178,12 +124,7 @@ (keybind green-cooler) (identifier magenta-faint) (prompt blue-cooler) - - (bg-region "#404f66") - (fg-region unspecified) - -;;;; Code mappings - + (builtin blue) (comment blue-faint) (constant yellow-cooler) @@ -197,15 +138,11 @@ (rx-escape yellow) ; compare with `string' (rx-construct red) -;;;; Accent mappings - (accent-0 cyan-cooler) (accent-1 yellow-cooler) (accent-2 red) (accent-3 green) -;;;; Date mappings - (date-common cyan-cooler) (date-deadline red) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday cyan-cooler) (date-weekend red-faint) -;;;; Prose mappings - (prose-code green-warmer) (prose-done green) (prose-macro green-cooler) @@ -231,8 +166,6 @@ (prose-todo red-warmer) (prose-verbatim blue) -;;;; Mail mappings - (mail-cite-0 cyan) (mail-cite-1 green-cooler) (mail-cite-2 blue-warmer) @@ -242,8 +175,6 @@ (mail-subject blue-cooler) (mail-other cyan-cooler) -;;;; 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) - (fg-term-red red) - (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) - (fg-term-blue blue) - (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-warmer) - (fg-term-cyan cyan-warmer) - (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 green-cooler) (rainbow-1 blue) (rainbow-2 cyan-cooler) @@ -319,13 +196,7 @@ (rainbow-6 magenta-warmer) (rainbow-7 cyan-warmer) (rainbow-8 yellow)) - "The `ef-owl' 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 grey theme with blue, cyan, magenta and desaturated colors.") (defcustom ef-owl-palette-overrides nil "Overrides for `ef-owl-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-owl ef-owl-palette ef-owl-palette-overrides) - - (provide-theme 'ef-owl)) + (defconst ef-themes-owl-palette + (append ef-themes-common-palette-overrides ef-owl-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-owl + ef-themes + "Legible dark grey theme with blue, cyan, magenta and desaturated colors." + BG + MODUS-palette + ef-themes-owl-palette + ef-themes-owl-palette-overrides)) ;;; ef-owl-theme.el ends here diff --git a/ef-reverie-theme.el b/ef-reverie-theme.el index f68f557..7e6af98 100644 --- a/ef-reverie-theme.el +++ b/ef-reverie-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-reverie - "Legible light theme with gold and nuanced colors." - :background-mode 'light - :kind 'color-scheme - :family 'ef) - - (defconst ef-reverie-palette - '( -;;; Basic values - - (bg-main "#f3eddf") - (fg-main "#4f204f") - (bg-dim "#e5d6d4") - (fg-dim "#6f6877") - (bg-alt "#d9cac8") - (fg-alt "#55447f") - - (bg-active "#b9aaa8") + (defconst ef-reverie-partial + '((cursor "#9d5744") + (bg-main "#f3eddf") + (bg-dim "#e5d6d4") + (bg-alt "#d9cac8") + (fg-main "#4f204f") + (fg-dim "#6f6877") + (fg-alt "#55447f") + (bg-active "#b9aaa8") (bg-inactive "#ede4da") - -;;; Basic hues for foreground values - - (red "#ba2d2f") - (red-warmer "#b21f00") - (red-cooler "#a83058") - (red-faint "#a04650") - (green "#007a0a") - (green-warmer "#5a7400") - (green-cooler "#008250") - (green-faint "#426340") - (yellow "#87591f") - (yellow-warmer "#a05900") - (yellow-cooler "#906045") - (yellow-faint "#7a5c50") - (blue "#375cc6") - (blue-warmer "#5059c0") - (blue-cooler "#265fbf") - (blue-faint "#475d80") - (magenta "#9f4e74") - (magenta-warmer "#a73080") - (magenta-cooler "#7755b4") - (magenta-faint "#97508f") - (cyan "#3060af") - (cyan-warmer "#4f60a0") - (cyan-cooler "#0b6e8a") - (cyan-faint "#456b82") - -;;; Basic hues for background values - - (bg-red-intense "#ed899f") - (bg-green-intense "#96d080") - (bg-yellow-intense "#e2b270") - (bg-blue-intense "#c0c0f0") + (border "#c5afb6") + + (red "#ba2d2f") + (red-warmer "#b21f00") + (red-cooler "#a83058") + (red-faint "#a04650") + (green "#007a0a") + (green-warmer "#5a7400") + (green-cooler "#008250") + (green-faint "#426340") + (yellow "#87591f") + (yellow-warmer "#a05900") + (yellow-cooler "#906045") + (yellow-faint "#7a5c50") + (blue "#375cc6") + (blue-warmer "#5059c0") + (blue-cooler "#265fbf") + (blue-faint "#475d80") + (magenta "#9f4e74") + (magenta-warmer "#a73080") + (magenta-cooler "#7755b4") + (magenta-faint "#97508f") + (cyan "#3060af") + (cyan-warmer "#4f60a0") + (cyan-cooler "#0b6e8a") + (cyan-faint "#456b82") + + (bg-red-intense "#ed899f") + (bg-green-intense "#96d080") + (bg-yellow-intense "#e2b270") + (bg-blue-intense "#c0c0f0") (bg-magenta-intense "#daaaf0") - (bg-cyan-intense "#8fc6d0") - - (bg-red-subtle "#f0c0b0") - (bg-green-subtle "#b9e0b4") - (bg-yellow-subtle "#ebe08f") - (bg-blue-subtle "#ccd0f4") - (bg-magenta-subtle "#edc9ea") - (bg-cyan-subtle "#bae5e0") - -;;; Diffs - - (bg-added "#b4e9d0") - (bg-added-faint "#c9edd7") - (bg-added-refine "#a4d4c4") - (fg-added "#0f443f") - - (bg-changed "#f5e690") - (bg-changed-faint "#f5edaf") + (bg-cyan-intense "#8fc6d0") + + (bg-red-subtle "#f0c0b0") + (bg-green-subtle "#b9e0b4") + (bg-yellow-subtle "#ebe08f") + (bg-blue-subtle "#ccd0f4") + (bg-magenta-subtle "#edc9ea") + (bg-cyan-subtle "#bae5e0") + + (bg-added "#b4e9d0") + (bg-added-faint "#c9edd7") + (bg-added-refine "#a4d4c4") + (fg-added "#0f443f") + + (bg-changed "#f5e690") + (bg-changed-faint "#f5edaf") (bg-changed-refine "#eed284") - (fg-changed "#553d00") + (fg-changed "#553d00") - (bg-removed "#f8c3bf") - (bg-removed-faint "#f4d8d0") + (bg-removed "#f8c3bf") + (bg-removed-faint "#f4d8d0") (bg-removed-refine "#f9a8bd") - (fg-removed "#801530") - -;;; 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 "#d1b0df") - (fg-mode-line "#523044") - (bg-completion "#e9cedd") - (bg-hover "#ddc97f") - (bg-hover-secondary "#d0c4e4") - (bg-hl-line "#e7d9e0") - (bg-paren "#bf9fbf") - (bg-err "#ffc4d4") ; check with err - (bg-warning "#f0e0a4") ; check with warning - (bg-info "#dddef0") ; check with info - - (border "#c5afb6") - (cursor "#9d5744") - (fg-intense "#000000") - - (modeline-err "#900000") - (modeline-warning "#66008f") - (modeline-info "#1f409f") - - (underline-err "#c00f4f") - (underline-warning "#bf5f00") - (underline-info "#028082") - - (bg-char-0 "#7feaff") - (bg-char-1 "#f0a0f0") - (bg-char-2 "#d0e000") + (fg-removed "#801530") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#d1b0df") + (fg-mode-line-active "#523044") + (bg-completion "#e9cedd") + (bg-hover "#ddc97f") + (bg-hover-secondary "#d0c4e4") + (bg-hl-line "#e7d9e0") + (bg-paren-match-match "#bf9fbf") + (bg-region "#e0d0ba") + (bg-err "#ffc4d4") ; check with err + (bg-warning "#f0e0a4") ; check with warning + (bg-info "#dddef0") ; check with info (err magenta-warmer) (warning yellow-warmer) @@ -178,12 +124,7 @@ (keybind cyan) (identifier yellow-cooler) (prompt magenta) - - (bg-region "#e0d0ba") - (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-warmer) -;;;; Accent mappings - (accent-0 yellow) (accent-1 red) (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-cooler) (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-reverie' 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 cream theme with gold and nuanced colors.") (defcustom ef-reverie-palette-overrides nil "Overrides for `ef-reverie-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-reverie ef-reverie-palette ef-reverie-palette-overrides) - - (provide-theme 'ef-reverie)) + (defconst ef-themes-reverie-palette + (append ef-themes-common-palette-overrides ef-reverie-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-reverie + ef-themes + "Legible light cream theme with gold and nuanced colors." + light + modus-operandi-palette + ef-themes-reverie-palette + ef-themes-reverie-palette-overrides)) ;;; ef-reverie-theme.el ends here diff --git a/ef-rosa-theme.el b/ef-rosa-theme.el index 4de7273..f2a8fcc 100644 --- a/ef-rosa-theme.el +++ b/ef-rosa-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-rosa - "Legible dark theme with magenta and green colors." - :background-mode 'dark - :kind 'color-scheme - :family 'ef) - - (defconst ef-rosa-palette - '( -;;; Basic values - - (bg-main "#322023") - (fg-main "#e4d3e1") - (bg-dim "#432e32") - (fg-dim "#9d9d9d") - (bg-alt "#4a3842") - (fg-alt "#96c4af") - - (bg-active "#6a5862") + (defconst ef-rosa-partial + '((cursor "#ef607a") + (bg-main "#322023") + (bg-dim "#432e32") + (bg-alt "#4a3842") + (fg-main "#e4d3e1") + (fg-dim "#9d9d9d") + (fg-alt "#96c4af") + (bg-active "#6a5862") (bg-inactive "#362129") - -;;; Basic hues for foreground values - - (red "#ff707f") - (red-warmer "#ff7f5f") - (red-cooler "#f0888f") - (red-faint "#e89f84") - (green "#5fbb5f") - (green-warmer "#8ad05a") - (green-cooler "#49d081") - (green-faint "#9aba8b") - (yellow "#e4c53f") - (yellow-warmer "#f2a85f") - (yellow-cooler "#eec26f") - (yellow-faint "#d8c09f") - (blue "#57aff6") - (blue-warmer "#78b2ff") - (blue-cooler "#62cff7") - (blue-faint "#9fbfdf") - (magenta "#ffb2d6") - (magenta-warmer "#f28fdf") - (magenta-cooler "#cfb1ff") - (magenta-faint "#c59fdf") - (cyan "#5fc0dc") - (cyan-warmer "#7fc5df") - (cyan-cooler "#80dfbf") - (cyan-faint "#99bfcf") - -;;; Basic hues for background values - - (bg-red-intense "#bd1f30") - (bg-green-intense "#408420") - (bg-yellow-intense "#847020") - (bg-blue-intense "#2f5f9f") + (border "#6f5f58") + + (red "#ff707f") + (red-warmer "#ff7f5f") + (red-cooler "#f0888f") + (red-faint "#e89f84") + (green "#5fbb5f") + (green-warmer "#8ad05a") + (green-cooler "#49d081") + (green-faint "#9aba8b") + (yellow "#e4c53f") + (yellow-warmer "#f2a85f") + (yellow-cooler "#eec26f") + (yellow-faint "#d8c09f") + (blue "#57aff6") + (blue-warmer "#78b2ff") + (blue-cooler "#62cff7") + (blue-faint "#9fbfdf") + (magenta "#ffb2d6") + (magenta-warmer "#f28fdf") + (magenta-cooler "#cfb1ff") + (magenta-faint "#c59fdf") + (cyan "#5fc0dc") + (cyan-warmer "#7fc5df") + (cyan-cooler "#80dfbf") + (cyan-faint "#99bfcf") + + (bg-red-intense "#bd1f30") + (bg-green-intense "#408420") + (bg-yellow-intense "#847020") + (bg-blue-intense "#2f5f9f") (bg-magenta-intense "#905fdf") - (bg-cyan-intense "#028099") - - (bg-red-subtle "#772c2a") - (bg-green-subtle "#38512f") - (bg-yellow-subtle "#634627") - (bg-blue-subtle "#424075") - (bg-magenta-subtle "#6b3c52") - (bg-cyan-subtle "#3f4e72") - -;;; Diffs - - (bg-added "#2f4735") - (bg-added-faint "#2a382f") - (bg-added-refine "#1d6044") - (fg-added "#a0e0a0") - - (bg-changed "#51512f") - (bg-changed-faint "#40332f") + (bg-cyan-intense "#028099") + + (bg-red-subtle "#772c2a") + (bg-green-subtle "#38512f") + (bg-yellow-subtle "#634627") + (bg-blue-subtle "#424075") + (bg-magenta-subtle "#6b3c52") + (bg-cyan-subtle "#3f4e72") + + (bg-added "#2f4735") + (bg-added-faint "#2a382f") + (bg-added-refine "#1d6044") + (fg-added "#a0e0a0") + + (bg-changed "#51512f") + (bg-changed-faint "#40332f") (bg-changed-refine "#61621f") - (fg-changed "#dada90") + (fg-changed "#dada90") - (bg-removed "#5f252f") - (bg-removed-faint "#4a242a") + (bg-removed "#5f252f") + (bg-removed-faint "#4a242a") (bg-removed-refine "#792d35") - (fg-removed "#ffbfbf") - -;;; 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 "#814558") - (fg-mode-line "#e8e5e7") - (bg-completion "#6e425f") - (bg-hover "#3f6a50") - (bg-hover-secondary "#6a4f5f") - (bg-hl-line "#42352f") - (bg-paren "#7c454f") - (bg-err "#551a07") ; check with err - (bg-warning "#4f3f13") ; check with warning - (bg-info "#0f4312") ; check with info - - (border "#6f5f58") - (cursor "#ef607a") - (fg-intense "#ffffff") - - (modeline-err "#ffb4ff") - (modeline-warning "#dfdf43") - (modeline-info "#7fefff") - - (underline-err "#df4f2f") - (underline-warning "#d4c000") - (underline-info "#22b022") - - (bg-char-0 "#0050af") - (bg-char-1 "#7f1f7f") - (bg-char-2 "#6f6600") + (fg-removed "#ffbfbf") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#814558") + (fg-mode-line-active "#e8e5e7") + (bg-completion "#6e425f") + (bg-hover "#3f6a50") + (bg-hover-secondary "#6a4f5f") + (bg-hl-line "#42352f") + (bg-paren-match-match "#7c454f") + (bg-region "#45524a") + (bg-err "#551a07") ; check with err + (bg-warning "#4f3f13") ; check with warning + (bg-info "#0f4312") ; check with info (err red-warmer) (warning yellow-warmer) @@ -178,12 +124,7 @@ (keybind magenta-warmer) (identifier green-faint) (prompt cyan-cooler) - - (bg-region "#45524a") - (fg-region unspecified) - -;;;; Code mappings - + (builtin magenta-cooler) (comment green-faint) (constant green-cooler) @@ -197,15 +138,11 @@ (rx-escape red-cooler) ; compare with `string' (rx-construct blue-cooler) -;;;; Accent mappings - (accent-0 green-warmer) (accent-1 magenta-warmer) (accent-2 yellow-warmer) (accent-3 green-cooler) -;;;; Date mappings - (date-common magenta-cooler) (date-deadline magenta) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday magenta-cooler) (date-weekend red-cooler) -;;;; Prose mappings - (prose-code magenta-warmer) (prose-done green-cooler) (prose-macro red-cooler) @@ -231,8 +166,6 @@ (prose-todo red-warmer) (prose-verbatim cyan-cooler) -;;;; Mail mappings - (mail-cite-0 green-warmer) (mail-cite-1 cyan-cooler) (mail-cite-2 red-cooler) @@ -242,8 +175,6 @@ (mail-subject green) (mail-other magenta-warmer) -;;;; 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) - (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-warmer) - (fg-term-yellow-bright yellow-warmer) - - (bg-term-blue blue) - (fg-term-blue blue) - (bg-term-blue-bright blue-warmer) - (fg-term-blue-bright blue-warmer) - - (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 magenta-warmer) (rainbow-1 green-warmer) (rainbow-2 magenta) @@ -319,13 +196,7 @@ (rainbow-6 green) (rainbow-7 yellow-warmer) (rainbow-8 cyan-cooler)) - "The `ef-rosa' 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 rosewood theme with magenta and green colors.") (defcustom ef-rosa-palette-overrides nil "Overrides for `ef-rosa-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-rosa ef-rosa-palette ef-rosa-palette-overrides) - - (provide-theme 'ef-rosa)) + (defconst ef-themes-rosa-palette + (append ef-themes-common-palette-overrides ef-rosa-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-rosa + ef-themes + "Legible dark rosewood theme with magenta and green colors." + dark + modus-vivendi-palette + ef-themes-rosa-palette + ef-themes-rosa-palette-overrides)) ;;; ef-rosa-theme.el ends here diff --git a/ef-spring-theme.el b/ef-spring-theme.el index 20a6846..637c0fe 100644 --- a/ef-spring-theme.el +++ b/ef-spring-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-spring - "Legible light theme with cool, varied colors (green, cyan, red)." - :background-mode 'light - :kind 'color-scheme - :family 'ef) - - (defconst ef-spring-palette - '( -;;; Basic values - - (bg-main "#f6fff9") - (fg-main "#34494a") - (bg-dim "#e8f0f0") - (fg-dim "#777294") - (bg-alt "#e0e6e3") - (fg-alt "#9d5e7a") - - (bg-active "#c0c6c3") + (defconst ef-spring-partial + '((cursor "#bf005f") + (bg-main "#f6fff9") + (bg-dim "#e8f0f0") + (bg-alt "#e0e6e3") + (fg-main "#34494a") + (fg-dim "#777294") + (fg-alt "#9d5e7a") + (bg-active "#c0c6c3") (bg-inactive "#f0f8f4") - -;;; Basic hues for foreground values - - (red "#c42d2f") - (red-warmer "#d03003") - (red-cooler "#cf2f4f") - (red-faint "#b64850") - (green "#1a870f") - (green-warmer "#4a7d00") - (green-cooler "#007f68") - (green-faint "#61756c") - (yellow "#a45f22") - (yellow-warmer "#b6540f") - (yellow-cooler "#ae5a30") - (yellow-faint "#876450") - (blue "#375cc6") - (blue-warmer "#5f5fdf") - (blue-cooler "#265fbf") - (blue-faint "#6a65bf") - (magenta "#d5206f") - (magenta-warmer "#cb26a0") - (magenta-cooler "#9435b4") - (magenta-faint "#a04360") - (cyan "#1f6fbf") - (cyan-warmer "#3f6faf") - (cyan-cooler "#0f7b8f") - (cyan-faint "#5f6abf") - -;;; Basic hues for background values - - (bg-red-intense "#ff8f88") - (bg-green-intense "#7fdda0") - (bg-yellow-intense "#efcf00") - (bg-blue-intense "#afdfff") + (border "#b4c4c0") + + (red "#c42d2f") + (red-warmer "#d03003") + (red-cooler "#cf2f4f") + (red-faint "#b64850") + (green "#1a870f") + (green-warmer "#4a7d00") + (green-cooler "#007f68") + (green-faint "#61756c") + (yellow "#a45f22") + (yellow-warmer "#b6540f") + (yellow-cooler "#ae5a30") + (yellow-faint "#876450") + (blue "#375cc6") + (blue-warmer "#5f5fdf") + (blue-cooler "#265fbf") + (blue-faint "#6a65bf") + (magenta "#d5206f") + (magenta-warmer "#cb26a0") + (magenta-cooler "#9435b4") + (magenta-faint "#a04360") + (cyan "#1f6fbf") + (cyan-warmer "#3f6faf") + (cyan-cooler "#0f7b8f") + (cyan-faint "#5f6abf") + + (bg-red-intense "#ff8f88") + (bg-green-intense "#7fdda0") + (bg-yellow-intense "#efcf00") + (bg-blue-intense "#afdfff") (bg-magenta-intense "#df8fff") - (bg-cyan-intense "#80caf0") - - (bg-red-subtle "#ffcfbf") - (bg-green-subtle "#b2faa5") - (bg-yellow-subtle "#f0f37f") - (bg-blue-subtle "#ccdfff") - (bg-magenta-subtle "#ffddff") - (bg-cyan-subtle "#bfefff") - -;;; Diffs - - (bg-added "#c9ffda") - (bg-added-faint "#d7ffe5") - (bg-added-refine "#b3efcf") - (fg-added "#005000") - - (bg-changed "#f0e8bd") - (bg-changed-faint "#f5efcb") + (bg-cyan-intense "#80caf0") + + (bg-red-subtle "#ffcfbf") + (bg-green-subtle "#b2faa5") + (bg-yellow-subtle "#f0f37f") + (bg-blue-subtle "#ccdfff") + (bg-magenta-subtle "#ffddff") + (bg-cyan-subtle "#bfefff") + + (bg-added "#c9ffda") + (bg-added-faint "#d7ffe5") + (bg-added-refine "#b3efcf") + (fg-added "#005000") + + (bg-changed "#f0e8bd") + (bg-changed-faint "#f5efcb") (bg-changed-refine "#efd299") - (fg-changed "#553d00") + (fg-changed "#553d00") - (bg-removed "#ffd6e0") - (bg-removed-faint "#ffe9e6") + (bg-removed "#ffd6e0") + (bg-removed-faint "#ffe9e6") (bg-removed-refine "#f5bfc8") - (fg-removed "#8f1313") - -;;; 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 "#90e8b0") - (fg-mode-line "#243228") - (bg-completion "#ccedff") - (bg-hover "#ffc09f") - (bg-hover-secondary "#f0bfff") - (bg-hl-line "#f9e0e5") - (bg-paren "#7fddd0") - (bg-err "#ffe8e0") ; check with err - (bg-warning "#ffecba") ; check with warning - (bg-info "#ccf5dd") ; check with info - - (border "#b4c4c0") - (cursor "#bf005f") - (fg-intense "#000000") - - (modeline-err "#9f0030") - (modeline-warning "#5f0f9f") - (modeline-info "#1240af") - - (underline-err "#ef0f1f") - (underline-warning "#bf5f00") - (underline-info "#02af52") - - (bg-char-0 "#7feaff") - (bg-char-1 "#ffaaff") - (bg-char-2 "#dff000") + (fg-removed "#8f1313") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#90e8b0") + (fg-mode-line-active "#243228") + (bg-completion "#ccedff") + (bg-hover "#ffc09f") + (bg-hover-secondary "#f0bfff") + (bg-hl-line "#f9e0e5") + (bg-paren-match-match "#7fddd0") + (bg-region "#d0e6ff") + (bg-err "#ffe8e0") ; check with err + (bg-warning "#ffecba") ; check with warning + (bg-info "#ccf5dd") ; check with info (err red-warmer) (warning yellow) @@ -178,12 +124,7 @@ (keybind magenta-warmer) (identifier magenta-faint) (prompt green) - - (bg-region "#d0e6ff") - (fg-region unspecified) - -;;;; Code mappings - + (builtin green) (comment yellow-faint) (constant red-warmer) @@ -197,15 +138,11 @@ (rx-escape cyan) ; compare with `string' (rx-construct magenta-warmer) -;;;; Accent mappings - (accent-0 green) (accent-1 red-cooler) (accent-2 blue) (accent-3 yellow-warmer) -;;;; Date mappings - (date-common cyan) (date-deadline red-warmer) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code red-cooler) (prose-done green) (prose-macro blue) @@ -231,8 +166,6 @@ (prose-todo red-warmer) (prose-verbatim green) -;;;; Mail mappings - (mail-cite-0 green) (mail-cite-1 yellow-cooler) (mail-cite-2 blue-warmer) @@ -242,8 +175,6 @@ (mail-subject cyan) (mail-other cyan-cooler) -;;;; 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-cooler) - (fg-term-red-bright red-cooler) - - (bg-term-green green) - (fg-term-green green) - (bg-term-green-bright green-cooler) - (fg-term-green-bright green-cooler) - - (bg-term-yellow yellow-warmer) - (fg-term-yellow yellow-warmer) - (bg-term-yellow-bright yellow) - (fg-term-yellow-bright yellow) - - (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-cooler) (rainbow-1 green-cooler) (rainbow-2 magenta-warmer) @@ -319,13 +196,7 @@ (rainbow-6 magenta) (rainbow-7 magenta-cooler) (rainbow-8 yellow-cooler)) - "The `ef-spring' 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 floral theme with cool, varied colors (green, cyan, red).") (defcustom ef-spring-palette-overrides nil "Overrides for `ef-spring-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-spring ef-spring-palette ef-spring-palette-overrides) - - (provide-theme 'ef-spring)) + (defconst ef-themes-spring-palette + (append ef-themes-common-palette-overrides ef-spring-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-spring + ef-themes + "Legible light floral theme with cool, varied colors (green, cyan, red)." + light + modus-operandi-palette + ef-themes-spring-palette + ef-themes-spring-palette-overrides)) ;;; ef-spring-theme.el ends here diff --git a/ef-summer-theme.el b/ef-summer-theme.el index 8b1f360..7c23b23 100644 --- a/ef-summer-theme.el +++ b/ef-summer-theme.el @@ -36,137 +36,84 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-summer - "Legible light theme with magenta, purple, gold, cyan colors." - :background-mode 'light - :kind 'color-scheme - :family 'ef) - - (defconst ef-summer-palette - '( -;;; Basic values - - (bg-main "#fff2f3") - (fg-main "#4f4073") - (bg-dim "#f2e4ea") - (fg-dim "#786e74") - (bg-alt "#efd3e4") - (fg-alt "#af4988") - - (bg-active "#cfb3c4") + (defconst ef-summer-partial + '((cursor "#cf0090") + (bg-main "#fff2f3") + (bg-dim "#f2e4ea") + (bg-alt "#efd3e4") + (fg-main "#4f4073") + (fg-dim "#786e74") + (fg-alt "#af4988") + (bg-active "#cfb3c4") (bg-inactive "#f7ebee") - -;;; Basic hues for foreground values - - (red "#d3303a") - (red-warmer "#e00033") - (red-cooler "#d50f7f") - (red-faint "#c24552") - (green "#217a3c") - (green-warmer "#4a7d00") - (green-cooler "#007f68") - (green-faint "#61756c") - (yellow "#a45f22") - (yellow-warmer "#b6532f") - (yellow-cooler "#b65050") - (yellow-faint "#9a5f6a") - (blue "#375ce6") - (blue-warmer "#5250ef") - (blue-cooler "#065fff") - (blue-faint "#6060d0") - (magenta "#ba35af") - (magenta-warmer "#cb1aaa") - (magenta-cooler "#8e44f3") - (magenta-faint "#a45392") - (cyan "#1f6fbf") - (cyan-warmer "#3f6faf") - (cyan-cooler "#0f7b8f") - (cyan-faint "#5f60bf") - -;;; Basic hues for background values - - (bg-red-intense "#ff7f88") - (bg-green-intense "#86df80") - (bg-yellow-intense "#ffc200") - (bg-blue-intense "#cbcfff") + (border "#c6bbc6") + + (red "#d3303a") + (red-warmer "#e00033") + (red-cooler "#d50f7f") + (red-faint "#c24552") + (green "#217a3c") + (green-warmer "#4a7d00") + (green-cooler "#007f68") + (green-faint "#61756c") + (yellow "#a45f22") + (yellow-warmer "#b6532f") + (yellow-cooler "#b65050") + (yellow-faint "#9a5f6a") + (blue "#375ce6") + (blue-warmer "#5250ef") + (blue-cooler "#065fff") + (blue-faint "#6060d0") + (magenta "#ba35af") + (magenta-warmer "#cb1aaa") + (magenta-cooler "#8e44f3") + (magenta-faint "#a45392") + (cyan "#1f6fbf") + (cyan-warmer "#3f6faf") + (cyan-cooler "#0f7b8f") + (cyan-faint "#5f60bf") + + (bg-red-intense "#ff7f88") + (bg-green-intense "#86df80") + (bg-yellow-intense "#ffc200") + (bg-blue-intense "#cbcfff") (bg-magenta-intense "#df8fff") - (bg-cyan-intense "#88ccff") - - (bg-red-subtle "#fbc3cf") - (bg-green-subtle "#b9edca") - (bg-yellow-subtle "#f7e78f") - (bg-blue-subtle "#ccdfff") - (bg-magenta-subtle "#facdf5") - (bg-cyan-subtle "#c2ecf0") - -;;; Diffs - - (bg-added "#caf4da") - (bg-added-faint "#dff6ea") - (bg-added-refine "#bae9cf") - (fg-added "#005000") - - (bg-changed "#ffdfb9") - (bg-changed-faint "#ffefcb") + (bg-cyan-intense "#88ccff") + + (bg-red-subtle "#fbc3cf") + (bg-green-subtle "#b9edca") + (bg-yellow-subtle "#f7e78f") + (bg-blue-subtle "#ccdfff") + (bg-magenta-subtle "#facdf5") + (bg-cyan-subtle "#c2ecf0") + + (bg-added "#caf4da") + (bg-added-faint "#dff6ea") + (bg-added-refine "#bae9cf") + (fg-added "#005000") + + (bg-changed "#ffdfb9") + (bg-changed-faint "#ffefcb") (bg-changed-refine "#ffcfa0") - (fg-changed "#553d00") + (fg-changed "#553d00") - (bg-removed "#ffcee0") - (bg-removed-faint "#ffdfe6") + (bg-removed "#ffcee0") + (bg-removed-faint "#ffdfe6") (bg-removed-refine "#f5b6c8") - (fg-removed "#8f1313") - -;;; 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 "#ffa4dc") - (fg-mode-line "#341f58") - (bg-completion "#f4cfff") - (bg-hover "#b4cfff") - (bg-hover-secondary "#aaeccf") - (bg-hl-line "#ffd6e5") - (bg-paren "#9fc0ef") - (bg-err "#ffd0e6") ; check with err - (bg-warning "#ffe5ba") ; check with warning - (bg-info "#bbefda") ; check with info - - (border "#c6bbc6") - (cursor "#cf0090") - (fg-intense "#000000") - - (modeline-err "#9f003f") - (modeline-warning "#5f009f") - (modeline-info "#1240af") - - (underline-err "#ef0f1f") - (underline-warning "#bf5f00") - (underline-info "#02af52") - - (bg-char-0 "#7feaff") - (bg-char-1 "#ffaaff") - (bg-char-2 "#dff000") + (fg-removed "#8f1313") -;;; Mappings + (bg-mode-line-active "#ffa4dc") + (fg-mode-line-active "#341f58") -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-completion "#f4cfff") + (bg-hover "#b4cfff") + (bg-hover-secondary "#aaeccf") + (bg-hl-line "#ffd6e5") + (bg-paren-match-match "#9fc0ef") + (bg-region "#eecfff") + (bg-err "#ffd0e6") ; check with err + (bg-warning "#ffe5ba") ; check with warning + (bg-info "#bbefda") ; check with info (err red-warmer) (warning yellow) @@ -179,11 +126,6 @@ (identifier magenta-faint) (prompt magenta-warmer) - (bg-region "#eecfff") - (fg-region unspecified) - -;;;; Code mappings - (builtin magenta) (comment yellow-faint) (constant red-cooler) @@ -197,15 +139,11 @@ (rx-escape cyan-cooler) ; compare with `string' (rx-construct red-cooler) -;;;; Accent mappings - (accent-0 magenta-cooler) (accent-1 yellow) (accent-2 cyan-cooler) (accent-3 red) -;;;; Date mappings - (date-common cyan-cooler) (date-deadline red-warmer) (date-deadline-subtle red-faint) @@ -218,8 +156,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code yellow) (prose-done green-cooler) (prose-macro cyan-cooler) @@ -231,8 +167,6 @@ (prose-todo red-warmer) (prose-verbatim magenta-cooler) -;;;; Mail mappings - (mail-cite-0 yellow-cooler) (mail-cite-1 magenta) (mail-cite-2 blue-warmer) @@ -242,8 +176,6 @@ (mail-subject magenta-cooler) (mail-other magenta) -;;;; Search mappings - (bg-search-match bg-warning) (bg-search-current bg-yellow-intense) (bg-search-lazy bg-blue-intense) @@ -254,62 +186,6 @@ (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-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 magenta-warmer) (rainbow-1 magenta-cooler) (rainbow-2 yellow) @@ -319,13 +195,7 @@ (rainbow-6 red-cooler) (rainbow-7 cyan-cooler) (rainbow-8 yellow-cooler)) - "The `ef-summer' 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 warm pink theme with magenta, purple, gold, cyan colors.") (defcustom ef-summer-palette-overrides nil "Overrides for `ef-summer-palette'. @@ -344,8 +214,16 @@ further details)." :type '(repeat (list symbol (choice symbol string))) :link '(info-link "(ef-themes) Palette overrides")) - (ef-themes-theme ef-summer ef-summer-palette ef-summer-palette-overrides) - - (provide-theme 'ef-summer)) + (defconst ef-themes-summer-palette + (append ef-themes-common-palette-overrides ef-summer-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-summer + ef-themes + "Legible light warm pink theme with magenta, purple, gold, cyan colors." + light + modus-operandi-palette + ef-themes-summer-palette + ef-themes-summer-palette-overrides)) ;;; ef-summer-theme.el ends here diff --git a/ef-symbiosis-theme.el b/ef-symbiosis-theme.el index a92589d..65ff840 100644 --- a/ef-symbiosis-theme.el +++ b/ef-symbiosis-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-symbiosis - "Legible dark theme with blue, magenta, cyan, purple colors." - :background-mode 'dark - :kind 'color-scheme - :family 'ef) - - (defconst ef-symbiosis-palette - '( -;;; Basic values - - (bg-main "#130911") - (fg-main "#d0d0d0") - (bg-dim "#221920") - (fg-dim "#857f8f") - (bg-alt "#372d32") - (fg-alt "#89afef") - - (bg-active "#4b3f47") + (defconst ef-symbiosis-partial + '((cursor "#f0af7f") + (bg-main "#130911") + (bg-dim "#221920") + (bg-alt "#372d32") + (fg-main "#d0d0d0") + (fg-dim "#857f8f") + (fg-alt "#89afef") + (bg-active "#4b3f47") (bg-inactive "#191317") - -;;; Basic hues for foreground values - - (red "#ef6360") - (red-warmer "#ff7355") - (red-cooler "#fe5a7a") - (red-faint "#d56f72") - (green "#0faa26") - (green-warmer "#6aad0f") - (green-cooler "#00a692") - (green-faint "#61a06c") - (yellow "#bf9032") - (yellow-warmer "#d1843f") - (yellow-cooler "#df8a5a") - (yellow-faint "#cf9f8f") - (blue "#3f95f6") - (blue-warmer "#6a9fff") - (blue-cooler "#029fff") - (blue-faint "#7a94df") - (magenta "#d369af") - (magenta-warmer "#e580ea") - (magenta-cooler "#af85ff") - (magenta-faint "#c58faf") - (cyan "#4fbaef") - (cyan-warmer "#6fafff") - (cyan-cooler "#1dbfcf") - (cyan-faint "#8aa0df") - -;;; Basic hues for background values - - (bg-red-intense "#b02930") - (bg-green-intense "#4a7100") - (bg-yellow-intense "#8f5040") - (bg-blue-intense "#4648d0") + (border "#4d4a4b") + + (red "#ef6360") + (red-warmer "#ff7355") + (red-cooler "#fe5a7a") + (red-faint "#d56f72") + (green "#0faa26") + (green-warmer "#6aad0f") + (green-cooler "#00a692") + (green-faint "#61a06c") + (yellow "#bf9032") + (yellow-warmer "#d1843f") + (yellow-cooler "#df8a5a") + (yellow-faint "#cf9f8f") + (blue "#3f95f6") + (blue-warmer "#6a9fff") + (blue-cooler "#029fff") + (blue-faint "#7a94df") + (magenta "#d369af") + (magenta-warmer "#e580ea") + (magenta-cooler "#af85ff") + (magenta-faint "#c58faf") + (cyan "#4fbaef") + (cyan-warmer "#6fafff") + (cyan-cooler "#1dbfcf") + (cyan-faint "#8aa0df") + + (bg-red-intense "#b02930") + (bg-green-intense "#4a7100") + (bg-yellow-intense "#8f5040") + (bg-blue-intense "#4648d0") (bg-magenta-intense "#804fdf") - (bg-cyan-intense "#2270cf") - - (bg-red-subtle "#6f1f2a") - (bg-green-subtle "#1f462f") - (bg-yellow-subtle "#5a372f") - (bg-blue-subtle "#2f366a") - (bg-magenta-subtle "#582650") - (bg-cyan-subtle "#1c4256") - -;;; Diffs - - (bg-added "#233b0f") - (bg-added-faint "#102a00") - (bg-added-refine "#2f512f") - (fg-added "#a0e0a0") - - (bg-changed "#363300") - (bg-changed-faint "#2a1f00") + (bg-cyan-intense "#2270cf") + + (bg-red-subtle "#6f1f2a") + (bg-green-subtle "#1f462f") + (bg-yellow-subtle "#5a372f") + (bg-blue-subtle "#2f366a") + (bg-magenta-subtle "#582650") + (bg-cyan-subtle "#1c4256") + + (bg-added "#233b0f") + (bg-added-faint "#102a00") + (bg-added-refine "#2f512f") + (fg-added "#a0e0a0") + + (bg-changed "#363300") + (bg-changed-faint "#2a1f00") (bg-changed-refine "#4a4a00") - (fg-changed "#efef80") + (fg-changed "#efef80") - (bg-removed "#4e111f") - (bg-removed-faint "#380a0f") + (bg-removed "#4e111f") + (bg-removed-faint "#380a0f") (bg-removed-refine "#751a1f") - (fg-removed "#ffbfbf") - -;;; 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 "#583435") - (fg-mode-line "#ffe5f0") - (bg-completion "#1f334f") - (bg-hover "#304477") - (bg-hover-secondary "#5f3f3a") - (bg-hl-line "#1f2f3f") - (bg-paren "#005f4a") - (bg-err "#461309") ; check with err - (bg-warning "#3a3104") ; check with warning - (bg-info "#163505") ; check with info - - (border "#4d4a4b") - (cursor "#f0af7f") - (fg-intense "#ffffff") - - (modeline-err "#ff906f") - (modeline-warning "#dfcf73") - (modeline-info "#7fc82f") - - (underline-err "#df2f2f") - (underline-warning "#c0b000") - (underline-info "#22b022") - - (bg-char-0 "#0050af") - (bg-char-1 "#7f1f7f") - (bg-char-2 "#625a00") + (fg-removed "#ffbfbf") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#583435") + (fg-mode-line-active "#ffe5f0") + (bg-completion "#1f334f") + (bg-hover "#304477") + (bg-hover-secondary "#5f3f3a") + (bg-hl-line "#1f2f3f") + (bg-paren-match-match "#005f4a") + (bg-region "#3f2f40") + (bg-err "#461309") ; check with err + (bg-warning "#3a3104") ; check with warning + (bg-info "#163505") ; check with info (err red-warmer) (warning yellow) @@ -178,12 +124,7 @@ (keybind yellow-cooler) (identifier yellow-faint) (prompt cyan) - - (bg-region "#3f2f40") - (fg-region unspecified) - -;;;; Code mappings - + (builtin blue) (comment fg-dim) (constant cyan-cooler) @@ -197,15 +138,11 @@ (rx-escape green-cooler) ; compare with `string' (rx-construct red) -;;;; Accent mappings - (accent-0 cyan) (accent-1 yellow-warmer) (accent-2 green-warmer) (accent-3 magenta-cooler) -;;;; Date mappings - (date-common green-cooler) (date-deadline red-warmer) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday yellow-cooler) (date-weekend blue) -;;;; Prose mappings - (prose-code cyan-cooler) (prose-done green) (prose-macro green-warmer) @@ -231,8 +166,6 @@ (prose-todo red) (prose-verbatim blue-warmer) -;;;; Mail mappings - (mail-cite-0 yellow-cooler) (mail-cite-1 blue-faint) (mail-cite-2 green-faint) @@ -242,8 +175,6 @@ (mail-subject magenta-cooler) (mail-other blue-warmer) -;;;; 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-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 yellow-cooler) (rainbow-1 blue-warmer) (rainbow-2 magenta-cooler) @@ -319,13 +196,7 @@ (rainbow-6 red-faint) (rainbow-7 yellow) (rainbow-8 cyan-warmer)) - "The `ef-symbiosis' 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 brown-black theme with blue, green, cyan, gold colors.") (defcustom ef-symbiosis-palette-overrides nil "Overrides for `ef-symbiosis-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-symbiosis ef-symbiosis-palette ef-symbiosis-palette-overrides) - - (provide-theme 'ef-symbiosis)) + (defconst ef-themes-symbiosis-palette + (append ef-themes-common-palette-overrides ef-symbiosis-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-symbiosis + ef-themes + "Legible dark brown-black theme with blue, green, cyan, gold colors." + dark + modus-vivendi-palette + ef-themes-symbiosis-palette + ef-themes-symbiosis-palette-overrides)) ;;; ef-symbiosis-theme.el ends here diff --git a/ef-themes.el b/ef-themes.el index b0e5e47..8e5b534 100644 --- a/ef-themes.el +++ b/ef-themes.el @@ -6,7 +6,7 @@ ;; Maintainer: Protesilaos Stavrou <info@protesilaos.com> ;; URL: https://github.com/protesilaos/ef-themes ;; Version: 1.11.0 -;; Package-Requires: ((emacs "28.1")) +;; Package-Requires: ((emacs "28.1") (modus-themes "4.9.0")) ;; Keywords: faces, theme, accessibility ;; This file is NOT part of GNU Emacs. @@ -44,6 +44,7 @@ (require 'seq) +(require 'modus-themes) (eval-when-compile (require 'subr-x)) (defgroup ef-themes () @@ -97,222 +98,39 @@ ef-winter) "List of symbols with the dark Ef themes.") -(defvaralias 'ef-themes-items 'ef-themes-collection - "Alias of `ef-themes-collection'.") +(defvaralias 'ef-themes-collection 'ef-themes-items + "Alias of `ef-themes-items'.") -(defconst ef-themes-collection +(defconst ef-themes-items (append ef-themes-light-themes ef-themes-dark-themes) "Symbols of all the Ef themes.") -(defvaralias 'ef-themes-after-load-theme-hook 'ef-themes-post-load-hook - "Alias for `ef-themes-post-load-hook'.") - -(defcustom ef-themes-post-load-hook nil - "Hook that runs after loading an Ef theme. -This is used by the commands `ef-themes-toggle', `ef-themes-rotate', -`ef-themes-load-random', `ef-themes-select', as well as the function -`ef-themes-load-theme'." - :type 'hook - :package-version '(ef-themes . "0.2.0") - :group 'ef-themes) - -(defcustom ef-themes-disable-other-themes t - "Disable all other themes when loading a Ef theme. - -When the value is non-nil, the commands `ef-themes-toggle' and -`ef-themes-select' will disable all other themes while loading -the specified Ef theme. This is done to ensure that Emacs does -not blend two or more themes: such blends lead to awkward results -that undermine the work of the designer. - -When the value is nil, the aforementioned commands will only -disable other themes within the Ef collection. - -This option is provided because Emacs themes are not necessarily -limited to colors/faces: they can consist of an arbitrary set of -customizations. Users who use such customization bundles must -set this variable to a nil value." - :group 'ef-themes - :package-version '(ef-themes . "0.11.0") - :type 'boolean) - -(defcustom ef-themes-to-toggle nil - "Specify two `ef-themes' for `ef-themes-toggle' command. -The variable `ef-themes-collection' contains the symbols of all -themes that form part of this collection." - :type `(choice - (const :tag "No toggle (default)" nil) - (list :tag "Pick two themes to toggle between" - (choice :tag "Theme one of two" - ,@(mapcar (lambda (theme) - (list 'const theme)) - ef-themes-collection)) - (choice :tag "Theme two of two" - ,@(mapcar (lambda (theme) - (list 'const theme)) - ef-themes-collection)))) - :package-version '(ef-themes . "0.3.0") - :group 'ef-themes) - -(defcustom ef-themes-to-rotate ef-themes-items - "List of Ef themes to rotate among, per `ef-themes-rotate'." - :type `(repeat (choice - :tag "A theme among the `ef-themes-items'" - ,@(mapcar (lambda (theme) (list 'const theme)) ef-themes-items))) - :package-version '(ef-themes . "1.9.0") - :group 'ef-themes) - -(defconst ef-themes-weights - '( thin ultralight extralight light semilight regular medium - semibold bold heavy extrabold ultrabold) - "List of font weights.") - -(defconst ef-themes--headings-choice - '(set :tag "Properties" :greedy t - (const :tag "Proportionately spaced font (variable-pitch)" variable-pitch) - (choice :tag "Font weight (must be supported by the typeface)" - (const :tag "Bold (default)" nil) - (const :tag "Thin" thin) - (const :tag "Ultra-light" ultralight) - (const :tag "Extra-light" extralight) - (const :tag "Light" light) - (const :tag "Semi-light" semilight) - (const :tag "Regular" regular) - (const :tag "Medium" medium) - (const :tag "Semi-bold" semibold) - (const :tag "Extra-bold" extrabold) - (const :tag "Ultra-bold" ultrabold)) - (radio :tag "Height" - (float :tag "Floating point to adjust height by") - (cons :tag "Cons cell of `(height . FLOAT)'" - (const :tag "The `height' key (constant)" height) - (float :tag "Floating point")))) - "Refer to the doc string of `ef-themes-headings'. -This is a helper variable intended for internal use.") - -(defcustom ef-themes-headings nil - "Heading styles with optional list of values per heading level. - -This is an alist that accepts a (KEY . LIST-OF-VALUES) -combination. The KEY is either a number, representing the -heading's level (0-8) or t, which pertains to the fallback style. -The named keys `agenda-date' and `agenda-structure' apply to the -Org agenda. - -Level 0 is used for what counts as a document title or -equivalent, such as the #+title construct we find in Org files. -Levels 1-8 are regular headings. - -The LIST-OF-VALUES covers symbols that refer to properties, as -described below. Here is a complete sample with various -stylistic combinations, followed by a presentation of all -available properties: - - (setq ef-themes-headings - (quote ((1 light variable-pitch 1.5) - (2 regular 1.3) - (3 1.1) - (agenda-date 1.3) - (agenda-structure variable-pitch light 1.8) - (t variable-pitch)))) - -By default (a nil value for this variable), all headings have a -bold typographic weight, a font family that is the same as the -`default' face (typically monospaced), and a height that is equal -to the `default' face's height. - -- A `variable-pitch' property changes the font family of the - heading to that of the `variable-pitch' face (normally a - proportionately spaced typeface). Also check the `fontaine' - package (by Protesilaos) for tweaking fonts via faces. - -- The symbol of a weight attribute adjusts the font of the - heading accordingly, such as `light', `semibold', etc. Valid - symbols are defined in the variable `ef-themes-weights'. The - absence of a weight means that bold will be used by virtue of - inheriting the `bold' face. - -- A number, expressed as a floating point (e.g. 1.5), adjusts the - height of the heading to that many times the base font size. - The default height is the same as 1.0, though it need not be - explicitly stated. Instead of a floating point, an acceptable - value can be in the form of a cons cell like (height . FLOAT) - or (height FLOAT), where FLOAT is the given number. - -Combinations of any of those properties are expressed as a list, -like in these examples: - - (semibold) - (variable-pitch semibold) - (variable-pitch semibold 1.3) - (variable-pitch semibold (height 1.3)) ; same as above - (variable-pitch semibold (height . 1.3)) ; same as above - -The order in which the properties are set is not significant. - -In user configuration files the form may look like this: - - (setq ef-themes-headings - (quote ((1 light variable-pitch 1.5) - (2 regular 1.3) - (3 1.1) - (t variable-pitch)))) - -When defining the styles per heading level, it is possible to -pass a non-nil non-list value (e.g. t) instead of a list of -properties. This will retain the original aesthetic for that -level. For example: - - (setq ef-themes-headings - (quote ((1 . t) ; keep the default style - (2 variable-pitch 1.2) - (t variable-pitch)))) ; style for all other headings - - (setq ef-themes-headings - (quote ((1 variable-pitch 1.6) - (2 1.3) - (t . t)))) ; default style for all other levels" - :group 'ef-themes - :package-version '(ef-themes . "0.10.0") - :type `(alist - :options ,(mapcar (lambda (el) - (list el ef-themes--headings-choice)) - '(0 1 2 3 4 5 6 7 8 t agenda-date agenda-structure)) - :key-type symbol - :value-type ,ef-themes--headings-choice) - :link '(info-link "(ef-themes) Option for headings")) - -(defcustom ef-themes-mixed-fonts nil - "Non-nil to enable inheritance from `fixed-pitch' in some faces. - -This is done to allow spacing-sensitive constructs, such as Org -tables and code blocks, to remain monospaced when users opt for a -proportionately spaced font as their default or when they use -something like the command `variable-pitch-mode'. - -Users may need to explicitly configure the font family of -`fixed-pitch' in order to get a consistent experience with their -typography (also check the `fontaine' package on GNU ELPA (by -Protesilaos))." - :group 'ef-themes - :package-version '(ef-themes . "0.4.0") - :type 'boolean - :link '(info-link "(ef-themes) Enable mixed fonts")) - -(defcustom ef-themes-variable-pitch-ui nil - "Use proportional fonts (`variable-pitch') in UI elements. -This includes the mode line, header line, tab bar, and tab line. - -Users may need to explicitly configure the font family of -`variable-pitch' in order to get a consistent experience with -their typography (also check the `fontaine' package on GNU -ELPA (by Protesilaos))." - :group 'ef-themes - :package-version '(ef-themes . "0.4.0") - :type 'boolean - :link '(info-link "(ef-themes) UI typeface")) - -(make-obsolete-variable 'ef-themes-region nil "1.4.0 (use palette overrides to change region colours)") +(defconst ef-themes-palette-common + '((bg-line-number-active unspecified) + (bg-line-number-inactive unspecified) + (bg-mode-line-inactive bg-alt) + (bg-space unspecified) + (bg-tab-bar bg-alt) + (bg-tab-current bg-main) + (bg-tab-other bg-active) + (border-mode-line-active border) + (border-mode-line-inactive border) + (fg-line-number-active accent-0) + (fg-mode-line-inactive fg-dim) + (fg-region unspecified) + (fg-space border) + (fringe unspecified) + + (fg-heading-0 rainbow-0) + (fg-heading-1 rainbow-1) + (fg-heading-2 rainbow-2) + (fg-heading-3 rainbow-3) + (fg-heading-4 rainbow-4) + (fg-heading-5 rainbow-5) + (fg-heading-6 rainbow-6) + (fg-heading-7 rainbow-7) + (fg-heading-8 rainbow-8)) + "Common palette mappings for the Ef themes.") (defcustom ef-themes-common-palette-overrides nil "Set palette overrides for all the Ef themes. @@ -333,2340 +151,11 @@ further details)." :type '(repeat (list symbol (choice symbol string))) :link '(info-link "(ef-themes) Palette overrides")) -;;; Helpers for user options - -(defun ef-themes--warn (option) - "Warn that OPTION has changed." - (prog1 nil - (display-warning - 'ef-themes - (format "`%s' has changed; please read the updated documentation" option) - :warning))) - -(defun ef-themes--list-or-warn (option) - "Return list or nil value of OPTION, else `ef-themes--warn'." - (let* ((value (symbol-value option))) - (if (or (null value) (listp value)) - value - (ef-themes--warn option)))) - -(defun ef-themes--fixed-pitch () - "Conditional application of `fixed-pitch' inheritance." - (when ef-themes-mixed-fonts - (list :inherit 'fixed-pitch))) - -(defun ef-themes--variable-pitch-ui () - "Conditional application of `variable-pitch' in the UI." - (when ef-themes-variable-pitch-ui - (list :inherit 'variable-pitch))) - -(defun ef-themes--property-lookup (properties alist-key list-pred default) - "Return value from property alist or list. -Check PROPERTIES for an alist value that corresponds to -ALIST-KEY. If no alist is present, search the PROPERTIES -list given LIST-PRED, using DEFAULT as a fallback." - (if-let* ((val (or (alist-get alist-key properties) - (seq-filter (lambda (x) (funcall list-pred x)) properties) - default)) - ((listp val))) - (car val) - val)) - -(defun ef-themes--weight (list) - "Search for `ef-themes--heading' weight in LIST." - (catch 'found - (dolist (elt list) - (when (memq elt ef-themes-weights) - (throw 'found elt))))) - -(defun ef-themes--heading (level) - "Conditional styles for `ef-themes-headings' per LEVEL heading." - (let* ((key (alist-get level ef-themes-headings)) - (style (or key (alist-get t ef-themes-headings))) - (style-listp (listp style)) - (properties style) - (var (when (and style-listp (memq 'variable-pitch properties)) 'variable-pitch)) - (weight (when style-listp (ef-themes--weight style)))) - (list :inherit - (cond - ((not style-listp) 'bold) - (weight var) - (var (append (list 'bold) (list var))) - (t 'bold)) - :height - (if style-listp - (ef-themes--property-lookup properties 'height #'floatp 'unspecified) - 'unspecified) - :weight - (or weight 'unspecified)))) - -;;; Commands and their helper functions - -(defun ef-themes--retrieve-palette-value (color palette) - "Return COLOR from PALETTE. -Use recursion until COLOR is retrieved as a string. Refrain from -doing so if the value of COLOR is not a key in the PALETTE. - -Return `unspecified' if the value of COLOR cannot be determined. -This symbol is accepted by faces and is thus harmless. - -This function is used in the macros `ef-themes-theme', -`ef-themes-with-colors'." - (let ((value (car (alist-get color palette)))) - (cond - ((or (stringp value) - (eq value 'unspecified)) - value) - ((and (symbolp value) value) - (ef-themes--retrieve-palette-value value palette)) - (t - 'unspecified)))) - -(defun ef-themes-get-color-value (color &optional overrides theme) - "Return color value of named COLOR for current Ef theme. - -COLOR is a symbol that represents a named color entry in the -palette. - -If the value is the name of another color entry in the -palette (so a mapping), recur until you find the underlying color -value. - -With optional OVERRIDES as a non-nil value, account for palette -overrides. Else use the default palette. - -With optional THEME as a symbol among `ef-themes-collection', use -the palette of that item. Else use the current Ef theme. - -If COLOR is not present in the palette, return the `unspecified' -symbol, which is safe when used as a face attribute's value." - (if-let* ((palette (if theme - (ef-themes--palette-value theme overrides) - (ef-themes--current-theme-palette overrides))) - (value (ef-themes--retrieve-palette-value color palette))) - value - 'unspecified)) - -(defun ef-themes--ef-p (theme) - "Return non-nil if THEME name has an ef- prefix." - (string-prefix-p "ef-" (symbol-name theme))) - -(defun ef-themes--list-enabled-themes () - "Return list of `custom-enabled-themes' with ef- prefix." - (seq-filter #'ef-themes--ef-p custom-enabled-themes)) - -(defun ef-themes--enable-themes (&optional subset) - "Enable all Ef themes. -With optional SUBSET as a symbol of `light' or `dark', enable only those -themes." - (let ((themes (cond - ((eq subset 'dark) ef-themes-dark-themes) - ((eq subset 'light) ef-themes-light-themes) - (t ef-themes-collection)))) - (mapc - (lambda (theme) - (unless (memq theme custom-known-themes) - (load-theme theme :no-confirm :no-enable))) - themes))) - -(defun ef-themes--list-known-themes () - "Return list of `custom-known-themes' with ef- prefix." - (ef-themes--enable-themes) - (seq-filter #'ef-themes--ef-p custom-known-themes)) - -(defun ef-themes--current-theme () - "Return first enabled Ef theme." - (car (or (ef-themes--list-enabled-themes) - (ef-themes--list-known-themes)))) - -(defun ef-themes--palette-symbol (theme &optional overrides) - "Return THEME palette as a symbol. -With optional OVERRIDES, return THEME palette overrides as a -symbol." - (when-let* ((suffix (cond - ((and theme overrides) - "palette-overrides") - (theme - "palette")))) - (intern (format "%s-%s" theme suffix)))) - -(defun ef-themes--palette-value (theme &optional overrides) - "Return palette value of THEME with optional OVERRIDES." - (let ((base-value (symbol-value (ef-themes--palette-symbol theme)))) - (if overrides - (append (symbol-value (ef-themes--palette-symbol theme :overrides)) - ef-themes-common-palette-overrides - base-value) - base-value))) - -(defun ef-themes--current-theme-palette (&optional overrides) - "Return palette value of active Ef theme, else produce `user-error'. -With optional OVERRIDES return palette value plus whatever -overrides." - (if-let* ((theme (ef-themes--current-theme))) - (if overrides - (ef-themes--palette-value theme :overrides) - (ef-themes--palette-value theme)) - (user-error "No enabled Ef theme could be found"))) - -(defun ef-themes--choose-subset () - "Use `read-multiple-choice' to return `dark' or `light' variant." - (intern - (cadr - (read-multiple-choice - "Variant" - '((?d "dark" "Load a random dark theme") - (?l "light" "Load a random light theme")) - "Limit to the dark or light subset of the Ef themes collection.")))) - -(defun ef-themes--annotate-theme (theme) - "Return completion annotation for THEME." - (when-let* ((symbol (intern-soft theme)) - (doc-string (get symbol 'theme-documentation))) - (format " -- %s" - (propertize - (car (split-string doc-string "\\.")) - 'face 'completions-annotations)))) - -(defun ef-themes--completion-table (category candidates) - "Pass appropriate metadata CATEGORY to completion CANDIDATES." - (lambda (string pred action) - (if (eq action 'metadata) - `(metadata (category . ,category)) - (complete-with-action action candidates string pred)))) - -(defvar ef-themes--select-theme-history nil - "Minibuffer history of `ef-themes--select-prompt'.") - -(defun ef-themes--load-subset (subset) - "Return the `light' or `dark' SUBSET of the Ef themes. -If SUBSET is neither `light' nor `dark', return all the known Ef themes." - (ef-themes--completion-table 'theme (ef-themes--enable-themes subset))) - -(defun ef-themes--maybe-prompt-subset (variant) - "Helper function for `ef-themes--select-prompt' VARIANT argument." - (cond - ((null variant)) - ((or (eq variant 'light) (eq variant 'dark)) variant) - (t (ef-themes--choose-subset)))) - -(defun ef-themes--select-prompt (&optional prompt variant) - "Minibuffer prompt for `ef-themes-select'. -With optional PROMPT string, use it. Else use a generic prompt. - -With optional VARIANT as a non-nil value, prompt for a subset of -themes divided into light and dark variants. Then limit the -completion candidates accordingly. - -If VARIANT is either `light' or `dark' then use it directly -instead of prompting the user for a choice. - -When VARIANT is nil, all Ef themes are candidates for completion." - (let* ((subset (ef-themes--maybe-prompt-subset variant)) - (themes (ef-themes--load-subset subset)) - (completion-extra-properties `(:annotation-function ,#'ef-themes--annotate-theme))) - (intern - (completing-read - (or prompt "Select Ef Theme: ") - themes - nil t nil - 'ef-themes--select-theme-history)))) - -(defun ef-themes--disable-themes () - "Disable themes per `ef-themes-disable-other-themes'." - (mapc #'disable-theme - (if ef-themes-disable-other-themes - custom-enabled-themes - (ef-themes--list-known-themes)))) - -(define-obsolete-function-alias - 'ef-themes--load-theme - 'ef-themes-load-theme - "1.9.0") - -(defun ef-themes-load-theme (theme) - "Load THEME while disabling other Ef themes. -Which themes are disabled is determined by the user option -`ef-themes-disable-other-themes'. - -Run the `ef-themes-post-load-hook' as the final step after -loading the THEME. - -Return THEME." - (ef-themes--disable-themes) - (load-theme theme :no-confirm) - (run-hooks 'ef-themes-post-load-hook) - theme) - -;;;; Select a theme using minibuffer completion - -;;;###autoload -(defun ef-themes-select (theme &optional _variant) - "Load an Ef THEME using minibuffer completion. - -With optional VARIANT as a prefix argument, prompt to limit the -set of themes to either dark or light variants. - -Run `ef-themes-post-load-hook' after loading the theme. - -When called from Lisp, THEME is the symbol of a theme. VARIANT -is ignored in this scenario." - (interactive (list (ef-themes--select-prompt nil current-prefix-arg))) - (ef-themes-load-theme theme)) - -;;;###autoload -(defun ef-themes-select-light (theme) - "Load a light Ef THEME. -Run `ef-themes-post-load-hook' after loading the theme. - -Also see `ef-themes-select-dark'. - -This command is the same as `ef-themes-select' except it only -prompts for light themes when called interactively. Calling it -from Lisp behaves the same as `ef-themes-select' for the THEME -argument, meaning that it loads the Ef THEME regardless of -whether it is light or dark." - (interactive - (list - (ef-themes--select-prompt "Select light Ef theme: " 'light))) - (ef-themes-load-theme theme)) - -;;;###autoload -(defun ef-themes-select-dark (theme) - "Load a dark Ef THEME. -Run `ef-themes-post-load-hook' after loading the theme. - -Also see `ef-themes-select-light'. - -This command is the same as `ef-themes-select' except it only -prompts for dark themes when called interactively. Calling it -from Lisp behaves the same as `ef-themes-select' for the THEME -argument, meaning that it loads the Ef THEME regardless of -whether it is light or dark." - (interactive - (list - (ef-themes--select-prompt "Select dark Ef theme: " 'dark))) - (ef-themes-load-theme theme)) - -(defun ef-themes--toggle-theme-p () - "Return non-nil if `ef-themes-to-toggle' are valid." - (condition-case nil - (dolist (theme ef-themes-to-toggle) - (or (memq theme ef-themes-collection) - (memq theme (ef-themes--list-known-themes)) - (error "`%s' is not part of `ef-themes-collection'" theme))) - (error nil) - (:success ef-themes-to-toggle))) - -;;;; Toggle between two themes - -;;;###autoload -(defun ef-themes-toggle () - "Toggle between the two `ef-themes-to-toggle'. -If `ef-themes-to-toggle' does not specify two Ef themes, inform -the user about it while prompting with completion for a theme -among our collection (this is practically the same as the -`ef-themes-select' command). - -Run `ef-themes-post-load-hook' after loading the theme." - (interactive) - (if-let* ((themes (ef-themes--toggle-theme-p)) - (one (car themes)) - (two (cadr themes))) - (if (eq (car custom-enabled-themes) one) - (ef-themes-load-theme two) - (ef-themes-load-theme one)) - (ef-themes-load-theme - (ef-themes--select-prompt - (concat "Set two `ef-themes-to-toggle'; " - "switching to theme selection for now: "))))) - -;;;; Load a theme at random - -(defun ef-themes--minus-current (&optional variant) - "Return list of Ef themes minus the current one. -VARIANT is either `light' or `dark', which stand for -`ef-themes-light-themes' and `ef-themes-dark-themes', -respectively. Else check against the return value of -`ef-themes--list-known-themes'." - (let* ((list (when variant - (if (eq variant 'dark) - ef-themes-dark-themes - ef-themes-light-themes))) - (sequence (or list (ef-themes--list-known-themes))) - (themes (copy-sequence sequence))) - (delete (ef-themes--current-theme) themes))) - -;;;###autoload -(defun ef-themes-load-random (&optional variant silent) - "Load an Ef theme at random, excluding the current one. - -With optional VARIANT as a prefix argument, prompt to limit the -set of themes to either dark or light variants. - -Run `ef-themes-post-load-hook' after loading the theme. - -Print the name of the new theme, unless optional argument SILENT is -non-nil. - -When called from Lisp, VARIANT is either the `dark' or `light' -symbol." - (interactive (list (when current-prefix-arg (ef-themes--choose-subset)))) - (let* ((themes (ef-themes--minus-current variant)) - (n (random (length themes))) - (pick (nth n themes)) - (loaded (if (null pick) (car themes) pick))) - (ef-themes-load-theme loaded) - (unless silent - (message "Loaded `%s'" loaded)))) - -;;;; Rotate through a list of themes - -(defun ef-themes--rotate (themes) - "Rotate THEMES rightward such that the car is moved to the end." - (if (proper-list-p themes) - (let* ((index (seq-position themes (ef-themes--current-theme))) - (offset (1+ index))) - (append (nthcdr offset themes) (take offset themes))) - (error "The `%s' is not a list" themes))) - -(defun ef-themes--rotate-p (themes) - "Return a new theme among THEMES if it is possible to rotate to it." - (if-let* ((new-theme (car (ef-themes--rotate themes)))) - (if (eq new-theme (ef-themes--current-theme)) - (car (ef-themes--rotate-p (ef-themes--rotate themes))) - new-theme) - (error "Cannot determine a theme among `%s'" themes))) - -;;;###autoload -(defun ef-themes-rotate (themes &optional silent) - "Rotate to the next theme among THEMES. -When called interactively THEMES is the value of `ef-themes-to-rotate'. - -If the current theme is already the next in line, then move to the one -after. Perform the rotation rightwards, such that the first element in -the list becomes the last. Do not modify THEMES in the process. - -Print the name of the new theme, unless optional argument SILENT is -non-nil." - (interactive (list ef-themes-to-rotate)) - (unless (proper-list-p themes) - "This is not a list of themes: `%s'" themes) - (let ((candidate (ef-themes--rotate-p themes))) - (if (ef-themes--ef-p candidate) - (progn - (unless silent - (message "Rotating to `%s'" (propertize (symbol-name candidate) 'face 'success))) - (ef-themes-load-theme candidate)) - (user-error "`%s' is not part of the Ef collection" candidate)))) - -;;;; Preview a theme palette - -(defun ef-themes--list-colors-get-mappings (palette) - "Get the semantic palette entries in PALETTE. -PALETTE is the value of a variable like `ef-summer-palette'." - (seq-remove - (lambda (cell) - (stringp (cadr cell))) - palette)) - -(defun ef-themes--list-colors-tabulated (theme &optional mappings) - "Return a data structure of THEME palette or MAPPINGS for tabulated list." - (let* ((current-palette (ef-themes--palette-value theme mappings)) - (palette (if mappings - (ef-themes--list-colors-get-mappings current-palette) - current-palette))) - (mapcar (lambda (cell) - (pcase-let* ((`(,name ,value) cell) - (name-string (format "%s" name)) - (value-string (format "%s" value)) - (value-string-padded (string-pad value-string 30)) - (color (ef-themes-get-color-value name mappings theme))) ; resolve a semantic mapping - (list name - (vector - (if (and (symbolp value) - (not (eq value 'unspecified))) - "Yes" - "") - name-string - (propertize value-string 'face `( :foreground ,color)) - (propertize value-string-padded 'face (list :background color - :foreground (if (string= color "unspecified") - (readable-foreground-color (ef-themes-get-color-value 'bg-main nil theme)) - (readable-foreground-color color)))))))) - palette))) - -(defvar ef-themes-current-preview nil) -(defvar ef-themes-current-preview-show-mappings nil) - -(defun ef-themes--set-tabulated-entries () - "Set the value of `tabulated-list-entries' with palette entries." - (setq-local tabulated-list-entries - (ef-themes--list-colors-tabulated ef-themes-current-preview ef-themes-current-preview-show-mappings))) - -(defun ef-themes-list-colors (theme &optional mappings) - "Preview the palette of the Ef THEME of choice. -With optional prefix argument for MAPPINGS preview only the semantic -color mappings instead of the complete palette." - (interactive - (let ((prompt (if current-prefix-arg - "Preview palette mappings of THEME: " - "Preview palette of THEME: "))) - (list - (ef-themes--select-prompt prompt) - current-prefix-arg))) - (let ((buffer (get-buffer-create (format (if mappings "*%s-list-mappings*" "*%s-list-all*") theme)))) - (with-current-buffer buffer - (let ((ef-themes-current-preview theme) - (ef-themes-current-preview-show-mappings mappings)) - (ef-themes-preview-mode))) - (pop-to-buffer buffer))) - -(defalias 'ef-themes-preview-colors 'ef-themes-list-colors - "Alias for `ef-themes-list-colors'.") - -(defun ef-themes-list-colors-current (&optional mappings) - "Like `ef-themes-list-colors' with optional MAPPINGS for the current theme." - (interactive "P") - (ef-themes-list-colors (ef-themes--current-theme) mappings)) - -(defalias 'ef-themes-preview-colors-current 'ef-themes-list-colors-current - "Alias for `ef-themes-list-colors-current'.") - -(define-derived-mode ef-themes-preview-mode tabulated-list-mode "Ef palette" - "Major mode to display a Ef themes palette." - :interactive nil - (setq-local tabulated-list-format - [("Mapping?" 10 t) - ("Symbol name" 30 t) - ("As foreground" 30 t) - ("As background" 0 t)]) - (ef-themes--set-tabulated-entries) - (tabulated-list-init-header) - (tabulated-list-print)) - -;;; Faces and variables - -(defgroup ef-themes-faces () - "Faces defined by the Ef themes." - :group 'ef-themes - :link '(info-link "(ef-themes) Top") - :link '(url-link :tag "Homepage" "https://protesilaos.com/emacs/ef-themes") - :link '(url-link :tag "Sample pictures" "https://protesilaos.com/emacs/ef-themes-pictures") - :prefix "ef-themes-" - :tag "Ef Themes Faces") - -;; This produces `ef-themes-height-0' and the like. -(dotimes (n 9) - (custom-declare-face - (intern (format "ef-themes-heading-%d" n)) - nil (format "Used for level %d heading." n) - :package-version '(ef-themes . "0.3.0") - :group 'ef-themes-faces)) - -(defface ef-themes-key-binding nil - "Face for key bindings." - :package-version '(ef-themes . "0.3.0") - :group 'ef-themes-faces) - -(defface ef-themes-fixed-pitch nil - "Face for `fixed-pitch' if `ef-themes-mixed-fonts' is non-nil." - :package-version '(ef-themes . "0.4.0") - :group 'ef-themes-faces) - -(defface ef-themes-ui-variable-pitch nil - "Face for `variable-pitch' if `ef-themes-variable-pitch-ui' is non-nil." - :package-version '(ef-themes . "0.4.0") - :group 'ef-themes-faces) - -(defface ef-themes-reset-soft nil - "Generic face to set most face properties to nil. - -This is intended to be inherited by faces that should not retain -properties from their context (e.g. an overlay over an underlined -text should not be underlined as well) yet still blend in." - :package-version '(ef-themes . "1.2.0") - :group 'ef-themes-faces) - -;; This produces `ef-themes-mark-delete' and the like. -(dolist (scope '(delete select other)) - (custom-declare-face - (intern (format "ef-themes-mark-%s" scope)) - nil (format "Face for %s marks (e.g. `dired', `trashed')." scope) - :package-version '(ef-themes . "0.9.0") - :group 'ef-themes-faces)) - -;; This produces `ef-themes-underline-error' and the like -(dolist (scope '(info error warning)) - (custom-declare-face - (intern (format "ef-themes-underline-%s" scope)) - nil (format "Face for %s underline (e.g. `flymake', `flyspell')." scope) - :package-version '(ef-themes . "0.9.0") - :group 'ef-themes-faces)) - -;; This produces `ef-themes-search-current' and the like -(dolist (scope '(current lazy replace match)) - (custom-declare-face - (intern (format "ef-themes-search-%s" scope)) - nil (format "Search of type %s." scope) - :package-version '(ef-themes . "1.8.0") - :group 'ef-themes-faces)) - -;; This produces `ef-themes-search-rx-group-0' and the like -(dotimes (n 4) - (custom-declare-face - (intern (format "ef-themes-search-rx-group-%s" n)) - nil (format "Search regexp group number %s." n) - :package-version '(ef-themes . "1.5.0") - :group 'ef-themes-faces)) - -(defface ef-themes-button nil - "Face to style all graphical buttons uniformly." - :package-version '(ef-themes . "1.9.0") - :group 'ef-themes-faces) - -(defconst ef-themes-faces - '( -;;;; internal faces - `(ef-themes-button ((,c :inherit variable-pitch - :box (:line-width 1 :color ,border :style released-button) - :background ,bg-active - :foreground ,fg-intense))) - `(ef-themes-fixed-pitch ((,c ,@(ef-themes--fixed-pitch)))) - `(ef-themes-heading-0 ((,c ,@(ef-themes--heading 0) :foreground ,rainbow-0))) - `(ef-themes-heading-1 ((,c ,@(ef-themes--heading 1) :foreground ,rainbow-1))) - `(ef-themes-heading-2 ((,c ,@(ef-themes--heading 2) :foreground ,rainbow-2))) - `(ef-themes-heading-3 ((,c ,@(ef-themes--heading 3) :foreground ,rainbow-3))) - `(ef-themes-heading-4 ((,c ,@(ef-themes--heading 4) :foreground ,rainbow-4))) - `(ef-themes-heading-5 ((,c ,@(ef-themes--heading 5) :foreground ,rainbow-5))) - `(ef-themes-heading-6 ((,c ,@(ef-themes--heading 6) :foreground ,rainbow-6))) - `(ef-themes-heading-7 ((,c ,@(ef-themes--heading 7) :foreground ,rainbow-7))) - `(ef-themes-heading-8 ((,c ,@(ef-themes--heading 8) :foreground ,rainbow-8))) - `(ef-themes-key-binding ((,c :inherit (bold ef-themes-fixed-pitch) :foreground ,keybind))) - `(ef-themes-ui-variable-pitch ((,c ,@(ef-themes--variable-pitch-ui)))) - `(ef-themes-mark-delete ((,c :inherit error :background ,bg-err))) - `(ef-themes-mark-select ((,c :inherit success :background ,bg-info))) - `(ef-themes-mark-other ((,c :inherit warning :background ,bg-warning))) - `(ef-themes-search-current ((,c :background ,bg-search-current :foreground ,fg-intense))) - `(ef-themes-search-lazy ((,c :background ,bg-search-lazy :foreground ,fg-intense))) - `(ef-themes-search-replace ((,c :background ,bg-search-replace :foreground ,fg-intense))) - `(ef-themes-search-rx-group-0 ((,c :background ,bg-search-rx-group-0 :foreground ,fg-intense))) - `(ef-themes-search-rx-group-1 ((,c :background ,bg-search-rx-group-1 :foreground ,fg-intense))) - `(ef-themes-search-rx-group-2 ((,c :background ,bg-search-rx-group-2 :foreground ,fg-intense))) - `(ef-themes-search-rx-group-3 ((,c :background ,bg-search-rx-group-3 :foreground ,fg-intense))) - `(ef-themes-search-match ((,c :background ,bg-search-match))) - `(ef-themes-underline-error ((,c :underline (:style wave :color ,underline-err)))) - `(ef-themes-underline-info ((,c :underline (:style wave :color ,underline-info)))) - `(ef-themes-underline-warning ((,c :underline (:style wave :color ,underline-warning)))) - `(ef-themes-reset-soft ((,c :background ,bg-main :foreground ,fg-main - :weight normal :slant normal :strike-through nil - :box nil :underline nil :overline nil :extend nil))) -;;;; all basic faces -;;;;; absolute essentials - `(bold ((,c :weight bold))) - `(bold-italic ((,c :inherit (bold italic)))) - `(cursor ((,c :background ,cursor))) - `(default ((,c :background ,bg-main :foreground ,fg-main))) - `(italic ((,c :slant italic))) - `(menu ((,c :background ,bg-dim :foreground ,fg-main))) - `(region ((,c :background ,bg-region :foreground ,fg-region))) - `(scroll-bar ((,c :background ,bg-dim :foreground ,fg-dim))) - `(tool-bar ((,c :background ,bg-dim :foreground ,fg-main))) - `(vertical-border ((,c :foreground ,border))) -;;;;; all other basic faces - `(appt-notification ((,c :inherit bold :foreground ,modeline-err))) - `(blink-matching-paren-offscreen ((,c :background ,bg-paren))) - `(button ((,c :foreground ,link :underline ,border))) - `(child-frame-border ((,c :background ,border))) - `(comint-highlight-input ((,c :inherit bold))) - `(comint-highlight-prompt ((,c :inherit minibuffer-prompt))) - `(edmacro-label ((,c :inherit bold :foreground ,accent-0))) - `(elisp-shorthand-font-lock-face ((,c :inherit (italic font-lock-preprocessor-face)))) - `(error ((,c :inherit bold :foreground ,err))) - `(escape-glyph ((,c :foreground ,warning))) - `(fringe ((,c :background ,bg-fringe :foreground ,fg-fringe))) - `(header-line ((,c :inherit ef-themes-ui-variable-pitch :background ,bg-dim))) - `(header-line-inactive ((,c :inherit (ef-themes-ui-variable-pitch shadow)))) - `(header-line-highlight ((,c :inherit highlight))) - `(help-argument-name ((,c :foreground ,accent-0))) - `(help-key-binding ((,c :inherit (bold ef-themes-fixed-pitch) :foreground ,keybind))) - `(highlight ((,c :background ,bg-hover :foreground ,fg-intense))) - `(hl-line ((,c :background ,bg-hl-line))) - `(icon-button ((,c :inherit ef-themes-button))) - `(link ((,c :foreground ,link :underline ,border))) - `(link-visited ((,c :foreground ,link-alt :underline ,border))) - `(minibuffer-prompt ((,c :foreground ,prompt))) - `(minibuffer-nonselected ((,c :inverse-video t))) - `(mm-command-output ((,c :foreground ,mail-part))) - `(mm-uu-extract ((,c :foreground ,mail-part))) - `(pgtk-im-0 ((,c :inherit secondary-selection))) - `(read-multiple-choice-face ((,c :inherit warning :background ,bg-warning))) - `(rectangle-preview ((,c :inherit secondary-selection))) - `(secondary-selection ((,c :background ,bg-hover-secondary :foreground ,fg-intense))) - `(shadow ((,c :foreground ,fg-dim))) - `(success ((,c :inherit bold :foreground ,info))) - `(tooltip ((,c :background ,bg-alt :foreground ,fg-intense))) - `(trailing-whitespace ((,c :background ,bg-red-intense :foreground ,fg-intense))) - `(warning ((,c :inherit bold :foreground ,warning))) -;;;; adoc-mode - `(adoc-code-face ((,c :inherit font-lock-constant-face))) - `(adoc-command-face ((,c :foreground ,prose-macro))) - `(adoc-complex-replacement-face ((,c :background ,bg-magenta-subtle :foreground ,magenta))) - `(adoc-emphasis-face ((,c (:inherit bold)))) - `(adoc-gen-face ((,c :foreground ,blue))) - `(adoc-meta-face ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-metadata))) - `(adoc-meta-hide-face ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-metadata))) - `(adoc-replacement-face ((,c :inherit font-lock-escape-face))) - `(adoc-secondary-text-face ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-metadata-value))) - `(adoc-table-face ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-table))) - `(adoc-title-0-face ((,c :inherit ef-themes-heading-0))) - `(adoc-title-1-face ((,c :inherit ef-themes-heading-1))) - `(adoc-title-2-face ((,c :inherit ef-themes-heading-2))) - `(adoc-title-3-face ((,c :inherit ef-themes-heading-3))) - `(adoc-title-4-face ((,c :inherit ef-themes-heading-4))) - `(adoc-title-5-face ((,c :inherit ef-themes-heading-5))) - `(adoc-typewriter-face ((,c :foreground ,prose-verbatim))) - `(adoc-verbatim-face ((,c :foreground ,prose-verbatim))) -;;;; all-the-icons - `(all-the-icons-blue ((,c :foreground ,blue-cooler))) - `(all-the-icons-blue-alt ((,c :foreground ,blue-warmer))) - `(all-the-icons-cyan ((,c :foreground ,cyan))) - `(all-the-icons-cyan-alt ((,c :foreground ,cyan-warmer))) - `(all-the-icons-dblue ((,c :foreground ,blue-faint))) - `(all-the-icons-dcyan ((,c :foreground ,cyan-faint))) - `(all-the-icons-dgreen ((,c :foreground ,green-faint))) - `(all-the-icons-dmaroon ((,c :foreground ,magenta-faint))) - `(all-the-icons-dorange ((,c :foreground ,red-faint))) - `(all-the-icons-dpink ((,c :foreground ,magenta-faint))) - `(all-the-icons-dpurple ((,c :foreground ,magenta-cooler))) - `(all-the-icons-dred ((,c :foreground ,red))) - `(all-the-icons-dsilver ((,c :foreground ,cyan-faint))) - `(all-the-icons-dyellow ((,c :foreground ,yellow-faint))) - `(all-the-icons-green ((,c :foreground ,green))) - `(all-the-icons-lblue ((,c :foreground ,blue-cooler))) - `(all-the-icons-lcyan ((,c :foreground ,cyan))) - `(all-the-icons-lgreen ((,c :foreground ,green-warmer))) - `(all-the-icons-lmaroon ((,c :foreground ,magenta-warmer))) - `(all-the-icons-lorange ((,c :foreground ,red-warmer))) - `(all-the-icons-lpink ((,c :foreground ,magenta))) - `(all-the-icons-lpurple ((,c :foreground ,magenta-faint))) - `(all-the-icons-lred ((,c :foreground ,red-faint))) - `(all-the-icons-lsilver ((,c :foreground "gray50"))) - `(all-the-icons-lyellow ((,c :foreground ,yellow-warmer))) - `(all-the-icons-maroon ((,c :foreground ,magenta))) - `(all-the-icons-orange ((,c :foreground ,yellow-warmer))) - `(all-the-icons-pink ((,c :foreground ,magenta-warmer))) - `(all-the-icons-purple ((,c :foreground ,magenta-cooler))) - `(all-the-icons-purple-alt ((,c :foreground ,blue-warmer))) - `(all-the-icons-red ((,c :foreground ,red))) - `(all-the-icons-red-alt ((,c :foreground ,red-cooler))) - `(all-the-icons-silver ((,c :foreground "gray50"))) - `(all-the-icons-yellow ((,c :foreground ,yellow))) -;;;; all-the-icons-dired - `(all-the-icons-dired-dir-face ((,c :foreground ,accent-0))) -;;;; all-the-icons-ibuffer - `(all-the-icons-ibuffer-dir-face ((,c :foreground ,accent-0))) - `(all-the-icons-ibuffer-file-face ((,c :foreground ,docstring))) - `(all-the-icons-ibuffer-mode-face ((,c :foreground ,type))) - `(all-the-icons-ibuffer-size-face ((,c :foreground ,variable))) -;;;; ansi-color - ;; Those are in Emacs28. - `(ansi-color-black ((,c :background ,bg-term-black :foreground ,fg-term-black))) - `(ansi-color-blue ((,c :background ,bg-term-blue :foreground ,fg-term-blue))) - `(ansi-color-bold ((,c :inherit bold))) - `(ansi-color-bright-black ((,c :background ,bg-term-black-bright :foreground ,fg-term-black-bright))) - `(ansi-color-bright-blue ((,c :background ,bg-term-blue-bright :foreground ,fg-term-blue-bright))) - `(ansi-color-bright-cyan ((,c :background ,bg-term-cyan-bright :foreground ,fg-term-cyan-bright))) - `(ansi-color-bright-green ((,c :background ,bg-term-green-bright :foreground ,fg-term-green-bright))) - `(ansi-color-bright-magenta ((,c :background ,bg-term-magenta-bright :foreground ,fg-term-magenta-bright))) - `(ansi-color-bright-red ((,c :background ,bg-term-red-bright :foreground ,fg-term-red-bright))) - `(ansi-color-bright-white ((,c :background ,bg-term-white-bright :foreground ,fg-term-white-bright))) - `(ansi-color-bright-yellow ((,c :background ,bg-term-yellow-bright :foreground ,fg-term-yellow-bright))) - `(ansi-color-cyan ((,c :background ,bg-term-cyan :foreground ,fg-term-cyan))) - `(ansi-color-green ((,c :background ,bg-term-green :foreground ,fg-term-green))) - `(ansi-color-magenta ((,c :background ,bg-term-magenta :foreground ,fg-term-magenta))) - `(ansi-color-red ((,c :background ,bg-term-red :foreground ,fg-term-red))) - `(ansi-color-white ((,c :background ,bg-term-white :foreground ,fg-term-white))) - `(ansi-color-yellow ((,c :background ,bg-term-yellow :foreground ,fg-term-yellow))) -;;;; auctex and tex - `(font-latex-bold-face ((,c :inherit bold))) - `(font-latex-doctex-documentation-face ((,c :inherit font-lock-doc-face))) - `(font-latex-doctex-preprocessor-face ((,c :inherit font-lock-preprocessor-face))) - `(font-latex-italic-face ((,c :inherit italic))) - `(font-latex-math-face ((,c :inherit font-lock-constant-face))) - `(font-latex-script-char-face ((,c :inherit font-lock-builtin-face))) - `(font-latex-sectioning-5-face ((,c :inherit (bold ef-themes-variable-pitch) :foreground ,fg-alt))) - `(font-latex-sedate-face ((,c :inherit font-lock-keyword-face))) - `(font-latex-slide-title-face ((,c :inherit ef-themes-heading-0))) - `(font-latex-string-face ((,c :inherit font-lock-string-face))) - `(font-latex-underline-face ((,c :inherit underline))) - `(font-latex-verbatim-face ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-verbatim))) - `(font-latex-warning-face ((,c :inherit font-lock-warning-face))) - `(tex-verbatim ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-verbatim))) - ;; `(texinfo-heading ((,c :foreground ,magenta))) - `(TeX-error-description-error ((,c :inherit error))) - `(TeX-error-description-help ((,c :inherit success))) - `(TeX-error-description-tex-said ((,c :inherit success))) - `(TeX-error-description-warning ((,c :inherit warning))) -;;;; auto-dim-other-buffers - `(auto-dim-other-buffers-face ((,c :background ,bg-inactive))) - `(auto-dim-other-buffers-hide-face ((,c :foreground ,bg-inactive :background ,bg-inactive))) -;;;; avy - `(avy-background-face ((,c :background ,bg-dim :foreground ,fg-dim :extend t))) - `(avy-goto-char-timer-face ((,c :inherit bold :background ,bg-active))) - `(avy-lead-face ((,c :inherit (bold ef-themes-reset-soft) :background ,bg-char-0))) - `(avy-lead-face-0 ((,c :inherit (bold ef-themes-reset-soft) :background ,bg-char-1))) - `(avy-lead-face-1 ((,c :inherit ef-themes-reset-soft :background ,bg-inactive))) - `(avy-lead-face-2 ((,c :inherit (bold ef-themes-reset-soft) :background ,bg-char-2))) -;;;; aw (ace-window) - `(aw-background-face ((,c :foreground ,fg-dim))) - `(aw-key-face ((,c :inherit ef-themes-key-binding))) - `(aw-leading-char-face ((,c :inherit (bold ef-themes-reset-soft) :height 1.5 :foreground ,keybind))) - `(aw-minibuffer-leading-char-face ((,c :inherit ef-themes-key-binding))) - `(aw-mode-line-face ((,c :inherit bold))) -;;;; breadcrumb - `(breadcrumb-face (( ))) - `(breadcrumb-imenu-leaf-face ((,c :inherit bold :foreground ,fg-intense))) ; same as `which-func' - `(breadcrumb-project-leaf-face ((,c :inherit bold))) -;;;; bongo - `(bongo-album-title (( ))) - `(bongo-artist ((,c :foreground ,rainbow-0))) - `(bongo-currently-playing-track ((,c :inherit bold))) - `(bongo-elapsed-track-part ((,c :background ,bg-alt :underline t))) - `(bongo-filled-seek-bar ((,c :background ,bg-hover))) - `(bongo-marked-track ((,c :inherit ef-themes-mark-other))) - `(bongo-marked-track-line ((,c :background ,bg-dim))) - `(bongo-played-track ((,c :inherit shadow :strike-through t))) - `(bongo-track-length ((,c :inherit shadow))) - `(bongo-track-title ((,c :foreground ,rainbow-1))) - `(bongo-unfilled-seek-bar ((,c :background ,bg-dim))) -;;;; bookmark - `(bookmark-face ((,c :foreground ,info))) - `(bookmark-menu-bookmark ((,c :inherit bold))) -;;;; calendar and diary - `(calendar-month-header ((,c :inherit bold))) - `(calendar-today - ((default :foreground ,date-common :inverse-video t) - (((supports :box t)) - :box (:line-width (-1 . -1) :color ,fg-main)))) - `(calendar-weekday-header ((,c :foreground ,date-weekday))) - `(calendar-weekend-header ((,c :foreground ,date-weekend))) - `(diary ((,c :foreground ,date-common))) - `(diary-anniversary ((,c :foreground ,date-holiday))) - `(diary-time ((,c :foreground ,date-common))) - `(holiday ((,c :foreground ,date-holiday))) -;;;; centaur-tabs - `(centaur-tabs-active-bar-face ((,c :background ,keybind))) - `(centaur-tabs-close-mouse-face ((,c :inherit bold :foreground ,err :underline t))) - `(centaur-tabs-close-selected ((,c :inherit centaur-tabs-selected))) - `(centaur-tabs-close-unselected ((,c :inherit centaur-tabs-unselected))) - `(centaur-tabs-modified-marker-selected ((,c :inherit centaur-tabs-selected))) - `(centaur-tabs-modified-marker-unselected ((,c :inherit centaur-tabs-unselected))) - `(centaur-tabs-default ((,c :background ,bg-main))) - `(centaur-tabs-selected ((,c :inherit bold :box (:line-width -2 :color ,bg-tab-current) :background ,bg-tab-current))) - `(centaur-tabs-selected-modified ((,c :inherit (italic centaur-tabs-selected)))) - `(centaur-tabs-unselected ((,c :box (:line-width -2 :color ,bg-tab-other) :background ,bg-tab-other))) - `(centaur-tabs-unselected-modified ((,c :inherit (italic centaur-tabs-unselected)))) -;;;; cider - `(cider-deprecated-face ((,c :background ,bg-warning :foreground ,warning))) - `(cider-enlightened-face ((,c :box ,warning))) - `(cider-enlightened-local-face ((,c :inherit warning))) - `(cider-error-highlight-face ((,c :inherit ef-themes-underline-error))) - `(cider-fringe-good-face ((,c :inherit ef-themes-mark-select))) - `(cider-instrumented-face ((,c :box ,err))) - `(cider-reader-conditional-face ((,c :inherit font-lock-type-face))) - `(cider-repl-prompt-face ((,c :inherit minibuffer-prompt))) - `(cider-repl-stderr-face ((,c :foreground ,err))) - `(cider-repl-stdout-face ((,c :foreground ,info))) - `(cider-warning-highlight-face ((,c :inherit ef-themes-underline-warning))) -;;;; change-log and log-view (`vc-print-log' and `vc-print-root-log') - `(change-log-acknowledgment ((,c :foreground ,identifier))) - `(change-log-conditionals ((,c :inherit error))) - `(change-log-date ((,c :foreground ,date-common))) - `(change-log-email ((,c :foreground ,fg-alt))) - `(change-log-file ((,c :inherit bold))) - `(change-log-function ((,c :inherit warning))) - `(change-log-list ((,c :inherit bold))) - `(change-log-name ((,c :foreground ,name))) - `(log-edit-header ((,c :inherit bold))) - `(log-edit-headers-separator ((,c :height 1 :background ,border :extend t))) - `(log-edit-summary ((,c :inherit success))) - `(log-edit-unknown-header ((,c :inherit shadow))) - `(log-view-commit-body (( ))) - `(log-view-file ((,c :inherit bold))) - `(log-view-message ((,c :foreground ,identifier))) -;;;; clojure-mode - `(clojure-keyword-face ((,c :inherit font-lock-builtin-face))) -;;;; company-mode - `(company-echo-common ((,c :inherit bold :foreground ,accent-0))) - `(company-preview ((,c :background ,bg-dim :foreground ,fg-dim))) - `(company-preview-common ((,c :inherit company-echo-common))) - `(company-preview-search ((,c :background ,bg-yellow-intense :foreground ,fg-intense))) - `(company-scrollbar-bg ((,c :background ,bg-active))) - `(company-scrollbar-fg ((,c :background ,fg-main))) - `(company-template-field ((,c :background ,bg-active :foreground ,fg-intense))) - `(company-tooltip ((,c :inherit ef-themes-fixed-pitch :background ,bg-inactive))) - `(company-tooltip-annotation ((,c :inherit completions-annotations))) - `(company-tooltip-common ((,c :inherit company-echo-common))) - `(company-tooltip-deprecated ((,c :inherit company-tooltip :strike-through t))) - `(company-tooltip-mouse ((,c :inherit highlight))) - `(company-tooltip-scrollbar-thumb ((,c :background ,fg-alt))) - `(company-tooltip-scrollbar-track ((,c :background ,bg-alt))) - `(company-tooltip-search ((,c :inherit secondary-selection))) - `(company-tooltip-search-selection ((,c :inherit secondary-selection :underline t))) - `(company-tooltip-selection ((,c :background ,bg-completion))) -;;;; compilation - `(compilation-column-number ((,c :inherit compilation-line-number))) - `(compilation-error ((,c :inherit error))) - `(compilation-info ((,c :inherit bold :foreground ,name))) - `(compilation-line-number ((,c :inherit shadow))) - `(compilation-mode-line-exit ((,c :inherit bold :foreground ,modeline-info))) - `(compilation-mode-line-fail ((,c :inherit bold :foreground ,modeline-err))) - `(compilation-mode-line-run ((,c :inherit bold :foreground ,modeline-warning))) - `(compilation-warning ((,c :inherit warning))) -;;;; completions - `(completions-annotations ((,c :inherit italic :foreground ,docstring))) - `(completions-common-part ((,c :inherit bold :foreground ,accent-0))) - `(completions-first-difference ((,c :inherit bold :foreground ,accent-1))) - `(completions-group-title ((,c :inherit bold :foreground ,name))) - `(completions-highlight ((,c :background ,bg-completion))) -;;;; consult - `(consult-async-split ((,c :inherit warning))) - `(consult-file ((,c :foreground ,name))) - `(consult-key ((,c :inherit ef-themes-key-binding))) - `(consult-imenu-prefix ((,c :inherit shadow))) - `(consult-line-number ((,c :inherit shadow))) - `(consult-line-number-prefix ((,c :inherit shadow))) - `(consult-separator ((,c :foreground ,border))) -;;;; corfu - `(corfu-current ((,c :background ,bg-completion))) - `(corfu-bar ((,c :background ,fg-main))) - `(corfu-border ((,c :background ,bg-active))) - `(corfu-default ((,c :inherit ef-themes-fixed-pitch :background ,bg-inactive))) -;;;;; corfu-candidate-overlay - `(corfu-candidate-overlay-face ((t :inherit shadow))) -;;;; corfu-quick - `(corfu-quick1 ((,c :inherit bold :background ,bg-char-0))) - `(corfu-quick2 ((,c :inherit bold :background ,bg-char-1))) -;;;; csv-mode - `(csv-separator-face ((,c :foreground ,err))) -;;;; custom (M-x customize) - `(custom-button - ((default :inherit variable-pitch :background ,bg-active :foreground ,fg-intense) - (((supports :box t)) - :box (:line-width 1 :color ,border :style released-button)) - (t :underline ,border))) - `(custom-button-mouse - ((default :inherit variable-pitch :background ,bg-hover :foreground ,fg-intense) - (((supports :box t)) - :box (:line-width 1 :color ,border :style released-button)) - (t :underline ,border))) - `(custom-button-pressed - ((default :inherit variable-pitch :background ,bg-main :foreground ,fg-intense) - (((supports :box t)) - :box (:line-width 1 :color ,border :style pressed-button)) - (t :underline ,border))) - - `(custom-changed ((,c :background ,bg-changed))) - `(custom-comment ((,c :inherit shadow))) - `(custom-comment-tag ((,c :inherit (bold shadow)))) - `(custom-invalid ((,c :inherit error :strike-through t))) - `(custom-modified ((,c :inherit custom-changed))) - `(custom-rogue ((,c :inherit custom-invalid))) - `(custom-set ((,c :inherit success))) - `(custom-state ((,c :foreground ,fg-alt))) - `(custom-themed ((,c :inherit custom-changed))) - `(custom-variable-obsolete ((,c :inherit shadow))) - `(custom-face-tag ((,c :inherit bold :foreground ,type))) - `(custom-group-tag ((,c :inherit bold :foreground ,builtin))) - `(custom-group-tag-1 ((,c :inherit bold :foreground ,constant))) - `(custom-variable-tag ((,c :inherit bold :foreground ,variable))) -;;;; dashboard - `(dashboard-heading ((,c :foreground ,name))) - `(dashboard-items-face (( ))) ; use the underlying style of all-the-icons -;;;; denote - `(denote-faces-date ((,c :foreground ,date-common))) - `(denote-faces-delimiter ((,c :inherit shadow))) - `(denote-faces-extension ((,c :inherit shadow))) - `(denote-faces-keywords ((,c :inherit bold :foreground ,keyword))) - `(denote-faces-link ((,c :inherit link))) - `(denote-faces-prompt-current-name ((,c :inherit italic :foreground ,fg-changed))) - `(denote-faces-prompt-new-name ((,c :inherit italic :foreground ,fg-added))) - `(denote-faces-prompt-old-name ((,c :inherit italic :foreground ,fg-removed))) - `(denote-faces-signature ((,c :inherit bold :foreground ,string))) - `(denote-faces-subdirectory ((,c :inherit bold :foreground ,fg-dim))) - `(denote-faces-time ((,c :inherit denote-faces-date))) - `(denote-faces-time-delimiter ((,c :inherit shadow))) - `(denote-faces-title (( ))) -;;;; dictionary - `(dictionary-button-face ((,c :inherit bold))) - `(dictionary-reference-face ((,c :inherit link))) - `(dictionary-word-definition-face (( ))) - `(dictionary-word-entry-face ((,c :inherit font-lock-comment-face))) -;;;; diff-hl - `(diff-hl-change ((,c :background ,bg-changed-refine))) - `(diff-hl-delete ((,c :background ,bg-removed-refine))) - `(diff-hl-insert ((,c :background ,bg-added-refine))) - `(diff-hl-reverted-hunk-highlight ((,c :background ,fg-main :foreground ,bg-main))) -;;;; diff-mode - `(diff-added ((,c :background ,bg-added :foreground ,fg-added))) - `(diff-changed ((,c :background ,bg-changed :foreground ,fg-changed :extend t))) - `(diff-changed-unspecified ((,c :inherit diff-changed))) - `(diff-removed ((,c :background ,bg-removed :foreground ,fg-removed))) - `(diff-refine-added ((,c :background ,bg-added-refine :foreground ,fg-added))) - `(diff-refine-changed ((,c :background ,bg-changed-refine :foreground ,fg-changed))) - `(diff-refine-removed ((,c :background ,bg-removed-refine :foreground ,fg-removed))) - `(diff-indicator-added ((,c :inherit diff-added :foreground ,fg-added))) - `(diff-indicator-changed ((,c :inherit diff-changed :foreground ,fg-changed))) - `(diff-indicator-removed ((,c :inherit diff-removed :foreground ,fg-removed))) - `(diff-context (( ))) - `(diff-error ((,c :inherit error))) - `(diff-file-header ((,c :inherit bold))) - `(diff-function ((,c :background ,bg-alt))) - `(diff-header (( ))) - `(diff-hunk-header ((,c :inherit bold :background ,bg-alt))) - `(diff-index ((,c :inherit italic))) - `(diff-nonexistent ((,c :inherit bold))) -;;;; dired - `(dired-broken-symlink ((,c :inherit (error link)))) - `(dired-directory ((,c :foreground ,accent-0))) - `(dired-flagged ((,c :inherit ef-themes-mark-delete))) - `(dired-header ((,c :inherit bold))) - `(dired-ignored ((,c :inherit shadow))) - `(dired-mark ((,c :foreground ,fg-intense))) - `(dired-marked ((,c :inherit ef-themes-mark-select))) - `(dired-symlink ((,c :inherit link))) - `(dired-warning ((,c :inherit warning))) -;;;; dired-subtree - ;; remove backgrounds from dired-subtree faces, else they break - ;; dired-{flagged,marked} and any other face that sets a background - ;; such as hl-line. Also, denoting depth by varying shades of gray - ;; does not look right. - `(dired-subtree-depth-1-face (( ))) - `(dired-subtree-depth-2-face (( ))) - `(dired-subtree-depth-3-face (( ))) - `(dired-subtree-depth-4-face (( ))) - `(dired-subtree-depth-5-face (( ))) - `(dired-subtree-depth-6-face (( ))) -;;;; diredfl - `(diredfl-autofile-name ((,c :background ,bg-alt))) - `(diredfl-compressed-file-name ((,c :foreground ,yellow-cooler))) - `(diredfl-compressed-file-suffix ((,c :foreground ,red))) - `(diredfl-date-time ((,c :foreground ,date-common))) - `(diredfl-deletion ((,c :inherit dired-flagged))) - `(diredfl-deletion-file-name ((,c :inherit diredfl-deletion))) - `(diredfl-dir-heading ((,c :inherit bold))) - `(diredfl-dir-name ((,c :inherit dired-directory))) - `(diredfl-dir-priv ((,c :inherit dired-directory))) - `(diredfl-exec-priv ((,c :foreground ,rainbow-3))) - `(diredfl-executable-tag ((,c :inherit diredfl-exec-priv))) - `(diredfl-file-name ((,c :foreground ,fg-main))) - `(diredfl-file-suffix ((,c :foreground ,variable))) - `(diredfl-flag-mark ((,c :inherit dired-marked))) - `(diredfl-flag-mark-line ((,c :inherit dired-marked))) - `(diredfl-ignored-file-name ((,c :inherit shadow))) - `(diredfl-link-priv ((,c :foreground ,link))) - `(diredfl-no-priv ((,c :inherit shadow))) - `(diredfl-number ((,c :inherit shadow))) - `(diredfl-other-priv ((,c :foreground ,rainbow-0))) - `(diredfl-rare-priv ((,c :foreground ,rainbow-0))) - `(diredfl-read-priv ((,c :foreground ,rainbow-1))) - `(diredfl-symlink ((,c :inherit dired-symlink))) - `(diredfl-tagged-autofile-name ((,c :inherit (diredfl-autofile-name dired-marked)))) - `(diredfl-write-priv ((,c :foreground ,rainbow-2))) -;;;; dirvish - `(dirvish-hl-line ((,c :background ,bg-hl-line))) -;;;; display-fill-column-indicator-mode - ;; NOTE 2022-09-14: We use the bg-alt mapping as the border mapping - ;; is for the `vertical-border'. We want this to be more subtle. - `(fill-column-indicator ((,c :height 1 :background ,bg-alt :foreground ,bg-alt))) -;;;; doom-modeline - `(doom-modeline-bar ((,c :background ,keybind))) - `(doom-modeline-bar-inactive ((,c :background ,bg-alt))) - `(doom-modeline-battery-charging ((,c :foreground ,modeline-info))) - `(doom-modeline-battery-critical ((,c :underline t :foreground ,modeline-err))) - `(doom-modeline-battery-error ((,c :underline t :foreground ,modeline-err))) - `(doom-modeline-battery-full (( ))) - `(doom-modeline-battery-warning ((,c :inherit bold :foreground ,modeline-warning))) - `(doom-modeline-buffer-file ((,c :inherit bold))) - `(doom-modeline-buffer-major-mode (( ))) - `(doom-modeline-buffer-minor-mode (( ))) - `(doom-modeline-buffer-modified ((,c :foreground ,modeline-err))) - `(doom-modeline-buffer-path (( ))) - `(doom-modeline-evil-emacs-state ((,c :inherit italic))) - `(doom-modeline-evil-insert-state ((,c :foreground ,modeline-info))) - `(doom-modeline-evil-motion-state (( ))) - `(doom-modeline-evil-normal-state (( ))) - `(doom-modeline-evil-operator-state ((,c :inherit bold))) - `(doom-modeline-evil-replace-state ((,c :inherit bold :foreground ,modeline-err))) - `(doom-modeline-evil-visual-state ((,c :inherit bold :foreground ,modeline-warning))) - `(doom-modeline-info ((,c :inherit bold :foreground ,modeline-info))) - `(doom-modeline-input-method (( ))) - `(doom-modeline-lsp-error ((,c :inherit bold))) - `(doom-modeline-lsp-running (( ))) - `(doom-modeline-lsp-success ((,c :inherit bold :foreground ,modeline-info))) - `(doom-modeline-lsp-warning ((,c :inherit bold :foreground ,modeline-warning))) - `(doom-modeline-notification ((,c :inherit mode-line-emphasis :foreground ,modeline-err))) - `(doom-modeline-project-dir (( ))) - `(doom-modeline-project-parent-dir (( ))) - `(doom-modeline-project-root-dir (( ))) - `(doom-modeline-repl-success ((,c :inherit bold :foreground ,modeline-info))) - `(doom-modeline-repl-warning ((,c :inherit bold :foreground ,modeline-warning))) - `(doom-modeline-time (( ))) - `(doom-modeline-urgent ((,c :inherit bold :foreground ,modeline-err))) - `(doom-modeline-warning ((,c :inherit bold :foreground ,modeline-warning))) -;;;; ediff - `(ediff-current-diff-A ((,c :background ,bg-removed :foreground ,fg-removed))) - `(ediff-current-diff-Ancestor ((,c :background ,bg-region))) - `(ediff-current-diff-B ((,c :background ,bg-added :foreground ,fg-added))) - `(ediff-current-diff-C ((,c :background ,bg-changed :foreground ,fg-changed))) - `(ediff-even-diff-A ((,c :background ,bg-dim))) - `(ediff-even-diff-Ancestor ((,c :background ,bg-dim))) - `(ediff-even-diff-B ((,c :background ,bg-dim))) - `(ediff-even-diff-C ((,c :background ,bg-dim))) - `(ediff-fine-diff-A ((,c :background ,bg-removed-refine :foreground ,fg-removed))) - `(ediff-fine-diff-Ancestor ((,c :background ,bg-active :foreground ,fg-intense))) - `(ediff-fine-diff-B ((,c :background ,bg-added-refine :foreground ,fg-added))) - `(ediff-fine-diff-C ((,c :background ,bg-changed-refine :foreground ,fg-changed))) - `(ediff-odd-diff-A ((,c :inherit ediff-even-diff-A))) - `(ediff-odd-diff-Ancestor ((,c :inherit ediff-even-diff-Ancestor))) - `(ediff-odd-diff-B ((,c :inherit ediff-even-diff-B))) - `(ediff-odd-diff-C ((,c :inherit ediff-even-diff-C))) -;;;; eglot - `(eglot-mode-line ((,c :inherit bold :foreground ,modeline-info))) - `(eglot-diagnostic-tag-unnecessary-face ((,c :inherit ef-themes-underline-info))) -;;;; eldoc - ;; NOTE: see https://github.com/purcell/package-lint/issues/187 - (list 'eldoc-highlight-function-argument `((,c :inherit warning :background ,bg-warning))) -;;;; elfeed - `(elfeed-log-date-face ((,c :inherit elfeed-search-date-face))) - `(elfeed-log-debug-level-face ((,c :inherit elfeed-search-filter-face))) - `(elfeed-log-error-level-face ((,c :inherit error))) - `(elfeed-log-info-level-face ((,c :inherit success))) - `(elfeed-log-warn-level-face ((,c :inherit warning))) - `(elfeed-search-date-face ((,c :foreground ,date-common))) - `(elfeed-search-feed-face ((,c :foreground ,accent-1))) - `(elfeed-search-filter-face ((,c :inherit bold))) - `(elfeed-search-last-update-face ((,c :inherit bold :foreground ,date-common))) - `(elfeed-search-tag-face ((,c :foreground ,accent-0))) - `(elfeed-search-title-face ((,c :foreground ,fg-dim))) - `(elfeed-search-unread-count-face (( ))) - `(elfeed-search-unread-title-face ((,c :inherit bold :foreground ,fg-main))) -;;;; embark - `(embark-collect-group-title ((,c :inherit bold :foreground ,name))) - `(embark-keybinding ((,c :inherit ef-themes-key-binding))) - `(embark-keybinding-repeat ((,c :inherit bold))) - `(embark-selected ((,c :inherit ef-themes-mark-select))) -;;;; epa - `(epa-field-body (( ))) - `(epa-field-name ((,c :inherit bold :foreground ,fg-dim))) - `(epa-mark ((,c :inherit bold))) - `(epa-string ((,c :foreground ,string))) - `(epa-validity-disabled ((,c :foreground ,err))) - `(epa-validity-high ((,c :inherit success))) - `(epa-validity-low ((,c :inherit shadow))) - `(epa-validity-medium ((,c :foreground ,info))) -;;;; erc - `(erc-action-face ((,c :foreground ,accent-2))) - `(erc-bold-face ((,c :inherit bold))) - `(erc-button ((,c :inherit button))) - `(erc-command-indicator-face ((,c :inherit bold :foreground ,accent-3))) - `(erc-current-nick-face ((,c :inherit match))) - `(erc-dangerous-host-face ((,c :inherit error))) - `(erc-direct-msg-face ((,c :inherit shadow))) - `(erc-error-face ((,c :inherit error))) - `(erc-fool-face ((,c :inherit shadow))) - `(erc-input-face ((,c :foreground ,fnname))) - `(erc-inverse-face ((,c :inherit erc-default-face :inverse-video t))) - `(erc-fill-wrap-merge-indicator-face ((,c :foreground ,fg-dim))) - `(erc-keep-place-indicator-arrow ((,c :foreground ,info))) - `(erc-keyword-face ((,c :inherit bold :foreground ,keyword))) - `(erc-my-nick-face ((,c :inherit bold :foreground ,name))) - `(erc-my-nick-prefix-face ((,c :inherit erc-my-nick-face))) - `(erc-nick-default-face ((,c :inherit bold :foreground ,accent-0))) - `(erc-nick-msg-face ((,c :inherit warning))) - `(erc-nick-prefix-face ((,c :inherit erc-nick-default-face))) - `(erc-notice-face ((,c :inherit font-lock-comment-face))) - `(erc-pal-face ((,c :inherit bold :foreground ,accent-1))) - `(erc-prompt-face ((,c :inherit minibuffer-prompt))) - `(erc-timestamp-face ((,c :foreground ,date-common))) - `(erc-underline-face ((,c :underline t))) -;;;; ert - `(ert-test-result-expected ((,c :background ,bg-info :foreground ,info))) - `(ert-test-result-unexpected ((,c :background ,bg-err :foreground ,err))) -;;;; eshell - `(eshell-ls-archive ((,c :foreground ,accent-2))) - `(eshell-ls-backup ((,c :inherit shadow))) - `(eshell-ls-clutter ((,c :inherit shadow))) - `(eshell-ls-directory ((,c :foreground ,accent-0))) - `(eshell-ls-executable ((,c :foreground ,accent-1))) - `(eshell-ls-missing ((,c :inherit error))) - `(eshell-ls-product ((,c :inherit shadow))) - `(eshell-ls-readonly ((,c :foreground ,warning))) - `(eshell-ls-special ((,c :foreground ,accent-3))) - `(eshell-ls-symlink ((,c :inherit link))) - `(eshell-ls-unreadable ((,c :inherit shadow))) - `(eshell-prompt ((,c :inherit minibuffer-prompt))) -;;;; evil-mode - `(evil-ex-commands ((,c :inherit font-lock-keyword-face))) - `(evil-ex-info ((,c :inherit font-lock-type-face))) - `(evil-ex-substitute-replacement ((,c :inherit query-replace))) -;;;; eww - `(eww-invalid-certificate ((,c :foreground ,err))) - `(eww-valid-certificate ((,c :foreground ,info))) - `(eww-form-checkbox ((,c :inherit eww-form-text))) - `(eww-form-file ((,c :inherit eww-form-submit))) - `(eww-form-select ((,c :inherit eww-form-submit))) - `(eww-form-submit ((,c :inherit ef-themes-button))) - `(eww-form-text ((,c :inherit widget-field))) - `(eww-form-textarea ((,c :inherit eww-form-text))) -;;;; flycheck - `(flycheck-error ((,c :inherit ef-themes-underline-error))) - `(flycheck-fringe-error ((,c :inherit ef-themes-mark-delete))) - `(flycheck-fringe-info ((,c :inherit ef-themes-mark-select))) - `(flycheck-fringe-warning ((,c :inherit ef-themes-mark-other))) - `(flycheck-info ((,c :inherit ef-themes-underline-info))) - `(flycheck-warning ((,c :inherit ef-themes-underline-warning))) -;;;; flymake - `(flymake-end-of-line-diagnostics-face ((,c :inherit italic :height 0.85 :box ,border))) - `(flymake-error ((,c :inherit ef-themes-underline-error))) - `(flymake-error-echo ((,c :inherit error))) - `(flymake-error-echo-at-eol ((,c :inherit flymake-end-of-line-diagnostics-face :foreground ,err))) - `(flymake-note ((,c :inherit ef-themes-underline-info))) - `(flymake-note-echo ((,c :inherit success))) - `(flymake-note-echo-at-eol ((,c :inherit flymake-end-of-line-diagnostics-face :foreground ,info))) - `(flymake-warning ((,c :inherit ef-themes-underline-warning))) - `(flymake-warning-echo ((,c :inherit warning))) - `(flymake-note-echo-at-eol ((,c :inherit flymake-end-of-line-diagnostics-face :foreground ,warning))) -;;;; flyspell - `(flyspell-duplicate ((,c :inherit ef-themes-underline-warning))) - `(flyspell-incorrect ((,c :inherit ef-themes-underline-error))) -;;;; font-lock - `(font-lock-builtin-face ((,c :inherit bold :foreground ,builtin))) - `(font-lock-comment-delimiter-face ((,c :inherit font-lock-comment-face))) - `(font-lock-comment-face ((,c :inherit italic :foreground ,comment))) - `(font-lock-constant-face ((,c :foreground ,constant))) - `(font-lock-doc-face ((,c :inherit italic :foreground ,docstring))) - `(font-lock-function-name-face ((,c :foreground ,fnname))) - `(font-lock-keyword-face ((,c :inherit bold :foreground ,keyword))) - `(font-lock-negation-char-face ((,c :inherit bold))) - `(font-lock-preprocessor-face ((,c :foreground ,preprocessor))) - `(font-lock-regexp-grouping-backslash ((,c :foreground ,rx-escape))) - `(font-lock-regexp-grouping-construct ((,c :foreground ,rx-construct))) - `(font-lock-string-face ((,c :foreground ,string))) - `(font-lock-type-face ((,c :foreground ,type))) - `(font-lock-variable-name-face ((,c :foreground ,variable))) - `(font-lock-warning-face ((,c :foreground ,warning))) -;;;; forge - `(forge-dimmed ((,c :inherit shadow))) - `(forge-issue-completed ((,c :inherit shadow))) - `(forge-issue-open (( ))) - `(forge-issue-unplanned ((,c :inherit forge-dimmed :strike-through t))) - `(forge-post-author ((,c :inherit bold :foreground ,name))) - `(forge-post-date ((,c :inherit bold :foreground ,date-common))) - `(forge-pullreq-merged ((,c :foreground ,fg-alt))) - `(forge-pullreq-open ((,c :foreground ,info))) - `(forge-pullreq-rejected ((,c :foreground ,err :strike-through t))) - `(forge-topic-done (( ))) - `(forge-topic-pending ((,c :inherit italic))) - `(forge-topic-slug-completed ((,c :inherit forge-dimmed))) - `(forge-topic-slug-open ((,c :inherit forge-dimmed))) - `(forge-topic-slug-saved ((,c :inherit success))) - `(forge-topic-slug-unplanned ((,c :inherit forge-dimmed :strike-through t))) - `(forge-topic-unread ((,c :inherit bold))) -;;;; git-commit - `(git-commit-comment-action ((,c :inherit font-lock-comment-face))) - `(git-commit-comment-branch-local ((,c :inherit font-lock-comment-face :foreground ,accent-0))) - `(git-commit-comment-branch-remote ((,c :inherit font-lock-comment-face :foreground ,accent-1))) - `(git-commit-comment-heading ((,c :inherit (bold font-lock-comment-face)))) - `(git-commit-comment-file ((,c :inherit font-lock-comment-face :foreground ,name))) - `(git-commit-keyword ((,c :foreground ,keyword))) - `(git-commit-nonempty-second-line ((,c :foreground ,err))) - `(git-commit-overlong-summary ((,c :foreground ,warning))) - `(git-commit-summary ((,c :inherit success))) -;;;; git-gutter - `(git-gutter:added ((,c :background ,bg-added :foreground ,fg-added))) - `(git-gutter:deleted ((,c :background ,bg-removed :foreground ,fg-removed))) - `(git-gutter:modified ((,c :background ,bg-changed :foreground ,fg-changed))) - `(git-gutter:separator ((,c :inherit success))) - `(git-gutter:unchanged ((,c :inherit bold))) -;;;; git-gutter-fr - `(git-gutter-fr:added ((,c :background ,bg-added :foreground ,fg-added))) - `(git-gutter-fr:deleted ((,c :background ,bg-removed :foreground ,fg-removed))) - `(git-gutter-fr:modified ((,c :background ,bg-changed :foreground ,fg-changed))) -;;;; git-rebase - `(git-rebase-comment-hash ((,c :inherit (bold font-lock-comment-face) :foreground ,identifier))) - `(git-rebase-comment-heading ((,c :inherit (bold font-lock-comment-face)))) - `(git-rebase-description ((,c :foreground ,fg-main))) - `(git-rebase-hash ((,c :foreground ,identifier))) -;;;; gnus - `(gnus-button ((,c :inherit button :underline nil))) - `(gnus-cite-1 ((,c :inherit message-cited-text-1))) - `(gnus-cite-2 ((,c :inherit message-cited-text-2))) - `(gnus-cite-3 ((,c :inherit message-cited-text-3))) - `(gnus-cite-4 ((,c :inherit message-cited-text-4))) - `(gnus-cite-5 ((,c :inherit message-cited-text-1))) - `(gnus-cite-6 ((,c :inherit message-cited-text-2))) - `(gnus-cite-7 ((,c :inherit message-cited-text-3))) - `(gnus-cite-8 ((,c :inherit message-cited-text-4))) - `(gnus-cite-9 ((,c :inherit message-cited-text-1))) - `(gnus-cite-10 ((,c :inherit message-cited-text-2))) - `(gnus-cite-11 ((,c :inherit message-cited-text-3))) - `(gnus-cite-attribution ((,c :inherit italic))) - `(gnus-emphasis-bold ((,c :inherit bold))) - `(gnus-emphasis-bold-italic ((,c :inherit bold-italic))) - `(gnus-emphasis-highlight-words ((,c :inherit warning))) - `(gnus-emphasis-italic ((,c :inherit italic))) - `(gnus-emphasis-underline-bold ((,c :inherit gnus-emphasis-bold :underline t))) - `(gnus-emphasis-underline-bold-italic ((,c :inherit gnus-emphasis-bold-italic :underline t))) - `(gnus-emphasis-underline-italic ((,c :inherit gnus-emphasis-italic :underline t))) - `(gnus-group-mail-1 ((,c :inherit bold :foreground ,rainbow-1))) - `(gnus-group-mail-1-empty ((,c :foreground ,rainbow-1))) - `(gnus-group-mail-2 ((,c :inherit bold :foreground ,rainbow-2))) - `(gnus-group-mail-2-empty ((,c :foreground ,rainbow-2))) - `(gnus-group-mail-3 ((,c :inherit bold :foreground ,rainbow-3))) - `(gnus-group-mail-3-empty ((,c :foreground ,rainbow-3))) - `(gnus-group-mail-low ((,c :inherit bold :foreground ,fg-alt))) - `(gnus-group-mail-low-empty ((,c :foreground ,fg-alt))) - `(gnus-group-news-1 ((,c :inherit bold :foreground ,rainbow-1))) - `(gnus-group-news-1-empty ((,c :foreground ,rainbow-1))) - `(gnus-group-news-2 ((,c :inherit bold :foreground ,rainbow-2))) - `(gnus-group-news-2-empty ((,c :foreground ,rainbow-2))) - `(gnus-group-news-3 ((,c :inherit bold :foreground ,rainbow-3))) - `(gnus-group-news-3-empty ((,c :foreground ,rainbow-3))) - `(gnus-group-news-4 ((,c :inherit bold :foreground ,rainbow-4))) - `(gnus-group-news-4-empty ((,c :foreground ,rainbow-4))) - `(gnus-group-news-5 ((,c :inherit bold :foreground ,rainbow-5))) - `(gnus-group-news-5-empty ((,c :foreground ,rainbow-5))) - `(gnus-group-news-6 ((,c :inherit bold :foreground ,rainbow-6))) - `(gnus-group-news-6-empty ((,c :foreground ,rainbow-6))) - `(gnus-group-news-low ((,c :inherit bold :foreground ,fg-alt))) - `(gnus-group-news-low-empty ((,c :foreground ,fg-alt))) - `(gnus-header-content ((,c :inherit message-header-other))) - `(gnus-header-from ((,c :inherit message-header-to :underline nil))) - `(gnus-header-name ((,c :inherit message-header-name))) - `(gnus-header-newsgroups ((,c :inherit message-header-newsgroups))) - `(gnus-header-subject ((,c :inherit message-header-subject))) - `(gnus-server-agent ((,c :inherit bold))) - `(gnus-server-closed ((,c :inherit italic))) - `(gnus-server-cloud ((,c :inherit bold :foreground ,fg-alt))) - `(gnus-server-cloud-host ((,c :inherit bold :foreground ,fg-alt :underline t))) - `(gnus-server-denied ((,c :inherit error))) - `(gnus-server-offline ((,c :inherit shadow))) - `(gnus-server-opened ((,c :inherit success))) - `(gnus-summary-cancelled ((,c :background ,bg-warning :foreground ,warning :extend t))) - `(gnus-summary-high-ancient ((,c :inherit bold :foreground ,fg-alt))) - `(gnus-summary-high-read ((,c :inherit bold :foreground ,fg-dim))) - `(gnus-summary-high-ticked ((,c :inherit bold :foreground ,err))) - `(gnus-summary-high-undownloaded ((,c :inherit bold-italic :foreground ,warning))) - `(gnus-summary-high-unread ((,c :inherit bold))) - `(gnus-summary-low-ancient ((,c :inherit italic))) - `(gnus-summary-low-read ((,c :inherit (shadow italic)))) - `(gnus-summary-low-ticked ((,c :inherit italic :foreground ,err))) - `(gnus-summary-low-undownloaded ((,c :inherit italic :foreground ,warning))) - `(gnus-summary-low-unread ((,c :inherit italic))) - `(gnus-summary-normal-ancient ((,c :foreground ,fg-dim))) - `(gnus-summary-normal-read ((,c :inherit shadow))) - `(gnus-summary-normal-ticked ((,c :foreground ,err))) - `(gnus-summary-normal-undownloaded ((,c :foreground ,warning))) - `(gnus-summary-normal-unread (( ))) - `(gnus-summary-selected ((,c :inherit highlight))) -;;;; helpful-mode - `(helpful-heading ((,c :inherit ef-themes-heading-1))) -;;;; hexl-mode - `(hexl-address-region ((,c :foreground ,constant))) - `(hexl-ascii-region ((,c :foreground ,variable))) -;;;; hi-lock (M-x highlight-regexp) - ;; NOTE 2022-10-16 We hardcode color values. We have to do this - ;; as the themes lack entries in their palette for such an edge - ;; case. Defining those entries is not appropriate. - ;; - ;; The use of :inverse-video here is to prevert `hl-line-mode' or - ;; the active region from overriding those highlights. - `(hi-aquamarine ((((class color) (min-colors 88) (background light)) - :background "white" :foreground "#227f9f" :inverse-video t) - (((class color) (min-colors 88) (background dark)) - :background "black" :foreground "#66cbdc" :inverse-video t))) - `(hi-black-b ((,c :inverse-video t))) - `(hi-black-hb ((,c :background ,bg-main :foreground ,fg-dim :inverse-video t))) - `(hi-blue ((((class color) (min-colors 88) (background light)) - :background "white" :foreground "#3366dd" :inverse-video t) - (((class color) (min-colors 88) (background dark)) - :background "black" :foreground "#aaccff" :inverse-video t))) - `(hi-blue-b ((,c :inherit (bold hi-blue)))) - `(hi-green ((((class color) (min-colors 88) (background light)) - :background "white" :foreground "#008a00" :inverse-video t) - (((class color) (min-colors 88) (background dark)) - :background "black" :foreground "#66dd66" :inverse-video t))) - `(hi-green-b ((,c :inherit (bold hi-green)))) - `(hi-pink ((((class color) (min-colors 88) (background light)) - :background "white" :foreground "#bd30aa" :inverse-video t) - (((class color) (min-colors 88) (background dark)) - :background "black" :foreground "#ff88ee" :inverse-video t))) - `(hi-red-b ((((class color) (min-colors 88) (background light)) - :background "white" :foreground "#dd0000" :inverse-video t) - (((class color) (min-colors 88) (background dark)) - :background "black" :foreground "#f06666" :inverse-video t))) - `(hi-salmon ((((class color) (min-colors 88) (background light)) - :background "white" :foreground "#af4f6f" :inverse-video t) - (((class color) (min-colors 88) (background dark)) - :background "black" :foreground "#e08a50" :inverse-video t))) - `(hi-yellow ((((class color) (min-colors 88) (background light)) - :background "white" :foreground "#af6f00" :inverse-video t) - (((class color) (min-colors 88) (background dark)) - :background "black" :foreground "#faea00" :inverse-video t))) -;;;; highlight-indentation mode - `(highlight-indentation-face ((,c :background ,bg-dim))) -;;;; howm - `(action-lock-face ((,c :inherit button))) - `(howm-mode-keyword-face (( ))) - `(howm-mode-ref-face ((,c :inherit link))) - `(howm-mode-title-face ((,c :inherit ef-themes-heading-0))) - `(howm-mode-wiki-face ((,c :inherit link))) - `(howm-reminder-deadline-face ((,c :foreground ,date-deadline))) - `(howm-reminder-late-deadline-face ((,c :inherit bold :foreground ,date-deadline))) - `(howm-reminder-defer-face ((,c :foreground ,date-scheduled))) - `(howm-reminder-scheduled-face ((,c :foreground ,date-scheduled))) - `(howm-reminder-done-face ((,c :foreground ,prose-done))) - `(howm-reminder-todo-face ((,c :foreground ,prose-todo))) - `(howm-reminder-normal-face ((,c :foreground ,date-common))) - `(howm-reminder-today-face ((,c :inherit bold :foreground ,date-common))) - `(howm-reminder-tomorrow-face ((,c :inherit bold :foreground ,date-scheduled))) - `(howm-simulate-todo-mode-line-face ((,c :inherit bold))) - `(howm-view-empty-face (( ))) - `(howm-view-hilit-face ((,c :inherit match))) - `(howm-view-name-face ((,c :inherit bold))) - `(iigrep-counts-face1 ((,c :foreground ,rainbow-1))) - `(iigrep-counts-face2 ((,c :foreground ,rainbow-2))) - `(iigrep-counts-face3 ((,c :foreground ,rainbow-3))) - `(iigrep-counts-face4 ((,c :foreground ,rainbow-4))) - `(iigrep-counts-face5 ((,c :foreground ,rainbow-5))) -;;;; ibuffer - `(ibuffer-locked-buffer ((,c :foreground ,warning))) -;;;; image-dired - `(image-dired-thumb-flagged ((,c :background ,err :box (:line-width -3)))) - `(image-dired-thumb-header-file-name ((,c :inherit bold))) - `(image-dired-thumb-header-file-size ((,c :foreground ,info))) - `(image-dired-thumb-mark ((,c :background ,info :box (:line-width -3)))) -;;;; imenu-list - `(imenu-list-entry-face-0 ((,c :foreground ,rainbow-1))) - `(imenu-list-entry-face-1 ((,c :foreground ,rainbow-2))) - `(imenu-list-entry-face-2 ((,c :foreground ,rainbow-3))) - `(imenu-list-entry-face-3 ((,c :foreground ,rainbow-4))) - `(imenu-list-entry-subalist-face-0 ((,c :inherit bold :foreground ,rainbow-1 :underline t))) - `(imenu-list-entry-subalist-face-1 ((,c :inherit bold :foreground ,rainbow-2 :underline t))) - `(imenu-list-entry-subalist-face-2 ((,c :inherit bold :foreground ,rainbow-3 :underline t))) - `(imenu-list-entry-subalist-face-3 ((,c :inherit bold :foreground ,rainbow-4 :underline t))) -;;;; info - `(Info-quoted ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-verbatim))) ; the capitalization is canonical - `(info-header-node ((,c :inherit (shadow bold)))) - `(info-header-xref ((,c :foreground ,link))) - `(info-index-match ((,c :inherit match))) - `(info-menu-header ((,c :inherit bold))) - `(info-menu-star ((,c :foreground ,red))) - `(info-node ((,c :inherit bold))) - `(info-title-1 ((,c :inherit ef-themes-heading-1))) - `(info-title-2 ((,c :inherit ef-themes-heading-2))) - `(info-title-3 ((,c :inherit ef-themes-heading-3))) - `(info-title-4 ((,c :inherit ef-themes-heading-4))) -;;;; isearch, occur, and the like - `(isearch ((,c :inherit ef-themes-search-current))) - `(isearch-fail ((,c :inherit error :background ,bg-err :foreground ,err))) - `(isearch-group-1 ((,c :inherit ef-themes-search-rx-group-0))) - `(isearch-group-2 ((,c :inherit ef-themes-search-rx-group-1))) - `(lazy-highlight ((,c :inherit ef-themes-search-lazy))) - `(match ((,c :inherit ef-themes-search-match))) - `(query-replace ((,c :inherit ef-themes-search-replace))) -;;;; jit-spell - `(jit-spell-misspelling ((,c :inherit ef-themes-underline-error))) -;;;; jinx - `(jinx-misspelled ((,c :inherit ef-themes-underline-warning))) -;;;; keycast - `(keycast-command ((,c :inherit bold))) - `(keycast-key ((,c :inherit bold :background ,bg-hover :foreground ,fg-intense :box (:line-width -1 :color ,fg-dim)))) -;;;; lin - `(lin-blue ((,c :background ,bg-blue-subtle))) - `(lin-cyan ((,c :background ,bg-cyan-subtle))) - `(lin-green ((,c :background ,bg-green-subtle))) - `(lin-magenta ((,c :background ,bg-magenta-subtle))) - `(lin-red ((,c :background ,bg-red-subtle))) - `(lin-yellow ((,c :background ,bg-yellow-subtle))) - `(lin-blue-override-fg ((,c :background ,bg-blue-subtle :foreground ,fg-intense))) - `(lin-cyan-override-fg ((,c :background ,bg-cyan-subtle :foreground ,fg-intense))) - `(lin-green-override-fg ((,c :background ,bg-green-subtle :foreground ,fg-intense))) - `(lin-magenta-override-fg ((,c :background ,bg-magenta-subtle :foreground ,fg-intense))) - `(lin-red-override-fg ((,c :background ,bg-red-subtle :foreground ,fg-intense))) - `(lin-yellow-override-fg ((,c :background ,bg-yellow-subtle :foreground ,fg-intense))) -;;;; line numbers (display-line-numbers-mode and global variant) - ;; We need to fall back to `default' otherwise line numbers do not - ;; scale when using `text-scale-adjust'. - `(line-number ((,c :inherit (ef-themes-fixed-pitch shadow default)))) - `(line-number-current-line ((,c :inherit (bold line-number) :foreground ,fg-intense))) - `(line-number-major-tick ((,c :inherit (bold line-number) :foreground ,rainbow-0))) - `(line-number-minor-tick ((,c :inherit (bold line-number)))) -;;;; magit - `(magit-bisect-bad ((,c :inherit error))) - `(magit-bisect-good ((,c :inherit success))) - `(magit-bisect-skip ((,c :inherit warning))) - `(magit-blame-date (( ))) - `(magit-blame-dimmed ((,c :inherit shadow))) - `(magit-blame-hash (( ))) - `(magit-blame-highlight ((,c :background ,bg-active :foreground ,fg-intense))) - `(magit-blame-name (( ))) - `(magit-blame-summary (( ))) - `(magit-branch-local ((,c :foreground ,accent-0))) - `(magit-branch-remote ((,c :foreground ,accent-1))) - `(magit-branch-upstream ((,c :inherit italic))) - `(magit-branch-warning ((,c :inherit warning))) - `(magit-cherry-equivalent ((,c :foreground ,magenta))) - `(magit-cherry-unmatched ((,c :foreground ,cyan))) - `(magit-diff-added ((,c :background ,bg-added-faint :foreground ,fg-added))) - `(magit-diff-added-highlight ((,c :background ,bg-added :foreground ,fg-added))) - `(magit-diff-base ((,c :background ,bg-changed-faint :foreground ,fg-changed))) - `(magit-diff-base-highlight ((,c :background ,bg-changed :foreground ,fg-changed))) - `(magit-diff-context ((,c :inherit shadow))) - `(magit-diff-context-highlight ((,c :background ,bg-dim))) - `(magit-diff-file-heading ((,c :inherit bold :foreground ,accent-0))) - `(magit-diff-file-heading-highlight ((,c :inherit magit-diff-file-heading :background ,bg-alt))) - `(magit-diff-file-heading-selection ((,c :inherit bold :background ,bg-hover-secondary :foreground ,fg-intense))) - `(magit-diff-hunk-heading ((,c :background ,bg-alt))) - `(magit-diff-hunk-heading-highlight ((,c :inherit bold :background ,bg-active :foreground ,fg-intense))) - `(magit-diff-hunk-heading-selection ((,c :inherit bold :background ,bg-hover-secondary :foreground ,fg-intense))) - `(magit-diff-hunk-region ((,c :inherit bold))) - `(magit-diff-lines-boundary ((,c :background ,fg-intense))) - `(magit-diff-lines-heading ((,c :background ,fg-alt :foreground ,bg-alt))) - `(magit-diff-removed ((,c :background ,bg-removed-faint :foreground ,fg-removed))) - `(magit-diff-removed-highlight ((,c :background ,bg-removed :foreground ,fg-removed))) - `(magit-diffstat-added ((,c :inherit success))) - `(magit-diffstat-removed ((,c :inherit error))) - `(magit-dimmed ((,c :inherit shadow))) - `(magit-filename ((,c :foreground ,name))) - `(magit-hash ((,c :foreground ,identifier))) - `(magit-head ((,c :inherit magit-branch-local))) - `(magit-header-line ((,c :inherit bold))) - `(magit-header-line-key ((,c :inherit ef-themes-key-binding))) - `(magit-header-line-log-select ((,c :inherit bold))) - `(magit-keyword ((,c :foreground ,keyword))) - `(magit-keyword-squash ((,c :inherit bold :foreground ,warning))) - `(magit-log-author ((,c :foreground ,name))) - `(magit-log-date ((,c :foreground ,date-common))) - `(magit-log-graph ((,c :inherit shadow))) - `(magit-mode-line-process ((,c :inherit bold :foreground ,modeline-info))) - `(magit-mode-line-process-error ((,c :inherit bold :foreground ,modeline-err))) - `(magit-process-ng ((,c :inherit error))) - `(magit-process-ok ((,c :inherit success))) - `(magit-reflog-amend ((,c :inherit warning))) - `(magit-reflog-checkout ((,c :inherit bold :foreground ,blue))) - `(magit-reflog-cherry-pick ((,c :inherit success))) - `(magit-reflog-commit ((,c :inherit bold))) - `(magit-reflog-merge ((,c :inherit success))) - `(magit-reflog-other ((,c :inherit bold :foreground ,cyan))) - `(magit-reflog-rebase ((,c :inherit bold :foreground ,magenta))) - `(magit-reflog-remote ((,c :inherit (bold magit-branch-remote)))) - `(magit-reflog-reset ((,c :inherit error))) - `(magit-refname ((,c :inherit shadow))) - `(magit-refname-pullreq ((,c :inherit shadow))) - `(magit-refname-stash ((,c :inherit shadow))) - `(magit-refname-wip ((,c :inherit shadow))) - `(magit-section ((,c :background ,bg-dim :foreground ,fg-main))) - `(magit-section-heading ((,c :inherit bold))) - `(magit-section-heading-selection ((,c :inherit bold :background ,bg-hover-secondary :foreground ,fg-intense))) - `(magit-section-highlight ((,c :background ,bg-dim))) - `(magit-section-secondary-heading ((,c :inherit bold))) - `(magit-sequence-done ((,c :inherit success))) - `(magit-sequence-drop ((,c :inherit error))) - `(magit-sequence-exec ((,c :inherit bold :foreground ,magenta))) - `(magit-sequence-head ((,c :inherit bold :foreground ,cyan))) - `(magit-sequence-onto ((,c :inherit (bold shadow)))) - `(magit-sequence-part ((,c :inherit warning))) - `(magit-sequence-pick ((,c :inherit bold))) - `(magit-sequence-stop ((,c :inherit error))) - `(magit-signature-bad ((,c :inherit error))) - `(magit-signature-error ((,c :inherit error))) - `(magit-signature-expired ((,c :inherit warning))) - `(magit-signature-expired-key ((,c :foreground ,warning))) - `(magit-signature-good ((,c :inherit success))) - `(magit-signature-revoked ((,c :inherit bold :foreground ,warning))) - `(magit-signature-untrusted ((,c :inherit (bold shadow)))) - `(magit-tag ((,c :foreground ,accent-3))) ; compare with branches -;;;; man - `(Man-overstrike ((,c :inherit bold :foreground ,accent-0))) - `(Man-underline ((,c :foreground ,accent-1 :underline t))) -;;;; marginalia - `(marginalia-archive ((,c :foreground ,accent-0))) - `(marginalia-char ((,c :foreground ,accent-2))) - `(marginalia-date ((,c :foreground ,date-common))) - `(marginalia-documentation ((,c :inherit italic :foreground ,docstring))) - `(marginalia-file-name (( ))) - `(marginalia-file-owner ((,c :inherit shadow))) - `(marginalia-file-priv-dir (( ))) - `(marginalia-file-priv-exec ((,c :foreground ,rainbow-3))) - `(marginalia-file-priv-link ((,c :foreground ,link))) - `(marginalia-file-priv-no ((,c :inherit shadow))) - `(marginalia-file-priv-other ((,c :foreground ,rainbow-0))) - `(marginalia-file-priv-rare ((,c :foreground ,rainbow-0))) - `(marginalia-file-priv-read ((,c :foreground ,rainbow-1))) - `(marginalia-file-priv-write ((,c :foreground ,rainbow-2))) - `(marginalia-function ((,c :foreground ,fnname))) - `(marginalia-key ((,c :inherit ef-themes-key-binding))) - `(marginalia-lighter ((,c :inherit shadow))) - `(marginalia-liqst ((,c :inherit shadow))) - `(marginalia-mode ((,c :foreground ,constant))) - `(marginalia-modified ((,c :inherit warning))) - `(marginalia-null ((,c :inherit shadow))) - `(marginalia-number ((,c :foreground ,constant))) - `(marginalia-size ((,c :foreground ,variable))) - `(marginalia-string ((,c :foreground ,string))) - `(marginalia-symbol ((,c :foreground ,builtin))) - `(marginalia-true (( ))) - `(marginalia-type ((,c :foreground ,type))) - `(marginalia-value ((,c :inherit shadow))) - `(marginalia-version ((,c :foreground ,accent-1))) -;;;; markdown-mode - `(markdown-blockquote-face ((,c :inherit font-lock-doc-face))) - `(markdown-bold-face ((,c :inherit bold))) - `(markdown-code-face ((,c :inherit ef-themes-fixed-pitch :background ,bg-inactive :extend t))) - `(markdown-gfm-checkbox-face ((,c :foreground ,warning))) - `(markdown-header-face (( ))) - `(markdown-header-face-1 ((,c :inherit ef-themes-heading-1))) - `(markdown-header-face-2 ((,c :inherit ef-themes-heading-2))) - `(markdown-header-face-3 ((,c :inherit ef-themes-heading-3))) - `(markdown-header-face-4 ((,c :inherit ef-themes-heading-4))) - `(markdown-header-face-5 ((,c :inherit ef-themes-heading-5))) - `(markdown-header-face-6 ((,c :inherit ef-themes-heading-6))) - `(markdown-highlighting-face ((,c :background ,bg-info :foreground ,info))) - `(markdown-inline-code-face ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-code))) - `(markdown-italic-face ((,c :inherit italic))) - `(markdown-language-keyword-face ((,c :inherit ef-themes-fixed-pitch :background ,bg-dim))) - `(markdown-line-break-face ((,c :inherit nobreak-space))) - `(markdown-link-face ((,c :inherit link))) - `(markdown-markup-face ((,c :inherit shadow))) - `(markdown-metadata-key-face ((,c :inherit bold))) - `(markdown-metadata-value-face ((,c :foreground ,string))) - `(markdown-missing-link-face ((,c :inherit warning))) - `(markdown-pre-face ((,c :inherit markdown-code-face))) - `(markdown-table-face ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-table))) - `(markdown-url-face ((,c :foreground ,fg-alt))) -;;;; mct - `(mct-highlight-candidate ((,c :background ,bg-completion))) -;;;; messages - `(message-cited-text-1 ((,c :foreground ,mail-cite-0))) - `(message-cited-text-2 ((,c :foreground ,mail-cite-1))) - `(message-cited-text-3 ((,c :foreground ,mail-cite-2))) - `(message-cited-text-4 ((,c :foreground ,mail-cite-3))) - `(message-header-name ((,c :inherit bold))) - `(message-header-newsgroups ((,c :inherit message-header-other))) - `(message-header-to ((,c :inherit bold :foreground ,mail-recipient))) - `(message-header-cc ((,c :foreground ,mail-recipient))) - `(message-header-subject ((,c :inherit bold :foreground ,mail-subject))) - `(message-header-xheader ((,c :inherit message-header-other))) - `(message-header-other ((,c :foreground ,mail-other))) - `(message-mml ((,c :foreground ,mail-part))) - `(message-separator ((,c :background ,bg-dim :foreground ,fg-main))) -;;;; mode-line - `(mode-line - ((default :inherit ef-themes-ui-variable-pitch :background ,bg-mode-line :foreground ,fg-mode-line) - (((supports :box t)) - :box ,border) - (t :underline ,border))) - `(mode-line-active ((,c :inherit mode-line))) - `(mode-line-buffer-id ((,c :inherit bold))) - `(mode-line-emphasis ((,c :inherit bold :foreground ,modeline-info))) - `(mode-line-highlight ((,c :inherit highlight))) - `(mode-line-inactive - ((default :inherit ef-themes-ui-variable-pitch :background ,bg-alt :foreground ,fg-dim) - (((supports :box t)) - :box ,border) - (t :underline ,border))) -;;;; mood-line - `(mood-line-modified ((,c :inherit italic))) - `(mood-line-status-error ((,c :inherit error))) - `(mood-line-status-info ((,c :foreground ,info))) - `(mood-line-status-neutral (( ))) - `(mood-line-status-success ((,c :inherit success))) - `(mood-line-status-warning ((,c :inherit warning))) - `(mood-line-unimportant ((,c :inherit shadow))) -;;;; mu4e - `(mu4e-attach-number-face ((,c :inherit bold :foreground ,fg-dim))) - `(mu4e-cited-1-face ((,c :inherit message-cited-text-1))) - `(mu4e-cited-2-face ((,c :inherit message-cited-text-2))) - `(mu4e-cited-3-face ((,c :inherit message-cited-text-3))) - `(mu4e-cited-4-face ((,c :inherit message-cited-text-4))) - `(mu4e-cited-5-face ((,c :inherit message-cited-text-1))) - `(mu4e-cited-6-face ((,c :inherit message-cited-text-2))) - `(mu4e-cited-7-face ((,c :inherit message-cited-text-3))) - `(mu4e-compose-header-face ((,c :inherit mu4e-compose-separator-face))) - `(mu4e-compose-separator-face ((,c :inherit message-separator))) - `(mu4e-contact-face ((,c :inherit message-header-to))) - `(mu4e-context-face ((,c :inherit bold))) - `(mu4e-draft-face ((,c :foreground ,info))) - `(mu4e-flagged-face ((,c :foreground ,keyword))) - `(mu4e-footer-face ((,c :inherit italic :foreground ,fg-alt))) - `(mu4e-forwarded-face ((,c :inherit italic :foreground ,info))) - `(mu4e-header-face ((,c :inherit shadow))) - `(mu4e-header-highlight-face ((,c :inherit hl-line))) - `(mu4e-header-key-face ((,c :inherit message-header-name))) - `(mu4e-header-marks-face ((,c :inherit mu4e-special-header-value-face))) - `(mu4e-header-title-face ((,c :foreground ,rainbow-0))) - `(mu4e-header-value-face ((,c :inherit message-header-other))) - `(mu4e-highlight-face ((,c :inherit ef-themes-key-binding))) - `(mu4e-link-face ((,c :inherit link))) - `(mu4e-modeline-face (( ))) - `(mu4e-moved-face ((,c :inherit italic :foreground ,warning))) - `(mu4e-ok-face ((,c :inherit success))) - `(mu4e-region-code ((,c :foreground ,builtin))) - `(mu4e-related-face ((,c :inherit (italic shadow)))) - `(mu4e-replied-face ((,c :foreground ,info))) - `(mu4e-special-header-value-face ((,c :inherit message-header-subject))) - `(mu4e-system-face ((,c :inherit italic))) - `(mu4e-thread-fold-face ((,c :foreground ,border))) - `(mu4e-title-face (( ))) - `(mu4e-trashed-face ((,c :foreground ,err))) - `(mu4e-unread-face ((,c :inherit bold))) - `(mu4e-url-number-face ((,c :inherit shadow))) - `(mu4e-view-body-face (( ))) - `(mu4e-warning-face ((,c :inherit warning))) -;;;; nerd-icons - `(nerd-icons-blue ((,c :foreground ,blue-cooler))) - `(nerd-icons-blue-alt ((,c :foreground ,blue-warmer))) - `(nerd-icons-cyan ((,c :foreground ,cyan))) - `(nerd-icons-cyan-alt ((,c :foreground ,cyan-warmer))) - `(nerd-icons-dblue ((,c :foreground ,blue-faint))) - `(nerd-icons-dcyan ((,c :foreground ,cyan-faint))) - `(nerd-icons-dgreen ((,c :foreground ,green-faint))) - `(nerd-icons-dmaroon ((,c :foreground ,magenta-faint))) - `(nerd-icons-dorange ((,c :foreground ,red-faint))) - `(nerd-icons-dpink ((,c :foreground ,magenta-faint))) - `(nerd-icons-dpurple ((,c :foreground ,magenta-cooler))) - `(nerd-icons-dred ((,c :foreground ,red))) - `(nerd-icons-dsilver ((,c :foreground ,cyan-faint))) - `(nerd-icons-dyellow ((,c :foreground ,yellow-faint))) - `(nerd-icons-green ((,c :foreground ,green))) - `(nerd-icons-lblue ((,c :foreground ,blue-cooler))) - `(nerd-icons-lcyan ((,c :foreground ,cyan))) - `(nerd-icons-lgreen ((,c :foreground ,green-warmer))) - `(nerd-icons-lmaroon ((,c :foreground ,magenta-warmer))) - `(nerd-icons-lorange ((,c :foreground ,red-warmer))) - `(nerd-icons-lpink ((,c :foreground ,magenta))) - `(nerd-icons-lpurple ((,c :foreground ,magenta-faint))) - `(nerd-icons-lred ((,c :foreground ,red-faint))) - `(nerd-icons-lsilver ((,c :foreground "gray50"))) - `(nerd-icons-lyellow ((,c :foreground ,yellow-warmer))) - `(nerd-icons-maroon ((,c :foreground ,magenta))) - `(nerd-icons-orange ((,c :foreground ,yellow-warmer))) - `(nerd-icons-pink ((,c :foreground ,magenta-warmer))) - `(nerd-icons-purple ((,c :foreground ,magenta-cooler))) - `(nerd-icons-purple-alt ((,c :foreground ,blue-warmer))) - `(nerd-icons-red ((,c :foreground ,red))) - `(nerd-icons-red-alt ((,c :foreground ,red-cooler))) - `(nerd-icons-silver ((,c :foreground "gray50"))) - `(nerd-icons-yellow ((,c :foreground ,yellow))) -;;;;; nerd-icons-completion - `(nerd-icons-completion-dir-face ((,c :foreground ,accent-0))) -;;;; nerd-icons-dired - `(nerd-icons-dired-dir-face ((,c :foreground ,accent-0))) -;;;; nerd-icons-ibuffer - `(nerd-icons-ibuffer-dir-face ((,c :foreground ,accent-0))) - `(nerd-icons-ibuffer-file-face ((,c :foreground ,docstring))) - `(nerd-icons-ibuffer-mode-face ((,c :foreground ,type))) - `(nerd-icons-ibuffer-size-face ((,c :foreground ,variable))) -;;;; neotree - `(neo-banner-face ((,c :foreground ,accent-0))) - `(neo-button-face ((,c :inherit button))) - `(neo-dir-link-face (( ))) - `(neo-expand-btn-face (( ))) - `(neo-file-link-face (( ))) - `(neo-header-face ((,c :inherit bold))) - `(neo-root-dir-face ((,c :inherit bold :foreground ,accent-0))) - `(neo-vc-added-face ((,c :inherit success))) - `(neo-vc-conflict-face ((,c :inherit error))) - `(neo-vc-default-face (( ))) - `(neo-vc-edited-face ((,c :inherit italic))) - `(neo-vc-ignored-face ((,c :inherit shadow))) - `(neo-vc-missing-face ((,c :inherit error))) - `(neo-vc-needs-merge-face ((,c :inherit italic))) - `(neo-vc-needs-update-face ((,c :underline t))) - `(neo-vc-removed-face ((,c :strike-through t))) - `(neo-vc-unlocked-changes-face ((,c :inherit success))) - `(neo-vc-up-to-date-face (( ))) - `(neo-vc-user-face ((,c :inherit warning))) -;;;; notmuch - `(notmuch-crypto-decryption ((,c :inherit bold))) - `(notmuch-crypto-part-header ((,c :foreground ,mail-part))) ; like `message-mml' - `(notmuch-crypto-signature-bad ((,c :inherit error))) - `(notmuch-crypto-signature-good ((,c :inherit success))) - `(notmuch-crypto-signature-good-key ((,c :inherit success))) - `(notmuch-crypto-signature-unknown ((,c :inherit warning))) - `(notmuch-jump-key ((,c :inherit ef-themes-key-binding))) - `(notmuch-message-summary-face - ((default :inherit bold :background ,bg-alt) - (((supports :overline t)) - :overline ,border))) - `(notmuch-search-count ((,c :foreground ,fg-dim))) - `(notmuch-search-date ((,c :foreground ,date-common))) - `(notmuch-search-flagged-face ((,c :foreground ,keyword))) - `(notmuch-search-matching-authors ((,c :foreground ,mail-recipient))) - `(notmuch-search-non-matching-authors ((,c :inherit shadow))) - `(notmuch-search-subject ((,c :foreground ,fg-main))) - `(notmuch-search-unread-face ((,c :inherit bold))) - `(notmuch-tag-added ((,c :underline ,underline-info))) - `(notmuch-tag-deleted ((,c :strike-through ,underline-err))) - `(notmuch-tag-face ((,c :foreground ,accent-0))) - `(notmuch-tag-flagged ((,c :foreground ,keyword))) - `(notmuch-tag-unread ((,c :foreground ,accent-1))) - `(notmuch-tree-match-author-face ((,c :inherit notmuch-search-matching-authors))) - `(notmuch-tree-match-date-face ((,c :inherit notmuch-search-date))) - `(notmuch-tree-match-face ((,c :foreground ,fg-main))) - `(notmuch-tree-match-tag-face ((,c :inherit notmuch-tag-face))) - `(notmuch-tree-no-match-face ((,c :inherit shadow))) - `(notmuch-tree-no-match-date-face ((,c :inherit shadow))) - `(notmuch-wash-cited-text ((,c :inherit message-cited-text-1))) - `(notmuch-wash-toggle-button ((,c :background ,bg-dim :foreground ,fg-alt))) -;;;; olivetti - `(olivetti-fringe ((,c :background ,bg-fringe))) -;;;; orderless - `(orderless-match-face-0 ((,c :inherit bold :foreground ,accent-0))) - `(orderless-match-face-1 ((,c :inherit bold :foreground ,accent-1))) - `(orderless-match-face-2 ((,c :inherit bold :foreground ,accent-2))) - `(orderless-match-face-3 ((,c :inherit bold :foreground ,accent-3))) -;;;; org - `(org-agenda-calendar-daterange ((,c :foreground ,date-range))) - `(org-agenda-calendar-event ((,c :foreground ,date-event))) - `(org-agenda-calendar-sexp ((,c :inherit (italic org-agenda-calendar-event)))) - `(org-agenda-clocking ((,c :background ,bg-warning :foreground ,warning))) - `(org-agenda-column-dateline ((,c :background ,bg-alt))) - `(org-agenda-current-time ((,c :foreground ,date-now))) - `(org-agenda-date ((,c ,@(ef-themes--heading 'agenda-date) :foreground ,date-weekday))) - `(org-agenda-date-today ((,c :inherit org-agenda-date :underline t))) - `(org-agenda-date-weekend ((,c :inherit org-agenda-date :foreground ,date-weekend))) - `(org-agenda-date-weekend-today ((,c :inherit org-agenda-date-today :foreground ,date-weekend))) - `(org-agenda-diary ((,c :inherit org-agenda-calendar-sexp))) - `(org-agenda-dimmed-todo-face ((,c :inherit shadow))) - `(org-agenda-done ((,c :inherit org-done))) - `(org-agenda-filter-category ((,c :inherit bold :foreground ,modeline-err))) - `(org-agenda-filter-effort ((,c :inherit bold :foreground ,modeline-err))) - `(org-agenda-filter-regexp ((,c :inherit bold :foreground ,modeline-err))) - `(org-agenda-filter-tags ((,c :inherit bold :foreground ,modeline-err))) - `(org-agenda-restriction-lock ((,c :background ,bg-dim :foreground ,fg-dim))) - `(org-agenda-structure ((,c ,@(ef-themes--heading 'agenda-structure) :foreground ,fg-alt))) - `(org-agenda-structure-filter ((,c :inherit org-agenda-structure :foreground ,warning))) - `(org-agenda-structure-secondary ((,c :inherit font-lock-doc-face))) - `(org-archived ((,c :background ,bg-alt :foreground ,fg-main))) - `(org-block ((,c :inherit ef-themes-fixed-pitch :background ,bg-inactive :extend t))) - `(org-block-begin-line ((,c :inherit (shadow ef-themes-fixed-pitch) :background ,bg-dim :extend t))) - `(org-block-end-line ((,c :inherit org-block-begin-line))) - `(org-checkbox ((,c :inherit ef-themes-fixed-pitch :foreground ,warning))) - `(org-checkbox-statistics-done ((,c :inherit org-done))) - `(org-checkbox-statistics-todo ((,c :inherit org-todo))) - `(org-clock-overlay ((,c :background ,bg-hover-secondary))) - `(org-code ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-code))) - `(org-column ((,c :inherit default :background ,bg-alt))) - `(org-column-title ((,c :inherit (ef-themes-fixed-pitch bold default) :underline t :background ,bg-alt))) - `(org-date ((,c :inherit ef-themes-fixed-pitch :foreground ,date-common))) - `(org-date-selected ((,c :inherit calendar-today))) - `(org-dispatcher-highlight ((,c :inherit warning :background ,bg-warning))) - `(org-document-info ((,c :foreground ,prose-metadata-value))) - `(org-document-info-keyword ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-metadata))) - `(org-document-title ((,c :inherit ef-themes-heading-0))) - `(org-done ((,c :foreground ,prose-done))) - `(org-drawer ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-metadata))) - `(org-ellipsis (( ))) ; inherits from the heading's color - `(org-footnote ((,c :inherit link))) - `(org-formula ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-table-formula))) - `(org-headline-done ((,c :inherit org-done))) - `(org-headline-todo ((,c :inherit org-todo))) - `(org-hide ((,c :foreground ,bg-main))) - `(org-indent ((,c :inherit (fixed-pitch org-hide)))) - `(org-imminent-deadline ((,c :inherit bold :foreground ,date-deadline))) - `(org-latex-and-related ((,c :foreground ,type))) - `(org-level-1 ((,c :inherit ef-themes-heading-1))) - `(org-level-2 ((,c :inherit ef-themes-heading-2))) - `(org-level-3 ((,c :inherit ef-themes-heading-3))) - `(org-level-4 ((,c :inherit ef-themes-heading-4))) - `(org-level-5 ((,c :inherit ef-themes-heading-5))) - `(org-level-6 ((,c :inherit ef-themes-heading-6))) - `(org-level-7 ((,c :inherit ef-themes-heading-7))) - `(org-level-8 ((,c :inherit ef-themes-heading-8))) - `(org-link ((,c :inherit link))) - `(org-list-dt ((,c :inherit bold))) - `(org-macro ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-macro))) - `(org-meta-line ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-metadata))) - `(org-mode-line-clock (( ))) - `(org-mode-line-clock-overrun ((,c :inherit bold :foreground ,modeline-err))) - `(org-priority ((,c :foreground ,prose-tag))) - `(org-property-value ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-metadata-value))) - `(org-quote ((,c :inherit org-block))) - `(org-scheduled ((,c :foreground ,date-scheduled-subtle))) - `(org-scheduled-previously ((,c :inherit (bold org-scheduled-today)))) - `(org-scheduled-today ((,c :foreground ,date-scheduled))) - `(org-sexp-date ((,c :foreground ,date-common))) - `(org-special-keyword ((,c :inherit (shadow ef-themes-fixed-pitch)))) - `(org-table ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-table))) - `(org-table-header ((,c :inherit (bold org-table)))) - `(org-tag ((,c :foreground ,prose-tag))) - `(org-tag-group ((,c :inherit (bold org-tag)))) - `(org-target ((,c :underline t))) - `(org-time-grid ((,c :foreground ,fg-dim))) - `(org-todo ((,c :foreground ,prose-todo))) - `(org-upcoming-deadline ((,c :foreground ,date-deadline-subtle))) - `(org-upcoming-distant-deadline ((,c :foreground ,fg-main))) - `(org-verbatim ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-verbatim))) - `(org-verse ((,c :inherit org-block))) - `(org-warning ((,c :inherit warning))) -;;;; org-habit - `(org-habit-alert-face ((,c :background ,bg-graph-yellow-0 :foreground "black"))) ; special case - `(org-habit-alert-future-face ((,c :background ,bg-graph-yellow-1))) - `(org-habit-clear-face ((,c :background ,bg-graph-blue-0 :foreground "black"))) ; special case - `(org-habit-clear-future-face ((,c :background ,bg-graph-blue-1))) - `(org-habit-overdue-face ((,c :background ,bg-graph-red-0))) - `(org-habit-overdue-future-face ((,c :background ,bg-graph-red-1))) - `(org-habit-ready-face ((,c :background ,bg-graph-green-0 :foreground "black"))) ; special case - `(org-habit-ready-future-face ((,c :background ,bg-graph-green-1))) -;;;; outline-mode - `(outline-1 ((,c :inherit ef-themes-heading-1))) - `(outline-2 ((,c :inherit ef-themes-heading-2))) - `(outline-3 ((,c :inherit ef-themes-heading-3))) - `(outline-4 ((,c :inherit ef-themes-heading-4))) - `(outline-5 ((,c :inherit ef-themes-heading-5))) - `(outline-6 ((,c :inherit ef-themes-heading-6))) - `(outline-7 ((,c :inherit ef-themes-heading-7))) - `(outline-8 ((,c :inherit ef-themes-heading-8))) -;;;; outline-minor-faces - `(outline-minor-0 (( ))) -;;;; package (M-x list-packages) - `(package-description ((,c :foreground ,docstring))) - `(package-help-section-name ((,c :inherit bold))) - `(package-mark-delete-line ((,c :inherit ef-themes-mark-delete))) - `(package-mark-install-line ((,c :inherit ef-themes-mark-select))) - `(package-name ((,c :inherit link))) - `(package-status-available ((,c :foreground ,date-common))) - `(package-status-avail-obso ((,c :inherit error))) - `(package-status-built-in ((,c :foreground ,builtin))) - `(package-status-dependency ((,c :foreground ,warning))) - `(package-status-disabled ((,c :inherit error :strike-through t))) - `(package-status-from-source ((,c :foreground ,type))) - `(package-status-held ((,c :foreground ,warning))) - `(package-status-incompat ((,c :inherit warning))) - `(package-status-installed ((,c :foreground ,fg-alt))) - `(package-status-new ((,c :inherit success))) - `(package-status-unsigned ((,c :inherit error))) -;;;; perspective - `(persp-selected-face ((,c :inherit mode-line-emphasis))) -;;;; proced - `(proced-cpu ((,c :foreground ,keyword))) - `(proced-emacs-pid ((,c :foreground ,identifier :underline t))) - `(proced-executable ((,c :foreground ,name))) - `(proced-interruptible-sleep-status-code ((,c :inherit shadow))) - `(proced-mem ((,c :foreground ,type))) - `(proced-memory-high-usage ((,c :foreground ,err))) - `(proced-memory-low-usage ((,c :foreground ,info))) - `(proced-memory-medium-usage ((,c :foreground ,warning))) - `(proced-pgrp ((,c :inherit proced-pid))) - `(proced-pid ((,c :foreground ,identifier))) - `(proced-ppid ((,c :inherit proced-pid))) - `(proced-run-status-code ((,c :inherit success))) - `(proced-sess ((,c :inherit proced-pid))) - `(proced-session-leader-pid ((,c :inherit bold :foreground ,identifier))) - `(proced-time-colon (( ))) - `(proced-uninterruptible-sleep-status-code ((,c :inherit error))) - `(proced-user (( ))) -;;;; powerline - `(powerline-active0 ((,c :background ,fg-dim :foreground ,bg-main))) - `(powerline-active1 ((,c :inherit mode-line))) - `(powerline-active2 ((,c :inherit mode-line-inactive))) - `(powerline-inactive0 ((,c :background ,bg-active :foreground ,fg-dim))) - `(powerline-inactive1 ((,c :background ,bg-main :foreground ,fg-dim))) - `(powerline-inactive2 ((,c :inherit mode-line-inactive))) -;;;; pulsar - `(pulsar-blue ((,c :background ,bg-blue-subtle))) - `(pulsar-cyan ((,c :background ,bg-cyan-subtle))) - `(pulsar-green ((,c :background ,bg-green-subtle))) - `(pulsar-magenta ((,c :background ,bg-magenta-subtle))) - `(pulsar-red ((,c :background ,bg-red-subtle))) - `(pulsar-yellow ((,c :background ,bg-yellow-subtle))) -;;;; pulse - `(pulse-highlight-start-face ((,c :background ,bg-blue-subtle))) -;;;; rainbow-delimiters - `(rainbow-delimiters-base-error-face ((,c :inherit (bold rainbow-delimiters-mismatched-face)))) - `(rainbow-delimiters-base-face ((,c :foreground ,rainbow-0))) - `(rainbow-delimiters-depth-1-face ((,c :foreground ,rainbow-0))) - `(rainbow-delimiters-depth-2-face ((,c :foreground ,rainbow-1))) - `(rainbow-delimiters-depth-3-face ((,c :foreground ,rainbow-2))) - `(rainbow-delimiters-depth-4-face ((,c :foreground ,rainbow-3))) - `(rainbow-delimiters-depth-5-face ((,c :foreground ,rainbow-4))) - `(rainbow-delimiters-depth-6-face ((,c :foreground ,rainbow-5))) - `(rainbow-delimiters-depth-7-face ((,c :foreground ,rainbow-6))) - `(rainbow-delimiters-depth-8-face ((,c :foreground ,rainbow-7))) - `(rainbow-delimiters-depth-9-face ((,c :foreground ,rainbow-8))) - `(rainbow-delimiters-mismatched-face ((,c :background ,bg-red-intense :foreground ,fg-intense))) - `(rainbow-delimiters-unmatched-face ((,c :inherit (bold rainbow-delimiters-mismatched-face)))) -;;;; rcirc - `(rcirc-bright-nick ((,c :inherit bold :foreground ,fg-intense))) - `(rcirc-dim-nick ((,c :inherit shadow))) - `(rcirc-monospace-text ((,c :inherit fixed-pitch))) - `(rcirc-my-nick ((,c :inherit bold :foreground ,accent-1))) - `(rcirc-nick-in-message ((,c :inherit rcirc-my-nick))) - `(rcirc-nick-in-message-full-line ((,c :inherit rcirc-my-nick))) - `(rcirc-other-nick ((,c :inherit bold :foreground ,accent-0))) - `(rcirc-prompt ((,c :inherit minibuffer-prompt))) - `(rcirc-server ((,c :inherit font-lock-comment-face))) - `(rcirc-timestamp ((,c :foreground ,date-common))) - `(rcirc-track-keyword ((,c :inherit bold :foreground ,modeline-warning))) - `(rcirc-track-nick ((,c :inherit rcirc-my-nick))) - `(rcirc-url ((,c :inherit link))) -;;;; recursion-indicator - `(recursion-indicator-general ((,c :foreground ,modeline-err))) - `(recursion-indicator-minibuffer ((,c :foreground ,modeline-info))) -;;;; regexp-builder (re-builder) - `(reb-match-0 ((,c :inherit ef-themes-search-rx-group-0))) - `(reb-match-1 ((,c :inherit ef-themes-search-rx-group-1))) - `(reb-match-2 ((,c :inherit ef-themes-search-rx-group-2))) - `(reb-match-3 ((,c :inherit ef-themes-search-rx-group-3))) - `(reb-regexp-grouping-backslash ((,c :inherit font-lock-regexp-grouping-backslash))) - `(reb-regexp-grouping-construct ((,c :inherit font-lock-regexp-grouping-construct))) -;;;; rst-mode - `(rst-level-1 ((,c :inherit ef-themes-heading-1))) - `(rst-level-2 ((,c :inherit ef-themes-heading-2))) - `(rst-level-3 ((,c :inherit ef-themes-heading-3))) - `(rst-level-4 ((,c :inherit ef-themes-heading-4))) - `(rst-level-5 ((,c :inherit ef-themes-heading-5))) - `(rst-level-6 ((,c :inherit ef-themes-heading-6))) -;;;; ruler-mode - `(ruler-mode-column-number ((,c :inherit ruler-mode-default))) - `(ruler-mode-comment-column ((,c :inherit ruler-mode-default :foreground ,red))) - `(ruler-mode-current-column ((,c :inherit ruler-mode-default :background ,bg-active :foreground ,fg-intense))) - `(ruler-mode-default ((,c :inherit default :background ,bg-dim :foreground ,fg-dim))) - `(ruler-mode-fill-column ((,c :inherit ruler-mode-default :foreground ,green))) - `(ruler-mode-fringes ((,c :inherit ruler-mode-default :foreground ,cyan))) - `(ruler-mode-goal-column ((,c :inherit ruler-mode-default :foreground ,blue))) - `(ruler-mode-margins ((,c :inherit ruler-mode-default :foreground ,bg-main))) - `(ruler-mode-pad ((,c :inherit ruler-mode-default :background ,bg-alt :foreground ,fg-dim))) - `(ruler-mode-tab-stop ((,c :inherit ruler-mode-default :foreground ,yellow))) -;;;; shortdoc - `(shortdoc-heading ((,c :inherit bold))) - `(shortdoc-section (())) ; remove the default's variable-pitch style -;;;; show-paren-mode - `(show-paren-match ((,c :background ,bg-paren :foreground ,fg-intense))) - `(show-paren-match-expression ((,c :background ,bg-alt))) - `(show-paren-mismatch ((,c :background ,bg-red-intense :foreground ,fg-intense))) -;;;; shell-script-mode (sh-mode) - `(sh-heredoc ((,c :inherit font-lock-doc-face))) - `(sh-quoted-exec ((,c :inherit font-lock-builtin-face))) -;;;; shr - `(shr-code ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-code))) - `(shr-h1 ((,c :inherit ef-themes-heading-1))) - `(shr-h2 ((,c :inherit ef-themes-heading-2))) - `(shr-h3 ((,c :inherit ef-themes-heading-3))) - `(shr-h4 ((,c :inherit ef-themes-heading-4))) - `(shr-h5 ((,c :inherit ef-themes-heading-5))) - `(shr-h6 ((,c :inherit ef-themes-heading-6))) - `(shr-mark ((,c :inherit match))) - `(shr-selected-link ((,c :inherit link :background ,bg-dim))) -;;;; smerge - `(smerge-base ((,c :inherit diff-changed))) - `(smerge-lower ((,c :inherit diff-added))) - `(smerge-markers ((,c :inherit diff-header))) - `(smerge-refined-added ((,c :inherit diff-refine-added))) - `(smerge-refined-changed (( ))) - `(smerge-refined-removed ((,c :inherit diff-refine-removed))) - `(smerge-upper ((,c :inherit diff-removed))) -;;;; spacious-padding - `(spacious-padding-line-active ((,c :foreground ,accent-0))) - `(spacious-padding-line-inactive ((,c :foreground ,border))) - `(spacious-padding-subtle-mode-line-active ((,c :foreground ,accent-0))) - `(spacious-padding-subtle-mode-line-inactive ((,c :foreground ,border))) -;;;; tab-bar-mode - `(tab-bar ((,c :inherit ef-themes-ui-variable-pitch :background ,bg-tab-bar))) - `(tab-bar-tab-group-current ((,c :inherit bold :background ,bg-tab-current :box (:line-width -2 :color ,bg-tab-current) :foreground ,fg-alt))) - `(tab-bar-tab-group-inactive ((,c :background ,bg-tab-bar :box (:line-width -2 :color ,bg-tab-bar) :foreground ,fg-alt))) - `(tab-bar-tab ((,c :inherit bold :box (:line-width -2 :color ,bg-tab-current) :background ,bg-tab-current))) - `(tab-bar-tab-highlight ((,c :inherit highlight))) - `(tab-bar-tab-inactive ((,c :box (:line-width -2 :color ,bg-tab-other) :background ,bg-tab-other))) - `(tab-bar-tab-ungrouped ((,c :inherit tab-bar-tab-inactive))) -;;;; tab-line-mode - `(tab-line ((,c :inherit ef-themes-ui-variable-pitch :background ,bg-tab-bar :height 0.95))) - `(tab-line-close-highlight ((,c :foreground ,err))) - `(tab-line-highlight ((,c :inherit highlight))) - `(tab-line-tab (( ))) - `(tab-line-tab-current ((,c :inherit bold :box (:line-width -2 :color ,bg-tab-current) :background ,bg-tab-current))) - `(tab-line-tab-inactive ((,c :box (:line-width -2 :color ,bg-tab-other) :background ,bg-tab-other))) - `(tab-line-tab-inactive-alternate ((,c :inherit tab-line-tab-inactive :foreground ,fg-alt))) - `(tab-line-tab-modified ((,c :foreground ,warning))) -;;;; tempel - `(tempel-default ((,c :inherit italic :background ,bg-alt :foreground ,fg-alt))) - `(tempel-field ((,c :background ,bg-info :foreground ,info))) - `(tempel-form ((,c :background ,bg-err :foreground ,err))) -;;;; term - ;; NOTE 2023-08-10: `term-color-black' and `term-color-white' use - ;; the "bright" semantic color mappings to make sure they are - ;; distinct from `term'. - `(term ((,c :background ,bg-main :foreground ,fg-main))) - `(term-bold ((,c :inherit bold))) - `(term-color-black ((,c :background ,bg-term-black-bright :foreground ,fg-term-black-bright))) - `(term-color-blue ((,c :background ,bg-term-blue :foreground ,fg-term-blue))) - `(term-color-cyan ((,c :background ,bg-term-cyan :foreground ,fg-term-cyan))) - `(term-color-green ((,c :background ,bg-term-green :foreground ,fg-term-green))) - `(term-color-magenta ((,c :background ,bg-term-magenta :foreground ,fg-term-magenta))) - `(term-color-red ((,c :background ,bg-term-red :foreground ,fg-term-red))) - `(term-color-white ((,c :background ,bg-term-white-bright :foreground ,fg-term-white-bright))) - `(term-color-yellow ((,c :background ,bg-term-yellow :foreground ,fg-term-yellow))) - `(term-underline ((,c :underline t))) -;;;; textsec - `(textsec-suspicious (( ))) -;;;; tldr - `(tldr-code-block (( ))) - `(tldr-command-argument ((,c :inherit font-lock-string-face))) - `(tldr-command-itself ((,c :inherit font-lock-builtin-face))) - `(tldr-description ((,c :inherit font-lock-doc-face))) - `(tldr-introduction ((,c :inherit font-lock-comment-face))) - `(tldr-title ((,c :inherit bold))) -;;;; tmr - `(tmr-mode-line-active ((,c :inherit bold :foreground ,modeline-info))) - `(tmr-mode-line-soon ((,c :inherit bold :foreground ,modeline-warning))) - `(tmr-mode-line-urgent ((,c :inherit bold :foreground ,modeline-err))) - `(tmr-tabulated-description ((,c :foreground ,docstring))) - `(tmr-tabulated-end-time ((,c :foreground ,date-deadline))) - `(tmr-tabulated-remaining-time ((,c :foreground ,date-scheduled))) - `(tmr-tabulated-start-time ((,c :foreground ,date-common))) -;;;; transient - `(transient-active-infix ((,c :background ,bg-active :foreground ,fg-intense))) - `(transient-amaranth ((,c :inherit bold :foreground ,yellow-warmer))) - ;; Placate the compiler for what is a spurious warning. We also - ;; have to do this with `eldoc-highlight-function-argument'. - (list 'transient-argument `((,c :inherit warning :background ,bg-warning))) - `(transient-blue ((,c :inherit bold :foreground ,blue-cooler))) - `(transient-disabled-suffix ((,c :strike-through t))) - `(transient-enabled-suffix ((,c :inherit success :background ,bg-info))) - `(transient-heading ((,c :inherit bold))) - `(transient-inactive-argument ((,c :inherit shadow))) - `(transient-inactive-value ((,c :inherit shadow))) - ;; NOTE 2023-12-09 10:30:09 +0200: The new user option - ;; `transient-semantic-coloring' is enabled by default. This is - ;; not good for us, because we are making it harder for users who - ;; need accessible colors to use the transient interfaces. I - ;; could set that user option to nil, but I think it is less - ;; intrusive to enforce uniformity among the relevant faces. - ;; Those who want semantic coloring can modify these faces. - `(transient-key ((,c :inherit ef-themes-key-binding))) - `(transient-key-exit ((,c :inherit ef-themes-key-binding))) - `(transient-key-noop ((,c :inherit (shadow ef-themes-key-binding)))) - `(transient-key-recurse ((,c :inherit ef-themes-key-binding))) - `(transient-key-return ((,c :inherit ef-themes-key-binding))) - `(transient-key-stack ((,c :inherit ef-themes-key-binding))) - `(transient-key-stay ((,c :inherit ef-themes-key-binding))) - `(transient-mismatched-key ((,c :underline t))) - `(transient-nonstandard-key ((,c :underline t))) - `(transient-pink ((,c :inherit bold :foreground ,magenta))) - `(transient-purple ((,c :inherit bold :foreground ,magenta-cooler))) - `(transient-red ((,c :inherit bold :foreground ,red))) - `(transient-teal ((,c :inherit bold :foreground ,cyan-cooler))) - `(transient-unreachable ((,c :inherit shadow))) - `(transient-unreachable-key ((,c :inherit shadow))) - `(transient-value ((,c :inherit success :background ,bg-info))) -;;;; trashed - `(trashed-restored ((,c :inherit ef-themes-mark-other))) -;;;; tree-sitter - `(tree-sitter-hl-face:attribute ((,c :inherit font-lock-variable-name-face))) - `(tree-sitter-hl-face:constant.builtin ((,c :inherit tree-sitter-hl-face:constant))) - `(tree-sitter-hl-face:escape ((,c :inherit font-lock-regexp-grouping-backslash))) - `(tree-sitter-hl-face:function ((,c :inherit font-lock-function-name-face))) - `(tree-sitter-hl-face:function.call ((,c :inherit tree-sitter-hl-face:function))) - `(tree-sitter-hl-face:label (( ))) - `(tree-sitter-hl-face:method.call (( ))) - `(tree-sitter-hl-face:operator ((,c :inherit bold))) - `(tree-sitter-hl-face:property (( ))) - `(tree-sitter-hl-face:property.definition ((,c :inherit font-lock-variable-name-face))) - `(tree-sitter-hl-face:punctuation (( ))) - `(tree-sitter-hl-face:punctuation.bracket (( ))) - `(tree-sitter-hl-face:punctuation.delimiter (( ))) - `(tree-sitter-hl-face:punctuation.special ((,c :inherit font-lock-regexp-grouping-construct))) - `(tree-sitter-hl-face:string.special ((,c :inherit tree-sitter-hl-face:string))) - `(tree-sitter-hl-face:tag ((,c :inherit font-lock-function-name-face))) - `(tree-sitter-hl-face:type.argument (( ))) -;;;; tty-menu - `(tty-menu-disabled-face ((,c :background ,bg-alt :foreground ,fg-dim))) - `(tty-menu-enabled-face ((,c :background ,bg-alt :foreground ,fg-intense))) - `(tty-menu-selected-face ((,c :inherit highlight))) -;;;; vc (vc-dir.el, vc-hooks.el) - `(vc-dir-directory (( ))) - `(vc-dir-file ((,c :foreground ,name))) - `(vc-dir-header ((,c :inherit bold))) - `(vc-dir-header-value ((,c :foreground ,string))) - `(vc-dir-mark-indicator ((,c :foreground ,fg-intense))) - `(vc-dir-status-edited ((,c :inherit italic))) - `(vc-dir-status-ignored ((,c :inherit shadow))) - `(vc-dir-status-up-to-date ((,c :foreground ,info))) - `(vc-dir-status-warning ((,c :inherit error))) - `(vc-conflict-state ((,c :inherit error))) - `(vc-edited-state ((,c :inherit italic))) - `(vc-git-log-edit-summary-max-warning ((,c :foreground ,err))) - `(vc-git-log-edit-summary-target-warning ((,c :foreground ,warning))) - `(vc-locally-added-state ((,c :inherit italic))) - `(vc-locked-state ((,c :inherit success))) - `(vc-missing-state ((,c :inherit error))) - `(vc-needs-update-state ((,c :inherit error))) - `(vc-removed-state ((,c :inherit error))) - `(vc-state-base (( ))) - `(vc-up-to-date-state (( ))) -;;;; vertico - `(vertico-current ((,c :background ,bg-completion))) - `(vertico-group-title ((,c :inherit bold :foreground ,name))) -;;;; vertico-quick - `(vertico-quick1 ((,c :inherit bold :background ,bg-char-0))) - `(vertico-quick2 ((,c :inherit bold :background ,bg-char-1))) -;;;; vterm - ;; NOTE 2023-08-10: `vterm-color-black' and `vterm-color-white' - ;; use the "bright" semantic color mappings to make sure they are - ;; distinct from `vterm-color-default'. - `(vterm-color-black ((,c :background ,bg-term-black :foreground ,fg-term-black))) - `(vterm-color-blue ((,c :background ,bg-term-blue :foreground ,fg-term-blue))) - `(vterm-color-cyan ((,c :background ,bg-term-cyan :foreground ,fg-term-cyan))) - `(vterm-color-default ((,c :background ,bg-main :foreground ,fg-main))) - `(vterm-color-green ((,c :background ,bg-term-green :foreground ,fg-term-green))) - `(vterm-color-inverse-video ((,c :background ,bg-main :inverse-video t))) - `(vterm-color-magenta ((,c :background ,bg-term-magenta :foreground ,fg-term-magenta))) - `(vterm-color-red ((,c :background ,bg-term-red :foreground ,fg-term-red))) - `(vterm-color-underline ((,c :underline t))) - `(vterm-color-white ((,c :background ,bg-term-white :foreground ,fg-term-white))) - `(vterm-color-yellow ((,c :background ,bg-term-yellow :foreground ,fg-term-yellow))) -;;;; vundo - `(vundo-default ((,c :inherit shadow))) - `(vundo-highlight ((,c :inherit (bold vundo-node) :foreground ,err))) - `(vundo-last-saved ((,c :inherit (bold vundo-node) :foreground ,fg-intense))) - `(vundo-saved ((,c :inherit vundo-node :foreground ,fg-intense))) -;;;; wgrep - `(wgrep-delete-face ((,c :inherit warning))) - `(wgrep-done-face ((,c :background ,bg-info :foreground ,info))) - `(wgrep-face ((,c :inherit bold))) - `(wgrep-file-face ((,c :foreground ,fg-alt))) - `(wgrep-reject-face ((,c :background ,bg-err :foreground ,err))) -;;;; which-function-mode - `(which-func ((,c :inherit bold :foreground ,fg-intense))) ; same as `breadcrumb-imenu-leaf-face' -;;;; which-key - `(which-key-command-description-face ((,c :foreground ,fg-main))) - `(which-key-group-description-face ((,c :foreground ,keyword))) - `(which-key-highlighted-command-face ((,c :foreground ,warning :underline t))) - `(which-key-key-face ((,c :inherit ef-themes-key-binding))) - `(which-key-local-map-description-face ((,c :foreground ,fg-main))) - `(which-key-note-face ((,c :inherit shadow))) - `(which-key-separator-face ((,c :inherit shadow))) - `(which-key-special-key-face ((,c :inherit error))) -;;;; whitespace-mode - `(whitespace-big-indent ((,c :background ,bg-space-err))) - `(whitespace-empty ((,c :background ,bg-space))) - `(whitespace-hspace ((,c :background ,bg-space :foreground ,fg-space))) - `(whitespace-indentation ((,c :background ,bg-space :foreground ,fg-space))) - `(whitespace-line ((,c :background ,bg-space :foreground ,warning))) - `(whitespace-newline ((,c :background ,bg-space :foreground ,fg-space))) - `(whitespace-space ((,c :background ,bg-space :foreground ,fg-space))) - `(whitespace-space-after-tab ((,c :inherit warning :background ,bg-space))) - `(whitespace-space-before-tab ((,c :inherit warning :background ,bg-space))) - `(whitespace-tab ((,c :background ,bg-space :foreground ,fg-space))) - `(whitespace-trailing ((,c :background ,bg-space-err))) -;;;; widget - `(widget-button ((,c :inherit bold :foreground ,link))) - `(widget-button-pressed ((,c :inherit widget-button :foreground ,link-alt))) - `(widget-documentation ((,c :inherit font-lock-doc-face))) - `(widget-field ((,c :background ,bg-alt :foreground ,fg-main :extend nil))) - `(widget-inactive ((,c :inherit shadow :background ,bg-dim))) - `(widget-single-line-field ((,c :inherit widget-field))) -;;;; window-divider-mode - `(window-divider ((,c :foreground ,border))) - `(window-divider-first-pixel ((,c :foreground ,bg-inactive))) - `(window-divider-last-pixel ((,c :foreground ,bg-inactive))) -;;;; window-tool-bar-mode - `(window-tool-bar-button ((,c :inherit ef-themes-button))) - `(window-tool-bar-button-hover ((,c :inherit (highlight ef-themes-button)))) - `(window-tool-bar-button-disabled ((,c :inherit ef-themes-button :background ,bg-dim :foreground ,fg-dim))) -;;;; writegood-mode - `(writegood-duplicates-face ((,c :inherit ef-themes-underline-error))) - `(writegood-passive-voice-face ((,c :inherit ef-themes-underline-info))) - `(writegood-weasels-face ((,c :inherit ef-themes-underline-warning))) -;;;; woman - `(woman-addition ((,c :foreground ,accent-2))) - `(woman-bold ((,c :inherit bold :foreground ,accent-0))) - `(woman-italic ((,c :inherit italic :foreground ,accent-1))) - `(woman-unknown ((,c :foreground ,accent-3))) -;;;; ztree - `(ztreep-arrow-face ((,c :inherit shadow))) - `(ztreep-diff-header-face ((,c :inherit ef-themes-heading-0))) - `(ztreep-diff-header-small-face ((,c :inherit font-lock-doc-face))) - `(ztreep-diff-model-add-face ((,c :foreground ,info))) - `(ztreep-diff-model-diff-face ((,c :foreground ,err))) - `(ztreep-diff-model-ignored-face ((,c :foreground ,fg-dim :strike-through t))) - `(ztreep-diff-model-normal-face (( ))) - `(ztreep-expand-sign-face ((,c :inherit shadow))) - `(ztreep-header-face ((,c :inherit ef-themes-heading-0))) - `(ztreep-leaf-face (( ))) - `(ztreep-node-count-children-face ((,c :inherit (shadow italic)))) - `(ztreep-node-face ((,c :foreground ,accent-0)))) - "Face specs for use with `ef-themes-theme'.") - -(defconst ef-themes-custom-variables - '( -;;;; 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 - ,bg-graph-red-1 ,bg-graph-green-1 ,bg-graph-yellow-1 ,bg-graph-blue-1 ,bg-graph-magenta-1 ,bg-graph-cyan-1)) -;;;; flymake fringe indicators - `(flymake-error-bitmap '(flymake-double-exclamation-mark ef-themes-mark-delete)) - `(flymake-warning-bitmap '(exclamation-mark ef-themes-mark-other)) - `(flymake-note-bitmap '(exclamation-mark ef-themes-mark-select)) -;;;; ibuffer - `(ibuffer-deletion-face 'ef-themes-mark-delete) - `(ibuffer-filter-group-name-face 'bold) - `(ibuffer-marked-face 'ef-themes-mark-select) - `(ibuffer-title-face 'default) -;;; pdf-tools - `(pdf-view-midnight-colors '(,fg-main . ,bg-dim))) - "Custom variables for `ef-themes-theme'.") - -;;; Theme macros - -;;;; Instantiate an Ef theme - -;;;###autoload -(defmacro ef-themes-theme (name palette &optional overrides) - "Bind NAME's color PALETTE around face specs and variables. -Face specifications are passed to `custom-theme-set-faces'. -While variables are handled by `custom-theme-set-variables'. -Those are stored in `ef-themes-faces' and -`ef-themes-custom-variables' respectively. - -Optional OVERRIDES are appended to PALETTE, overriding -corresponding entries." - (declare (indent 0)) - (let ((sym (gensym)) - (colors (mapcar #'car (symbol-value palette)))) - `(let* ((c '((class color) (min-colors 256))) - (,sym (ef-themes--palette-value ',name ',overrides)) - ,@(mapcar (lambda (color) - (list color - `(ef-themes--retrieve-palette-value ',color ,sym))) - colors)) - (custom-theme-set-faces ',name ,@ef-themes-faces) - (custom-theme-set-variables ',name ,@ef-themes-custom-variables)))) - -;;;; Use theme colors - -(defmacro ef-themes-with-colors (&rest body) - "Evaluate BODY with colors from current palette bound." - (declare (indent 0)) - (let* ((sym (gensym)) - ;; NOTE 2022-08-23: We just give it a sample palette at this - ;; stage. It only needs to collect each car. Then we - ;; instantiate the actual theme's palette. We have to do this - ;; otherwise the macro does not work properly when called from - ;; inside a function. - (colors (mapcar #'car (ef-themes--current-theme-palette)))) - `(let* ((c '((class color) (min-colors 256))) - (,sym (ef-themes--current-theme-palette :overrides)) - ,@(mapcar (lambda (color) - (list color - `(ef-themes--retrieve-palette-value ',color ,sym))) - colors)) - (ignore c ,@colors) ; Silence unused variable warnings - ,@body))) +(dolist (theme modus-themes-items) + (unless (custom-theme-p theme) + (custom-declare-theme theme 'modus-themes) + (provide-theme theme) + (load-theme theme t t))) ;;;; Add themes from package to path diff --git a/ef-trio-dark-theme.el b/ef-trio-dark-theme.el index e3f69f5..28bbc43 100644 --- a/ef-trio-dark-theme.el +++ b/ef-trio-dark-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-trio-dark - "Legible dark theme with magenta, blue, teal colors." - :background-mode 'dark - :kind 'color-scheme - :family 'ef) - - (defconst ef-trio-dark-palette - '( -;;; Basic values - - (bg-main "#160f0f") - (fg-main "#d8cfd5") - (bg-dim "#2a2228") - (fg-dim "#908890") - (bg-alt "#362f35") - (fg-alt "#afdacf") - - (bg-active "#564f55") - (bg-inactive "#1c1719") - -;;; Basic hues for foreground values - - (red "#f48359") - (red-warmer "#ff7560") - (red-cooler "#ff85aa") - (red-faint "#e07a9a") - (green "#60b444") - (green-warmer "#a0c27f") - (green-cooler "#60bf88") - (green-faint "#61a06c") - (yellow "#d4a052") - (yellow-warmer "#ef926f") - (yellow-cooler "#ef9680") - (yellow-faint "#c7a07f") - (blue "#7fa5f6") - (blue-warmer "#8895ff") - (blue-cooler "#72afff") - (blue-faint "#7a94df") - (magenta "#d37faf") - (magenta-warmer "#e772df") - (magenta-cooler "#a698ef") - (magenta-faint "#c9addf") - (cyan "#8fbaff") - (cyan-warmer "#9ac2ff") - (cyan-cooler "#8fcfdf") - (cyan-faint "#8ac0ef") - -;;; Basic hues for background values - - (bg-red-intense "#b02930") - (bg-green-intense "#2a7140") - (bg-yellow-intense "#8f5040") - (bg-blue-intense "#4648d0") + (defconst ef-trio-dark-partial + '((cursor "#ff99ff") + (bg-main "#160f0f") + (bg-dim "#2a2228") + (bg-alt "#362f35") + (fg-main "#d8cfd5") + (fg-dim "#908890") + (fg-alt "#afdacf") + (bg-active "#564f55") + (bg-inactive "#1c1719") + (border "#605760") + + (red "#f48359") + (red-warmer "#ff7560") + (red-cooler "#ff85aa") + (red-faint "#e07a9a") + (green "#60b444") + (green-warmer "#a0c27f") + (green-cooler "#60bf88") + (green-faint "#61a06c") + (yellow "#d4a052") + (yellow-warmer "#ef926f") + (yellow-cooler "#ef9680") + (yellow-faint "#c7a07f") + (blue "#7fa5f6") + (blue-warmer "#8895ff") + (blue-cooler "#72afff") + (blue-faint "#7a94df") + (magenta "#d37faf") + (magenta-warmer "#e772df") + (magenta-cooler "#a698ef") + (magenta-faint "#c9addf") + (cyan "#8fbaff") + (cyan-warmer "#9ac2ff") + (cyan-cooler "#8fcfdf") + (cyan-faint "#8ac0ef") + + (bg-red-intense "#b02930") + (bg-green-intense "#2a7140") + (bg-yellow-intense "#8f5040") + (bg-blue-intense "#4648d0") (bg-magenta-intense "#804fd5") - (bg-cyan-intense "#2270cf") - - (bg-red-subtle "#651f1a") - (bg-green-subtle "#1a421f") - (bg-yellow-subtle "#553320") - (bg-blue-subtle "#283565") - (bg-magenta-subtle "#562654") - (bg-cyan-subtle "#133d58") - -;;; Diffs - - (bg-added "#00371f") - (bg-added-faint "#002918") - (bg-added-refine "#004c2f") - (fg-added "#a0e0a0") - - (bg-changed "#363300") - (bg-changed-faint "#2a1f00") + (bg-cyan-intense "#2270cf") + + (bg-red-subtle "#651f1a") + (bg-green-subtle "#1a421f") + (bg-yellow-subtle "#553320") + (bg-blue-subtle "#283565") + (bg-magenta-subtle "#562654") + (bg-cyan-subtle "#133d58") + + (bg-added "#00371f") + (bg-added-faint "#002918") + (bg-added-refine "#004c2f") + (fg-added "#a0e0a0") + + (bg-changed "#363300") + (bg-changed-faint "#2a1f00") (bg-changed-refine "#4a4a00") - (fg-changed "#efef80") + (fg-changed "#efef80") - (bg-removed "#450f1f") - (bg-removed-faint "#2f060f") + (bg-removed "#450f1f") + (bg-removed-faint "#2f060f") (bg-removed-refine "#641426") - (fg-removed "#ffbfbf") - -;;; 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 "#6a294f") - (fg-mode-line "#ffdfdf") - (bg-completion "#2f335a") - (bg-hover "#004f3f") - (bg-hover-secondary "#452f5f") - (bg-hl-line "#34223f") - (bg-paren "#2f605e") - (bg-err "#461018") ; check with err - (bg-warning "#3a330f") ; check with warning - (bg-info "#103515") ; check with info - - (border "#605760") - (cursor "#ff99ff") - (fg-intense "#ffffff") - - (modeline-err "#ff9fcf") - (modeline-warning "#edbf00") - (modeline-info "#5fd0bf") - - (underline-err "#df2f2f") - (underline-warning "#c0b000") - (underline-info "#22b022") - - (bg-char-0 "#0050af") - (bg-char-1 "#7f1f7f") - (bg-char-2 "#625a00") - -;;; Mappings + (fg-removed "#ffbfbf") -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#6a294f") + (fg-mode-line-active "#ffdfdf") + (bg-completion "#2f335a") + (bg-hover "#004f3f") + (bg-hover-secondary "#452f5f") + (bg-hl-line "#34223f") + (bg-paren-match-match "#2f605e") + (bg-region "#16304f") + (bg-err "#461018") ; check with err + (bg-warning "#3a330f") ; check with warning + (bg-info "#103515") ; check with info (err red-warmer) (warning yellow) @@ -178,12 +124,7 @@ (keybind magenta-warmer) (identifier red-faint) (prompt blue-cooler) - - (bg-region "#16304f") - (fg-region unspecified) - -;;;; Code mappings - + (builtin magenta-cooler) (comment yellow-faint) (constant magenta-warmer) @@ -197,15 +138,11 @@ (rx-escape blue-warmer) ; compare with `string' (rx-construct red) -;;;; Accent mappings - (accent-0 magenta-warmer) (accent-1 green-cooler) (accent-2 blue-warmer) (accent-3 yellow) -;;;; Date mappings - (date-common cyan-cooler) (date-deadline red-warmer) (date-deadline-subtle red-faint) @@ -218,8 +155,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code green-cooler) (prose-done green) (prose-macro blue-warmer) @@ -231,8 +166,6 @@ (prose-todo red-warmer) (prose-verbatim magenta-warmer) -;;;; Mail mappings - (mail-cite-0 blue-warmer) (mail-cite-1 magenta-warmer) (mail-cite-2 green-cooler) @@ -242,8 +175,6 @@ (mail-subject magenta) (mail-other cyan) -;;;; 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-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-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 magenta-warmer) (rainbow-1 blue-warmer) (rainbow-2 green-cooler) @@ -319,13 +196,7 @@ (rainbow-6 magenta-cooler) (rainbow-7 cyan-warmer) (rainbow-8 yellow-cooler)) - "The `ef-trio-dark' 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 magenta, blue, teal colors.") (defcustom ef-trio-dark-palette-overrides nil "Overrides for `ef-trio-dark-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-trio-dark ef-trio-dark-palette ef-trio-dark-palette-overrides) - - (provide-theme 'ef-trio-dark)) + (defconst ef-themes-trio-dark-palette + (append ef-themes-common-palette-overrides ef-trio-dark-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-trio-dark + ef-themes + "Legible dark purple grey theme with magenta, blue, teal colors." + dark + modus-vivendi-palette + ef-themes-trio-dark-palette + ef-themes-trio-dark-palette-overrides)) ;;; ef-trio-dark-theme.el ends here diff --git a/ef-trio-light-theme.el b/ef-trio-light-theme.el index 52ddfcb..740f065 100644 --- a/ef-trio-light-theme.el +++ b/ef-trio-light-theme.el @@ -36,137 +36,83 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-trio-light - "Legible light theme with magenta, blue, and teal colors." - :background-mode 'light - :kind 'color-scheme - :family 'ef) - - (defconst ef-trio-light-palette - '( -;;; Basic values - - (bg-main "#f8f5ff") - (fg-main "#4f3363") - (bg-dim "#ebe7f1") - (fg-dim "#786e74") - (bg-alt "#e3e0e9") - (fg-alt "#3f7668") - - (bg-active "#c3c0c9") + (defconst ef-trio-light-partial + '((cursor "#4f45ff") + (bg-main "#f8f5ff") + (bg-dim "#ebe7f1") + (bg-alt "#e3e0e9") + (fg-main "#4f3363") + (fg-dim "#786e74") + (fg-alt "#3f7668") + (bg-active "#c3c0c9") (bg-inactive "#efeef7") - -;;; Basic hues for foreground values - - (red "#c3303a") - (red-warmer "#d03033") - (red-cooler "#c01f5f") - (red-faint "#a24568") - (green "#057800") - (green-warmer "#4f7d0f") - (green-cooler "#007f6f") - (green-faint "#41754c") - (yellow "#a45f22") - (yellow-warmer "#b8532f") - (yellow-cooler "#b65050") - (yellow-faint "#a05b5f") - (blue "#375cd6") - (blue-warmer "#5165e4") - (blue-cooler "#065fbf") - (blue-faint "#6060d0") - (magenta "#ad45ba") - (magenta-warmer "#c035aa") - (magenta-cooler "#705ae3") - (magenta-faint "#804fb0") - (cyan "#1f6fbf") - (cyan-warmer "#3f6faf") - (cyan-cooler "#0f7a9d") - (cyan-faint "#5f60bf") - -;;; Basic hues for background values - - (bg-red-intense "#ff7f88") - (bg-green-intense "#7fdda0") - (bg-yellow-intense "#ffc200") - (bg-blue-intense "#cbcfff") + (border "#c6bac5") + + (red "#c3303a") + (red-warmer "#d03033") + (red-cooler "#c01f5f") + (red-faint "#a24568") + (green "#057800") + (green-warmer "#4f7d0f") + (green-cooler "#007f6f") + (green-faint "#41754c") + (yellow "#a45f22") + (yellow-warmer "#b8532f") + (yellow-cooler "#b65050") + (yellow-faint "#a05b5f") + (blue "#375cd6") + (blue-warmer "#5165e4") + (blue-cooler "#065fbf") + (blue-faint "#6060d0") + (magenta "#ad45ba") + (magenta-warmer "#c035aa") + (magenta-cooler "#705ae3") + (magenta-faint "#804fb0") + (cyan "#1f6fbf") + (cyan-warmer "#3f6faf") + (cyan-cooler "#0f7a9d") + (cyan-faint "#5f60bf") + + (bg-red-intense "#ff7f88") + (bg-green-intense "#7fdda0") + (bg-yellow-intense "#ffc200") + (bg-blue-intense "#cbcfff") (bg-magenta-intense "#df8fff") - (bg-cyan-intense "#88ccff") - - (bg-red-subtle "#ffc3c7") - (bg-green-subtle "#beecc2") - (bg-yellow-subtle "#f3ea8f") - (bg-blue-subtle "#ceddff") - (bg-magenta-subtle "#f5cff8") - (bg-cyan-subtle "#c0eaf0") - -;;; Diffs - - (bg-added "#caf4da") - (bg-added-faint "#dff6ea") - (bg-added-refine "#bae9cf") - (fg-added "#005000") - - (bg-changed "#ffdfb9") - (bg-changed-faint "#ffefcb") + (bg-cyan-intense "#88ccff") + + (bg-red-subtle "#ffc3c7") + (bg-green-subtle "#beecc2") + (bg-yellow-subtle "#f3ea8f") + (bg-blue-subtle "#ceddff") + (bg-magenta-subtle "#f5cff8") + (bg-cyan-subtle "#c0eaf0") + + (bg-added "#caf4da") + (bg-added-faint "#dff6ea") + (bg-added-refine "#bae9cf") + (fg-added "#005000") + + (bg-changed "#ffdfb9") + (bg-changed-faint "#ffefcb") (bg-changed-refine "#ffcfa0") - (fg-changed "#553d00") + (fg-changed "#553d00") - (bg-removed "#ffcee0") - (bg-removed-faint "#ffdfe6") + (bg-removed "#ffcee0") + (bg-removed-faint "#ffdfe6") (bg-removed-refine "#f5b6c8") - (fg-removed "#8f1313") - -;;; 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 "#ddb4ff") - (fg-mode-line "#241f48") - (bg-completion "#f4cfff") - (bg-hover "#aaeccf") - (bg-hover-secondary "#b4cfff") - (bg-hl-line "#cfe6ff") - (bg-paren "#dfadaf") - (bg-err "#ffdfe6") ; check with err - (bg-warning "#ffe5bf") ; check with warning - (bg-info "#d0efdf") ; check with info - - (border "#c6bac5") - (cursor "#4f45ff") - (fg-intense "#000000") - - (modeline-err "#980000") - (modeline-warning "#5f4400") - (modeline-info "#1042af") - - (underline-err "#ef0f1f") - (underline-warning "#bf5f00") - (underline-info "#02af52") - - (bg-char-0 "#7feaff") - (bg-char-1 "#ffaaff") - (bg-char-2 "#dff000") + (fg-removed "#8f1313") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#ddb4ff") + (fg-mode-line-active "#241f48") + (bg-completion "#f4cfff") + (bg-hover "#aaeccf") + (bg-hover-secondary "#b4cfff") + (bg-hl-line "#cfe6ff") + (bg-paren-match-match "#dfadaf") + (bg-region "#eed0ff") + (bg-err "#ffdfe6") ; check with err + (bg-warning "#ffe5bf") ; check with warning + (bg-info "#d0efdf") ; check with info (err red-warmer) (warning yellow-warmer) @@ -178,12 +124,7 @@ (keybind magenta-warmer) (identifier red-faint) (prompt blue-cooler) - - (bg-region "#eed0ff") - (fg-region unspecified) - -;;;; Code mappings - + (builtin magenta-cooler) (comment yellow-faint) (constant magenta-warmer) @@ -197,15 +138,11 @@ (rx-escape blue-warmer) ; compare with `string' (rx-construct red) -;;;; Accent mappings - (accent-0 magenta-warmer) (accent-1 green-cooler) (accent-2 blue-warmer) (accent-3 yellow) -;;;; Date mappings - (date-common cyan-cooler) (date-deadline red-warmer) (date-deadline-subtle red-cooler) @@ -218,8 +155,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code green-cooler) (prose-done green) (prose-macro blue-warmer) @@ -231,8 +166,6 @@ (prose-todo red-warmer) (prose-verbatim magenta-warmer) -;;;; Mail mappings - (mail-cite-0 blue-warmer) (mail-cite-1 magenta-warmer) (mail-cite-2 cyan-cooler) @@ -242,8 +175,6 @@ (mail-subject magenta) (mail-other cyan) -;;;; 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-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-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 magenta-warmer) (rainbow-1 blue-warmer) (rainbow-2 green-cooler) @@ -319,13 +196,7 @@ (rainbow-6 magenta-cooler) (rainbow-7 cyan-warmer) (rainbow-8 yellow-cooler)) - "The `ef-trio-light' 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 purple grey theme with magenta, blue, and teal colors.") (defcustom ef-trio-light-palette-overrides nil "Overrides for `ef-trio-light-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-trio-light ef-trio-light-palette ef-trio-light-palette-overrides) - - (provide-theme 'ef-trio-light)) + (defconst ef-themes-trio-light-palette + (append ef-themes-common-palette-overrides ef-trio-light-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-trio-light + ef-themes + "Legible light purple grey theme with magenta, blue, and teal colors." + light + modus-operandi-palette + ef-themes-trio-light-palette + ef-themes-trio-light-palette-overrides)) ;;; ef-trio-light-theme.el ends here diff --git a/ef-tritanopia-dark-theme.el b/ef-tritanopia-dark-theme.el index 6e74365..6cedf6c 100644 --- a/ef-tritanopia-dark-theme.el +++ b/ef-tritanopia-dark-theme.el @@ -39,137 +39,83 @@ ;; Most of the colors here, like the blue and green hues, are defined ;; simply to preserve compatibility with the rest of the project. We ;; don't actually rely on them for anything critical. -;;;###theme-autoload - (deftheme ef-tritanopia-dark - "Legible dark theme, optimized for blue-yellow color deficiency." - :background-mode 'dark - :kind 'color-scheme - :family 'ef) - - (defconst ef-tritanopia-dark-palette - '( -;;; Basic values - - (bg-main "#15050f") - (fg-main "#dfd0d5") - (bg-dim "#282026") - (fg-dim "#908890") - (bg-alt "#352f2f") - (fg-alt "#afdaef") - - (bg-active "#554f4f") - (bg-inactive "#1a1517") - -;;; Basic hues for foreground values - - (red "#cf4f5f") - (red-warmer "#df4f4f") - (red-cooler "#d24f7f") - (red-faint "#b07f7f") - (green "#2fa526") - (green-warmer "#64aa0f") - (green-cooler "#00b066") - (green-faint "#5f9f6f") - (yellow "#c48702") - (yellow-warmer "#d0730f") - (yellow-cooler "#df8f6f") - (yellow-faint "#cf9f7f") - (blue "#379cf6") - (blue-warmer "#6a88ff") - (blue-cooler "#029fff") - (blue-faint "#6a84af") - (magenta "#b0648f") - (magenta-warmer "#c560aa") - (magenta-cooler "#a6699f") - (magenta-faint "#c590af") - (cyan "#3fafcf") - (cyan-warmer "#3f9aaf") - (cyan-cooler "#4fafaf") - (cyan-faint "#82a0af") - -;;; Basic hues for background values - - (bg-red-intense "#aa0010") - (bg-green-intense "#5f806f") - (bg-yellow-intense "#950f4f") - (bg-blue-intense "#165f70") + (defconst ef-tritanopia-dark-partial + '((cursor "#fd3333") + (bg-main "#15050f") + (bg-dim "#282026") + (bg-alt "#352f2f") + (fg-main "#dfd0d5") + (fg-dim "#908890") + (fg-alt "#afdaef") + (bg-active "#554f4f") + (bg-inactive "#1a1517") + (border "#555564") + + (red "#cf4f5f") + (red-warmer "#df4f4f") + (red-cooler "#d24f7f") + (red-faint "#b07f7f") + (green "#2fa526") + (green-warmer "#64aa0f") + (green-cooler "#00b066") + (green-faint "#5f9f6f") + (yellow "#c48702") + (yellow-warmer "#d0730f") + (yellow-cooler "#df8f6f") + (yellow-faint "#cf9f7f") + (blue "#379cf6") + (blue-warmer "#6a88ff") + (blue-cooler "#029fff") + (blue-faint "#6a84af") + (magenta "#b0648f") + (magenta-warmer "#c560aa") + (magenta-cooler "#a6699f") + (magenta-faint "#c590af") + (cyan "#3fafcf") + (cyan-warmer "#3f9aaf") + (cyan-cooler "#4fafaf") + (cyan-faint "#82a0af") + + (bg-red-intense "#aa0010") + (bg-green-intense "#5f806f") + (bg-yellow-intense "#950f4f") + (bg-blue-intense "#165f70") (bg-magenta-intense "#a04f9f") - (bg-cyan-intense "#007faa") - - (bg-red-subtle "#6e1b20") - (bg-green-subtle "#054c38") - (bg-yellow-subtle "#65302f") - (bg-blue-subtle "#224360") - (bg-magenta-subtle "#603256") - (bg-cyan-subtle "#004a57") - -;;; Diffs - - (bg-added "#002d3f") - (bg-added-faint "#001f38") - (bg-added-refine "#003b4f") - (fg-added "#cbdfff") - - (bg-changed "#352354") - (bg-changed-faint "#351444") + (bg-cyan-intense "#007faa") + + (bg-red-subtle "#6e1b20") + (bg-green-subtle "#054c38") + (bg-yellow-subtle "#65302f") + (bg-blue-subtle "#224360") + (bg-magenta-subtle "#603256") + (bg-cyan-subtle "#004a57") + + (bg-added "#002d3f") + (bg-added-faint "#001f38") + (bg-added-refine "#003b4f") + (fg-added "#cbdfff") + + (bg-changed "#352354") + (bg-changed-faint "#351444") (bg-changed-refine "#383964") - (fg-changed "#e3cfff") + (fg-changed "#e3cfff") - (bg-removed "#4d091f") - (bg-removed-faint "#37040f") + (bg-removed "#4d091f") + (bg-removed-faint "#37040f") (bg-removed-refine "#6b0f26") - (fg-removed "#ffbfbf") - -;;; Graphs - - (bg-graph-red-0 "#b52c2c") - (bg-graph-red-1 "#702020") - (bg-graph-green-0 "#afd1c0") - (bg-graph-green-1 "#607a8f") - (bg-graph-yellow-0 "#facfd6") - (bg-graph-yellow-1 "#b57b85") - (bg-graph-blue-0 "#4f9fdf") - (bg-graph-blue-1 "#004559") - (bg-graph-magenta-0 "#b6427f") - (bg-graph-magenta-1 "#7f506f") - (bg-graph-cyan-0 "#57dfea") - (bg-graph-cyan-1 "#00808f") - -;;; Special hues - - (bg-mode-line "#671822") - (fg-mode-line "#ffffff") - (bg-completion "#441824") - (bg-hover "#00405f") - (bg-hover-secondary "#5e3e5b") - (bg-hl-line "#3f1515") - (bg-paren "#2f5f7a") - (bg-err "#451212") ; check with err - (bg-warning "#40173d") ; check with warning - (bg-info "#00354f") ; check with info - - (border "#555564") - (cursor "#fd3333") - (fg-intense "#ffffff") - - (modeline-err "#ff7fbf") - (modeline-warning "#df9f93") - (modeline-info "#4fcfef") - - (underline-err "#ff0f1f") - (underline-warning "#ffafa0") - (underline-info "#22ffd2") - - (bg-char-0 "#922a00") - (bg-char-1 "#00709f") - (bg-char-2 "#5f3faf") + (fg-removed "#ffbfbf") -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#671822") + (fg-mode-line-active "#ffffff") + (bg-completion "#441824") + (bg-hover "#00405f") + (bg-hover-secondary "#5e3e5b") + (bg-hl-line "#3f1515") + (bg-paren-match-match "#2f5f7a") + (bg-region "#293140") + (bg-err "#451212") ; check with err + (bg-warning "#40173d") ; check with warning + (bg-info "#00354f") ; check with info (err red-warmer) (warning magenta-warmer) @@ -181,12 +127,7 @@ (keybind red-cooler) (identifier magenta-faint) (prompt cyan) - - (bg-region "#293140") - (fg-region unspecified) - -;;;; Code mappings - + (builtin magenta) (comment red-faint) (constant red-cooler) @@ -200,15 +141,11 @@ (rx-escape cyan-cooler) ; compare with `string' (rx-construct red) -;;;; Accent mappings - (accent-0 cyan) (accent-1 red) (accent-2 cyan-warmer) (accent-3 magenta) -;;;; Date mappings - (date-common cyan-cooler) (date-deadline red-warmer) (date-deadline-subtle red-cooler) @@ -221,8 +158,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code red) (prose-done cyan) (prose-macro cyan-warmer) @@ -234,8 +169,6 @@ (prose-todo red-warmer) (prose-verbatim cyan) -;;;; Mail mappings - (mail-cite-0 cyan) (mail-cite-1 red-cooler) (mail-cite-2 cyan-cooler) @@ -245,8 +178,6 @@ (mail-subject red-warmer) (mail-other magenta-cooler) -;;;; Search mappings - (bg-search-match bg-warning) (bg-search-current bg-red-intense) (bg-search-lazy bg-cyan-intense) @@ -257,62 +188,8 @@ (bg-search-rx-group-2 bg-cyan-subtle) (bg-search-rx-group-3 bg-red-subtle) -;;;; Space mappings - - (bg-space unspecified) - (fg-space border) (bg-space-err bg-red-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-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 cyan) (rainbow-1 red) (rainbow-2 cyan-warmer) @@ -322,13 +199,7 @@ (rainbow-6 cyan-faint) (rainbow-7 magenta-faint) (rainbow-8 red-faint)) - "The `ef-tritanopia-dark' 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 theme, optimized for blue-yellow color deficiency.") (defcustom ef-tritanopia-dark-palette-overrides nil "Overrides for `ef-tritanopia-dark-palette'. @@ -347,8 +218,16 @@ further details)." :type '(repeat (list symbol (choice symbol string))) :link '(info-link "(ef-themes) Palette overrides")) - (ef-themes-theme ef-tritanopia-dark ef-tritanopia-dark-palette ef-tritanopia-dark-palette-overrides) + (defconst ef-themes-tritanopia-dark-palette + (append ef-themes-common-palette-overrides ef-tritanopia-dark-partial ef-themes-palette-common)) - (provide-theme 'ef-tritanopia-dark)) + (modus-themes-theme + ef-tritanopia-dark + ef-themes + "Legible dark theme, optimized for blue-yellow color deficiency." + dark + modus-vivendi-tritanopia-palette + ef-themes-tritanopia-dark-palette + ef-themes-tritanopia-dark-palette-overrides)) ;;; ef-tritanopia-dark-theme.el ends here diff --git a/ef-tritanopia-light-theme.el b/ef-tritanopia-light-theme.el index d3c4de1..7641a2c 100644 --- a/ef-tritanopia-light-theme.el +++ b/ef-tritanopia-light-theme.el @@ -39,137 +39,83 @@ ;; Most of the colors here, like the blue and green hues, are defined ;; simply to preserve compatibility with the rest of the project. We ;; don't actually rely on them for anything critical. -;;;###theme-autoload - (deftheme ef-tritanopia-light - "Legible light theme, optimized for blue-yellow color deficiency." - :background-mode 'light - :kind 'color-scheme - :family 'ef) - - (defconst ef-tritanopia-light-palette - '( -;;; Basic values - - (bg-main "#fff9f9") - (fg-main "#1a1a1a") - (bg-dim "#efecec") - (fg-dim "#756275") - (bg-alt "#ddd9d9") - (fg-alt "#194f90") - - (bg-active "#bdb9b9") + (defconst ef-tritanopia-light-partial + '((cursor "#bb0000") + (bg-main "#fff9f9") + (bg-dim "#efecec") + (bg-alt "#ddd9d9") + (fg-main "#1a1a1a") + (fg-dim "#756275") + (fg-alt "#194f90") + (bg-active "#bdb9b9") (bg-inactive "#f7f2f2") - -;;; Basic hues for foreground values - - (red "#aa0010") - (red-warmer "#dd0000") - (red-cooler "#c50f4f") - (red-faint "#92454f") - (green "#217a3c") - (green-warmer "#4a7d00") - (green-cooler "#008058") - (green-faint "#61756c") - (yellow "#805d00") - (yellow-warmer "#965000") - (yellow-cooler "#765040") - (yellow-faint "#776d6a") - (blue "#375cd8") - (blue-warmer "#4250ef") - (blue-cooler "#065fff") - (blue-faint "#6060d0") - (magenta "#aa357f") - (magenta-warmer "#bf256a") - (magenta-cooler "#af40af") - (magenta-faint "#7f4580") - (cyan "#2070af") - (cyan-warmer "#2f5faf") - (cyan-cooler "#007faa") - (cyan-faint "#5f6a90") - -;;; Basic hues for background values - - (bg-red-intense "#ffa2a0") - (bg-green-intense "#8aefef") - (bg-yellow-intense "#ff7f78") - (bg-blue-intense "#a8c8ef") + (border "#adadad") + + (red "#aa0010") + (red-warmer "#dd0000") + (red-cooler "#c50f4f") + (red-faint "#92454f") + (green "#217a3c") + (green-warmer "#4a7d00") + (green-cooler "#008058") + (green-faint "#61756c") + (yellow "#805d00") + (yellow-warmer "#965000") + (yellow-cooler "#765040") + (yellow-faint "#776d6a") + (blue "#375cd8") + (blue-warmer "#4250ef") + (blue-cooler "#065fff") + (blue-faint "#6060d0") + (magenta "#aa357f") + (magenta-warmer "#bf256a") + (magenta-cooler "#af40af") + (magenta-faint "#7f4580") + (cyan "#2070af") + (cyan-warmer "#2f5faf") + (cyan-cooler "#007faa") + (cyan-faint "#5f6a90") + + (bg-red-intense "#ffa2a0") + (bg-green-intense "#8aefef") + (bg-yellow-intense "#ff7f78") + (bg-blue-intense "#a8c8ef") (bg-magenta-intense "#e09fc0") - (bg-cyan-intense "#7bcfcf") - - (bg-red-subtle "#ffc4bf") - (bg-green-subtle "#baeecf") - (bg-yellow-subtle "#f5d8a8") - (bg-blue-subtle "#c8e6f7") - (bg-magenta-subtle "#ffcfe0") - (bg-cyan-subtle "#bbeff2") - -;;; Diffs - - (bg-added "#c9efea") - (bg-added-faint "#d7eff5") - (bg-added-refine "#b3dfdf") - (fg-added "#004840") - - (bg-changed "#dbdbff") - (bg-changed-faint "#e4e4ff") + (bg-cyan-intense "#7bcfcf") + + (bg-red-subtle "#ffc4bf") + (bg-green-subtle "#baeecf") + (bg-yellow-subtle "#f5d8a8") + (bg-blue-subtle "#c8e6f7") + (bg-magenta-subtle "#ffcfe0") + (bg-cyan-subtle "#bbeff2") + + (bg-added "#c9efea") + (bg-added-faint "#d7eff5") + (bg-added-refine "#b3dfdf") + (fg-added "#004840") + + (bg-changed "#dbdbff") + (bg-changed-faint "#e4e4ff") (bg-changed-refine "#c0c0ef") - (fg-changed "#333399") + (fg-changed "#333399") - (bg-removed "#ffd6e0") - (bg-removed-faint "#ffe9e6") + (bg-removed "#ffd6e0") + (bg-removed-faint "#ffe9e6") (bg-removed-refine "#f5bfc8") - (fg-removed "#8f1313") - -;;; Graphs - - (bg-graph-red-0 "#ef7969") - (bg-graph-red-1 "#ffaab4") - (bg-graph-green-0 "#68c0a0") - (bg-graph-green-1 "#a5dfd0") - (bg-graph-yellow-0 "#d99f9f") - (bg-graph-yellow-1 "#ffb58f") - (bg-graph-blue-0 "#80a0df") - (bg-graph-blue-1 "#a8cfff") - (bg-graph-magenta-0 "#efafcf") - (bg-graph-magenta-1 "#ffdaef") - (bg-graph-cyan-0 "#7fd3ed") - (bg-graph-cyan-1 "#afefff") - -;;; Special hues - - (bg-mode-line "#ff99aa") - (fg-mode-line "#1a0a0f") - (bg-completion "#ffcada") - (bg-hover "#8fcfff") - (bg-hover-secondary "#eda9dc") - (bg-hl-line "#ffdadf") - (bg-paren "#8fc0cf") - (bg-err "#ffbfca") ; check with err - (bg-warning "#efcae6") ; check with warning - (bg-info "#cfdfef") ; check with info - - (border "#adadad") - (cursor "#bb0000") - (fg-intense "#000000") - - (modeline-err "#8f0000") - (modeline-warning "#6f306f") - (modeline-info "#00445f") - - (underline-err "#ef0f1f") - (underline-warning "#af7f90") - (underline-info "#22afc2") + (fg-removed "#8f1313") - (bg-char-0 "#ff908f") - (bg-char-1 "#bfbfff") - (bg-char-2 "#5fcfdf") - -;;; Mappings - -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-mode-line-active "#ff99aa") + (fg-mode-line-active "#1a0a0f") + (bg-completion "#ffcada") + (bg-hover "#8fcfff") + (bg-hover-secondary "#eda9dc") + (bg-hl-line "#ffdadf") + (bg-paren-match-match "#8fc0cf") + (bg-region "#dadadf") + (bg-err "#ffbfca") ; check with err + (bg-warning "#efcae6") ; check with warning + (bg-info "#cfdfef") ; check with info (err red-warmer) (warning magenta) @@ -181,12 +127,7 @@ (keybind red-cooler) (identifier magenta-faint) (prompt cyan) - - (bg-region "#dadadf") - (fg-region unspecified) - -;;;; Code mappings - + (builtin magenta) (comment red-faint) (constant red-cooler) @@ -200,15 +141,11 @@ (rx-escape cyan-warmer) ; compare with `string' (rx-construct red-warmer) -;;;; Accent mappings - (accent-0 cyan) (accent-1 red) (accent-2 cyan-warmer) (accent-3 magenta) -;;;; Date mappings - (date-common cyan-cooler) (date-deadline red-warmer) (date-deadline-subtle red-cooler) @@ -221,8 +158,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code red) (prose-done cyan) (prose-macro cyan-warmer) @@ -234,8 +169,6 @@ (prose-todo red-warmer) (prose-verbatim cyan) -;;;; Mail mappings - (mail-cite-0 cyan-cooler) (mail-cite-1 red-cooler) (mail-cite-2 cyan-warmer) @@ -245,8 +178,6 @@ (mail-subject red-warmer) (mail-other magenta-cooler) -;;;; Search mappings - (bg-search-match bg-warning) (bg-search-current bg-red-intense) (bg-search-lazy bg-cyan-intense) @@ -257,62 +188,8 @@ (bg-search-rx-group-2 bg-cyan-subtle) (bg-search-rx-group-3 bg-red-subtle) -;;;; Space mappings - - (bg-space unspecified) - (fg-space border) (bg-space-err bg-red-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-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 cyan) (rainbow-1 red) (rainbow-2 cyan-warmer) @@ -322,13 +199,7 @@ (rainbow-6 cyan-faint) (rainbow-7 magenta-faint) (rainbow-8 red-faint)) - "The `ef-tritanopia-light' 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 theme, optimized for blue-yellow color deficiency.") (defcustom ef-tritanopia-light-palette-overrides nil "Overrides for `ef-tritanopia-light-palette'. @@ -347,8 +218,16 @@ further details)." :type '(repeat (list symbol (choice symbol string))) :link '(info-link "(ef-themes) Palette overrides")) - (ef-themes-theme ef-tritanopia-light ef-tritanopia-light-palette ef-tritanopia-light-palette-overrides) + (defconst ef-themes-tritanopia-light-palette + (append ef-themes-common-palette-overrides ef-tritanopia-light-partial ef-themes-palette-common)) - (provide-theme 'ef-tritanopia-light)) + (modus-themes-theme + ef-tritanopia-light + ef-themes + "Legible light theme, optimized for blue-yellow color deficiency." + light + modus-operandi-tritanopia-palette + ef-themes-tritanopia-light-palette + ef-themes-tritanopia-light-palette-overrides)) ;;; ef-tritanopia-light-theme.el ends here diff --git a/ef-winter-theme.el b/ef-winter-theme.el index 365eb11..99e669f 100644 --- a/ef-winter-theme.el +++ b/ef-winter-theme.el @@ -36,137 +36,84 @@ (eval-and-compile (require 'ef-themes) -;;;###theme-autoload - (deftheme ef-winter - "Legible dark theme with magenta, purple, fawn, teal colors." - :background-mode 'dark - :kind 'color-scheme - :family 'ef) - - (defconst ef-winter-palette - '( -;;; Basic values - - (bg-main "#0f0b15") - (fg-main "#b8c6d5") - (bg-dim "#1d202f") - (fg-dim "#807c9f") - (bg-alt "#2a2f42") - (fg-alt "#bf8f8f") - - (bg-active "#4a4f62") - (bg-inactive "#19181f") - -;;; Basic hues for foreground values - - (red "#f47359") - (red-warmer "#ef6560") - (red-cooler "#ff6a7a") - (red-faint "#d56f72") - (green "#29a444") - (green-warmer "#6aad0f") - (green-cooler "#00a392") - (green-faint "#61a06c") - (yellow "#b58a52") - (yellow-warmer "#d1803f") - (yellow-cooler "#df9080") - (yellow-faint "#c0a38a") - (blue "#3f95f6") - (blue-warmer "#6a9fff") - (blue-cooler "#029fff") - (blue-faint "#7a94df") - (magenta "#d369af") - (magenta-warmer "#e580e0") - (magenta-cooler "#af85ea") - (magenta-faint "#c57faf") - (cyan "#4fbaef") - (cyan-warmer "#6fafdf") - (cyan-cooler "#35afbf") - (cyan-faint "#8aa0df") - -;;; Basic hues for background values - - (bg-red-intense "#b02930") - (bg-green-intense "#0a7040") - (bg-yellow-intense "#8f5040") - (bg-blue-intense "#4648d0") + (defconst ef-winter-partial + '((cursor "#ff6ff0") + (bg-main "#0f0b15") + (bg-dim "#1d202f") + (bg-alt "#2a2f42") + (fg-main "#b8c6d5") + (fg-dim "#807c9f") + (fg-alt "#bf8f8f") + (bg-active "#4a4f62") + (bg-inactive "#19181f") + (border "#4a4955") + + (red "#f47359") + (red-warmer "#ef6560") + (red-cooler "#ff6a7a") + (red-faint "#d56f72") + (green "#29a444") + (green-warmer "#6aad0f") + (green-cooler "#00a392") + (green-faint "#61a06c") + (yellow "#b58a52") + (yellow-warmer "#d1803f") + (yellow-cooler "#df9080") + (yellow-faint "#c0a38a") + (blue "#3f95f6") + (blue-warmer "#6a9fff") + (blue-cooler "#029fff") + (blue-faint "#7a94df") + (magenta "#d369af") + (magenta-warmer "#e580e0") + (magenta-cooler "#af85ea") + (magenta-faint "#c57faf") + (cyan "#4fbaef") + (cyan-warmer "#6fafdf") + (cyan-cooler "#35afbf") + (cyan-faint "#8aa0df") + + (bg-red-intense "#b02930") + (bg-green-intense "#0a7040") + (bg-yellow-intense "#8f5040") + (bg-blue-intense "#4648d0") (bg-magenta-intense "#a04fc5") - (bg-cyan-intense "#2270cf") - - (bg-red-subtle "#67182f") - (bg-green-subtle "#10452f") - (bg-yellow-subtle "#54362a") - (bg-blue-subtle "#2a346e") - (bg-magenta-subtle "#572454") - (bg-cyan-subtle "#133d56") - -;;; Diffs - - (bg-added "#00371f") - (bg-added-faint "#002918") - (bg-added-refine "#004c2f") - (fg-added "#a0e0a0") - - (bg-changed "#363300") - (bg-changed-faint "#2a1f00") + (bg-cyan-intense "#2270cf") + + (bg-red-subtle "#67182f") + (bg-green-subtle "#10452f") + (bg-yellow-subtle "#54362a") + (bg-blue-subtle "#2a346e") + (bg-magenta-subtle "#572454") + (bg-cyan-subtle "#133d56") + + (bg-added "#00371f") + (bg-added-faint "#002918") + (bg-added-refine "#004c2f") + (fg-added "#a0e0a0") + + (bg-changed "#363300") + (bg-changed-faint "#2a1f00") (bg-changed-refine "#4a4a00") - (fg-changed "#efef80") + (fg-changed "#efef80") - (bg-removed "#450f1f") - (bg-removed-faint "#2f060f") + (bg-removed "#450f1f") + (bg-removed-faint "#2f060f") (bg-removed-refine "#641426") - (fg-removed "#ffbfbf") - -;;; 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 "#5f1f5f") - (fg-mode-line "#dedeff") - (bg-completion "#2f2a7a") - (bg-hover "#00474f") - (bg-hover-secondary "#44196f") - (bg-hl-line "#003045") - (bg-paren "#2f608e") - (bg-err "#44101a") ; check with err - (bg-warning "#393312") ; check with warning - (bg-info "#0f3518") ; check with info - - (border "#4a4955") - (cursor "#ff6ff0") - (fg-intense "#ffffff") - - (modeline-err "#ff9fbf") - (modeline-warning "#ddb300") - (modeline-info "#40e0af") - - (underline-err "#df2f2f") - (underline-warning "#c0b000") - (underline-info "#22b022") - - (bg-char-0 "#0050af") - (bg-char-1 "#7f1f7f") - (bg-char-2 "#625a00") + (fg-removed "#ffbfbf") -;;; Mappings + (bg-mode-line-active "#5f1f5f") + (fg-mode-line-active "#dedeff") -;;;; General mappings - - (bg-fringe unspecified) - (fg-fringe unspecified) + (bg-completion "#2f2a7a") + (bg-hover "#00474f") + (bg-hover-secondary "#44196f") + (bg-hl-line "#003045") + (bg-paren-match-match "#2f608e") + (bg-region "#342464") + (bg-err "#44101a") ; check with err + (bg-warning "#393312") ; check with warning + (bg-info "#0f3518") ; check with info (err red-warmer) (warning yellow) @@ -179,11 +126,6 @@ (identifier magenta-faint) (prompt magenta-warmer) - (bg-region "#342464") - (fg-region unspecified) - -;;;; Code mappings - (builtin magenta-warmer) (comment yellow-faint) (constant magenta) @@ -197,15 +139,11 @@ (rx-escape green) ; compare with `string' (rx-construct blue) -;;;; Accent mappings - (accent-0 magenta-cooler) (accent-1 yellow) (accent-2 green-cooler) (accent-3 magenta-warmer) -;;;; Date mappings - (date-common cyan-cooler) (date-deadline red-warmer) (date-deadline-subtle red-faint) @@ -218,8 +156,6 @@ (date-weekday cyan) (date-weekend red-faint) -;;;; Prose mappings - (prose-code yellow) (prose-done green) (prose-macro green-cooler) @@ -231,8 +167,6 @@ (prose-todo red-warmer) (prose-verbatim magenta-cooler) -;;;; Mail mappings - (mail-cite-0 magenta-cooler) (mail-cite-1 yellow-cooler) (mail-cite-2 cyan-cooler) @@ -242,8 +176,6 @@ (mail-subject blue-warmer) (mail-other magenta-cooler) -;;;; Search mappings - (bg-search-match bg-warning) (bg-search-current bg-yellow-intense) (bg-search-lazy bg-blue-intense) @@ -254,62 +186,6 @@ (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-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 magenta) (rainbow-1 cyan-cooler) (rainbow-2 magenta-cooler) @@ -319,13 +195,7 @@ (rainbow-6 green-cooler) (rainbow-7 yellow-cooler) (rainbow-8 cyan-warmer)) - "The `ef-winter' 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-black theme with magenta, purple, fawn, teal colors.") (defcustom ef-winter-palette-overrides nil "Overrides for `ef-winter-palette'. @@ -344,8 +214,16 @@ further details)." :type '(repeat (list symbol (choice symbol string))) :link '(info-link "(ef-themes) Palette overrides")) - (ef-themes-theme ef-winter ef-winter-palette ef-winter-palette-overrides) - - (provide-theme 'ef-winter)) + (defconst ef-themes-winter-palette + (append ef-themes-common-palette-overrides ef-winter-partial ef-themes-palette-common)) + + (modus-themes-theme + ef-winter + ef-themes + "Legible dark purple-black theme with magenta, purple, fawn, teal colors." + dark + modus-vivendi-palette + ef-themes-winter-palette + ef-themes-winter-palette-overrides)) ;;; ef-winter-theme.el ends here |