X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=emacs%2F.emacs;h=857b765ac124dda401eb3b26b3901df7dd6dfe82;hb=7a392baab639d1f571a6a4784fef8e45e41eddc0;hp=9628a42e56d4231027151aa20a29fd33b3a36bdd;hpb=6fe8ab703b538aa770d8b121c54b49c44e035b18;p=max%2Fdotfiles.git diff --git a/emacs/.emacs b/emacs/.emacs index 9628a42..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 - (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)) @@ -131,95 +131,23 @@ (use-package yaml-mode :ensure t) -(use-package mu4e +(use-package jl-encrypt) + +(use-package smart-mode-line + :ensure t + :config + (sml/setup)) + +(use-package smart-tabs-mode + :ensure t :config - (setq - mu4e-maildir "~/mail" - mu4e-get-mail-command - (concat "/usr/bin/mbsync -c /home/max/.mbsync/personal.mbsync -a &&" - "/usr/bin/mbsync -c /home/max/.mbsync/personal-gmail.mbsync -a &&" - "/usr/bin/mbsync -c /home/max/.mbsync/aber.mbsync -a") - mu4e-update-interval 60) - ; Force mu4e to rename file on moving - (setq mu4e-change-filenames-when-moving t) - (setq - 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" - :enter-func (lambda () (mu4e-message "Switch to Peronal context")) - :match-func (lambda (msg) - (when msg - (mu4e-message-contact-field-matches - msg (list :to :cc :bcc) - "max\\+?.*@frie\\(dersdorff\\)?.com"))) - :vars '((user-mail-address . "max@friedersdorff.com") - (user-full-name . "Maximilian Friedersdorff") - (mu4e-sent-folder . "/personal/Sent") - (mu4e-trash-folder . "/personal/Trash") - (smtpmail-smtp-server . "mail.friedersdorff.com") - (smtpmail-smtp-service . 587))), - (make-mu4e-context - :name "Gmail" - :enter-func (lambda () (mu4e-message "Switch to Gmail context")) - :match-func (lambda (msg) - (when msg - (mu4e-message-contact-field-matches - msg (list :to :cc :bcc) - "maxf130\\+?.*@gmail.com"))) - :vars '((user-mail-address . "maxf130@gmail.com") - (user-full-name . "Maximilian Friedersdorff") - (mu4e-sent-folder . "/personal-gmail/Sent") - (mu4e-sent-messages-behaviour . 'delete) - (smtpmail-smtp-server . "smtp.gmail.com") - (smtpmail-smtp-service . 587))), - (make-mu4e-context - :name "Aber" - :enter-func (lambda () (mu4e-message "Switch to Aber context")) - :match-func (lambda (msg) - (when msg - (mu4e-message-contact-field-matches - msg (list :to :cc :bcc) - ".*@aber.ac.uk"))) - :vars '((user-mail-address . "maf54@aber.ac.uk") - (user-full-name . "Maximilian Friedersdorff") - (mu4e-sent-folder . "/aber/Sent") - (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") - (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) - )) - -(use-package mu4e-alert + (smart-tabs-insinuate 'c)) + +(use-package fill-column-indicator :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 'notifications) - (add-hook 'after-init-hook #'mu4e-alert-enable-notifications)) + (setq fci-rule-column 80) + (add-hook 'after-change-major-mode-hook 'fci-mode)) ;;;(global-company-mode)