summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2021-04-15 15:55:09 -0400
committerBen Sima <ben@bsima.me>2021-04-15 15:58:31 -0400
commit6eb3fd14976e3ecd5677f51d8574d428ea045d87 (patch)
tree4704f7838cc3e4d23e38315dd050567008e538ae
parenta35c13f7c36ef86efc12eb161d70cf054c0977fc (diff)
Update gpgid and auto-sign git commits
-rw-r--r--lib/common.nix3
-rw-r--r--linux.nix3
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 = {