diff options
| -rw-r--r-- | emacs/evergarden-fall-theme.el (renamed from themes/evergarden-fall-theme.el) | 12 | ||||
| -rw-r--r-- | emacs/evergarden-spring-theme.el (renamed from themes/evergarden-spring-theme.el) | 12 | ||||
| -rw-r--r-- | emacs/evergarden-summer-theme.el (renamed from themes/evergarden-summer-theme.el) | 10 | ||||
| -rw-r--r-- | emacs/evergarden-winter-theme.el (renamed from themes/evergarden-winter-theme.el) | 12 | ||||
| -rw-r--r-- | evergarden-common.el | 521 |
5 files changed, 288 insertions, 279 deletions
diff --git a/themes/evergarden-fall-theme.el b/emacs/evergarden-fall-theme.el index 5c276e3..a32f5a3 100644 --- a/themes/evergarden-fall-theme.el +++ b/emacs/evergarden-fall-theme.el @@ -6,14 +6,15 @@ ;; Keywords: faces, theme ;;; Commentary: -;; fall yum evergarden +;; Fall evergarden + ;;; Code: (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'")))) @@ -31,7 +32,8 @@ (bg-active "#4a585c") (bg-inactive "#2b3337") (border "#58686d") - ;; fall yum palette + + ;; Fall's own named palette (from the whiskers color table) (bg-hl "#4a585c") (bg-prose-block "#2a3338") (red "#f57f82") diff --git a/themes/evergarden-spring-theme.el b/emacs/evergarden-spring-theme.el index ac62437..0fc0db2 100644 --- a/themes/evergarden-spring-theme.el +++ b/emacs/evergarden-spring-theme.el @@ -6,14 +6,15 @@ ;; Keywords: faces, theme ;;; Commentary: -;; spring evergarden +;; Spring evergarden + ;;; Code: (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'")))) @@ -31,7 +32,8 @@ (bg-active "#4a585c") (bg-inactive "#343e43") (border "#58686d") - ;; spring pallette + + ;; Spring's own named palette (from the whiskers color table) (bg-hl "#4a585c") (bg-prose-block "#323d42") (red "#f57f82") diff --git a/themes/evergarden-summer-theme.el b/emacs/evergarden-summer-theme.el index 8bc1e2d..e5223d1 100644 --- a/themes/evergarden-summer-theme.el +++ b/emacs/evergarden-summer-theme.el @@ -6,13 +6,15 @@ ;; Keywords: faces, theme ;;; Commentary: -;; summer evergarden +;; Summer evergarden + ;;; Code: + (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/emacs/evergarden-winter-theme.el index 42c4a54..6ade734 100644 --- a/themes/evergarden-winter-theme.el +++ b/emacs/evergarden-winter-theme.el @@ -6,14 +6,15 @@ ;; Keywords: faces, theme ;;; Commentary: -;; winter cold brrr evergarden +;; Winter evergarden + ;;; Code: (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'")))) @@ -31,7 +32,8 @@ (bg-active "#4a585c") (bg-inactive "#262f33") (border "#58686d") - ;; winte + + ;; Winter's own named palette (from the whiskers color table) (bg-hl "#4a585c") (bg-prose-block "#252d31") (red "#f57f82") diff --git a/evergarden-common.el b/evergarden-common.el index 749bcda..64a7fc6 100644 --- a/evergarden-common.el +++ b/evergarden-common.el @@ -6,8 +6,7 @@ ;; Keywords: faces, theme ;;; Commentary: -;; this is NOT a theme in itself - +;; This is NOT a theme by itself. it is a shared engine for `whiskers` to use and generate the actual evergarden themes. ;;; Code: (require 'modus-themes) @@ -24,252 +23,254 @@ (defconst evergarden--term-mappings-dark '((bg-term-black bg-main) - (fg-term-black bg-main) - (bg-term-black-bright overlay0) - (fg-term-black-bright overlay0) - (bg-term-white fg-dim) - (fg-term-white fg-dim) - (bg-term-white-bright fg-main) - (fg-term-white-bright fg-main)) + (fg-term-black bg-main) + (bg-term-black-bright overlay0) + (fg-term-black-bright overlay0) + (bg-term-white fg-dim) + (fg-term-white fg-dim) + (bg-term-white-bright fg-main) + (fg-term-white-bright fg-main)) "ANSI black/white terminal mapping for dark-background flavors. Anchors \"black\" to the darkest neutrals and \"white\" to the lightest, the same relationship a light theme uses just inverted.") (defconst evergarden--term-mappings-light '((bg-term-black fg-main) - (fg-term-black fg-main) - (bg-term-black-bright fg-dim) - (fg-term-black-bright fg-dim) - (bg-term-white border) - (fg-term-white border) - (bg-term-white-bright bg-main) - (fg-term-white-bright bg-main)) + (fg-term-black fg-main) + (bg-term-black-bright fg-dim) + (fg-term-black-bright fg-dim) + (bg-term-white border) + (fg-term-white border) + (bg-term-white-bright bg-main) + (fg-term-white-bright bg-main)) "ANSI black/white terminal mapping for the light-background flavor (summer). Matches fortune-gold-theme.el's light-theme convention.") (defconst evergarden--term-mappings-color '((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-warmer) (fg-term-magenta-bright magenta-warmer) - (bg-term-cyan cyan) (fg-term-cyan cyan) - (bg-term-cyan-bright cyan-warmer) (fg-term-cyan-bright cyan-warmer)) + (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-warmer) (fg-term-magenta-bright magenta-warmer) + (bg-term-cyan cyan) (fg-term-cyan cyan) + (bg-term-cyan-bright cyan-warmer) (fg-term-cyan-bright cyan-warmer)) "ANSI colored-slot terminal mapping, identical for every flavor. Left as true family colors (not the green signature) since ANSI red should stay red, ANSI blue should stay blue, etc., regardless of flavor.") (defconst evergarden-palette-mappings-partial (append - '( - (err red) - (warning orange) - (info cyan) - (underline-err red) - (underline-warning orange) - (underline-note cyan) - (modeline-err red) - (modeline-warning yellow) - (modeline-info cyan) - (bg-prominent-warning bg-warning) - (fg-prominent-warning fg-main) - (bg-prominent-note bg-info) - (fg-prominent-note fg-main) - - (fg-link blue) - (fg-link-visited magenta) - (fg-link-symbolic cyan) - (bg-link unspecified) - (bg-link-symbolic unspecified) - (bg-link-visited unspecified) - (underline-link blue) - (underline-link-visited magenta) - (underline-link-symbolic cyan) - - (name cyan) - (keybind green) - (identifier fg-main) - (fg-prompt green) - (bg-prompt unspecified) - - (builtin cyan-cooler) - (comment fg-dim) - (constant magenta-cooler) - (fnname cyan) - (fnname-call cyan-warmer) - (keyword red) - (preprocessor green) - (property fg-main) - (docstring fg-dim) - (docmarkup green-cooler) - (string green-warmer) - (type yellow) - (variable blue) - (variable-use blue) - (rx-backslash orange) - (rx-construct magenta) - - (accent-0 green) - (accent-1 cyan) - (accent-2 magenta-warmer) - (accent-3 orange) - - (fg-button-active fg-main) - (fg-button-inactive fg-dim) - (bg-button-active bg-main) - (bg-button-inactive bg-dim) - (fg-region fg-main) - (bg-mark-delete bg-red-subtle) - (fg-mark-delete red) - (bg-mark-select bg-green-subtle) - (fg-mark-select green) - (bg-mark-other bg-cyan-subtle) - (fg-mark-other cyan) - - (date-common cyan) - (date-deadline red) - (date-deadline-subtle red-faint) - (date-event fg-alt) - (date-holiday red-warmer) - (date-holiday-other magenta-warmer) - (date-now fg-main) - (date-range fg-alt) - (date-scheduled green) - (date-scheduled-subtle green-faint) - (date-weekday blue) - (date-weekend red-faint) - - (fg-prose-code green-cooler) - (prose-done green) - (fg-prose-macro green) - (prose-metadata fg-dim) - (prose-metadata-value fg-alt) - (prose-table fg-alt) - (prose-table-formula cyan) - (prose-tag yellow-faint) - (prose-todo red) - (fg-prose-verbatim magenta-warmer) - - (mail-cite-0 green) - (mail-cite-1 cyan) - (mail-cite-2 magenta-warmer) - (mail-cite-3 red-warmer) - (mail-part cyan) - (mail-recipient blue) - (mail-subject green) - (mail-other fg-alt) - - (bg-search-static bg-cyan-subtle) - (bg-search-current bg-green-intense) - (bg-search-lazy bg-green-subtle) - (bg-search-replace bg-red-intense) - - (bg-search-rx-group-0 bg-green-intense) - (bg-search-rx-group-1 bg-magenta-intense) - (bg-search-rx-group-2 bg-cyan-intense) - (bg-search-rx-group-3 bg-red-intense) - - (bg-space-err bg-red-intense) - (bg-space bg-main) - (fg-space border) - - (fringe bg-main) - (fg-line-number-active green) - (fg-line-number-inactive overlay1) - (bg-line-number-active bg-hl-line) - (bg-line-number-inactive bg-main) - - (bg-tab-bar bg-dim) - (bg-tab-current bg-main) - (bg-tab-other bg-dim) - - (bg-prominent-err bg-err) - (fg-prominent-err err) - (fg-paren-match fg-main) - (underline-paren-match unspecified) - (bg-active-argument bg-active) - (fg-active-argument green) - (bg-active-value bg-green-subtle) - (fg-active-value green) - - (bg-prose-block-delimiter bg-prose-block) - (fg-prose-block-delimiter fg-dim) - (bg-prose-block-contents bg-prose-block) - (bg-prose-code unspecified) - (bg-prose-macro unspecified) - (bg-prose-verbatim unspecified) - - (fg-completion-match-0 green) - (fg-completion-match-1 cyan) - (fg-completion-match-2 magenta-warmer) - (fg-completion-match-3 orange) - (bg-completion-match-0 unspecified) - (bg-completion-match-1 unspecified) - (bg-completion-match-2 unspecified) - (bg-completion-match-3 unspecified) - (bg-completion bg-dim) - (fg-search-current fg-main) - - (rainbow-0 green) - (rainbow-1 cyan) - (rainbow-2 magenta) - (rainbow-3 blue) - (rainbow-4 orange) - (rainbow-5 red) - (rainbow-6 yellow) - (rainbow-7 fg-alt) - (rainbow-8 fg-dim) - - (fg-heading-0 green) - (fg-heading-1 green) - (fg-heading-2 cyan) - (fg-heading-3 magenta) - (fg-heading-4 blue) - (fg-heading-5 orange) - (fg-heading-6 red) - (fg-heading-7 fg-alt) - (fg-heading-8 fg-dim) - (bg-heading-0 unspecified) - (bg-heading-1 bg-green-nuanced) - (bg-heading-2 unspecified) - (bg-heading-3 bg-magenta-nuanced) - (bg-heading-4 bg-blue-nuanced) - (bg-heading-5 unspecified) - (bg-heading-6 bg-red-nuanced) - (bg-heading-7 unspecified) - (bg-heading-8 unspecified) - (overline-heading-0 green) - (overline-heading-1 green) - (overline-heading-2 cyan) - (overline-heading-3 magenta) - (overline-heading-4 blue) - (overline-heading-5 orange) - (overline-heading-6 red) - (overline-heading-7 unspecified) - (overline-heading-8 unspecified)) - evergarden--term-mappings-color) + '(;; Status + (err red) + (warning orange) + (info cyan) + (underline-err red) + (underline-warning orange) + (underline-note cyan) + (modeline-err red) + (modeline-warning yellow) + (modeline-info cyan) + (bg-prominent-warning bg-warning) + (fg-prominent-warning fg-main) + (bg-prominent-note bg-info) + (fg-prominent-note fg-main) + + (fg-link blue) + (fg-link-visited magenta) + (fg-link-symbolic cyan) + (bg-link unspecified) + (bg-link-symbolic unspecified) + (bg-link-visited unspecified) + (underline-link blue) + (underline-link-visited magenta) + (underline-link-symbolic cyan) + + (name cyan) + (keybind green) + (identifier fg-main) + (fg-prompt green) + (bg-prompt unspecified) + + (builtin cyan-cooler) + (comment overlay2) + (constant pink) + (fnname green) + (fnname-call green-warmer) + (keyword red) + (preprocessor cherry) + (property cyan-cooler) + (docstring cyan-cooler) + (docmarkup cyan) + (string lime) + (type yellow) + (variable fg-main) + (variable-use fg-main) + (rx-backslash yellow) + (rx-construct cyan) + + (accent-0 green) + (accent-1 cyan) + (accent-2 magenta-warmer) + (accent-3 orange) + + (fg-button-active fg-main) + (fg-button-inactive fg-dim) + (bg-button-active bg-main) + (bg-button-inactive bg-dim) + (fg-region fg-main) + (bg-mark-delete bg-red-subtle) + (fg-mark-delete red) + (bg-mark-select bg-green-subtle) + (fg-mark-select green) + (bg-mark-other bg-cyan-subtle) + (fg-mark-other cyan) + + (date-common cyan) + (date-deadline red) + (date-deadline-subtle red-faint) + (date-event fg-alt) + (date-holiday red-warmer) + (date-holiday-other magenta-warmer) + (date-now fg-main) + (date-range fg-alt) + (date-scheduled green) + (date-scheduled-subtle green-faint) + (date-weekday blue) + (date-weekend red-faint) + + (fg-prose-code green-cooler) + (prose-done green) + (fg-prose-macro green) + (prose-metadata fg-dim) + (prose-metadata-value fg-alt) + (prose-table fg-alt) + (prose-table-formula cyan) + (prose-tag yellow-faint) + (prose-todo red) + (fg-prose-verbatim magenta-warmer) + + (mail-cite-0 green) + (mail-cite-1 cyan) + (mail-cite-2 magenta-warmer) + (mail-cite-3 red-warmer) + (mail-part cyan) + (mail-recipient blue) + (mail-subject green) + (mail-other fg-alt) + + (bg-search-static bg-cyan-subtle) + (bg-search-current bg-green-intense) + (bg-search-lazy bg-green-subtle) + (bg-search-replace bg-red-intense) + + (bg-search-rx-group-0 bg-green-intense) + (bg-search-rx-group-1 bg-magenta-intense) + (bg-search-rx-group-2 bg-cyan-intense) + (bg-search-rx-group-3 bg-red-intense) + + (bg-space-err bg-red-intense) + (bg-space bg-main) + (fg-space border) + + (fringe bg-main) + (fg-line-number-active green) + (fg-line-number-inactive overlay1) + (bg-line-number-active bg-hl-line) + (bg-line-number-inactive bg-main) + + (bg-tab-current bg-main) + (bg-tab-other bg-dim) + + (bg-prominent-err bg-err) + (fg-prominent-err err) + (fg-paren-match fg-main) + (underline-paren-match unspecified) + (bg-active-argument bg-active) + (fg-active-argument green) + (bg-active-value bg-green-subtle) + (fg-active-value green) + + (bg-prose-block-delimiter bg-prose-block) + (fg-prose-block-delimiter fg-dim) + (bg-prose-block-contents bg-prose-block) + (bg-prose-code unspecified) + (bg-prose-macro unspecified) + (bg-prose-verbatim unspecified) + + (fg-completion-match-0 green) + (fg-completion-match-1 cyan) + (fg-completion-match-2 magenta-warmer) + (fg-completion-match-3 orange) + (bg-completion-match-0 unspecified) + (bg-completion-match-1 unspecified) + (bg-completion-match-2 unspecified) + (bg-completion-match-3 unspecified) + (bg-completion bg-dim) + (fg-search-current fg-main) + + (rainbow-0 green) + (rainbow-1 cyan) + (rainbow-2 magenta) + (rainbow-3 blue) + (rainbow-4 orange) + (rainbow-5 red) + (rainbow-6 yellow) + (rainbow-7 fg-alt) + (rainbow-8 fg-dim) + + (fg-heading-0 green) + (fg-heading-1 green) + (fg-heading-2 cyan) + (fg-heading-3 magenta) + (fg-heading-4 blue) + (fg-heading-5 orange) + (fg-heading-6 red) + (fg-heading-7 fg-alt) + (fg-heading-8 fg-dim) + (bg-heading-0 unspecified) + (bg-heading-1 bg-green-nuanced) + (bg-heading-2 unspecified) + (bg-heading-3 bg-magenta-nuanced) + (bg-heading-4 bg-blue-nuanced) + (bg-heading-5 unspecified) + (bg-heading-6 bg-red-nuanced) + (bg-heading-7 unspecified) + (bg-heading-8 unspecified) + (overline-heading-0 green) + (overline-heading-1 green) + (overline-heading-2 cyan) + (overline-heading-3 magenta) + (overline-heading-4 blue) + (overline-heading-5 orange) + (overline-heading-6 red) + (overline-heading-7 unspecified) + (overline-heading-8 unspecified)) + evergarden--term-mappings-color) "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 - :foreground ,fg-main))) - `(corfu-current ((,c :background ,bg-green-intense - :foreground ,fg-main - :extend t - :box (:line-width -1 :color ,green) - :weight semi-bold))) - `(corfu-border ((,c :background ,border - :foreground ,border))) - `(corfu-bar ((,c :background ,green))) - `(corfu-popupinfo ((,c :background ,bg-dim - :foreground ,fg-main))))) + :background ,bg-dim + :foreground ,fg-main))) + `(corfu-current ((,c :background ,bg-green-intense + :foreground ,fg-main + :extend t + :box (:line-width -1 :color ,green) + :weight semi-bold))) + `(corfu-border ((,c :background ,border + :foreground ,border))) + `(corfu-bar ((,c :background ,green))) + `(corfu-popupinfo ((,c :background ,bg-dim + :foreground ,fg-main)))) + "Additional face overrides shared by every evergarden flavor.") + (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. @@ -289,49 +290,49 @@ fall.lua/winter.lua table, plus the warmer/cooler/faint/intense/subtle/ nuanced variants Modus needs). MODE is `dark' or `light' and selects which of `evergarden--term-mappings-dark'/`-light' gets appended." (let* ((flavor-str (symbol-name flavor-name)) - (description (format "Cozy evergarden dark theme, %s flavor." - (capitalize (substring flavor-str (length "evergarden-"))))) - (palette-sym (intern (concat flavor-str "-palette"))) - (overrides-sym (intern (concat flavor-str "-palette-overrides"))) - (term-mappings (if (eq mode 'dark) - evergarden--term-mappings-dark - evergarden--term-mappings-light))) + (description (format "Cozy evergarden dark theme, %s flavor." + (capitalize (substring flavor-str (length "evergarden-"))))) + (palette-sym (intern (concat flavor-str "-palette"))) + (overrides-sym (intern (concat flavor-str "-palette-overrides"))) + (term-mappings (if (eq mode 'dark) + evergarden--term-mappings-dark + evergarden--term-mappings-light))) (eval - `(progn - (defcustom ,overrides-sym nil - ,(format "Overrides for `%s'. + `(progn + (defcustom ,overrides-sym nil + ,(format "Overrides for `%s'. Each element should have the form (NAME VALUE), where NAME is a palette entry from `%s' and VALUE is either another palette symbol or a color string." - palette-sym palette-sym) - :group 'evergarden-theme - :package-version '(evergarden-theme . "0.2.0") - :type '(repeat (list symbol (choice symbol string)))) - - (defconst ,palette-sym - (modus-themes-generate-palette - ',palette-partial - ',(if (eq mode 'dark) 'cool 'warm) - nil - (append evergarden-palette-mappings-partial - ',term-mappings - ef-themes-palette-common)) - ,(format "Full palette for `%s'." flavor-name)) - - (evergarden--ensure-modus-theme-metadata - ',flavor-name 'evergarden-theme ,description ',mode ',palette-sym ',overrides-sym) - - (modus-themes-theme - ',flavor-name 'evergarden-theme ,description ',mode - ',palette-sym nil ',overrides-sym 'evergarden-custom-faces)) - t))) + palette-sym palette-sym) + :group 'evergarden-theme + :package-version '(evergarden-theme . "0.2.0") + :type '(repeat (list symbol (choice symbol string)))) + + (defconst ,palette-sym + (modus-themes-generate-palette + ',palette-partial + ',(if (eq mode 'dark) 'cool 'warm) + nil + (append evergarden-palette-mappings-partial + ',term-mappings + ef-themes-palette-common)) + ,(format "Full palette for `%s'." flavor-name)) + + (evergarden--ensure-modus-theme-metadata + ',flavor-name 'evergarden-theme ,description ',mode ',palette-sym ',overrides-sym) + + (modus-themes-theme + ',flavor-name 'evergarden-theme ,description ',mode + ',palette-sym nil ',overrides-sym 'evergarden-custom-faces)) + t))) ;;;###autoload (when load-file-name (add-to-list 'custom-theme-load-path - (file-name-as-directory - (file-name-directory load-file-name)))) + (file-name-as-directory + (file-name-directory load-file-name)))) (provide 'evergarden-common) |