3 files changed, 27 insertions, 17 deletions
diff --git a/emacs/custom/my-completion.el b/emacs/custom/my-completion.el
index 98744a7..487045b 100644
--- a/emacs/custom/my-completion.el
+++ b/emacs/custom/my-completion.el
@@ -7,7 +7,12 @@
 (use-package vertico
   :ensure t
   :init
-  (vertico-mode))
+  (vertico-mode)
+  (vertico-multiform-mode 1)
+  (setq vertico-multiform-commands
+        '((consult-imenu buffer indexed)
+          (consult-org-heading buffer indexed)
+          (consult-outline buffer indexed))))
 
 (use-package marginalia
   :ensure t
@@ -26,17 +31,33 @@
          ("M-g e"   . consult-compile-error)
          ("M-g f"   . consult-flymake)
          ("M-g M-g" . consult-goto-line)
-         ("M-g o"   . consult-outline)
+         ("M-g O"   . consult-outline)
+         ("M-g o"   . consult-org-heading)
          ("M-g m"   . consult-mark)
          ("M-g k"   . consult-global-mark)
          ("C-c i"   . consult-imenu)
-         ("M-s d"   . consult-find)
          ("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)))
+         ("M-s k"   . consult-keep-lines)
+         ;; Isearch integration
+         ("M-s e" . 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
+         ("M-s l" . consult-line) ;; needed by consult-line to detect isearch
+         ("M-s L" . consult-line-multi) ;; needed by consult-line to detect isearch
+         ))
+
+(use-package corfu
+  :ensure t
+  :custom
+  (corfu-cycle t)  ;; Enable cycling for `corfu-next/previous'
+  (corfu-auto t)   ;; Enable auto completion
+  :init
+  (corfu-global-mode))
 
 (provide 'my-completion)
 ;;; my-completion.el ends here
diff --git a/emacs/custom/my-conf.el b/emacs/custom/my-conf.el
index 6d702bc..55bc132 100644
--- a/emacs/custom/my-conf.el
+++ b/emacs/custom/my-conf.el
@@ -31,8 +31,7 @@
 
 (use-package systemd
   :ensure t
-  :hook ((systemd-mode . flyspell-prog-mode)
-         (systemd-mode . company-mode)))
+  :hook ((systemd-mode . flyspell-prog-mode)))
 
 (use-package hcl-mode
   :ensure t)
diff --git a/emacs/custom/my-prog.el b/emacs/custom/my-prog.el
index 9146d2d..ae3202b 100644
--- a/emacs/custom/my-prog.el
+++ b/emacs/custom/my-prog.el
@@ -47,16 +47,6 @@
   (comment-fill-column 80)
   (comment-auto-fill-only-comments t))
 
-(use-package company
-  :ensure t
-  :diminish company-mode
-  :hook (prog-mode . company-mode)
-  :custom
-  (company-minimum-prefix-length 2)
-  (company-tooltip-align-annotations t)
-  (company-tooltip-limit 12)
-  (company-idle-delay 1))
-
 (use-package lispy
   :ensure t
   :config
@@ -70,7 +60,7 @@
   :bind ("C-c C-h" . eldoc))
 
 (use-package eglot
-  :after (yasnippet company)
+  :after (yasnippet)
   :commands (eglot eglot-ensure)
   :ensure t
   :bind (:map eglot-mode-map