From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 IIchLf7nI2JJdgEAgWs5BA (envelope-from ) for ; Sat, 05 Mar 2022 23:45:18 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id sM67Kf7nI2IqUwAAauVa8A (envelope-from ) for ; Sat, 05 Mar 2022 23:45:18 +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 63C891EF1B for ; Sat, 5 Mar 2022 23:45:18 +0100 (CET) Received: from localhost ([::1]:36820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQd9J-0002n9-2n for larch@yhetil.org; Sat, 05 Mar 2022 17:45:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQd94-0002mw-Jk for bug-guix@gnu.org; Sat, 05 Mar 2022 17:45:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55435) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQd94-00041J-Au for bug-guix@gnu.org; Sat, 05 Mar 2022 17:45:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nQd94-0005UK-4V for bug-guix@gnu.org; Sat, 05 Mar 2022 17:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#52808: Guix home should not assume that all targets are dot files Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 05 Mar 2022 22:45: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: Andrew Tropin Received: via spool by 52808-submit@debbugs.gnu.org id=B52808.164652027921055 (code B ref 52808); Sat, 05 Mar 2022 22:45:02 +0000 Received: (at 52808) by debbugs.gnu.org; 5 Mar 2022 22:44:39 +0000 Received: from localhost ([127.0.0.1]:49332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQd8g-0005TW-Hl for submit@debbugs.gnu.org; Sat, 05 Mar 2022 17:44:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQd8f-0005TJ-8g for 52808@debbugs.gnu.org; Sat, 05 Mar 2022 17:44:37 -0500 Received: from [2001:470:142:3::e] (port=37196 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQd8Y-0003wf-TO; Sat, 05 Mar 2022 17:44:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=uGLgHVaqZxCuBSjdYSUBPJF7YwRAN+2+XoqeZNes5ik=; b=Z5/O3NY1AyjKuqdO9diU paiChd4e2TAhFO1Nz9qrAPJW0VcPgpOXfpXXNVYWtjryqrU/kyvU/BnpGuAPr++aPjqSk9sr2n71p thC4dEvid6btrTFyKNPKtROmjEZgI4+JTNsJxU0dAYcyDk6SWrOBBvY0XB7ecyBp3f8FHYGDwXzDd GfWflfbHvXCdI5QC/L0Z4UJyUA/YhLxVlB/yRtNPnLbTBq+nHFYovW9u4FFquT6amzNpCRKT+LGZ4 mRBOPKyLuz75hKfA6DHBoIlOTuxNZfW/VbPGF4vDduSZ/mrGw6+lXiLO9c6uDYWU+uuKG7RQ+2e1T XeeaVKTKidfNlg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:50130 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQd8Y-0004em-Bc; Sat, 05 Mar 2022 17:44:30 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= 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> Date: Sat, 05 Mar 2022 23:44:27 +0100 In-Reply-To: <87r189s8mz.fsf@trop.in> (Andrew Tropin's message of "Fri, 11 Feb 2022 18:52:36 +0300") Message-ID: <871qzgm33o.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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=1646520318; 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: 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=uGLgHVaqZxCuBSjdYSUBPJF7YwRAN+2+XoqeZNes5ik=; b=jCz02dj8CX1CJVLReWV+fmAv/W5xWZcqBzAs9hUeNwGrx+Dm0BIzYLJEF5v6wmBQLoldXg VCDpRt8h6WEgfJWusl8RnZfsfYKrKiwZZZ1nCuRWI2JJfxVupBbRr6RqT1wMwHXBa/Yvp8 vVHIJor6dXx38YX4bon+wNuCd0P2uBzh4U51+CKwCwI76MFuoglalfUN9AimTIJxRQ6oi1 v/u0UKqVd4g2f5a2dQ8xxomV3GwNSynkAE1iN+60H4Ya94beGu4r+WwVhV55hRTV2QRpsv /jvx+J5XvU61RNu0RtryiRS5ZeBbT0+GGyxeOQTHR5ILyWIm1grKA9fde8yrTQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1646520318; a=rsa-sha256; cv=none; b=UT4m6nDwIDApVXxpGNOaRLZZ65d6jMIgGovMDCFzqRCln8NSDzEwPXUyo4bvwrfrtJDPJG y+t1liipFYvrL4rHLuIbXkDnq8tzyd6bYQY8LsMI+fazdpLa7LYgWgPrhRWQx5d7bI7rgv qbnsZecBvS9oM2//F7AIf1dpBQm2GgVyKIStC6livvIBunuxQ6An5JQROZfz4KM1nqYMQ1 k2TuJxYjIRwLOxInvbpGcykUht7o2k9HkOmz/1blFDaChgZpmIFOE6YVss30ISJVPctVyY kACJV/f/tLdc9zBjZ7FqxJKek1iBy/yUo94W0STAULFKoN4rA28cgPZ4CME1aA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="Z5/O3NY1"; dmarc=pass (policy=none) header.from=gnu.org; 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: -4.14 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="Z5/O3NY1"; dmarc=pass (policy=none) header.from=gnu.org; 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: 63C891EF1B X-Spam-Score: -4.14 X-Migadu-Scanner: scn0.migadu.com X-TUID: WSJd+IiCmbCd Hi Andrew, The patches reached my mailbox around the time I went on vacation and then fell through the cracks. Sorry about that! 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-manag= er > 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 measure= ). Otherwise LGTM. > 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=9Ccon= fig=E2=80=9D). That way, there wouldn=E2=80=99t be any special treatment. WDYT? Also: s/subdir/directory/, and please use =E2=80=98match=E2=80=99 instead o= f car/cdr (info "(guix) Coding Style"). > + (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-files. > > * 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): Migrate= 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-fi= les. 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 during > 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? Thanks in advance, and apologies again for the delay! Ludo=E2=80=99.