1 files changed, 17 insertions, 14 deletions
diff --git a/custom/jao-custom-notmuch.el b/custom/jao-custom-notmuch.el
index 8b985d7..b0e7043 100644
--- a/custom/jao-custom-notmuch.el
+++ b/custom/jao-custom-notmuch.el
@@ -138,12 +138,15 @@
 (jao-notmuch-def-searches hacking
   `(,(jao-notmuch--q "hacking" "h")
     ,(jao-notmuch--q "prog" "p")
-    ,(jao-notmuch--q "lists" "lr" "rust")
-    ,(jao-notmuch--q "lists" "lx" "xmobar")
-    ,(jao-notmuch--q "lists" "lg" "geiser")
-    ,(jao-notmuch--q "lists" "ln" "notmuch")
-    ,(jao-notmuch--q "lists" "ls" "scheme")
-    ,(jao-notmuch--q "lists" "lh" "haskell")))
+    ,@(mapcar 'jao-notmuch--q-feed
+              '(("lc" "clojure")
+                ("le" "emacs")
+                ("lg" "geiser")
+                ("lh" "haskell")
+                ("ln" "notmuch")
+                ("lr" "rust")
+                ("ls" "scheme")
+                ("lx" "xmobar")))))
 
 (jao-notmuch-def-searches sci
   (mapcar 'jao-notmuch--q-feed
@@ -159,22 +162,22 @@
   t)
 
 (jao-notmuch-def-searches nil
-  `(,(jao-notmuch--q "jao" "F" "flagged" '("tag:flagged" "tag:jao"))))
+  `(,(jao-notmuch--q "flagged" "F" nil '("tag:flagged" "tag:jao"))))
 
 (jao-notmuch-def-searches today
-  `(,(jao-notmuch--q "new" "N" nil '("tag:new" "not tag:draft"))
-    ,(jao-notmuch--q "jao" "D" "drafts" '("tag:draft"))
-    ,(jao-notmuch--q "jao" "S" "sent" '("date:1d.." "tag:sent"))
-    ,(jao-notmuch--q "jao" "T" "today"
+  `(,(jao-notmuch--q "new" "N" nil (list jao-notmuch--new "not tag:draft"))
+    ,(jao-notmuch--q "drafts" "D" nil '("tag:draft"))
+    ,(jao-notmuch--q "sent" "S" nil '("date:1d.." "tag:sent"))
+    ,(jao-notmuch--q "today" "T" nil
                      '("tag:jao" "date:24h.."
                        "not tag:\"/(sent|feeds|spam|local)/\""))))
 
 (jao-notmuch-def-searches trove
-  '((:query "tag:trove" :name "jao/trove" :search-type tree)
-    (:query "tag:hacking" :name "jao/hacking" :search-type tree)
+  '((:query "tag:trove" :name "trove" :search-type tree)
+    (:query "tag:hacking" :name "hacking" :search-type tree)
     (:query "not tag:trove and not tag:hacking" :name "untroved"
             :search-type tree)
-    (:query "tag:sent" :name "jao/sent" :search-type tree)))
+    (:query "tag:sent" :name "sent" :search-type tree)))
 
 (jao-notmuch-def-searches nil
   '((:query "*" :name "messages" :search-type tree)))