Cleanup helm settings

1 files changed, 23 insertions, 35 deletions

diff --git a/home/.emacs.d/config/navigation.el b/home/.emacs.d/config/navigation.el
index 7c9291a..8ef5f66 100644
--- a/home/.emacs.d/config/navigation.el
+++ b/home/.emacs.d/config/navigation.el
@@ -1,38 +1,21 @@
 (use-package helm
   :config
-  (use-package helm-descbinds
-    :bind      ("C-h b"   . helm-descbinds))
+  (progn
+    (setq helm-split-window-in-side-p t ; open helm buffer inside current windowA
+	  helm-candidate-number-limit 100
+	  helm-quick-update t
+	  helm-M-x-requires-pattern nil
+	  helm-M-x-fuzzy-match t
+	  helm-buffers-fuzzy-matching t
+	  helm-recentf-fuzzy-match t
+	  helm-ff-file-name-history-use-recentf t)
+    (message "Helm started"))
 
-  (use-package helm-projectile
-    :bind      ("C-c h" . helm-projectile))
-
-  (use-package helm-swoop
-    :bind      (("C-c o" . helm-swoop)
-		("C-c M-o" . helm-multi-swoop)))
-
-  (setq helm-candidate-number-limit 100
-	helm-idle-delay 0.0 ; update fast sources immediately (doesn't).
-	helm-input-idle-delay 0.01  ; this actually updates things reeeelatively quickly.
-	helm-yas-display-key-on-candidate t
-	helm-quick-update t
-	helm-M-x-requires-pattern nil
-	helm-ff-skip-boring-files t
-	helm-split-window-in-side-p t ; open helm buffer inside current window
-	helm-M-x-fuzzy-match t
-	helm-buffers-fuzzy-matching t
-	helm-recentf-fuzzy-match t
-	helm-ff-file-name-history-use-recentf t)
-
-  :bind (("C-c h" . helm-mini)
-	 ("C-h a" . helm-apropos)
+  :bind (("C-h a" . helm-apropos)
 	 ("C-x b" . helm-buffers-list)
 	 ("C-x C-f" . helm-find-files)
 	 ("M-y" . helm-show-kill-ring)
 	 ("M-x" . helm-M-x)
-	 ("C-x c o" . helm-occur)
-	 ("C-x c y" . helm-yas-complete)
-	 ("C-x c Y" . helm-yas-create-snippet-on-region)
-	 ("C-x c SPC" . helm-all-mark-rings)
 	 :map helm-map
 	 ("<tab>" . helm-execute-persistent-action)
 	 ("C-i" . helm-execute-persistent-action) ; make TAB works in terminal
@@ -40,14 +23,19 @@
 
   :diminish helm-mode)
 
+(use-package helm-descbinds
+  :bind ("C-h b" . helm-descbinds))
+
+(use-package helm-swoop
+  :bind ("C-s" . helm-swoop))
+
+(use-package helm-projectile
+  :config
+  (helm-projectile-on)
+  :bind ("C-x p" . helm-projectile))
 
 (use-package projectile
-  :diminish projectile-mode
+  :defer t ; loading is ensured by helm-projectile
   :config
-  (setq projectile-keymap-prefix (kbd "C-c p"))
-  (setq projectile-completion-system 'default)
-  (setq projectile-enable-caching t)
-  (setq projectile-indexing-method 'alien)
-  (add-to-list 'projectile-globally-ignored-files "node-modules")
   (projectile-global-mode)
-  (helm-projectile-on))
+  :diminish projectile-mode)