diff --git a/modules/home-manager/emacs/emacs.d/config.org b/modules/home-manager/emacs/emacs.d/config.org
index b00072f..0ec3599 100644
--- a/modules/home-manager/emacs/emacs.d/config.org
+++ b/modules/home-manager/emacs/emacs.d/config.org
@@ -16,7 +16,7 @@
   - [[#enable-table-of-contents][Enable Table of Contents]]
   - [[#enable-org-bullets][Enable org bullets]]
   - [[#block-expansion][Block expansion]]
-  - [[#caldav-sync][caldav sync]]
+  - [[#org-roam][Org Roam]]
 - [[#completion-framework][Completion Framework]]
 - [[#completion-at-point][COMPLETION AT POINT]]
 - [[#lsp][LSP]]
@@ -143,7 +143,7 @@
 ** General Settings
 #+begin_src emacs-lisp
   ;; Must do this so the agenda knows where to look for my files
-  (setq org-agenda-files '("~/everything"))
+  (setq org-agenda-files (directory-files-recursively "~/everything/" "\\.org$"))
 
   ;; When a TODO is set to a done state, record a timestamp
   (setq org-log-done 'time)
@@ -193,16 +193,27 @@
 #+begin_src emacs-lisp
   (require 'org-tempo)
 #+end_src
-** Org caldav
+
+** Org Roam
 #+begin_src emacs-lisp
-  (use-package org-caldav
+  (use-package org-roam
     :ensure t
+    :custom
+    (org-roam-directory "~/everything")
+    (org-roam-completion-everywhere t)
+    (org-roam-dailies-capture-templates
+      '(("d" "default" entry "* %<%I:%M %p>: %?"
+         :if-new (file+head "%<%Y-%m-%d>.org" "#+title: %<%Y-%m-%d>\n"))))
+    :bind (("C-c n l" . org-roam-buffer-toggle)
+           ("C-c n f" . org-roam-node-find)
+           ("C-c n g" . org-roam-graph)
+           ("C-c n i" . org-roam-node-insert)
+           ("C-c n c" . org-roam-capture)
+           ;; Dailies
+           ("C-c n j" . org-roam-dailies-capture-today))
     :config
-    (setq org-caldav-url "https://nextcloud.michaelthomson.dev/remote.php/dav/calendars/mthomson")
-    (setq org-caldav-calendar-id "personal")
-    (setq org-caldav-inbox "~/everything/calendar.org")
-    (setq org-caldav-files nil)
-    (setq org-icalendar-timezone "America/Toronto"))
+    (setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag)))
+    (org-roam-db-autosync-mode))
 #+end_src
 
 * Completion Framework