From e57fe68659662daa08997df59189fb5d4608a5ca Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sat, 20 Sep 2025 22:54:36 +0100
Subject: theme tweaks

---
 lib/themes/jao-light-theme.el |  4 ++--
 lib/themes/jao-themes.el      | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'lib/themes')

diff --git a/lib/themes/jao-light-theme.el b/lib/themes/jao-light-theme.el
index c9b1882..612c44d 100644
--- a/lib/themes/jao-light-theme.el
+++ b/lib/themes/jao-light-theme.el
@@ -99,7 +99,8 @@
             (magit-diff-hunk-heading-highlight (c nil hl) it bf)
             (message-header-subject (p warning) nbf)
             (mode-line (c "grey20") :box (:line-width 1 :color "grey80"))
-            (mode-line-active (c "grey20") :box (:line-width 1 :color "grey80"))
+            (mode-line-active (c "grey20")
+                              :box (:line-width 1 :color "grey80"))
             (mode-line-inactive
              (c "grey40" bg-light) :box (:line-width 1 :color "grey80"))
             (mode-line-buffer-id (~ default) (c nil nil) nit)
@@ -113,7 +114,6 @@
             (shr-link (~ link) (ul light-gray))
             (shr-code (c blue nil))
             (success (c green))
-            (variable-pitch :family "Iosevka Etoile" :height 90)
             (vertical-border (c "grey70" nil))
             (vterm-color-yellow (c "darkgoldenrod4" yellow))
             (widget-button (~ default) nit (ul "grey80"))))
diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el
index efb691c..d05583a 100644
--- a/lib/themes/jao-themes.el
+++ b/lib/themes/jao-themes.el
@@ -23,8 +23,12 @@
 ;;; palette
 (defvar jao-themes-default-face nil)
 (defvar jao-themes-default-family "Hack")
+(defvar jao-themes-default-variable-pitch-size 9)
+(defvar jao-themes-default-variable-pitch-family "Hack")
 (defvar jao-themes-default-size 9)
 (defvar jao-themes--face-family jao-themes-default-face)
+(defvar jao-themes--variable-pitch-family nil)
+(defvar jao-themes--variable-pitch-height nil)
 (defvar jao-themes--fg "black")
 (defvar jao-themes--bg "white")
 (defvar jao-themes--box "grey75")
@@ -1111,7 +1115,7 @@
             (twittering-uri-face (~ link))
             (twittering-username-face (p f01)))
           `((underline ul))
-          `((variable-pitch :family ,jao-themes--face-family)
+          `((variable-pitch :family ,jao-themes--variable-pitch-family)
             (variable-pitch-text (~ variable-pitch))
             (vertical-border (c ,jao-themes--box nil) :inherit default)
             (vertico-current (p hilite))
@@ -1234,19 +1238,28 @@
                     jao-themes-default-family))
         (size (or (cadr (assoc :face-size args))
                   jao-themes-default-size))
+        (vpitch (or (cadr (assoc :variable-pitch-family args))
+                    jao-themes-default-variable-pitch-family))
+        (vsize (or (cadr (assoc :variable-pitch-size args))
+                   jao-themes-default-variable-pitch-size))
         (bw (or (cadr (assoc :bold-weight args)) jao-themes--bold-weight)))
     `(progn
        (custom-make-theme-feature ',name)
        (deftheme ,name)
        (custom-theme-set-variables ',name
                                    '(jao-themes-default-face
-                                     (format "%s-%s" ,family ,size))
+                                     ,(format "%s-%s" family size))
                                    '(jao-themes--face-family ,family)
+                                   '(jao-themes--variable-pitch-family
+                                     ,vpitch)
+                                   '(jao-themes--variable-pitch-height
+                                     ,(* 10 vsize))
                                    '(jao-themes--bold-weight ,bw))
        (let ((*jao-themes--color-names* ',(cdr (assoc :names args)))
              (jao-themes--face-family ,family))
          (let* ,(jao-themes--let-palette palette)
            (jao-themes--set-fbg 'x)
+           (jao-themes--set-fbg 'ns)
            (jao-themes--set-fbg 'pgtk)
            (let* ((xfaces (jao-themes--make-faces ',x-faces ',x-colors))
                   (tx-faces (jao-themes--extract-faces xfaces xfaces)))
-- 
cgit v1.2.3