From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 03 23:23:57 2025 Received: (at submit) by debbugs.gnu.org; 4 Apr 2025 03:23:57 +0000 Received: from localhost ([127.0.0.1]:36546 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u0Xeu-0002bN-RZ for submit@debbugs.gnu.org; Thu, 03 Apr 2025 23:23:57 -0400 Received: from lists.gnu.org ([2001:470:142::17]:32922) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u0Xeo-0002a2-CI for submit@debbugs.gnu.org; Thu, 03 Apr 2025 23:23:53 -0400 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 1u0Xei-0006su-QO for guix-patches@gnu.org; Thu, 03 Apr 2025 23:23:44 -0400 Received: from mx.boiledscript.com ([2a01:4f8:10b:392::42]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0Xeh-0002hu-7x for guix-patches@gnu.org; Thu, 03 Apr 2025 23:23:44 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1743737021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tm9Lvhwm7Z/F7x6u5dWGMXUbr4UiI1vKjwS8fQdmtt0=; b=Mtr+xzaDPlPyNGlIt4cVLD9OQNyLWE1CwfTmBXcoKyXXvzDYpcHz/V+Qe+ONJQ91d4HvDE PGQkO2RketzqtqrwVal5Phbtuhk4ZG4nyBX5pfzyBzo1IOB+eOR54tZbmu+pkCz61NmlGv MWOivYO2RDrBXDARbpoBaK91QG8+VXWmZPKrZ0B1uSrItjhERBhRFPA8pwJMyIzetX2J3R x2A0DCdDIZceW0cGKWxgARjFfgkqJturp+rC5rvsguas6DZGS6k7ykiHVV3qcdfTtQfdNv 9w0+NmnmZFYkmLQFLkY+Nf/BpYQISssTJ204+HMwkniy+VYuKaFeG6O7wxEYzQ== To: guix-patches@gnu.org Subject: [PATCH v4 3/6] system: /etc/profile: Set up extra environment variables for Guix Home. Date: Fri, 4 Apr 2025 11:23:00 +0800 Message-ID: <23fcef43612216d58882c304ec255d2fbb816509.1743736516.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andrew Tropin , Hilton Chain , Janneke Nieuwenhuizen , Ludovic Courtès , Tanguy Le Carrour Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a01:4f8:10b:392::42; envelope-from=hako@ultrarare.space; helo=mx.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * gnu/system.scm (operating-system-etc-service)[profile]: Set up extra environment variables for Guix Home. * gnu/home/services/shells.scm (add-shell-profile-file): Skip setup-environment if already finished. * gnu/home/services.scm (environment-variables->setup-environment-script): Skip initializing home profile if already finished. Change-Id: Ife4100c6b19f61272525eebc82931c81784fe9e0 --- gnu/home/services.scm | 6 +++++- gnu/home/services/shells.scm | 6 +++++- gnu/system.scm | 5 +++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/home/services.scm b/gnu/home/services.scm index 85a43f80ca..6be1a49a90 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -279,7 +279,11 @@ (define (environment-variables->setup-environment-script vars) # ~/.profile does) GUIX_PROFILE=\"$HOME_ENVIRONMENT/profile\" PROFILE_FILE=\"$GUIX_PROFILE/etc/profile\" -[ -f $PROFILE_FILE ] && . $PROFILE_FILE +# Skip if already initialized. +case $INFOPATH in + *$GUIX_PROFILE/share/info*) ;; + *) [ -f \"$PROFILE_FILE\" ] && . \"$PROFILE_FILE\" ;; +esac case $GUIX_LOCPATH in *$GUIX_PROFILE/lib/locale*) ;; diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm index bab5730c3d..35c0c52a8e 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -88,7 +88,11 @@ (define (add-shell-profile-file config) "shell-profile" "\ HOME_ENVIRONMENT=$HOME/.guix-home -. $HOME_ENVIRONMENT/setup-environment +# Skip if already sourced. +case $INFOPATH in + *$HOME_ENVIRONMENT/profile/share/info*) ;; + *) . \"$HOME_ENVIRONMENT/setup-environment\" ;; +esac $HOME_ENVIRONMENT/on-first-login unset HOME_ENVIRONMENT\n" (serialize-configuration diff --git a/gnu/system.scm b/gnu/system.scm index 46e6729e74..b67d26b648 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1148,6 +1148,11 @@ (define* (operating-system-etc-service os) esac done +# Set up extra environment variables for Guix Home. +HOME_ENVIRONMENT=\"$HOME/.guix-home\" +[ -f \"$HOME_ENVIRONMENT/setup-environment\" ] && . \"$HOME_ENVIRONMENT/setup-environment\" +unset HOME_ENVIRONMENT + # Prepend search paths not in a profile. export PATH=/run/privileged/bin:$PATH export XCURSOR_PATH=\"$HOME/.icons:$XCURSOR_PATH\" -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 03 23:27:03 2025 Received: (at control) by debbugs.gnu.org; 4 Apr 2025 03:27:04 +0000 Received: from localhost ([127.0.0.1]:36580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u0Xhv-0002oo-Bz for submit@debbugs.gnu.org; Thu, 03 Apr 2025 23:27:03 -0400 Received: from mx.boiledscript.com ([2a01:4f8:10b:392::42]:47190) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u0Xhr-0002oL-Ek for control@debbugs.gnu.org; Thu, 03 Apr 2025 23:27:00 -0400 Date: Fri, 04 Apr 2025 11:26:02 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1743737217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=1cb6Pxl7vmZdVWKjwiEtbTf2vtKoBRAoWds+NG/Amsw=; b=LkIp6WkNK5NOiyZhomWJTqWD6aHdo7i/tJW1qI40rFJ8dTTeeydesXZTyT5zMNiEJCBvpZ 8TFSzdwfiZqPT+Hjp1cVB2p9YdCLNxn2BFoUJohIMhtqtVnBQVsBpoHRO5FIAnq9xZ+JoV 4glte2IjroLB7xg2E12QlgY23cOauNUvRPakKeRI6KgEtJ9hMbpWrbGHBaMU37pWKvFMqR zKC+Ut6PRH6rw6IfBs4wmDGOCaaxCJtwEuLstPS+TcO9ubmaoQMk0oUO0rdk7CUkXi2sf8 8k7rcfdCenQkmSS81LKAgfFtGOH3fMvirUDtiNHOzJ4gIwDE2F710GQJIFZpbQ== Message-ID: <87plhsppyt.wl-hako@ultrarare.space> From: Hilton Chain To: control@debbugs.gnu.org Subject: Control message MIME-Version: 1.0 X-MS-Reactions: disallow Content-Type: text/plain; charset=US-ASCII X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) merge 77035 77522 77523 77524 77525 77526 77527 77528 quit From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 18 22:32:36 2025 Received: (at 77526) by debbugs.gnu.org; 19 Apr 2025 02:32:37 +0000 Received: from localhost ([127.0.0.1]:54229 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5y0Q-00023d-JF for submit@debbugs.gnu.org; Fri, 18 Apr 2025 22:32:36 -0400 Received: from mail.envs.net ([5.199.136.28]:56512) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5y0K-00022N-04 for 77526@debbugs.gnu.org; Fri, 18 Apr 2025 22:32:29 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id D488E38A409F; Sat, 19 Apr 2025 02:32:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1745029946; bh=g3rDCy3W6aTFUFOD4L1H4LH/pgd0OlMHVW5WEHjsxNE=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=nFOLlsrmBzhuKLPrr0x3fj5pox2cRKKRIKLZ8EBEi9KjHwTD/h3q2g7CF3Y/nQvEL OHeTIlkvZx9M1yaSXSdz+elj8Z2gTmr9NO/Jh31YMufaON1X8tTUOQs5iBMUrLRmi/ WVUBilQV/VWndm4mDRQQzTpDLlXhHJEm8a9EkuXe9K1G5aWRFqGMS0tinkShPIX9Ny 7x1kGsG6DRTJyfnzQW9Q7/1Xbl9ma4q5xUlPuMGXZAt7X4z5fhNhPeosEisieX+qwt NRZF1fkfInIql/X/DKUn1I/WfM3dtVh13UABOGrxR60L73QzeBKPBymhtflIQXI4z8 qA6xcwA42xR4/0Ztw4bbb9F9RQ0MKC8x1hlQb0QiKhzwOONo9MA/oDLBCK9QRbHAHK T5sCB9YEjQhAM9giLHBmO9ev+wgjoKrdyz1TizYos/PnYWQx+1+nQVJapkAdZy4uSc eaEdbXRdJH76hL7fbWDc7bL22kREAFy7YaCMMa/BbqRbd9Radb0G0SpnJo5vL4lUBU YobINTUyhf0+BEHRHNpRJ5pVjxSBWUy5OHTVEYKTgl/llpDVldJiDMa5EKabE20jW4 3vH4AKj82QtyikYaNeFNpTTerxd+xvtN+KuMDI1hISFEHrnGv66RypEXKeqUG6yl5z QLN5kRnO461ZGIrr0qJzuDz0= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id dldElt9xd4h1; Sat, 19 Apr 2025 02:32:16 +0000 (UTC) Received: from localhost (unknown [112.44.73.128]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sat, 19 Apr 2025 02:32:16 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 2b28ecc6; Sat, 19 Apr 2025 02:37:14 +0000 (UTC) From: =?utf-8?B?5a6L5paH5q2m?= To: Hilton Chain Subject: Re: [bug#77526] [PATCH v4 3/6] system: /etc/profile: Set up extra environment variables for Guix Home. In-Reply-To: <23fcef43612216d58882c304ec255d2fbb816509.1743736516.git.hako@ultrarare.space> (Hilton Chain's message of "Fri, 4 Apr 2025 11:23:00 +0800") References: <23fcef43612216d58882c304ec255d2fbb816509.1743736516.git.hako@ultrarare.space> Date: Sat, 19 Apr 2025 10:37:14 +0800 Message-ID: <87cyd8ho6d.fsf@envs.net> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77526 Cc: 77526@debbugs.gnu.org, Ludovic =?utf-8?Q?Court=C3=A8s?= , Janneke Nieuwenhuizen , Tanguy Le Carrour , Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hilton Chain writes: > * gnu/system.scm (operating-system-etc-service)[profile]: Set up extra > environment variables for Guix Home. > * gnu/home/services/shells.scm (add-shell-profile-file): Skip > setup-environment if already finished. > * gnu/home/services.scm (environment-variables->setup-environment-script): > Skip initializing home profile if already finished. > > Change-Id: Ife4100c6b19f61272525eebc82931c81784fe9e0 > --- > gnu/home/services.scm | 6 +++++- > gnu/home/services/shells.scm | 6 +++++- > gnu/system.scm | 5 +++++ > 3 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/gnu/home/services.scm b/gnu/home/services.scm > index 85a43f80ca..6be1a49a90 100644 > --- a/gnu/home/services.scm > +++ b/gnu/home/services.scm > @@ -279,7 +279,11 @@ (define (environment-variables->setup-environment-script vars) > # ~/.profile does) > GUIX_PROFILE=\"$HOME_ENVIRONMENT/profile\" > PROFILE_FILE=\"$GUIX_PROFILE/etc/profile\" > -[ -f $PROFILE_FILE ] && . $PROFILE_FILE > +# Skip if already initialized. > +case $INFOPATH in > + *$GUIX_PROFILE/share/info*) ;; > + *) [ -f \"$PROFILE_FILE\" ] && . \"$PROFILE_FILE\" ;; > +esac I don't think INFOPATH is a perfect flag, but I have no better idea here.. So look good to me.