notmuch tweaks

2 files changed, 19 insertions, 15 deletions

diff --git a/custom/jao-custom-email.el b/custom/jao-custom-email.el
index 373d895..6dc146f 100644
--- a/custom/jao-custom-email.el
+++ b/custom/jao-custom-email.el
@@ -2,8 +2,8 @@
 
 ;;; main email system
 (require 'jao-afio)
-(setq jao-afio-mail-function 'gnus)
-;; (setq jao-afio-mail-function 'notmuch)
+;; (setq jao-afio-mail-function 'gnus)
+(setq jao-afio-mail-function 'notmuch)
 
 (defvar jao-notmuch-enabled (eq jao-afio-mail-function 'notmuch))
 
@@ -78,8 +78,8 @@
                              jao-message--bcc-alist))
         (insert "Bcc: " b "\n")))))
 
-(when jao-notmuch-enabled
-  (add-hook 'message-header-setup-hook #'jao-message-insert-bcc))
+;; (when jao-notmuch-enabled
+;;   (add-hook 'message-header-setup-hook #'jao-message-insert-bcc))
 
 ;;;; to->from
 (defvar jao-message-to-from nil)
diff --git a/custom/jao-custom-notmuch.el b/custom/jao-custom-notmuch.el
index f69375a..6f8c8ef 100644
--- a/custom/jao-custom-notmuch.el
+++ b/custom/jao-custom-notmuch.el
@@ -3,7 +3,7 @@
 (defvar jao-notmuch-minibuffer-string "")
 
 (defvar jao-notmuch-minibuffer-queries
-  '((:name "" :query "tag:new and not tag:draft" :face jao-themes-f00)
+  `((:name "" :query "tag:new and not tag:draft" :face jao-themes-f00)
     (:name "B" :query "tag:new and tag:bigml and tag:inbox" :face default)
     (:name "A" :query "tag:new and tag:alba" :face default)
     (:name "b" :query "tag:new and tag:bigml and tag:bugs"
@@ -13,10 +13,11 @@
            :query "tag:new and tag:bigml and not tag:\"/support|bugs|inbox/\""
            :face default)
     (:name "I"
-           :query "tag:new and tag:jao and tag:inbox"
+           :query "tag:new and tag:jao and (tag:inbox or tag:write)"
            :face jao-themes-warning)
     (:name "J"
-           :query "tag:new and tag:jao and not tag:\"/local|hacking|draft|inbox|prog|words/\""
+           :query ,(concat "tag:new and tag:jao and not "
+                           "tag:\"/local|hacking|draft|inbox|prog|words|write/\"")
            :face default)
     (:name "H" :query "tag:new and tag:hacking and not tag:\"/emacs/\"")
     (:name "E" :query "tag:new and tag:\"/emacs/\"")
@@ -106,13 +107,14 @@
 (jao-notmuch-def-searches inbox
   `(,(jao-notmuch--q "jao" "inbox" "ji")
     ,(jao-notmuch--qn "jao" "bills" "jb" '("tag:bills"))
+    ,(jao-notmuch--qn "jao" "write" "jw" '("tag:write"))
     ,(jao-notmuch--q "jao" "drivel" "jd")
     ,(jao-notmuch--q "jao" "mdk" "jm")
     ,(jao-notmuch--qn "jao" "hacking" "jh" '("tag:hacking" "not tag:\"/emacs/\""))
     ,(jao-notmuch--qn "jao" "local" "jl" '("tag:local"))))
 
 (jao-notmuch-def-searches news
-  (mapcar #'jao-notmuch--sq '("news" "fun" "words" "computers")))
+  (mapcar #'jao-notmuch--sq '("news" "noticias" "fun" "words" "computers")))
 
 (jao-notmuch-def-searches hacking
   (mapcar #'jao-notmuch--sq '("xmobar" "geiser" "mdk" "mailutils" "notmuch")))
@@ -166,10 +168,10 @@
           '("jao" "hacking" "feeds" "bills")))
 
 (jao-notmuch-def-searches nil
-  '((:query "not tag:trove and not tag:bigml" :name "jao/untroved")
-    (:query "tag:sent and tag:bigml" :name "bigml/sent")
-    (:query "tag:sent and not tag:bigml" :name "jao/sent")
-    (:query "*" :name "messages")))
+  '((:query "not tag:trove and not tag:bigml" :name "jao/untroved" :search-type tree)
+    (:query "tag:sent and tag:bigml" :name "bigml/sent" :search-type tree)
+    (:query "tag:sent and not tag:bigml" :name "jao/sent" :search-type tree)
+    (:query "*" :name "messages" :search-type tree)))
 
 (defvar jao-notmuch-widened-searches
   (jao-notmuch-widen-searches notmuch-saved-searches))
@@ -197,7 +199,7 @@
             (e `(:foreground ,(face-attribute 'jao-themes-error :foreground))))
         `(("unread")
           ("signed")
-          ("new" "N")
+          ("new" "·")
           ("replied" "↩" (propertize tag 'face '(:family "Fira Code")))
           ("sent" "🛪")
           ("attachment" "📎")
@@ -231,8 +233,9 @@
         notmuch-draft-quoted-tags '("part")
         notmuch-fcc-dirs
         '(("\\(support\\|education\\)@bigml.com" . nil)
-          (".*@bigml.com" . "bigml.inbox -new -unread +sent +bigml")
-          (".*" . "jao.inbox -new -unread +sent +jao"))
+          ("mail@jao.io" . nil)
+          (".*@bigml.com" . "bigml -new -unread +sent +bigml")
+          (".*" . "jao -new -unread +sent +jao"))
         notmuch-maildir-use-notmuch-insert t)
 
   :custom ((notmuch-address-internal-completion '(sent nil)))
@@ -526,6 +529,7 @@
                (">" . jao-notmuch-tree-end-of-buffer)
                ("\\" . notmuch-tree-view-raw-message)
                ("." . jao-notmuch-toggle-mime-parts)
+               (";" . bbdb-mua-display-sender)
                ("=" . jao-notmuch-tree-toggle-message)
                ("RET" . jao-notmuch-tree-show-or-scroll)
                ("SPC" . jao-notmuch-tree-scroll-or-next)