Merge branch 'master' into beryllium

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

diff --git a/emacs/.emacs b/emacs/.emacs
index da4d39a6796171328c2ee3aa93ec4095773cdf29..1caf61ef1588c07928a41c8f59f6944ab747e652 100644 (file)
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -6,7 +6,17 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(package-selected-packages (quote (org evil))))
+ '(ansi-color-faces-vector
+   [default default default italic underline success warning error])
+ '(auto-save-file-name-transforms (quote ((".*" "~/.emacs.d/autosaves/\\1" t))))
+ '(backup-directory-alist (quote ((".*" . "~/.emacs.d/backups/"))))
+ '(custom-enabled-themes (quote (zenburn)))
+ '(custom-safe-themes
+   (quote
+    ("4e753673a37c71b07e3026be75dc6af3efbac5ce335f3707b7d6a110ecb636a3" "b571f92c9bfaf4a28cb64ae4b4cdbda95241cd62cf07d942be44dc8f46c491f4" default)))
+ '(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))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -14,8 +24,49 @@
  ;; If there is more than one, they won't work right.
  )
 
-(require 'evil)
-(evil-mode 1)
+;; Create autosave dir
+(make-directory "~/.emacs.d/autosaves/" t)
 
+(use-package evil
+  :ensure t
+  :config (evil-mode 1))
 
-(load-theme 'molokai t)
+(use-package flycheck
+  :ensure t
+  :init (global-flycheck-mode))
+
+(use-package helm-config
+  :ensure helm
+  :config
+  (helm-mode 1)
+  (global-set-key (kbd "M-x") 'helm-M-x))
+
+(use-package projectile
+  :ensure t)
+
+(use-package helm-projectile
+  :ensure t
+  :config
+  (projectile-global-mode)
+  (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-indend-guides-character ?\|)
+  (set-face-foreground 'highlight-indent-guides-character-face "darkgray"))
+
+(use-package jinja2-mode
+  :ensure t)
+
+
+
+(add-hook 'after-init-hook 'global-company-mode)
+
+(add-hook 'prog-mode-hook 'electric-pair-mode)
+
+(eval-after-load 'company
+  '(add-to-list 'company-backends 'company-jedi))