diff --git a/init.el b/init.el index 6849b41..a22c969 100644 --- a/init.el +++ b/init.el @@ -155,7 +155,6 @@ global-subword-mode ; Treats camel-case names as multiple words global-auto-revert-mode ; Automatically revert buffers on file changes global-hl-line-mode ; Highlight the currently-selected line - ido-mode ; Better directory and buffer completion column-number-mode ; Show column number in the mode line show-paren-mode ; Highlight matching parenthesis size-indication-mode ; Show buffer size in the mode line @@ -172,8 +171,6 @@ ;; Mode Configuration (setq - ido-max-prospects 8 ; (ido-mode) - Limit max on-screen matches to 8 items - ido-max-window-height 10 ; (ido-mode) - Limit max minibuffer height to 10 lines show-paren-delay 0.0 ; (show-paren-mode) - Parenthesis highlighting delay visual-line-fringe-indicators t ; (visual-line-mode) - Shows fringe indicators for wrapping ) @@ -743,22 +740,6 @@ (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map) (projectile-mode t)) -;;==================== -;; Smex (M-x Autocompletion) -;;==================== - -;; Bindings: -;; [ M-x ] (Overwritten) -> Open Smex - -;; Load Smex -(use-package smex - :config - (smex-initialize) - :custom - (smex-prompt-string "Cmd: ") - :bind - ("M-x" . smex)) - ;;==================== ;; Undo Tree ;;==================== @@ -914,9 +895,7 @@ ;; Load Magit (use-package magit :bind - ("C-c g" . magit-status) - :custom - (magit-completing-read-function 'magit-ido-completing-read)) + ("C-c g" . magit-status)) ;; [TODO Listing] ;; Load Magit-Todos @@ -925,66 +904,55 @@ (magit-mode-hook)) ;;==================== -;; Crm-Custom (Additional Ido Compat.) +;; Consult (Enhanced Autocompletion Commands) ;;==================== -;; Load Crm-Custom -(use-package crm-custom +(use-package consult :demand t - :config - (crm-custom-mode 1)) - -;;==================== -;; Ido-Completing-Read+ (Ido Everywhere) -;;==================== - -;; Load Ido-Completing-Read+ -(use-package ido-completing-read+ - :demand - t - :config - (ido-ubiquitous-mode t)) - -;;==================== -;; Ido-Vertical-Mode (Vertical Completions) -;;==================== - -;; Load Ido-Vertical-Mode -(use-package ido-vertical-mode - :demand - t - :config - (ido-vertical-mode t) - :custom - (ido-vertical-define-keys 'C-n-C-p-up-down-left-right) - (ido-vertical-indicator " →")) - -;;==================== -;; Flx-Ido (Ido Fuzzy Matching) -;;==================== - -;; Load Flx-Ido -(use-package flx-ido - :demand - t - :config - (flx-ido-mode t)) - -;;==================== -;; Swiper (Inline Search w/ Overview) -;;==================== - -(use-package swiper - :demand - t - :custom - (ivy-dynamic-exhibit-delay-ms 250) - (ivy-count-format "") - (swiper-include-line-number-in-search t) :bind - ("C-s" . swiper) - ("C-r" . swiper-backward)) + (("C-S-s" . 'consult-line-multi) + (" " . 'consult-line) + (" " . 'consult-goto-line) + (" " . 'consult-buffer) + ("C-x M-b" . 'consult-buffer-other-window) + (" " . 'consult-yank-from-kill-ring) + (" " . 'consult-ripgrep))) + +;;==================== +;; Fussy (Fuzzy Matching Completion Style) +;;==================== + +(use-package fussy + :demand + t + :custom + (completion-styles '(fussy basic)) + (completion-category-defaults nil) + (completion--category-overrides nil)) + +;;==================== +;; Vertico (Vertical Autocompletion UI) +;;==================== + +(use-package vertico + :demand + t + :custom + (vertico-count 9) + (vertico-cycle t) + (vertico-resize nil) + (vertico-group-format nil) + (vertico-count-format nil) + :hook + (rfn-eshadow-update-overlay-hook . vertico-directory-tidy) + :config + (vertico-mode t) + :bind + (:map vertico-map + ("\r" . 'vertico-directory-enter) + ("\d" . 'vertico-directory-delete-char) + ("\M-\d" . 'vertico-directory-delete-word))) ;;==================== ;; Anzu (Search Mode Info Display)