diff options
| author | William Carroll <wpcarro@gmail.com> | 2020-01-17T10·41+0000 |
|---|---|---|
| committer | William Carroll <wpcarro@gmail.com> | 2020-01-17T10·56+0000 |
| commit | e197dc5aba1072b1f584453f9042d7c23e825318 (patch) | |
| tree | aba539d967dedc8707b8e1e8f82e2a768c1ee67b /configs/shared/.emacs.d/wpc/packages/wpc-org.el | |
| parent | 2108ee933a57b88267b6f2365e70d31dda50a57f (diff) | |
Re-enable wpc-org with direnv support
After moving some environment variables out of `~/.profile` and into a `.envrc` file, I broke some of my modules because Emacs, which is started in `~/.xsessionrc.shared`, is started from outside of the `.envrc` scope. Thankfully someone wrote an excellent Emacs integration with `direnv` so now the world keeps turning and it is even more beautiful than it was previously.
Diffstat (limited to 'configs/shared/.emacs.d/wpc/packages/wpc-org.el')
| -rw-r--r-- | configs/shared/.emacs.d/wpc/packages/wpc-org.el | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-org.el b/configs/shared/.emacs.d/wpc/packages/wpc-org.el index fb270336ec2f..7dfe94520261 100644 --- a/configs/shared/.emacs.d/wpc/packages/wpc-org.el +++ b/configs/shared/.emacs.d/wpc/packages/wpc-org.el @@ -12,9 +12,10 @@ (require 'prelude) (require 'f) +(require 'maybe) -;; TODO: Define function like env/set? to handle this. -(prelude/assert (f-exists? (getenv "ORG_DIRECTORY"))) +(prelude/assert (and (maybe/some? (getenv "ORG_DIRECTORY")) + (f-exists? (getenv "ORG_DIRECTORY")))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Configuration @@ -22,29 +23,22 @@ ;; TODO: figure out how to nest this in (use-package org ...) (setq org-capture-templates - `( - - ("w" "work" entry (file+headline + `(("w" "work" entry (file+headline ,(f-join (getenv "ORG_DIRECTORY") "work.org") "Tasks") "* TODO %?") - ("p" "personal" entry (file+headline ,(f-join (getenv "ORG_DIRECTORY") "personal.org") "Tasks") "* TODO %? ") - ("i" "ideas" entry (file+headline ,(f-join (getenv "ORG_DIRECTORY") "ideas.org") "Tasks") "* %? ") - ("s" "shopping list" entry (file+headline ,(f-join (getenv "ORG_DIRECTORY") "shopping.org") "Items") - "* TODO %? ") - - )) + "* TODO %? "))) (evil-set-initial-state 'org-mode 'normal) |