commit 3e6866d27e3f7d2a610d37e055bda7925253ca96
parent dcc090a89810aeb037390c84616ca71c48823402
Author: Hayden Hamilton <hayden@haydenvh.com>
Date: Sat, 15 Feb 2020 13:36:54 +0000
More grub
Diffstat:
16 files changed, 83 insertions(+), 61 deletions(-)
diff --git a/.config/grub/autoinstall.sh b/.config/grub/autoinstall.sh
@@ -7,5 +7,5 @@ sudo cp background.png /boot/grub
sudo cp grub /etc/default/grub
sudo grub-mkconfig -o grub.cfg
sudo cp grub.cfg /boot/grub/grub.cfg
-user="$USER"
+USER1="$USER"
sudo chown $USER1:$USER1 grub.cfg
diff --git a/.config/grub/box/item_c.png b/.config/grub/box/item_c.png
Binary files differ.
diff --git a/.config/grub/box/item_e.png b/.config/grub/box/item_e.png
Binary files differ.
diff --git a/.config/grub/box/item_w.png b/.config/grub/box/item_w.png
Binary files differ.
diff --git a/.config/grub/box/terminal_box_c.png b/.config/grub/box/terminal_box_c.png
Binary files differ.
diff --git a/.config/grub/box/terminal_box_e.png b/.config/grub/box/terminal_box_e.png
Binary files differ.
diff --git a/.config/grub/box/terminal_box_n.png b/.config/grub/box/terminal_box_n.png
Binary files differ.
diff --git a/.config/grub/box/terminal_box_ne.png b/.config/grub/box/terminal_box_ne.png
Binary files differ.
diff --git a/.config/grub/box/terminal_box_nw.png b/.config/grub/box/terminal_box_nw.png
Binary files differ.
diff --git a/.config/grub/box/terminal_box_s.png b/.config/grub/box/terminal_box_s.png
Binary files differ.
diff --git a/.config/grub/box/terminal_box_se.png b/.config/grub/box/terminal_box_se.png
Binary files differ.
diff --git a/.config/grub/box/terminal_box_sw.png b/.config/grub/box/terminal_box_sw.png
Binary files differ.
diff --git a/.config/grub/box/terminal_box_w.png b/.config/grub/box/terminal_box_w.png
Binary files differ.
diff --git a/.config/grub/grub b/.config/grub/grub
@@ -4,7 +4,7 @@
GRUB_DEFAULT=0
#GRUB_HIDDEN_TIMEOUT=0
#GRUB_HIDDEN_TIMEOUT_QUIET=false
-GRUB_TIMEOUT=5
+GRUB_TIMEOUT=50
GRUB_DISTRIBUTOR="Void/Austall"
GRUB_CMDLINE_LINUX_DEFAULT="loglevel=4 slub_debug=P page_poison=1"
# Uncomment to use basic console
diff --git a/.config/grub/grub.cfg b/.config/grub/grub.cfg
@@ -62,9 +62,9 @@ insmod part_msdos
insmod ext2
set root='hd0,msdos1'
if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos1 --hint-efi=hd0,msdos1 --hint-baremetal=ahci0,msdos1 788d0f37-8e91-4264-ba91-6a6b47885232
+ search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos1 --hint-efi=hd0,msdos1 --hint-baremetal=ahci0,msdos1 cf3e4a02-7721-44f3-ae27-98a4098b2d22
else
- search --no-floppy --fs-uuid --set=root 788d0f37-8e91-4264-ba91-6a6b47885232
+ search --no-floppy --fs-uuid --set=root cf3e4a02-7721-44f3-ae27-98a4098b2d22
fi
font="/usr/share/grub/unicode.pf2"
fi
@@ -80,11 +80,11 @@ fi
terminal_output gfxterm
insmod part_msdos
insmod ext2
-set root='hd0,msdos4'
+set root='hd0,msdos3'
if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos4 --hint-efi=hd0,msdos4 --hint-baremetal=ahci0,msdos4 b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
+ search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
else
- search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
+ search --no-floppy --fs-uuid --set=root a97ae8a3-d28a-4913-8249-9c5c829fb7c9
fi
insmod gfxmenu
insmod png
@@ -92,134 +92,168 @@ set theme=($root)/grub/theme.txt
export theme
if [ x$feature_timeout_style = xy ] ; then
set timeout_style=menu
- set timeout=5
+ set timeout=50
# Fallback normal timeout code in case the timeout_style feature is
# unavailable.
else
- set timeout=5
+ set timeout=50
fi
### END /etc/grub.d/00_header ###
### BEGIN /etc/grub.d/10_linux ###
-menuentry 'Void/Austall GNU/Linux' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-simple-788d0f37-8e91-4264-ba91-6a6b47885232' {
+menuentry 'Void/Austall GNU/Linux' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-simple-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
load_video
set gfxpayload=keep
insmod gzio
insmod part_msdos
insmod ext2
- set root='hd0,msdos4'
+ set root='hd0,msdos3'
if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos4 --hint-efi=hd0,msdos4 --hint-baremetal=ahci0,msdos4 b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
+ search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
else
- search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
+ search --no-floppy --fs-uuid --set=root a97ae8a3-d28a-4913-8249-9c5c829fb7c9
fi
echo 'Loading Linux 5.4.19_1 ...'
- linux /vmlinuz-5.4.19_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro loglevel=4 slub_debug=P page_poison=1
+ linux /vmlinuz-5.4.19_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro loglevel=4 slub_debug=P page_poison=1
echo 'Loading initial ramdisk ...'
initrd /initramfs-5.4.19_1.img
}
-submenu 'Advanced options for Void/Austall GNU/Linux' $menuentry_id_option 'gnulinux-advanced-788d0f37-8e91-4264-ba91-6a6b47885232' {
- menuentry 'Void/Austall GNU/Linux, with Linux 5.4.19_1' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.19_1-advanced-788d0f37-8e91-4264-ba91-6a6b47885232' {
+submenu 'Advanced options for Void/Austall GNU/Linux' $menuentry_id_option 'gnulinux-advanced-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
+ menuentry 'Void/Austall GNU/Linux, with Linux 5.4.19_1' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.19_1-advanced-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
load_video
set gfxpayload=keep
insmod gzio
insmod part_msdos
insmod ext2
- set root='hd0,msdos4'
+ set root='hd0,msdos3'
if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos4 --hint-efi=hd0,msdos4 --hint-baremetal=ahci0,msdos4 b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
+ search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
else
- search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
+ search --no-floppy --fs-uuid --set=root a97ae8a3-d28a-4913-8249-9c5c829fb7c9
fi
echo 'Loading Linux 5.4.19_1 ...'
- linux /vmlinuz-5.4.19_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro loglevel=4 slub_debug=P page_poison=1
+ linux /vmlinuz-5.4.19_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro loglevel=4 slub_debug=P page_poison=1
echo 'Loading initial ramdisk ...'
initrd /initramfs-5.4.19_1.img
}
- menuentry 'Void/Austall GNU/Linux, with Linux 5.4.19_1 (recovery mode)' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.19_1-recovery-788d0f37-8e91-4264-ba91-6a6b47885232' {
+ menuentry 'Void/Austall GNU/Linux, with Linux 5.4.19_1 (recovery mode)' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.19_1-recovery-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
load_video
set gfxpayload=keep
insmod gzio
insmod part_msdos
insmod ext2
- set root='hd0,msdos4'
+ set root='hd0,msdos3'
if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos4 --hint-efi=hd0,msdos4 --hint-baremetal=ahci0,msdos4 b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
+ search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
else
- search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
+ search --no-floppy --fs-uuid --set=root a97ae8a3-d28a-4913-8249-9c5c829fb7c9
fi
echo 'Loading Linux 5.4.19_1 ...'
- linux /vmlinuz-5.4.19_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro single
+ linux /vmlinuz-5.4.19_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro single
echo 'Loading initial ramdisk ...'
initrd /initramfs-5.4.19_1.img
}
- menuentry 'Void/Austall GNU/Linux, with Linux 5.4.18_1' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.18_1-advanced-788d0f37-8e91-4264-ba91-6a6b47885232' {
+ menuentry 'Void/Austall GNU/Linux, with Linux 5.4.18_1' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.18_1-advanced-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
load_video
set gfxpayload=keep
insmod gzio
insmod part_msdos
insmod ext2
- set root='hd0,msdos4'
+ set root='hd0,msdos3'
if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos4 --hint-efi=hd0,msdos4 --hint-baremetal=ahci0,msdos4 b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
+ search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
else
- search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
+ search --no-floppy --fs-uuid --set=root a97ae8a3-d28a-4913-8249-9c5c829fb7c9
fi
echo 'Loading Linux 5.4.18_1 ...'
- linux /vmlinuz-5.4.18_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro loglevel=4 slub_debug=P page_poison=1
+ linux /vmlinuz-5.4.18_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro loglevel=4 slub_debug=P page_poison=1
echo 'Loading initial ramdisk ...'
initrd /initramfs-5.4.18_1.img
}
- menuentry 'Void/Austall GNU/Linux, with Linux 5.4.18_1 (recovery mode)' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.18_1-recovery-788d0f37-8e91-4264-ba91-6a6b47885232' {
+ menuentry 'Void/Austall GNU/Linux, with Linux 5.4.18_1 (recovery mode)' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.18_1-recovery-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
load_video
set gfxpayload=keep
insmod gzio
insmod part_msdos
insmod ext2
- set root='hd0,msdos4'
+ set root='hd0,msdos3'
if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos4 --hint-efi=hd0,msdos4 --hint-baremetal=ahci0,msdos4 b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
+ search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
else
- search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
+ search --no-floppy --fs-uuid --set=root a97ae8a3-d28a-4913-8249-9c5c829fb7c9
fi
echo 'Loading Linux 5.4.18_1 ...'
- linux /vmlinuz-5.4.18_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro single
+ linux /vmlinuz-5.4.18_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro single
echo 'Loading initial ramdisk ...'
initrd /initramfs-5.4.18_1.img
}
- menuentry 'Void/Austall GNU/Linux, with Linux 5.4.17_1' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.17_1-advanced-788d0f37-8e91-4264-ba91-6a6b47885232' {
+ menuentry 'Void/Austall GNU/Linux, with Linux 5.3.18_1' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.3.18_1-advanced-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
load_video
set gfxpayload=keep
insmod gzio
insmod part_msdos
insmod ext2
- set root='hd0,msdos4'
+ set root='hd0,msdos3'
if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos4 --hint-efi=hd0,msdos4 --hint-baremetal=ahci0,msdos4 b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
+ search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
else
- search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
+ search --no-floppy --fs-uuid --set=root a97ae8a3-d28a-4913-8249-9c5c829fb7c9
fi
- echo 'Loading Linux 5.4.17_1 ...'
- linux /vmlinuz-5.4.17_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro loglevel=4 slub_debug=P page_poison=1
+ echo 'Loading Linux 5.3.18_1 ...'
+ linux /vmlinuz-5.3.18_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro loglevel=4 slub_debug=P page_poison=1
echo 'Loading initial ramdisk ...'
- initrd /initramfs-5.4.17_1.img
+ initrd /initramfs-5.3.18_1.img
}
- menuentry 'Void/Austall GNU/Linux, with Linux 5.4.17_1 (recovery mode)' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.4.17_1-recovery-788d0f37-8e91-4264-ba91-6a6b47885232' {
+ menuentry 'Void/Austall GNU/Linux, with Linux 5.3.18_1 (recovery mode)' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.3.18_1-recovery-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
load_video
set gfxpayload=keep
insmod gzio
insmod part_msdos
insmod ext2
- set root='hd0,msdos4'
+ set root='hd0,msdos3'
if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos4 --hint-efi=hd0,msdos4 --hint-baremetal=ahci0,msdos4 b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
+ search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
else
- search --no-floppy --fs-uuid --set=root b2bdfd15-e2d3-44b2-aeee-214e9ea5b80e
+ search --no-floppy --fs-uuid --set=root a97ae8a3-d28a-4913-8249-9c5c829fb7c9
fi
- echo 'Loading Linux 5.4.17_1 ...'
- linux /vmlinuz-5.4.17_1 root=UUID=788d0f37-8e91-4264-ba91-6a6b47885232 ro single
+ echo 'Loading Linux 5.3.18_1 ...'
+ linux /vmlinuz-5.3.18_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro single
echo 'Loading initial ramdisk ...'
- initrd /initramfs-5.4.17_1.img
+ initrd /initramfs-5.3.18_1.img
+ }
+ menuentry 'Void/Austall GNU/Linux, with Linux 5.3.9_1' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.3.9_1-advanced-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
+ load_video
+ set gfxpayload=keep
+ insmod gzio
+ insmod part_msdos
+ insmod ext2
+ set root='hd0,msdos3'
+ if [ x$feature_platform_search_hint = xy ]; then
+ search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
+ else
+ search --no-floppy --fs-uuid --set=root a97ae8a3-d28a-4913-8249-9c5c829fb7c9
+ fi
+ echo 'Loading Linux 5.3.9_1 ...'
+ linux /vmlinuz-5.3.9_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro loglevel=4 slub_debug=P page_poison=1
+ echo 'Loading initial ramdisk ...'
+ initrd /initramfs-5.3.9_1.img
+ }
+ menuentry 'Void/Austall GNU/Linux, with Linux 5.3.9_1 (recovery mode)' --class void_austall --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.3.9_1-recovery-cf3e4a02-7721-44f3-ae27-98a4098b2d22' {
+ load_video
+ set gfxpayload=keep
+ insmod gzio
+ insmod part_msdos
+ insmod ext2
+ set root='hd0,msdos3'
+ if [ x$feature_platform_search_hint = xy ]; then
+ search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos3 --hint-efi=hd0,msdos3 --hint-baremetal=ahci0,msdos3 a97ae8a3-d28a-4913-8249-9c5c829fb7c9
+ else
+ search --no-floppy --fs-uuid --set=root a97ae8a3-d28a-4913-8249-9c5c829fb7c9
+ fi
+ echo 'Loading Linux 5.3.9_1 ...'
+ linux /vmlinuz-5.3.9_1 root=UUID=cf3e4a02-7721-44f3-ae27-98a4098b2d22 ro single
+ echo 'Loading initial ramdisk ...'
+ initrd /initramfs-5.3.9_1.img
}
}
diff --git a/.config/vim/.netrwhist b/.config/vim/.netrwhist
@@ -1,12 +0,0 @@
-let g:netrw_dirhistmax =10
-let g:netrw_dirhistcnt =2
-let g:netrw_dirhist_2='/etc/bash'
-let g:netrw_dirhist_1='/etc/bash/bashrc.d'
-let g:netrw_dirhist_0='/home/hayden/.config/i3'
-let g:netrw_dirhist_9='/home/hayden'
-let g:netrw_dirhist_8='/'
-let g:netrw_dirhist_7='/home'
-let g:netrw_dirhist_6='/home/hayden'
-let g:netrw_dirhist_5='/home/hayden/work/website2/html/downloads/sent'
-let g:netrw_dirhist_4='/home/hayden/work/website2/bin/templates'
-let g:netrw_dirhist_3='/home/hayden/music/synth/eg/voyager'
