X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=emacs%2F.emacs;h=c3eec872df8d8cf2a695cde76a011aaef7ac7474;hb=e303ff886611ec4c2e780194076536b0ec2cfc1b;hp=ae2f6547407915e0426adb90c4e6fea587099265;hpb=e6e8c107e8df472980cbeb7da025e6b70732c9fa;p=max%2Fdotfiles.git

diff --git a/emacs/.emacs b/emacs/.emacs
index ae2f654..c3eec87 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -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))
 
@@ -129,10 +131,6 @@
 (use-package yaml-mode
   :ensure t)
 
-
-(use-package wanderlust
-  :ensure t)
-
 (use-package mu4e
   :config
   (setq
@@ -142,6 +140,8 @@
 	   "/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)
+  ; Force mu4e to rename file on moving
+  (setq mu4e-change-filenames-when-moving t)
   (setq
    message-send-mail-function 'smtpmail-send-it
    smtpmail-default-smtp-server "mail.friedersdorff.com"
@@ -152,8 +152,9 @@
 	      :enter-func (lambda () (mu4e-message "Switch to Peronal context"))
 	      :match-func (lambda (msg)
 			    (when msg
-			      mu4e-message-contact-field-matches msg
-			      :to "max\+?.*@frie(dersdorff)?.com"))
+			      (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")
@@ -166,8 +167,9 @@
 	     :enter-func (lambda () (mu4e-message "Switch to Gmail context"))
 	     :match-func (lambda (msg)
 			   (when msg
-			     mu4e-message-contact-field-matches msg
-			     :to "maxf130\+?.*@gmail.com"))
+			     (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")
@@ -180,8 +182,9 @@
 	     :enter-func (lambda () (mu4e-message "Switch to Aber context"))
 	     :match-func (lambda (msg)
 			   (when msg
-			     mu4e-message-contact-field-matches msg
-			     :to "maf54\+?.*@aber.ac.uk"))
+			     (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")
@@ -190,7 +193,8 @@
 		     (smtpmail-smtp-server . "smtp.office365.com")
 		     (smtpmail-smtp-service . 587))))
 
-	mu4e-context-policy 'pick-first))
+	mu4e-context-policy 'pick-first)
+  (setq mu4e-html2text-command "lynx -stdin -dump -force_html"))
 
 
 ;;;(global-company-mode)