diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index 3adb6e776..5b87887ac 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -57,14 +57,6 @@ immediately runs it on the current candidate (ending the ivy session)." ;; enable ability to select prompt (alternative to `ivy-immediate-done') ivy-use-selectable-prompt t) - (when (featurep! +fuzzy) - (setq ivy-re-builders-alist - '((counsel-ag . ivy--regex-plus) - (counsel-grep . ivy--regex-plus) - (swiper . ivy--regex-plus) - (t . ivy--regex-fuzzy)) - ivy-initial-inputs-alist nil)) - (after! yasnippet (add-to-list 'yas-prompt-functions #'+ivy-yas-prompt nil #'eq)) @@ -211,6 +203,18 @@ immediately runs it on the current candidate (ending the ivy session)." (setf (alist-get fn ivy-display-functions-alist) #'ivy-display-function-fallback))) +(def-package! flx + :when (featurep! +fuzzy) + :defer t ; is loaded by ivy + :init + (setq ivy-re-builders-alist + '((counsel-ag . ivy--regex-plus) + (counsel-grep . ivy--regex-plus) + (swiper . ivy--regex-plus) + (t . ivy--regex-fuzzy)) + ivy-initial-inputs-alist nil)) + + ;; Used by `counsel-M-x' (setq amx-save-file (concat doom-cache-dir "amx-items")) diff --git a/modules/completion/ivy/packages.el b/modules/completion/ivy/packages.el index 888368ce1..ace65cf1b 100644 --- a/modules/completion/ivy/packages.el +++ b/modules/completion/ivy/packages.el @@ -10,5 +10,8 @@ (package! ivy-rich) (package! wgrep) +(when (featurep! +fuzzy) + (package! flx)) + (when (and EMACS26+ (featurep! +childframe)) (package! ivy-posframe))