X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/a9c07f72e7733d3425e1b0147ff92bee9c173ce4..e3eb6fe078f51ebfe3a6da92d80cd8953a3e915f:/dot/gnus-local.el.distorted diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted index 9fbace1..00f46d6 100644 --- a/dot/gnus-local.el.distorted +++ b/dot/gnus-local.el.distorted @@ -5,22 +5,13 @@ ;;; (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) +(setq auth-sources '("~/.authinfo.gpg")) ;;;-------------------------------------------------------------------------- ;;; How to send mail. (setq smtpmail-smtp-service 587 - smtpmail-auth-credentials "~/.gnus.authinfo") + smtpmail-auth-credentials "~/.authinfo.gpg") (setq mdw-send-mail-alist `((distorted-smtp @@ -45,7 +36,7 @@ "\\|" "evade\\.org\\.uk" "\\|" "fyvzl\\.net" "\\)$") . chiark-smtp) - ("@g\\(\\|oogle\\)mail\\.com$" . gmail-smtp)) + ("@g\\(oogle\\)?mail\\.com$" . gmail-smtp)) mdw-default-send-mail-method nil) ;;;-------------------------------------------------------------------------- @@ -81,18 +72,8 @@ (setq message-alternative-emails bbdb-user-mail-names message-dont-reply-to-names message-alternative-emails) -;; Mail sent to `mdw-nospam-THING' should appear to come from this address. -(setq gnus-posting-styles - '(("^nnimap\\+distorted:crap\\." - (address (concat "mdw-nospam-" - (substring gnus-newsgroup-name (match-end 0)) - "@distorted.org.uk"))) - ("^nnimap\\+[^:]+-chiark:" - ("X-mdw-Send-Mail" "chiark-smtp")) - ("^nnimap\\+google:" - (address "distorted.mdw@gmail.com") - ("X-mdw-Send-Mail" "gmail-smtp")))) - +;; Augment Gnus's built-in header-list abbreviations. +(require 'nnmail) (setq nnmail-split-abbrev-alist (mdw-uniquify-alist `((to . ,(concat "to\\|cc\\|apparently-to\\|envelope-to\\|" @@ -102,6 +83,7 @@ "resent-to\\|resent-cc")) ,@nnmail-split-abbrev-alist))) +;; Find out about my `odin.gg' mappings. (defvar mdw-odin-parse-regexp (concat "^" "\\S-+" "\\s-+" ; time limit @@ -110,8 +92,11 @@ "=" "\\(" "\\S-+" "\\)" ; mailbox tag "\\(" "$" "\\|" "\\s-" "\\)")) -(defun mdw-odin-splits () - (let ((list nil)) +(defvar mdw-odin-splits nil) +(defvar mdw-odin-sender-alist nil) + +(defun mdw-update-odin-info () + (let ((splits nil) (senders nil)) (with-temp-buffer (call-process "ssh" nil t nil "stratocaster" "userv" "odin" "mail" "list") @@ -122,9 +107,26 @@ (tag (match-string 2))) (push `(to ,(format "%s@odin\\.gg" local-part) ,(format "crap.%s" tag)) - list))) + splits) + (push (cons tag local-part) senders))) (forward-line))) - (nreverse list))) + (setq mdw-odin-splits (nreverse splits) + mdw-odin-sender-alist (nreverse senders)))) +(mdw-update-odin-info) + +;; Mail sent to `mdw-nospam-THING' should appear to come from this address. +(setq gnus-posting-styles + '(("^nnimap\\+distorted:crap\\." + (address (let* ((mailbox (substring gnus-newsgroup-name + (match-end 0))) + (entry (assoc mailbox mdw-odin-sender-alist))) + (if entry (concat (cdr entry) "@odin.gg") + (concat "mdw-nospam-" mailbox "@distorted.org.uk"))))) + ("^nnimap\\+[^:]+-chiark:" + ("X-mdw-Send-Mail" "chiark-smtp")) + ("^nnimap\\+google:" + (address "distorted.mdw@gmail.com") + ("X-mdw-Send-Mail" "gmail-smtp")))) ;; The actual splitting rules. (setq nnmail-split-fancy @@ -142,6 +144,7 @@ (from "cron daemon" "admin.misc") (from "uucp@distorted\\.org\\.uk" "admin.uucp") (from "darchive@.*\\.distorted\\.org\\.uk" "admin.misc") + (from "sales@aa\\.net\\.uk" "admin.aaisp") (from "support@aa\\.net\\.uk" "admin.aaisp") (from "bugs@distorted\\.org\\.uk" "admin.bugs") (from "darchive@distorted\\.org\\.uk" "admin.darchive") @@ -152,8 +155,8 @@ ;; Mailing lists, not split out earlier. (to "python-list@python\\.org" "lists.python") - (to ,(concat "\\(jump-\\(announce\\|discuss\\)\\)@" - "\\(lists\\.\\|\\)" "jump\\.net\\.uk") + (to ,(concat "\\(jump-\\(announce\\|discuss\\|vps\\)\\)@" + "\\(lists\\.\\)?" "jump\\.net\\.uk") "lists.\\1") (to "cambridgecryptowhiskyclub@gmail\\.com" "lists.cambridge-crypto-whisky") @@ -166,6 +169,7 @@ (from "@warwick\\.ac\\.uk\\>" "lists.warwick-uni" t) (to "chiark-\\(motd\\|announce\\)@chiark\\.greenend\\.org\\.uk" "lists.chiark-announce") + (to "sot@dotat\\.at" "lists.sot" t) (any "clive-cambridge-gamers@nsict\\.org" "lists.nsict-games") ;; Per-sender addresses. @@ -174,7 +178,7 @@ (to "\\" "crap.lovefilm" t) - (from "@\\(\\|.*\\.\\)amazon\\." "crap.amazon" t) + (from "@\\([^.]+\\.\\)?aegon" "crap.aegon" t) + (from "@\\(.*\\.\\)?amazon\\." "crap.amazon" t) + (from "@\\(.*\\.\\)?primevideo\\." "crap.amazon" t) (from "@cineworldmail\\.com\\>" "crap.cineworld" t) - (from "@picturehouses\\.co\\.uk\\>" "crap.picturehouse" t) - (from "@nationwide" "crap.nationwide" t) - (from "nationwide@securesuiteemail\\.com\\>" "crap.nationwide" t) - (from "@news\\.spotifymail\\.com\\>" "crap.spotify" t) - (from "@action\\.openrightsgroup\\.org\\>" "crap.org" t) (from "unlimited@cineworld\\.com\\>" "crap.cineworld" t) - (from "@tshirthell\\.com\\>" "crap.tshirt-hell" t) + (from "@\\(.*\\.\\)?gandi\\.net\\>" "crap.gandi" t) + (from "@accounts\\.google\\.com\\>" "crap.google" t) (from "campaigns@jolla\\.com\\>" "crap.jolla" t) + (from "@\\(.*\\.\\)?lovefilm\\.com\\>" "crap.lovefilm" t) + (from "@mythic-beasts\\.com\\>" "crap.mythic-beasts" t) + (from "@\\([^.]+\\.\\)?nationwide" "crap.nationwide" t) + (from "nationwide@securesuiteemail\\.com\\>" "crap.nationwide" t) + (from "@action\\.openrightsgroup\\.org\\>" "crap.org" t) + (from "@picturehouses\\.co\\.uk\\>" "crap.picturehouse" t) + (from "@\\(.*\\.\\)?spotify\\(mail\\)?\\.com\\>" "crap.spotify" t) (from "@thomann\\.de\\>" "crap.thomann" t) + (from "@tshirthell\\.com\\>" "crap.tshirt-hell" t) (from "@wikimedia\\.org\\>" "crap.wikimedia" t) - (from "@gandi\\.net\\>" "crap.gandi" t) - (from "@mythic-beasts\\.com\\>" "crap.mythic-beasts" t) ;; Default. "mail.misc")) @@ -211,6 +218,7 @@ (setq gnus-secondary-select-methods `((nnimap "distorted" (nnimap-address "mail.distorted.org.uk") + (nnimap-user "mdw") (nnimap-stream starttls) (nnimap-inbox ("INBOX" "to.split")) (nnimap-split-methods nnimap-split-fancy) @@ -218,6 +226,15 @@ (nnimap-unsplittable-articles (%Deleted))) (nnimap "markw-distorted" (nnimap-address "mail.distorted.org.uk") + (nnimap-user "markw") + (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 "mdw-chiark" + (nnimap-address "imap.dovecot.chiark.greenend.org.uk") + (nnimap-user "mdw") (nnimap-stream starttls) (nnimap-inbox ("INBOX" "to.split")) (nnimap-split-methods nnimap-split-fancy) @@ -225,13 +242,18 @@ (nnimap-unsplittable-articles (%Deleted))) (nnimap "mwooding-chiark" (nnimap-address "imap.dovecot.chiark.greenend.org.uk") + (nnimap-user "mwooding") (nnimap-stream starttls) - (nnimap-inbox "INBOX") + (nnimap-inbox ("INBOX" "to.split")) + (nnimap-split-methods nnimap-split-fancy) + (nnimap-split-fancy ,nnmail-split-fancy) (nnimap-unsplittable-articles (%Deleted))) (nnimap "google" (nnimap-address "imap.gmail.com") (nnimap-stream tls) - (nnimap-inbox "INBOX") + (nnimap-inbox ("INBOX" "to.split")) + (nnimap-split-methods nnimap-split-fancy) + (nnimap-split-fancy ,nnmail-split-fancy) (nnimap-unsplittable-articles (%Deleted))))) ;; Send sent mail back to me.