3 files changed, 19 insertions, 16 deletions

@@ -570,8 +570,7 @@ N spaces."
 
 (use-package crux
   :ensure t :demand t
-  :bind (("C-o" . crux-smart-open-line)
-         ("C-x 4 t" . crux-transpose-windows))
+  :bind (("C-x 4 t" . crux-transpose-windows))
   :config
   (crux-with-region-or-buffer indent-region)
   (crux-with-region-or-buffer tabify)
@@ -166,12 +166,12 @@
   (setopt display-time-format " %H:%M"
           display-time-mail-function
           (defun +notmuch-new-mail-p ()
-          (plist-get (cl-find "inbox+unread"
-                              (ignore-errors
-                                (notmuch-hello-query-counts notmuch-saved-searches))
-                              :key (lambda (l) (plist-get l :name))
-                              :test #'equal)
-                     :count))
+            (plist-get (cl-find "inbox+unread"
+                                (ignore-errors
+                                  (notmuch-hello-query-counts notmuch-saved-searches))
+                                :key (lambda (l) (plist-get l :name))
+                                :test #'equal)
+                       :count))
           display-time-default-load-average nil)
   (display-time-mode))
 
@@ -728,9 +728,13 @@ With PREFIX, prompt to change the current dictionary."
 
 (use-package tab-bar
   :config
-  (setopt tab-bar-show t
-          tab-bar-format
-          (append tab-bar-format
-                  '(tab-bar-format-align-right
-                    tab-bar-format-global)))
+  (setopt tab-bar-show t)
+  (add-to-list 'tab-bar-format 'tab-bar-format-menu-bar)
+  (add-to-list 'tab-bar-format 'tab-bar-format-align-right :append)
+  (add-to-list 'tab-bar-format 'tab-bar-format-global :append)
+  (with-eval-after-load 'notmuch
+
+    ;; (remove-hook 'notmuch-after-tag-hook #'tab-bar-make-keymap-1)
+    (define-advice notmuch-update-tags (:after (&rest _) update-tab-bar)
+      (tab-bar--update-tab-bar-lines)))
   (tab-bar-mode))
@@ -147,7 +147,7 @@ the saved search as well."
 (use-package notmuch
   :when (executable-find "notmuch")
   :load-path "~/usr/share/emacs/site-lisp/"
-  :defer t
+  :defer 30
   :commands (notmuch-mua-new-mail
              notmuch-search
              notmuch-hello)
@@ -169,6 +169,7 @@ the saved search as well."
           notmuch-show-indent-content nil
           message-kill-buffer-on-exit t
           message-auto-save-directory nil
+          message-signature "Case Duckworth\nhttps://www.acdw.net"
           send-mail-function #'sendmail-send-it
           mail-specify-envelope-from t
           message-sendmail-envelope-from 'header
@@ -228,8 +229,7 @@ This version doesn't add any initial-input."
     "Trim whitespace from ends of tags."
     (list (car args) (mapcar #'string-trim (cadr args))))
   ;; Load init file
-  ;; (load notmuch-init-file 'noerror)
-  )
+  (load notmuch-init-file :noerror))
 
 (provide 'acdw-mail)
 ;;; acdw-mail.el ends here