Nice update to mostly org stuff

1 files changed, 21 insertions, 22 deletions

diff --git a/doom.d/config.el b/doom.d/config.el
index f3d677a..b9120d7 100644
--- a/doom.d/config.el
+++ b/doom.d/config.el
@@ -44,13 +44,16 @@
 ;; If you use `org' and don't want your org files in the default location below,
 ;; change `org-directory'. It must be set before org loads!
 ;;
+
 ;; Basic agenda stuff
 
 (after! org
                 (setq org-directory "~/org/")
+                (setq org-deadline-warning-days 4)
                 (setq org-clock-persist 'history)
                 (org-clock-persistence-insinuate)
-                (setq org-agenda-span 'day)
+                (setq org-agenda-span 'week)
+                (setq org-agenda-start-day "today")
                 (setq org-directory "~/org")
                 (setq org-agenda-files (quote ("~/org/home.org"
                 "~/org/projects.org"
@@ -67,14 +70,14 @@
                 (setq org-log-done 'time)
                 (setq org-log-done-with-time 'note)
                 (setq diary-file "~/org/diary")
-                (setq org-agenda-include-diary t)
+                (setq org-agenda-include-diary nil)
                 (setq org-agenda-diary-file "~/org/calendar/cal.org")
                 (setq org-agenda-show-future-repeats t)
                 (setq org-agenda-skip-deadline-if-done t)
                 (setq org-agenda-skip-scheduled-if-done t)
                 (setq org-reverse-note-order t)
                 (setq org-habit-graph-column 45)
-                (setq org-sort-agenda-notime-is-late nil)
+                (setq org-agenda-sort-notime-is-late nil)
                 (setq org-columns-default-format "%50ITEM(Task) %10CLOCKSUM %25TIMESTAMP_IA")
                 (setq org-archive-location "~/org/archive.org::* From %s")
                 (setq org-refile-targets (quote ((nil :maxlevel . 9)
@@ -149,10 +152,10 @@
                 ;; org capture templates
                 (setq org-capture-templates
                       (quote (("h" "Home Tasks & Notes")
-                              ("ht" "Home TODO" entry (file+headline "~/org/home.org" "Single Actions")
+                              ("ht" "Home TODO" entry (file+headline "~/org/home.org" "Tasks")
                                "** TODO %?\nEntered on %U\n"
                                :prepend t)
-                              ("hn" "Home NEXT" entry (file+headline "~/org/home.org" "Single Actions")
+                              ("hn" "Home NEXT" entry (file+headline "~/org/home.org" "Tasks")
                                "** NEXT %?\nEntered on %U\n"
                                :prepend t)
                               ("hN" "Home Note" entry (file+headline "~/org/home.org" "Notes")
@@ -161,19 +164,15 @@
                                "* %?\nEntered on %U\n")
                               ("hi" "Home Idea" entry (file+headline "~/org/notes.org" "Notes")
                                "** %? :idea:\nEntered on %U\n")
-                              ;; ("hc" "Home Calendar" entry (file+headline "~/org/calendar/cal.org" "Home Calendar")
-                              ;;  "* %? %^G\n%^{CATEGORY}p%^T")
-                              ;; ("hb" "Home Calendar - Block " entry (file+headline "~/org/calendar/cal.org" "Home Calendar")
-                              ;;  "* %? %^G\n%^{CATEGORY}p%^t--%^t")
-                              ("hc" "Home Calendar" entry (file+headline "~/org/calendar/cal.org" "Home Calendar")
-                                "* %?\n:PROPERTIES:\n:CATEGORY: HomeCal\n:END:\n%^T")
-                              ("hb" "Home Calendar - Block" entry (file+headline "~/org/calendar/cal.org" "Home Calendar")
-                                "* %?\n:PROPERTIES:\n:CATEGORY: HomeCal\n:END:\n%^t--%^t")
+                              ("hc" "Home Calendar - Single" entry (file+headline "~/org/home.org" "Calendar")
+                                "* %?\n%^T")
+                              ("hb" "Home Calendar - Block" entry (file+headline "~/org/home.org" "Calendar")
+                                "* %?\n%^t--%^t")
                               ("w" "Work Tasks & Notes")
-                              ("wt" "Work TODO" entry (file+headline "~/org/work.org" "Single Actions")
+                              ("wt" "Work TODO" entry (file+headline "~/org/work.org" "Tasks")
                                "** TODO %?\nEntered on %U\n"
                                :prepend t)
-                              ("wn" "Work NEXT" entry (file+headline "~/org/work.org" "Single Actions")
+                              ("wn" "Work NEXT" entry (file+headline "~/org/work.org" "Tasks")
                                "** NEXT %?\nEntered on %U\n"
                                :prepend t)
                               ("wN" "Note" entry (file+headline "~/org/work.org" "Notes")
@@ -184,16 +183,16 @@
                                "* %?\n\t\n%i")
                               ("wj" "Journal" entry (file+olp+datetree "~/org/work.org" "Journal")
                                "** %?\nEntered on %U\n")
-                              ("wd" "Retrospective Single Action" entry (file+headline "~/org/work.org" "Single Actions")
+                              ("wd" "Retrospective Tasks" entry (file+headline "~/org/work.org" "Tasks")
                                "* DONE %?\nCLOSED: %U")
-                              ;; ("wc" "Work Calendar" entry (file+olp+datetree "~/org/calendar/cal.org" "Work Calendar")
-                              ;;  "* %? %^G\n%^{CATEGORY}p%^T")
-                              ;; ("wb" "Work Calendar - Block " entry (file+olp+datetree "~/org/calendar/cal.org" "Work Calendar")
-                              ;;  "* %? %^G\n%^{CATEGORY}p%^t--%^t")
-                              ("wc" "Work Calendar" entry (file+headline "~/org/calendar/cal.org" "Work Calendar")
+                              ("wc" "Work Calendar - Single" entry (file+headline "~/org/work.org" "Calendar")
                                 "* %?\n:PROPERTIES:\n:CATEGORY: WorkCal\n:END:\n%^T")
-                              ("wb" "Work Calendar - Block" entry (file+headline "~/org/calendar/cal.org" "Work Calendar")
+                              ("wb" "Work Calendar - Block" entry (file+headline "~/org/work.org" "Calendar")
                                 "* %?\n:PROPERTIES:\n:CATEGORY: WorkCal\n:END:\n%^t--%^t")
+                              ("wp" "Work Calendar - Trip" entry (file+headline "~/org/work.org" "Work Trips")
+                                "* %?\n%^t--%^t")
+                              ("wm" "Work Calendar - Meeting" entry (file+headline "~/org/work.org" "Meetings")
+                                "* %?\n:PROPERTIES:\n:CATEGORY: Meeting\n:END:\n%^T")
                               ("e" "Emacs Tip")
                               ("et" "Emacs Tip" entry (file+headline "~/org/emacs-tips.org" "Emacs Tips")
                                "* %?\n\t%a")