From 21452281c70fcf6af34efcd032cad6c57343b3a2 Mon Sep 17 00:00:00 2001
From: ndwarshuis <ndwar@yavin4.ch>
Date: Sun, 21 Jun 2020 10:05:11 -0400
Subject: [PATCH] ENH use inert projects/tasks only where appropriate

---
 etc/conf.org | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/etc/conf.org b/etc/conf.org
index b7613a7..49fe0cc 100644
--- a/etc/conf.org
+++ b/etc/conf.org
@@ -2555,10 +2555,13 @@ original org entry before executing BODY."
        (org-super-agenda-groups
         `((:auto-map
            ,(nd/org-x-mk-super-agenda-pred
-             (let* ((status (org-x-task-status))
-                    (priority (alist-get status nd/org-x-task-status-priorities))
-                    (is-atomic (org-x-is-atomic-task-p)))
-               (if (< priority 0) "99. Other"
+             (let* ((is-atomic (org-x-is-atomic-task-p))
+                    ;; lump inert and active non-atomic tasks together
+                    (status (--> (org-x-task-status)
+                                 (if (and (not is-atomic) (eq it :inert))
+                                     :active it)))
+                    (priority (alist-get status nd/org-x-task-status-priorities)))
+               (unless (< priority 0)
                  (--> status
                       (symbol-name it)
                       (substring it 1)
@@ -2566,7 +2569,8 @@ original org entry before executing BODY."
                       (s-titleize it)
                       (concat "%s.%s " it)
                       (format it priority (if is-atomic 1 0))
-                      (concat it (if is-atomic " (α)" " (σ)")))))))))))))
+                      (concat it (if is-atomic " (α)" " (σ)")))))))
+          (:discard (:anything t))))))))
 
    ("p"
     "Project View"
@@ -2575,7 +2579,11 @@ original org entry before executing BODY."
       ((org-agenda-overriding-header "Projects")
        (org-agenda-skip-function
         ,(nd/org-x-mk-skip-function
-          (unless (org-x-is-project-p) (org-x-skip-heading))))
+          (cond ((or (org-x-is-iterator-heading-p)
+                    (org-x-is-periodical-heading-p))
+                 (org-x-skip-subtree))
+                ((not (org-x-is-project-p))
+                 (org-x-skip-heading)))))
        (org-agenda-sorting-strategy '(category-keep))
        (org-super-agenda-groups
         `((:auto-map
@@ -2583,8 +2591,12 @@ original org entry before executing BODY."
              ;; TODO this ain't DRY
              (let* ((status (org-x-get-project-status))
                     (priority (alist-get status nd/org-x-project-status-priorities))
-                    (is-subproject (org-x-headline-has-parent 'org-x-is-todoitem-p)))
-               (unless (< priority 0)
+                    (is-subproject (org-x-headline-has-parent 'org-x-is-todoitem-p))
+                    ;; skip anything that is in a CANC or HOLD project
+                    (is-masked (when is-subproject
+                                 (or (org-x-is-todo-child "CANC")
+                                     (org-x-is-todo-child "HOLD")))))
+               (unless (or is-masked (< priority 0))
                  (--> status
                       (symbol-name it)
                       (substring it 1)