Architectural Upgrade 2026-03-30: Modular Emacs, org-gtd v4.0, and PSF Phase 1

projects/dotemacs/emacs-gtd.org

@@ -15,8 +15,8 @@ Basic agenda settings
 Agenda files
 #+begin_src elisp
   (setq org-agenda-files (list
-  			(concat org-directory "/0_inbox/inbox.org")
-  			(concat org-directory "/0_inbox/org-gtd-tasks.org")
+  			(concat org-directory "inbox.org")
+  			(concat org-directory "gtd.org")
   			)
         )
 #+end_src
@@ -32,8 +32,7 @@ Basic todo
 #+begin_src elisp
   (setq org-todo-keywords
           '(
-            (sequence "TODO(t)" "NEXT(n)" "|" "DONE(d!)")
-            (sequence "WAIT(w@/!)" "|" "CNCL(c@)")
+            (sequence "TODO(t)" "NEXT(n)" "WAIT(w@/!)" "|" "DONE(d!)" "CNCL(c@)")
             )
           )
 
@@ -69,13 +68,21 @@ Switch entry to 'DONE' when all subentries are done
 #+begin_src elisp
   (use-package org-gtd
     :defer t
-    :init (setq org-gtd-update-ack "3.0.0")
+    :init (setq org-gtd-update-ack "4.0.0")
     :after org
     :config
-    ;; Keeping these two settings on instead of enabling (org-gtd-mode) until this issue is resolved https://github.om/Trevoke/org-gtd.el/issues/198
     (setq org-edna-use-inheritance t)
     (org-edna-mode)
-    ;;    (org-gtd-mode)
+    (setq org-gtd-keyword-mapping
+          '((todo . "TODO")
+            (next . "NEXT")
+            (wait . "WAIT")
+            (done . "DONE")
+            (canceled . "CNCL")))
+    (setq org-gtd-custom-node-paths
+          '(("Actionable" . '("~/memex/gtd.org" "Actions"))
+            ("Incubate" . '("~/memex/gtd.org" "Incubate"))))
+    (org-gtd-mode)
     :bind (
   	 ("C-c d c" . org-gtd-capture)
   	 ("C-c d e" . org-gtd-engage)

projects/dotemacs/emacs-org.org

@@ -17,7 +17,7 @@
 #+end_src
 
 #+begin_src elisp
-  (defvar org-directory (concat (getenv "HOME") "/org/"))
+  (defvar org-directory (concat (getenv "HOME") "/memex/"))
 #+end_src
 
 ** Looks
@@ -97,7 +97,7 @@ Images
 ** Capture
 
 #+begin_src elisp
-  (defvar org-default-notes-file (concat org-directory "/0_inbox/inbox.org"))
+  (defvar org-default-notes-file (concat org-directory "inbox.org"))
 #+end_src
 
 *** Org-protocol
@@ -132,12 +132,12 @@ Org-protocol templates
   (defvar org-capture-templates '(
                                 ("p" "Protocol"
                                  entry
-                                 (file "0_inbox/inbox.org")
+                                 (file "inbox.org")
                                  "* %^{Title}\nSource: %u, %c\n #+BEGIN_QUOTE\n%i\n#+END_QUOTE\n\n\n%?"
                                  )
                                 ("L" "Protocol Link"
                                  entry
-                                 (file "0_inbox/inbox.org")
+                                 (file "inbox.org")
                                  "* %? [[%:link][%:description]]\n:PROPERTIES:\n:TITLE: %:description\n:URI: %:link\n:CREATED: %U\n:END:"
                                  :prepend nil
                                  :empty-lines 1

projects/dotemacs/emacs-roam.org

@@ -27,8 +27,8 @@
 #+end_src
 
 #+begin_src elisp
-  (setq org-roam-directory (concat org-directory "/1_thinking"))
-  (setq org-roam-dailies-directory (concat org-directory "/0_inbox/daily"))
+  (setq org-roam-directory (concat org-directory "notes"))
+  (setq org-roam-dailies-directory (concat org-directory "daily"))
 #+end_src
 
 #+begin_src elisp :tangle no