Split out gtd into multiple files again

diff --git a/config.org b/config.org
index 26d3d009d3437ad691d463ef3a13704717747016..f1dc89b8ba0234312a43482faf7e3a023e42abc4 100644 (file)
--- a/config.org
+++ b/config.org
@@ -244,7 +244,6 @@ Sly really doesn't play well with elodc in the minibuffer, so here are some sett
       org-startup-folded 'fold
       org-startup-with-inline-images t
       org-tags-column 0
-      org-use-tag-inheritance nil
       org-yank-adjusted-subtrees t
       org-startup-indented t)
 #+END_SRC
@@ -291,6 +290,10 @@ Sly really doesn't play well with elodc in the minibuffer, so here are some sett
                              (800 900 1000 1100 1200 1300 1400 1500 1600 1700 1800 1900 2000)
                              " -----"
                              "")
+      org-agenda-prefix-format '((agenda . " %?-12t% s")
+                                 (todo . " ")
+                                 (tags . " ")
+                                 (search . " "))
       org-agenda-scheduled-leaders '("Booked: " "Booked %dd. ago: ")
       org-agenda-deadline-leaders '("Deadline: " "In %dd.: " "Died %dd. ago: ")
       org-read-date-prefer-future 'time
@@ -303,16 +306,15 @@ Sly really doesn't play well with elodc in the minibuffer, so here are some sett
 ***** Custom Agendas
 #+BEGIN_SRC emacs-lisp
 (defvar *re/org-agenda-inbox*
-  '(tags "CATEGORY=\"inbox\"" ((org-agenda-skip-function
-                                '(org-agenda-skip-entry-if 'regexp "^\\* "))
-                               (org-agenda-overriding-header "INBOX:"))))
+  '(tags "CATEGORY=\"inbox\"" ((org-agenda-overriding-header "INBOX:"))))
 
 (defvar *re/org-agenda-todo*
   '(tags-todo "-recurring/TODO" ((org-agenda-overriding-header "NEXT:"))))
 
 (defvar *re/org-agenda-undertakings*
-  '(tags "CATEGORY=\"undertaking\"" ((org-agenda-skip-function
-                  '(org-agenda-skip-entry-if 'notregexp "^\\*\\* ")))))
+  '(tags "CATEGORY=\"undertakings\"" ((org-agenda-skip-function
+                                       '(org-agenda-skip-entry-if 'notregexp "^\\* "))
+                                      (org-agenda-overriding-header "UNDERTAKIŊS:"))))
 
 (defvar *re/org-agenda-waiting*
   '(todo "WAITING" ((org-agenda-overriding-header "WAITIŊ:"))))
@@ -323,28 +325,29 @@ Sly really doesn't play well with elodc in the minibuffer, so here are some sett
                                    ("w" "Waiting" ,@*re/org-agenda-waiting*)
                                    ("o" "Overview" (,*re/org-agenda-inbox*
                                                     ,,*re/org-agenda-todo*
-                                                    ,,*re/org-agenda-waiting*))))
+                                                    ,,*re/org-agenda-waiting*
+                                                    ,,*re/org-agenda-undertakings*))))
 #+END_SRC
 ***** Capture Templates
 #+BEGIN_SRC emacs-lisp
 (setq org-capture-templates '(("i" "Inbox" entry
-                               (file+olp "gtd.org" "Inbox")
+                               (file "inbox.org")
                                "* %^{Description}\n%U\n%?"
                                :prepend t)
                               ("n" "Next Action" entry
-                               (file+olp "gtd.org" "Next")
+                               (file "next.org")
                                "* TODO %^{Description}\n%U\n%?"
                                :prepend t)
                               ("u" "Undertaking" entry
-                               (file+olp "gtd.org" "Undertakings")
+                               (file "undertakings.org")
                                "* %^{Description}\n%U\n%?"
                                :prepend t)
                               ("m" "Meeting" entry
-                               (file+olp "gtd.org" "Meetings")
+                               (file "meetings.org")
                                "* MEETING %^{Description}\n%^{Scheduled:}T\n%?"
                                :prepend t)
                               ("p" "Phone Call" entry
-                               (file "gtd.org")
+                               (file "meetings.org")
                                "* %^{Description} :call:\n%U\n%?"
                                :prepend t)
                               ("t" "Note" entry