many changes to org

Additions to capture templates, agenda views, settings.

diff --git a/re/re-org.el b/re/re-org.el
index f5dc699439748a4c2a45f1277a933b223a1abf56..27e5067a1222d74ad41f1ddf388496410f9413cf 100644 (file)
--- a/re/re-org.el
+++ b/re/re-org.el
@@ -7,8 +7,10 @@
 (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 -1
       org-M-RET-may-split-line nil
       org-table-export-default-format "orgtbl-to-csv"
       org-ellipsis "↴")
@@ -28,39 +30,61 @@
       org-yank-adjusted-subtrees t)
 \f
 ;; Agenda and capture
-(setq org-agenda-files '("~/org/inbox.org" "~/org/undertakings.org" "~/org/next.org" "~/org/meetings.org"))
+(setq org-agenda-files '("~/org/inbox.org"
+                        "~/org/undertakings.org"
+                        "~/org/next.org"
+                        "~/org/meetings.org"))
 
 ;; Allow 9 levels in current file, any other org file, allow toplevel refile, and allow creation of new parents
-(setq org-refile-targets '((nil :maxlevel . 9) ((file-expand-wildcards "~/org/*.org") :maxlevel . 9))
+(setq org-refile-targets '((nil :maxlevel . 9)
+                          (org-agenda-files :maxlevel . 9))
       org-refile-use-outline-path 'file
       org-refile-allow-creating-parent-nodes 'confirm)
 
-(setq org-todo-keywords '((sequence "TODO(t)" "WAITING(w)" "UNDERTAKING(u)" "MEETING(m)"
+(setq org-todo-keywords '((sequence "TODO(t)" "WAITING(w@)" "UNDERTAKEN(u)" "MEETING(m)"
                                    "|"
                                    "DONE(d)" "BELAYED(b)" "GIVEN(g)" "MET(M)")))
 
+(setq org-tag-alist '((:startgroup . nil)
+                     ("email" . ?m)
+                     ("call" . ?c)
+                     ("epicor" . ?e)
+                     ("software" . ?s)
+                     ("jobpc" . ?j)
+                     (:endgroup . nil)
+                     ("troubleshoot" . ?t)))
+
 (setq org-agenda-restore-windows-after-quit t
       org-agenda-start-on-weekday nil
       org-agenda-remove-tags t
       org-agenda-span 'week
       org-agenda-window-setup 'current-window)
 
-(setq org-agenda-prefix-format '((agenda . " %-12:c%?-12t% s")
-                                (todo . " %-12:c")
-                                (tags . " %-12:c")
-                                (search . " %-12:c"))
+(setq org-agenda-prefix-format '((agenda . " %?-12t% s")
+                                (todo . " ")
+                                (tags . " ")
+                                (search . " "))
       org-agenda-scheduled-leaders '("BOOKED: " "In %2dx: ")
       org-agenda-deadline-leaders '("DEADLINE: " "In %3d d.: " "%2d d. ago: "))
 
 (setq org-agenda-custom-commands
-      '(("i" "Inbox" tags "inbox")
-       ("n" "Next Actions" todo "TODO")
-       ("u" "Undertakings" todo "UNDERTAKING")
-       ("w" "Waiting" todo "WAITING")
-       ("s" "Someday" tags "someday" ((org-agenda-files "~/org/someday.org")))))
+      '(("i" "Inbox" tags "inbox" ((org-agenda-overriding-header "INBOX:")))
+       ("n" "Next Actions" ((agenda)
+                            (tags-todo "email" ((org-agenda-overriding-header "EMAILS:")))
+                            (tags-todo "call"((org-agenda-overriding-header "CALLS:")))
+                            (tags-todo "epicor"((org-agenda-overriding-header "EPICOR:")))
+                            (tags-todo "jobpc"((org-agenda-overriding-header "JOB PCS:")))
+                            (tags-todo "software"((org-agenda-overriding-header "SOFTWARE:")))
+                            (tags-todo "troubleshoot" ((org-agenda-overriding-header "TROUBLESHOOT:")))
+                            (tags-todo "TAGS=\"\"/-UNDERTAKEN-MEETING"
+                                       ((org-agenda-overriding-header "UNCATEGORIZED:")))))
+       ("u" "Undertakings" todo "UNDERTAKEN" ((org-agenda-overriding-header "UNDERTAKINGS:")))
+       ("w" "Waiting" todo "WAITING" ((org-agenda-overriding-header "WAITING:")))
+       ("s" "Someday" tags "someday" ((org-agenda-files "~/org/someday.org")
+                                      (org-agenda-overriding-header "SOMEDAY:")))))
 
 ;; Configure stuck projects
-(setq org-stuck-projects '("+TODO=\"UNDERTAKING\"" ("TODO") nil ""))
+(setq org-stuck-projects '("+TODO=\"UNDERTAKEN\"" ("TODO") nil ""))
 
 (setq  org-agenda-start-with-log-mode t
        org-agenda-log-mode-items '(closed clock state)
@@ -69,10 +93,20 @@
 (setq org-capture-templates
       '(("i" "Inbox" entry
         (file "inbox.org")
-        "* %^{Brief Description}\nAdded: %U\n%?")
+        "* %^{Brief Description}\nAdded: %U\n%?"
+        :empty-lines-before 1)
+       ("n" "Next Item" entry
+        (file "next.org")
+        "* TODO %^{Brief Description} %^{tags}G\nAdded: %U\n%?"
+        :empty-lines-before 1)
+       ("u" "Undertake" entry
+        (file "undertakings.org")
+        "* UNDERTAKEN %^{Brief Description}\nAdded: %U\n%?"
+        :empty-lines-before 1)
        ("m" "Meeting" entry
         (file "agenda.org")
-        "* %^{Brief Description}\n%^{Scheduled:}T\n%?")))
+        "* %^{Brief Description}\n%^{Scheduled:}T\n%?"
+        :empty-lines-before 1)))
 
 (setq org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id
       org-id-method 'ts