diff options
| author | Kenny Ballou <kb@devnulllabs.io> | 2022-07-06 23:26:47 -0600 |
|---|---|---|
| committer | Kenny Ballou <kb@devnulllabs.io> | 2022-07-08 09:23:49 -0600 |
| commit | f02350db9ce79609924dde9c3133b68fa3793706 (patch) | |
| tree | 54fcd82a4d3300625810654223640e8d4b6e79aa /systems | |
| parent | ecb0637b09056fad31b739e06eea8243cd148223 (diff) | |
| download | dotfiles-f02350db9ce79609924dde9c3133b68fa3793706.tar.gz dotfiles-f02350db9ce79609924dde9c3133b68fa3793706.tar.xz | |
systems/daeva: use guix removable bootloader
[618f665a5f (bootloader: grub: Add removable grub-efi bootloader
option., 2022-05-24)][0] was added to guix, removing the need for our
own.
[0]: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=618f665a5ffc6330bc99c4ac2b1077c1e1a7506c
Signed-off-by: Kenny Ballou <kb@devnulllabs.io>
Diffstat (limited to 'systems')
| -rw-r--r-- | systems/daeva.scm | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/systems/daeva.scm b/systems/daeva.scm index 611b2c14..234dcd02 100644 --- a/systems/daeva.scm +++ b/systems/daeva.scm @@ -32,24 +32,6 @@ #:use-module ((kbg system mcron) :prefix mcron:) #:use-module (kbg system xorg)) -(define install-grub-efi-removable - #~(lambda (bootloader efi-dir mount-point) - (when efi-dir - (let ((grub-install (string-append bootloader "/sbin/grub-install")) - (install-dir (string-append mount-point "/boot")) - (target-esp (if (file-exists? (string-append mount-point efi-dir)) - (string-append mount-point efi-dir) - efi-dir))) - (setenv "GRUB_ENABLE_CRYPTODISK" "y") - (invoke/quiet grub-install "--boot-directory" install-dir - "--efi-directory" target-esp - "--removable"))))) - -(define grub-efi-removable - (bootloader - (inherit grub-efi-bootloader) - (installer install-grub-efi-removable))) - (define daeva-system (operating-system (kernel linux-lts) @@ -67,7 +49,7 @@ (keyboard-layout (keyboard-layout "us" #:options '("ctrl:nocaps"))) (bootloader (bootloader-configuration - (bootloader grub-efi-removable) + (bootloader grub-efi-removable-bootloader) (targets '("/boot/efi")) (keyboard-layout keyboard-layout))) |