summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2015-02-01 18:12:04 -0500
committerKyle Meyer <kyle@kyleam.com>2015-02-02 01:27:27 -0500
commiteb28135a82727f26655a050d04edac3c38907df5 (patch)
tree56aa1c537c74edcc40998ef77cf297a999a12579 /lisp
parent5e42d5434c9370138d6caada9b45f32f3a0973c5 (diff)
downloademacs.d-eb28135a82727f26655a050d04edac3c38907df5.tar.gz
Merge Org capture and agenda sections
Diffstat (limited to 'lisp')
-rw-r--r--lisp/init-org.el46
1 files changed, 21 insertions, 25 deletions
diff --git a/lisp/init-org.el b/lisp/init-org.el
index 1e14ceb..db0964c 100644
--- a/lisp/init-org.el
+++ b/lisp/init-org.el
@@ -242,31 +242,6 @@ to
(define-key ctl-x-4-map "o" 'km/org-switch-to-buffer-other-window)
-;;; Org capture
-
-(setq org-capture-templates
- '(("t" "task" entry (file+headline "~/notes/tasks.org" "Inbox")
- "* TODO %?\n%i")
- ("d" "date" entry (file+headline "~/notes/calendar.org" "Inbox")
- "* %?\n%i")
- ("m" "misc" entry (file+headline "~/notes/misc.org" "Inbox")
- "* %?\n%i")
- ;; Link counterparts
- ("T" "task link" entry (file+headline "~/notes/tasks.org" "Inbox")
- "* TODO %?\n%i\nLink: %a")
- ("D" "date link" entry (file+headline "~/notes/calendar.org" "Inbox")
- "* %?\n%i\nLink: %a")
- ("M" "misc link" entry (file+headline "~/notes/misc.org" "Inbox")
- "* %?\n%i\nLink: %a")
- ;; Clipboard
- ("x" "task clipboard" entry (file+headline "~/notes/tasks.org" "Inbox")
- "* TODO %?\n%x")
- ("X" "misc clipboard" entry (file+headline "~/notes/misc.org" "Inbox")
- "* %?\n%x")))
-
-(key-chord-define-global ",t" 'org-capture)
-
-
;;; Agenda
(setq org-default-notes-file "~/notes/agenda/tasks.org")
@@ -301,6 +276,26 @@ to
(org-agenda-overriding-header "Unscheduled TODO entries: ")))
("p" "Past timestamps" tags "TIMESTAMP<=\"<now>\"")))
+(setq org-capture-templates
+ '(("t" "task" entry (file+headline "~/notes/tasks.org" "Inbox")
+ "* TODO %?\n%i")
+ ("d" "date" entry (file+headline "~/notes/calendar.org" "Inbox")
+ "* %?\n%i")
+ ("m" "misc" entry (file+headline "~/notes/misc.org" "Inbox")
+ "* %?\n%i")
+ ;; Link counterparts
+ ("T" "task link" entry (file+headline "~/notes/tasks.org" "Inbox")
+ "* TODO %?\n%i\nLink: %a")
+ ("D" "date link" entry (file+headline "~/notes/calendar.org" "Inbox")
+ "* %?\n%i\nLink: %a")
+ ("M" "misc link" entry (file+headline "~/notes/misc.org" "Inbox")
+ "* %?\n%i\nLink: %a")
+ ;; Clipboard
+ ("x" "task clipboard" entry (file+headline "~/notes/tasks.org" "Inbox")
+ "* TODO %?\n%x")
+ ("X" "misc clipboard" entry (file+headline "~/notes/misc.org" "Inbox")
+ "* %?\n%x")))
+
(add-hook 'org-agenda-mode-hook 'km/org-agenda-cd-and-read-dir-locals)
(add-hook 'org-agenda-finalize-hook 'km/org-agenda-store-current-span)
@@ -361,6 +356,7 @@ displayed in the agenda."
(org-refile '(4))))
(key-chord-define-global ",a" 'org-agenda)
+(key-chord-define-global ",t" 'org-capture)
(define-key km/global-org-map "a" 'org-agenda)
(define-key km/global-org-map "j" 'km/org-goto-agenda-heading)