completion/selectrum -> completion/vertico, part 2

- Rename module from `:completion selectrum` to `:completion vertico`
- Rename all files involved
- Do *not* yet rename all the functions, as that messes up git's rename
  detection.
This commit is contained in:
Itai Y. Efrat 2021-07-09 20:16:11 +03:00
parent f9e1c99b2b
commit 24eaa1317c
33 changed files with 79 additions and 90 deletions

View file

@ -46,7 +46,7 @@ completion.
+ helm =+fuzzy +childframe= - *Another* search engine for love and life + helm =+fuzzy +childframe= - *Another* search engine for love and life
+ ido - The /other/ *other* search engine for love and life + ido - The /other/ *other* search engine for love and life
+ [[file:../modules/completion/ivy/README.org][ivy]] =+fuzzy +prescient +childframe +icons= - /The/ search engine for love and life + [[file:../modules/completion/ivy/README.org][ivy]] =+fuzzy +prescient +childframe +icons= - /The/ search engine for love and life
+ [[file:../modules/completion/selectrum/README.org][selectrum]] =+icons= - The search engine of the future + [[file:../modules/completion/vertico/README.org][vertico]] =+icons= - The search engine of the future
* :config * :config
Modules that configure Emacs one way or another, or focus on making it easier Modules that configure Emacs one way or another, or focus on making it easier

View file

@ -24,7 +24,7 @@
;;helm ; the *other* search engine for love and life ;;helm ; the *other* search engine for love and life
;;ido ; the other *other* search engine... ;;ido ; the other *other* search engine...
ivy ; a search engine for love and life ivy ; a search engine for love and life
;;selectrum ; the search engine of the future ;;vertico ; the search engine of the future
:ui :ui
;;deft ; notational velocity for Emacs ;;deft ; notational velocity for Emacs

View file

