diff --git a/src_files/.config/zsh/.zshrc b/src_files/.config/zsh/.zshrc
index 353de63..37422d2 100644
--- a/src_files/.config/zsh/.zshrc
+++ b/src_files/.config/zsh/.zshrc
@@ -16,22 +16,18 @@ alias tms='tmux-sessionizer'
 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'
-
 # misc commands
 alias pdt='ping -c 4 drinkingtea.net'
+alias ppw='ping -c 4 pinewoods.xyz'
 alias weather='curl wttr.in'
 alias shrug='echo "¯\\_(ツ)_/¯"'
+alias journal="cd $DIR_HOME_BOX; $EDITOR .current-journal"
 
 # source extensions and system-specific files
 [[ -e "$HOME/.profile" ]] && source "$HOME/.profile" # TODO: do i want to source .profile?
+[[ -a "$ZDOTDIR/zsh-general-dev" ]] && source "$ZDOTDIR/zsh-general-dev"
 [[ -a "$ZDOTDIR/zsh-life-system" ]] && source "$ZDOTDIR/zsh-life-system"
-[[ -a "$ZDOTDIR/zsh-job-rs" ]] && source "$ZDOTDIR/zsh-job-rs"
 
 # TODO: refactor the below; simplify or at least move elsewhere
-alias lintjs='npx prettier --write'
 export DEVKITARM=/opt/devkitpro/devkitARM
 . /opt/homebrew/opt/asdf/libexec/asdf.sh # TODO: ensure not duplicated asdf logic
diff --git a/src_files/.config/zsh/zsh-general-dev b/src_files/.config/zsh/zsh-general-dev
new file mode 100644
index 0000000..43c0025
--- /dev/null
+++ b/src_files/.config/zsh/zsh-general-dev
@@ -0,0 +1,23 @@
+# set env vars, path updates, etc
+[[ -a $HOME/.local-box-vars ]] \
+  && source $HOME/.local-box-vars \
+  && . /usr/local/opt/asdf/libexec/asdf.sh
+
+# login shortcuts
+alias assume="source assume"
+alias login-aws='aws sso login --profile'
+alias login-aws-id-list="grep sso_account_id $HOME/.aws/config"
+
+# git stuff
+alias gfo='git fetch origin'
+alias git-push-to-temp='git branch -D temp; git checkout -b temp; git push origin temp -uf; git checkout -'
+alias gpdev='git-push-to-temp'
+alias gpo='git pull origin'
+
+# code/test/linter run and build commands
+alias bel='bundle exec standardrb'
+alias bet='bundle exec rspec'
+alias lintjs='npx prettier --write'
+alias prl='poetry run black'
+alias prt='poetry run pytest'
+
diff --git a/src_files/.config/zsh/zsh-job-rs b/src_files/.config/zsh/zsh-job-rs
deleted file mode 100644
index 6277cd3..0000000
--- a/src_files/.config/zsh/zsh-job-rs
+++ /dev/null
@@ -1,27 +0,0 @@
-# TODO: refactor this file; separate general dev from rs specific
-# set env vars, path updates, etc
-[[ -a $HOME/.rs-vars ]] \
-  && source $HOME/.rs-vars \
-  && export PATH=$PATH:$HOME/.rd/bin \
-  && . /usr/local/opt/asdf/libexec/asdf.sh
-
-# login shortcuts
-alias assume="source assume"
-alias login-bunk='aws sso login --profile'
-alias login-bunk-id-list="grep sso_account_id $HOME/.aws/config"
-alias login-pulumi-bunk='pulumi login '$PULUMI_LOGIN_TARGET'$(aws sts get-caller-identity --query Account --output text)'
-
-# git stuff
-alias git-push-to-develop='git branch -D develop; git checkout -b develop; git push origin develop -uf; git checkout -'
-alias gpdev='git-push-to-develop'
-
-# misc shortcuts
-alias journal="cd $DIR_HOME_BOX; $EDITOR .current-journal"
-alias kra="cd $DIR_HOME_BOX/process/kra; open .current_kra"
-alias gll="cd $DIR_DEV/git/lampo/gitlab"
-alias bet='bundle exec rspec'
-alias bel='bundle exec standardrb'
-alias belr='bundle exec rubocop'
-alias prt='poetry run pytest'
-alias prl='poetry run black'
-