emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tweak: adopt +vertico as our default backend

Browse source 
This has been a long time coming. Vertico et co turned out to be what I
wanted ivy to be and more.
This commit is contained in:
Henrik Lissner 2021-07-26 14:43:17 -04:00
parent a6b6b6197b
commit c2e6db27d0
3 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
init.example.el
View file

@ -23,8 +23,8 @@
company ; the ultimate code completion backend company ; the ultimate code completion backend
;;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
;;vertico ; 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

26
modules/config/default/+emacs-bindings.el
View file

@ -114,12 +114,12 @@
(:prefix-map ("s" . "search") (:prefix-map ("s" . "search")
:desc "Search project for symbol" "." #'+default/search-project-for-symbol-at-point :desc "Search project for symbol" "." #'+default/search-project-for-symbol-at-point
:desc "Search buffer" "b" :desc "Search buffer" "b"
(cond ((featurep! :completion helm) #'swiper) (cond ((featurep! :completion vertico) #'consult-line)
((featurep! :completion ivy) #'swiper) ((featurep! :completion ivy) #'swiper)
((featurep! :completion vertico) #'consult-line)) ((featurep! :completion helm) #'swiper))
:desc "Search all open buffers" "B" :desc "Search all open buffers" "B"
(cond ((featurep! :completion helm) #'swiper-all) (cond ((featurep! :completion ivy) #'swiper-all)
((featurep! :completion ivy) #'swiper-all)) ((featurep! :completion helm) #'swiper-all))
:desc "Search current directory" "d" #'+default/search-cwd :desc "Search current directory" "d" #'+default/search-cwd
:desc "Search other directory" "D" #'+default/search-other-cwd :desc "Search other directory" "D" #'+default/search-other-cwd
:desc "Locate file" "f" #'+lookup/file :desc "Locate file" "f" #'+lookup/file
@ -135,9 +135,9 @@
:desc "Search other project" "P" #'+default/search-other-project :desc "Search other project" "P" #'+default/search-other-project
:desc "Search buffer" "s" #'+default/search-buffer :desc "Search buffer" "s" #'+default/search-buffer
: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 vertico) #'+vertico/search-symbol-at-point)
((featurep! :completion ivy) #'swiper-isearch-thing-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 "Dictionary" "t" #'+lookup/dictionary-definition
:desc "Thesaurus" "T" #'+lookup/synonyms) :desc "Thesaurus" "T" #'+lookup/synonyms)
@ -156,9 +156,9 @@
:desc "Org agenda" "a" #'org-agenda :desc "Org agenda" "a" #'org-agenda
(:when (featurep! :tools biblio) (:when (featurep! :tools biblio)
:desc "Bibliographic entries" "b" :desc "Bibliographic entries" "b"
(cond ((featurep! :completion ivy) #'ivy-bibtex) (cond ((featurep! :completion vertico) #'bibtex-actions-open-entry)
((featurep! :completion helm) #'helm-bibtex) ((featurep! :completion ivy) #'ivy-bibtex)
((featurep! :completion vertico) #'bibtex-actions-open-entry))) ((featurep! :completion helm) #'helm-bibtex)))
: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
@ -520,12 +520,12 @@
[C-tab] #'company-complete-common-or-cycle [C-tab] #'company-complete-common-or-cycle
[tab] #'company-complete-common-or-cycle [tab] #'company-complete-common-or-cycle
[backtab] #'company-select-previous [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 ivy) #'counsel-company)
((featurep! :completion vertico) #'completion-at-point)) ((featurep! :completion helm) #'helm-company))
"C-<return>" (cond ((featurep! :completion helm) #'helm-company) "C-<return>" (cond ((featurep! :completion vertico) #'completion-at-point)
((featurep! :completion ivy) #'counsel-company) ((featurep! :completion ivy) #'counsel-company)
((featurep! :completion vertico) #'completion-at-point)) ((featurep! :completion helm) #'helm-company))
: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

28
modules/config/default/+evil-bindings.el
View file

@ -138,9 +138,9 @@
"C-u" #'company-previous-page "C-u" #'company-previous-page
"C-d" #'company-next-page "C-d" #'company-next-page
"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 vertico) #'completion-at-point)
((featurep! :completion ivy) #'counsel-company) ((featurep! :completion ivy) #'counsel-company)
((featurep! :completion vertico) #'completion-at-point)) ((featurep! :completion helm) #'helm-company))
"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
@ -304,9 +304,9 @@
:desc "Switch buffer" "<" #'switch-to-buffer) :desc "Switch buffer" "<" #'switch-to-buffer)
:desc "Switch to last buffer" "`" #'evil-switch-to-windows-last-buffer :desc "Switch to last buffer" "`" #'evil-switch-to-windows-last-buffer
:desc "Resume last search" "'" :desc "Resume last search" "'"
(cond ((featurep! :completion ivy) #'ivy-resume) (cond ((featurep! :completion vertico) #'vertico-repeat)
((featurep! :completion helm) #'helm-resume) ((featurep! :completion ivy) #'ivy-resume)
((featurep! :completion vertico) #'vertico-repeat)) ((featurep! :completion helm) #'helm-resume))
: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
@ -516,9 +516,9 @@
:desc "Org agenda" "a" #'org-agenda :desc "Org agenda" "a" #'org-agenda
(:when (featurep! :tools biblio) (:when (featurep! :tools biblio)
:desc "Bibliographic entries" "b" :desc "Bibliographic entries" "b"
(cond ((featurep! :completion ivy) #'ivy-bibtex) (cond ((featurep! :completion vertico) #'bibtex-actions-open-entry)
((featurep! :completion helm) #'helm-bibtex) ((featurep! :completion ivy) #'ivy-bibtex)
((featurep! :completion vertico) #'bibtex-actions-open-entry))) ((featurep! :completion helm) #'helm-bibtex)))
: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
@ -703,12 +703,12 @@
;;; <leader> s --- search ;;; <leader> s --- search
(:prefix-map ("s" . "search") (:prefix-map ("s" . "search")
:desc "Search buffer" "b" :desc "Search buffer" "b"
(cond ((featurep! :completion helm) #'swiper) (cond ((featurep! :completion vertico) #'consult-line)
((featurep! :completion ivy) #'swiper) ((featurep! :completion ivy) #'swiper)
((featurep! :completion vertico) #'consult-line)) ((featurep! :completion helm) #'swiper))
:desc "Search all open buffers" "B" :desc "Search all open buffers" "B"
(cond ((featurep! :completion helm) #'swiper-all) (cond ((featurep! :completion ivy) #'swiper-all)
((featurep! :completion ivy) #'swiper-all)) ((featurep! :completion helm) #'swiper-all))
:desc "Search current directory" "d" #'+default/search-cwd :desc "Search current directory" "d" #'+default/search-cwd
:desc "Search other directory" "D" #'+default/search-other-cwd :desc "Search other directory" "D" #'+default/search-other-cwd
:desc "Locate file" "f" #'locate :desc "Locate file" "f" #'locate
@ -726,9 +726,9 @@
:desc "Jump to mark" "r" #'evil-show-marks :desc "Jump to mark" "r" #'evil-show-marks
:desc "Search buffer" "s" #'+default/search-buffer :desc "Search buffer" "s" #'+default/search-buffer
: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 vertico) #'+vertico/search-symbol-at-point)
((featurep! :completion ivy) #'swiper-isearch-thing-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 "Dictionary" "t" #'+lookup/dictionary-definition
:desc "Thesaurus" "T" #'+lookup/synonyms) :desc "Thesaurus" "T" #'+lookup/synonyms)