nix-community/nix-direnv
1
0
Fork 0
mirror of https://github.com/nix-community/nix-direnv.git synced 2025-11-08 19:46:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #225 from nix-community/perf-improvements

Browse source 
Perf improvements
This commit is contained in:
Jörg Thalheim 2022-09-03 12:25:43 +01:00 • committed by GitHub
commit e37d0f5679
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
direnvrc
View file

@ -141,12 +141,8 @@ _nix_argsum_suffix() {
} }
nix_direnv_watch_file() { nix_direnv_watch_file() {
for watch in "$@"; do watch_file "$@"
if [[ -e "${watch}" ]]; then nix_watches+=("$@")
watch_file "${watch}"
nix_watches+=("${watch}")
fi
done
} }
use_flake() { use_flake() {
@ -155,11 +151,15 @@ use_flake() {
flake_expr="${1:-.}" flake_expr="${1:-.}"
flake_dir="${flake_expr%#*}" flake_dir="${flake_expr%#*}"
nix_direnv_watch_file ".envrc" "$HOME/.direnvrc" "$HOME/.config/direnv/direnvrc" local files_to_watch
files_to_watch=(".envrc" "$HOME/.direnvrc" "$HOME/.config/direnv/direnvrc")
if [[ -d "$flake_dir" ]]; then if [[ -d "$flake_dir" ]]; then
nix_direnv_watch_file "$flake_dir/flake.nix" "$flake_dir/flake.lock" "$flake_dir/devshell.toml" files_to_watch+=("$flake_dir/flake.nix" "$flake_dir/flake.lock" "$flake_dir/devshell.toml")
fi fi
nix_direnv_watch_file "${files_to_watch[@]}"
local layout_dir profile local layout_dir profile
layout_dir=$(direnv_layout_dir) layout_dir=$(direnv_layout_dir)
profile="${layout_dir}/flake-profile$(_nix_argsum_suffix "$flake_expr")" profile="${layout_dir}/flake-profile$(_nix_argsum_suffix "$flake_expr")"