From db4c1863340ca9174b721fddaf002344ca57b437 Mon Sep 17 00:00:00 2001
From: Thanos Apollo <public@thanosapollo.org>
Date: Tue, 5 Mar 2024 06:38:05 +0200
Subject: emacs: Update consult & corfu config

---
 .emacs.d/init.el | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 094de8c..6606b00 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -314,9 +314,25 @@
   (marginalia-mode))
 
 (use-package consult
-  :defer t
-  :bind (("C-x b" . 'consult-buffer)
-	 ("C-c m" . 'consult-imenu)))
+  :ensure t
+  :init (define-prefix-command 'thanos/search)
+  :bind (("C-x r d" . 'bookmark-delete)
+	 ("C-x r C-r" . 'bookmark-rename)
+	 ("C-x r ." . 'consult-register)
+	 ("C-x r s" . 'consult-register-store)
+	 ("C-x r b" . 'consult-bookmark)
+         ("M-y" . 'consult-yank-from-kill-ring)
+	 ("C-s" . 'thanos/search)
+	 :map thanos/search
+	 ("f" . 'isearch-forward)
+	 ("r" . 'isearch-backward)
+	 ("s" . 'consult-line)
+	 ("C-f" . 'consult-find)
+	 ("C-g" . 'consult-grep)
+	 ("C-i" . 'consult-info)
+	 ("C-l" . 'consult-locate)
+	 :map project-prefix-map
+	 ("b" . 'consult-project-buffer)))
 
 (use-package which-key
   :ensure t
@@ -435,7 +451,6 @@
 
 (use-package corfu
   :ensure t
-  :init (define-prefix-command 'thanos/search)
   :config
   (global-corfu-mode)
   (corfu-popupinfo-mode)
@@ -449,24 +464,7 @@
 	corfu-preselect 'first
 	corfu-preview-current t
 	corfu-echo-mode t)
-  (setf indent-tabs-mode nil)
-  :bind (("C-x r d" . 'bookmark-delete)
-	 ("C-x r C-r" . 'bookmark-rename)
-	 ("C-x r ." . 'consult-register)
-	 ("C-x r s" . 'consult-register-store)
-	 ("C-x r b" . 'consult-bookmark)
-         ("M-y" . 'consult-yank-from-kill-ring) 
-	 ("C-s" . 'thanos/search)
-	 :map thanos/search
-	 ("f" . 'isearch-forward)
-	 ("r" . 'isearch-backward)
-	 ("s" . 'consult-line)
-	 ("C-f" . 'consult-find)
-	 ("C-g" . 'consult-grep)
-	 ("C-i" . 'consult-info)
-	 ("C-l" . 'consult-locate)
-	 :map project-prefix-map
-	 ("b" . 'consult-project-buffer)))
+  (setf indent-tabs-mode nil))
 
 (defun insert-brackets (&optional arg)
   "Insert ARG brackets."
-- 
cgit v1.2.3