diff --git a/roles/admin.nix b/roles/admin.nix
index c2bde38..5607bc7 100644
--- a/roles/admin.nix
+++ b/roles/admin.nix
@@ -14,6 +14,7 @@ in {
     unstable.kustomize
     unstable.vault
 
+    docker-compose
     fuse-overlayfs
     qemu
 
diff --git a/roles/base.nix b/roles/base.nix
index c0d9ea2..75605ce 100644
--- a/roles/base.nix
+++ b/roles/base.nix
@@ -53,10 +53,20 @@ in {
       export EDITOR=nvim
       export STARSHIP_CONFIG=/etc/starship.toml
 
-      if [ -z "$SSH_AUTH_SOCK" ]; then
-          eval $(ssh-agent)
+      if [ -f ~/.ssh/agent.env ] ; then
+          . ~/.ssh/agent.env > /dev/null
+          if ! kill -0 "$SSH_AGENT_PID" > /dev/null 2>&1; then
+              echo "Stale agent file found. Spawning a new agent. "
+              eval `ssh-agent | tee ~/.ssh/agent.env`
+              ssh-add
+          fi
+      else
+          echo "Starting ssh-agent"
+          eval `ssh-agent | tee ~/.ssh/agent.env`
+          ssh-add
       fi
 
+
       set_win_title() {
         echo -ne "\033]0;$USER@$HOSTNAME: $PWD\007"
       }
@@ -91,6 +101,7 @@ in {
       less = "bat -p";
       ls = "ls --color=auto";
       vim = "nvim";
+      sink = "VAULT_TOKEN=$(vault token lookup -format=json | jq -r .data.id) ENVIRONMENTS=staging ~/git/bitsbeats/vault-sink/sink";
     };
   };