From d192d01273a025158adee83677d1557f539fa45f Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 23 Jun 2022 15:10:54 +0200
Subject: [PATCH] update archiso

---
 archiso/airootfs/etc/mkinitcpio.conf |  2 +-
 archiso/grub/grub.cfg                | 25 +++++++++++--------------
 archiso/packages.x86_64              |  5 ++++-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/archiso/airootfs/etc/mkinitcpio.conf b/archiso/airootfs/etc/mkinitcpio.conf
index e287dfc..5bda027 100644
--- a/archiso/airootfs/etc/mkinitcpio.conf
+++ b/archiso/airootfs/etc/mkinitcpio.conf
@@ -4,7 +4,7 @@
 # run.  Advanced users may wish to specify all system modules
 # in this array.  For instance:
 #     MODULES=(piix ide_disk reiserfs)
-MODULES=(vda)
+MODULES=()
 
 # BINARIES
 # This setting includes any additional binaries a given user may
diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg
index e336cae..9db20de 100644
--- a/archiso/grub/grub.cfg
+++ b/archiso/grub/grub.cfg
@@ -14,25 +14,22 @@ if loadfont "${prefix}/fonts/unicode.pf2" ; then
     terminal_output gfxterm
 fi
 
-# GRUB init tune for accessibility
-#
-# Morse translation table:
-# "." is "500 1 300 1"
-# "-" is "600 3 300 1"
-# " " is "100 2"
-# "/" is "100 5"
-#
-# Message: "s for blind"
-play 500 500 1 300 1 500 1 300 1 500 1 300 1 100 5 500 1 300 1 500 1 300 1 100 2 500 1 300 1 500 1 300 1 600 3 300 1 500 1 300 1 100 5 600 3 300 1 500 1 300 1 500 1 300 1 500 1 300 1 100 2 500 1 300 1 600 3 300 1 500 1 300 1 500 1 300 1 100 2 500 1 300 1 500 1 300 1 100 2 500 1 300 1 500 1 300 1 100 2 600 3 300 1 500 1 300 1 100 2 600 3 300 1 500 1 300 1 500 1 300 1
+default=cachyos
+timeout=15
+timeout_style=menu
 
-menuentry "CachyOS (x86_64, UEFI)" {
+# GRUB init tune for accessibility
+# 
+play 600 988 1 1319 4
+
+menuentry "CachyOS (x86_64, UEFI)" --class arch --class gnu-linux --class gnu --class os --id 'cachyos' {
     set gfxpayload=keep
     search --no-floppy --set=root --label %ARCHISO_LABEL%
     linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=5G driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes
     initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img
 }
 
-menuentry "CachyOS (x86_64, UEFI) Copy to RAM" {
+menuentry "CachyOS (x86_64, UEFI) Copy to RAM" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'cachyos-accessibility' {
     set gfxpayload=keep
     search --no-floppy --set=root --label %ARCHISO_LABEL%
     linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on
@@ -59,12 +56,12 @@ if [ "${grub_platform}" == "efi" ]; then
 	}
 fi
 
-menuentry "System shutdown" {
+menuentry "System shutdown" --class shutdown --class poweroff {
 	echo "System shutting down..."
 	halt
 }
 
-menuentry "System restart" {
+menuentry "System restart" --class reboot --class restart {
 	echo "System rebooting..."
 	reboot
 }
diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64
index 9181e88..fd3c84f 100644
--- a/archiso/packages.x86_64
+++ b/archiso/packages.x86_64
@@ -7,6 +7,7 @@ archlinux-keyring
 avahi
 b43-fwcutter
 base
+micro
 bash-completion
 bind
 boost-libs
@@ -55,7 +56,7 @@ efibootmgr
 ethtool
 exfatprogs
 f2fs-tools
-fastfetch
+fastfetch-git
 fatresize
 ffmpegthumbnailer
 file-roller
@@ -139,6 +140,7 @@ nss-mdns
 ntfs-3g
 ntp
 nvme-cli
+kio
 octopi
 openconnect
 opendesktop-fonts
@@ -161,6 +163,7 @@ pipewire-pulse
 plasma-desktop
 plasma-framework
 plasma-nm
+plasma-integration
 plasma-pa
 plasma-workspace
 polkit