summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--deployment/system.scm4
-rw-r--r--deployment/system/aisaka.scm2
-rw-r--r--deployment/system/asakura.scm9
-rw-r--r--deployment/system/cokolwiek.scm4
-rw-r--r--deployment/system/mcdowell.scm4
-rw-r--r--deployment/system/rakan.scm4
6 files changed, 11 insertions, 16 deletions
diff --git a/deployment/system.scm b/deployment/system.scm
index b6a9771..3d36d8c 100644
--- a/deployment/system.scm
+++ b/deployment/system.scm
@@ -69,6 +69,8 @@
#:prefix nongnu:packages:linux:)
#:use-module ((nongnu system linux-initrd)
#:prefix nongnu:system:linux-initrd:)
+ #:use-module ((sovereign devices amd64)
+ #:prefix sovereign:devices:amd64:)
#:use-module ((sovereign packages jekyll)
#:prefix sovereign:packages:jekyll:)
#:use-module ((sovereign services)
@@ -86,7 +88,7 @@
(kernel-loadable-modules (list))
(kernel-arguments gnu:system:%default-kernel-arguments)
(hurd #f)
- (bootloader deployment:system:aisaka:system-bootloader)
+ (bootloader sovereign:devices:amd64:custom-bootloader-configuration)
(label (sovereign:systems:operating-system-label* deployment:system:aisaka:system-name
gnu:system:this-operating-system))
(keyboard-layout deployment:system:aisaka:system-keyboard-layout)
diff --git a/deployment/system/aisaka.scm b/deployment/system/aisaka.scm
index 78b35ea..49d28a3 100644
--- a/deployment/system/aisaka.scm
+++ b/deployment/system/aisaka.scm
@@ -114,7 +114,7 @@
(define-public file-system-efi
(gnu:system:file-systems:file-system
- (device (gnu:system:file-systems:file-system-label "AISAKA"))
+ (device (gnu:system:file-systems:file-system-label "BOOT"))
(mount-point "/boot")
(type "vfat")
(flags (list))
diff --git a/deployment/system/asakura.scm b/deployment/system/asakura.scm
index 3a253ec..7ad954a 100644
--- a/deployment/system/asakura.scm
+++ b/deployment/system/asakura.scm
@@ -92,13 +92,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define (bootloader)
- (use-modules (gnu bootloader grub))
- ((@ (gnu bootloader) bootloader-configuration)
- (bootloader grub-efi-bootloader)
- (targets (list "/boot"))
- (keyboard-layout keyboard-layout)))
-
(define (file-systems)
(append gnu:system:file-systems:%base-file-systems
(list root-partition
@@ -129,7 +122,7 @@
(define-public system
(gnu:system:operating-system
(kernel nongnu:packages:linux:linux)
- (bootloader (bootloader))
+ (bootloader sovereign:devices:amd64:custom-bootloader-configuration)
(label (sovereign:systems:operating-system-label* host-name
gnu:system:this-operating-system))
(keyboard-layout keyboard-layout)
diff --git a/deployment/system/cokolwiek.scm b/deployment/system/cokolwiek.scm
index f5015c5..fcc3980 100644
--- a/deployment/system/cokolwiek.scm
+++ b/deployment/system/cokolwiek.scm
@@ -60,7 +60,7 @@
(define file-system-efi
(let*
( (l-system-name (string-upcase system-name))
- (l-device (sovereign:devices:file-system-label l-system-name)))
+ (l-device (sovereign:devices:file-system-label "BOOT")))
(gnu:system:file-systems:file-system
(inherit sovereign:devices:file-system/efi)
(device l-device))))
@@ -86,7 +86,7 @@
( (l-guix-homes (list users:id1000:named-home-environment
users:id1001:named-home-environment))
(l-guix-home-service (sovereign:systems:guix-home-service l-guix-homes))
- (l-bootloader (sovereign:devices:amd64:custom-bootloader-configuration system-name))
+ (l-bootloader sovereign:devices:amd64:custom-bootloader-configuration)
(l-file-systems (cons* file-system-root
file-system-efi
gnu:system:file-systems:%base-file-systems))
diff --git a/deployment/system/mcdowell.scm b/deployment/system/mcdowell.scm
index 3627ec1..e5519bc 100644
--- a/deployment/system/mcdowell.scm
+++ b/deployment/system/mcdowell.scm
@@ -61,7 +61,7 @@
(define file-system-efi
(let*
( (l-system-name (string-upcase system-name))
- (l-device (sovereign:devices:file-system-label l-system-name)))
+ (l-device (sovereign:devices:file-system-label "BOOT")))
(gnu:system:file-systems:file-system
(inherit sovereign:devices:file-system/efi)
(device l-device))))
@@ -100,7 +100,7 @@
(let*
( (l-guix-homes (list users:id1000:named-home-environment))
(l-guix-home-service (sovereign:systems:guix-home-service l-guix-homes))
- (l-bootloader (sovereign:devices:amd64:custom-bootloader-configuration system-name))
+ (l-bootloader sovereign:devices:amd64:custom-bootloader-configuration)
(l-file-systems (cons* file-system-root
file-system-efi
gnu:system:file-systems:%base-file-systems))
diff --git a/deployment/system/rakan.scm b/deployment/system/rakan.scm
index 0fb9f00..1daec21 100644
--- a/deployment/system/rakan.scm
+++ b/deployment/system/rakan.scm
@@ -79,7 +79,7 @@
(define file-system-efi
(let*
( (l-system-name (string-upcase system-name))
- (l-device (sovereign:devices:file-system-label l-system-name)))
+ (l-device (sovereign:devices:file-system-label "BOOT")))
(gnu:system:file-systems:file-system
(inherit sovereign:devices:file-system/efi)
(device l-device))))
@@ -232,7 +232,7 @@
(kernel-loadable-modules (list))
(kernel-arguments gnu:system:%default-kernel-arguments)
(hurd #f)
- (bootloader (sovereign:devices:amd64:custom-bootloader-configuration system-name))
+ (bootloader sovereign:devices:amd64:custom-bootloader-configuration)
(label (sovereign:systems:operating-system-label* system-name
gnu:system:this-operating-system))
(keyboard-layout sovereign:devices:pl-keyboard-layout)
generated by cgit v1.3 (git 2.53.0) at 2026-05-18 18:12:26 +0000