[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/10: system: Export default zprofile.
From: |
guix-commits |
Subject: |
02/10: system: Export default zprofile. |
Date: |
Wed, 17 Jan 2024 04:19:22 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit 6a9e4b063917240c8c4bf412db47f7e07df39732
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Dec 31 10:25:17 2023 +0200
system: Export default zprofile.
* gnu/system/shadow.scm (%default-zprofile): Extract from
default-skeletons, export.
(default-skeletons): Use %default-zprofile.
Change-Id: I6c6e158bca2e462a2eae709fbc2c25a2c7f3f8b4
---
gnu/system/shadow.scm | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index cd4e1a9156..9b1678c54d 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -65,6 +65,7 @@
#:export (%default-bashrc
%default-bash-profile
+ %default-zprofile
default-skeletons
skeleton-directory
%base-groups
@@ -166,13 +167,8 @@ eval \"$(guix package --search-paths \\
export PATH=/run/setuid-programs:$PATH
"))
-(define (default-skeletons)
- "Return the default skeleton files for /etc/skel. These files are copied by
-'useradd' in the home directory of newly created user accounts."
-
- (let ((profile %default-bash-profile)
- (bashrc %default-bashrc)
- (zprofile (plain-file "zprofile" "\
+(define %default-zprofile
+ (plain-file "zprofile" "\
# Honor system-wide environment variables
source /etc/profile
@@ -185,6 +181,14 @@ eval \"$(guix package --search-paths \\
# Prepend setuid programs.
export PATH=/run/setuid-programs:$PATH
"))
+
+(define (default-skeletons)
+ "Return the default skeleton files for /etc/skel. These files are copied by
+'useradd' in the home directory of newly created user accounts."
+
+ (let ((profile %default-bash-profile)
+ (bashrc %default-bashrc)
+ (zprofile %default-zprofile)
(xdefaults (plain-file "Xdefaults" "\
XTerm*utf8: always
XTerm*metaSendsEscape: true\n"))
- 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 <=
- 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, 2024/01/17
- 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