From f41ebbcbe0550c20b039b8f282513a7181b495c8 Mon Sep 17 00:00:00 2001
From: Alex <alex@ahubbard.xyz>
Date: Mon, 4 Jul 2022 19:01:53 -0500
Subject: [PATCH] changes to arch install on laptop

---
 .local/installers/arch/arch-install.sh | 15 +++++++++------
 .local/installers/arch/programs.sh     | 18 ++++++++++++------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.local/installers/arch/arch-install.sh b/.local/installers/arch/arch-install.sh
index 6638197..3454d28 100755
--- a/.local/installers/arch/arch-install.sh
+++ b/.local/installers/arch/arch-install.sh
@@ -25,10 +25,11 @@ enable_repos() {
     sudo pacman -Sy
 
 
+    #commenting since this is done during archinstall
     #enable multilib
-    sudo sh -c "echo "[multilib]" >> /etc/pacman.conf"
-    sudo sh -c "echo "Include\ =\ /etc/pacman.d/mirrorlist" >> /etc/pacman.conf"
-    sudo sh -c "echo "" >> /etc/pacman.conf"
+    #sudo sh -c "echo "[multilib]" >> /etc/pacman.conf"
+    #sudo sh -c "echo "Include\ =\ /etc/pacman.d/mirrorlist" >> /etc/pacman.conf"
+    #sudo sh -c "echo "" >> /etc/pacman.conf"
 
     sudo pacman -Sy
 
@@ -116,7 +117,9 @@ configure() {
 
     read input
     if [ "$input" = "y" ]; then
-        echo "permit persist $USER as root" >> ~/.cache/doas.conf
+        echo "permit persist $USER as root" > ~/.cache/doas.conf
+        echo "permit nopass :wheel as root cmd /sbin/poweroff" >> ~/.cache/doas.conf
+        echo "permit nopass :wheel as root cmd /sbin/reboot" >> ~/.cache/doas.conf
         sudo cp ~/.cache/doas.conf /etc/doas.conf
         rm ~/.cache/doas.conf
         doas pacman -R sudo && doas ln -s /bin/doas /bin/sudo                            #TODO ARCH SPECIFIC
@@ -167,8 +170,8 @@ base() {
     #install all packages in $PKGS
     sudo pacman --noconfirm --needed -S - < ./pkgs/base.list
 
-    #installl all packages in $AUR_PKGS
-    yay --noconfirm --needed -S - < ./pkgs/aur.list 
+    #install all packages in $AUR_PKGS
+    yay --needed -S - < ./pkgs/aur.list 
 
     #setup local git repos defined in $GIT_REPOS to $GIT_REPOS_DIR
     sh ~/.local/scripts/install.sh add-repos ./pkgs/repos.list
diff --git a/.local/installers/arch/programs.sh b/.local/installers/arch/programs.sh
index 6037cbe..628c105 100644
--- a/.local/installers/arch/programs.sh
+++ b/.local/installers/arch/programs.sh
@@ -10,6 +10,7 @@
 repo_check() {
    if [ -z "$(grep "^\[multilib" /etc/pacman.conf)" ] || 
       [ -z "$(grep "^\[community" /etc/pacman.conf)" ] || 
+      echo "repo check"
       [ ! -f "/usr/bin/yay" ]; then
         echo "either yay, or the lib32 or community repos have not been setup correctly. Exiting"
         exit
@@ -19,17 +20,22 @@ repo_check() {
 
 ungoogled_chromium() {
     repo_check
+    echo "after repo check"
 
-    CMD=" --noconfirm -S "
+    CMD=" -S "
 
     [ "$1" = "-R" ] && CMD=" -Rs "
 
-    #sudo pacman "$CMD" ffmpeg4.4 
-    sudo pacman "$CMD" aur/ungoogled-chromium-binary
-    sudo pacman "$CMD" aur/chromium-ublock-origin
+    echo "ungoogled chromium install not working just installing chromium (press enter to continue)"
+    read input
 
-    yay "$CMD" aur/chromium-extension-web-store
-    yay "$CMD" aur/chromium-widevine
+    sudo pacman -S chromium
+
+    #yay "$CMD" aur/ungoogled-chromium-binary
+    #yay "$CMD" aur/chromium-ublock-origin
+
+    #yay "$CMD" aur/chromium-extension-web-store
+    #yay "$CMD" aur/chromium-widevine
 }
 
 virt_manager() {