diff --git i/direnvrc w/direnvrc index ddac0f5..fbcade6 100644 --- i/direnvrc +++ w/direnvrc @@ -29,10 +29,8 @@ _nix_direnv_warning() { _nix_direnv_error() { log_error "${_NIX_DIRENV_LOG_PREFIX}$*"; } -_nix_direnv_nix="" - _nix() { - ${_nix_direnv_nix} --extra-experimental-features "nix-command flakes" "$@" + nix --extra-experimental-features "nix-command flakes" "$@" } _require_version() { @@ -55,34 +53,6 @@ _require_cmd_version() { _require_version "$cmd" "${BASH_REMATCH[1]}" "$required" } -_nix_direnv_resolve_nix() { - local ambient_nix - - if ambient_nix=$(command -v nix); then - if _require_cmd_version "${ambient_nix}" "${NIX_MIN_VERSION}"; then - echo "${ambient_nix}" - return 0 - else - _nix_direnv_warning "Nix version in PATH is too old, wanted ${NIX_MIN_VERSION}+, got $(${ambient_nix} --version), will attempt fallback" - fi - else - _nix_direnv_warning "Could not find Nix in PATH, will attempt fallback" - fi - - if [ -n "${NIX_DIRENV_FALLBACK_NIX}" ]; then - if _require_cmd_version "${NIX_DIRENV_FALLBACK_NIX}" "${NIX_MIN_VERSION}"; then - echo "${NIX_DIRENV_FALLBACK_NIX}" - return 0 - else - _nix_direnv_error "Fallback Nix version is too old, wanted ${NIX_MIN_VERSION}+, got $(${NIX_DIRENV_FALLBACK_NIX} --version)" - return 1 - fi - else - _nix_direnv_error "Could not find fallback Nix binary, please add Nix to PATH or set NIX_DIRENV_FALLBACK_NIX" - return 1 - fi -} - _nix_direnv_preflight() { if [[ -z $direnv ]]; then # shellcheck disable=2016 @@ -102,10 +72,6 @@ _nix_direnv_preflight() { fi fi - if ! _nix_direnv_nix=$(_nix_direnv_resolve_nix); then - return 1 - fi - local layout_dir layout_dir=$(direnv_layout_dir)