diff --git a/zsh/dot-zshrc b/zsh/dot-zshrc
index 300b00f..f6270bc 100644
--- a/zsh/dot-zshrc
+++ b/zsh/dot-zshrc
@@ -1,5 +1,23 @@
 source ~/.env
 
+# $PATH setup
+case `uname` in
+Darwin)
+export PATH=/Users/myockey/.local/bin:$PATH
+export PATH=/Users/myockey/.opencode/bin:$PATH
+export PATH=/Users/myockey/go/bin:$PATH
+;;
+Linux)
+export PATH=/home/myockey/.local/bin:$PATH
+export PATH=/home/myockey/.opencode/bin:$PATH
+export PATH=/home/myockey/go/bin:$PATH
+;;
+esac
+
+# Zsh Completions
+autoload -Uz compinit
+compinit
+
 # direnv
 eval "$(direnv hook zsh)"
 
@@ -18,8 +36,15 @@ if command -v pyenv &>/dev/null; then
   eval "$(pyenv init -)"
 fi
 
-autoload -Uz compinit
-compinit
+# opencode
+if command -v opencode &>/dev/null; then
+  eval "$(opencode completion)"
+else
+  curl -fsSL https://opencode.ai/install | bash
+  eval "$(opencode completion)"
+fi
+
+
 
 # ZOxide, cd alternative
 eval "$(zoxide init --cmd cd zsh)"
@@ -72,18 +97,6 @@ for file in $HOME/.functions/*.zsh; do
 done
 source $HOME/.scripts/geometry/geometry.zsh
 
-case `uname` in
-  Darwin)
-    export PATH=/Users/myockey/.local/bin:$PATH
-    export PATH=/Users/myockey/.opencode/bin:$PATH
-    export PATH=/Users/myockey/go/bin:$PATH
-  ;;
-  Linux)
-    export PATH=/home/myockey/.local/bin:$PATH
-    export PATH=/home/myockey/.opencode/bin:$PATH
-    export PATH=/home/myockey/go/bin:$PATH
-  ;;
-esac
 
 . "$HOME/.atuin/bin/env"
 
@@ -97,3 +110,6 @@ eval "$(atuin gen-completions --shell zsh)"
 # bun
 export BUN_INSTALL="$HOME/.bun"
 export PATH="$BUN_INSTALL/bin:$PATH"
+
+# opencode
+export PATH=/Users/myockey/.opencode/bin:$PATH