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: Read git e-mail addresses from a file

---
 nix-conf/home/otm.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'nix-conf/home/otm.nix')

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";
-- 
cgit 1.4.1-2-gfad0