From a16687e8023a8cc40263729c7537b272cd5469a4 Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Mon, 23 Sep 2019 13:53:40 +0200 Subject: [PATCH] Continue moving Org settings to the use-package :custom block --- configuration.org | 96 ++++++++++++++++++++++++----------------------- 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/configuration.org b/configuration.org index 4f418b4..107ef04 100644 --- a/configuration.org +++ b/configuration.org @@ -2710,23 +2710,7 @@ This is a big one; I use a lot of customisation here. org-html-checkbox-types '((unicode (on . "☑") (off . "☐") - (trans . "▣"))) - org-speed-commands-user '(("m" . org-mark-subtree)) - org-refile-targets '((org-agenda-files :maxlevel . 3)) - org-agenda-custom-commands '(("c" "Simple agenda view" - ((tags "PRIORITY=\"A\"" - ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done)) - (org-agenda-overriding-header "High priority unfinished tasks"))) - (agenda "") - (alltodo "" - ((org-agenda-skip-function - '(or (air-org-skip-subtree-if-habit) - (air-org-skip-subtree-if-priority ?A) - (gpolonkai/org-skip-subtree-if-state "SOMEDAY") - (org-agenda-skip-if nil '(scheduled deadline)))) - (org-agenda-overriding-header "ALL normal priority tasks")))) - ((org-agenda-compact-blocks t)))) - org-log-note-clock-out t) + (trans . "▣")))) :config ;; Load the markdown exporter (require 'ox-md) @@ -2741,36 +2725,6 @@ This is a big one; I use a lot of customisation here. (require 'org-crypt) ;; Set up capture templates for blog posts and GT2 related notes - (add-to-list 'org-capture-templates - '("p" "Blog post" entry - (file+olp+datetree (lambda () (expand-file-name "blog.org" org-directory))) - "* %^{Title} :blog:\n:PROPERTIES:\n:CREATED: %T\n:END:\n\n%i%?")) - (add-to-list 'org-capture-templates - '("g" "GT2 note" entry - (file+headline (lambda () (expand-file-name "gt2-notes.org" org-directory)) "Captures") - "** %^{Title}\n:PROPERTIES:\n:CREATED: %T\n:END:\n\n%a\n\n%i%?")) - (add-to-list 'org-capture-templates - '("c" "Item to current Clocked Task" item - (clock) - "%i%?" - :empty-lines 1)) - (add-to-list 'org-capture-templates - '("K" "Kill-ring to Current Clocked Task" plain - (clock) - "%c" - :immediate-finish t - :empty-lines 1)) - (add-to-list 'org-capture-templates - '("R" "Region to Current Clocked Task" plain - (clock) - "%i" - :immediate-finish t - :empty-lines 1)) - (add-to-list 'org-capture-templates - '("L" "Org-protocol capture" entry - (file+headline (lambda () (expand-file-name "index.org" org-directory)) "Captures") - "** %:description\n:PROPERTIES:\n:SOURCE: %:link\n:END:\n\n%:initial" - :empty-lines 1)) :custom (org-log-into-drawer t) (org-ellipsis "…#") @@ -2798,6 +2752,54 @@ This is a big one; I use a lot of customisation here. (org-outline-path-complete-in-steps nil) (org-refile-allow-creating-parent-nodes 'confirm) (org-crypt-key "B0740C4C") + (org-speed-commands-user '(("m" . org-mark-subtree))) + (org-refile-targets '((org-agenda-files :maxlevel . 3))) + (org-agenda-custom-commands '(("c" "Simple agenda view" + ((tags "PRIORITY=\"A\"" + ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done)) + (org-agenda-overriding-header "High priority unfinished tasks"))) + (agenda "") + (alltodo "" + ((org-agenda-skip-function + '(or (air-org-skip-subtree-if-habit) + (air-org-skip-subtree-if-priority ?A) + (gpolonkai/org-skip-subtree-if-state "SOMEDAY") + (org-agenda-skip-if nil '(scheduled deadline)))) + (org-agenda-overriding-header "ALL normal priority tasks")))) + ((org-agenda-compact-blocks t))))) + (org-log-note-clock-out t) + (org-capture-templates (("L" "Org-protocol capture" entry + (file+headline + (lambda () + (expand-file-name "index.org" org-directory)) + "Captures") + "** %:description\n:PROPERTIES:\n:SOURCE: %:link\n:END:\n\n%:initial" + :empty-lines 1) + ("R" "Region to Current Clocked Task" plain + (clock) + "%i" + :immediate-finish t + :empty-lines 1) + ("K" "Kill-ring to Current Clocked Task" plain + (clock) + "%c" + :immediate-finish t + :empty-lines 1) + ("c" "Item to current Clocked Task" item + (clock) + "%i%?" + :empty-lines 1) + ("g" "GT2 note" entry + (file+headline + (lambda () + (expand-file-name "gt2-notes.org" org-directory)) + "Captures") + "** %^{Title}\n:PROPERTIES:\n:CREATED: %T\n:END:\n\n%a\n\n%i%?") + ("p" "Blog post" entry + (file+olp+datetree + (lambda () + (expand-file-name "blog.org" org-directory))) + "* %^{Title} :blog:\n:PROPERTIES:\n:CREATED: %T\n:END:\n\n%i%?"))) :hook (ediff-select . f-ediff-org-unfold-tree-element) (ediff-unselect . f-ediff-org-fold-tree)