config/default: refactor evil-collection fixes

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

View file

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