diff --git a/aliases b/aliases index f0f3306..740873b 100644 --- a/aliases +++ b/aliases @@ -6,21 +6,16 @@ alias gp='git push' alias gs='git status' # ls -alias lsd="ls -d" alias ll='ls -alh' # System Utils alias brewup='cl; brew update; brew upgrade; brew upgrade --cask; brew cleanup -s; brew doctor --verbose | grep -A 1 --color=never "Homebrew Version"' alias cl='clear' -alias sleep="open /System/Library/CoreServices/ScreenSaverEngine.app" alias ta="tmux a -t" 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; 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' - -# School -alias 305='cd /Users/smparkin/Library/Mobile\ Documents/com\~apple\~CloudDocs/CalPoly/2020-21/Spring21/CSC305' +alias src='omz reload' diff --git a/gitignore_global b/gitignore_global index 60166c7..23a3ee0 100644 --- a/gitignore_global +++ b/gitignore_global @@ -43,4 +43,5 @@ cov.xml launch.json settings.json sftp.json -.coverage \ No newline at end of file +.coverage +secrets diff --git a/zshrc b/zshrc index a7c81f4..44e5129 100644 --- a/zshrc +++ b/zshrc @@ -19,7 +19,6 @@ DISABLE_UNTRACKED_FILES_DIRTY="true" plugins=( colored-man-pages iterm2 - zsh_reload zsh-navigation-tools shrink-path ) @@ -31,14 +30,7 @@ if [ "$OSTYPE" = "Darwin" ]; then source ~/.iterm2_shell_integration.zsh fi -export EDITOR="/usr/local/bin/vim" -shownetinfo -if [ "$OSTYPE" = "Linux" ]; then - echo "" -elif [ "$OSTYPE" = "Darwin" ]; then - ssh-add -K ~/.ssh/id_rsa 2>/dev/null - batt -fi +export EDITOR="/opt/homebrew/bin/vim" # configure homebrew for arm and x86 if [ "$OSTYPE" = "Darwin" ]; then ARCH=$(uname -m) @@ -46,11 +38,20 @@ if [ "$OSTYPE" = "Darwin" ]; then 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 PATH="/usr/local/bin:$PATH" export PATH="/usr/local/sbin:$PATH" fi fi -export PATH="/opt/homebrew/opt/openjdk/bin:$PATH" export DEVKITPRO="/opt/devkitpro" export DEVKITARM="/opt/devkitpro/devkitARM" + +shownetinfo +if [ "$OSTYPE" = "Linux" ]; then + echo "" +elif [ "$OSTYPE" = "Darwin" ]; then + ssh-add -K ~/.ssh/id_rsa 2>/dev/null + batt +fi