nits

6 files changed, 16 insertions, 22 deletions

diff --git a/completion.org b/completion.org
index 0fe2de0..0de9b55 100644
--- a/completion.org
+++ b/completion.org
@@ -21,7 +21,7 @@
             '(orderless-literal orderless-regexp orderless-initialism)))
   #+end_src
 * company
-  #+begin_src emacs-lisp
+  #+begin_src emacs-lisp :load no
     (use-package company
       :ensure t
       :custom ((company-backends '(company-capf
diff --git a/email.org b/email.org
index 9d33f5c..7583ccc 100644
--- a/email.org
+++ b/email.org
@@ -495,20 +495,22 @@
                    (sit-for 1)
                    (jao-emms-echo)))
              (error "Found an enclosure, but not a link!")))))
+
     #+end_src
 *** package
     #+begin_src emacs-lisp
       (use-package notmuch
         :ensure t
+        :demand t
         :init
         (setq notmuch-fcc-dirs
               '(("jao@bigml.com" . "bigml/sent") (".*" . "jao/sent"))
               notmuch-message-headers-visible t
-              jao-notmuch-message-headers '("Subject" "To" "Cc" "Date" "List-Id"
-                                            "Reply-To"
+              jao-notmuch-message-headers '("Subject" "To" "Cc" "Date"
+                                            "List-Id" "List-ID" "Reply-To"
                                             "X-Mailer" "User-Agent" "X-User-Agent")
               notmuch-message-headers jao-notmuch-message-headers
-              notmuch-show-mark-read-tags '("-new" "-unread" "-toread")
+              notmuch-show-mark-read-tags '("-new" "-unread")
               notmuch-archive-tags '("+trove" "-new" "-unread" "-inbox")
               notmuch-tagging-keys
               '(("a" notmuch-archive-tags "Archive")
@@ -648,8 +650,7 @@
     (jao-load-path "mu4e")
     (use-package mu4e
       :init
-      (setq
-            mu4e-attachment-dir (expand-file-name "~/var/download/attachments")
+      (setq mu4e-attachment-dir (expand-file-name "~/var/download/attachments")
             mu4e-change-filenames-when-moving nil
             mu4e-completing-read-function 'completing-read
             mu4e-display-update-status-in-modeline nil
diff --git a/gnus.org b/gnus.org
index 44a5b8e..52d898d 100644
--- a/gnus.org
+++ b/gnus.org
@@ -288,12 +288,6 @@
              (jao-gnus--trash-group "nnimap:jao/trash")
              (jao-gnus--spam-group "nnimap:jao/spam")
              (jao-gnus--archiving-group "nnimap:jao/archive"))
-            ("^nnimap:jao/archive$"
-             (jao-gnus--archiving-group "nnimap:trove/jao"))
-            ("^nnimap:pm/.*"
-             (jao-gnus--trash-group "nnimap:pm/trash")
-             (jao-gnus--spam-group "nnimap:pm/spam")
-             (jao-gnus--archiving-group "nnimap:pm/archive"))
             ("^nnimap:\\(jao\\|pm\\|bigml\\)/\\(trash\\|spam\\)"
              (gcc-self . nil)
              (auto-expire . t)
@@ -303,18 +297,18 @@
              (expiry-target . delete))
             ("^nnimap:jao/inbox"
              (gcc-self . t))
-            ("^nnimap:b\\(ig\\)?ml/.*"
+            ("^nnimap:bigml/.*"
              (posting-style (address "jao@bigml.com"))
              (jao-gnus--spam-group "nnimap:bigml/spam")
              (jao-gnus--archiving-group "nnimap:bigml/trove"))
-            ("^nnimap:b\\(ig\\)?ml/inbox"
+            ("^nnimap:bigml/inbox"
              (gcc-self . t)
              (auto-expire . t)
              (total-expire . t)
-             (expiry-wait . 7.0)
+             (expiry-wait . 365)
              (jao-gnus--trash-group "nnimap:trash")
-             (expiry-target . "nnimap:bigml/trove"))
-            ("^nnimap:b\\(ig\\)?ml/support"
+             (expiry-target . delete))
+            ("^nnimap:bigml/support"
              (posting-style (address "support@bigml.com")))
             (,jao-gnus-expirable
              (jao-gnus--trash-group nil)
@@ -330,8 +324,6 @@
              (expiry-wait . 30)
              (jao-gnus--archiving-group "nnimap:trove/tech")
              (posting-style (address "jao@gnu.org")))
-            ("^nnimap:feeds/\\(physics\\|math\\|papers\\)$"
-             (jao-gnus--archiving-group "nnimap:trove/sci"))
             ("^nnimap:jao/hacking$"
              (jao-gnus--archiving-group "nnimap:trove/tech"))
             ("^nnimap:jao/gnu$"
diff --git a/init.org b/init.org
index 63ebad0..06d9bf4 100644
--- a/init.org
+++ b/init.org
@@ -1714,8 +1714,8 @@
     #+end_src
 * Email
   #+begin_src emacs-lisp
-    (setq jao-afio-mail-function 'notmuch
-          jao-afio-notmuch-in-web t)
+    (setq jao-afio-mail-function 'notmuch ;; 'gnus 'mu4e
+          jao-afio-notmuch-in-web nil)
     (jao-load-org "email")
   #+end_src
 * PDFs
diff --git a/lib/eos/jao-afio.el b/lib/eos/jao-afio.el
index 0f17d44..14794fd 100644
--- a/lib/eos/jao-afio.el
+++ b/lib/eos/jao-afio.el
@@ -127,6 +127,7 @@
   (interactive)
   (if (or (null jao-afio-mail-function) (eq 'gnus jao-afio-mail-function))
       (jao-afio-open-gnus)
+    (calendar)
     (jao-trisect)
     (other-window 2)
     (delete-window)
diff --git a/lib/net/jao-eww-session.el b/lib/net/jao-eww-session.el
index 31ff858..b0dfc46 100644
--- a/lib/net/jao-eww-session.el
+++ b/lib/net/jao-eww-session.el
@@ -183,7 +183,7 @@ the session is already displayed in a eww tab, jao-eww-session can:
 
 (defun jao-eww-session--save-backup (&optional skip)
   (let ((f (jao-eww-session--backup-name jao-eww-session-file)))
-    (jao-eww-session--to--file f skip)))
+    (jao-eww-session--to--file f t skip)))
 
 (defun jao-eww-session--save-backup-1 ()
   (when (derived-mode-p 'eww-mode) (jao-eww-session--save-backup t)))