From 42ae135d38bfeae8a5fdd5f80dbc2b1aec54d177 Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Mon, 21 Aug 2017 15:01:36 +0200
Subject: [PATCH] gpg-agent: add zsh support

---
 modules/services/gpg-agent.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/services/gpg-agent.nix b/modules/services/gpg-agent.nix
index 1d015397..03affd21 100644
--- a/modules/services/gpg-agent.nix
+++ b/modules/services/gpg-agent.nix
@@ -6,6 +6,12 @@ let
 
   cfg = config.services.gpg-agent;
 
+  gpgInitStr = ''
+    GPG_TTY="$(tty)"
+    export GPG_TTY
+    gpg-connect-agent updatestartuptty /bye > /dev/null
+  '';
+
 in
 
 {
@@ -44,11 +50,8 @@ in
           SSH_AUTH_SOCK = "\${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh";
         };
 
-      programs.bash.initExtra = ''
-        GPG_TTY="$(tty)"
-        export GPG_TTY
-        gpg-connect-agent updatestartuptty /bye > /dev/null
-      '';
+      programs.bash.initExtra = gpgInitStr;
+      programs.zsh.initExtra = gpgInitStr;
     }
 
     # The systemd units below are direct translations of the