diff options
| author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-10-13 17:27:38 +0200 |
|---|---|---|
| committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-10-13 17:44:28 +0200 |
| commit | fb0ac479c8fb9ef16e2803883e30a7f2cfe173bb (patch) | |
| tree | 24172a299932ba19346a550cf2091c812237e8b2 /systems | |
| parent | 8e5f71712a28c206d4d937e4d9794a487bb5188a (diff) | |
refactor(mcdowell): modernize module imports for bootloader stack
Diffstat (limited to 'systems')
| -rw-r--r-- | systems/mcdowell.scm | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/systems/mcdowell.scm b/systems/mcdowell.scm index 0d20837..92df5a7 100644 --- a/systems/mcdowell.scm +++ b/systems/mcdowell.scm @@ -11,19 +11,21 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(define (bootloader-target-mcdowell) - (use-modules (machines amd64)) - (bootloader-device-path host-name*)) +(define bootloader-target-mcdowell + ((@ (machines amd64) bootloader-device-path) + host-name*)) (define (desktop-services-mcdowell) (use-modules (suweren system)) %suweren-services) -(define (grub-mkrescue-bootloader-mcdowell) - (use-modules (gnu packages bootloaders)) - ((@ (gnu bootloader) bootloader) - (inherit grub-bootloader) - (package grub-hybrid))) +(define grub-mkrescue-bootloader-mcdowell + (let + ((grub-bootloader (@ (gnu bootloader grub) grub-bootloader)) + (grub-hybrid (@ (gnu packages bootloaders) grub-hybrid))) + ((@ (gnu bootloader) bootloader) + (inherit grub-bootloader) + (package grub-hybrid)))) (define keyboard-layout-mcdowell ((@ (gnu system keyboard) keyboard-layout) @@ -37,12 +39,11 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(define (bootloader-mcdowell) - (use-modules (gnu bootloader grub)) +(define bootloader-mcdowell ((@ (gnu bootloader) bootloader-configuration) - (bootloader (grub-mkrescue-bootloader-mcdowell)) + (bootloader grub-mkrescue-bootloader-mcdowell) (keyboard-layout keyboard-layout-mcdowell) - (targets (list (bootloader-target-mcdowell))))) + (targets (list bootloader-target-mcdowell)))) (define services-mcdowell (append (desktop-services-mcdowell) @@ -63,7 +64,7 @@ (kernel-loadable-modules (list)) (kernel-arguments %default-kernel-arguments) (hurd #f) - (bootloader (bootloader-mcdowell)) + (bootloader bootloader-mcdowell) (keyboard-layout keyboard-layout-mcdowell) (initrd initrd*) (firmware firmware*) |