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

[max/dotfiles.git] / emacs / .emacs

diff --git a/emacs/.emacs b/emacs/.emacs
index b731c30f1a3def467a7d93bdb0186ae5794280e1..9f438857aa551c3c1dda6194231676563a2afa5e 100644 (file)
--- 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
@@ -137,8 +150,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 +165,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 +180,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")