diff --git a/emacs/.config/doom/config.org b/emacs/.config/doom/config.org
index 89dd6db..31feeb5 100644
--- a/emacs/.config/doom/config.org
+++ b/emacs/.config/doom/config.org
@@ -452,6 +452,14 @@ To get a more nuanced overview of my current TODOs I add more progress states.
 (setq org-todo-keywords
       '((sequence "TODO(t!)" "IN_PROGRESS(i!)" "BLOCKED(b@)" "REVIEW(r@)" "TESTING(t@)" "|" "DONE(d!)" "DELEGATED(!)" "CANCELED(c@)")))
 #+end_src
+*** Add "~/org" to Agenda
+#+begin_src emacs-lisp :tangle config.el
+(after! org
+  (setq org-agenda-files (f-files "~/org"
+                                  (lambda (f)
+                                    (string= (f-ext f) "org"))
+                                  'recursive)))
+#+end_src
 ** CalDAV Sync
 [[https://github.com/dengste/org-caldav][org-caldav]] provides a tool for syncing with a CalDAV server (in my case Nextcloud).
 A lot of the config is also taken from [[https://www.reddit.com/r/orgmode/comments/8rl8ep/comment/e0sb5j0/?utm_source=share&utm_medium=web3x&utm_name=web3xcss&utm_term=1&utm_content=share_button][this]] reddit post.
@@ -468,11 +476,6 @@ add the calendars to the org-caldav config
         '((:calendar-id "org-test" :files ("~/org/calendars/org_test.org")
            :inbox "~/org/calendars/org_test.org"))))
 #+end_src
-and add them to the org agenda as well
-#+begin_src emacs-lisp :tangle config.el
-(after! org
-  (setq org-agenda-files '("~/org/calendars")))
-#+end_src
 *** enable TODOs
 #+begin_src emacs-lisp :tangle config.el
 (after! org-caldav