Refactor evil keybinds; remove SPC {],[} prefixes

These were redundant with the ],[ motion keys.
This commit is contained in:
Henrik Lissner 2019-02-26 22:59:40 -05:00
parent 80d62aaaef
commit 609e577ce7
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -76,32 +76,9 @@
[remap quit-window] #'kill-this-buffer) [remap quit-window] #'kill-this-buffer)
;; misc ;; misc
:n "C-S-f" #'toggle-frame-fullscreen) :n "C-S-f" #'toggle-frame-fullscreen
;; Global evil keybinds
;;
;; Module keybinds
;;; :feature
(map! (:when (featurep! :feature debugger)
:after realgud
:map realgud:shortkey-mode-map
:n "j" #'evil-next-line
:n "k" #'evil-previous-line
:n "h" #'evil-backward-char
:n "l" #'evil-forward-char
:n "c" #'realgud:cmd-continue
:m "n" #'realgud:cmd-next
:m "b" #'realgud:cmd-break
:m "B" #'realgud:cmd-clear)
(:when (featurep! :feature eval)
:g "M-r" #'+eval/buffer
:nv "gr" #'+eval:region
:n "gR" #'+eval/buffer
:v "gR" #'+eval:replace-region)
(:when (featurep! :feature evil)
:m "]a" #'evil-forward-arg :m "]a" #'evil-forward-arg
:m "[a" #'evil-backward-arg :m "[a" #'evil-backward-arg
:m "]o" #'outline-next-visible-heading :m "]o" #'outline-next-visible-heading
@ -200,6 +177,29 @@
:o "s" #'evil-surround-edit :o "s" #'evil-surround-edit
:o "S" #'evil-Surround-edit) :o "S" #'evil-Surround-edit)
;;
;; Module keybinds
;;; :feature
(map! (:when (featurep! :feature debugger)
:after realgud
:map realgud:shortkey-mode-map
:n "j" #'evil-next-line
:n "k" #'evil-previous-line
:n "h" #'evil-backward-char
:n "l" #'evil-forward-char
:n "c" #'realgud:cmd-continue
:m "n" #'realgud:cmd-next
:m "b" #'realgud:cmd-break
:m "B" #'realgud:cmd-clear)
(:when (featurep! :feature eval)
:g "M-r" #'+eval/buffer
:nv "gr" #'+eval:region
:n "gR" #'+eval/buffer
:v "gR" #'+eval:replace-region)
(:when (featurep! :feature lookup) (:when (featurep! :feature lookup)
:nv "K" #'+lookup/documentation :nv "K" #'+lookup/documentation
:nv "gd" #'+lookup/definition :nv "gd" #'+lookup/definition
@ -222,6 +222,8 @@
[delete] #'+snippets/delete-forward-char-or-field))) [delete] #'+snippets/delete-forward-char-or-field)))
(:when (featurep! :tools flyspell) (:when (featurep! :tools flyspell)
:m "]s" #'evil-next-flyspell-error
:m "[s" #'evil-prev-flyspell-error
:m "]S" #'flyspell-correct-word-generic :m "]S" #'flyspell-correct-word-generic
:m "[S" #'flyspell-correct-previous-word-generic :m "[S" #'flyspell-correct-previous-word-generic
(:map flyspell-mouse-map (:map flyspell-mouse-map
@ -528,8 +530,8 @@
:desc "Jump to symbol across buffers" "I" #'imenu-anywhere :desc "Jump to symbol across buffers" "I" #'imenu-anywhere
:desc "Search buffer" "b" #'swiper :desc "Search buffer" "b" #'swiper
:desc "Search current directory" "d" :desc "Search current directory" "d"
(cond ((featurep! :completion helm) #'+helm/project-search-from-cwd) (cond ((featurep! :completion ivy) #'+ivy/project-search-from-cwd)
((featurep! :completion ivy) #'+ivy/project-search-from-cwd)) ((featurep! :completion helm) #'+helm/project-search-from-cwd))
:desc "Jump to symbol" "i" #'imenu :desc "Jump to symbol" "i" #'imenu
:desc "Jump to link" "l" #'ace-link :desc "Jump to link" "l" #'ace-link
:desc "Look up online" "o" #'+lookup/online-select :desc "Look up online" "o" #'+lookup/online-select
@ -537,26 +539,6 @@
(cond ((featurep! :completion ivy) #'+ivy/project-search) (cond ((featurep! :completion ivy) #'+ivy/project-search)
((featurep! :completion helm) #'+helm/project-search))) ((featurep! :completion helm) #'+helm/project-search)))
(:prefix ("]" . "next")
:desc "Increase text size" "]" #'text-scale-increase
:desc "Next buffer" "b" #'next-buffer
:desc "Next diff Hunk" "d" #'git-gutter:next-hunk
:desc "Next todo" "t" #'hl-todo-next
:desc "Next error" "e" #'next-error
:desc "Next workspace" "w" #'+workspace/switch-right
:desc "Next spelling error" "s" #'evil-next-flyspell-error
:desc "Next spelling correction" "S" #'flyspell-correct-next-word-generic)
(:prefix ("[" . "previous")
:desc "Decrease text size" "[" #'text-scale-decrease
:desc "Previous buffer" "b" #'previous-buffer
:desc "Previous diff Hunk" "d" #'git-gutter:previous-hunk
:desc "Previous todo" "t" #'hl-todo-previous
:desc "Previous error" "e" #'previous-error
:desc "Previous workspace" "w" #'+workspace/switch-left
:desc "Previous spelling error" "s" #'evil-prev-flyspell-error
:desc "Previous spelling correction" "S" #'flyspell-correct-word-generic)
(:when (featurep! :feature workspaces) (:when (featurep! :feature workspaces)
(:prefix ([tab] . "workspace") (:prefix ([tab] . "workspace")
:desc "Display tab bar" "TAB" #'+workspace/display :desc "Display tab bar" "TAB" #'+workspace/display