From 064603f6e693211952cc1dfb91396da0e7d8131e Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 28 Mar 2020 20:08:53 -0400
Subject: [PATCH] Only bind C-s in minibuffer if ivy/helm are available

---
 modules/config/default/+evil-bindings.el | 5 +----
 modules/config/default/config.el         | 5 ++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index 79802177f..bacc14e55 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -6,10 +6,7 @@
   ;; Minibuffer
   (define-key! evil-ex-completion-map
     "C-a" #'evil-beginning-of-line
-    "C-b" #'evil-backward-char
-    "C-s" (if (featurep! :completion ivy)
-              #'counsel-minibuffer-history
-            #'helm-minibuffer-history))
+    "C-b" #'evil-backward-char)
 
   (define-key! :keymaps +default-minibuffer-maps
     [escape] #'abort-recursive-edit
diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index 9ca48370a..490ec2a14 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -382,7 +382,10 @@
                             #'counsel-minibuffer-history)
                            ((featurep! :completion helm)
                             #'helm-minibuffer-history)))
-    (define-key! :keymaps +default-minibuffer-maps
+    (define-key!
+      :keymaps (append +default-minibuffer-maps
+                       (when (featurep! :editor evil +everywhere)
+                         '(evil-ex-completion-map)))
       "C-s" command))
 
   ;; Smarter C-a/C-e for both Emacs and Evil. C-a will jump to indentation.