From patchwork Sun Dec 31 11:39:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58246 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 5BD5127BBEC; Sun, 31 Dec 2023 11:42:00 +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=ham 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 D657C27BBE2 for ; Sun, 31 Dec 2023 11:41:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJuBl-0001ei-Jt; 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 1rJuBk-0001cs-0B for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:04 -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 1rJuBj-0003jh-Nf for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJuBk-0004Vo-Pn for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68169] [PATCH 5/9] system: Export default nanorc. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 11:41:04 +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.170402284317233 (code B ref 68169); Sun, 31 Dec 2023 11:41:04 +0000 Received: (at 68169) by debbugs.gnu.org; 31 Dec 2023 11:40:43 +0000 Received: from localhost ([127.0.0.1]:45736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBO-0004Tr-U7 for submit@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:43 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:42233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBH-0004Sh-Db for 68169@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:36 -0500 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40d5b7b8adfso22746625e9.0 for <68169@debbugs.gnu.org>; Sun, 31 Dec 2023 03:40:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704022828; x=1704627628; 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=yXTSqjiZUDDQKxccV9dR6pX9ZimjrdADpP9xrD1B/HI=; b=J907rE+/wXEtuF1LECnBDxIfhSUuxhcsF9dO0I+vFsA8MFimiJSJiLcCero1TxTVWW AqMdU7TgGscLgIqpfO7ENXdV/9eOqT6A7ftIW6dKioMzYevCxoDoTk1KfJNN8jxAn8xm yFCK8jf7zOClAydGfzTLw2bUSLQavxQVrCyd5PeFMv7qIC4oAEQbe7OzUEzL+YaeCra4 +lrq3QWmgnzbbIKXlIvHGhEvpzZFK/VnozYF5U4vtGaT6PTJxORANOhMW1+wnYffEDoa E46urv7wCWJzLP3u1Pc0OSuWTXodQCLeYEyvyNs1ELX/jyQaZXemSYJcVU0C14mwCU74 no7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704022828; x=1704627628; 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=yXTSqjiZUDDQKxccV9dR6pX9ZimjrdADpP9xrD1B/HI=; b=Yk6xAwf1iFsTID33DFDvcslXr8WrkgZTVrUblhLV9q78WnssapyFVl1HslhIxP2cKl PxdW6JHoVgPexMqksqXYANCvgLPRA0o7hOtE5tXnodDkX0IyfWIJt4AKr3QWx1FOILub GWVojVisgrNJzDWd34Qpvxk/ZJIjRy3xjnXOiBhwkD5vHGXGqkUTQDnZ/96m6GHL8V6i aNmuiwo+eIdGuppxNrfhXC+y+udsgg/cSu/pV5/Jj8/raDsiUZIV+tzY5Tc7g0b3Xyq4 uKWDA4xEwNYxMZ+HxPsFkOAs6mhHvb6JtXwkyQ6HuXJHD/vsbwI5pmAWglBvV1xYqFwq Z9pA== X-Gm-Message-State: AOJu0YxWoRspBrK/4YNCxPtPNc/A3rPa0MECnjJWl6CA1Vqe33P4Yer8 ne2w29EMOEU/oy9D2B8VBcVcvH52xIT6yw== X-Google-Smtp-Source: AGHT+IFDhjxYPRUkgfXD2TiM3/cJiXzXKfQajAEyvZwCnOo1C/qY/sU+Z9vwBtLb03A3QPjEtac1vA== X-Received: by 2002:a05:600c:84c9:b0:40c:25ed:9be2 with SMTP id er9-20020a05600c84c900b0040c25ed9be2mr7449027wmb.75.1704022828536; Sun, 31 Dec 2023 03:40:28 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id bg42-20020a05600c3caa00b0040d6b91efd9sm11700583wmb.44.2023.12.31.03.40.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 03:40:28 -0800 (PST) From: Efraim Flashner Date: Sun, 31 Dec 2023 13:39:44 +0200 Message-ID: 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-nanorc): Extract from default-skeletons, export. (default-skeletons): Use %default-nanorc. Change-Id: I0d07b13ed4894b1152a08b96d9ef8527dde073ce --- 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 e1dd31262a..a8bc2d9567 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -68,6 +68,7 @@ (define-module (gnu system shadow) %default-zprofile %default-xdefaults %default-gdbinit + %default-nanorc default-skeletons skeleton-directory %base-groups @@ -211,6 +212,11 @@ (define %default-gdbinit # pretty-printers of libstdc++. set auto-load safe-path /gnu/store/*/lib\n")) +(define %default-nanorc + (plain-file "nanorc" + "# 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." @@ -226,9 +232,7 @@ (define (default-skeletons) ;; 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" ,(plain-file "nanorc" "\ -# Include all the syntax highlighting modules. -include /run/current-system/profile/share/nano/*.nanorc\n")) + (".nanorc" ,%default-nanorc) (".Xdefaults" ,xdefaults) (".guile" ,(plain-file "dot-guile" "(cond ((false-if-exception (resolve-interface '(ice-9 readline)))