guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/10: system: Export default xdefaults.


From: guix-commits
Subject: 03/10: system: Export default xdefaults.
Date: Wed, 17 Jan 2024 04:19:23 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit 72928388746e05fa698b62fd7a6c78965f374aef
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Dec 31 10:26:44 2023 +0200

    system: Export default xdefaults.
    
    * 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 --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 @@
   #:export (%default-bashrc
             %default-bash-profile
             %default-zprofile
+            %default-xdefaults
             default-skeletons
             skeleton-directory
             %base-groups
@@ -182,6 +183,11 @@ eval \"$(guix package --search-paths \\
 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 @@ export PATH=/run/setuid-programs:$PATH
   (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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]