From 5ef5095ab101874e1ddee99fabb9c14e30888b9d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 31 Dec 2023 12:07:25 +0200 Subject: [PATCH] system: default-zprofile: Sync with home zprofile. The removed fields are already sourced in /etc/profile. * gnu/system/shadow.scm (%default-zprofile): Sync with default zprofile from (gnu home services shells). Change-Id: I419eadf636344e23e8fd2f7006efa81f45527756 --- gnu/system/shadow.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 6c8e02953a..8b3958ba5c 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -174,17 +174,10 @@ (define %default-bash-profile (define %default-zprofile (plain-file "zprofile" "\ -# Honor system-wide environment variables +# Set up the system, user profile, and related variables. source /etc/profile - -# Merge search-paths from multiple profiles, the order matters. -eval \"$(guix package --search-paths \\ --p $HOME/.config/guix/current \\ --p $HOME/.guix-profile \\ --p /run/current-system/profile)\" - -# Prepend setuid programs. -export PATH=/run/setuid-programs:$PATH +# Set up the home environment profile. +source ~/.profile ")) (define %default-xdefaults