Merge branch 'master' into beryllium

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

diff --git a/emacs/.emacs b/emacs/.emacs
index c1f6a1b9c4d7f7e6e49a19a26f96dec6802e78ce..1bf96c906fd74f0c4cc3cf50cc6b4f4ffe5aaecf 100644 (file)
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -16,7 +16,7 @@
     ("4e753673a37c71b07e3026be75dc6af3efbac5ce335f3707b7d6a110ecb636a3" "b571f92c9bfaf4a28cb64ae4b4cdbda95241cd62cf07d942be44dc8f46c491f4" default)))
  '(package-selected-packages
    (quote
-    (zenburn-theme helm helm-config use-package flycheck company-jedi company org evil))))
+    (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.
@@ -41,6 +41,15 @@
   (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))
 
 (add-hook 'after-init-hook 'global-company-mode)