diff --git a/core/autoload/help.el b/core/autoload/help.el index ccbe8face..ab8412f3e 100644 --- a/core/autoload/help.el +++ b/core/autoload/help.el @@ -226,6 +226,8 @@ will be automatically appended to the result." #'+ivy-file-search) ((fboundp '+helm-file-search) #'+helm-file-search) + ((fboundp '+selectrum-file-search) + #'+selectrum-file-search) ((rgrep (read-regexp "Search for" (or initial-input 'grep-tag-default) diff --git a/modules/completion/selectrum/TODO.org b/modules/completion/selectrum/TODO.org index 268b54066..5d1a372aa 100644 --- a/modules/completion/selectrum/TODO.org +++ b/modules/completion/selectrum/TODO.org @@ -30,7 +30,6 @@ https://github.com/oantolin/orderless/issues/41 * PROJ Missing Features ** TODO Icons https://github.com/minad/marginalia/issues/59 -** TODO =SPC s B= ** TODO =C-C C-e= wgrep fun check if we can add this to ~consult-line~ too ** TODO bibtex-actions improvements? @@ -42,8 +41,5 @@ are nontrivial loading order shenanigans happening that make that not straightfo *** TODO lookup module *** TODO taskrunner module (doesn't seem to be an interface yet) *** TODO pass module (creating embark-pass can't be that hard) -*** TODO irc module -*** TODO org module (check, might be fine) -*** TODO counsel-minibuffer-history analogue -*** TODO counsel-company analogue - +*** TODO ~+irc/ivy-jump-to-channel~ analogue +*** TODO =SPC s B= (~swiper-all~ analogue) diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el index 4f0d0464e..b8eb376b3 100644 --- a/modules/config/default/+emacs-bindings.el +++ b/modules/config/default/+emacs-bindings.el @@ -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-" #'counsel-company + "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)) :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 33577fd5c..7caaa10d5 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -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 diff --git a/modules/config/default/config.el b/modules/config/default/config.el index 618fcef13..36c73075a 100644 --- a/modules/config/default/config.el +++ b/modules/config/default/config.el @@ -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) diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index 444470847..6227feabc 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -724,6 +724,9 @@ between the two." (:when (featurep! :completion helm) "." #'helm-org-in-buffer-headings "/" #'helm-org-agenda-files-headings) + (:when (featurep! :completion selectrum) + "." #'consult-org-heading + "/" #'consult-org-agenda) "A" #'org-archive-subtree "e" #'org-export-dispatch "f" #'org-footnote-new @@ -807,6 +810,9 @@ between the two." (:when (featurep! :completion helm) "g" #'helm-org-in-buffer-headings "G" #'helm-org-agenda-files-headings) + (:when (featurep! :completion selectrum) + "g" #'consult-org-heading + "G" #'consult-org-agenda) "c" #'org-clock-goto "C" (cmd! (org-clock-goto 'select)) "i" #'org-id-goto