diff options
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/.emacs.d/init.el | 3 | ||||
| -rw-r--r-- | emacs/.emacs.d/org-mode.el | 94 |
2 files changed, 28 insertions, 69 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 08b4bce..2105459 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -55,8 +55,7 @@ (("C-c a" . org-agenda)) :config (org-super-agenda-mode 1) - (load-file "~/.emacs.d/org-mode.el") - (load-if-exists "~/.emacs.d/org-mode.local.el")) + (load-file "~/.emacs.d/org-mode.el")) ;; --- PROJECTS --- (use-package projectile diff --git a/emacs/.emacs.d/org-mode.el b/emacs/.emacs.d/org-mode.el index 2f691ae..634524b 100644 --- a/emacs/.emacs.d/org-mode.el +++ b/emacs/.emacs.d/org-mode.el @@ -8,84 +8,47 @@ (string= title "DEADLINE"))) (format-time-string "%Y-%m-%d" (org-time-string-to-time value)))) -(defun bab/org-agenda () - "My own custom org agenda" - (interactive) - (org-ql-search (org-agenda-files) - '(and - (todo) - (not (done)) ;; maybe allow entries that were completed today? - (not (org-entry-blocked-p)) - (or - (deadline auto) ;; deadline near enough to care about - (not (deadline)) ;; or no deadline at all - (scheduled) - (ts-active :on today))) - :title "My Agenda" - :sort '(priority deadline) - :super-groups - '((:name "Scheduled Later" - :scheduled future - :order 8) - (:name "Overdue" - :deadline past) - (:name "Today" - :deadline today - :scheduled past - :scheduled today) - (:name "Some Day" - :deadline nil - :order 9) - (:name "Waiting" - :todo "WAIT" - :order 8) - (:auto-property "TYPE") - (:name "Upcoming" - :anything t) - ))) - -(defun bab/org-agenda-test () - "My own custom org agenda" - (interactive) - (org-ql-search (org-agenda-files) - '(and - (not (done)) ;; maybe allow entries that were completed today? - (not (org-entry-blocked-p)) - (or - (deadline auto) ;; deadline near enough to care about - (not (deadline)) ;; or no deadline at all - (scheduled :to today) - (ts-active :on today))) - :title "My Agenda - TEST" - :sort '(priority deadline) - :super-groups - '((:name "FIRST" - :deadline past - :deadline today)))) - (setq org-agenda-custom-commands '(("w" "Work Agenda" ((agenda "" ((org-agenda-span 1) (org-agenda-sorting-strategy '(time-up scheduled-down priority-down deadline-up)) (org-super-agenda-groups - '((:name "Waiting" :todo "WAIT" :order 9) + '((:todo "WAIT" :order 9) (:anything t))))) - (org-ql-block '(and (tags "@work") - (todo "WAIT")) - ((org-ql-block-header "Waiting"))) - (org-ql-block '(and (tags "@work") - (todo "TLG")) + (org-ql-block '(todo "TLG") ((org-ql-block-header "Time Logging"))) - (org-ql-block '(and (tags "@work") - (todo) + (org-ql-block '(and (todo) (not (todo "TLG")) (not (deadline)) (not (scheduled))) ((org-ql-block-header "Some Day")))) - ((org-agenda-tag-filter-preset '("+@work"))) + ((org-agenda-files '("~/org/tasks/work"))) ))) +(setq org-capture-templates + '(("d" "Development" entry (file "~/org/tasks/work/dev.org") " +* %^{Description} + :PROPERTIES: + :ORDERED: + :MERGE_REQUEST: ???%? + :END: +** TODO [#C] DEV: %\\1 +** TODO [#B] PQA1: %\\1 +" :empty-lines 1) + ("D" "DLG Development" entry (file "~/org/tasks/work/dev.org") " +* %^{Description} + :PROPERTIES: + :ORDERED: + :DLG: ???%? + :END: +** TODO [#C] DEV: %\\1 +** TODO [#B] PQA1: %\\1 +** TODO [#B] QA1: %\\1 +** TODO [#A] PQA2: %\\1 +** TODO [#A] QA2: %\\1 +" :empty-lines 1))) + ;; --- CONFIGURATION --- (define-key global-map "\C-cc" 'org-capture) @@ -105,9 +68,6 @@ ("MEETING" . (:foreground "aquamarine")) ("CANCELED" . (:foreground "snow4"))) - ;; Blank capture templates, so local config can add to it - org-capture-templates () - ;; Agenda org-agenda-files '("~/org/tasks/home" "~/org/tasks/work" "~/org/tasks") org-agenda-overriding-columns-format "%1PRIORITY %DEADLINE %TODO %CLOCKSUM %80ITEM" |