From 07b0013c75fc2542d9f417afe5ac9eea2b31ffc7 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sun, 20 Jun 2021 01:09:31 +0100 Subject: [PATCH] feat(editor): add config for vertico + orderless as a alternative to selectrum I still prefer selectrum for the time being, but I've written the config, might as well commit it for potential future use or experimentation. --- modules/editor/siren-orderless.el | 20 +++++++++++++++ modules/editor/siren-vertico.el | 27 +++++++++++++++++++++ modules/navigation/siren-consult.el | 4 --- themes/siren-doom-themes-overrides-theme.el | 15 ++++++++++++ 4 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 modules/editor/siren-orderless.el create mode 100644 modules/editor/siren-vertico.el diff --git a/modules/editor/siren-orderless.el b/modules/editor/siren-orderless.el new file mode 100644 index 0000000..18e28b9 --- /dev/null +++ b/modules/editor/siren-orderless.el @@ -0,0 +1,20 @@ +;;; siren-orderless.el --- jimeh's Emacs Siren: orderless configuration. + +;;; Commentary: + +;; Basic configuration for orderless. + +;;; Code: + +(use-package orderless + :custom + (completion-styles '(orderless)) + (completion-category-overrides '((file (styles . (partial-completion))))) + (orderless-matching-styles '(orderless-literal + orderless-prefixes + orderless-regexp + orderless-initialism + orderless-flex))) + +(provide 'siren-orderless) +;;; siren-orderless.el ends here diff --git a/modules/editor/siren-vertico.el b/modules/editor/siren-vertico.el new file mode 100644 index 0000000..2b0b994 --- /dev/null +++ b/modules/editor/siren-vertico.el @@ -0,0 +1,27 @@ +;;; siren-vertico.el --- jimeh's Emacs Siren: vertico configuration. + +;;; Commentary: + +;; Basic configuration for vertico. + +;;; Code: + +(require 'siren-orderless) + +(use-package vertico + :custom + (enable-recursive-minibuffers t) + (resize-mini-windows nil) + (vertico-count 12) + (vertico-cycle t) + + :init + (defun siren-crm-indicator (args) + (cons (concat "[CRM] " (car args)) (cdr args))) + + :config + (vertico-mode +1) + (advice-add #'completing-read-multiple :filter-args #'siren-crm-indicator)) + +(provide 'siren-vertico) +;;; siren-vertico.el ends here diff --git a/modules/navigation/siren-consult.el b/modules/navigation/siren-consult.el index c4b8c3d..3b1c249 100644 --- a/modules/navigation/siren-consult.el +++ b/modules/navigation/siren-consult.el @@ -6,10 +6,6 @@ ;;; Code: -(require 'siren-prescient) -(require 'siren-projectile) -(require 'siren-selectrum) - (use-package consult :defer t :bind diff --git a/themes/siren-doom-themes-overrides-theme.el b/themes/siren-doom-themes-overrides-theme.el index 8297eae..bb2ef7d 100644 --- a/themes/siren-doom-themes-overrides-theme.el +++ b/themes/siren-doom-themes-overrides-theme.el @@ -115,6 +115,21 @@ :foreground ,(doom-blend 'magenta 'red 0.6) :weight 'bold)))) + ;; vertico + `(vertico-current ((t ( :background ,(doom-blend 'violet 'bg 0.2) + :foreground ,(doom-blend 'violet 'fg 0.3) + :distant-foreground nil :extend t )))) + + ;; orderless + `(orderless-match-face-0 ((t ( :background nil + :foreground ,(doom-lighten 'magenta 0.15) )))) + `(orderless-match-face-1 ((t ( :background nil + :foreground ,(doom-lighten 'magenta '0.3) )))) + `(orderless-match-face-2 ((t ( :background nil + :foreground ,(doom-blend 'magenta 'red 0.4) )))) + `(orderless-match-face-3 ((t ( :background nil + :foreground ,(doom-blend 'magenta 'red 0.7) )))) + ;; helm `(helm-posframe-border ((t ( :background ,(doom-color 'dark-blue) )))))