From patchwork Wed Nov 17 15:44:42 2021 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: 34577 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 601F127BBE3; Wed, 17 Nov 2021 15:45:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2718927BBE1 for ; Wed, 17 Nov 2021 15:45:12 +0000 (GMT) Received: from localhost ([::1]:48588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnN7X-0005yf-7f for patchwork@mira.cbaines.net; Wed, 17 Nov 2021 10:45:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnN7O-0005xT-5W for guix-patches@gnu.org; Wed, 17 Nov 2021 10:45:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50217) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mnN7N-000081-S4 for guix-patches@gnu.org; Wed, 17 Nov 2021 10:45:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mnN7N-0001i0-Q5 for guix-patches@gnu.org; Wed, 17 Nov 2021 10:45:01 -0500 Subject: bug#51657: [PATCH] scripts: home: Make =?utf-8?b?4oCYZ3VpeA==?= home =?utf-8?b?aW1wb3J04oCZ?= populate =?utf-8?q?=E2=80=98home-configuration=2Es?= =?utf-8?q?cm?= Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Wed, 17 Nov 2021 15:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 51657 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Xinglu Chen Cc: 51657-done@debbugs.gnu.org, Andrew Tropin Mail-Followup-To: 51657@debbugs.gnu.org, ludo@gnu.org, public@yoctocell.xyz Received: via spool by 51657-done@debbugs.gnu.org id=D51657.16371638936529 (code D ref 51657); Wed, 17 Nov 2021 15:45:01 +0000 Received: (at 51657-done) by debbugs.gnu.org; 17 Nov 2021 15:44:53 +0000 Received: from localhost ([127.0.0.1]:33529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnN7F-0001hF-7h for submit@debbugs.gnu.org; Wed, 17 Nov 2021 10:44:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnN7D-0001gy-Fj for 51657-done@debbugs.gnu.org; Wed, 17 Nov 2021 10:44:52 -0500 Received: from [2001:470:142:3::e] (port=36288 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 1mnN77-00004r-Lj; Wed, 17 Nov 2021 10:44:45 -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=vG789ClibdToA8RDi9ibSo41vlgSh9RttZCr5hSVkG0=; b=PZkJX9Gx5AC/B6fo/qUW CEZppmAVBGvAjAlEyDeikYOmukCc9nRKt07HmqMTuyvRqaGZGYHmqChPGm8B8zlXmDa95pEe8YXji epBjkYy8B1pCjU93KPli+mNv1SskrUQqduvbHzHiUnmeBvKIRgb+4Ea44y8C4Zf1FQugDRPxAEz9g xgPnNXXcbi4po3tKrU7HBcoG2/1Cf+8baR+spvhlhEidGA9CH9+SGwzGniApzyqF9iu2Mo3xpO7rn qlfl4hOsWyq1IDRt9qaPENuAT97Frrdde4MjnPHHPinWGMg4CuScWUWJYDegKGxs5SmV2fnHLiziI nhyi9T4AQLAF+g==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:64903 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnN77-00027n-EY; Wed, 17 Nov 2021 10:44:45 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <14ec6984221fa50f5720db519cb0f06db4dd478b.1636283518.git.public@yoctocell.xyz> Date: Wed, 17 Nov 2021 16:44:42 +0100 In-Reply-To: <14ec6984221fa50f5720db519cb0f06db4dd478b.1636283518.git.public@yoctocell.xyz> (Xinglu Chen's message of "Sun, 07 Nov 2021 12:13:32 +0100") Message-ID: <87bl2ivlat.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) 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" X-getmail-retrieved-from-mailbox: Patches Hello, Xinglu Chen skribis: > * guix/scripts/home.scm (process-command): Populate ‘home-configuration.scm’ > in the destination directory instead of printing to stdout. > * doc/guix.texi (Declaring the Home Environment): Adjust accordingly. > (Invoking guix home): Likewise. Applied with the changes below. This is looking nice now! Thanks! Ludo’. diff --git a/doc/guix.texi b/doc/guix.texi index 5ce18fdf8a..59ceb4477a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -36673,7 +36673,7 @@ environment. Note that not every home service that exists is supported @example $ guix home import ~/guix-config -/home/alice/guix-config has been populated with all the configuration files of your home environment. Run 'guix home reconfigure /home/alice/guix-config/home-configuration.scm' to make it take effect. +guix home: '/home/alice/guix-config' populated with all the Home configuration files @end example @end table diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm index 118e66895e..afc7d8b39c 100644 --- a/guix/scripts/home.scm +++ b/guix/scripts/home.scm @@ -277,9 +277,12 @@ (define-syntax-rule (with-store* store exp ...) (call-with-output-file (string-append destination "/home-configuration.scm") (cut import-manifest manifest destination <>)) - (format #t (G_ "~a/ has been populated with all the configuration files \ -of your home environment. Run 'guix home reconfigure ~a/home-configuration.scm' \ -to make it take effect.") destination destination))) + (info (G_ "'~a' populated with all the Home configuration files~%") + destination) + (display-hint (format #f (G_ "\ +Run @command{guix home reconfigure ~a/home-configuration.scm} to effectively +deploy the home environment described by these files.\n") + destination)))) ((describe) (match (generation-number %guix-home) (0