From 47b3ec9f70d4cca4843144fe5b7626be5ab1ea19 Mon Sep 17 00:00:00 2001
From: Drew Galbraith <dgalbraith33@gmail.com>
Date: Fri, 17 Nov 2023 19:57:26 -0800
Subject: [PATCH] More fixes

---
 install_desktop.sh |  1 -
 install_usr.sh     | 11 +++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 install_usr.sh

diff --git a/install_desktop.sh b/install_desktop.sh
index 76cf3d5..87235ac 100755
--- a/install_desktop.sh
+++ b/install_desktop.sh
@@ -28,7 +28,6 @@ echo "Enabling SDDM"
 systemctl enable sddm
 mkdir /etc/sddm.conf.d
 cp sddm.conf /etc/sddm.conf.d/sddm.conf
-sed -i 's/ForceHideCompletePassword=false/ForceHideCompletePassword=true/' /usr/share/sddm/themes/sugar-dark/theme.conf
 
 echo "Giving Sway hardware access."
 usermod -aG seat drew
diff --git a/install_usr.sh b/install_usr.sh
old mode 100644
new mode 100755
index b939c6c..16e8cdf
--- a/install_usr.sh
+++ b/install_usr.sh
@@ -1,3 +1,5 @@
+#! /bin/bash
+set -e 
 
 echo "Installing yay"
 mkdir opt
@@ -5,20 +7,19 @@ pushd opt
   git clone https://aur.archlinux.org/yay.git
   chown -R drew .
   pushd yay
-    su -c "makepkg -s" drew
-    pacman -U *.tar.zst
+    makepkg -si
   popd
 popd
 
 echo "Installing plymouth theme"
-su -c "yay -S plymouth-theme-deus-ex-git" drew
+yay -S plymouth-theme-deus-ex-git
 plymouth-set-default-theme -R deus_ex
 
 echo "Installing SDDM theme"
 yay -S sddm-sugar-dark
 
 echo "Pulling home git config"
-$CONFIG='/usr/bin/git --git-dir=/home/drew/.cfg/ --work-tree=/home/drew'
+$CONFIG="/usr/bin/git --git-dir=/home/drew/.cfg/ --work-tree=/home/drew"
 git config --global init.defaultBranch main
 mkdir ~/.cfg
 $CONFIG init
@@ -26,3 +27,5 @@ $CONFIG remote add origin https://gitlab.com/dgalbraith33/dotfiles.git
 $CONFIG pull origin main
 $CONFIG submodule update --init
 echo "*" > ~/.gitignore
+
+sed -i 's/ForceHideCompletePassword=false/ForceHideCompletePassword=true/' /usr/share/sddm/themes/sugar-dark/theme.conf