diff options
| -rw-r--r-- | .envrc | 1 | ||||
| -rw-r--r-- | configs/shared/.emacs.d/wpc/bookmark.el | 1 | ||||
| -rw-r--r-- | configs/shared/.emacs.d/wpc/packages/wpc-org.el | 21 |
3 files changed, 9 insertions, 14 deletions
diff --git a/.envrc b/.envrc index dd1aa44963ec..f95eed11e3a7 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1 @@ export DOTFILES=~/dotfiles -export ORG_DIRECTORY=~/Dropbox/org diff --git a/configs/shared/.emacs.d/wpc/bookmark.el b/configs/shared/.emacs.d/wpc/bookmark.el index 7f912f1b1734..3a49b7cfd896 100644 --- a/configs/shared/.emacs.d/wpc/bookmark.el +++ b/configs/shared/.emacs.d/wpc/bookmark.el @@ -47,7 +47,6 @@ Otherwise, open with `counsel-find-file'." (defconst bookmark/whitelist (list - ;; TODO: Consider using (getenv "ORG_DIRECTORY") (make-bookmark :label "org" :path "~/Dropbox/org" :kbd "o") diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-org.el b/configs/shared/.emacs.d/wpc/packages/wpc-org.el index 7dfe94520261..3263fb50380c 100644 --- a/configs/shared/.emacs.d/wpc/packages/wpc-org.el +++ b/configs/shared/.emacs.d/wpc/packages/wpc-org.el @@ -10,33 +10,30 @@ ;; Dependencies ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(require 'prelude) (require 'f) -(require 'maybe) - -(prelude/assert (and (maybe/some? (getenv "ORG_DIRECTORY")) - (f-exists? (getenv "ORG_DIRECTORY")))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Configuration ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(setq org-directory "~/Dropbox/org") + ;; TODO: figure out how to nest this in (use-package org ...) (setq org-capture-templates `(("w" "work" entry (file+headline - ,(f-join (getenv "ORG_DIRECTORY") "work.org") + ,(f-join org-directory "work.org") "Tasks") "* TODO %?") ("p" "personal" entry (file+headline - ,(f-join (getenv "ORG_DIRECTORY") "personal.org") + ,(f-join org-directory "personal.org") "Tasks") "* TODO %? ") ("i" "ideas" entry (file+headline - ,(f-join (getenv "ORG_DIRECTORY") "ideas.org") + ,(f-join org-directory "ideas.org") "Tasks") "* %? ") ("s" "shopping list" entry (file+headline - ,(f-join (getenv "ORG_DIRECTORY") "shopping.org") + ,(f-join org-directory "shopping.org") "Items") "* TODO %? "))) @@ -55,9 +52,9 @@ (setq org-startup-folded nil) (setq org-todo-keywords '((sequence "TODO" "BLOCKED" "DONE"))) - (setq org-default-notes-file (f-join (getenv "ORG_DIRECTORY") "notes.org")) - (setq org-agenda-files (list (f-join (getenv "ORG_DIRECTORY") "work.org") - (f-join (getenv "ORG_DIRECTORY") "personal.org"))) + (setq org-default-notes-file (f-join org-directory "notes.org")) + (setq org-agenda-files (list (f-join org-directory "work.org") + (f-join org-directory "personal.org"))) ;; TODO: troubleshoot why `wpc/kbds-minor-mode', `wpc/ensure-kbds' aren't ;; enough to override the following KBDs. See this discussion for more context ;; on where the idea came from: |