me
/
guix
Archived
1
0
Fork 0

guix home: Add 'edit' sub-command.

* 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.
Ludovic Courtès 2022-06-01 16:54:40 +02:00
parent 8eb17cebc1
commit 35c1edb20a
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
5 changed files with 87 additions and 1 deletions

View File

@ -312,6 +312,7 @@ MODULES = \
guix/scripts/system/reconfigure.scm \ guix/scripts/system/reconfigure.scm \
guix/scripts/system/search.scm \ guix/scripts/system/search.scm \
guix/scripts/home.scm \ guix/scripts/home.scm \
guix/scripts/home/edit.scm \
guix/scripts/home/import.scm \ guix/scripts/home/import.scm \
guix/scripts/lint.scm \ guix/scripts/lint.scm \
guix/scripts/challenge.scm \ guix/scripts/challenge.scm \

View File

@ -39452,6 +39452,19 @@ guix home container config.scm -- herd status
The command to run in the container must come after @code{--} (double The command to run in the container must come after @code{--} (double
hyphen). 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 @item reconfigure
Build the home environment described in @var{file}, and switch to it. Build the home environment described in @var{file}, and switch to it.
Switching means that the activation script will be evaluated and (in Switching means that the activation script will be evaluated and (in

View File

@ -60,6 +60,7 @@
#:autoload (guix scripts pull) (channel-commit-hyperlink) #:autoload (guix scripts pull) (channel-commit-hyperlink)
#:autoload (guix scripts system) (service-node-type #:autoload (guix scripts system) (service-node-type
shepherd-service-node-type) shepherd-service-node-type)
#:autoload (guix scripts home edit) (guix-home-edit)
#:autoload (guix scripts home import) (import-manifest) #:autoload (guix scripts home import) (import-manifest)
#:use-module ((guix status) #:select (with-status-verbosity)) #:use-module ((guix status) #:select (with-status-verbosity))
#:use-module ((guix build utils) #:select (mkdir-p)) #:use-module ((guix build utils) #:select (mkdir-p))
@ -93,6 +94,8 @@ Some ACTIONS support additional ARGS.\n"))
(newline) (newline)
(display (G_ "\ (display (G_ "\
search search for existing service types\n")) search search for existing service types\n"))
(display (G_ "\
edit edit the definition of an existing service type\n"))
(display (G_ " (display (G_ "
container run the home environment configuration in a container\n")) container run the home environment configuration in a container\n"))
(display (G_ "\ (display (G_ "\
@ -539,6 +542,8 @@ argument list and OPTS is the option alist."
;; an home environment file. ;; an home environment file.
((search) ((search)
(apply search args)) (apply search args))
((edit)
(apply guix-home-edit args))
((import) ((import)
(let* ((profiles (delete-duplicates (let* ((profiles (delete-duplicates
(match (filter-map (match-lambda (match (filter-map (match-lambda
@ -611,7 +616,7 @@ deploy the home environment described by these files.\n")
extension-graph shepherd-graph extension-graph shepherd-graph
list-generations describe list-generations describe
delete-generations roll-back delete-generations roll-back
switch-generation search switch-generation search edit
import container) import container)
(alist-cons 'action action result)) (alist-cons 'action action result))
(else (leave (G_ "~a: unknown action~%") action)))))) (else (leave (G_ "~a: unknown action~%") action))))))

View File

@ -0,0 +1,66 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022 Ludovic Courtès <ludo@gnu.org>
;;;
;;; 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 <http://www.gnu.org/licenses/>.
(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)))))

View File

@ -125,6 +125,7 @@ guix/scripts/archive.scm
guix/scripts/build.scm guix/scripts/build.scm
guix/scripts/discover.scm guix/scripts/discover.scm
guix/scripts/environment.scm guix/scripts/environment.scm
guix/scripts/home/edit.scm
guix/scripts/home/import.scm guix/scripts/home/import.scm
guix/scripts/home.scm guix/scripts/home.scm
guix/scripts/time-machine.scm guix/scripts/time-machine.scm