civodul pushed a commit to branch master in repository guix. commit 890fe50d9b3b780f30e802cd2b4d9f8334151057 Author: Liam Hupfer <l...@hpfr.net> AuthorDate: Wed Feb 5 22:24:57 2025 -0600
home: services: setup-environment: Use GUIX_PROFILE. setup-environment already defines this variable. Use it since it’s more concise. * gnu/home/services.scm (environment-variables->setup-environment-script): Use GUIX_PROFILE. Change-Id: Ib75d8df6294976f4e95cfa7d607dc0ba21ddd258 Signed-off-by: Ludovic Courtès <l...@gnu.org> --- gnu/home/services.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/home/services.scm b/gnu/home/services.scm index 3b6fe28e1d..aa7beeb462 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -277,28 +277,28 @@ exported." (display "\ HOME_ENVIRONMENT=$HOME/.guix-home GUIX_PROFILE=\"$HOME_ENVIRONMENT/profile\" -PROFILE_FILE=\"$HOME_ENVIRONMENT/profile/etc/profile\" +PROFILE_FILE=\"$GUIX_PROFILE/etc/profile\" [ -f $PROFILE_FILE ] && . $PROFILE_FILE case $XDG_DATA_DIRS in - *$HOME_ENVIRONMENT/profile/share*) ;; - *) export XDG_DATA_DIRS=$HOME_ENVIRONMENT/profile/share:$XDG_DATA_DIRS ;; + *$GUIX_PROFILE/share*) ;; + *) export XDG_DATA_DIRS=$GUIX_PROFILE/share:$XDG_DATA_DIRS ;; esac case $MANPATH in - *$HOME_ENVIRONMENT/profile/share/man*) ;; - *) export MANPATH=$HOME_ENVIRONMENT/profile/share/man:$MANPATH + *$GUIX_PROFILE/share/man*) ;; + *) export MANPATH=$GUIX_PROFILE/share/man:$MANPATH esac case $INFOPATH in - *$HOME_ENVIRONMENT/profile/share/info*) ;; - *) export INFOPATH=$HOME_ENVIRONMENT/profile/share/info:$INFOPATH ;; + *$GUIX_PROFILE/share/info*) ;; + *) export INFOPATH=$GUIX_PROFILE/share/info:$INFOPATH ;; esac case $XDG_CONFIG_DIRS in - *$HOME_ENVIRONMENT/profile/etc/xdg*) ;; - *) export XDG_CONFIG_DIRS=$HOME_ENVIRONMENT/profile/etc/xdg:$XDG_CONFIG_DIRS ;; + *$GUIX_PROFILE/etc/xdg*) ;; + *) export XDG_CONFIG_DIRS=$GUIX_PROFILE/etc/xdg:$XDG_CONFIG_DIRS ;; esac case $XCURSOR_PATH in - *$HOME_ENVIRONMENT/profile/share/icons*) ;; - *) export XCURSOR_PATH=$HOME_ENVIRONMENT/profile/share/icons:$XCURSOR_PATH ;; + *$GUIX_PROFILE/share/icons*) ;; + *) export XCURSOR_PATH=$GUIX_PROFILE/share/icons:$XCURSOR_PATH ;; esac " port)