diff --git a/.envrc b/.envrc
index f95eed11e..dd1aa4496 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1,2 @@
 export DOTFILES=~/dotfiles
+export ORG_DIRECTORY=~/Dropbox/org
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-org.el b/configs/shared/.emacs.d/wpc/packages/wpc-org.el
index 674354097..fb270336e 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-org.el
+++ b/configs/shared/.emacs.d/wpc/packages/wpc-org.el
@@ -6,6 +6,20 @@
 
 ;;; Code:
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Dependencies
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(require 'prelude)
+(require 'f)
+
+;; TODO: Define function like env/set? to handle this.
+(prelude/assert (f-exists? (getenv "ORG_DIRECTORY")))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Configuration
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 ;; TODO: figure out how to nest this in (use-package org ...)
 (setq org-capture-templates
       `(
@@ -31,6 +45,7 @@
          "* TODO %? ")
 
         ))
+
 (evil-set-initial-state 'org-mode 'normal)
 
 (use-package org
diff --git a/configs/shared/.profile b/configs/shared/.profile
index 2f201c37d..57f87751b 100644
--- a/configs/shared/.profile
+++ b/configs/shared/.profile
@@ -31,14 +31,13 @@ export RUST_SRC_PATH
 
 # TODO: Decide if clipmenu is compatible with EXWM.
 # Ensure clipmenu uses rofi instead of dmenu
+# TODO: Remove this after fully supporting Emacs client for clipmenu.
 export CM_LAUNCHER=rofi
 
 # Application configuration
 export FZF_DEFAULT_COMMAND='fd --hidden --follow --exclude ".git"'
 export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 
-export ORG_DIRECTORY="$HOME/Dropbox/org"
-
 # Prevent compton from fading to the lock screen. This also prevents the white
 # overlay that compton was causing to appear. Still unsure why that was
 # happening.