From 46c111e8c1eb858c8f0c29733116534a38ffb91c Mon Sep 17 00:00:00 2001
From: Drew Galbraith <dgalbraith33@gmail.com>
Date: Mon, 20 Nov 2023 13:44:35 -0800
Subject: [PATCH] Install usr updates to make the command more repeatable.

---
 install_usr.sh | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/install_usr.sh b/install_usr.sh
index 29f432c..3b7ab14 100755
--- a/install_usr.sh
+++ b/install_usr.sh
@@ -7,30 +7,31 @@ if [[ $EUID -eq 0 ]]; then
 fi
 
 echo "Installing yay"
-mkdir opt
+mkdir -p opt
 pushd opt
-  git clone https://aur.archlinux.org/yay.git
-  chown -R drew .
-  pushd yay
-    makepkg -si
-  popd
+  if [ ! -d yay ]; then
+    git clone https://aur.archlinux.org/yay.git
+    pushd yay
+      makepkg -si
+    popd
+  fi
 popd
 
 echo "Installing plymouth theme"
-yay --noconfirm -S plymouth-theme-deus-ex-git
+yay --noconfirm --needed -S plymouth-theme-deus-ex-git
 sudo plymouth-set-default-theme -R deus_ex
 
 echo "Installing SDDM theme"
-yay --noconfirm -S sddm-sugar-dark
+yay --noconfirm --needed -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
+mkdir -p ~/.cfg
 $CONFIG init
 $CONFIG remote add origin https://gitlab.com/dgalbraith33/dotfiles.git
+rm ~/.gitconfig
 $CONFIG pull origin main
 $CONFIG submodule update --init
-echo "*" > ~/.gitignore
 
 sudo sed -i 's/ForceHideCompletePassword=false/ForceHideCompletePassword=true/' /usr/share/sddm/themes/sugar-dark/theme.conf