X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/1e3bad2152a2d4e383b45a419e7c0d7ce3423ff8..e3eb6fe078f51ebfe3a6da92d80cd8953a3e915f:/dot/gnus-local.el.distorted

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 7bfba60..00f46d6 100644
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -5,13 +5,13 @@
 ;;; (c) 2014 Mark Wooding
 ;;;
 
-(setq auth-sources '("~/.gnus.authinfo"))
+(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
@@ -36,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)
 
 ;;;--------------------------------------------------------------------------
@@ -144,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")
@@ -154,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")
@@ -168,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.
@@ -187,21 +189,24 @@
 	  (from "expiry@letsencrypt\\.org" "admin.letsencrypt")
 
 	  ;; Other splits I've not given a per-sender address.
-	  (from "@\\(.*\\.\\)?lovefilm\\.com\\>" "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"))
@@ -213,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)
@@ -220,6 +226,7 @@
 		(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)
@@ -227,6 +234,7 @@
 		(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)
@@ -234,6 +242,7 @@
 		(nnimap-unsplittable-articles (%Deleted)))
 	(nnimap "mwooding-chiark"
 		(nnimap-address "imap.dovecot.chiark.greenend.org.uk")
+		(nnimap-user "mwooding")
 		(nnimap-stream starttls)
 		(nnimap-inbox ("INBOX" "to.split"))
 		(nnimap-split-methods nnimap-split-fancy)