From patchwork Sun Dec 31 11:39:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58241 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 7FC4C27BBEA; Sun, 31 Dec 2023 11:41:30 +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 0E1A727BBE2 for ; Sun, 31 Dec 2023 11:41:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJuBj-0001Zr-4s; Sun, 31 Dec 2023 06:41:03 -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 1rJuBi-0001ZY-3f for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:02 -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 1rJuBh-0003j7-R0 for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJuBi-0004VJ-Tc for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68169] [PATCH 1/9] system: Export default bash-profile. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 11:41:02 +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.170402281617117 (code B ref 68169); Sun, 31 Dec 2023 11:41:02 +0000 Received: (at 68169) by debbugs.gnu.org; 31 Dec 2023 11:40:16 +0000 Received: from localhost ([127.0.0.1]:45718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuAy-0004S0-1r for submit@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:16 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:42130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuAt-0004Rg-Je for 68169@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:15 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-336746a545fso4613595f8f.0 for <68169@debbugs.gnu.org>; Sun, 31 Dec 2023 03:40:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704022804; x=1704627604; 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=HTi8qsLlJB/RG+Bh9mDjcjEy7Ua4yLDFvPBulEVynHU=; b=M8jWVchd2MX7hOYl3mkyTGFKXBTqHBJAc7lB3HSeBgwW42oKY/NIvWHMBZW/lD0UON yPayK3VJNQMY8d1qwoVZU2xQ+pxIjRxXF6K4DCyZaz++1Oob6FXr3vicftbtfNctfDUl O75NBTJaRkL646oUltO3Jeq3gqo9ON6x4rzEr3w0I/adp0LM0ReThyH/cDyiddn7k0Vc ONQxerYUyn588EEXwPXfFm+o2jMOZG9aXGXsItDBAhcB99ZABa7a3Ynol0dWX9s9qZcW BW3lsh1DUadb0cHS8yWmzmLvhIRt1oj3LRbQDYAtYJEMS8CUFcBYMq4W0N6um9hde+ZX WgTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704022804; x=1704627604; 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=HTi8qsLlJB/RG+Bh9mDjcjEy7Ua4yLDFvPBulEVynHU=; b=VEO/RTvkuNs73QdcXkfROKcJW5Hb6MLHYaVIBSKA2rg6TPuFtMd6Y2OrdkMKV3cSUv UQoJDGoAXE+aXT/ES3ZCz8yvxrHn66NrBGutSFoVnXnmvUPsQvDf/oCd7ie5FXaFdNrR MOncgrlTcgdDRtZWdU59Mp8M4AdTpiSQCcn8wmSwQwXnCbdbgGDZ5vbRz3wfsFygN3hL 3q2gP45XrnDKrJLyzWul0EGFpMaukfYgBrRUcCcMlsooWf2yj+8cFREupgVNmKaI7x3s pt1fWzaydGnAUS+5RfP1TBzzit5bWbeqLLQXPUW6SRgAJWhGbAdmEzrFML4i0OR9crm2 11ZQ== X-Gm-Message-State: AOJu0YzlIGxfxj9Vu3zDVd7VeSNHWTj7qkWgoigBjzt26zNS59GjGvWr CpAI2UpAgJT6SjO0xSt4yFbkpICaJLD8dQ== X-Google-Smtp-Source: AGHT+IEPYHMsNdps8Iv8qQN/2f3BjmLR6xFZYpI6Sg+J3Ku+pSkXROa++CllNkEHp2+zEyWLxDuwUQ== X-Received: by 2002:adf:fe06:0:b0:336:6dbe:f6c8 with SMTP id n6-20020adffe06000000b003366dbef6c8mr7391579wrr.12.1704022804237; Sun, 31 Dec 2023 03:40:04 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id i2-20020adffc02000000b003364aa5cc13sm23627055wrr.1.2023.12.31.03.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 03:40:03 -0800 (PST) From: Efraim Flashner Date: Sun, 31 Dec 2023 13:39:40 +0200 Message-ID: <46f070e31135c8fe39b28cef4c58e54ec99d5f13.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-bash-profile): Extract from default-skeletons, export. (default-skeletons): Use %default-bash-profile. Change-Id: I45641b1091daee3495a5f92bdc1a63050e0cc59e --- gnu/system/shadow.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 47f19551b6..cd4e1a9156 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -64,6 +64,7 @@ (define-module (gnu system shadow) user-group-system?) #:export (%default-bashrc + %default-bash-profile default-skeletons skeleton-directory %base-groups @@ -147,11 +148,8 @@ (define %default-bashrc alias grep='grep --color=auto' alias ip='ip -color=auto'\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 (plain-file "bash_profile" "\ +(define %default-bash-profile + (plain-file "bash_profile" "\ # Set up Guix Home profile if [ -f ~/.profile ]; then . ~/.profile; fi @@ -167,6 +165,12 @@ (define (default-skeletons) # Prepend setuid programs. export PATH=/run/setuid-programs:$PATH ")) + +(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 (plain-file "zprofile" "\ # Honor system-wide environment variables From patchwork Sun Dec 31 11:39:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58238 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 6BB1F27BBEA; Sun, 31 Dec 2023 11:41:22 +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 C374427BBE9 for ; Sun, 31 Dec 2023 11:41:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJuBm-0001fk-UP; Sun, 31 Dec 2023 06:41:06 -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 1rJuBi-0001Zg-IK for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:02 -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-0003jE-A4 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-0004VS-CN for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68169] [PATCH 2/9] system: Export default zprofile. 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.170402283217162 (code B ref 68169); Sun, 31 Dec 2023 11:41:03 +0000 Received: (at 68169) by debbugs.gnu.org; 31 Dec 2023 11:40:32 +0000 Received: from localhost ([127.0.0.1]:45724 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBD-0004Sj-FF for submit@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:31 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:55552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBB-0004ST-AO for 68169@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:29 -0500 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3373bc6d625so362202f8f.3 for <68169@debbugs.gnu.org>; Sun, 31 Dec 2023 03:40:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704022822; x=1704627622; 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=IUXBYBGe6igm5Qy4nLLq/puzYPH3Q3amd+a1VN/fius=; b=BCsd4KIc6H2avK+ZCsp8wQc/G+owXQVhOhRbRNoOSxUfbEcMFV5cgElw1V8d+Occdf h225aiJ5xWMRYtHJdMli+Os2lQ4jpgwi0tKryf5pCeGKg6A+fueVdQ82wPNm3F+zc1Lx NW8EqaOFJg+M1mYZj/asaUN9hHhl8Lp2S3+ymGnqwnYhCRk79JHeHk8jjdS46U1BtfPp 6PossgAs18BNlVRdE8E7kAs3dnTDk5aQujwEgi2231Evv3ygovAshv+SDuwkIXtzX0J7 pxDCjH7lCdaPwpetXWX069ek1YztqICjtDWp47vU+4faoEfXNhypYWhMnbitN1oC4EWu RtGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704022822; x=1704627622; 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=IUXBYBGe6igm5Qy4nLLq/puzYPH3Q3amd+a1VN/fius=; b=rUnPvn6Z0ov0jx7LJvTJGmDYpa4AHfKmMlAnFMg7v7EGrm8MqcoHKhQUINux2tzcHS NQIROq+myV/hcr5c5ckNXhG0Xxwhj/39e5zFwMfHpDxuMFcRN4ZgG0JRrqwipOl/L8qF ybjC2GKt1wi3dI1yEka6aTWR3ClsFtMAA7/gNZ7ntBFZcqG6O/2qZvmHZi16i1T6JX+m oFnxD5XDTsRsMSxgsk5Qpjf42WEW74DCgKTSzEyjw85048Dqn+K18zLHQKdbM9iGoPxc +bqqzTKMthepsvb8XHLP29978s4x3hEAwpTpqGLjozrtci88+ycnNSIy0h9iTLSXST7U bXkA== X-Gm-Message-State: AOJu0Yws3fK5bKgb+tKqw4beSiyswqwOLqz8kIQn6bphG3NU3LyHnAlv OxFlebb+6CfCfuiMtWUlMvu0UZZfPCvw0g== X-Google-Smtp-Source: AGHT+IF+jbVxxryTsMeXZYLJDe1sZ6lX16YBOp2rnQWv9Y/CHnLdb/p5257Yt9jcPELYoSOZ5wx9bQ== X-Received: by 2002:adf:e790:0:b0:336:7562:3376 with SMTP id n16-20020adfe790000000b0033675623376mr7281259wrm.102.1704022822464; Sun, 31 Dec 2023 03:40:22 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id a15-20020adfed0f000000b00336673a4153sm23409122wro.80.2023.12.31.03.40.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 03:40:21 -0800 (PST) From: Efraim Flashner Date: Sun, 31 Dec 2023 13:39:41 +0200 Message-ID: <89274dd664f5c6316dfbb387e6e39e11ad96efa6.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-zprofile): Extract from default-skeletons, export. (default-skeletons): Use %default-zprofile. Change-Id: I6c6e158bca2e462a2eae709fbc2c25a2c7f3f8b4 --- gnu/system/shadow.scm | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index cd4e1a9156..9b1678c54d 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -65,6 +65,7 @@ (define-module (gnu system shadow) #:export (%default-bashrc %default-bash-profile + %default-zprofile default-skeletons skeleton-directory %base-groups @@ -166,25 +167,28 @@ (define %default-bash-profile export PATH=/run/setuid-programs:$PATH ")) +(define %default-zprofile + (plain-file "zprofile" "\ +# Honor system-wide environment variables +source /etc/profile + +# Merge search-paths from multiple profiles, the order matters. +eval \"$(guix package --search-paths \\ +-p $HOME/.config/guix/current \\ +-p $HOME/.guix-profile \\ +-p /run/current-system/profile)\" + +# Prepend setuid programs. +export PATH=/run/setuid-programs:$PATH +")) + (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 (plain-file "zprofile" "\ -# Honor system-wide environment variables -source /etc/profile - -# Merge search-paths from multiple profiles, the order matters. -eval \"$(guix package --search-paths \\ --p $HOME/.config/guix/current \\ --p $HOME/.guix-profile \\ --p /run/current-system/profile)\" - -# Prepend setuid programs. -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")) 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 From patchwork Sun Dec 31 11:39:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58244 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 666C627BBE2; Sun, 31 Dec 2023 11:41:58 +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 BF45827BBEB for ; Sun, 31 Dec 2023 11:41:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJuBl-0001eZ-Jz; 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-0001aG-EZ 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 1rJuBj-0003jY-6a 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-0004Vh-9a for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68169] [PATCH 4/9] system: Export default gdbinit. 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.170402283717200 (code B ref 68169); Sun, 31 Dec 2023 11:41:04 +0000 Received: (at 68169) by debbugs.gnu.org; 31 Dec 2023 11:40:37 +0000 Received: from localhost ([127.0.0.1]:45731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBI-0004TI-Ew for submit@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:36 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:48626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBF-0004SZ-Hx for 68169@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:34 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3333b46f26aso7639464f8f.1 for <68169@debbugs.gnu.org>; Sun, 31 Dec 2023 03:40:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704022826; x=1704627626; 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=Yf3x3yYROLZtQ3oOIg6pLvgPnyvPiboldy1IrEayIOs=; b=ixjW3Y0wGR4oF+Dqv3H6wJefUYZ8v14LboZxfdeYzxNO0CqAt31jucaChUdN2IsqSV DAuMsVoPq/CMUIwa0SpoS10HiSbojdFL9z5rPz2aOP5qAu0rLgvI4qBDJ63Wo2XeadwM gZbShG180uLJ7useHFIQbwqs8i4EE9ZkyzBFvDjITdQWGAowYmwOEvL+5MnqhQwCGyhs 2Niv/VcA9epTJTMUwE6GcMWIPEpc5D3X05JEdyUSFTqO8LWgWB8r7nKpWkX0ZNoeWBfG Z1sE5q2nsTu+SZndbMc8B570dHTXL2Gx8dL1narvnjvjB17hvJigdEG7DSCbDWnVeQOO 79Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704022826; x=1704627626; 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=Yf3x3yYROLZtQ3oOIg6pLvgPnyvPiboldy1IrEayIOs=; b=HXoPS7oqkQbL+qO2PH9o2G54XQemL7WUPtdYHM7sqqWpJVz5j9F/zS5QqHE7Qsox7I Zb9+YhfiLYqWcg0vsjaUsRz3Lbfe0zbA6FkViEUEhiM6E2+/Jf3KEIFzTDAspcg8D4Bq iZvoj1XdbuB0nCGfP8ZVsduyR3KhjiqLP+usdHit4DecvDdevQ18Kun829OHlmXXJ3la 7U78zM/KlapnP9WKQBkfURZpf5ByyfFvImXe0XqVFxo23TjXjnZt+H+osO5aZe0L+Ss7 wiWOgf3aJkecmnV8MYA7RfCLbRyxEkSSS0LxG0GgKfog9U5VkzQudiQookluIJXX+hg+ X5/A== X-Gm-Message-State: AOJu0Yz/jh0So4MvWX4SYef4lRHw2fD8VenvmrA3qRQtzUYpM2Ver53+ cB3L2B04dudovs4c4vFfTRLJRC7EOI5XMg== X-Google-Smtp-Source: AGHT+IESSP478VG7J/OAqtvCSfqhBIHbrSiKtQ171P2iGe1Iufm4BOKiUyQ0DDWOkd4Cps6TLDOZOQ== X-Received: by 2002:a05:600c:213:b0:40d:5fd4:ce3a with SMTP id 19-20020a05600c021300b0040d5fd4ce3amr3480869wmi.85.1704022826520; Sun, 31 Dec 2023 03:40:26 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id n15-20020a5d400f000000b0033662fb321esm23460316wrp.33.2023.12.31.03.40.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 03:40:26 -0800 (PST) From: Efraim Flashner Date: Sun, 31 Dec 2023 13:39:43 +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-gdbinit): Extract from default-skeletons, export. (default-skeletons): Use %default-gdbinit. Change-Id: Ia5188f8083a83ad4cdb96e234dbd730b1bfe0072 --- gnu/system/shadow.scm | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index be7c4370a2..e1dd31262a 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -67,6 +67,7 @@ (define-module (gnu system shadow) %default-bash-profile %default-zprofile %default-xdefaults + %default-gdbinit default-skeletons skeleton-directory %base-groups @@ -188,16 +189,9 @@ (define %default-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." - - (let ((profile %default-bash-profile) - (bashrc %default-bashrc) - (zprofile %default-zprofile) - (xdefaults %default-xdefaults) - (gdbinit (plain-file "gdbinit" "\ -# Tell GDB where to look for separate debugging files. +(define %default-gdbinit + (plain-file "gdbinit" + "# Tell GDB where to look for separate debugging files. guile (use-modules (gdb)) (execute (string-append \"set debug-file-directory \" @@ -215,7 +209,17 @@ (define (default-skeletons) # Authorize extensions found in the store, such as the # pretty-printers of libstdc++. -set auto-load safe-path /gnu/store/*/lib\n"))) +set auto-load safe-path /gnu/store/*/lib\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 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))) From patchwork Sun Dec 31 11:39:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58243 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 B9C5A27BBEC; Sun, 31 Dec 2023 11:41:57 +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 A945727BBE2 for ; Sun, 31 Dec 2023 11:41:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJuBt-0001iW-C6; Sun, 31 Dec 2023 06:41:13 -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-0001dw-Eo 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 1rJuBk-0003jo-6i for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJuBl-0004Vv-8w for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68169] [PATCH 6/9] system: Export default guile config. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 11:41:05 +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.170402284417240 (code B ref 68169); Sun, 31 Dec 2023 11:41:05 +0000 Received: (at 68169) by debbugs.gnu.org; 31 Dec 2023 11:40:44 +0000 Received: from localhost ([127.0.0.1]:45738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBP-0004Tu-9s for submit@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:43 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:55601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBJ-0004Sr-IB for 68169@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:38 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40d76923ec4so18480035e9.3 for <68169@debbugs.gnu.org>; Sun, 31 Dec 2023 03:40:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704022830; x=1704627630; 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=zS3TDQRU6oTfpiN2hyguiMQit08ILUZ9ceEkOd2kOgw=; b=NuySeQOzlqTwwYV2+4yf/+fjpBbLO7yuLiWqQVv7EaDFBWe4IRxa3Ni032AM/X0UG6 cOLyTcoYj7VvXEK6giSCRduEnelUBII9GFTgZS2Q09UggvTWsIK+1olO16V726Uw8476 0OPP/1m8VOjNIU9KOXPHRjdjnJi7dYYSY9ZNRbWi3qzWjrXknk6yM2pWoA/RqVO35MIX W6b6TUg/UzvxCTxurqrBGyKwdDMSJPTL5d4+td8PgQX0QO9HkhSweldU6EyOO0hYIs5F LhFgGhqEWtMRZz5ZhpjAZxUlCJBH30RoHYEjfLzqHVV9XhDrR3paH31GdujstVESzRSm LdMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704022830; x=1704627630; 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=zS3TDQRU6oTfpiN2hyguiMQit08ILUZ9ceEkOd2kOgw=; b=Uc4iTS/o+c8hfcxnfAMKn7SAghFzgKcmU0r6nwpK/YxiUCUhiwCH+Ok5jZBUftn/vG raj+90+fQfC0MsuvOq7XJjpwHW0cPmnkamqJMdIu4LwsfRE79nkCLNJlzVO01u8DVwj4 nMejDf8sdsUfD2maHWO9cLNfIy3qoPw+gzgBuHQJMSnQaOK66f48Hb6NfEtb5aOIqBbG BR53b7BE7nbIyxD1O8wA6RfWdliiqqJF8biDotbbD6YqFChsQRIThn86A9HFpYWL11/y Btcw47G186/k7rS2Hm2skg9JKVgTwkpW43YbLuylAsEbK5/PFRyl5JQTV2EMR3HQyiGC YFNA== X-Gm-Message-State: AOJu0YyWcLYm0J3MOC6QW/SnyqKrTaXa6CnJX/PQguYPSzPo57HSh1QJ 5fYNHfPDnAUfS8UZfUhodzbl7hu9xvVf5Q== X-Google-Smtp-Source: AGHT+IHl1+5nHgYynn6t1EQuS48FB3h1XZoqPec9XGeRnNmN5SPHdEpipiW1whM3ulpSsap7anP0VQ== X-Received: by 2002:a05:600c:46cc:b0:40b:473d:6b82 with SMTP id q12-20020a05600c46cc00b0040b473d6b82mr7986481wmo.12.1704022830582; Sun, 31 Dec 2023 03:40:30 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id l4-20020a05600c1d0400b0040d3276ba19sm37116479wms.25.2023.12.31.03.40.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 03:40:30 -0800 (PST) From: Efraim Flashner Date: Sun, 31 Dec 2023 13:39:45 +0200 Message-ID: <06d01fdafe2fd52169e57943843e4a49b9dc4d77.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-dotguile): Extract from default-skeletons, export. (default-skeletons): Use %default-dotguile. Change-Id: Ibe91b3b517ae542bd28070a08e14152f87ed75ec --- gnu/system/shadow.scm | 42 +++++++++++++++++++++++------------------- 1 file 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 @@ (define-module (gnu system shadow) %default-xdefaults %default-gdbinit %default-nanorc + %default-dotguile default-skeletons skeleton-directory %base-groups @@ -217,25 +218,9 @@ (define %default-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." - - (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 @@ (define (default-skeletons) (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) From patchwork Sun Dec 31 11:39:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58247 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 0C0E327BBE2; Sun, 31 Dec 2023 11:42:01 +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 2491027BBEA for ; Sun, 31 Dec 2023 11:42:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJuBn-0001gR-2A; Sun, 31 Dec 2023 06:41:07 -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-0001eV-TA for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:05 -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 1rJuBk-0003jt-Hn for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJuBl-0004W3-Ki for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68169] [PATCH 7/9] system: Add default guix-home-config. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 11:41:05 +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.170402284417253 (code B ref 68169); Sun, 31 Dec 2023 11:41:05 +0000 Received: (at 68169) by debbugs.gnu.org; 31 Dec 2023 11:40:44 +0000 Received: from localhost ([127.0.0.1]:45741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBP-0004U1-Rt for submit@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:44 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:45067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBL-0004T4-Ew for 68169@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:39 -0500 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40d2764c0f2so106469475e9.2 for <68169@debbugs.gnu.org>; Sun, 31 Dec 2023 03:40:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704022832; x=1704627632; 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=biV/AMH1DqP+KKguLmy/jPyYFRgPzHvZIOfPozS/pdc=; b=huKkgKPpM1wA8UGocvIAZUAJZpWEqrBTAEkBjH43bDgSkC9U8jWWwNJEuu6fw5nVQU p1k/dYuZVw3TGSQZB9671X9zAzxtpq+Y2mhObx97Is9IjHcrCSIynGuo3WOqOySG3b+J 6yG60GGkuxhdCPYDDePrf+6/59UyAVNQUQOBDe9cKXcF+nAv6OkUISm5PNveBdRrZbn9 tKG0x5tEWHuh4ZjliMNiFl6niBur8DlBbnO0YmXNIVW/2RdiZP3QriFAlF0O1MhEn+w/ NFRoY/EcBCK/OB7Xrl/2X305Dd1um9Y6lfEVyC+mq0MnalNaR+m7d14FCTgaia0Lkous TFEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704022832; x=1704627632; 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=biV/AMH1DqP+KKguLmy/jPyYFRgPzHvZIOfPozS/pdc=; b=Ca/E/dzeFUI43yQgVLexkGPXCWT/Tz66znRpdYM1nFEYim3Oq001kxtUr5KZDgeXMk vx8+QzQv/DV+5P1mSPivRhbo3NjCLSORx5YvCD6SWrMSvUNLUGnP50ps4Jxrji7jsVPt 7lJpWcBJZvhMqIpVekst06NX3CcR4jeu+f7eUFX6DIsax5lkVqcfEVqXDRzrNqCcjfRP TyT89p/Pq7LwIYXoZIjincEHsuuO2OSbmPeJBrXK5vdnkYNZbuF6yGjByvULGLvYESHm 1/R+E1Dh0YZmTmL/6QdzAtidG2gzo0uzOqvVxq4B+wOYXL6avQlwywzVDNttnx/tL7Cz FAiw== X-Gm-Message-State: AOJu0Yw3pvXvbnhpyBiR8vVkkr8SZYUIRmillnLoR+8tP4Qlfvc9tlSf TAc43ip9sDk/RCnw2fgXEnvkLYmAs8eOIw== X-Google-Smtp-Source: AGHT+IGVv7g94bGg6Yt18XQRUciHqO2VqIpfPcTWDezIYDFFXudpYB0bN0yRPt1Z1E4xpLXv6Vp7PQ== X-Received: by 2002:a05:600c:a43:b0:40d:6cb7:7ee3 with SMTP id c3-20020a05600c0a4300b0040d6cb77ee3mr2470937wmq.124.1704022832627; Sun, 31 Dec 2023 03:40:32 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id ay14-20020a05600c1e0e00b0040c6ab53cd2sm37898384wmb.10.2023.12.31.03.40.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 03:40:32 -0800 (PST) From: Efraim Flashner Date: Sun, 31 Dec 2023 13:39:46 +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 (%deafult-skeleton-home-config): New variable. (default-skeletons): Add it. Change-Id: Ida4cca8b1b3674491a4f18d94bc1b12d426575ba --- gnu/system/shadow.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index ca9c65e6d4..6c8e02953a 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -70,6 +70,7 @@ (define-module (gnu system shadow) %default-gdbinit %default-nanorc %default-dotguile + %default-skeleton-home-config default-skeletons skeleton-directory %base-groups @@ -239,6 +240,37 @@ (define %default-dotguile (display \"Consider installing the 'guile-colorized' package for a colorful Guile experience.\\n\\n\"))))\n")) +(define %default-skeleton-home-config + (plain-file "default-home-config" "\ +;; This is a sample Guix Home configuration which can help setup your +;; home directory in the same declarative manner as Guix System. +;; For more information, see the Home Configuration section of the manual. +(define-module (guix-home-config) + #:use-module (gnu home) + #:use-module (gnu home services) + #:use-module (gnu home services shells) + #:use-module (gnu services) + #:use-module (gnu system shadow)) + +(define home-config + (home-environment + (services + (list + ;; Uncomment the shell you wish to use for your user: + ;(service home-bash-service-type) + ;(service home-fish-service-type) + ;(service home-zsh-service-type) + + (service home-files-service-type + `((\".guile\" ,%default-dotguile) + (\".Xdefaults\" ,%default-xdefaults))) + + (service home-xdg-configuration-files-service-type + `((\"gdb/gdbinit\" ,%default-gdbinit) + (\"nano/nanorc\" ,%default-nanorc))))))) + +home-config")) + (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." @@ -257,7 +289,8 @@ (define (default-skeletons) (".nanorc" ,%default-nanorc) (".Xdefaults" ,xdefaults) (".guile" ,%default-dotguile) - (".gdbinit" ,gdbinit)))) + (".gdbinit" ,gdbinit) + ("guix-home-config.scm" ,%default-skeleton-home-config)))) (define (skeleton-directory skeletons) "Return a directory containing SKELETONS, a list of name/derivation tuples." From patchwork Sun Dec 31 11:39:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58245 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 2CD6927BBE2; Sun, 31 Dec 2023 11:41:59 +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 D185127BBEA for ; Sun, 31 Dec 2023 11:41:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJuBy-0001ir-3d; Sun, 31 Dec 2023 06:41:19 -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 1rJuBl-0001ej-Em for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:05 -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 1rJuBk-0003jz-Tl for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJuBm-0004WA-0F for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68169] [PATCH 8/9] system: default-zprofile: Sync with home zprofile. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 11:41:05 +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.170402285317269 (code B ref 68169); Sun, 31 Dec 2023 11:41:05 +0000 Received: (at 68169) by debbugs.gnu.org; 31 Dec 2023 11:40:53 +0000 Received: from localhost ([127.0.0.1]:45743 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBY-0004US-Dg for submit@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:52 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:61733) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBN-0004TF-Ko for 68169@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:42 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-40d5d898162so29823105e9.3 for <68169@debbugs.gnu.org>; Sun, 31 Dec 2023 03:40:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704022835; x=1704627635; 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=D56GMppx192x7gbABpZTZhKxgPyXhXvhZRPe27OfY/g=; b=UrZCuz5GUkdheZKWJa9CcXehk+5pmm2pqpcRt8WQk25zt/mWdN7g4haGtmpNRLr4+X idfwofkhV00irawVpm2BD83OOONWpFkgqjC67NVIGc2thP81YbRvDrnu3YlDW34eSlC1 TpEUFPnZ9iot5IL2Qe0xSK7Uw45eWTs6y4vTKIPSerYTdD51JUKSNPdPa6VoUIXdwsmP e9mNKwOkgTVM+bjXR0I2J+CEygwaDt3bZdW9r1J0/iTufeVCxq4OHPZ6RZF2w478R+36 mNBdiPayMJuh4a2+3OLojIGPCdyttU6Ejk4tQULotby7FtwLcU5vexEMede5xOANjOZm rbPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704022835; x=1704627635; 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=D56GMppx192x7gbABpZTZhKxgPyXhXvhZRPe27OfY/g=; b=XVmnsnu+XKZQ6LBps8DDGrwCuUnl6+EO+JckRv6IEyi75xtxqlqTiDbFPF6gr7VdjL pDCxoZnYazUhkr0KeG2rWeDyZhB+WraNItaZBtl5QMZj9G4WLhAOm2WGmO4n9ju6psQd 20IK0umjQZZaZFncy4JxaWJvo+eF/L4QKE04o9AMmbd8iZt3g2NbqWCIupddLCf9p/40 1zxOVc3kE6KTgJGxbL5e8pwBJapTggl+48L4zTINQmZKlXeAL8vczVI/LmxnokIg96qX LSUfQaAQJB3KeTBG094/Ek0I9AM4Xaky0uPi+lIwF0970GkXlSekb8OWP6ZAYLFQ0W4m zq2A== X-Gm-Message-State: AOJu0YzpELNX49EeMq9g6dHXJNMziRSpr0R7hB3tb6HZIP08UryKmSte QJK927GDhc62qs6vs8LRwrlW40azx3h7eQ== X-Google-Smtp-Source: AGHT+IEdE+Kx0b2trx0abp4xCrwI6RsJGRZAQZlW0gJLlJh5NVfWamrVo2YrXFhOCo24FBYrbAHpsw== X-Received: by 2002:a05:600c:1992:b0:40d:5fed:eecf with SMTP id t18-20020a05600c199200b0040d5fedeecfmr3426005wmq.101.1704022834755; Sun, 31 Dec 2023 03:40:34 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id cg13-20020a5d5ccd000000b00336e6014263sm12051477wrb.98.2023.12.31.03.40.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 03:40:34 -0800 (PST) From: Efraim Flashner Date: Sun, 31 Dec 2023 13:39:47 +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 The removed fields are already sourced in /etc/profile. * gnu/system/shadow.scm (%default-zprofile): Sync with default zprofile from (gnu home services shells). Change-Id: I419eadf636344e23e8fd2f7006efa81f45527756 --- gnu/system/shadow.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 6c8e02953a..8b3958ba5c 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -174,17 +174,10 @@ (define %default-bash-profile (define %default-zprofile (plain-file "zprofile" "\ -# Honor system-wide environment variables +# Set up the system, user profile, and related variables. source /etc/profile - -# Merge search-paths from multiple profiles, the order matters. -eval \"$(guix package --search-paths \\ --p $HOME/.config/guix/current \\ --p $HOME/.guix-profile \\ --p /run/current-system/profile)\" - -# Prepend setuid programs. -export PATH=/run/setuid-programs:$PATH +# Set up the home environment profile. +source ~/.profile ")) (define %default-xdefaults From patchwork Sun Dec 31 11:39:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58239 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 3398227BBEC; Sun, 31 Dec 2023 11:41:28 +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 8C87727BBE9 for ; Sun, 31 Dec 2023 11:41:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJuBo-0001hI-MN; Sun, 31 Dec 2023 06:41:09 -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 1rJuBl-0001em-K1 for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:05 -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 1rJuBl-0003k0-8b for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJuBm-0004WH-BJ for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68169] [PATCH 9/9] home: services: zsh: Use unified zprofile. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 11:41:06 +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 , ( , Andrew Tropin , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: ( , Andrew Tropin , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 68169-submit@debbugs.gnu.org id=B68169.170402285317276 (code B ref 68169); Sun, 31 Dec 2023 11:41:06 +0000 Received: (at 68169) by debbugs.gnu.org; 31 Dec 2023 11:40:53 +0000 Received: from localhost ([127.0.0.1]:45745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBY-0004UV-Rl for submit@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:53 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:61736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBP-0004TZ-He for 68169@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:44 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40d5d898162so29823205e9.3 for <68169@debbugs.gnu.org>; Sun, 31 Dec 2023 03:40:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704022837; x=1704627637; 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=2YXu0meyswPHbovnNq75HvcWaaiZ/bMZZIKKv+kHAOc=; b=mvztVUdiN6n9wDj4UJtuVJvTu9fw5TbLkSuYWKElHaYBc2riXzdFznkEFlhkjLSxo1 HSzVVxAh3Or6ykT+sdBzQvQS33LC8UbMsQ5qvhqDOdvP+GzS0pwVLNx1spKY/w6l1/OF VD0lEAeUqBikWBe/GlP2pG8yZ8fHiVsN3Tdsc3F+cMo6cuNztB1qlW7w1Q0x1tk3RUBq BoSL5inqZF1dtahI9V9ZKaYs66AV0GpLw2FibjJhvpnuahVlk4R5vCZHz+w5IrNocT7b cvSAO6xZTgPeobCiipDzqV2UPmo1La6oQAxQyAPMFgljSl/PLtKgUe7R6pp/lt1aLxcb o1og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704022837; x=1704627637; 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=2YXu0meyswPHbovnNq75HvcWaaiZ/bMZZIKKv+kHAOc=; b=hsaLv1cTn9ciACAoinrAlrZbRJ1Pe5aK9LlZA5i8Ri0NpdHdkzhPsMyOk0GI82+RHn cShF8mS3T2g8HBDwcSPp94ReN0OC65TxjLi6QOlB1jgoW6iMzC+xdo3SAuZm6SE9eOn5 6Aytg5snyvuOGdv2Dsmz4u3+cLHdK1GvTjScFnRbXEednE+h9XFVDksZr9kT2khmjf0j s+FFwCw4VOn8nBLIArJeQ4iWN104EmbKn1c6YDMEaBx9iYuK6EifyQWF2aBLF0Tgzl+9 RwjEK8kOvuFHBWOV3UN7n0hhNyUoer/TslrxA74SxUAa92MeKJxo9GZ1/Tqy3jimdLta cnRA== X-Gm-Message-State: AOJu0YxwWaOHhnWJQxCUShRJrmUMhHwk2RITjo04aZEgInWXjcARTJrh FA8DlidHEC3BWlv9sAwf2OSt3acGr2TflQ== X-Google-Smtp-Source: AGHT+IEN9Oe+S63oETovDfjnR1e3Fc9/kQbq3S0guLZj6Iu8wX3ZAuucZWOk+8ogo7h1FtpuyHETcg== X-Received: by 2002:a7b:c4cd:0:b0:40c:6138:9815 with SMTP id g13-20020a7bc4cd000000b0040c61389815mr9384709wmk.105.1704022836734; Sun, 31 Dec 2023 03:40:36 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id h12-20020a05600c314c00b0040d6eb44b94sm10990476wmo.2.2023.12.31.03.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 03:40:36 -0800 (PST) From: Efraim Flashner Date: Sun, 31 Dec 2023 13:39:48 +0200 Message-ID: <0ca8780eb30164f4fbdb058e8f1c30c8a387eafb.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/home/services/shells.scm (zsh-file-zprofile): Use the zprofile defined in (gnu system shadow) as a base. Change-Id: Iaf4c4f66d1ccbc0bd0166136b3d082229bdec201 --- gnu/home/services/shells.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm index 9dd56f634a..db82a7cff3 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -20,7 +20,7 @@ (define-module (gnu home services shells) #:use-module (gnu services configuration) - #:autoload (gnu system shadow) (%default-bashrc) + #:autoload (gnu system shadow) (%default-bashrc %default-zprofile) #:use-module (gnu home services utils) #:use-module (gnu home services) #:use-module (gnu packages shells) @@ -189,12 +189,8 @@ (define (zsh-file-zshenv config) (define (zsh-file-zprofile config) (mixed-text-file "zprofile" + (plain-file-content %default-zprofile) "\ -# Set up the system, user profile, and related variables. -source /etc/profile -# Set up the home environment profile. -source ~/.profile - # It's only necessary if zsh is a login shell, otherwise profiles will # be already sourced by bash "