guixsd-config

commit 687f762e54407f6eaa2be2d1c61df60d4ea7aac0
parent 7d361cfaf26d9f622fdfdd50aa8e2ac5e64134e4
Author: Vineet Kumar <git@vineetk.net>
Date:   Wed, 21 Jan 2026 01:19:18 -0500

saklas: didn't realize it wasn't uefi

Diffstat:
M
epistemia/bootloader.scm
 | 
23
++++++++++++++++++++---
M
epistemia/systems/saklas.scm
 | 
33
+++++++++------------------------

2 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/epistemia/bootloader.scm b/epistemia/bootloader.scm
@@ -3,10 +3,9 @@
   #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (gnu bootloader)
-  #:use-module (gnu bootloader grub)
-  #:export (grub-zfs))
+  #:use-module (gnu bootloader grub))
 
-(define grub-zfs
+(define-public grub-zfs
   (bootloader
     (inherit grub-efi-bootloader)
     (name 'grub-zfs)
@@ -22,3 +21,21 @@
               "set root=(hd0,gpt2)")
              ((" /store/") 
               " /gnu/@/store/")))))))
+
+;; TODO combine into previous with an argument?
+(define-public grub-zfs-bios
+  (bootloader
+    (inherit grub-bootloader)
+    (name 'grub-zfs)
+    (installer
+     #~(lambda (bootloader targets mount-point)
+         (use-modules (guix build utils))
+         (let ((standard-installer #$(bootloader-installer grub-bootloader)))
+           (standard-installer bootloader targets mount-point))
+         (let ((grub-cfg (string-append mount-point "/boot/grub/grub.cfg")))
+           (chmod grub-cfg #o644)
+           (substitute* grub-cfg
+             (("search --label --set [^ ]+")
+              "set root=(hd0,gpt2)")
+             ((" /store/")
+              " /gnu/@/store/")))))))
diff --git a/epistemia/systems/saklas.scm b/epistemia/systems/saklas.scm
@@ -58,11 +58,11 @@
   (firmware (cons* amdgpu-firmware %base-firmware))
 
   (bootloader (bootloader-configuration
-		(bootloader grub-zfs)
-		(targets '("/boot/efi1"
-			   "/boot/efi2"
-			   "/boot/efi3"
-			   "/boot/efi4"))))
+		(bootloader grub-zfs-bios)
+		(targets '("/dev/sda"
+			   "/dev/sdb"
+			   "/dev/sdc"
+			   "/dev/sdd"))))
 
   (file-systems (append
                  (list (file-system
@@ -88,23 +88,7 @@
 			 (mount-point "/home")
 			 (type "zfs")
 			 (check? #f)
-			 (needed-for-boot? #t))
-                       (file-system
-			 (device (uuid "F618-FA9F" 'fat))
-			 (mount-point "/boot/efi1")
-			 (type "vfat"))
-		       (file-system
-			 (device (uuid "F618-FA9F" 'fat))
-			 (mount-point "/boot/efi2")
-			 (type "vfat"))
-		       (file-system
-			 (device (uuid "F618-FA9F" 'fat))
-			 (mount-point "/boot/efi3")
-			 (type "vfat"))
-		       (file-system
-			 (device (uuid "F618-FA9F" 'fat))
-			 (mount-point "/boot/efi4")
-			 (type "vfat")))
+			 (needed-for-boot? #t)))
                  %base-file-systems))
 
   (packages (append (list emacs-no-x
@@ -112,7 +96,7 @@
 			  zfs-linux)
                     %base-packages))
 
-  (services (list (simple-service 'zfs-loader
+  (services (append (list (simple-service 'zfs-loader
 				  kernel-module-loader-service-type
 				  '("zfs"))
 		  (simple-service 'zfs-shepherd-services
@@ -229,4 +213,5 @@ rpz:
 			       (nginx-reverse-proxy "searx.demiurge.epistemia" 8081)
 			       (nginx-reverse-proxy "redlib.demiurge.epistemia" 8085)
 			       (nginx-reverse-proxy "navidrome.demiurge.epistemia" 4533)
-			       (nginx-reverse-proxy "sdui.demiurge.epistemia" 5000))))))))
+			       (nginx-reverse-proxy "sdui.demiurge.epistemia" 5000))))))
+		    %base-services)))