Merge branch 'master' of git.friedersdorff.com:max/dotfiles

diff --combined emacs/.emacs
index 96989811fc8eabea86895ebaf392a3e56e2c9815,b42e49ac4e1f131236309459f96a2cbf4cee90fe..9f438857aa551c3c1dda6194231676563a2afa5e
--- 1/emacs/.emacs
--- 2/emacs/.emacs
+++ b/emacs/.emacs
@@@ -57,8 -57,6 +57,8 @@@
  (make-directory "~/.emacs.d/autosaves/" t)
  
  (use-package evil
 +  :init
 +  (setq evil-want-C-i-jump nil)
    :ensure t
    :config (evil-mode 1))
  
@@@ -131,13 -129,71 +131,71 @@@
  (use-package yaml-mode
    :ensure t)
  
- 
- (add-hook 'after-init-hook 'global-company-mode)
- (use-package wanderlust
-   :ensure t)
- 
- 
- 
+ (use-package mu4e
+   :config
+   (setq
+    mu4e-maildir "~/mail"
+    mu4e-get-mail-command
+    (concat "/usr/bin/mbsync -c /home/max/.mbsync/personal.mbsync -a &&"
+          "/usr/bin/mbsync -c /home/max/.mbsync/personal-gmail.mbsync -a &&"
+          "/usr/bin/mbsync -c /home/max/.mbsync/aber.mbsync -a")
+    mu4e-update-interval 60)
+   (setq
+    message-send-mail-function 'smtpmail-send-it
+    smtpmail-default-smtp-server "mail.friedersdorff.com"
+    smtpmail-auth-credentials (expand-file-name "~/.authinfo.gpg"))
+   (setq mu4e-contexts
+       `( , (make-mu4e-context
+             :name "Personal"
+             :enter-func (lambda () (mu4e-message "Switch to Peronal context"))
+             :match-func (lambda (msg)
+                           (when msg
+                             (mu4e-message-contact-field-matches
+                              msg (list :to :cc :bcc)
+                              "max\\+?.*@frie\\(dersdorff\\)?.com")))
+             :vars '((user-mail-address . "max@friedersdorff.com")
+                     (user-full-name . "Maximilian Friedersdorff")
+                     (mu4e-sent-folder . "/personal/Sent")
+                     (mu4e-drafts-folder . "/personal/Drafts")
+                     (mu4e-trash-folder . "/personal/Trash")
+                     (smtpmail-smtp-server . "mail.friedersdorff.com")
+                     (smtpmail-smtp-service . 587))),
+           (make-mu4e-context
+            :name "Gmail"
+            :enter-func (lambda () (mu4e-message "Switch to Gmail context"))
+            :match-func (lambda (msg)
+                          (when msg
+                            (mu4e-message-contact-field-matches
+                             msg (list :to :cc :bcc)
+                             "maxf130\\+?.*@gmail.com")))
+            :vars '((user-mail-address . "maxf130@gmail.com")
+                    (user-full-name . "Maximilian Friedersdorff")
+                    (mu4e-sent-folder . "/personal-gmail/Sent")
+                    (mu4e-sent-messages-behaviour . 'delete)
+                    (mu4e-drafts-folder . "/personal-gmail/Drafts")
+                    (smtpmail-smtp-server . "smtp.gmail.com")
+                    (smtpmail-smtp-service . 587))),
+           (make-mu4e-context
+            :name "Aber"
+            :enter-func (lambda () (mu4e-message "Switch to Aber context"))
+            :match-func (lambda (msg)
+                          (when msg
+                            (mu4e-message-contact-field-matches
+                             msg (list :to :cc :bcc)
+                             "maf54\\+?.*@aber.ac.uk")))
+            :vars '((user-mail-address . "maf54@aber.ac.uk")
+                    (user-full-name . "Maximilian Friedersdorff")
+                    (mu4e-sent-folder . "/aber/Sent")
+                    (mu4e-drafts-folder . "/aber/Drafts")
+                    (mu4e-trash-folder . "/aber/Trash")
+                    (smtpmail-smtp-server . "smtp.office365.com")
+                    (smtpmail-smtp-service . 587))))
+ 
+       mu4e-context-policy 'pick-first))
+ 
+ 
+ ;;;(global-company-mode)
+ ;;;(add-hook 'after-init-hook 'global-company-mode)
  
  (add-hook 'prog-mode-hook 'electric-pair-mode)