From 6eb3fd14976e3ecd5677f51d8574d428ea045d87 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Thu, 15 Apr 2021 15:55:09 -0400
Subject: Update gpgid and auto-sign git commits

---
 lib/common.nix | 3 +--
 linux.nix      | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/common.nix b/lib/common.nix
index 80b8c79..d4eadc3 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -2,7 +2,7 @@
 
 let
   locale = "en_US.UTF-8";
-  gpgid = "D09299626FA78AF8";
+  gpgid = "66A6AD150399D970DCA4C4E6C8218B7D0BFDECCD";
   homedir = builtins.getEnv "HOME";
 in
 {
@@ -84,7 +84,6 @@ in
       package = pkgs.gitAndTools.gitFull;
       signing = {
         key = gpgid;
-        signByDefault = false;
       };
       aliases = {
         authors = "shortlog -s -n";
diff --git a/linux.nix b/linux.nix
index a597c90..c4ebe9c 100644
--- a/linux.nix
+++ b/linux.nix
@@ -3,7 +3,7 @@
 let
   homedir = builtins.getEnv "HOME";
   hostname = lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname);
-  gpgid = "D09299626FA78AF8";
+  gpgid = "66A6AD150399D970DCA4C4E6C8218B7D0BFDECCD";
   cmdtree = pkgs.stdenv.mkDerivation {
     name = "cmdtree";
     src = fetchGit {
@@ -389,6 +389,7 @@ in
   };
 
   programs = {
+    git.signing.signByDefault = true;
     qutebrowser = {
       enable = true;
       settings = {
-- 
cgit v1.2.3