From ceb5285f06b1ecab4efa9b99cb2d51bbd1c08f03 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Sat, 11 Feb 2023 21:26:33 +0100 Subject: Construct the list of system services with append instead of cons* --- aisaka.org | 25 ++++++++++++------------ system-configuration.scm | 49 ++++++++++++++++++++++++------------------------ 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/aisaka.org b/aisaka.org index 806e1a0..eabf7a7 100644 --- a/aisaka.org +++ b/aisaka.org @@ -75,18 +75,19 @@ https://guix.gnu.org/en/manual/en/html_node/Services.html #+begin_src scheme :noweb-ref system-services (services - (cons* - <> - <> - (service cups-service-type - (cups-configuration (extensions `(,cups-filters - ,epson-inkjet-printer-escpr)) - (web-interface? #t))) - (service git-daemon-service-type) - (service gnome-desktop-service-type) - (service tor-service-type (tor-configuration - (control-socket? #t))) - <> + (append + (list + <> + <> + (service cups-service-type + (cups-configuration (extensions `(,cups-filters + ,epson-inkjet-printer-escpr)) + (web-interface? #t))) + (service git-daemon-service-type) + (service gnome-desktop-service-type) + (service tor-service-type (tor-configuration + (control-socket? #t))) + <>) (modify-services %desktop-services (elogind-service-type configuration => diff --git a/system-configuration.scm b/system-configuration.scm index f29ac61..f1bec80 100644 --- a/system-configuration.scm +++ b/system-configuration.scm @@ -40,30 +40,31 @@ "ntfs-3g")) %base-packages)) (services - (cons* - (service openssh-service-type) - (service - (service-type - (name 'trezor-system-packages) - (extensions - (list - (service-extension profile-service-type - (lambda (_) - (map specification->package - (list - "trezord" - "trezord-udev-rules")))))) - (description "TrezorD packages needed by the system.") - (default-value #f))) - (service cups-service-type - (cups-configuration (extensions `(,cups-filters - ,epson-inkjet-printer-escpr)) - (web-interface? #t))) - (service git-daemon-service-type) - (service gnome-desktop-service-type) - (service tor-service-type (tor-configuration - (control-socket? #t))) - (udev-rules-service 'trezord trezord-udev-rules) + (append + (list + (service openssh-service-type) + (service + (service-type + (name 'trezor-system-packages) + (extensions + (list + (service-extension profile-service-type + (lambda (_) + (map specification->package + (list + "trezord" + "trezord-udev-rules")))))) + (description "TrezorD packages needed by the system.") + (default-value #f))) + (service cups-service-type + (cups-configuration (extensions `(,cups-filters + ,epson-inkjet-printer-escpr)) + (web-interface? #t))) + (service git-daemon-service-type) + (service gnome-desktop-service-type) + (service tor-service-type (tor-configuration + (control-socket? #t))) + (udev-rules-service 'trezord trezord-udev-rules)) (modify-services %desktop-services (elogind-service-type configuration => -- cgit v1.2.3