edit gpg keys

home/c/programs/git/default.nix

@@ -4,7 +4,7 @@
 
     userName = "Callum Leslie";
     userEmail = "git@cleslie.uk";
-    signing.key = "D382C4AFEECEAA90";
+    signing.key = "03B01F427831BCFD!";
     signing.signByDefault = true;
 
     ignores = [".direnv/"];
@@ -15,7 +15,7 @@
         contents = {
           user = {
             email = "psycl6@nottingham.ac.uk";
-            signingKey = "5A944DF89B6F65AC";
+            signingKey = "14861F1282EFB5C8!";
           };
           credential = {helper = "store";};
         };

home/c/services/default.nix

@@ -1,4 +1,4 @@
-{...}: {
+{pkgs, ...}: {
   imports = [./mako ./kanshi];
   services = {
     network-manager-applet.enable = true;
@@ -6,6 +6,7 @@
     gpg-agent = {
       enable = true;
       enableSshSupport = true;
+      pinentryPackage = pkgs.pinentry-gnome3;
     };
   };
 }

hosts/artemis/configuration.nix

@@ -31,6 +31,7 @@
     vim
     gnome.adwaita-icon-theme
     wget
+    pinentry
     fzf
     nil
     killall