From 5c329662329cf9f706f2142cbf99360b98b2c491 Mon Sep 17 00:00:00 2001
From: Randall Winkhart <idgr@tutanota.com>
Date: Wed, 6 Dec 2023 18:08:07 -0500
Subject: [PATCH] Use wheel group for opendoas configuration, rather than
 username

---
 chrootInstall.sh | 10 +++++-----
 install.sh       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/chrootInstall.sh b/chrootInstall.sh
index e84a0bf..fa68283 100755
--- a/chrootInstall.sh
+++ b/chrootInstall.sh
@@ -45,16 +45,16 @@ grub-mkconfig -o /boot/grub/grub.cfg
 
 # account setup
 groupadd libvirt
-useradd -m -g users -G uucp,libvirt "$username"
+useradd -m -g users -G wheel,uucp,libvirt "$username"
 echo "$userpassword
 $userpassword
 " | passwd "$username"
 
 # opendoas configuration
-echo "permit persist keepenv $username as root
-permit nopass $username as root cmd /usr/local/bin/powerset.sh
-permit nopass $username as root cmd /usr/bin/poweroff
-permit nopass $username as root cmd /usr/bin/reboot
+echo "permit persist keepenv :wheel as root
+permit nopass :wheel as root cmd /usr/local/bin/powerset.sh
+permit nopass :wheel as root cmd /usr/bin/poweroff
+permit nopass :wheel as root cmd /usr/bin/reboot
 " > /etc/doas.conf
 curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/doas-completion -o /usr/share/bash-completion/completions/doas
 ln -s /usr/bin/doas /usr/local/bin/sudo
diff --git a/install.sh b/install.sh
index 10f94f2..54632d6 100755
--- a/install.sh
+++ b/install.sh
@@ -3,7 +3,7 @@
 loadkeys us
 echo ----------------------------------------------------------------------------------------------
 echo rwinkhart\'s artix install script
-echo last updated december 03, 2023 \(rev. C\)
+echo last updated december 06, 2023 \(rev. A\)
 echo ----------------------------------------------------------------------------------------------
 echo You will be asked some questions before installation.
 echo -e "----------------------------------------------------------------------------------------------\n"