c7254e7bdc
+ enable lexical-scope everywhere (lexical-binding = t): ~5-10% faster startup; ~5-20% general boost + reduce consing, function calls & garbage collection by preferring cl-loop & dolist over lambda closures (for mapc[ar], add-hook, and various cl-lib filter/map/reduce functions) -- where possible + prefer functions with dedicated opcodes, like assq (see byte-defop's in bytecomp.el for more) + prefer pcase & cond (faster) over cl-case + general refactor for code readability + ensure naming & style conventions are adhered to + appease byte-compiler by marking unused variables with underscore + defer minor mode activation to after-init, emacs-startup or window-setup hooks; a customization opportunity for users + ensures custom functionality won't interfere with startup.
386 lines
14 KiB
EmacsLisp
386 lines
14 KiB
EmacsLisp
;;; feature/evil/config.el -*- lexical-binding: t; -*-
|
|
|
|
;; I'm a vimmer at heart. Its modal philosophy suits me better, and this module
|
|
;; strives to make Emacs a much better vim than vim was.
|
|
|
|
(def-setting! :evil-state (&rest mode-state-list)
|
|
"Set the initialize STATE of MODE using `evil-set-initial-state'."
|
|
(if (cl-every #'listp mode-state-list)
|
|
`(progn
|
|
,@(let (forms)
|
|
(dolist (it mode-state-list (nreverse forms))
|
|
(unless (consp it)
|
|
(error ":evil-state expected cons cells, got %s" it))
|
|
(push `(evil-set-initial-state ',(car it) ',(cdr it)) forms))))
|
|
(let ((argc (length mode-state-list)))
|
|
(unless (= argc 2)
|
|
(error ":evil-state expected 2 arguments, got %s" argc)))
|
|
`(evil-set-initial-state ',(car mode-state-list) ',(cadr mode-state-list))))
|
|
|
|
|
|
;;
|
|
;; evil-mode
|
|
;;
|
|
|
|
(def-package! evil :demand t
|
|
:init
|
|
(setq evil-want-C-u-scroll t
|
|
evil-want-visual-char-semi-exclusive t
|
|
evil-want-Y-yank-to-eol t
|
|
evil-magic t
|
|
evil-echo-state t
|
|
evil-indent-convert-tabs t
|
|
evil-ex-search-vim-style-regexp t
|
|
evil-ex-substitute-global t
|
|
evil-ex-visual-char-range t ; column range for ex commands
|
|
evil-insert-skip-empty-lines t
|
|
evil-mode-line-format 'nil
|
|
;; more vim-like behavior
|
|
evil-symbol-word-search t
|
|
;; don't activate mark on shift-click
|
|
shift-select-mode nil)
|
|
|
|
:config
|
|
(add-hook 'emacs-startup-hook #'evil-mode)
|
|
(evil-select-search-module 'evil-search-module 'evil-search)
|
|
|
|
(set! :popup
|
|
'("*evil-registers*" :size 0.3)
|
|
'("*Command Line*" :size 8))
|
|
|
|
;; Don't interfere with localleader key
|
|
(define-key evil-motion-state-map "\\" nil)
|
|
|
|
;; Set cursor colors later, once theme is loaded
|
|
(defun +evil*init-cursors (&rest _)
|
|
(setq evil-default-cursor (face-background 'cursor nil t)
|
|
evil-normal-state-cursor 'box
|
|
evil-emacs-state-cursor `(,(face-foreground 'warning) box)
|
|
evil-insert-state-cursor 'bar
|
|
evil-visual-state-cursor 'hollow))
|
|
(advice-add #'load-theme :after #'+evil*init-cursors)
|
|
|
|
;; default modes
|
|
(dolist (mode '(tabulated-list-mode view-mode comint-mode term-mode calendar-mode Man-mode grep-mode))
|
|
(evil-set-initial-state mode 'emacs))
|
|
(dolist (mode '(help-mode debugger-mode))
|
|
(evil-set-initial-state mode 'normal))
|
|
|
|
;; make `try-expand-dabbrev' from `hippie-expand' work in minibuffer
|
|
;; @see `he-dabbrev-beg', so we need re-define syntax for '/'
|
|
(defun minibuffer-inactive-mode-hook-setup ()
|
|
(set-syntax-table (let* ((table (make-syntax-table)))
|
|
(modify-syntax-entry ?/ "." table)
|
|
table)))
|
|
(add-hook 'minibuffer-inactive-mode-hook #'minibuffer-inactive-mode-hook-setup)
|
|
|
|
|
|
;; --- keybind fixes ----------------------
|
|
(map! (:after wgrep
|
|
;; a wrapper that invokes `wgrep-mark-deletion' across lines
|
|
;; you use `evil-delete' on.
|
|
:map wgrep-mode-map [remap evil-delete] #'+evil-delete)
|
|
|
|
;; replace native folding commands
|
|
:n "zo" #'+evil:fold-open
|
|
:n "zO" #'+evil:fold-open
|
|
:n "zc" #'+evil:fold-close
|
|
:n "za" #'+evil:fold-toggle
|
|
:n "zr" #'+evil:fold-open-all
|
|
:n "zm" #'+evil:fold-close-all)
|
|
|
|
|
|
;; --- evil hacks -------------------------
|
|
(defvar +evil-esc-hook '(t)
|
|
"A hook run after ESC is pressed in normal mode (invoked by
|
|
`evil-force-normal-state'). If a hook returns non-nil, all hooks after it are
|
|
ignored.")
|
|
|
|
(defun +evil*attach-escape-hook ()
|
|
"Run the `+evil-esc-hook'."
|
|
(cond ((minibuffer-window-active-p (minibuffer-window))
|
|
;; quit the minibuffer if open.
|
|
(abort-recursive-edit))
|
|
((evil-ex-hl-active-p 'evil-ex-search)
|
|
;; disable ex search buffer highlights.
|
|
(evil-ex-nohighlight))
|
|
(t
|
|
;; Run all escape hooks. If any returns non-nil, then stop there.
|
|
(run-hook-with-args-until-success '+evil-esc-hook))))
|
|
(advice-add #'evil-force-normal-state :after #'+evil*attach-escape-hook)
|
|
|
|
(defun +evil*restore-normal-state-on-windmove (orig-fn &rest args)
|
|
"If in anything but normal or motion mode when moving to another window,
|
|
restore normal mode. This prevents insert state from bleeding into other modes
|
|
across windows."
|
|
(unless (memq evil-state '(normal motion))
|
|
(evil-normal-state +1))
|
|
(apply orig-fn args))
|
|
(advice-add #'windmove-do-window-select :around #'+evil*restore-normal-state-on-windmove)
|
|
|
|
(defun +evil*static-reindent (orig-fn &rest args)
|
|
"Don't move cursor on indent."
|
|
(save-excursion (apply orig-fn args)))
|
|
(advice-add #'evil-indent :around #'+evil*static-reindent)
|
|
|
|
;; monkey patch `evil-ex-replace-special-filenames' to add more ex
|
|
;; substitution flags to evil-mode
|
|
(advice-add #'evil-ex-replace-special-filenames
|
|
:override #'+evil*ex-replace-special-filenames)
|
|
|
|
;; These arg types will highlight matches in the current buffer
|
|
(evil-ex-define-argument-type buffer-match :runner +evil-ex-buffer-match)
|
|
(evil-ex-define-argument-type global-match :runner +evil-ex-global-match)
|
|
|
|
;; By default :g[lobal] doesn't highlight matches in the current buffer. I've
|
|
;; got to write my own argument type and interactive code to get it to do so.
|
|
(evil-ex-define-argument-type global-delim-match :runner +evil-ex-global-delim-match)
|
|
|
|
(dolist (sym '(evil-ex-global evil-ex-global-inverted))
|
|
(evil-set-command-property sym :ex-arg 'global-delim-match))
|
|
|
|
;; Other commands can make use of this
|
|
(evil-define-interactive-code "<//>"
|
|
:ex-arg buffer-match (list (when (evil-ex-p) evil-ex-argument)))
|
|
(evil-define-interactive-code "<//g>"
|
|
:ex-arg global-match (list (when (evil-ex-p) evil-ex-argument)))
|
|
|
|
(evil-set-command-properties
|
|
'+evil:align :move-point t :ex-arg 'buffer-match :ex-bang t :evil-mc t :keep-visual t :suppress-operator t)
|
|
(evil-set-command-properties
|
|
'+evil:mc :move-point nil :ex-arg 'global-match :ex-bang t :evil-mc t)
|
|
|
|
;; Move to new split -- setting `evil-split-window-below' &
|
|
;; `evil-vsplit-window-right' to non-nil mimics this, but that doesn't update
|
|
;; window history. That means when you delete a new split, Emacs leaves you on
|
|
;; the 2nd to last window on the history stack, which is jarring.
|
|
(defun +evil*window-follow (&rest _) (evil-window-down 1))
|
|
(defun +evil*window-vfollow (&rest _) (evil-window-right 1))
|
|
(advice-add #'evil-window-split :after #'+evil*window-follow)
|
|
(advice-add #'evil-window-vsplit :after #'+evil*window-vfollow))
|
|
|
|
|
|
;;
|
|
;; Plugins
|
|
;;
|
|
|
|
(def-package! evil-commentary
|
|
:commands (evil-commentary evil-commentary-yank evil-commentary-line)
|
|
:config (evil-commentary-mode 1))
|
|
|
|
|
|
(def-package! evil-easymotion
|
|
:after evil-snipe
|
|
:config
|
|
(defvar +evil--snipe-repeat-fn
|
|
(evilem-create #'evil-snipe-repeat
|
|
:bind ((evil-snipe-scope 'whole-buffer)
|
|
(evil-snipe-enable-highlight)
|
|
(evil-snipe-enable-incremental-highlight)))))
|
|
|
|
|
|
(def-package! evil-embrace
|
|
:after evil-surround
|
|
:config
|
|
(setq evil-embrace-show-help-p nil)
|
|
(evil-embrace-enable-evil-surround-integration)
|
|
|
|
(defun +evil--embrace-get-pair (char)
|
|
(if-let (pair (cdr-safe (assoc (string-to-char char) evil-surround-pairs-alist)))
|
|
pair
|
|
(if-let (pair (assoc-default char embrace--pairs-list))
|
|
(if-let (real-pair (and (functionp (embrace-pair-struct-read-function pair))
|
|
(funcall (embrace-pair-struct-read-function pair))))
|
|
real-pair
|
|
(cons (embrace-pair-struct-left pair) (embrace-pair-struct-right pair)))
|
|
(cons char char))))
|
|
|
|
(defun +evil--embrace-escaped ()
|
|
"Backslash-escaped surround character support for embrace."
|
|
(let ((char (read-char "\\")))
|
|
(if (eq char 27)
|
|
(cons "" "")
|
|
(let ((pair (+evil--embrace-get-pair (string char)))
|
|
(text (if (sp-point-in-string) "\\\\%s" "\\%s")))
|
|
(cons (format text (car pair))
|
|
(format text (cdr pair)))))))
|
|
|
|
(defun +evil--embrace-latex ()
|
|
"LaTeX command support for embrace."
|
|
(cons (format "\\%s{" (read-string "\\")) "}"))
|
|
|
|
(defun +evil--embrace-elisp-fn ()
|
|
"Elisp function support for embrace."
|
|
(cons (format "(%s " (or (read-string "(") "")) ")"))
|
|
|
|
;; Add escaped-sequence support to embrace
|
|
(push (cons ?\\ (make-embrace-pair-struct
|
|
:key ?\\
|
|
:read-function #'+evil--embrace-escaped
|
|
:left-regexp "\\[[{(]"
|
|
:right-regexp "\\[]})]"))
|
|
(default-value 'embrace--pairs-list))
|
|
|
|
;; Add extra pairs
|
|
(add-hook 'LaTeX-mode-hook #'embrace-LaTeX-mode-hook)
|
|
(add-hook 'org-mode-hook #'embrace-org-mode-hook)
|
|
(add-hook! emacs-lisp-mode
|
|
(embrace-add-pair ?\` "`" "'"))
|
|
(add-hook! (emacs-lisp-mode lisp-mode)
|
|
(embrace-add-pair-regexp ?f "([^ ]+ " ")" #'+evil--embrace-elisp-fn))
|
|
(add-hook! (org-mode LaTeX-mode)
|
|
(embrace-add-pair-regexp ?l "\\[a-z]+{" "}" #'+evil--embrace-latex)))
|
|
|
|
|
|
(def-package! evil-escape
|
|
:commands evil-escape-mode
|
|
:init
|
|
(setq evil-escape-excluded-states '(normal visual multiedit emacs)
|
|
evil-escape-excluded-major-modes '(neotree-mode)
|
|
evil-escape-key-sequence "jk"
|
|
evil-escape-delay 0.25)
|
|
|
|
(add-hook 'emacs-startup-hook #'evil-escape-mode)
|
|
:config
|
|
(map! :irvo "C-g" #'evil-escape))
|
|
|
|
|
|
(def-package! evil-exchange
|
|
:commands evil-exchange
|
|
:config
|
|
(defun +evil|escape-exchange ()
|
|
(when evil-exchange--overlays
|
|
(evil-exchange-cancel)
|
|
t))
|
|
(add-hook '+evil-esc-hook #'+evil|escape-exchange))
|
|
|
|
|
|
(def-package! evil-matchit
|
|
:commands (evilmi-jump-items evilmi-text-object global-evil-matchit-mode)
|
|
:config (global-evil-matchit-mode 1)
|
|
:init
|
|
(map! [remap evil-jump-item] #'evilmi-jump-items
|
|
:textobj "%" #'evilmi-text-object #'evilmi-text-object)
|
|
:config
|
|
(defun +evil|simple-matchit ()
|
|
"A hook to force evil-matchit to favor simple bracket jumping. Helpful when
|
|
the new algorithm is confusing, like in python or ruby."
|
|
(setq-local evilmi-always-simple-jump t))
|
|
(add-hook 'python-mode-hook #'+evil|simple-matchit))
|
|
|
|
|
|
(def-package! evil-multiedit
|
|
:commands (evil-multiedit-match-all
|
|
evil-multiedit-match-and-next
|
|
evil-multiedit-match-and-prev
|
|
evil-multiedit-match-symbol-and-next
|
|
evil-multiedit-match-symbol-and-prev
|
|
evil-multiedit-toggle-or-restrict-region
|
|
evil-multiedit-next
|
|
evil-multiedit-prev
|
|
evil-multiedit-abort
|
|
evil-multiedit-ex-match))
|
|
|
|
|
|
(def-package! evil-mc
|
|
:commands (evil-mc-make-cursor-here evil-mc-make-all-cursors
|
|
evil-mc-undo-all-cursors evil-mc-pause-cursors
|
|
evil-mc-resume-cursors evil-mc-make-and-goto-first-cursor
|
|
evil-mc-make-and-goto-last-cursor evil-mc-make-cursor-here
|
|
evil-mc-make-cursor-move-next-line
|
|
evil-mc-make-cursor-move-prev-line
|
|
evil-mc-make-cursor-at-pos
|
|
evil-mc-make-and-goto-next-cursor evil-mc-skip-and-goto-next-cursor
|
|
evil-mc-make-and-goto-prev-cursor evil-mc-skip-and-goto-prev-cursor
|
|
evil-mc-make-and-goto-next-match evil-mc-skip-and-goto-next-match
|
|
evil-mc-skip-and-goto-next-match evil-mc-make-and-goto-prev-match
|
|
evil-mc-skip-and-goto-prev-match)
|
|
:init
|
|
(defvar evil-mc-key-map (make-sparse-keymap))
|
|
:config
|
|
(global-evil-mc-mode +1)
|
|
|
|
;; Add custom commands to whitelisted commands
|
|
(dolist (fn '(doom/deflate-space-maybe doom/inflate-space-maybe
|
|
doom/backward-to-bol-or-indent doom/forward-to-last-non-comment-or-eol
|
|
doom/backward-kill-to-bol-and-indent doom/newline-and-indent))
|
|
(push (cons fn '((:default . evil-mc-execute-default-call))) evil-mc-custom-known-commands))
|
|
|
|
(defun +evil|escape-multiple-cursors ()
|
|
"Clear evil-mc cursors and restore state."
|
|
(when (evil-mc-has-cursors-p)
|
|
(evil-mc-undo-all-cursors)
|
|
(evil-mc-resume-cursors)
|
|
t))
|
|
(add-hook '+evil-esc-hook #'+evil|escape-multiple-cursors)
|
|
|
|
;; disable evil-escape in evil-mc; causes unwanted text on invocation
|
|
(push 'evil-escape-mode evil-mc-incompatible-minor-modes))
|
|
|
|
|
|
(def-package! evil-snipe :demand t
|
|
:init
|
|
(setq evil-snipe-smart-case t
|
|
evil-snipe-scope 'line
|
|
evil-snipe-repeat-scope 'visible
|
|
evil-snipe-override-evil-repeat-keys nil
|
|
evil-snipe-char-fold t
|
|
evil-snipe-aliases '((?\[ "[[{(]")
|
|
(?\] "[]})]")
|
|
(?\; "[;:]")))
|
|
:config
|
|
(add-hook 'emacs-startup-hook #'evil-snipe-override-mode))
|
|
|
|
|
|
(def-package! evil-surround
|
|
:commands (global-evil-surround-mode
|
|
evil-surround-edit
|
|
evil-Surround-edit
|
|
evil-surround-region)
|
|
:config (global-evil-surround-mode 1))
|
|
|
|
|
|
(def-package! evil-vimish-fold
|
|
:commands evil-vimish-fold-mode
|
|
:init
|
|
(setq vimish-fold-dir (concat doom-cache-dir "vimish-fold/")
|
|
vimish-fold-indication-mode 'right-fringe)
|
|
(add-hook 'emacs-startup-hook #'evil-vimish-fold-mode t))
|
|
|
|
|
|
;; Without `evil-visualstar', * and # grab the word at point and search, no
|
|
;; matter what mode you're in. I want to be able to visually select a region and
|
|
;; search for other occurrences of it.
|
|
(def-package! evil-visualstar
|
|
:commands (global-evil-visualstar-mode
|
|
evil-visualstar/begin-search
|
|
evil-visualstar/begin-search-forward
|
|
evil-visualstar/begin-search-backward)
|
|
:init
|
|
(map! :v "*" #'evil-visualstar/begin-search-forward
|
|
:v "#" #'evil-visualstar/begin-search-backward)
|
|
:config
|
|
(global-evil-visualstar-mode 1))
|
|
|
|
|
|
;;
|
|
;; Text object plugins
|
|
;;
|
|
|
|
(def-package! evil-args
|
|
:commands (evil-inner-arg evil-outer-arg
|
|
evil-forward-arg evil-backward-arg
|
|
evil-jump-out-args))
|
|
|
|
|
|
(def-package! evil-indent-plus
|
|
:commands (evil-indent-plus-i-indent
|
|
evil-indent-plus-a-indent
|
|
evil-indent-plus-i-indent-up
|
|
evil-indent-plus-a-indent-up
|
|
evil-indent-plus-i-indent-up-down
|
|
evil-indent-plus-a-indent-up-down))
|
|
|
|
|
|
(def-package! evil-textobj-anyblock
|
|
:commands (evil-textobj-anyblock-inner-block evil-textobj-anyblock-a-block))
|