080409a5a71359021c347a4e23e29e9514ef151a

 1diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
 2index a1e64ad0f119fdd627ae8f9a82d41d987d82bb34..2fb8d54624dcfa86b49e53817a7168699ec01bd0 100644
 3--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
 4+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
 5@@ -27,7 +27,7 @@
 6 #   Florent Thoumie and Jonas Pfenniger
 7 #
 8 
 9-local _plugin__ssh_env=$HOME/.ssh/environment-$HOST
10+local _plugin__ssh_env
11 local _plugin__forwarding
12 
13 function _plugin__start_agent()
14@@ -42,12 +42,20 @@ function _plugin__start_agent()
15   . ${_plugin__ssh_env} > /dev/null
16 
17   # load identies
18-  zstyle -a :omz:plugins:ssh-agent identities identities 
19+  zstyle -a :omz:plugins:ssh-agent identities identities
20   echo starting ssh-agent...
21 
22   /usr/bin/ssh-add $HOME/.ssh/${^identities}
23 }
24 
25+# Get the filename to store/lookup the environment from
26+if (( $+commands[scutil] )); then
27+  # It's OS X!
28+  _plugin__ssh_env="$HOME/.ssh/environment-$(scutil --get ComputerName)"
29+else
30+  _plugin__ssh_env="$HOME/.ssh/environment-$HOST"
31+fi
32+
33 # test if agent-forwarding is enabled
34 zstyle -b :omz:plugins:ssh-agent agent-forwarding _plugin__forwarding
35 if [[ ${_plugin__forwarding} == "yes" && -n "$SSH_AUTH_SOCK" ]]; then