diff --git a/development.nix b/development.nix index 5d4bc73..f725834 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.pub"; + signingkey = "DF8FEAF54EFAC996!"; }; merge = { ff = "true"; @@ -16,7 +16,6 @@ pull = { ff = "only"; }; - gpg.format = "ssh"; commit.gpgsign = "true"; }; }; diff --git a/onlykey.nix b/onlykey.nix index 1e56142..93f767f 100644 --- a/onlykey.nix +++ b/onlykey.nix @@ -27,9 +27,9 @@ pinentryPackage = pkgs.pinentry-curses; }; hardware.onlykey.enable = true; - #environment.variables = { - # GNUPGHOME = "~/.gnupg/onlykey"; - #}; + environment.variables = { + GNUPGHOME = "~/.gnupg/onlykey"; + }; security.pam.u2f.enable = true; }