X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/bfdee8c36e31700e3c744c68489cc8de2c4e2c12..0191c356991d51c055fd7818adcbcc91fa348214:/dot/gnus-local.el.distorted

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 64dced6..15c76e2 100644
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -24,8 +24,8 @@
 (setq gnus-select-method
       '(nntp "chiark-ssh-kludge"
 	     (nntp-open-connection-function nntp-open-authinfo-kludge)
-	     (nntp-address "localhost:10119")
-	     (nntp-authinfo-generic "md5cookie1way chiark")))
+	     (nntp-address "tunnel.chiark.greenend.org.uk")
+	     (nntp-authinfo-generic "md5cookie1way mdw")))
 
 ;;;--------------------------------------------------------------------------
 ;;; Where we get mail from.
@@ -40,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)
@@ -65,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
@@ -73,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