reogranize files more only working on optiplex for now prepare for home manager refactoringHEADmaster

1 files changed, 9 insertions, 8 deletions

diff --git a/flake.nix b/flake.nix
index d2112ca..007bd8e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,7 @@ rec {
 	outputs = { nixpkgs, home-manager, arkenfox, ... }@inputs :
 		let
 			system = "x86_64-linux";
-			pkgs = nixpkgs.legacyPackages.${system};
+			#pkgs = nixpkgs.legacyPackages.${system};
 			userDetails = {
 				username = "timmy";
 				email = "tjk@tjkeller.xyz";
@@ -44,22 +44,23 @@ rec {
 					inherit userDetails;
 				};
 				modules = [
-					./modules/hosts/${hostname}/configuration.nix
-					./modules/nixos
-					./modules/overlays
+					./hosts/${hostname}/configuration.nix
+					./nixos
+					./archetypes
+					./pkgs
 					home-manager.nixosModules.home-manager {
 						home-manager = {
-							backupFileExtension = "backup";
+							backupFileExtension = "backup";  # In case file is overwritten
 							useGlobalPkgs = true;
 							useUserPackages = true;
-							users.${userDetails.username} = import ./modules/home;
+							users.${userDetails.username} = import ./home-manager;
 							extraSpecialArgs = {
 								inherit userDetails;
 								inherit homeStateVersion;
 							};
 							sharedModules = [
-								inputs.arkenfox.hmModules.arkenfox
-								./modules/hosts/${hostname}/home.nix
+								arkenfox.hmModules.arkenfox
+								./hosts/${hostname}/home.nix
 							];
 						};
 					}