ndwarshuis
/
emacs-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added birthdays and holidays

This commit is contained in:
petrucci4prez 2018-06-21 22:35:03 -04:00
parent eefb90e8ff
commit af70878c81
2 changed files with 69 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
conf.el
View File

@ -476,18 +476,24 @@ event of an error or nonlocal exit."
(setq org-agenda-compact-blocks t) (setq org-agenda-compact-blocks t)
(setq org-agenda-window-setup 'current-window) (setq org-agenda-window-setup 'current-window)
(setq holiday-bahai-holidays nil)
(setq holiday-hebrew-holidays nil)
(setq holiday-islamic-holidays nil)
(defun nd/get-date-property (date-property) (defun nd/get-date-property (date-property)
"Helper function to get the date property and convert to a number. "Helper function to get the date property and convert to a number.
If it does not have a date, it will return nil." If it does not have a date, it will return nil."
(let ((timestamp (org-entry-get nil date-property))) (let ((timestamp (org-entry-get nil date-property)))
(if timestamp (float-time (date-to-time timestamp))))) (if timestamp (float-time (date-to-time timestamp)))))
(defun nd/heading-compare-timestamp (timestamp-fun &optional ref-time future) (defun nd/heading-compare-timestamp (timestamp-fun
"helper function that returns the timestamp (returned by timestamp-fun on the &optional ref-time future)
current header) if timestamp is futher back in time compared to a ref-time "helper function that returns the timestamp (returned by
(default to 0 which is now, where negative is past an positive is future). timestamp-fun on the current header) if timestamp is futher back in
If the future flag is set, returns timestamp if it is in the future time compared to a ref-time (default to 0 which is now, where negative
compared to ref-time. Returns nil if no timestamp is found." is past an positive is future). If the future flag is set, returns
timestamp if it is in the future compared to ref-time. Returns nil if
no timestamp is found."
(let* ((timestamp (funcall timestamp-fun)) (let* ((timestamp (funcall timestamp-fun))
(ref-time (or ref-time 0))) (ref-time (or ref-time 0)))
(if (and timestamp (if (and timestamp
@ -509,7 +515,10 @@ If the future flag is set, returns timestamp if it is in the future
(nd/get-date-property "CLOSED")) (nd/get-date-property "CLOSED"))
(defun nd/is-stale-heading-p () (defun nd/is-stale-heading-p ()
(nd/heading-compare-timestamp 'nd/is-timestamped-heading-p)) (nd/heading-compare-timestamp
(lambda () (let ((ts (org-entry-get nil "TIMESTAMP")))
(if (and ts (not (find ?+ ts)))
(float-time (date-to-time ts)))))))
(defun nd/is-fresh-heading-p () (defun nd/is-fresh-heading-p ()
(nd/heading-compare-timestamp 'nd/is-timestamped-heading-p nil t)) (nd/heading-compare-timestamp 'nd/is-timestamped-heading-p nil t))
@ -1140,7 +1149,7 @@ set as a text property for further sorting"
(org-agenda-skip-function '(nd/skip-projects-without-statuscode ,statuscode)) (org-agenda-skip-function '(nd/skip-projects-without-statuscode ,statuscode))
;;(org-agenda-before-sorting-filter-function 'nd/sorting-filter-demo) ;;(org-agenda-before-sorting-filter-function 'nd/sorting-filter-demo)
;; (nd/apply-statuscodes t) ;; (nd/apply-statuscodes t)
(org-agenda-prefix-format '((tags . " %-12:c %(format \"xxxx: \")"))) ;; (org-agenda-prefix-format '((tags . " %-12:c %(format \"xxxx: \")")))
(org-agenda-sorting-strategy '(category-keep))))) (org-agenda-sorting-strategy '(category-keep)))))
(let* ((actionable "-NA-REFILE-%inc") (let* ((actionable "-NA-REFILE-%inc")
@ -1154,7 +1163,8 @@ set as a text property for further sorting"
(setq org-agenda-custom-commands (setq org-agenda-custom-commands
`(("t" `(("t"
"Task View" "Task View"
((agenda "" (org-agenda-skip-function '(nd/skip-headings-with-tags '("%inc")))) ((agenda "" ((org-agenda-skip-function '(nd/skip-headings-with-tags '("%inc")))
(org-agenda-include-diary t)))
,(nd/agenda-base-task-cmd act-no-rep-match ,(nd/agenda-base-task-cmd act-no-rep-match
"Project Tasks" "Project Tasks"
''nd/skip-non-project-tasks ''nd/skip-non-project-tasks

30
conf.org
View File

@ -686,6 +686,12 @@ There are several types of tags I use:
(setq org-agenda-compact-blocks t) (setq org-agenda-compact-blocks t)
(setq org-agenda-window-setup 'current-window) (setq org-agenda-window-setup 'current-window)
#+END_SRC #+END_SRC
*** holidays and birthdays
#+BEGIN_SRC emacs-lisp
(setq holiday-bahai-holidays nil)
(setq holiday-hebrew-holidays nil)
(setq holiday-islamic-holidays nil)
#+END_SRC
*** task helper functions *** task helper functions
These are the building blocks for skip functions. These are the building blocks for skip functions.
**** timestamps **** timestamps
@ -697,12 +703,14 @@ Each of these returns the timestamp if found.
(let ((timestamp (org-entry-get nil date-property))) (let ((timestamp (org-entry-get nil date-property)))
(if timestamp (float-time (date-to-time timestamp))))) (if timestamp (float-time (date-to-time timestamp)))))
(defun nd/heading-compare-timestamp (timestamp-fun &optional ref-time future) (defun nd/heading-compare-timestamp (timestamp-fun
"helper function that returns the timestamp (returned by timestamp-fun on the &optional ref-time future)
current header) if timestamp is futher back in time compared to a ref-time "helper function that returns the timestamp (returned by
(default to 0 which is now, where negative is past an positive is future). timestamp-fun on the current header) if timestamp is futher back in
If the future flag is set, returns timestamp if it is in the future time compared to a ref-time (default to 0 which is now, where negative
compared to ref-time. Returns nil if no timestamp is found." is past an positive is future). If the future flag is set, returns
timestamp if it is in the future compared to ref-time. Returns nil if
no timestamp is found."
(let* ((timestamp (funcall timestamp-fun)) (let* ((timestamp (funcall timestamp-fun))
(ref-time (or ref-time 0))) (ref-time (or ref-time 0)))
(if (and timestamp (if (and timestamp
@ -724,7 +732,10 @@ Each of these returns the timestamp if found.
(nd/get-date-property "CLOSED")) (nd/get-date-property "CLOSED"))
(defun nd/is-stale-heading-p () (defun nd/is-stale-heading-p ()
(nd/heading-compare-timestamp 'nd/is-timestamped-heading-p)) (nd/heading-compare-timestamp
(lambda () (let ((ts (org-entry-get nil "TIMESTAMP")))
(if (and ts (not (find ?+ ts)))
(float-time (date-to-time ts)))))))
(defun nd/is-fresh-heading-p () (defun nd/is-fresh-heading-p ()
(nd/heading-compare-timestamp 'nd/is-timestamped-heading-p nil t)) (nd/heading-compare-timestamp 'nd/is-timestamped-heading-p nil t))
@ -1435,7 +1446,7 @@ set as a text property for further sorting"
(org-agenda-skip-function '(nd/skip-projects-without-statuscode ,statuscode)) (org-agenda-skip-function '(nd/skip-projects-without-statuscode ,statuscode))
;;(org-agenda-before-sorting-filter-function 'nd/sorting-filter-demo) ;;(org-agenda-before-sorting-filter-function 'nd/sorting-filter-demo)
;; (nd/apply-statuscodes t) ;; (nd/apply-statuscodes t)
(org-agenda-prefix-format '((tags . " %-12:c %(format \"xxxx: \")"))) ;; (org-agenda-prefix-format '((tags . " %-12:c %(format \"xxxx: \")")))
(org-agenda-sorting-strategy '(category-keep))))) (org-agenda-sorting-strategy '(category-keep)))))
(let* ((actionable "-NA-REFILE-%inc") (let* ((actionable "-NA-REFILE-%inc")
@ -1449,7 +1460,8 @@ set as a text property for further sorting"
(setq org-agenda-custom-commands (setq org-agenda-custom-commands
`(("t" `(("t"
"Task View" "Task View"
((agenda "" (org-agenda-skip-function '(nd/skip-headings-with-tags '("%inc")))) ((agenda "" ((org-agenda-skip-function '(nd/skip-headings-with-tags '("%inc")))
(org-agenda-include-diary t)))
,(nd/agenda-base-task-cmd act-no-rep-match ,(nd/agenda-base-task-cmd act-no-rep-match
"Project Tasks" "Project Tasks"
''nd/skip-non-project-tasks ''nd/skip-non-project-tasks