diff --git a/src/home/email/default.nix b/src/home/email/default.nix
index 46feeae..9a8be49 100644
--- a/src/home/email/default.nix
+++ b/src/home/email/default.nix
@@ -84,6 +84,10 @@ in
               showSignature = "append";
             };
             passwordCommand = "${cat} ${config.sops.secrets."personal/password".path}";
+            gpg = {
+              key = "1913ECC8FD7076BC8330E11607AA5254804C009F";
+              signByDefault = true;
+            };
             smtp = {
               host = "smtp.gmail.com";
             };
@@ -120,6 +124,7 @@ in
                 named-mailboxes "${mailboxName}/important" =Important
                 named-mailboxes "${mailboxName}/trash"     =Trash
                 named-mailboxes "${mailboxName}/archive"   =Archive
+                set pgp_sign_as = 0x07AA5254804C009F
               '';
             };
           };
@@ -137,6 +142,10 @@ in
               showSignature = "append";
             };
             passwordCommand = "${cat} ${config.sops.secrets."uchicago/password".path}";
+            gpg = {
+              key = "1913ECC8FD7076BC8330E11607AA5254804C009F";
+              signByDefault = true;
+            };
             smtp = {
               host = "127.0.0.1";
               port = 1025;
@@ -185,6 +194,7 @@ in
                 named-mailboxes "${mailboxName}/trash"     =Trash
                 named-mailboxes "${mailboxName}/archive"   =Archive
                 named-mailboxes "${mailboxName}/teaching"  =Teaching
+                set pgp_sign_as = 0x07AA5254804C009F
               '';
             };
           };
diff --git a/src/home/shell/default.nix b/src/home/shell/default.nix
index 95a9580..316e12a 100644
--- a/src/home/shell/default.nix
+++ b/src/home/shell/default.nix
@@ -31,7 +31,17 @@
       ]
       ++ (lib.attrValues config.custom.shell.packages);
 
+    services = {
+      gpg-agent = {
+        enable = true;
+        enableSshSupport = true;
+      };
+    };
+
     programs = {
+      gpg = {
+        enable = true;
+      };
       bat = {
         enable = true;
         extraPackages = [
diff --git a/src/nixos/default.nix b/src/nixos/default.nix
index 4655b15..c28cb31 100644
--- a/src/nixos/default.nix
+++ b/src/nixos/default.nix
@@ -12,6 +12,7 @@
     ./fonts.nix
     ./fingerprint.nix
     ./gnome.nix
+    ./gnupg.nix
     ./impermanence.nix
     ./kde.nix
     ./keyd.nix
diff --git a/src/nixos/gnupg.nix b/src/nixos/gnupg.nix
new file mode 100644
index 0000000..b345c09
--- /dev/null
+++ b/src/nixos/gnupg.nix
@@ -0,0 +1,16 @@
+{ pkgs, config, lib, ... }:
+
+{
+  programs.gnupg = {
+    agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
+  }; 
+
+  custom.persist = {
+    home.directories = [
+      ".gnupg" 
+    ];
+  };
+}