From 4d393fe9c2d0e8251c76255d9ff174242cff2e02 Mon Sep 17 00:00:00 2001 From: yoavm448 Date: Sat, 8 Feb 2020 19:40:28 +0200 Subject: [PATCH 1/2] Also try to search for fdfind, not only fd --- modules/completion/ivy/config.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index 5140a721e..21acdffad 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -266,6 +266,8 @@ evil-ex-specific constructs, so we disable it solely in evil-ex." (cl-destructuring-bind (find-program . args) (cond ((executable-find "fd") (cons "fd" (list "-t" "f" "-E" ".git"))) + ((executable-find "fdfind") + (cons "fdfind" (list "-t" "f" "-E" ".git"))) ((executable-find "rg") (cons "rg" (list "--files" "--hidden" "--no-messages"))) ((cons find-program args))) @@ -275,7 +277,7 @@ evil-ex-specific constructs, so we disable it solely in evil-ex." (cons find-program args) (lambda () (goto-char (point-min)) - (let ((offset (if (member find-program '("fd" "rg")) 0 2)) + (let ((offset (if (member find-program '("fd" "fdfind" "rg")) 0 2)) files) (while (< (point) (point-max)) (push (buffer-substring From 2c312c4f23f88851aef99c2936a3fa1da7715230 Mon Sep 17 00:00:00 2001 From: yoavm448 Date: Sun, 9 Feb 2020 10:03:37 +0200 Subject: [PATCH 2/2] Use doom-projectile-fd-binary for fd binary Don't look for it again --- modules/completion/ivy/config.el | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index 21acdffad..9b32c097e 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -264,10 +264,8 @@ evil-ex-specific constructs, so we disable it solely in evil-ex." "Change `counsel-file-jump' to use fd or ripgrep, if they are available." :override #'counsel--find-return-list (cl-destructuring-bind (find-program . args) - (cond ((executable-find "fd") - (cons "fd" (list "-t" "f" "-E" ".git"))) - ((executable-find "fdfind") - (cons "fdfind" (list "-t" "f" "-E" ".git"))) + (cond ((executable-find doom-projectile-fd-binary) + (cons doom-projectile-fd-binary (list "-t" "f" "-E" ".git"))) ((executable-find "rg") (cons "rg" (list "--files" "--hidden" "--no-messages"))) ((cons find-program args))) @@ -277,7 +275,7 @@ evil-ex-specific constructs, so we disable it solely in evil-ex." (cons find-program args) (lambda () (goto-char (point-min)) - (let ((offset (if (member find-program '("fd" "fdfind" "rg")) 0 2)) + (let ((offset (if (member find-program (list "rg" doom-projectile-fd-binary)) 0 2)) files) (while (< (point) (point-max)) (push (buffer-substring