0xa/.emacs.d
1
0
Fork 0
Code Issues Pull requests Releases Activity

use vertico for in-emacs completion

Browse source
This commit is contained in:
Grigory Shipunov 2023-05-04 15:32:36 +02:00
parent 0336e986eb
commit 02019ea38a
Signed by: 0xa
GPG key ID: 91FA5E5BF9AA901C
2 changed files with 82 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
init.el
View file

@ -10,6 +10,7 @@
(require 'oxa/sane-defaults)
(require 'oxa/utils)
(require 'oxa/misc)
(require 'oxa/completion)
(require 'oxa/org)
(require 'oxa/latex)
@ -48,15 +49,6 @@
(global-set-key (kbd "M-n") 'move-text-down)
(global-set-key (kbd "M-p") 'move-text-up)
;;; ido/smex for completion
(oxa/insure 'smex)
(oxa/insure 'ido-completing-read+)
(require 'ido)
(require 'ido-completing-read+)
(setq ido-require-flex-matching t)
(setq ido-everywhere t)
(ido-mode 1)
(ido-ubiquitous-mode 1)
;; direnv
(straight-use-package 'direnv)

81
lisp/oxa/completion.el Normal file
View file

@ -0,0 +1,81 @@
(straight-use-package 'vertico)
(straight-use-package 'orderless)
(straight-use-package 'marginalia)
(straight-use-package 'consult)
;; vertico uses history
(require 'savehist)
(savehist-mode)
;; orderless completion
(require 'orderless)
(setq completion-styles '(orderless basic)
completion-category-defaults nil
completion-category-overrides '((file (styles partial-completion))))
;; completion framework
(require 'vertico)
(vertico-mode)
(setq enable-recursive-minibuffers t)
(keymap-set vertico-map "?" #'minibuffer-completion-help)
(keymap-set vertico-map "M-RET" #'minibuffer-force-complete-and-exit)
(keymap-set vertico-map "M-TAB" #'minibuffer-complete)
;; annotations for minibuffer
(require 'marginalia)
(marginalia-mode)
(keymap-set minibuffer-local-map "M-A" #'marginalia-cycle)
;; vertico-enabled replacements
(require 'consult)
(setq consult-narrow-key "<")
;; global binds
(global-set-key (kbd "C-c M-x") 'consult-mode-command)
(global-set-key (kbd "C-c h") 'consult-history)
(global-set-key (kbd "C-c k") 'consult-kmacro)
(global-set-key (kbd "C-c m") 'consult-man)
(global-set-key (kbd "C-c i") 'consult-info)
(global-set-key (kbd "M-y") 'consult-yank-pop)
(global-set-key (kbd "C-x b") 'consult-buffer) ;; orig. switch-to-buffer
(global-set-key (kbd "C-x M-:") 'consult-complex-command) ;; orig. repeat-complex-command
(global-set-key (kbd "C-x 4 b") 'consult-buffer-other-window) ;; orig. switch-to-buffer-other-window
(global-set-key (kbd "C-x 5 b") 'consult-buffer-other-frame) ;; orig. switch-to-buffer-other-frame
(global-set-key (kbd "C-x r b") 'consult-bookmark) ;; orig. bookmark-jump
(global-set-key (kbd "C-x p b") 'consult-project-buffer) ;; orig. project-switch-to-buffer
;; goto-map
(global-set-key (kbd "M-g e") 'consult-compile-error)
(global-set-key (kbd "M-g f") 'consult-flymake) ;; Alternative: consult-flycheck
(global-set-key (kbd "M-g g") 'consult-goto-line) ;; orig. goto-line
(global-set-key (kbd "M-g M-g") 'consult-goto-line) ;; orig. goto-line
(global-set-key (kbd "M-g o") 'consult-outline) ;; Alternative: consult-org-heading
(global-set-key (kbd "M-g m") 'consult-mark)
(global-set-key (kbd "M-g k") 'consult-global-mark)
(global-set-key (kbd "M-g i") 'consult-imenu)
(global-set-key (kbd "M-g I") 'consult-imenu-multi)
;; search map
(global-set-key (kbd "M-s d") 'consult-find)
(global-set-key (kbd "M-s D") 'consult-locate)
(global-set-key (kbd "M-s g") 'consult-grep)
(global-set-key (kbd "M-s G") 'consult-git-grep)
(global-set-key (kbd "M-s r") 'consult-ripgrep)
(global-set-key (kbd "M-s l") 'consult-line)
(global-set-key (kbd "M-s L") 'consult-line-multi)
(global-set-key (kbd "M-s k") 'consult-keep-lines)
(global-set-key (kbd "M-s u") 'consult-focus-lines)
;; finding files
;; minibuffer
(keymap-set minibuffer-local-map "M-s" #'consult-history)
(keymap-set minibuffer-local-map "M-r" #'consult-history)
(provide 'oxa/completion)