emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tools/direnv: refactor

Browse source 
Our advice is no longer needed, now that envrc provides
envrc-propagate-environment. We also cache the executable path (benefits
TRAMP users, in particular).
This commit is contained in:
Henrik Lissner 2021-07-06 02:19:05 -04:00
parent 3ccc12c16b
commit 6a23c6142b
1 changed files with 8 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
modules/tools/direnv/config.el
View file

@ -2,7 +2,7 @@
(use-package! envrc (use-package! envrc
:when (executable-find "direnv") :when (executable-find "direnv")
:after-call doom-first-file-hook :hook (doom-first-file . envrc-global-mode)
:config :config
(add-to-list 'doom-debug-variables 'envrc-debug) (add-to-list 'doom-debug-variables 'envrc-debug)
@ -26,27 +26,12 @@
(defadvice! +direnv--fail-gracefully-a (&rest _) (defadvice! +direnv--fail-gracefully-a (&rest _)
"Don't try to use direnv if the executable isn't present." "Don't try to use direnv if the executable isn't present."
:before-while #'envrc-mode :before-while #'envrc-mode
(or (executable-find "direnv") (or (get 'envrc-mode 'direnv-executable)
(put 'envrc-mode 'direnv-executable (executable-find "direnv" t))
(ignore (doom-log "Couldn't find direnv executable")))) (ignore (doom-log "Couldn't find direnv executable"))))
;; HACK envrc-mode only affects the current buffer's environment, which is ;; Ensure babel's execution environment matches the host buffer's.
;; generally what we want, except when we're running babel blocks in (advice-add #'org-babel-execute-src-block :around #'envrc-propagate-environment)
;; org-mode, because there may be state or envvars those blocks need to
;; read. In order to perpetuate the org buffer's environment into the ;; Make sure any envrc changes are propagated after a `doom/reload'
;; execution of the babel block we need to temporarily change the global (add-hook 'doom-after-reload-hook #'envrc-reload-all))
;; environment. Let's hope it runs quickly enough that its effects aren't
;; felt in other buffers in the meantime!
(defvar +direnv--old-environment nil)
(defadvice! +direnv-persist-environment-a (orig-fn &rest args)
:around #'org-babel-execute-src-block
(if +direnv--old-environment
(apply orig-fn args)
(setq-default +direnv--old-environment
(cons (default-value 'process-environment)
(default-value 'exec-path))
exec-path exec-path
process-environment process-environment)
(unwind-protect (apply orig-fn args)
(setq-default process-environment (car +direnv--old-environment)
exec-path (cdr +direnv--old-environment)
+direnv--old-environment nil)))))