dot/zsh
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: dot:17359d1fd035b058a7e50e5adfe67bf549bc1a1f
Branches Tags
dot:main
...
compare: dot:1bc2b49e3f64b4d36b939e3795ed18875f604b4c
Branches Tags
dot:main

2 commits
17359d1fd0 ... 1bc2b49e3f

Author SHA1 Message Date
Danielle McLean 1bc2b49e3f
Update Direnv hook to match current recommendation 2023-11-19 16:24:19 +11:00
Danielle McLean 60f637b609
Load Direnv state before rendering instant prompt, as recommended 2023-11-19 16:23:26 +11:00
2 changed files with 12 additions and 4 deletions
Show stats Expand all files Collapse all files

12
dot-config/zsh/interactive/direnv
View file

@ -1,8 +1,12 @@
#! zsh #! zsh
_direnv_hook() { _direnv_hook() {
eval "$(direnv export zsh)" trap -- '' SIGINT
emulate zsh -c "$(direnv export zsh)"
trap - SIGINT
} }
typeset -ag precmd_functions
if (( $+commands[direnv] )) && [[ -z ${precmd_functions[(r)_direnv_hook]} ]]; then typeset -ag precmd_functions chpwd_functions
precmd_functions+=(_direnv_hook) if (( $+commands[direnv] )); then
[[ -z ${precmd_functions[(r)_direnv_hook]} ]] && precmd_functions+=(_direnv_hook)
[[ -z ${chpwd_functions[(r)_direnv_hook]} ]] && chpwd_functions+=(_direnv_hook)
fi fi

4
dot-config/zsh/zshrc
View file

@ -1,3 +1,7 @@
# For accurate instant prompt from Powerlevel10k, we need to load up the
# correct environment from direnv first.
(( ${+commands[direnv]} )) && emulate zsh -c "$(direnv export zsh)"
# Enable Powerlevel10k instant prompt. Should stay close to the top of zshrc. # Enable Powerlevel10k instant prompt. Should stay close to the top of zshrc.
# Initialization code that may require console input (password prompts, [y/n] # Initialization code that may require console input (password prompts, [y/n]
# confirmations, etc.) must go above this block; everything else may go below. # confirmations, etc.) must go above this block; everything else may go below.