adapt to the API change in custom-bootloader-configuration

6 files changed, 28 insertions, 19 deletions

diff --git a/deployment/system.scm b/deployment/system.scm
index 4227253..88c05f1 100644
--- a/deployment/system.scm
+++ b/deployment/system.scm
@@ -71,8 +71,6 @@
                 #: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)
@@ -90,7 +88,7 @@
    (kernel-loadable-modules (list))
    (kernel-arguments        gnu:system:%default-kernel-arguments)
    (hurd                    #f)
-   (bootloader              sovereign:devices:amd64:custom-bootloader-configuration)
+   (bootloader              deployment:system:aisaka:bootloader-aisaka)
    (label                   (sovereign:systems:operating-system-label* deployment:system:aisaka:host-name-aisaka
                                                                        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 4ecd374..acde16e 100644
--- a/deployment/system/aisaka.scm
+++ b/deployment/system/aisaka.scm
@@ -19,8 +19,10 @@
 ;;; If not, see <https://www.gnu.org/licenses/>.
 
 (define-module (deployment system aisaka)
-  #:export     (host-name-aisaka)
+  #:export     (bootloader-aisaka
+                host-name-aisaka)
   #:use-module (guix gexp)
+  #:use-module (sovereign devices amd64)
   #:use-module ((deployment gexp)
                 #:prefix deployment:gexp:)
   #:use-module ((gnu bootloader)
@@ -69,8 +71,6 @@
                 #:prefix nongnu:system:linux-initrd:)
   #:use-module ((sovereign devices)
                 #:prefix sovereign:devices:)
-  #:use-module ((sovereign devices amd64)
-                #:prefix sovereign:devices:amd64:)
   #:use-module ((sovereign packages jekyll)
                 #:prefix sovereign:packages:jekyll:)
   #:use-module ((sovereign services)
@@ -322,4 +322,10 @@
 
 (define host-name-aisaka "aisaka")
 
+(define bootloader-configuration-targets-aisaka
+  (list "/dev/nvme0n1"))
+
+(define bootloader-aisaka
+  (custom-bootloader-configuration bootloader-configuration-targets-aisaka))
+
 ;;; EOF
diff --git a/deployment/system/asakura.scm b/deployment/system/asakura.scm
index 7ad954a..bc0e555 100644
--- a/deployment/system/asakura.scm
+++ b/deployment/system/asakura.scm
@@ -19,12 +19,12 @@
 ;;; If not, see <https://www.gnu.org/licenses/>.
 
 (define-module (deployment system asakura)
+  #:use-module (sovereign devices amd64)
   #:use-module ((gnu system)                    #:prefix gnu:system:)
   #:use-module ((gnu system file-systems)       #:prefix gnu:system:file-systems:)
   #:use-module ((gnu system uuid)               #:prefix gnu:system:uuid:)
   #:use-module ((nongnu packages linux)         #: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 protonmail) #:prefix sovereign:packages:protonmail:)
   #:use-module ((sovereign systems)             #:prefix sovereign:systems:)
   #:use-module ((users id1000)                  #:prefix users:id1000:))
@@ -122,7 +122,7 @@
 (define-public system
   (gnu:system:operating-system
    (kernel nongnu:packages:linux:linux)
-   (bootloader sovereign:devices:amd64:custom-bootloader-configuration)
+   (bootloader (custom-bootloader-configuration (list)))
    (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 fcc3980..10418eb 100644
--- a/deployment/system/cokolwiek.scm
+++ b/deployment/system/cokolwiek.scm
@@ -19,6 +19,7 @@
 ;;; If not, see <https://www.gnu.org/licenses/>.
 
 (define-module (deployment system cokolwiek)
+  #:use-module (sovereign devices amd64)
   #:use-module ( (gnu packages package-management)
                  #:prefix gnu:packages:package-management:)
   #:use-module ( (gnu services)
@@ -43,8 +44,6 @@
                  #:prefix sovereign:channels:)
   #:use-module ( (sovereign devices)
                  #:prefix sovereign:devices:)
-  #:use-module ( (sovereign devices amd64)
-                 #:prefix sovereign:devices:amd64:)
   #:use-module ( (sovereign packages protonmail)
                  #:prefix sovereign:packages:protonmail:)
   #:use-module ( (sovereign systems)
@@ -86,7 +85,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)
+      (l-bootloader         (custom-bootloader-configuration (list)))
       (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 e5519bc..0defcb4 100644
--- a/deployment/system/mcdowell.scm
+++ b/deployment/system/mcdowell.scm
@@ -19,6 +19,8 @@
 ;;; If not, see <https://www.gnu.org/licenses/>.
 
 (define-module (deployment system mcdowell)
+  #:use-module (guix gexp)
+  #:use-module (sovereign devices amd64)
   #:use-module ( (deployment gexp)
                  #:prefix deployment:gexp:)
   #:use-module ( (gnu packages package-management)
@@ -45,15 +47,12 @@
                  #:prefix sovereign:channels:)
   #:use-module ( (sovereign devices)
                  #:prefix sovereign:devices:)
-  #:use-module ( (sovereign devices amd64)
-                 #:prefix sovereign:devices:amd64:)
   #:use-module ( (sovereign packages protonmail)
                  #:prefix sovereign:packages:protonmail:)
   #:use-module ( (sovereign systems)
                  #:prefix sovereign:systems:)
   #:use-module ( (users id1000)
-                 #:prefix users:id1000:)
-  #:use-module (guix gexp))
+                 #:prefix users:id1000:))
 
 (define system-name
   "mcdowell")
@@ -100,7 +99,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)
+      (l-bootloader         (custom-bootloader-configuration (list)))
       (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 1daec21..c901cdc 100644
--- a/deployment/system/rakan.scm
+++ b/deployment/system/rakan.scm
@@ -19,7 +19,9 @@
 ;;; If not, see <https://www.gnu.org/licenses/>.
 
 (define-module (deployment system rakan)
+  #:export     (bootloader-configuration-targets-rakan)
   #:use-module (guix gexp)
+  #:use-module (sovereign devices amd64)
   #:use-module ( (deployment gexp)
                  #:prefix deployment:gexp:)
   #:use-module ( (gnu home)
@@ -60,8 +62,6 @@
                  #:prefix rde/gnu:home-services:mail:)
   #:use-module ( (sovereign devices)
                  #:prefix sovereign:devices:)
-  #:use-module ( (sovereign devices amd64)
-                 #:prefix sovereign:devices:amd64:)
   #:use-module ( (sovereign packages emacs)
                  #:prefix sovereign:packages:emacs:)
   #:use-module ( (sovereign packages protonmail)
@@ -226,13 +226,20 @@
 (define-public guix-publish-service
   (sovereign:services:guix-publish-service guix-publish-configuration))
 
+(define bootloader-configuration-targets-rakan
+  (list "/dev/sda"
+        "/dev/nvme0n1"
+        "/dev/nvme1n1"
+        "/dev/nvme2n1"
+        "/dev/nvme3n1"))
+
 (define-public system
   (gnu:system:operating-system
    (kernel                  nongnu:packages:linux:linux)
    (kernel-loadable-modules (list))
    (kernel-arguments        gnu:system:%default-kernel-arguments)
    (hurd                    #f)
-   (bootloader              sovereign:devices:amd64:custom-bootloader-configuration)
+   (bootloader              (custom-bootloader-configuration bootloader-configuration-targets-rakan))
    (label                   (sovereign:systems:operating-system-label* system-name
                                                                        gnu:system:this-operating-system))
    (keyboard-layout         sovereign:devices:pl-keyboard-layout)