refactor(systems): change %suweren-operating-system to plain record

3 files changed, 22 insertions, 82 deletions

diff --git a/systems/aisaka.scm b/systems/aisaka.scm
deleted file mode 100644
index e30fece..0000000
--- a/systems/aisaka.scm
+++ /dev/null
@@ -1,68 +0,0 @@
-(define-module (systems aisaka)
-  ;; service
-  #:use-module (gnu services)
-
-  ;; guix-home-service-type
-  #:use-module (gnu services guix)
-
-  ;; keyboard-layout
-  #:use-module (gnu system keyboard)
-
-  ;; bootloader-configuration*
-  ;; file-systems*
-  ;; firmware*
-  ;; hardware-groups
-  ;; initrd*
-  ;; kernel*
-  ;; swap-devices*
-  #:use-module (machines inspiron)
-
-  ;; %suweren-operating-system
-  #:use-module (suweren system)
-
-  ;; uid1000-account
-  ;; uid1000-home-environment
-  ;; uid1000-name
-  #:use-module (users id1000)
-
-  ;; uid1001-account
-  ;; uid1001-home-environment
-  ;; uid1001-name
-  #:use-module (users id1001))
-
-;; string
-(define host-name*
-  "aisaka")
-
-;; (record user-account)
-(define users*
-  (list uid1000-account
-	uid1001-account))
-
-;; record operating-system
-(define-public operating-system*
-  (let* ((home-environments `((,uid1000-name ,(uid1000-home-environment host-name*))
-			      (,uid1001-name ,(uid1001-home-environment host-name*))))
-
-	 (guix-home (service guix-home-service-type
-			     home-environments))
-
-	 (keyboard-layout* (keyboard-layout "pl"))
-	 (services* (list guix-home))
-	 (timezone* "Europe/Warsaw")
-	 ;; (locale* "en_US.utf8")
-	 )
-    (%suweren-operating-system kernel*
-			       (bootloader-configuration* keyboard-layout*)
-			       keyboard-layout*
-			       initrd*
-			       firmware*
-			       host-name*
-			       (file-systems* host-name*)
-			       (swap-devices* host-name*)
-			       users*
-			       timezone*
-			       ;; locale*
-			       services*)))
-
-operating-system*
diff --git a/systems/akashi.scm b/systems/akashi.scm
index 7239af1..67d80a0 100644
--- a/systems/akashi.scm
+++ b/systems/akashi.scm
@@ -10,6 +10,7 @@
 (define (operating-system*)
   (use-modules (gnu services guix)
 	       (machines thinkpad-x200)
+	       (suweren system)
 	       (users id1000))
   (let* ((home-environments `((,uid1000-name ,(uid1000-home-environment host-name*))))
 
@@ -24,7 +25,8 @@
 			   'adb-udev
 			   (@ (gnu packages android) android-udev-rules))))
 	 (timezone* "Europe/Warsaw"))
-    ((@ (suweren system) %suweren-operating-system)
+    ((@ (gnu system) operating-system)
+     (inherit %suweren-operating-system)
      kernel*
      (bootloader-configuration* keyboard-layout)
      keyboard-layout
diff --git a/systems/mcdowell.scm b/systems/mcdowell.scm
index 98c3b38..2641be5 100644
--- a/systems/mcdowell.scm
+++ b/systems/mcdowell.scm
@@ -24,7 +24,8 @@
   (list uid1000-account))
 
 ;; record operating-system
-(define-public operating-system*
+(define (operating-system*)
+  (use-modules (suweren system))
   (let* ((home-environments `((,uid1000-name ,(uid1000-home-environment host-name*))))
 
 	 (guix-home (service guix-home-service-type
@@ -35,17 +36,22 @@
 	 (timezone* "Europe/Warsaw")
 	 ;; (locale* "en_US.utf8")
 	 )
-    (%suweren-operating-system kernel*
-			       (bootloader-configuration* keyboard-layout*)
-			       keyboard-layout*
-			       initrd*
-			       firmware*
-			       host-name*
-			       (file-systems* host-name*)
-			       (swap-devices* host-name*)
-			       users*
-			       timezone*
-			       ;; locale*
-			       services*)))
+    ((@ (gnu system) operating-system)
+     (inherit %suweren-operating-system)
+     kernel*
+     (bootloader-configuration* keyboard-layout*)
+     keyboard-layout*
+     initrd*
+     firmware*
+     host-name*
+     (file-systems* host-name*)
+     (swap-devices* host-name*)
+     users*
+     timezone*
+     ;; locale*
+     services*)))
+
+(define-public operating-system*
+  (operating-system*))
 
 operating-system*