diff --git a/modules/home-environment.nix b/modules/home-environment.nix index 164d3e9c3..c6fc345d7 100644 --- a/modules/home-environment.nix +++ b/modules/home-environment.nix @@ -313,7 +313,6 @@ in pkgs.gnugrep pkgs.gnused pkgs.ncurses # For `tput`. - pkgs.nix ] + optionalString (!cfg.emptyActivationPath) "\${PATH:+:}$PATH"; diff --git a/modules/lib-bash/activation-init.sh b/modules/lib-bash/activation-init.sh index 1239e18e2..b5472504c 100755 --- a/modules/lib-bash/activation-init.sh +++ b/modules/lib-bash/activation-init.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + function setupVars() { local profilesPath="/nix/var/nix/profiles/per-user/$USER" local gcPath="/nix/var/nix/gcroots/per-user/$USER" @@ -46,6 +48,11 @@ else export DRY_RUN_CMD="" fi +if [[ -v VERBOSE ]]; then + echo -n "Using Nix version: " + nix-env --version +fi + $VERBOSE_ECHO "Activation variables:" if [[ -v oldGenNum ]] ; then $VERBOSE_ECHO " oldGenNum=$oldGenNum"