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

tools/direnv: only update on major mode change

Browse source 
Rather than on buffer-switch. This makes switching windows much faster,
but introduces a (low) risk of a stale environment. Needs more testing.
This commit is contained in:
Henrik Lissner 2019-10-18 22:34:41 -04:00
parent 12b276c4d6
commit 4860bb86ce
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,14 +12,21 @@
:config :config
(add-hook! 'direnv-mode-hook (add-hook! 'direnv-mode-hook
(defun +direnv-init-h () (defun +direnv-init-h ()
"Instead of checking for direnv on `post-command-hook', check on "Instead of checking for direnv on `post-command-hook', check only once,
buffer/window/frame switch, which is less expensive." when the file is first opened/major mode is activated. This is significantly
less expensive, but is less sensitive to changes to .envrc done outside of
Emacs."
(direnv--disable) (direnv--disable)
(when direnv-mode (when direnv-mode
(add-hook! '(doom-switch-buffer-hook (add-hook 'after-change-major-mode-hook
doom-switch-window-hook #'direnv--maybe-update-environment))))
doom-switch-frame-hook)
#'direnv--maybe-update-environment)))) (defadvice! +direnv--make-process-environment-buffer-local-a (items)
:filter-return #'direnv--export
(when items
(mapc 'kill-local-variable '(process-environment exec-path))
(mapc 'make-local-variable '(process-environment exec-path)))
items)
;; Fontify special .envrc keywords; it's a good indication of whether or not ;; Fontify special .envrc keywords; it's a good indication of whether or not
;; we've typed them correctly. ;; we've typed them correctly.
@ -27,9 +34,12 @@ buffer/window/frame switch, which is less expensive."
(defun +direnv-envrc-fontify-keywords-h () (defun +direnv-envrc-fontify-keywords-h ()
(font-lock-add-keywords (font-lock-add-keywords
nil `((,(regexp-opt +direnv--keywords 'symbols) nil `((,(regexp-opt +direnv--keywords 'symbols)
(0 font-lock-keyword-face)))))) (0 font-lock-keyword-face)))))
(defun +direnv-update-on-save-h ()
(add-hook 'after-save-hook #'direnv--maybe-update-environment
nil 'local)))
(defadvice! +direnv--update-a (&rest _) (defadvice! +direnv-update-a (&rest _)
"Update direnv. Useful to advise functions that may run "Update direnv. Useful to advise functions that may run
environment-sensitive logic like `flycheck-default-executable-find'. This fixes environment-sensitive logic like `flycheck-default-executable-find'. This fixes
flycheck issues with direnv and on nix." flycheck issues with direnv and on nix."