From c17ca639525c921216b78c0645fbfaeafd68753a Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Fri, 2 Jun 2023 00:09:12 -0700 Subject: [PATCH] [oni-org] Throw away custom agenda commands and capture templates --- oni-org/capture-templates/appointment.org | 2 - .../capture-templates/clocked/code-note.org | 8 -- oni-org/capture-templates/clocked/code.org | 3 - oni-org/capture-templates/clocked/item.org | 1 - .../capture-templates/clocked/kill-ring.org | 1 - oni-org/capture-templates/clocked/note.org | 3 - .../inbox-with-selection.org | 9 -- oni-org/capture-templates/journal.org | 3 - oni-org/capture-templates/reading-note.org | 5 -- .../reading-url-protocol.org | 6 -- oni-org/capture-templates/reading-url.org | 4 - oni-org/capture-templates/task.org | 4 - oni-org/oni-org.el | 87 +------------------ 13 files changed, 1 insertion(+), 135 deletions(-) delete mode 100644 oni-org/capture-templates/appointment.org delete mode 100644 oni-org/capture-templates/clocked/code-note.org delete mode 100644 oni-org/capture-templates/clocked/code.org delete mode 100644 oni-org/capture-templates/clocked/item.org delete mode 100644 oni-org/capture-templates/clocked/kill-ring.org delete mode 100644 oni-org/capture-templates/clocked/note.org delete mode 100644 oni-org/capture-templates/inbox-with-selection.org delete mode 100644 oni-org/capture-templates/journal.org delete mode 100644 oni-org/capture-templates/reading-note.org delete mode 100644 oni-org/capture-templates/reading-url-protocol.org delete mode 100644 oni-org/capture-templates/reading-url.org delete mode 100644 oni-org/capture-templates/task.org diff --git a/oni-org/capture-templates/appointment.org b/oni-org/capture-templates/appointment.org deleted file mode 100644 index a29f899..0000000 --- a/oni-org/capture-templates/appointment.org +++ /dev/null @@ -1,2 +0,0 @@ -* TODO %i%? -%U diff --git a/oni-org/capture-templates/clocked/code-note.org b/oni-org/capture-templates/clocked/code-note.org deleted file mode 100644 index ee9489f..0000000 --- a/oni-org/capture-templates/clocked/code-note.org +++ /dev/null @@ -1,8 +0,0 @@ -%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" diff --git a/oni-org/capture-templates/clocked/code.org b/oni-org/capture-templates/clocked/code.org deleted file mode 100644 index e8df773..0000000 --- a/oni-org/capture-templates/clocked/code.org +++ /dev/null @@ -1,3 +0,0 @@ -#+BEGIN_EXAMPLE -%i -#+END_EXAMPLE diff --git a/oni-org/capture-templates/clocked/item.org b/oni-org/capture-templates/clocked/item.org deleted file mode 100644 index 8b3f27b..0000000 --- a/oni-org/capture-templates/clocked/item.org +++ /dev/null @@ -1 +0,0 @@ -%i%? diff --git a/oni-org/capture-templates/clocked/kill-ring.org b/oni-org/capture-templates/clocked/kill-ring.org deleted file mode 100644 index 4a883c8..0000000 --- a/oni-org/capture-templates/clocked/kill-ring.org +++ /dev/null @@ -1 +0,0 @@ -%c diff --git a/oni-org/capture-templates/clocked/note.org b/oni-org/capture-templates/clocked/note.org deleted file mode 100644 index f3e8ce3..0000000 --- a/oni-org/capture-templates/clocked/note.org +++ /dev/null @@ -1,3 +0,0 @@ -%U - -%? diff --git a/oni-org/capture-templates/inbox-with-selection.org b/oni-org/capture-templates/inbox-with-selection.org deleted file mode 100644 index 9dc2f6e..0000000 --- a/oni-org/capture-templates/inbox-with-selection.org +++ /dev/null @@ -1,9 +0,0 @@ -* %? -:PROPERTIES: -:CREATED: %U -:ORIGIN: %a -:END: - -#+begin_quote -%i -#+end_quote diff --git a/oni-org/capture-templates/journal.org b/oni-org/capture-templates/journal.org deleted file mode 100644 index 3d0f142..0000000 --- a/oni-org/capture-templates/journal.org +++ /dev/null @@ -1,3 +0,0 @@ -* %<%H:%M:%S> - -%(if (org-clock-is-active) "- task (clocked in) :: %K\n\n" "")%? diff --git a/oni-org/capture-templates/reading-note.org b/oni-org/capture-templates/reading-note.org deleted file mode 100644 index bbf1cf7..0000000 --- a/oni-org/capture-templates/reading-note.org +++ /dev/null @@ -1,5 +0,0 @@ -%? - -#+begin_quote -%i -#+end_quote diff --git a/oni-org/capture-templates/reading-url-protocol.org b/oni-org/capture-templates/reading-url-protocol.org deleted file mode 100644 index c9cb092..0000000 --- a/oni-org/capture-templates/reading-url-protocol.org +++ /dev/null @@ -1,6 +0,0 @@ -* READ %:description -:PROPERTIES: -:CREATED: %U -:END: - -[[%:link]] diff --git a/oni-org/capture-templates/reading-url.org b/oni-org/capture-templates/reading-url.org deleted file mode 100644 index 9f51d51..0000000 --- a/oni-org/capture-templates/reading-url.org +++ /dev/null @@ -1,4 +0,0 @@ -* READ %(oni-org-get-url-link (read-from-minibuffer "URL: ")) %^g -:PROPERTIES: -:CREATED: %U -:END: diff --git a/oni-org/capture-templates/task.org b/oni-org/capture-templates/task.org deleted file mode 100644 index 20a4d69..0000000 --- a/oni-org/capture-templates/task.org +++ /dev/null @@ -1,4 +0,0 @@ -* TODO %i%? -:PROPERTIES: -:CREATED: %U -:END: diff --git a/oni-org/oni-org.el b/oni-org/oni-org.el index f401f60..4915c85 100644 --- a/oni-org/oni-org.el +++ b/oni-org/oni-org.el @@ -4,7 +4,7 @@ ;; Author: Tom Willemse ;; Keywords: local -;; Version: 2023.0601.224638 +;; Version: 2023.0602.000455 ;; 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 @@ -601,34 +601,6 @@ 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<\"\"|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=\"\"") - ("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 @@ -704,63 +676,6 @@ 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