nitsmain

2 files changed, 6 insertions, 3 deletions

diff --git a/custom/jao-custom-notmuch.el b/custom/jao-custom-notmuch.el
index 9fb9231..ca2664c 100644
--- a/custom/jao-custom-notmuch.el
+++ b/custom/jao-custom-notmuch.el
@@ -27,6 +27,7 @@
   (format "%s%s" (plist-get c :name) (plist-get c :count)))
 
 (defvar jao-notmuch-mac-xbar t)
+(defvar jao-notmuch-mac-mail-badge nil)
 
 (defun jao-notmuch-xbar ()
   (let ((cnts (notmuch-hello-query-counts jao-notmuch-xbar-queries)))
@@ -37,7 +38,8 @@
   (interactive)
   (let* ((cnts (notmuch-hello-query-counts jao-notmuch-minibuffer-queries))
          (mc (jao-d-l
-              (unless jao-notmuch-mac-xbar (jao-mac-app-badge "Mail")) 0))
+              (when jao-notmuch-mac-mail-badge (jao-mac-app-badge "Mail"))
+              0))
          (cnts (if (> (or mc 0) 0) (cons `(:name "" :count ,mc) cnts) cnts)))
     (setq jao-notmuch-minibuffer-string
           (mapconcat (lambda (c)
@@ -133,6 +135,8 @@
         notmuch-saved-searches nil
         jao-notmuch-widened-searches nil)
 
+  (when other (jao-notmuch--def-searches (car other) (cdr other)))
+
   (jao-notmuch--def-searches "inbox"
     `(,(jao-notmuch--q "inbox" "i")
       ,(jao-notmuch--q "write" "w")
@@ -140,8 +144,6 @@
       ,(jao-notmuch--q "trove" "t")
       ,(jao-notmuch--q "local" "x")))
 
-  (when other (jao-notmuch--def-searches (car other) (cdr other)))
-
   (jao-notmuch--def-searches "news"
     (mapcar 'jao-notmuch--q-feed
             '(("fn" "news")
diff --git a/custom/jao-custom-programming.el b/custom/jao-custom-programming.el
index e879222..d8f9308 100644
--- a/custom/jao-custom-programming.el
+++ b/custom/jao-custom-programming.el
@@ -58,6 +58,7 @@
     (flymake-mode 1)
     (eglot-inlay-hints-mode -1)
     (setq-local eldoc-display-functions '(eldoc-display-in-buffer)))
+  (setq eglot-events-buffer-config '(:size 0 :format full))
   :config
   :hook (eglot-managed-mode . jao-eglot-managed-mode-hook)
   :bind (:map eglot-mode-map (("C-h ." . jao-eldoc-toggle))))