X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=emacs%2F.emacs;h=857b765ac124dda401eb3b26b3901df7dd6dfe82;hb=7a392baab639d1f571a6a4784fef8e45e41eddc0;hp=a9e7eab1159ef143015d3f4050d67a77c34ffcc4;hpb=35cd25babbbbbc8c6d5d186b0aafdb05f10e2312;p=max%2Fdotfiles.git diff --git a/emacs/.emacs b/emacs/.emacs index a9e7eab..857b765 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)) @@ -131,102 +131,6 @@ (use-package yaml-mode :ensure t) -(use-package mu4e - :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) - ) - (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 @@ -234,6 +138,17 @@ :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)