From 8aa6f8289b2ca2e88dab5d733b5508feca48eae6 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Mon, 7 Jul 2025 12:27:24 +0200 Subject: systems: standardise label creation All operating-system records are configured to prepend default labels with respective host names. ----- Some minor adaptations had to performed. --- deployment/systems/mcdowell.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'deployment/systems/mcdowell.scm') diff --git a/deployment/systems/mcdowell.scm b/deployment/systems/mcdowell.scm index 3328dd8..3bcf592 100644 --- a/deployment/systems/mcdowell.scm +++ b/deployment/systems/mcdowell.scm @@ -44,7 +44,7 @@ (inherit sovereign:devices:swap/no-trim) (target l-target)))) -(define system-bootstrap +(define system (let* ( (l-guix-homes (list users:id1000:name/home-environment)) (l-guix-home-service (sovereign:systems:guix-home-service l-guix-homes)) @@ -65,6 +65,8 @@ (gnu:system:operating-system (kernel nongnu:packages:linux:linux) (bootloader l-bootloader) + (label (sovereign:systems:operating-system-label* system-name + (gnu:system:operating-system-default-label gnu:system:this-operating-system))) (keyboard-layout sovereign:devices:pl-keyboard-layout) (initrd nongnu:system:linux-initrd:microcode-initrd) (initrd-modules l-initrd-modules) @@ -79,14 +81,5 @@ (services l-services) (sudoers-file sovereign:systems:%sovereign-sudoers-specification)))) -(define-public system - (let* - ( (bootstrap-label (gnu:system:operating-system-label system-bootstrap)) - (l-label (sovereign:systems:operating-system-label* system-name - bootstrap-label))) - (gnu:system:operating-system - (inherit system-bootstrap) - (label l-label)))) - (define-public operating-system* system) -- cgit v1.2.3