From 5205cf961f5e75788e38a774ceb13f8c5438cb4d Mon Sep 17 00:00:00 2001
From: David Morgan <djm_uk@protonmail.com>
Date: Thu, 24 Nov 2022 16:57:22 +0000
Subject: [PATCH] Read git e-mail addresses from a file

---
 nix-conf/home/includes/common.nix | 3 ++-
 nix-conf/home/otm.nix             | 9 +++++++--
 setup-home.sh                     | 2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/nix-conf/home/includes/common.nix b/nix-conf/home/includes/common.nix
index 971aa7d..c9bd270 100644
--- a/nix-conf/home/includes/common.nix
+++ b/nix-conf/home/includes/common.nix
@@ -2,9 +2,9 @@
 let
   hcr = pkgs.callPackage ./scripts/hm-changes-report.nix { inherit config pkgs; };
   scr = pkgs.callPackage ./scripts/system-changes-report.nix { inherit config pkgs; };
+  email = builtins.readFile "${config.home.homeDirectory}/email.txt";
 in
 {
-
   imports = [
     ./zsh.nix
   ];
@@ -172,6 +172,7 @@ in
   programs.git = {
     enable = true;
     userName = "David Morgan";
+    userEmail = email;
     aliases = {
       # difftastic
       logt = "!sh -c 'GIT_EXTERNAL_DIFF=\"difft --background=dark\" git log -p --ext-diff'";
diff --git a/nix-conf/home/otm.nix b/nix-conf/home/otm.nix
index 667493c..71c31ab 100644
--- a/nix-conf/home/otm.nix
+++ b/nix-conf/home/otm.nix
@@ -1,4 +1,8 @@
 { config, lib, pkgs, ... }:
+let
+  email = builtins.readFile "${config.home.homeDirectory}/email.txt";
+  otmEmail = builtins.readFile "${config.home.homeDirectory}/otm_email.txt";
+in
 {
   imports = [ 
     ./includes/darwin.nix
@@ -14,9 +18,10 @@
 
   programs.git = {
     signing.signByDefault = lib.mkForce false;
+    userEmail = lib.mkForce otmEmail;
     includes = [
-      { path = "~/.gitconfig-personal"; condition = "gitdir:~/src/personal/"; }
-      { contents = { commit.gpgSign = true; }; condition = "gitdir:~/src/personal/"; }
+      { contents = { commit.gpgSign = true; user.email = email; }; condition = "gitdir:~/src/personal/"; }
+      { contents = { commit.gpgSign = true; user.email = email; }; condition = "gitdir:~/dotfiles/"; }
     ];
     extraConfig = {
       github.user = "david-morgan-otm";
diff --git a/setup-home.sh b/setup-home.sh
index 29c621d..f36c94a 100644
--- a/setup-home.sh
+++ b/setup-home.sh
@@ -16,5 +16,7 @@ ln -sf ~/dotfiles/.emacs.d ~/
 mkdir ~/.config/nix
 echo "extra-experimental-features = nix-command flakes" > ~/.config/nix/nix.conf
 
+echo -n $EMAIL > ~/email.txt
+
 home-manager switch