From 744e7d6dfd7ddfde3145b7af9845902d6df0051d Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 21 Mar 2018 19:39:47 -0400
Subject: [PATCH] feature/evil: move evil-collection fixes to config/default

---
 modules/config/default/+bindings.el | 28 ++++++++++++++++++++++++++++
 modules/feature/evil/config.el      | 22 +---------------------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/modules/config/default/+bindings.el b/modules/config/default/+bindings.el
index cdb423c50..366b36d1e 100644
--- a/modules/config/default/+bindings.el
+++ b/modules/config/default/+bindings.el
@@ -732,3 +732,31 @@
 
       (:after view
         (: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)))
diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el
index f39089349..bdde64a5e 100644
--- a/modules/feature/evil/config.el
+++ b/modules/feature/evil/config.el
@@ -30,27 +30,7 @@
         evil-collection-company-use-tng nil)
   :config
   (delq 'kotlin-mode evil-collection-mode-list) ; doesn't do anything useful
-  (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)))
+  (evil-collection-init))
 
 
 (def-package! evil