tweaks

4 files changed, 14 insertions, 14 deletions

diff --git a/email.org b/email.org
index ceb2022..918d735 100644
--- a/email.org
+++ b/email.org
@@ -251,8 +251,7 @@
   #+begin_src emacs-lisp
     (defun jao-list-mailboxes (base)
       (let ((dir (expand-file-name base "~/var/mail")))
-        (seq-difference (directory-files dir)
-                        '("." ".." "sent" "inbox" "trash"))))
+        (seq-difference (directory-files dir) '("." ".." "sent" "trash"))))
   #+end_src
 * consult narrowing
   #+begin_src emacs-lisp
@@ -360,7 +359,7 @@
 
       (defun jao-notmuch--q (d0 d1 &optional k qs st)
         (let ((q (or (when qs (mapconcat #'identity qs " AND "))
-                     (format "folder:%s/%s and tag:unread" d0 d1))))
+                     (format "folder:%s/%s and tag:\"/^(unread|new)$/\"" d0 d1))))
           (list :name (concat d0 (when d1 "/") d1)
                 :key k :query q :search-type (or st 'tree)
                 :sort-order 'oldest-first)))
@@ -375,8 +374,8 @@
       (setq notmuch-saved-searches
             `(,(jao-notmuch--q "bigml" "inbox" "bi")
               ,@(jao-notmuch--mboxes-search "bigml" "inbox")
-              ,(jao-notmuch--q "jao" "inbox" "ji")
-              ,@(jao-notmuch--mboxes-search "jao" "inbox")
+              ,(jao-notmuch--q "bigml/support" nil "bs" '("tag:new" "tag:support"))
+              ,@(jao-notmuch--mboxes-search "jao")
               ,@(jao-notmuch--mboxes-search "feeds")
               ,(jao-notmuch--q "gmane/emacs" nil "e"
                                '("tag:gmane" "tag:new" "tag:emacs"))
@@ -408,7 +407,7 @@
               notmuch-show-empty-saved-searches nil
               notmuch-show-part-button-default-action 'notmuch-show-view-part
               notmuch-show-mark-read-tags '("-new" "-unread")
-              notmuch-archive-tags '("+trove" "-new" "-unread" "-flagged")
+              notmuch-archive-tags '("+trove" "-new")
               notmuch-fcc-dirs
               '((".*@bigml.com" . "bigml/inbox +bigml +sent -new")
                 (".*" . "jao/inbox +jao +sent -new"))
@@ -541,7 +540,8 @@
         (when-let ((n (or n (jao-notmuch--unread-count))))
           (rename-buffer (format "*%s - {%s messages left}*"
                                  notmuch-tree-basic-query
-                                 n))))
+                                 n))
+          (jao-minibuffer-refresh)))
 
       (defun jao-notmuch-tree-next (thread &optional no-exit)
         "Next message or thread in forest or exit if none."
@@ -765,16 +765,16 @@
 
       notmuch tag +gmane -- tag:new AND folder:/gmane/
 
-      for l in notmuch haskell emacs-devel emacs-diffs emacs; do
+      for l in geiser notmuch haskell erlang emacs-devel emacs-diffs emacs; do
         tag_list $l
       done
       tag_list emacs-bugs bug-gnu-emacs
-
+      tag_list mailutils bug-mailutils
     #+end_src
 *** expiry shell script
     #+begin_src bash :shebang "#!/bin/bash" :tangle ./bin/notmuch-expire.sh :tangle-mode (identity #o755)
 
-      spared_tags="tag:\"/^(trove|new|flagged|unread|draft)$/\""
+      spared_tags="tag:\"/^(trove|new|flagged|unread|draft|gmane)$/\""
 
       function tag_deleted {
         notmuch tag +deleted -- "$1 AND date:..${2:-3d} AND NOT $spared_tags"
@@ -787,7 +787,7 @@
       tag_deleted_foldr "bigml.(drivel|lists|deploys|bugs)" 3d
       tag_deleted_foldr "bigml.reports" 1d
       tag_deleted_foldr "jao.(drivel|lists|books|think|local)" 3d
-      tag_deleted_foldr "feeds.+" 3d
+      tag_deleted "tag:feeds" 3d
 
       tag_deleted "tag:support AND tag:bigml" 7d
 
diff --git a/init.org b/init.org
index c528854..3d20887 100644
--- a/init.org
+++ b/init.org
@@ -696,7 +696,7 @@
         (setq erc-track-enable-keybindings nil)
         :bind (("C-c C-SPC" . tracking-next-buffer)))
 
-      (use-package jao-minibuffer-tracking
+      (use-package jao-tracking
         :demand t
         :init (setq jao-tracking-bkg
                     (if (jao-colors-scheme-dark-p) "grey20" "grey93")))
diff --git a/lib/doc/jao-org-links.el b/lib/doc/jao-org-links.el
index ab07498..73c24b6 100644
--- a/lib/doc/jao-org-links.el
+++ b/lib/doc/jao-org-links.el
@@ -39,7 +39,7 @@
              (real-file (if (file-exists-p sink-file) sink-file
                           (read-file-name "Import file: "
                                           jao-org--sink-dir link link))))
-        (shell-command (format "mv %s %s" real-file dest-path))))
+        (shell-command-to-string (format "mv %s %s" real-file dest-path))))
     (if (jao-doc-view-is-pdf dest-path)
         (jao-org-links--open-pdf full-link)
       (browse-url (format "file://%s" (expand-file-name  dest-path))))))
diff --git a/lib/eos/jao-minibuffer.el b/lib/eos/jao-minibuffer.el
index 7704194..cd63daa 100644
--- a/lib/eos/jao-minibuffer.el
+++ b/lib/eos/jao-minibuffer.el
@@ -155,7 +155,7 @@
                         :extend t))
   (advice-add 'force-mode-line-update :after #'jao-minibuffer-refresh)
   (advice-add 'select-window :after #'jao-minibuffer-refresh)
-  (add-hook 'window-selection-change-functions #'jao-minibuffer-refresh)
+  ;; (add-hook 'window-selection-change-functions #'jao-minibuffer-refresh)
   (jao-minibuffer-add-variable 'jao-minibuffer--mode-line-format order))
 
 ;;;###autoload