X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/9906310798d936a6cacd0ec5a2d3b607e911c423..01ad59de5f6d5c9b2a81ffede8a00e4919e38f3d:/dot/vm

diff --git a/dot/vm b/dot/vm
index 3a1d494..846cf3e 100644
--- a/dot/vm
+++ b/dot/vm
@@ -2,6 +2,8 @@
 ;;;
 ;;; Configuration for VM
 
+(require 'auth-source)
+
 (setq vm-reply-subject-prefix "Re: "
       vm-included-text-prefix "> "
       vm-included-text-attribution-format "%F <%f> wrote:\n\n"
@@ -12,50 +14,66 @@
       vm-preview-lines nil
       vm-highlighted-header-regexp "^From\\|^Subject"
       vm-movemail-program "movemail-hack"
+      vm-mail-header-from (format "Mark Wooding <%s>"
+				  (or (mdw-config 'email)
+				      "mdw@distorted.org.uk"))
       vm-delete-after-saving t
       vm-move-after-deleting t
-      vm-delete-empty-folders)
+      vm-delete-empty-folders nil
+      vm-summary-format "%*%a [%-16.16F]:  %I%s\n")
+
+(setq-default vm-summary-show-threads t)
+
+(setq auth-sources '("~/.authinfo.gpg")
+      vm-imap-max-message-size 0
+      vm-imap-refer-to-inbox-by-account-name t
+      vm-imap-save-to-server t
+      vm-imap-account-alist
+      '(("imap-ssl:mail.distorted.org.uk:993:*:login:mdw:*"
+	 "distorted")
+	("imap-ssl:mail.distorted.org.uk:993:*:login:markw:*"
+	 "markw-distorted")
+	("imap-ssl:imap.dovecot.chiark.greenend.org.uk:993:*:login:mdw:*"
+	 "mdw-chiark")
+	("imap-ssl:imap.dovecot.chiark.greenend.org.uk:993:*:login:mwooding:*"
+	 "mwooding-chiark")
+	("imap-ssl:imap.gmail.com:993:*:login:distorted.mdw@gmail.com:*"
+	 "google")))
 
 (and (eq (terminal-coding-system) 'utf-8)
      (add-to-list 'vm-mime-default-face-charsets "utf-8"))
 
-(setq vm-mime-qp-encoder-program "mimencode"
-      vm-mime-qp-encoder-switches '("-q")
-      vm-mime-qp-decoder-program "mimencode"
-      vm-mime-qp-decoder-switches '("-q" "-u")
-      vm-mime-base64-encoder-program "mimencode"
-      vm-mime-base64-encoder-switches '("-b")
-      vm-mime-base64-decoder-program "mimencode"
-      vm-mime-base64-decoder-switches '("-b" "-u"))
+(setq vm-mime-qp-encoder-program nil
+      vm-mime-qp-decoder-program nil
+      vm-mime-base64-encoder-program nil
+      vm-mime-base64-decoder-program nil)
 
 (setq vm-visible-headers '("resent-from:" "from:" "reply-to:" "sender:"
 			   "to:" "apparently-to:" "cc:"
 			   "subject:" "date:"
 			   "delivered-to:" "return-path:"))
 
-(setq vm-reply-ignored-addresses '("mdw@excessus\\.demon\\.co\\.uk"
-				   "mdw@nsict\\.org" "mdw@eh\\.org"
-				   "mdw@ncipher\\.com"
-				   "mwooding@ncipher\\.com"
-				   "submit@bugs\\.ncipher\\.com"
-				   "mdw@chiark\\.greenend\\.org\\.uk"
-				   "mdw@distorted\\.org\\.uk"
-				   "mdw@metalzone\\.distorted\\.org\\.uk"
-				   "tux@nsict\\.org"))
+(setq vm-reply-ignored-addresses
+      (let ((pat bbdb-user-mail-names))
+	(if (string-prefix-p "^" pat)
+	    (setq pat (substring pat 1)))
+	(if (string-suffix-p "$" pat)
+	    (setq pat (substring pat 0 (1- (length pat)))))
+	(cons (concat "\\<" pat "\\>") nil)))
 
 (defvar mdw-mailing-lists
   '("hibachi-dealers-members@chiark\\.greenend\\.org\\.uk"))
 
 (setq vm-mime-external-content-types-alist
-      '(("image/jpeg" "display")
-	("image/jpg" "display")
-	("image/gif" "display")
-	("image/bmp" "display")
-	("image/tiff" "display")
-	("application/postscript" "evince")
-	("application/pdf" "evince")))
-
-(setq vm-url-browser "firefox")
+      '(("image/jpeg" "xdg-open")
+	("image/jpg" "xdg-open")
+	("image/gif" "xdg-open")
+	("image/bmp" "xdg-open")
+	("image/tiff" "xdg-open")
+	("application/postscript" "xdg-open")
+	("application/pdf" "xdg-open")))
+
+(setq vm-url-browser "sensible-browser")
 
 (setq vm-frame-parameter-alist
       '((folder ((width . 81) (height . 33)))