fuckton of shit, mainly switch from helm + company -> vertico + corfu/cape

5 files changed, 49 insertions, 116 deletions

diff --git a/extra-themes/evergarden-common.el b/extra-themes/evergarden-common.el
index 749bcda..30f0e60 100644
--- a/extra-themes/evergarden-common.el
+++ b/extra-themes/evergarden-common.el
@@ -6,8 +6,7 @@
 ;; Keywords: faces, theme
 
 ;;; Commentary:
-;; this is NOT a theme in itself
-
+;; NOT a theme by itself. shared engine for evergarden themes
 ;;; Code:
 
 (require 'modus-themes)
@@ -19,8 +18,7 @@
   :group 'ef-themes
   :prefix "evergarden-")
 
-(defconst evergarden-theme-family 'evergarden-theme
-  "Shared theme family symbol for every evergarden flavor.")
+(defconst evergarden-theme-family 'evergarden-theme)
 
 (defconst evergarden--term-mappings-dark
   '((bg-term-black bg-main)
@@ -30,10 +28,7 @@
     (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.")
+    (fg-term-white-bright fg-main)))
 
 (defconst evergarden--term-mappings-light
   '((bg-term-black fg-main)
@@ -43,9 +38,7 @@ the same relationship a light theme uses just inverted.")
     (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.")
+    (fg-term-white-bright bg-main)))
 
 (defconst evergarden--term-mappings-color
   '((bg-term-red red) (fg-term-red red)
@@ -59,19 +52,16 @@ Matches fortune-gold-theme.el's light-theme convention.")
     (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.")
+    (bg-term-cyan-bright cyan-warmer) (fg-term-cyan-bright cyan-warmer)))
 
 (defconst evergarden-palette-mappings-partial
   (append
    '(
      (err red)
-     (warning orange)
+     (warning yellow)
      (info cyan)
      (underline-err red)
-     (underline-warning orange)
+     (underline-warning yellow)
      (underline-note cyan)
      (modeline-err red)
      (modeline-warning yellow)
@@ -94,25 +84,25 @@ stay red, ANSI blue should stay blue, etc., regardless of flavor.")
      (name cyan)
      (keybind green)
      (identifier fg-main)
-     (fg-prompt green)
+     (fg-prompt pink)
      (bg-prompt unspecified)
 
      (builtin cyan-cooler)
-     (comment fg-dim)
-     (constant magenta-cooler)
-     (fnname cyan)
-     (fnname-call cyan-warmer)
+     (comment overlay2)
+     (constant pink)
+     (fnname green)
+     (fnname-call green-warmer)
      (keyword red)
-     (preprocessor green)
-     (property fg-main)
-     (docstring fg-dim)
-     (docmarkup green-cooler)
-     (string green-warmer)
+     (preprocessor cherry)
+     (property cyan-cooler)
+     (docstring cyan-cooler)
+     (docmarkup cyan)
+     (string lime)
      (type yellow)
-     (variable blue)
-     (variable-use blue)
-     (rx-backslash orange)
-     (rx-construct magenta)
+     (variable fg-main)
+     (variable-use fg-main)
+     (rx-backslash yellow)
+     (rx-construct cyan)
 
      (accent-0 green)
      (accent-1 cyan)
@@ -126,8 +116,8 @@ stay red, ANSI blue should stay blue, etc., regardless of flavor.")
      (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-select bg-yellow-subtle)
+     (fg-mark-select yellow)
      (bg-mark-other bg-cyan-subtle)
      (fg-mark-other cyan)
 
@@ -152,7 +142,7 @@ stay red, ANSI blue should stay blue, etc., regardless of flavor.")
      (prose-table fg-alt)
      (prose-table-formula cyan)
      (prose-tag yellow-faint)
-     (prose-todo red)
+     (prose-todo cyan)
      (fg-prose-verbatim magenta-warmer)
 
      (mail-cite-0 green)
@@ -165,8 +155,8 @@ stay red, ANSI blue should stay blue, etc., regardless of flavor.")
      (mail-other fg-alt)
 
      (bg-search-static bg-cyan-subtle)
-     (bg-search-current bg-green-intense)
-     (bg-search-lazy bg-green-subtle)
+     (bg-search-current bg-blue-intense)
+     (bg-search-lazy bg-blue-subtle)
      (bg-search-replace bg-red-intense)
 
      (bg-search-rx-group-0 bg-green-intense)
@@ -179,14 +169,14 @@ stay red, ANSI blue should stay blue, etc., regardless of flavor.")
      (fg-space border)
 
      (fringe bg-main)
-     (fg-line-number-active green)
-     (fg-line-number-inactive overlay1)
+     (fg-line-number-active overlay1)
+     (fg-line-number-inactive surface1)
      (bg-line-number-active bg-hl-line)
      (bg-line-number-inactive bg-main)
 
-     (bg-tab-bar bg-dim)
+     (bg-tab-bar overlay1)
      (bg-tab-current bg-main)
-     (bg-tab-other bg-dim)
+     (bg-tab-other surface2)
 
      (bg-prominent-err bg-err)
      (fg-prominent-err err)
@@ -252,10 +242,8 @@ stay red, ANSI blue should stay blue, etc., regardless of flavor.")
      (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.")
+   evergarden--term-mappings-color))
+
 (defconst evergarden-custom-faces
   '(`(corfu-default ((,c :inherit modus-themes-fixed-pitch
                       :background ,bg-dim
@@ -270,24 +258,13 @@ list works whether the active flavor's palette is dark or light.")
     `(corfu-bar ((,c :background ,green)))
     `(corfu-popupinfo ((,c :background ,bg-dim
                         :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.
 
-FAMILY, DESCRIPTION, MODE, PALETTE-SYM and OVERRIDES-SYM are forwarded to
-`modus-themes-declare', matching what `modus-themes-theme' expects to find
-if the theme object already exists in the current session."
+(defun evergarden--ensure-modus-theme-metadata (name family description mode palette-sym overrides-sym)
   (unless (plist-get (get name 'theme-properties) :modus-core-palette)
     (modus-themes-declare name family description mode palette-sym nil overrides-sym)
     (modus-themes-register name)))
 
 (defun evergarden-build-theme (flavor-name palette-partial mode)
-  "Register and define one evergarden flavor.
-
-FLAVOR-NAME is a symbol like `evergarden-fall'. PALETTE-PARTIAL is that
-flavor's base palette (its own analogue of one spring.lua/summer.lua/
-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-")))))
diff --git a/extra-themes/evergarden-fall-theme.el b/extra-themes/evergarden-fall-theme.el
index e0903c2..30d6a89 100644
--- a/extra-themes/evergarden-fall-theme.el
+++ b/extra-themes/evergarden-fall-theme.el
@@ -6,21 +6,10 @@
 ;; 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 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)
@@ -172,12 +161,12 @@
     (bg-completion "#2b3337")
     (bg-hover "#4a585c")
     (bg-hover-secondary "#c4cedc")
-    (bg-hl-line "#4a585c")
-    (bg-paren-match "#deccb0")
+    (bg-hl-line "#2b3337")
+    (bg-paren-match "#f7a182")
     (bg-err "#d79d9f")
     (bg-warning "#deccb0")
     (bg-info "#b5e1ca")
-    (bg-region "#cbe1b5"))
+    (bg-region "#374145"))
   "Base palette entries for `evergarden-fall', generated by whiskers.")
 
 (evergarden-build-theme 'evergarden-fall evergarden-fall-palette-partial 'dark)
diff --git a/extra-themes/evergarden-spring-theme.el b/extra-themes/evergarden-spring-theme.el
index 4ce3f85..181dae9 100644
--- a/extra-themes/evergarden-spring-theme.el
+++ b/extra-themes/evergarden-spring-theme.el
@@ -6,21 +6,10 @@
 ;; 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)
@@ -172,12 +161,12 @@
     (bg-completion "#343e43")
     (bg-hover "#4a585c")
     (bg-hover-secondary "#c4cedc")
-    (bg-hl-line "#4a585c")
-    (bg-paren-match "#deccb0")
+    (bg-hl-line "#343e43")
+    (bg-paren-match "#f7a182")
     (bg-err "#d79d9f")
     (bg-warning "#deccb0")
     (bg-info "#b5e1ca")
-    (bg-region "#cbe1b5"))
+    (bg-region "#3e4a4f"))
   "Base palette entries for `evergarden-spring', generated by whiskers.")
 
 (evergarden-build-theme 'evergarden-spring evergarden-spring-palette-partial 'dark)
diff --git a/extra-themes/evergarden-summer-theme.el b/extra-themes/evergarden-summer-theme.el
index 0557283..7d518ed 100644
--- a/extra-themes/evergarden-summer-theme.el
+++ b/extra-themes/evergarden-summer-theme.el
@@ -6,21 +6,10 @@
 ;; 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)
@@ -172,12 +161,12 @@
     (bg-completion "#ede8dd")
     (bg-hover "#ceccbd")
     (bg-hover-secondary "#6f91c1")
-    (bg-hl-line "#ceccbd")
-    (bg-paren-match "#d1ad73")
+    (bg-hl-line "#ede8dd")
+    (bg-paren-match "#c69883")
     (bg-err "#d3797b")
     (bg-warning "#d1ad73")
     (bg-info "#52c68a")
-    (bg-region "#93c85a"))
+    (bg-region "#e6e1d3"))
   "Base palette entries for `evergarden-summer', generated by whiskers.")
 
 (evergarden-build-theme 'evergarden-summer evergarden-summer-palette-partial 'light)
diff --git a/extra-themes/evergarden-winter-theme.el b/extra-themes/evergarden-winter-theme.el
index e353f3a..b3dc7e7 100644
--- a/extra-themes/evergarden-winter-theme.el
+++ b/extra-themes/evergarden-winter-theme.el
@@ -6,21 +6,10 @@
 ;; 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 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)
@@ -172,12 +161,12 @@
     (bg-completion "#262f33")
     (bg-hover "#4a585c")
     (bg-hover-secondary "#c4cedc")
-    (bg-hl-line "#4a585c")
-    (bg-paren-match "#deccb0")
+    (bg-hl-line "#262f33")
+    (bg-paren-match "#f7a182")
     (bg-err "#d79d9f")
     (bg-warning "#deccb0")
     (bg-info "#b5e1ca")
-    (bg-region "#cbe1b5"))
+    (bg-region "#374145"))
   "Base palette entries for `evergarden-winter', generated by whiskers.")
 
 (evergarden-build-theme 'evergarden-winter evergarden-winter-palette-partial 'dark)