diff --git a/home-config/aerc/binds.conf b/home-config/aerc/binds.conf
index f06ee85..4dee57f 100644
--- a/home-config/aerc/binds.conf
+++ b/home-config/aerc/binds.conf
@@ -49,6 +49,11 @@ Rr = :reply<Enter>
Rq = :reply -q<Enter>
f = :forward -A<Enter>
+# Git custom stuff ala Drew Devault
+ga = :pipe -mb git am -3<Enter>
+gp = :term git push<Enter>
+rt = :reply -aTthanks<Enter>
+
c = :cf<space>
$ = :term<space>
! = :term<space>
diff --git a/home-config/aerc/templates/quoted_reply b/home-config/aerc/templates/quoted_reply
index dc184d9..402515f 100644
--- a/home-config/aerc/templates/quoted_reply
+++ b/home-config/aerc/templates/quoted_reply
@@ -1,5 +1,6 @@
X-Mailer: aerc {{version}}
+{{.Signature}}
On {{dateFormat (.OriginalDate | toLocal) "Mon Jan 2, 2006 at 3:04 PM MST"}}, {{(index .OriginalFrom 0).Name}} wrote:
{{trimSignature .OriginalText | quote}}
diff --git a/home-config/aerc/templates/thanks b/home-config/aerc/templates/thanks
new file mode 100644
index 0000000..bc920a6
--- /dev/null
+++ b/home-config/aerc/templates/thanks
@@ -0,0 +1,7 @@
+X-Mailer: aerc {{version}}
+
+Thanks!
+
+{{exec "{ git remote get-url --push origin; git reflog -2 origin/main --pretty=format:%h; } | xargs printf 'To %s\n %s..%s main -> main\n'" ""}}
+
+{{.Signature}}
diff --git a/home-config/gitconfig b/home-config/gitconfig
index ee6224b..6fa1c67 100644
--- a/home-config/gitconfig
+++ b/home-config/gitconfig
@@ -12,3 +12,8 @@
ui = auto
[init]
defaultBranch = main
+[sendemail]
+ smtpserver = mail.rschanz.org
+ smtpuser = ryan@rschanz.org
+ smtpencryption = ssl
+ smtpserverport = 465
diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index 77bfdbb..06b3d96 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -106,7 +106,7 @@
"mpv"
"qbittorrent"
"playerctl"
- "aerc"
+ ;"aerc"
"tcpdump"
"pamixer"
"git"
diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix
index 9dcdc28..9d712dc 100644
--- a/home-config/nix-home-manager/home.nix
+++ b/home-config/nix-home-manager/home.nix
@@ -33,6 +33,7 @@
zoxide
nodePackages.pnpm
gcc
+ aerc
pkg-config
wttrbar
swww