From patchwork Thu Feb 6 04:24:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liam Hupfer X-Patchwork-Id: 38306 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 D388227BBEA; Thu, 6 Feb 2025 04:27:48 +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=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED 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 68C2927BBE2 for ; Thu, 6 Feb 2025 04:27:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tftTs-0000Rn-As; Wed, 05 Feb 2025 23:27: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 1tftTn-0000P7-0t for guix-patches@gnu.org; Wed, 05 Feb 2025 23:27:07 -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 1tftTl-00017t-DC; Wed, 05 Feb 2025 23:27:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Dwiy5+CqTIh8K5J1sqV4Ik5ui8H+88jsUR933dn+I0k=; b=naxjR2jkGgjABQzCX1C/Q0M1H1PnKa34PrvhAzkIsG3m3XS4JNRfX4LS5ZAzwXcHmYc43tsdk1M8WO4vTgViJwe1yC4abm0c+i/qsOxx8hWgfM8oKML+saXZHdfaC/qdOft3hoGJZzOKn9QH8/weW2ST5lp901AjgA7U+wgcu+PqCQQM2FODqNrkDELc/c93rq1tjtjWbSGJKCUJ8oOxqbrYr3YQRzheqzYwHbKV2U8Fy1RhXYjuH4KmmrMgaJcHHgsmTJjZwLD267TaDDl6QMaAjfoPk+xG6R3NW0ECvH7fACoOm+Un4FeDX8GebLPyF9PPgBtQy/UFDyNoIbGPOg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tftTh-0002X0-Po; Wed, 05 Feb 2025 23:27:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76082] [PATCH 2/9] home: services: Unset variables after profile init. Resent-From: Liam Hupfer Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, janneke@gnu.org, ludo@gnu.org, tanguy@bioneland.org, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Thu, 06 Feb 2025 04:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76082 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76082@debbugs.gnu.org Cc: Liam Hupfer , Andrew Tropin , Janneke Nieuwenhuizen , Ludovic =?utf-8?q?Court=C3=A8s?= , Tanguy Le Carrour , Vagrant Cascadian X-Debbugs-Original-Xcc: Andrew Tropin , Janneke Nieuwenhuizen , Ludovic =?utf-8?q?Court=C3=A8s?= , Tanguy Le Carrour , Vagrant Cascadian Received: via spool by 76082-submit@debbugs.gnu.org id=B76082.17388159689548 (code B ref 76082); Thu, 06 Feb 2025 04:27:01 +0000 Received: (at 76082) by debbugs.gnu.org; 6 Feb 2025 04:26:08 +0000 Received: from localhost ([127.0.0.1]:53608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tftSp-0002Tv-Tx for submit@debbugs.gnu.org; Wed, 05 Feb 2025 23:26:08 -0500 Received: from out-174.mta0.migadu.com ([2001:41d0:1004:224b::ae]:28123) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tftSo-0002TC-3R for 76082@debbugs.gnu.org; Wed, 05 Feb 2025 23:26:06 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpfr.net; s=key1; t=1738815953; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=Dwiy5+CqTIh8K5J1sqV4Ik5ui8H+88jsUR933dn+I0k=; b=ObfvIDr4abTluIOr8/doI+/kkUU18Udz3nUKD5BqataIqIFx6kqfpa8lY5WPyVnEJHkspC fa+2QUiVNVCd9f8KKnuywAixKvrTYtXojis3gODcY5fdS718Q7MdvjO1FluDiqaPauKxob v8Miwv1TVAwLnPBzbtLKf2QbJFK96MwM9RfBtWREcU4B0gUmBrhaN9YRoBEpb8tx4TMWte MOeuwz6J0ysZkSgdevBsou/oXmRx2TsvnGwDPtHN/vD+//UaHva4KJpDTcyWNiWd9rsmKf fUHFg/7gBvdiY/qXm19IrtKayXK4TEavWS9Bc+xqb/ZCoBNFnJ7u8eq4trTbnw== From: Liam Hupfer Date: Wed, 5 Feb 2025 22:24:58 -0600 Message-ID: <25ffb457020cb7ad0bbc9b9ff62736ed01ff0002.1738815703.git.liam@hpfr.net> In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT 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 While they aren’t exported, these temporary variables show up in the resulting shell, cluttering tab completion and declare -p. * gnu/home/services.scm (environment-variables->setup-environment-script): Unset shell variables. * gnu/home/services/shells.scm (add-shell-profile-file): Likewise. Change-Id: Ibb634849d9f38c1a9a44c0d493e92231364de958 --- gnu/home/services.scm | 6 +++++- gnu/home/services/shells.scm | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/home/services.scm b/gnu/home/services.scm index bbf2ba2404..165bc33b05 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -275,7 +275,8 @@ (define (environment-variables->setup-environment-script vars) (lambda (port) (set-port-encoding! port "UTF-8") (display "\ -HOME_ENVIRONMENT=$HOME/.guix-home +# NOTE: Set HOME_ENVIRONMENT before sourcing (home-shell-profile-service-type ensures +# ~/.profile does) GUIX_PROFILE=\"$HOME_ENVIRONMENT/profile\" PROFILE_FILE=\"$GUIX_PROFILE/etc/profile\" [ -f $PROFILE_FILE ] && . $PROFILE_FILE @@ -301,6 +302,9 @@ (define (environment-variables->setup-environment-script vars) *) export XCURSOR_PATH=$GUIX_PROFILE/share/icons:$XCURSOR_PATH ;; esac +# Keep the shell environment clean. +unset GUIX_PROFILE PROFILE_FILE + " port) (display #$(environment-variable-shell-definitions vars) diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm index ee6b09f17c..bab5730c3d 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -89,7 +89,8 @@ (define (add-shell-profile-file config) "\ HOME_ENVIRONMENT=$HOME/.guix-home . $HOME_ENVIRONMENT/setup-environment -$HOME_ENVIRONMENT/on-first-login\n" +$HOME_ENVIRONMENT/on-first-login +unset HOME_ENVIRONMENT\n" (serialize-configuration config (filter-configuration-fields