config/Package.nix

@@ -45,7 +45,7 @@ in {
 
 			# Chromium config.
 			environment.etc = let
-				chromium = import <home/file/chromium> args;
+				chromium = import <home/config/chromium> args;
 			in {
 				"chromium/initial_preferences".source         = lib.mkForce chromium.preferences;
 				"chromium/policies/managed/extra.json".source = lib.mkForce chromium.policy;

flake.nix

@@ -149,6 +149,7 @@
 				./home/Android.nix
 			]
 			++ (self.findFiles ./option)
+			++ (self.findFiles ./overlay)
 			;
 			extraSpecialArgs = {
 				inherit inputs self pkgsMaster pkgsUnstable;

home/Android.nix

@@ -13,8 +13,6 @@
 } @args: let
 	cfg = config.home.android;
 	android  = import ./android args;
-	env      = import ./env     args;
-	file     = import ./file    args;
 	package  = import <package> args;
 	programs = import ./program args;
 	stylix   = import <system/Stylix.nix> args;
@@ -37,9 +35,9 @@ in {
 				inputs.stylix.homeManagerModules.stylix
 			];
 			home = {
-				inherit (env) sessionVariables;
-				inherit file;
-				stateVersion = const.droidStateVersion;
+				file = import ./config args;
+				sessionVariables = import ./variable args;
+				stateVersion     = const.droidStateVersion;
 			};
 		};
 	};

home/NixOs.nix

@@ -9,8 +9,6 @@
 	...
 } @args: let
 	cfg = config.home.nixos;
-	env      = import ./env args;
-	file     = import ./file args;
 	programs = import ./program args;
 in {
 	imports = (util.ls <user>);
@@ -31,16 +29,16 @@ in {
 					${user.username} = {
 						home = {
 							inherit (const) stateVersion;
-							inherit (env) sessionVariables;
 							inherit (user) username homeDirectory;
-							inherit file;
+							file = import ./config args;
+							sessionVariables = import ./variable args;
 
 							# ISSUE: https://github.com/nix-community/home-manager/issues/5589
 							extraActivationPath = with pkgs; [ openssh ];
 						};
 						xdg = import ./xdg { inherit (user) homeDirectory; };
 						programs = with programs; core // desktop;
-						dconf.settings = util.catSet (util.ls ./file/dconf) args;
+						dconf.settings = util.catSet (util.ls ./config/dconf) args;
 					};
 				}
 			) { } cfg.users;