Agenda tweaks

Set up shared blokcs as vars, selectively compact headers for blocks, add
block for two week look-ahead.

diff --git a/config.org b/config.org
index 83c8f28f3f5e9e897b70888b4483936b4fefde7a..7473f082733a5a229c4b90876be8ce576ef62681 100644 (file)
--- a/config.org
+++ b/config.org
@@ -299,12 +299,11 @@ Sly really doesn't play well with elodc in the minibuffer, so here are some sett
                               ("MEETING" :foreground "#315e9a" :weight bold))
       org-agenda-restore-windows-after-quit t
       org-agenda-start-on-weekday nil
-      org-agenda-compact-blocks t
       org-agenda-span 'day
       org-deadline-warning-days 30
       org-agenda-window-setup 'current-window
       org-agenda-time-grid '((daily today remove-match)
-                            (600 700 800 900 1000 1100 1200 1300 1400 1500 1600 1700 1800 1900)
+                            (600 800 1200 1700 1800)
                             " ――――― "
                             "")
       org-agenda-tags-column 50
@@ -317,20 +316,38 @@ Sly really doesn't play well with elodc in the minibuffer, so here are some sett
                                 (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 '(("f" "Maybe Someday" tags "someday" ((org-agenda-overriding-header "SOMEDAY:")))
-                                  ("i" "Inbox" tags "inbox" ((org-agenda-overriding-header "INBOX:")))
+      org-read-date-prefer-future 'time)
+
+(defvar *re/org-agenda-inbox*
+  '(tags "inbox" ((org-agenda-overriding-header "\nINBOX:"))))
+
+(defvar *re/org-agenda-todo*
+  '(tags-todo "-recurring/TODO" ((org-agenda-overriding-header "\nNEXT:"))))
+
+(defvar *re/org-agenda-undertakings*
+  '(tags "open" ((org-agenda-overriding-header "\nUNDERTAKINGS:"))))
+
+(defvar *re/org-agenda-waiting*
+  '(todo "WAITING" ((org-agenda-overriding-header "\nWAITING:"))))
+
+(defvar *re/org-agenda-two-week-overview*
+  '(agenda "" ((org-agenda-span 14)
+              (org-agenda-start-on-weekday nil)
+              (org-agenda-overriding-header "\nTWO-WEEK UPCOMING:"))))
+
+(setq org-agenda-custom-commands `(("f" "Maybe Someday" tags "someday" ((org-agenda-overriding-header "SOMEDAY:")))
+                                  ("i" "Inbox" ,*re/org-agenda-inbox*)
                                   ("l" "Licenses" tags "license" ((org-agenda-overriding-header "LICENSES:")))
-                                  ("n" "Next Actions" tags-todo "-recurring/TODO" ((org-agenda-overriding-header "NEXT:")))
+                                  ("n" "Next Actions" ,*re/org-agenda-todo*)
                                   ("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-overriding-header "\nNEXT:")
-                                                                                 (org-agenda-max-entries 10)))
-                                                   (tags "open" ((org-agenda-overriding-header "\nUNDERTAKINGS:")))
-                                                   (todo "WAITING" ((org-agenda-overriding-header "\nWAITING:"))))))
+                                  ("u" "Undertakings" ,*re/org-agenda-undertakings*)
+                                  ("w" "Waiting" ,*re/org-agenda-waiting*)
+                                  ("o" "Overview" ((agenda "" ((org-agenda-compact-blocks t)))
+                                                   ,,*re/org-agenda-inbox*
+                                                   ,,*re/org-agenda-todo*
+                                                   ,,*re/org-agenda-two-week-overview*
+                                                   ,,*re/org-agenda-undertakings*
+                                                   ,,*re/org-agenda-waiting*)))
       org-agenda-start-with-log-mode t
       org-agenda-log-mode-items '(closed clock state)
       org-log-done 'time