up to date with pop

1 files changed, 40 insertions, 26 deletions

diff --git a/doom.d/config.el b/doom.d/config.el
index aaabf52..690789c 100644
--- a/doom.d/config.el
+++ b/doom.d/config.el
@@ -63,7 +63,7 @@
 (defun mrl/switch-to-scratch ()
   (interactive)
   (switch-to-buffer "*scratch*"))
-;;
+
 ;; --------------------
 ;; Custom keybindings
 ;; --------------------
@@ -73,13 +73,23 @@
 (global-unset-key (kbd "C-x C-b")) ;; we don't want the old buffer list!
 
 ;; org-roam
-(after! org-roam
-  (setq org-roam-directory ("~/org-roam"))
-  (org-roam-db-autosync-mode)
-  (setq org-roam-node-display-template
-      (concat "${title:*} "
-              (propertize "${tags:10}" 'face 'org-tag)))
-  )
+(use-package org-roam
+  :custom
+  (org-roam-directory "~/org-roam")
+  (org-roam-complete-everywhere t)
+  (setq org-roam-capture-templates
+        '(("d" "default" plain
+           "%?"
+           :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n")
+           :unnarrowed t)
+          ("e" "encrypted" plain
+           "%?"
+           :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org.gpg" "#+title: ${title}\n")
+           :unnarrowed t)))
+  (setq org-roam-dailies-capture-templates
+        '(("d" "default" entry "* %<%H:%M>: %?"
+           :if-new (file+head "%<%Y-%m-%d>.org" "#+title: %<%Y-%m-%d>\n")
+           :unnarrowed t))))
 
 ;; Basic agenda stuff
 
@@ -131,7 +141,6 @@
   ;; Basic org keybindings
   (global-set-key "\C-cl" 'org-store-link)
   (global-set-key "\C-ca" 'org-agenda)
-  (global-set-key "\C-cb" 'org-iswitchb)
   (global-set-key "\C-cc" 'org-capture)
   ;;
   ;; Agenda dispatcher
@@ -174,17 +183,21 @@
                        ((org-agenda-overriding-header "Work Project NEXT actions")))
             ))
           ("h" . "Home")
-          ("hh" "Agenda + Home TODO"
+          ("hm" "Main"
            (
             (agenda)
-            (tags-todo "+CATEGORY=\"home\"-SCHEDULED>=\"<today>\"-TODO=\"WAITING\"-TODO=\"DOING\""
-                       ((org-agenda-overriding-header "Home TODO UNSCHEDULED")
+            (tags "TODO=\"DOING\"|REFILE+LEVEL=2|current|PRIORITY=\"A\"" ((org-agenda-overriding-header "DEAL")))
+            (tags-todo "TODO=\"WAITING\"" ((org-agenda-overriding-header "Home WAITING")
+                                           (org-agenda-sorting-strategy '(deadline-down scheduled-down priority-down))))
+            (tags-todo "-SCHEDULED>=\"<today>\"&TODO=\"NEXT\""
+                       ((org-agenda-overriding-header "Home NEXT UNSCHEDULED")
                         (org-agenda-sorting-strategy '(deadline-down scheduled-down priority-down))))
-            (tags-todo "+CATEGORY=\"home\"+TODO=\"WAITING\""
-                       ((org-agenda-overriding-header "Home WAITING")))
-            (tags-todo "+CATEGORY=\"home\"+TODO=\"DOING\"" ((org-agenda-overriding-header "Home in progress")))
+            (tags-todo "TODO=\"PROJ\"" ((org-agenda-overriding-header "Projects")))
+            (tags-todo "TODO=\"NEXT\"" ((org-agenda-overriding-header "Next Actions")
+                                        (org-agenda-sorting-strategy '(deadline-down scheduled-down priority-down))))
+            (tags-todo "TODO=\"TODO\"" ((org-agenda-overriding-header "TODO")))
             )
-           ((org-agenda-category-filter-preset '("+home")))
+           ((org-agenda-category-filter-preset '("+home" "+refile")))
            )
           ("hn" "Agenda + Home NEXT"
            (
@@ -210,13 +223,14 @@
             (agenda "")
             (todo "WAITING")))
           ("i" tags "idea")
-          ("R" tags-todo "REFILE"
-           ((org-agenda-overriding-header "Review these pages captured from the web")))
+          ("R" tags "LEVEL=2+REFILE" ((org-agenda-overriding-header "Stuff to refile")))
           ))
 
   ;; org capture templates
   (setq org-capture-templates
-        (quote (("h" "Home Tasks & Notes")
+        (quote (("i" "Inbox" entry (file+headline "~/org/refile.org" "Inbox")
+                 "* %?\nCaptured: %U\n")
+                ("h" "Home Tasks & Notes")
                 ;; ("w" "Protocol Capture" entry (file+headline "~/org/refile.org" "Web Capture")
                 ;;  "* %^{Title or Comment}\nDescription: %:description\nSource: %:link\n%:initial\nCaptured: %U\n")
                 ("x" "Protocol Capture" entry (file+headline "~/org/refile.org" "Web Capture")
@@ -277,17 +291,17 @@
   ;; org tags
   (setq org-tag-alist '(
                         ;; Depth
-                        ("@immersive" . ?i) ;; "Deep"
-                        ("@process" . ?p)   ;; "Shallow"
-                        ("@offdesk" . ?o)   ;; "Away from desk"
+                        ("immersive" . ?i) ;; "Deep"
+                        ("process" . ?p)   ;; "Shallow"
+                        ("offdesk" . ?o)   ;; "Away from desk"
                         ;; Type
                         ("brainstorm" . ?b)
                         ("idea" . ?d)
                         ;; Context
-                        ("@work" . ?w)
-                        ("@home" . ?h)
-                        ("@errand" . ?e)
-                        ("@emacs" . ?E)
+                        ("work" . ?w)
+                        ("home" . ?h)
+                        ("errand" . ?e)
+                        ("emacs" . ?E)
                         ;; Energy
                         ("Challenge" . ?1)
                         ("Average" . ?2)