Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

home-manager: improve nix profile detection

Browse source 
If `nix.settings.use-xdg-base-directories` is true, the
`~/.nix-profile` directory may not exist, and `home.profileDirectory`
should be checked instead.

Co-authored-by: Bruno BELANYI <bruno@belanyi.fr>
This commit is contained in:
e-nikolov 2023-09-08 07:02:56 +02:00 committed by Robert Helgesson
parent e9b9ecef42
commit a2e592cc49
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
home-manager/home-manager
View file

@ -29,7 +29,9 @@ function removeByName() {
} }
function setNixProfileCommands() { function setNixProfileCommands() {
if [[ -e $HOME/.nix-profile/manifest.json ]] ; then if [[ -e $HOME/.nix-profile/manifest.json \
|| -e ${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile/manifest.json ]] ; then
LIST_OUTPATH_CMD="nix profile list" LIST_OUTPATH_CMD="nix profile list"
REMOVE_CMD="removeByName" REMOVE_CMD="removeByName"
else else
@ -406,6 +408,10 @@ $xdgVars
# #
# or # or
# #
# ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
#
# or
#
# /etc/profiles/per-user/$USER/etc/profile.d/hm-session-vars.sh # /etc/profiles/per-user/$USER/etc/profile.d/hm-session-vars.sh
# #
home.sessionVariables = { home.sessionVariables = {

6
modules/home-environment.nix
View file

@ -175,7 +175,7 @@ in
done automatically if the shell configuration is managed by Home done automatically if the shell configuration is managed by Home
Manager. If not, then you must source the Manager. If not, then you must source the
~/.nix-profile/etc/profile.d/hm-session-vars.sh ${cfg.profileDirectory}/etc/profile.d/hm-session-vars.sh
file yourself. file yourself.
'') '')
@ -585,7 +585,7 @@ in
if config.submoduleSupport.externalPackageInstall if config.submoduleSupport.externalPackageInstall
then then
'' ''
if [[ -e $HOME/.nix-profile/manifest.json ]] ; then if [[ -e ${cfg.profileDirectory}/manifest.json ]] ; then
nix profile list \ nix profile list \
| { grep 'home-manager-path$' || test $? = 1; } \ | { grep 'home-manager-path$' || test $? = 1; } \
| cut -d ' ' -f 4 \ | cut -d ' ' -f 4 \
@ -623,7 +623,7 @@ in
$DRY_RUN_CMD $oldNix profile install $1 $DRY_RUN_CMD $oldNix profile install $1
} }
if [[ -e $HOME/.nix-profile/manifest.json ]] ; then if [[ -e ${cfg.profileDirectory}/manifest.json ]] ; then
INSTALL_CMD="nix profile install" INSTALL_CMD="nix profile install"
INSTALL_CMD_ACTUAL="nixReplaceProfile" INSTALL_CMD_ACTUAL="nixReplaceProfile"
LIST_CMD="nix profile list" LIST_CMD="nix profile list"