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

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

diff --git a/emacs/.emacs b/emacs/.emacs
index e6bc5f6d36b77291b3bdd3523939013b78f2dc27..7fd25c7b088c0a82b3783b56e1027efc09340c8c 100644 (file)
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -22,7 +22,7 @@
     ("#CC9393" "#DFAF8F" "#F0DFAF" "#7F9F7F" "#BFEBBF" "#93E0E3" "#94BFF3" "#DC8CC3")))
  '(package-selected-packages
    (quote
-    (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)))
+    (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
@@ -94,7 +94,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
@@ -131,6 +131,11 @@
 
 
 (add-hook 'after-init-hook 'global-company-mode)
+(use-package wanderlust
+  :ensure t)
+
+
+
 
 (add-hook 'prog-mode-hook 'electric-pair-mode)