From c8f96ac2632fcd6546a1b3e71532f406e4e42bce Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Fri, 28 Feb 2020 12:16:25 +0300
Subject: [PATCH] Update modules/workspace/misc.nix modules/workspace/ssh.nix

---
 modules/workspace/misc.nix | 5 +++++
 modules/workspace/ssh.nix  | 8 --------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/modules/workspace/misc.nix b/modules/workspace/misc.nix
index 22d1a4e..e7e6f9f 100644
--- a/modules/workspace/misc.nix
+++ b/modules/workspace/misc.nix
@@ -34,6 +34,11 @@
         key = "687558B21E04FE92B255BED0E081FF12ADCB4AD5";
       };
     };
+    services.gpg-agent = {
+      enable = true;
+      enableSshSupport = true;
+    };
+    systemd.user.sockets.gpg-agent-ssh = lib.mkForce { };
     news.display = "silent";
     programs.command-not-found = {
       enable = true;
diff --git a/modules/workspace/ssh.nix b/modules/workspace/ssh.nix
index 5e3ee96..d087cea 100644
--- a/modules/workspace/ssh.nix
+++ b/modules/workspace/ssh.nix
@@ -18,14 +18,6 @@
     gpg-connect-agent /bye
     export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
   '';
-
-  programs = {
-    ssh.startAgent = false;
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-  };
   
   home-manager.users.balsoft.home.file.".gnupg/scdaemon.conf".text = "reader-port Yubico Yubi";