Update .zshrc and refactor related files as needed

This commit is contained in:
2025-04-04 16:55:39 -05:00
parent a277b12884
commit 5f59b4f86d
12 changed files with 54 additions and 44 deletions

View File

@@ -3,49 +3,47 @@ set -o vi
# env vars
export EDITOR='vim' # TODO: update to nvim once configured
export HOMEBOX=$HOME'/dbox'
export DEVDIR=$HOME'/dev'
export HOME_BOX="$HOME/dbox"
export DIR_DEV="$HOME/dev"
export DIR_CONFIG="$HOME/.config"
export XDG_CONFIG_HOME=$DIR_CONFIG
export DIR_LOCAL="$HOME/.local"
export DIR_BUILD="$DIR_LOCAL/build"
# path updates
export PATH=$HOME/.local/bin:$HOME/.local/scripts:$PATH
export PATH=$DIR_LOCAL/bin:$DIR_LOCAL/scripts:$PATH
export PATH=$PATH:/opt/homebrew/opt/ccache/libexec
export PATH=$PATH:~/bin/android-sdk-darwin/platform-tools:/opt/homebrew/opt/ccache/libexec
# executable name overrides
alias ls='ls -F'
#alias vim='nvim'
# shortcuts for common commands
alias 3e='echo;echo;echo'
alias 12e='3e;3e;3e;3e'
alias cl='clear; '
alias cls='clear;ls'
# executable name overrides
alias ls='ls -F'
alias youtube-dl='youtube-dl --write-info-json'
# git stuff
alias gfo='git fetch origin'
alias gpo='git pull origin'
alias gfpo='git fetch origin; git pull origin'
# executable renames/paths
alias youtube-dl='youtube-dl --write-info-json'
# misc commands
alias pdt='ping -c 4 drinkingtea.net'
alias weather='curl wttr.in'
alias shrug='echo "¯\\_(ツ)_/¯"'
[[ -e $HOME/.profile ]] && source $HOME/.profile
[[ -e "$HOME/.profile" ]] && source "$HOME/.profile"
# add machine-specific configs as appropriate
[[ -a $HOME/.config/zsh/.zshrc-life-system ]] \
&& source $HOME/.config/zsh/.zshrc-life-system
[[ -a "$DIR_CONFIG/zsh/.zshrc-life-system" ]] &&
source "$DIR_CONFIG/zsh/.zshrc-life-system"
# TODO: refactor the below so that general dev is separate from rs specific stuff
[[ -a $HOME/.config/zsh/.zshrc-job-rs ]] \
&& source $HOME/.config/zsh/.zshrc-job-rs
[[ -a $DIR_CONFIG/zsh/.zshrc-job-rs ]] &&
source $DIR_CONFIG/zsh/.zshrc-job-rs
alias lintjs='npx prettier --write'
export DEVKITARM=/opt/devkitpro/devkitARM
. /opt/homebrew/opt/asdf/libexec/asdf.sh # TODO: ensure not duplicated asdf logic