color tweaks for dark theme

5 files changed, 28 insertions, 17 deletions

diff --git a/email.org b/email.org
index 9010012..78d4679 100644
--- a/email.org
+++ b/email.org
@@ -514,14 +514,15 @@
       (use-package notmuch-tree
         :config
 
-        (dolist (f '(notmuch-tree-match-tree-face
-                     notmuch-tree-no-match-tree-face))
-          (set-face-attribute f nil :family "Fira Code" :foreground "grey60"))
+        (let ((fg (face-attribute 'jao-themes-dimm :foreground)))
+          (dolist (f '(notmuch-tree-match-tree-face
+                       notmuch-tree-no-match-tree-face))
+            (set-face-attribute f nil :family "Fira Code" :foreground fg)))
 
         (defun jao-notmuch--format-field (fun field &rest args)
           (let ((rs (apply fun field args)))
             (cond ((and (stringp field) (string= field "tree"))
-                   (replace-regexp-in-string "►" "→" rs))
+                   (replace-regexp-in-string "►" "" rs)) ;; "→"
                   ((not (stringp field)) (truncate-string-to-width rs 100))
                   (t rs))))
 
diff --git a/init.org b/init.org
index b4572d3..036553e 100644
--- a/init.org
+++ b/init.org
@@ -408,7 +408,7 @@
       (setq custom-theme-directory
             (expand-file-name "lib/themes" jao-emacs-dir))
 
-      (defvar jao-default-font "Fira Code-9")  ;;  "Hack-9"
+      (defvar jao-default-font "Hack-9")  ;;  "Fira Code-9"
 
       (require 'jao-themes)
 
diff --git a/lib/eos/jao-minibuffer.el b/lib/eos/jao-minibuffer.el
index cd63daa..212d738 100644
--- a/lib/eos/jao-minibuffer.el
+++ b/lib/eos/jao-minibuffer.el
@@ -136,12 +136,7 @@
 (defun jao-minibuffer-add-msg-variable (variable-name &optional order)
   (jao-minibuffer--add-variable 'jao-minibuffer-msg-info variable-name order))
 
-;;;###autoload
-(defun jao-minibuffer-add-mode-line (order)
-  (setq jao-minibuffer--original-modeline mode-line-format)
-  (setq-default mode-line-format '(" "))
-  (dolist (b (buffer-list))
-    (with-current-buffer b (setq-local mode-line-format '(" "))))
+(defun jao-minibuffer-adjust-mode-line-faces ()
   (let ((bg (face-attribute 'default :background)))
     (set-face-attribute 'mode-line nil :box nil :height 1
                         :background bg :foreground bg
@@ -152,7 +147,15 @@
                         :background bg :foreground bg
                         :overline nil
                         :underline jao-minibuffer-inactive-buffer-line-color
-                        :extend t))
+                        :extend t)))
+
+;;;###autoload
+(defun jao-minibuffer-add-mode-line (order)
+  (setq jao-minibuffer--original-modeline mode-line-format)
+  (setq-default mode-line-format '(" "))
+  (dolist (b (buffer-list))
+    (with-current-buffer b (setq-local mode-line-format '(" "))))
+  (jao-minibuffer-adjust-mode-line-faces)
   (advice-add 'force-mode-line-update :after #'jao-minibuffer-refresh)
   (advice-add 'select-window :after #'jao-minibuffer-refresh)
   ;; (add-hook 'window-selection-change-functions #'jao-minibuffer-refresh)
diff --git a/lib/themes/jao-greenish-theme.el b/lib/themes/jao-greenish-theme.el
index d54cf3d..11b7a59 100644
--- a/lib/themes/jao-greenish-theme.el
+++ b/lib/themes/jao-greenish-theme.el
@@ -31,7 +31,7 @@
           (orange "#a6c1e0")
           (orange2 "#dd8844")
           (red "#e1c1ee" "#ff6655" "red")
-          (comments "#5699AF" "#6e7899")
+          (comments "lightskyblue4")
           (constants "#a6c1e0")
           (dimm-line-fg "#3f3f3f")
           (dimm-line "#6f6f6f")
@@ -43,7 +43,7 @@
           (modeline-bg "#22242b")
           (modeline-bg-inactive "#24262d")
           (region "#41454b")
-          (strings "azure3" "lightskyblue4")
+          (strings "#6e7899" "azure4")
           (success "#5b94ab" "#99bb66")
           (warning "#cfcf9c")
           (warning2 "#ECBE7B"))
@@ -58,7 +58,7 @@
             (visited-link ((c dark-blue)))
             (tab-sel ((c 252 232) nbf))
             (tab-unsel ((c 245 232)))
-            (comment ((c fg-0.5) it))
+            (comment ((c comments)))
             (keyword ((c keywords)))
             (function ((c functions)))
             (type ((c strings)))
@@ -111,9 +111,9 @@
             (header-line (p hilite))
             (magit-diff-context-highlight (p hilite) ex)
             (mode-line (c "grey60" modeline-bg)
-                       :box (:line-width 1 :color "#282b33")) ;; "#22242b"
+                       :box (:line-width 1 :color "#282b33"))
             (mode-line-inactive (c "grey35" modeline-bg-inactive)
-                                :box (:line-width 1 :color "#282b33")) ;; "#24262d"
+                                :box (:line-width 1 :color "#282b33"))
             (mode-line-buffer-id (c yellow))
             (org-hide (c 0 nil))
             (org-code (c yellow))
@@ -123,10 +123,13 @@
             (show-paren-match (c "darkseagreen1" "#5f5f5f"))
             (variable-pitch (c nil nil))
             (vertical-border (c "black") :inherit nil)
+            (vertico-group-separator (p dimm) :strike-through "#6f6f6f")
             (w3m-image (c green) bx it)
             (w3m-tab-background (c nil nil))
             (w3m-tab-line (c 0 0) ul)))
 
 ;; (enable-theme 'jao-greenish)
+;; (jao-minibuffer-adjust-mode-line-faces)
+
 
 (provide 'jao-greenish-theme)
diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el
index b069c3b..02c141c 100644
--- a/lib/themes/jao-themes.el
+++ b/lib/themes/jao-themes.el
@@ -883,6 +883,10 @@
             (notmuch-tag-unread (p warn))
             (notmuch-tree-match-author-face (p f01))
             (notmuch-tree-match-tag-face ul)
+            (notmuch-tree-no-match-face (p dimm))
+            (notmuch-tree-no-match-date-face (p dimm))
+            (notmuch-tree-no-match-subject-face (p dimm))
+            (notmuch-tree-no-match-tag-face (p dimm))
             (notmuch-wash-cited-text (~ gnus-cite-1)))
           `((orderless-match-face-0 ul)
             (orderless-match-face-1 ul)