refactor project to prioritize correctness. place custom nixos options into existing 'modules' and prefix them with '_'. use _archetypes module for software collections, system profiles, etc. personal configs moved to _archetypes.tjkeller. probably changed or fixed or broke a few other things in the process

1 files changed, 21 insertions, 6 deletions

diff --git a/modules/hosts/X230/configuration.nix b/modules/hosts/X230/configuration.nix
index 9a8e6b4..accbb1c 100644
--- a/modules/hosts/X230/configuration.nix
+++ b/modules/hosts/X230/configuration.nix
@@ -1,14 +1,29 @@
 { config, lib, pkgs, ... }: {
 	imports = [
 		./hardware-configuration.nix
+		../../nixos/archetypes/tjkeller
 	];
-	bootloader.mode = "efi";
 
-	# Enable extra software pkgs
-	software.desktop = {
-		crypto.enable = true;
-		graphics.enable = true;
-		office.enable = true;
+	# Setup bootloader
+	boot._loader.enable = true;
+
+	# Enable common options
+	_archetypes = {
+		# Use desktop profile
+		profiles.desktop.enable = true;
+		# Install software
+		collections = {
+			desktop = {
+				crypto.enable = true;
+				graphics.enable = true;
+				office.enable = true;
+			};
+		};
+		# Setup user
+		users.primary = {
+			enable = true;
+			autologin.enable = true;
+		};
 	};
 
 	system.stateVersion = "24.05";