diff options
| -rw-r--r-- | emacs.tera | 29 | ||||
| -rw-r--r-- | themes/evergarden-fall-theme.el | 23 | ||||
| -rw-r--r-- | themes/evergarden-spring-theme.el | 23 | ||||
| -rw-r--r-- | themes/evergarden-summer-theme.el | 21 | ||||
| -rw-r--r-- | themes/evergarden-winter-theme.el | 23 |
5 files changed, 20 insertions, 99 deletions
@@ -7,22 +7,6 @@ whiskers: --- {%- 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) -%} @@ -163,21 +147,10 @@ whiskers: ;; 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. +;; {{flavor.name}} evergarden ;;; 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) diff --git a/themes/evergarden-fall-theme.el b/themes/evergarden-fall-theme.el index e0903c2..5c276e3 100644 --- a/themes/evergarden-fall-theme.el +++ b/themes/evergarden-fall-theme.el @@ -6,26 +6,14 @@ ;; 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. - +;; fall yum evergarden ;;; 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" "")))) + (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'")))) @@ -43,8 +31,7 @@ (bg-active "#4a585c") (bg-inactive "#2b3337") (border "#58686d") - - ;; Fall's own named palette (from the whiskers color table) + ;; fall yum palette (bg-hl "#4a585c") (bg-prose-block "#2a3338") (red "#f57f82") diff --git a/themes/evergarden-spring-theme.el b/themes/evergarden-spring-theme.el index 4ce3f85..ac62437 100644 --- a/themes/evergarden-spring-theme.el +++ b/themes/evergarden-spring-theme.el @@ -6,26 +6,14 @@ ;; 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. - +;; spring evergarden ;;; 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" "")))) + (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'")))) @@ -43,8 +31,7 @@ (bg-active "#4a585c") (bg-inactive "#343e43") (border "#58686d") - - ;; Spring's own named palette (from the whiskers color table) + ;; spring pallette (bg-hl "#4a585c") (bg-prose-block "#323d42") (red "#f57f82") diff --git a/themes/evergarden-summer-theme.el b/themes/evergarden-summer-theme.el index 0557283..8bc1e2d 100644 --- a/themes/evergarden-summer-theme.el +++ b/themes/evergarden-summer-theme.el @@ -6,26 +6,13 @@ ;; 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. - +;; summer evergarden ;;; 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" "")))) + (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'")))) diff --git a/themes/evergarden-winter-theme.el b/themes/evergarden-winter-theme.el index e353f3a..42c4a54 100644 --- a/themes/evergarden-winter-theme.el +++ b/themes/evergarden-winter-theme.el @@ -6,26 +6,14 @@ ;; 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. - +;; winter cold brrr evergarden ;;; 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" "")))) + (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'")))) @@ -43,8 +31,7 @@ (bg-active "#4a585c") (bg-inactive "#262f33") (border "#58686d") - - ;; Winter's own named palette (from the whiskers color table) + ;; winte (bg-hl "#4a585c") (bg-prose-block "#252d31") (red "#f57f82") |