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

feature/evil: move evil-collection fixes to config/default

Browse source
This commit is contained in:
Henrik Lissner 2018-03-21 19:39:47 -04:00
parent 61206a553d
commit 744e7d6dfd
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -732,3 +732,31 @@
(:after view (:after view
(:map view-mode-map "<escape>" #'View-quit-all))) (:map view-mode-map "<escape>" #'View-quit-all)))
;;
;; Evil-collection mods
;;
;; TODO find a better way
(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 rebind Doom's keybinds
(after! alchemist
(evil-define-key* 'normal alchemist-mode-map "gd" nil "K" nil "gz" nil))
(after! anaconda-mode
(evil-define-key* 'normal anaconda-mode-map "gd" nil "K" nil))
(after! compile
(evil-define-key* '(normal visual) compilation-mode-map "gd" nil "K" 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))
(after! outline
(evil-define-key* 'normal outline-mode-map "\C-j" nil "\C-k" nil))
(after! racer
(evil-define-key* 'normal racer-mode-map "gd" nil "K" nil)))

22
modules/feature/evil/config.el
View file

@ -30,27 +30,7 @@
evil-collection-company-use-tng nil) evil-collection-company-use-tng nil)
:config :config
(delq 'kotlin-mode evil-collection-mode-list) ; doesn't do anything useful (delq 'kotlin-mode evil-collection-mode-list) ; doesn't do anything useful
(evil-collection-init) (evil-collection-init))
;; 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)))
(def-package! evil (def-package! evil