From 07fbffe86834e97a3e49622dd825d013f62a9a59 Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <anthony@anthonycicchetti.com>
Date: Sun, 21 Mar 2021 20:44:49 -0400
Subject: [PATCH] Whole completion thingy

---
 emacs/init.el | 67 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 65 insertions(+), 2 deletions(-)

diff --git a/emacs/init.el b/emacs/init.el
index 441d467..0447d25 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -64,7 +64,8 @@
      ("melpa" . "https://melpa.org/packages/")
      ("org" . "https://orgmode.org/elpa/")))
  '(package-selected-packages
-   '(lua-mode lsp-mode yaml-mode evil-lispy treemacs-magit treemacs-evil treemacs lsp-pyright lsp-ui rustic flycheck origami groovy-mode avy editorconfig org-crypt tree-sitter-langs tree-sitter centaur-tabs dashboard page-break-lines wakatime-mode super-save ox-pandoc evil-surround evil-collection undo-tree toc-org evil-org org-plus-contrib evil-goggles evil-expat evil-commentary auto-package-update lispy smartparens which-key git-gutter rainbow-delimiters auto-complete-distel auto-complete evil magit evil-magit))
+   '(embark-consult embark selectrum-prescient prescient marginalia consult-flycheck consult-selectrum selectrum lua-mode lsp-mode yaml-mode evil-lispy treemacs-magit treemacs-evil treemacs lsp-pyright lsp-ui rustic flycheck origami groovy-mode avy editorconfig org-crypt tree-sitter-langs tree-sitter centaur-tabs dashboard page-break-lines wakatime-mode super-save ox-pandoc evil-surround evil-collection undo-tree toc-org evil-org org-plus-contrib evil-goggles evil-expat evil-commentary auto-package-update lispy smartparens which-key git-gutter rainbow-delimiters auto-complete-distel auto-complete evil magit evil-magit))
+ '(prescient-filter-method '(literal regexp initialism fuzzy))
  '(ring-bell-function 'ignore)
  '(rustic-format-trigger 'on-compile)
  '(rustic-indent-method-chain t)
@@ -184,7 +185,7 @@
 (evil-define-key 'normal 'global (kbd "<leader>i") 'help)
 (evil-define-key 'normal 'global (kbd "gc") 'evil-commentary)
 (evil-define-key 'normal 'global (kbd "<leader>u") 'undo-tree-visualize)
-(evil-define-key 'normal 'global (kbd "<leader> b") 'ibuffer)
+(evil-define-key 'normal 'global (kbd "<leader> b") 'consult-buffer)
 
 ;; Avy
 (use-package avy
@@ -207,6 +208,9 @@
 
 ;; which-key
 (use-package which-key
+  :after (evil)
+  :init
+  (setq which-key-show-operator-state-maps t)
   :config (which-key-mode))
 
 ;; Git gutter
@@ -329,6 +333,65 @@
 (use-package treemacs-magit
   :after (treemacs magit))
 
+;; Prescient
+(use-package prescient)
+
+(use-package selectrum-prescient
+  :after (prescient selectrum)
+  :init
+  (selectrum-prescient-mode 1))
+
+;; Selectrum
+(use-package selectrum
+  :init
+  (selectrum-mode 1))
+
+;; Consult, Marginalia, embark
+(use-package consult
+  :after (evil)
+  :config
+  (evil-define-key 'normal 'global (kbd "<leader> c f") 'find-fd)
+  (evil-define-key 'normal 'global (kbd "<leader> c g") 'consult-ripgrep)
+  :init
+  (defun find-fd (&optional dir initial)
+    (interactive "P")
+    (let ((consult-find-command "fd --color=never --full-path ARG OPTS"))
+      (consult-find dir initial))) (fset 'multi-occur #'consult-multi-occur)
+  (advice-add #'register-preview :override #'consult-register-window)
+  :config)
+
+(use-package consult-flycheck
+  :after (consult flycheck)
+  :bind (:map flycheck-command-map
+              ("!" . consult-flycheck)))
+
+(use-package marginalia
+  :init
+  (marginalia-mode)
+  (advice-add #'marginalia-cycle :after
+              (lambda () (when (bound-and-true-p selectrum-mode) (selectrum-exhibit 'keep-selected))))
+
+  (setq marginalia-annotators '(marginalia-annotators-heavy marginalia-annotators-light nil)))
+
+(use-package embark
+  :ensure t
+  :after (evil)
+  :init
+  (evil-define-key 'normal 'global (kbd "<leader> e") 'embark-act)
+  (setq embark-action-indicator
+      (lambda (map _target)
+        (which-key--show-keymap "Embark" map nil nil #'no-paging)
+        #'which-key--hide-popup-ignore-command)
+      embark-become-indicator embark-action-indicator))
+
+;; Consult users will also want the embark-consult package.
+(use-package embark-consult
+  :ensure t
+  :after (embark consult)
+  :demand t
+  :hook
+  (embark-collect-mode . embark-consult-preview-minor-mode))
+
 (if (file-directory-p "~/.emacs.d/custom")
     (require 'lsp))