diff --git a/config/major_modes.org b/config/major_modes.org
index 93b19f5..c73c4ae 100644
--- a/config/major_modes.org
+++ b/config/major_modes.org
@@ -33,9 +33,7 @@ bother with an explanation on each.
 ;; Clojure
 (use-package clojure-mode
   :ensure t
-  :after (rainbow-mode)
   :hook
-  (clojure-mode . cider-mode)
   (clojure-mode . (lambda () (setq-local lsp-semantic-tokens-enable nil))))
 
 (use-package clojure-ts-mode
@@ -44,7 +42,6 @@ bother with an explanation on each.
          ("\\.cljs\\'" . clojure-ts-mode)
          ("\\.cljc\\'" . clojure-ts-mode))
   :hook
-  (clojure-ts-mode . cider-mode)
   (clojure-ts-mode . (lambda () (setq-local lsp-semantic-tokens-enable nil))))
 
 ;; Gleam
@@ -53,7 +50,14 @@ bother with an explanation on each.
 
 (use-package cider
   :ensure t
-  :defer t)
+  :hook
+  (clojure-mode . cider-mode)
+  (clojure-ts-mode . cider-mode)
+  :custom
+  ;; Let clojure-lsp handle these
+  (cider-eldoc-display-for-symbol-at-point nil)
+  (cider-use-xref nil)
+  (cider-completion-at-point-enable nil))
 
 (use-package elixir-ts-mode
   :ensure t
diff --git a/config/qol.org b/config/qol.org
index 3264d01..eeca8d6 100644
--- a/config/qol.org
+++ b/config/qol.org
@@ -134,7 +134,7 @@ I'm going to try out gptel and see how I like it.
   :config
   (setq
    gptel-model 'gemini-3-pro-preview
-   gptel-api-key (auth-source-pick-first-password :host "generativelanguage.googleapis.com")
+   gptel-api-key (lambda () (auth-source-pick-first-password :host "generativelanguage.googleapis.com"))
    gptel-backend (gptel-make-gemini "Gemini"
                    :stream t
                    :key #'gptel-api-key-from-auth-source)))