diff options
author | Tom Willemsen | 2012-12-05 00:44:09 +0100 |
---|---|---|
committer | Tom Willemsen | 2012-12-05 00:44:09 +0100 |
commit | 6278e2e634b05027d31220afd328a9f7fe77c6f1 (patch) | |
tree | 3dbec6a3880ca980694def0d737a477b68254691 /.emacs.d/site-lisp/org-init.el | |
parent | fa717d86a07d009ab324a40cd8dbf539e61a9da3 (diff) | |
parent | 15adc911da3f5b527c74b6bb67d677898d6a173e (diff) | |
download | dotfiles-6278e2e634b05027d31220afd328a9f7fe77c6f1.tar.gz dotfiles-6278e2e634b05027d31220afd328a9f7fe77c6f1.zip |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/site-lisp/oni.el
Diffstat (limited to '.emacs.d/site-lisp/org-init.el')
-rw-r--r-- | .emacs.d/site-lisp/org-init.el | 44 |
1 files changed, 10 insertions, 34 deletions
diff --git a/.emacs.d/site-lisp/org-init.el b/.emacs.d/site-lisp/org-init.el index 6f28432..3bacaad 100644 --- a/.emacs.d/site-lisp/org-init.el +++ b/.emacs.d/site-lisp/org-init.el @@ -34,24 +34,13 @@ '(org-crypt-use-before-save-magic)) (setq org-agenda-custom-commands - '(("pa" "Avandu" tags-todo "slug=\"avandu\"") - ("pb" "Blog" tags-todo "slug=\"blog\"") - ("pc" "Configuration" tags-todo "slug=\"configuration\"") - ("pd" "dispass.el" tags-todo "slug=\"dispass.el\"") - ("pD" "DVDroid" tags-todo "slug=\"dvdroid\"") - ("pe" "Eye on Manga" tags-todo "slug=\"eye-on-manga\"") - ("pG" "gDisPass" tags-todo "slug=\"gdispass\"") - ("pg" "gitto" tags-todo "slug=\"gitto\"") - ("pi" "Ideas" tags-todo "slug=\"ideas\"") - ("pM" "Maintenance" tags-todo "slug=\"maintenance\"") - ("pme" "Metal Express Radio.el" tags-todo - "slug=\"metal-express-radio.el\"") - ("pmo" "Mode Icons" tags-todo "slug=\"mode-icons\"") - ("pmy1" "myAethon" tags-todo "slug=\"myaethon\"") - ("pmy2" "myAethon2" tags-todo "slug=\"myaethon2\"") - ("ps" "Sawfish Naquadah theme" tags-todo - "slug=\"sawfish-naquadah-theme\"") - ("w" "Work todo." tags-todo "work"))) + '(("w" "Work todo." tags-todo "work"))) +(setq org-agenda-prefix-format + '((agenda . " %i %-12:c%?-12t% s") + (timeline . " % s") + (todo . " %i %-12:c %(concat \"[ \"(org-format-outline-path (org-get-outline-path)) \" ]\") ") + (tags . " %i %-12:c %(concat \"[ \"(org-format-outline-path (org-get-outline-path)) \" ]\") ") + (search . " %i %-12:c"))) (setq org-agenda-sorting-strategy '((agenda habit-down time-up priority-down category-keep) (todo priority-down category-keep) @@ -61,22 +50,8 @@ (setq org-capture-templates '(("t" "Task" entry (file "~/documents/org/tasks") "* TODO %?") - ("h" "Habit" entry (file "") - (concat "* TODO %^{Description}\n" - " SCHEDULED: %^T\n" - " :PROPERTIES:\n" - " :STYLE: habit\n" - " :END:") - :immediate-finish t) - ("l" "Log" entry (file+headline "" "notes") - (concat "* %n %<%d-%m-%Y %H:%M:%S>\n" - " %a\n\n" - " %?") - :prepend t :empty-lines 1) - ("a" "Appointment" entry (file+headline "" "appointments") - "* %^{Description} %^T" :immediate-finish t) - ("b" "Bookmark" entry (file "~/documents/org/misc/bookmarks.org") - "* %c\n\n %:initial"))) + ("T" "Linked task" entry (file "~/documents/org/tasks") + "* TODO %?\n\n %a"))) (setq org-contacts-files '("~/documents/org/misc/contacts.org")) (setq org-directory (expand-file-name "~/documents/org")) (setq org-agenda-files @@ -85,6 +60,7 @@ ,(concat org-directory "/misc/contacts.org") ,(concat org-directory "/misc/bookmarks.org")) org-agenda-files)) +(setq org-agenda-show-outline-path nil) (setq org-agenda-todo-ignore-deadlines 'far) (setq org-agenda-todo-ignore-scheduled t) (setq org-default-notes-file (concat org-directory "/org")) |