diff --git a/.DS_Store b/.DS_Store
index eeb7f84..aea35dc 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/brew/.Brewfile b/brew/.Brewfile
index 375d25b..377582c 100644
--- a/brew/.Brewfile
+++ b/brew/.Brewfile
@@ -26,3 +26,4 @@ brew "go"
 brew "wget"
 brew "jq"
 brew "ruby"
+brew "opencode"
diff --git a/macutil.sh b/macutil.sh
index 19803e7..2c5c7a5 100755
--- a/macutil.sh
+++ b/macutil.sh
@@ -26,7 +26,6 @@ DOTFILES_DIR="$HOME/dotfiles"
 if [ ! -d "$DOTFILES_DIR" ]; then
     echo "Cloning dotfiles..."
 git clone https://git@moo:dmm/dotfiles.git
-cd dotfiles
 fi
 cd "$DOTFILES_DIR"
 brew bundle --file=.Brewfile
@@ -34,6 +33,11 @@ brew bundle --file=.Brewfile
 stow .
 
 cd ~/
+TPM_DIR="$HOME/.config/tmux/plugins/tpm/"
+if [ ! -d "$TPM_DIR" ]; then
+    echo "Cloning tpm..."
+    git clone https://github.com/tmux-plugins/tpm ~/.config/tmux/plugins/tpm
+fi
 
 
 # Enable Touch ID for sudo
diff --git a/nvim/.DS_Store b/nvim/.DS_Store
index d5c3088..ac9e6f9 100644
Binary files a/nvim/.DS_Store and b/nvim/.DS_Store differ
diff --git a/tmux/.DS_Store b/tmux/.DS_Store
index 8916a61..ed79cc1 100644
Binary files a/tmux/.DS_Store and b/tmux/.DS_Store differ
diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf
index 2ee6db3..3c3ba5e 100644
--- a/tmux/.config/tmux/tmux.conf
+++ b/tmux/.config/tmux/tmux.conf
@@ -13,28 +13,6 @@ set -g status-style 'bg=default' # Completely transparent container
 
 set -g status-left-length 100
 set -g status-left "#[fg=#090E13,bg=colour6,bold] #S "
-# palette = 0=#090E13
-# palette = 1=#c4746e
-# palette = 2=#8a9a7b
-# palette = 3=#c4b28a
-# palette = 4=#8ba4b0
-# palette = 5=#a292a3
-# palette = 6=#8ea4a2
-# palette = 7=#a4a7a4
-# palette = 8=#5C6066
-# palette = 9=#e46876
-# palette = 10=#87a987
-# palette = 11=#e6c384
-# palette = 12=#7fb4ca
-# palette = 13=#938aa9
-# palette = 14=#7aa89f
-# palette = 15=#c5c9c7
-#
-# background = #090E13
-# foreground = #c5c9c7
-# cursor-color = #c5c9c7
-# selection-background = #22262D
-# selection-foreground = #c5c9c7
 
 set -g status-right ""
 
diff --git a/zshrc/.zshrc b/zshrc/.zshrc
index 462cd8b..dfde67d 100644
--- a/zshrc/.zshrc
+++ b/zshrc/.zshrc
@@ -1,14 +1,3 @@
-if [[ $(uname) != "Darwin" ]]; then
-	if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
-		XDG_CURRENT_DESKTOP=sway dbus-run-session sway
-	fi
-	bindkey "^[[1;5C" forward-word
-	bindkey "^[[1;5D" backward-word
-	bindkey "^[[3~" delete-char
-	bindkey "^[[5~" up-line
-	bindkey "^[[6~" down-line
-fi
-
 HISTFILE=~/.zsh_history
 HISTSIZE=100
 SAVEHIST=200
@@ -17,9 +6,7 @@ source "$HOME/.local/share/zinit/zinit.git/zinit.zsh"
 
 zinit light zsh-users/zsh-autosuggestions
 zinit light zdharma-continuum/fast-syntax-highlighting
-if [[ $(uname) == "Darwin" ]]; then
-	zinit light junegunn/fzf
-fi
+zinit light junegunn/fzf
 
 eval "$(starship init zsh)"
 eval "$(zoxide init --cmd cd zsh)"
@@ -30,32 +17,18 @@ autoload -Uz _zinit
 export PATH="$HOME/.local/bin:$PATH"
 
 alias cat="bat"
-alias rebuild="sudo darwin-rebuild switch --flake /etc/nix-darwin/#Andrews-MacBook-Air";
-alias enix="nvim /etc/nix-darwin/flake.nix"
 alias v="nvim"
 alias ls="eza -a"
 alias brew-update="brew update && brew upgrade && brew bundle --cleanup --zap --file=~/.Brewfile"
 alias cmake-update="sudo rm -rd build && cmake -S . -B build && cmake --build build"
 alias oasis="ssh oasis"
 
-# alias grep="rg"
-#
-if [[ $(uname) != "Darwin" ]]; then
-	alias update_world='doas emerge --ask --update --newuse --deep @world'
-	alias env="sh /home/andrew/personal/dotfiles/env_linux.sh"
-else
-	alias env='sh ~/personal/dotfiles/env_mac.sh'
-        export MANPAGER="sh -c 'sed -u -e \"s/\\x1B\\[[0-9;]*m//g; s/.\\x08//g\" | bat -p -l man'"
-        # export PATH="$HOME/.flutter/bin/:$PATH"
-	export GOOGLE_CLOUD_PROJECT="development-477121"
-	export HOMEBREW_NO_AUTO_UPDATE=1
-	export HOMEBREW_NO_ENV_HINTS=1
-	export HOMEBREW_DISPLAY_INSTALL_TIMES=0
-	export HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS=1
-	export HOMEBREW_NO_EMOJI=1
-fi
-
-### End of Zinit's installer chunk
+export MANPAGER="sh -c 'sed -u -e \"s/\\x1B\\[[0-9;]*m//g; s/.\\x08//g\" | bat -p -l man'"
+export HOMEBREW_NO_AUTO_UPDATE=1
+export HOMEBREW_NO_ENV_HINTS=1
+export HOMEBREW_DISPLAY_INSTALL_TIMES=0
+export HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS=1
+export HOMEBREW_NO_EMOJI=1
 
 # bun completions
 [ -s "/Users/andrew/.bun/_bun" ] && source "/Users/andrew/.bun/_bun"