diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
index 86af392..254c029 100644
--- a/.gnupg/gpg-agent.conf
+++ b/.gnupg/gpg-agent.conf
@@ -1,4 +1,4 @@
-#enable-ssh-support
+enable-ssh-support
 #disable-scdaemon
 pinentry-program /usr/bin/pinentry-qt
 #pinentry-program /usr/bin/pinentry-gnome3
diff --git a/.gnupg/gpg.conf b/.gnupg/gpg.conf
index d912947..b30aeaa 100644
--- a/.gnupg/gpg.conf
+++ b/.gnupg/gpg.conf
@@ -6,3 +6,5 @@ auto-key-locate local
 # It will disable options before this marked block, but it will
 # never change anything below these lines.
 
+
+default-key  3159FF4CB13EBFB4
\ No newline at end of file
diff --git a/.gnupg/sshcontrol b/.gnupg/sshcontrol
new file mode 100644
index 0000000..64079ab
--- /dev/null
+++ b/.gnupg/sshcontrol
@@ -0,0 +1,19 @@
+# List of allowed ssh keys.  Only keys present in this file are used
+# in the SSH protocol.  The ssh-add tool may add new entries to this
+# file to enable them; you may also add them manually.  Comment
+# lines, like this one, as well as empty lines are ignored.  Lines do
+# have a certain length limit but this is not serious limitation as
+# the format of the entries is fixed and checked by gpg-agent. A
+# non-comment line starts with optional white spaces, followed by the
+# keygrip of the key given as 40 hex digits, optionally followed by a
+# caching TTL in seconds, and another optional field for arbitrary
+# flags.   Prepend the keygrip with an '!' mark to disable it.
+
+# RSA key added on: 2018-02-28 21:02:35
+# Fingerprints:  MD5:dc:e3:ea:ff:c7:a7:fb:e3:69:ea:10:00:df:be:f9:13
+#                SHA256:iQmjjzK14TikjqC3p6H2ltVqPvbRevXJo27v9kx0P/w
+B39C21E22452C91FB4475C14F5FB2E6697005C10 0 confirm
+# Ed25519 key added on: 2018-02-28 21:02:46
+# Fingerprints:  MD5:e0:5e:b6:ae:f2:81:a6:38:23:e1:4b:b5:c2:69:77:f1
+#                SHA256:1TKB8Z257L8EHK8GWNxKgMhD8a+FAR+f+j3nnlcuNVM
+C33D6098996457FB6F446F0460C9180C4D2B36B2
diff --git a/.shell-env b/.shell-env
index ced821c..5f5fdaf 100644
--- a/.shell-env
+++ b/.shell-env
@@ -28,4 +28,10 @@ if [ -f "$HOME/.shell-env.local" ]; then
   . "$HOME/.shell-env.local"
 fi
 
+##
+## GPG/SSH Agent
+##
+gpgconf --launch gpg-agent export GPG_TTY=$(tty) export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+
+
 umask 022