diff --git a/outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.service b/outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.service
new file mode 100644
index 0000000..e6a5d36
--- /dev/null
+++ b/outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=trezor-gpg-agent
+Requires=trezor-gpg-agent.socket
+
+[Service]
+Type=simple
+Environment="GNUPGHOME=%h/.gnupg/trezor"
+Environment="PATH=/bin:/usr/bin:/usr/local/bin:%h/.local/bin"
+ExecStart=%h/.local/bin/trezor-gpg-agent --pin-entry-binary=/usr/bin/pinentry-gnome3 --passphrase-entry-binary=/usr/bin/pinentry-gnome3
diff --git a/outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.socket b/outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.socket
new file mode 100644
index 0000000..9dce37a
--- /dev/null
+++ b/outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.socket
@@ -0,0 +1,11 @@
+[Unit]
+Description=trezor-gpg-agent socket
+
+[Socket]
+ListenStream=%t/gnupg/S.gpg-agent
+FileDescriptorName=std
+SocketMode=0600
+DirectoryMode=0700
+
+[Install]
+WantedBy=sockets.target