dot/emacs: I have another chiark email address now.

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

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index b4b0037..15c76e2 100644 (file)
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -18,6 +18,16 @@
           '(("mail.distorted.org.uk" 587 "" ""))))
 
 ;;;--------------------------------------------------------------------------
+;;; News via chiark.
+
+;; Currently we assume an SSH tunnel.  This will be fixed later.
+(setq gnus-select-method
+      '(nntp "chiark-ssh-kludge"
+            (nntp-open-connection-function nntp-open-authinfo-kludge)
+            (nntp-address "tunnel.chiark.greenend.org.uk")
+            (nntp-authinfo-generic "md5cookie1way mdw")))
+
+;;;--------------------------------------------------------------------------
 ;;; Where we get mail from.
 
 ;; Read mail on the IMAP server.
@@ -30,6 +40,10 @@
                (nnimap-address "mail.distorted.org.uk")
                (nnimap-stream tls)
                (nnimap-authinfo-file "~/.gnus.authinfo.markw"))
+       (nnimap "mwooding-chiark"
+               (nnimap-address "imap.dovecot.chiark.greenend.org.uk")
+               (nnimap-stream tls)
+               (nnimap-authinfo-file "~/.gnus.authinfo"))
        (nnimap "google"
                (nnimap-address "imap.gmail.com")
                (nnimap-stream tls)
@@ -55,7 +69,9 @@
 
 ;; Automatic expiry for particular groups.
 (setq gnus-auto-expirable-newsgroups
-      "^nnimap\\+distorted:\\(crap\\|spam\\|admin\\|lists\\|nag\\)\\..*")
+      (concat "^"
+             "\\(nnimap\\+[^:]+\\|nnvirtual\\):"
+             "\\(admin\\|crap\\|lists\\|nag\\|spam\\)\\."))
 
 ;; My various email addresses.
 (setq message-alternative-emails bbdb-user-mail-names
@@ -63,12 +79,10 @@
 
 ;; Mail sent to `mdw-nospam-THING' should appear to come from this address.
 (setq gnus-posting-styles
-      '(((and (string-match "^nnimap\\+distorted:crap\\.\\(.*\\)$"
-                           gnus-newsgroup-name)
-             (setq mdw-from-address
-                   (replace-match "mdw-nospam-\\1@distorted.org.uk"
-                                  nil nil gnus-newsgroup-name)))
-        ("From" mdw-from-address))))
+      '(("^nnimap\\+distorted:crap\\."
+        (address (concat "mdw-nospam-"
+                         (substring gnus-newsgroup-name (match-end 0))
+                         "@distorted.org.uk")))))
 
 ;; The actual splitting rules.
 (setq nnmail-split-fancy
@@ -104,6 +118,9 @@
          (from "\\(sealbot\\|cardbot\\)@ncipher\\.com" "nag.cardbot")
          (from "\\<mailman-owner@" "nag.mailman" t)
 
+         ;; Uninteresting mail.
+         (from "expiry@letsencrypt\\.org" "spam.letsencrypt" t)
+
          ;; Other splits I've not given a per-sender address.
          (from "@\\(.*\\.\\)?lovefilm\\.com" "spam.lovefilm" t)
          (from "@amazon\\." "spam.amazon" t)