[emacs] merged a bunch of org-files together.

I'll rather have fewer files and rely on tagging to find what I'm
looking for.

1 files changed, 18 insertions, 19 deletions

diff --git a/emacs.d/custom/fcuny-org.el b/emacs.d/custom/fcuny-org.el
index 80ff216..d09f381 100644
--- a/emacs.d/custom/fcuny-org.el
+++ b/emacs.d/custom/fcuny-org.el
@@ -55,12 +55,9 @@
   (org-enforce-todo-dependencies t)
 
   ;; list of files to use for the agenda
-  (org-agenda-files (list (expand-file-name "personal/tasks.org" org-directory)
-                          (expand-file-name "personal/projects.org" org-directory)
-                          (expand-file-name "twitter/tasks.org" org-directory)
-                          (expand-file-name "twitter/projects.org" org-directory)
-                          (expand-file-name "twitter/people.org" org-directory)
-                          (expand-file-name "twitter/meetings.org" org-directory)))
+  (org-agenda-files (list (expand-file-name "tasks.org" org-directory)
+                          (expand-file-name "projects.org" org-directory)
+                          (expand-file-name "tw-journal.org" org-directory)))
 
   (org-export-with-toc nil)
   (org-export-with-section-numbers nil)
@@ -102,28 +99,33 @@
      ("q" "Quotes" entry
       (file+headline ,(concat org-directory "/notes.org") "Quote")
       "* %^{TITLE}\n:PROPERTIES:\n:Created: %U\n:Page: %^{page}\n:END:\n%?")
+     ("d" "Debug" entry
+      (file+headline ,(concat org-directory "/notes.org") "Debug")
+      "* %^{TITLE}\n:PROPERTIES:\n:Created: %U\n:END:\n%?")
 
      ;; templates for personal things only.
      ("j" "Personal Journal" entry
-      (file+olp+datetree ,(concat org-directory "/personal/journal.org"))
+      (file+olp+datetree ,(concat org-directory "/journal.org"))
       "* %U %?\n"
       :tree-type week)
      ("w" "Weekly Review" entry
-      (file+olp+datetree ,(concat org-directory "/personal/reviews.org"))
+      (file+olp+datetree ,(concat org-directory "/journal.org"))
       (file ,(concat fcuny/path-emacs-etc "/weekly_review.org"))
       :tree-type week :jump-to-captured t)
 
      ;; templates for work related things only.
      ("J" "Work Journal" entry
-      (file+olp+datetree ,(concat org-directory "/twitter/journal.org"))
+      (file+olp+datetree ,(concat org-directory "/tw-journal.org"))
       "* %U %?\n"
       :tree-type week)
-     ("M" "Meeting" entry
-      (file+olp+datetree ,(concat org-directory "/twitter/meetings.org"))
-      "* %U %^{TITLE}\n%?")
+     ("m" "Meeting" entry
+      (file+olp+datetree ,(concat org-directory "/tw-journal.org"))
+      "* %U %^{TITLE}\n%?"
+      :tree-type week)
      ("I" "Interview" entry
-      (file+headline ,(concat org-directory "/twitter/people.org") "Interview")
-      (file ,(concat fcuny/path-emacs-etc "/interview.org")))
+      (file+olp+datetree ,(concat org-directory "/tw-journal.org"))
+      (file ,(concat fcuny/path-emacs-etc "/interview.org"))
+      :tree-type week)
 
      ;; refile!
      ("p" "New Project" entry
@@ -131,13 +133,10 @@
       (file ,(concat fcuny/path-emacs-etc "/new-project.org")))
      ("t" "Todo" entry
       (file+headline ,(concat org-directory "/inbox.org") "Task")
-      "* TODO [#4] %?\n:PROPERTIES:\n:Created: %U\n:END:")
+      "* TODO [#4] %? %^G\n:PROPERTIES:\n:Created: %U\n:END:")
      ("i" "Inbox, refile later" entry
       (file+headline ,(concat org-directory "/inbox.org") "Review")
-      "* %?\n:PROPERTIES:\n:Created: %U\n:END:")
-     ("m" "Meeting (inbox)" entry
-      (file ,(concat org-directory "/inbox.org"))
-      "* %U %^{TITLE}\n%?"))))
+      "* %?\n:PROPERTIES:\n:Created: %U\n:END:"))))
 
 (use-package htmlize
   :ensure t)