;;; (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
"\\|" "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)
;;;--------------------------------------------------------------------------
(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")
;; Mailing lists, not split out earlier.
(to "python-list@python\\.org" "lists.python")
(to ,(concat "\\(jump-\\(announce\\|discuss\\)\\)@"
- "\\(lists\\.\\|\\)" "jump\\.net\\.uk")
+ "\\(lists\\.\\)?" "jump\\.net\\.uk")
"lists.\\1")
(to "cambridgecryptowhiskyclub@gmail\\.com"
"lists.cambridge-crypto-whisky")
;; Other splits I've not given a per-sender address.
(from "@\\(.*\\.\\)?lovefilm\\.com\\>" "crap.lovefilm" t)
- (from "@\\(\\|.*\\.\\)amazon\\." "crap.amazon" t)
+ (from "@\\(.*\\.\\)?amazon\\." "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 "@\\(.*\\.\\)?spotify\\(mail\\)?\\.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 "campaigns@jolla\\.com\\>" "crap.jolla" t)
(from "@thomann\\.de\\>" "crap.thomann" t)
(from "@wikimedia\\.org\\>" "crap.wikimedia" t)
- (from "@gandi\\.net\\>" "crap.gandi" 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"))
(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)
(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-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)
(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)