diff options
Diffstat (limited to 'gnu/home/services')
| -rw-r--r-- | gnu/home/services/guix.scm | 44 | ||||
| -rw-r--r-- | gnu/home/services/shells.scm | 23 |
2 files changed, 51 insertions, 16 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 <[email protected]> +;;; +;;; 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..172e58a9ff 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -111,16 +111,7 @@ service type can be extended with a list of file-like objects."))) (define (serialize-boolean field-name val) "") (define (serialize-posix-env-vars field-name val) - #~(string-append - #$@(map - (match-lambda - ((key . #f) - "") - ((key . #t) - #~(string-append "export " #$key "\n")) - ((key . value) - #~(string-append "export " #$key "=" #$value "\n"))) - val))) + (environment-variable-shell-definitions val)) ;;; @@ -192,9 +183,9 @@ another process for example).")) (mixed-text-file "zprofile" "\ -# Setups system and user profiles and related variables +# Set up the system, user profile, and related variables. source /etc/profile -# Setups home environment profile +# Set up the home environment profile. source ~/.profile # It's only necessary if zsh is a login shell, otherwise profiles will @@ -443,9 +434,9 @@ alias grep='grep --color=auto'\n") ,(mixed-text-file "bash_profile" "\ -# Setups system and user profiles and related variables +# Set up the system, user profile, and related variables. # /etc/profile will be sourced by bash automatically -# Setups home environment profile +# Set up the home environment profile. if [ -f ~/.profile ]; then source ~/.profile; fi # Honor per-interactive-shell startup file @@ -555,9 +546,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 |