~ruther/guix-local

50a2d73eac1577e35b526d3fc91423b97e581aef — Liam Hupfer 1 year, 17 days ago 890fe50 
home: services: Unset variables after profile init.

While they aren’t exported, these temporary variables show up in the
resulting shell, cluttering tab completion and declare -p.

* gnu/home/services.scm (environment-variables->setup-environment-script):
Unset shell variables.
* gnu/home/services/shells.scm (add-shell-profile-file): Likewise.

Change-Id: Ibb634849d9f38c1a9a44c0d493e92231364de958
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
patch browse .tar.gz 
2 files changed, 7 insertions(+), 2 deletions(-)

M gnu/home/services.scm
M gnu/home/services/shells.scm

M gnu/home/services.scm => gnu/home/services.scm +5 -1
@@ 275,7 275,8 @@ exported."
                           (lambda (port)
                             (set-port-encoding! port "UTF-8")
                             (display "\
HOME_ENVIRONMENT=$HOME/.guix-home
# NOTE: Set HOME_ENVIRONMENT before sourcing (home-shell-profile-service-type ensures
# ~/.profile does)
GUIX_PROFILE=\"$HOME_ENVIRONMENT/profile\"
PROFILE_FILE=\"$GUIX_PROFILE/etc/profile\"
[ -f $PROFILE_FILE ] && . $PROFILE_FILE


@@ 301,6 302,9 @@ case $XCURSOR_PATH in
  *) export XCURSOR_PATH=$GUIX_PROFILE/share/icons:$XCURSOR_PATH ;;
esac

# Keep the shell environment clean.
unset GUIX_PROFILE PROFILE_FILE

" port)
                             (display
                              #$(environment-variable-shell-definitions vars)


M gnu/home/services/shells.scm => gnu/home/services/shells.scm +2 -1
@@ 89,7 89,8 @@ really know what you do."))
       "\
HOME_ENVIRONMENT=$HOME/.guix-home
. $HOME_ENVIRONMENT/setup-environment
$HOME_ENVIRONMENT/on-first-login\n"
$HOME_ENVIRONMENT/on-first-login
unset HOME_ENVIRONMENT\n"
       (serialize-configuration
        config
        (filter-configuration-fields