From f8c2d0b441a9c03260a0e77b6a685ed703e948ae Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sat, 3 Nov 2018 11:37:31 +0100 Subject: [PATCH] [Org] Move org-capture configuration to init.el --- init.el | 104 ++++++++++++++++++++++++++++++++++++++++++-- site-lisp/db-org.el | 94 --------------------------------------- 2 files changed, 101 insertions(+), 97 deletions(-) diff --git a/init.el b/init.el index 00931e6..08138a4 100644 --- a/init.el +++ b/init.el @@ -659,11 +659,13 @@ _h_ _l_ _o_k _y_ank db/org-agenda-skip-tag db/cmp-date-property hydra-org-agenda-view/body - org-babel-execute:hy)) + org-babel-execute:hy + db/org-timestamp-difference + db/read-clockline + db/org-capture-code-snippet)) (use-package org - :commands (org-capture - org-store-link + :commands (org-store-link hydra-org-clock/body) :bind (:map org-mode-map ([remap org-return] . org-return-indent)) @@ -1030,6 +1032,102 @@ _h_ _l_ _o_k _y_ank (add-hook 'org-agenda-mode-hook #'hl-line-mode 'append))) +;; Capturing + +(use-package org-capture + :commands (org-capture) + :init (setq org-capture-use-agenda-date nil + org-capture-templates + `(("t" "Todo" + entry + (file db/org-default-refile-file) + ,(concat "* TODO %^{What}\n" + "SCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"+0d\"))\n" + ":PROPERTIES:\n:CREATED: %U\n:END:\n" + "%?")) + ("n" "Note" + entry + (file db/org-default-refile-file) + "* %^{About} :NOTE:\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%?" + :clock-in t :clock-resume t) + ("d" "Date" + entry + (file db/org-default-refile-file) + "* GOTO %^{What} :DATE:\n%^{When}t\n%a%?") + ("i" "Interruptions") + ("in" "Interruption now" + entry + (file db/org-default-refile-file) + "* DONE %^{What}\n\n%?" + :clock-in t :clock-resume t) + ("ip" "Interruption previously" ; bad English vs mnemonics + entry + (file db/org-default-refile-file) + ,(concat "* DONE %^{What}\n" + ":LOGBOOK:\n" + "%(db/read-clockline)\n" ; evaluated before above prompt? + ":END:\n" + "%?")) + ("j" "journal entry" + plain + (file+datetree db/org-default-pensieve-file) + "\n%i%U\n\n%?\n") + ("r" "respond" + entry + (file db/org-default-refile-file) + ,(concat "* TODO E-Mail: %:subject (%:from) :EMAIL:\n" + "SCHEDULED: %^{Reply when?}t\n" + ":PROPERTIES:\n:CREATED: %U\n:END:\n" + "\n%a") + :immediate-finish t) + ("R" "read" + entry + (file db/org-default-refile-file) + ,(concat "* READ %:subject :READ:\n" + ;; "DEADLINE: <%(org-read-date nil nil \"+1m\")>\n" + ":PROPERTIES:\n:CREATED: %U\n:END:\n" + "\n%a")) + ("U" "Read current content of clipboard" + entry + (file db/org-default-refile-file) + ,(concat "* READ %^{Description} :READ:\n" + ":PROPERTIES:\n:CREATED: %U\n:END:\n" + "\n%(current-kill 0)")) + ("m" "Meeting" + entry + (file db/org-default-refile-file) + ,(concat "* MEETING %^{What} :MEETING:\n" + ":PROPERTIES:\n:CREATED: %U\n:END:\n" + "\n%?") + :clock-in t :clock-resume t) + ("p" "Phone call" + entry + (file db/org-default-refile-file) + ,(concat "* PHONE %^{Calling} :PHONE:\n" + ":PROPERTIES:\n:CREATED: %U\n:END:\n" + "\n%?") + :clock-in t :clock-resume t) + ("w" "Weekly Summary" + entry + (file+datetree db/org-default-pensieve-file) + "* Weekly Review\n\n%?") + ("b" "Bookmark" + entry + (file+headline db/org-default-notes-file "Bookmarks") + ,(concat "* [[%^{Link}][%^{Caption}]]\n" + ":PROPERTIES:\n:CREATED: %U\n:END:\n\n") + :immediate-finish t) + ("s" "Code Snippet" + entry + (file db/org-default-refile-file) + "* %?\n%(db/org-capture-code-snippet \"%F\")"))) + :config (progn + ;; disable usage of helm for `org-capture' + (with-eval-after-load 'helm-mode + (defvar helm-completing-read-handlers-alist) ; for the byte compiler + (add-to-list 'helm-completing-read-handlers-alist + '(org-capture . nil))))) + ;; Babel (use-package ob-core diff --git a/site-lisp/db-org.el b/site-lisp/db-org.el index 43a77f6..54eb61a 100644 --- a/site-lisp/db-org.el +++ b/site-lisp/db-org.el @@ -181,95 +181,6 @@ _y_: ?y? year _q_: quit _L__l__c_: ?l? ;;; Capturing -;; disable usage of helm for `org-capture' -(with-eval-after-load 'helm-mode - (defvar helm-completing-read-handlers-alist) ; for the byte compiler - (add-to-list 'helm-completing-read-handlers-alist - '(org-capture . nil))) - -(setq org-capture-use-agenda-date nil) - -(setq org-capture-templates - `(("t" "Todo" - entry - (file db/org-default-refile-file) - ,(concat "* TODO %^{What}\n" - "SCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"+0d\"))\n" - ":PROPERTIES:\n:CREATED: %U\n:END:\n" - "%?")) - ("n" "Note" - entry - (file db/org-default-refile-file) - "* %^{About} :NOTE:\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%?" - :clock-in t :clock-resume t) - ("d" "Date" - entry - (file db/org-default-refile-file) - "* GOTO %^{What} :DATE:\n%^{When}t\n%a%?") - ("i" "Interruptions") - ("in" "Interruption now" - entry - (file db/org-default-refile-file) - "* DONE %^{What}\n\n%?" - :clock-in t :clock-resume t) - ("ip" "Interruption previously" ; bad English vs mnemonics - entry - (file db/org-default-refile-file) - ,(concat "* DONE %^{What}\n" - ":LOGBOOK:\n" - "%(db/read-clockline)\n" ; evaluated before above prompt? - ":END:\n" - "%?")) - ("j" "journal entry" - plain - (file+datetree db/org-default-pensieve-file) - "\n%i%U\n\n%?\n") - ("r" "respond" - entry - (file db/org-default-refile-file) - ,(concat "* TODO E-Mail: %:subject (%:from) :EMAIL:\n" - "SCHEDULED: %^{Reply when?}t\n" - ":PROPERTIES:\n:CREATED: %U\n:END:\n" - "\n%a") - :immediate-finish t) - ("R" "read" - entry - (file db/org-default-refile-file) - ,(concat "* READ %:subject :READ:\n" - ;; "DEADLINE: <%(org-read-date nil nil \"+1m\")>\n" - ":PROPERTIES:\n:CREATED: %U\n:END:\n" - "\n%a")) - ("U" "Read current content of clipboard" - entry - (file db/org-default-refile-file) - ,(concat "* READ %^{Description} :READ:\n" - ":PROPERTIES:\n:CREATED: %U\n:END:\n" - "\n%(current-kill 0)")) - ("m" "Meeting" - entry - (file db/org-default-refile-file) - ,(concat "* MEETING %^{What} :MEETING:\n" - ":PROPERTIES:\n:CREATED: %U\n:END:\n" - "\n%?") - :clock-in t :clock-resume t) - ("p" "Phone call" - entry - (file db/org-default-refile-file) - ,(concat "* PHONE %^{Calling} :PHONE:\n" - ":PROPERTIES:\n:CREATED: %U\n:END:\n" - "\n%?") - :clock-in t :clock-resume t) - ("w" "Weekly Summary" - entry - (file+datetree db/org-default-pensieve-file) - "* Weekly Review\n\n%?") - ("b" "Bookmark" - entry - (file+headline db/org-default-notes-file "Bookmarks") - ,(concat "* [[%^{Link}][%^{Caption}]]\n" - ":PROPERTIES:\n:CREATED: %U\n:END:\n\n") - :immediate-finish t))) - (defun db/org-timestamp-difference (stamp-1 stamp-2) "Returns time difference between two given org-mode timestamps." ;; Things copied from `org-clock-update-time-maybe’ @@ -324,11 +235,6 @@ In ~%s~: org-src-mode code-snippet)))) -(add-to-list 'org-capture-templates - '("s" "Code Snippet" entry (file db/org-default-refile-file) - "* %?\n%(db/org-capture-code-snippet \"%F\")") - t) - ;;; Refiling