TODO state tweaks

1 files changed, 28 insertions, 12 deletions

diff --git a/init.el b/init.el
index f084493..d0028c9 100644
--- a/init.el
+++ b/init.el
@@ -921,6 +921,7 @@
   (ss-crm-report-buffer "CRM by location" :location))
 
 (dolist (hook '(text-mode-hook org-mode-hook))
+  (add-hook hook 'visual-line-mode)
   (add-hook hook #'ss-crm-enable-capf)
   (add-hook hook #'ss-crm-install-abbrevs))
 
@@ -952,9 +953,24 @@
         org-agenda-window-setup 'only-window
         org-startup-folded 'overview
         org-cycle-hide-drawer-startup t
+        
+        org-log-done 'time
+        org-log-into-drawer "LOGBOOK"
         org-drawers '("PROPERTIES" "LOGBOOK")
+        
         org-todo-keywords
-        '((sequence "TODO" "CLARIFY" "|" "DONE(d!)"))
+        '((sequence "TODO(t)" "IN-PROGRESS(i@/!)" "WAIT(w@/!)" "|" "DONE(d@)")
+          (sequence "CLARIFY(c@)" "WAIT(w@/!)" "|" "ANSWERED(a@)"))
+
+        org-todo-keyword-faces
+        '(
+          ("TODO" . (:foreground "GoldenRod" :weight bold))
+          ("CLARIFY" . (:foreground "DeepPink" :weight bold))
+          ("IN-PROGRESS" . (:foreground "Cyan" :weight bold))
+          ("WAIT" . (:foreground "Red" :weight bold))
+          ("DONE" . (:foreground "LimeGreen" :weight bold))
+          ("ANSWERED" . (:foreground "LimeGreen" :weight bold)))
+        
         org-use-speed-commands t
         org-refile-use-outline-path 'file
         org-outline-path-complete-in-steps nil
@@ -962,8 +978,8 @@
         org-id-link-to-org-use-id nil
         org-special-ctrl-a/e t
         org-insert-heading-respect-content t
-        org-log-done 'time
-        org-log-into-drawer "LOGBOOK")
+        org-return-follows-link t
+        org-hide-emphasis-markers t)
 
   :config
   ;; Keep capture modal in the current window.
@@ -980,23 +996,23 @@
 (setq org-capture-templates
       `(("i" "Inbox" entry
          (file+headline ,org-default-notes-file "Inbox")
-     "* %?\n:PROPERTIES:\n:CAPTURED: %U\n:END:\n%a\n")
-
+         "* %?\n:PROPERTIES:\n:CAPTURED: %U\n:END:\n%a\n")
+        
+        ("b" "Bookmark" entry
+         (file+headline ,org-default-notes-file "Bookmarks")
+         "* %?\n")
+        
         ("t" "Task" entry
          (file+headline ,org-default-notes-file "Tasks")
-     "* TODO %?\n:PROPERTIES:\n:CAPTURED: %U\n:END:\n%a\n")
+         "* TODO %?\n:PROPERTIES:\n:CAPTURED: %U\n:END:\n%a\n")
 
         ("q" "Question" entry
          (file+headline ,org-default-notes-file "Questions")
-     "* CLARIFY %?\n:PROPERTIES:\n:CAPTURED: %U\n:END:\n%a\n")
+         "* CLARIFY %?\n:PROPERTIES:\n:CAPTURED: %U\n:END:\n%a\n")
 
         ("m" "Meeting" entry
          (file+headline ,org-default-notes-file "Meetings")
-         "* %<%H:%M> %?\n<%<%Y-%m-%d %a %H:%M>>\n")
-
-        ("r" "Recurring" entry
-         (file+headline ,org-default-notes-file "Recurring")
-     "* TODO %?\n:PROPERTIES:\n:CAPTURED: %U\n:END:\nSCHEDULED: %^t\n")))
+         "* <%<%Y-%m-%d %a %H:%M>> %?\n")))
 
 ;; Load Custom state last so Customize values can override defaults above.
 (load custom-file t)