Browse Source

Use fd for fzf if available

master
10sr 5 years ago
parent
commit
2cf50e29d0
Signed by: 10sr GPG Key ID: C384BB17CBB19347
1 changed files with 21 additions and 14 deletions
  1. +21
    -14
      emacs.el

+ 21
- 14
emacs.el View File

@@ -736,7 +736,7 @@ found, otherwise returns nil."


;; fzf ;; fzf


;; Too slow!
;; Too slow in term buffer!
;; (set-variable 'fzf/executable "sk") ;; (set-variable 'fzf/executable "sk")
;; (set-variable 'fzf/args "--color bw --print-query") ;; (set-variable 'fzf/args "--color bw --print-query")
;; Modified from hardcoded default to include: ;; Modified from hardcoded default to include:
@@ -746,22 +746,29 @@ found, otherwise returns nil."
;; - parent directory (..) ;; - parent directory (..)
;; ripgrep cannot list directories... ;; ripgrep cannot list directories...
;; (setenv "FZF_DEFAULT_COMMAND" "rg --files --hidden --follow --glob '!.git/*' --no-ignore") ;; (setenv "FZF_DEFAULT_COMMAND" "rg --files --hidden --follow --glob '!.git/*' --no-ignore")
;; TODO: Use fd if available
(let* ((find (if (executable-find "bfs") (let* ((find (if (executable-find "bfs")
;; Breadth-first find https://github.com/tavianator/bfs ;; Breadth-first find https://github.com/tavianator/bfs
"bfs" "bfs"
"find")) "find"))
(defcmd (concat "set -eu; set -o pipefail; "
"echo .; "
"echo ..; "
"command " find " -L . "
"-mindepth 1 "
"\\( -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune "
"-o -print "
"2> /dev/null "
"| "
"cut -b3-")))
(setenv "FZF_DEFAULT_COMMAND" defcmd))
(findcmd (concat "set -eu; set -o pipefail; "
"echo .; "
"echo ..; "
"command " find " -L . "
"-mindepth 1 "
"\\( -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune "
"-o -print "
"2> /dev/null "
"| "
"cut -b3-"))
(fdcmd (concat "set -eu; set -o pipefail; "
"echo .; "
"echo ..; "
"command fd "
"--follow --hidden --no-ignore "
"2>/dev/null")))
(if (executable-find "fd")
(setenv "FZF_DEFAULT_COMMAND" fdcmd)
(setenv "FZF_DEFAULT_COMMAND" findcmd)))
(set-variable 'fzf/window-height 45) (set-variable 'fzf/window-height 45)
(set-variable 'fzf/args "--print-query --ansi --inline-info --cycle") (set-variable 'fzf/args "--print-query --ansi --inline-info --cycle")


@@ -974,7 +981,7 @@ found, otherwise returns nil."
(lambda () (lambda ()
(setq imenu-generic-expression (setq imenu-generic-expression
`(("Sections" ";;;\+\n;; \\(.*\\)\n" 1) `(("Sections" ";;;\+\n;; \\(.*\\)\n" 1)
,@imenu-generic-expression))))
,@imenu-generic-expression))))


(with-eval-after-load 'compile (with-eval-after-load 'compile
(defvar compilation-filter-start) (defvar compilation-filter-start)


Loading…
Cancel
Save