[bug#56439] [PATCH] gnu: home: Add Guix channels service.

[bug#56439] [PATCH] gnu: home: Add Guix channels service.

[Reily Siegel]

* gnu/home/services/guix.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add guix.scm.
* doc/guix.texi: Add documentation for home-channels-service.
---

 doc/guix.texi              | 32 +++++++++++++++++++++++++++
 gnu/home/services/guix.scm | 44 ++++++++++++++++++++++++++++++++++++++
 gnu/local.mk               |  1 +
 3 files changed, 77 insertions(+)
 create mode 100644 gnu/home/services/guix.scm

diff --git a/doc/guix.texi b/doc/guix.texi
index 097e4a362b..b8b3f5cd82 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -105,6 +105,7 @@ Copyright @copyright{} 2022 Aleksandr Vityazev@*
 Copyright @copyright{} 2022 Philip M@sup{c}Grath@*
 Copyright @copyright{} 2022 Karl Hallsby@*
 Copyright @copyright{} 2022 Justin Veilleux@*
+Copyright @copyright{} 2022 Reily Siegel@*
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -39433,6 +39434,7 @@ services)}.
 * Shepherd: Shepherd Home Service.       Managing User's Daemons.
 * SSH: Secure Shell.                     Setting up the secure shell client.
 * Desktop: Desktop Home Services.        Services for graphical environments.
+* Guix: Guix Home Services.              Services for Guix.
 @end menu
 @c In addition to that Home Services can provide
 
@@ -40073,6 +40075,36 @@ format.
 
 @end deftp
 
