[zsh] Resolve conflicts

2026-01-03 12:30:31 -05:00
parent 96ffe4d603
commit a161cdc40f
2 changed files with 43 additions and 1 deletions
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@ -6,7 +6,8 @@ export ZSH="$HOME/.oh-my-zsh"

 ZSH_THEME="robbyrussell"

-plugins=(git z fzf asdf direnv yarn)
+plugins=(git z fzf asdf direnv emacs yarn)
+eval $(ssh-agent)

 source $ZSH/oh-my-zsh.sh