dot/gnus-local.el.distorted: Fix name of `noationwide' folder.
[profile] / dot / gnus-local.el.distorted
index 175b443..2e64c00 100644 (file)
@@ -5,8 +5,17 @@
 ;;; (c) 2014 Mark Wooding
 ;;;
 
+;;;--------------------------------------------------------------------------
+;;; Random configuration.
+
 (setq auth-sources '("~/.gnus.authinfo"))
 
+(remove-hook 'gnus-mark-article-hook
+            'gnus-summary-mark-read-and-unread-as-read)
+(add-hook 'gnus-mark-article-hook 'gnus-summary-mark-unread-as-read)
+
+(setq gnus-level-unsubscribed 6)
+
 ;;;--------------------------------------------------------------------------
 ;;; How to send mail.
 
             (nntp-authinfo-generic "md5cookie1way mdw")))
 
 ;;;--------------------------------------------------------------------------
-;;; Where we get mail from.
-
-;; Read mail on the IMAP server.
-(setq gnus-secondary-select-methods
-      '((nnimap "distorted"
-               (nnimap-address "mail.distorted.org.uk")
-               (nnimap-stream tls)
-               (nnimap-authinfo-file "~/.gnus.authinfo")
-               (nnimap-inbox "INBOX")
-               (nnimap-unsplittable-articles (%Deleted)))
-       (nnimap "markw-distorted"
-               (nnimap-address "mail.distorted.org.uk")
-               (nnimap-stream tls)
-               (nnimap-authinfo-file "~/.gnus.authinfo.markw")
-               (nnimap-inbox "INBOX")
-               (nnimap-unsplittable-articles (%Deleted)))
-       (nnimap "mwooding-chiark"
-               (nnimap-address "imap.dovecot.chiark.greenend.org.uk")
-               (nnimap-stream tls)
-               (nnimap-authinfo-file "~/.gnus.authinfo")
-               (nnimap-inbox "INBOX")
-               (nnimap-unsplittable-articles (%Deleted)))
-       (nnimap "google"
-               (nnimap-address "imap.gmail.com")
-               (nnimap-stream tls)
-               (nnimap-authinfo-file "~/.gnus.authinfo")
-               (nnimap-inbox "INBOX")
-               (nnimap-unsplittable-articles (%Deleted)))))
-
-;; Send sent mail back to me.
-(setq gnus-message-archive-method "mail"
-      gnus-gcc-mark-as-read t
-      gnus-message-archive-group "nnimap+distorted:mail.sent")
-
-;;;--------------------------------------------------------------------------
 ;;; Mail group configuration.
 
 ;; General splitting configuration.
-(setq nnimap-split-inbox '("INBOX" "to.split")
-      nnimap-split-rule 'nnimap-split-fancy
-      nnimap-split-methods 'nnimap-split-fancy
+(setq nnimap-split-rule 'nnimap-split-fancy
       nnmail-split-methods 'nnmail-split-fancy
       nnimap-split-predicate "UNDELETED"
       nnimap-split-crosspost t
 (setq gnus-auto-expirable-newsgroups
       (concat "^"
              "\\(nnimap\\+[^:]+\\|nnvirtual\\):"
-             "\\(admin\\|crap\\|lists\\|nag\\|spam\\)\\."))
+             "\\(" "\\(admin\\|crap\\|lists\\|nag\\|spam\\)\\."
+             "\\|" "spam\\.oubliette"
+             "\\)"))
 
 ;; My various email addresses.
 (setq message-alternative-emails bbdb-user-mail-names
         (address "distorted.mdw@gmail.com")
         ("X-mdw-Send-Mail" "gmail-smtp"))))
 
+(defvar mdw-odin-parse-regexp
+  (concat "^"
+         "\\S-+" "\\s-+"               ; time limit
+         "\\(" "\\S-+" "\\)" "\\s-+"   ; local part
+         "\\S-+" "\\s-+"               ; recipient email address
+         "=" "\\(" "\\S-+" "\\)"       ; mailbox tag
+         "\\(" "$" "\\|" "\\s-" "\\)"))
+
+(defun mdw-odin-splits ()
+  (let ((list nil))
+    (with-temp-buffer
+      (call-process "ssh" nil t nil
+                   "stratocaster" "userv" "odin" "mail" "list")
+      (goto-char (point-min))
+      (while (< (point) (point-max))
+       (when (looking-at mdw-odin-parse-regexp)
+         (let ((local-part (match-string 1))
+               (tag (match-string 2)))
+           (push `(to ,(format "%s@odin\\.gg" local-part)
+                      ,(format "crap.%s" tag))
+                 list)))
+       (forward-line)))
+    (nreverse list)))
+
 ;; The actual splitting rules.
 (setq nnmail-split-fancy
-      '(|
+      `(|
          ;; Administrative boxes.
-         (to "\\(root\\|postgres\\|ca\\|noc\\)@" "admin.misc" t)
-         (to "\\(jukebox\\|nobody\\|darchive\\)@" "admin.misc" t)
-         (to "\\(hostmaster\\)@" "admin.dns" t)
-         (to "\\(news\\|newsmaster\\|usenet\\)@" "admin.news" t)
-         (to "\\(postmaster\\|spamd\\|mailer-daemon\\)@" "admin.mail" t)
-         (to "\\(irc\\|blight\\|ircbot\\)@" "admin.irc" t)
-         (to "\\(www\\|webmaster\\|mtos\\)@" "admin.web" t)
-         (to "\\(ftp\\|ftpadmin\\|mirror\\)@" "admin.ftp" t)
-         (to "\\(abuse\\|security\\)@" "admin.keep" t)
+         (to "\\<\\(root\\|postgres\\|ca\\|noc\\)@" "admin.misc" t)
+         (to "\\<\\(jukebox\\|nobody\\|darchive\\)@" "admin.misc" t)
+         (to "\\<\\(hostmaster\\)@" "admin.dns" t)
+         (to "\\<\\(news\\|newsmaster\\|usenet\\)@" "admin.news" t)
+         (to "\\<\\(postmaster\\|spamd\\|mailer-daemon\\)@" "admin.mail" t)
+         (to "\\<\\(irc\\|blight\\|ircbot\\)@" "admin.irc" t)
+         (to "\\<\\(www\\|webmaster\\|mtos\\)@" "admin.web" t)
+         (to "\\<\\(ftp\\|ftpadmin\\|mirror\\)@" "admin.ftp" t)
+         (to "\\\<\\(abuse\\|security\\)@" "admin.keep" t)
          (from "cron daemon" "admin.misc")
          (from "uucp@distorted\\.org\\.uk" "admin.uucp")
          (from "darchive@.*\\.distorted\\.org\\.uk" "admin.misc")
 
          ;; Mailing lists, not split out earlier.
          (to "python-list@python\\.org" "lists.python")
-         (to "jump-announce@jump\\.net\\.uk" "lists.jump-announce")
+         (to "\\(jump-\\(announce\\|discuss\\)\\)@\\(lists\\.\\)jump\\.net\\.uk"
+             "lists.jump-\\1")
 
          ;; Per-sender addresses.
-         (to "mdw-nospam-justgviing@" "crap.justgiving" t)
-         (to "mdw-nospam-\\([^@]+\\)@" "crap.\\1" t)
-         (to "mdw-nopspam-\\([^@]+\\)@" "crap.\\1" t)
+         (to "\\<mdw-nospam-justgviing@" "crap.justgiving" t)
+         (to "\\<mdw-nospam-\\([^@]+\\)@" "crap.\\1" t)
+         (to "\\<mdw-nopspam-\\([^@]+\\)@" "crap.\\1" t)
+
+         (to "\\(markw\\|mdw\\|mw\\)@odin\\.gg" "mail.misc")
+         ,@(mdw-odin-splits)
+         (to "\\([a-z0-9]+\\)@odin\\.gg" "crap.odin-misc")
 
          ;; Regular nags.
          (from "\\(sealbot\\|cardbot\\)@ncipher\\.com" "nag.cardbot")
          (from "\\<mailman-owner@" "nag.mailman" t)
 
          ;; Uninteresting mail.
-         (from "expiry@letsencrypt\\.org" "spam.letsencrypt" t)
+         (from "expiry@letsencrypt\\.org" "spam.letsencrypt")
 
          ;; Other splits I've not given a per-sender address.
-         (from "@\\(.*\\.\\)?lovefilm\\.com" "spam.lovefilm" t)
-         (from "@amazon\\." "spam.amazon" t)
-         (from "@cineworldmail\\.com" "spam.cineworld" t)
-         (from "@picturehouses\\.co\\.uk" "spam.picturehouse" t)
+         (from "@\\(.*\\.\\)?lovefilm\\.com\\>" "spam.lovefilm" t)
+         (from "@\\(\\|.*\\.\\)amazon\\." "spam.amazon" t)
+         (from "@cineworldmail\\.com\\>" "spam.cineworld" t)
+         (from "@picturehouses\\.co\\.uk\\>" "spam.picturehouse" t)
          (from "@nationwide" "spam.nationwide" t)
-         (from "@news\\.spotifymail\\.com" "spam.spotify" t)
-         (from "@action\\.openrightsgroup\\.org" "spam.org" t)
-         (from "unlimited@cineworld\\.com" "spam.cineworld" t)
-         (from "nationwide@securesuiteemail\\.com" "spam.nationwide" t)
-         (from "@liberty-human-rights\\.org\\.uk" "spam.liberty" t)
-         (from "@libertymail\\.org\\.uk" "spam.liberty" t)
-         (from "@openrightsgroup\\.org" "spam.org" t)
-         (from "@tshirthell\\.com" "spam.tshirt-hell" t)
-         (from "campaigns@jolla\\.com" "crap.jolla" t)
+         (from "@news\\.spotifymail\\.com\\>" "spam.spotify" t)
+         (from "@action\\.openrightsgroup\\.org\\>" "spam.org" t)
+         (from "unlimited@cineworld\\.com\\>" "spam.cineworld" t)
+         (from "nationwide@securesuiteemail\\.com\\>" "spam.nationwide" t)
+         (from "@liberty-human-rights\\.org\\.uk\\>" "spam.liberty" t)
+         (from "@libertymail\\.org\\.uk\\>" "spam.liberty" t)
+         (from "@openrightsgroup\\.org\\>" "spam.org" t)
+         (from "@tshirthell\\.com\\>" "spam.tshirt-hell" t)
+         (from "campaigns@jolla\\.com\\>" "crap.jolla" t)
 
          ;; Default.
-         "mail.misc")
-      nnimap-split-fancy nnmail-split-fancy)
+         "mail.misc"))
+
+;;;--------------------------------------------------------------------------
+;;; Where we get mail from.
+
+;; Read mail on the IMAP server.
+(setq gnus-secondary-select-methods
+      `((nnimap "distorted"
+               (nnimap-address "mail.distorted.org.uk")
+               (nnimap-stream starttls)
+               (nnimap-inbox ("INBOX" "to.split"))
+               (nnimap-split-methods nnimap-split-fancy)
+               (nnimap-split-fancy ,nnmail-split-fancy)
+               (nnimap-unsplittable-articles (%Deleted)))
+       (nnimap "markw-distorted"
+               (nnimap-address "mail.distorted.org.uk")
+               (nnimap-stream starttls)
+               (nnimap-inbox ("INBOX" "to.split"))
+               (nnimap-split-methods nnimap-split-fancy)
+               (nnimap-split-fancy ,nnmail-split-fancy)
+               (nnimap-unsplittable-articles (%Deleted)))
+       (nnimap "mwooding-chiark"
+               (nnimap-address "imap.dovecot.chiark.greenend.org.uk")
+               (nnimap-stream starttls)
+               (nnimap-inbox "INBOX")
+               (nnimap-unsplittable-articles (%Deleted)))
+       (nnimap "google"
+               (nnimap-address "imap.gmail.com")
+               (nnimap-stream tls)
+               (nnimap-inbox "INBOX")
+               (nnimap-unsplittable-articles (%Deleted)))))
+
+;; Send sent mail back to me.
+(setq gnus-message-archive-method "mail"
+      gnus-gcc-mark-as-read t
+      gnus-message-archive-group "nnimap+distorted:mail.sent")
 
 ;;;----- That's all, folks --------------------------------------------------