From 6c5755efd0525d57f2fe9b7df1e2a994e08f611f Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Sat, 16 Apr 2022 11:46:57 -0700
Subject: completion: a few more changes

---
 emacs/custom/my-completion.el | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'emacs/custom/my-completion.el')

diff --git a/emacs/custom/my-completion.el b/emacs/custom/my-completion.el
index b4d3b33..005dc81 100644
--- a/emacs/custom/my-completion.el
+++ b/emacs/custom/my-completion.el
@@ -1,5 +1,7 @@
-;;; my-completion.el --- Configure parts related to completion
+;;; my-completion.el --- Configure parts related to completion -*- lexical-binding: t -*-
+
 ;;; Commentary:
+
 ;;; Code:
 
 (require 'use-package)
@@ -9,10 +11,15 @@
   :init
   (vertico-mode)
   (vertico-multiform-mode 1)
+
+  (setq vertico-multiform-categories
+        '((consult-grep buffer)))
+
   (setq vertico-multiform-commands
-        '((consult-imenu buffer indexed)
-          (consult-org-heading buffer indexed)
-          (consult-outline buffer indexed))))
+        '((consult-imenu buffer)
+          (consult-ripgrep buffer)
+          (consult-org-heading buffer )
+          (consult-outline buffer))))
 
 (use-package orderless
   :ensure t
@@ -33,6 +40,9 @@
          ("C-x 4 b" . consult-buffer-other-window)
          ("C-x r b" . consult-bookmark)
          ("C-x p b" . consult-project-buffer)
+         ("C-c i"   . consult-imenu)
+         ("C-c f"   . consult-git-grep)
+         ("C-c /"   . consult-ripgrep)
          ("M-y"     . consult-yank-pop)
          ("M-g e"   . consult-compile-error)
          ("M-g f"   . consult-flymake)
@@ -41,15 +51,10 @@
          ("M-g o"   . consult-org-heading)
          ("M-g m"   . consult-mark)
          ("M-g k"   . consult-global-mark)
-         ("C-c i"   . consult-imenu)
-         ("C-c f"   . consult-git-grep)
-         ("C-c /"   . consult-ripgrep)
          ("M-s l"   . consult-line)
          ("M-s L"   . consult-line-multi)
-         ("M-s m"   . consult-multi-occur)
-         ("M-s k"   . consult-keep-lines)
          ;; Isearch integration
-         ("M-s e" . consult-isearch-history)
+         ("C-s" . consult-isearch-history)
          :map isearch-mode-map
          ("M-e" . consult-isearch-history)   ;; orig. isearch-edit-string
          ("M-s e" . consult-isearch-history) ;; orig. isearch-edit-string
-- 
cgit 1.4.1