diff --git a/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix
index f915bfb2..6df0493e 100644
--- a/hosts/PW05CH3L/configuration.nix
+++ b/hosts/PW05CH3L/configuration.nix
@@ -1,5 +1,11 @@
 { inputs, username, ... }:
 
+let
+  git = {
+    name = "Oliver Davies";
+    emailAddress = "oliver.davies@tfw.wales";
+  };
+in
 {
   imports = [
     ../../modules/editor/nvim.nix
@@ -7,7 +13,6 @@
     ../../modules/mixins/direnv.nix
     ../../modules/mixins/docker.nix
     ../../modules/mixins/fzf.nix
-    ../../modules/mixins/git.nix
     ../../modules/mixins/node.nix
     ../../modules/mixins/phpactor
     ../../modules/mixins/ranger.nix
@@ -16,6 +21,8 @@
     ../../modules/mixins/tmux.nix
     ../../modules/mixins/zsh
 
+    (import ../../modules/mixins/git.nix { inherit git; })
+
     ./modules/notes.nix
     ./modules/wiki.nix
 
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 4edabaed..db3337db 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -1,5 +1,11 @@
 { inputs, pkgs, ... }:
 
+let
+  git = {
+    name = "Oliver Davies";
+    emailAddress = "oliver@oliverdavies.uk";
+  };
+in
 {
   imports = [
     ./hardware-configuration.nix
@@ -15,7 +21,6 @@
     ../../modules/mixins/flameshot.nix
     ../../modules/mixins/fonts.nix
     ../../modules/mixins/fzf.nix
-    ../../modules/mixins/git.nix
     ../../modules/mixins/gnupg.nix
     ../../modules/mixins/gtk.nix
     ../../modules/mixins/qutebrowser.nix
@@ -33,6 +38,8 @@
     ../../modules/profiles/dwm
     ../../modules/profiles/xbanish.nix
 
+    (import ../../modules/mixins/git.nix { inherit git; })
+
     ../../users/opdavies
 
     ./modules/neomutt.nix
diff --git a/modules/mixins/git.nix b/modules/mixins/git.nix
index f7955fab..18a63de9 100644
--- a/modules/mixins/git.nix
+++ b/modules/mixins/git.nix
@@ -1,3 +1,8 @@
+{
+  git ? { },
+  ...
+}:
+
 {
   home-manager.users.opdavies =
     { config, pkgs, ... }:
@@ -25,8 +30,8 @@
       programs = {
         git = {
           enable = true;
-          userName = "Oliver Davies";
-          userEmail = "oliver@oliverdavies.dev";
+          userName = git.name;
+          userEmail = git.emailAddress;
 
           includes = [
             {