diff --git a/Cask b/Cask index 486ba8d7e..ff6dac2a6 100644 --- a/Cask +++ b/Cask @@ -36,6 +36,7 @@ (depends-on "evil-surround") (depends-on "evil-visualstar") (depends-on "evil-plugins" :git "https://github.com/tarao/evil-plugins") +(depends-on "evil-easymotion") ;; Editor --- core/core-editor.el (depends-on "ace-window") diff --git a/core/core-evil.el b/core/core-evil.el index c302b4d0f..14f36ca4d 100644 --- a/core/core-evil.el +++ b/core/core-evil.el @@ -133,6 +133,27 @@ See https://bitbucket.org/lyro/evil/issue/527" :commands (evilmi-jump-items global-evil-matchit-mode) :config (global-evil-matchit-mode 1)) +(use-package evil-easymotion + :config + (evilem-default-keybindings "g SPC") + (evilem-define (kbd "g s") 'evil-snipe-repeat + (lambda () + (save-excursion + (ignore-errors + (call-interactively #'evil-snipe-s)))) + nil + ((evil-snipe-enable-highlight) + (evil-snipe-enable-incremental-highlight))) + + (evilem-define (kbd "g S") 'evil-snipe-repeat-reverse + (lambda () + (save-excursion + (ignore-errors + (call-interactively #'evil-snipe-s)))) + nil + ((evil-snipe-enable-highlight) + (evil-snipe-enable-incremental-highlight)))) + (use-package evil-numbers :commands (evil-numbers/inc-at-pt evil-numbers/dec-at-pt)) diff --git a/private/my-bindings.el b/private/my-bindings.el index 720848246..18e370857 100644 --- a/private/my-bindings.el +++ b/private/my-bindings.el @@ -51,7 +51,7 @@ ;; Local keymaps ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - :nmv ";" 'evil-ex + :m ";" 'evil-ex (:prefix "," ; :n "," (λ (if (narf/project-p) (helm-projectile-switch-to-buffer) (helm-buffers-list))) @@ -135,7 +135,6 @@ :n "gr" 'narf:eval-region :v "gR" 'narf:eval-region-and-replace :m "gl" 'avy-goto-line - :m "gs" 'avy-goto-char-2 :m "g]" 'smart-down :m "g[" 'smart-up