diff options
| -rw-r--r-- | deployment/systems/aisaka.scm | 2 | ||||
| -rw-r--r-- | deployment/systems/akashi.scm | 7 | ||||
| -rw-r--r-- | deployment/systems/ayase.scm | 2 | ||||
| -rw-r--r-- | deployment/systems/mcdowell.scm | 13 |
4 files changed, 12 insertions, 12 deletions
diff --git a/deployment/systems/aisaka.scm b/deployment/systems/aisaka.scm index fa76904..c5c687c 100644 --- a/deployment/systems/aisaka.scm +++ b/deployment/systems/aisaka.scm @@ -404,6 +404,8 @@ (define-public system (gnu:system:operating-system (bootloader system-bootloader) + (label (sovereign:systems:operating-system-label* system-name + (gnu:system:operating-system-default-label gnu:system:this-operating-system))) (kernel nongnu:packages:linux:linux) (keyboard-layout system-keyboard-layout) (initrd nongnu:system:linux-initrd:microcode-initrd) diff --git a/deployment/systems/akashi.scm b/deployment/systems/akashi.scm index 97f0681..dc0545f 100644 --- a/deployment/systems/akashi.scm +++ b/deployment/systems/akashi.scm @@ -4,6 +4,7 @@ (define-module (deployment systems akashi) #:use-module ((gnu packages linux) #:prefix gnu:packages:linux:) #:use-module ((gnu services guix) #:prefix gnu:services:guix:) + #:use-module ((gnu system) #:prefix gnu:system:) #:use-module ((machines thinkpad-x200) #:prefix machines:thinkpad-x200:) #:use-module ((sovereign systems) #:prefix sovereign:systems:) #:use-module (users id1000)) @@ -47,10 +48,12 @@ (define-public operating-system* (let* ((patter-placeholder #f) - (timezone* "Europe/Warsaw")) - ((@ (gnu system) operating-system) + (timezone* "Europe/Warsaw")) + (gnu:system:operating-system (kernel gnu:packages:linux:linux-libre) (bootloader (machines:thinkpad-x200:bootloader-configuration* keyboard-layout*)) + (label (sovereign:systems:operating-system-label* host-name* + (gnu:system:operating-system-default-label gnu:system:this-operating-system))) (keyboard-layout keyboard-layout*) (host-name host-name*) (file-systems (file-systems)) diff --git a/deployment/systems/ayase.scm b/deployment/systems/ayase.scm index 1af9017..9606c7b 100644 --- a/deployment/systems/ayase.scm +++ b/deployment/systems/ayase.scm @@ -122,6 +122,8 @@ (gnu:system:operating-system (kernel nongnu:packages:linux:linux) (bootloader (bootloader)) + (label (sovereign:systems:operating-system-label* host-name + (gnu:system:operating-system-default-label gnu:system:this-operating-system))) (keyboard-layout keyboard-layout) (initrd nongnu:system:linux-initrd:microcode-initrd) (firmware (list nongnu:packages:linux:linux-firmware)) 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) |