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

config/default: refactor evil-collection fixes

Browse source
This commit is contained in:
Henrik Lissner 2018-05-12 23:19:20 +02:00
parent 5a13c436ff
commit 370dacf2a2
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -745,22 +745,13 @@
;;
(when (featurep 'evil-collection)
;; don't interfere with leader key
(evil-define-key* '(normal visual) special-mode-map (kbd doom-leader-key) nil)
(after! dired
(evil-define-key* 'normal dired-mode-map (kbd doom-leader-key) nil))
;; don't remap gd or K; Doom does this already
;; TODO find a better way
(after! compile
(evil-define-key* '(normal visual) compilation-mode-map "gd" nil "K" nil))
(after! racer
(evil-define-key* 'normal racer-mode-map "gd" nil "K" nil))
(after! anaconda-mode
(evil-define-key* 'normal anaconda-mode-map "gd" nil "K" nil))
(after! alchemist
(evil-define-key* 'normal alchemist-mode-map "gd" nil "K" nil "gz" nil))
(after! go-mode
(evil-define-key* 'normal go-mode-map "gd" nil "K" nil))
(after! lua-mode
(evil-define-key* 'normal lua-mode-map "K" nil)))
(defun +config|deal-with-evil-collections-bs (feature keymaps)
"Unmap keys that conflict with Doom's defaults."
(dolist (map keymaps)
(evil-define-key '(normal visual motion) map
doom-leader-key nil
"C-j" nil "C-k" nil
"gd" nil "gf" nil
"K" nil
"]" nil "[" nil)))
(add-hook 'evil-collection-setup-hook #'+config|deal-with-evil-collections-bs))