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 "