From 497876d1c993445080028d9912135a8661da8d9a Mon Sep 17 00:00:00 2001
From: Callum Leslie <git@cleslie.uk>
Date: Thu, 12 Sep 2024 12:27:35 +0100
Subject: [PATCH 1/2] new gpg keys

---
 home/c/programs/git/default.nix | 4 ++--
 home/c/services/default.nix     | 3 ++-
 hosts/artemis/configuration.nix | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/home/c/programs/git/default.nix b/home/c/programs/git/default.nix
index c10a2b2..48ba412 100644
--- a/home/c/programs/git/default.nix
+++ b/home/c/programs/git/default.nix
@@ -4,7 +4,7 @@
 
     userName = "Callum Leslie";
     userEmail = "git@cleslie.uk";
-    signing.key = "D382C4AFEECEAA90";
+    signing.key = "483E476D02ED580C";
     signing.signByDefault = true;
 
     ignores = [".direnv/"];
@@ -15,7 +15,7 @@
         contents = {
           user = {
             email = "psycl6@nottingham.ac.uk";
-            signingKey = "5A944DF89B6F65AC";
+            signingKey = "483E476D02ED580C";
           };
           credential = {helper = "store";};
         };
diff --git a/home/c/services/default.nix b/home/c/services/default.nix
index 5b065dc..803374c 100644
--- a/home/c/services/default.nix
+++ b/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;
     };
   };
 }
diff --git a/hosts/artemis/configuration.nix b/hosts/artemis/configuration.nix
index 7915feb..13ce697 100644
--- a/hosts/artemis/configuration.nix
+++ b/hosts/artemis/configuration.nix
@@ -31,6 +31,7 @@
     vim
     gnome.adwaita-icon-theme
     wget
+    pinentry
     fzf
     nil
     killall

From 7dd119992fb4fec1ccb9653e47c925cf2749229e Mon Sep 17 00:00:00 2001
From: Callum Leslie <git@cleslie.uk>
Date: Thu, 12 Sep 2024 13:25:20 +0100
Subject: [PATCH 2/2] edit gpg keys

---
 home/c/programs/git/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/home/c/programs/git/default.nix b/home/c/programs/git/default.nix
index 48ba412..b7e532b 100644
--- a/home/c/programs/git/default.nix
+++ b/home/c/programs/git/default.nix
@@ -4,7 +4,7 @@
 
     userName = "Callum Leslie";
     userEmail = "git@cleslie.uk";
-    signing.key = "483E476D02ED580C";
+    signing.key = "03B01F427831BCFD!";
     signing.signByDefault = true;
 
     ignores = [".direnv/"];
@@ -15,7 +15,7 @@
         contents = {
           user = {
             email = "psycl6@nottingham.ac.uk";
-            signingKey = "483E476D02ED580C";
+            signingKey = "14861F1282EFB5C8!";
           };
           credential = {helper = "store";};
         };