refactor(mcdowell): make the system build after other refactors

1 files changed, 54 insertions, 41 deletions

diff --git a/systems/mcdowell.scm b/systems/mcdowell.scm
index 8b9d3ad..c7a418d 100644
--- a/systems/mcdowell.scm
+++ b/systems/mcdowell.scm
@@ -15,44 +15,57 @@
 					; uid1000-name
   )
 
-;; ;; string
-;; (define host-name*
-;;   "mcdowell")
-
-;; ;; (record user-account)
-;; (define users*
-;;   (list uid1000-account))
-
-;; ;; record operating-system
-;; (define (operating-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
-;; 			     home-environments))
-
-;; 	 (keyboard-layout* (keyboard-layout "pl"))
-;; 	 (services* (list guix-home))
-;; 	 (timezone* "Europe/Warsaw")
-;; 	 ;; (locale* "en_US.utf8")
-;; 	 )
-;;     ((@ (gnu system) operating-system)
-;;      (inherit %suweren-operating-system)
-;;      (kernel kernel*)
-;;      (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*))))
-
-;; (define-public operating-system*
-;;   (operating-system*))
-
-;; operating-system*
+;; string
+(define host-name*
+  "mcdowell")
+
+;; (record user-account)
+(define users*
+  (list uid1000-account))
+
+;;;???????????????????????????????????????????????????????????????????
+
+(define home-environments
+  `((,uid1000-name ,(uid1000-home-environment host-name*))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(define (desktop-services-mcdowell)
+  (use-modules (suweren system))
+  %suweren-services)
+
+(define guix-home
+  (service guix-home-service-type
+           home-environments))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(define services-mcdowell
+  (append (desktop-services-mcdowell)
+          (list guix-home)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(define (operating-system*)
+  (use-modules (machines portable-bios)
+	       (suweren system))
+  (let* ((keyboard-layout* (keyboard-layout "pl"))
+	 (timezone* "Europe/Warsaw"))
+    ((@ (gnu system) operating-system)
+     (kernel kernel*)
+     (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-mcdowell))))
+
+(define-public operating-system*
+  (operating-system*))
+
+operating-system*