summary refs log tree commit diff
path: root/emacs/custom
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--emacs/custom/fcuny-org.el40
1 files changed, 28 insertions, 12 deletions
diff --git a/emacs/custom/fcuny-org.el b/emacs/custom/fcuny-org.el
index 95a77b5..abf4d2c 100644
--- a/emacs/custom/fcuny-org.el
+++ b/emacs/custom/fcuny-org.el
@@ -20,9 +20,15 @@
 (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-work-journal-file
+  (concat fcuny/org-directory "/journals/twitter.org"))
+
 (use-package htmlize
   :ensure t)
 
@@ -75,7 +81,10 @@
   (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-work-notes-file))
+                      ,fcuny/org-personal-journal-file
+                      ,fcuny/org-work-notes-file
+                      ,fcuny/org-work-journal-file
+                      ,fcuny/org-references-file))
 
   ;; refile
   (org-refile-use-cache nil)
@@ -124,36 +133,43 @@
            (("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: %U" ":END:"
+                          ":PROPERTIES:" ":CREATED: %T" ":END:"
                           "%?"))
               ("Note" :keys "n" :headline "Notes" :type entry
                :template ("* %^{Description}"
-                          ":PROPERTIES:" ":CREATED: %U" ":END:"
+                          ":PROPERTIES:" ":CREATED: %T" ":END:"
                           "%?"))
               ("Reading" :keys "r" :todo-state "TODO" :headline "Reading"
                :template ("* %{todo-state} %^{Description}"
-                          ":PROPERTIES:" ":CREATED: %U" ":END:"
+                          ":PROPERTIES:" ":CREATED: %T" ":END:"
                           "%?"))
               ("Journal" :keys "j" :type entry :datetree t :tree-type week
-               :template ("* %^{Description}"
-                          ":PROPERTIES:" ":CREATED: %U" ":END:"
+               :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: %U" ":END:"
+                          ":PROPERTIES:" ":CREATED: %T" ":END:"
                           "%?"))
               ("Note" :keys "n" :headline "Notes" :type entry
                :template ("* %^{Description}"
-                          ":PROPERTIES:" ":CREATED: %U" ":END:"
+                          ":PROPERTIES:" ":CREATED: %T" ":END:"
                           "%?"))
               ("Reading" :keys "r" :todo-state "TODO" :headline "Reading"
                :template ("* %{todo-state} %^{Description}"
-                          ":PROPERTIES:" ":CREATED: %U" ":END:"
+                          ":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 week
-               :template ("* meeting: %^{Description}"
-                          ":PROPERTIES:" ":CREATED: %U" ":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:"
                           "%?")))))))))
 
 (provide 'fcuny-org)