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

selectrum: improve ivy parity

Browse source 
- add `completion-at-point` as analogue to `cousnel-company`
- fix emacs-bindings `counsel-company` binding to respect helm and selectrum
- add org jump commands `consult-org-heading` and `consult-org-agenda` bindings
- add `consult-history` as `counsel-minibuffer-history` analogue
- add support for `doom/help-search`
- update TODO.org
This commit is contained in:
Itai Y. Efrat 2021-05-08 16:48:48 +03:00
parent 1266ac7b24
commit 26a310d04c
6 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -486,8 +486,12 @@
[C-tab] #'company-complete-common-or-cycle
[tab] #'company-complete-common-or-cycle
[backtab] #'company-select-previous
"C-RET" #'counsel-company
"C-<return>" #'counsel-company
"C-RET" (cond ((featurep! :completion helm) #'helm-company)
((featurep! :completion ivy) #'counsel-company)
((featurep! :completion selectrum) #'completion-at-point))
"C-<return>" (cond ((featurep! :completion helm) #'helm-company)
((featurep! :completion ivy) #'counsel-company)
((featurep! :completion selectrum) #'completion-at-point))
:map company-search-map
"C-n" #'company-search-repeat-forward
"C-p" #'company-search-repeat-backward

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

@ -138,8 +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))
"C-S-s" (cond ((featurep! :completion helm) #'helm-company)
((featurep! :completion ivy) #'counsel-company)
((featurep! :completion selectrum) #'completion-at-point))
"C-SPC" #'company-complete-common
"TAB" #'company-complete-common-or-cycle
[tab] #'company-complete-common-or-cycle

6
modules/config/default/config.el
View file

@ -404,11 +404,13 @@ 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 for their superior filtering.
;; ivy/helm/selectrum for their superior filtering.
(when-let (command (cond ((featurep! :completion ivy)
#'counsel-minibuffer-history)
((featurep! :completion helm)
#'helm-minibuffer-history)))
#'helm-minibuffer-history)
((featurep! :completion selectrum)
#'consult-history)))
(define-key!
:keymaps (append +default-minibuffer-maps
(when (featurep! :editor evil +everywhere)