From patchwork Thu Feb 6 04:24:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liam Hupfer X-Patchwork-Id: 38301 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 76DA827BBEA; Thu, 6 Feb 2025 04:26:40 +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 04CB527BBE2 for ; Thu, 6 Feb 2025 04:26:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tftSt-00009k-94; Wed, 05 Feb 2025 23:26:11 -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 1tftSo-00009H-QE for guix-patches@gnu.org; Wed, 05 Feb 2025 23:26: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 1tftSn-0000wF-FO; Wed, 05 Feb 2025 23:26:05 -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=gD9taRrXx1IHdbkvXIeQgchX6Q4e86rvdFcrPhkskMw=; b=T5XuXKUi47WZLGxKClceFoX48upB0SdwwS9a0V9HO67dwHgYYTtHVMeJh/uwOTh45GoFORSOzDa5A4IL1+wDACP7Pn9qNY/gzMQUIEukQ5IkZVLZicPOhKparnhJ/EMVUqw8PH6U7A2txzUZjsj6JWjssvcdM7SZAk7TvkjWYrAIh/pLcMS7nfWk76FVajy/jytKECY7PrQkgS21FdBa4aA+PJea6hCrMA48Jhgi0PxhcM5+20E0U6qfoEGtr9YXWSyvksAzdHluxBgLiViJOq6jRUbYwZGvM3bpclm3cg38v7tmuAYSdmXcxAHdkrk+R1neuvWP62SxO9hQHhoLdQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tftSk-0002TO-7U; Wed, 05 Feb 2025 23:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76082] [PATCH 1/9] home: services: setup-environment: Use GUIX_PROFILE. 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:26:02 +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.17388159349466 (code B ref 76082); Thu, 06 Feb 2025 04:26:02 +0000 Received: (at 76082) by debbugs.gnu.org; 6 Feb 2025 04:25:34 +0000 Received: from localhost ([127.0.0.1]:53600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tftSI-0002Sb-EL for submit@debbugs.gnu.org; Wed, 05 Feb 2025 23:25:34 -0500 Received: from out-171.mta0.migadu.com ([91.218.175.171]:61196) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tftSF-0002SJ-6r for 76082@debbugs.gnu.org; Wed, 05 Feb 2025 23:25:32 -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=1738815922; 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=gD9taRrXx1IHdbkvXIeQgchX6Q4e86rvdFcrPhkskMw=; b=p4RMizB7o5M60y9P19QV7Ddfhoy0KDPMixW01lVVV8rD3qoMMd//owwUixdH2qbFuD1oze bDhERCumGx6bChV0dPphpmzGYr0vk3RA4DHOBpKY6eBTeFm5+VnkL9UhDrvpbXs60yKhiS 87RPP1rpx1xZs7nnpAgUaCMibbfIRe0OYqs0Ew17Se1zujixG+sHop+heuWr39BBtE/bmu VJqC4A5uC1Ir2idQ8Jtfg3EfoquSOLfIufpIWPnZltm8g5Dx/YpqO+JOMJHVwVhdspCbfg jB/ZS7LcaW8fGmN4gKo+0eF+l/lfXiUxNfpAoMjoJKvIZZ5P3BlNCSSXWo3JsQ== From: Liam Hupfer Date: Wed, 5 Feb 2025 22:24:57 -0600 Message-ID: <2094e26655b1bdd87417b090ddda9761a0458d38.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 setup-environment already defines this variable. Use it since it’s more concise. * gnu/home/services.scm (environment-variables->setup-environment-script): Use GUIX_PROFILE. Change-Id: Ib75d8df6294976f4e95cfa7d607dc0ba21ddd258 --- gnu/home/services.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) base-commit: 52c05f3b120e641c8bd2d68cfcf0d6af947de27b diff --git a/gnu/home/services.scm b/gnu/home/services.scm index 39c9033ad6..bbf2ba2404 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -277,28 +277,28 @@ (define (environment-variables->setup-environment-script vars) (display "\ HOME_ENVIRONMENT=$HOME/.guix-home GUIX_PROFILE=\"$HOME_ENVIRONMENT/profile\" -PROFILE_FILE=\"$HOME_ENVIRONMENT/profile/etc/profile\" +PROFILE_FILE=\"$GUIX_PROFILE/etc/profile\" [ -f $PROFILE_FILE ] && . $PROFILE_FILE case $XDG_DATA_DIRS in - *$HOME_ENVIRONMENT/profile/share*) ;; - *) export XDG_DATA_DIRS=$HOME_ENVIRONMENT/profile/share:$XDG_DATA_DIRS ;; + *$GUIX_PROFILE/share*) ;; + *) export XDG_DATA_DIRS=$GUIX_PROFILE/share:$XDG_DATA_DIRS ;; esac case $MANPATH in - *$HOME_ENVIRONMENT/profile/share/man*) ;; - *) export MANPATH=$HOME_ENVIRONMENT/profile/share/man:$MANPATH + *$GUIX_PROFILE/share/man*) ;; + *) export MANPATH=$GUIX_PROFILE/share/man:$MANPATH esac case $INFOPATH in - *$HOME_ENVIRONMENT/profile/share/info*) ;; - *) export INFOPATH=$HOME_ENVIRONMENT/profile/share/info:$INFOPATH ;; + *$GUIX_PROFILE/share/info*) ;; + *) export INFOPATH=$GUIX_PROFILE/share/info:$INFOPATH ;; esac case $XDG_CONFIG_DIRS in - *$HOME_ENVIRONMENT/profile/etc/xdg*) ;; - *) export XDG_CONFIG_DIRS=$HOME_ENVIRONMENT/profile/etc/xdg:$XDG_CONFIG_DIRS ;; + *$GUIX_PROFILE/etc/xdg*) ;; + *) export XDG_CONFIG_DIRS=$GUIX_PROFILE/etc/xdg:$XDG_CONFIG_DIRS ;; esac case $XCURSOR_PATH in - *$HOME_ENVIRONMENT/profile/share/icons*) ;; - *) export XCURSOR_PATH=$HOME_ENVIRONMENT/profile/share/icons:$XCURSOR_PATH ;; + *$GUIX_PROFILE/share/icons*) ;; + *) export XCURSOR_PATH=$GUIX_PROFILE/share/icons:$XCURSOR_PATH ;; esac " port)