os fix

2 files changed, 14 insertions, 15 deletions

diff --git a/configuration.nix b/configuration.nix
index 733a476..d03bd22 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -19,6 +19,10 @@ in
     useGlobalPkgs = true;
     useUserPackages = true;
     backupFileExtension = "backup";
-    users.${config.system.primaryUser} = import ./home.nix;
+    users.${config.system.primaryUser} = {
+      imports = [ ./home.nix ];
+      home.username = config.system.primaryUser;
+      home.homeDirectory = "/Users/${config.system.primaryUser}";
+    };
   };
 }
diff --git a/home.nix b/home.nix
index bfa669e..48c9cb5 100644
--- a/home.nix
+++ b/home.nix
@@ -1,27 +1,22 @@
 {
   lib,
-  osConfig ? null,
   ...
 }:
 
 let
-  detectedHostname =
-    if osConfig != null then osConfig.networking.hostName else builtins.getEnv "HOSTNAME";
-  detectedUsername = if osConfig != null then osConfig.system.primaryUser else builtins.getEnv "USER";
+  detectedHostname = builtins.getEnv "HOSTNAME";
+  detectedUsername = builtins.getEnv "USER";
   detectedHome =
-    if osConfig != null then
-      osConfig.users.users.${detectedUsername}.home
-    else
-      let
-        envHome = builtins.getEnv "HOME";
-      in
-      # Will not work on cs.purdue.edu
-      if envHome != "" then envHome else "/home/${detectedUsername}";
+    let
+      envHome = builtins.getEnv "HOME";
+    in
+    # Will not work on cs.purdue.edu
+    if envHome != "" then envHome else "/home/${detectedUsername}";
 in
 {
   home = {
-    username = detectedUsername;
-    homeDirectory = detectedHome;
+    username = lib.mkDefault detectedUsername;
+    homeDirectory = lib.mkDefault detectedHome;
   };
 
   imports = [