cleanup, fix up agenda

diff --git a/re/re-org.el b/re/re-org.el
index a956c61ba9d25b5b9668deab46b57ca6cb95d6aa..d9a034230d9917cccbc6fcdf51abd77b99ce80e9 100644 (file)
--- a/re/re-org.el
+++ b/re/re-org.el
@@ -63,6 +63,7 @@
                      ("errand" . ?r)
                      ("jobpc" . ?j)
                      ("license" . ?l)
+                     ("meeting" . ?m)
                      ("open" . ?o))
       org-tags-exclude-from-inheritance '("open")
       org-agenda-restore-windows-after-quit t
@@ -75,58 +76,50 @@
                             (600 700 800 900 1000 1100 1200 1300 1400 1500 1600 1700 1800 1900)
                             " ――――― "
                             "")
-      org-agenda-tags-column 0
-      org-agenda-remove-tags t
+      org-agenda-tags-column 80
       org-agenda-skip-additional-timestamps-same-entry t
       org-agenda-skip-deadline-if-done t
       org-agenda-skip-scheduled-if-done t
-      org-agenda-prefix-format '((agenda . "%25c:%?-12t% s")
-                                (todo . "%25c:%?-12t% s")
-                                (tags . "%25c:%?-12t% s")
-                                (search . "%25c:%?-12t% s"))
+      org-agenda-prefix-format '((agenda . "  %?-12t% s")
+                                (todo . "  ")
+                                (tags . "  ")
+                                (search . "  "))
       org-agenda-scheduled-leaders '("BOOKED: " "Booked %2d d. ago: ")
       org-agenda-deadline-leaders '("DEADLINE: " "In %3d d.: " "%2d d. ago: ")
       org-read-date-prefer-future 'time
-      org-agenda-custom-commands
-      '(("d" "Done items" todo "DONE|BELAYED|GIVEN|MET" ((org-agenda-skip-function
-                                                         '(org-agenda-skip-entry-if 'notregexp "^\\*\\* "))
-                                                        (org-agenda-overriding-header "DONE - MAYBE KEEP:")))
-       ("f" "Maybe Someday" tags "someday" ((org-agenda-skip-function
-                                             '(org-agenda-skip-entry-if 'regexp "^\\* someday"))
-                                            (org-agenda-overriding-header "SOMEDAY:")))
-       ("i" "Inbox" tags "inbox" ((org-agenda-skip-function
-                                   '(org-agenda-skip-entry-if 'regexp "^\\* inbox"))
-                                  (org-agenda-overriding-header "INBOX:")))
-       ("l" "Licenses" tags "license" ((org-agenda-overriding-header "LICENSES:")))
-       ("n" "Next Actions" tags-todo "-recurring/TODO" ((org-agenda-overriding-header "NEXT:")
-                                                        (org-agenda-sorting-strategy
-                                                         '((agenda tag-up time-up)))))
-       ("p" "JobPCs" tags "jobpc" ((org-agenda-overriding-header "JOB PCS:")))
-       ("u" "Undertakings" tags "open" ((org-agenda-overriding-header "UNDERTAKINGS:")))
-       ("w" "Waiting" todo "WAITING" ((org-agenda-overriding-header "WAITING:")))
-       ("o" "Overview" ((agenda "")
-                        (tags "inbox" ((org-agenda-overriding-header "\nINBOX:")))
-                        (tags "open" ((org-agenda-skip-function
-                                       '(org-agenda-skip-entry-if 'notregexp "^\\* "))
-                                      (org-agenda-overriding-header "\nUNDERTAKINGS:")))
-                        (todo "WAITING" ((org-agenda-overriding-header "\nWAITING:"))))))
+      org-agenda-custom-commands '(("f" "Maybe Someday" tags "someday" ((org-agenda-overriding-header "SOMEDAY:")))
+                                  ("i" "Inbox" tags "inbox" ((org-agenda-overriding-header "INBOX:")))
+                                  ("l" "Licenses" tags "license" ((org-agenda-overriding-header "LICENSES:")))
+                                  ("n" "Next Actions" tags-todo "-recurring/TODO" ((org-agenda-overriding-header "NEXT:")))
+                                  ("p" "JobPCs" tags "jobpc" ((org-agenda-overriding-header "JOB PCS:")))
+                                  ("u" "Undertakings" tags "open" ((org-agenda-overriding-header "UNDERTAKINGS:")))
+                                  ("w" "Waiting" todo "WAITING" ((org-agenda-overriding-header "WAITING:")))
+                                  ("o" "Overview" ((agenda "")
+                                                   (tags "inbox" ((org-agenda-overriding-header "\nINBOX:")))
+                                                   (tags-todo "-recurring/TODO" ((org-agenda-max-entries 10)
+                                                                                 (org-agenda-overriding-header "\nNEXT:")))
+                                                   (tags "open" ((org-agenda-overriding-header "\nUNDERTAKINGS:")))
+                                                   (todo "WAITING" ((org-agenda-overriding-header "\nWAITING:"))))))
       org-agenda-start-with-log-mode t
       org-agenda-log-mode-items '(closed clock state)
       org-log-done 'time
       org-log-into-drawer t
       org-capture-templates '(("i" "Inbox" entry
-                              (file "inbox.org")
-                              "* %^{Description}\n%U\n%?"
+                              (file "gtd.org")
+                              "* %^{Description} :inbox:\n%U\n%?"
+                              :prepend t
                               :clock-in t
                               :clock-resume t)
                              ("m" "Meeting" entry
-                              (file "inbox.org")
-                              "* %^{Description}\n%^{Scheduled:}T\n%?"
+                              (file "gtd.org")
+                              "* MEETING %^{Description} :meeting:\n%^{Scheduled:}T\n%?"
+                              :prepend t
                               :clock-in t
                               :clock-resume t)
                              ("p" "Phone Call" entry
-                              (file "inbox.org")
+                              (file "gtd.org")
                               "* %^{Description} :call:\n%U\n%?"
+                              :prepend t
                               :clock-in t
                               :clock-resume t))
       org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id