Replace helm with selectrum+consult+marginalia for most use cases

1 files changed, 54 insertions, 31 deletions

diff --git a/gui/conf/init.el b/gui/conf/init.el
index 2c04ee1..de167dd 100644
--- a/gui/conf/init.el
+++ b/gui/conf/init.el
@@ -34,10 +34,6 @@
   (startup (selected-frame)))
 
 (savehist-mode 1)
-(setq savehist-additional-variables
-      '(kill-ring search-ring))
-(setq savehist-file "~/.emacs.d/savehist")
-
 (global-eldoc-mode -1)
 
 (setq mouse-wheel-scroll-amount '(5))
@@ -345,23 +341,58 @@
 
 (global-set-key (kbd "<print>") 'org-store-link)
 
-(use-package helm
+(use-package orderless
+  :ensure t)
+
+(use-package selectrum
+  :ensure t
+  :config
+  (setq completion-styles '(orderless))
+  (setq selectrum-prescient-enable-filtering nil)
+  (setq selectrum-max-window-height 16)
+  :init
+  (selectrum-mode +1))
+
+(use-package prescient
+  :ensure t)
+
+(use-package selectrum-prescient
+  :ensure t
+  :after (selectrum prescient)
+  :init
+  (selectrum-prescient-mode +1)
+  (prescient-persist-mode +1))
+
+(use-package consult
   :ensure t
   :config
-  (global-set-key (kbd "M-x") 'helm-M-x)
-  (evil-leader/set-key "x" 'helm-M-x)
   (define-key evil-motion-state-map (kbd "C-b") nil)
-  (global-set-key (kbd "C-b") 'helm-mini)
-  (setq helm-split-window-in-side-p       t
-        helm-move-to-line-cycle-in-source t
-        helm-buffer-max-length            60)
-  (evil-leader/set-key "d" 'helm-etags-select)
-  (helm-mode 1))
+  (global-set-key (kbd "C-b") 'consult-buffer)
+  (evil-leader/set-key "s" 'consult-line)
+  (evil-leader/set-key "x" 'execute-extended-command))
+
+(use-package marginalia
+  :ensure t
+  :init
+  (marginalia-mode))
 
-(use-package helm-swoop
+(use-package embark
+  :ensure t
+  :bind
+  (("C-S-a" . embark-act)
+   ("C-h B" . embark-bindings)))
+
+(use-package embark-consult
+  :ensure t
+  :after (embark consult))
+
+(use-package helm
   :ensure t
   :config
-  (evil-leader/set-key "s" 'helm-swoop-without-pre-input))
+  (setq helm-split-window-in-side-p       t
+        helm-move-to-line-cycle-in-source t
+        helm-buffer-max-length            60)
+  (evil-leader/set-key "d" 'helm-etags-select))
 
 (use-package helm-ls-git
   :ensure t
@@ -380,8 +411,7 @@
 
 (evil-define-key 'normal 'global
   "J" 'evil-forward-paragraph
-  "K" 'evil-backward-paragraph
-  "P" 'helm-show-kill-ring)
+  "K" 'evil-backward-paragraph)
 
 (defun switch-to-last-buffer ()
   (interactive)
@@ -408,7 +438,6 @@
   (after-init . org-roam-mode)
   :custom
   (org-roam-directory "~/org")
-  (org-roam-completion-system 'helm)
   (org-roam-rename-file-on-title-change nil))
 
 (defhydra hydra-roam ()
@@ -445,11 +474,6 @@
 (use-package helm-org-ql
   :ensure t)
 
-(use-package helm-ag
-  :ensure t
-  :config
-  (evil-leader/set-key "pa" 'helm-projectile-ag))
-
 (use-package magit
   :ensure t
   :config
@@ -458,20 +482,19 @@
 (use-package projectile
   :ensure t
   :config
-  (setq projectile-completion-system 'helm)
   (setq projectile-project-search-path '("~/projects"))
-  (projectile-mode)
   (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)
   (evil-leader/set-key "pt" 'projectile-regenerate-tags)
-  (evil-leader/set-key "pk" 'projectile-kill-buffers))
+  (evil-leader/set-key "pk" 'projectile-kill-buffers)
+  (evil-leader/set-key "pp" 'projectile-switch-project)
+  (evil-leader/set-key "pb" 'projectile-switch-to-buffer)
+  :init
+  (projectile-mode))
 
-(use-package helm-projectile
+(use-package helm-ag
   :ensure t
   :config
-  (helm-projectile-on)
-  (evil-leader/set-key "ph" 'helm-projectile)
-  (evil-leader/set-key "pp" 'helm-projectile-switch-project)
-  (evil-leader/set-key "pb" 'helm-projectile-switch-to-buffer))
+  (evil-leader/set-key "pa" 'helm-projectile-ag))
 
 (defun get-related-files ()
   (let ((common-basename-files (seq-filter (lambda (file) (string= (file-name-sans-extension file) (file-name-base)))