Add back in features as needed

diff --git a/config.org b/config.org
index fd2aff5623af7c1023de47431974127606aa5a7b..3d303ad08c8ad45d4a7acdbcdf69eee19f33c7f5 100644 (file)
--- a/config.org
+++ b/config.org
@@ -201,31 +201,29 @@ Sly really doesn't play well with elodc in the minibuffer, so here are some sett
 (setq org-M-RET-may-split-line nil\r
       org-cycle-inline-images-display t\r
       org-cycle-separator-lines -1\r
-      org-ellipsis "↴"\r
+      ;; org-ellipsis "↴"\r
+      org-ellipsis "->"\r
       org-enforce-todo-checkbox-dependencies t\r
       org-enforce-todo-dependencies t\r
-      org-fold-catch-invisible-edits 'show-and-error\r
+      org-goto-interface 'outline-path-completion\r
+      org-outline-path-complete-in-steps nil\r
+      org-src-fontify-natively nil\r
       org-return-follows-link t\r
       org-reverse-note-order t\r
       org-special-ctrl-a/e t\r
       org-special-ctrl-k t\r
+      org-src-preserve-indentation t\r
       org-startup-folded 'fold\r
       org-tags-column 0\r
       org-yank-adjusted-subtrees t\r
-      org-refile-targets '((nil :maxlevel . 9)\r
-                          (org-agenda-files :maxlevel . 9))\r
       org-refile-use-outline-path 'file\r
       org-refile-allow-creating-parent-nodes 'confirm)\r
 #+END_SRC\r
-**** Testing without these options\r
+**** Testing without these setq options\r
 #+BEGIN_SRC emacs-lisp :tangle no\r
       org-fontify-done-headline nil\r
       org-goto-auto-isearch nil\r
-      org-goto-interface 'outline-path-completion\r
       org-list-allow-alphabetical t\r
-      org-outline-path-complete-in-steps nil\r
-      org-src-fontify-natively nil\r
-      org-src-preserve-indentation t\r
       org-src-window-setup 'current-window)\r
 #+END_SRC\r
 *** Time Clocking\r
@@ -240,15 +238,23 @@ Sly really doesn't play well with elodc in the minibuffer, so here are some sett
 *** Agenda and Capture\r
 **** Agenda settings\r
 #+BEGIN_SRC emacs-lisp\r
-(setq org-agenda-files (append '("~/org/")\r
+  (setq org-agenda-files (append '("~/org/")\r
                               (file-expand-wildcards "~/projects/*/"))\r
-      org-todo-keywords '((sequence "TODO(t)" "WAITING(w@)" "|" "DONE(d)" "BELAYED(b@)" "GIVEN(g@)"))\r
-      org-todo-keyword-faces '(("WAITING" :foreground "#e85400" :weight bold)) ; alert orange\r
-      org-read-date-prefer-future 'time\r
-      org-log-done 'time\r
-      org-log-redeadline 'time\r
-      org-log-reschedule 'time\r
-      org-log-state-notes-insert-after-drawers t)\r
+       org-refile-targets '((nil :maxlevel . 9)\r
+                          (org-agenda-files :maxlevel . 9))\r
+       org-todo-keywords '((sequence "TODO(t)" "WAITING(w@)" "|" "DONE(d)" "BELAYED(b@)" "GIVEN(g@)"))\r
+       org-todo-keyword-faces '(("WAITING" :foreground "#e85400" :weight bold)) ; alert orange\r
+       org-agenda-prefix-format '((agenda . "          %?-12t%? s")\r
+                                (todo . " ")\r
+                                (tags . " ")\r
+                                (search . " "))\r
+       org-agenda-start-on-weekday nil\r
+       org-read-date-prefer-future 'time\r
+       org-log-done 'time\r
+       org-log-redeadline 'time\r
+       org-log-reschedule 'time\r
+       org-log-state-notes-insert-after-drawers t\r
+       org-agenda-window-setup 'current-window)\r
 #+END_SRC\r
 ***** Testing without these options\r
 #+BEGIN_SRC emacs-lisp :tangle no\r
@@ -262,61 +268,51 @@ Sly really doesn't play well with elodc in the minibuffer, so here are some sett
                      ("errand" . ?e)\r
                      ("vps" . ?v)\r
                      (:endgroup))\r
-      org-agenda-start-on-weekday nil\r
       org-agenda-span 'day\r
-      org-agenda-window-setup 'current-window\r
       org-agenda-restore-windows-after-quit t\r
       org-agenda-time-grid '((daily today require-timed)\r
                             (800 1000 1200 1400 1600 1800 2000)\r
                             " -----"\r
                             "")\r
