diff --git a/tree/.config/fish/config.fish.tpl b/tree/.config/fish/config.fish.tpl
index a1641fa..7bc305a 100644
--- a/tree/.config/fish/config.fish.tpl
+++ b/tree/.config/fish/config.fish.tpl
@@ -43,6 +43,8 @@ abbr --add grc gitrecap # custom recap command
 
 fish_vi_key_bindings
 
+fish_ssh_agent
+
 zoxide init fish | source
 
 starship init fish | source
diff --git a/tree/.config/fish/functions/fish_ssh_agent.fish b/tree/.config/fish/functions/fish_ssh_agent.fish
new file mode 100644
index 0000000..5960b75
--- /dev/null
+++ b/tree/.config/fish/functions/fish_ssh_agent.fish
@@ -0,0 +1,32 @@
+function __ssh_agent_is_started -d "check if ssh agent is already started"
+   if begin; test -f $SSH_ENV; and test -z "$SSH_AGENT_PID"; end
+      source $SSH_ENV > /dev/null
+   end
+
+   if test -z "$SSH_AGENT_PID"
+      return 1
+   end
+
+   ps -ef | grep $SSH_AGENT_PID | grep -v grep | grep -q ssh-agent
+   #pgrep ssh-agent
+   return $status
+end
+
+
+function __ssh_agent_start -d "start a new ssh agent"
+   ssh-agent -c | sed 's/^echo/#echo/' > $SSH_ENV
+   chmod 600 $SSH_ENV
+   source $SSH_ENV > /dev/null
+   true  # suppress errors from setenv, i.e. set -gx
+end
+
+
+function fish_ssh_agent --description "Start ssh-agent if not started yet, or uses already started ssh-agent."
+   if test -z "$SSH_ENV"
+      set -xg SSH_ENV $HOME/.ssh/environment
+   end
+
+   if not __ssh_agent_is_started
+      __ssh_agent_start
+   end
+end