From 64605bc7409e84022ac3d79a727ea7aaf1819bda Mon Sep 17 00:00:00 2001
From: Mitch Tishmack <mitch.tishmack@gmail.com>
Date: Mon, 7 Sep 2020 11:03:52 -0500
Subject: [PATCH] Update org-mode capture templates and add org-habit back in

---
 emacs.org | 79 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 65 insertions(+), 14 deletions(-)

diff --git a/emacs.org b/emacs.org
index 411e0c4..9d42da2 100644
--- a/emacs.org
+++ b/emacs.org
@@ -696,15 +696,43 @@ Todo is to figure out what needs to happen for the capture templates.
   (org-confirm-babel-evaluate nil)
   (org-src-strip-leading-and-trailing-blank-lines t)
   (org-src-preserve-indentation t)
+  (org-directory "~/src/org")
+  (org-archive-directory "~/src/org/attic")
+  (org-default-notes-file (concat org-directory "/notes.org"))
+  ;; Ref https://orgmode.org/manual/Template-elements.html for more detail.
+  (org-agenda-files
+   (list "~/src/org"
+         "~/src/git.functionalidiot.com/mitchty/dotfiles"))
   (org-capture-templates
-   '(("t" "Todo" entry (file+headline "~/src/org/gtd.org" "Tasks")
-      "* TODO %?\n  %i\n  %a")
-     ("n" "Note" entry (file+datetree "~/src/org/notes.org")
-      "* %?\nRandom Note entered on %U\n  %i\n  %a")
-     ("m" "Todo from email" entry (file+headline "~/src/org/gtd.org" "INBOX")
-      "* TODO %?, Link: %a")
-     ("u" "Url" entry (file+headline "~/src/org/urls.org" "Urls")
-      "* %u\n\n %i" :prepend t)
+   '(
+     ("d" "deadline"
+      entry (file+headline org-default-notes-file "Todos")
+      "* PRIO %? \nDEADLINE: %t"
+      :prepend t :empty-lines 1 :clock-in t :clock-resume t)
+     ("t" "todo"
+      entry (file+headline org-default-notes-file "Todos")
+      "* TODO %?\n  %i\n  %a\n"
+      :prepend t :empty-lines 1 :clock-in t :clock-resume t)
+     ("n" "note"
+      entry (file+headline org-default-notes-file "Notes")
+      "\n* %?\nRandom Note entered on %U\n  %i\n  %a\n"
+      :prepend t :empty-lines 1 :clock-in t :clock-resume t)
+     ("m" "email todo"
+      entry (file+headline org-default-notes-file "Inbox")
+      "\n* TODO %?, Link: %a\n"
+      :prepend t :empty-lines 1 :clock-in t :clock-resume t)
+     ("u" "urls"
+      entry (file+headline org-default-notes-file "Urls")
+      "\n* %? :url:\n%i\n"
+      :prepend t :empty-lines 1 :clock-in t :clock-resume t)
+     ("i" "interruption"
+      entry (file+headline org-default-notes-file "Interruptions")
+      "\n* BLOCKED by %? :BLOCKED:\n%t"
+      :prepend t :empty-lines 1 :clock-in t :clock-resume t)
+     ("j" "journal"
+      entry (file (concat org-directory "/journal.org"))
+      "* %?\n%U\n"
+      :prepend t :empty-lines 1 :clock-in t :clock-resume t)
      ))
   :config
   (add-to-list 'org-structure-template-alist '("el" "#+BEGIN_SRC emacs-lisp\n?\n#+END_SRC" ""))
@@ -746,22 +774,45 @@ Figure out how the hell to use this thing.
               ("C-c n f" . org-roam-find-file)
               ("C-c n j" . org-roam-jump-to-index)
               ("C-c n b" . org-roam-switch-to-buffer)
-              ("C-c n g" . org-roam-graph))
-             :map org-mode-map
-             (("C-c n i" . org-roam-insert))))
+              ("C-c n g" . org-roam-graph)
+              ("C-c n i" . org-roam-insert)))
+              )
+
 ;;(use-package ob-async :after org-plus-contrib :ensure t)
 #+END_SRC
 
+**** TODO org babel ob-async testing
+
+Validate that this installs from scratch fine, blocking babel executions is ass.
+
+#+BEGIN_SRC emacs-lisp
+(use-package ob-async :after org :ensure t)
+#+END_SRC
+
+**** TODO org-habit customization
+
+Figure out the customization needed here.
+
 #+BEGIN_SRC emacs-lisp
-(use-package ob-async :after org-plus-contrib :ensure t)
+(use-package org-habit
+  :after org
+  :diminish
+  :custom
+  (org-habit-graph-column 44)
+  (org-habit-preceding-days 31)
+  (org-habit-following-days 7))
 #+END_SRC
 
+**** TODO org-bullets review if alternative is worth it
+
+https://github.com/integral-dw/org-superstar-mode
+
 #+BEGIN_SRC emacs-lisp
 (use-package org-bullets
-  :after org-plus-contrib
+  :after org
   :ensure t
   :custom
-  (org-bullets-bullet-list '("・" "◦" "•" "◉"))
+  (org-bullets-bullet-list '("①" "②" "③" "④" "⑤"))
   :config
   (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
   (when window-system