-      org-agenda-prefix-format '((agenda . " %?-12t% s")\r
-                                (todo . " ")\r
-                                (tags . " ")\r
-                                (search . " "))\r
       org-agenda-scheduled-leaders '("Booked: " "Booked %dd. ago: ")\r
       org-agenda-deadline-leaders '("Deadline: " "In %dd.: " "Died %dd. ago: ")\r
       org-agenda-start-with-log-mode t\r
       org-agenda-log-mode-items '(closed clock state))\r
 #+END_SRC\r
 **** Custom Agendas\r
-#+BEGIN_SRC emacs-lisp :tangle no\r
-(defvar *re/org-agenda-inbox*\r
-  '(tags "CATEGORY=\"inbox\"" ((org-agenda-overriding-header "INBOX:"))))\r
+#+BEGIN_SRC emacs-lisp\r
+  (defvar *re/org-agenda-inbox*\r
+    '(tags "CATEGORY=\"inbox\"" ((org-agenda-overriding-header ""))))\r
 \r
-(defvar *re/org-agenda-todo*\r
-  '(tags-todo "-recurring/TODO" ((org-agenda-overriding-header "NEXT:"))))\r
+  (defvar *re/org-agenda-todo*\r
+    '(tags-todo "-recurring/TODO" ((org-agenda-overriding-header ""))))\r
 \r
-(defvar *re/org-agenda-undertakings*\r
-  '(tags "CATEGORY=\"undertakings\"" ((org-agenda-skip-function\r
-                                      '(org-agenda-skip-entry-if 'notregexp "^\\* "))\r
-                                     (org-agenda-overriding-header "UNDERTAKIŊS:"))))\r
+  (defvar *re/org-agenda-undertakings*\r
+    '(tags "CATEGORY=\"undertakings\"" ((org-agenda-skip-function\r
+                              '(org-agenda-skip-entry-if 'notregexp "^\\* "))\r
+                             (org-agenda-overriding-header ""))))\r
 \r
-(defvar *re/org-agenda-waiting*\r
-  '(todo "WAITING" ((org-agenda-overriding-header "WAITIŊ:"))))\r
+  (defvar *re/org-agenda-waiting*\r
+    '(todo "WAITING" ((org-agenda-overriding-header ""))))\r
 \r
-(setq org-agenda-custom-commands `(("i" "Inbox" ,@*re/org-agenda-inbox*)\r
-                                  ("n" "Next Actions" ,@*re/org-agenda-todo*)\r
-                                  ("u" "Undertakings" ,@*re/org-agenda-undertakings*)\r
-                                  ("w" "Waiting" ,@*re/org-agenda-waiting*)\r
-                                  ("o" "Overview" (,*re/org-agenda-inbox*\r
-                                                   ,,*re/org-agenda-todo*\r
-                                                   ,,*re/org-agenda-waiting*\r
-                                                   ,,*re/org-agenda-undertakings*))))\r
+  (setq org-agenda-custom-commands `(("i" "Inbox" ,@*re/org-agenda-inbox*)\r
+                                          ("n" "Next Actions" ,@*re/org-agenda-todo*)\r
+                                          ("u" "Undertakings" ,@*re/org-agenda-undertakings*)\r
+                                          ("w" "Waiting" ,@*re/org-agenda-waiting*)))\r
 #+END_SRC\r
 **** Capture Templates\r
-#+BEGIN_SRC emacs-lisp :tangle no\r
-(setq org-capture-templates '(("i" "Inbox" entry\r
+#+BEGIN_SRC emacs-lisp\r
+  (setq org-capture-templates '(("i" "Inbox" entry\r
                               (file "inbox.org")\r
                               "* %^{Description}\n%U\n%?"\r
                               :prepend t)\r
                              ("n" "Next Action" entry\r
                               (file "next.org")\r
-                              "* TODO %^{Description}\n%U\n%?"\r
+                              "* TODO %^{Description}\nTaken: %T\n%?"\r
                               :prepend t)\r
                              ("u" "Undertaking" entry\r
                               (file "undertakings.org")\r
-                              "* %^{Description} [/]\n%U\n%?"\r
+                              "* %^{Description} [/]\nTaken: %T\n%?"\r
                               :prepend t)\r
                              ("m" "Meeting" entry\r
                               (file "meetings.org")\r
@@ -324,7 +320,7 @@ Sly really doesn't play well with elodc in the minibuffer, so here are some sett
                               :prepend t)\r
                              ("p" "Phone Call" entry\r
                               (file "inbox.org")\r
-                              "* %^{Description} :call:\n%U\n%?"\r
+                              "* %^{Description} :call:\n%T\n%?"\r
                               :prepend t)\r
                              ("t" "Note" entry\r
                               (file "notes.org")\r
@@ -429,7 +425,6 @@ Libraries Not from the package manager
 (dolist (file '(eng-paper-theme sedit-mouse))\r
   (require file))\r
 #+END_SRC\r
-\r
 * UNIX/vi-like bindings\r
 =C-h=, =C-w=, =C-u=, et. al to work as I expect (like acme).  Some functions get re-bound when these take over a default.\r
 #+BEGIN_SRC emacs-lisp\r