X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/c3daaa72a1fe1262bac1d0f7e8d5416609eaab2e..9af2290baca1a1a491adbb3ba4f2e27bd457b0bc:/dot/gnus-local.el.distorted?ds=sidebyside

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 8238a13..5967b7b 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
@@ -202,6 +202,7 @@
 	  (from "@wikimedia\\.org\\>" "crap.wikimedia" t)
 	  (from "@\\(.*\\.\\)?gandi\\.net\\>" "crap.gandi" t)
 	  (from "@mythic-beasts\\.com\\>" "crap.mythic-beasts" t)
+	  (from "@accounts\\.google\\.com\\>" "crap.google" t)
 
 	  ;; Default.
 	  "mail.misc"))
@@ -213,6 +214,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 +222,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 +230,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 +238,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)