Extract ivy config into core-ivy.el

This commit is contained in:
Henrik Lissner 2016-10-03 12:10:52 +02:00
parent d21b82d89b
commit c28bb1519d
3 changed files with 6 additions and 6 deletions

View file

@ -278,8 +278,7 @@
(use-package smex (use-package smex
:commands (smex smex-major-mode-commands) :commands (smex smex-major-mode-commands)
:config :config
(setq smex-completion-method 'ivy (setq smex-save-file (concat doom-temp-dir "/smex-items"))
smex-save-file (concat doom-temp-dir "/smex-items"))
(smex-initialize)) (smex-initialize))
(use-package swiper :commands (swiper swiper-all)) (use-package swiper :commands (swiper swiper-all))

View file

@ -9,9 +9,6 @@
ivy-wrap t) ivy-wrap t)
:config :config
(after! magit
(setq magit-completing-read-function 'ivy-completing-read))
(ivy-mode +1) (ivy-mode +1)
(map! :map ivy-minibuffer-map (map! :map ivy-minibuffer-map
[escape] 'keyboard-escape-quit [escape] 'keyboard-escape-quit
@ -24,6 +21,10 @@
;; Fix display glitches ;; Fix display glitches
(advice-add 'ivy-done :after 'redraw-display) (advice-add 'ivy-done :after 'redraw-display)
(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))
;; ;;
(require 'counsel) (require 'counsel)

View file

@ -13,7 +13,7 @@
(setq yas-verbosity 0 (setq yas-verbosity 0
yas-indent-line 'auto yas-indent-line 'auto
yas-also-auto-indent-first-line t yas-also-auto-indent-first-line t
yas-prompt-functions '(doom/yas-ivy-prompt yas-ido-prompt yas-no-prompt) yas-prompt-functions '(yas-ido-prompt yas-no-prompt)
;; Only load personal snippets ;; Only load personal snippets
yas-snippet-dirs (list (concat doom-private-dir "/snippets") yas-snippet-dirs (list (concat doom-private-dir "/snippets")
(concat doom-private-dir "/templates"))) (concat doom-private-dir "/templates")))