emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

completion/ivy: fix key remapping; custom ivy switch-buffer commands work now

Browse source
This commit is contained in:
Henrik Lissner 2017-02-21 00:45:50 -05:00
parent 27a3041f40
commit 22a1b2b41a
2 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
modules/completion/ivy/config.el
View file

@ -8,17 +8,6 @@
(setq ivy-exit 'done) (setq ivy-exit 'done)
(exit-minibuffer))) (exit-minibuffer)))
(@map [remap find-file] 'counsel-find-file
[remap switch-to-buffer] 'ivy-switch-buffer
[remap projectile-switch-to-buffer] '+ivy/switch-project-buffer
[remap recentf] 'counsel-recentf
[remap imenu] 'counsel-imenu
[remap bookmark-jump] 'counsel-bookmark
[remap projectile-switch-project] 'counsel-projectile-switch-project
[remap projectile-find-file] 'counsel-projectile-find-file
[remap imenu-anywhere] 'ivy-imenu-anywhere
[remap execute-extended-command] 'counsel-M-x)
;; ;;
;; Packages ;; Packages
@ -36,11 +25,7 @@
(setq projectile-completion-system 'ivy (setq projectile-completion-system 'ivy
smex-completion-method 'ivy) smex-completion-method 'ivy)
(@map :map ivy-mode-map (@map :map ivy-minibuffer-map
[remap ivy-switch-buffer] '+ivy/switch-buffer
[remap projectile-switch-to-buffer] '+ivy/switch-project-buffer
:map ivy-minibuffer-map
[escape] 'keyboard-escape-quit [escape] 'keyboard-escape-quit
"C-r" 'evil-paste-from-register "C-r" 'evil-paste-from-register
"M-v" 'clipboard-yank "M-v" 'clipboard-yank
@ -59,7 +44,19 @@
(@after magit (setq magit-completing-read-function 'ivy-completing-read)) (@after magit (setq magit-completing-read-function 'ivy-completing-read))
(@after yasnippet (push '+ivy-yas-prompt yas-prompt-functions)) (@after yasnippet (push '+ivy-yas-prompt yas-prompt-functions))
(ivy-mode +1)) (ivy-mode +1)
(@map :map ivy-mode-map
[remap find-file] 'counsel-find-file
[remap switch-to-buffer] '+ivy/switch-buffer
[remap persp-switch-to-buffer] '+ivy/switch-workspace-buffer
[remap recentf] 'counsel-recentf
[remap imenu] 'counsel-imenu
[remap bookmark-jump] 'counsel-bookmark
[remap projectile-switch-project] 'counsel-projectile-switch-project
[remap projectile-find-file] 'counsel-projectile-find-file
[remap imenu-anywhere] 'ivy-imenu-anywhere
[remap execute-extended-command] 'counsel-M-x))
(@def-package counsel (@def-package counsel

2
modules/private/hlissner/+bindings.el
View file

@ -70,7 +70,7 @@
;;; <leader> and <localleader> ;;; <leader> and <localleader>
:m ";" 'evil-ex :m ";" 'evil-ex
(:leader (:leader
:desc "Switch project buffer" :n "," 'projectile-switch-to-buffer :desc "Switch project buffer" :n "," 'persp-switch-to-buffer
:desc "Switch buffer" :n "<" 'switch-to-buffer :desc "Switch buffer" :n "<" 'switch-to-buffer
:desc "Browse files" :n "." 'find-file :desc "Browse files" :n "." 'find-file
:desc "Find file from here" :n ">" 'counsel-file-jump :desc "Find file from here" :n ">" 'counsel-file-jump