dot/bashrc, dot/zshrc: Promote invoking the common config.

[profile] / dot / gnus-local.el.distorted

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 1ea2487..94c8c32 100644 (file)
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -5,17 +5,8 @@
 ;;; (c) 2014 Mark Wooding
 ;;;
 
-;;;--------------------------------------------------------------------------
-;;; Random configuration.
-
 (setq auth-sources '("~/.gnus.authinfo"))
 
-(remove-hook 'gnus-mark-article-hook
-            'gnus-summary-mark-read-and-unread-as-read)
-(add-hook 'gnus-mark-article-hook 'gnus-summary-mark-unread-as-read)
-
-(setq gnus-level-unsubscribed 6)
-
 ;;;--------------------------------------------------------------------------
 ;;; How to send mail.
 
@@ -93,6 +84,7 @@
         (address "distorted.mdw@gmail.com")
         ("X-mdw-Send-Mail" "gmail-smtp"))))
 
+(require 'nnmail)
 (setq nnmail-split-abbrev-alist
       (mdw-uniquify-alist
        `((to . ,(concat "to\\|cc\\|apparently-to\\|envelope-to\\|"
@@ -144,19 +136,29 @@
          (from "darchive@.*\\.distorted\\.org\\.uk" "admin.misc")
          (from "support@aa\\.net\\.uk" "admin.aaisp")
          (from "bugs@distorted\\.org\\.uk" "admin.bugs")
+         (from "darchive@distorted\\.org\\.uk" "admin.darchive")
 
-         ;; Colo provider.
+         ;; Colo and network provider.
          (from "\\(accounts\\|support\\)@jump\\.net\\.uk" "keep.colo")
+         (from "\\(accounts\\|support\\)@aa\\.net\\.uk" "keep.aaisp")
 
          ;; Mailing lists, not split out earlier.
          (to "python-list@python\\.org" "lists.python")
-         (to "\\(jump-\\(announce\\|discuss\\)\\)@\\(lists\\.\\)jump\\.net\\.uk"
-             "lists.jump-\\1")
+         (to ,(concat "\\(jump-\\(announce\\|discuss\\)\\)@"
+                      "\\(lists\\.\\|\\)" "jump\\.net\\.uk")
+             "lists.\\1")
          (to "cambridgecryptowhiskyclub@gmail\\.com"
              "lists.cambridge-crypto-whisky")
-         (from "@liberty-human-rights\\.org\\.uk\\>" "lists.liberty" t)
-         (from "@libertymail\\.org\\.uk\\>" "lists.liberty" t)
+         (from ,(concat "@" "\\(" "liberty-human-rights"
+                            "\\|" "libertyhumanrights"
+                            "\\|" "libertymail"
+                            "\\)" "\\.org\\.uk" "\\>")
+               "lists.liberty" t)
          (from "@openrightsgroup\\.org\\>" "lists.org" t)
+         (from "@warwick\\.ac\\.uk\\>" "lists.warwick-uni" t)
+         (to "chiark-\\(motd\\|announce\\)@chiark\\.greenend\\.org\\.uk"
+             "lists.chiark-announce")
+         (any "clive-cambridge-gamers@nsict\\.org" "lists.nsict-games")
 
          ;; Per-sender addresses.
          (to "\\<mdw-nospam-justgviing@" "crap.justgiving" t)
@@ -186,6 +188,10 @@
          (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 "@mythic-beasts\\.com\\>" "crap.mythic-beasts" t)
 
          ;; Default.
          "mail.misc"))