Add whitespace mode keybind, remove embark and consult
This commit is contained in:
parent
2820cfd0f1
commit
d9da140621
@ -320,6 +320,7 @@
|
|||||||
(define-key evil-normal-state-map (kbd "SPC E") 'eval-expression)
|
(define-key evil-normal-state-map (kbd "SPC E") 'eval-expression)
|
||||||
(define-key evil-normal-state-map (kbd "SPC b") 'eval-buffer)
|
(define-key evil-normal-state-map (kbd "SPC b") 'eval-buffer)
|
||||||
(define-key evil-normal-state-map (kbd "SPC w") 'save-buffer)
|
(define-key evil-normal-state-map (kbd "SPC w") 'save-buffer)
|
||||||
|
(define-key evil-normal-state-map (kbd "SPC W") 'whitespace-mode)
|
||||||
(define-key evil-normal-state-map (kbd "SPC k") 'kill-buffer)
|
(define-key evil-normal-state-map (kbd "SPC k") 'kill-buffer)
|
||||||
(define-key evil-normal-state-map (kbd "SPC f") 'ffap)
|
(define-key evil-normal-state-map (kbd "SPC f") 'ffap)
|
||||||
(define-key evil-normal-state-map (kbd "SPC F") 'find-file)
|
(define-key evil-normal-state-map (kbd "SPC F") 'find-file)
|
||||||
@ -434,116 +435,6 @@
|
|||||||
:commands (marginalia-mode marginalia-cycle)
|
:commands (marginalia-mode marginalia-cycle)
|
||||||
:hook (after-init . marginalia-mode))
|
:hook (after-init . marginalia-mode))
|
||||||
|
|
||||||
(use-package embark
|
|
||||||
:straight t
|
|
||||||
:defer t
|
|
||||||
:commands (embark-act
|
|
||||||
embark-dwim
|
|
||||||
embark-export
|
|
||||||
embark-collect
|
|
||||||
embark-bindings
|
|
||||||
embark-prefix-help-command)
|
|
||||||
:bind
|
|
||||||
(("C-." . embark-act) ;; pick some comfortable binding
|
|
||||||
("C-;" . embark-dwim) ;; good alternative: M-.
|
|
||||||
("C-h B" . embark-bindings)) ;; alternative for `describe-bindings'
|
|
||||||
|
|
||||||
:init
|
|
||||||
(setq prefix-help-command #'embark-prefix-help-command)
|
|
||||||
|
|
||||||
:config
|
|
||||||
;; Hide the mode line of the Embark live/completions buffers
|
|
||||||
(add-to-list 'display-buffer-alist
|
|
||||||
'("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*"
|
|
||||||
nil
|
|
||||||
(window-parameters (mode-line-format . none)))))
|
|
||||||
|
|
||||||
(use-package embark-consult
|
|
||||||
:straight t
|
|
||||||
:hook
|
|
||||||
(embark-collect-mode . consult-preview-at-point-mode))
|
|
||||||
|
|
||||||
(use-package consult
|
|
||||||
:straight t
|
|
||||||
:bind (;; C-c bindings in `mode-specific-map'
|
|
||||||
("C-c M-x" . consult-mode-command)
|
|
||||||
("C-c h" . consult-history)
|
|
||||||
("C-c k" . consult-kmacro)
|
|
||||||
("C-c m" . consult-man)
|
|
||||||
("C-c i" . consult-info)
|
|
||||||
([remap Info-search] . consult-info)
|
|
||||||
;; C-x bindings in `ctl-x-map'
|
|
||||||
("C-x M-:" . consult-complex-command)
|
|
||||||
("C-x b" . consult-buffer)
|
|
||||||
("C-x 4 b" . consult-buffer-other-window)
|
|
||||||
("C-x 5 b" . consult-buffer-other-frame)
|
|
||||||
("C-x t b" . consult-buffer-other-tab)
|
|
||||||
("C-x r b" . consult-bookmark)
|
|
||||||
("C-x p b" . consult-project-buffer)
|
|
||||||
;; Custom M-# bindings for fast register access
|
|
||||||
("M-#" . consult-register-load)
|
|
||||||
("M-'" . consult-register-store)
|
|
||||||
("C-M-#" . consult-register)
|
|
||||||
;; Other custom bindings
|
|
||||||
("M-y" . consult-yank-pop)
|
|
||||||
;; M-g bindings in `goto-map'
|
|
||||||
("M-g e" . consult-compile-error)
|
|
||||||
("M-g f" . consult-flymake)
|
|
||||||
("M-g g" . consult-goto-line)
|
|
||||||
("M-g M-g" . consult-goto-line)
|
|
||||||
("M-g o" . consult-outline)
|
|
||||||
("M-g m" . consult-mark)
|
|
||||||
("M-g k" . consult-global-mark)
|
|
||||||
("M-g i" . consult-imenu)
|
|
||||||
("M-g I" . consult-imenu-multi)
|
|
||||||
;; M-s bindings in `search-map'
|
|
||||||
("M-s d" . consult-find)
|
|
||||||
("M-s c" . consult-locate)
|
|
||||||
("M-s g" . consult-grep)
|
|
||||||
("M-s G" . consult-git-grep)
|
|
||||||
("M-s r" . consult-ripgrep)
|
|
||||||
("M-s l" . consult-line)
|
|
||||||
("M-s L" . consult-line-multi)
|
|
||||||
("M-s k" . consult-keep-lines)
|
|
||||||
("M-s u" . consult-focus-lines)
|
|
||||||
;; Isearch integration
|
|
||||||
("M-s e" . consult-isearch-history)
|
|
||||||
:map isearch-mode-map
|
|
||||||
("M-e" . consult-isearch-history)
|
|
||||||
("M-s e" . consult-isearch-history)
|
|
||||||
("M-s l" . consult-line)
|
|
||||||
("M-s L" . consult-line-multi)
|
|
||||||
;; Minibuffer history
|
|
||||||
:map minibuffer-local-map
|
|
||||||
("M-s" . consult-history)
|
|
||||||
("M-r" . consult-history))
|
|
||||||
|
|
||||||
;; Enable automatic preview at point in the *Completions* buffer.
|
|
||||||
:hook (completion-list-mode . consult-preview-at-point-mode)
|
|
||||||
|
|
||||||
:init
|
|
||||||
;; Optionally configure the register formatting. This improves the register
|
|
||||||
(setq register-preview-delay 0.5
|
|
||||||
register-preview-function #'consult-register-format)
|
|
||||||
|
|
||||||
;; Optionally tweak the register preview window.
|
|
||||||
(advice-add #'register-preview :override #'consult-register-window)
|
|
||||||
|
|
||||||
;; Use Consult to select xref locations with preview
|
|
||||||
(setq xref-show-xrefs-function #'consult-xref
|
|
||||||
xref-show-definitions-function #'consult-xref)
|
|
||||||
|
|
||||||
:config
|
|
||||||
(consult-customize
|
|
||||||
consult-theme :preview-key '(:debounce 0.2 any)
|
|
||||||
consult-ripgrep consult-git-grep consult-grep
|
|
||||||
consult-bookmark consult-recent-file consult-xref
|
|
||||||
consult--source-bookmark consult--source-file-register
|
|
||||||
consult--source-recent-file consult--source-project-recent-file
|
|
||||||
;; :preview-key "M-."
|
|
||||||
:preview-key '(:debounce 0.4 any))
|
|
||||||
(setq consult-narrow-key "<"))
|
|
||||||
|
|
||||||
;;; Better discoverability for key mappings (which-key)
|
;;; Better discoverability for key mappings (which-key)
|
||||||
(use-package which-key
|
(use-package which-key
|
||||||
:straight t
|
:straight t
|
||||||
@ -609,7 +500,6 @@
|
|||||||
|
|
||||||
;; Abbrevs and Snippets
|
;; Abbrevs and Snippets
|
||||||
|
|
||||||
|
|
||||||
;;; Abbrevs
|
;;; Abbrevs
|
||||||
(define-abbrev global-abbrev-table "bg" "background")
|
(define-abbrev global-abbrev-table "bg" "background")
|
||||||
(define-abbrev global-abbrev-table "ty" "thank you")
|
(define-abbrev global-abbrev-table "ty" "thank you")
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user