Tweaks for GTD

diff --git a/re/re-org.el b/re/re-org.el
index daf61c16c469486457c07fb73154a75dada2dc97..bff0a26b128d432c973034ab6523275c39fdf1dd 100644 (file)
--- a/re/re-org.el
+++ b/re/re-org.el
@@ -34,54 +34,18 @@
       '((file . find-file)))
 
 (setq org-directory "~/org"
-      org-agenda-files (mapcar 'file-truename (file-expand-wildcards "~/org/*.org"))
-      ;; org-default-notes-file "~/org/refile.org"
-      ;; org-journal-file "~/org/journal.org"
-      )
+      org-agenda-files (mapcar 'file-truename (file-expand-wildcards "~/org/*.org")))
 
 (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)" "NEXT(n)" "HOLD(h)" "|" "DONE(d)")))
-
-(defun log-todo-next-creation-date (&rest ignore)
-  "Log NEXT creation time in the property drawer under the key 'ACTIVATED'"
-  (when (and (string= (org-get-todo-state) "NEXT")
-            (not (org-entry-get nil "ACTIVATED")))
-    (org-entry-put nil "ACTIVATED" (format-time-string "[%Y-%m-%d]"))))
-
-(add-hook 'org-after-todo-state-change-hook #'log-todo-next-creation-date)
-
-;; (setq org-todo-keywords '((sequence "TODO(t)"
-;;                                 "WAITING(w@/!)"
-;;                                 "IN-PROGRESS(i!)"
-;;                                 "ORDERED(o!)"
-;;                                 "QUOTED(q!)"
-;;                                 "|"
-;;                                 "RECEIVED(r!/@)"
-;;                                 "DELEGATED(l@)"
-;;                                 "DONE(d!/@)"
-;;                                 "CANCELLED(c@)")))
-
-;; (setq org-tag-alist '((:startgroup . nil)
-;;                   ("licenses" . ?l)
-;;                   ("need" . ?n)
-;;                   ("standard" . ?s)
-;;                   ("wisdom" . ?w)
-;;                   (:endgroup . nil)))
+(setq org-todo-keywords '((sequence "TODO(t)" "NEXT(n!)" "HOLD(h!)" "|" "DONE(d)" "CANCELLED(c)" "DELEGATED(l)")))
 
 (setq org-agenda-restore-windows-after-quit t
-      org-agenda-start-on-weekday 0
-      org-agenda-span 10
-      org-deadline-warning-days 30
+      org-agenda-start-on-weekday nil
       org-agenda-window-setup 'current-window
       org-agenda-remove-tags t)
-;; org-agenda-prefix-format '((agenda . " %:c %b %?-12t% s")
-;;                              (todo . " %:c % b")
-;;                              (tags . " %:c % b")
-;;                              (search . " %:c % b")))
 
 (setq org-agenda-custom-commands
       '(("g" "Get Things Done (GTD)"
@@ -99,84 +63,27 @@
                   (org-agenda-format-date "")
                   (org-deadline-warning-days 7)
                   (org-agenda-skip-function
-                   '(org-agenda-skip-entry-if 'notregexp "\\* NEXT"))
-                  (org-agenda-overriding-header "\nDeadlines")))
-         (tags-todo "inbox"
-                    ((org-agenda-prefix-format "  %?-12t% s")
-                     (org-agenda-overriding-header "\nInbox\n")))
+                   '(org-agenda-skip-entry-if 'regexp "\\* DONE"))
+                  (org-agenda-overriding-header "\nDeadlines\n")))
+         (tags "inbox"
+               ((org-agenda-prefix-format "  %?-12t% s")
+                (org-agenda-overriding-header "\nInbox\n")))
          (tags "CLOSED>=\"<today>\""
-               ((org-agenda-overriding-header "\nCompleted today\n")))))
-       (" " "Agenda"
-        ((tags "need"
-               ((org-agenda-overriding-header "Needed Items")))
-         (tags-todo "-REFILE+TODO=\"IN-PROGRESS\""
-                    ((org-agenda-overriding-header "In Progress")))
-         (tags "REFILE"
-               ((org-agenda-overriding-header "Tasks to Refile")))
-         (tags-todo "-TODO=\"WAITING\"-TODO=\"IN-PROGRESS\"-standard-REFILE"
-                    ((org-agenda-overriding-header "Filed Tasks")))
-         (tags-todo "TODO=\"WAITING\"-REFILE"
-                    ((org-agenda-overriding-header "Holding")))
-         (tags-todo "standard"
-                    ((org-agenda-overriding-header "Changes to Standard")))))))
-
-(setq org-columns-default-format "%50ITEM(Task) %10CLOCKSUM %16TIMESTAMP_IA"
-      org-agenda-start-with-log-mode t)
+               ((org-agenda-overriding-header "\nCompleted today\n")))))))
+
+(setq  org-agenda-start-with-log-mode t
+       org-log-done 'time)
 
 (setq org-capture-templates
       `(("i" "Inbox" entry  (file "inbox.org")
-        ,(concat "* TODO %?\n"
+        ,(concat "* %?\n"
                  "/Entered on/ %U"))
        ("m" "Meeting" entry  (file+headline "agenda.org" "Future")
         ,(concat "* %? :meeting:\n"
                  "<%<%Y-%m-%d %a %H:00>>"))
        ("n" "Note" entry  (file "notes.org")
         ,(concat "* Note (%a)\n"
-                 "/Entered on/ %U\n" "\n" "%?"))
-       ("@" "Inbox [mu4e]" entry (file "inbox.org")
-        ,(concat "* TODO Reply to \"%a\" %?\n"
-                 "/Entered on/ %U"))))
-
-;; (setq org-capture-templates '(("n"
-;;                            "Note"
-;;                            entry
-;;                            (file org-default-notes-file)
-;;                            "* %?\n%T")
-;;                           ("t"
-;;                            "TODO"
-;;                            entry
-;;                            (file org-default-notes-file)
-;;                            "* TODO %?\n%t\n")
-;;                           ("f"
-;;                            "TODO in Future"
-;;                            entry
-;;                            (file org-default-notes-file)
-;;                            "* TODO %?\nSCHEDULED: %^t\n")
-;;                           ("d"
-;;                            "TODO with Deadline"
-;;                            entry
-;;                            (file org-default-notes-file)
-;;                            "* TODO %?\nDEADLINE: %^t\n")
-;;                           ("l"
-;;                            "Purchase Licenses"
-;;                            entry
-;;                            (file org-default-notes-file)
-;;                            "* TODO Get Licenses :licenses:\nDEADLINE: %^t\n- [ ] HMI\n- [ ] IO Server\n")
-;;                           ("m"
-;;                            "Meeting"
-;;                            entry
-;;                            (file+olp+datetree org-journal-file)
-;;                            "* %? :meeting:\n%^T\n** Notes\n** Action Items")
-;;                           ("s"
-;;                            "Semi-Weekly PLC Meeting"
-;;                            entry
-;;                            (file+olp+datetree org-journal-file)
-;;                            "* Semi-Weekly PLC Meeting :plc:semiweekly:meeting:%^g \n%t\n** ITEM1")
-;;                           ("j"
-;;                            "Journal"
-;;                            entry
-;;                            (file+olp+datetree org-journal-file)
-;;                            "* %?\n%T\n")))
+                 "/Entered on/ %U\n" "\n" "%?"))))
 
 (setq org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id
       org-id-method 'ts