From aa36dbf19094aec29c1aff8f4ac18f1ec13706c6 Mon Sep 17 00:00:00 2001
From: Philip Henning <mail@philip-henning.com>
Date: Sat, 30 Dec 2017 12:30:01 +0100
Subject: [PATCH] Add Systemd service for ssh-agent; end SSH_AGENT environment
 variable.

---
 config.yaml                                   |  4 ++++
 .../config/systemd/user/ssh-agent.service     | 20 +++++++++++++++++++
 dotfiles/profile                              |  6 ++++++
 3 files changed, 30 insertions(+)
 create mode 100644 dotfiles/config/systemd/user/ssh-agent.service

diff --git a/config.yaml b/config.yaml
index de8db94..c5973ea 100644
--- a/config.yaml
+++ b/config.yaml
@@ -36,6 +36,9 @@ dotfiles:
   f_profile:
     dst: ~/.profile
     src: profile
+  f_ssh-agent.service:
+    dst: ~/.config/systemd/user/ssh-agent.service
+    src: config/systemd/user/ssh-agent.service
   f_vimrc:
     dst: ~/.vimrc
     src: vimrc
@@ -69,3 +72,4 @@ profiles:
     - f_powerlevel9krc
     - d_colors
     - f_xresources
+    - f_ssh-agent.service
diff --git a/dotfiles/config/systemd/user/ssh-agent.service b/dotfiles/config/systemd/user/ssh-agent.service
new file mode 100644
index 0000000..a806574
--- /dev/null
+++ b/dotfiles/config/systemd/user/ssh-agent.service
@@ -0,0 +1,20 @@
+#
+# {{@@ env['dotdrop_warning'] @@}}
+#
+
+[Unit]
+Description=SSH key agent
+Wants=environment.target
+Before=environment.target
+IgnoreOnIsolate=true
+
+[Service]
+Type=forking
+Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
+ExecStart=/usr/bin/ssh-agent -a $SSH_AUTH_SOCK
+ExecStartPost=/usr/bin/systemctl --user set-environment SSH_AUTH_SOCK=${SSH_AUTH_SOCK}
+#ExecStop=/usr/bin/ssh-agent -k
+ExecStopPost=/bin/rm ${SSH_AUTH_SOCK}
+
+[Install]
+WantedBy=default.target
diff --git a/dotfiles/profile b/dotfiles/profile
index 16c256f..527c535 100644
--- a/dotfiles/profile
+++ b/dotfiles/profile
@@ -2,9 +2,15 @@
 # {{@@ env['dotdrop_warning'] @@}}
 #
 
+# Set XDG_CONFIG_HOME
 XDG_CONFIG_HOME="$HOME/.config"
 export XDG_CONFIG_HOME
+# SSH Agent (KeeAgent)
+SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
+export SSH_AUTH_SOCK
+# Use vim as editor on X
 VISUAL='vim'
 export VISUAL
+# Use vim as standard editor
 EDITOR='vim'
 export EDITOR