emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

config/default: move evil-easymotion keybinds into +bindings.el

Browse source 
It's easier to see and discover this way.
This commit is contained in:
Henrik Lissner 2018-05-16 23:50:48 +02:00
parent 42bdb848b5
commit 34b6d4d0cf
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/config/default/+bindings.el
View file

@ -334,7 +334,6 @@
:n "gr" #'+eval:region :n "gr" #'+eval:region
:n "gR" #'+eval/buffer :n "gR" #'+eval/buffer
:v "gR" #'+eval:replace-region :v "gR" #'+eval:replace-region
:m "gs" #'+default/easymotion ; lazy-load `evil-easymotion'
:v "@" #'+evil:apply-macro :v "@" #'+evil:apply-macro
:n "g@" #'+evil:apply-macro :n "g@" #'+evil:apply-macro
;; repeat in visual mode (FIXME buggy) ;; repeat in visual mode (FIXME buggy)
@ -394,6 +393,25 @@
"C-SPC" #'ivy-call-and-recenter ; preview "C-SPC" #'ivy-call-and-recenter ; preview
"M-RET" (+ivy-do-action! #'+ivy-git-grep-other-window-action))) "M-RET" (+ivy-do-action! #'+ivy-git-grep-other-window-action)))
;; easymotion
:m "gs" #'+default/easymotion ; lazy-load `evil-easymotion'
(:after evil-easymotion
:map evilem-map
"a" (evilem-create #'evil-forward-arg)
"A" (evilem-create #'evil-backward-arg)
"n" (evilem-create #'evil-ex-search-next)
"N" (evilem-create #'evil-ex-search-previous)
"s" (evilem-create #'evil-snipe-repeat
:pre-hook (save-excursion (call-interactively #'evil-snipe-s))
:bind ((evil-snipe-scope 'buffer)
(evil-snipe-enable-highlight)
(evil-snipe-enable-incremental-highlight)))
"S" (evilem-create #'evil-snipe-repeat-reverse
:pre-hook (save-excursion (call-interactively #'evil-snipe-s))
:bind ((evil-snipe-scope 'buffer)
(evil-snipe-enable-highlight)
(evil-snipe-enable-incremental-highlight))))
;; evil ;; evil
(:after evil (:after evil
:textobj "a" #'evil-inner-arg #'evil-outer-arg :textobj "a" #'evil-inner-arg #'evil-outer-arg

22
modules/config/default/autoload/evil.el
View file

@ -38,25 +38,11 @@ buffers."
;;;###autoload ;;;###autoload
(defun +default/easymotion () (defun +default/easymotion ()
"TODO" "Invoke and lazy-load `evil-easymotion' without compromising which-key
integration."
(interactive) (interactive)
(let ((prefix (this-command-keys))) (let ((prefix (this-command-keys)))
(map! :m prefix nil) (map! :m prefix nil)
(evilem-default-keybindings prefix) (evilem-default-keybindings prefix)
(let ((map evilem-map)) (set-transient-map evilem-map)
(define-key map "n" (evilem-create #'evil-ex-search-next)) (which-key-reload-key-sequence prefix)))
(define-key map "N" (evilem-create #'evil-ex-search-previous))
(define-key map "s"
(evilem-create #'evil-snipe-repeat
:pre-hook (save-excursion (call-interactively #'evil-snipe-s))
:bind ((evil-snipe-scope 'buffer)
(evil-snipe-enable-highlight)
(evil-snipe-enable-incremental-highlight))))
(define-key map "S"
(evilem-create #'evil-snipe-repeat-reverse
:pre-hook (save-excursion (call-interactively #'evil-snipe-s))
:bind ((evil-snipe-scope 'buffer)
(evil-snipe-enable-highlight)
(evil-snipe-enable-incremental-highlight))))
(set-transient-map map)
(which-key-reload-key-sequence prefix))))