[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/10: system: Export default guile config.
From: |
guix-commits |
Subject: |
06/10: system: Export default guile config. |
Date: |
Wed, 17 Jan 2024 04:19:24 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit 3ca02f03048fc1ef5c604d1ac566e0b75ab5a45f
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Dec 31 10:31:06 2023 +0200
system: Export default guile config.
* gnu/system/shadow.scm (%default-dotguile): Extract from
default-skeletons, export.
(default-skeletons): Use %default-dotguile.
Change-Id: Ibe91b3b517ae542bd28070a08e14152f87ed75ec
---
gnu/system/shadow.scm | 42 +++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index a8bc2d9567..ca9c65e6d4 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -69,6 +69,7 @@
%default-xdefaults
%default-gdbinit
%default-nanorc
+ %default-dotguile
default-skeletons
skeleton-directory
%base-groups
@@ -217,25 +218,9 @@ set auto-load safe-path /gnu/store/*/lib\n"))
"# Include all the syntax highlighting modules.
include /run/current-system/profile/share/nano/*.nanorc\n"))
-(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 %default-xdefaults)
- (gdbinit %default-gdbinit))
- `((".bash_profile" ,profile)
- (".bashrc" ,bashrc)
- ;; Zsh sources ~/.zprofile before ~/.zshrc, and it sources ~/.zlogin
- ;; after ~/.zshrc. To avoid interfering with any customizations a user
- ;; may have made in their ~/.zshrc, put this in .zprofile, not .zlogin.
- (".zprofile" ,zprofile)
- (".nanorc" ,%default-nanorc)
- (".Xdefaults" ,xdefaults)
- (".guile" ,(plain-file "dot-guile"
- "(cond ((false-if-exception (resolve-interface
'(ice-9 readline)))
+(define %default-dotguile
+ (plain-file "dot-guile"
+ "(cond ((false-if-exception (resolve-interface '(ice-9
readline)))
=>
(lambda (module)
;; Enable completion and input history at the REPL.
@@ -253,6 +238,25 @@ convenient interactive line editing and input
history.\\n\\n\")))
(else
(display \"Consider installing the 'guile-colorized' package
for a colorful Guile experience.\\n\\n\"))))\n"))
+
+(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 %default-xdefaults)
+ (gdbinit %default-gdbinit))
+ `((".bash_profile" ,profile)
+ (".bashrc" ,bashrc)
+ ;; Zsh sources ~/.zprofile before ~/.zshrc, and it sources ~/.zlogin
+ ;; after ~/.zshrc. To avoid interfering with any customizations a user
+ ;; may have made in their ~/.zshrc, put this in .zprofile, not .zlogin.
+ (".zprofile" ,zprofile)
+ (".nanorc" ,%default-nanorc)
+ (".Xdefaults" ,xdefaults)
+ (".guile" ,%default-dotguile)
(".gdbinit" ,gdbinit))))
(define (skeleton-directory skeletons)
- 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 <=
- 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