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

Improve v2.0 compatibility for modules/completion/ivy

Browse source
This commit is contained in:
Henrik Lissner 2017-02-13 21:11:54 -05:00
parent 9173d79eb8
commit 54d58c358e
2 changed files with 57 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,22 @@
(setq ivy-exit 'done)
(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
;;
(@def-package ivy :demand t
:init
(setq ivy-height 14
@ -17,6 +33,9 @@
ivy-format-function 'ivy-format-function-line) ;; highlight til EOL
:config
(setq projectile-completion-system 'ivy
smex-completion-method 'ivy)
(@map :map ivy-mode-map
[remap ivy-switch-buffer] '+ivy/switch-buffer
[remap projectile-switch-to-buffer] '+ivy/switch-project-buffer
@ -36,18 +55,16 @@
(advice-add 'ivy-read :after 'doom|redisplay)
(@after magit (setq magit-completing-read-function 'ivy-completing-read))
(@after smex (setq smex-completion-method 'ivy))
(@after yasnippet (push 'doom-yas-ivy-prompt yas-prompt-functions))
(@after yasnippet (push '+ivy-yas-prompt yas-prompt-functions))
(ivy-mode +1))
(@def-package counsel
:after ivy
:init
:config
(setq counsel-find-file-ignore-regexp "\\(?:^[#.]\\)\\|\\(?:[#~]$\\)\\|\\(?:^Icon?\\)")
:config
(require 'counsel-projectile)
(@def-counsel-action ag-open-in-other-window