diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 9a4950bd67f3d11b9cc8d466678a021b61745565..e4ffe3f32d8bdc8d58f2cc2bd8bdd4828ab4ae8b 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -3,11 +3,13 @@
   config,
   pkgs,
   lib,
+  currentSystemUser,
   ...
 }: {
   programs = import ../shared/home-programs.nix {inherit inputs config pkgs lib;};
 
   home = {
+    username = currentSystemUser;
     homeDirectory = "/Users/nmarks/";
     # Home Manager needs a bit of information about you and the paths it should
     # manage.
diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix
index 0bb91cf49d8317b53bedafe2951e6815b0aeace9..e8fe62e9b3f70ebf9f74e77488a82e6e8ccfeea3 100644
--- a/lib/mkSystem.nix
+++ b/lib/mkSystem.nix
@@ -30,6 +30,11 @@
   hostConfig = ../hosts/${host}/configuration.nix;
   homeConfig = ../hosts/${host}/home.nix;
 
+  homeDir =
+    if darwin
+    then "/Users/nmarks/"
+    else "/home/nmarks";
+
   # NixOS vs nix-darwin functions
   systemFunc =
     if darwin