From 8dc2cf440a7309fc0f08297e9cddd42fa4b8b014 Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marek@marekpasnikowski.pl>
Date: Sun, 13 Oct 2024 17:50:32 +0200
Subject: refactor(mcdowell): modernize module imports for operating-system*

---
 systems/mcdowell.scm | 49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

(limited to 'systems')

diff --git a/systems/mcdowell.scm b/systems/mcdowell.scm
index 92df5a7..fb9542f 100644
--- a/systems/mcdowell.scm
+++ b/systems/mcdowell.scm
@@ -55,31 +55,30 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define (operating-system*)
-  (use-modules (gnu system)
-               (machines amd64)
-	       (suweren system))
-  ((@ (gnu system) operating-system)
-   (kernel kernel-amd64)
-   (kernel-loadable-modules (list))
-   (kernel-arguments %default-kernel-arguments)
-   (hurd #f)
-   (bootloader bootloader-mcdowell)
-   (keyboard-layout keyboard-layout-mcdowell)
-   (initrd initrd*)
-   (firmware firmware*)
-   (host-name host-name*)
-   (file-systems (file-systems* host-name*))
-   (swap-devices (swap-devices* host-name*))
-   (users (users-mcdowell))
-   (timezone "Europe/Warsaw")
-   ;; locale*
-   (services services-mcdowell)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define-public operating-system*
-  (operating-system*))
+(define operating-system*
+  (let
+      ((%default-kernel-arguments (@ (gnu system) %default-kernel-arguments))
+       (file-systems* (@ (machines amd64) file-systems*))
+       (firmware* (@ (machines amd64) firmware*))
+       (initrd* (@ (machines amd64) initrd*))
+       (kernel-amd64 (@ (machines amd64) kernel-amd64))
+       (swap-devices* (@ (machines amd64) swap-devices*)))
+    ((@ (gnu system) operating-system)
+     (kernel kernel-amd64)
+     (kernel-loadable-modules (list))
+     (kernel-arguments %default-kernel-arguments)
+     (hurd #f)
+     (bootloader bootloader-mcdowell)
+     (keyboard-layout keyboard-layout-mcdowell)
+     (initrd initrd*)
+     (firmware firmware*)
+     (host-name host-name*)
+     (file-systems (file-systems* host-name*))
+     (swap-devices (swap-devices* host-name*))
+     (users (users-mcdowell))
+     (timezone "Europe/Warsaw")
+     ;; locale*
+     (services services-mcdowell))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-- 
cgit v1.2.3