X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=emacs%2F.emacs;h=e6bc5f6d36b77291b3bdd3523939013b78f2dc27;hb=4d9f38422bf0d994a6bda0b486c43c7e06a01296;hp=1d258be21a7e9a60593bac23877ec6b259b24f38;hpb=cbd9b2c8b6baeb1b31f1d0406e3353dfebd85baf;p=max%2Fdotfiles.git

diff --git a/emacs/.emacs b/emacs/.emacs
index 1d258be..e6bc5f6 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 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,6 +114,21 @@
 (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)