dev: updating local from master
This commit is contained in:
commit
9f00bc021b
9 changed files with 54 additions and 83 deletions
|
@ -7,9 +7,6 @@ The completion/vertico module uses the orderless completion style by default,
|
|||
but this returns too broad a candidate set for company completion. This variable
|
||||
overrides `completion-styles' during company completion sessions.")
|
||||
|
||||
(defvar +vertico-consult-fd-args nil
|
||||
"Shell command and arguments the vertico module uses for fd.")
|
||||
|
||||
(defvar +vertico-consult-dir-container-executable "docker"
|
||||
"Command to call for listing container hosts.")
|
||||
|
||||
|
@ -143,20 +140,21 @@ orderless."
|
|||
:before (list #'consult-recent-file #'consult-buffer)
|
||||
(recentf-mode +1))
|
||||
|
||||
(setq consult-project-root-function #'doom-project-root
|
||||
(setq consult-project-function #'doom-project-root
|
||||
consult-narrow-key "<"
|
||||
consult-line-numbers-widen t
|
||||
consult-async-min-input 2
|
||||
consult-async-refresh-delay 0.15
|
||||
consult-async-input-throttle 0.2
|
||||
consult-async-input-debounce 0.1)
|
||||
(unless +vertico-consult-fd-args
|
||||
(setq +vertico-consult-fd-args
|
||||
(if doom-projectile-fd-binary
|
||||
(format "%s --color=never -i -H -E .git --regex %s"
|
||||
doom-projectile-fd-binary
|
||||
(if IS-WINDOWS "--path-separator=/" ""))
|
||||
consult-find-args)))
|
||||
(if doom-projectile-fd-binary
|
||||
(setq consult-fd-args
|
||||
'(doom-projectile-fd-binary
|
||||
"--color=never"
|
||||
;; https://github.com/sharkdp/fd/issues/839
|
||||
"--full-path --absolute-path"
|
||||
"--hidden --exclude .git"
|
||||
(when IS-WINDOWS "--path-separator=/"))))
|
||||
|
||||
(consult-customize
|
||||
consult-ripgrep consult-git-grep consult-grep
|
||||
|
@ -306,9 +304,9 @@ orderless."
|
|||
(map! (:map embark-file-map
|
||||
:desc "Open target with sudo" "s" #'doom/sudo-find-file
|
||||
(:when (modulep! :tools magit)
|
||||
:desc "Open magit-status of target" "g" #'+vertico/embark-magit-status)
|
||||
:desc "Open magit-status of target" "g" #'+vertico/embark-magit-status)
|
||||
(:when (modulep! :ui workspaces)
|
||||
:desc "Open in new workspace" "TAB" #'+vertico/embark-open-in-new-workspace))))
|
||||
:desc "Open in new workspace" "TAB" #'+vertico/embark-open-in-new-workspace))))
|
||||
|
||||
|
||||
(use-package! marginalia
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue