From 84811e04eee70349ecebe105a89a2ef2fea715c6 Mon Sep 17 00:00:00 2001
From: Alex Kan <29241719+akan72@users.noreply.github.com>
Date: Fri, 29 May 2026 15:06:09 -0400
Subject: [PATCH 1/2] Clean up zshrc: stop sourcing bashrc, drop OMZ git
 plugin, fix shell conflicts

- Stop sourcing ~/.bashrc from zshrc (bash-specific syntax can break under zsh);
  inline the shared aliases/exports directly (extracted to shared.sh in follow-up)
- Remove the oh-my-zsh git plugin (custom git aliases shadow every alias it provides)
- Resolve set -o vi vs bindkey -e: drop 'set -o vi' from bashrc so zsh uses emacs
  line editing consistently (was silently overridden anyway)
- Resolve brew node vs nvm: remove brew "node" from Brewfile so nvm manages
  Node versions (per-project .nvmrc), matching the active setup
---
 Brewfile |  1 -
 bashrc   |  2 --
 zshrc    | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/Brewfile b/Brewfile
index 8054604..0d004fb 100644
--- a/Brewfile
+++ b/Brewfile
@@ -10,7 +10,6 @@ brew "lsd"
 brew "lua"
 brew "neovim"
 brew "mosh"
-brew "node"
 brew "postgresql@17"
 brew "pre-commit"
 brew "tmux"
diff --git a/bashrc b/bashrc
index 836a834..432fa67 100644
--- a/bashrc
+++ b/bashrc
@@ -1,8 +1,6 @@
 # ----
 # Basics
 
-set -o vi
-
 export LANG='en_US.UTF-8'
 
 # Ask uv to check resolved packages against malicious-package advisories.
diff --git a/zshrc b/zshrc
index 634c578..251135e 100644
--- a/zshrc
+++ b/zshrc
@@ -1,5 +1,82 @@
 # Basics
-source ~/.bashrc
+# bashrc is no longer sourced from zshrc (bash-specific syntax can break under zsh).
+# The shared aliases/exports below are inlined here; a follow-up extracts them to shared.sh.
+
+export LANG='en_US.UTF-8'
+export XDG_CONFIG_HOME="$HOME/dotfiles"
+export GPG_TTY=$(tty)
+
+# Homebrew (Intel + ARM) PATH
+export PATH="/usr/local/bin:${PATH}"
+export PATH="/opt/homebrew/bin:${PATH}"
+# Postgres
+export PATH="$(brew --prefix postgresql@17)/bin:${PATH}"
+
+# Aliases — general
+alias vi=nvim
+alias vim=nvim
+alias ls="lsd -al"
+alias claude="$HOME/.local/bin/claude"
+
+# Aliases — Docker
+alias d='docker'
+alias dc='docker compose'
+alias dcup='docker compose up'
+alias dsp='docker system prune --all --force'
+alias docker_rmi_dangling='docker rmi $(docker images -qa -f "dangling=true") -f'
+
+# Aliases — python
+alias python='python3.11'
+alias python3='python3.11'
+alias pip='python3.11 -m pip'
+alias pip3='pip'
+alias grepy='grep -r --include \*.py'
+alias greps='grep -r --include \*.sql'
+alias jpn='jupyter notebook'
+function ver {
+    pip list | grep $1
+}
+
+# Aliases — git
+alias g='git status'
+alias gs='git status'
+alias gf='git fetch'
+alias gm='git merge'
+alias ga='git add'
+alias gb='git branch'
+alias gc='git commit'
+alias gck='git checkout'
+alias gckb='git checkout -b'
+alias gd='git diff'
+alias gg='git grep'
+alias gl='git log --reverse -n 10'
+alias gpl='git pull'
+alias gp='git push'
+alias gdm='git diff main'
+alias gdnm='git diff --name-only origin/main'
+alias gcap='git checkout main && git pull'
+
+# Aliases — kube
+alias ku='kubectl'
+alias kuc='kubectl config'
+
+# Aliases — dbt
+alias docs="dbt docs generate; dbt docs serve"
+alias dbtb="dbt build"
+alias dbtc="dbt compile"
+alias dbtr="dbt run"
+
+# Aliases — rust
+alias cb="cargo build"
+alias cr="cargo run"
+alias ct="cargo test"
+
+# Aliases — modal
+alias md="modal deploy"
+alias mr="modal run"
+
+# Aliases — terraform
+alias tf="terraform"
 
 export ZSH="$HOME/.oh-my-zsh"
 export UPDATE_ZSH_DAYS=13
@@ -25,9 +102,8 @@ HIST_STAMPS="mm/dd/yyyy"
 COMPLETION_WAITING_DOTS="false"
 
 # Plugins
-plugins=(
-  git
-)
+# (OMZ git plugin removed — custom git aliases above shadow every alias it provides)
+plugins=()
 
 bindkey -e
 bindkey "^[begin" backward-word

From 9aeafbfe31a504dc4e9467f015a6f15de20933ab Mon Sep 17 00:00:00 2001
From: Alex Kan <29241719+akan72@users.noreply.github.com>
Date: Sun, 5 Jul 2026 09:44:13 -0400
Subject: [PATCH 2/2] Fix comment: OMZ git plugin shadowed the custom aliases,
 not vice versa

---
 zshrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zshrc b/zshrc
index 251135e..60c8323 100644
--- a/zshrc
+++ b/zshrc
@@ -102,7 +102,8 @@ HIST_STAMPS="mm/dd/yyyy"
 COMPLETION_WAITING_DOTS="false"
 
 # Plugins
-# (OMZ git plugin removed — custom git aliases above shadow every alias it provides)
+# (OMZ git plugin removed — it loads after the custom git aliases above and was
+# shadowing them, e.g. its gl='git pull' clobbered gl='git log --reverse -n 10')
 plugins=()
 
 bindkey -e