From 846c13881efbf405526fb30185fb2e35d52f36e4 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Tue, 19 Apr 2022 00:47:54 +0100 Subject: [PATCH] fix(navigation): resolve load order between consult and projectile --- modules/navigation/siren-consult.el | 7 +++---- modules/projects/siren-projectile.el | 3 +++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/navigation/siren-consult.el b/modules/navigation/siren-consult.el index c5c9adc..f252f19 100644 --- a/modules/navigation/siren-consult.el +++ b/modules/navigation/siren-consult.el @@ -6,6 +6,8 @@ ;;; Code: +(require 'siren-projectile) + (eval-when-compile (require 'cl-lib)) @@ -24,10 +26,7 @@ (consult-preview-max-count 10) :config - ;; (consult-customize consult--source-bookmark :hidden t) - ;; (consult-customize consult--source-recent-file :hidden t) - (with-eval-after-load 'projectile - (setq consult-project-root-function 'projectile-project-root)) + (setq consult-project-root-function 'projectile-project-root) :init (defun siren-consult-imenu () diff --git a/modules/projects/siren-projectile.el b/modules/projects/siren-projectile.el index 3d90db7..bd79d01 100644 --- a/modules/projects/siren-projectile.el +++ b/modules/projects/siren-projectile.el @@ -7,6 +7,9 @@ ;;; Code: (use-package projectile + :commands + projectile-project-root + :general ("C-c p p" 'projectile-switch-project) ("C-c p k" 'projectile-kill-buffers)