From 23f66520c73aa6e2f7541052ded279999f74823a Mon Sep 17 00:00:00 2001 From: Noah Metz Date: Wed, 6 Dec 2023 11:27:38 -0700 Subject: [PATCH] bootloader change to efi --- otto.scm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/otto.scm b/otto.scm index 679ed1b..9dfc417 100644 --- a/otto.scm +++ b/otto.scm @@ -1,6 +1,6 @@ (use-modules (gnu) (nongnu packages linux) - (nongnu packages linux-initrd) + (nongnu system linux-initrd) (metznet system base-system) (gnu packages vim) (gnu packages version-control) @@ -9,25 +9,28 @@ (operating-system (inherit %metznet-base-desktop-system) - ; Requires nonfree kernel for intel wifi support + ;; Requires nonfree kernel for intel wifi support (kernel linux) (initrd microcode-initrd) (firmware (list linux-firmware)) (host-name "otto") (bootloader (bootloader-configuration - (bootloader grub-minimal-bootloader) - (targets '("/dev/nvme0n1")))) + (bootloader grub-efi-bootloader) + (targets '("/boot/efi")))) (swap-devices (list (swap-space (target (file-system-label "otto-swap"))))) - (file-systems (cons (file-system - (device (file-system-label "otto-data")) - (mount-point "/") - (type "ext4")) %base-file-systems)) + (file-systems (cons* (file-system + (device (file-system-label "OTTO-BOOT")) + (mount-point "/boot/efi") + (type "vfat")) + (file-system + (device (file-system-label "otto-data")) + (mount-point "/") + (type "ext4")) %base-file-systems)) (sudoers-file (plain-file "sudoers" (string-join (list "root ALL=(ALL:ALL) NOPASSWD:ALL" - "%admin ALL=(ALL:ALL) ALL" - "") "\n"))) + "%admin ALL=(ALL:ALL) ALL" "") "\n"))) (packages (cons* git neovim %metznet-desktop-packages)))