From 4fc7de442e8939d4cd8fa4a6a03c24e00b794871 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <accounts@v0.io>
Date: Tue, 16 Oct 2018 02:03:23 -0400
Subject: [PATCH] lang/clojure: group & update evil integration

Also removes evil-normalize-keymaps on cider-repl-mode-hook, because cider-repl-mode isn't a minor mode. The purpose of evil-normalize-keymaps is to ensure evil is aware of evil keybinds in minor-mode keymaps when it is first enabled.
---
 modules/lang/clojure/config.el | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el
index 0bb670701..a6b633210 100644
--- a/modules/lang/clojure/config.el
+++ b/modules/lang/clojure/config.el
@@ -47,17 +47,6 @@
           cider-repl-wrap-history nil
           cider-stacktrace-default-filters '(tooling dup))
 
-    (when (featurep! :feature evil +everywhere)
-      (evil-define-key 'insert cider-repl-mode-map
-        [S-return] #'cider-repl-newline-and-indent)
-      (evil-define-key 'normal cider-repl-history-mode-map
-        "q" 'cider-repl-history-quit
-        [return] 'cider-repl-history-insert-and-quit
-        "l" 'cider-repl-history-occur
-        "s" 'cider-repl-history-search-forward
-        "r" 'cider-repl-history-search-backward
-        "U" 'cider-repl-history-undo-other-window))
-
     ;; TODO: Add mode-local labels when general support is in.
     (map! :localleader
           (:map clojure-mode-map
@@ -106,8 +95,17 @@
               :n "b" #'cider-switch-to-repl-buffer
               :n "B" #'+clojure|cider-switch-to-repl-buffer-and-switch-ns
               :n "c" #'cider-repl-clear-buffer)))
+
     (when (featurep! :feature evil +everywhere)
-      (add-hook 'cider-repl-mode-hook #'evil-normalize-keymaps)))
+      (evil-define-key 'insert cider-repl-mode-map
+        [S-return] #'cider-repl-newline-and-indent)
+      (evil-define-key 'normal cider-repl-history-mode-map
+        "q" 'cider-repl-history-quit
+        [return] 'cider-repl-history-insert-and-quit
+        "l" 'cider-repl-history-occur
+        "s" 'cider-repl-history-search-forward
+        "r" 'cider-repl-history-search-backward
+        "U" 'cider-repl-history-undo-other-window)))
 
   (def-package! clj-refactor
     :hook (clojure-mode . clj-refactor-mode)