Update Org config to use :custom instead of setq calls
This commit is contained in:
parent
42750c7e05
commit
b776127e4c
@ -2630,19 +2630,8 @@ This is a big one; I use a lot of customisation here.
|
|||||||
`(("^[ \t]*\\(?:[-+*]\\|[0-9]+[).]\\)[ \t]+\\(\\(?:\\[@\\(?:start:\\)?[0-9]+\\][ \t]*\\)?\\[\\(?:X\\|\\([0-9]+\\)/\\2\\)\\][^\n]*\n\\)" 12 'org-checkbox-done-text prepend))
|
`(("^[ \t]*\\(?:[-+*]\\|[0-9]+[).]\\)[ \t]+\\(\\(?:\\[@\\(?:start:\\)?[0-9]+\\][ \t]*\\)?\\[\\(?:X\\|\\([0-9]+\\)/\\2\\)\\][^\n]*\n\\)" 12 'org-checkbox-done-text prepend))
|
||||||
'append)
|
'append)
|
||||||
(setq org-directory (expand-file-name "NextCloud/orgmode" user-documents-directory))
|
(setq org-directory (expand-file-name "NextCloud/orgmode" user-documents-directory))
|
||||||
(setq-default org-crypt-key "B0740C4C"
|
(setq-default org-default-notes-file (expand-file-name "notes.org" org-directory)
|
||||||
org-default-notes-file (expand-file-name "notes.org" org-directory)
|
|
||||||
org-agenda-files `(,org-directory)
|
org-agenda-files `(,org-directory)
|
||||||
org-ellipsis "…#"
|
|
||||||
org-startup-folded 'content
|
|
||||||
org-log-done 'time
|
|
||||||
org-src-preserve-indentation t
|
|
||||||
org-log-into-drawer t
|
|
||||||
org-tags-column 0
|
|
||||||
org-startup-indented t
|
|
||||||
org-special-ctrl-a/e t
|
|
||||||
org-return-follows-link t
|
|
||||||
org-src-fontify-natively t
|
|
||||||
org-time-stamp-formats '("<%Y-%m-%d>" . "<%Y-%m-%d %H:%M>")
|
org-time-stamp-formats '("<%Y-%m-%d>" . "<%Y-%m-%d %H:%M>")
|
||||||
org-todo-keywords '((sequence "TODO(t)"
|
org-todo-keywords '((sequence "TODO(t)"
|
||||||
"DOING(w@/!)"
|
"DOING(w@/!)"
|
||||||
@ -2652,41 +2641,26 @@ This is a big one; I use a lot of customisation here.
|
|||||||
"CANCELED(c@/!)"
|
"CANCELED(c@/!)"
|
||||||
"REVIEW(r@/!)"
|
"REVIEW(r@/!)"
|
||||||
"DONE(d@/!)"))
|
"DONE(d@/!)"))
|
||||||
org-todo-keyword-faces '(
|
org-todo-keyword-faces '(("SOMEDAY" . (:foreground "goldenrod"))
|
||||||
("SOMEDAY" . (:foreground "goldenrod"))
|
|
||||||
("CANCELED" . (:foreground "#228b22" :strike-through t)))
|
("CANCELED" . (:foreground "#228b22" :strike-through t)))
|
||||||
org-goto-interface 'outline-path-completion
|
|
||||||
org-goto-max-level 10
|
|
||||||
org-html-checkbox-type 'unicode
|
|
||||||
org-html-checkbox-types
|
org-html-checkbox-types
|
||||||
'((unicode (on . "<span class=\"task-done\">☑</span>")
|
'((unicode (on . "<span class=\"task-done\">☑</span>")
|
||||||
(off . "<span class=\"task-todo\">☐</span>")
|
(off . "<span class=\"task-todo\">☐</span>")
|
||||||
(trans . "<span class=\"task-in-progress\">▣</span>")))
|
(trans . "<span class=\"task-in-progress\">▣</span>")))
|
||||||
org-src-window-setup 'current-window
|
|
||||||
org-pretty-entities t
|
|
||||||
org-pretty-entities-include-sub-superscripts t
|
|
||||||
org-use-speed-commands t
|
|
||||||
org-speed-commands-user '(("m" . org-mark-subtree))
|
org-speed-commands-user '(("m" . org-mark-subtree))
|
||||||
org-hide-leading-stars t
|
|
||||||
org-enforce-todo-dependencies t
|
|
||||||
org-catch-invisible-edits 'show
|
|
||||||
org-log-reschedule 'time
|
|
||||||
org-log-redeadline 'note
|
|
||||||
org-refile-targets '((org-agenda-files :maxlevel . 3))
|
org-refile-targets '((org-agenda-files :maxlevel . 3))
|
||||||
org-refile-use-outline-path 'file
|
org-agenda-custom-commands '(("c" "Simple agenda view"
|
||||||
org-outline-path-complete-in-steps nil
|
((tags "PRIORITY=\"A\""
|
||||||
org-refile-allow-creating-parent-nodes 'confirm
|
((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done))
|
||||||
org-agenda-custom-commands '(("c" "Simple agenda view" ((tags "PRIORITY=\"A\""
|
(org-agenda-overriding-header "High priority unfinished tasks")))
|
||||||
((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done))
|
(agenda "")
|
||||||
(org-agenda-overriding-header "High priority unfinished tasks")))
|
(alltodo ""
|
||||||
(agenda "")
|
((org-agenda-skip-function
|
||||||
(alltodo ""
|
'(or (air-org-skip-subtree-if-habit)
|
||||||
((org-agenda-skip-function
|
(air-org-skip-subtree-if-priority ?A)
|
||||||
'(or (air-org-skip-subtree-if-habit)
|
(gpolonkai/org-skip-subtree-if-state "SOMEDAY")
|
||||||
(air-org-skip-subtree-if-priority ?A)
|
(org-agenda-skip-if nil '(scheduled deadline))))
|
||||||
(gpolonkai/org-skip-subtree-if-state "SOMEDAY")
|
(org-agenda-overriding-header "ALL normal priority tasks"))))
|
||||||
(org-agenda-skip-if nil '(scheduled deadline))))
|
|
||||||
(org-agenda-overriding-header "ALL normal priority tasks"))))
|
|
||||||
((org-agenda-compact-blocks t))))
|
((org-agenda-compact-blocks t))))
|
||||||
org-log-note-clock-out t)
|
org-log-note-clock-out t)
|
||||||
:config
|
:config
|
||||||
@ -2699,6 +2673,8 @@ This is a big one; I use a lot of customisation here.
|
|||||||
|
|
||||||
;; Handle org-protocol:// links
|
;; Handle org-protocol:// links
|
||||||
(require 'org-protocol)
|
(require 'org-protocol)
|
||||||
|
;; Make it possible to encrypt headings
|
||||||
|
(require 'org-crypt)
|
||||||
|
|
||||||
;; Set up capture templates for blog posts and GT2 related notes
|
;; Set up capture templates for blog posts and GT2 related notes
|
||||||
(add-to-list 'org-capture-templates
|
(add-to-list 'org-capture-templates
|
||||||
@ -2731,6 +2707,33 @@ This is a big one; I use a lot of customisation here.
|
|||||||
(file+headline (lambda () (expand-file-name "index.org" org-directory)) "Captures")
|
(file+headline (lambda () (expand-file-name "index.org" org-directory)) "Captures")
|
||||||
"** %:description\n:PROPERTIES:\n:SOURCE: %:link\n:END:\n\n%:initial"
|
"** %:description\n:PROPERTIES:\n:SOURCE: %:link\n:END:\n\n%:initial"
|
||||||
:empty-lines 1))
|
:empty-lines 1))
|
||||||
|
:custom
|
||||||
|
(org-log-into-drawer t)
|
||||||
|
(org-ellipsis "…#")
|
||||||
|
(org-startup-folded 'content)
|
||||||
|
(org-log-done 'time)
|
||||||
|
(org-src-preserve-indentation t)
|
||||||
|
(org-tags-column 0)
|
||||||
|
(org-startup-indented t)
|
||||||
|
(org-special-ctrl-a/e t)
|
||||||
|
(org-return-follows-link t)
|
||||||
|
(org-src-fontify-natively t)
|
||||||
|
(org-goto-interface 'outline-path-completion)
|
||||||
|
(org-goto-max-level 10)
|
||||||
|
(org-html-checkbox-type 'unicode)
|
||||||
|
(org-src-window-setup 'current-window)
|
||||||
|
(org-pretty-entities t)
|
||||||
|
(org-pretty-entities-include-sub-superscripts t)
|
||||||
|
(org-use-speed-commands t)
|
||||||
|
(org-hide-leading-stars t)
|
||||||
|
(org-enforce-todo-dependencies t)
|
||||||
|
(org-catch-invisible-edits 'show)
|
||||||
|
(org-log-reschedule 'time)
|
||||||
|
(org-log-redeadline 'note)
|
||||||
|
(org-refile-use-outline-path 'file)
|
||||||
|
(org-outline-path-complete-in-steps nil)
|
||||||
|
(org-refile-allow-creating-parent-nodes 'confirm)
|
||||||
|
(org-crypt-key "B0740C4C")
|
||||||
:hook
|
:hook
|
||||||
(ediff-select . f-ediff-org-unfold-tree-element)
|
(ediff-select . f-ediff-org-unfold-tree-element)
|
||||||
(ediff-unselect . f-ediff-org-fold-tree)
|
(ediff-unselect . f-ediff-org-fold-tree)
|
||||||
|
Loading…
Reference in New Issue
Block a user