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