From a6085b58a21ba0145294803b2a9239a5efb6aee1 Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Tue, 10 May 2022 13:57:09 -0500
Subject: Fix load order

---
 init.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index 03040db..478b735 100644
--- a/init.el
+++ b/init.el
@@ -1269,7 +1269,8 @@
 (setup (:straight clhs))
 
 (setup (:straight consult)
-  (:require consult +consult)
+  (+with-ensure-after-init
+    (:require consult +consult))
   ;; from Consult wiki
   (:option register-preview-delay 0
            register-preview-function #'consult-register-format
@@ -1332,7 +1333,7 @@
   (:bind-into org
     "M-g o" #'consult-org-heading)
   (advice-add 'consult-yank-pop :after #'+yank@indent)
-  (:when-loaded
+  (+with-eval-after-loads (consult +consult)
     (:option consult-narrow-key "<"
              consult-project-root-function '+consult-project-root)
     (consult-customize consult-theme
@@ -1371,6 +1372,7 @@
         (setf (alist-get buf-cmd vertico-multiform-commands) nil)))))
 
 (setup (:straight consult-dir)
+  (:load-after consult)
   (:+key "C-x C-d" #'consult-dir)
   (:with-map vertico-map
     (:bind "C-x C-d" #'consult-dir
-- 
cgit 1.4.1-21-gabe81