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

completion/ivy: refactor

Browse source
This commit is contained in:
Henrik Lissner 2017-02-22 04:27:23 -05:00
parent 404b1e5287
commit 38c3ef744d
2 changed files with 21 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,16 +23,20 @@
;; ;;
(@def-package ivy :demand t (@def-package ivy :demand t
:init :config
(setq ivy-height 14 (setq ivy-height 14
ivy-do-completion-in-region nil ivy-do-completion-in-region nil
ivy-wrap t ivy-wrap t
ivy-fixed-height-minibuffer t ivy-fixed-height-minibuffer t
ivy-format-function 'ivy-format-function-line) ;; highlight til EOL projectile-completion-system 'ivy
smex-completion-method 'ivy
;; highlight til EOL
ivy-format-function 'ivy-format-function-line)
:config (@after magit (setq magit-completing-read-function 'ivy-completing-read))
(setq projectile-completion-system 'ivy (@after yasnippet (push '+ivy-yas-prompt yas-prompt-functions))
smex-completion-method 'ivy)
(ivy-mode +1)
(@map :map ivy-minibuffer-map (@map :map ivy-minibuffer-map
[escape] 'keyboard-escape-quit [escape] 'keyboard-escape-quit
@ -43,18 +47,6 @@
"C-b" 'backward-word "C-b" 'backward-word
"C-f" 'forward-word) "C-f" 'forward-word)
;; Occasionally, when ivy closes, it causes display artifacting
;; between horizontal splits. This fixes it, though may cause
;; flickering on some OSes.
(defun doom|redisplay (&rest _) (force-mode-line-update))
(advice-add 'ivy-read :after 'doom|redisplay)
(add-hook 'projectile-find-file-hook 'doom|redisplay)
(@after magit (setq magit-completing-read-function 'ivy-completing-read))
(@after yasnippet (push '+ivy-yas-prompt yas-prompt-functions))
(ivy-mode +1)
(@map :map ivy-mode-map (@map :map ivy-mode-map
[remap find-file] 'counsel-find-file [remap find-file] 'counsel-find-file
[remap switch-to-buffer] '+ivy/switch-buffer [remap switch-to-buffer] '+ivy/switch-buffer
@ -65,7 +57,18 @@
[remap projectile-switch-project] 'counsel-projectile-switch-project [remap projectile-switch-project] 'counsel-projectile-switch-project
[remap projectile-find-file] 'counsel-projectile-find-file [remap projectile-find-file] 'counsel-projectile-find-file
[remap imenu-anywhere] 'ivy-imenu-anywhere [remap imenu-anywhere] 'ivy-imenu-anywhere
[remap execute-extended-command] 'counsel-M-x)) [remap execute-extended-command] 'counsel-M-x)
(when (@featurep :feature workspaces)
(nconc ivy-sort-functions-alist
'((persp-kill-buffer . nil)
(persp-remove-buffer . nil)
(persp-add-buffer . nil)
(persp-switch . nil)
(persp-window-switch . nil)
(persp-frame-switch . nil)
(+workspace/switch-to . nil)
(+workspace/delete . nil)))))
(@def-package swiper :commands (swiper swiper-all)) (@def-package swiper :commands (swiper swiper-all))

19
modules/feature/workspaces/config.el
View file

@ -68,22 +68,3 @@
(doom-popup--init window plist)))) (doom-popup--init window plist))))
(add-hook '+workspaces-load-session-hook '+workspaces|restore-popups)) (add-hook '+workspaces-load-session-hook '+workspaces|restore-popups))
(@after ivy
;; (defun +workspaces|ivy-ignore-non-persp-buffers (b)
;; (when persp-mode
;; (let ((persp (get-current-persp)))
;; (and persp (not (persp-contain-buffer-p b persp))))))
;; (pushnew '+workspaces|ivy-ignore-non-persp-buffers ivy-ignore-buffers)
(setq ivy-sort-functions-alist
(append ivy-sort-functions-alist
'((persp-kill-buffer . nil)
(persp-remove-buffer . nil)
(persp-add-buffer . nil)
(persp-switch . nil)
(persp-window-switch . nil)
(persp-frame-switch . nil)
(+workspace/switch-to . nil)
(+workspace/delete . nil)))))