From 9e54e393eac41f6bf4288fbc51010d95dba3bfab Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 15 Jun 2018 16:08:23 +0200 Subject: [PATCH] Use new evil-collection blacklist instead of hook --- modules/config/default/+bindings.el | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/modules/config/default/+bindings.el b/modules/config/default/+bindings.el index d7d813271..0ac49394a 100644 --- a/modules/config/default/+bindings.el +++ b/modules/config/default/+bindings.el @@ -794,20 +794,7 @@ (after! ivy (+default|fix-minibuffer-in-map ivy-minibuffer-map)) -;; ;; Evil-collection fixes -;; - -(defun +config|deal-with-evil-collections-bs (_feature keymaps) - "Unmap keys that conflict with Doom's defaults." - (dolist (map keymaps) - (evil-delay `(and (boundp ',map) (keymapp ,map)) - `(evil-define-key* '(normal visual motion) ,map - (kbd doom-leader-key) nil - (kbd "C-j") nil (kbd "C-k") nil - "gd" nil "gf" nil "K" nil - "]" nil "[" nil) - 'after-load-functions t nil - (format "+default-redefine-key-in-%s" map)))) - -(add-hook 'evil-collection-setup-hook #'+config|deal-with-evil-collections-bs) +(setq evil-collection-key-blacklist + (list "C-j" "C-k" "gd" "gf" "K" "[" "]" + doom-leader-key doom-localleader-key))