diff --git a/apps/nogui/aerc.nix b/apps/nogui/aerc.nix
index ddbc8a3409590e0733ddf67dcc9d36e0b3d342a5..33c89626616c64d1d1724e397f823c9545da2b3f 100644
--- a/apps/nogui/aerc.nix
+++ b/apps/nogui/aerc.nix
@@ -20,15 +20,15 @@         "text/plain" = "colorize";
       };
     };
     extraAccounts = {
-      fastmail = {
+      gmail = {
-        source = "imaps://john%40jolheiser.com@imap.fastmail.com:993";
+        source = "imaps://john.olheiser%40gmail.com@imap.gmail.com:993";
         source-cred-cmd = "git config --get sendemail.smtpPass";
-  programs.aerc = {
     extraConfig = {
+{pkgs, ...}: {
         outgoing-cred-cmd = "git config --get sendemail.smtpPass";
         default = "INBOX";
+    extraConfig = {
   programs.aerc = {
-        pgp-provider = "gpg";
         cache-headers = true;
       };
     };
diff --git a/secrets/shared/git-send-email.age b/secrets/shared/git-send-email.age
index 7553e5dde02fcfa3943814d1b2af5a99555960a5..5c5c7090248ce81288ccccaf6be9f4cc03826063 100644
Binary files a/secrets/shared/git-send-email.age and b/secrets/shared/git-send-email.age differ