diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2023-12-31 10:31:06 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2024-01-17 11:11:09 +0200 |
commit | 3ca02f03048fc1ef5c604d1ac566e0b75ab5a45f (patch) | |
tree | 649356d6a25f5486f7c9ec4f44d7abc3be3a0f47 | |
parent | 33136e0426f5722dea63e18a14e7f54cda530132 (diff) | |
download | guix-3ca02f03048fc1ef5c604d1ac566e0b75ab5a45f.tar.gz guix-3ca02f03048fc1ef5c604d1ac566e0b75ab5a45f.zip |
system: Export default guile config.
* gnu/system/shadow.scm (%default-dotguile): Extract from
default-skeletons, export.
(default-skeletons): Use %default-dotguile.
Change-Id: Ibe91b3b517ae542bd28070a08e14152f87ed75ec
-rw-r--r-- | gnu/system/shadow.scm | 42 |
1 files 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) |