Merge remote-tracking branch 'origin/master'

emacs/.config/doom/config.org

@@ -467,8 +467,9 @@ To get a more nuanced overview of my current TODOs I add more progress states.
 | Access Key | t    | b       | i           | r      | t       |   | d    |           | c        |
 | Log Type   | time | note    | time        | note   | note    |   | time | note      |  note    |
 #+begin_src emacs-lisp :tangle config.el
+(after! org
   (setq org-todo-keywords
-      '((sequence "TODO(t!)" "IN_PROGRESS(i!)" "BLOCKED(b@)" "REVIEW(r@)" "TESTING(t@)" "|" "DONE(d!)" "DELEGATED(!)" "CANCELED(c@)")))
+        '((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
@@ -485,22 +486,22 @@ A lot of the config is also taken from [[https://www.reddit.com/r/orgmode/commen
 #+begin_src emacs-lisp :tangle packages.el
 (package! org-caldav)
 #+end_src
-*** configure calendars
-add the calendars to the org-caldav config
-#+begin_src emacs-lisp :tangle config.el
-(after! org-caldav
-  (setq org-caldav-url "https://cloud.ploedige.com/remote.php/dav/calendars/paul-loedige")
-  (setq org-caldav-calendars
-        '((:calendar-id "org-test" :files ("~/org/calendars/org_test.org")
-           :inbox "~/org/calendars/org_test.org"))))
-#+end_src
-*** enable TODOs
+*** Enable TODOs
 #+begin_src emacs-lisp :tangle config.el
 (after! org-caldav
   (setq org-icalendar-include-todo 'all
     org-caldav-sync-todo t))
 #+end_src
 
+*** Configure Sync
+add the calendars to the org-caldav config
+#+begin_src emacs-lisp :tangle config.el
+(after! org-caldav
+  (setq org-caldav-url "https://cloud.ploedige.com/remote.php/dav/calendars/paul-loedige")
+  (setq org-caldav-calendars
+        '((:calendar-id "todo" :files ("~/org/todo.org")
+           :inbox "~/org/todo.org"))))
+#+end_src
 ** Org Roam
 *** set base directory
 Both the org files themselves and the database should be located in the same directory to enable syncing via Nextcloud