Write core initfiles + defuns
This commit is contained in:
Henrik Lissner
parent
c0661f5293
commit
b998f4ab08
52 changed files with 2444 additions and 706 deletions
|
|
@ -1,24 +1,25 @@
|
|||
;;; core-evil.el --- the root of all evil
|
||||
;; see lib/evil-defuns.el
|
||||
|
||||
(use-package evil
|
||||
:init
|
||||
;; highlight matching delimiters where it's important
|
||||
(defun show-paren-mode-off () (show-paren-mode -1))
|
||||
(@add-hook evil-insert-state-entry 'show-paren-mode)
|
||||
(@add-hook evil-insert-state-exit 'show-paren-mode-off)
|
||||
(@add-hook evil-visual-state-entry 'show-paren-mode)
|
||||
(@add-hook evil-visual-state-exit 'show-paren-mode-off)
|
||||
(@add-hook evil-motion-state-entry 'show-paren-mode)
|
||||
(@add-hook evil-motion-state-exit 'show-paren-mode-off)
|
||||
(@add-hook evil-operator-state-entry 'show-paren-mode)
|
||||
(@add-hook evil-operator-state-exit 'show-paren-mode-off)
|
||||
(add-hook! evil-insert-state-entry 'show-paren-mode)
|
||||
(add-hook! evil-insert-state-exit 'show-paren-mode-off)
|
||||
(add-hook! evil-visual-state-entry 'show-paren-mode)
|
||||
(add-hook! evil-visual-state-exit 'show-paren-mode-off)
|
||||
(add-hook! evil-motion-state-entry 'show-paren-mode)
|
||||
(add-hook! evil-motion-state-exit 'show-paren-mode-off)
|
||||
(add-hook! evil-operator-state-entry 'show-paren-mode)
|
||||
(add-hook! evil-operator-state-exit 'show-paren-mode-off)
|
||||
|
||||
;; Disable highlights on insert-mode
|
||||
(@add-hook evil-insert-state-entry 'evil-ex-nohighlight)
|
||||
(add-hook! evil-insert-state-entry 'evil-ex-nohighlight)
|
||||
|
||||
(@add-hook undo-tree-mode (diminish 'undo-tree-mode))
|
||||
(add-hook! undo-tree-mode (diminish 'undo-tree-mode))
|
||||
;; Always ensure evil-shift-width is consistent with tab-width
|
||||
(@add-hook evil-local-mode (setq evil-shift-width tab-width))
|
||||
(add-hook! evil-local-mode (setq evil-shift-width tab-width))
|
||||
:config
|
||||
(setq evil-magic t
|
||||
evil-want-C-u-scroll t ; enable C-u for scrolling
|
||||
|
|
@ -37,7 +38,8 @@
|
|||
|
||||
(evil-mode 1)
|
||||
(evil-select-search-module 'evil-search-module 'evil-search)
|
||||
(add-to-list 'evil-overriding-maps 'narf-mode-map)
|
||||
|
||||
(bind! :map evil-command-window-mode-map :n [escape] 'kill-buffer-and-window)
|
||||
|
||||
(defadvice evil-ex-hl-do-update-highlight (around evil-ex-hl-shut-up activate)
|
||||
"Silence 'Error running timer `evil-ex-hl-do-update-highlight': (error
|
||||
|
|
@ -50,176 +52,13 @@ See `https://bitbucket.org/lyro/evil/issue/527'"
|
|||
(dolist (mode-map '((cider-repl-mode . emacs)
|
||||
(comint-mode . emacs)
|
||||
(term-mode . emacs)
|
||||
(fundamental-mode . normal)
|
||||
(fundamental-mode . motion)
|
||||
(help-mode . normal)
|
||||
(message-mode . normal)
|
||||
(compilation-mode . normal)))
|
||||
(compilation-mode . normal)
|
||||
(text-mode . normal)))
|
||||
(evil-set-initial-state `,(car mode-map) `,(cdr mode-map)))
|
||||
|
||||
(progn ; evil plugins
|
||||
(use-package evil-anzu)
|
||||
|
||||
(use-package evil-commentary
|
||||
:diminish evil-commentary-mode
|
||||
:commands (evil-commentary
|
||||
evil-commentary-mode
|
||||
evil-commentary-yank
|
||||
evil-commentary-line)
|
||||
:config (evil-commentary-mode 1))
|
||||
|
||||
(use-package evil-ex-registers
|
||||
:commands (evil-get-spec-register
|
||||
evil-ex-paste-from-register))
|
||||
|
||||
(use-package evil-exchange
|
||||
:commands evil-exchange
|
||||
:config
|
||||
(defadvice evil-force-normal-state (before evil-esc-quit-exchange activate)
|
||||
"Remove `evil-exchange' overlays on ESC"
|
||||
(when evil-exchange--overlays (evil-exchange-cancel))))
|
||||
(lambda ()
|
||||
(interactive)
|
||||
(if (iedit-current-occurrence-string)
|
||||
(progn
|
||||
(save-excursion (iedit-restrict-region (region-beginning) (region-end)))
|
||||
(evil-previous-line)
|
||||
(evil-iedit-state/iedit-mode))
|
||||
(call-interactively 'evil-ret)))
|
||||
(use-package evil-iedit-state
|
||||
:functions (iedit-current-occurrence-string iedit-restrict-region)
|
||||
:commands (evil-iedit-state evil-iedit-state/iedit-mode)
|
||||
:config
|
||||
(@map ; Don't interfere with evil-snipe
|
||||
:I :unset "s"
|
||||
:I :unset "S"
|
||||
|
||||
:I "V" 'evil-visual-line
|
||||
:I "C" 'evil-iedit-state/substitute ; instead of s/S
|
||||
:I "za" 'iedit-toggle-unmatched-lines-visible
|
||||
|
||||
:v "SPC" (λ (if (iedit-current-occurrence-string)
|
||||
(progn
|
||||
(save-excursion (iedit-restrict-region (region-beginning) (region-end)))
|
||||
(evil-previous-line)
|
||||
(evil-iedit-state/iedit-mode))
|
||||
(call-interactively 'evil-ret)))))
|
||||
|
||||
(use-package evil-indent-textobject
|
||||
:commands (evil-indent-i-indent
|
||||
evil-indent-a-indent
|
||||
evil-indent-a-indent-lines)
|
||||
:init
|
||||
(@map :map evil-inner-text-objects-map
|
||||
"i" 'evil-indent-i-indent
|
||||
"i" 'evil-indent-a-indent
|
||||
"I" 'evil-indent-a-indent-lines))
|
||||
|
||||
(use-package evil-jumper
|
||||
:init
|
||||
(setq evil-jumper-file (! (expand-file-name "jumplist" narf-temp-dir))
|
||||
evil-jumper-auto-center t
|
||||
evil-jumper-auto-save-interval 3600))
|
||||
|
||||
(use-package evil-matchit
|
||||
:commands (evilmi-jump-items global-evil-matchit-mode)
|
||||
:config (global-evil-matchit-mode 1))
|
||||
|
||||
(use-package evil-numbers
|
||||
:commands (evil-numbers/inc-at-pt
|
||||
evil-numbers/dec-at-pt))
|
||||
|
||||
(use-package evil-search-highlight-persist
|
||||
:config (global-evil-search-highlight-persist t))
|
||||
|
||||
(use-package evil-snipe
|
||||
:diminish evil-snipe-mode
|
||||
:commands (evil-snipe-s evil-snipe-S
|
||||
evil-snipe-x evil-snipe-X
|
||||
evil-snipe-f evil-snipe-F
|
||||
evil-snipe-t evil-snipe-T)
|
||||
:init
|
||||
(setq-default
|
||||
evil-snipe-smart-case t
|
||||
evil-snipe-scope 'line
|
||||
evil-snipe-repeat-scope 'buffer
|
||||
evil-snipe-override-evil-repeat-keys nil
|
||||
evil-snipe-symbol-groups '((?\[ "[[{(]")
|
||||
(?\] "[]})]")))
|
||||
:config
|
||||
(evil-snipe-mode 1)
|
||||
(evil-snipe-override-mode 1))
|
||||
|
||||
(use-package evil-space
|
||||
:diminish (evil-space-mode . "_")
|
||||
:config
|
||||
(progn
|
||||
(add-to-list 'evil-overriding-maps 'evil-space-mode-map)
|
||||
|
||||
(evil-space-setup "/" "n" "N")
|
||||
(evil-space-setup "?" "N" "n")
|
||||
|
||||
(@after evil-numbers
|
||||
(let ((map (evil-get-auxiliary-keymap narf-mode-map 'normal)))
|
||||
(evil-space-setup "g=" "g=" "g-" map)
|
||||
(evil-space-setup "g-" "g-" "g=" map)))
|
||||
|
||||
(@after evil-snipe
|
||||
(let ((map (evil-get-auxiliary-keymap evil-snipe-override-mode-map 'motion)))
|
||||
(evil-space-setup "t" "C-;" "C-," map)
|
||||
(evil-space-setup "f" "C-;" "C-," map)
|
||||
(evil-space-setup "T" "C-," "C-;" map)
|
||||
(evil-space-setup "F" "C-," "C-;" map))
|
||||
(let ((map (evil-get-auxiliary-keymap evil-snipe-mode-map 'motion)))
|
||||
(evil-space-setup "s" "C-;" "C-," map)
|
||||
(evil-space-setup "S" "C-," "C-;" map)))
|
||||
|
||||
(@after evil-visualstar
|
||||
(let ((map (evil-get-auxiliary-keymap evil-visualstar-mode-map 'visual)))
|
||||
(evil-space-setup "*" "n" "N" map)
|
||||
(evil-space-setup "#" "n" "N" map)))
|
||||
|
||||
(evil-space-mode)))
|
||||
|
||||
(use-package evil-surround
|
||||
:commands (global-evil-surround-mode
|
||||
evil-surround-edit
|
||||
evil-Surround-edit
|
||||
evil-surround-region)
|
||||
:config
|
||||
(global-evil-surround-mode 1)
|
||||
|
||||
;; Escaped surround characters
|
||||
(defun evil-surround-escaped ()
|
||||
(let* ((char (string (read-char "\\")))
|
||||
(pair (cond ((string-match "[]})[{(]" char)
|
||||
(let ((-pair (cdr (assoc (string-to-char char) evil-surround-pairs-alist))))
|
||||
`(,(car -pair) . ,(cdr -pair))))
|
||||
(t
|
||||
`(,char . ,char))))
|
||||
(format (if (sp-point-in-string) "\\\\%s" "\\%s")))
|
||||
(cons (format format (car pair))
|
||||
(format format (cdr pair)))))
|
||||
|
||||
(push '(?\\ . evil-surround-escaped) evil-surround-pairs-alist))
|
||||
|
||||
(use-package evil-visualstar
|
||||
:commands (global-evil-visualstar-mode
|
||||
evil-visualstar/begin-search
|
||||
evil-visualstar/begin-search-forward
|
||||
evil-visualstar/begin-search-backward)
|
||||
:config
|
||||
;; I cut this down because the original visualstar wouldn't remember
|
||||
;; the last search if evil-search-module was 'evil-search.
|
||||
(defun narf/evil-visualstar/begin-search (beg end direction)
|
||||
(when (evil-visual-state-p)
|
||||
(evil-exit-visual-state)
|
||||
(let ((selection (regexp-quote (buffer-substring-no-properties beg end))))
|
||||
(setq isearch-forward direction)
|
||||
(evil-search selection direction t))))
|
||||
(advice-add 'evil-visualstar/begin-search :override 'narf/evil-visualstar/begin-search)
|
||||
|
||||
(global-evil-visualstar-mode 1)))
|
||||
|
||||
(progn ; evil hacks
|
||||
(defadvice evil-force-normal-state (before evil-esc-quit activate)
|
||||
(ignore-errors
|
||||
|
|
@ -236,27 +75,154 @@ See `https://bitbucket.org/lyro/evil/issue/527'"
|
|||
(defadvice evil-window-vsplit (after evil-window-vsplit-jump activate)
|
||||
(evil-window-right 1))
|
||||
|
||||
(@after isearch ; Restore vimmish ex-mode keymaps to isearch
|
||||
;; Hide keystroke display while isearch is active
|
||||
(@add-hook isearch-mode (setq echo-keystrokes 0))
|
||||
(@add-hook isearch-mode-end (setq echo-keystrokes 0.02))
|
||||
(@map :map isearch-mode-map
|
||||
:unset "C-r"
|
||||
;; Restore vimmish ex-mode keymaps to isearch
|
||||
;; Hide keystroke display while isearch is active
|
||||
(add-hook! isearch-mode (setq echo-keystrokes 0))
|
||||
(add-hook! isearch-mode-end (setq echo-keystrokes 0.02))
|
||||
(bind! :map isearch-mode-map
|
||||
"C-r" nil
|
||||
|
||||
"C-r %" (λ (narf:isearch-paste-from-register ?%))
|
||||
"C-r #" (λ (narf:isearch-paste-from-register ?#))
|
||||
"C-r /" (λ (narf:isearch-paste-from-register ?/))
|
||||
"C-r :" (λ (narf:isearch-paste-from-register ?:))
|
||||
"C-r ." (λ (narf:isearch-paste-from-register ?.))
|
||||
"C-r -" (λ (narf:isearch-paste-from-register ?-))
|
||||
"C-r _" (λ (narf:isearch-paste-from-register ?_))
|
||||
"C-r =" (λ (narf:isearch-paste-from-register ?=))
|
||||
"C-r +" 'narf:isearch-paste-from-clipboard
|
||||
"C-r %" (λ (narf/isearch-paste-from-register ?%))
|
||||
"C-r #" (λ (narf/isearch-paste-from-register ?#))
|
||||
"C-r /" (λ (narf/isearch-paste-from-register ?/))
|
||||
"C-r :" (λ (narf/isearch-paste-from-register ?:))
|
||||
"C-r ." (λ (narf/isearch-paste-from-register ?.))
|
||||
"C-r -" (λ (narf/isearch-paste-from-register ?-))
|
||||
"C-r _" (λ (narf/isearch-paste-from-register ?_))
|
||||
"C-r =" (λ (narf/isearch-paste-from-register ?=))
|
||||
"C-r +" 'narf/isearch-paste-from-clipboard
|
||||
|
||||
"C-w" 'narf:isearch-delete-word
|
||||
"C-u" 'narf:isearch-delete-line
|
||||
"M-v" 'narf:isearch-paste-from-clipboard))))
|
||||
"C-w" 'narf/isearch-delete-word
|
||||
"C-u" 'narf/isearch-delete-line
|
||||
"M-v" 'narf/isearch-paste-from-clipboard)))
|
||||
|
||||
;; evil plugins
|
||||
(use-package evil-anzu)
|
||||
|
||||
(use-package evil-commentary
|
||||
:diminish evil-commentary-mode
|
||||
:commands (evil-commentary
|
||||
evil-commentary-yank
|
||||
evil-commentary-line)
|
||||
:config (evil-commentary-mode 1))
|
||||
|
||||
(use-package evil-ex-registers
|
||||
:commands (evil-get-spec-register
|
||||
evil-ex-paste-from-register))
|
||||
|
||||
(use-package evil-exchange
|
||||
:commands evil-exchange
|
||||
:config
|
||||
(advice-add 'evil-force-normal :after 'narf*evil-exchange-off))
|
||||
|
||||
(use-package evil-iedit-state
|
||||
:functions (iedit-current-occurrence-string iedit-restrict-region)
|
||||
:commands (evil-iedit-state evil-iedit-state/iedit-mode)
|
||||
:config
|
||||
(bind! ; Don't interfere with evil-snipe
|
||||
:I :unset "s"
|
||||
:I :unset "S"
|
||||
:I "V" 'evil-visual-line
|
||||
:I "C" 'evil-iedit-state/substitute ; instead of s/S
|
||||
:I "za" 'iedit-toggle-unmatched-lines-visible
|
||||
:v "SPC" 'narf:iedit-restrict-to-region))
|
||||
|
||||
(use-package evil-indent-textobject
|
||||
:commands (evil-indent-i-indent
|
||||
evil-indent-a-indent
|
||||
evil-indent-a-indent-lines)
|
||||
:init
|
||||
(bind! :map evil-inner-text-objects-map
|
||||
"i" 'evil-indent-i-indent
|
||||
"i" 'evil-indent-a-indent
|
||||
"I" 'evil-indent-a-indent-lines))
|
||||
|
||||
(use-package evil-jumper
|
||||
:init
|
||||
(setq evil-jumper-file (! (concat narf-temp-dir "jumplist"))
|
||||
evil-jumper-auto-center t
|
||||
evil-jumper-auto-save-interval 3600))
|
||||
|
||||
(use-package evil-matchit
|
||||
:commands (evilmi-jump-items global-evil-matchit-mode)
|
||||
:config (global-evil-matchit-mode 1))
|
||||
|
||||
(use-package evil-numbers
|
||||
:commands (evil-numbers/inc-at-pt
|
||||
evil-numbers/dec-at-pt))
|
||||
|
||||
(use-package evil-search-highlight-persist
|
||||
:config (global-evil-search-highlight-persist t))
|
||||
|
||||
(use-package evil-snipe
|
||||
:diminish evil-snipe-mode
|
||||
:commands (evil-snipe-s evil-snipe-S
|
||||
evil-snipe-x evil-snipe-X
|
||||
evil-snipe-f evil-snipe-F
|
||||
evil-snipe-t evil-snipe-T
|
||||
evil-snipe-repeat evil-snipe-repeat-reverse)
|
||||
:init
|
||||
(bind! :m "s" 'evil-snipe-s
|
||||
:m "S" 'evil-snipe-S
|
||||
:m "f" 'evil-snipe-f
|
||||
:m "F" 'evil-snipe-F
|
||||
:m "t" 'evil-snipe-t
|
||||
:m "T" 'evil-snipe-T
|
||||
:o "z" 'evil-snipe-s
|
||||
:o "Z" 'evil-snipe-S
|
||||
:o "x" 'evil-snipe-x
|
||||
:o "X" 'evil-snipe-X)
|
||||
(define-key evil-normal-state-map "s" nil)
|
||||
(define-key evil-normal-state-map "S" nil)
|
||||
:config
|
||||
(setq-default
|
||||
evil-snipe-smart-case t
|
||||
evil-snipe-scope 'line
|
||||
evil-snipe-repeat-scope 'buffer
|
||||
evil-snipe-override-evil-repeat-keys nil
|
||||
evil-snipe-symbol-groups '((?\[ "[[{(]")
|
||||
(?\] "[]})]")))
|
||||
(evil-snipe-mode 1)
|
||||
(evil-snipe-override-mode 1))
|
||||
|
||||
(use-package evil-space
|
||||
:diminish (evil-space-mode . "_")
|
||||
:init (setq evil-space-auto-setup nil)
|
||||
:config
|
||||
(evil-space-mode 1)
|
||||
|
||||
(evil-space-setup "/" "n" "N")
|
||||
(evil-space-setup "?" "N" "n")
|
||||
|
||||
(after! evil-snipe
|
||||
(evil-space-setup 'evil-snipe-f 'evil-snipe-repeat 'evil-snipe-repeat-reverse)
|
||||
(evil-space-setup 'evil-snipe-F 'evil-snipe-repeat 'evil-snipe-repeat-reverse)
|
||||
(evil-space-setup 'evil-snipe-t 'evil-snipe-repeat 'evil-snipe-repeat-reverse)
|
||||
(evil-space-setup 'evil-snipe-T 'evil-snipe-repeat 'evil-snipe-repeat-reverse)
|
||||
(evil-space-setup 'evil-snipe-s 'evil-snipe-repeat 'evil-snipe-repeat-reverse)
|
||||
(evil-space-setup 'evil-snipe-S 'evil-snipe-repeat 'evil-snipe-repeat-reverse))
|
||||
|
||||
(after! evil-visualstar
|
||||
(evil-space-setup 'evil-visualstar/begin-search-forward "n" "N")
|
||||
(evil-space-setup 'evil-visualstar/begin-search-backward "n" "N")))
|
||||
|
||||
(use-package evil-surround
|
||||
:commands (global-evil-surround-mode
|
||||
evil-surround-edit
|
||||
evil-Surround-edit
|
||||
evil-surround-region)
|
||||
:config
|
||||
(global-evil-surround-mode 1)
|
||||
;; Escaped surround characters
|
||||
(push '(?\\ . narf/evil-surround-escaped) evil-surround-pairs-alist))
|
||||
|
||||
(use-package evil-visualstar
|
||||
:commands (global-evil-visualstar-mode
|
||||
evil-visualstar/begin-search
|
||||
evil-visualstar/begin-search-forward
|
||||
evil-visualstar/begin-search-backward)
|
||||
:config
|
||||
(global-evil-visualstar-mode 1))
|
||||
|
||||
(provide 'core-evil)
|
||||
;;; core-evil.el ends here
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue