From 82312ac9aa116dc3492cc5e34a6f89c51c95c92f Mon Sep 17 00:00:00 2001
From: James Ravn <james@r-vn.org>
Date: Wed, 8 Apr 2020 13:10:17 +0100
Subject: [PATCH 1/2] Load org-roam after org-mode

Fix https://github.com/hlissner/doom-emacs/issues/2846
---
 modules/lang/org/contrib/roam.el | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/modules/lang/org/contrib/roam.el b/modules/lang/org/contrib/roam.el
index 5fb55a917..bf16eb894 100644
--- a/modules/lang/org/contrib/roam.el
+++ b/modules/lang/org/contrib/roam.el
@@ -2,16 +2,7 @@
 ;;;###if (featurep! +roam)
 
 (use-package! org-roam
-  :commands (org-roam
-             org-roam-capture
-             org-roam-date
-             org-roam-find-file
-             org-roam-graph-show
-             org-roam-insert
-             org-roam-switch-to-buffer
-             org-roam-today
-             org-roam-tomorrow
-             org-roam-yesterday)
+  :after org
   :preface
   ;; Set this to nil so we can later detect whether the user has set a custom
   ;; directory for it, and default to `org-directory' if they haven't.

From 8ecf393a3a1885c05ce08db14550ff73698f1e6d Mon Sep 17 00:00:00 2001
From: James Ravn <james@r-vn.org>
Date: Wed, 8 Apr 2020 21:24:49 +0100
Subject: [PATCH 2/2] Add back :commands and use :hook for org-roam

---
 modules/lang/org/contrib/roam.el | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/modules/lang/org/contrib/roam.el b/modules/lang/org/contrib/roam.el
index bf16eb894..961ea9b75 100644
--- a/modules/lang/org/contrib/roam.el
+++ b/modules/lang/org/contrib/roam.el
@@ -2,7 +2,17 @@
 ;;;###if (featurep! +roam)
 
 (use-package! org-roam
-  :after org
+  :hook (org-load . org-roam-mode)
+  :commands (org-roam
+             org-roam-capture
+             org-roam-date
+             org-roam-find-file
+             org-roam-graph-show
+             org-roam-insert
+             org-roam-switch-to-buffer
+             org-roam-today
+             org-roam-tomorrow
+             org-roam-yesterday)
   :preface
   ;; Set this to nil so we can later detect whether the user has set a custom
   ;; directory for it, and default to `org-directory' if they haven't.
@@ -24,8 +34,7 @@
           :desc "Yesterday"      "y" #'org-roam-yesterday))
   :config
   (unless org-roam-directory
-    (setq org-roam-directory org-directory))
-  (org-roam-mode +1))
+    (setq org-roam-directory org-directory)))
 
 
 ;; Since the org module lazy loads org-protocol (waits until an org URL is