diff --git a/homeConfig/home.nix b/homeConfig/home.nix
index 26f7637..7bc6f92 100644
--- a/homeConfig/home.nix
+++ b/homeConfig/home.nix
@@ -1,12 +1,14 @@
-{ ... }:
+{ config, ... }:
 
 {
   programs.home-manager.enable = true;
-  imports = [ (import ./modules) ];
+
+  imports = [ ./modules ../user ];
+
   home.stateVersion = "22.11";
 
-  home.username = "bryan";
-  home.homeDirectory = "/home/bryan";
+  home.username = "${config.user.name}";
+  home.homeDirectory = "/home/${config.user.name}";
 
   modules = {
     gui.enable = true;
diff --git a/sysConfig/desktop/default.nix b/sysConfig/desktop/default.nix
index ad25247..06a3915 100644
--- a/sysConfig/desktop/default.nix
+++ b/sysConfig/desktop/default.nix
@@ -1 +1 @@
-{ imports = [ ./hardware.nix ./system.nix ./user ]; }
+{ imports = [ ./hardware.nix ./system.nix ../../user ]; }
diff --git a/sysConfig/desktop/user/default.nix b/user/default.nix
similarity index 100%
rename from sysConfig/desktop/user/default.nix
rename to user/default.nix