From ddd5d3a7a0653a1c15bd651dbb36fe22adfd0ff5 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Mon, 20 Jan 2020 10:13:02 +0000 Subject: Drop support for ORG_DIRECTORY in envrc When Emacs starts it's called from xsessionrc.shared, which is called outside of direnv's .envrc scope. Because of this variables defined therein, like ORG_DIRECTORY, are undefined and prevent Emacs from initializing. I'm hard-coding the `org-directory` variable for now and removing references to `(getenv "ORG_DIRECTORY")`. --- configs/shared/.emacs.d/wpc/packages/wpc-org.el | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'configs/shared/.emacs.d/wpc/packages/wpc-org.el') 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: -- cgit 1.4.1