diff --git a/docs/modules.org b/docs/modules.org index 7a3bae28b..2187b1cb5 100644 --- a/docs/modules.org +++ b/docs/modules.org @@ -46,7 +46,7 @@ completion. + helm =+fuzzy +childframe= - *Another* 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/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 Modules that configure Emacs one way or another, or focus on making it easier diff --git a/init.example.el b/init.example.el index 74170f0f0..2db8a0009 100644 --- a/init.example.el +++ b/init.example.el @@ -24,7 +24,7 @@ ;;helm ; the *other* search engine for love and life ;;ido ; the other *other* search engine... ivy ; a search engine for love and life - ;;selectrum ; the search engine of the future + ;;vertico ; the search engine of the future :ui ;;deft ; notational velocity for Emacs diff --git a/modules/app/irc/autoload/irc.el b/modules/app/irc/autoload/irc.el index cc739fb78..c1caaeb73 100644 --- a/modules/app/irc/autoload/irc.el +++ b/modules/app/irc/autoload/irc.el @@ -69,8 +69,8 @@ argument) is non-nil only show channels in current server." (interactive "P") (call-interactively (cond ((featurep! :completion ivy) #'+irc/ivy-jump-to-channel) - ((featurep! :completion selectrum) #'+irc/selectrum-jump-to-channel) - ((user-error "No jump-to-channel backend is enabled. Enable selectrum or ivy!"))))) + ((featurep! :completion vertico) #'+irc/selectrum-jump-to-channel) + ((user-error "No jump-to-channel backend is enabled. Enable vertico or ivy!"))))) ;;;###autoload (defun +irc--circe-all-buffers () diff --git a/modules/app/irc/autoload/selectrum.el b/modules/app/irc/autoload/vertico.el similarity index 79% rename from modules/app/irc/autoload/selectrum.el rename to modules/app/irc/autoload/vertico.el index 1190151de..f58061dcf 100644 --- a/modules/app/irc/autoload/selectrum.el +++ b/modules/app/irc/autoload/vertico.el @@ -1,9 +1,9 @@ -;;; app/irc/autoload/selectrum.el -*- lexical-binding: t; -*- -;;;###if (featurep! :completion selectrum) +;;; app/irc/autoload/vertico.el -*- lexical-binding: t; -*- +;;;###if (featurep! :completion vertico) ;;;###autoload (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) (require 'consult) (consult--multi (list (plist-put (copy-sequence +irc--consult-circe-source) diff --git a/modules/app/irc/config.el b/modules/app/irc/config.el index d301fc0db..ad079d386 100644 --- a/modules/app/irc/config.el +++ b/modules/app/irc/config.el @@ -141,7 +141,7 @@ playback.") ;; Fail gracefully if not in a circe buffer (global-set-key [remap tracking-next-buffer] #'+irc/tracking-next-buffer) - (when (featurep! :completion selectrum) + (when (featurep! :completion vertico) (after! consult (add-to-list 'consult-buffer-sources '+irc--consult-circe-source 'append))) diff --git a/modules/checkers/spell/README.org b/modules/checkers/spell/README.org index f8eea996f..b0fb6971f 100644 --- a/modules/checkers/spell/README.org +++ b/modules/checkers/spell/README.org @@ -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-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-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]] + else + [[https://gitlab.com/ideasman42/emacs-spell-fu][spell-fu]] diff --git a/modules/checkers/spell/autoload/+spell-fu.el b/modules/checkers/spell/autoload/+spell-fu.el index 4bddacf8e..33450eeab 100644 --- a/modules/checkers/spell/autoload/+spell-fu.el +++ b/modules/checkers/spell/autoload/+spell-fu.el @@ -63,7 +63,7 @@ (ispell-accept-buffer-local-defs)) (if (not (or (featurep! :completion ivy) (featurep! :completion helm) - (featurep! :completion selectrum))) + (featurep! :completion vertico))) (call-interactively #'ispell-word) (cl-destructuring-bind (start . end) (or (bounds-of-thing-at-point 'word) diff --git a/modules/checkers/spell/config.el b/modules/checkers/spell/config.el index 17dc1983e..5f94032c4 100644 --- a/modules/checkers/spell/config.el +++ b/modules/checkers/spell/config.el @@ -234,7 +234,7 @@ e.g. proselint and langtool." (require 'flyspell-correct-helm nil t))) ((and (featurep! :completion ivy) (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 (setq flyspell-popup-correct-delay 0.8) (define-key popup-menu-keymap [escape] #'keyboard-quit)))) diff --git a/modules/checkers/spell/packages.el b/modules/checkers/spell/packages.el index 359e7a710..32da2eaf9 100644 --- a/modules/checkers/spell/packages.el +++ b/modules/checkers/spell/packages.el @@ -8,6 +8,6 @@ (package! flyspell-correct-ivy)) ((featurep! :completion helm) (package! flyspell-correct-helm)) - ((not (featurep! :completion selectrum)) + ((not (featurep! :completion vertico)) (package! flyspell-correct-popup))) (package! flyspell-lazy :pin "0fc5996bcee20b46cbd227ae948d343c3bef7339")) diff --git a/modules/completion/selectrum/README.org b/modules/completion/vertico/README.org similarity index 96% rename from modules/completion/selectrum/README.org rename to modules/completion/vertico/README.org index 7b27ab454..c3951f5b0 100644 --- a/modules/completion/selectrum/README.org +++ b/modules/completion/vertico/README.org @@ -1,4 +1,4 @@ -#+TITLE: completion/selectrum +#+TITLE: completion/vertico #+DATE: February 16, 2021 #+SINCE: v3.0.0 #+STARTUP: inlineimages @@ -52,7 +52,7 @@ Doom-specific additions: This module provides an interface to navigate within a project using =projectile=: -https://assets.doomemacs.org/completion/selectrum/projectile.png +https://assets.doomemacs.org/completion/vertico/projectile.png | 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 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= 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 users). -https://assets.doomemacs.org/completion/selectrum/search-replace.png +https://assets.doomemacs.org/completion/vertico/search-replace.png ** In-buffer searching 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 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=. diff --git a/modules/completion/selectrum/TODO.org b/modules/completion/vertico/TODO.org similarity index 91% rename from modules/completion/selectrum/TODO.org rename to modules/completion/vertico/TODO.org index 1ee66f294..bfdec7c0c 100644 --- a/modules/completion/selectrum/TODO.org +++ b/modules/completion/vertico/TODO.org @@ -28,7 +28,7 @@ case for why this should be an exception: - 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 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 ~map!~ since that seems to be one of the main concerns. - ~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 modification column? - 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 ** TODO ~fboundp~ issues diff --git a/modules/completion/selectrum/autoload/evil.el b/modules/completion/vertico/autoload/evil.el similarity index 80% rename from modules/completion/selectrum/autoload/evil.el rename to modules/completion/vertico/autoload/evil.el index 2f9b0e20c..78d15c8b8 100644 --- a/modules/completion/selectrum/autoload/evil.el +++ b/modules/completion/vertico/autoload/evil.el @@ -1,13 +1,13 @@ -;; completion/selectrum/autoload/evil.el -*- lexical-binding: t; -*- +;; completion/vertico/autoload/evil.el -*- lexical-binding: t; -*- ;;;###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) "Ex interface for `+selectrum/project-search'." (interactive "") (+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) "Ex interface for `+selectrum/project-search-from-cwd'." (interactive "") diff --git a/modules/completion/selectrum/autoload/selectrum.el b/modules/completion/vertico/autoload/vertico.el similarity index 94% rename from modules/completion/selectrum/autoload/selectrum.el rename to modules/completion/vertico/autoload/vertico.el index e668292b1..b613b70cd 100644 --- a/modules/completion/selectrum/autoload/selectrum.el +++ b/modules/completion/vertico/autoload/vertico.el @@ -1,4 +1,4 @@ -;;; completion/selectrum/autoload/selectrum.el -*- lexical-binding: t; -*- +;;; completion/vertico/autoload/vertico.el -*- lexical-binding: t; -*- ;;;###autoload (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 (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) (let ((metadata (completion-metadata (minibuffer-contents) minibuffer-completion-table @@ -95,7 +95,7 @@ If ARG (universal argument), include all files, even hidden or compressed ones." ;;;###autoload (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" (interactive) @@ -113,7 +113,7 @@ Supports exporting consult-grep to wgrep, file to wdeired, and consult-location ;;;###autoload (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) (unless (bound-and-true-p consult--preview-function) (save-selected-window diff --git a/modules/completion/selectrum/autoload/workspaces.el b/modules/completion/vertico/autoload/workspaces.el similarity index 96% rename from modules/completion/selectrum/autoload/workspaces.el rename to modules/completion/vertico/autoload/workspaces.el index 5fefd4df4..d8396438e 100644 --- a/modules/completion/selectrum/autoload/workspaces.el +++ b/modules/completion/vertico/autoload/workspaces.el @@ -1,4 +1,4 @@ -;;; completion/selectrum/autoload/workspaces.el -*- lexical-binding: t; -*- +;;; completion/vertico/autoload/workspaces.el -*- lexical-binding: t; -*- ;;;###if (featurep! :ui workspaces) ;;;###autoload diff --git a/modules/completion/selectrum/config.el b/modules/completion/vertico/config.el similarity index 99% rename from modules/completion/selectrum/config.el rename to modules/completion/vertico/config.el index 4a691ffc6..a6eaee77c 100644 --- a/modules/completion/selectrum/config.el +++ b/modules/completion/vertico/config.el @@ -1,4 +1,4 @@ -;;; completion/selectrum/config.el -*- lexical-binding: t; -*- +;;; completion/vertico/config.el -*- lexical-binding: t; -*- (use-package! vertico :hook (doom-first-input . vertico-mode) diff --git a/modules/completion/selectrum/packages.el b/modules/completion/vertico/packages.el similarity index 96% rename from modules/completion/selectrum/packages.el rename to modules/completion/vertico/packages.el index 8fc0c82ea..fcc64cee2 100644 --- a/modules/completion/selectrum/packages.el +++ b/modules/completion/vertico/packages.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; -*- -;;; completion/selectrum/packages.el +;;; completion/vertico/packages.el (package! vertico :recipe (:host github :repo "minad/vertico" diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el index d159c6fa5..b78d5d4c7 100644 --- a/modules/config/default/+emacs-bindings.el +++ b/modules/config/default/+emacs-bindings.el @@ -54,7 +54,7 @@ (:when (featurep! :completion helm) :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) - (:when (featurep! :completion selectrum) + (:when (featurep! :completion vertico) :desc "Jump to symbol in current workspace" "j" #'consult-lsp-symbols :desc "Jump to symbol in any workspace" "J" (cmd! #'consult-lsp-symbols '(4))) (:when (featurep! :ui treemacs +lsp) @@ -116,7 +116,7 @@ :desc "Search buffer" "b" (cond ((featurep! :completion helm) #'swiper) ((featurep! :completion ivy) #'swiper) - ((featurep! :completion selectrum) #'consult-line)) + ((featurep! :completion vertico) #'consult-line)) :desc "Search all open buffers" "B" (cond ((featurep! :completion helm) #'swiper-all) ((featurep! :completion ivy) #'swiper-all)) @@ -137,7 +137,7 @@ :desc "Search buffer for thing at point" "S" (cond ((featurep! :completion helm) #'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 "Thesaurus" "T" #'+lookup/synonyms) @@ -158,7 +158,7 @@ :desc "Bibliographic entries" "b" (cond ((featurep! :completion ivy) #'ivy-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 "Cancel current org-clock" "C" #'org-clock-cancel @@ -434,7 +434,7 @@ :desc "Send message" "s" #'+irc/send-message (:when (featurep! :completion ivy) :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))) ;;; T --- twitter @@ -463,7 +463,7 @@ (:when (featurep! :completion helm) "C-S-s" #'swiper-helm "C-S-r" #'helm-resume) - (:when (featurep! :completion selectrum) + (:when (featurep! :completion vertico) "C-S-r" #'vertico-repeat) ;;; objed @@ -496,12 +496,12 @@ [C-tab] #'company-complete-common-or-cycle [tab] #'company-complete-common-or-cycle [backtab] #'company-select-previous - "C-RET" (cond ((featurep! :completion helm) #'helm-company) - ((featurep! :completion ivy) #'counsel-company) - ((featurep! :completion selectrum) #'completion-at-point)) - "C-" (cond ((featurep! :completion helm) #'helm-company) - ((featurep! :completion ivy) #'counsel-company) - ((featurep! :completion selectrum) #'completion-at-point)) + "C-RET" (cond ((featurep! :completion helm) #'helm-company) + ((featurep! :completion ivy) #'counsel-company) + ((featurep! :completion vertico) #'completion-at-point)) + "C-" (cond ((featurep! :completion helm) #'helm-company) + ((featurep! :completion ivy) #'counsel-company) + ((featurep! :completion vertico) #'completion-at-point)) :map company-search-map "C-n" #'company-search-repeat-forward "C-p" #'company-search-repeat-backward diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index 86efc126c..ddc9fdbbb 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -138,9 +138,9 @@ "C-u" #'company-previous-page "C-d" #'company-next-page "C-s" #'company-filter-candidates - "C-S-s" (cond ((featurep! :completion helm) #'helm-company) - ((featurep! :completion ivy) #'counsel-company) - ((featurep! :completion selectrum) #'completion-at-point)) + "C-S-s" (cond ((featurep! :completion helm) #'helm-company) + ((featurep! :completion ivy) #'counsel-company) + ((featurep! :completion vertico) #'completion-at-point)) "C-SPC" #'company-complete-common "TAB" #'company-complete-common-or-cycle [tab] #'company-complete-common-or-cycle @@ -203,7 +203,7 @@ (:after helm-grep :map helm-grep-map [C-return] #'helm-grep-run-other-window-action)) - (:when (featurep! :completion selectrum) + (:when (featurep! :completion vertico) (:after vertico :map vertico-map "M-RET" #'vertico-exit-input @@ -306,7 +306,7 @@ :desc "Resume last search" "'" (cond ((featurep! :completion ivy) #'ivy-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 project" "/" #'+default/search-project @@ -384,7 +384,7 @@ (:when (featurep! :completion helm) :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) - (:when (featurep! :completion selectrum) + (:when (featurep! :completion vertico) :desc "Jump to symbol in current workspace" "j" #'consult-lsp-symbols :desc "Jump to symbol in any workspace" "J" (cmd! #'consult-lsp-symbols '(4))) (:when (featurep! :ui treemacs +lsp) @@ -516,9 +516,9 @@ :desc "Org agenda" "a" #'org-agenda (:when (featurep! :tools biblio) :desc "Bibliographic entries" "b" - (cond ((featurep! :completion ivy) #'ivy-bibtex) - ((featurep! :completion helm) #'helm-bibtex) - ((featurep! :completion selectrum) #'bibtex-actions-open-entry))) + (cond ((featurep! :completion ivy) #'ivy-bibtex) + ((featurep! :completion helm) #'helm-bibtex) + ((featurep! :completion vertico) #'bibtex-actions-open-entry))) :desc "Toggle last org-clock" "c" #'+org/toggle-last-clock :desc "Cancel current org-clock" "C" #'org-clock-cancel @@ -680,7 +680,7 @@ :desc "Search buffer" "b" (cond ((featurep! :completion helm) #'swiper) ((featurep! :completion ivy) #'swiper) - ((featurep! :completion selectrum) #'consult-line)) + ((featurep! :completion vertico) #'consult-line)) :desc "Search all open buffers" "B" (cond ((featurep! :completion helm) #'swiper-all) ((featurep! :completion ivy) #'swiper-all)) @@ -703,7 +703,7 @@ :desc "Search buffer for thing at point" "S" (cond ((featurep! :completion helm) #'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 "Thesaurus" "T" #'+lookup/synonyms) diff --git a/modules/config/default/autoload/search.el b/modules/config/default/autoload/search.el index c9344751f..8a2ac4196 100644 --- a/modules/config/default/autoload/search.el +++ b/modules/config/default/autoload/search.el @@ -10,9 +10,9 @@ If prefix ARG is set, prompt for a directory to search from." (read-directory-name "Search directory: ") default-directory))) (call-interactively - (cond ((featurep! :completion ivy) #'+ivy/project-search-from-cwd) - ((featurep! :completion helm) #'+helm/project-search-from-cwd) - ((featurep! :completion selectrum) #'+selectrum/project-search-from-cwd) + (cond ((featurep! :completion ivy) #'+ivy/project-search-from-cwd) + ((featurep! :completion helm) #'+helm/project-search-from-cwd) + ((featurep! :completion vertico) #'+selectrum/project-search-from-cwd) (#'rgrep))))) ;;;###autoload @@ -31,7 +31,7 @@ If a selection is active, pre-fill the prompt with it." (if (region-active-p) #'swiper-isearch-thing-at-point #'swiper-isearch)) - ((featurep! :completion selectrum) #'isearch-forward)))) + ((featurep! :completion vertico) #'isearch-forward)))) ;;;###autoload (defun +default/search-project (&optional arg) @@ -48,9 +48,9 @@ If prefix ARG is set, include ignored/hidden files." (user-error "There are no known projects")) default-directory))) (call-interactively - (cond ((featurep! :completion ivy) #'+ivy/project-search) - ((featurep! :completion helm) #'+helm/project-search) - ((featurep! :completion selectrum) #'+selectrum/project-search) + (cond ((featurep! :completion ivy) #'+ivy/project-search) + ((featurep! :completion helm) #'+helm/project-search) + ((featurep! :completion vertico) #'+selectrum/project-search) (#'projectile-ripgrep))))) ;;;###autoload @@ -77,7 +77,7 @@ If prefix ARG is set, prompt for a known project to search from." (+ivy/project-search nil symbol)) ((featurep! :completion helm) (+helm/project-search nil symbol)) - ((featurep! :completion selectrum) + ((featurep! :completion vertico) (+selectrum/project-search nil symbol)) ((rgrep (regexp-quote symbol)))))) diff --git a/modules/config/default/autoload/text.el b/modules/config/default/autoload/text.el index 5da7f4937..cb9ef34c8 100644 --- a/modules/config/default/autoload/text.el +++ b/modules/config/default/autoload/text.el @@ -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. ((fboundp 'counsel-yank-pop) #'counsel-yank-pop) ((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 (defun +default/yank-buffer-path (&optional root) diff --git a/modules/config/default/config.el b/modules/config/default/config.el index 868890484..b99d9be08 100644 --- a/modules/config/default/config.el +++ b/modules/config/default/config.el @@ -402,12 +402,12 @@ Continues comments if executed from a commented line. Consults "A-x" #'execute-extended-command) ;; 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) #'counsel-minibuffer-history) ((featurep! :completion helm) #'helm-minibuffer-history) - ((featurep! :completion selectrum) + ((featurep! :completion vertico) #'consult-history))) (define-key! :keymaps (append +default-minibuffer-maps diff --git a/modules/editor/evil/+commands.el b/modules/editor/evil/+commands.el index e667823ca..606654a9f 100644 --- a/modules/editor/evil/+commands.el +++ b/modules/editor/evil/+commands.el @@ -69,7 +69,7 @@ ((featurep! :completion helm) (evil-ex-define-cmd "pg[rep]" #'+helm:project-search) (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[grep]d" #'+selectrum:project-search-from-cwd))) diff --git a/modules/email/mu4e/config.el b/modules/email/mu4e/config.el index 274bcc24e..bf7e46cd4 100644 --- a/modules/email/mu4e/config.el +++ b/modules/email/mu4e/config.el @@ -42,11 +42,11 @@ mu4e-context-policy 'pick-first ;; compose with the current context, or ask mu4e-compose-context-policy 'ask-if-none - ;; use helm/ivy/selectrum + ;; use helm/ivy/vertico mu4e-completing-read-function - (cond ((featurep! :completion ivy) #'ivy-completing-read) - ((featurep! :completion helm) #'completing-read) - ((featurep! :completion selectrum) #'completing-read) + (cond ((featurep! :completion ivy) #'ivy-completing-read) + ((featurep! :completion helm) #'completing-read) + ((featurep! :completion vertico) #'completing-read) (t #'ido-completing-read)) ;; no need to ask mu4e-confirm-quit nil diff --git a/modules/email/notmuch/config.el b/modules/email/notmuch/config.el index f99fb7ac6..1ebc040ae 100644 --- a/modules/email/notmuch/config.el +++ b/modules/email/notmuch/config.el @@ -106,6 +106,6 @@ OR a shell command string such as (use-package! consult-notmuch - :when (featurep! :completion selectrum) + :when (featurep! :completion vertico) :commands consult-notmuch :after notmuch) diff --git a/modules/email/notmuch/packages.el b/modules/email/notmuch/packages.el index 7c699b80c..e6fc02bd7 100644 --- a/modules/email/notmuch/packages.el +++ b/modules/email/notmuch/packages.el @@ -8,5 +8,5 @@ (package! counsel-notmuch :pin "a4a1562935e4180c42524c51609d1283e9be0688")) (when (featurep! :completion helm) (package! helm-notmuch :pin "97a01497e079a7b6505987e9feba6b603bbec288")) -(when (featurep! :completion selectrum) +(when (featurep! :completion vertico) (package! consult-notmuch :pin "67cf219fcce211237347a783ce6982402341d5fd")) diff --git a/modules/input/layout/+bepo.el b/modules/input/layout/+bepo.el index cc9f2c7af..8fa1edcc8 100644 --- a/modules/input/layout/+bepo.el +++ b/modules/input/layout/+bepo.el @@ -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)) (after! treemacs (+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 '(minibuffer-local-map minibuffer-local-ns-map diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index 6227feabc..76a176f59 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -724,7 +724,7 @@ between the two." (:when (featurep! :completion helm) "." #'helm-org-in-buffer-headings "/" #'helm-org-agenda-files-headings) - (:when (featurep! :completion selectrum) + (:when (featurep! :completion vertico) "." #'consult-org-heading "/" #'consult-org-agenda) "A" #'org-archive-subtree @@ -810,7 +810,7 @@ between the two." (:when (featurep! :completion helm) "g" #'helm-org-in-buffer-headings "G" #'helm-org-agenda-files-headings) - (:when (featurep! :completion selectrum) + (:when (featurep! :completion vertico) "g" #'consult-org-heading "G" #'consult-org-agenda) "c" #'org-clock-goto diff --git a/modules/tools/biblio/config.el b/modules/tools/biblio/config.el index 43dbd27c7..532fc552f 100644 --- a/modules/tools/biblio/config.el +++ b/modules/tools/biblio/config.el @@ -15,7 +15,7 @@ (use-package! bibtex-actions - :when (featurep! :completion selectrum) + :when (featurep! :completion vertico) :after embark :defer t :config diff --git a/modules/tools/biblio/packages.el b/modules/tools/biblio/packages.el index 6a7901e23..2ebb049e6 100644 --- a/modules/tools/biblio/packages.el +++ b/modules/tools/biblio/packages.el @@ -6,5 +6,5 @@ (package! ivy-bibtex :pin "9f6ea920a49457d85096caa0e61f086a42b2908e")) (when (featurep! :completion helm) (package! helm-bibtex :pin "9f6ea920a49457d85096caa0e61f086a42b2908e")) -(when (featurep! :completion selectrum) +(when (featurep! :completion vertico) (package! bibtex-actions :pin "b1ddbb32373ac01b6bb46dfc4cdc143461e3c14c")) diff --git a/modules/tools/lookup/autoload/lookup.el b/modules/tools/lookup/autoload/lookup.el index 622a75d7f..39198019a 100644 --- a/modules/tools/lookup/autoload/lookup.el +++ b/modules/tools/lookup/autoload/lookup.el @@ -245,7 +245,7 @@ Will return nil if neither is available. These require ripgrep to be installed." ((featurep! :completion helm) (+helm-file-search :query query) t) - ((featurep! :completion selectrum) + ((featurep! :completion vertico) (+selectrum-file-search :query query) t)))))) diff --git a/modules/tools/lookup/config.el b/modules/tools/lookup/config.el index d9e54ac63..b7e1a0d73 100644 --- a/modules/tools/lookup/config.el +++ b/modules/tools/lookup/config.el @@ -181,7 +181,7 @@ Dictionary.app behind the scenes to get definitions.") :when (featurep! :completion helm)) (use-package! consult-xref - :when (featurep! :completion selectrum) + :when (featurep! :completion vertico) :init (setq xref-show-xrefs-function #'consult-xref xref-show-definitions-function #'consult-xref))) diff --git a/modules/tools/lsp/README.org b/modules/tools/lsp/README.org index 505c81c4d..4dfefa79b 100644 --- a/modules/tools/lsp/README.org +++ b/modules/tools/lsp/README.org @@ -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-ivy][lsp-ivy]] (=:completion ivy=) + [[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]] * Prerequisites @@ -87,7 +87,7 @@ including instructions to register your own. * TODO Features ** LSP-powered project search 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 : | Keybind | Description | |-----------+-------------------------------------| diff --git a/modules/tools/lsp/packages.el b/modules/tools/lsp/packages.el index cc930f9fa..110c982c2 100644 --- a/modules/tools/lsp/packages.el +++ b/modules/tools/lsp/packages.el @@ -9,5 +9,5 @@ (package! lsp-ivy :pin "bccd86028e669f5a1cad78364775fe7a0741ff93")) (when (featurep! :completion helm) (package! helm-lsp :pin "c2c6974dadfac459b1a69a1217441283874cea92")) - (when (featurep! :completion selectrum) + (when (featurep! :completion vertico) (package! consult-lsp :pin "c882749e91e4de3bae17d825ac9950cc074b1595")))