From 720a736b0c05f98e1280acf05f8aa617563380d7 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 11 Mar 2024 11:15:28 +0000
Subject: [PATCH] Set work laptop to pull git email address from account
 setting

Set Scorch home config to just import Ronin home config, minimise
duplication since I want them to be the same anyway
---
 hosts/Ronin/home.nix  |  8 ++++++--
 hosts/Scorch/home.nix | 15 +--------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix
index 260008d0..59466be0 100644
--- a/hosts/Ronin/home.nix
+++ b/hosts/Ronin/home.nix
@@ -1,6 +1,10 @@
-{pkgs, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   home.packages = [(pkgs.writeShellScriptBin "ukaea-vpn-connect" "sudo ${pkgs.openfortivpn}/bin/openfortivpn -c ${./ukaea-vpn.conf}")];
-  programs.git.userEmail = "evie.litherland-smith@ukaea.uk";
+  programs.git.userEmail = config.accounts.email.accounts.outlook.address;
   accounts.email.accounts = {
     proton.primary = false;
     outlook = {
diff --git a/hosts/Scorch/home.nix b/hosts/Scorch/home.nix
index f2f5c17e..215a60a9 100644
--- a/hosts/Scorch/home.nix
+++ b/hosts/Scorch/home.nix
@@ -1,14 +1 @@
-{...}: {
-  programs.git.userEmail = "evie.litherland-smith@ukaea.uk";
-  accounts.email.accounts = {
-    proton.primary = false;
-    outlook = {
-      primary = true;
-      mu.enable = true;
-    };
-  };
-  wayland.windowManager.hyprland.settings = {
-    misc.force_default_wallpaper = 0;
-    monitor = ["desc:Dell Inc. DELL P3223QE CCG8YN3,highres,0x0,1.5"];
-  };
-}
+{...}: {imports = [../Ronin/home.nix];}