@ -69,8 +69,8 @@ argument) is non-nil only show channels in current server."
(interactive "P") (interactive "P")
(call-interactively (call-interactively
(cond ((featurep! :completion ivy) #'+irc/ivy-jump-to-channel) (cond ((featurep! :completion ivy) #'+irc/ivy-jump-to-channel)
((featurep! :completion selectrum) #'+irc/selectrum-jump-to-channel) ((featurep! :completion vertico) #'+irc/selectrum-jump-to-channel)
((user-error "No jump-to-channel backend is enabled. Enable selectrum or ivy!"))))) ((user-error "No jump-to-channel backend is enabled. Enable vertico or ivy!")))))
;;;###autoload ;;;###autoload
(defun +irc--circe-all-buffers () (defun +irc--circe-all-buffers ()

View file

@ -1,9 +1,9 @@
;;; app/irc/autoload/selectrum.el -*- lexical-binding: t; -*- ;;; app/irc/autoload/vertico.el -*- lexical-binding: t; -*-
;;;###if (featurep! :completion selectrum) ;;;###if (featurep! :completion vertico)
;;;###autoload ;;;###autoload
(defun +irc/selectrum-jump-to-channel () (defun +irc/selectrum-jump-to-channel ()
"Jump to an open channel or server buffer with selectrum." "Jump to an open channel or server buffer with vertico."
(interactive) (interactive)
(require 'consult) (require 'consult)
(consult--multi (list (plist-put (copy-sequence +irc--consult-circe-source) (consult--multi (list (plist-put (copy-sequence +irc--consult-circe-source)

View file

@ -141,7 +141,7 @@ playback.")
;; Fail gracefully if not in a circe buffer ;; Fail gracefully if not in a circe buffer
(global-set-key [remap tracking-next-buffer] #'+irc/tracking-next-buffer) (global-set-key [remap tracking-next-buffer] #'+irc/tracking-next-buffer)
(when (featurep! :completion selectrum) (when (featurep! :completion vertico)
(after! consult (after! consult
(add-to-list 'consult-buffer-sources '+irc--consult-circe-source 'append))) (add-to-list 'consult-buffer-sources '+irc--consult-circe-source 'append)))

View file

@ -46,7 +46,7 @@ This module has no dedicated maintainers.
+ [[https://github.com/d12frosted/flyspell-correct][flyspell-correct]] + [[https://github.com/d12frosted/flyspell-correct][flyspell-correct]]
+ [[https://github.com/d12frosted/flyspell-correct#flyspell-correct-ivy-interface][flyspell-correct-ivy]] (=completion/ivy=) + [[https://github.com/d12frosted/flyspell-correct#flyspell-correct-ivy-interface][flyspell-correct-ivy]] (=completion/ivy=)
+ [[https://github.com/d12frosted/flyspell-correct#flyspell-correct-helm-interface][flyspell-correct-helm]] (=completion/helm=) + [[https://github.com/d12frosted/flyspell-correct#flyspell-correct-helm-interface][flyspell-correct-helm]] (=completion/helm=)
+ [[https://github.com/d12frosted/flyspell-correct#flyspell-correct-popup-interface][flyspell-correct-popup]] (if *neither* =completion/ivy=, =completion/helm= or =completion/selectrum=) + [[https://github.com/d12frosted/flyspell-correct#flyspell-correct-popup-interface][flyspell-correct-popup]] (if *neither* =completion/ivy=, =completion/helm= or =completion/vertico=)
+ [[https://github.com/rolandwalker/flyspell-lazy][flyspell-lazy]] + [[https://github.com/rolandwalker/flyspell-lazy][flyspell-lazy]]
+ else + else
+ [[https://gitlab.com/ideasman42/emacs-spell-fu][spell-fu]] + [[https://gitlab.com/ideasman42/emacs-spell-fu][spell-fu]]

View file

@ -63,7 +63,7 @@
(ispell-accept-buffer-local-defs)) (ispell-accept-buffer-local-defs))
(if (not (or (featurep! :completion ivy) (if (not (or (featurep! :completion ivy)
(featurep! :completion helm) (featurep! :completion helm)
(featurep! :completion selectrum))) (featurep! :completion vertico)))
(call-interactively #'ispell-word) (call-interactively #'ispell-word)
(cl-destructuring-bind (start . end) (cl-destructuring-bind (start . end)
(or (bounds-of-thing-at-point 'word) (or (bounds-of-thing-at-point 'word)

View file

@ -234,7 +234,7 @@ e.g. proselint and langtool."
(require 'flyspell-correct-helm nil t))) (require 'flyspell-correct-helm nil t)))
((and (featurep! :completion ivy) ((and (featurep! :completion ivy)
(require 'flyspell-correct-ivy nil t))) (require 'flyspell-correct-ivy nil t)))
((featurep! :completion selectrum)) ; selectrum doesn't need any extra configuration ((featurep! :completion vertico)) ; vertico doesn't need any extra configuration
((require 'flyspell-correct-popup nil t) ; only use popup if no compatible completion UI is enabled ((require 'flyspell-correct-popup nil t) ; only use popup if no compatible completion UI is enabled
(setq flyspell-popup-correct-delay 0.8) (setq flyspell-popup-correct-delay 0.8)
(define-key popup-menu-keymap [escape] #'keyboard-quit)))) (define-key popup-menu-keymap [escape] #'keyboard-quit))))

View file

@ -8,6 +8,6 @@
(package! flyspell-correct-ivy)) (package! flyspell-correct-ivy))
((featurep! :completion helm) ((featurep! :completion helm)
(package! flyspell-correct-helm)) (package! flyspell-correct-helm))
((not (featurep! :completion selectrum)) ((not (featurep! :completion vertico))
(package! flyspell-correct-popup))) (package! flyspell-correct-popup)))
(package! flyspell-lazy :pin "0fc5996bcee20b46cbd227ae948d343c3bef7339")) (package! flyspell-lazy :pin "0fc5996bcee20b46cbd227ae948d343c3bef7339"))

View file

@ -1,4 +1,4 @@
#+TITLE: completion/selectrum #+TITLE: completion/vertico
#+DATE: February 16, 2021 #+DATE: February 16, 2021
#+SINCE: v3.0.0 #+SINCE: v3.0.0
#+STARTUP: inlineimages #+STARTUP: inlineimages
@ -52,7 +52,7 @@ Doom-specific additions:
This module provides an interface to navigate within a project using This module provides an interface to navigate within a project using
=projectile=: =projectile=:
https://assets.doomemacs.org/completion/selectrum/projectile.png https://assets.doomemacs.org/completion/vertico/projectile.png
| Keybind | Description | | Keybind | Description |
|----------------------+-------------------------------------| |----------------------+-------------------------------------|
@ -70,7 +70,7 @@ This module provides interactive text search and replace using ripgrep.
| =SPC s d= | Search this directory | | =SPC s d= | Search this directory |
| =SPC s D= | Search another directory | | =SPC s D= | Search another directory |
https://assets.doomemacs.org/completion/selectrum/search.png https://assets.doomemacs.org/completion/vertico/search.png
Prefixing these keys with the universal argument (=SPC u= for evil users; =C-u= Prefixing these keys with the universal argument (=SPC u= for evil users; =C-u=
otherwise) changes the behavior of these commands, instructing the underlying otherwise) changes the behavior of these commands, instructing the underlying
@ -104,7 +104,7 @@ Changes to the resulting wgrep buffer (opened by =C-c C-e=) can be committed
with =C-c C-c= and aborted with =C-c C-k= (alternatively =ZZ= and =ZQ=, for evil with =C-c C-c= and aborted with =C-c C-k= (alternatively =ZZ= and =ZQ=, for evil
users). users).
https://assets.doomemacs.org/completion/selectrum/search-replace.png https://assets.doomemacs.org/completion/vertico/search-replace.png
** In-buffer searching ** In-buffer searching
This module provides some in buffer searching bindings: This module provides some in buffer searching bindings:
@ -113,7 +113,7 @@ This module provides some in buffer searching bindings:
+ =SPC s S= (~+selectrum/search-symbol-at-point~ via ~consult-line~) + =SPC s S= (~+selectrum/search-symbol-at-point~ via ~consult-line~)
+ =SPC s b= (~consult-line~) + =SPC s b= (~consult-line~)
https://assets.doomemacs.org/completion/selectrum/buffer-search.png https://assets.doomemacs.org/completion/vertico/buffer-search.png
An ~occur-edit~ buffer can be opened from ~consult-line~ with =C-c C-e=. An ~occur-edit~ buffer can be opened from ~consult-line~ with =C-c C-e=.

View file

@ -28,7 +28,7 @@ case for why this should be an exception:
- other than helping with discoverability for stuff this also allows for - other than helping with discoverability for stuff this also allows for
commands for things that are too niche for top level bindings, such as actions commands for things that are too niche for top level bindings, such as actions
on ~package!~ statements and recipes or urls. on ~package!~ statements and recipes or urls.
- selectrum is slated to become the default completion module, which makes this - vertico is slated to become the default completion module, which makes this
less of an inconsistency, but I'm not sure about the performance slowdown in less of an inconsistency, but I'm not sure about the performance slowdown in
~map!~ since that seems to be one of the main concerns. ~map!~ since that seems to be one of the main concerns.
- ~embark~ like most packages in the vertico cinematic universe can be - ~embark~ like most packages in the vertico cinematic universe can be
@ -57,17 +57,6 @@ Do we want to have the annotations be more like ivy? e.g.
- Mark the modified/remote status of the buffer with color, on top of the - Mark the modified/remote status of the buffer with color, on top of the
modification column? modification column?
- Change colors in general? - Change colors in general?
** TODO Consider renaming the module
=:completion selectrum= is a bit of a misnomer. Selectrum is probably the
most easily replaceable part of the module as it can replaced with Vertico
fairly easily, other than losing the ~selectrum-repeat~ command. However,
naming is hard™. Best alternative I can think of is this:
#+begin_src emacs-lisp
:completion
;...
;ivy ;; a search engine for love and life
compleseus ;; a search engine with all the planks replaced
#+end_src
* PROJ HACKs to be addressed * PROJ HACKs to be addressed
** TODO ~fboundp~ issues ** TODO ~fboundp~ issues

View file

@ -1,13 +1,13 @@
;; completion/selectrum/autoload/evil.el -*- lexical-binding: t; -*- ;; completion/vertico/autoload/evil.el -*- lexical-binding: t; -*-
;;;###if (featurep! :editor evil) ;;;###if (featurep! :editor evil)
;;;###autoload (autoload '+selectrum:project-search "completion/selectrum/autoload/evil" nil t) ;;;###autoload (autoload '+selectrum:project-search "completion/vertico/autoload/evil" nil t)
(evil-define-command +selectrum:project-search (query &optional all-files-p) (evil-define-command +selectrum:project-search (query &optional all-files-p)
"Ex interface for `+selectrum/project-search'." "Ex interface for `+selectrum/project-search'."
(interactive "<a><!>") (interactive "<a><!>")
(+selectrum/project-search all-files-p query)) (+selectrum/project-search all-files-p query))
;;;###autoload (autoload '+selectrum:project-search-from-cwd "completion/selectrum/autoload/evil" nil t) ;;;###autoload (autoload '+selectrum:project-search-from-cwd "completion/vertico/autoload/evil" nil t)
(evil-define-command +selectrum:project-search-from-cwd (query &optional recurse-p) (evil-define-command +selectrum:project-search-from-cwd (query &optional recurse-p)
"Ex interface for `+selectrum/project-search-from-cwd'." "Ex interface for `+selectrum/project-search-from-cwd'."
(interactive "<a><!>") (interactive "<a><!>")

View file

@ -1,4 +1,4 @@
;;; completion/selectrum/autoload/selectrum.el -*- lexical-binding: t; -*- ;;; completion/vertico/autoload/vertico.el -*- lexical-binding: t; -*-
;;;###autoload ;;;###autoload
(defadvice! +selectrum--company-capf--candidates-a (fn &rest args) (defadvice! +selectrum--company-capf--candidates-a (fn &rest args)
@ -77,7 +77,7 @@ If ARG (universal argument), include all files, even hidden or compressed ones."
;;;###autoload ;;;###autoload
(defun +selectrum/backward-updir () (defun +selectrum/backward-updir ()
"Delete char before or go up directory for file cagetory selectrum buffers." "Delete char before or go up directory for file cagetory vertico buffers."
(interactive) (interactive)
(let ((metadata (completion-metadata (minibuffer-contents) (let ((metadata (completion-metadata (minibuffer-contents)
minibuffer-completion-table minibuffer-completion-table
@ -95,7 +95,7 @@ If ARG (universal argument), include all files, even hidden or compressed ones."
;;;###autoload ;;;###autoload
(defun +selectrum/embark-export-write () (defun +selectrum/embark-export-write ()
"Export the current selectrum results to a writable buffer if possible. "Export the current vertico results to a writable buffer if possible.
Supports exporting consult-grep to wgrep, file to wdeired, and consult-location to occur-edit" Supports exporting consult-grep to wgrep, file to wdeired, and consult-location to occur-edit"
(interactive) (interactive)
@ -113,7 +113,7 @@ Supports exporting consult-grep to wgrep, file to wdeired, and consult-location
;;;###autoload ;;;###autoload
(defun +selectrum/embark-preview () (defun +selectrum/embark-preview ()
"Previews candidate in selectrum buffer, unless it's a consult command" "Previews candidate in vertico buffer, unless it's a consult command"
(interactive) (interactive)
(unless (bound-and-true-p consult--preview-function) (unless (bound-and-true-p consult--preview-function)
(save-selected-window (save-selected-window

View file

@ -1,4 +1,4 @@
;;; completion/selectrum/autoload/workspaces.el -*- lexical-binding: t; -*- ;;; completion/vertico/autoload/workspaces.el -*- lexical-binding: t; -*-
;;;###if (featurep! :ui workspaces) ;;;###if (featurep! :ui workspaces)
;;;###autoload ;;;###autoload

View file

@ -1,4 +1,4 @@
;;; completion/selectrum/config.el -*- lexical-binding: t; -*- ;;; completion/vertico/config.el -*- lexical-binding: t; -*-
(use-package! vertico (use-package! vertico
:hook (doom-first-input . vertico-mode) :hook (doom-first-input . vertico-mode)

View file

@ -1,5 +1,5 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; completion/selectrum/packages.el ;;; completion/vertico/packages.el
(package! vertico (package! vertico
:recipe (:host github :repo "minad/vertico" :recipe (:host github :repo "minad/vertico"

View file

@ -54,7 +54,7 @@
(:when (featurep! :completion helm) (:when (featurep! :completion helm)
:desc "Jump to symbol in current workspace" "j" #'helm-lsp-workspace-symbol :desc "Jump to symbol in current workspace" "j" #'helm-lsp-workspace-symbol
:desc "Jump to symbol in any workspace" "J" #'helm-lsp-global-workspace-symbol) :desc "Jump to symbol in any workspace" "J" #'helm-lsp-global-workspace-symbol)
(:when (featurep! :completion selectrum) (:when (featurep! :completion vertico)
:desc "Jump to symbol in current workspace" "j" #'consult-lsp-symbols :desc "Jump to symbol in current workspace" "j" #'consult-lsp-symbols
:desc "Jump to symbol in any workspace" "J" (cmd! #'consult-lsp-symbols '(4))) :desc "Jump to symbol in any workspace" "J" (cmd! #'consult-lsp-symbols '(4)))
(:when (featurep! :ui treemacs +lsp) (:when (featurep! :ui treemacs +lsp)
@ -116,7 +116,7 @@
:desc "Search buffer" "b" :desc "Search buffer" "b"
(cond ((featurep! :completion helm) #'swiper) (cond ((featurep! :completion helm) #'swiper)
((featurep! :completion ivy) #'swiper) ((featurep! :completion ivy) #'swiper)
((featurep! :completion selectrum) #'consult-line)) ((featurep! :completion vertico) #'consult-line))
:desc "Search all open buffers" "B" :desc "Search all open buffers" "B"
(cond ((featurep! :completion helm) #'swiper-all) (cond ((featurep! :completion helm) #'swiper-all)
((featurep! :completion ivy) #'swiper-all)) ((featurep! :completion ivy) #'swiper-all))
@ -137,7 +137,7 @@
:desc "Search buffer for thing at point" "S" :desc "Search buffer for thing at point" "S"
(cond ((featurep! :completion helm) #'swiper-isearch-thing-at-point) (cond ((featurep! :completion helm) #'swiper-isearch-thing-at-point)
((featurep! :completion ivy) #'swiper-isearch-thing-at-point) ((featurep! :completion ivy) #'swiper-isearch-thing-at-point)
((featurep! :completion selectrum) #'+selectrum/search-symbol-at-point)) ((featurep! :completion vertico) #'+selectrum/search-symbol-at-point))
:desc "Dictionary" "t" #'+lookup/dictionary-definition :desc "Dictionary" "t" #'+lookup/dictionary-definition
:desc "Thesaurus" "T" #'+lookup/synonyms) :desc "Thesaurus" "T" #'+lookup/synonyms)
@ -158,7 +158,7 @@
:desc "Bibliographic entries" "b" :desc "Bibliographic entries" "b"
(cond ((featurep! :completion ivy) #'ivy-bibtex) (cond ((featurep! :completion ivy) #'ivy-bibtex)
((featurep! :completion helm) #'helm-bibtex) ((featurep! :completion helm) #'helm-bibtex)
((featurep! :completion selectrum) #'bibtex-actions-open-entry))) ((featurep! :completion vertico) #'bibtex-actions-open-entry)))
:desc "Toggle last org-clock" "c" #'+org/toggle-last-clock :desc "Toggle last org-clock" "c" #'+org/toggle-last-clock
:desc "Cancel current org-clock" "C" #'org-clock-cancel :desc "Cancel current org-clock" "C" #'org-clock-cancel
@ -434,7 +434,7 @@
:desc "Send message" "s" #'+irc/send-message :desc "Send message" "s" #'+irc/send-message
(:when (featurep! :completion ivy) (:when (featurep! :completion ivy)
:desc "Jump to channel" "j" #'+irc/ivy-jump-to-channel) :desc "Jump to channel" "j" #'+irc/ivy-jump-to-channel)
(:when (featurep! :completion selectrum) (:when (featurep! :completion vertico)
:desc "Jump to channel" "j" #'+irc/selectrum-jump-to-channel))) :desc "Jump to channel" "j" #'+irc/selectrum-jump-to-channel)))
;;; <leader> T --- twitter ;;; <leader> T --- twitter
@ -463,7 +463,7 @@
(:when (featurep! :completion helm) (:when (featurep! :completion helm)
"C-S-s" #'swiper-helm "C-S-s" #'swiper-helm
"C-S-r" #'helm-resume) "C-S-r" #'helm-resume)
(:when (featurep! :completion selectrum) (:when (featurep! :completion vertico)
"C-S-r" #'vertico-repeat) "C-S-r" #'vertico-repeat)
;;; objed ;;; objed
@ -498,10 +498,10 @@
[backtab] #'company-select-previous [backtab] #'company-select-previous
"C-RET" (cond ((featurep! :completion helm) #'helm-company) "C-RET" (cond ((featurep! :completion helm) #'helm-company)
((featurep! :completion ivy) #'counsel-company) ((featurep! :completion ivy) #'counsel-company)
((featurep! :completion selectrum) #'completion-at-point)) ((featurep! :completion vertico) #'completion-at-point))
"C-<return>" (cond ((featurep! :completion helm) #'helm-company) "C-<return>" (cond ((featurep! :completion helm) #'helm-company)
((featurep! :completion ivy) #'counsel-company) ((featurep! :completion ivy) #'counsel-company)
((featurep! :completion selectrum) #'completion-at-point)) ((featurep! :completion vertico) #'completion-at-point))
:map company-search-map :map company-search-map
"C-n" #'company-search-repeat-forward "C-n" #'company-search-repeat-forward
"C-p" #'company-search-repeat-backward "C-p" #'company-search-repeat-backward

View file

@ -140,7 +140,7 @@
"C-s" #'company-filter-candidates "C-s" #'company-filter-candidates
"C-S-s" (cond ((featurep! :completion helm) #'helm-company) "C-S-s" (cond ((featurep! :completion helm) #'helm-company)
((featurep! :completion ivy) #'counsel-company) ((featurep! :completion ivy) #'counsel-company)
((featurep! :completion selectrum) #'completion-at-point)) ((featurep! :completion vertico) #'completion-at-point))
"C-SPC" #'company-complete-common "C-SPC" #'company-complete-common
"TAB" #'company-complete-common-or-cycle "TAB" #'company-complete-common-or-cycle
[tab] #'company-complete-common-or-cycle [tab] #'company-complete-common-or-cycle
@ -203,7 +203,7 @@
(:after helm-grep :map helm-grep-map (:after helm-grep :map helm-grep-map
[C-return] #'helm-grep-run-other-window-action)) [C-return] #'helm-grep-run-other-window-action))
(:when (featurep! :completion selectrum) (:when (featurep! :completion vertico)
(:after vertico (:after vertico
:map vertico-map :map vertico-map
"M-RET" #'vertico-exit-input "M-RET" #'vertico-exit-input
@ -306,7 +306,7 @@
:desc "Resume last search" "'" :desc "Resume last search" "'"
(cond ((featurep! :completion ivy) #'ivy-resume) (cond ((featurep! :completion ivy) #'ivy-resume)
((featurep! :completion helm) #'helm-resume) ((featurep! :completion helm) #'helm-resume)
((featurep! :completion selectrum) #'vertico-repeat)) ((featurep! :completion vertico) #'vertico-repeat))
:desc "Search for symbol in project" "*" #'+default/search-project-for-symbol-at-point :desc "Search for symbol in project" "*" #'+default/search-project-for-symbol-at-point
:desc "Search project" "/" #'+default/search-project :desc "Search project" "/" #'+default/search-project
@ -384,7 +384,7 @@
(:when (featurep! :completion helm) (:when (featurep! :completion helm)
:desc "Jump to symbol in current workspace" "j" #'helm-lsp-workspace-symbol :desc "Jump to symbol in current workspace" "j" #'helm-lsp-workspace-symbol
:desc "Jump to symbol in any workspace" "J" #'helm-lsp-global-workspace-symbol) :desc "Jump to symbol in any workspace" "J" #'helm-lsp-global-workspace-symbol)
(:when (featurep! :completion selectrum) (:when (featurep! :completion vertico)
:desc "Jump to symbol in current workspace" "j" #'consult-lsp-symbols :desc "Jump to symbol in current workspace" "j" #'consult-lsp-symbols
:desc "Jump to symbol in any workspace" "J" (cmd! #'consult-lsp-symbols '(4))) :desc "Jump to symbol in any workspace" "J" (cmd! #'consult-lsp-symbols '(4)))
(:when (featurep! :ui treemacs +lsp) (:when (featurep! :ui treemacs +lsp)
@ -518,7 +518,7 @@
:desc "Bibliographic entries" "b" :desc "Bibliographic entries" "b"
(cond ((featurep! :completion ivy) #'ivy-bibtex) (cond ((featurep! :completion ivy) #'ivy-bibtex)
((featurep! :completion helm) #'helm-bibtex) ((featurep! :completion helm) #'helm-bibtex)
((featurep! :completion selectrum) #'bibtex-actions-open-entry))) ((featurep! :completion vertico) #'bibtex-actions-open-entry)))
:desc "Toggle last org-clock" "c" #'+org/toggle-last-clock :desc "Toggle last org-clock" "c" #'+org/toggle-last-clock
:desc "Cancel current org-clock" "C" #'org-clock-cancel :desc "Cancel current org-clock" "C" #'org-clock-cancel
@ -680,7 +680,7 @@
:desc "Search buffer" "b" :desc "Search buffer" "b"
(cond ((featurep! :completion helm) #'swiper) (cond ((featurep! :completion helm) #'swiper)
((featurep! :completion ivy) #'swiper) ((featurep! :completion ivy) #'swiper)
((featurep! :completion selectrum) #'consult-line)) ((featurep! :completion vertico) #'consult-line))
:desc "Search all open buffers" "B" :desc "Search all open buffers" "B"
(cond ((featurep! :completion helm) #'swiper-all) (cond ((featurep! :completion helm) #'swiper-all)
((featurep! :completion ivy) #'swiper-all)) ((featurep! :completion ivy) #'swiper-all))
@ -703,7 +703,7 @@
:desc "Search buffer for thing at point" "S" :desc "Search buffer for thing at point" "S"
(cond ((featurep! :completion helm) #'swiper-isearch-thing-at-point) (cond ((featurep! :completion helm) #'swiper-isearch-thing-at-point)
((featurep! :completion ivy) #'swiper-isearch-thing-at-point) ((featurep! :completion ivy) #'swiper-isearch-thing-at-point)
((featurep! :completion selectrum) #'+selectrum/search-symbol-at-point)) ((featurep! :completion vertico) #'+selectrum/search-symbol-at-point))
:desc "Dictionary" "t" #'+lookup/dictionary-definition :desc "Dictionary" "t" #'+lookup/dictionary-definition
:desc "Thesaurus" "T" #'+lookup/synonyms) :desc "Thesaurus" "T" #'+lookup/synonyms)

View file

@ -12,7 +12,7 @@ If prefix ARG is set, prompt for a directory to search from."
(call-interactively (call-interactively
(cond ((featurep! :completion ivy) #'+ivy/project-search-from-cwd) (cond ((featurep! :completion ivy) #'+ivy/project-search-from-cwd)
((featurep! :completion helm) #'+helm/project-search-from-cwd) ((featurep! :completion helm) #'+helm/project-search-from-cwd)
((featurep! :completion selectrum) #'+selectrum/project-search-from-cwd) ((featurep! :completion vertico) #'+selectrum/project-search-from-cwd)
(#'rgrep))))) (#'rgrep)))))
;;;###autoload ;;;###autoload
@ -31,7 +31,7 @@ If a selection is active, pre-fill the prompt with it."
(if (region-active-p) (if (region-active-p)
#'swiper-isearch-thing-at-point #'swiper-isearch-thing-at-point
#'swiper-isearch)) #'swiper-isearch))
((featurep! :completion selectrum) #'isearch-forward)))) ((featurep! :completion vertico) #'isearch-forward))))
;;;###autoload ;;;###autoload
(defun +default/search-project (&optional arg) (defun +default/search-project (&optional arg)
@ -50,7 +50,7 @@ If prefix ARG is set, include ignored/hidden files."
(call-interactively (call-interactively
(cond ((featurep! :completion ivy) #'+ivy/project-search) (cond ((featurep! :completion ivy) #'+ivy/project-search)
((featurep! :completion helm) #'+helm/project-search) ((featurep! :completion helm) #'+helm/project-search)
((featurep! :completion selectrum) #'+selectrum/project-search) ((featurep! :completion vertico) #'+selectrum/project-search)
(#'projectile-ripgrep))))) (#'projectile-ripgrep)))))
;;;###autoload ;;;###autoload
@ -77,7 +77,7 @@ If prefix ARG is set, prompt for a known project to search from."
(+ivy/project-search nil symbol)) (+ivy/project-search nil symbol))
((featurep! :completion helm) ((featurep! :completion helm)
(+helm/project-search nil symbol)) (+helm/project-search nil symbol))
((featurep! :completion selectrum) ((featurep! :completion vertico)
(+selectrum/project-search nil symbol)) (+selectrum/project-search nil symbol))
((rgrep (regexp-quote symbol)))))) ((rgrep (regexp-quote symbol))))))

View file

@ -30,7 +30,7 @@
(cond ((fboundp 'consult-yank-pop) #'consult-yank-pop) ;HACK see @ymarco's comment on #5013 and TODO.org in the selecturm module. (cond ((fboundp 'consult-yank-pop) #'consult-yank-pop) ;HACK see @ymarco's comment on #5013 and TODO.org in the selecturm module.
((fboundp 'counsel-yank-pop) #'counsel-yank-pop) ((fboundp 'counsel-yank-pop) #'counsel-yank-pop)
((fboundp 'helm-show-kill-ring) #'helm-show-kill-ring) ((fboundp 'helm-show-kill-ring) #'helm-show-kill-ring)
((error "No kill-ring search backend available. Enable ivy, helm or selectrum!"))))) ((error "No kill-ring search backend available. Enable ivy, helm or vertico!")))))
;;;###autoload ;;;###autoload
(defun +default/yank-buffer-path (&optional root) (defun +default/yank-buffer-path (&optional root)

View file

@ -402,12 +402,12 @@ Continues comments if executed from a commented line. Consults
"A-x" #'execute-extended-command) "A-x" #'execute-extended-command)
;; A Doom convention where C-s on popups and interactive searches will invoke ;; A Doom convention where C-s on popups and interactive searches will invoke
;; ivy/helm/selectrum for their superior filtering. ;; ivy/helm/vertico for their superior filtering.
(when-let (command (cond ((featurep! :completion ivy) (when-let (command (cond ((featurep! :completion ivy)
#'counsel-minibuffer-history) #'counsel-minibuffer-history)
((featurep! :completion helm) ((featurep! :completion helm)
#'helm-minibuffer-history) #'helm-minibuffer-history)
((featurep! :completion selectrum) ((featurep! :completion vertico)
#'consult-history))) #'consult-history)))
(define-key! (define-key!
:keymaps (append +default-minibuffer-maps :keymaps (append +default-minibuffer-maps

View file

@ -69,7 +69,7 @@
((featurep! :completion helm) ((featurep! :completion helm)
(evil-ex-define-cmd "pg[rep]" #'+helm:project-search) (evil-ex-define-cmd "pg[rep]" #'+helm:project-search)
(evil-ex-define-cmd "pg[grep]d" #'+helm:project-search-from-cwd)) (evil-ex-define-cmd "pg[grep]d" #'+helm:project-search-from-cwd))
((featurep! :completion selectrum) ((featurep! :completion vertico)
(evil-ex-define-cmd "pg[rep]" #'+selectrum:project-search) (evil-ex-define-cmd "pg[rep]" #'+selectrum:project-search)
(evil-ex-define-cmd "pg[grep]d" #'+selectrum:project-search-from-cwd))) (evil-ex-define-cmd "pg[grep]d" #'+selectrum:project-search-from-cwd)))

View file

@ -42,11 +42,11 @@
mu4e-context-policy 'pick-first mu4e-context-policy 'pick-first
;; compose with the current context, or ask ;; compose with the current context, or ask
mu4e-compose-context-policy 'ask-if-none mu4e-compose-context-policy 'ask-if-none
;; use helm/ivy/selectrum ;; use helm/ivy/vertico
mu4e-completing-read-function mu4e-completing-read-function
(cond ((featurep! :completion ivy) #'ivy-completing-read) (cond ((featurep! :completion ivy) #'ivy-completing-read)
((featurep! :completion helm) #'completing-read) ((featurep! :completion helm) #'completing-read)
((featurep! :completion selectrum) #'completing-read) ((featurep! :completion vertico) #'completing-read)
(t #'ido-completing-read)) (t #'ido-completing-read))
;; no need to ask ;; no need to ask
mu4e-confirm-quit nil mu4e-confirm-quit nil

View file

@ -106,6 +106,6 @@ OR a shell command string such as
(use-package! consult-notmuch (use-package! consult-notmuch
:when (featurep! :completion selectrum) :when (featurep! :completion vertico)
:commands consult-notmuch :commands consult-notmuch
:after notmuch) :after notmuch)

View file

@ -8,5 +8,5 @@
(package! counsel-notmuch :pin "a4a1562935e4180c42524c51609d1283e9be0688")) (package! counsel-notmuch :pin "a4a1562935e4180c42524c51609d1283e9be0688"))
(when (featurep! :completion helm) (when (featurep! :completion helm)
(package! helm-notmuch :pin "97a01497e079a7b6505987e9feba6b603bbec288")) (package! helm-notmuch :pin "97a01497e079a7b6505987e9feba6b603bbec288"))
(when (featurep! :completion selectrum) (when (featurep! :completion vertico)
(package! consult-notmuch :pin "67cf219fcce211237347a783ce6982402341d5fd")) (package! consult-notmuch :pin "67cf219fcce211237347a783ce6982402341d5fd"))

View file

@ -105,7 +105,7 @@ In all cases, 'h' functions go to 'c' and 'l' ones go to 'r' so the navigation k
:n "C-#" #'+popup/raise)) :n "C-#" #'+popup/raise))
(after! treemacs (after! treemacs
(+layout-bepo-rotate-ts-bare-keymap '(evil-treemacs-state-map))) (+layout-bepo-rotate-ts-bare-keymap '(evil-treemacs-state-map)))
(after! (:or helm ivy selectrum icomplete) (after! (:or helm ivy vertico icomplete)
(+layout-bepo-rotate-keymaps (+layout-bepo-rotate-keymaps
'(minibuffer-local-map '(minibuffer-local-map
minibuffer-local-ns-map minibuffer-local-ns-map

View file

@ -724,7 +724,7 @@ between the two."
(:when (featurep! :completion helm) (:when (featurep! :completion helm)
"." #'helm-org-in-buffer-headings "." #'helm-org-in-buffer-headings
"/" #'helm-org-agenda-files-headings) "/" #'helm-org-agenda-files-headings)
(:when (featurep! :completion selectrum) (:when (featurep! :completion vertico)
"." #'consult-org-heading "." #'consult-org-heading
"/" #'consult-org-agenda) "/" #'consult-org-agenda)
"A" #'org-archive-subtree "A" #'org-archive-subtree
@ -810,7 +810,7 @@ between the two."
(:when (featurep! :completion helm) (:when (featurep! :completion helm)
"g" #'helm-org-in-buffer-headings "g" #'helm-org-in-buffer-headings
"G" #'helm-org-agenda-files-headings) "G" #'helm-org-agenda-files-headings)
(:when (featurep! :completion selectrum) (:when (featurep! :completion vertico)
"g" #'consult-org-heading "g" #'consult-org-heading
"G" #'consult-org-agenda) "G" #'consult-org-agenda)
"c" #'org-clock-goto "c" #'org-clock-goto

View file

@ -15,7 +15,7 @@
(use-package! bibtex-actions (use-package! bibtex-actions
:when (featurep! :completion selectrum) :when (featurep! :completion vertico)
:after embark :after embark
:defer t :defer t
:config :config

View file

@ -6,5 +6,5 @@
(package! ivy-bibtex :pin "9f6ea920a49457d85096caa0e61f086a42b2908e")) (package! ivy-bibtex :pin "9f6ea920a49457d85096caa0e61f086a42b2908e"))
(when (featurep! :completion helm) (when (featurep! :completion helm)
(package! helm-bibtex :pin "9f6ea920a49457d85096caa0e61f086a42b2908e")) (package! helm-bibtex :pin "9f6ea920a49457d85096caa0e61f086a42b2908e"))
(when (featurep! :completion selectrum) (when (featurep! :completion vertico)
(package! bibtex-actions :pin "b1ddbb32373ac01b6bb46dfc4cdc143461e3c14c")) (package! bibtex-actions :pin "b1ddbb32373ac01b6bb46dfc4cdc143461e3c14c"))

View file

@ -245,7 +245,7 @@ Will return nil if neither is available. These require ripgrep to be installed."
((featurep! :completion helm) ((featurep! :completion helm)
(+helm-file-search :query query) (+helm-file-search :query query)
t) t)
((featurep! :completion selectrum) ((featurep! :completion vertico)
(+selectrum-file-search :query query) (+selectrum-file-search :query query)
t)))))) t))))))

View file

@ -181,7 +181,7 @@ Dictionary.app behind the scenes to get definitions.")
:when (featurep! :completion helm)) :when (featurep! :completion helm))
(use-package! consult-xref (use-package! consult-xref
:when (featurep! :completion selectrum) :when (featurep! :completion vertico)
:init :init
(setq xref-show-xrefs-function #'consult-xref (setq xref-show-xrefs-function #'consult-xref
xref-show-definitions-function #'consult-xref))) xref-show-definitions-function #'consult-xref)))

View file

@ -69,7 +69,7 @@ As of this writing, this is the state of LSP support in Doom Emacs:
+ [[https://github.com/emacs-lsp/lsp-ui][lsp-ui]] + [[https://github.com/emacs-lsp/lsp-ui][lsp-ui]]
+ [[https://github.com/emacs-lsp/lsp-ivy][lsp-ivy]] (=:completion ivy=) + [[https://github.com/emacs-lsp/lsp-ivy][lsp-ivy]] (=:completion ivy=)
+ [[https://github.com/emacs-lsp/helm-lsp][helm-lsp]] (=:completion helm=) + [[https://github.com/emacs-lsp/helm-lsp][helm-lsp]] (=:completion helm=)
+ [[https://github.com/gagbo/consult-lsp][consult-lsp]] (=:completion selectrum=) + [[https://github.com/gagbo/consult-lsp][consult-lsp]] (=:completion vertico=)
+ [[https://github.com/joaotavora/eglot][eglot]] + [[https://github.com/joaotavora/eglot][eglot]]
* Prerequisites * Prerequisites
@ -87,7 +87,7 @@ including instructions to register your own.
* TODO Features * TODO Features
** LSP-powered project search ** LSP-powered project search
Without the =+eglot= flag, and when =:completion ivy=, =:completion helm= or Without the =+eglot= flag, and when =:completion ivy=, =:completion helm= or
=:completion selectrum= is active, LSP is used to search a symbol indexed by the =:completion vertico= is active, LSP is used to search a symbol indexed by the
LSP server : LSP server :
| Keybind | Description | | Keybind | Description |
|-----------+-------------------------------------| |-----------+-------------------------------------|

View file

@ -9,5 +9,5 @@
(package! lsp-ivy :pin "bccd86028e669f5a1cad78364775fe7a0741ff93")) (package! lsp-ivy :pin "bccd86028e669f5a1cad78364775fe7a0741ff93"))
(when (featurep! :completion helm) (when (featurep! :completion helm)
(package! helm-lsp :pin "c2c6974dadfac459b1a69a1217441283874cea92")) (package! helm-lsp :pin "c2c6974dadfac459b1a69a1217441283874cea92"))
(when (featurep! :completion selectrum) (when (featurep! :completion vertico)
(package! consult-lsp :pin "c882749e91e4de3bae17d825ac9950cc074b1595"))) (package! consult-lsp :pin "c882749e91e4de3bae17d825ac9950cc074b1595")))