From 46a28c0496d4d8422056011556bde12e759ff6d1 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 29 Aug 2017 21:14:31 +0200
Subject: Add riseup to email system

---
 emacs/.emacs.d/main.el     | 18 ++++++++++++------
 msmtp/.msmtprc             |  7 +++++++
 offlineimap/.offlineimaprc | 31 +++++++++++++++++++++++++++----
 3 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 17d38b1..e50fdad 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -1380,7 +1380,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,7 +1391,6 @@
         sendmail-program "msmtp"
 
         mu4e-maildir-shortcuts '(("/INBOX" . ?i))
-        ;; mu4e-get-mail-command "offlineimap -o"
         mu4e-contexts
         (list
          (make-mu4e-context
@@ -1399,14 +1399,20 @@
                         (when msg
                           (mu4e-message-contact-field-matches
                            msg :to "alan@alanpearce\..*")))
-          :vars '((user-mail-address . "alan@alanpearce.eu")))
+          :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 "Work"
+          :name "Riseup"
           :match-func (lambda (msg)
                         (when msg
                           (mu4e-message-contact-field-matches
-                           msg :to "alan.*@satoshipay.io")))
-          :vars '((user-mail-address . "alan@satoshipay.io"))))
+                           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)
diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc
index 9a3c193..6216e0b 100644
--- a/msmtp/.msmtprc
+++ b/msmtp/.msmtprc
@@ -22,5 +22,12 @@ account        riseup
 host           smtp.riseup.net
 from           alanpearce@riseup.net
 
+account        riseup
+host           mail.riseup.net
+from           alanpearce@riseup.net
+user           alanpearce
+port           465
+passwordeval   pass mail/riseup.net
+
 # Set a default account
 account default : personal
diff --git a/offlineimap/.offlineimaprc b/offlineimap/.offlineimaprc
index ea98729..1e15793 100644
--- a/offlineimap/.offlineimaprc
+++ b/offlineimap/.offlineimaprc
@@ -1,6 +1,6 @@
 [general]
 # List of accounts to be synced, separated by a comma.
-accounts = alanpearce.eu
+accounts = alanpearce.eu, riseup.net
 pythonfile = ~/.offlineimap.py
 
 [Account alanpearce.eu]
@@ -10,13 +10,13 @@ localrepository = alanpearce.eu-local
 remoterepository = alanpearce.eu-remote
 autorefresh = 20
 quick = 2
-postsynchook = mu index --maildir=%(personalmaildir)s --lazy-check --nocleanup --quiet
+postsynchook = mu index --muhome=~/.cache/mu/alanpearce.eu --maildir=%(alanpearcemaildir)s --lazy-check --nocleanup --quiet
  
 [Repository alanpearce.eu-local]
 # OfflineIMAP supports Maildir, GmailMaildir, and IMAP for local repositories.
 type = Maildir
 # Where should the mail be placed?
-localfolders = %(personalmaildir)s
+localfolders = %(alanpearcemaildir)s
 
 [Repository alanpearce.eu-remote]
 # Remote repos can be IMAP or Gmail, the latter being a preconfigured IMAP.
@@ -30,5 +30,28 @@ holdconnectionopen = yes
 usecompression = yes
 idlefolders = ['INBOX']
 
+[Account riseup.net]
+localrepository = riseup.net-local
+remoterepository = riseup.net-remote
+autorefresh = 20
+quick = 2
+postsynchook = mu index --muhome=~/.cache/mu/riseup.net --maildir=%(riseupmaildir)s --lazy-check --nocleanup --quiet
+
+[Repository riseup.net-local]
+type = Maildir
+localfolders = %(riseupmaildir)s
+
+[Repository riseup.net-remote]
+type = IMAP
+remotehost = mail.riseup.net
+remoteuser = alanpearce
+remotepasseval = get_pass("mail/riseup.net")
+sslcacertfile = /etc/ssl/certs/ca-certificates.crt
+keepalive = 1740
+holdconnectionopen = yes
+usecompression = yes
+idlefolders = ['INBOX']
+
 [DEFAULT]
-personalmaildir = ~/mail/alanpearce
+alanpearcemaildir = ~/mail/personal/alanpearce
+riseupmaildir = ~/mail/personal/riseup
-- 
cgit 1.4.1