From: Maximilian Friedersdorff Date: Wed, 26 Oct 2016 15:38:19 +0000 (+0100) Subject: Additional improvements to .emacs X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=27e23fcde870116ad04b3fbe5e0fc4a18b37f704;p=max%2Fdotfiles.git Additional improvements to .emacs --- diff --git a/emacs/.emacs b/emacs/.emacs index 1caf61e..1d258be 100644 --- a/emacs/.emacs +++ b/emacs/.emacs @@ -8,15 +8,44 @@ ;; If there is more than one, they won't work right. '(ansi-color-faces-vector [default default default italic underline success warning error]) + '(ansi-color-names-vector + ["#212526" "#ff4b4b" "#b4fa70" "#fce94f" "#729fcf" "#e090d7" "#8cc4ff" "#eeeeec"]) '(auto-save-file-name-transforms (quote ((".*" "~/.emacs.d/autosaves/\\1" t)))) '(backup-directory-alist (quote ((".*" . "~/.emacs.d/backups/")))) - '(custom-enabled-themes (quote (zenburn))) + '(custom-enabled-themes (quote (molokai))) '(custom-safe-themes (quote ("4e753673a37c71b07e3026be75dc6af3efbac5ce335f3707b7d6a110ecb636a3" "b571f92c9bfaf4a28cb64ae4b4cdbda95241cd62cf07d942be44dc8f46c491f4" default))) + '(fci-rule-color "#383838") + '(nrepl-message-colors + (quote + ("#CC9393" "#DFAF8F" "#F0DFAF" "#7F9F7F" "#BFEBBF" "#93E0E3" "#94BFF3" "#DC8CC3"))) '(package-selected-packages (quote - (jinja2 jinja2-mode highlight-indent-guides projectile helm-projectile zenburn-theme helm helm-config use-package flycheck company-jedi company org evil)))) + (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 + (quote + ((20 . "#BC8383") + (40 . "#CC9393") + (60 . "#DFAF8F") + (80 . "#D0BF8F") + (100 . "#E0CF9F") + (120 . "#F0DFAF") + (140 . "#5F7F5F") + (160 . "#7F9F7F") + (180 . "#8FB28F") + (200 . "#9FC59F") + (220 . "#AFD8AF") + (240 . "#BFEBBF") + (260 . "#93E0E3") + (280 . "#6CA0A3") + (300 . "#7CB8BB") + (320 . "#8CD0D3") + (340 . "#94BFF3") + (360 . "#DC8CC3"))) t) + '(vc-annotate-very-old-color "#DC8CC3")) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -31,10 +60,19 @@ :ensure t :config (evil-mode 1)) +(use-package org + :ensure t) + +(use-package org-evil + :ensure t) + (use-package flycheck :ensure t :init (global-flycheck-mode)) +(use-package flycheck-mypy + :ensure t) + (use-package helm-config :ensure helm :config @@ -62,6 +100,19 @@ (use-package jinja2-mode :ensure t) +(use-package whitespace + :config + (setq whitespace-style '(face lines)) + (setq whitespace-line-column 80) + (global-whitespace-mode +1)) + +(use-package magit + :ensure t + :config + (global-set-key (kbd "C-x g") 'magit-status)) + +(use-package evil-magit + :ensure t) (add-hook 'after-init-hook 'global-company-mode)