From 1c22927508cab13fa47920ea5b1d8f5ccb923d7b Mon Sep 17 00:00:00 2001
From: Stephen <smparkin@calpoly.edu>
Date: Wed, 20 Jan 2021 18:01:01 -0800
Subject: [PATCH] remove lab check

---
 Brewfile |  4 +---
 aliases  |  9 +++++----
 zshrc    | 26 +++++++++++++-------------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/Brewfile b/Brewfile
index bc04d5e..cdc0dfe 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,5 +1,4 @@
 tap "adoptopenjdk/openjdk"
-tap "cjbassi/gotop"
 tap "homebrew/bundle"
 tap "homebrew/cask"
 tap "homebrew/cask-drivers"
@@ -14,7 +13,7 @@ brew "freetype"
 brew "fontconfig"
 brew "openssl@1.1"
 brew "xz"
-brew "python@3.9"
+brew "python3"
 brew "cmake"
 brew "cmatrix"
 brew "cocoapods"
@@ -64,7 +63,6 @@ brew "zsh-completions"
 brew "zsh-history-substring-search"
 brew "zsh-syntax-highlighting"
 brew "zzz"
-brew "cjbassi/gotop/gotop"
 cask "adoptopenjdk8"
 cask "appcleaner"
 cask "burp-suite"
diff --git a/aliases b/aliases
index 4ae9207..f6e07d5 100644
--- a/aliases
+++ b/aliases
@@ -18,9 +18,10 @@ alias tn="tmux new-session -s"
 alias gcc="gcc -g"
 alias hora='date "+%H:%M:%S"'
 alias wthr='curl wttr.in/san_luis_obispo'
-alias nf='cl; neofetch; neofetch | grep OS | cut -d " " -f2 -f3 -f4 -f5 -f6 | figlet -w 100; shownetinfo && lab && batt'
+alias nf='cl; neofetch; shownetinfo && lab && batt'
 
 # School
-alias glp='~/Development/gp.sh'
-alias 429='cd "/Users/smparkin/Library/Mobile Documents/com~apple~CloudDocs/CalPoly/2020-21/Fall20/CSC 429"'
-alias 321='cd "/Users/smparkin/Library/Mobile Documents/com~apple~CloudDocs/CalPoly/2020-21/Fall20/CPE 321"' 
+alias 429='cd /Users/smparkin/Library/Mobile\ Documents/com\~apple\~CloudDocs/CalPoly/2020-21/Winter21/CSC429'
+alias 484='cd /Users/smparkin/Library/Mobile\ Documents/com\~apple\~CloudDocs/CalPoly/2020-21/Winter21/CSC484' 
+alias 402='cd /Users/smparkin/Library/Mobile\ Documents/com\~apple\~CloudDocs/CalPoly/2020-21/Winter21/CSC402'
+alias 217='cd /Users/smparkin/Library/Mobile\ Documents/com\~apple\~CloudDocs/CalPoly/2020-21/Winter21/COMS217'
diff --git a/zshrc b/zshrc
index cc0a42d..96a6344 100644
--- a/zshrc
+++ b/zshrc
@@ -1,9 +1,9 @@
 # Path to your oh-my-zsh installation.
 OSTYPE=$(uname -s)
 if [ "$OSTYPE" = "Linux" ]; then
-	export ZSH="/home/smparkin/.oh-my-zsh"
+    export ZSH="/home/smparkin/.oh-my-zsh"
 elif [ "$OSTYPE" = "Darwin" ]; then
-	export ZSH="/Users/smparkin/.oh-my-zsh"
+    export ZSH="/Users/smparkin/.oh-my-zsh"
 fi
 
 # Set name of the theme to load
@@ -31,19 +31,19 @@ if [ "$OSTYPE" = "Darwin" ]; then
     source ~/.iterm2_shell_integration.zsh
 fi
 
-export DEVKITPRO=/opt/devkitpro
-export DEVKITARM=${DEVKITPRO}/devkitARM
-export DEVKITPPC=${DEVKITPRO}/devkitPPC
-
-export PATH=${DEVKITPRO}/tools/bin:$PATH
-
 export EDITOR="/usr/local/bin/vim"
-export PATH="/usr/local/sbin:$PATH"
-export PATH="/usr/local/opt/openssl/bin:$PATH"
 shownetinfo
 if [ "$OSTYPE" = "Linux" ]; then
-	echo ""
+    echo ""
 elif [ "$OSTYPE" = "Darwin" ]; then
-        ssh-add -K ~/.ssh/id_rsa 2>/dev/null
-        batt
+    ssh-add -K ~/.ssh/id_rsa 2>/dev/null
+    batt
+fi
+# configure homebrew for arm and x86
+ARCH=$(uname -m)
+if [ "$ARCH" = "arm64" ]; then
+    export PATH="/opt/homebrew/bin:$PATH"
+    export PATH="/opt/homebrew/sbin:$PATH"
+elif [ "$ARCH" = "x86_64" ]; then
+    export PATH="/usr/local/bin:$PATH"
 fi