[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/10: system: default-zprofile: Sync with home zprofile.
From: |
guix-commits |
Subject: |
08/10: system: default-zprofile: Sync with home zprofile. |
Date: |
Wed, 17 Jan 2024 04:19:26 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit 5ef5095ab101874e1ddee99fabb9c14e30888b9d
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Dec 31 12:07:25 2023 +0200
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 @@ export PATH=/run/setuid-programs:$PATH
(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
- branch master updated (2f3d6ff968 -> 299ce524c9), guix-commits, 2024/01/17
- 01/10: system: Export default bash-profile., guix-commits, 2024/01/17
- 02/10: system: Export default zprofile., guix-commits, 2024/01/17
- 03/10: system: Export default xdefaults., guix-commits, 2024/01/17
- 04/10: system: Export default gdbinit., guix-commits, 2024/01/17
- 05/10: system: Export default nanorc., guix-commits, 2024/01/17
- 06/10: system: Export default guile config., guix-commits, 2024/01/17
- 07/10: system: Add default guix-home-config., guix-commits, 2024/01/17
- 08/10: system: default-zprofile: Sync with home zprofile.,
guix-commits <=
- 10/10: home: fontutils: Don't install fontconfig., guix-commits, 2024/01/17
- 09/10: home: services: zsh: Use unified zprofile., guix-commits, 2024/01/17