X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=emacs%2F.emacs;h=96989811fc8eabea86895ebaf392a3e56e2c9815;hb=25d868d7872648a392ec13d5cc1a096db6b7f566;hp=1d258be21a7e9a60593bac23877ec6b259b24f38;hpb=27e23fcde870116ad04b3fbe5e0fc4a18b37f704;p=max%2Fdotfiles.git

diff --git a/emacs/.emacs b/emacs/.emacs
index 1d258be..9698981 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -22,7 +22,7 @@
     ("#CC9393" "#DFAF8F" "#F0DFAF" "#7F9F7F" "#BFEBBF" "#93E0E3" "#94BFF3" "#DC8CC3")))
  '(package-selected-packages
    (quote
-    (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))
 
@@ -94,7 +96,7 @@
   :config
   (add-hook 'prog-mode-hook 'highlight-indent-guides-mode)
   (setq highlight-indent-guides-method 'character)
-  (setq highlight-indend-guides-character ?\|)
+  (setq highlight-indent-guides-character ?\|)
   (set-face-foreground 'highlight-indent-guides-character-face "darkgray"))
 
 (use-package jinja2-mode
@@ -114,8 +116,28 @@
 (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)
+
+
+
 
 (add-hook 'prog-mode-hook 'electric-pair-mode)