diff mbox series

[bug#68169,3/9] system: Export default xdefaults.

Message ID 0a965b5c16b336d01eeb78d2a997a6d81fad6167.1704021933.git.efraim@flashner.co.il
State New
Headers show
Series Add guix-home config to /etc/skel | expand

Commit Message

Efraim Flashner Dec. 31, 2023, 11:39 a.m. UTC 
* gnu/system/shadow.scm (%default-xdefaults): Extract from
default-skeletons, export.
(default-skeletons): Use %default-xdefaults.

Change-Id: I44018516ec3687a68d32ca5c86c41bc29507a273
---
 gnu/system/shadow.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index 9b1678c54d..be7c4370a2 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -66,6 +66,7 @@  (define-module (gnu system shadow)
   #:export (%default-bashrc
             %default-bash-profile
             %default-zprofile
+            %default-xdefaults
             default-skeletons
             skeleton-directory
             %base-groups
@@ -182,6 +183,11 @@  (define %default-zprofile
 export PATH=/run/setuid-programs:$PATH
 "))
 
+(define %default-xdefaults
+  (plain-file "Xdefaults" "\
+XTerm*utf8: always
+XTerm*metaSendsEscape: true\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."
@@ -189,9 +195,7 @@  (define (default-skeletons)
   (let ((profile   %default-bash-profile)
         (bashrc    %default-bashrc)
         (zprofile  %default-zprofile)
-        (xdefaults (plain-file "Xdefaults" "\
-XTerm*utf8: always
-XTerm*metaSendsEscape: true\n"))
+        (xdefaults %default-xdefaults)
         (gdbinit   (plain-file "gdbinit" "\
 # Tell GDB where to look for separate debugging files.
 guile