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

session-init: consistently use the config for resolving home directory

Browse source 
It is not helpful to switch between `$HOME` and the config option for
resolving the path of the home directory.
This commit is contained in:
Tobias Happ 2021-12-14 20:12:23 +01:00
parent bb8470da1d
commit 7e00a63733
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/environment/session-init.nix
View file

@ -25,7 +25,7 @@ let
[ -n "$__NOD_SESS_INIT_SOURCED" ] && return [ -n "$__NOD_SESS_INIT_SOURCED" ] && return
export __NOD_SESS_INIT_SOURCED=1 export __NOD_SESS_INIT_SOURCED=1
. $HOME/.nix-profile/etc/profile.d/nix.sh . "${config.user.home}/.nix-profile/etc/profile.d/nix.sh"
# workaround for nix 2.4, see https://github.com/NixOS/nixpkgs/issues/149791 # workaround for nix 2.4, see https://github.com/NixOS/nixpkgs/issues/149791
${addToNixPath "${config.user.home}/.nix-defexpr/channels"} ${addToNixPath "${config.user.home}/.nix-defexpr/channels"}
@ -33,8 +33,8 @@ let
${addToNixPath "nixpkgs=${config.user.home}/.nix-defexpr/channels/nixpkgs/"} ${addToNixPath "nixpkgs=${config.user.home}/.nix-defexpr/channels/nixpkgs/"}
${optionalString (config.home-manager.config != null) '' ${optionalString (config.home-manager.config != null) ''
if [ -e "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" ]; then if [ -e "${config.user.home}/.nix-profile/etc/profile.d/hm-session-vars.sh" ]; then
. "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" . "${config.user.home}/.nix-profile/etc/profile.d/hm-session-vars.sh"
fi fi
''} ''}