diff --git a/home/modules/user.nix b/home/modules/user.nix
index 7ab763c..6c76386 100644
--- a/home/modules/user.nix
+++ b/home/modules/user.nix
@@ -8,9 +8,9 @@ in
     enable = lib.mkEnableOption "user";
   };
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf cfg.enable rec {
     home.username = lib.mkDefault "ravenshade";
-    home.homeDirectory = lib.mkDefault "/home/ravenshade";
+    home.homeDirectory = lib.mkDefault "/home/${config.home.username}";
 
     home.sessionPath = [
       "${config.home.homeDirectory}/.cargo/bin"
diff --git a/hosts/caveserver/home.nix b/hosts/caveserver/home.nix
index 95019f8..eb060f4 100644
--- a/hosts/caveserver/home.nix
+++ b/hosts/caveserver/home.nix
@@ -15,7 +15,6 @@
 
 
   home.username = "val";
-  home.homeDirectory = "/home/val";
 
   home.sessionPath = [
     "${config.home.homeDirectory}/.cargo/bin"