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