wee refactorings

2 files changed, 13 insertions, 11 deletions

diff --git a/init.org b/init.org
index b72439f..c0dc2bb 100644
--- a/init.org
+++ b/init.org
@@ -553,12 +553,6 @@
         (add-hook 'after-init-hook #'jao-sway-enable))
 
     #+end_src
-*** detect ws
-    #+begin_src emacs-lisp
-      (defvar jao-window-system
-        (or jao-exwm-enabled jao-xmonad-enabled jao-sway-enabled))
-      (defun jao-window-system-p () jao-window-system)
-    #+end_src
 *** wallpaper
     #+begin_src emacs-lisp
       (defvar jao-wallpaper-dir "~/.wallpapers/")
@@ -2639,7 +2633,7 @@
                     cider-auto-select-error-buffer nil
                     cider-auto-select-test-report-buffer nil
                     cider-eldoc-display-for-symbol-at-point t
-                    cider-eldoc-ns-function #'cider-last-ns-segment
+                    cider-eldoc-ns-function #'identity ;; #'cider-last-ns-segment
                     cider-enrich-classpath nil
                     cider-lein-parameters "repl :headless :host localhost"
                     cider-mode-line  " ÷"
@@ -3321,6 +3315,9 @@
       (jao-afio--goto-scratch-1)
       (package-list-packages))
 
+    (defun jao-window-system-p ()
+      (or jao-exwm-enabled jao-xmonad-enabled jao-sway-enabled))
+
     (transient-define-prefix jao-transient-utils ()
       "Global operations in X11."
       [["Notes"
diff --git a/notmuch.org b/notmuch.org
index 89b30fb..f4756f8 100644
--- a/notmuch.org
+++ b/notmuch.org
@@ -451,6 +451,13 @@
         (funcall (if ext browse-url-secondary-browser-function #'browse-url)
                  url)))
 
+    (defun jao-notmuch-adjust-tree-fonts (&optional family)
+      (let ((fg (face-attribute 'jao-themes-dimm :foreground))
+            (family (or family "Source Code Pro")))
+        (dolist (f '(notmuch-tree-match-tree-face
+                     notmuch-tree-no-match-tree-face))
+          (set-face-attribute f nil :family family :foreground fg))))
+
     (use-package notmuch-tree
       :init
       (setq notmuch-tree-result-format
@@ -473,10 +480,8 @@
 
       :config
 
-      (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 "Source Code Pro" :foreground fg)))
+      (when (string-prefix-p "Hack" jao-themes-default-face)
+        (jao-notmuch-adjust-tree-fonts))
 
       (jao-notmuch-tree-setup "T")