From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id IGNRJjxjq2NlTQEAbAwnHQ (envelope-from ) for ; Tue, 27 Dec 2022 22:27:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id ABtWJTxjq2OlfQAAG6o9tA (envelope-from ) for ; Tue, 27 Dec 2022 22:27:24 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CCA4B2FB34 for ; Tue, 27 Dec 2022 22:27:23 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAHTT-0001Et-KI; Tue, 27 Dec 2022 16:27: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 1pAHTS-0001ED-DN for guix-patches@gnu.org; Tue, 27 Dec 2022 16:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pAHTS-00040U-3Y for guix-patches@gnu.org; Tue, 27 Dec 2022 16:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pAHTR-0007t8-VU for guix-patches@gnu.org; Tue, 27 Dec 2022 16:27:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60365] [PATCH 1/4] system, home: Factorize default '.bashrc'. References: <20221227212342.17939-1-ludo@gnu.org> In-Reply-To: <20221227212342.17939-1-ludo@gnu.org> Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Dec 2022 21:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60365 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60365@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 60365-submit@debbugs.gnu.org id=B60365.167217639530263 (code B ref 60365); Tue, 27 Dec 2022 21:27:01 +0000 Received: (at 60365) by debbugs.gnu.org; 27 Dec 2022 21:26:35 +0000 Received: from localhost ([127.0.0.1]:56601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAHT0-0007rv-77 for submit@debbugs.gnu.org; Tue, 27 Dec 2022 16:26:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAHSy-0007rb-U1 for 60365@debbugs.gnu.org; Tue, 27 Dec 2022 16:26:33 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pAHSt-0003wx-I0; Tue, 27 Dec 2022 16:26:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=yzRijfcOpOS3yxSmBXg9a+6cJjQVJGLS+CDH/FpIX4c=; b=Omon+9Qeph2F4K y3b/Ij70aVFyjVY3YVPVGwG+3nT7slUbz8rf637DNRjhLiiOHeTbbgvvv8OMWNqQB3NbCDyuzF7ue hmvmuExEqHD/L71wGyhORWKtN+krB69bbpRRXYIjOPcVCxajVoMs4wQfQjOn1fpX0ix2D7DP81GRB 02c627uNgrRCGUNxDn6V/hyrSo2z5ppI4fGoRE3Mh0s+TSH1ge5pmO12S/0gd4W2/wi0qijNM/rxV SONWj5YhwaeyuZwD2Ulx3JBtLHTF9PWpJQdgwmUlv7fbL16QUhGFlnAyeb994g/ws70HG2tgUlp82 UieeLTu2KalxXaFgUnCg==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pAHSt-0007DL-6G; Tue, 27 Dec 2022 16:26:27 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Tue, 27 Dec 2022 22:26:15 +0100 Message-Id: <20221227212618.18063-1-ludo@gnu.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1672176443; a=rsa-sha256; cv=none; b=j+LADOGwdPMxUMki7v9Y/sEytTQiK5aU3Y7csptj53WLM3qf7eHdVjVQpcKzD2lHG0nc5J bOAobwy+mAIvO8iz0QtSmQITQ+HHx+0+XPaA613yRstgJD/Md6T3fdktgS0NkZxgmiOq7v ZfMER+NtSBAeGAcS+pF0h6Alnx+rtGF4m7/c7PpNF4BjODM+aO18VyKDF2fErB4pQDaaLH MRyWGcGsigfmUPzsSC+iZDq25ACOvokbgXQaLJa/1Ac03NDLux8hqORdw2rV02tqscn+9v GLkasc+HkHWq/qPIzuYPET5D+5eFKAwAUu1B2RqyETlYKtb7n50S0KIG1OTzfg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Omon+9Qe; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672176443; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=yzRijfcOpOS3yxSmBXg9a+6cJjQVJGLS+CDH/FpIX4c=; b=DX91z64uxc/xXS+/AgxXGQAAOFjSraeAzuOOlV808s7flztoyV6ce3T77bSdOTseym1nJT hDdBJye+ZcqhQHN1IRtbdtHSoktc8tu6zMcgCDom3g6GnrXEkSBfcwKFFy9z4olyKr5UIq hCf9BZ0UlIFjjlSwO6UZv3qltmnl0GK1jCaCCvLONMb3n0yLQTh/FiYIoQ2h0mUYKWpra/ NtoN99/Zq2/q/a2QpiQ6meu/4Sc9V+REtA7NScDFXtK/C2ExvUMjaOmznmZHVDWtLZJeFd DUInAU5D9wWLL91a/MJs2JE1x+/4gZ7VGLRFY40GQuiQ9ohsYlkrfyQpvSe6vA== X-Spam-Score: -1.73 X-Migadu-Queue-Id: CCA4B2FB34 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Omon+9Qe; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -1.73 X-TUID: wSX1becytUQF * gnu/system/shadow.scm (%default-bashrc): New variable. Source /etc/bashrc only if it exists. (default-skeletons): Use it. * gnu/home/services/shells.scm (guix-bashrc): Remove. (add-bash-configuration): Refer to '%default-bashrc' instead. --- gnu/home/services/shells.scm | 41 +++--------------------------------- gnu/system/shadow.scm | 26 +++++++++++++---------- 2 files changed, 18 insertions(+), 49 deletions(-) diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm index b529c8e798..d7dd579293 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -19,6 +19,7 @@ (define-module (gnu home services shells) #:use-module (gnu services configuration) + #:autoload (gnu system shadow) (%default-bashrc) #:use-module (gnu home services utils) #:use-module (gnu home services) #:use-module (gnu packages shells) @@ -370,43 +371,6 @@ (define-configuration home-bash-configuration won't be read in some cases (if the shell terminates by exec'ing another process for example).")) -;; TODO: Use value from (gnu system shadow) -(define guix-bashrc - "\ -# Bash initialization for interactive non-login shells and -# for remote shells (info \"(bash) Bash Startup Files\"). - -# Export 'SHELL' to child processes. Programs such as 'screen' -# honor it and otherwise use /bin/sh. -export SHELL - -if [[ $- != *i* ]] -then - # We are being invoked from a non-interactive shell. If this - # is an SSH session (as in \"ssh host command\"), source - # /etc/profile so we get PATH and other essential variables. - [[ -n \"$SSH_CLIENT\" ]] && source /etc/profile - - # Don't do anything else. - return -fi - -# Source the system-wide file. -if [[ -e /etc/bashrc ]]; then - source /etc/bashrc -fi - -# Adjust the prompt depending on whether we're in 'guix environment'. -if [ -n \"$GUIX_ENVIRONMENT\" ] -then - PS1='\\u@\\h \\w [env]\\$ ' -else - PS1='\\u@\\h \\w\\$ ' -fi -alias ls='ls -p --color=auto' -alias ll='ls -l' -alias grep='grep --color=auto'\n") - (define (add-bash-configuration config) (define (filter-fields field) (filter-configuration-fields home-bash-configuration-fields @@ -449,7 +413,8 @@ (define* (file-if-not-empty field #:optional (extra-content #f)) ,@(list (file-if-not-empty 'bashrc (if (home-bash-configuration-guix-defaults? config) - (list (serialize-field 'aliases) guix-bashrc) + (list (serialize-field 'aliases) + (plain-file-content %default-bashrc)) (list (serialize-field 'aliases)))) (file-if-not-empty 'bash-logout))))) diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 59f0a02c8b..4360a5ebd1 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2013-2020, 2022 Ludovic Courtès ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Efraim Flashner @@ -63,7 +63,8 @@ (define-module (gnu system shadow) user-group-id user-group-system?) - #:export (default-skeletons + #:export (%default-bashrc + default-skeletons skeleton-directory %base-groups %base-user-accounts @@ -118,14 +119,8 @@ (define %base-user-accounts (create-home-directory? #f) (system? #t)))) -(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" "\ -# Honor per-interactive-shell startup file -if [ -f ~/.bashrc ]; then . ~/.bashrc; fi\n")) - (bashrc (plain-file "bashrc" "\ +(define %default-bashrc + (plain-file "bashrc" "\ # Bash initialization for interactive non-login shells and # for remote shells (info \"(bash) Bash Startup Files\"). @@ -145,7 +140,7 @@ (define (default-skeletons) fi # Source the system-wide file. -source /etc/bashrc +[ -f /etc/bashrc ] && source /etc/bashrc # Adjust the prompt depending on whether we're in 'guix environment'. if [ -n \"$GUIX_ENVIRONMENT\" ] @@ -157,6 +152,15 @@ (define (default-skeletons) alias ls='ls -p --color=auto' alias ll='ls -l' alias grep='grep --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" "\ +# Honor per-interactive-shell startup file +if [ -f ~/.bashrc ]; then . ~/.bashrc; fi\n")) + (bashrc %default-bashrc) (zprofile (plain-file "zprofile" "\ # Honor system-wide environment variables source /etc/profile\n")) -- 2.38.1