Better org capture templates

diff --git a/re/re-org.el b/re/re-org.el
index f7f75e94856682143076ea80f2a180043c398e68..1de46d6ae464c5e2714f04505e911e95f88d39e1 100644 (file)
--- a/re/re-org.el
+++ b/re/re-org.el
@@ -87,49 +87,68 @@
 (setq org-columns-default-format "%50ITEM(Task) %10CLOCKSUM %16TIMESTAMP_IA"
       org-agenda-start-with-log-mode t)
 
-(setq org-capture-templates '(("n" "Note" entry
+(setq org-capture-templates '(("n"
+                              "Note"
+                              entry
                               (file org-default-notes-file)
-                              "* %?"
-                              :clock-in t
-                              :clock-resume t)
-                             ("t" "TODO" entry
+                              "* %?\n%T")
+                             ("t"
+                              "TODO"
+                              entry
                               (file org-default-notes-file)
-                              "* TODO %?\n%U\n"
-                              :clock-in t
-                              :clock-resume t)
-                             ("l" "Purchase Licenses" entry
+                              "* TODO %?\n%t\n")
+                             ("f"
+                              "TODO in Future"
+                              entry
                               (file org-default-notes-file)
-                              "* TODO Get Licenses :licenses:\n%U\n** TODO Wonderware\n** TODO TOPServer\n"
-                              :clock-in t
-                              :clock-resume t)
-                             ("m" "Meeting" entry
+                              "* 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"
-                              :time-prompt t)
-                             ("s" "Semi-Weekly PLC Meeting" entry
+                              "* %? :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"
-                              :clock-in t
-                              :clock-resume t)
-                             ("j" "Journal" entry
+                              "* Semi-Weekly PLC Meeting :plc:semiweekly:meeting:%^g \n%t\n** ITEM1")
+                             ("j"
+                              "Journal"
+                              entry
                               (file+olp+datetree org-journal-file)
-                              "* %?\n%U\n")))
+                              "* %?\n%T\n")))
 
 (setq org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id
       org-id-method 'ts
       org-attach-id-to-path-function-list '(org-attach-id-ts-folder-format
                                            org-attach-id-uuid-folder-format))
-(add-hook 'org-mode-hook (lambda ()
-(keymap-set org-mode-map "M-<right>" #'org-shiftmetaright)
-(keymap-set org-mode-map "M-<left>" #'org-shiftmetaleft)
-(keymap-set org-mode-map "M-S-<right>" #'org-metaright)
-(keymap-set org-mode-map "M-S-<left>" #'org-metaleft)
-(keymap-set org-mode-map "C-M-u" #'org-up-element)
-(keymap-set org-mode-map "C-M-d" #'org-down-element)
-(keymap-set org-mode-map "C-M-b" #'org-backward-heading-same-level)
-(keymap-set org-mode-map "C-M-f" #'org-forward-heading-same-level)
-(keymap-set org-mode-map "C-M-p" #'org-previous-visible-heading)
-(keymap-set org-mode-map "C-M-n" #'org-next-visible-heading)))
+
+(add-hook 'org-mode-hook
+         (lambda ()
+           (keymap-set org-mode-map "M-<right>" #'org-shiftmetaright)
+           (keymap-set org-mode-map "M-<left>" #'org-shiftmetaleft)
+           (keymap-set org-mode-map "M-S-<right>" #'org-metaright)
+           (keymap-set org-mode-map "M-S-<left>" #'org-metaleft)
+           (keymap-set org-mode-map "C-M-u" #'org-up-element)
+           (keymap-set org-mode-map "C-M-d" #'org-down-element)
+           (keymap-set org-mode-map
+                       "C-M-b"
+                       #'org-backward-heading-same-level)
+           (keymap-set org-mode-map
+                       "C-M-f"
+                       #'org-forward-heading-same-level)
+           (keymap-set org-mode-map "C-M-p" #'org-previous-visible-heading)
+           (keymap-set org-mode-map "C-M-n" #'org-next-visible-heading)))
 
 (provide 're-org)
 ;;; re-org.el ends here