refactor(mcdowell): adjust operating-system fields

1 files changed, 12 insertions, 11 deletions

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*))