Reformatting, mainly

1 files changed, 46 insertions, 31 deletions

diff --git a/doom.d/config.el b/doom.d/config.el
index 479e6e6..349c9d4 100644
--- a/doom.d/config.el
+++ b/doom.d/config.el
@@ -160,36 +160,51 @@ matt@matthewlemon.com")
                   ((org-agenda-overriding-header "Current Ideas")))
             (tags-todo "PRIORITY=\"A\""
                        ((org-agenda-overriding-header "Urgent Tasks")))
-            (agenda "")
-            )
-           )
+            (agenda "")))
+            
+           
           ("w" . "Work")
+          ("wm" "Main"
+           (
+            (agenda)
+            (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 "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 '("+MOD" "+refile"))))
           ("wt" "Agenda + Work TODO"
            (
             (agenda "")
             (tags-todo "CATEGORY=\"MOD\"&TODO=\"TODO\"-SCHEDULED>=\"<today>\"|CATEGORY=\"Work\"&TODO=\"TODO\"-SCHEDULED>=\"<today>\""
                        ((org-agenda-overriding-header "Work TODO UNSCHEDULED")))
             (tags-todo "CATEGORY=\"MOD\"&TODO=\"WAITING\"|CATEGORY=\"Work\"&TODO=\"WAITING\""
-                       ((org-agenda-overriding-header "Work WAITING")))
-            )
-           ((org-agenda-category-filter-preset '("+MOD" "+Work" "+Meeting")))
-           )
+                       ((org-agenda-overriding-header "Work WAITING"))))
+            
+           ((org-agenda-category-filter-preset '("+MOD" "+Work" "+Meeting"))))
+           
           ("wn" "Agenda + Work NEXT"
            (
             (agenda)
             (tags-todo "CATEGORY=\"MOD\"&TODO=\"NEXT\"-SCHEDULED>=\"<today>\"|CATEGORY=\"Work\"&TODO=\"NEXT\"-SCHEDULED>=\"<today>\""
                        ((org-agenda-overriding-header "Work NEXT UNSCHEDULED")))
             (tags-todo "CATEGORY=\"MOD\"&TODO=\"WAITING\"|CATEGORY=\"Work\"&TODO=\"WAITING\""
-                       ((org-agenda-overriding-header "Work WAITING")))
-            )
-           ((org-agenda-category-filter-preset '("+MOD" "+Work" "+Meeting")))
-           )
+                       ((org-agenda-overriding-header "Work WAITING"))))
+            
+           ((org-agenda-category-filter-preset '("+MOD" "+Work" "+Meeting"))))
+           
           ("wp" "Work Project NEXT"
            (
             (agenda)
             (tags-todo "+CATEGORY=\"MOD\"TODO=\"NEXT\"+CATEGORY=\"Project\""
-                       ((org-agenda-overriding-header "Work Project NEXT actions")))
-            ))
+                       ((org-agenda-overriding-header "Work Project NEXT actions")))))
+            
           ("h" . "Home")
           ("hm" "Main"
            (
@@ -203,10 +218,10 @@ matt@matthewlemon.com")
             (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" "+refile")))
-           )
+            (tags-todo "TODO=\"TODO\"" ((org-agenda-overriding-header "TODO"))))
+            
+           ((org-agenda-category-filter-preset '("+home" "+refile"))))
+           
           ("hn" "Agenda + Home NEXT"
            (
             (agenda "")
@@ -214,10 +229,10 @@ matt@matthewlemon.com")
                        ((org-agenda-overriding-header "Home NEXT UNSCHEDULED")
                         (org-agenda-sorting-strategy '(deadline-down scheduled-down priority-down))))
             (tags-todo "+CATEGORY=\"home\"+TODO=\"DOING\""
-                       ((org-agenda-overriding-header "Home in progress")))
-            )
-           ((org-agenda-category-filter-preset '("+home")))
-           )
+                       ((org-agenda-overriding-header "Home in progress"))))
+            
+           ((org-agenda-category-filter-preset '("+home"))))
+           
           ("n" "Agenda + All NEXT"
            (
             (agenda "")
@@ -231,8 +246,8 @@ matt@matthewlemon.com")
             (agenda "")
             (todo "WAITING")))
           ("i" tags "idea")
-          ("R" tags "LEVEL=2+REFILE" ((org-agenda-overriding-header "Stuff to refile")))
-          ))
+          ("R" tags "LEVEL=2+REFILE" ((org-agenda-overriding-header "Stuff to refile")))))
+          
 
   ;; org capture templates
   (setq org-capture-templates
@@ -294,8 +309,8 @@ matt@matthewlemon.com")
                 ("et" "Emacs Tip" entry (file+headline "~/org/emacs-tips.org" "Emacs Tips")
                  "* %?\n\t%a")
                 ("er" "Emacs Tip from Region" entry (file+headline "~/org/emacs-tips.org" "Emacs Tips")
-                 "* %?\n\t%i")
-                )))
+                 "* %?\n\t%i"))))
+                
   ;; org tags
   (setq org-tag-alist '(
                         ;; Depth
@@ -315,8 +330,8 @@ matt@matthewlemon.com")
                         ("Average" . ?2)
                         ("Easy" . ?3)
                         ;; Misc
-                        ("Maybe" . ?m)
-                        ))
+                        ("Maybe" . ?m)))
+                        
 
   ;; org agenda should be full screen
   (defun open-agenda ()
@@ -339,8 +354,8 @@ matt@matthewlemon.com")
 
   (setq org-todo-keywords
         (quote ((sequence "TODO(t)" "NEXT(n)" "DOING(D)" "PROJ(p)"  "|" "DONE(d!)")
-                (sequence "WAITING(w@/!)" "SOMEDAY(s@/!)" "HOLD(h@/!)" "|" "CANCELLED(c@/!)")
-                )))
+                (sequence "WAITING(w@/!)" "SOMEDAY(s@/!)" "HOLD(h@/!)" "|" "CANCELLED(c@/!)"))))
+                
 
   (setq org-todo-keyword-faces
         (quote (("TODO" :foreground "red" :weight bold)
@@ -372,8 +387,8 @@ matt@matthewlemon.com")
         '((?A . (:foreground "#CC0000" :background "#FFE3E3"))
           (?B . (:foreground "#64992C" :background "#EBF4DD"))
           (?C . (:foreground "#64992C" :background "#FFFFFF"))))
-  (setq org-ellipsis "...")
-  )
+  (setq org-ellipsis "..."))
+  
 
 (after! deft
   (setq deft-recursive t))