From e197dc5aba1072b1f584453f9042d7c23e825318 Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Fri, 17 Jan 2020 10:41:01 +0000
Subject: 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.
---
 configs/shared/.emacs.d/wpc/packages/wpc-misc.el |  5 +++++
 configs/shared/.emacs.d/wpc/packages/wpc-org.el  | 16 +++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'configs/shared/.emacs.d')

diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-misc.el b/configs/shared/.emacs.d/wpc/packages/wpc-misc.el
index 0540b6251fb3..b78ccaaeab06 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-misc.el
+++ b/configs/shared/.emacs.d/wpc/packages/wpc-misc.el
@@ -90,6 +90,11 @@
 ;; alternative to help
 (use-package helpful)
 
+;; Emacs integration with direnv
+(use-package direnv
+  :config
+  (direnv-mode))
+
 ;; Superior Elisp library for working with dates and times.
 ;; TODO: Put this where my other installations for dash.el, s.el, a.el, and
 ;; other utility Elisp libraries are located.
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)
 
-- 
cgit 1.4.1