gnus tweaks

1 files changed, 23 insertions, 32 deletions

diff --git a/gnus.org b/gnus.org
index 9302b17..e0b9163 100644
--- a/gnus.org
+++ b/gnus.org
@@ -153,7 +153,7 @@
 * Local mail
 *** nnml
     #+begin_src emacs-lisp
-      (setq mail-sources '((group))
+      (setq mail-sources '((file :path "/var/mail/jao"))
             gnus-message-archive-group nil
             nnimap-quirks nil)
 
@@ -171,22 +171,15 @@
             nnmail-split-methods 'nnmail-split-fancy)
 
       (when jao-gnus-use-nnml
-        (let ((mails (file-name-as-directory mail-source-directory)))
-          (add-to-list
-           'gnus-secondary-select-methods
-           `(nnml "" ,(jao-gnus--notmuch-engine mails "notmuch.config")))))
+        (add-to-list
+         'gnus-secondary-select-methods
+         `(nnml "" ,(jao-gnus--notmuch-engine nnml-directory "notmuch.config"))))
 
-      (defun jao-gnus-nnml--add-maildir (dir)
+      (defun jao-gnus-nnml--add-maildirs (dir)
         (dolist (f (directory-files (concat "~/var/mail/" dir) t "[^\\.]"))
-          (add-to-list 'gnus-parameters
-                       `(,(concat "nnml:" dir "." (file-name-base f))
-                         (mail-source . (maildir :path ,f)))
-                       t)))
+          (add-to-list 'mail-sources `(maildir :path ,f))))
 
-      (defvar jao-gnus-split-on-mail-source
-        '("X-Gnus-Mail-Source"
-          "maildir:.+/var/mail/\\([^/]+\\)/\\([^/]+\\).*"
-          "\\1.\\2"))
+      (dolist (dir '("jao" "bigml" "feeds")) (jao-gnus-nnml--add-maildirs dir))
 
     #+end_src
 *** maildirs
@@ -248,7 +241,8 @@
           ("nnml:jao.inbox" "I" jao-themes-f01)
           ("nnml:bigml.[^ibs]" "W" jao-themes-dimm)
           ("nnml:jao.[^ist]" "J" jao-themes-dimm)
-          (,(format "^gmane\\|nnml:%s" (regexp-opt feeds)) "F" jao-themes-dimm)
+          (,(format "^nnml:%s" (regexp-opt feeds)) "F" jao-themes-dimm)
+          ("^gmane\\|^gwene" "G" jao-themes-dimm)
           ("nnml:local" "l" jao-themes-dimm))))
 
     (defun jao-gnus--unread-counts ()
@@ -392,6 +386,7 @@
     (define-key gnus-group-mode-map "zg" #'notmuch)
     (define-key gnus-group-mode-map "zz" #'jao-consult-notmuch-folder)
     (define-key gnus-group-mode-map "zZ" #'consult-notmuch)
+    (define-key gnus-group-mode-map "\C-x\C-s" #'gnus-group-save-newsrc)
 
     (jao-transient-major-mode gnus-group
       ["Search"
@@ -408,21 +403,16 @@
     #+end_src
 * Group parameters
   #+begin_src emacs-lisp
-    (setq gnus-permanently-visible-groups "^nnselect:.*-today")
+    (setq gnus-permanently-visible-groups "^nnselect:.*today")
 
-    (defvar jao-gnus-image-groups-rx
-      (format "nnml:feeds\\.fun\\|gwene\\..*%s.*"
-              (regexp-opt jao-gnus-image-groups)))
+    (defvar jao-gnus-image-groups '("xkcd"))
 
     (setq gnus-parameters
-          `(("^nnselect:.*\\(-today\\|bigml\\.bugs\\)"
-             (nnselect-rescan . t))
-            ("nnml:local"
+          `(("nnml:local"
              (auto-expire . t)
              (total-expire . t)
              (expiry-wait . 1)
-             (expiry-target . delete)
-             (mail-source . (file :path "/var/mail/jao")))
+             (expiry-target . delete))
             ("nnml:jao\\..*"
              (jao-gnus--trash-group "nnml:jao.trash")
              (jao-gnus--spam-group "nnml:jao.spam")
@@ -437,7 +427,7 @@
             ("^nnml:.*\\.\\(inbox\\|hacking\\)"
              (gcc-self . t))
             ("nnml:bigml\\..*"
-             ;; (posting-style (address "jao@bigml.com"))
+             (posting-style (address "jao@bigml.com"))
              (jao-gnus--trash-group "nnml:jao.trash")
              (jao-gnus--spam-group "nnml:jao.spam")
              (jao-gnus--archiving-group "nnml:bigml.trove"))
@@ -452,9 +442,9 @@
              (total-expire . t)
              (expiry-target . delete)
              (expiry-wait . 365))
-            (,(format "^nnml:bigml\\.%s"
-                      (regexp-opt '("support" "reports" "deploys"
-                                    "lists" "drivel" "bugs")))
+            (,(format "^nnml:bigml\\.%s" (regexp-opt '("support" "reports"
+                                                       "deploys" "lists"
+                                                       "drivel" "bugs")))
              (jao-gnus--trash-group nil)
              (gcc-self . nil)
              (auto-expire . t)
@@ -466,25 +456,26 @@
              (total-expire . t)
              (expiry-wait . 3)
              (expiry-target . delete))
-            ("nnml:feeds\\..*"
+            ("nnml:feeds\\.\\(.*\\)"
              (auto-expire . t)
              (total-expire . t)
              (expiry-wait . 7)
              (expiry-target . delete)
+             (comment . "feeds.\\1")
              (jao-gnus--archiving-group "nnml:feeds.trove"))
             ("^nnml:feeds\\.\\(news\\)$" (expiry-wait . 2))
+            ("^nnml:feeds\\.erlang" (gnus-list-identifiers "Erlang Forums"))
             ("nnml:feeds\\.trove"
              (auto-expire . nil)
              (total-expire . nil))
-            (,jao-gnus-image-groups-rx
+            (,(format "nnml:feeds\\.fun\\|gwene\\..*%s.*"
+                      (regexp-opt jao-gnus-image-groups))
              (mm-html-inhibit-images nil)
              (mm-html-blocked-images nil))
             ("\\(gmane\\|gwene\\)\\..*"
              (jao-gnus--archiving-group "nnml:feeds.trove")
              (posting-style (address "jao@gnu.org")))))
 
-    (dolist (dir '("jao" "bigml" "feeds")) (jao-gnus-nnml--add-maildir dir))
-
   #+end_src
 * Summary buffer
 *** Configuration