tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

installer: system-services->configuration: Simplify returning sexp.

Browse Source 
* gnu/installer/services.scm (system-services->configuration): Simplify
returning sexp to improve readability.

Change-Id: I02a91523bcf4af1b6fe6476ab2f0e390559a8457
This commit is contained in:
Hilton Chain
2026-01-16 23:56:20 +08:00
parent 4c98911039
commit 50203e4181
1 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
gnu/installer/services.scm
View File

@@ -243,44 +243,32 @@
;; under their own account: use 'guix search KEYWORD' to search
;; for packages and 'guix install PACKAGE' to install a package.\n")))))
(if (null? snippets)
`(,@(if (null? packages)
(if (target-hurd?)
`(,@package-heading
(packages %base-packages/hurd))
'())
`(,@(if (null? packages)
(if (target-hurd?)
`(,@package-heading
(packages (append (list ,@packages)
,(if (target-hurd?)
'%base-packages/hurd
'%base-packages)))))
(packages %base-packages/hurd))
'())
`(,@package-heading
(packages (append (list ,@packages)
,(if (target-hurd?)
'%base-packages/hurd
'%base-packages)))))
,@service-heading
(services ,services))
`(,@(if (null? packages)
(if (target-hurd?)
`(,@package-heading
(packages %base-packages/hurd))
'())
`(,@package-heading
(packages (append (list ,@packages)
,(if (target-hurd?)
'%base-packages/hurd
'%base-packages)))))
,@service-heading
,(if (null? snippets)
`(services ,services)
`(services
(append (list ,@snippets
,@service-heading
(services (append (list ,@snippets
,@(if desktop?
;; XXX: Assume 'keyboard-layout' is in scope.
`((set-xorg-configuration
(xorg-configuration
(keyboard-layout keyboard-layout))))
'()))
,@(if desktop?
;; XXX: Assume 'keyboard-layout' is in
;; scope.
`((set-xorg-configuration
(xorg-configuration
(keyboard-layout keyboard-layout))))
'()))
,(vertical-space 1)
,(comment (G_ "\
,(vertical-space 1)
,(comment (G_ "\
;; This is the default list of services we
;; are appending to.\n"))
,services))))))
,services))))))