guixsd-config

commit ab121cf5645f5a6bd7639cc95fe13abfa2dcec2a
parent 2a23b197db93ad24aa987a5a92eb691b9dd0fe13
Author: vin <git@vineetk.net>
Date:   Sun, 21 Dec 2025 21:52:38 -0500

update custom initrd

Diffstat:
M
epistemia/systems/install-iso.scm
 | 
9
++-------
M
epistemia/systems/linux-initrd.scm
 | 
10
++--------

2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/epistemia/systems/install-iso.scm b/epistemia/systems/install-iso.scm
@@ -2,20 +2,15 @@
   #:use-module (gnu)
   #:use-module (gnu system install)
   #:use-module (gnu packages file-systems)
-  #:use-module (nongnu packages linux) ;; Provides linux-6.16
-  #:use-module (epistemia packages zfs) ;; Provides zfs-linux
+  #:use-module (nongnu packages linux)
+  #:use-module (epistemia packages zfs)
   #:export (zfs-installation-os))
 
 (define zfs-installation-os
   (operating-system
     (inherit installation-os)
-    ;; 1. Use the specific kernel you require
     (kernel linux-6.17)
-    
-    ;; 2. Ensure ZFS modules are loadable in the live environment
     (kernel-loadable-modules (list (list zfs-linux "module")))
-
-    ;; 3. Add userspace tools (zpool/zfs) to the live environment
     (packages (append (list zfs-linux)
                       (operating-system-packages installation-os)))))
 
diff --git a/epistemia/systems/linux-initrd.scm b/epistemia/systems/linux-initrd.scm
@@ -1,7 +1,6 @@
 ;;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;; Adapted from GNU Guix gnu/system/linux-initrd.scm and Hako's Rosenthal zfs-on-root patches
-
-(define-module (epistemia system linux-initrd)
+(define-module (epistemia systems linux-initrd)
   #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module ((guix store) #:select (%store-prefix))
@@ -9,6 +8,7 @@
   #:use-module (guix modules)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages disk)
+  #:use-module (gnu packages guile)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages file-systems)
   #:use-module (gnu system file-systems)
@@ -183,7 +183,6 @@ for the requested modules."
                                       (and #$pre-mount
                                            #$@device-mapping-commands
                                            #$@file-system-scan-commands
-                                           ;; INJECT ZFS HERE
                                            #$zfs-import-commands))
                         #:linux-modules '#$linux-modules
                         #:linux-module-directory '#$kodir
@@ -194,10 +193,6 @@ for the requested modules."
                         #:on-error '#$on-error))))
    #:name "zfs-initrd"))
 
-;;;
-;;; The Public Interface
-;;;
-
 (define* (epistemia-zfs-initrd file-systems
                                #:key
                                (linux linux-libre)
@@ -221,7 +216,6 @@ for the requested modules."
             ,@extra-modules)))
 
   (define helper-packages
-    ;; Ensure zfs-package is available in the initrd (for zpool command)
     (cons zfs-package
           (append (file-system-packages file-systems
                                         #:volatile-root? volatile-root?)