From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id +PEpBZPRKmO5FAEAbAwnHQ (envelope-from ) for ; Wed, 21 Sep 2022 10:55:47 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id gKj6BJPRKmOK5gAAauVa8A (envelope-from ) for ; Wed, 21 Sep 2022 10:55:47 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E5462CB53 for ; Wed, 21 Sep 2022 10:55:46 +0200 (CEST) Received: from localhost ([::1]:47648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oavWD-0003H3-Us for larch@yhetil.org; Wed, 21 Sep 2022 04:55:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oavVZ-0003FY-7l for guix-patches@gnu.org; Wed, 21 Sep 2022 04:55:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33303) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oavVX-0002iw-5R for guix-patches@gnu.org; Wed, 21 Sep 2022 04:55:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oavVW-00067t-SF for guix-patches@gnu.org; Wed, 21 Sep 2022 04:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57963] [PATCH 1/1] home: fontutils: Support user's fontconfig. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Sep 2022 08:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57963 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Taiju HIGASHI , 57963@debbugs.gnu.org Received: via spool by 57963-submit@debbugs.gnu.org id=B57963.166375048423489 (code B ref 57963); Wed, 21 Sep 2022 08:55:02 +0000 Received: (at 57963) by debbugs.gnu.org; 21 Sep 2022 08:54:44 +0000 Received: from localhost ([127.0.0.1]:60610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oavVE-00066m-5H for submit@debbugs.gnu.org; Wed, 21 Sep 2022 04:54:44 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:19475) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oavV9-00066U-3l for 57963@debbugs.gnu.org; Wed, 21 Sep 2022 04:54:42 -0400 Received: from lprikler-laptop.ist.intra (gw.ist.tugraz.at [129.27.202.101]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4MXXKR14W2z1LZWr; Wed, 21 Sep 2022 10:54:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4MXXKR14W2z1LZWr DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1663750475; bh=SiewZ3YU/RLxivLopaQMakfaHyE1Xt3JfmoPGcAK4IE=; h=Subject:From:To:Date:In-Reply-To:References:From; b=uSRE6G2kj61PuU1pga63SjQONpOWdIdxHqXUrcx6MRPYGblIcoLIs5TLJEwGwO06f IF28mSqhd2QsS+hDQBPEzi6aLVlM38y2hL0pwnMuv8wSl2ro9RVhkXnO+L2uj8FhZ2 cSKryeoe+tH28Q/LjP9/sTFsdvfa/2UyLSE7xP4Q= Message-ID: From: Liliana Marie Prikler Date: Wed, 21 Sep 2022 10:54:34 +0200 In-Reply-To: <20220921002921.23631-2-higashi@taiju.info> References: <20220921002921.23631-2-higashi@taiju.info> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.45.3 MIME-Version: 1.0 X-TUG-Backscatter-control: waObeELIUl4ypBWmcn/8wQ X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1663750546; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=SiewZ3YU/RLxivLopaQMakfaHyE1Xt3JfmoPGcAK4IE=; b=Ev82I37hNsxBVjLFERbndMa1Pd3BzCmNqAMQXdM6HEYxesyVxbr6uI6lxQTN4rAbDROs6U +wvP4rKrpHF+95Oot+Uazk0v/3CKMcJUiTwS1RLfGy2DXHRlFkLQnIL6VNqcnK9DbydJmi AmhV4DBn1TktxEDOGSU4vtbwiuQp/MNo5L/6hhj0oA7yP2WS87aKK+rj3iRsTy4kHt4FDQ V5Ojew9nbYCAhuDrwL4ufEbf0jcciN1HtwZ/+oxpjdNtvHTcBtd2tZhbZfhjPucE58O/Vc m5lNi5f9vRXUxpLHF+1KgWPX8t7wZayVGInryrC1zeYfOpWklp40SxJkyUrC9Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1663750546; a=rsa-sha256; cv=none; b=acrGP7+Ti6ZgdjBjGakGryLBvmPgyvawKHoZRdbeY1VUh+W9yEU5VzOcOtsDZSPhZLE2bd Byhxz92airxSYRLBfc0dAeXTkRt+yFeIWgcstUh6TYpOFiOGzoh/2fCY9eLMfrgjCp4P6M PwULQa6WlCPyF69ZF/7bG0e1Ggm+b3kOMkks8UiwQm971Ch+am/3dxH9ilK/acULZiLTAI C1vkDnAzDjgCQKiaK4wvn2PNrb8sssuBjPBCO1wduY5wu5eIEUMAU9IyqxJ7FBoWRqLQ+S DcGtfdz+oqBRFKJryMl5i3n4Z1xhk2cVhTcvsfUxlEmGhsOpFm+Da3S+Uc+/Ew== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=uSRE6G2k; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.96 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=uSRE6G2k; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: E5462CB53 X-Spam-Score: 5.96 X-Migadu-Scanner: scn1.migadu.com X-TUID: NvcW2HiAPoPd Am Mittwoch, dem 21.09.2022 um 09:29 +0900 schrieb Taiju HIGASHI: > * gnu/home/services/fontutils.scm (add-fontconfig-config-file): > Support user's fontconfig. > --- > =C2=A0gnu/home/services/fontutils.scm | 15 +++++++++++---- > =C2=A01 file changed, 11 insertions(+), 4 deletions(-) >=20 > diff --git a/gnu/home/services/fontutils.scm > b/gnu/home/services/fontutils.scm > index 6062eaed6a..3ea8b1db74 100644 > --- a/gnu/home/services/fontutils.scm > +++ b/gnu/home/services/fontutils.scm > @@ -1,6 +1,7 @@ > =C2=A0;;; GNU Guix --- Functional package management for GNU > =C2=A0;;; Copyright =C2=A9 2021 Andrew Tropin > =C2=A0;;; Copyright =C2=A9 2021 Xinglu Chen > +;;; Copyright =C2=A9 2022 Taiju HIGASHI > =C2=A0;;; > =C2=A0;;; This file is part of GNU Guix. > =C2=A0;;; > @@ -21,6 +22,7 @@ (define-module (gnu home services fontutils) > =C2=A0=C2=A0 #:use-module (gnu home services) > =C2=A0=C2=A0 #:use-module (gnu packages fontutils) > =C2=A0=C2=A0 #:use-module (guix gexp) > +=C2=A0 #:use-module (srfi srfi-1) > =C2=A0 > =C2=A0=C2=A0 #:export (home-fontconfig-service-type)) > =C2=A0 > @@ -33,15 +35,18 @@ (define-module (gnu home services fontutils) > =C2=A0;;; > =C2=A0;;; Code: > =C2=A0 > -(define (add-fontconfig-config-file he-symlink-path) > +(define (add-fontconfig-config-file font-config) > =C2=A0=C2=A0 `(("fontconfig/fonts.conf" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ,(mixed-text-file > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "fonts.conf" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 " > =C2=A0 > =C2=A0 > -=C2=A0 ~/.guix-home/profile/share/fonts > -")))) > +=C2=A0 ~/.guix-home/profile/share/fonts\n" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (if (null? font-config) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-joi= n font-config "\n" 'suffix)) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "\n")))) I think it'd be wiser to pretty-print SXML here. The structure could look something like `(fontconfig=C2=A0 (dir "~/.guix-home/profile/share/fonts") ,@(extra-user-config ...)) Also, for the particular use case of handling multiple profiles gracefully (rather than the current status quo) I think fontconfig- service-type should be able to construct (dir "#$profile/share/fonts") style entries on its own. However, given that multiple profiles aren't supported yet, this is future work. Cheers