diff --git a/general.nix b/general.nix
index 412a265..7fff46b 100644
--- a/general.nix
+++ b/general.nix
@@ -93,6 +93,13 @@ in
     documentation.man.generateCaches = true;
 
 
+    environment.shellInit = concatStringsSep "\n" [
+      ''export GPG_TTY="$(tty)"''
+      ''gpg-connect-agent /bye''
+      ''export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"''
+    ];
+
+
     nixpkgs.localSystem.system = builtins.currentSystem;
     nixpkgs.localSystem.platform  = lib.systems.platforms.pc // {
       gcc.arch = cfg.cpuArch;
diff --git a/services.nix b/services.nix
index a9f495b..3bdc018 100644
--- a/services.nix
+++ b/services.nix
@@ -173,10 +173,15 @@ in {
     programs.gnupg = {
       agent.enable = true;
       dirmngr.enable = true;
+      agent.pinentryFlavor = "curses";
       agent.enableSSHSupport = true;
       agent.enableExtraSocket = true;
       agent.enableBrowserSocket = true;
     };
+    programs.ssh.startAgent = false;
+
+    # SmartCards
+    services.pcscd.enable = true;
 
     services.avahi.enable = true; # .lan/.local resolution
     services.avahi.nssmdns = true; # .lan/.local resolution