Merge branch 'master' into staging

2 files changed, 46 insertions, 2 deletions

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/home/services/shells.scm b/gnu/home/services/shells.scm
index fd5a66090d..dda80736b1 100644
--- a/gnu/home/services/shells.scm
+++ b/gnu/home/services/shells.scm
@@ -555,9 +555,9 @@ with text blocks from other extensions and the base service."))
                ((key . #f)
                 "")
                ((key . #t)
-                #~(string-append "set " #$key "\n"))
+                #~(string-append "set -x " #$key "\n"))
                ((key . value)
-                #~(string-append "set " #$key " "  #$value "\n")))
+                #~(string-append "set -x " #$key " "  #$value "\n")))
              val)))
 
 (define-configuration home-fish-configuration