From fde38d60a5dfd4e70f8d4d4883698ee0fca5f12c Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Sun, 29 Sep 2024 08:53:29 +0200 Subject: refactor(mcdowell): adjust operating-system fields --- systems/mcdowell.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'systems/mcdowell.scm') diff --git a/systems/mcdowell.scm b/systems/mcdowell.scm index 9322c20..df54eec 100644 --- a/systems/mcdowell.scm +++ b/systems/mcdowell.scm @@ -25,7 +25,8 @@ ;; record operating-system (define (operating-system*) - (use-modules (suweren system)) + (use-modules (machines portable-bios) + (suweren system)) (let* ((home-environments `((,uid1000-name ,(uid1000-home-environment host-name*)))) (guix-home (service guix-home-service-type @@ -39,17 +40,17 @@ ((@ (gnu system) operating-system) (inherit %suweren-operating-system) (kernel kernel*) - (bootloader-configuration* keyboard-layout*) - keyboard-layout* - initrd* - firmware* - host-name* - (file-systems* host-name*) - (swap-devices* host-name*) - users* - timezone* + (bootloader (bootloader-configuration* keyboard-layout*)) + (keyboard-layout keyboard-layout*) + (initrd initrd*) + (firmware firmware*) + (host-name host-name*) + (file-systems (file-systems* host-name*)) + (swap-devices (swap-devices* host-name*)) + (users users*) + (timezone timezone*) ;; locale* - services*))) + (services services*)))) (define-public operating-system* (operating-system*)) -- cgit v1.2.3