direnv: move DIRENV_ACTIVE var to direnvrc

cachix · Dec 27, 2024 · c48fa1a · c48fa1a
1 parent fc5a2d6
commit c48fa1a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/direnvrc b/direnvrc
@@ -45,6 +45,11 @@ _nix_export_or_unset() {
 _nix_import_env() {
   local profile_rc=$1
 
+  # Note which environments are active, but make sure we don't repeat them
+  if [[ ! "''${DIRENV_ACTIVE-}" =~ (^|:)"$PWD"(:|$) ]]; then
+    export DIRENV_ACTIVE="$PWD:''${DIRENV_ACTIVE-}"
+  fi
+
   local old_nix_build_top=${NIX_BUILD_TOP:-__UNSET__}
   local old_tmp=${TMP:-__UNSET__}
   local old_tmpdir=${TMPDIR:-__UNSET__}

diff --git a/src/modules/top-level.nix b/src/modules/top-level.nix
@@ -274,11 +274,6 @@ in
         fi
       ''}
 
-      # note what environments are active, but make sure we don't repeat them
-      if [[ ! "''${DIRENV_ACTIVE-}" =~ (^|:)"$PWD"(:|$) ]]; then
-        export DIRENV_ACTIVE="$PWD:''${DIRENV_ACTIVE-}"
-      fi
-
       # direnv helper
       if [ ! type -p direnv &>/dev/null && -f .envrc ]; then
         echo "An .envrc file was detected, but the direnv command is not installed."