wee gnus/message tweaks

2 files changed, 24 insertions, 20 deletions

diff --git a/email.org b/email.org
index 1232bbd..f02b605 100644
--- a/email.org
+++ b/email.org
@@ -5,7 +5,8 @@
 * message mode
 *** Customization
     #+begin_src emacs-lisp
-      (defvar jao-mails "")
+      (defvar jao-mails)
+      (defvar jao-extra-mails)
       (defvar jao-mails-regexp)
       (setq jao-mails-regexp (regexp-opt jao-mails))
 
@@ -17,11 +18,12 @@
       (setq password-cache-expiry nil)
       (setq message-generate-headers-first t)
       (setq message-forward-before-signature nil)
-      (setq message-alternative-emails jao-mails-regexp)
+      (setq message-alternative-emails
+            (regexp-opt (append jao-mails jao-extra-mails)))
       (setq message-dont-reply-to-names
-            (format "%s\\|%s" jao-mails-regexp (regexp-opt '("noreply@" "@noreply"
-                                                             "no-reply@" "@no-reply"
-                                                             "notifications@github"))))
+            (regexp-opt (append jao-mails '("noreply@" "@noreply"
+                                            "no-reply@" "@no-reply"
+                                            "notifications@github"))))
       (setq message-citation-line-format "On %a, %b %d %Y, %N wrote:\n")
       (setq message-citation-line-function 'message-insert-formatted-citation-line)
 
diff --git a/gnus.org b/gnus.org
index e791919..017261d 100644
--- a/gnus.org
+++ b/gnus.org
@@ -247,19 +247,17 @@
     (setq gnus-check-new-newsgroups nil)
 
     (defvar jao-gnus-tracked-groups
-      (let ((feeds (seq-difference (directory-files "~/var/mail/feeds")
-                                   '("emacs" "papers" "trove" "." ".."))))
+      (let ((feeds (thread-first
+                     (directory-files mail-source-directory nil "feeds")
+                     (seq-difference '("feeds.trove")))))
         `(("nnml:bigml.inbox" "B" jao-themes-f00)
           ("nnml:bigml.bugs" "b" jao-themes-error)
           ("nnml:bigml.support" "S" default)
-          ("nnml:jao.drivel" "I" jao-themes-f01)
+          ("nnml:jao.inbox" "I" jao-themes-f01)
           ("nnml:bigml.[^ibs]" "W" jao-themes-dimm)
-          ("nnml:jao.[^dst]" "J" jao-themes-dimm)
-          ("nnml:local" "l" jao-themes-dimm)
-          ("nnml:feeds.papers" "P" jao-themes-dimm)
-          ("^gmane\\.emacs\\|nnml:feeds.emacs" "E" jao-themes-dimm)
-          (,(format "nnml:feeds.%s" (regexp-opt feeds)) "F" jao-themes-dimm)
-          ("^gmane\\.[^e]" "G" jao-themes-dimm))))
+          ("nnml:jao.[^ist]" "J" jao-themes-dimm)
+          (,(format "^gmane\\|nnml:%s" (regexp-opt feeds)) "F" jao-themes-dimm)
+          ("nnml:local" "l" jao-themes-dimm))))
 
     (defun jao-gnus--unread-counts ()
       (seq-reduce (lambda (r g)
@@ -455,23 +453,24 @@
             ("^nnml:.*\\.\\(inbox\\|hacking\\)"
              (gcc-self . t))
             ("nnml:bigml\\..*"
-             (gcc-self . t)
-             (posting-style (address "jao@bigml.com"))
+             ;; (posting-style (address "jao@bigml.com"))
              (jao-gnus--trash-group "nnml:jao.trash")
              (jao-gnus--archiving-group "nnml:bigml.trove")
              (jao-gnus--spam-group "nnml:bigml.spam"))
-            ("nnml:bigml.inbox"
+            ("nnml:bigml\\.inbox"
+             (gcc-self . t)
              (auto-expire . t)
              (total-expire . t)
              (expiry-wait . 7)
              (expiry-target . "nnml:bigml.trove"))
-            ("nnml:bigml.trove"
+            ("nnml:bigml\\.trove"
              (auto-expire . t)
              (total-expire . t)
              (expiry-target . delete)
              (expiry-wait . 365))
             (,(format "^nnml:bigml\\.%s"
-                      (regexp-opt '("reports" "deploys" "lists" "drivel")))
+                      (regexp-opt '("support" "reports" "deploys"
+                                    "lists" "drivel" "bugs")))
              (jao-gnus--trash-group nil)
              (gcc-self . nil)
              (auto-expire . t)
@@ -493,6 +492,9 @@
             ("nnml:feeds\\.trove"
              (auto-expire . nil)
              (total-expire . nil))
+            ("nnml:feeds.fun"
+             (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")))))
@@ -514,7 +516,7 @@
 
       (setq gnus-summary-ignore-duplicates t
             gnus-suppress-duplicates t
-            gnus-summary-ignored-from-addresses jao-mails-regexp
+            ;; gnus-summary-ignored-from-addresses jao-mails-regexp
             gnus-process-mark-toggle t
             gnus-refer-thread-use-search t
             gnus-auto-select-next 'almost-quietly)