1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 13:10:33 +02:00

home: Define ‘%base-home-services’.

* gnu/home.scm (%base-home-services): New variable.
(<home-environment>)[services]: Change default to ‘%base-home-services’.
* guix/scripts/home/import.scm (manifest+configuration-files->code): Use
‘%base-home-services’ by default.
* tests/home-import.scm (match-home-environment-no-services)
(match-home-environment-transformations)
(match-home-environment-no-services-nor-packages)
(match-home-environment-bash-service)
(match-home-environment-bash-service-with-alias): Adjust accordingly.
* doc/he-config-bare-bones.scm: Use ‘%base-home-services’.
* doc/guix.texi (Declaring the Home Environment): Add index entry for
‘%base-home-services’.

Change-Id: Id95ede62b97a976aad138bfc4b63fc0bdf37c7de
This commit is contained in:
Ludovic Courtès
2024-12-13 23:37:03 +01:00
parent f68060a101
commit 0aa45f1854
5 changed files with 50 additions and 37 deletions

View File

@@ -115,7 +115,7 @@ corresponding file."
('specifications->packages
('list "guile@2.0.9" "gcc:lib" "glibc@2.19")))
('services
('list)))))
('append ('list) '%base-home-services)))))
(define-home-environment-matcher match-home-environment-transformations
('begin
@@ -131,7 +131,7 @@ corresponding file."
('list (transform ('specification->package "guile@2.0.9"))
('list ('specification->package "gcc") "lib")
('specification->package "glibc@2.19")))
('services ('list)))))
('services ('append ('list) '%base-home-services)))))
(define-home-environment-matcher match-home-environment-no-services-nor-packages
('begin
@@ -143,7 +143,7 @@ corresponding file."
('packages
('specifications->packages ('list)))
('services
('list)))))
('append ('list) '%base-home-services)))))
(define-home-environment-matcher match-home-environment-bash-service
('begin
@@ -157,13 +157,14 @@ corresponding file."
('packages
('specifications->packages ('list)))
('services
('list ('service
'home-bash-service-type
('home-bash-configuration
('aliases ('quote ()))
('bashrc
('list ('local-file "/tmp/guix-config/.bashrc"
"bashrc"))))))))))
(append ('list ('service
'home-bash-service-type
('home-bash-configuration
('aliases ('quote ()))
('bashrc
('list ('local-file "/tmp/guix-config/.bashrc"
"bashrc"))))))
'%base-home-services)))))
(define-home-environment-matcher match-home-environment-bash-service-with-alias
('begin
@@ -177,15 +178,16 @@ corresponding file."
('packages
('specifications->packages ('list)))
('services
('list ('service
'home-bash-service-type
('home-bash-configuration
('aliases
('quote (("grep" . "grep --exclude-from=\"$HOME/.grep-exclude\"")
("ls" . "ls -p"))))
('bashrc
('list ('local-file "/tmp/guix-config/.bashrc"
"bashrc"))))))))))
('append ('list ('service
'home-bash-service-type
('home-bash-configuration
('aliases
('quote (("grep" . "grep --exclude-from=\"$HOME/.grep-exclude\"")
("ls" . "ls -p"))))
('bashrc
('list ('local-file "/tmp/guix-config/.bashrc"
"bashrc"))))))
'%base-home-services)))))
(test-assert "manifest->code: No services"