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

diff --git a/emacs/.authinfo.gpg b/emacs/.authinfo.gpg
new file mode 100644 (file)
index 0000000..da2b741
Binary files /dev/null and b/emacs/.authinfo.gpg differ

diff --git a/emacs/.emacs b/emacs/.emacs
index 96989811fc8eabea86895ebaf392a3e56e2c9815..9f438857aa551c3c1dda6194231676563a2afa5e 100644 (file)
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -131,13 +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)
 

diff --git a/offline_mail/.mbsync/aber.mbsync b/offline_mail/.mbsync/aber.mbsync
index 00d2ace5ca7357a1ff28c8749191c4867a443c1c..5c62c22a1abdfd3d0133ea0c8c337dcbc5d9978f 100644 (file)
--- a/offline_mail/.mbsync/aber.mbsync
+++ b/offline_mail/.mbsync/aber.mbsync
@@ -1,7 +1,7 @@
 IMAPAccount aber
 Host outlook.office365.com 
 User maf54@aber.ac.uk 
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.mail_pass/aber.gpg"
+PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.mail_pass/aber.gpg"
 SSLType STARTTLS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 

diff --git a/offline_mail/.mbsync/personal-gmail.mbsync b/offline_mail/.mbsync/personal-gmail.mbsync
index 63cb2814f12ed7beb0b84d3ea00c9b4a84c8b89c..abc355eb487dfee001d12544cc4f46b343360fa5 100644 (file)
--- a/offline_mail/.mbsync/personal-gmail.mbsync
+++ b/offline_mail/.mbsync/personal-gmail.mbsync
@@ -1,7 +1,7 @@
 IMAPAccount gmail
 Host imap.gmail.com
 User maxf130@gmail.com
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.mail_pass/personal-gmail.gpg"
+PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.mail_pass/personal-gmail.gpg"
 SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 

diff --git a/offline_mail/.mbsync/personal.mbsync b/offline_mail/.mbsync/personal.mbsync
index a6d7e20c070f9b0b51332f6dc9fc04989c372871..e2e64724cebf49112276dda33560275873f44449 100644 (file)
--- a/offline_mail/.mbsync/personal.mbsync
+++ b/offline_mail/.mbsync/personal.mbsync
@@ -1,7 +1,7 @@
 IMAPAccount personal
 Host mail.friedersdorff.com
 User max
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.mail_pass/personal.gpg"
+PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.mail_pass/personal.gpg"
 SSLType STARTTLS
 CertificateFile /etc/ssl/certs/ca-certificates.crt