From 108b19163218f1fbfa8467d5d0f6ee602c869844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vili=20Sinerv=C3=A4?= Date: Thu, 17 Oct 2024 01:20:15 +0300 Subject: [PATCH] Revert "Remove GPG OnlyKey" This reverts commit 50d9ebb7c374fd5b7695363672618509cc7a5967. --- development.nix | 2 +- onlykey.nix | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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; }