From patchwork Sun Dec 24 18:00:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 58041 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 80C0627BBE2; Sun, 24 Dec 2023 19:25:27 +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,HTML_MESSAGE,MAILING_LIST_MULTI,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 9646627BBEC for ; Sun, 24 Dec 2023 19:25:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rHU5T-0003QA-Op; Sun, 24 Dec 2023 14:24:35 -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 1rHSmX-0003ZE-6i for guix-patches@gnu.org; Sun, 24 Dec 2023 13:00:57 -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 1rHSmW-0004kD-Un for guix-patches@gnu.org; Sun, 24 Dec 2023 13:00:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rHSmc-0007bu-KZ for guix-patches@gnu.org; Sun, 24 Dec 2023 13:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68009] home-xdg-user-directories-service-type: Extend it with home-environment-variables service Resent-From: lgcoelho@disroot.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Dec 2023 18:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68009 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 68009@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.170344083926659 (code B ref -1); Sun, 24 Dec 2023 18:01:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Dec 2023 18:00:39 +0000 Received: from localhost ([127.0.0.1]:53494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHSmE-0006ux-Oy for submit@debbugs.gnu.org; Sun, 24 Dec 2023 13:00:39 -0500 Received: from lists.gnu.org ([2001:470:142::17]:58676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHSmA-0006Tv-NB for submit@debbugs.gnu.org; Sun, 24 Dec 2023 13:00:38 -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 1rHSlu-0003TE-On for guix-patches@gnu.org; Sun, 24 Dec 2023 13:00:19 -0500 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rHSls-0004dI-GH for guix-patches@gnu.org; Sun, 24 Dec 2023 13:00:18 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4CC0341ABF for ; Sun, 24 Dec 2023 19:00:13 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1iK1IJc_RtSs for ; Sun, 24 Dec 2023 19:00:12 +0100 (CET) MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1703440812; bh=Nih+VbT9bhppxN4X0BpGFVseWXDkSvMAIdPtDCwH3rM=; h=Date:From:To:Subject; b=QtcGFMub3NGTPq4GsXwkJs5Ed58dxXTaq5vmWhdumToZI07seHD7w6iKg9ADTTAGh zSH9qZgckJNzf8Z/R9s+eaTQYpOyYfT1DKcjPF/k30+DPoFtKRP1VKZJujXPApCfM4 2Y6MnUH7xuDZXghmFom2tYCah65W48GEmfiFfS5JD7Jn8PpIPboEnB/W1IBisXC7P9 uTbQF3cEVq3m9IYIN+KgrHP5w5sTfq75XF5UbsYHtTd7ayE77p/bGW0DUrQCtvTShM xjZp5uL2y18MAUmrsVxSuw8sFeukp2jzVzaEsmXnyqb+saimFzZozKxdS6lxXkP/tm viZTxhdf5BcYg== Date: Sun, 24 Dec 2023 18:00:12 +0000 Message-ID: <1dff17d3ef7bbc11c17b7e614cc96f16@disroot.org> X-Sender: lgcoelho@disroot.org Received-SPF: pass client-ip=178.21.23.139; envelope-from=lgcoelho@disroot.org; helo=layka.disroot.org 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, HTML_MESSAGE=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sun, 24 Dec 2023 14:24:33 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: lgcoelho@disroot.org X-ACL-Warn: , lgcoelho--- via Guix-patches X-Patchwork-Original-From: lgcoelho--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" 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 Current home-xdg-user-directories-service-type creates a ~/.config/user-dirs.dirs which some non posix-compliant shells like fish aren't able to read, this makes necessary to use some external tool like fish-foreign-env, but this solution makes fish startup times really slower in the case fish sources it in a non-login shell. After thinking about it for a bit, I guess it would be proper if guix itself was responsible for setting these environment variables. This could avoid the need for users of other non-posix shells to make their own custom workarounds for this problem. From f915f08c166ffdeaadfdd2438a66d8d0d3401629 Mon Sep 17 00:00:00 2001 From: Luis Guilherme Coelho Date: Sun, 24 Dec 2023 14:43:38 -0300 Subject: [PATCH] home-xdg-user-directories-service-type: Extend it with home-environment-service-type --- gnu/home/services/xdg.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm index 958772696b..e14870df05 100644 --- a/gnu/home/services/xdg.scm +++ b/gnu/home/services/xdg.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021, 2022 Andrew Tropin ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2023 Bruno Victal +;;; Copyright © 2023 Luis Guilherme Coelho ;;; ;;; This file is part of GNU Guix. ;;; @@ -256,12 +257,27 @@ (define (home-xdg-user-directories-activation-service config) (map ensure-dir '#$dirs) (display " done\n")))) +(define (home-xdg-user-directories-environment-variables-service config) + (match-record config + (desktop documents music pictures videos publicshare download templates) + `(("XDG_DESKTOP_DIR" . ,desktop) + ("XDG_DOCUMENTS_DIR" . ,documents) + ("XDG_DOWNLOAD_DIR" . ,download) + ("XDG_MUSIC_DIR" . ,music) + ("XDG_PICTURES_DIR" . ,pictures) + ("XDG_PUBLICSHARE_DIR" . ,publicshare) + ("XDG_TEMPLATES_DIR" . ,templates) + ("XDG_VIDEOS_DIR" . ,videos)))) + (define home-xdg-user-directories-service-type (service-type (name 'home-xdg-user-directories) (extensions (list (service-extension home-xdg-configuration-files-service-type home-xdg-user-directories-files-service) + (service-extension + home-environment-variables-service-type + home-xdg-user-directories-environment-variables-service) (service-extension home-activation-service-type home-xdg-user-directories-activation-service))) -- 2.41.0