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

tools/direnv: conform to new hook conventions

Browse source
This commit is contained in:
Henrik Lissner 2019-07-22 23:25:09 +02:00
parent d7ed52f3c7
commit 8e096f7a23
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,22 +10,24 @@
(def-package! direnv
:after-call (after-find-file dired-initial-position-hook)
:config
(defun +direnv|init ()
"Instead of checking for direnv on `post-command-hook', check on
(add-hook 'direnv-mode-hook
(defun +direnv-init-h ()
"Instead of checking for direnv on `post-command-hook', check on
buffer/window/frame switch, which is less expensive."
(direnv--disable)
(when direnv-mode
(add-hook 'doom-switch-buffer-hook #'direnv--maybe-update-environment)
(add-hook 'doom-switch-window-hook #'direnv--maybe-update-environment)
(add-hook 'doom-switch-frame-hook #'direnv--maybe-update-environment)
(add-hook 'focus-in-hook #'direnv--maybe-update-environment)))
(add-hook 'direnv-mode-hook #'+direnv|init)
(direnv--disable)
(when direnv-mode
(add-hook 'doom-switch-buffer-hook #'direnv--maybe-update-environment)
(add-hook 'doom-switch-window-hook #'direnv--maybe-update-environment)
(add-hook 'doom-switch-frame-hook #'direnv--maybe-update-environment)
(add-hook 'focus-in-hook #'direnv--maybe-update-environment))))
(defun +direnv|envrc-fontify-keywords ()
(font-lock-add-keywords
nil `((,(regexp-opt +direnv--keywords 'symbols)
(0 font-lock-keyword-face)))))
(add-hook 'direnv-envrc-mode-hook #'+direnv|envrc-fontify-keywords)
;; Fontify special .envrc keywords; it's a good indication of whether or not
;; we've typed them correctly.
(add-hook 'direnv-envrc-mode-hook
(defun +direnv-envrc-fontify-keywords-h ()
(font-lock-add-keywords
nil `((,(regexp-opt +direnv--keywords 'symbols)
(0 font-lock-keyword-face))))))
(def-advice! +direnv--update-a (&rest _)
"Update direnv. Useful to advise functions that may run