From patchwork Wed Mar 13 18:41:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Sent X-Patchwork-Id: 61788 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 4FA1927BBE9; Wed, 13 Mar 2024 20:06:35 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 1C35127BBEA for ; Wed, 13 Mar 2024 20:06:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkUrm-0002lI-T3; Wed, 13 Mar 2024 16:06:23 -0400 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 1rkTp1-0007ZI-Ue for guix-patches@gnu.org; Wed, 13 Mar 2024 14:59:27 -0400 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 1rkTp1-0005pS-Md for guix-patches@gnu.org; Wed, 13 Mar 2024 14:59:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rkTpa-0001pk-My for guix-patches@gnu.org; Wed, 13 Mar 2024 15:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69781] [PATCH] services: Add the Guix Home Service Resent-From: Richard Sent Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Wed, 13 Mar 2024 19:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69781 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69781@debbugs.gnu.org Cc: Richard Sent , andrew@trop.in, ( , Andrew Tropin , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: ( , Andrew Tropin , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by submit@debbugs.gnu.org id=B.17103563977003 (code B ref -1); Wed, 13 Mar 2024 19:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Mar 2024 18:59:57 +0000 Received: from localhost ([127.0.0.1]:47420 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkTpV-0001ot-02 for submit@debbugs.gnu.org; Wed, 13 Mar 2024 14:59:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:56644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkTpS-0001ok-TA for submit@debbugs.gnu.org; Wed, 13 Mar 2024 14:59:55 -0400 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 1rkToq-0007Ys-JB for guix-patches@gnu.org; Wed, 13 Mar 2024 14:59:17 -0400 Received: from mail-108-mta84.mxroute.com ([136.175.108.84]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkToo-0005pC-HA for guix-patches@gnu.org; Wed, 13 Mar 2024 14:59:16 -0400 Received: from filter006.mxroute.com ([136.175.111.2] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta84.mxroute.com (ZoneMTA) with ESMTPSA id 18e392a0e5d0003bea.001 for (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Wed, 13 Mar 2024 18:54:01 +0000 X-Zone-Loop: a70feebf12a97cf97e9ed5b715b808ef87de3c9ba2d6 X-Originating-IP: [136.175.111.2] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=freakingpenguin.com; s=x; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=RPo7Ay/LuJbkrX3JsDHLdkL8t617dy9K63vGGHquuEE=; b=OnHRZjE3i9UCL9HOKQXKwBJqq9 BQxqMQ80SbUKQepwgX/3r0Ubtd7PljUMF3195ht9GPKS2pzyHmikI81ZE5rIRh/iOvBMoKwmhmxNA rEeniZuW0Bwof83qotBWMis72tajRXmGvmekM8fKSCZXlYvhaVhzDWdf7GO6YutrX58DiQXWSiD3c pj+nTSOdI4kgyvguWXFjR1yjvnw2Xxh5uubQ7ShFRi9mFbuDDKfoUiCucYVMu+NMABwazb1lxu0C9 9YDrISUCFcOrrLTb9lfGINKjGN4UhGvSqFvwATqol1LfpbNJwzEHdfgEFi/N2wQWVivhjrz0mvqib Ikp6QBNQ==; From: Richard Sent Date: Wed, 13 Mar 2024 14:41:40 -0400 Message-ID: <05fd930c91838ce9640720ce68e3379f10154590.1710355300.git.richard@freakingpenguin.com> MIME-Version: 1.0 X-Authenticated-Id: richard@freakingpenguin.com Received-SPF: pass client-ip=136.175.108.84; envelope-from=richard@freakingpenguin.com; helo=mail-108-mta84.mxroute.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Wed, 13 Mar 2024 16:06:20 -0400 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 This patch adds a Guix Home Service, which allows for configuring/deploying an operating-system declaration with an associated home-environment. * gnu/services/guix.scm: Add guix-home-service and guix-home-shepherd-service * gnu/home/services/shepherd.scm: Don't attempt to launch user shepherd when the system shepherd runs guix-home- * doc/guix.texi: Add documentation for guix-home-service Change-Id: Ifbcc0878d934aa4abe34bb2123b5081fb432aa8e --- Hi Guix. This patch adds support for activating a home configuration as part of a Guix System configuration. It does this by creating a one-shot shepherd service that runs the home environment activation script. This patch is based on code from Andrew Tropin [1], used with permission. [2]. Given that fact I'm not 100% sure I handled the copyright headers correctly; let me know if they need changed. There was an issue where the activation script would attempt to also launch the user-level shepherd, which would fail as /run/user/ would not usually exist. It was a benign issue (symlinks would still be set up), but I decided an environment variable would be the best way to avoid printing spurious warnings to the shepherd log file. I also changed the rde code from relying on term-tty1 to user-processes. I've not observed any failed activations with this change and it also allows the operating-system to run in a container, unlike term-tty1. [1] https://git.sr.ht/~abcdw/rde/tree/master/item/src/gnu/services/home.scm [2] https://lists.sr.ht/~abcdw/rde-discuss/%3C87h6j0rqmi.fsf%40freakingpenguin.com%3E doc/guix.texi | 32 ++++++++++++++++++++++++++++ gnu/home/services/shepherd.scm | 7 +++++- gnu/services/guix.scm | 39 ++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 1 deletion(-) base-commit: 447e9c96259e8fa15a828de9b2dd3400e2ffafe6 diff --git a/doc/guix.texi b/doc/guix.texi index 858d5751bf..5523d1a174 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -125,6 +125,7 @@ Copyright @copyright{} 2023 Graham James Addis@* Copyright @copyright{} 2023 Tomas Volf@* Copyright @copyright{} 2024 Herman Rimm@* +Copyright @copyright{} 2024 Richard Sent@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -39567,6 +39568,37 @@ Guix Services @end table @end deftp +@subsubheading Guix Home Service +The Guix Home Service allows for associating Guix @ref{Declaring the +Home Environment, home-environment} declarations with a Guix +@ref{operating-system Reference, operating-system}. + +@defvar guix-home-service-type +Service type for the Guix Home Service. Its value must be an +association list. The key of each pair is a string representing the user +to deploy the configuration under and the value is a home-environment +configuration. + +@lisp +(define my-home + (home-environment + ...)) + +(operating-system + (services (list + (service guix-home-service-type + `(("alice" ,my-home)))))) +@end lisp + +This service can be extended by other services to add additional home +environments, as in this example: + +@lisp +(simple-service 'my-extra-home home-service-type + `(("bob" ,my-extra-home)))) +@end lisp +@end defvar + @subsubheading Nar Herder The @uref{https://git.cbaines.net/guix/nar-herder/about/,Nar Herder} is a utility for managing a collection of nars. diff --git a/gnu/home/services/shepherd.scm b/gnu/home/services/shepherd.scm index 176f4575cb..e68dea6954 100644 --- a/gnu/home/services/shepherd.scm +++ b/gnu/home/services/shepherd.scm @@ -132,7 +132,12 @@ (define (ensure-shepherd-gexp config) (format #f "/run/user/~a" (getuid))) "/shepherd/socket")) #$(reload-configuration-gexp config) - #$(launch-shepherd-gexp config))) + ;; Don't attempt to start user shepherd if the system is running the + ;; activation script. /run/user/ may not have been created + ;; yet. But do otherwise so if the runtime dir does not exist an error + ;; is logged. + (unless (getenv "GUIX_SYSTEM_IS_RUNNING_HOME_ACTIVATE") + #$(launch-shepherd-gexp config)))) (define (shepherd-xdg-configuration-files config) `(("shepherd/init.scm" ,(home-shepherd-configuration-file config)))) diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index c438da531c..5f649cbb6f 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020, 2021, 2022 Christopher Baines +;;; Copyright © 2024 Andrew Tropin ;;; ;;; This file is part of GNU Guix. ;;; @@ -101,6 +102,8 @@ (define-module (gnu services guix) guix-data-service-type + guix-home-service-type + nar-herder-service-type nar-herder-configuration nar-herder-configuration? @@ -686,6 +689,42 @@ (define guix-data-service-type (description "Run an instance of the Guix Data Service."))) + +;;; +;;; Guix Home Service +;;; + +(define (guix-home-shepherd-service config) + (map (lambda (x) + (let ((user (car x)) + (he (cdr x))) + (shepherd-service + (documentation "Activate Guix Home.") + (requirement '(user-processes)) + (provision (list (symbol-append 'guix-home- (string->symbol user)))) + (one-shot? #t) + (auto-start? #t) + (start #~(make-forkexec-constructor + '(#$(file-append he "/activate")) + #:user #$user + #:environment-variables + (list (string-append "HOME=" (passwd:dir (getpw #$user))) + "GUIX_SYSTEM_IS_RUNNING_HOME_ACTIVATE=t") + #:group (group:name (getgrgid (passwd:gid (getpw #$user)))))) + (stop #~(make-kill-destructor))))) + config)) + +(define guix-home-service-type + (service-type + (name 'guix-home) + (description "Setups home-environments specified in the value.") + (extensions (list (service-extension + shepherd-root-service-type + guix-home-shepherd-service))) + (compose concatenate) + (extend append) + (default-value '()))) + ;;; ;;; Nar Herder