Split out minibuffer config
This commit is contained in:
parent
bd602d65fb
commit
45e480cd93
|
|
@ -30,6 +30,7 @@
|
|||
(require 'init-modeline)
|
||||
(require 'init-dashboard)
|
||||
(require 'init-completion)
|
||||
(require 'init-minibuffer)
|
||||
(require 'init-kill)
|
||||
(require 'init-dired)
|
||||
(require 'init-smartparens)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;;; init-completion.el --- Completion Configuration File -*- lexical-binding: t -*-
|
||||
;;; Commentary:
|
||||
;; Config for completion-at-point (corfu) and minibuffer (vertico, embark, consult, etc)
|
||||
;; Config for completion-at-point (corfu), as well as orderless (see also init-minibuffer.el)
|
||||
;; Most of it is taken from the READMEs and wikis of those packages
|
||||
;;; Code:
|
||||
|
||||
|
|
@ -25,21 +25,16 @@
|
|||
:bind
|
||||
("M-/" . hippie-expand))
|
||||
|
||||
(use-package fancy-dabbrev
|
||||
:diminish
|
||||
:config
|
||||
(global-fancy-dabbrev-mode))
|
||||
|
||||
(use-package emacs
|
||||
:init
|
||||
;; for corfu
|
||||
(setq completion-cycle-threshold 3)
|
||||
(setq tab-always-indent 'complete)
|
||||
(setq tab-always-indent 'complete))
|
||||
|
||||
;; for vertico
|
||||
;; Do not allow the cursor in the minibuffer prompt
|
||||
(setq minibuffer-prompt-properties
|
||||
'(read-only t cursor-intangible t face minibuffer-prompt))
|
||||
(add-hook 'minibuffer-setup-hook #'cursor-intangible-mode)
|
||||
(setq enable-recursive-minibuffers t)
|
||||
(minibuffer-depth-indicate-mode t))
|
||||
|
||||
;; orderless is used by corfu and vertico
|
||||
(use-package orderless
|
||||
:bind (:map minibuffer-local-completion-map
|
||||
("C-l" . my/orderless-match-components-literally))
|
||||
|
|
@ -89,7 +84,6 @@
|
|||
(setq orderless-matching-styles '(orderless-literal orderless-regexp orderless-strict-leading-initialism)
|
||||
orderless-style-dispatchers '(my/orderless-dispatch)))
|
||||
|
||||
|
||||
;; code completion - corfu
|
||||
(use-package corfu
|
||||
;; Optional customizations
|
||||
|
|
@ -103,310 +97,5 @@
|
|||
:init
|
||||
(corfu-global-mode))
|
||||
|
||||
(use-package fancy-dabbrev
|
||||
:diminish
|
||||
:config
|
||||
(global-fancy-dabbrev-mode))
|
||||
|
||||
;; minibuffer completion - vertico et al
|
||||
(use-package vertico
|
||||
:init
|
||||
(vertico-mode)
|
||||
(setq vertico-cycle t)
|
||||
(advice-add #'vertico--format-candidate :around
|
||||
(lambda (orig cand prefix suffix index _start)
|
||||
(setq cand (funcall orig cand prefix suffix index _start))
|
||||
(concat
|
||||
(if (= vertico--index index)
|
||||
(propertize "» " 'face 'vertico-current)
|
||||
" ")
|
||||
cand)))
|
||||
:config
|
||||
(defun down-from-outside ()
|
||||
"Move to next candidate in minibuffer, even when minibuffer isn't selected."
|
||||
(interactive)
|
||||
(with-selected-window (active-minibuffer-window)
|
||||
(execute-kbd-macro [down])))
|
||||
|
||||
(defun up-from-outside ()
|
||||
"Move to previous candidate in minibuffer, even when minibuffer isn't selected."
|
||||
(interactive)
|
||||
(with-selected-window (active-minibuffer-window)
|
||||
(execute-kbd-macro [up])))
|
||||
|
||||
(defun preview-from-outside ()
|
||||
"Preview the selected candidate, even when minibuffer isn't selected."
|
||||
(interactive)
|
||||
(with-selected-window (active-minibuffer-window)
|
||||
(execute-kbd-macro (kbd "M-."))))
|
||||
|
||||
(defun to-and-fro-minibuffer ()
|
||||
"Go back and forth between minibuffer and other window."
|
||||
(interactive)
|
||||
(if (window-minibuffer-p (selected-window))
|
||||
(select-window (minibuffer-selected-window))
|
||||
(select-window (active-minibuffer-window))))
|
||||
|
||||
(key-chord-define-global "XX" 'to-and-fro-minibuffer)
|
||||
;(key-chord-define-global ">>" 'preview-from-outside)
|
||||
:bind (("C-M-<" . up-from-outside)
|
||||
("C-M->" . down-from-outside)
|
||||
("C-M-+" . preview-from-outside)
|
||||
("M-X" . to-and-fro-minibuffer)
|
||||
("C-M-S-g" . minibuffer-keyboard-quit)))
|
||||
|
||||
;; See init-packages.el for fetching of Vertico Extenions
|
||||
;; Required extensions must be in the vertico-extensions var
|
||||
(use-package vertico-directory
|
||||
:init
|
||||
(defvar switching-project nil)
|
||||
(defun vertico-directory-enter-or-switch-project ()
|
||||
"Wrapper around vertico-directory-enter that plays nicely with Projectile."
|
||||
(interactive)
|
||||
(if switching-project
|
||||
(vertico-exit)
|
||||
(vertico-directory-enter)))
|
||||
(defun read-project (orig &rest args)
|
||||
(let ((switching-project t))
|
||||
(apply orig args)))
|
||||
(advice-add 'projectile-completing-read :around
|
||||
'read-project)
|
||||
:config
|
||||
(defun vertico-directory-slash ()
|
||||
(interactive)
|
||||
(if (and (>= vertico--index 0)
|
||||
(string-suffix-p "/" (vertico--candidate))
|
||||
(vertico-directory--completing-file-p))
|
||||
(vertico-insert)
|
||||
(insert "/")))
|
||||
(defun vertico-directory-home ()
|
||||
(interactive)
|
||||
(if (and (string-suffix-p "/" (vertico--candidate))
|
||||
(vertico-directory--completing-file-p))
|
||||
(insert "~/")
|
||||
(insert "~")))
|
||||
:load-path vertico-extensions-dir
|
||||
:commands vertico-directory-enter
|
||||
:bind (:map vertico-map
|
||||
("RET" . vertico-directory-enter-or-switch-project)
|
||||
("/" . vertico-directory-slash)
|
||||
("~" . vertico-directory-home)
|
||||
("DEL" . vertico-directory-delete-char)
|
||||
("M-DEL" . vertico-directory-delete-word))
|
||||
;; Tidy shadowed file names
|
||||
:hook (rfn-eshadow-update-overlay . vertico-directory-tidy))
|
||||
|
||||
(use-package vertico-repeat
|
||||
:load-path vertico-extensions-dir
|
||||
:bind ("M-P" . vertico-repeat))
|
||||
|
||||
(use-package consult
|
||||
:after projectile
|
||||
:bind (;; C-c bindings (mode-specific-map)
|
||||
("C-c h" . consult-history)
|
||||
("C-c m" . consult-mode-command)
|
||||
("C-c b" . consult-bookmark)
|
||||
("C-c k" . consult-kmacro)
|
||||
;; C-x bindings (ctl-x-map)
|
||||
("C-x M-:" . consult-complex-command) ;; orig. repeat-complex-command
|
||||
("C-x b" . consult-buffer) ;; orig. switch-to-buffer
|
||||
("C-x B" . consult-buffer-no-preview) ;; orig. switch-to-buffer
|
||||
("C-x 4 b" . consult-buffer-other-window) ;; orig. switch-to-buffer-other-window
|
||||
("C-x 5 b" . consult-buffer-other-frame) ;; orig. switch-to-buffer-other-frame
|
||||
;; Custom M-# bindings for fast register access
|
||||
("M-#" . consult-register-load)
|
||||
("M-'" . consult-register-store) ;; orig. abbrev-prefix-mark (unrelated)
|
||||
("C-M-#" . consult-register)
|
||||
;; Other custom bindings
|
||||
("C-S-s" . consult-line)
|
||||
("M-*" . consult-line-symbol-at-point)
|
||||
("C-c f" . consult-recent-file)
|
||||
("C-c r" . consult-ripgrep)
|
||||
("C-c R" . consult-ripgrep-auto-preview)
|
||||
("C-c *" . consult-ripgrep-symbol-at-point)
|
||||
("M-y" . consult-yank-pop) ;; orig. yank-pop
|
||||
("<help> a" . consult-apropos) ;; orig. apropos-command
|
||||
;; M-g bindings (goto-map)
|
||||
("M-g e" . consult-compile-error)
|
||||
("M-g f" . consult-flycheck)
|
||||
("M-g g" . consult-goto-line) ;; orig. goto-line
|
||||
("M-g M-g" . consult-goto-line) ;; orig. goto-line
|
||||
("M-g o" . consult-outline) ;; Alternative: consult-org-heading
|
||||
("M-g m" . consult-mark)
|
||||
("M-g k" . consult-global-mark)
|
||||
("M-g i" . consult-imenu)
|
||||
("M-g I" . consult-project-imenu)
|
||||
:map isearch-mode-map
|
||||
("M-e" . consult-isearch) ;; orig. isearch-edit-string
|
||||
("M-s e" . consult-isearch) ;; orig. isearch-edit-string
|
||||
("M-s l" . consult-line)) ;; needed by consult-line to detect isearch
|
||||
|
||||
:init
|
||||
|
||||
;; Optionally configure the register formatting. This improves the register
|
||||
;; preview for `consult-register', `consult-register-load',
|
||||
;; `consult-register-store' and the Emacs built-ins.
|
||||
(setq register-preview-delay 0
|
||||
register-preview-function #'consult-register-format)
|
||||
|
||||
;; Optionally tweak the register preview window.
|
||||
;; This adds thin lines, sorting and hides the mode line of the window.
|
||||
(advice-add #'register-preview :override #'consult-register-window)
|
||||
|
||||
;; Optionally replace `completing-read-multiple' with an enhanced version.
|
||||
(advice-add #'completing-read-multiple :override #'consult-completing-read-multiple)
|
||||
|
||||
;; Use Consult to select xref locations with preview
|
||||
(setq xref-show-xrefs-function #'consult-xref
|
||||
xref-show-definitions-function #'consult-xref)
|
||||
|
||||
:config
|
||||
|
||||
(defun consult-ripgrep-symbol-at-point (&optional dir initial)
|
||||
(interactive
|
||||
(list prefix-arg (when-let ((s (symbol-at-point)))
|
||||
(symbol-name s))))
|
||||
(consult-ripgrep dir initial))
|
||||
(defun consult-ripgrep-auto-preview (&optional dir initial)
|
||||
(interactive "P")
|
||||
(consult-ripgrep dir initial))
|
||||
(defun consult-ripgrep-unrestricted (&optional dir initial)
|
||||
(interactive "P")
|
||||
(let ((consult-ripgrep-args (replace-regexp-in-string "\\." "-uu ." consult-ripgrep-args)))
|
||||
(consult-ripgrep dir initial)))
|
||||
(defun consult-z-ripgrep (&optional dir initial)
|
||||
(interactive "P")
|
||||
(let ((consult-ripgrep-args (replace-regexp-in-string "\\." "-z ." consult-ripgrep-args)))
|
||||
(consult-ripgrep dir initial)))
|
||||
(defun consult-buffer-no-preview ()
|
||||
(interactive)
|
||||
(consult-buffer))
|
||||
(defun consult-line-symbol-at-point ()
|
||||
(interactive)
|
||||
(consult-line (thing-at-point 'symbol)))
|
||||
|
||||
;; Add these here, as we have two bindings for search map (M-s and C-c s)
|
||||
(define-key search-map "f" 'consult-find)
|
||||
(define-key search-map "F" 'consult-locate)
|
||||
(define-key search-map "g" 'consult-grep)
|
||||
(define-key search-map "G" 'consult-git-grep)
|
||||
(define-key search-map "r" 'consult-ripgrep)
|
||||
(define-key search-map "R" 'consult-ripgrep-auto-preview)
|
||||
(define-key search-map "M-r" 'consult-ripgrep-unrestricted)
|
||||
(define-key search-map "*" 'consult-ripgrep-symbol-at-point)
|
||||
(define-key search-map "z" 'consult-z-ripgrep)
|
||||
(define-key search-map "l" 'consult-line)
|
||||
(define-key search-map "L" 'consult-line-multi)
|
||||
(define-key search-map "m" 'consult-multi-occur)
|
||||
(define-key search-map "k" 'consult-keep-lines)
|
||||
(define-key search-map "u" 'consult-focus-lines)
|
||||
(define-key search-map "e" 'consult-isearch)
|
||||
|
||||
;; Optionally configure preview. The default value
|
||||
;; is 'any, such that any key triggers the preview.
|
||||
;; (setq consult-preview-key 'any)
|
||||
;; (setq consult-preview-key (kbd "M-."))
|
||||
;; (setq consult-preview-key (list (kbd "<S-down>") (kbd "<S-up>")))
|
||||
;; For some commands and buffer sources it is useful to configure the
|
||||
;; :preview-key on a per-command basis using the `consult-customize' macro.
|
||||
(consult-customize
|
||||
consult-theme
|
||||
:preview-key '(:debounce 0.2 any)
|
||||
consult-ripgrep consult-git-grep consult-grep
|
||||
consult-ripgrep-unrestricted consult-ripgrep-symbol-at-point
|
||||
consult-bookmark consult-recent-file consult-xref consult-buffer-no-preview
|
||||
consult--source-file consult--source-project-file consult--source-bookmark
|
||||
:preview-key (kbd "M-."))
|
||||
|
||||
;; Optionally configure the narrowing key.
|
||||
;; Both < and C-+ work reasonably well.
|
||||
(setq consult-narrow-key "<") ;; (kbd "C-+")
|
||||
|
||||
;; Optionally make narrowing help available in the minibuffer.
|
||||
;; You may want to use `embark-prefix-help-command' or which-key instead.
|
||||
;; (define-key consult-narrow-map (vconcat consult-narrow-key "?") #'consult-narrow-help)
|
||||
|
||||
(autoload 'projectile-project-root "projectile")
|
||||
(setq consult-project-root-function #'projectile-project-root)
|
||||
|
||||
(defvar consult-initial-narrow-config
|
||||
'((consult-buffer . ?p)
|
||||
(consult-buffer-no-preview . ?p)))
|
||||
;; Add initial narrowing hook
|
||||
(defun consult-initial-narrow ()
|
||||
(when-let (key (alist-get this-command consult-initial-narrow-config))
|
||||
(setq unread-command-events (append unread-command-events (list key 32)))))
|
||||
(add-hook 'minibuffer-setup-hook #'consult-initial-narrow)
|
||||
|
||||
(when (and (eq system-type 'darwin) (string-match-p "^find" consult-find-command))
|
||||
(setq consult-find-command (concat "g" consult-find-command)))
|
||||
|
||||
(defun consult--orderless-regexp-compiler (input type)
|
||||
(setq input (orderless-pattern-compiler input))
|
||||
(cons
|
||||
(mapcar (lambda (r) (consult--convert-regexp r type)) input)
|
||||
(lambda (str) (orderless--highlight input str))))
|
||||
(defun consult--with-orderless (&rest args)
|
||||
(minibuffer-with-setup-hook
|
||||
(lambda ()
|
||||
(setq-local consult--regexp-compiler #'consult--orderless-regexp-compiler))
|
||||
(apply args)))
|
||||
(advice-add #'consult-ripgrep :around #'consult--with-orderless))
|
||||
|
||||
(use-package consult-flycheck)
|
||||
|
||||
(use-package consult-lsp
|
||||
:bind (:map lsp-mode-map
|
||||
([remap xref-find-apropos] . consult-lsp-symbols)))
|
||||
|
||||
(use-package consult-dir
|
||||
:ensure t
|
||||
:bind (("C-x C-d" . consult-dir)
|
||||
:map vertico-map ;minibuffer-local-completion-map
|
||||
("C-x C-d" . consult-dir)
|
||||
("C-x C-j" . consult-dir-jump-file)))
|
||||
|
||||
(use-package marginalia
|
||||
:bind (("M-A" . marginalia-cycle)
|
||||
:map minibuffer-local-map
|
||||
("M-A" . marginalia-cycle))
|
||||
:init
|
||||
(marginalia-mode)
|
||||
:config
|
||||
;; For Projectile
|
||||
(add-to-list 'marginalia-prompt-categories '("Switch to project" . file))
|
||||
(add-to-list 'marginalia-prompt-categories '("Find file" . project-file))
|
||||
(add-to-list 'marginalia-prompt-categories '("Recently visited files" . project-file))
|
||||
(add-to-list 'marginalia-prompt-categories '("Switch to buffer" . buffer))
|
||||
;; For Crux
|
||||
(add-to-list 'marginalia-prompt-categories '("Choose recent file" . file)))
|
||||
|
||||
(use-package embark
|
||||
:bind
|
||||
(("C-," . embark-act)
|
||||
;; CIDER will override M-. so have two bindings for this
|
||||
("M-." . embark-dwim)
|
||||
("C-." . embark-dwim)
|
||||
("C-c C-o" . embark-export)
|
||||
("C-h b" . embark-bindings)
|
||||
("C-h B" . describe-bindings))
|
||||
:init
|
||||
;; Optionally replace the key help with a completing-read interface
|
||||
(setq prefix-help-command #'embark-prefix-help-command)
|
||||
:config
|
||||
;; Hide the mode line of the Embark live/completions buffers
|
||||
(add-to-list 'display-buffer-alist
|
||||
'("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*"
|
||||
nil
|
||||
(window-parameters (mode-line-format . none)))))
|
||||
|
||||
(use-package embark-consult
|
||||
:after (embark consult)
|
||||
:demand t ; only necessary if you have the hook below
|
||||
;; if you want to have consult previews as you move around an
|
||||
;; auto-updating embark collect buffer
|
||||
:hook
|
||||
(embark-collect-mode . consult-preview-at-point-mode))
|
||||
|
||||
(provide 'init-completion)
|
||||
;;; init-completion.el ends here
|
||||
|
|
|
|||
|
|
@ -0,0 +1,317 @@
|
|||
;;; init-minibuffer.el --- Minibuffer Completion Configuration File -*- lexical-binding: t -*-
|
||||
;;; Commentary:
|
||||
;; Config for completion etc in the minibuffer (vertico, embark, consult, etc)
|
||||
;; Most of it is taken from the READMEs and wikis of those packages.
|
||||
;; Relies on orderless config in init-completion.el
|
||||
;;; Code:
|
||||
|
||||
(use-package emacs
|
||||
:init
|
||||
;; Do not allow the cursor in the minibuffer prompt
|
||||
(setq minibuffer-prompt-properties
|
||||
'(read-only t cursor-intangible t face minibuffer-prompt))
|
||||
(add-hook 'minibuffer-setup-hook #'cursor-intangible-mode)
|
||||
(setq enable-recursive-minibuffers t)
|
||||
(minibuffer-depth-indicate-mode t))
|
||||
|
||||
(use-package vertico
|
||||
:init
|
||||
(vertico-mode)
|
||||
(setq vertico-cycle t)
|
||||
(advice-add #'vertico--format-candidate :around
|
||||
(lambda (orig cand prefix suffix index _start)
|
||||
(setq cand (funcall orig cand prefix suffix index _start))
|
||||
(concat
|
||||
(if (= vertico--index index)
|
||||
(propertize "» " 'face 'vertico-current)
|
||||
" ")
|
||||
cand)))
|
||||
:config
|
||||
(defun down-from-outside ()
|
||||
"Move to next candidate in minibuffer, even when minibuffer isn't selected."
|
||||
(interactive)
|
||||
(with-selected-window (active-minibuffer-window)
|
||||
(execute-kbd-macro [down])))
|
||||
|
||||
(defun up-from-outside ()
|
||||
"Move to previous candidate in minibuffer, even when minibuffer isn't selected."
|
||||
(interactive)
|
||||
(with-selected-window (active-minibuffer-window)
|
||||
(execute-kbd-macro [up])))
|
||||
|
||||
(defun preview-from-outside ()
|
||||
"Preview the selected candidate, even when minibuffer isn't selected."
|
||||
(interactive)
|
||||
(with-selected-window (active-minibuffer-window)
|
||||
(execute-kbd-macro (kbd "M-."))))
|
||||
|
||||
(defun to-and-fro-minibuffer ()
|
||||
"Go back and forth between minibuffer and other window."
|
||||
(interactive)
|
||||
(if (window-minibuffer-p (selected-window))
|
||||
(select-window (minibuffer-selected-window))
|
||||
(select-window (active-minibuffer-window))))
|
||||
|
||||
(key-chord-define-global "XX" 'to-and-fro-minibuffer)
|
||||
;(key-chord-define-global ">>" 'preview-from-outside)
|
||||
:bind (("C-M-<" . up-from-outside)
|
||||
("C-M->" . down-from-outside)
|
||||
("C-M-+" . preview-from-outside)
|
||||
("M-X" . to-and-fro-minibuffer)
|
||||
("C-M-S-g" . minibuffer-keyboard-quit)))
|
||||
|
||||
;; See init-packages.el for fetching of Vertico Extenions
|
||||
;; Required extensions must be in the vertico-extensions var
|
||||
(use-package vertico-directory
|
||||
:init
|
||||
(defvar switching-project nil)
|
||||
(defun vertico-directory-enter-or-switch-project ()
|
||||
"Wrapper around vertico-directory-enter that plays nicely with Projectile."
|
||||
(interactive)
|
||||
(if switching-project
|
||||
(vertico-exit)
|
||||
(vertico-directory-enter)))
|
||||
(defun read-project (orig &rest args)
|
||||
(let ((switching-project t))
|
||||
(apply orig args)))
|
||||
(advice-add 'projectile-completing-read :around
|
||||
'read-project)
|
||||
:config
|
||||
(defun vertico-directory-slash ()
|
||||
(interactive)
|
||||
(if (and (>= vertico--index 0)
|
||||
(string-suffix-p "/" (vertico--candidate))
|
||||
(vertico-directory--completing-file-p))
|
||||
(vertico-insert)
|
||||
(insert "/")))
|
||||
(defun vertico-directory-home ()
|
||||
(interactive)
|
||||
(if (and (string-suffix-p "/" (vertico--candidate))
|
||||
(vertico-directory--completing-file-p))
|
||||
(insert "~/")
|
||||
(insert "~")))
|
||||
:load-path vertico-extensions-dir
|
||||
:commands vertico-directory-enter
|
||||
:bind (:map vertico-map
|
||||
("RET" . vertico-directory-enter-or-switch-project)
|
||||
("/" . vertico-directory-slash)
|
||||
("~" . vertico-directory-home)
|
||||
("DEL" . vertico-directory-delete-char)
|
||||
("M-DEL" . vertico-directory-delete-word))
|
||||
;; Tidy shadowed file names
|
||||
:hook (rfn-eshadow-update-overlay . vertico-directory-tidy))
|
||||
|
||||
(use-package vertico-repeat
|
||||
:load-path vertico-extensions-dir
|
||||
:bind ("M-P" . vertico-repeat))
|
||||
|
||||
(use-package consult
|
||||
:after projectile
|
||||
:bind (;; C-c bindings (mode-specific-map)
|
||||
("C-c h" . consult-history)
|
||||
("C-c m" . consult-mode-command)
|
||||
("C-c b" . consult-bookmark)
|
||||
("C-c k" . consult-kmacro)
|
||||
;; C-x bindings (ctl-x-map)
|
||||
("C-x M-:" . consult-complex-command) ;; orig. repeat-complex-command
|
||||
("C-x b" . consult-buffer) ;; orig. switch-to-buffer
|
||||
("C-x B" . consult-buffer-no-preview) ;; orig. switch-to-buffer
|
||||
("C-x 4 b" . consult-buffer-other-window) ;; orig. switch-to-buffer-other-window
|
||||
("C-x 5 b" . consult-buffer-other-frame) ;; orig. switch-to-buffer-other-frame
|
||||
;; Custom M-# bindings for fast register access
|
||||
("M-#" . consult-register-load)
|
||||
("M-'" . consult-register-store) ;; orig. abbrev-prefix-mark (unrelated)
|
||||
("C-M-#" . consult-register)
|
||||
;; Other custom bindings
|
||||
("C-S-s" . consult-line)
|
||||
("M-*" . consult-line-symbol-at-point)
|
||||
("C-c f" . consult-recent-file)
|
||||
("C-c r" . consult-ripgrep)
|
||||
("C-c R" . consult-ripgrep-auto-preview)
|
||||
("C-c *" . consult-ripgrep-symbol-at-point)
|
||||
("M-y" . consult-yank-pop) ;; orig. yank-pop
|
||||
("<help> a" . consult-apropos) ;; orig. apropos-command
|
||||
;; M-g bindings (goto-map)
|
||||
("M-g e" . consult-compile-error)
|
||||
("M-g f" . consult-flycheck)
|
||||
("M-g g" . consult-goto-line) ;; orig. goto-line
|
||||
("M-g M-g" . consult-goto-line) ;; orig. goto-line
|
||||
("M-g o" . consult-outline) ;; Alternative: consult-org-heading
|
||||
("M-g m" . consult-mark)
|
||||
("M-g k" . consult-global-mark)
|
||||
("M-g i" . consult-imenu)
|
||||
("M-g I" . consult-project-imenu)
|
||||
:map isearch-mode-map
|
||||
("M-e" . consult-isearch) ;; orig. isearch-edit-string
|
||||
("M-s e" . consult-isearch) ;; orig. isearch-edit-string
|
||||
("M-s l" . consult-line)) ;; needed by consult-line to detect isearch
|
||||
|
||||
:init
|
||||
|
||||
;; Optionally configure the register formatting. This improves the register
|
||||
;; preview for `consult-register', `consult-register-load',
|
||||
;; `consult-register-store' and the Emacs built-ins.
|
||||
(setq register-preview-delay 0
|
||||
register-preview-function #'consult-register-format)
|
||||
|
||||
;; Optionally tweak the register preview window.
|
||||
;; This adds thin lines, sorting and hides the mode line of the window.
|
||||
(advice-add #'register-preview :override #'consult-register-window)
|
||||
|
||||
;; Optionally replace `completing-read-multiple' with an enhanced version.
|
||||
(advice-add #'completing-read-multiple :override #'consult-completing-read-multiple)
|
||||
|
||||
;; Use Consult to select xref locations with preview
|
||||
(setq xref-show-xrefs-function #'consult-xref
|
||||
xref-show-definitions-function #'consult-xref)
|
||||
|
||||
:config
|
||||
|
||||
(defun consult-ripgrep-symbol-at-point (&optional dir initial)
|
||||
(interactive
|
||||
(list prefix-arg (when-let ((s (symbol-at-point)))
|
||||
(symbol-name s))))
|
||||
(consult-ripgrep dir initial))
|
||||
(defun consult-ripgrep-auto-preview (&optional dir initial)
|
||||
(interactive "P")
|
||||
(consult-ripgrep dir initial))
|
||||
(defun consult-ripgrep-unrestricted (&optional dir initial)
|
||||
(interactive "P")
|
||||
(let ((consult-ripgrep-args (replace-regexp-in-string "\\." "-uu ." consult-ripgrep-args)))
|
||||
(consult-ripgrep dir initial)))
|
||||
(defun consult-z-ripgrep (&optional dir initial)
|
||||
(interactive "P")
|
||||
(let ((consult-ripgrep-args (replace-regexp-in-string "\\." "-z ." consult-ripgrep-args)))
|
||||
(consult-ripgrep dir initial)))
|
||||
(defun consult-buffer-no-preview ()
|
||||
(interactive)
|
||||
(consult-buffer))
|
||||
(defun consult-line-symbol-at-point ()
|
||||
(interactive)
|
||||
(consult-line (thing-at-point 'symbol)))
|
||||
|
||||
;; Add these here, as we have two bindings for search map (M-s and C-c s)
|
||||
(define-key search-map "f" 'consult-find)
|
||||
(define-key search-map "F" 'consult-locate)
|
||||
(define-key search-map "g" 'consult-grep)
|
||||
(define-key search-map "G" 'consult-git-grep)
|
||||
(define-key search-map "r" 'consult-ripgrep)
|
||||
(define-key search-map "R" 'consult-ripgrep-auto-preview)
|
||||
(define-key search-map "M-r" 'consult-ripgrep-unrestricted)
|
||||
(define-key search-map "*" 'consult-ripgrep-symbol-at-point)
|
||||
(define-key search-map "z" 'consult-z-ripgrep)
|
||||
(define-key search-map "l" 'consult-line)
|
||||
(define-key search-map "L" 'consult-line-multi)
|
||||
(define-key search-map "m" 'consult-multi-occur)
|
||||
(define-key search-map "k" 'consult-keep-lines)
|
||||
(define-key search-map "u" 'consult-focus-lines)
|
||||
(define-key search-map "e" 'consult-isearch)
|
||||
|
||||
;; Optionally configure preview. The default value
|
||||
;; is 'any, such that any key triggers the preview.
|
||||
;; (setq consult-preview-key 'any)
|
||||
;; (setq consult-preview-key (kbd "M-."))
|
||||
;; (setq consult-preview-key (list (kbd "<S-down>") (kbd "<S-up>")))
|
||||
;; For some commands and buffer sources it is useful to configure the
|
||||
;; :preview-key on a per-command basis using the `consult-customize' macro.
|
||||
(consult-customize
|
||||
consult-theme
|
||||
:preview-key '(:debounce 0.2 any)
|
||||
consult-ripgrep consult-git-grep consult-grep
|
||||
consult-ripgrep-unrestricted consult-ripgrep-symbol-at-point
|
||||
consult-bookmark consult-recent-file consult-xref consult-buffer-no-preview
|
||||
consult--source-file consult--source-project-file consult--source-bookmark
|
||||
:preview-key (kbd "M-."))
|
||||
|
||||
;; Optionally configure the narrowing key.
|
||||
;; Both < and C-+ work reasonably well.
|
||||
(setq consult-narrow-key "<") ;; (kbd "C-+")
|
||||
|
||||
;; Optionally make narrowing help available in the minibuffer.
|
||||
;; You may want to use `embark-prefix-help-command' or which-key instead.
|
||||
;; (define-key consult-narrow-map (vconcat consult-narrow-key "?") #'consult-narrow-help)
|
||||
|
||||
(autoload 'projectile-project-root "projectile")
|
||||
(setq consult-project-root-function #'projectile-project-root)
|
||||
|
||||
(defvar consult-initial-narrow-config
|
||||
'((consult-buffer . ?p)
|
||||
(consult-buffer-no-preview . ?p)))
|
||||
;; Add initial narrowing hook
|
||||
(defun consult-initial-narrow ()
|
||||
(when-let (key (alist-get this-command consult-initial-narrow-config))
|
||||
(setq unread-command-events (append unread-command-events (list key 32)))))
|
||||
(add-hook 'minibuffer-setup-hook #'consult-initial-narrow)
|
||||
|
||||
(when (and (eq system-type 'darwin) (string-match-p "^find" consult-find-command))
|
||||
(setq consult-find-command (concat "g" consult-find-command)))
|
||||
|
||||
(defun consult--orderless-regexp-compiler (input type)
|
||||
(setq input (orderless-pattern-compiler input))
|
||||
(cons
|
||||
(mapcar (lambda (r) (consult--convert-regexp r type)) input)
|
||||
(lambda (str) (orderless--highlight input str))))
|
||||
(defun consult--with-orderless (&rest args)
|
||||
(minibuffer-with-setup-hook
|
||||
(lambda ()
|
||||
(setq-local consult--regexp-compiler #'consult--orderless-regexp-compiler))
|
||||
(apply args)))
|
||||
(advice-add #'consult-ripgrep :around #'consult--with-orderless))
|
||||
|
||||
(use-package consult-flycheck)
|
||||
|
||||
(use-package consult-lsp
|
||||
:bind (:map lsp-mode-map
|
||||
([remap xref-find-apropos] . consult-lsp-symbols)))
|
||||
|
||||
(use-package consult-dir
|
||||
:ensure t
|
||||
:bind (("C-x C-d" . consult-dir)
|
||||
:map vertico-map ;minibuffer-local-completion-map
|
||||
("C-x C-d" . consult-dir)
|
||||
("C-x C-j" . consult-dir-jump-file)))
|
||||
|
||||
(use-package marginalia
|
||||
:bind (("M-A" . marginalia-cycle)
|
||||
:map minibuffer-local-map
|
||||
("M-A" . marginalia-cycle))
|
||||
:init
|
||||
(marginalia-mode)
|
||||
:config
|
||||
;; For Projectile
|
||||
(add-to-list 'marginalia-prompt-categories '("Switch to project" . file))
|
||||
(add-to-list 'marginalia-prompt-categories '("Find file" . project-file))
|
||||
(add-to-list 'marginalia-prompt-categories '("Recently visited files" . project-file))
|
||||
(add-to-list 'marginalia-prompt-categories '("Switch to buffer" . buffer))
|
||||
;; For Crux
|
||||
(add-to-list 'marginalia-prompt-categories '("Choose recent file" . file)))
|
||||
|
||||
(use-package embark
|
||||
:bind
|
||||
(("C-," . embark-act)
|
||||
;; CIDER will override M-. so have two bindings for this
|
||||
("M-." . embark-dwim)
|
||||
("C-." . embark-dwim)
|
||||
("C-c C-o" . embark-export)
|
||||
("C-h b" . embark-bindings)
|
||||
("C-h B" . describe-bindings))
|
||||
:init
|
||||
;; Optionally replace the key help with a completing-read interface
|
||||
(setq prefix-help-command #'embark-prefix-help-command)
|
||||
:config
|
||||
;; Hide the mode line of the Embark live/completions buffers
|
||||
(add-to-list 'display-buffer-alist
|
||||
'("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*"
|
||||
nil
|
||||
(window-parameters (mode-line-format . none)))))
|
||||
|
||||
(use-package embark-consult
|
||||
:after (embark consult)
|
||||
:demand t ; only necessary if you have the hook below
|
||||
;; if you want to have consult previews as you move around an
|
||||
;; auto-updating embark collect buffer
|
||||
:hook
|
||||
(embark-collect-mode . consult-preview-at-point-mode))
|
||||
|
||||
(provide 'init-minibuffer)
|
||||
;;; init-minibuffer.el ends here
|
||||
Loading…
Reference in New Issue