diff --git a/aliases b/aliases index f6e07d5..9c8027c 100644 --- a/aliases +++ b/aliases @@ -19,6 +19,7 @@ alias gcc="gcc -g" alias hora='date "+%H:%M:%S"' alias wthr='curl wttr.in/san_luis_obispo' alias nf='cl; neofetch; shownetinfo && lab && batt' +alias servers='python3 /Users/smparkin/Development/server_stats/servers.py' # School alias 429='cd /Users/smparkin/Library/Mobile\ Documents/com\~apple\~CloudDocs/CalPoly/2020-21/Winter21/CSC429' diff --git a/functions b/functions index 8dfd6be..bf0f53e 100644 --- a/functions +++ b/functions @@ -1,46 +1,46 @@ function shownetinfo() { - OSTYPE=$(uname -s) - IP="" - GW="" - NET="" + OSTYPE=$(uname -s) + IP="" + GW="" + NET="" - if [ "$OSTYPE" = "Linux" ]; then - IP=$(ifconfig | grep -v "127.0.0.1" | grep "inet " | head -1 | cut -d " " -f10) - NET=$(ip route | grep default | cut -d " " -f3) - elif [ "$OSTYPE" = "Darwin" ]; then - NET=$(system_profiler SPNetworkDataType | grep "Router:" | cut -c 19-30 | head -1) - IP=$(ifconfig | grep -v "127.0.0.1" | grep "inet " | head -1 | cut -d " " -f2) - fi - if [ "$NET" != "" ]; then - GW=$(curl -s icanhazip.com) - fi - tput setaf 7; tput bold; echo -en "Net: " - tput sgr0 - tput setaf 7; echo -en "internal $IP" - if [ "$NET" != "" ]; then - echo -en ", external $GW" - echo -en ", router $NET" - fi - tput sgr0 + if [ "$OSTYPE" = "Linux" ]; then + IP=$(ip addr show | grep -v "127.0.0.1" | grep "inet " | head -1 | cut -d " " -f6 | cut -d "/" -f1) + NET=$(ip route | grep default | cut -d " " -f3) + elif [ "$OSTYPE" = "Darwin" ]; then + NET=$(system_profiler SPNetworkDataType | grep "Router:" | cut -c 19-30 | head -1) + IP=$(ifconfig | grep -v "127.0.0.1" | grep "inet " | head -1 | cut -d " " -f2) + fi + if [ "$NET" != "" ]; then + GW=$(curl -s icanhazip.com) + fi + tput setaf 7; tput bold; echo -en "Net: " + tput sgr0 + tput setaf 7; echo -en "internal $IP" + if [ "$NET" != "" ]; then + echo -en ", external $GW" + echo -en ", router $NET" + fi + tput sgr0 } function batt() { - tput setaf 7 - tput bold - echo -en " | " - tput sgr0 - tput setaf 7; tput bold; echo -en "Bat: " - tput sgr0 - tput setaf 7 - echo -en $(pmset -g batt | grep -Eo "\d+%" | cut -d% -f1) - echo "%" - tput sgr0 + tput setaf 7 + tput bold + echo -en " | " + tput sgr0 + tput setaf 7; tput bold; echo -en "Bat: " + tput sgr0 + tput setaf 7 + echo -en $(pmset -g batt | grep -Eo "\d+%" | cut -d% -f1) + echo "%" + tput sgr0 } function lab() { - tput setaf 7; tput bold; echo -en "Lab: " - tput sgr0 - tput setaf 7 - echo -en $(curl -s https://thewhitehat.club/api/v1/status | jq ".data.status" | tr -d "\"") - tput sgr0 + tput setaf 7; tput bold; echo -en "Lab: " + tput sgr0 + tput setaf 7 + echo -en $(curl -s https://thewhitehat.club/api/v1/status | jq ".data.status" | tr -d "\"") + tput sgr0 } diff --git a/zshrc b/zshrc index 96a6344..fcc1b0f 100644 --- a/zshrc +++ b/zshrc @@ -40,10 +40,12 @@ elif [ "$OSTYPE" = "Darwin" ]; then 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" +if [ "$OSTYPE" = "Darwin" ]; then + 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 fi