X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=emacs%2F.emacs;h=857b765ac124dda401eb3b26b3901df7dd6dfe82;hb=7a392baab639d1f571a6a4784fef8e45e41eddc0;hp=d296bbe52c7f2a6dc740b4f85c635dc57697a65a;hpb=ec5f0c5e17cd4050bd1a3104e5ccca7f3258bc66;p=max%2Fdotfiles.git

diff --git a/emacs/.emacs b/emacs/.emacs
index d296bbe..857b765 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -15,14 +15,14 @@
  '(custom-enabled-themes (quote (molokai)))
  '(custom-safe-themes
    (quote
-    ("4e753673a37c71b07e3026be75dc6af3efbac5ce335f3707b7d6a110ecb636a3" "b571f92c9bfaf4a28cb64ae4b4cdbda95241cd62cf07d942be44dc8f46c491f4" default)))
+    ("3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "4e753673a37c71b07e3026be75dc6af3efbac5ce335f3707b7d6a110ecb636a3" "b571f92c9bfaf4a28cb64ae4b4cdbda95241cd62cf07d942be44dc8f46c491f4" default)))
  '(fci-rule-color "#383838")
  '(nrepl-message-colors
    (quote
     ("#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)))
+    (fill-column-indicator column-marker smart-tabs-mode smart-mode-line sml mu4e-alert 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))
 
@@ -89,20 +91,20 @@
   (setq projectile-completion-system 'helm)
   (helm-projectile-on))
 
-(use-package highlight-indent-guides
-  :ensure t
-  :config
-  (add-hook 'prog-mode-hook 'highlight-indent-guides-mode)
-  (setq highlight-indent-guides-method 'character)
-  (setq highlight-indend-guides-character ?\|)
-  (set-face-foreground 'highlight-indent-guides-character-face "darkgray"))
+;(use-package highlight-indent-guides
+;  :ensure t
+;  :config
+;  (add-hook 'prog-mode-hook 'highlight-indent-guides-mode)
+;  (setq highlight-indent-guides-method 'character)
+;  (setq highlight-indent-guides-character ?\|)
+;  (set-face-foreground 'highlight-indent-guides-character-face "darkgray"))
 
 (use-package jinja2-mode
   :ensure t)
 
 (use-package whitespace
   :config
-  (setq whitespace-style '(face lines))
+  (setq whitespace-style '(face tabs tab-mark))
   (setq whitespace-line-column 80)
   (global-whitespace-mode +1))
 
@@ -114,13 +116,42 @@
 (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))
 
-(add-hook 'after-init-hook 'global-company-mode)
-(use-package wanderlust
+(use-package yaml-mode
   :ensure t)
 
+(use-package jl-encrypt)
+
+(use-package smart-mode-line
+  :ensure t
+  :config
+  (sml/setup))
+
+(use-package smart-tabs-mode
+  :ensure t
+  :config
+  (smart-tabs-insinuate 'c))
+
+(use-package fill-column-indicator
+  :ensure t
+  :config
+  (setq fci-rule-column 80)
+  (add-hook 'after-change-major-mode-hook 'fci-mode))
 
 
+;;;(global-company-mode)
+;;;(add-hook 'after-init-hook 'global-company-mode)
 
 (add-hook 'prog-mode-hook 'electric-pair-mode)