themes: external specification of face family

3 files changed, 13 insertions, 8 deletions

diff --git a/init.el b/init.el
index 8eec615..3d9f160 100644
--- a/init.el
+++ b/init.el
@@ -440,6 +440,9 @@
 (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))
+
 (defun jao-themes-setup ()
   (let* ((dark (jao-colors-scheme-dark-p))
          (theme (cond ((and dark window-system) jao-theme-dark)
diff --git a/lib/themes/jao-light-theme.el b/lib/themes/jao-light-theme.el
index 30a56af..c9b1882 100644
--- a/lib/themes/jao-light-theme.el
+++ b/lib/themes/jao-light-theme.el
@@ -18,7 +18,7 @@
 
 (jao-define-custom-theme jao-light
   (:names (bg-lightest "gray98")
-          (bg-light "gray95")
+          (bg-light "#efefef")
 
           (light-gray "gray80")
 
@@ -36,9 +36,6 @@
           (green "#005555")
           (lightgreen "darkgreen")
           (yellow "lightyellow"))
-  (:face-size (jao-d-l 12 9))
-  ;; (:face-family "DejaVu Sans Mono")
-  (:face-family (jao-d-l "Triplicate T4c" "Hack"))
   (:bold-weight 'semibold)
   (:palette (fg "black")
             (bg "white")
@@ -102,6 +99,7 @@
             (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-inactive
              (c "grey40" bg-light) :box (:line-width 1 :color "grey80"))
             (mode-line-buffer-id (~ default) (c nil nil) nit)
diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el
index f529842..efb691c 100644
--- a/lib/themes/jao-themes.el
+++ b/lib/themes/jao-themes.el
@@ -21,8 +21,10 @@
 (require 'ansi-color)
 
 ;;; palette
-(defvar jao-themes-default-face "DejaVu Sans Mono-9")
-(defvar jao-themes--face-family "DejaVu Sans Mono")
+(defvar jao-themes-default-face nil)
+(defvar jao-themes-default-family "Hack")
+(defvar jao-themes-default-size 9)
+(defvar jao-themes--face-family jao-themes-default-face)
 (defvar jao-themes--fg "black")
 (defvar jao-themes--bg "white")
 (defvar jao-themes--box "grey75")
@@ -1228,8 +1230,10 @@
   (let ((palette (cdr (assoc :palette args)))
         (x-faces (cdr (assoc :x-faces args)))
         (x-colors (cdr (assoc :x-colors args)))
-        (family (cadr (assoc :face-family args)))
-        (size (or (cadr (assoc :face-size args)) 9))
+        (family (or (cadr (assoc :face-family args))
+                    jao-themes-default-family))
+        (size (or (cadr (assoc :face-size args))
+                  jao-themes-default-size))
         (bw (or (cadr (assoc :bold-weight args)) jao-themes--bold-weight)))
     `(progn
        (custom-make-theme-feature ',name)