Use new system for defining home vars and git email

home/Legion-xenia.nix

@@ -3,5 +3,9 @@
     ./env/xenia.nix
     ./tui
   ];
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home.username = "xenia";
+  home.homeDirectory = "/home/xenia";
   home.stateVersion = "22.11";
 }

home/Monarch-tux.nix

@@ -1,8 +1,17 @@
 { ... }:
 {
   imports = [
-    ./env/tux.nix
+    ./env
+    ./env/git/personal.nix
     ./tui
   ];
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home.username = "tux";
+  home.homeDirectory = "/Users/tux";
   home.stateVersion = "22.11";
+
+  programs.zsh.envExtra = ''
+    eval "$(/opt/homebrew/bin/brew shellenv)"
+  '';
 }

home/Northstar-xenia.nix

@@ -1,7 +1,12 @@
 { ... }: {
   imports = [
-    ./env/user/xenia.nix
+    ./env
+    ./env/git/personal.nix
     ./tui
   ];
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home.username = "xenia";
+  home.homeDirectory = "/home/xenia";
   home.stateVersion = "22.11";
 }

home/Vanguard-xenia.nix

@@ -1,8 +1,9 @@
 { ... }: {
   imports = [
-    ./env/xenia.nix
     ./desktop/gtk.nix
     ./desktop/wayland.nix
+    ./env
+    ./env/git/personal.nix
     ./tui
     ./gui/firefox.nix
     ./gui/cloud.nix
@@ -11,5 +12,9 @@
     ./gui/messaging.nix
     ./gui/nomachine.nix
   ];
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home.username = "xenia";
+  home.homeDirectory = "/home/xenia";
   home.stateVersion = "22.11";
 }

home/env/user/elitherl.nix

@@ -1,12 +0,0 @@
-{ ... }:
-{
-  imports = [ ../default.nix ];
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home.username = "elitherl";
-  home.homeDirectory = "/home/elitherl";
-
-  programs.git = {
-    userEmail = "evie.litherland-smith@ukaea.uk";
-  };
-}

home/env/user/tux.nix

@@ -1,16 +0,0 @@
-{ ... }:
-{
-  imports = [ ../default.nix ];
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home.username = "tux";
-  home.homeDirectory = "/Users/tux";
-
-  programs.git = {
-    userEmail = "evie@xenia.me.uk";
-  };
-
-  programs.zsh.envExtra = ''
-    eval "$(/opt/homebrew/bin/brew shellenv)"
-  '';
-}

home/env/user/xenia.nix

@@ -1,12 +0,0 @@
-{ ... }:
-{
-  imports = [ ../default.nix ];
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home.username = "xenia";
-  home.homeDirectory = "/home/xenia";
-
-  programs.git = {
-    userEmail = "evie@xenia.me.uk";
-  };
-}

home/ukaea-elitherl.nix

@@ -18,6 +18,5 @@
   # paths it should manage.
   home.username = "elitherl";
   home.homeDirectory = "/home/elitherl";
-  home.stateVersion = "22.11";
 
 }