diff --git a/home-manager/default.nix b/home-manager/default.nix
index 70e16799..b59ecbc8 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -1,6 +1,11 @@
 { lib, config, pkgs, hostname, username, desktop, hmStateVersion, ... }: {
   home.stateVersion = hmStateVersion;
 
+  home = {
+    inherit hmStateVersion;
+    inherit username;
+  };
+
   imports = [ 
     # Common app configs - Will apply to all users managed by home-manager
     ./common/software/cli/bash.nix
diff --git a/home-manager/users/albert/default.nix b/home-manager/users/albert/default.nix
index 61f554ea..4f8e022b 100644
--- a/home-manager/users/albert/default.nix
+++ b/home-manager/users/albert/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, hostname, ... }: {
+{ config, pkgs, ... }: {
   programs.git = {
     userName  = "albert";
     userEmail = "albert@sysctl.io";
diff --git a/home-manager/users/root/default.nix b/home-manager/users/root/default.nix
index 41298cff..9c10b725 100644
--- a/home-manager/users/root/default.nix
+++ b/home-manager/users/root/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, hmStateVersion, ... }: {
+{ config, pkgs, ... }: {
   programs.git = {
     userName  = "albert";
     userEmail = "albert@sysctl.io";