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

diff --git a/emacs/.emacs b/emacs/.emacs
index b731c30..c3eec87 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -22,7 +22,7 @@
     ("#CC9393" "#DFAF8F" "#F0DFAF" "#7F9F7F" "#BFEBBF" "#93E0E3" "#94BFF3" "#DC8CC3")))
  '(package-selected-packages
    (quote
-    (wanderlust evil-magit evil-leader evil-org molokai-theme org-evil flycheck-mypy jinja2 jinja2-mode highlight-indent-guides projectile helm-projectile zenburn-theme helm helm-config use-package flycheck company-jedi company org evil)))
+    (yaml-mode minimap js2-mode editorconfig wanderlust evil-magit evil-leader evil-org molokai-theme org-evil flycheck-mypy jinja2 jinja2-mode highlight-indent-guides projectile helm-projectile zenburn-theme helm helm-config use-package flycheck company-jedi company org evil)))
  '(pdf-view-midnight-colors (quote ("#DCDCCC" . "#383838")))
  '(vc-annotate-background "#2B2B2B")
  '(vc-annotate-color-map
@@ -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))
 
@@ -114,8 +116,19 @@
 (use-package evil-magit
   :ensure t)
 
+(use-package editorconfig
+  :ensure t
+  :init
+  (add-hook 'prog-mode-hook (editorconfig-mode 1))
+  (add-hook 'text-mode-hook (editorconfig-mode 1)))
+
+(use-package js2-mode
+  :ensure t
+  :config
+  (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
+  (setq js2-strict-missing-semi-warning nil))
 
-(use-package wanderlust
+(use-package yaml-mode
   :ensure t)
 
 (use-package mu4e
@@ -127,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"
@@ -137,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")
@@ -151,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")
@@ -165,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")
@@ -175,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)