Cleanup, simplify

zen

diff --git a/re/re-org.el b/re/re-org.el
index 5e193379543509079386e079c764a14f091ce91c..d5bfc3fb599a4f21e3c1abfec6b6cbd60245cde7 100644 (file)
--- a/re/re-org.el
+++ b/re/re-org.el
@@ -7,6 +7,7 @@
 (add-to-list 'org-export-backends 'md)
 
 (setq org-startup-indented t
+      org-startup-folded 'fold
       org-startup-with-inline-images t
       org-cycle-inline-images-display t
       org-cycle-separator-lines 0
@@ -22,6 +23,7 @@
       org-enforce-todo-dependencies t
       org-enforce-todo-checkbox-dependencies t
       org-fontify-done-headline nil
+      org-fontify-todo-headline nil
       org-goto-interface 'outline-path-completion
       org-outline-path-complete-in-steps nil
       org-goto-auto-isearch nil
@@ -53,33 +55,14 @@
                           (org-agenda-files :maxlevel . 9))
       org-refile-use-outline-path 'file
       org-refile-allow-creating-parent-nodes 'confirm
-      org-todo-keywords '((sequence "UNDERTAKEN(u)" "|")
-                         (sequence "TODO(t)" "WAITING(w@)" "|")
-                         (sequence "|" "DONE(d)" "BELAYED(b@)" "GIVEN(g@)")
+      org-todo-keywords '((sequence "TODO(t)" "WAITING(w@)" "|" "DONE(d)" "BELAYED(b@)" "GIVEN(g@)")
                          (sequence "MEETING(m)" "|" "MET(M)"))
-      org-tag-alist '((:startgroup . nil) ; contexts
-                     ("buy" . ?b)
-                     ("call" . ?c)
-                     ("email" . ?m)
+      org-tag-alist '(("call" . ?c)
+                     ("email" . ?e)
                      ("errand" . ?r)
                      ("jobpc" . ?j)
                      ("license" . ?l)
-                     ("online" . ?o)
-                     ("software" . ?s)
-                     ("writ" . ?w)
-                     (:endgroup . nil)
-                     ("bugfix" . ?g)
-                     ("update" . ?u)
-                     ("troubleshoot" . ?t)
-                     (:startgroup . nil) ; people to contact
-                     ("amy" . nil)
-                     ("ee" . nil)
-                     ("me" . nil)
-                     ("mikec" . nil)
-                     ("pm" . nil)
-                     ("psm" . nil)
-                     ("sm" . nil)
-                     (:endgroup . nil))
+                     ("open" . ?o))
       org-agenda-restore-windows-after-quit t
       org-agenda-start-on-weekday nil
       org-agenda-compact-blocks t
@@ -91,6 +74,7 @@
                             " ――――― "
                             "")
       org-agenda-tags-column 0
+      org-agenda-remove-tags t
       org-agenda-skip-additional-timestamps-same-entry t
       org-agenda-skip-deadline-if-done t
       org-agenda-skip-scheduled-if-done t
@@ -115,49 +99,34 @@
        ("n" "Next Actions" tags-todo "-recurring/TODO" ((org-agenda-overriding-header "NEXT:")
                                                         (org-agenda-sorting-strategy
                                                          '((agenda tag-up time-up)))))
-       ("N" "Notes" tags "note" ((org-agenda-overriding-header "NOTES:")))
        ("p" "JobPCs" tags "jobpc" ((org-agenda-overriding-header "JOB PCS:")))
-       ("u" "Undertakings" todo "UNDERTAKEN" ((org-agenda-overriding-header "UNDERTAKINGS:")))
-       ("w" "Waiting" todo "WAITING" ((org-agenda-overriding-header "WAITING:"))))
-      org-stuck-projects '("+TODO=\"UNDERTAKEN\"" ("TODO") nil "")
+       ("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-skip-function
+                                        '(org-agenda-skip-entry-if 'notregexp "^\\* "))
+                                       (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-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+olp "gtd.org" "inbox")
-                              "* %^{Description}\nAdded: %U\n%?"
-                              :empty-lines-before 1
-                              :clock-in t
-                              :clock-resume t)
-                             ("n" "Next Item" entry
-                              (file+olp "gtd.org" "next")
-                              "* TODO %^{Description} %^{tags}G\nAdded: %U\n%?"
-                              :empty-lines-before 1
-                              :clock-in t
-                              :clock-resume t)
-                             ("u" "Undertake" entry
-                              (file+olp "gtd.org" "undertakings")
-                              "* UNDERTAKEN %^{Description}\nAdded: %U\n%?"
-                              :empty-lines-before 1
+                              (file "inbox.org")
+                              "* %^{Description}\n%U\n%?"
                               :clock-in t
                               :clock-resume t)
                              ("m" "Meeting" entry
-                              (file+olp "gtd.org" "meetings")
+                              (file "inbox.org")
                               "* %^{Description}\n%^{Scheduled:}T\n%?"
-                              :empty-lines-before 1
                               :clock-in t
                               :clock-resume t)
                              ("p" "Phone Call" entry
-                              (file+olp "gtd.org" "inbox")
-                              "* %^{Description} :call:\nAdded: %U\n%?"
-                              :empty-lines-before 1
-                              :clock-in t
-                              :clock-resume t)
-                             ("s" "Someday/Maybe" entry
-                              (file+olp "gtd.org" "someday")
-                              "* %^{Description} :call:\nAdded: %U\n%?"
-                              :empty-lines-before 1
+                              (file "inbox.org")
+                              "* %^{Description} :call:\n%U\n%?"
                               :clock-in t
                               :clock-resume t))
       org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id