From 13de5a2bbaa816d4261bd1188a4c696adaf5ff13 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 24 Apr 2023 09:55:29 +0100
Subject: [PATCH] Add specific configs for different git emails

---
 home/env/default.nix                  | 2 +-
 home/env/{git.nix => git/default.nix} | 4 ++--
 home/env/git/personal.nix             | 7 +++++++
 home/env/git/work.nix                 | 7 +++++++
 home/ukaea-elitherl.nix               | 8 +++++++-
 5 files changed, 24 insertions(+), 4 deletions(-)
 rename home/env/{git.nix => git/default.nix} (88%)
 create mode 100644 home/env/git/personal.nix
 create mode 100644 home/env/git/work.nix

diff --git a/home/env/default.nix b/home/env/default.nix
index 7ee59ba8..6f38cc89 100644
--- a/home/env/default.nix
+++ b/home/env/default.nix
@@ -2,9 +2,9 @@
 {
   imports = [
     ./fonts
+    ./git
     ./shell
     ./direnv.nix
-    ./git.nix
     ./keychain.nix
     ./nixpkgs.nix
     ./qemu.nix
diff --git a/home/env/git.nix b/home/env/git/default.nix
similarity index 88%
rename from home/env/git.nix
rename to home/env/git/default.nix
index 4eef79bb..7c78f1bc 100644
--- a/home/env/git.nix
+++ b/home/env/git/default.nix
@@ -1,8 +1,8 @@
 { ... }:
 {
   imports = [
-    ./ssh.nix
-    ./shell
+    ../ssh.nix
+    ../shell
   ];
   programs.git = {
     enable = true;
diff --git a/home/env/git/personal.nix b/home/env/git/personal.nix
new file mode 100644
index 00000000..85d43716
--- /dev/null
+++ b/home/env/git/personal.nix
@@ -0,0 +1,7 @@
+{ ... }:
+{
+  imports = [ ./default.nix ];
+  programs.git = {
+    userEmail = "evie@xenia.me.uk";
+  };
+}
diff --git a/home/env/git/work.nix b/home/env/git/work.nix
new file mode 100644
index 00000000..1e7aba86
--- /dev/null
+++ b/home/env/git/work.nix
@@ -0,0 +1,7 @@
+{ ... }:
+{
+  imports = [ ./default.nix ];
+  programs.git = {
+    userEmail = "evie.litherland-smith@ukaea.uk";
+  };
+}
diff --git a/home/ukaea-elitherl.nix b/home/ukaea-elitherl.nix
index 78074f14..8cc4ede8 100644
--- a/home/ukaea-elitherl.nix
+++ b/home/ukaea-elitherl.nix
@@ -2,7 +2,8 @@
   imports = [
     ./desktop/gtk.nix
     ./desktop/wayland.nix
-    ./env/elitherl.nix
+    ./env
+    ./env/git/work.nix
     ./tui
     ./gui/chromium-wayland.nix
     ./gui/neovide.nix
@@ -13,5 +14,10 @@
     ./gui/nomachine.nix
     ./gui/ukaea.nix
   ];
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home.username = "elitherl";
+  home.homeDirectory = "/home/elitherl";
   home.stateVersion = "22.11";
+
 }