+@node Guix Home Services
+@subsection Guix Home Services
+
+The @code{(gnu home services guix)} module provides services for
+user-specific Guix configuraton.
+
+@defvr {Scheme Variable} home-channels-service-type
+This is the service type for managing
+@file{$XGG_CONFIG_HOME/guix/channels.scm}, the file which controlls the
+channels recived on @command{guix pull}. It's associated value is a list
+of @code{channel} records, defined in the @code{(guix channels)} module.
+
+Generally, it is better to extend this service than to directly
+configure it, as its default value is the default guix channel(s)
+defined by @code{%default-channels}. If you configure this service
+directly, be sure to include a guix channel. See @ref{Specifying
+Additional Channels} and @ref{Using a Custom Guix Channel} for more
+details.
+
+A typical extension for adding a channel might look like this:
+
+@lisp
+(simple-service 'variant-pacakges-service
+                home-channels-service-type
+                (list
+                 (channel
+                  (name 'variant-packages)
+                  (url "https://example.org/variant-packages.git")))
+@end lisp
+@end defvr
 
 @node Invoking guix home
 @section Invoking @code{guix home}
diff --git a/gnu/home/services/guix.scm b/gnu/home/services/guix.scm
new file mode 100644
index 0000000000..428daff1c4
--- /dev/null
+++ b/gnu/home/services/guix.scm
@@ -0,0 +1,44 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2022 Reily Siegel <mail@reilysiegel.com>
+;;;
+;;; 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 (gnu home services guix)
+  #:use-module (gnu home services)
+  #:use-module (guix channels)
+  #:use-module (guix gexp)
+  #:use-module (ice-9 pretty-print)
+  #:use-module (srfi srfi-1)
+  #:export (home-channels-service-type))
+
+(define (channels-xdg-files channels)
+  `(("guix/channels.scm"
+     ,(plain-file
+       "channels.scm"
+       (call-with-output-string
+         (lambda (port)
+           (pretty-print (cons 'list (map channel->code channels)) port)))))))
+
+(define home-channels-service-type
+  (service-type
+   (name 'home-channels)
+   (default-value %default-channels)
+   (compose concatenate)
+   (extend append)
+   (extensions
+    (list (service-extension home-xdg-configuration-files-service-type
+                             channels-xdg-files)))
+   (description "Manages $XDG_CONFIG_HOME/guix/channels.scm")))
diff --git a/gnu/local.mk b/gnu/local.mk
index faad6cc6b2..65891cb8ea 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -83,6 +83,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/home/services/desktop.scm			\
   %D%/home/services/symlink-manager.scm		\
   %D%/home/services/fontutils.scm		\
+  %D%/home/services/guix.scm			\
   %D%/home/services/shells.scm			\
   %D%/home/services/shepherd.scm		\
   %D%/home/services/ssh.scm			\

-- 
Reily Siegel

[bug#56439] [PATCH v2] gnu: home: Add Guix channels service.

[Reily Siegel]

* gnu/home/services/guix.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add guix.scm.
* doc/guix.texi: Add documentation for home-channels-service.
---
 doc/guix.texi              | 32 +++++++++++++++++++++++++++
 gnu/home/services/guix.scm | 44 ++++++++++++++++++++++++++++++++++++++
 gnu/local.mk               |  1 +
 3 files changed, 77 insertions(+)
 create mode 100644 gnu/home/services/guix.scm

diff --git a/doc/guix.texi b/doc/guix.texi
index 097e4a362b..f3e6cca266 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -105,6 +105,7 @@ Copyright @copyright{} 2022 Aleksandr Vityazev@*
 Copyright @copyright{} 2022 Philip M@sup{c}Grath@*
 Copyright @copyright{} 2022 Karl Hallsby@*
 Copyright @copyright{} 2022 Justin Veilleux@*
+Copyright @copyright{} 2022 Reily Siegel@*
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -39433,6 +39434,7 @@ services)}.
 * Shepherd: Shepherd Home Service.       Managing User's Daemons.
 * SSH: Secure Shell.                     Setting up the secure shell client.
 * Desktop: Desktop Home Services.        Services for graphical environments.
+* Guix: Guix Home Services.              Services for Guix.
 @end menu
 @c In addition to that Home Services can provide
 
@@ -40073,6 +40075,36 @@ format.
 
 @end deftp
 
+@node Guix Home Services
+@subsection Guix Home Services
+
+The @code{(gnu home services guix)} module provides services for
+user-specific Guix configuraton.
+
+@defvr {Scheme Variable} home-channels-service-type
+This is the service type for managing
+@file{$XGG_CONFIG_HOME/guix/channels.scm}, the file which controls the
+channels recieved on @command{guix pull}. Its associated value is a list
+of @code{channel} records, defined in the @code{(guix channels)} module.
+
+Generally, it is better to extend this service than to directly
+configure it, as its default value is the default guix channel(s)
+defined by @code{%default-channels}. If you configure this service
+directly, be sure to include a guix channel. See @ref{Specifying
+Additional Channels} and @ref{Using a Custom Guix Channel} for more
+details.
+
+A typical extension for adding a channel might look like this:
+
+@lisp
+(simple-service 'variant-packages-service
+                home-channels-service-type
+                (list
+                 (channel
+                  (name 'variant-packages)
+                  (url "https://example.org/variant-packages.git")))
+@end lisp
+@end defvr
 
 @node Invoking guix home
 @section Invoking @code{guix home}
diff --git a/gnu/home/services/guix.scm b/gnu/home/services/guix.scm
new file mode 100644
index 0000000000..819b20b6c9
--- /dev/null
+++ b/gnu/home/services/guix.scm
@@ -0,0 +1,44 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2022 Reily Siegel <mail@reilysiegel.com>
+;;;
+;;; 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 (gnu home services guix)
+  #:use-module (gnu home services)
+  #:use-module (guix channels)
+  #:use-module (guix gexp)
+  #:use-module (ice-9 pretty-print)
+  #:use-module (srfi srfi-1)
+  #:export (home-channels-service-type))
+
+(define (channels-xdg-files channels)
+  `(("guix/channels.scm"
+     ,(plain-file
+       "channels.scm"
+       (call-with-output-string
+         (lambda (port)
+           (pretty-print (cons 'list (map channel->code channels)) port)))))))
+
+(define home-channels-service-type
+  (service-type
+   (name 'home-channels)
+   (default-value %default-channels)
+   (compose concatenate)
+   (extend append)
+   (extensions
+    (list (service-extension home-xdg-configuration-files-service-type
+                             channels-xdg-files)))
+   (description "Manages the per-user Guix channels specification.")))
diff --git a/gnu/local.mk b/gnu/local.mk
index 2516562ea4..b5863b1ec8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -83,6 +83,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/home/services/desktop.scm			\
   %D%/home/services/symlink-manager.scm		\
   %D%/home/services/fontutils.scm		\
+  %D%/home/services/guix.scm			\
   %D%/home/services/shells.scm			\
   %D%/home/services/shepherd.scm		\
   %D%/home/services/ssh.scm			\

-- 
Reily Siegel

[bug#56439] [PATCH v3] gnu: home: Add Guix channels service.

[Reily Siegel]

* gnu/home/services/guix.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add guix.scm.
* doc/guix.texi: Add documentation for home-channels-service.
---
 doc/guix.texi              | 32 +++++++++++++++++++++++++++
 gnu/home/services/guix.scm | 44 ++++++++++++++++++++++++++++++++++++++
 gnu/local.mk               |  1 +
 3 files changed, 77 insertions(+)
 create mode 100644 gnu/home/services/guix.scm

diff --git a/doc/guix.texi b/doc/guix.texi
index 097e4a362b..1f49d9bd6a 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -105,6 +105,7 @@ Copyright @copyright{} 2022 Aleksandr Vityazev@*
 Copyright @copyright{} 2022 Philip M@sup{c}Grath@*
 Copyright @copyright{} 2022 Karl Hallsby@*
 Copyright @copyright{} 2022 Justin Veilleux@*
+Copyright @copyright{} 2022 Reily Siegel@*
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -39433,6 +39434,7 @@ services)}.
 * Shepherd: Shepherd Home Service.       Managing User's Daemons.
 * SSH: Secure Shell.                     Setting up the secure shell client.
 * Desktop: Desktop Home Services.        Services for graphical environments.
+* Guix: Guix Home Services.              Services for Guix.
 @end menu
 @c In addition to that Home Services can provide
 
@@ -40073,6 +40075,36 @@ format.
 
 @end deftp
 
+@node Guix Home Services
+@subsection Guix Home Services
+
+The @code{(gnu home services guix)} module provides services for
+user-specific Guix configuration.
+
+@defvr {Scheme Variable} home-channels-service-type
+This is the service type for managing
+@file{$XGG_CONFIG_HOME/guix/channels.scm}, the file which controls the
+channels recieved on @command{guix pull}. Its associated value is a list
+of @code{channel} records, defined in the @code{(guix channels)} module.
+
+Generally, it is better to extend this service than to directly
+configure it, as its default value is the default guix channel(s)
+defined by @code{%default-channels}. If you configure this service
+directly, be sure to include a guix channel. See @ref{Specifying
+Additional Channels} and @ref{Using a Custom Guix Channel} for more
+details.
+
+A typical extension for adding a channel might look like this:
+
+@lisp
+(simple-service 'variant-packages-service
+                home-channels-service-type
+                (list
+                 (channel
+                  (name 'variant-packages)
+                  (url "https://example.org/variant-packages.git")))
+@end lisp
+@end defvr
 
 @node Invoking guix home
 @section Invoking @code{guix home}
diff --git a/gnu/home/services/guix.scm b/gnu/home/services/guix.scm
new file mode 100644
index 0000000000..819b20b6c9
--- /dev/null
+++ b/gnu/home/services/guix.scm
@@ -0,0 +1,44 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2022 Reily Siegel <mail@reilysiegel.com>
+;;;
+;;; 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 (gnu home services guix)
+  #:use-module (gnu home services)
+  #:use-module (guix channels)
+  #:use-module (guix gexp)
+  #:use-module (ice-9 pretty-print)
+  #:use-module (srfi srfi-1)
+  #:export (home-channels-service-type))
+
+(define (channels-xdg-files channels)
+  `(("guix/channels.scm"
+     ,(plain-file
+       "channels.scm"
+       (call-with-output-string
+         (lambda (port)
+           (pretty-print (cons 'list (map channel->code channels)) port)))))))
+
+(define home-channels-service-type
+  (service-type
+   (name 'home-channels)
+   (default-value %default-channels)
+   (compose concatenate)
+   (extend append)
+   (extensions
+    (list (service-extension home-xdg-configuration-files-service-type
+                             channels-xdg-files)))
+   (description "Manages the per-user Guix channels specification.")))
diff --git a/gnu/local.mk b/gnu/local.mk
index 2516562ea4..b5863b1ec8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -83,6 +83,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/home/services/desktop.scm			\
   %D%/home/services/symlink-manager.scm		\
   %D%/home/services/fontutils.scm		\
+  %D%/home/services/guix.scm			\
   %D%/home/services/shells.scm			\
   %D%/home/services/shepherd.scm		\
   %D%/home/services/ssh.scm			\

-- 
Reily Siegel

bug#56439: [PATCH] gnu: home: Add Guix channels service.

[Ludovic Courtès]

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

Hi,

Reily Siegel <mail@reilysiegel.com> skribis:

> * gnu/home/services/guix.scm: New file.
> * gnu/local.mk (GNU_SYSTEM_MODULES): Add guix.scm.
> * doc/guix.texi: Add documentation for home-channels-service.

Neat!  Applied with the cosmetic changes below.

> +(define (channels-xdg-files channels)
> +  `(("guix/channels.scm"
> +     ,(plain-file
> +       "channels.scm"
> +       (call-with-output-string
> +         (lambda (port)
> +           (pretty-print (cons 'list (map channel->code channels)) port)))))))

The downside with this approach is that it doesn’t let you have a
sophisticated ‘channels.scm’ file, for instance one that calls
‘channel-with-substitutes-available’ (info "(guix) Channels with
Substitutes").

All in all, I think that’s an acceptable limitation.  Someone willing to
write arbitrary code to ‘channels.scm’ can “roll their own” and extend
‘home-xdg-configuration-files-service-type’ similarly.

Thanks,
Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1052 bytes --]

diff --git a/doc/guix.texi b/doc/guix.texi
index 1f49d9bd6a..637a2cf744 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -40083,14 +40083,14 @@ user-specific Guix configuration.
 
 @defvr {Scheme Variable} home-channels-service-type
 This is the service type for managing
-@file{$XGG_CONFIG_HOME/guix/channels.scm}, the file which controls the
-channels recieved on @command{guix pull}. Its associated value is a list
+@file{$XDG_CONFIG_HOME/guix/channels.scm}, the file that controls the
+channels recieved on @command{guix pull}.  Its associated value is a list
 of @code{channel} records, defined in the @code{(guix channels)} module.
 
 Generally, it is better to extend this service than to directly
 configure it, as its default value is the default guix channel(s)
 defined by @code{%default-channels}. If you configure this service
-directly, be sure to include a guix channel. See @ref{Specifying
+directly, be sure to include a guix channel.  @xref{Specifying
 Additional Channels} and @ref{Using a Custom Guix Channel} for more
 details.
 

[bug#56439] [PATCH] gnu: home: Add Guix channels service.

[( via Guix-patches via]

LGTM, except a few typos:

On Wed Jun 29, 2022 at 10:05 PM BST, Reily Siegel wrote:
> +The @code{(gnu home services guix)} module provides services for
> +user-specific Guix configuraton.
configuraton -> configuration

> +@file{$XGG_CONFIG_HOME/guix/channels.scm}, the file which controlls the
controlls -> controls

> +channels recived on @command{guix pull}. It's associated value is a list
recived -> recieved, and possibly It's -> Its

> +A typical extension for adding a channel might look like this:
> +
> +@lisp
> +(simple-service 'variant-pacakges-service
pacakges -> packages

> +   (description "Manages $XDG_CONFIG_HOME/guix/channels.scm")))
Maybe change this to something like "Manages the per-user Guix channels
specification"?

    -- (