[PATCH 00/12] Move (gnu home-services XYZ) to (gnu services XYZ)

> * gnu/home/services/configuration.scm (interpose): Include content of files.

> (string-or-gexp?): Rename to 'file-or-string-or-gexp?' and check for file-like

> object.

> (serialize-string-or-gexp): Rename to 'serialize-file-or-string-or-gexp'.

> (text-config?): Call 'file-or-string-or-gexp?' intead of 'string-or-gexp?'.

> * guix/scripts/home/import.scm:

> (generate-bash-module+configuration): Don't call slurp-file-gexp.

> ---

> gnu/home/services/configuration.scm | 14 ++++++++++----

> guix/scripts/home/import.scm | 8 +++-----

> 2 files changed, 13 insertions(+), 9 deletions(-)

>

> diff --git a/gnu/home/services/configuration.scm b/gnu/home/services/configuration.scm

> index 5e7743e7d6..39db7a5693 100644

> --- a/gnu/home/services/configuration.scm

> +++ b/gnu/home/services/configuration.scm

> @@ -59,7 +59,12 @@ DELIMITER interposed LS. Support 'infix and 'suffix GRAMMAR values."

> (G_ "The GRAMMAR value must be 'infix or 'suffix, but ~a provided.")

> grammar)))

> (fold-right (lambda (e acc)

> - (cons e

> + (cons (if (file-like? e)

> + #~(begin

> + (use-modules (ice-9 rdelim))

> + (with-fluids ((%default-port-encoding "UTF-8"))

> + (with-input-from-file #$e read-string)))

> + e)

> (if (and (null? acc) (eq? grammar 'infix))

> acc

> (cons delimiter acc))))

> @@ -79,11 +84,12 @@ the list result in @code{#t} when applying PRED? on them."

>

> (define alist? list?)

>

> -(define (string-or-gexp? sg) (or (string? sg) (gexp? sg)))

> -(define (serialize-string-or-gexp field-name val) "")

> +(define (file-or-string-or-gexp? fsg)

> + (or (string? fsg) (gexp? fsg) (file-like? fsg)))

> +(define (serialize-file-or-string-or-gexp field-name val) "")

>

> (define (text-config? config)

> - (and (list? config) (every string-or-gexp? config)))

> + (and (list? config) (every file-or-string-or-gexp? config)))

> (define (serialize-text-config field-name val)

> #~(string-append #$@(interpose val "\n" 'suffix)))

>

> diff --git a/guix/scripts/home/import.scm b/guix/scripts/home/import.scm

> index c977ec3861..611f580e85 100644

> --- a/guix/scripts/home/import.scm

> +++ b/guix/scripts/home/import.scm

> @@ -46,17 +46,15 @@

> (home-bash-configuration

> ,@(if (file-exists? rc)

> `((bashrc

> - (list (slurp-file-gexp (local-file ,rc)))))

> + (list (local-file ,rc))))

> '())

> ,@(if (file-exists? profile)

> `((bash-profile

> - (list (slurp-file-gexp

> - (local-file ,profile)))))

> + (list (local-file ,profile))))

> '())

> ,@(if (file-exists? logout)

> `((bash-logout

> - (list (slurp-file-gexp

> - (local-file ,logout)))))

> + (list (local-file ,logout))))

> '()))))))

>

>

> --

> 2.33.0

> * gnu/home-services/configuration.scm: Move the content ...

> * gnu/home/services/configuration.scm: ... here.

> * gnu/local.mk (GNU_SYSTEM_MODULES): Same.

> * gnu/home-services/shells.scm: Replace (gnu home-services configuration)

> with (gnu home services configuration).

> * gnu/home-services/xdg.scm: Same.

> ---

> gnu/home-services/shells.scm | 2 +-

> gnu/home-services/xdg.scm | 2 +-

> gnu/{home-services => home/services}/configuration.scm | 2 +-

> gnu/local.mk | 2 +-

> * doc/guix.texi (Invoking guix home): Document guix home import.

> ---

> doc/guix.texi | 4 ++++

> 1 file changed, 4 insertions(+)

> On Sat, Oct 02 2021, Oleg Pykhalov wrote:

>

>> * doc/guix.texi (Invoking guix home): Document guix home import.

>> ---

>> doc/guix.texi | 4 ++++

>> 1 file changed, 4 insertions(+)

>

> I sent a patch that documents ‘guix home import’ in a separate series

> which also fixes some things about ‘guix home import’[1].

>

> [1]: <https://issues.guix.gnu.org/50873>

> From: Andrew Tropin <andrew@trop.in>

>

> * tests/guix-home.sh: New file.

> * Makefile.am (SH_TESTS): Add tests/guix-home.sh.

>

> Signed-off-by: Oleg Pykhalov <go.wigust@gmail.com>

> +# Reporting of syntax errors.

> +

> +cat > "$tmpfile"<<EOF

> +;; This is line 1, and the next one is line 2.

> + (home-environment

> + (packages))

> +;; The 'T' is at column 3.

> +EOF

> * gnu/home-services.scm

> (%service-type-path): Search home services in "gnu/services".

> * gnu/home-services.scm: Update documentation string.

> ---

> gnu/home-services.scm | 4 ++--

> 1 file changed, 2 insertions(+), 2 deletions(-)

>

> diff --git a/gnu/home-services.scm b/gnu/home-services.scm

> index 9f1e986616..a244a15511 100644

> --- a/gnu/home-services.scm

> +++ b/gnu/home-services.scm

> @@ -512,10 +512,10 @@ environment, and its configuration file, when available.")))

>

> (define %service-type-path

> ;; Search path for service types.

> - (make-parameter `((,%guix-home-root-directory . "gnu/home-services"))))

> + (make-parameter `((,%guix-home-root-directory . "gnu/home/services"))))

>

> On Sat, Oct 02 2021, Oleg Pykhalov wrote:

>

>> * gnu/home/services/configuration.scm (interpose): Include content of files.

>> (string-or-gexp?): Rename to 'file-or-string-or-gexp?' and check for file-like

>> object.

>

> I would call it ‘file-like-or-string-or-gexp?’, just ‘files’ doesn’t

> really make it clear that it should be a “file-like object”.

> * guix/scripts/home.scm (process-action): Make sure profile directory exists.

> * tests/guix-home.sh: New file.

> * Makefile.am (SH_TESTS): Add this.

> ---

> Makefile.am | 1 +

> guix/scripts/home.scm | 2 ++

> tests/guix-home.sh | 73 +++++++++++++++++++++++++++++++++++++++++++

> 3 files changed, 76 insertions(+)

> create mode 100644 tests/guix-home.sh

>

> diff --git a/Makefile.am b/Makefile.am

> index b66789fa0b..5bf2567dc8 100644

> --- a/Makefile.am

> +++ b/Makefile.am

> @@ -546,6 +546,7 @@ SH_TESTS = \

> tests/guix-package-aliases.sh \

> tests/guix-package-net.sh \

> tests/guix-system.sh \

> + tests/guix-home.sh \

> tests/guix-archive.sh \

> tests/guix-authenticate.sh \

> tests/guix-environment.sh \

> diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm

> index 75df6d707d..115dfadb57 100644

> --- a/guix/scripts/home.scm

> +++ b/guix/scripts/home.scm

> @@ -1,6 +1,7 @@

> ;;; GNU Guix --- Functional package management for GNU

> ;;; Copyright © 2021 Andrew Tropin <andrew@trop.in>

> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>

> +;;; Copyright © 2021 Oleg Pykhalov <go.wigust@gmail.com>

> ;;;

> ;;; This file is part of GNU Guix.

> ;;;

> @@ -179,6 +180,7 @@ ACTION must be one of the sub-commands that takes a home environment

> declaration as an argument (a file name.) OPTS is the raw alist of options

> resulting from command-line parsing."

> (define (ensure-home-environment file-or-exp obj)

> + (ensure-profile-directory)

> (unless (home-environment? obj)

> (leave (G_ "'~a' does not return a home environment ~%")

> file-or-exp))

> diff --git a/tests/guix-home.sh b/tests/guix-home.sh

> new file mode 100644

> index 0000000000..e79982b7f7

> --- /dev/null

> +++ b/tests/guix-home.sh

> @@ -0,0 +1,73 @@

> +#!/bin/sh

> +

> +# GNU Guix --- Functional package management for GNU

> +# Copyright © 2021 Oleg Pykhalov <go.wigust@gmail.com>

> +#

> Xinglu Chen <public@yoctocell.xyz> skribis:

>

>> On Sat, Oct 02 2021, Oleg Pykhalov wrote:

>>

>>> * gnu/home/services/configuration.scm (interpose): Include content of files.

>>> (string-or-gexp?): Rename to 'file-or-string-or-gexp?' and check for file-like

>>> object.

>>

>> I would call it ‘file-like-or-string-or-gexp?’, just ‘files’ doesn’t

>> really make it clear that it should be a “file-like object”.

>

> As a matter of API, I would make it monomorphic: accept a file-like

> object, period. This is what’s done for System services (and

> polymorphic APIs are rare in general in Guix).

>

> ‘plain-file’ and ‘scheme-file’ allow users to “convert” a string or a

> gexp into a file-like object.

>

> WDYT?

>

> Ludo’.

>

>

>

> Well, guix home reconfigure will break your ~/.bashrc. Sorry.

> This patch fixes user's files corruption. Also, I applied suggestions

> about commit message, thanks zimoun!

> Oleg Pykhalov <go.wigust@gmail.com> writes:

>

> > This patch fixes user's files corruption. Also, I applied suggestions

> > about commit message, thanks zimoun!

>

> Also, in addion I forget to:

>

> Replace '#!/usr/bin/env bash' with '#!/bin/bash'

>

> Maybe a /bin/sh would be more Guix friendly, but shellcheck warns about

> export -f does not exist in posix shell. Thoughts are welcome ;-)

>> Replace '#!/usr/bin/env bash' with '#!/bin/bash'

>>

>> Maybe a /bin/sh would be more Guix friendly, but shellcheck warns about

>> export -f does not exist in posix shell. Thoughts are welcome ;-)

>

> /bin/bash doesn't exist on Guix System, so it seems a bit weird to me

> to use that in Guix. Anyway, I think shellcheck should classify

> '#!/usr/bin/env bash' as a bash shell instead of a posix shell?

> Maxime Devos <maximedevos@telenet.be> writes:

>

> […]

>

> > > Replace '#!/usr/bin/env bash' with '#!/bin/bash'

> > >

> > > Maybe a /bin/sh would be more Guix friendly, but shellcheck warns about

> > > export -f does not exist in posix shell. Thoughts are welcome ;-)

> >

> > /bin/bash doesn't exist on Guix System, so it seems a bit weird to me

> > to use that in Guix. Anyway, I think shellcheck should classify

> > '#!/usr/bin/env bash' as a bash shell instead of a posix shell?

>

> Yes, also /usr/bin/env does not exist on Guix as well. So in that sense

> both /bin/bash and /usr/bin/env bash are equal.

> On 2021-10-04 16:04, Ludovic Courtès wrote:

>

>> Xinglu Chen <public@yoctocell.xyz> skribis:

>>

>>> On Sat, Oct 02 2021, Oleg Pykhalov wrote:

>>>

>>>> * gnu/home/services/configuration.scm (interpose): Include content of files.

>>>> (string-or-gexp?): Rename to 'file-or-string-or-gexp?' and check for file-like

>>>> object.

>>>

>>> I would call it ‘file-like-or-string-or-gexp?’, just ‘files’ doesn’t

>>> really make it clear that it should be a “file-like object”.

>>

>> As a matter of API, I would make it monomorphic: accept a file-like

>> object, period. This is what’s done for System services (and

>> polymorphic APIs are rare in general in Guix).

>

> At least some of system services are far from ideal, recently I tried to

> add rtmp section to nginx configuration using nginx system service.

> Imagine the following use case: I want to create a home service, which

> accepts a package (zsh plugin) and adds a code for loading this package

> to zshrc, currently it's implemented like that:

>

> https://git.sr.ht/~abcdw/rde/tree/69dd2baf0384c899a4a4f97bdac8bf0b6e499b82/item/gnu/home-services/shellutils.scm#L18

>

> Exteding the service above with `(list zsh-autosuggestions)` will add

> the following line to zshrc:

>

> source /gnu/store/w7d43gk1qszplj9i0rkzqvzz6kp88qfm-zsh-autosuggestions-0.7.0/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh

> Hi Andrew,

>

> Andrew Tropin <andrew@trop.in> skribis:

>

>> On 2021-10-04 16:04, Ludovic Courtès wrote:

>>

>>> Xinglu Chen <public@yoctocell.xyz> skribis:

>>>

>>>> On Sat, Oct 02 2021, Oleg Pykhalov wrote:

>>>>

>>>>> * gnu/home/services/configuration.scm (interpose): Include content of files.

>>>>> (string-or-gexp?): Rename to 'file-or-string-or-gexp?' and check for file-like

>>>>> object.

>>>>

>>>> I would call it ‘file-like-or-string-or-gexp?’, just ‘files’ doesn’t

>>>> really make it clear that it should be a “file-like object”.

>>>

>>> As a matter of API, I would make it monomorphic: accept a file-like

>>> object, period. This is what’s done for System services (and

>>> polymorphic APIs are rare in general in Guix).

>>

>> At least some of system services are far from ideal, recently I tried to

>> add rtmp section to nginx configuration using nginx system service.

>

> I agree that nginx config is problematic:

>

> https://issues.guix.gnu.org/37388

>

> But IMO that’s off-topic. :-)

>

>> Imagine the following use case: I want to create a home service, which

>> accepts a package (zsh plugin) and adds a code for loading this package

>> to zshrc, currently it's implemented like that:

>>

>> https://git.sr.ht/~abcdw/rde/tree/69dd2baf0384c899a4a4f97bdac8bf0b6e499b82/item/gnu/home-services/shellutils.scm#L18

>>

>> Exteding the service above with `(list zsh-autosuggestions)` will add

>> the following line to zshrc:

>>

>> source /gnu/store/w7d43gk1qszplj9i0rkzqvzz6kp88qfm-zsh-autosuggestions-0.7.0/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh

>

> OK.

>

> Then that’s fine: you can have special code that emits those “source”

> lines in .zshrc while still allowing users to provide their own

> file-like object for .zshrc lines they want to add. Again, see how

> ‘torrc’ is generated in ‘tor-service-type’.

>

> I’m happy to discuss specific service examples in mode details if you

> want. Overall, I’m confident Home services don’t require any pattern

> that’s not already found in one of the many System services. :-)

>

> HTH,

> Ludo’.

> * gnu/home/services/configuration.scm (interpose): Include content of files.

> (string-or-gexp?): Rename to 'file-or-string-or-gexp?' and check for file-like

> object.

> (serialize-string-or-gexp): Rename to 'serialize-file-or-string-or-gexp'.

> (text-config?): Call 'file-or-string-or-gexp?' intead of 'string-or-gexp?'.

> * guix/scripts/home/import.scm:

> (generate-bash-module+configuration): Don't call slurp-file-gexp.

> ---

> gnu/home/services/configuration.scm | 14 ++++++++++----

> guix/scripts/home/import.scm | 8 +++-----

> 2 files changed, 13 insertions(+), 9 deletions(-)

>

> diff --git a/gnu/home/services/configuration.scm b/gnu/home/services/configuration.scm

> index 5e7743e7d6..39db7a5693 100644

> --- a/gnu/home/services/configuration.scm

> +++ b/gnu/home/services/configuration.scm

> @@ -59,7 +59,12 @@ DELIMITER interposed LS. Support 'infix and 'suffix GRAMMAR values."

> (G_ "The GRAMMAR value must be 'infix or 'suffix, but ~a provided.")

> grammar)))

> (fold-right (lambda (e acc)

> - (cons e

> + (cons (if (file-like? e)

> + #~(begin

> + (use-modules (ice-9 rdelim))

> + (with-fluids ((%default-port-encoding "UTF-8"))

> + (with-input-from-file #$e read-string)))

> + e)

> (if (and (null? acc) (eq? grammar 'infix))

> acc

> (cons delimiter acc))))

> @@ -79,11 +84,12 @@ the list result in @code{#t} when applying PRED? on them."

>

> (define alist? list?)

>

> -(define (string-or-gexp? sg) (or (string? sg) (gexp? sg)))

> -(define (serialize-string-or-gexp field-name val) "")

> +(define (file-or-string-or-gexp? fsg)

> + (or (string? fsg) (gexp? fsg) (file-like? fsg)))

> +(define (serialize-file-or-string-or-gexp field-name val) "")

>

> (define (text-config? config)

> - (and (list? config) (every string-or-gexp? config)))

> + (and (list? config) (every file-or-string-or-gexp? config)))

> (define (serialize-text-config field-name val)

> #~(string-append #$@(interpose val "\n" 'suffix)))

>

> diff --git a/guix/scripts/home/import.scm b/guix/scripts/home/import.scm

> index c977ec3861..611f580e85 100644

> --- a/guix/scripts/home/import.scm

> +++ b/guix/scripts/home/import.scm

> @@ -46,17 +46,15 @@

> (home-bash-configuration

> ,@(if (file-exists? rc)

> `((bashrc

> - (list (slurp-file-gexp (local-file ,rc)))))

> + (list (local-file ,rc))))

> '())

> ,@(if (file-exists? profile)

> `((bash-profile

> - (list (slurp-file-gexp

> - (local-file ,profile)))))

> + (list (local-file ,profile))))

> '())

> ,@(if (file-exists? logout)

> `((bash-logout

> - (list (slurp-file-gexp

> - (local-file ,logout)))))

> + (list (local-file ,logout))))

> '()))))))

> * gnu/home-services/configuration.scm: Move the content ...

> ...

> * gnu/home-services.scm: Update documentation string.

> ---

> doc/guix.texi | 8 ++++----

> doc/he-config-bare-bones.scm | 2 +-

> gnu/home-services.scm | 4 ++--

> gnu/home.scm | 8 ++++----

> .../services}/configuration.scm | 2 +-

> .../services}/fontutils.scm | 2 +-

> gnu/{home-services => home/services}/mcron.scm | 4 ++--

> gnu/{home-services => home/services}/shells.scm | 6 +++---

> .../services}/shepherd.scm | 2 +-

> .../services}/symlink-manager.scm | 2 +-

