selectrum: improve ivy parity

- 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

View file

@ -226,6 +226,8 @@ will be automatically appended to the result."
#'+ivy-file-search) #'+ivy-file-search)
((fboundp '+helm-file-search) ((fboundp '+helm-file-search)
#'+helm-file-search) #'+helm-file-search)
((fboundp '+selectrum-file-search)
#'+selectrum-file-search)
((rgrep ((rgrep
(read-regexp (read-regexp
"Search for" (or initial-input 'grep-tag-default) "Search for" (or initial-input 'grep-tag-default)

View file

@ -30,7 +30,6 @@ https://github.com/oantolin/orderless/issues/41
* PROJ Missing Features * PROJ Missing Features
** TODO Icons ** TODO Icons
https://github.com/minad/marginalia/issues/59 https://github.com/minad/marginalia/issues/59
** TODO =SPC s B=
** TODO =C-C C-e= wgrep fun ** TODO =C-C C-e= wgrep fun
check if we can add this to ~consult-line~ too check if we can add this to ~consult-line~ too
** TODO bibtex-actions improvements? ** TODO bibtex-actions improvements?
@ -42,8 +41,5 @@ are nontrivial loading order shenanigans happening that make that not straightfo
*** TODO lookup module *** TODO lookup module
*** TODO taskrunner module (doesn't seem to be an interface yet) *** TODO taskrunner module (doesn't seem to be an interface yet)
*** TODO pass module (creating embark-pass can't be that hard) *** TODO pass module (creating embark-pass can't be that hard)
*** TODO irc module *** TODO ~+irc/ivy-jump-to-channel~ analogue
*** TODO org module (check, might be fine) *** TODO =SPC s B= (~swiper-all~ analogue)
*** TODO counsel-minibuffer-history analogue
*** TODO counsel-company analogue

View file

@ -486,8 +486,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" #'counsel-company "C-RET" (cond ((featurep! :completion helm) #'helm-company)
"C-<return>" #'counsel-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 :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

@ -138,8 +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 helm) #'helm-company)
((featurep! :completion ivy) #'counsel-company)) ((featurep! :completion ivy) #'counsel-company)
((featurep! :completion selectrum) #'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

View file

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

View file

@ -724,6 +724,9 @@ 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)
"." #'consult-org-heading
"/" #'consult-org-agenda)
"A" #'org-archive-subtree "A" #'org-archive-subtree
"e" #'org-export-dispatch "e" #'org-export-dispatch
"f" #'org-footnote-new "f" #'org-footnote-new
@ -807,6 +810,9 @@ 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)
"g" #'consult-org-heading
"G" #'consult-org-agenda)
"c" #'org-clock-goto "c" #'org-clock-goto
"C" (cmd! (org-clock-goto 'select)) "C" (cmd! (org-clock-goto 'select))
"i" #'org-id-goto "i" #'org-id-goto