From d9cee2a73e294c4f47268d70234e6de18f226572 Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Tue, 2 Jul 2024 21:46:16 -0400 Subject: [PATCH] Moved bootloader declaration to be computer independent --- RyanLaptop.scm | 4 ++++ RyanThinkpad.scm | 4 ++++ modules/ryan-config/base-system.scm | 5 +---- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/RyanLaptop.scm b/RyanLaptop.scm index 11650bc..0fcdcad 100644 --- a/RyanLaptop.scm +++ b/RyanLaptop.scm @@ -19,6 +19,10 @@ (device (uuid "4C53-D400" 'fat32)) (type "vfat")) %base-file-systems)) + (bootloader (bootloader-configuration + (bootloader grub-efi-bootloader) + (targets (list "/boot/efi")) + (keyboard-layout keyboard-layout))) (swap-devices (list (swap-space (target (uuid "6758bed3-9ff2-49a0-9cc3-7c48eaee6c4a")))))) diff --git a/RyanThinkpad.scm b/RyanThinkpad.scm index 1066bac..3d11645 100644 --- a/RyanThinkpad.scm +++ b/RyanThinkpad.scm @@ -23,6 +23,10 @@ (device (uuid "DFE8-32EF" 'fat32)) (type "vfat")) %base-file-systems)) + (bootloader (bootloader-configuration + (bootloader grub-efi-bootloader) + (targets (list "/boot/efi")) + (keyboard-layout (keyboard-layout "us")))) (swap-devices (list (swap-space (target (uuid "7e1bb7c5-da2a-4509-8263-f707fc752993")))))) diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm index ac1ac79..1f9fb75 100644 --- a/modules/ryan-config/base-system.scm +++ b/modules/ryan-config/base-system.scm @@ -259,7 +259,4 @@ (type "tmpfs") (check? #f)) %base-file-systems)) - (bootloader (bootloader-configuration - (bootloader grub-efi-bootloader) - (targets (list "/boot/efi")) - (keyboard-layout keyboard-layout))))) + (bootloader "placeholder")))