summary refs log tree commit diff stats
path: root/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/main.el60
1 files changed, 33 insertions, 27 deletions
diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 69f584ec..e79c6055 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -1381,7 +1381,8 @@
           mu4e-view-show-images t
           mu4e-headers-date-format "%Y-%m-%d %H:%M"
 
-          mu4e-maildir (expand-file-name "~/mail/alanpearce")
+          mu4e-mu-home (expand-file-name "~/.cache/mu/alanpearce.eu")
+          mu4e-maildir (expand-file-name "~/mail/personal/alanpearce/")
           mu4e-sent-folder "/Sent"
           mu4e-drafts-folder "/Drafts"
           mu4e-refile-folder "/Archive"
@@ -1390,32 +1391,37 @@
           message-send-mail-function #'message-send-mail-with-sendmail
           sendmail-program "msmtp"
 
-          mu4e-maildir-shortcuts '(("/INBOX" . ?i))
-          ;; mu4e-get-mail-command "offlineimap -o"
-          mu4e-contexts
-          (list
-           (make-mu4e-context
-            :name "Personal"
-            :match-func (lambda (msg)
-                          (when msg
-                            (mu4e-message-contact-field-matches
-                             msg :to "alan@alanpearce\..*")))
-            :vars '((user-mail-address . "alan@alanpearce.eu")))
-           (make-mu4e-context
-            :name "Work"
-            :match-func (lambda (msg)
-                          (when msg
-                            (mu4e-message-contact-field-matches
-                             msg :to "alan.*@satoshipay.io")))
-            :vars '((user-mail-address . "alan@satoshipay.io"))))
-          mu4e-user-mail-address-list (append
-                                       (delq nil
-                                             (mapcar (lambda (context)
-                                                       (when (mu4e-context-vars context)
-                                                         (cdr (assq 'user-mail-address (mu4e-context-vars context)))))
-                                                     mu4e-contexts))
-                                       '("alan@alanpearce.uk"
-                                         "alan@alanpearce.co.uk")))))
+        mu4e-maildir-shortcuts '(("/INBOX" . ?i))
+        mu4e-contexts
+        (list
+         (make-mu4e-context
+          :name "Personal"
+          :match-func (lambda (msg)
+                        (when msg
+                          (mu4e-message-contact-field-matches
+                           msg :to "alan@alanpearce\..*")))
+          :vars `((user-mail-address . "alan@alanpearce.eu")
+                  (mu4e-maildir . ,(expand-file-name "~/mail/personal/alanpearce"))
+                  (mu4e-mu-home . ,(expand-file-name "~/.cache/mu/alanpearce.eu"))
+                  (mu4e-sent-messages-behavior . sent)))
+         (make-mu4e-context
+          :name "Riseup"
+          :match-func (lambda (msg)
+                        (when msg
+                          (mu4e-message-contact-field-matches
+                           msg :to "alanpearce@riseup.net")))
+          :vars `((user-mail-address . "alanpearce@riseup.net")
+                  (mu4e-maildir . ,(expand-file-name "~/mail/personal/riseup"))
+                  (mu4e-mu-home . ,(expand-file-name "~/.cache/mu/riseup.net"))
+                  (mu4e-sent-messages-behavior . sent))))
+        mu4e-user-mail-address-list (append
+                                     (delq nil
+                                           (mapcar (lambda (context)
+                                                     (when (mu4e-context-vars context)
+                                                       (cdr (assq 'user-mail-address (mu4e-context-vars context)))))
+                                                   mu4e-contexts))
+                                     '("alan@alanpearce.uk"
+                                       "alan@alanpearce.co.uk"))))
 ;; #+END_SRC
 
 ;; *** BBDB