all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#57692] [PATCH] home: shepherd: Add shepherd/init.scm to XDG_CONFIG_HOME.
@ 2022-09-09 12:42 Andrew Tropin
  2022-09-09 15:15 ` Liliana Marie Prikler
  0 siblings, 1 reply; 3+ messages in thread
From: Andrew Tropin @ 2022-09-09 12:42 UTC (permalink / raw)
  To: 57692; +Cc: Ludovic Courtès

[-- Attachment #1: Type: text/plain, Size: 1662 bytes --]


* 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)
-- 
2.37.3

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [bug#57692] [PATCH] home: shepherd: Add shepherd/init.scm to XDG_CONFIG_HOME.
  2022-09-09 12:42 [bug#57692] [PATCH] home: shepherd: Add shepherd/init.scm to XDG_CONFIG_HOME Andrew Tropin
@ 2022-09-09 15:15 ` Liliana Marie Prikler
  2022-09-09 19:22   ` Andrew Tropin
  0 siblings, 1 reply; 3+ messages in thread
From: Liliana Marie Prikler @ 2022-09-09 15:15 UTC (permalink / raw)
  To: Andrew Tropin, 57692; +Cc: Ludovic Courtès

Am Freitag, dem 09.09.2022 um 15:42 +0300 schrieb Andrew Tropin:
> 
> * gnu/home/services/shepherd.scm: Add shepherd/init.scm to
> XDG_CONFIG_HOME.
Should be

* gnu/home/services/shepherd.scm (add-shepherd-configuration): New
variable.
(home-shepherd-service-type)[extensions]: Add home-xdg-configuration-
files-service-type.

Note that I'm less sure on the second entry here, you might have to
refer to add-shepherd-configuration.

I'd personally prefer "shepherd-configuration-files" as a name for the
procedure or "shepherd-xdg-configuration-files" if we're super strict.

Other than that LGTM. 

Cheers





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [bug#57692] [PATCH] home: shepherd: Add shepherd/init.scm to XDG_CONFIG_HOME.
  2022-09-09 15:15 ` Liliana Marie Prikler
@ 2022-09-09 19:22   ` Andrew Tropin
  0 siblings, 0 replies; 3+ messages in thread
From: Andrew Tropin @ 2022-09-09 19:22 UTC (permalink / raw)
  To: Liliana Marie Prikler, 57692; +Cc: Ludovic Courtès

[-- Attachment #1: Type: text/plain, Size: 808 bytes --]

On 2022-09-09 17:15, Liliana Marie Prikler wrote:

> Am Freitag, dem 09.09.2022 um 15:42 +0300 schrieb Andrew Tropin:
>> 
>> * gnu/home/services/shepherd.scm: Add shepherd/init.scm to
>> XDG_CONFIG_HOME.
> Should be
>
> * gnu/home/services/shepherd.scm (add-shepherd-configuration): New
> variable.
> (home-shepherd-service-type)[extensions]: Add home-xdg-configuration-
> files-service-type.

Right, will adjust it, thank you!

>
> Note that I'm less sure on the second entry here, you might have to
> refer to add-shepherd-configuration.
>
> I'd personally prefer "shepherd-configuration-files" as a name for the
> procedure or "shepherd-xdg-configuration-files" if we're super strict.

Sounds good.

>
> Other than that LGTM.
>
> Cheers
>

-- 
Best regards,
Andrew Tropin

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-09-09 19:23 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-09 12:42 [bug#57692] [PATCH] home: shepherd: Add shepherd/init.scm to XDG_CONFIG_HOME Andrew Tropin
2022-09-09 15:15 ` Liliana Marie Prikler
2022-09-09 19:22   ` Andrew Tropin

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.