diff options
| -rw-r--r-- | init.el | 12 | ||||
| -rw-r--r-- | lib/themes/jao-light-theme.el | 4 | ||||
| -rw-r--r-- | lib/themes/jao-themes.el | 17 |
3 files changed, 25 insertions, 8 deletions
@@ -433,15 +433,19 @@ (setq custom-theme-directory (expand-file-name "lib/themes" jao-emacs-dir)) -(require 'jao-themes) - (defvar jao-theme-dark 'jao-dark) (defvar jao-theme-light 'jao-light) (defvar jao-theme-term-dark 'modus-vivendi) (defvar jao-theme-term-light 'jao-light-term) -(setq jao-themes-default-face (jao-d-l "Inconsolata LGC" "Hack") - jao-themes-default-size (jao-d-l 10 9)) +(use-package jao-themes + :demand t + :init + (setq jao-themes-default-family (jao-d-l "Inconsolata LGC" "Hack") + jao-themes-default-size (jao-d-l 10 9) + jao-themes-default-variable-pitch-family + (jao-d-l "Helvetica" "Iosevka Etoile") + jao-themes-default-variable-pitch-size (jao-d-l 12 9))) (defun jao-themes-setup () (let* ((dark (jao-colors-scheme-dark-p)) 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))) |