From d3a792b61b49dbb8e33bb13c0954f38a8671b04b Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sun, 22 Jan 2023 14:37:41 -0500
Subject: [PATCH] Auto Update

---
 setenv.sh |  4 ++--
 setup.sh  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/setenv.sh b/setenv.sh
index 02fa78a..795e4b7 100644
--- a/setenv.sh
+++ b/setenv.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
 # Show env vars
-grep -v '^#' .env
+grep -v '^#' ../../.env
 
 # Export env vars
 set -o allexport
-source .env
+source ../../.env
 set +o allexport
diff --git a/setup.sh b/setup.sh
index 3191ab8..870df9e 100644
--- a/setup.sh
+++ b/setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # updates all dotfiles on the system
-rm ../../.bash* ../../.profile /root/.bash* /etc/nanorc
+rm ../../.bash* ../../.profile /root/.bash* /etc/nanorc ../../.PS1 /root/.PS1
 
 ln ./.bash* /root
 ln ./.bash* ../../
@@ -13,22 +13,22 @@ cp .profile /root
 ln ./nanorc /etc/nanorc
 
 # changes PS1 prompts
+SERV_COLOR=""
+source ./setenv.sh
 
 ## root PS1
 RED="01;31m"
 cat << EOF >> /root/.PS1
-
 PS1='\[\033[$RED\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ '
 EOF
 
 ## user PS1
 GREEN="01;32m"
-cat << EOF >> ~/.PS1
+cat << EOF >> ../../.PS1
 PS1='\[\033[$GREEN\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ '
 EOF
 
-if [ -f ~/git/dotfiles/.env ] ; then
-	source ./setenv.sh
+if [ -f ../../.env ] ; then
 	rm /etc/sudoers.d/user
 	echo "$USER ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/user
 fi