diff options
| -rw-r--r-- | emacs/custom/fcuny-org.el | 101 |
1 files changed, 32 insertions, 69 deletions
diff --git a/emacs/custom/fcuny-org.el b/emacs/custom/fcuny-org.el index 64f66e3..0d07ac2 100644 --- a/emacs/custom/fcuny-org.el +++ b/emacs/custom/fcuny-org.el @@ -3,31 +3,28 @@ (use-package org-ml :ensure t) -(use-package doct - :ensure t) - (require 'fcuny-vars) (defvar fcuny/org-directory - (expand-file-name "~/workspace/notebooks")) + ;; if we're on a macOS machine, we're using a work machine, so we + ;; store the notes inside a directory in the workspace. In other + ;; cases, we store them in ~/documents/notes which is backed up by + ;; syncthing. + (if (memq window-system '(mac ns)) + (expand-file-name "~/workspace/notebooks")) + (expand-file-name "~/documents/notes")) -(defvar fcuny/org-inbox-file - (concat fcuny/org-directory "/inbox.org")) +(defvar fcuny/org-tasks-file + (concat fcuny/org-directory "/tasks.org")) (defvar fcuny/org-references-file (concat fcuny/org-directory "/references.org")) -(defvar fcuny/org-personal-notes-file - (concat fcuny/org-directory "/personal.org")) - -(defvar fcuny/org-personal-journal-file - (concat fcuny/org-directory "/journals/personal.org")) - -(defvar fcuny/org-work-notes-file - (concat fcuny/org-directory "/twitter.org")) +(defvar fcuny/org-notes-file + (concat fcuny/org-directory "/notes.org")) -(defvar fcuny/org-work-journal-file - (concat fcuny/org-directory "/journals/twitter.org")) +(defvar fcuny/org-journal-file + (concat fcuny/org-directory "/journal.org")) (use-package htmlize :ensure t) @@ -82,22 +79,20 @@ ;; priorities (org-priority-start-cycle-with-default nil) ;; Start one over/under default value. - (org-highest-priority ?1) - (org-lowest-priority ?4) - (org-default-priority ?3) ;; Ensures unset tasks have low priority. + (org-highest-priority ?A) + (org-lowest-priority ?D) + (org-default-priority ?C) ;; Ensures unset tasks have low priority. ;; agenda related (calendar-week-start-day 1) ;; org-mode uses calendar for the date picker, and I want this to start on Monday (org-agenda-start-on-weekday 1) ;; this is specific to org-agenda - (org-agenda-files `(,fcuny/org-personal-notes-file - ,fcuny/org-personal-journal-file - ,fcuny/org-work-notes-file - ,fcuny/org-work-journal-file - ,fcuny/org-references-file)) + (org-agenda-files `(,fcuny/org-notes-file + ,fcuny/org-tasks-file + ,fcuny/org-journal-file)) ;; refile (org-refile-use-cache nil) - (org-refile-targets '((org-agenda-files . (:maxlevel . 6)))) + (org-refile-targets '((org-agenda-files . (:maxlevel . 3)))) (org-refile-use-outline-path 'file) (org-outline-path-complete-in-steps nil) (org-refile-allow-creating-parent-nodes 'confirm) @@ -139,51 +134,19 @@ (use-package org-capture :ensure nil - :after (org doct) + :after (org) :custom (org-capture-templates - (doct `(:group - :children - (("Personal" :keys "p" :file fcuny/org-personal-notes-file :clock-in t :clock-resume t :children - (("Task" :keys "t" :todo-state "TODO" :headline "Tasks" - :template ("* %{todo-state} [#3] %^{Description}" - ":PROPERTIES:" ":CREATED: %T" ":END:" - "%?")) - ("Note" :keys "n" :headline "Notes" :type entry - :template ("* %^{Description}" - ":PROPERTIES:" ":CREATED: %T" ":END:" - "%?")) - ("Reading" :keys "r" :todo-state "TODO" :headline "Reading" - :template ("* %{todo-state} %^{Description}" - ":PROPERTIES:" ":CREATED: %T" ":END:" - "%?")) - ("Journal" :keys "j" :type entry :datetree t :tree-type week - :file fcuny/org-personal-journal-file - :template ("* journal" - ":PROPERTIES:" ":CREATED: %T" ":END:" - "%?")))) - ("Work" :keys "w" :file fcuny/org-work-notes-file :clock-in t :clock-resume t :children - (("Tasks" :keys "t" :todo-state "TODO" :headline "Tasks" - :template ("* %{todo-state} [#3] %^{Description}" - ":PROPERTIES:" ":CREATED: %T" ":END:" - "%?")) - ("Note" :keys "n" :headline "Notes" :type entry - :template ("* %^{Description}" - ":PROPERTIES:" ":CREATED: %T" ":END:" - "%?")) - ("Reading" :keys "r" :todo-state "TODO" :headline "Reading" - :template ("* %{todo-state} %^{Description}" - ":PROPERTIES:" ":CREATED: %T" ":END:" - "%?")) - ("Journal" :keys "j" :type entry :datetree t :tree-type month - :file fcuny/org-work-journal-file - :template ("* %U journal" - ":PROPERTIES:" ":CREATED: %T" ":END:" - "%?")) - ("Meeting" :keys "m" :type entry :datetree t :tree-type month - :file fcuny/org-work-journal-file - :template ("* %U meeting: %^{Description}" - ":PROPERTIES:" ":CREATED: %T" ":END:" - "%?"))))))))) + `(("t" "Todo [inbox]" entry + (file+headline ,fcuny/org-tasks-file "Tasks") + "* TODO [#D] %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n") + + ("n" "Note" entry + (file ,fcuny/org-notes-file) + "* NOTE %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n") + + ("j" "Journal" entry + (file+olp+datetree ,fcuny/org-journal-file) + "* %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n" :tree-type month)))) (provide 'fcuny-org) |