From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id sHfBICTt5WUTUwAAe85BDQ:P1 (envelope-from ) for ; Mon, 04 Mar 2024 16:47:48 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id sHfBICTt5WUTUwAAe85BDQ (envelope-from ) for ; Mon, 04 Mar 2024 16:47:48 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=P3jEgtFE; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1709567268; 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=0HWVm22kqN9f1k1a6T/3oYYJYdJqrcRKzst7yxkVofk=; b=uzeu6KEic46Zipi8+eLXSFvzqt+1AnDmK3yHZbYSIYBlsI/k4xLBxwntqndLYpBEz/Nfkf CuBEMbo5bzfGiK+dZYZXp0VGM5cPqrr4Uv5f9diBkQ+QTDbFUpatfMi7LsKtNXak7zE+2V QmekcIjutpspjOQHKkLYU3fph9O809bWVDLBwIG+yitVXzMR2rg+5dNdBB78id8FgMmiUc UM7uSlndIPyJ1n4Y+72NuTCQVTVjQ34dd/tCRhGHnAJrdbDUJi5FO5UQcWzIyPD2GxDRdg jMZ/0rmRKVbCJE97WNRGbh1XjTp//EZTHEYQ40hAdXbZrf0dcfIhdtXUwQD0cw== 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=P3jEgtFE; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1709567268; a=rsa-sha256; cv=none; b=owYI5HQ86GVxk0gfEiOi03XQDvRwy4rEpsaa7W/f1s1dBp8GBIb2oKHD8AtOSZt1rxinlW 4vMAO2Ihe8MwOe642h+5ZcOZQ7Tj4jPtTfb2Ih6RaWoY6emSbtHevhAP5OqHgGLR+O19Cg Wgu+Fn9bMubrF2a7e+yJjzshag2zwO3qVjSTrm7hMD5oWijPL8TlhXvvT8iA6bw3YX1OyZ 2UMM+P8orFqqFvZ8tHtD1aMD26qB1JgYDX0jGsKXdX+9NL0Nqff7QG0AnSPxWU5qQQCifl Sv//kE5X/UVrhDFIJxC6scpMLueARfBtvExZXfFjEvBwR2+Jiblcd8Go2pKqMg== 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 221526C541 for ; Mon, 4 Mar 2024 16:47:47 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhAXO-0004AD-3M; Mon, 04 Mar 2024 10:47:34 -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 1rhAXM-00049o-Qc for guix-patches@gnu.org; Mon, 04 Mar 2024 10:47:33 -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 1rhAXM-0002Lv-GM for guix-patches@gnu.org; Mon, 04 Mar 2024 10:47:32 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhAXq-0001SI-2Y for guix-patches@gnu.org; Mon, 04 Mar 2024 10:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68857] gnu: home: dotfiles: Avoid creating extra directory in $HOME. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Mar 2024 15:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68857 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Giacomo Leidi Cc: paren@disroot.org, 68857@debbugs.gnu.org, Andrew Tropin Received: via spool by 68857-submit@debbugs.gnu.org id=B68857.17095672365542 (code B ref 68857); Mon, 04 Mar 2024 15:48:02 +0000 Received: (at 68857) by debbugs.gnu.org; 4 Mar 2024 15:47:16 +0000 Received: from localhost ([127.0.0.1]:44521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhAX6-0001RK-2s for submit@debbugs.gnu.org; Mon, 04 Mar 2024 10:47:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhAX4-0001R3-M2 for 68857@debbugs.gnu.org; Mon, 04 Mar 2024 10:47:15 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rhAWU-00027e-3N; Mon, 04 Mar 2024 10:46:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=0HWVm22kqN9f1k1a6T/3oYYJYdJqrcRKzst7yxkVofk=; b=P3jEgtFE6V7G2yrEKDwC 88sQJHdet0q2G/KWLi+7h2ICPBeaalhKB9JSwlYv4G8F85wM3nsgm0lqIzZu5ULmNudeU1T/MTMU3 g657dZCDYa+ujqSi59quzH6zDmPbBrwmqzEuqmnaGNxBrdY4c0+O3KZSQKAwb/zSqL9mkqL+xiNzz WoZX8lUSt2THljQwyjp4xinanW2yXpBT52n+Ogg0R/7upPL8HiqbCHFu3PxBUspbW094oP0yhsP+V Cm9KNitPt6WqbiPxOQ1swueLo/KdFxNaRvUNF3uTAyz2kKd/XH/vHQ56uK7y2Vq3dJWqcg9tGpBtl 1lm73O8WQQBHiQ==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <413c752eb714951dfe350517fd0f783710a26386.1709037308.git.goodoldpaul@autistici.org> (Giacomo Leidi's message of "Tue, 27 Feb 2024 13:35:08 +0100") References: <14bc720d-7fdc-516a-3018-58294c1cafcd@autistici.org> <413c752eb714951dfe350517fd0f783710a26386.1709037308.git.goodoldpaul@autistici.org> Date: Mon, 04 Mar 2024 16:46:35 +0100 Message-ID: <87bk7uf19g.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) 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: 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.68 X-Spam-Score: -4.68 X-Migadu-Queue-Id: 221526C541 X-Migadu-Scanner: mx11.migadu.com X-TUID: MNqgW9KJFi3d Hi, Giacomo Leidi skribis: > The current implementation of the home-dotfiles-service-type contradicts > the Guix manual (see https://issues.guix.gnu.org/68848 ). This patch > properly implements both the plain and Stow dotfiles directory layouts. > > It does so by refactoring home-dotfiles-configuration, renaming the > directories field to a single directory, adding a new packages field to > support GNU Stow's users workflow and introducing a new layout field to > switch between the two directory layouts. > > * gnu/home/services/dotfiles (home-dotfiles-configuration): Migrate to > (gnu services configuration); > [directories]: rename to...; > [directory]: ...this, new field; > [packages]: new field; > [layout]: new field; > (strip-stow-dotfile): new variable; > (strip-plain-dotfile): new variable; > (home-dotfiles-configuration->files): use the new fields; > [directory-contents]: allow for > selecting a subset of application dotfile directories; > * doc/guix.texi: document the new layouts. > > Change-Id: I2e96037608353e360828290f055ec5271cfdfd48 LGTM, but=E2=80=A6 > - (directories home-dotfiles-configuration-directories ;list= of strings > - (default '())) [...] > + (directory > + (string) > + "The dotfiles directory where @code{home-dotfiles-service-type} > +will look for application dotfiles.") This is an incompatible change. Can we keep the old =E2=80=98directories= =E2=80=99 field? (Maybe this change is worthwhile, but it=E2=80=99s beyond the scope of this patch series IMO, so I=E2=80=99d suggest discussing it separately.) > (define-public home-dotfiles-service-type > (service-type (name 'home-dotfiles) > (extensions > (list (service-extension home-files-service-type > - home-dotfiles-configuration->f= iles))) > - (default-value (home-dotfiles-configuration)) > + (lambda (config) > + (when config > + (home-dotfiles-configurati= on->files config)))))) > + (default-value #f) Better not provide a default value than provide one that is invalid. My suggestion would be to remove the =E2=80=98default-value=E2=80=99 field her= e. Apologies for the delays and thanks for your work and for your patience! Ludo=E2=80=99.