From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 2D48FlWJl2KjaAEAbAwnHQ (envelope-from ) for ; Wed, 01 Jun 2022 17:44:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id mN8cFlWJl2LQ2gAAauVa8A (envelope-from ) for ; Wed, 01 Jun 2022 17:44:21 +0200 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 D565B281D8 for ; Wed, 1 Jun 2022 17:44:20 +0200 (CEST) Received: from localhost ([::1]:58640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwQWC-0004oo-1T for larch@yhetil.org; Wed, 01 Jun 2022 11:44:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwQVv-0004Cu-Nv for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57754) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwQVv-00089H-FQ for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nwQVv-0001Wo-E1 for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55752] [PATCH 4/5] guix home: Add 'edit' sub-command. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Jun 2022 15:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55752 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55752@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 55752-submit@debbugs.gnu.org id=B55752.16540982055776 (code B ref 55752); Wed, 01 Jun 2022 15:44:03 +0000 Received: (at 55752) by debbugs.gnu.org; 1 Jun 2022 15:43:25 +0000 Received: from localhost ([127.0.0.1]:51646 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwQVI-0001V5-Ns for submit@debbugs.gnu.org; Wed, 01 Jun 2022 11:43:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwQVD-0001UB-4s for 55752@debbugs.gnu.org; Wed, 01 Jun 2022 11:43:20 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:37378) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwQV7-00083j-J4; Wed, 01 Jun 2022 11:43:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=hB6UdHO4kLKbRLbFkZYAcj0iaEZ0Q/8LQCCgPMtOugk=; b=L4ASrSDaQOKdY2ZBIcF6 Rm6VQZV0GR0vQJBU0/lv1qODKi4N2vt8yPtoTSr3+ziNWuJsJGWb62nIKez5L+0NJCCDaPKRkRk/w AtmwClWYjTh6vSAE6vdeuRSNSAyHBnssNF93mk1lSbNH6IsAgO9xXJI2BeDP7REUqzlvLMECY+Ipn 6hZ5hlU4XGriHE9jZnm+wYSE313lIpaKnlYu5DrV714MQ4cC7m6hTYiHfEr4iECDXfwRdMa9Gh4uH V6nGMgCnZk0ce77vDVAq8ApyxSZKu7KBs3L0w13hRTtmGKx+653O+jl81CulncwBCSn2JzCgCM4Te SX2bxvASr+F4Eg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:55618 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwQV7-0006Xy-3F; Wed, 01 Jun 2022 11:43:13 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Wed, 1 Jun 2022 17:43:01 +0200 Message-Id: <20220601154302.16222-4-ludo@gnu.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220601154302.16222-1-ludo@gnu.org> References: <20220601154302.16222-1-ludo@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1654098261; 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=Jbbagi0g8PHssm+jv7kElkJXM70FQrtsE2wKzW90wYQ=; b=HMx9hC/qbdq6Vj2n3xnFQXsXDyfYkr1N5KawD0FjKTUMy7h6fPE7Qy6dObhQrvQmvbJnZC IqwDVo2nXuWg68R1GKMNTP1ZHLI+SXxNGqtNOV3S12K46d7gNJbFw2usJSSC8JAmpFEBgi OxYlQ2fuIPaeMTGaO6ia96zFbdxiYM/Ck0TvHglsH8mWHkbRdycbNfRjZgg/tp5iGyQJqJ E2oeO5bHdAkQdmzc4Ao2nUFVSwQfZF5r3VewjSDAK6Z1TaDy/KYZNakR7HmVOW4ou+5i2A O0ipHzL8UxI6mnnudWQY4IeQ/j3TnasTGhOaQndg59FizS9svyS92tboaW8W5A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654098261; a=rsa-sha256; cv=none; b=IFQbTdLEDOlbvxiEkkLLwBqtODVm1JlNWnP+tKy5HcgAwB+BKwSkCJPZKucZOPVWnsIM+a iuRL6DV0sqJ3S233tkdEwecLhcmJxJbAZD1hfbSCVyZbmUeoDSGstqkoRnyR9B70DSrJso FZKHyxIV26cGhxUPIxbk5rDe3C+r7nSFIqxXRZk2f1SFHYcoBYWRLAsuJKxKVLTIyMghFv qLOWa8nDjgSktJZAW50eKQ/JoR7pMqjv7n0gVBzKVvB7ooVX7NcvHCBOZ1qVh89AGWdgUr gSsRToBOcQ/tmDB5mquewrzL9kVwgHIcq+xpqVaNn+DT9p+hZSBK4aIR7EgLtA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=L4ASrSDa; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -3.43 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=L4ASrSDa; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: D565B281D8 X-Spam-Score: -3.43 X-Migadu-Scanner: scn0.migadu.com X-TUID: Gwm49tNySKSM * guix/scripts/home/edit.scm: New file. * Makefile.am (MODULES): Add it. * guix/scripts/home.scm (show-help): Add "edit". (process-command): Handle it. (guix-home): Add it. * po/guix/POTFILES.in: Add 'guix/scripts/home/edit.scm'. * doc/guix.texi (Invoking guix home): Document it. --- Makefile.am | 1 + doc/guix.texi | 13 ++++++++ guix/scripts/home.scm | 7 +++- guix/scripts/home/edit.scm | 66 ++++++++++++++++++++++++++++++++++++++ po/guix/POTFILES.in | 1 + 5 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 guix/scripts/home/edit.scm diff --git a/Makefile.am b/Makefile.am index 89bc03c9a2..e8d4b7ef8a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -312,6 +312,7 @@ MODULES = \ guix/scripts/system/reconfigure.scm \ guix/scripts/system/search.scm \ guix/scripts/home.scm \ + guix/scripts/home/edit.scm \ guix/scripts/home/import.scm \ guix/scripts/lint.scm \ guix/scripts/challenge.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index ecd99084ef..f85eaacdfa 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -39466,6 +39466,19 @@ guix home container config.scm -- herd status The command to run in the container must come after @code{--} (double hyphen). +@cindex service type definition, editing +@cindex editing, service type definition +@item edit +Edit or view the definition of the given Home service types. + +For example, the command below opens your editor, as specified by the +@env{EDITOR} environment variable, on the definition of the +@code{home-mcron} service type: + +@example +guix home edit home-mcron +@end example + @item reconfigure Build the home environment described in @var{file}, and switch to it. Switching means that the activation script will be evaluated and (in diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm index f43bf865a7..0f5c3388a1 100644 --- a/guix/scripts/home.scm +++ b/guix/scripts/home.scm @@ -60,6 +60,7 @@ (define-module (guix scripts home) #:autoload (guix scripts pull) (channel-commit-hyperlink) #:autoload (guix scripts system) (service-node-type shepherd-service-node-type) + #:autoload (guix scripts home edit) (guix-home-edit) #:autoload (guix scripts home import) (import-manifest) #:use-module ((guix status) #:select (with-status-verbosity)) #:use-module ((guix build utils) #:select (mkdir-p)) @@ -93,6 +94,8 @@ (define (show-help) (newline) (display (G_ "\ search search for existing service types\n")) + (display (G_ "\ + edit edit the definition of an existing service type\n")) (display (G_ " container run the home environment configuration in a container\n")) (display (G_ "\ @@ -539,6 +542,8 @@ (define-syntax-rule (with-store* store exp ...) ;; an home environment file. ((search) (apply search args)) + ((edit) + (apply guix-home-edit args)) ((import) (let* ((profiles (delete-duplicates (match (filter-map (match-lambda @@ -611,7 +616,7 @@ (define (parse-sub-command arg result) extension-graph shepherd-graph list-generations describe delete-generations roll-back - switch-generation search + switch-generation search edit import container) (alist-cons 'action action result)) (else (leave (G_ "~a: unknown action~%") action)))))) diff --git a/guix/scripts/home/edit.scm b/guix/scripts/home/edit.scm new file mode 100644 index 0000000000..a6c05675b3 --- /dev/null +++ b/guix/scripts/home/edit.scm @@ -0,0 +1,66 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix scripts home edit) + #:use-module (guix diagnostics) + #:use-module (guix i18n) + #:use-module (guix ui) + #:autoload (guix utils) (string-closest) + #:use-module (gnu services) + #:use-module (gnu home services) + #:use-module (srfi srfi-1) + #:use-module (ice-9 match) + #:autoload (guix scripts edit) (spawn-editor) + #:export (guix-home-edit)) + +(define (service-type-not-found type) + "Report an error about @var{type} not being found and exit." + (report-error (G_ "~a: no such service type~%") type) + + (let* ((type (symbol->string type)) + (available (fold-home-service-types (lambda (type lst) + (cons (symbol->string + (service-type-name type)) + lst)) + '())) + (closest (string-closest type available))) + (unless (or (not closest) (string=? closest type)) + (display-hint (format #f (G_ "Did you mean @code{~a}?~%") + closest)))) + + (exit 1)) + + +(define (guix-home-edit . args) + (when (null? args) + (leave (G_ "no service types specified, nothing to edit~%"))) + + (with-error-handling + (let* ((types (append-map (lambda (type) + (let ((type (string->symbol type))) + (match (lookup-home-service-types type) + (() (service-type-not-found type)) + ((one) (list one)) + (lst + (warning (N_ "~a: ~a matching service type~%" + "~a: ~a matching service types~%" + (length lst)) + type (length lst)) + lst)))) + args))) + (spawn-editor (filter-map service-type-location types))))) diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index 5ad3c9f0a8..6b8bd92bb7 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -125,6 +125,7 @@ guix/scripts/archive.scm guix/scripts/build.scm guix/scripts/discover.scm guix/scripts/environment.scm +guix/scripts/home/edit.scm guix/scripts/home/import.scm guix/scripts/home.scm guix/scripts/time-machine.scm -- 2.36.1