commit - 058fb71a4dade10dc19345791d37c30c00accab2
commit + 9ef211753751c50a24fcbc94b959992624339af4
blob - 928d88e8baf4540c2156fa4d329f37a0a0461dcb
blob + 6daa2389cb6fb3b28e64a1e5276af464b237ba26
--- custom.el
+++ custom.el
@@ -16,7 +16,6 @@
       '(("g" "GTD View"
          ((todo "NEXT"
                 ((org-agenda-overriding-header "Next Actions")))
-
           (agenda ""
                   ((org-agenda-overriding-header "Today")
                    (org-agenda-span 'day)
@@ -24,20 +23,20 @@
                    (org-agenda-skip-scheduled-if-done t)
                    (org-agenda-skip-deadline-if-done t)
                    (org-agenda-skip-timestamp-if-done t)))
-
           (todo "WAIT"
                 ((org-agenda-overriding-header "Waiting On")))
-
           (todo "TODO"
                 ((org-agenda-overriding-header "Remaining TODOs"))))
-
-         ((org-agenda-files '("~/org/agenda"))
+         ((org-agenda-files
+           (list (expand-file-name "~/org/agenda/")
+                 (expand-file-name "~/org/calendars/")))
           (org-agenda-prefix-format
            '((agenda . "  %?-12t% s")
              (todo   . "  ")
              (tags   . "  ")
              (search . "  ")))))
 
+
         ("i" "Inbox"
          ((tags "-{.*}"
                 ((org-agenda-overriding-header "Inbox (Refile with - SPC m r)")
@@ -46,16 +45,57 @@
                   '((agenda . "  %?-12t% s")
                     (tags   . "  ")
                     (todo   . "  ")
-                    (search . "  ")))))))))
+                    (search . "  ")))))))
 
+
+        ("w" "Weekly Review"
+         ((tags "Balcony"
+                ((org-agenda-overriding-header "Balcony Task ")
+                 (org-agenda-prefix-format
+                  '((agenda . "  %?-12t% s")
+                    (tags   . "  ")
+                    (todo   . "  ")
+                    (search . "  ")))))
+          (todo "KILL"
+                ((org-agenda-overriding-header "Killed Tasks")
+                 (org-agenda-prefix-format
+                  '((agenda . "  %?-12t% s")
+                    (tags   . "  ")
+                    (todo   . "  ")
+                    (search . "  ")))))
+          (todo "DONE"
+                ((org-agenda-overriding-header "Unarchived Completed Tasks (May need purging)")))
+          ))
+        ))
+
 ;; Set custom capture templates
 (after! org
   (add-to-list 'org-capture-templates
                '("i" "Inbox" entry
                  (file "~/org/agenda/inbox.org")
-                 "* %?")))
+                 "* %?"))
 
-;; Set custom
+  (add-to-list 'org-capture-templates
+               '("j" "Journal (Markdown)" plain
+                 (file (lambda ()
+                         (let* ((date-str (format-time-string "%Y-%m-%d-%H-%M"))
+                                (custom-str (read-string "Journal Title: "))
+                                (filename (concat date-str "-" custom-str ".md")))
+                           (expand-file-name filename "~/Journal/"))))
+                 "# %^{Title}\n\n%U\n\n%?"
+                 :empty-lines 1)))
+
+
+;; Call Inbox org capture template with SPC m i
+(map! :leader
+      :desc "Capture to inbox"
+      "m i" (lambda () (interactive) (org-capture nil "i")))
+;; Keybinding for Journal (Markdown)
+(map! :leader
+      :desc "Journal (Markdown)"
+      "m j" (lambda! () (interactive) (org-capture nil "j")))
+
+;; Set custom org-todo items
 (after! org
   (setq org-todo-keywords
         '((sequence "TODO(t)" "NEXT(n)" "PROJ(p)" "LOOP(r)" "STRT(s)"
@@ -63,7 +103,13 @@
           (sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)")
           (sequence "|" "OKAY(o)" "YES(y)" "NO(n)"))))
 
+;; Rebind org-add-note
+(after! org
+  (map! :mode org-mode
+        :localleader   ; SPC m
+        "N" #'org-add-note))
 
+
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.