Much org configuring

init.el

@@ -415,7 +415,11 @@
            org-src-window-setup 'current-window
            org-startup-truncated nil
            org-startup-with-inline-images t
-           org-tags-column (- (- fill-column (length org-ellipsis))))
+           org-tags-column (- (- fill-column (length org-ellipsis)))
+           org-todo-keywords '((sequence "TODO(t)" "WAIT(w@/!)"
+                                         "|" "DONE(d!)")
+                               (sequence "|" "CANCELED(k!)")
+                               (sequence "MEETING(m)")))
   (:bind "RET" #'+org-return-dwim
          "<S-return>" #'+org-table-copy-down
          "C-c C-l" #'+org-insert-link-dwim
@@ -428,14 +432,46 @@
     (org-link-set-parameters "tel" :follow #'+org-tel-open)))
 
 (setup org-agenda
-  (:option org-agenda-skip-deadline-if-done t)
-  (add-to-list '+custom-variable-allowlist 'org-agenda-file-regexp)
-  (add-to-list '+custom-variable-allowlist 'org-agenda-templates)
-  (:+leader "a" #'org-agenda "C-a" #'org-agenda))
+  (:option org-agenda-skip-deadline-if-done t
+           org-agenda-skip-scheduled-if-done t
+           org-agenda-span 10
+           org-agenda-include-diary nil ; I use the org-diary features
+           org-agenda-todo-ignore-deadlines 'near
+           org-agenda-todo-ignore-scheduled 'future
+           org-agenda-include-deadlines t
+           org-deadline-warning-days 0
+           org-agenda-show-future-repeats 'next)
+  (with-eval-after-load custom-file
+    (dolist (var '(org-agenda-files
+                  org-agenda-file-regexp
+                  org-agenda-templates))
+      (add-to-list '+custom-variable-allowlist var))
+    (add-to-list 'org-agenda-files (sync/ "org/" t)))
+  (:+leader "a" #'org-agenda "C-a" #'org-agenda)
+  (:hook #'hl-line-mode))
 
 (setup org-capture
   (:require +org-capture)
-  (:+leader "c" #'org-capture "C-c" #'org-capture))
+  (:+leader "c" #'org-capture "C-c" #'org-capture)
+  (+org-capture-templates-setf "t" "Todo")
+  (+org-capture-templates-setf "tt"
+      '("Today!" entry (file "todo.org")
+        (concat "* TODO %^{Title}\n"
+                "DEADLINE: %t\n"
+                "\n%?")))
+  (+org-capture-templates-setf "ts"
+      '("Someday..." entry (file "todo.org")
+        (concat "* TODO %^{Title}\n"
+                ":PROPERTIES:\n"
+                ":CREATED: [%<%F %T>]\n"
+                ":END:\n"
+                "\n%?")))
+  (+org-capture-sort))
+
+(setup org-contacts
+  (:also-straight org-vcard)                 ; for importing Vcard files
+  (:option org-contacts-matcher "contact")    ; Contacts are tagged "contact"
+  )
 
 (setup prog
   (:local-set comment-auto-fill-only-comments t)