From 4d9ddf27a980a85e0f2f3264a7821c05589370c6 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 1 Jun 2018 02:18:46 +0200
Subject: [PATCH] Fix over-zealous evil-integration in ivy #636

---
 modules/completion/ivy/config.el    | 20 +-------------------
 modules/config/default/+bindings.el |  1 +
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el
index d6f8728e2..c2ca832c2 100644
--- a/modules/completion/ivy/config.el
+++ b/modules/completion/ivy/config.el
@@ -270,22 +270,4 @@ immediately runs it on the current candidate (ending the ivy session)."
       :n "go"       #'ivy-occur-dispatch
       :n "gc"       #'ivy-occur-toggle-calling
       ;; quit
-      :n "q"        #'quit-window
-
-      :map ivy-minibuffer-map
-      [escape]    #'abort-recursive-edit
-      [return]    #'exit-minibuffer
-      [backspace] #'ivy-backward-delete-char
-      "C-m"       #'ivy-done
-      "C-j"       #'ivy-next-line
-      "C-k"       #'ivy-previous-line
-      "C-l"       #'ivy-alt-done
-      "C-A-k"     #'ivy-scroll-down-command
-      "C-A-j"     #'ivy-scroll-up-command
-      "C-r"       #'ivy-reverse-i-search
-      "C-n"       #'ivy-next-line
-      "C-p"       #'ivy-previous-line
-      "C-w"       #'ivy-backward-kill-word
-      "C-u"       #'ivy-kill-line
-      "C-b"       #'backward-word
-      "C-f"       #'forward-word)
+      :n "q"        #'quit-window)
diff --git a/modules/config/default/+bindings.el b/modules/config/default/+bindings.el
index e44425ef1..78938d4f7 100644
--- a/modules/config/default/+bindings.el
+++ b/modules/config/default/+bindings.el
@@ -351,6 +351,7 @@
       (:after ivy
         :map ivy-minibuffer-map
         "C-SPC" #'ivy-call-and-recenter  ; preview file
+        "C-l"   #'ivy-alt-done
         "M-z"   #'undo
         "M-v"   #'yank
         "C-v"   #'yank)