diff --git a/init.example.el b/init.example.el index 2db8a0009..b24c44cb6 100644 --- a/init.example.el +++ b/init.example.el @@ -23,8 +23,8 @@ company ; the ultimate code completion backend ;;helm ; the *other* search engine for love and life ;;ido ; the other *other* search engine... - ivy ; a search engine for love and life - ;;vertico ; the search engine of the future + ;;ivy ; a search engine for love and life + vertico ; the search engine of the future :ui ;;deft ; notational velocity for Emacs diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el index a3695e54c..5b3b07be6 100644 --- a/modules/config/default/+emacs-bindings.el +++ b/modules/config/default/+emacs-bindings.el @@ -114,12 +114,12 @@ (:prefix-map ("s" . "search") :desc "Search project for symbol" "." #'+default/search-project-for-symbol-at-point :desc "Search buffer" "b" - (cond ((featurep! :completion helm) #'swiper) + (cond ((featurep! :completion vertico) #'consult-line) ((featurep! :completion ivy) #'swiper) - ((featurep! :completion vertico) #'consult-line)) + ((featurep! :completion helm) #'swiper)) :desc "Search all open buffers" "B" - (cond ((featurep! :completion helm) #'swiper-all) - ((featurep! :completion ivy) #'swiper-all)) + (cond ((featurep! :completion ivy) #'swiper-all) + ((featurep! :completion helm) #'swiper-all)) :desc "Search current directory" "d" #'+default/search-cwd :desc "Search other directory" "D" #'+default/search-other-cwd :desc "Locate file" "f" #'+lookup/file @@ -135,9 +135,9 @@ :desc "Search other project" "P" #'+default/search-other-project :desc "Search buffer" "s" #'+default/search-buffer :desc "Search buffer for thing at point" "S" - (cond ((featurep! :completion helm) #'swiper-isearch-thing-at-point) + (cond ((featurep! :completion vertico) #'+vertico/search-symbol-at-point) ((featurep! :completion ivy) #'swiper-isearch-thing-at-point) - ((featurep! :completion vertico) #'+vertico/search-symbol-at-point)) + ((featurep! :completion helm) #'swiper-isearch-thing-at-point)) :desc "Dictionary" "t" #'+lookup/dictionary-definition :desc "Thesaurus" "T" #'+lookup/synonyms) @@ -156,9 +156,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 vertico) #'bibtex-actions-open-entry))) + (cond ((featurep! :completion vertico) #'bibtex-actions-open-entry) + ((featurep! :completion ivy) #'ivy-bibtex) + ((featurep! :completion helm) #'helm-bibtex))) :desc "Toggle last org-clock" "c" #'+org/toggle-last-clock :desc "Cancel current org-clock" "C" #'org-clock-cancel @@ -520,12 +520,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) + "C-RET" (cond ((featurep! :completion vertico) #'completion-at-point) ((featurep! :completion ivy) #'counsel-company) - ((featurep! :completion vertico) #'completion-at-point)) - "C-" (cond ((featurep! :completion helm) #'helm-company) + ((featurep! :completion helm) #'helm-company)) + "C-" (cond ((featurep! :completion vertico) #'completion-at-point) ((featurep! :completion ivy) #'counsel-company) - ((featurep! :completion vertico) #'completion-at-point)) + ((featurep! :completion helm) #'helm-company)) :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 ae707b883..e05e7eff4 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) + "C-S-s" (cond ((featurep! :completion vertico) #'completion-at-point) ((featurep! :completion ivy) #'counsel-company) - ((featurep! :completion vertico) #'completion-at-point)) + ((featurep! :completion helm) #'helm-company)) "C-SPC" #'company-complete-common "TAB" #'company-complete-common-or-cycle [tab] #'company-complete-common-or-cycle @@ -304,9 +304,9 @@ :desc "Switch buffer" "<" #'switch-to-buffer) :desc "Switch to last buffer" "`" #'evil-switch-to-windows-last-buffer :desc "Resume last search" "'" - (cond ((featurep! :completion ivy) #'ivy-resume) - ((featurep! :completion helm) #'helm-resume) - ((featurep! :completion vertico) #'vertico-repeat)) + (cond ((featurep! :completion vertico) #'vertico-repeat) + ((featurep! :completion ivy) #'ivy-resume) + ((featurep! :completion helm) #'helm-resume)) :desc "Search for symbol in project" "*" #'+default/search-project-for-symbol-at-point :desc "Search project" "/" #'+default/search-project @@ -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 vertico) #'bibtex-actions-open-entry))) + (cond ((featurep! :completion vertico) #'bibtex-actions-open-entry) + ((featurep! :completion ivy) #'ivy-bibtex) + ((featurep! :completion helm) #'helm-bibtex))) :desc "Toggle last org-clock" "c" #'+org/toggle-last-clock :desc "Cancel current org-clock" "C" #'org-clock-cancel @@ -703,12 +703,12 @@ ;;; s --- search (:prefix-map ("s" . "search") :desc "Search buffer" "b" - (cond ((featurep! :completion helm) #'swiper) + (cond ((featurep! :completion vertico) #'consult-line) ((featurep! :completion ivy) #'swiper) - ((featurep! :completion vertico) #'consult-line)) + ((featurep! :completion helm) #'swiper)) :desc "Search all open buffers" "B" - (cond ((featurep! :completion helm) #'swiper-all) - ((featurep! :completion ivy) #'swiper-all)) + (cond ((featurep! :completion ivy) #'swiper-all) + ((featurep! :completion helm) #'swiper-all)) :desc "Search current directory" "d" #'+default/search-cwd :desc "Search other directory" "D" #'+default/search-other-cwd :desc "Locate file" "f" #'locate @@ -726,9 +726,9 @@ :desc "Jump to mark" "r" #'evil-show-marks :desc "Search buffer" "s" #'+default/search-buffer :desc "Search buffer for thing at point" "S" - (cond ((featurep! :completion helm) #'swiper-isearch-thing-at-point) + (cond ((featurep! :completion vertico) #'+vertico/search-symbol-at-point) ((featurep! :completion ivy) #'swiper-isearch-thing-at-point) - ((featurep! :completion vertico) #'+vertico/search-symbol-at-point)) + ((featurep! :completion helm) #'swiper-isearch-thing-at-point)) :desc "Dictionary" "t" #'+lookup/dictionary-definition :desc "Thesaurus" "T" #'+lookup/synonyms)