X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=emacs%2F.emacs;h=a0b34a043c470b37b3d202970f16b259a7f1c3ba;hb=791dddd6094eb7d4ec4266c7ac7840c050dbdcfd;hp=7be520645d73dd2303e9708d081d37e967ec66a9;hpb=a1fd5c5b855d191ff70fd747115e9531d579fc3f;p=max%2Fdotfiles.git

diff --git a/emacs/.emacs b/emacs/.emacs
index 7be5206..a0b34a0 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -22,7 +22,7 @@
     ("#CC9393" "#DFAF8F" "#F0DFAF" "#7F9F7F" "#BFEBBF" "#93E0E3" "#94BFF3" "#DC8CC3")))
  '(package-selected-packages
    (quote
-    (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)))
+    (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
@@ -91,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-indent-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))
 
@@ -203,7 +203,13 @@
 		  "maildir:/personal-gmail/Inbox OR "
 		  "maildir:/aber/Inbox "
 		  ")") "Unread Interesting Messages" ?i)
-	       ))
+	       )
+  (setq mu4e-view-show-images t)
+  (setq mu4e-compose-crypto-reply-policy 'sign-and-encrypt)
+  (setq mml-secure-openpgp-sign-with-sender t)
+  (setq mml-default-encrypt-method "pgpmime")
+  (add-hook 'mu4e-compose-mode-hook 'mml-secure-message-sign)
+  )
 
 (use-package mu4e-alert
   :ensure t
@@ -221,11 +227,23 @@
   (mu4e-alert-set-default-style 'libnotify)
   (add-hook 'after-init-hook #'mu4e-alert-enable-notifications))
 
+(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)