From 83781dda05be56ae7c402eb6c6b582da6fa90bd1 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Sun, 29 Sep 2024 06:38:04 +0200 Subject: refactor(systems): change %suweren-operating-system to plain record --- systems/mcdowell.scm | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'systems/mcdowell.scm') 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* -- cgit v1.2.3