X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/db6e1e360089e2b8679f6f6018e4fd12edae6510..1fe0e9b30ccdd5a65bb0aa419e50a46782d4dc24:/dot/gnus-local.el.distorted

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 50b7159..e7e7f52 100644
--- 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.
 
@@ -81,18 +72,7 @@
 (setq message-alternative-emails bbdb-user-mail-names
       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
-      '(("^nnimap\\+distorted:crap\\."
-	 (address (concat "mdw-nospam-"
-			  (substring gnus-newsgroup-name (match-end 0))
-			  "@distorted.org.uk")))
-	("^nnimap\\+[^:]+-chiark:"
-	 ("X-mdw-Send-Mail" "chiark-smtp"))
-	("^nnimap\\+google:"
-	 (address "distorted.mdw@gmail.com")
-	 ("X-mdw-Send-Mail" "gmail-smtp"))))
-
+;; Augment Gnus's built-in header-list abbreviations.
 (require 'nnmail)
 (setq nnmail-split-abbrev-alist
       (mdw-uniquify-alist
@@ -103,6 +83,7 @@
 			 "resent-to\\|resent-cc"))
 	 ,@nnmail-split-abbrev-alist)))
 
+;; Find out about my `odin.gg' mappings.
 (defvar mdw-odin-parse-regexp
   (concat "^"
 	  "\\S-+" "\\s-+"		; time limit
@@ -111,8 +92,10 @@
 	  "=" "\\(" "\\S-+" "\\)"	; mailbox tag
 	  "\\(" "$" "\\|" "\\s-" "\\)"))
 
-(defun mdw-odin-splits ()
-  (let ((list nil))
+(defvar mdw-odin-splits nil)
+
+(defun mdw-update-odin-info ()
+  (let ((splits nil))
     (with-temp-buffer
       (call-process "ssh" nil t nil
 		    "stratocaster" "userv" "odin" "mail" "list")
@@ -123,9 +106,23 @@
 		(tag (match-string 2)))
 	    (push `(to ,(format "%s@odin\\.gg" local-part)
 		       ,(format "crap.%s" tag))
-		  list)))
+		  splits)))
 	(forward-line)))
-    (nreverse list)))
+    (setq mdw-odin-splits (nreverse splits))))
+(mdw-update-odin-info)
+
+;; Mail sent to `mdw-nospam-THING' should appear to come from this address.
+(setq gnus-posting-styles
+      '(("^nnimap\\+distorted:crap\\."
+	 (address (let* ((mailbox (substring gnus-newsgroup-name
+					     (match-end 0)))
+			 (entry (assoc mailbox mdw-odin-sender-alist)))
+		    (concat "mdw-nospam-" mailbox "@distorted.org.uk"))))
+	("^nnimap\\+[^:]+-chiark:"
+	 ("X-mdw-Send-Mail" "chiark-smtp"))
+	("^nnimap\\+google:"
+	 (address "distorted.mdw@gmail.com")
+	 ("X-mdw-Send-Mail" "gmail-smtp"))))
 
 ;; The actual splitting rules.
 (setq nnmail-split-fancy
@@ -175,7 +172,7 @@
 	  (to "\\<mdw-nopspam-\\([^@]+\\)@" "crap.\\1" t)
 
 	  (to "\\(markw\\|mdw\\|mw\\)@odin\\.gg" "mail.misc")
-	  ,@(mdw-odin-splits)
+	  ,@mdw-odin-splits
 	  (to "\\([a-z0-9]+\\)@odin\\.gg" "crap.odin-misc")
 
 	  ;; Regular nags.
@@ -224,15 +221,26 @@
 		(nnimap-split-methods nnimap-split-fancy)
 		(nnimap-split-fancy ,nnmail-split-fancy)
 		(nnimap-unsplittable-articles (%Deleted)))
+	(nnimap "mdw-chiark"
+		(nnimap-address "imap.dovecot.chiark.greenend.org.uk")
+		(nnimap-stream starttls)
+		(nnimap-inbox ("INBOX" "to.split"))
+		(nnimap-split-methods nnimap-split-fancy)
+		(nnimap-split-fancy ,nnmail-split-fancy)
+		(nnimap-unsplittable-articles (%Deleted)))
 	(nnimap "mwooding-chiark"
 		(nnimap-address "imap.dovecot.chiark.greenend.org.uk")
 		(nnimap-stream starttls)
-		(nnimap-inbox "INBOX")
+		(nnimap-inbox ("INBOX" "to.split"))
+		(nnimap-split-methods nnimap-split-fancy)
+		(nnimap-split-fancy ,nnmail-split-fancy)
 		(nnimap-unsplittable-articles (%Deleted)))
 	(nnimap "google"
 		(nnimap-address "imap.gmail.com")
 		(nnimap-stream tls)
-		(nnimap-inbox "INBOX")
+		(nnimap-inbox ("INBOX" "to.split"))
+		(nnimap-split-methods nnimap-split-fancy)
+		(nnimap-split-fancy ,nnmail-split-fancy)
 		(nnimap-unsplittable-articles (%Deleted)))))
 
 ;; Send sent mail back to me.