diff --git a/development.nix b/development.nix
index 8e4bdd9..5d4bc73 100644
--- a/development.nix
+++ b/development.nix
@@ -8,7 +8,7 @@
       user = {
         email = "vili.m.sinerva@gmail.com";
         name = "Vili Sinervä";
-        signingkey = "/home/vili/.ssh/id_ed25519_sk.pub";
+        signingkey = "/home/vili/.ssh/id_ed25519.pub";
       };
       merge = {
         ff = "true";
diff --git a/onlykey.nix b/onlykey.nix
index f3abf4f..93f767f 100644
--- a/onlykey.nix
+++ b/onlykey.nix
@@ -19,8 +19,17 @@
 
     onlykey-cli
     onlykey-agent
+    gpa
   ];
 
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryPackage = pkgs.pinentry-curses;
+  };
   hardware.onlykey.enable = true;
+  environment.variables = {
+    GNUPGHOME = "~/.gnupg/onlykey";
+  };
+
   security.pam.u2f.enable = true;
 }