From 83c95ddaa0d818cf90f266de44e53f0706d67506 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 13 Sep 2019 14:01:16 -0400
Subject: [PATCH] lang/clojure: general refactor

To optimize load time and conform to new elips conventions introduced
with straight.el integration.
---
 modules/lang/clojure/config.el | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el
index e115f4c15..e813f709c 100644
--- a/modules/lang/clojure/config.el
+++ b/modules/lang/clojure/config.el
@@ -1,22 +1,22 @@
 ;;; lang/clojure/config.el -*- lexical-binding: t; -*-
 
-;;;###package clojure-mode
-(add-hook 'clojure-mode-hook #'rainbow-delimiters-mode)
+(after! clojure-mode
+  (add-hook 'clojure-mode-hook #'rainbow-delimiters-mode)
+
+  (set-repl-handler! 'clojure-mode #'+clojure/repl)
+  (set-eval-handler! 'clojure-mode #'cider-eval-region))
 
 
 (use-package! cider
   ;; NOTE: if you don't have an org directory set (the dir doesn't exist),
   ;; cider jack in won't work.
-  :commands (cider-jack-in cider-jack-in-clojurescript)
+  :commands cider-jack-in cider-jack-in-clojurescript
   :hook (clojure-mode-local-vars . cider-mode)
-  :init
-  (set-repl-handler! 'clojure-mode #'+clojure/repl)
-  (set-eval-handler! 'clojure-mode #'cider-eval-region)
+  :config
+  (add-hook 'cider-mode-hook #'eldoc-mode)
   (set-lookup-handlers! 'cider-mode
     :definition #'+clojure-cider-lookup-definition
     :documentation #'cider-doc)
-  (add-hook 'cider-mode-hook #'eldoc-mode)
-  :config
   (set-popup-rules!
     '(("^\\*cider-error*" :ignore t)
       ("^\\*cider-repl" :quit nil)
@@ -134,10 +134,9 @@
 
 (use-package! clj-refactor
   :hook (clojure-mode . clj-refactor-mode)
-  :init
+  :config
   (set-lookup-handlers! 'clj-refactor-mode
     :references #'cljr-find-usages)
-  :config
   (map! :map clojure-mode-map
         :localleader
         :desc "refactor" "R" #'hydra-cljr-help-menu/body))