update theme and GRUB config for AFS

3 files changed, 13 insertions, 10 deletions

diff --git a/boot/grub/grub.cfg b/boot/grub/grub.cfg
index 82a7b73..8c4291f 100644
--- a/boot/grub/grub.cfg
+++ b/boot/grub/grub.cfg
@@ -1,26 +1,30 @@
 set timeout=5
 set default=0
+set esp='hd0,gpt1'
+set themedir=($esp)/boot/grub/themes/akiba
+
+# Load font from ESP
+loadfont $themedir/f/akiba.pf2
 
-# Set graphics mode
 set gfxmode=800x600x32
 insmod all_video
 insmod gfxterm
-terminal_output gfxterm
-
-# Load image format modules
+insmod gfxmenu
 insmod png
+terminal_output gfxterm
 
-# Load theme
-insmod gfxmenu
-set theme=/boot/grub/themes/akiba/theme.txt
+set theme=$themedir/theme.txt
 
 insmod part_gpt
 insmod part_msdos
 insmod fat
+insmod afs
 
-search --no-floppy --set=root --label AKIBA
+# Switch to the AFS partition
+set root='hd0,gpt2'
 
 menuentry "Akiba" {
+    echo "Loading kernel from AFS partition..."
     multiboot2 /system/akiba/mirai.akibakernel
     boot
 }
\ No newline at end of file
diff --git a/boot/grub/themes/akiba/selected_blob_c.png b/boot/grub/themes/akiba/select_c.png
index 5664fa3..5664fa3 100644
--- a/boot/grub/themes/akiba/selected_blob_c.png
+++ b/boot/grub/themes/akiba/select_c.png
diff --git a/boot/grub/themes/akiba/theme.txt b/boot/grub/themes/akiba/theme.txt
index 510c55e..7c935ff 100644
--- a/boot/grub/themes/akiba/theme.txt
+++ b/boot/grub/themes/akiba/theme.txt
@@ -15,7 +15,7 @@ terminal-font: "VGA Regular 16"
 	item_padding = 0
 	item_icon_space = 0
 	item_spacing = 1
-	selected_item_pixmap_style = "selected_blob_*.png"
+	selected_item_pixmap_style = "select_*.png"
 	scrollbar = true
 	scrollbar_width = 0
 	item_color = "#ffffff"
@@ -63,4 +63,3 @@ terminal-font: "VGA Regular 16"
 	+ image {  file = "inbox_c.png"  left = 16  top = 12  width = 100%-32  height = 100%-24  }
 
 }
-