From 6c46dcc7b514ab20d2edd04bfa860a8ba7f01808 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Mon, 21 Oct 2024 06:53:34 +0200 Subject: refactor(suweren): consolidate the configuration of guix in a single source --- suweren/services.scm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'suweren/services.scm') diff --git a/suweren/services.scm b/suweren/services.scm index faa8036..2809da0 100644 --- a/suweren/services.scm +++ b/suweren/services.scm @@ -9,19 +9,13 @@ #:use-module (gnu services sound) #:use-module (gnu services syncthing) #:use-module (gnu services xorg) - #:use-module (services guix channels) - #:use-module (services nonguix substitute) #:use-module (services plasma-desktop) #:use-module (suweren services desktop) + #:use-module ((suweren system) + #:prefix suweren-system:) #:use-module (suweren trezor) ; trezor-bridge #:use-module (upstream services nbfc)) -(define (guix-options configuration-record) - (let ((extra-options (list "--gc-keep-derivations=yes" - "--gc-keep-outputs=yes"))) - (guix-configuration (inherit configuration-record) - (extra-options extra-options)))) - (define-public %distribution-services (let* ((cups-configuration* (cups-configuration (web-interface? #t))) (nbfc-configuration* (nbfc-configuration (model "Acer Nitro AN515-43"))) @@ -33,15 +27,9 @@ (%desktop-services* (modify-services %desktop-services (delete gdm-service-type) (delete pulseaudio-service-type) - (guix-service-type configuration - => - (guix-options configuration)) - (guix-service-type configuration - => - (channels configuration)) - (guix-service-type configuration - => - (nonguix-substitute configuration)))) + (guix-service-type configuration + => + (suweren-system:guix configuration)))) (nbfc-service (service nbfc-service-type nbfc-configuration*)) (plasma-desktop-service (service plasma-desktop-service-type)) -- cgit v1.2.3