From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MF3UB6AsKGJLrAAAgWs5BA (envelope-from ) for ; Wed, 09 Mar 2022 05:27:12 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id KGVUBaAsKGKynAAA9RJhRA (envelope-from ) for ; Wed, 09 Mar 2022 05:27:12 +0100 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 A3A911D0B9 for ; Wed, 9 Mar 2022 05:27:11 +0100 (CET) Received: from localhost ([::1]:54996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nRnuo-0004Oo-1t for larch@yhetil.org; Tue, 08 Mar 2022 23:27:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39588) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRnug-0004OQ-Ru for bug-guix@gnu.org; Tue, 08 Mar 2022 23:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nRnug-0007uE-JJ for bug-guix@gnu.org; Tue, 08 Mar 2022 23:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nRnug-00039e-7m for bug-guix@gnu.org; Tue, 08 Mar 2022 23:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#52808: Guix home should not assume that all targets are dot files Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 09 Mar 2022 04:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52808 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 52808-submit@debbugs.gnu.org id=B52808.164679998112078 (code B ref 52808); Wed, 09 Mar 2022 04:27:02 +0000 Received: (at 52808) by debbugs.gnu.org; 9 Mar 2022 04:26:21 +0000 Received: from localhost ([127.0.0.1]:58282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nRnu0-00038k-Hn for submit@debbugs.gnu.org; Tue, 08 Mar 2022 23:26:20 -0500 Received: from mail-lj1-f174.google.com ([209.85.208.174]:43530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nRnty-00038X-A1 for 52808@debbugs.gnu.org; Tue, 08 Mar 2022 23:26:18 -0500 Received: by mail-lj1-f174.google.com with SMTP id 25so1350459ljv.10 for <52808@debbugs.gnu.org>; Tue, 08 Mar 2022 20:26:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop-in.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=6EeOUWUJWZzNGjto3Z6iWae2sFQb5osGwCBLi4YSR/k=; b=JhFgRlAjixFvlVawBNPfET0GmPdAM2YPn5AMJjOTkMs6CL1qJaBnIVosnkIxlS06du ON6c4O5XORh2hCXfRk3hOavJzSqjnADRes3S7qiOM9FnMxMt2kzBjK1sXvxkLmdYcSxm O9vih0mfF/Q5O+67Zafyk6YfGsrmaqVxh5Lt4kMzKaRJ3MnKETB5kez9pL8A4jIYrbBs T4Jfuswb4H/TLtbQ89E/vQJWPD68swwMTIKh4n4JW1rXwX6o5XGBWYKT3kxlr0f/fRvN bYgW4sk1yPIoB4bA2i90qMpdLhIF96rt5z3r36MnaOs4wvF6AvNzOWXR5KUso3aCRdiC 8YCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=6EeOUWUJWZzNGjto3Z6iWae2sFQb5osGwCBLi4YSR/k=; b=kryXzZXc+TuWWH4h/ys3FnYspKenpiu9cUHUTGjLPbzuguSrOfHtrMqMiDne+/imdg M6GVa4BcudqpGAuD9ory0OaOeHIZtP67BZ5UPhVyuZosyjnfc5FmhIkth8zLWeVtWam/ 6sF3/deH5MyKNFkRqiRxZ5fzOYbRdyh7JP3TW2mzsLqNRhdbqTMrOd783kZa1HP2xVr5 fnyCD/9dGqn1Gkrv3k+xKdaEgbR04FzakmLykT4X9lhqrG+e9eFYOlown4t4OJnTFVLY YzIhl25U+Nm63J23Q/skz0uiEdtDljf5ZBayVeTHbLvx+I5dbV73qIa5e/MDNiCXlv6M yiQg== X-Gm-Message-State: AOAM531Yv3BmwpXRALb/SJjCQtIB8tPksIqjqH5ZYq46sGlyHd8fCinv 2ScJ9Pf0uxGulrGd1KVyKHaQ8A== X-Google-Smtp-Source: ABdhPJyx8d5qvchOZuqKBrrLfk/5jpGdV34W6aDROoIVUlRgvl1Rz+xZ13gYWRG+Eqjams49+IGyHg== X-Received: by 2002:a05:651c:516:b0:247:a27c:60fd with SMTP id o22-20020a05651c051600b00247a27c60fdmr12755458ljp.73.1646799972110; Tue, 08 Mar 2022 20:26:12 -0800 (PST) Received: from localhost (109-252-135-33.dynamic.spd-mgts.ru. [109.252.135.33]) by smtp.gmail.com with ESMTPSA id m14-20020a19520e000000b004483213f607sm162962lfb.103.2022.03.08.20.26.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Mar 2022 20:26:11 -0800 (PST) From: Andrew Tropin In-Reply-To: <871qzgm33o.fsf@gnu.org> References: <6050c325-9ae9-406a-97fe-91bdf9bcd12a@www.fastmail.com> <87bkzw2kvm.fsf@trop.in> <87o83t9mf8.fsf@gnu.org> <878rutzo1d.fsf@trop.in> <87zgn1bsha.fsf@gnu.org> <87r189s8mz.fsf@trop.in> <871qzgm33o.fsf@gnu.org> Date: Wed, 09 Mar 2022 07:26:07 +0300 Message-ID: <87o82fwy3k.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 52808@debbugs.gnu.org, Nick Zalutskiy Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1646800031; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=6EeOUWUJWZzNGjto3Z6iWae2sFQb5osGwCBLi4YSR/k=; b=SJPIQJH12whFo9uKWxRgvsds9yy2hvJkB+GfUrT7CKI8ACqITScRkBDB8USGQi2VUd55uI YOGFoPCXrsZUWPnfd3crgShjP4RNF0+FSdapd+JTDJOiTjLcdqmo7+QUc02CiJGxZ6hqjl Q3dQZR9E59N3tRcNawkAKXkOU5h5c8NA8wx0LSerw6L4J5Ge17jwDcKuZKghOh4D6i4sJq gXFdFuoAgZR4SZa85LNQSis9EOs8OGXJc7ZX0FQv7NsP84zTqNyo1ZauY/kTcF8k7G2Dga G287ig7Ammi9X9QvMmXPGtwREbTaEq1vQsigllxzbLLTYXVBvg4GoCddq7180w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1646800031; a=rsa-sha256; cv=none; b=J1H/NvhHtln+VAxAezdPSYEIiqiWrwErfONMxi6Vfnwhc9mu2agwf81mqfdpvqH38dCvdj h3pe36DPhVKTiNg6WwtJwvVKV9dd2LvGOMyDYyLOv052zvlxnklsAyoftNyAcjQedkhh4t AVUCaeKoUMorIz+R/derFFjWZRYTgTGYQ60/+ehp+D+zKqu/sfAmo1ukLSrE0qX73xvMiI j/RDej8daiuCZ0w573+5HAL21apm8AKWTyL22br41GlHKvOpF7obEAfc2J5yf5WAXWbEMg 2XMvblxU3mPylLmWIJkVq1k8Yd7Xf2XnRSv6YMjRcbpqFWqbbRf5O7GmpJ/X/w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop-in.20210112.gappssmtp.com header.s=20210112 header.b=JhFgRlAj; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.11 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop-in.20210112.gappssmtp.com header.s=20210112 header.b=JhFgRlAj; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: A3A911D0B9 X-Spam-Score: -1.11 X-Migadu-Scanner: scn0.migadu.com X-TUID: I0FvJ78I1+c9 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2022-03-05 23:44, Ludovic Court=C3=A8s wrote: > Hi Andrew, > > The patches reached my mailbox around the time I went on vacation and > then fell through the cracks. Sorry about that! No problem, I hope you had a good rest and got some fun! > > Andrew Tropin skribis: > >> After that patch series is merged we can give a time for users to >> migrate their self-made home services to xdg-configuration-files and >> after for example 2 weeks, remove special handling of dots for >> home-files. > > Sounds like a plan! > >> From 0cd37bbc724f9c793898c2655bdd1c335045c5f0 Mon Sep 17 00:00:00 2001 >> From: Andrew Tropin >> Date: Fri, 11 Feb 2022 10:55:01 +0300 >> Subject: [PATCH 1/5] home: Explicitly connect home-file and symlink-mana= ger >> services. >> >> * gnu/home/services.scm (home-files-directory): New variable. >> * gnu/home/symlink-manager.scm (update-symlinks-script): Use >> home-files-directory variable from (gnu home services). > > [...] > >> - (description "Configuration files for programs that >> -will be put in @file{~/.guix-home/files}."))) >> + (description (format #f "Files that will be put in >> +@file{~~/.guix-home/~a}, and further processed during activation." >> + home-files-directory)))) > > This hunk would prevent i18n so I suggest dropping it (you can mention > =E2=80=98home-files-directory=E2=80=99 in a margin comment for good measu= re). > > Otherwise LGTM. > Will fix it. >> From 23f7095d60b18b52de0d1aa314c4012cdf55a046 Mon Sep 17 00:00:00 2001 >> From: Andrew Tropin >> Date: Fri, 11 Feb 2022 11:03:02 +0300 >> Subject: [PATCH 2/5] home: Add home-xdg-configuration-files service. >> >> * gnu/home/services.scm (home-xdg-configuration-files): New variable. > > [...] > >> +(define xdg-configuration-files-subdir "config") >> >> +(define (xdg-configuration-files files) >> + (map (lambda (lst) >> + (cons (string-append xdg-configuration-files-subdir >> + "/" (car lst)) (cdr lst))) >> + files)) > > I=E2=80=99d just call it =E2=80=9C.config=E2=80=9D (instead of =E2=80=9Cc= onfig=E2=80=9D). That way, there > wouldn=E2=80=99t be any special treatment. WDYT? This is a patch series, which introduces preliminary changes and keeps backward compatibility, so people, who have their personal home services will be able to gradually migrate them to home-xdg-configuration-files. In the next patch series special treatment of the dots will be removed and this directory will become ".config". > > Also: s/subdir/directory/, and please use =E2=80=98match=E2=80=99 instead= of car/cdr > (info "(guix) Coding Style"). > Sure. >> + (description (format #f "Files that will be put in >> +@file{~~/.guix-home/~a/~a}, and further processed during activation." >> + home-files-directory >> + xdg-configuration-files)))) > > Same as above: drop =E2=80=98format=E2=80=99 and write ~/.guix-home/files= /.config. > >> From 11f23a48d480a91d6bfba0ff55c1a9831585a4ee Mon Sep 17 00:00:00 2001 >> From: Andrew Tropin >> Date: Fri, 11 Feb 2022 15:03:44 +0300 >> Subject: [PATCH 3/5] home: shells: Migrate zsh to xdg-configuration-file= s. >> >> * gnu/home/services.scm (home-zsh-service-type): Additionally extend >> home-xdg-configuration-files-service-type. > > [...] > >> From ef4c3bbcc0c8c1a251f4ad6c494f8ed30adf45f2 Mon Sep 17 00:00:00 2001 >> From: Andrew Tropin >> Date: Fri, 11 Feb 2022 15:34:46 +0300 >> Subject: [PATCH 4/5] home: Migrate fountutils and xdg modules to >> xdg-configuration-files. >> >> * gnu/home/services/fontutils.scm (home-fontconfig-service-type): Migrat= e to >> xdg-configuration-files. >> * gnu/home/services/xdg.scm (home-xdg-user-directories-service-type, >> home-xdg-mime-applications-service-type): Migrate to xdg-configuration-f= iles. > > Neat! > >> From 089683bbd301f6e085f00fbd53713f335abac40e Mon Sep 17 00:00:00 2001 >> From: Andrew Tropin >> Date: Fri, 11 Feb 2022 16:14:23 +0300 >> Subject: [PATCH 5/5] home: symlink-manager: Respect XDG_CONFIG_HOME duri= ng >> activation. >> >> * gnu/home/services/symlink-manager.scm (update-symlinks-script): Respect >> XDG_CONFIG_HOME during activation. > > I propose to postpone this one after > , and I even offer to rebase it > myself if you want. :-) > > Could you send updated patches? Sure, I even replied to bug#54180 ticket :) Waiting for the merge, after that will update patches to address your comments and will rebase them on top of bug#54180. Also, I need to update the manual as well. > > Thanks in advance, and apologies again for the delay! > > Ludo=E2=80=99. =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJDBAEBCgAtFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmIoLF8PHGFuZHJld0B0 cm9wLmluAAoJECII0glYwd6wBjQP/jVYHKadKL5KesHSs5O6wGMQYjxJPQPx4ruA /fSlNWl5k5P0wVa5ew38Lwx0sfC2Q4yAJJFkMc7hnaELcexM1kzmshNR3uQEJKhD +pBqus03ZZEFNRls6Z7BdRFSmQAzTBGcLRuy8FSOC9fQLGQEIvXUv02m1W+q1rU+ asU9vOY7DQCCeHENOhJ82K7IoklKrOqxK/8onBD4RP97OvsR9qRR2rSREm/U0gG+ h0PNZnP9t54/xGVzc0nJZg+smUCkSPeanxEkm/leIJxEW5DyteMIhgH6zpYkyVZ3 QkA6FTlHl76GheQfVoyG0AWpAsIZGBn2lT6wAnmGELQG2uLah6+wrznslYqRzUOY fDNbrvVtsS+y0hWsyn/1zY9X/qaNNHWpLz+s5nzAr856Nuvz6P0LTEn+JQKxDwbn hjSYnwm62SE1Z5LXEkWXVlH+7RlvrpG9jzcxKnYy5JA4Plc6papk9UVWshPmgW9a Uunoz7KZBWk2ET24ZsEs8rbka06lOd2SXm85sE8oh1lfBowM09aD/DHajnxeKSLa ZXdtD1sPCsHQ67aeMT76uPEa5Pkwrwo3Od/eUqfX6n6PiU7aTwCzevIWOAlF7EeI SsqJOJkPO5Cjc0uZJUmBKzA/qyTlt1U3WM3vRHQVE168nGlfjwIT0N2x8roa9fLX a2+guCL+ =yd+/ -----END PGP SIGNATURE----- --=-=-=--