From patchwork Sun Dec 31 11:39:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58242 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D940A27BBE2; Sun, 31 Dec 2023 11:41:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2391727BBEB for ; Sun, 31 Dec 2023 11:41:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJuBk-0001eH-NB; Sun, 31 Dec 2023 06:41:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJuBj-0001Zq-1l for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJuBi-0003jO-Pk for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJuBj-0004VZ-SD for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68169] [PATCH 3/9] system: Export default xdefaults. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 11:41:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68169@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 68169-submit@debbugs.gnu.org id=B68169.170402283617194 (code B ref 68169); Sun, 31 Dec 2023 11:41:03 +0000 Received: (at 68169) by debbugs.gnu.org; 31 Dec 2023 11:40:36 +0000 Received: from localhost ([127.0.0.1]:45729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBH-0004T6-VZ for submit@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:36 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:49270) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBD-0004SX-Ks for 68169@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:32 -0500 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-33687627ad0so7531109f8f.2 for <68169@debbugs.gnu.org>; Sun, 31 Dec 2023 03:40:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704022825; x=1704627625; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=fmbHHAF+9wi/mEQqESRJ6G3cBuTJ/3mQjahAb33elHI=; b=MF1475LCHox8YHKxHwg+RYmWLkQaVRKvSbs1mxjzKQ/TeWWHWjAnQrnuo9yPTnZB4a UuBKfEpHbx7zuYraz+Bgzmt/OLiCHRuGv57rezF1P1ISpRulGaWmXlBTEJLQAd5dyvle D6jQAc5QGkOPlniWu3yCYp7LDAcO77ZEUE7UftyQIkgUAqGr8pTF4sW6kB8dGBSZo9wh cbIpsUhjZ0Unr/z+J0ba3XSqboqzFFpUzOQyCHlIXC8++m7Td1hzWOcyJ3ktMuPXY2wV 6UZ3iki2e8/F3LkBAWepKHZY+NNgcYvnuXj5nmGT/KSc+Kvb/+UH+f4d6KNnaeiPKIjb nSjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704022825; x=1704627625; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fmbHHAF+9wi/mEQqESRJ6G3cBuTJ/3mQjahAb33elHI=; b=lZgh+03HwpCAow6njzOrF+pLyhUceh6OR/9VqUG2ap3WH8MmqNMeyuN4g71Ppdqfzv oLllZjpQ60OkcWHFMJigmj98ORiPAR7vPeZo2BwxYHxBppo0N0pB2bS8G+bG4bgRSKEv xcH75lXfHsqTlnxX3qHXmtNGggeUOT5IQ01Thc42XphV0bOHA0D4jbwKOtZocd+rOQSj 0Au65YNKXgiZuPUVHd5n7s14KmfTU4le+IjR+ugmxY9UQdflobaeARhunsB/fpIE/3Kj F+nPHmFztk0SJNvvTnA2uX0+GpTg5iTFNI9Ne/slwulXCOeeBQy2rKhJNroToSpOorjk szIg== X-Gm-Message-State: AOJu0YzVunanlFcb2X2xJ7fCiQqZfHPv3pcZ6yaZ1BIIyRPKusOBC031 6SX18pgFZGsYbcqFeAIPVSItlu+W/TeUMg== X-Google-Smtp-Source: AGHT+IFwzMpXHMOJAzh0iDvLd79F7CUWkYa+atSZ0rMLsu+Rj/N68qVIGebxhU3SGdXk95nF+2c/qA== X-Received: by 2002:adf:a353:0:b0:336:5964:ba7d with SMTP id d19-20020adfa353000000b003365964ba7dmr8452081wrb.85.1704022824427; Sun, 31 Dec 2023 03:40:24 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id z8-20020adfec88000000b0033672971fabsm23332868wrn.115.2023.12.31.03.40.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 03:40:24 -0800 (PST) From: Efraim Flashner Date: Sun, 31 Dec 2023 13:39:42 +0200 Message-ID: <0a965b5c16b336d01eeb78d2a997a6d81fad6167.1704021933.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 @@ (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