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

diff --combined emacs/.emacs
index b731c30f1a3def467a7d93bdb0186ae5794280e1,7fd25c7b088c0a82b3783b56e1027efc09340c8c..ae2f6547407915e0426adb90c4e6fea587099265
--- 1/emacs/.emacs
--- 2/emacs/.emacs
+++ b/emacs/.emacs
@@@ -22,7 -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
@@@ -114,72 -114,28 +114,87 @@@
  (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 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
 +                            :to "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
 +                           :to "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
 +                           :to "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)