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

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

diff --git a/emacs/.emacs b/emacs/.emacs
index c3eec872df8d8cf2a695cde76a011aaef7ac7474..a9e7eab1159ef143015d3f4050d67a77c34ffcc4 100644 (file)
--- 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
-    (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)))
+    (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
@@ -146,6 +146,7 @@
    message-send-mail-function 'smtpmail-send-it
    smtpmail-default-smtp-server "mail.friedersdorff.com"
    smtpmail-auth-credentials (expand-file-name "~/.authinfo.gpg"))
+  (setq mu4e-drafts-folder "/Drafts")
   (setq mu4e-contexts
        `( , (make-mu4e-context
              :name "Personal"
@@ -158,7 +159,6 @@
              :vars '((user-mail-address . "max@friedersdorff.com")
                      (user-full-name . "Maximilian Friedersdorff")
                      (mu4e-sent-folder . "/personal/Sent")
-                     (mu4e-drafts-folder . "/personal/Drafts")
                      (mu4e-trash-folder . "/personal/Trash")
                      (smtpmail-smtp-server . "mail.friedersdorff.com")
                      (smtpmail-smtp-service . 587))),
@@ -174,7 +174,6 @@
                     (user-full-name . "Maximilian Friedersdorff")
                     (mu4e-sent-folder . "/personal-gmail/Sent")
                     (mu4e-sent-messages-behaviour . 'delete)
-                    (mu4e-drafts-folder . "/personal-gmail/Drafts")
                     (smtpmail-smtp-server . "smtp.gmail.com")
                     (smtpmail-smtp-service . 587))),
            (make-mu4e-context
@@ -184,17 +183,56 @@
                           (when msg
                             (mu4e-message-contact-field-matches
                              msg (list :to :cc :bcc)
-                             "maf54\\+?.*@aber.ac.uk")))
+                             ".*@aber.ac.uk")))
             :vars '((user-mail-address . "maf54@aber.ac.uk")
                     (user-full-name . "Maximilian Friedersdorff")
                     (mu4e-sent-folder . "/aber/Sent")
-                    (mu4e-drafts-folder . "/aber/Drafts")
                     (mu4e-trash-folder . "/aber/Trash")
                     (smtpmail-smtp-server . "smtp.office365.com")
                     (smtpmail-smtp-service . 587))))
 
        mu4e-context-policy 'pick-first)
-  (setq mu4e-html2text-command "lynx -stdin -dump -force_html"))
+  (setq mu4e-html2text-command "lynx -stdin -dump -force_html")
+  (add-to-list 'mu4e-bookmarks
+              '((concatenate
+                 'string
+                 "flag:unread "
+                 "AND ( "
+                 "maildir:/personal/Inbox OR "
+                 "maildir:/personal/slackware OR "
+                 "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
+  :config
+  (setq mu4e-alert-interesting-mail-query
+       (concatenate
+        'string
+        "flag:unread "
+        "AND ( "
+        "maildir:/personal/Inbox OR "
+        "maildir:/personal/slackware OR "
+        "maildir:/personal-gmail/Inbox OR "
+        "maildir:/aber/Inbox "
+        ")"))
+  (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))
 
 
 ;;;(global-company-mode)