X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/370bb0ff091c2888901e55938b632a14835d9194..4d60a7ac95f814edd26bc558b486968a5a0728a0:/dot/gnus-local.el.distorted

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index e061cf3..02dea2e 100644
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -42,14 +42,27 @@
 ;; General splitting configuration.
 (setq nnimap-split-inbox '("INBOX" "to.split")
       nnimap-split-rule 'nnimap-split-fancy
-      nnimap-split-crosspost t
+      nnimap-split-methods 'nnimap-split-fancy
+      nnmail-split-methods 'nnmail-split-fancy
       nnimap-split-predicate "UNDELETED"
+      nnimap-split-crosspost t
+      nnmail-split-crosspost t
       nnmail-split-fancy-match-partial-words nil)
 
 ;; Automatic expiry for particular groups.
 (setq gnus-auto-expirable-newsgroups
       "^nnimap\\+distorted:\\(crap\\|spam\\|admin\\|lists\\|nag\\)\\..*")
 
+;; My various email addresses.
+(setq message-alternative-emails
+      (concat "^"
+	      "\\(" "\\(mdw\\|markw\\|postmaster\\)"
+		    "\\([-+][^@]*\\|\\)"
+		    "@\\(distorted\\.org\\.uk\\|escorted\\.org\\.uk\\|odin\\.gg\\)"
+	      "\\|" "distorted\\.mdw@g\\(oogle\\|\\)mail\\.com"
+	      "\\)$")
+      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
       '(((and (string-match "^nnimap\\+distorted:crap\\.\\(.*\\)$"
@@ -60,21 +73,40 @@
 	 ("From" mdw-from-address))))
 
 ;; The actual splitting rules.
-(setq nnimap-split-fancy
-      '(| (to "\\<\\(news\\|newsmaster\\|usenet\\)@" "admin.news" t)
-	  (to "\\<hostmaster@" "admin.dns" t)
-	  (to "\\<postmaster@" "admin.mail" t)
-	  (to "\\<\\(root\\|mirror\\|postgres\\|spamd\\)@" "admin.misc" t)
+(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)
+	  (from "cron daemon" "admin.misc")
+	  (from "uucp@distorted\\.org\\.uk" "admin.uucp")
+	  (from "darchive@.*\\.distorted\\.org\\.uk" "admin.misc")
+	  (from "bugs@distorted\\.org\\.uk" "admin.bugs")
+
+	  ;; Colo provider.
+	  (from "\\(accounts\\|support\\)@jump\\.net\\.uk" "keep.colo")
+
+	  ;; Mailing lists, not split out earlier.
 	  (to "python-list@python\\.org" "lists.python")
+	  (to "jump-announce@jump\\.net\\.uk" "lists.jump-announce")
+
+	  ;; Per-sender addresses.
 	  (to "mdw-nospam-justgviing@" "crap.justgiving" t)
 	  (to "mdw-nospam-\\([^@]+\\)@" "crap.\\1" t)
 	  (to "mdw-nopspam-\\([^@]+\\)@" "crap.\\1" t)
-	  (from "support@jump\\.net\\.uk" "keep.colo")
+
+	  ;; Regular nags.
 	  (from "\\(sealbot\\|cardbot\\)@ncipher\\.com" "nag.cardbot")
 	  (from "\\<mailman-owner@" "nag.mailman" t)
-	  (from "cron daemon" "admin.misc")
-	  (from "uucp@distorted\\.org\\.uk" "admin.uucp")
-	  (from "darchive@.*\\.distorted\\.org\\.uk" "admin.misc")
+
+	  ;; 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)
@@ -88,6 +120,10 @@
 	  (from "@libertymail\\.org\\.uk" "spam.liberty" t)
 	  (from "@openrightsgroup\\.org" "spam.org" t)
 	  (from "@tshirthell\\.com" "spam.tshirt-hell" t)
-	  "mail.misc"))
+	  (from "campaigns@jolla\\.com" "crap.jolla" t)
+
+	  ;; Default.
+	  "mail.misc")
+      nnimap-split-fancy nnmail-split-fancy)
 
 ;;;----- That's all, folks --------------------------------------------------