From 9cc876b29ad5efaad64adf0ec3fe1a2b8c43d687 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 26 Aug 2019 16:32:15 +0200
Subject: Emacs: enable projectile-ripgrep to be used

---
 emacs/.emacs.d/main.el | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'emacs')

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 30eae4ef..428f3bd6 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -310,15 +310,18 @@ With two prefix arguments, write out the day and month name."
 (use-package counsel-projectile
   :commands (counsel-projectile-switch-project
 	     counsel-projectile-rg
-	     counsel-projectile-switch-to-buffer)
+	     counsel-projectile-switch-to-buffer
+             counsel-projectile-mode)
   :general (:keymaps 'projectile-command-map
-                     "s s" #'counsel-projectile-rg)
+                     "s s" #'counsel-projectile-rg
+                     "s r" #'counsel-projectile-rg)
   :config (progn
+            (assq-delete-all #'projectile-ripgrep counsel-projectile-key-bindings)
+            (counsel-projectile-mode +1)
 	    (with-eval-after-load 'evil-ex
 	      (evil-ex-define-cmd "cprg" #'counsel-projectile-rg)
 	      (evil-ex-define-cmd "pb" #'counsel-projectile-switch-to-buffer)
-	      (evil-ex-define-cmd "psw[itch]" #'counsel-projectile-switch-project)))
-  :custom ((counsel-projectile-mode +1)))
+	      (evil-ex-define-cmd "psw[itch]" #'counsel-projectile-switch-project))))
 
 (use-package magit
   :commands (magit-status magit-dispatch)
-- 
cgit 1.4.1