Re-arrange, some bikeshedding

diff --git a/re/re-org.el b/re/re-org.el
index d9a034230d9917cccbc6fcdf51abd77b99ce80e9..cdc66d051ad49f39bd2ce5f4012b5d1500687c8a 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-indent-indentation-per-level tab-width
       org-startup-folded 'fold
       org-startup-with-inline-images t
       org-cycle-inline-images-display t
@@ -18,8 +19,9 @@
       org-table-export-default-format "orgtbl-to-csv"
       org-list-allow-alphabetical t
       org-fold-catch-invisible-edits 'show-and-error
-      org-ellipsis " ↴"
+      org-ellipsis "↴"
       org-tags-column 0
+      org-reverse-note-order t
       org-enforce-todo-dependencies t
       org-enforce-todo-checkbox-dependencies t
       org-fontify-done-headline nil
@@ -30,13 +32,7 @@
       org-special-ctrl-a/e t
       org-special-ctrl-k t
       org-return-follows-link t
-      org-yank-adjusted-subtrees t
-      org-todo-keyword-faces '(("WAITING" :foreground "#e15400" :weight bold)
-                              ("UNDERTAKEN" :foreground "magenta" :weight bold)
-                              ("MEETING" :foreground "#315e9a" :weight bold)))
-
-(add-hook 'org-agenda-mode-hook #'hl-line-mode)
-
+      org-yank-adjusted-subtrees t)
 \f
 ;; Time Clocking
 (org-clock-persistence-insinuate)
@@ -47,17 +43,16 @@
       org-clock-persist-query-resume nil
       org-clock-report-include-clocking-task t
       org-time-stamp-rounding-minutes '(1 1))
-
 \f
 ;; Agenda and capture
+(add-hook 'org-agenda-mode-hook #'hl-line-mode)
+
 (setq org-agenda-files (append '("~/org/")
                         (file-expand-wildcards "~/projects/*/"))
       org-refile-targets '((nil :maxlevel . 9)
                           (org-agenda-files :maxlevel . 9))
       org-refile-use-outline-path 'file
       org-refile-allow-creating-parent-nodes 'confirm
-      org-todo-keywords '((sequence "TODO(t)" "WAITING(w@)" "|" "DONE(d)" "BELAYED(b@)" "GIVEN(g@)")
-                         (sequence "MEETING(m)" "|" "MET(M)"))
       org-tag-alist '(("call" . ?c)
                      ("email" . ?e)
                      ("errand" . ?r)
@@ -66,6 +61,10 @@
                      ("meeting" . ?m)
                      ("open" . ?o))
       org-tags-exclude-from-inheritance '("open")
+      org-todo-keywords '((sequence "TODO(t)" "WAITING(w@)" "|" "DONE(d)" "BELAYED(b@)" "GIVEN(g@)")
+                         (sequence "MEETING(m)" "|" "MET(M)"))
+      org-todo-keyword-faces '(("WAITING" :foreground "#e85400" :weight bold)
+                              ("MEETING" :foreground "#315e9a" :weight bold))
       org-agenda-restore-windows-after-quit t
       org-agenda-start-on-weekday nil
       org-agenda-compact-blocks t
@@ -76,7 +75,7 @@
                             (600 700 800 900 1000 1100 1200 1300 1400 1500 1600 1700 1800 1900)
                             " ――――― "
                             "")
-      org-agenda-tags-column 80
+      org-agenda-tags-column 50
       org-agenda-skip-additional-timestamps-same-entry t
       org-agenda-skip-deadline-if-done t
       org-agenda-skip-scheduled-if-done t
@@ -96,8 +95,8 @@
                                   ("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-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:"))))))
       org-agenda-start-with-log-mode t
@@ -121,8 +120,10 @@
                               "* %^{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
+                              :clock-resume t)))
+\f
+;;; IDs
+(setq org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id
       org-id-method 'ts
       org-clone-delete-id t
       org-attach-id-to-path-function-list '(org-attach-id-ts-folder-format