From patchwork Fri Sep 9 12:42:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Tropin X-Patchwork-Id: 42357 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 D827827BBEA; Fri, 9 Sep 2022 13:43:13 +0100 (BST) 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 5EF3827BBE9 for ; Fri, 9 Sep 2022 13:43:13 +0100 (BST) Received: from localhost ([::1]:34350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWdLk-000517-Gb for patchwork@mira.cbaines.net; Fri, 09 Sep 2022 08:43:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWdLa-0004zJ-Ll for guix-patches@gnu.org; Fri, 09 Sep 2022 08:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44108) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oWdLa-0000Nf-C7 for guix-patches@gnu.org; Fri, 09 Sep 2022 08:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oWdLa-0007Hp-8I for guix-patches@gnu.org; Fri, 09 Sep 2022 08:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57692] [PATCH] home: shepherd: Add shepherd/init.scm to XDG_CONFIG_HOME. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Sep 2022 12:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57692 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57692@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166272735427960 (code B ref -1); Fri, 09 Sep 2022 12:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Sep 2022 12:42:34 +0000 Received: from localhost ([127.0.0.1]:32803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWdL8-0007Gu-Ef for submit@debbugs.gnu.org; Fri, 09 Sep 2022 08:42:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:48572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWdL6-0007Gm-71 for submit@debbugs.gnu.org; Fri, 09 Sep 2022 08:42:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWdL6-0004Lj-0Q for guix-patches@gnu.org; Fri, 09 Sep 2022 08:42:32 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:50715) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWdL3-0000Jr-S8; Fri, 09 Sep 2022 08:42:31 -0400 Received: (Authenticated sender: andrew@trop.in) by mail.gandi.net (Postfix) with ESMTPSA id 9B7A8C0004; Fri, 9 Sep 2022 12:42:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1662727345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=wKsNlpVzR8qotJflBFwshRNd5r1DgZxgakM2DdQcwvs=; b=e/0V4w4hKIx2m7/jn+ioZvvDbADheb2Zec/eRH4r2F3w0IVGzyh38wO4hOjOYzcgqXE1IZ id+pZ70TdPfjtYqsb9UYtX2CpoLTys8jm0bvQ9bbKYqu5FpcRU5wxqo93tFQTiLi2PUJPV hR0M7dGG0XP57vK/5T/R9Qc9y447vOasfo0gMc2alBYjKIKSNHyynHlUMUMPYrBPrNFFOn Hh8GRLBjhdBDPWICI4e/wVqrAtS/op3aj7lVDBoTolobxuKNST2/YwQF5InkqR+2I8CkQD TzYThqu4vbbtUp+7CFTTOFGxxhgD9RQlxauZwH5q+zs8/FSSteUEOSa4GR+TRg== From: Andrew Tropin Date: Fri, 09 Sep 2022 15:42:20 +0300 Message-ID: <87v8pwg1n7.fsf@trop.in> MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.183.198; envelope-from=andrew@trop.in; helo=relay6-d.mail.gandi.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 * gnu/home/services/shepherd.scm: Add shepherd/init.scm to XDG_CONFIG_HOME. --- Without this change it's not possible to start shepherd manually. Even if we disable extension of home-run-on-first-login-service-type via (home-shepherd-configuration-auto-start? #f), we don't know what shepherd configuration file to specify to shepherd --config. gnu/home/services/shepherd.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/home/services/shepherd.scm b/gnu/home/services/shepherd.scm index 62ab0aadc6..c17ec2b0f5 100644 --- a/gnu/home/services/shepherd.scm +++ b/gnu/home/services/shepherd.scm @@ -130,12 +130,21 @@ (define (ensure-shepherd-gexp config) #$(reload-configuration-gexp config) #$(launch-shepherd-gexp config))) +(define (add-shepherd-configuration config) + (let* ((shepherd (home-shepherd-configuration-shepherd config)) + (services (home-shepherd-configuration-services config))) + `(("shepherd/init.scm" + ,(home-shepherd-configuration-file services shepherd))))) + (define-public home-shepherd-service-type (service-type (name 'home-shepherd) (extensions (list (service-extension home-run-on-first-login-service-type launch-shepherd-gexp) + (service-extension + home-xdg-configuration-files-service-type + add-shepherd-configuration) (service-extension home-activation-service-type ensure-shepherd-gexp)