> gnu/{home-services => home/services}/utils.scm | 2 +-

> gnu/{home-services => home/services}/xdg.scm | 6 +++---

> gnu/local.mk | 16 ++++++++--------

> Imagine the following use case: I want to create a home service, which

> accepts a package (zsh plugin) and adds a code for loading this package

> to zshrc, currently it's implemented like that:

>

> https://git.sr.ht/~abcdw/rde/tree/69dd2baf0384c899a4a4f97bdac8bf0b6e499b82/item/gnu/home-services/shellutils.scm#L18

>

> Exteding the service above with `(list zsh-autosuggestions)` will add

> the following line to zshrc:

>

> source /gnu/store/w7d43gk1qszplj9i0rkzqvzz6kp88qfm-zsh-autosuggestions-0.7.0/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh

>

> Or the same thing can be done manually by user:

>

> --8<---------------cut here---------------start------------->8---

> (service

> home-zsh-service-type

> (home-zsh-configuration

> (zshrc

> (list

> #~(string-append "source " #$zsh-autosuggestions "/share/zs../..ions.zsh")

> ;; or

> "source \\"

> (file-append zsh-autosuggestions "/share/zs../..ions.zsh")))))

> --8<---------------cut here---------------end--------------->8---

>

> gexps returns a string, file-like object returns a path to the file in

