From 6ea000393f4e262137b2cac9276cd55455c1a30f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 30 May 2019 02:32:06 -0400 Subject: [PATCH] Use superior evil-numbers fork And rebind its keys from C-a/C-S-a to g= and g-. This is because the old narrow/widen commands aren't nearly as useful (and have a number of alternative keybinds). As much as I'd like to us C-a/C-x (as it is in Vim), C-x is an essential keybind for Emacs. Also, in visual mode, each number will be affected incrementally (ala g C-a and g C-x in vim). --- modules/config/default/+evil-bindings.el | 9 +++++---- modules/editor/evil/config.el | 4 ---- modules/editor/evil/packages.el | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index 01a140d57..f6403799a 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -68,14 +68,15 @@ :n "zx" #'kill-this-buffer :n "ZX" #'bury-buffer :n "gp" #'+evil/reselect-paste - :n "g=" #'widen - :v "g=" #'+evil:narrow-buffer + :n "g=" #'evil-numbers/inc-at-pt + :n "g-" #'evil-numbers/dec-at-pt + :v "g=" #'evil-numbers/inc-at-pt-incremental + :v "g-" #'evil-numbers/dec-at-pt-incremental + :v "g+" #'evil-numbers/inc-at-pt :nv "z=" #'flyspell-correct-word-generic :nv "g@" #'+evil:apply-macro :nv "gc" #'evil-commentary :nv "gx" #'evil-exchange - :nv "C-a" #'evil-numbers/inc-at-pt - :nv "C-S-a" #'evil-numbers/dec-at-pt :v "gp" #'+evil/paste-preserve-register :v "@" #'+evil:apply-macro ;; repeat in visual mode (FIXME buggy) diff --git a/modules/editor/evil/config.el b/modules/editor/evil/config.el index 1d560ee68..1fed18bc3 100644 --- a/modules/editor/evil/config.el +++ b/modules/editor/evil/config.el @@ -249,10 +249,6 @@ line with a linewise comment.") (add-hook 'doom-escape-hook #'+evil|escape-exchange)) -(def-package! evil-numbers - :commands (evil-numbers/inc-at-pt evil-numbers/dec-at-pt)) - - (def-package! evil-matchit :commands (evilmi-jump-items global-evil-matchit-mode evilmi-outer-text-object evilmi-inner-text-object) diff --git a/modules/editor/evil/packages.el b/modules/editor/evil/packages.el index e0125558e..29ed2f102 100644 --- a/modules/editor/evil/packages.el +++ b/modules/editor/evil/packages.el @@ -10,7 +10,7 @@ (package! evil-exchange) (package! evil-indent-plus) (package! evil-matchit) -(package! evil-numbers) +(package! evil-numbers :recipe (:fetcher github :repo "janpath/evil-numbers")) (package! evil-textobj-anyblock) (package! evil-snipe) (package! evil-surround)