themes: trying roboto and configurable bold weight

3 files changed, 25 insertions, 12 deletions

diff --git a/init.org b/init.org
index 4407c8a..9966532 100644
--- a/init.org
+++ b/init.org
@@ -298,7 +298,7 @@
     #+begin_src emacs-lisp
       (setq widget-image-enable nil
             widget-link-prefix ""
-            widget-link-suffix "↗"
+            widget-link-suffix ""
             widget-button-prefix " "
             widget-button-suffix " "
             widget-push-button-prefix ""
@@ -387,6 +387,7 @@
             (expand-file-name "lib/themes" jao-emacs-dir))
 
       (defvar jao-default-font "Hack-9")  ;;  "Fira Code-9"
+      (setq jao-default-font "Roboto Mono-9")
 
       (require 'jao-themes)
 
@@ -980,14 +981,21 @@
       (add-hook 'write-file-functions 'delete-trailing-whitespace)
       (setq-default indicate-empty-lines nil)
     #+END_SRC
-*** Filling
+*** Filling and fill column indicator
     Some variables to control where fci mode will be or is being used
-    #+BEGIN_SRC emacs-lisp
+    #+begin_src emacs-lisp
       (setq fill-column 78)
       (setq comment-auto-fill-only-comments nil)
-      (add-hook 'prog-mode-hook #'display-fill-column-indicator-mode)
-      (setq-default display-fill-column-indicator-column 80)
-    #+END_SRC
+      (use-package display-fill-column-indicator
+        :hook (prog-mode . display-fill-column-indicator-mode)
+        :init (setq display-fill-column-indicator-column 80
+                    display-fill-column-indicator-character ?│)
+        :config
+        (unless (string-prefix-p "Hack" jao-default-font)
+          (set-face-attribute 'fill-column-indicator nil
+                              :family "Hack" :height 110)))
+
+    #+end_src
 *** Visible mode
     #+begin_src emacs-lisp
       (use-package visible-mode
@@ -2033,10 +2041,10 @@
       #+end_src
 * Version control and CI
 *** General options
-    #+BEGIN_SRC emacs-lisp
+    #+begin_src emacs-lisp
     (setq vc-follow-symlinks t)
     (setq auto-revert-check-vc-info nil)
-    #+END_SRC
+    #+end_src
 *** Diff fringe indicators (diff-hl)
     #+begin_src emacs-lisp
       (use-package diff-hl
diff --git a/lib/themes/jao-light-theme.el b/lib/themes/jao-light-theme.el
index a9786ea..3c1aa31 100644
--- a/lib/themes/jao-light-theme.el
+++ b/lib/themes/jao-light-theme.el
@@ -43,7 +43,8 @@
           (functions "#005555")
           (red "salmon3")
           (red2 "sienna4"))
-  (:face-family "Hack")
+  (:face-family "Roboto Mono")
+  (:bold-weight 'medium)
   (:palette (fg "black")
             (bg "white")
             (box "grey88")
diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el
index eca20c5..db68668 100644
--- a/lib/themes/jao-themes.el
+++ b/lib/themes/jao-themes.el
@@ -179,6 +179,7 @@
 
 (defvar jao-themes--cidxs nil)
 (defvar jao-themes--x-colors nil)
+(defvar jao-themes--bold-weight 'medium)
 
 (defvar *jao-themes--color-names* nil)
 (defvar *jao--parsed-faces* nil)
@@ -213,7 +214,7 @@
            (dfg `(:foreground ,jao-themes--fg))
            (link (jao-themes--parse-face-body jao-themes--link))
            (vlink (jao-themes--parse-face-body jao-themes--visited-link))
-           (bf '(:bold t :weight bold))
+           (bf `(:bold t :weight ,jao-themes--bold-weight))
            (nbf '(:bold t :weight normal))
            (it '(:italic t :slant italic))
            (nit '(:italic nil :slant normal))
@@ -1202,11 +1203,14 @@
   (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))))
+        (family (cadr (assoc :face-family args)))
+        (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--face-family ,family))
+       (custom-theme-set-variables ',name
+                                   '(jao-themes--face-family ,family)
+                                   '(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)