From patchwork Sun Jan 28 21:02:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 59539 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 7EC6227BBEA; Sun, 28 Jan 2024 21:03:33 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 7D7A327BBE2 for ; Sun, 28 Jan 2024 21:03:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rUCJ2-0004I7-CS; Sun, 28 Jan 2024 16:03:08 -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 1rUCIo-0004EK-Qz for guix-patches@gnu.org; Sun, 28 Jan 2024 16:02:56 -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 1rUCIo-0001ft-IP for guix-patches@gnu.org; Sun, 28 Jan 2024 16:02:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rUCIw-0000tC-5q for guix-patches@gnu.org; Sun, 28 Jan 2024 16:03:02 -0500 Subject: bug#60521: [PATCH v7] home: Add home-dotfiles-service. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 28 Jan 2024 21:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 60521 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: Giacomo Leidi Cc: 60521-done@debbugs.gnu.org Mail-Followup-To: 60521@debbugs.gnu.org, ludo@gnu.org, goodoldpaul@autistici.org Received: via spool by 60521-done@debbugs.gnu.org id=D60521.17064757813411 (code D ref 60521); Sun, 28 Jan 2024 21:03:01 +0000 Received: (at 60521-done) by debbugs.gnu.org; 28 Jan 2024 21:03:01 +0000 Received: from localhost ([127.0.0.1]:58434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUCIv-0000ss-23 for submit@debbugs.gnu.org; Sun, 28 Jan 2024 16:03:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41308) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUCIs-0000sg-MU for 60521-done@debbugs.gnu.org; Sun, 28 Jan 2024 16:02:59 -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 1rUCIe-0001f1-Mj; Sun, 28 Jan 2024 16:02:44 -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=vfHwfg5bAL9wLKgJlgOShylGxP2dPPcVwm+z6iP5syU=; b=QLA4GiVdhb1kUIU073Sj dmiZOXV+pKcFYxWPMnPMn1mLOYTCxTkFfwL+obvAi8HhX77/0Lp3OZDcElMuogUb1e5v4IqoxCMAo gOCjpRyQjvPwdRC7AVs3jPPRgQqTwjlcPfNsB/BPmbxLDeMotIa4wMjNFjPWnBhmcRDPaSco0H2e5 MabkVsLoHCZh1MRg0+9zISNlxOvAzhlXBKNTqaIBBuhv2uP2+72s1ZeenO/BSULr1/eBXJoVG7Ykh mzwf49U5C+2Lw3YY/un3K3sq7czpXhp0FO7HCimsmi3DW+6qs968QaGDa3S0RlbrwMv5LlJNlvT50 U0WouOiGQYmSJQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= In-Reply-To: <20240128153716.20514-1-goodoldpaul@autistici.org> (Giacomo Leidi's message of "Sun, 28 Jan 2024 16:37:16 +0100") References: <0a8d7bce31856292baa06a08260494c0@autistici.org> <20240128153716.20514-1-goodoldpaul@autistici.org> Date: Sun, 28 Jan 2024 22:02:31 +0100 Message-ID: <877cjtf9y0.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi, Giacomo Leidi skribis: > * gnu/home/services.scm: New file; > (dotfiles-for-app): new variable; > (home-dotfiles-configuration): new variable; > (home-dotfiles-service-type): new variable. > * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. > * po/guix/POTFILES.in: Add it. > * doc/guix.texi: Document it. > > Change-Id: I6769169cfacefc3842faa5b31bee081c56c28743 > Co-authored-by: Ludovic Courtès Committed with the change below (perhaps a mistake I had introduced myself before) and with a slightly modified commit log. I’m switching my laptop’s config now. :-) Thanks for all the work, and thanks for your patience! Ludo’. diff --git a/gnu/home/services/dotfiles.scm b/gnu/home/services/dotfiles.scm index 7226b6bcff..6a740c42ce 100644 --- a/gnu/home/services/dotfiles.scm +++ b/gnu/home/services/dotfiles.scm @@ -58,11 +58,8 @@ (define (import-dotfiles directory files) generated by recursively visiting DIRECTORY and mapping its contents to the user's home directory, excluding files that match any of the patterns in EXCLUDED." (define (strip file) - (string-join - (cdr - (string-split (string-drop file (+ 1 (string-length directory))) - #\/)) - "/")) + (string-drop file (+ 1 (string-length directory)))) + (define (format file) ;; Remove from FILE characters that cannot be used in the store. (string-append