> the store, kinda expected behavior. Both implementations looks quite

> simple.

>

>

> Now I'll try to reimplement it with file-like objects. The code below

> is a pseudo code, but should demonstrate the overall concerns I have:

>

> --8<---------------cut here---------------start------------->8---

> ;; Some generic functions

> (define get-file-like-object-path (file-like)

> "Because all file-like object get inserted literally by home services,

> we need a function, which returns a file, which contains a path to the

> file."

> (computed-file

> "tmp-file"

> #~#$file-like))

>

> (define fl-append-strings (lst)

> "Accepts a list of strings and file-like object, reads the content of

> the file-like objects (to be consistent with behavior of home services

> configuration)."

> (define file-like->str (mb-file-like)

> (if (string? mb-file-like)

> mb-file-like

> #~(begin

> (use-modules (ice-9 rdelim))

> (with-fluids ((%default-port-encoding "UTF-8"))

> (with-input-from-file #$mb-file-like read-string)))))

> (computed-file

> "tmp-file"

> #~(apply string-append '#$(map file-like->str lst))))

>

>

> ;; A home service, declared in home-environment.

> (service

> home-zsh-service-type

> (home-zsh-configuration

> (zshrc

> (list

> (fl-append-strings

> (list

> "source "

> (get-file-like-object-path zsh-autosuggestions)

> "/share/zs../..ions.zsh"))

> ;; or

> "source \\"

> (get-file-like-object-path

> (file-append zsh-autosuggestions "/share/zs../..ions.zsh"))))))

> --8<---------------cut here---------------end--------------->8---

> Oleg Pykhalov <go.wigust@gmail.com> writes:

>

>> * gnu/home-services/configuration.scm: Move the content ...

>> ...

>> * gnu/home-services.scm: Update documentation string.

>> ---

>> doc/guix.texi | 8 ++++----

>> doc/he-config-bare-bones.scm | 2 +-

>> gnu/home-services.scm | 4 ++--

>> gnu/home.scm | 8 ++++----

>> .../services}/configuration.scm | 2 +-

>> .../services}/fontutils.scm | 2 +-

>> gnu/{home-services => home/services}/mcron.scm | 4 ++--

>> gnu/{home-services => home/services}/shells.scm | 6 +++---

>> .../services}/shepherd.scm | 2 +-

>> .../services}/symlink-manager.scm | 2 +-

>> gnu/{home-services => home/services}/utils.scm | 2 +-

>> gnu/{home-services => home/services}/xdg.scm | 6 +++---

>> gnu/local.mk | 16 ++++++++--------

>

> […]

>

> I pushed only this patch to master.

>

>

> On Wed, Oct 06 2021, Andrew Tropin wrote:

>

>> Imagine the following use case: I want to create a home service, which

>> accepts a package (zsh plugin) and adds a code for loading this package

>> to zshrc, currently it's implemented like that:

>>

>> https://git.sr.ht/~abcdw/rde/tree/69dd2baf0384c899a4a4f97bdac8bf0b6e499b82/item/gnu/home-services/shellutils.scm#L18

>>

>> Exteding the service above with `(list zsh-autosuggestions)` will add

>> the following line to zshrc:

>>

>> source /gnu/store/w7d43gk1qszplj9i0rkzqvzz6kp88qfm-zsh-autosuggestions-0.7.0/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh

>>

>> Or the same thing can be done manually by user:

>>

>> --8<---------------cut here---------------start------------->8---

>> (service

>> home-zsh-service-type

>> (home-zsh-configuration

>> (zshrc

>> (list

>> #~(string-append "source " #$zsh-autosuggestions "/share/zs../..ions.zsh")

>> ;; or

>> "source \\"

>> (file-append zsh-autosuggestions "/share/zs../..ions.zsh")))))

>> --8<---------------cut here---------------end--------------->8---

>>

>> gexps returns a string, file-like object returns a path to the file in

>> the store, kinda expected behavior. Both implementations looks quite

>> simple.

>>

>>

>> Now I'll try to reimplement it with file-like objects. The code below

>> is a pseudo code, but should demonstrate the overall concerns I have:

>>

>> --8<---------------cut here---------------start------------->8---

>> ;; Some generic functions

>> (define get-file-like-object-path (file-like)

>> "Because all file-like object get inserted literally by home services,

>> we need a function, which returns a file, which contains a path to the

>> file."

>> (computed-file

>> "tmp-file"

>> #~#$file-like))

>>

>> (define fl-append-strings (lst)

>> "Accepts a list of strings and file-like object, reads the content of

>> the file-like objects (to be consistent with behavior of home services

>> configuration)."

>> (define file-like->str (mb-file-like)

>> (if (string? mb-file-like)

>> mb-file-like

>> #~(begin

>> (use-modules (ice-9 rdelim))

>> (with-fluids ((%default-port-encoding "UTF-8"))

>> (with-input-from-file #$mb-file-like read-string)))))

>> (computed-file

>> "tmp-file"

>> #~(apply string-append '#$(map file-like->str lst))))

>>

>>

>> ;; A home service, declared in home-environment.

>> (service

>> home-zsh-service-type

>> (home-zsh-configuration

>> (zshrc

>> (list

>> (fl-append-strings

>> (list

>> "source "

>> (get-file-like-object-path zsh-autosuggestions)

>> "/share/zs../..ions.zsh"))

>> ;; or

>> "source \\"

>> (get-file-like-object-path

>> (file-append zsh-autosuggestions "/share/zs../..ions.zsh"))))))

>> --8<---------------cut here---------------end--------------->8---

>

> Wouldn’t something like the following work

>

> --8<---------------cut here---------------start------------->8---

> (service home-zsh-service-type

> (home-zsh-configuration

> (zshrc

> (list (mixed-text-file

> "zshrc"

> "source "

> (file-append zsh-autosuggestions "/share/zsh/..."))

> (local-file "./some-zshrc")))))

> --8<---------------cut here---------------end--------------->8---

>

> and since ‘zshrc’ is already a list of file-like objects, we could

> implement ‘serialize-text-config’ using something like

> ‘fl-append-strings’, which would read the contents of the two files and

> append them. That way users don’t have to deal with ‘fl-append-strings’

> or ‘slurp-file-gexp’.

> Oleg Pykhalov schreef op do 07-10-2021 om 01:15 [+0300]:

>> Oleg Pykhalov <go.wigust@gmail.com> writes:

>>

>> > This patch fixes user's files corruption. Also, I applied suggestions

>> > about commit message, thanks zimoun!

>>

>> Also, in addion I forget to:

>>

>> Replace '#!/usr/bin/env bash' with '#!/bin/bash'

>>

>> Maybe a /bin/sh would be more Guix friendly, but shellcheck warns about

>> export -f does not exist in posix shell. Thoughts are welcome ;-)

>

> /bin/bash doesn't exist on Guix System,

> It would be cool to notify people about this update, because they

> probably already have configurations, which will break. etc/news.scm,

> message in mailing list? What is the best way to do it?

> Sorry for the late idea, but don't we want gnu/home-services.scm to be

> gnu/home/services.scm? WDYT?

> * gnu/home-services/configuration.scm: Move the content ...

> * gnu/home/services/configuration.scm: ... here.

> * gnu/local.mk (GNU_SYSTEM_MODULES): Same.

> * gnu/home-services/shells.scm: Replace (gnu home-services configuration)

> with (gnu home services configuration).

> * gnu/home-services/xdg.scm: Same.

> * gnu/home-services/symlink-manager.scm: Rename to

> gnu/home/services/symlink-manager.scm.

> * gnu/local.mk: Same.

> * gnu/home.scm: Replace (gnu home-services symlink-manager) with

> (gnu home services symlink-manager).

> * gnu/home-services/utils.scm: Rename to gnu/home/services/utils.scm.

> * gnu/local.mk: Same.

> * gnu/home-services/shells.scm: Replace (gnu home-services utils) with

> (gnu home services utils).

> * gnu/home-services/xdg.scm: Same.

> * gnu/home-services/fontutils.scm: Rename to gnu/services/fontutils.scm.

> * gnu/local.mk: Same.

> * gnu/home.scm: Replace (gnu home-services fontutils) with

> (gnu services fontutils).

> * gnu/home-services/shells.scm: Rename to gnu/home/services/shells.scm.

> * gnu/local.mk: Same.

> * gnu/home.scm: Replace (gnu home-services shells) with (gnu home services shells).

> * doc/he-config-bare-bones.scm: Same.

> * gnu/home-services/xdg.scm: Rename to gnu/home/services/xdg.scm.

> * gnu/local.mk: Same.

> * gnu/home.scm: Replace (gnu home-services xdg) with (gnu home services xdg).

> * gnu/home-services/shepherd.scm: Move to gnu/home/services/shepherd.scm.

> * gnu/local.mk: Same.

> * gnu/home-services/mcron.scm: Replace (gnu home-services shepherd) with

> (gnu home services shepherd).

> * tests/guix-home.sh: Same.

> * gnu/home-services/mcron.scm: Move to gnu/home/services/mcron.scm.

> * gnu/local.mk: Same.

> * doc/guix.texi: Replace (gnu home-services mcron) with

> (gnu home services mcron).

> * guix/scripts/home/import.scm: Replace (gnu home-services bash) with

> (gnu home services bash).

> * doc/guix.texi: Replace (gnu home-services) with (gnu home services).

> * gnu/home-services.scm

> (%service-type-path): Search home services in "gnu/services".

> * gnu/home-services.scm: Update documentation string.

> From eec2ab5f514ec6e156244898f8a635baf323ab70 Mon Sep 17 00:00:00 2001

> From: Oleg Pykhalov <go.wigust@gmail.com>

> Date: Tue, 5 Oct 2021 02:10:25 +0300

> Subject: [PATCH] scripts: home: Make sure profile directory exists.

>

> * guix/scripts/home.scm (process-action): Make sure profile directory exists.

> * tests/guix-home.sh: New file.

> * Makefile.am (SH_TESTS): Add this.

> +++ b/tests/guix-home.sh

> @@ -0,0 +1,86 @@

> +#!/usr/bin/env bash

> +

> +run_guix_home_without_home()

> +{

> + (

> + # Save current directory (Guix source directory) for later mount

> + test_directory="$(mktemp -d)"

> + trap 'umount $test_directory; rmdir $test_directory' EXIT

> + mount --bind "$PWD" "$test_directory"

> +

> + # Make $HOME directory empty to preserve user's files

> + mount --types tmpfs none "$HOME"

> +

> + # Mount Guix source directory in a clean environment

> + mkdir -p "$PWD"

> + mount --bind "$test_directory" "$PWD"

> + cd "$PWD" || exit 77

> + guix home reconfigure "${test_directory}/home.scm"

> +unshare -mrf bash -c "run_guix_home_without_home"

>> From eec2ab5f514ec6e156244898f8a635baf323ab70 Mon Sep 17 00:00:00 2001

>> From: Oleg Pykhalov <go.wigust@gmail.com>

>> Date: Tue, 5 Oct 2021 02:10:25 +0300

>> Subject: [PATCH] scripts: home: Make sure profile directory exists.

> Also, wouldn’t it be easier to set HOME to a new directory?

>

>> + guix home reconfigure "${test_directory}/home.scm"

> Could you send an updated patch?