From 85399bc68074390693150288832a2e03a13389ea Mon Sep 17 00:00:00 2001
From: Tommy <contact@tommytran.io>
Date: Fri, 31 May 2024 20:06:43 -0700
Subject: [PATCH] Install sbctl by default

Signed-off-by: Tommy <contact@tommytran.io>
---
 install.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/install.sh b/install.sh
index 67476c7..c96fbb9 100644
--- a/install.sh
+++ b/install.sh
@@ -285,13 +285,13 @@ fi
 ## Pacstrap
 output 'Installing the base system (it may take a while).'
 if [ "${install_mode}" = 'desktop' ]; then
-    pacstrap /mnt base "${kernel}" "${microcode}" apparmor chrony efibootmgr firewalld grub grub-btrfs inotify-tools linux-firmware nano networkmanager reflector snapper sudo zram-generator nautilus gdm gnome-console gnome-control-center pipewire-alsa pipewire-pulse pipewire-jack
+    pacstrap /mnt base "${kernel}" "${microcode}" apparmor chrony efibootmgr firewalld grub grub-btrfs inotify-tools linux-firmware nano networkmanager reflector sbctl snapper sudo zram-generator nautilus gdm gnome-console gnome-control-center pipewire-alsa pipewire-pulse pipewire-jack
 elif [ "${install_mode}" = 'server' ]; then
-    pacstrap /mnt base "${kernel}" "${microcode}" apparmor chrony efibootmgr firewalld grub grub-btrfs inotify-tools linux-firmware nano networkmanager reflector snapper sudo zram-generator openssh
+    pacstrap /mnt base "${kernel}" "${microcode}" apparmor chrony efibootmgr firewalld grub grub-btrfs inotify-tools linux-firmware nano networkmanager reflector sbctl snapper sudo zram-generator openssh
 fi
 
 if [ "${virtualization}" = 'none' ]; then
-    pacstrap /mnt sbctl fwupd
+    pacstrap /mnt fwupd
     echo 'UriSchemes=file;https' | sudo tee -a /mnt/etc/fwupd/fwupd.conf
 elif [ "${virtualization}" = 'kvm' ]; then
     pacstrap /mnt qemu-guest-agent
@@ -400,6 +400,9 @@ arch-chroot /mnt /bin/bash -e <<EOF
     echo "Generating locales."
     locale-gen
 
+    # Create SecureBoot keys. This isn't strictly necessary, but certain things like linux-hardened preset expects it and mkinitcpio will fail without it, sooo...
+    sbctl create-keys
+
     # Generating a new initramfs.
     echo "Creating a new initramfs."
     chmod 600 /boot/initramfs-linux*