diff options
| author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-10-21 06:53:34 +0200 |
|---|---|---|
| committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-10-21 06:53:34 +0200 |
| commit | 6c46dcc7b514ab20d2edd04bfa860a8ba7f01808 (patch) | |
| tree | 5d205b43d5dde1b2f5612cd40dd3461165fb09b9 /suweren | |
| parent | 053308211e587dd3d59409f191c54642efd60c20 (diff) | |
refactor(suweren): consolidate the configuration of guix in a single source
Diffstat (limited to 'suweren')
| -rw-r--r-- | suweren/services.scm | 22 | ||||
| -rw-r--r-- | suweren/system.scm | 2 |
2 files changed, 6 insertions, 18 deletions
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)) diff --git a/suweren/system.scm b/suweren/system.scm index f1fbe40..0bde7cb 100644 --- a/suweren/system.scm +++ b/suweren/system.scm @@ -47,7 +47,7 @@ ;; record guix-configuration -> ;; record guix-configuration -(define (guix configuration) +(define-public (guix configuration) (let* ((deployment-commit "c24ce7cb11e74da13d491f9de3c4b7040a069f43") (distribution-commit "7d17bded11ef1239592e6e5abd40ceee1e99cbb8") (marekpasnikowski-fingerprint |