oni-org/capture-templates/appointment.org

@@ -0,0 +1,2 @@
+* TODO %i%?
+%U

oni-org/capture-templates/clocked/code-note.org

@@ -0,0 +1,8 @@
+%U
+- File: [[file:%F::%(number-to-string (with-current-buffer (get-buffer (find-file-noselect \"%F\")) (line-number-at-pos (region-beginning))))][%f]]
+
+%?
+
+#+BEGIN_SRC %(string-remove-suffix \"-mode\" (symbol-name (with-current-buffer (get-buffer (find-file-noselect \"%F\")) major-mode)))
+%i
+#+END_SRC"

oni-org/capture-templates/clocked/code.org

@@ -0,0 +1,3 @@
+#+BEGIN_EXAMPLE
+%i
+#+END_EXAMPLE

oni-org/capture-templates/clocked/item.org

@@ -0,0 +1 @@
+%i%?

oni-org/capture-templates/clocked/kill-ring.org

@@ -0,0 +1 @@
+%c

oni-org/capture-templates/clocked/note.org

@@ -0,0 +1,3 @@
+%U
+
+%?

oni-org/capture-templates/inbox-with-selection.org

@@ -0,0 +1,9 @@
+* %?
+:PROPERTIES:
+:CREATED:  %U
+:ORIGIN:  %a
+:END:
+
+#+begin_quote
+%i
+#+end_quote

oni-org/capture-templates/journal.org

@@ -0,0 +1,3 @@
+* %<%H:%M:%S>
+
+%(if (org-clock-is-active) "- task (clocked in) :: %K\n\n" "")%?

oni-org/capture-templates/reading-note.org

@@ -0,0 +1,5 @@
+%?
+
+#+begin_quote
+%i
+#+end_quote

oni-org/capture-templates/reading-url-protocol.org

@@ -0,0 +1,6 @@
+* READ %:description
+:PROPERTIES:
+:CREATED:  %U
+:END:
+
+[[%:link]]

oni-org/capture-templates/reading-url.org

@@ -0,0 +1,4 @@
+* READ %(oni-org-get-url-link (read-from-minibuffer "URL: ")) %^g
+:PROPERTIES:
+:CREATED:  %U
+:END:

oni-org/capture-templates/task.org

@@ -0,0 +1,4 @@
+* TODO %i%?
+:PROPERTIES:
+:CREATED:  %U
+:END:

oni-org/oni-org.el

@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2023.0604.153631
+;; Version: 2023.0601.224638
 ;; Package-Requires: (oni-yasnippet oni-alert oni-hydra org org-bullets org-edna diminish all-the-icons olivetti form-feed org-pretty-table)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -78,10 +78,6 @@
   (expand-file-name "someday.org" oni-org-todo-dir)
   "The file for TODO notes I will want to do some day, but not today.")
 
-(defconst oni-org-todo-tickler-file
-  (expand-file-name "tickler.org" oni-org-todo-dir)
-  "The tickler file for TODO notes of the future.")
-
 ;;; Fake org-roam -- oni-org-exocortex
 ;; I tried using org-roam v2 with Orgro, but it didn’t work. I’ve only been
 ;; using org-roam to more easily find and insert strings. The file renaming in
@@ -381,10 +377,6 @@ _di_: Add inlineimages STARTUP
 
 (defalias 'org-dblock-write:oni-backlinks 'oni-org-dblock-write-backlinks)
 
-;; Create a new archive for each year. This way archives don't keep growing
-;; indefinitely and opening the archive doesn't load every single language I've
-;; ever used because there are code blocks in there.
-(setq org-archive-location (format-time-string "%%s_archive_%Y::"))
 (setq org-catch-invisible-edits 'error)
 (setq org-clock-in-switch-to-state #'oni-org-maybe-change-todo-state)
 (setq org-extend-today-until 2)
@@ -399,8 +391,8 @@ _di_: Add inlineimages STARTUP
 (setq org-special-ctrl-a/e t)
 (setq org-src-fontify-natively t)
 (setq org-tags-column -67)
-(setq org-tags-exclude-from-inheritance '("project"))
 (setq org-tags-sort-function #'string<)
+(setq org-tags-exclude-from-inheritance '("project"))
 (setq org-use-fast-todo-selection t)
 (setq org-use-sub-superscripts '{})
 
@@ -609,6 +601,34 @@ also move point to the start of the heading."
 ;; https://github.com/novoid/dot-emacs/blob/23c28944f1991c636ea71ec7d5c3d266e6dbeb8a/config.org#general-org-mode-settings
 (setq org-agenda-dim-blocked-tasks 'invisible)
 
+(setq org-agenda-custom-commands
+      `(("t" "Todo" tags-todo "TODO=\"TODO\"-CATEGORY=\"project\"+(SCHEDULED<\"<tomorrow>\"|TODO=\"TODO\"-CATEGORY=\"project\"+SCHEDULED=\"\")")
+        ("r" . "Reading")
+        ("rc" "Casual reading" tags-todo "TODO=\"READ\"+casual")
+        ("rn" "Noteworthy reading" tags-todo "TODO=\"READ\"+note")
+        ("ru" "Uncategorized" tags-todo "TODO=\"READ\"-note-casual")
+        ("s" "Someday" tags-todo "TODO=\"TODO\"-CATEGORY=\"inbox\"")
+        ("p" "Projects & ideas" tags "CATEGORY=\"project\"|CATEGORY=\"idea\"")
+        ("c" "Today's (Current) tasks" tags "SCHEDULED=\"<today>\"")
+        ("w" . "Work topics")
+        ("wo" "Overview" ((tags-todo "+work+FOR=\"\"")
+                          (tags-todo "+work+FOR=\"Jordan\"")
+                          (tags-todo "+work+FOR=\"Remy\"")))
+        ("wt" "Work todo" tags-todo "+work+FOR=\"\"")
+        ("wj" "Topics for Jordan" tags-todo "+work+1o1+FOR=\"Jordan\"")
+        ("wr" "Topics for Remy" tags-todo "+work+1o1+FOR=\"Remy\"")
+        ("S" "Shopping" tags-todo "+shopping")
+        ("o" "Overview"
+         ((agenda "" ((org-agenda-span 'day)))
+          (tags-todo "TODO=\"WAITING\"-CATEGORY=\"inbox\"")
+          (tags-todo "TODO=\"TODO\"-CATEGORY=\"inbox\"-CATEGORY=\"project\"+SCHEDULED=\"\"")
+          (tags-todo "TODO=\"READ\"-CATEGORY=\"inbox\"")
+          (tags-todo "TODO=\"WATCH\"-CATEGORY=\"inbox\"")
+          (tags-todo "TODO=\"LISTEN\"-CATEGORY=\"inbox\""))
+         ((org-agenda-max-todos 10)))
+        ("v" "Review" tags "CLOSED>=\"<-1w>\"")
+        ("l" "Listen" tags-todo "TODO=\"LISTEN\"")))
+
 (add-hook 'org-mode-hook #'oni-org-initialize-agenda-category-icons)
 
 (add-to-list 'display-buffer-alist
@@ -684,6 +704,63 @@ After running it once remove it from `org-capture-after-finalize-hook'."
 (defun oni-org-format-names (names)
   (mapconcat (lambda (n) (format "** READ %s" n)) names "\n"))
 
+(setq org-capture-templates
+      `(("t" "Task" entry (file "")
+         (file ,(expand-file-name "task.org" oni-org-capture-template-directory)))
+        ("u" "URL to read" entry (file "")
+         (file ,(expand-file-name "reading-url.org" oni-org-capture-template-directory))
+         :immediate-finish t)
+        ("U" "URL to read" entry (file "")
+         (file ,(expand-file-name "reading-url-protocol.org" oni-org-capture-template-directory))
+         :immediate-finish t)
+        ("j" "Journal entry" entry
+         (file+olp+datetree ,(oni-org-expand-to-home "documents/gtd/journal.org"))
+         (file ,(expand-file-name "journal.org" oni-org-capture-template-directory)))
+        ("n" "Reading note" item (function oni-org-reading-note)
+         (file ,(expand-file-name "reading-note.org" oni-org-capture-template-directory))
+         :empty-lines 1)
+        ("A" "Album" entry (file "")
+         "* %^{Artist} - %^{Album Name}
+:PROPERTIES:
+:CATEGORY: music
+:END:
+** TODO Listen to %\\1 - %\\2
+** TODO Rip %\\1 - %\\2 to disk
+** TODO Add album art to %\\1 - %\\2
+** TODO Transfer %\\1 - %\\2 to phone"
+         :immediate-finish t)
+        ("m" "Code Magazine Issue" entry (file "")
+         "* CODE Issue %(oni-org-format-months)
+** READ Editorial
+%(oni-org-format-names (oni-org-ask-names))"
+         :immediate-finish t)
+        ("c" "Add to currently clocked item")
+        ("ca" "Note" plain
+         (clock)
+         (file ,(expand-file-name "clocked/note.org" oni-org-capture-template-directory))
+         :empty-lines 1)
+        ("ci" "Item to current clocked task" item
+         (clock)
+         (file ,(expand-file-name "clocked/item.org" oni-org-capture-template-directory))
+         :empty-lines 1)
+        ("cc" "Marked code example with notes" plain
+         (clock)
+         (file ,(expand-file-name "clocked/code-note.org" oni-org-capture-template-directory))
+         :empty-lines 1)
+        ("cC" "Marked code example" plain
+         (clock)
+         (file ,(expand-file-name "clocked/code.org" oni-org-capture-template-directory))
+         :immediate-finish t
+         :empty-lines 1)
+        ("ck" "Kill-ring contents" plain
+         (clock)
+         (file ,(expand-file-name "clocked/kill-ring.org" oni-org-capture-template-directory))
+         :immediate-finish t
+         :empty-lines 1)))
+
+(setq org-capture-templates-contexts
+      '(("n" ((in-mode . "nov-mode")))))
+
 (defun org-edna-finder/next-sibling-first-child ()
   "A finder for ‘org-edna’ to find the first child of the next sibling."
   (save-excursion
@@ -731,8 +808,7 @@ After running it once remove it from `org-capture-after-finalize-hook'."
 ;; ‘oni-org-todo-main-file', and the top of ‘oni-org-todo-someday-file'.
 (setq org-refile-targets '((nil . (:maxlevel . 10))
                            (oni-org-todo-main-file . (:maxlevel . 10))
-                           (oni-org-todo-someday-file . (:maxlevel . 1))
-                           (oni-org-todo-tickler-file . (:level . 1))))
+                           (oni-org-todo-someday-file . (:maxlevel . 1))))
 
 (define-key org-mode-map (kbd "C-c C-S-w") #'oni-org-refile-to-top)