From 94af8e0a5e5ff853c6069f3cea4ac2e2513d292d Mon Sep 17 00:00:00 2001 From: Magdalena Szweda Date: Sat, 19 Sep 2026 19:15:37 +0200 Subject: yay fix vereythign --- emacs.tera | 323 ++++++++++++++++++++++++++++++++++++++ evergarden-common.el | 5 +- evergarden-fall-theme.el | 156 ------------------ evergarden-spring-theme.el | 154 ------------------ evergarden-summer-theme.el | 155 ------------------ evergarden-winter-theme.el | 155 ------------------ themes/evergarden-fall-theme.el | 187 ++++++++++++++++++++++ themes/evergarden-spring-theme.el | 187 ++++++++++++++++++++++ themes/evergarden-summer-theme.el | 187 ++++++++++++++++++++++ themes/evergarden-winter-theme.el | 187 ++++++++++++++++++++++ 10 files changed, 1072 insertions(+), 624 deletions(-) create mode 100644 emacs.tera delete mode 100644 evergarden-fall-theme.el delete mode 100644 evergarden-spring-theme.el delete mode 100644 evergarden-summer-theme.el delete mode 100644 evergarden-winter-theme.el create mode 100644 themes/evergarden-fall-theme.el create mode 100644 themes/evergarden-spring-theme.el create mode 100644 themes/evergarden-summer-theme.el create mode 100644 themes/evergarden-winter-theme.el diff --git a/emacs.tera b/emacs.tera new file mode 100644 index 0000000..770db72 --- /dev/null +++ b/emacs.tera @@ -0,0 +1,323 @@ +--- +whiskers: + version: ^2.0.0 + matrix: + - flavor + filename: "emacs/evergarden-{{flavor.identifier}}-theme.el" +--- +{%- set is_dark = flavor.dark | default(value=true) -%} +{%- set c = flavor.colors -%} +{#- + Derivation formulas below mirror modus-themes' own warmer/cooler/faint/ + intense/subtle/nuanced conventions (reverse-engineered from fortune-gold- + theme.el's actual hue/sat/light values), just expressed as `add`/`sub`/ + `mod`/`mix` pipelines instead of a Python HSL helper. See evergarden- + common.el's commentary for why intense/subtle/nuanced/faint need different + targets depending on `is_dark`. + + add(hue=.., saturation=.., lightness=..): ADDS a delta (saturation/ + lightness deltas must be non-negative -- use `sub` for the other + direction, since those two attributes are unsigned). + mod(hue=.., saturation=.., lightness=..): SETS an absolute value. + mix(color=.., amount=..): linear-interpolates toward `color` by `amount`. + All three return a Color; chain `| hex` at the end to get a bare hex + string (no leading '#', added manually below to match Lisp string syntax). +-#} + +{#- ============================== Red family ============================== #} +{%- set red_warmer = c.red | add(hue=0) | sub(hue=9) | add(saturation=2) | sub(lightness=1) -%} +{%- set red_cooler = c.red | add(hue=14, saturation=2) | sub(lightness=2) -%} +{%- set red_faint_s = (c.red.hsl.s * 0.6 * 100) | round | int -%} +{%- if is_dark -%} + {%- set red_faint = c.red | mod(saturation=red_faint_s) | sub(lightness=10) -%} +{%- else -%} + {%- set red_faint = c.red | mod(saturation=red_faint_s) | add(lightness=10) -%} +{%- endif -%} + +{#- ============================= Green family ============================= #} +{%- set green_warmer = c.lime -%} +{%- set green_cooler_pre = c.green | add(hue=16) -%} +{%- set green_cooler = if(cond=is_dark, t=green_cooler_pre | sub(lightness=1), f=green_cooler_pre | add(lightness=1)) -%} +{%- set green_faint_s = (c.green.hsl.s * 0.65 * 100) | round | int -%} +{%- if is_dark -%} + {%- set green_faint = c.green | mod(saturation=green_faint_s) | sub(lightness=10) -%} +{%- else -%} + {%- set green_faint = c.green | mod(saturation=green_faint_s) | add(lightness=10) -%} +{%- endif -%} + +{#- ============================ Yellow family =============================#} +{%- set yellow_warmer = c.yellow | sub(hue=8) | add(saturation=2) -%} +{%- set yellow_cooler_pre = c.yellow | add(hue=10) -%} +{%- set yellow_cooler_s = (c.yellow.hsl.s * 100 - 5) | round | int -%} +{%- set yellow_cooler_pre2 = c.yellow | add(hue=10) | mod(saturation=yellow_cooler_s) -%} +{%- set yellow_cooler = if(cond=is_dark, t=yellow_cooler_pre2 | sub(lightness=1), f=yellow_cooler_pre2 | add(lightness=1)) -%} +{%- set yellow_faint_s = (c.yellow.hsl.s * 0.6 * 100) | round | int -%} +{%- if is_dark -%} + {%- set yellow_faint = c.yellow | mod(saturation=yellow_faint_s) | sub(lightness=10) -%} +{%- else -%} + {%- set yellow_faint = c.yellow | mod(saturation=yellow_faint_s) | add(lightness=10) -%} +{%- endif -%} + +{#- ============================== Blue family ==============================#} +{%- set blue_warmer = c.snow -%} +{%- set blue_cooler_pre = c.blue | add(hue=14) -%} +{%- set blue_cooler = if(cond=is_dark, t=blue_cooler_pre | sub(lightness=1), f=blue_cooler_pre | add(lightness=1)) -%} +{%- set blue_faint_s = (c.blue.hsl.s * 0.6 * 100) | round | int -%} +{%- if is_dark -%} + {%- set blue_faint = c.blue | mod(saturation=blue_faint_s) | sub(lightness=11) -%} +{%- else -%} + {%- set blue_faint = c.blue | mod(saturation=blue_faint_s) | add(lightness=11) -%} +{%- endif -%} + +{#- ============================ Magenta family =============================#} +{%- set magenta = c.purple -%} +{%- set magenta_warmer = c.pink -%} +{%- set magenta_cooler_pre = c.purple | add(hue=14) -%} +{%- set magenta_cooler = if(cond=is_dark, t=magenta_cooler_pre | sub(lightness=1), f=magenta_cooler_pre | add(lightness=1)) -%} +{%- set magenta_faint_s = (c.purple.hsl.s * 0.6 * 100) | round | int -%} +{%- if is_dark -%} + {%- set magenta_faint = c.purple | mod(saturation=magenta_faint_s) | sub(lightness=11) -%} +{%- else -%} + {%- set magenta_faint = c.purple | mod(saturation=magenta_faint_s) | add(lightness=11) -%} +{%- endif -%} + +{#- ============================== Cyan family ===============================#} +{%- set cyan = c.aqua -%} +{%- set cyan_warmer = c.aqua | sub(hue=14) -%} +{%- set cyan_cooler = c.skye -%} +{%- set cyan_faint_s = (c.aqua.hsl.s * 0.65 * 100) | round | int -%} +{%- if is_dark -%} + {%- set cyan_faint = c.aqua | mod(saturation=cyan_faint_s) | sub(lightness=11) -%} +{%- else -%} + {%- set cyan_faint = c.aqua | mod(saturation=cyan_faint_s) | add(lightness=11) -%} +{%- endif -%} + +{#- ==================== Intense / Subtle / Nuanced backgrounds ============== + Targets differ for dark vs. light flavors -- a dark theme's "intense" bg + needs to stay dark-ish (low lightness) to read as a background at all, + while a light theme's needs to stay pale. Values are the ones reverse- + engineered from fortune-gold-theme.el (light) and the original hand-built + evergarden-fall (dark). -#} +{%- if is_dark -%} + {%- set int_s = 42 %}{% set int_l = 30 -%} + {%- set sub_s = 26 %}{% set sub_l = 23 -%} + {%- set nua_s = 16 %}{% set nua_l = 19 -%} + {%- set g0_s = 55 %}{% set g0_l = 42 -%} + {%- set g1_s = 40 %}{% set g1_l = 30 -%} +{%- else -%} + {%- set int_s = 50 %}{% set int_l = 84 -%} + {%- set sub_s = 40 %}{% set sub_l = 90 -%} + {%- set nua_s = 35 %}{% set nua_l = 92 -%} + {%- set g0_s = 35 %}{% set g0_l = 60 -%} + {%- set g1_s = 35 %}{% set g1_l = 75 -%} +{%- endif -%} + +{%- set bg_red_intense = c.red | mod(saturation=int_s, lightness=int_l) -%} +{%- set bg_red_subtle = c.red | mod(saturation=sub_s, lightness=sub_l) -%} +{%- set bg_red_nuanced = c.red | mod(saturation=nua_s, lightness=nua_l) -%} +{%- set bg_graph_red_0 = c.red | mod(saturation=g0_s, lightness=g0_l) -%} +{%- set bg_graph_red_1 = c.red | mod(saturation=g1_s, lightness=g1_l) -%} + +{%- set bg_green_intense = c.green | mod(saturation=int_s, lightness=int_l) -%} +{%- set bg_green_subtle = c.green | mod(saturation=sub_s, lightness=sub_l) -%} +{%- set bg_green_nuanced = c.green | mod(saturation=nua_s, lightness=nua_l) -%} +{%- set bg_graph_green_0 = c.green | mod(saturation=g0_s, lightness=g0_l) -%} +{%- set bg_graph_green_1 = c.green | mod(saturation=g1_s, lightness=g1_l) -%} + +{%- set bg_yellow_intense = c.yellow | mod(saturation=int_s, lightness=int_l) -%} +{%- set bg_yellow_subtle = c.yellow | mod(saturation=sub_s, lightness=sub_l) -%} +{%- set bg_yellow_nuanced = c.yellow | mod(saturation=nua_s, lightness=nua_l) -%} +{%- set bg_graph_yellow_0 = c.yellow | mod(saturation=g0_s, lightness=g0_l) -%} +{%- set bg_graph_yellow_1 = c.yellow | mod(saturation=g1_s, lightness=g1_l) -%} + +{%- set bg_blue_intense = c.blue | mod(saturation=int_s, lightness=int_l) -%} +{%- set bg_blue_subtle = c.blue | mod(saturation=sub_s, lightness=sub_l) -%} +{%- set bg_blue_nuanced = c.blue | mod(saturation=nua_s, lightness=nua_l) -%} +{%- set bg_graph_blue_0 = c.blue | mod(saturation=g0_s, lightness=g0_l) -%} +{%- set bg_graph_blue_1 = c.blue | mod(saturation=g1_s, lightness=g1_l) -%} + +{%- set bg_magenta_intense = c.purple | mod(saturation=int_s, lightness=int_l) -%} +{%- set bg_magenta_subtle = c.purple | mod(saturation=sub_s, lightness=sub_l) -%} +{%- set bg_magenta_nuanced = c.purple | mod(saturation=nua_s, lightness=nua_l) -%} +{%- set bg_graph_magenta_0 = c.purple | mod(saturation=g0_s, lightness=g0_l) -%} +{%- set bg_graph_magenta_1 = c.purple | mod(saturation=g1_s, lightness=g1_l) -%} + +{%- set bg_cyan_intense = c.aqua | mod(saturation=int_s, lightness=int_l) -%} +{%- set bg_cyan_subtle = c.aqua | mod(saturation=sub_s, lightness=sub_l) -%} +{%- set bg_cyan_nuanced = c.aqua | mod(saturation=nua_s, lightness=nua_l) -%} +{%- set bg_graph_cyan_0 = c.aqua | mod(saturation=g0_s, lightness=g0_l) -%} +{%- set bg_graph_cyan_1 = c.aqua | mod(saturation=g1_s, lightness=g1_l) -%} + +{#- ================================== Diff ==================================#} +{%- set intense_txt_s = if(cond=is_dark, t=10, f=8) -%} +{%- set intense_txt_l = if(cond=is_dark, t=25, f=15) -%} +{%- set fg_added_intense = c.green | add(saturation=intense_txt_s) | sub(lightness=intense_txt_l) -%} +{%- set fg_changed_intense = yellow_cooler | add(saturation=intense_txt_s) | sub(lightness=intense_txt_l) -%} +{%- set fg_removed_intense = c.red | add(saturation=intense_txt_s) | sub(lightness=intense_txt_l) -%} + +;;; evergarden-{{flavor.identifier}}-theme.el --- Evergarden, {{flavor.name}} flavor -*- lexical-binding: t; -*- + +;; Author: expansion of the original evergarden theme by @koi.rip +;; Version: 0.2.0 +;; Package-Requires: ((emacs "28.1") (modus-themes "5.0.0") (ef-themes "2.0.0")) +;; Keywords: faces, theme + +;;; Commentary: +;; +;; The {{flavor.name}} flavor of evergarden -- generated by whiskers from +;; the shared color table, same as lua/evergarden/palettes/{{flavor.identifier}}.lua. +;; All the actual face wiring lives in evergarden-common.el; this file only +;; supplies {{flavor.name}}'s own colors. DO NOT EDIT BY HAND -- edit the +;; .tera template and re-run whiskers instead. + +;;; Code: + +;; Not `(file-name-directory (or load-file-name buffer-file-name))' -- +;; both can be nil depending on how the loader gets here (byte-compile +;; caches, `eval-buffer', some straight.el paths), which signals +;; `(wrong-type-argument stringp nil)'. `custom-theme-load-path' is +;; reliably populated by the time any theme file loads (it's how this +;; file was found in the first place), so search that instead. +(unless (featurep 'evergarden-common) + (let ((common (locate-file "evergarden-common" + (append (seq-filter #'stringp custom-theme-load-path) + load-path) + '(".el" ".elc" "")))) + (if common + (load common) + (error "evergarden-common.el not found; add its directory to `custom-theme-load-path'")))) + +(defconst evergarden-{{flavor.identifier}}-palette-partial + '( + ;; Core backgrounds / foregrounds + (cursor "#{{c.cherry | hex}}") + (bg-main "#{{c.base | hex}}") + (bg-dim "#{{c.surface0 | hex}}") + (bg-alt "#{{c.surface1 | hex}}") + (fg-main "#{{c.text | hex}}") + (fg-dim "#{{c.subtext1 | hex}}") + (fg-alt "#{{c.subtext0 | hex}}") + (bg-active "#{{c.surface2 | hex}}") + (bg-inactive "#{{c.surface0 | hex}}") + (border "#{{c.overlay0 | hex}}") + + ;; {{flavor.name}}'s own named palette (from the whiskers color table) + (bg-hl "#{{c.surface2 | hex}}") + (bg-prose-block "#{{ if(cond=is_dark, t=c.base | add(lightness=3) | hex, f=c.base | sub(lightness=2) | hex) }}") +{%- for id, color in c %} + ({{id}} "#{{color.hex}}") +{%- endfor %} + + ;; Red family + (red-warmer "#{{red_warmer | hex}}") + (red-cooler "#{{red_cooler | hex}}") + (red-faint "#{{red_faint | hex}}") + + ;; Green family + (green-warmer "#{{green_warmer | hex}}") + (green-cooler "#{{green_cooler | hex}}") + (green-faint "#{{green_faint | hex}}") + + ;; Yellow family + (yellow-warmer "#{{yellow_warmer | hex}}") + (yellow-cooler "#{{yellow_cooler | hex}}") + (yellow-faint "#{{yellow_faint | hex}}") + + ;; Blue family + (blue-warmer "#{{blue_warmer | hex}}") + (blue-cooler "#{{blue_cooler | hex}}") + (blue-faint "#{{blue_faint | hex}}") + + ;; Magenta/purple family + (magenta "#{{magenta | hex}}") + (magenta-warmer "#{{magenta_warmer | hex}}") + (magenta-cooler "#{{magenta_cooler | hex}}") + (magenta-faint "#{{magenta_faint | hex}}") + + ;; Cyan family + (cyan "#{{cyan | hex}}") + (cyan-warmer "#{{cyan_warmer | hex}}") + (cyan-cooler "#{{cyan_cooler | hex}}") + (cyan-faint "#{{cyan_faint | hex}}") + + ;; Intense/Subtle/Nuanced backgrounds + (bg-red-intense "#{{bg_red_intense | hex}}") + (bg-red-subtle "#{{bg_red_subtle | hex}}") + (bg-red-nuanced "#{{bg_red_nuanced | hex}}") + (bg-green-intense "#{{bg_green_intense | hex}}") + (bg-green-subtle "#{{bg_green_subtle | hex}}") + (bg-green-nuanced "#{{bg_green_nuanced | hex}}") + (bg-yellow-intense "#{{bg_yellow_intense | hex}}") + (bg-yellow-subtle "#{{bg_yellow_subtle | hex}}") + (bg-yellow-nuanced "#{{bg_yellow_nuanced | hex}}") + (bg-blue-intense "#{{bg_blue_intense | hex}}") + (bg-blue-subtle "#{{bg_blue_subtle | hex}}") + (bg-blue-nuanced "#{{bg_blue_nuanced | hex}}") + (bg-magenta-intense "#{{bg_magenta_intense | hex}}") + (bg-magenta-subtle "#{{bg_magenta_subtle | hex}}") + (bg-magenta-nuanced "#{{bg_magenta_nuanced | hex}}") + (bg-cyan-intense "#{{bg_cyan_intense | hex}}") + (bg-cyan-subtle "#{{bg_cyan_subtle | hex}}") + (bg-cyan-nuanced "#{{bg_cyan_nuanced | hex}}") + + ;; Graph colors + (bg-graph-red-0 "#{{bg_graph_red_0 | hex}}") + (bg-graph-red-1 "#{{bg_graph_red_1 | hex}}") + (bg-graph-green-0 "#{{bg_graph_green_0 | hex}}") + (bg-graph-green-1 "#{{bg_graph_green_1 | hex}}") + (bg-graph-yellow-0 "#{{bg_graph_yellow_0 | hex}}") + (bg-graph-yellow-1 "#{{bg_graph_yellow_1 | hex}}") + (bg-graph-blue-0 "#{{bg_graph_blue_0 | hex}}") + (bg-graph-blue-1 "#{{bg_graph_blue_1 | hex}}") + (bg-graph-magenta-0 "#{{bg_graph_magenta_0 | hex}}") + (bg-graph-magenta-1 "#{{bg_graph_magenta_1 | hex}}") + (bg-graph-cyan-0 "#{{bg_graph_cyan_0 | hex}}") + (bg-graph-cyan-1 "#{{bg_graph_cyan_1 | hex}}") + + ;; Diff + (bg-added "#{{bg_green_intense | hex}}") + (bg-added-faint "#{{bg_green_subtle | hex}}") + (bg-added-refine "#{{bg_green_intense | mix(color=bg_green_subtle, amount=0.4) | hex}}") + (bg-added-fringe "#{{bg_graph_green_0 | hex}}") + (fg-added "#{{c.green | hex}}") + (fg-added-intense "#{{fg_added_intense | hex}}") + + (bg-changed "#{{bg_yellow_intense | hex}}") + (bg-changed-faint "#{{bg_yellow_subtle | hex}}") + (bg-changed-refine "#{{bg_yellow_intense | mix(color=bg_yellow_subtle, amount=0.4) | hex}}") + (bg-changed-fringe "#{{bg_graph_yellow_0 | hex}}") + (fg-changed "#{{yellow_cooler | hex}}") + (fg-changed-intense "#{{fg_changed_intense | hex}}") + + (bg-removed "#{{bg_red_intense | hex}}") + (bg-removed-faint "#{{bg_red_subtle | hex}}") + (bg-removed-refine "#{{bg_red_intense | mix(color=bg_red_subtle, amount=0.4) | hex}}") + (bg-removed-fringe "#{{bg_graph_red_0 | hex}}") + (fg-removed "#{{c.red | hex}}") + (fg-removed-intense "#{{fg_removed_intense | hex}}") + + (bg-diff-context "#{{c.surface2 | hex}}") + + ;; UI chrome + (bg-mode-line-active "#{{c.surface2 | sub(lightness=3) | hex}}") + (fg-mode-line-active "#{{c.text | hex}}") + (bg-mode-line-inactive "#{{c.surface0 | hex}}") + (fg-mode-line-inactive "#{{c.subtext1 | hex}}") + (border-mode-line-active "#{{c.green | hex}}") + (border-mode-line-inactive "#{{c.overlay0 | hex}}") + (bg-completion "#{{c.surface0 | hex}}") + (bg-hover "#{{c.surface2 | hex}}") + (bg-hover-secondary "#{{bg_blue_subtle | hex}}") + (bg-hl-line "#{{c.surface2 | hex}}") + (bg-paren-match "#{{bg_yellow_intense | hex}}") + (bg-err "#{{bg_red_intense | hex}}") + (bg-warning "#{{bg_yellow_intense | hex}}") + (bg-info "#{{bg_cyan_intense | hex}}") + (bg-region "#{{bg_green_intense | hex}}")) + "Base palette entries for `evergarden-{{flavor.identifier}}', generated by whiskers.") + +(evergarden-build-theme 'evergarden-{{flavor.identifier}} evergarden-{{flavor.identifier}}-palette-partial '{{ if(cond=is_dark, t="dark", f="light") }}) + +(provide 'evergarden-{{flavor.identifier}}-theme) + +;;; evergarden-{{flavor.identifier}}-theme.el ends here diff --git a/evergarden-common.el b/evergarden-common.el index c897de4..749bcda 100644 --- a/evergarden-common.el +++ b/evergarden-common.el @@ -256,7 +256,6 @@ stay red, ANSI blue should stay blue, etc., regardless of flavor.") "Semantic color mappings shared by every evergarden flavor. Only references palette symbol names, never literal hex, so the exact same list works whether the active flavor's palette is dark or light.") - (defconst evergarden-custom-faces '(`(corfu-default ((,c :inherit modus-themes-fixed-pitch :background ,bg-dim @@ -270,9 +269,7 @@ list works whether the active flavor's palette is dark or light.") :foreground ,border))) `(corfu-bar ((,c :background ,green))) `(corfu-popupinfo ((,c :background ,bg-dim - :foreground ,fg-main)))) - "Additional face overrides shared by every evergarden flavor.") - + :foreground ,fg-main))))) (defun evergarden--ensure-modus-theme-metadata (name family description mode palette-sym overrides-sym) "Declare NAME as a Modus-derived theme when reloading in-session. diff --git a/evergarden-fall-theme.el b/evergarden-fall-theme.el deleted file mode 100644 index 300ccc3..0000000 --- a/evergarden-fall-theme.el +++ /dev/null @@ -1,156 +0,0 @@ -;;; evergarden-fall-theme.el --- Evergarden, Fall flavor -*- lexical-binding: t; -*- - -;; Author: expansion of the original evergarden theme by @koi.rip -;; Version: 0.2.0 -;; Package-Requires: ((emacs "28.1") (modus-themes "5.0.0") (ef-themes "2.0.0")) -;; Keywords: faces, theme - -;;; Commentary: -;; -;; The Fall flavor of evergarden - -;;; Code: - -(let ((dir (file-name-directory (or load-file-name buffer-file-name)))) - (add-to-list 'load-path dir) - (require 'evergarden-common)) - -(defconst evergarden-fall-palette-partial - '( - (cursor "#fae6ef") - (bg-main "#232a2e") - (bg-dim "#2b3337") - (bg-alt "#374145") - (fg-main "#f8f9e8") - (fg-dim "#adc9bc") - (fg-alt "#96b4aa") - (bg-active "#4a585c") - (bg-inactive "#2b3337") - (border "#58686d") - - (bg-hl "#4a585c") - (bg-prose-block "#2A3237") - (red "#f57f82") - (orange "#f7a182") - (yellow "#f5d098") - (lime "#dbe6af") - (green "#cbe3b3") - (aqua "#b3e3ca") - (skye "#b3e6db") - (snow "#afd9e6") - (blue "#b2caed") - (purple "#d2bdf3") - (pink "#f3c0e5") - (cherry "#fae6ef") - (subtext1 "#adc9bc") - (subtext0 "#96b4aa") - (overlay2 "#839e9a") - (overlay1 "#6f8788") - (overlay0 "#58686d") - (surface2 "#4a585c") - (surface1 "#374145") - (surface0 "#2b3337") - (mantle "#1c2225") - (crust "#171c1f") - - (red-warmer "#F6798F") - (red-cooler "#F68F74") - (red-faint "#CD7476") - - (green-warmer "#dbe6af") - (green-cooler "#C1E4B7") - (green-faint "#B2C99A") - - (yellow-warmer "#F6C497") - (yellow-cooler "#F3DF9F") - (yellow-faint "#D2B588") - - (blue-warmer "#afd9e6") - (blue-cooler "#B6C0EE") - (blue-faint "#97AED0") - - (magenta "#d2bdf3") - (magenta-warmer "#f3c0e5") - (magenta-cooler "#E1C1F4") - (magenta-faint "#B6A0D8") - - (cyan "#b3e3ca") - (cyan-warmer "#B3E3BF") - (cyan-cooler "#b3e6db") - (cyan-faint "#97C7AE") - - (bg-red-intense "#6D2C2E") - (bg-red-subtle "#482A2B") - (bg-red-nuanced "#372828") - (bg-green-intense "#4D6D2C") - (bg-green-subtle "#39482A") - (bg-green-nuanced "#2F3728") - (bg-yellow-intense "#6D532C") - (bg-yellow-subtle "#483C2A") - (bg-yellow-nuanced "#373128") - (bg-blue-intense "#2C476D") - (bg-blue-subtle "#2A3748") - (bg-blue-nuanced "#282E37") - (bg-magenta-intense "#452C6D") - (bg-magenta-subtle "#362A48") - (bg-magenta-nuanced "#2D2837") - (bg-cyan-intense "#2C6D4B") - (bg-cyan-subtle "#2A4839") - (bg-cyan-nuanced "#28372F") - - (bg-graph-red-0 "#A63033") - (bg-graph-red-1 "#6B2E2F") - (bg-graph-green-0 "#6BA630") - (bg-graph-green-1 "#4D6B2E") - (bg-graph-yellow-0 "#A67730") - (bg-graph-yellow-1 "#6B532E") - (bg-graph-blue-0 "#3060A6") - (bg-graph-blue-1 "#2E476B") - (bg-graph-magenta-0 "#5E30A6") - (bg-graph-magenta-1 "#462E6B") - (bg-graph-cyan-0 "#30A669") - (bg-graph-cyan-1 "#2E6B4B") - - (bg-added "#4D6D2C") - (bg-added-faint "#39482A") - (bg-added-refine "#435B2B") - (bg-added-fringe "#6BA630") - (fg-added "#cbe3b3") - (fg-added-intense "#8BCC4A") - (bg-changed "#6D532C") - (bg-changed-faint "#483C2A") - (bg-changed-refine "#5B482B") - (bg-changed-fringe "#A67730") - (fg-changed "#F3DF9F") - (fg-changed-intense "#F1BF22") - (bg-removed "#6D2C2E") - (bg-removed-faint "#482A2B") - (bg-removed-refine "#5B2B2C") - (bg-removed-fringe "#A63033") - (fg-removed "#f57f82") - (fg-removed-intense "#EF050B") - (bg-diff-context "#4a585c") - - (bg-mode-line-active "#435054") - (fg-mode-line-active "#f8f9e8") - (bg-mode-line-inactive "#2b3337") - (fg-mode-line-inactive "#adc9bc") - (border-mode-line-active "#cbe3b3") - (border-mode-line-inactive "#58686d") - (bg-completion "#2b3337") - (bg-hover "#4a585c") - (bg-hover-secondary "#2A3748") - (bg-hl-line "#4a585c") - (bg-paren-match "#6D532C") - (bg-err "#6D2C2E") - (bg-warning "#6D532C") - (bg-info "#2C6D4B") - (bg-region "#4D6D2C") - (bg-prose-block "#2A3237")) - "Base palette entries for `evergarden-fall'.") - -(evergarden-build-theme 'evergarden-fall evergarden-fall-palette-partial 'dark) - -(provide 'evergarden-fall-theme) - -;;; evergarden-fall-theme.el ends here diff --git a/evergarden-spring-theme.el b/evergarden-spring-theme.el deleted file mode 100644 index d63d94c..0000000 --- a/evergarden-spring-theme.el +++ /dev/null @@ -1,154 +0,0 @@ -;;; evergarden-spring-theme.el --- Evergarden, Spring flavor -*- lexical-binding: t; -*- - -;; Author: expansion of the original evergarden theme by @koi.rip -;; Version: 0.2.0 -;; Package-Requires: ((emacs "28.1") (modus-themes "5.0.0") (ef-themes "2.0.0")) -;; Keywords: faces, theme - -;;; Commentary: -;; the spring flavour of evergarden -;;; Code: - -(let ((dir (file-name-directory (or load-file-name buffer-file-name)))) - (add-to-list 'load-path dir) - (require 'evergarden-common)) - -(defconst evergarden-spring-palette-partial - '( - (cursor "#fae6ef") - (bg-main "#2b3438") - (bg-dim "#343e43") - (bg-alt "#3e4a4f") - (fg-main "#f8f9e8") - (fg-dim "#adc9bc") - (fg-alt "#96b4aa") - (bg-active "#4a585c") - (bg-inactive "#343e43") - (border "#58686d") - - (bg-hl "#4a585c") - (bg-prose-block "#323C41") - (red "#f57f82") - (orange "#f7a182") - (yellow "#f5d098") - (lime "#dbe6af") - (green "#cbe3b3") - (aqua "#b3e3ca") - (skye "#b3e6db") - (snow "#afd9e6") - (blue "#b2caed") - (purple "#d2bdf3") - (pink "#f3c0e5") - (cherry "#fae6ef") - (subtext1 "#adc9bc") - (subtext0 "#96b4aa") - (overlay2 "#839e9a") - (overlay1 "#6f8788") - (overlay0 "#58686d") - (surface2 "#4a585c") - (surface1 "#3e4a4f") - (surface0 "#343e43") - (mantle "#232a2e") - (crust "#1c2225") - - (red-warmer "#F6798F") - (red-cooler "#F68F74") - (red-faint "#CD7476") - - (green-warmer "#dbe6af") - (green-cooler "#C1E4B7") - (green-faint "#B2C99A") - - (yellow-warmer "#F6C497") - (yellow-cooler "#F3DF9F") - (yellow-faint "#D2B588") - - (blue-warmer "#afd9e6") - (blue-cooler "#B6C0EE") - (blue-faint "#97AED0") - - (magenta "#d2bdf3") - (magenta-warmer "#f3c0e5") - (magenta-cooler "#E1C1F4") - (magenta-faint "#B6A0D8") - - (cyan "#b3e3ca") - (cyan-warmer "#B3E3BF") - (cyan-cooler "#b3e6db") - (cyan-faint "#97C7AE") - - (bg-red-intense "#6D2C2E") - (bg-red-subtle "#482A2B") - (bg-red-nuanced "#372828") - (bg-green-intense "#4D6D2C") - (bg-green-subtle "#39482A") - (bg-green-nuanced "#2F3728") - (bg-yellow-intense "#6D532C") - (bg-yellow-subtle "#483C2A") - (bg-yellow-nuanced "#373128") - (bg-blue-intense "#2C476D") - (bg-blue-subtle "#2A3748") - (bg-blue-nuanced "#282E37") - (bg-magenta-intense "#452C6D") - (bg-magenta-subtle "#362A48") - (bg-magenta-nuanced "#2D2837") - (bg-cyan-intense "#2C6D4B") - (bg-cyan-subtle "#2A4839") - (bg-cyan-nuanced "#28372F") - - (bg-graph-red-0 "#A63033") - (bg-graph-red-1 "#6B2E2F") - (bg-graph-green-0 "#6BA630") - (bg-graph-green-1 "#4D6B2E") - (bg-graph-yellow-0 "#A67730") - (bg-graph-yellow-1 "#6B532E") - (bg-graph-blue-0 "#3060A6") - (bg-graph-blue-1 "#2E476B") - (bg-graph-magenta-0 "#5E30A6") - (bg-graph-magenta-1 "#462E6B") - (bg-graph-cyan-0 "#30A669") - (bg-graph-cyan-1 "#2E6B4B") - - (bg-added "#4D6D2C") - (bg-added-faint "#39482A") - (bg-added-refine "#435B2B") - (bg-added-fringe "#6BA630") - (fg-added "#cbe3b3") - (fg-added-intense "#8BCC4A") - (bg-changed "#6D532C") - (bg-changed-faint "#483C2A") - (bg-changed-refine "#5B482B") - (bg-changed-fringe "#A67730") - (fg-changed "#F3DF9F") - (fg-changed-intense "#F1BF22") - (bg-removed "#6D2C2E") - (bg-removed-faint "#482A2B") - (bg-removed-refine "#5B2B2C") - (bg-removed-fringe "#A63033") - (fg-removed "#f57f82") - (fg-removed-intense "#EF050B") - (bg-diff-context "#4a585c") - - (bg-mode-line-active "#435054") - (fg-mode-line-active "#f8f9e8") - (bg-mode-line-inactive "#343e43") - (fg-mode-line-inactive "#adc9bc") - (border-mode-line-active "#cbe3b3") - (border-mode-line-inactive "#58686d") - (bg-completion "#343e43") - (bg-hover "#4a585c") - (bg-hover-secondary "#2A3748") - (bg-hl-line "#4a585c") - (bg-paren-match "#6D532C") - (bg-err "#6D2C2E") - (bg-warning "#6D532C") - (bg-info "#2C6D4B") - (bg-region "#4D6D2C") - (bg-prose-block "#323C41")) - "Base palette entries for `evergarden-spring'") - -(evergarden-build-theme 'evergarden-spring evergarden-spring-palette-partial 'dark) - -(provide 'evergarden-spring-theme) - -;;; evergarden-spring-theme.el ends here diff --git a/evergarden-summer-theme.el b/evergarden-summer-theme.el deleted file mode 100644 index 807aaca..0000000 --- a/evergarden-summer-theme.el +++ /dev/null @@ -1,155 +0,0 @@ -;;; evergarden-spring-theme.el --- Evergarden, Spring flavor -*- lexical-binding: t; -*- - -;; Author: expansion of the original evergarden theme by @koi.rip -;; Version: 0.2.0 -;; Package-Requires: ((emacs "28.1") (modus-themes "5.0.0") (ef-themes "2.0.0")) -;; Keywords: faces, theme - -;;; Commentary: -;; summer flavour of evergarden - -;;; Code: - -(let ((dir (file-name-directory (or load-file-name buffer-file-name)))) - (add-to-list 'load-path dir) - (require 'evergarden-common)) - -(defconst evergarden-spring-palette-partial - '( - (cursor "#fae6ef") - (bg-main "#2b3438") - (bg-dim "#343e43") - (bg-alt "#3e4a4f") - (fg-main "#f8f9e8") - (fg-dim "#adc9bc") - (fg-alt "#96b4aa") - (bg-active "#4a585c") - (bg-inactive "#343e43") - (border "#58686d") - - (bg-hl "#4a585c") - (bg-prose-block "#323C41") - (red "#f57f82") - (orange "#f7a182") - (yellow "#f5d098") - (lime "#dbe6af") - (green "#cbe3b3") - (aqua "#b3e3ca") - (skye "#b3e6db") - (snow "#afd9e6") - (blue "#b2caed") - (purple "#d2bdf3") - (pink "#f3c0e5") - (cherry "#fae6ef") - (subtext1 "#adc9bc") - (subtext0 "#96b4aa") - (overlay2 "#839e9a") - (overlay1 "#6f8788") - (overlay0 "#58686d") - (surface2 "#4a585c") - (surface1 "#3e4a4f") - (surface0 "#343e43") - (mantle "#232a2e") - (crust "#1c2225") - - (red-warmer "#F6798F") - (red-cooler "#F68F74") - (red-faint "#CD7476") - - (green-warmer "#dbe6af") - (green-cooler "#C1E4B7") - (green-faint "#B2C99A") - - (yellow-warmer "#F6C497") - (yellow-cooler "#F3DF9F") - (yellow-faint "#D2B588") - - (blue-warmer "#afd9e6") - (blue-cooler "#B6C0EE") - (blue-faint "#97AED0") - - (magenta "#d2bdf3") - (magenta-warmer "#f3c0e5") - (magenta-cooler "#E1C1F4") - (magenta-faint "#B6A0D8") - - (cyan "#b3e3ca") - (cyan-warmer "#B3E3BF") - (cyan-cooler "#b3e6db") - (cyan-faint "#97C7AE") - - (bg-red-intense "#6D2C2E") - (bg-red-subtle "#482A2B") - (bg-red-nuanced "#372828") - (bg-green-intense "#4D6D2C") - (bg-green-subtle "#39482A") - (bg-green-nuanced "#2F3728") - (bg-yellow-intense "#6D532C") - (bg-yellow-subtle "#483C2A") - (bg-yellow-nuanced "#373128") - (bg-blue-intense "#2C476D") - (bg-blue-subtle "#2A3748") - (bg-blue-nuanced "#282E37") - (bg-magenta-intense "#452C6D") - (bg-magenta-subtle "#362A48") - (bg-magenta-nuanced "#2D2837") - (bg-cyan-intense "#2C6D4B") - (bg-cyan-subtle "#2A4839") - (bg-cyan-nuanced "#28372F") - - (bg-graph-red-0 "#A63033") - (bg-graph-red-1 "#6B2E2F") - (bg-graph-green-0 "#6BA630") - (bg-graph-green-1 "#4D6B2E") - (bg-graph-yellow-0 "#A67730") - (bg-graph-yellow-1 "#6B532E") - (bg-graph-blue-0 "#3060A6") - (bg-graph-blue-1 "#2E476B") - (bg-graph-magenta-0 "#5E30A6") - (bg-graph-magenta-1 "#462E6B") - (bg-graph-cyan-0 "#30A669") - (bg-graph-cyan-1 "#2E6B4B") - - (bg-added "#4D6D2C") - (bg-added-faint "#39482A") - (bg-added-refine "#435B2B") - (bg-added-fringe "#6BA630") - (fg-added "#cbe3b3") - (fg-added-intense "#8BCC4A") - (bg-changed "#6D532C") - (bg-changed-faint "#483C2A") - (bg-changed-refine "#5B482B") - (bg-changed-fringe "#A67730") - (fg-changed "#F3DF9F") - (fg-changed-intense "#F1BF22") - (bg-removed "#6D2C2E") - (bg-removed-faint "#482A2B") - (bg-removed-refine "#5B2B2C") - (bg-removed-fringe "#A63033") - (fg-removed "#f57f82") - (fg-removed-intense "#EF050B") - (bg-diff-context "#4a585c") - - (bg-mode-line-active "#435054") - (fg-mode-line-active "#f8f9e8") - (bg-mode-line-inactive "#343e43") - (fg-mode-line-inactive "#adc9bc") - (border-mode-line-active "#cbe3b3") - (border-mode-line-inactive "#58686d") - (bg-completion "#343e43") - (bg-hover "#4a585c") - (bg-hover-secondary "#2A3748") - (bg-hl-line "#4a585c") - (bg-paren-match "#6D532C") - (bg-err "#6D2C2E") - (bg-warning "#6D532C") - (bg-info "#2C6D4B") - (bg-region "#4D6D2C") - (bg-prose-block "#323C41")) - "Base palette entries for `evergarden-spring'") - -(evergarden-build-theme 'evergarden-spring evergarden-spring-palette-partial 'dark) - -(provide 'evergarden-spring-theme) - -;;; evergarden-spring-theme.el ends here diff --git a/evergarden-winter-theme.el b/evergarden-winter-theme.el deleted file mode 100644 index 99067b8..0000000 --- a/evergarden-winter-theme.el +++ /dev/null @@ -1,155 +0,0 @@ -;;; evergarden-winter-theme.el --- Evergarden, Winter flavor -*- lexical-binding: t; -*- - -;; Author: expansion of the original evergarden theme by @koi.rip -;; Version: 0.2.0 -;; Package-Requires: ((emacs "28.1") (modus-themes "5.0.0") (ef-themes "2.0.0")) -;; Keywords: faces, theme - -;;; Commentary: -;; -;; the winter flavour of evergarden -;;; Code: - -(let ((dir (file-name-directory (or load-file-name buffer-file-name)))) - (add-to-list 'load-path dir) - (require 'evergarden-common)) - -(defconst evergarden-winter-palette-partial - '( - (cursor "#fae6ef") - (bg-main "#1e2528") - (bg-dim "#262f33") - (bg-alt "#374145") - (fg-main "#f8f9e8") - (fg-dim "#adc9bc") - (fg-alt "#96b4aa") - (bg-active "#4a585c") - (bg-inactive "#262f33") - (border "#58686d") - - (bg-hl "#4a585c") - (bg-prose-block "#252D31") - (red "#f57f82") - (orange "#f7a182") - (yellow "#f5d098") - (lime "#dbe6af") - (green "#cbe3b3") - (aqua "#b3e3ca") - (skye "#b3e6db") - (snow "#afd9e6") - (blue "#b2caed") - (purple "#d2bdf3") - (pink "#f3c0e5") - (cherry "#fae6ef") - (subtext1 "#adc9bc") - (subtext0 "#96b4aa") - (overlay2 "#839e9a") - (overlay1 "#6f8788") - (overlay0 "#58686d") - (surface2 "#4a585c") - (surface1 "#374145") - (surface0 "#262f33") - (mantle "#191e21") - (crust "#171c1f") - - (red-warmer "#F6798F") - (red-cooler "#F68F74") - (red-faint "#CD7476") - - (green-warmer "#dbe6af") - (green-cooler "#C1E4B7") - (green-faint "#B2C99A") - - (yellow-warmer "#F6C497") - (yellow-cooler "#F3DF9F") - (yellow-faint "#D2B588") - - (blue-warmer "#afd9e6") - (blue-cooler "#B6C0EE") - (blue-faint "#97AED0") - - (magenta "#d2bdf3") - (magenta-warmer "#f3c0e5") - (magenta-cooler "#E1C1F4") - (magenta-faint "#B6A0D8") - - (cyan "#b3e3ca") - (cyan-warmer "#B3E3BF") - (cyan-cooler "#b3e6db") - (cyan-faint "#97C7AE") - - (bg-red-intense "#6D2C2E") - (bg-red-subtle "#482A2B") - (bg-red-nuanced "#372828") - (bg-green-intense "#4D6D2C") - (bg-green-subtle "#39482A") - (bg-green-nuanced "#2F3728") - (bg-yellow-intense "#6D532C") - (bg-yellow-subtle "#483C2A") - (bg-yellow-nuanced "#373128") - (bg-blue-intense "#2C476D") - (bg-blue-subtle "#2A3748") - (bg-blue-nuanced "#282E37") - (bg-magenta-intense "#452C6D") - (bg-magenta-subtle "#362A48") - (bg-magenta-nuanced "#2D2837") - (bg-cyan-intense "#2C6D4B") - (bg-cyan-subtle "#2A4839") - (bg-cyan-nuanced "#28372F") - - (bg-graph-red-0 "#A63033") - (bg-graph-red-1 "#6B2E2F") - (bg-graph-green-0 "#6BA630") - (bg-graph-green-1 "#4D6B2E") - (bg-graph-yellow-0 "#A67730") - (bg-graph-yellow-1 "#6B532E") - (bg-graph-blue-0 "#3060A6") - (bg-graph-blue-1 "#2E476B") - (bg-graph-magenta-0 "#5E30A6") - (bg-graph-magenta-1 "#462E6B") - (bg-graph-cyan-0 "#30A669") - (bg-graph-cyan-1 "#2E6B4B") - - (bg-added "#4D6D2C") - (bg-added-faint "#39482A") - (bg-added-refine "#435B2B") - (bg-added-fringe "#6BA630") - (fg-added "#cbe3b3") - (fg-added-intense "#8BCC4A") - (bg-changed "#6D532C") - (bg-changed-faint "#483C2A") - (bg-changed-refine "#5B482B") - (bg-changed-fringe "#A67730") - (fg-changed "#F3DF9F") - (fg-changed-intense "#F1BF22") - (bg-removed "#6D2C2E") - (bg-removed-faint "#482A2B") - (bg-removed-refine "#5B2B2C") - (bg-removed-fringe "#A63033") - (fg-removed "#f57f82") - (fg-removed-intense "#EF050B") - (bg-diff-context "#4a585c") - - (bg-mode-line-active "#435054") - (fg-mode-line-active "#f8f9e8") - (bg-mode-line-inactive "#262f33") - (fg-mode-line-inactive "#adc9bc") - (border-mode-line-active "#cbe3b3") - (border-mode-line-inactive "#58686d") - (bg-completion "#262f33") - (bg-hover "#4a585c") - (bg-hover-secondary "#2A3748") - (bg-hl-line "#4a585c") - (bg-paren-match "#6D532C") - (bg-err "#6D2C2E") - (bg-warning "#6D532C") - (bg-info "#2C6D4B") - (bg-region "#4D6D2C") - (bg-prose-block "#252D31")) - "Base palette entries for `evergarden-winter'") - -(evergarden-build-theme 'evergarden-winter evergarden-winter-palette-partial 'dark) - -(provide 'evergarden-winter-theme) - -;;; evergarden-winter-theme.el ends here diff --git a/themes/evergarden-fall-theme.el b/themes/evergarden-fall-theme.el new file mode 100644 index 0000000..e0903c2 --- /dev/null +++ b/themes/evergarden-fall-theme.el @@ -0,0 +1,187 @@ +;;; evergarden-fall-theme.el --- Evergarden, Fall flavor -*- lexical-binding: t; -*- + +;; Author: expansion of the original evergarden theme by @koi.rip +;; Version: 0.2.0 +;; Package-Requires: ((emacs "28.1") (modus-themes "5.0.0") (ef-themes "2.0.0")) +;; Keywords: faces, theme + +;;; Commentary: +;; +;; The Fall flavor of evergarden -- generated by whiskers from +;; the shared color table, same as lua/evergarden/palettes/fall.lua. +;; All the actual face wiring lives in evergarden-common.el; this file only +;; supplies Fall's own colors. DO NOT EDIT BY HAND -- edit the +;; .tera template and re-run whiskers instead. + +;;; Code: + +;; Not `(file-name-directory (or load-file-name buffer-file-name))' -- +;; both can be nil depending on how the loader gets here (byte-compile +;; caches, `eval-buffer', some straight.el paths), which signals +;; `(wrong-type-argument stringp nil)'. `custom-theme-load-path' is +;; reliably populated by the time any theme file loads (it's how this +;; file was found in the first place), so search that instead. +(unless (featurep 'evergarden-common) + (let ((common (locate-file "evergarden-common" + (append (seq-filter #'stringp custom-theme-load-path) + load-path) + '(".el" ".elc" "")))) + (if common + (load common) + (error "evergarden-common.el not found; add its directory to `custom-theme-load-path'")))) + +(defconst evergarden-fall-palette-partial + '( + ;; Core backgrounds / foregrounds + (cursor "#fae6ef") + (bg-main "#232a2e") + (bg-dim "#2b3337") + (bg-alt "#374145") + (fg-main "#f8f9e8") + (fg-dim "#adc9bc") + (fg-alt "#96b4aa") + (bg-active "#4a585c") + (bg-inactive "#2b3337") + (border "#58686d") + + ;; Fall's own named palette (from the whiskers color table) + (bg-hl "#4a585c") + (bg-prose-block "#2a3338") + (red "#f57f82") + (orange "#f7a182") + (yellow "#f5d098") + (lime "#dbe6af") + (green "#cbe3b3") + (aqua "#b3e3ca") + (skye "#b3e6db") + (snow "#afd9e6") + (blue "#b2caed") + (purple "#d2bdf3") + (pink "#f3c0e5") + (cherry "#fae6ef") + (text "#f8f9e8") + (subtext1 "#adc9bc") + (subtext0 "#96b4aa") + (overlay2 "#839e9a") + (overlay1 "#6f8788") + (overlay0 "#58686d") + (surface2 "#4a585c") + (surface1 "#374145") + (surface0 "#2b3337") + (base "#232a2e") + (mantle "#1c2225") + (crust "#171c1f") + + ;; Red family + (red-warmer "#f6788f") + (red-cooler "#f48f76") + (red-faint "#d07073") + + ;; Green family + (green-warmer "#dbe6af") + (green-cooler "#bae1af") + (green-faint "#b1c999") + + ;; Yellow family + (yellow-warmer "#f6c498") + (yellow-cooler "#f1dc97") + (yellow-faint "#d5b585") + + ;; Blue family + (blue-warmer "#afd9e6") + (blue-cooler "#aeb8ec") + (blue-faint "#98aed0") + + ;; Magenta/purple family + (magenta "#d2bdf3") + (magenta-warmer "#f3c0e5") + (magenta-cooler "#dcb8f2") + (magenta-faint "#b5a0d8") + + ;; Cyan family + (cyan "#b3e3ca") + (cyan-warmer "#b3e3bf") + (cyan-cooler "#b3e6db") + (cyan-faint "#97c7ae") + + ;; Intense/Subtle/Nuanced backgrounds + (bg-red-intense "#d79d9f") + (bg-red-subtle "#cca8a9") + (bg-red-nuanced "#c5afb0") + (bg-green-intense "#cbe1b5") + (bg-green-subtle "#cbd8be") + (bg-green-nuanced "#cbd3c3") + (bg-yellow-intense "#deccb0") + (bg-yellow-subtle "#d5cab9") + (bg-yellow-nuanced "#d0c9be") + (bg-blue-intense "#bccce4") + (bg-blue-subtle "#c4cedc") + (bg-blue-nuanced "#c8ced8") + (bg-magenta-intense "#d4c8e8") + (bg-magenta-subtle "#d6cee2") + (bg-magenta-nuanced "#d7d2de") + (bg-cyan-intense "#b5e1ca") + (bg-cyan-subtle "#bed8cb") + (bg-cyan-nuanced "#c3d3cb") + + ;; Graph colors + (bg-graph-red-0 "#e09497") + (bg-graph-red-1 "#d69ea0") + (bg-graph-green-0 "#cbe8ae") + (bg-graph-green-1 "#cbe0b6") + (bg-graph-yellow-0 "#e6cda8") + (bg-graph-yellow-1 "#ddcbb1") + (bg-graph-blue-0 "#b6cbea") + (bg-graph-blue-1 "#bdcce3") + (bg-graph-magenta-0 "#d3c3ed") + (bg-graph-magenta-1 "#d4c8e8") + (bg-graph-cyan-0 "#aee8ca") + (bg-graph-cyan-1 "#b6e0ca") + + ;; Diff + (bg-added "#cbe1b5") + (bg-added-faint "#cbd8be") + (bg-added-refine "#cbdcba") + (bg-added-fringe "#cbe8ae") + (fg-added "#cbe3b3") + (fg-added-intense "#8bcd49") + + (bg-changed "#deccb0") + (bg-changed-faint "#d5cab9") + (bg-changed-refine "#d9cbb5") + (bg-changed-fringe "#e6cda8") + (fg-changed "#f1dc97") + (fg-changed-intense "#efbd19") + + (bg-removed "#d79d9f") + (bg-removed-faint "#cca8a9") + (bg-removed-refine "#d0a4a5") + (bg-removed-fringe "#e09497") + (fg-removed "#f57f82") + (fg-removed-intense "#ef050d") + + (bg-diff-context "#4a585c") + + ;; UI chrome + (bg-mode-line-active "#435053") + (fg-mode-line-active "#f8f9e8") + (bg-mode-line-inactive "#2b3337") + (fg-mode-line-inactive "#adc9bc") + (border-mode-line-active "#cbe3b3") + (border-mode-line-inactive "#58686d") + (bg-completion "#2b3337") + (bg-hover "#4a585c") + (bg-hover-secondary "#c4cedc") + (bg-hl-line "#4a585c") + (bg-paren-match "#deccb0") + (bg-err "#d79d9f") + (bg-warning "#deccb0") + (bg-info "#b5e1ca") + (bg-region "#cbe1b5")) + "Base palette entries for `evergarden-fall', generated by whiskers.") + +(evergarden-build-theme 'evergarden-fall evergarden-fall-palette-partial 'dark) + +(provide 'evergarden-fall-theme) + +;;; evergarden-fall-theme.el ends here diff --git a/themes/evergarden-spring-theme.el b/themes/evergarden-spring-theme.el new file mode 100644 index 0000000..4ce3f85 --- /dev/null +++ b/themes/evergarden-spring-theme.el @@ -0,0 +1,187 @@ +;;; evergarden-spring-theme.el --- Evergarden, Spring flavor -*- lexical-binding: t; -*- + +;; Author: expansion of the original evergarden theme by @koi.rip +;; Version: 0.2.0 +;; Package-Requires: ((emacs "28.1") (modus-themes "5.0.0") (ef-themes "2.0.0")) +;; Keywords: faces, theme + +;;; Commentary: +;; +;; The Spring flavor of evergarden -- generated by whiskers from +;; the shared color table, same as lua/evergarden/palettes/spring.lua. +;; All the actual face wiring lives in evergarden-common.el; this file only +;; supplies Spring's own colors. DO NOT EDIT BY HAND -- edit the +;; .tera template and re-run whiskers instead. + +;;; Code: + +;; Not `(file-name-directory (or load-file-name buffer-file-name))' -- +;; both can be nil depending on how the loader gets here (byte-compile +;; caches, `eval-buffer', some straight.el paths), which signals +;; `(wrong-type-argument stringp nil)'. `custom-theme-load-path' is +;; reliably populated by the time any theme file loads (it's how this +;; file was found in the first place), so search that instead. +(unless (featurep 'evergarden-common) + (let ((common (locate-file "evergarden-common" + (append (seq-filter #'stringp custom-theme-load-path) + load-path) + '(".el" ".elc" "")))) + (if common + (load common) + (error "evergarden-common.el not found; add its directory to `custom-theme-load-path'")))) + +(defconst evergarden-spring-palette-partial + '( + ;; Core backgrounds / foregrounds + (cursor "#fae6ef") + (bg-main "#2b3438") + (bg-dim "#343e43") + (bg-alt "#3e4a4f") + (fg-main "#f8f9e8") + (fg-dim "#adc9bc") + (fg-alt "#96b4aa") + (bg-active "#4a585c") + (bg-inactive "#343e43") + (border "#58686d") + + ;; Spring's own named palette (from the whiskers color table) + (bg-hl "#4a585c") + (bg-prose-block "#323d42") + (red "#f57f82") + (orange "#f7a182") + (yellow "#f5d098") + (lime "#dbe6af") + (green "#cbe3b3") + (aqua "#b3e3ca") + (skye "#b3e6db") + (snow "#afd9e6") + (blue "#b2caed") + (purple "#d2bdf3") + (pink "#f3c0e5") + (cherry "#fae6ef") + (text "#f8f9e8") + (subtext1 "#adc9bc") + (subtext0 "#96b4aa") + (overlay2 "#839e9a") + (overlay1 "#6f8788") + (overlay0 "#58686d") + (surface2 "#4a585c") + (surface1 "#3e4a4f") + (surface0 "#343e43") + (base "#2b3438") + (mantle "#232a2e") + (crust "#1c2225") + + ;; Red family + (red-warmer "#f6788f") + (red-cooler "#f48f76") + (red-faint "#d07073") + + ;; Green family + (green-warmer "#dbe6af") + (green-cooler "#bae1af") + (green-faint "#b1c999") + + ;; Yellow family + (yellow-warmer "#f6c498") + (yellow-cooler "#f1dc97") + (yellow-faint "#d5b585") + + ;; Blue family + (blue-warmer "#afd9e6") + (blue-cooler "#aeb8ec") + (blue-faint "#98aed0") + + ;; Magenta/purple family + (magenta "#d2bdf3") + (magenta-warmer "#f3c0e5") + (magenta-cooler "#dcb8f2") + (magenta-faint "#b5a0d8") + + ;; Cyan family + (cyan "#b3e3ca") + (cyan-warmer "#b3e3bf") + (cyan-cooler "#b3e6db") + (cyan-faint "#97c7ae") + + ;; Intense/Subtle/Nuanced backgrounds + (bg-red-intense "#d79d9f") + (bg-red-subtle "#cca8a9") + (bg-red-nuanced "#c5afb0") + (bg-green-intense "#cbe1b5") + (bg-green-subtle "#cbd8be") + (bg-green-nuanced "#cbd3c3") + (bg-yellow-intense "#deccb0") + (bg-yellow-subtle "#d5cab9") + (bg-yellow-nuanced "#d0c9be") + (bg-blue-intense "#bccce4") + (bg-blue-subtle "#c4cedc") + (bg-blue-nuanced "#c8ced8") + (bg-magenta-intense "#d4c8e8") + (bg-magenta-subtle "#d6cee2") + (bg-magenta-nuanced "#d7d2de") + (bg-cyan-intense "#b5e1ca") + (bg-cyan-subtle "#bed8cb") + (bg-cyan-nuanced "#c3d3cb") + + ;; Graph colors + (bg-graph-red-0 "#e09497") + (bg-graph-red-1 "#d69ea0") + (bg-graph-green-0 "#cbe8ae") + (bg-graph-green-1 "#cbe0b6") + (bg-graph-yellow-0 "#e6cda8") + (bg-graph-yellow-1 "#ddcbb1") + (bg-graph-blue-0 "#b6cbea") + (bg-graph-blue-1 "#bdcce3") + (bg-graph-magenta-0 "#d3c3ed") + (bg-graph-magenta-1 "#d4c8e8") + (bg-graph-cyan-0 "#aee8ca") + (bg-graph-cyan-1 "#b6e0ca") + + ;; Diff + (bg-added "#cbe1b5") + (bg-added-faint "#cbd8be") + (bg-added-refine "#cbdcba") + (bg-added-fringe "#cbe8ae") + (fg-added "#cbe3b3") + (fg-added-intense "#8bcd49") + + (bg-changed "#deccb0") + (bg-changed-faint "#d5cab9") + (bg-changed-refine "#d9cbb5") + (bg-changed-fringe "#e6cda8") + (fg-changed "#f1dc97") + (fg-changed-intense "#efbd19") + + (bg-removed "#d79d9f") + (bg-removed-faint "#cca8a9") + (bg-removed-refine "#d0a4a5") + (bg-removed-fringe "#e09497") + (fg-removed "#f57f82") + (fg-removed-intense "#ef050d") + + (bg-diff-context "#4a585c") + + ;; UI chrome + (bg-mode-line-active "#435053") + (fg-mode-line-active "#f8f9e8") + (bg-mode-line-inactive "#343e43") + (fg-mode-line-inactive "#adc9bc") + (border-mode-line-active "#cbe3b3") + (border-mode-line-inactive "#58686d") + (bg-completion "#343e43") + (bg-hover "#4a585c") + (bg-hover-secondary "#c4cedc") + (bg-hl-line "#4a585c") + (bg-paren-match "#deccb0") + (bg-err "#d79d9f") + (bg-warning "#deccb0") + (bg-info "#b5e1ca") + (bg-region "#cbe1b5")) + "Base palette entries for `evergarden-spring', generated by whiskers.") + +(evergarden-build-theme 'evergarden-spring evergarden-spring-palette-partial 'dark) + +(provide 'evergarden-spring-theme) + +;;; evergarden-spring-theme.el ends here diff --git a/themes/evergarden-summer-theme.el b/themes/evergarden-summer-theme.el new file mode 100644 index 0000000..0557283 --- /dev/null +++ b/themes/evergarden-summer-theme.el @@ -0,0 +1,187 @@ +;;; evergarden-summer-theme.el --- Evergarden, Summer flavor -*- lexical-binding: t; -*- + +;; Author: expansion of the original evergarden theme by @koi.rip +;; Version: 0.2.0 +;; Package-Requires: ((emacs "28.1") (modus-themes "5.0.0") (ef-themes "2.0.0")) +;; Keywords: faces, theme + +;;; Commentary: +;; +;; The Summer flavor of evergarden -- generated by whiskers from +;; the shared color table, same as lua/evergarden/palettes/summer.lua. +;; All the actual face wiring lives in evergarden-common.el; this file only +;; supplies Summer's own colors. DO NOT EDIT BY HAND -- edit the +;; .tera template and re-run whiskers instead. + +;;; Code: + +;; Not `(file-name-directory (or load-file-name buffer-file-name))' -- +;; both can be nil depending on how the loader gets here (byte-compile +;; caches, `eval-buffer', some straight.el paths), which signals +;; `(wrong-type-argument stringp nil)'. `custom-theme-load-path' is +;; reliably populated by the time any theme file loads (it's how this +;; file was found in the first place), so search that instead. +(unless (featurep 'evergarden-common) + (let ((common (locate-file "evergarden-common" + (append (seq-filter #'stringp custom-theme-load-path) + load-path) + '(".el" ".elc" "")))) + (if common + (load common) + (error "evergarden-common.el not found; add its directory to `custom-theme-load-path'")))) + +(defconst evergarden-summer-palette-partial + '( + ;; Core backgrounds / foregrounds + (cursor "#c29fb2") + (bg-main "#f5efe6") + (bg-dim "#ede8dd") + (bg-alt "#e6e1d3") + (fg-main "#2b3034") + (fg-dim "#455355") + (fg-alt "#576869") + (bg-active "#ceccbd") + (bg-inactive "#ede8dd") + (border "#acb5a4") + + ;; Summer's own named palette (from the whiskers color table) + (bg-hl "#ceccbd") + (bg-prose-block "#f2ebe0") + (red "#c58687") + (orange "#c69883") + (yellow "#c4aa80") + (lime "#abb182") + (green "#91a77a") + (aqua "#74a48b") + (skye "#719f96") + (snow "#7799a3") + (blue "#8294ad") + (purple "#a897b8") + (pink "#c499b8") + (cherry "#c29fb2") + (text "#2b3034") + (subtext1 "#455355") + (subtext0 "#576869") + (overlay2 "#707d76") + (overlay1 "#829084") + (overlay0 "#acb5a4") + (surface2 "#ceccbd") + (surface1 "#e6e1d3") + (surface0 "#ede8dd") + (base "#f5efe6") + (mantle "#f2eae1") + (crust "#e8ded5") + + ;; Red family + (red-warmer "#c5818c") + (red-cooler "#c28e80") + (red-faint "#cdb3b3") + + ;; Green family + (green-warmer "#abb182") + (green-cooler "#89aa7e") + (green-faint "#abb6a0") + + ;; Yellow family + (yellow-warmer "#c6a17e") + (yellow-cooler "#c2b588") + (yellow-faint "#cbbfad") + + ;; Blue family + (blue-warmer "#7799a3") + (blue-cooler "#868eb0") + (blue-faint "#abb2bd") + + ;; Magenta/purple family + (magenta "#a897b8") + (magenta-warmer "#c499b8") + (magenta-cooler "#b39bbb") + (magenta-faint "#c4beca") + + ;; Cyan family + (cyan "#74a48b") + (cyan-warmer "#74a480") + (cyan-cooler "#719f96") + (cyan-faint "#9cb4a8") + + ;; Intense/Subtle/Nuanced backgrounds + (bg-red-intense "#d3797b") + (bg-red-subtle "#ca8284") + (bg-red-nuanced "#c58788") + (bg-green-intense "#93c85a") + (bg-green-subtle "#92bd65") + (bg-green-nuanced "#92b76b") + (bg-yellow-intense "#d1ad73") + (bg-yellow-subtle "#c7ab7d") + (bg-yellow-nuanced "#c2aa82") + (bg-blue-intense "#648fcc") + (bg-blue-subtle "#6f91c1") + (bg-blue-nuanced "#7492bc") + (bg-magenta-intense "#a97cd4") + (bg-magenta-subtle "#a985cb") + (bg-magenta-nuanced "#a98ac6") + (bg-cyan-intense "#52c68a") + (bg-cyan-subtle "#5eba8a") + (bg-cyan-nuanced "#64b48b") + + ;; Graph colors + (bg-graph-red-0 "#c58788") + (bg-graph-red-1 "#c58788") + (bg-graph-green-0 "#92b76b") + (bg-graph-green-1 "#92b76b") + (bg-graph-yellow-0 "#c2aa82") + (bg-graph-yellow-1 "#c2aa82") + (bg-graph-blue-0 "#7492bc") + (bg-graph-blue-1 "#7492bc") + (bg-graph-magenta-0 "#a98ac6") + (bg-graph-magenta-1 "#a98ac6") + (bg-graph-cyan-0 "#64b48b") + (bg-graph-cyan-1 "#64b48b") + + ;; Diff + (bg-added "#93c85a") + (bg-added-faint "#92bd65") + (bg-added-refine "#93c161") + (bg-added-fringe "#92b76b") + (fg-added "#91a77a") + (fg-added-intense "#6c894d") + + (bg-changed "#d1ad73") + (bg-changed-faint "#c7ab7d") + (bg-changed-refine "#cbac79") + (bg-changed-fringe "#c2aa82") + (fg-changed "#c2b588") + (fg-changed-intense "#b29c4c") + + (bg-removed "#d3797b") + (bg-removed-faint "#ca8284") + (bg-removed-refine "#cd7e80") + (bg-removed-fringe "#c58788") + (fg-removed "#c58687") + (fg-removed-intense "#b7494b") + + (bg-diff-context "#ceccbd") + + ;; UI chrome + (bg-mode-line-active "#c8c5b4") + (fg-mode-line-active "#2b3034") + (bg-mode-line-inactive "#ede8dd") + (fg-mode-line-inactive "#455355") + (border-mode-line-active "#91a77a") + (border-mode-line-inactive "#acb5a4") + (bg-completion "#ede8dd") + (bg-hover "#ceccbd") + (bg-hover-secondary "#6f91c1") + (bg-hl-line "#ceccbd") + (bg-paren-match "#d1ad73") + (bg-err "#d3797b") + (bg-warning "#d1ad73") + (bg-info "#52c68a") + (bg-region "#93c85a")) + "Base palette entries for `evergarden-summer', generated by whiskers.") + +(evergarden-build-theme 'evergarden-summer evergarden-summer-palette-partial 'light) + +(provide 'evergarden-summer-theme) + +;;; evergarden-summer-theme.el ends here diff --git a/themes/evergarden-winter-theme.el b/themes/evergarden-winter-theme.el new file mode 100644 index 0000000..e353f3a --- /dev/null +++ b/themes/evergarden-winter-theme.el @@ -0,0 +1,187 @@ +;;; evergarden-winter-theme.el --- Evergarden, Winter flavor -*- lexical-binding: t; -*- + +;; Author: expansion of the original evergarden theme by @koi.rip +;; Version: 0.2.0 +;; Package-Requires: ((emacs "28.1") (modus-themes "5.0.0") (ef-themes "2.0.0")) +;; Keywords: faces, theme + +;;; Commentary: +;; +;; The Winter flavor of evergarden -- generated by whiskers from +;; the shared color table, same as lua/evergarden/palettes/winter.lua. +;; All the actual face wiring lives in evergarden-common.el; this file only +;; supplies Winter's own colors. DO NOT EDIT BY HAND -- edit the +;; .tera template and re-run whiskers instead. + +;;; Code: + +;; Not `(file-name-directory (or load-file-name buffer-file-name))' -- +;; both can be nil depending on how the loader gets here (byte-compile +;; caches, `eval-buffer', some straight.el paths), which signals +;; `(wrong-type-argument stringp nil)'. `custom-theme-load-path' is +;; reliably populated by the time any theme file loads (it's how this +;; file was found in the first place), so search that instead. +(unless (featurep 'evergarden-common) + (let ((common (locate-file "evergarden-common" + (append (seq-filter #'stringp custom-theme-load-path) + load-path) + '(".el" ".elc" "")))) + (if common + (load common) + (error "evergarden-common.el not found; add its directory to `custom-theme-load-path'")))) + +(defconst evergarden-winter-palette-partial + '( + ;; Core backgrounds / foregrounds + (cursor "#fae6ef") + (bg-main "#1e2528") + (bg-dim "#262f33") + (bg-alt "#374145") + (fg-main "#f8f9e8") + (fg-dim "#adc9bc") + (fg-alt "#96b4aa") + (bg-active "#4a585c") + (bg-inactive "#262f33") + (border "#58686d") + + ;; Winter's own named palette (from the whiskers color table) + (bg-hl "#4a585c") + (bg-prose-block "#252d31") + (red "#f57f82") + (orange "#f7a182") + (yellow "#f5d098") + (lime "#dbe6af") + (green "#cbe3b3") + (aqua "#b3e3ca") + (skye "#b3e6db") + (snow "#afd9e6") + (blue "#b2caed") + (purple "#d2bdf3") + (pink "#f3c0e5") + (cherry "#fae6ef") + (text "#f8f9e8") + (subtext1 "#adc9bc") + (subtext0 "#96b4aa") + (overlay2 "#839e9a") + (overlay1 "#6f8788") + (overlay0 "#58686d") + (surface2 "#4a585c") + (surface1 "#374145") + (surface0 "#262f33") + (base "#1e2528") + (mantle "#191e21") + (crust "#171c1f") + + ;; Red family + (red-warmer "#f6788f") + (red-cooler "#f48f76") + (red-faint "#d07073") + + ;; Green family + (green-warmer "#dbe6af") + (green-cooler "#bae1af") + (green-faint "#b1c999") + + ;; Yellow family + (yellow-warmer "#f6c498") + (yellow-cooler "#f1dc97") + (yellow-faint "#d5b585") + + ;; Blue family + (blue-warmer "#afd9e6") + (blue-cooler "#aeb8ec") + (blue-faint "#98aed0") + + ;; Magenta/purple family + (magenta "#d2bdf3") + (magenta-warmer "#f3c0e5") + (magenta-cooler "#dcb8f2") + (magenta-faint "#b5a0d8") + + ;; Cyan family + (cyan "#b3e3ca") + (cyan-warmer "#b3e3bf") + (cyan-cooler "#b3e6db") + (cyan-faint "#97c7ae") + + ;; Intense/Subtle/Nuanced backgrounds + (bg-red-intense "#d79d9f") + (bg-red-subtle "#cca8a9") + (bg-red-nuanced "#c5afb0") + (bg-green-intense "#cbe1b5") + (bg-green-subtle "#cbd8be") + (bg-green-nuanced "#cbd3c3") + (bg-yellow-intense "#deccb0") + (bg-yellow-subtle "#d5cab9") + (bg-yellow-nuanced "#d0c9be") + (bg-blue-intense "#bccce4") + (bg-blue-subtle "#c4cedc") + (bg-blue-nuanced "#c8ced8") + (bg-magenta-intense "#d4c8e8") + (bg-magenta-subtle "#d6cee2") + (bg-magenta-nuanced "#d7d2de") + (bg-cyan-intense "#b5e1ca") + (bg-cyan-subtle "#bed8cb") + (bg-cyan-nuanced "#c3d3cb") + + ;; Graph colors + (bg-graph-red-0 "#e09497") + (bg-graph-red-1 "#d69ea0") + (bg-graph-green-0 "#cbe8ae") + (bg-graph-green-1 "#cbe0b6") + (bg-graph-yellow-0 "#e6cda8") + (bg-graph-yellow-1 "#ddcbb1") + (bg-graph-blue-0 "#b6cbea") + (bg-graph-blue-1 "#bdcce3") + (bg-graph-magenta-0 "#d3c3ed") + (bg-graph-magenta-1 "#d4c8e8") + (bg-graph-cyan-0 "#aee8ca") + (bg-graph-cyan-1 "#b6e0ca") + + ;; Diff + (bg-added "#cbe1b5") + (bg-added-faint "#cbd8be") + (bg-added-refine "#cbdcba") + (bg-added-fringe "#cbe8ae") + (fg-added "#cbe3b3") + (fg-added-intense "#8bcd49") + + (bg-changed "#deccb0") + (bg-changed-faint "#d5cab9") + (bg-changed-refine "#d9cbb5") + (bg-changed-fringe "#e6cda8") + (fg-changed "#f1dc97") + (fg-changed-intense "#efbd19") + + (bg-removed "#d79d9f") + (bg-removed-faint "#cca8a9") + (bg-removed-refine "#d0a4a5") + (bg-removed-fringe "#e09497") + (fg-removed "#f57f82") + (fg-removed-intense "#ef050d") + + (bg-diff-context "#4a585c") + + ;; UI chrome + (bg-mode-line-active "#435053") + (fg-mode-line-active "#f8f9e8") + (bg-mode-line-inactive "#262f33") + (fg-mode-line-inactive "#adc9bc") + (border-mode-line-active "#cbe3b3") + (border-mode-line-inactive "#58686d") + (bg-completion "#262f33") + (bg-hover "#4a585c") + (bg-hover-secondary "#c4cedc") + (bg-hl-line "#4a585c") + (bg-paren-match "#deccb0") + (bg-err "#d79d9f") + (bg-warning "#deccb0") + (bg-info "#b5e1ca") + (bg-region "#cbe1b5")) + "Base palette entries for `evergarden-winter', generated by whiskers.") + +(evergarden-build-theme 'evergarden-winter evergarden-winter-palette-partial 'dark) + +(provide 'evergarden-winter-theme) + +;;; evergarden-winter-theme.el ends here -- cgit v1.2.3