From 7257fa93373ca948e858c920ec0bd499a4543f45 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Mon, 22 Apr 2019 12:19:43 -0700
Subject: add new gpg key

---
 common.nix | 6 ++++++
 email.nix  | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/common.nix b/common.nix
index 7fe0094..11c5d16 100644
--- a/common.nix
+++ b/common.nix
@@ -3,11 +3,13 @@
 let
   homedir = builtins.getEnv "HOME";
   locale = "en_US.UTF-8";
+  gpgid = "D09299626FA78AF8";
 in
 {
   home = {
     packages = import ./packages.nix { inherit pkgs; };
     sessionVariables = {
+      GPGID = gpgid;
       EDITOR = "emacsclient";
       LANG = locale;
       LANGUAGE = locale;
@@ -69,6 +71,10 @@ in
       userEmail = "ben@bsima.me";
       ignores = [ "*~" "*.swp" ];
       package = pkgs.gitAndTools.gitFull;
+      signing = {
+        key = gpgid;
+        signByDefault = true;
+      };
       aliases = {
         authors = "shortlog -s -n";
       };
diff --git a/email.nix b/email.nix
index 5657cf0..ff74ff3 100644
--- a/email.nix
+++ b/email.nix
@@ -2,6 +2,7 @@
 
 let
   homedir = builtins.getEnv "HOME";
+  gpgid = "D09299626FA78AF8";
 in
 {
   accounts = {
@@ -24,6 +25,11 @@ in
             host = "mail.bsima.me";
             port = 587;
           };
+          gpg = {
+            key = gpgid;
+            signByDefault = true;
+            encryptByDefault = false;
+          };
           userName = "ben@bsima.me";
           mbsync = {
             enable = true;
-- 
cgit v1.2.3