Merge evil-collection-ivy into completion/ivy

Disables evil-collection-ivy. Another step toward the removal of
evil-collection from Doom.
This commit is contained in:
Henrik Lissner 2018-05-31 11:41:33 +02:00
parent 1f5dae9176
commit 183ccbb8f1
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 71 additions and 15 deletions

View file

@ -608,21 +608,10 @@
;; ivy
(:after ivy
:map ivy-minibuffer-map
[escape] #'keyboard-escape-quit
"C-SPC" #'ivy-call-and-recenter
"M-z" #'undo
"M-v" #'yank
"C-v" #'yank
"C-r" #'evil-paste-from-register
"C-k" #'ivy-previous-line
"C-j" #'ivy-next-line
"C-A-k" #'ivy-scroll-down-command
"C-A-j" #'ivy-scroll-up-command
"C-l" #'ivy-alt-done
"C-w" #'ivy-backward-kill-word
"C-u" #'ivy-kill-line
"C-b" #'backward-word
"C-f" #'forward-word)
"C-SPC" #'ivy-call-and-recenter ; preview file
"M-z" #'undo
"M-v" #'yank
"C-v" #'yank)
;; neotree
(:after neotree