From 9d6a7b7d4b52370eb6f3ede3171d3361d1f3ab1f Mon Sep 17 00:00:00 2001
From: Ellis Kenyo <me@elken.dev>
Date: Sat, 11 Mar 2023 10:23:57 +0000
Subject: [PATCH] fix(clojure): load against the correct package

The cider library is loaded too late for clojure-mode to rely on, so we
load after the cider-mode package instead.

Fix: #7130
---
 modules/lang/clojure/config.el | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el
index 2d21167ba..b5c3ab0f7 100644
--- a/modules/lang/clojure/config.el
+++ b/modules/lang/clojure/config.el
@@ -39,7 +39,10 @@
                #'tree-sitter!)))
 
 
-(use-package! cider
+;; `cider-mode' is used instead of the typical `cider' package due to the main
+;; library being loaded only when is absolutely needed, which is too late for
+;; our purposes
+(use-package! cider-mode
   ;; NOTE if `org-directory' doesn't exist, `cider-jack' in won't work
   :hook (clojure-mode-local-vars . cider-mode)
   :init
@@ -175,8 +178,6 @@
             "C"  #'cider-connect-cljs
             "m"  #'cider-macroexpand-1
             "M"  #'cider-macroexpand-all
-            "j"  #'jet
-            "f"  #'neil-find-clojure-package
             (:prefix ("d" . "debug")
              "d" #'cider-debug-defun-at-point)
             (:prefix ("e" . "eval")
@@ -274,8 +275,15 @@
   :commands (neil-find-clojure-package)
   :config
   (setq neil-prompt-for-version-p nil
-        neil-inject-dep-to-project-p t))
+        neil-inject-dep-to-project-p t)
+  (map! :map (clojure-mode-map clojurescript-mode-map clojurec-mode-map)
+        :localleader
+        "f"  #'neil-find-clojure-package))
 
 
 (use-package! jet
-  :commands (jet))
+  :commands (jet)
+  :config
+  (map! :map (clojure-mode-map clojurescript-mode-map clojurec-mode-map)
+        :localleader
+        "j" #'jet))