recursion

home-manager/default.nix

@@ -3,7 +3,6 @@
     imports = [
         ./programs
         ./services
-        ./users
     ];
 
     options.homeconfig = with lib; {
@@ -12,7 +11,7 @@
             default = null;
         };
         
-        username = mkOption {
+        name = mkOption {
             type = with types; nullOr str;
             default = null;
         };
@@ -30,9 +29,9 @@
 
     config = {
 
-        home.username = lib.mkDefault config.homeconfig.username;
+        home.username = lib.mkDefault config.homeconfig.name;
 
-        home.homeDirectory = lib.mkDefault "/home/${config.homeconfig.username}";
+        home.homeDirectory = lib.mkDefault "/home/${config.home.username}";
         
         programs.home-manager.enable = config.homeconfig.standalone.enable;
     };

home-manager/users/default.nix

@@ -1,26 +0,0 @@
-{ config, lib, osConfig, ... }: {
-
-    imports = [
-        ./nathan
-    ];
-
-    options.homeconfig = {
-        host = lib.options.mkOption {
-            type = lib.types.nullOr lib.types.str;
-            default = osConfig.sysconfig.host;
-        };
-
-        username = lib.options.mkOption {
-            type = lib.types.nullOr lib.types.str;
-            default = null;
-        };
-        
-        home-manager.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-            description = "Whether this is a standalone home-manager setup";
-        };
-    };
-
-    config = {};
-}