diff --git a/modules/nixos/security/gpg/default.nix b/modules/nixos/security/gpg/default.nix
index ece05f30..6d64b364 100644
--- a/modules/nixos/security/gpg/default.nix
+++ b/modules/nixos/security/gpg/default.nix
@@ -13,6 +13,10 @@ in
 {
   options.elementary.security.gpg = with types; {
     enable = mkEnableOption "gnupg";
+    pinentryPackage = mkOption {
+      type = nullOr package;
+      default = pkgs.pinentry-gnome3;
+    };
   };
 
   config = mkIf cfg.enable {
@@ -29,8 +33,8 @@ in
           ttlInSeconds = 8 * 60 * 60;
         in
         {
+          inherit (cfg) pinentryPackage;
           enable = true;
-          pinentryPackage = pkgs.pinentry-gnome3;
           defaultCacheTtl = ttlInSeconds;
           maxCacheTtl = ttlInSeconds;
         };
diff --git a/systems/x86_64-linux/silicon/default.nix b/systems/x86_64-linux/silicon/default.nix
index 5af0a825..e6c33a0f 100644
--- a/systems/x86_64-linux/silicon/default.nix
+++ b/systems/x86_64-linux/silicon/default.nix
@@ -31,6 +31,10 @@ in
       pkgs.gcc
       pkgs.powershell
     ];
+
+    services.gpg-agent.extraConfig = ''
+      pinentry-program "/mnt/c/Program Files (x86)/GnuPG/bin/pinentry-basic.exe"
+    '';
   };
 
   elementary = {
@@ -45,11 +49,12 @@ in
     };
     security = {
       sudo = enabled;
+      gpg = enabled;
     };
     programs = {
       git = enabled // {
-        signByDefault = false;
         userEmail = "gregor.grigorjan@gamesglobal.com";
+        signingKey = "FB5F09CB29F94BC5";
       };
       ssh = enabled;
       emacs = enabled // {