dot/gnus-local.el.distorted: Reorganize the split list.

Or, well, actually organize it for the first time.

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 0a9196d..4f6e014 100644 (file)
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -74,20 +74,38 @@
 
 ;; The actual splitting rules.
 (setq nnmail-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)
+      '(|
+         ;; 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")
+
+         ;; 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)
@@ -101,6 +119,9 @@
          (from "@libertymail\\.org\\.uk" "spam.liberty" t)
          (from "@openrightsgroup\\.org" "spam.org" t)
          (from "@tshirthell\\.com" "spam.tshirt-hell" t)
+         (from "campaigns@jolla\\.com" "crap.jolla" t)
+
+         ;; Default.
          "mail.misc")
       nnimap-split-fancy nnmail-split-fancy)