completion: minicomp goes by vertico now

2 files changed, 18 insertions, 16 deletions

diff --git a/completion.org b/completion.org
index 96e8252..61798bc 100644
--- a/completion.org
+++ b/completion.org
@@ -1,9 +1,5 @@
 #+title: Completion configuration using selectrum, consult and friends
 
-* completion styles
-  #+begin_src emacs-lisp
-    (setq completion-styles '(partial-completion emacs22 initials))
-  #+end_src
 * company
   #+begin_src emacs-lisp
     (use-package company
@@ -81,26 +77,30 @@
 
   #+end_src
 
-* orderless
+* completion styles
   #+begin_src emacs-lisp :load no
     (use-package orderless
       :ensure t
-      :custom ((orderless-component-separator "[ -/]+")
+      :custom ((completion--styles '(partial-completion emacs22 initials))
+               (completion-category-defaults nil)
+               ;; (completion-category-overrides
+               ;;  '((file (styles . (partial-completion)))))
+               (orderless-component-separator "[ -/]+")
                (orderless-matching-styles
                 '(orderless-literal orderless-regexp orderless-initialism)))
       :bind
       ((:map minibuffer-local-completion-map ("SPC" . self-insert-command))))
   #+end_src
-* minicomp
+* vertico
   #+begin_src emacs-lisp
-    (jao-load-path "minicomp")
-    (use-package minicomp
-      :init (setq minicomp-count 20)
+    (jao-load-path "vertico")
+    (use-package vertico
+      :init (setq vertico-count 20)
       :config
-      (defun jao-minicomp--orderless (&rest _)
+      (defun jao-vertico--orderless (&rest _)
         (setq-local completion-styles '(orderless)))
-      (advice-add 'minicomp--setup :before #'jao-minicomp--orderless))
-    (minicomp-mode 1)
+      (advice-add 'vertico--setup :before #'jao-minicomp--orderless))
+    (vertico-mode)
   #+end_src
 * marginalia
   #+begin_src emacs-lisp
diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el
index 6fa66c0..5543c9b 100644
--- a/lib/themes/jao-themes.el
+++ b/lib/themes/jao-themes.el
@@ -822,8 +822,6 @@
             (mm-uu-extract (p hilite) ex)
             (minibuffer-line (p f00))
             (minibuffer-prompt (p f00))
-            (minicomp-group-title (p dimm))
-            (minicomp-group-separator (p dimm) :strike-through "grey80")
             (mode-line-buffer-id nbf (c nil nil))
             (mode-line-emphasis (p warning))
             (mode-line-highlight (~ mode-line))
@@ -1012,7 +1010,11 @@
             (twittering-username-face (p f01)))
           `((underline ul))
           `((variable-pitch :family ,jao-themes--face-family :height 110)
-            (vertical-border (c ,jao-themes--box nil) :inherit default))
+            (vertical-border (c ,jao-themes--box nil) :inherit default)
+            (vertico-current (p hilite))
+            (vertico-group-title (p dimm))
+            (vertico-group-separator (p dimm) :strike-through "grey80")
+            (vertico-truncation (~ shadow)))
           `((w3m-anchor link)
             (w3m-arrived-anchor vlink)
             (w3m-bold bf dbg dfg)