From 10611070422a29e6a62fe80c06fb3d1e71e33680 Mon Sep 17 00:00:00 2001
From: Stephen Parkinson <smparkin@calpoly.edu>
Date: Thu, 17 Mar 2022 00:27:08 -0700
Subject: [PATCH] add more setup options

---
 aliases  |  3 ---
 setup.sh | 12 +++++++++---
 zshrc    |  6 ++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/aliases b/aliases
index cef8260..099db03 100644
--- a/aliases
+++ b/aliases
@@ -1,6 +1,4 @@
 # Git
-alias ga='git add *'
-alias gc='git commit -m'
 alias gcl='git clone'
 alias gp='git push'
 alias gs='git status'
@@ -16,7 +14,6 @@ alias tn="tmux new-session -s"
 alias gcc="gcc -g"
 alias wthr='curl wttr.in/san_luis_obispo'
 alias nf='cl; neofetch; shownetinfo && batt'
-alias servers='python3 /Users/smparkin/Development/server_stats/servers.py'
 alias hekate='python3 /Users/smparkin/Development/fusee-launcher/fusee-launcher.py /Users/smparkin/Development/fusee-launcher/hekate/hekate.bin'
 alias src='omz reload'
 
diff --git a/setup.sh b/setup.sh
index 5526b24..0d042a6 100755
--- a/setup.sh
+++ b/setup.sh
@@ -9,7 +9,7 @@ if [ "$OSTYPE" = "Linux" ]; then
         sudo apt install coreutils vim zsh jq python3 python3-pip -y
         sudo apt upgrade -y
     else
-        # pretty safe assumption that if not ubuntu were on arch
+        # pretty safe assumption that if not ubuntu its arch
         sudo pacman -Syu
         sudo pacman -Sy coreutils vim zsh jq python3
     fi
@@ -18,12 +18,18 @@ elif [ "$OSTYPE" = "Darwin" ]; then
     read homebrew
     if [ "$homebrew" = "y" ]; then
 	/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-        brew bundle install --file=Brewfile
+        echo "Restore from Brewfile? [y/n]"
+        read bundle
+        if [ "$bundle" = "y" ]; then
+            brew bundle install --file=Brewfile
+        else
+            brew install coreutils neofetch vim zsh jq python3
+        fi
     fi
 fi
 
 # silence login message
-touch .hushlogin
+touch ~/.hushlogin
 
 # get ohmyzsh setup
 git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh/
diff --git a/zshrc b/zshrc
index 9f2f02d..3b64853 100644
--- a/zshrc
+++ b/zshrc
@@ -37,15 +37,15 @@ if [ "$OSTYPE" = "Darwin" ]; then
         export EDITOR="/opt/homebrew/bin/vim"
         export PATH="/opt/homebrew/bin:$PATH"
         export PATH="/opt/homebrew/sbin:$PATH"
-        export PATH="/Users/smparkin/Library/Python/3.9/bin:$PATH"
         export PATH="/opt/homebrew/opt/openjdk/bin:$PATH"
-        export PATH="/Users/smparkin/Library/Python/2.7/bin:$PATH"
     elif [ "$ARCH" = "x86_64" ]; then
         export EDITOR="/usr/local/bin/vim"
         export PATH="/usr/local/bin:$PATH"
         export PATH="/usr/local/sbin:$PATH"
     fi
 fi
+export PATH="/Users/smparkin/Library/Python/2.7/bin:$PATH"
+export PATH="/Users/smparkin/Library/Python/3.9/bin:$PATH"
 export PATH="/opt/devkitpro/pacman/bin:$PATH"
 export DEVKITPRO="/opt/devkitpro"
 export DEVKITARM="/opt/devkitpro/devkitARM"
@@ -59,5 +59,7 @@ elif [ "$OSTYPE" = "Darwin" ]; then
     LAPTOP=$(system_profiler SPHardwareDataType | grep "Model Name" | grep "Book")
     if [ "$LAPTOP" != "" ]; then
         batt
+    else
+        echo ""
     fi
 fi