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, 49 insertions, 25 deletions

diff --git a/modules/hosts/optiplex/configuration.nix b/modules/hosts/optiplex/configuration.nix
index 16ba475..36241a8 100644
--- a/modules/hosts/optiplex/configuration.nix
+++ b/modules/hosts/optiplex/configuration.nix
@@ -1,36 +1,63 @@
 { config, lib, pkgs, ... }: {
-	imports = [ ./hardware-configuration.nix ];
-	bootloader.mode = "efi";
+	imports = [
+		./hardware-configuration.nix
+		../../nixos/archetypes/tjkeller
+	];
 
-	# Allow unfree for nvidia + others
-	nixpkgs.config.allowUnfree = true;
+	# Setup bootloader
+	boot._loader.enable = true;
 
-	# Enable extra software pkgs
-	software.desktop = {
-		chromium.enable = true;
-		cad.enable = true;
-		crypto.enable = true;
-		graphics.enable = true;
-		office.enable = true;
-		utilities.enable = true;
-	};
-	software.development = {
-		docker.enable = true;
+	# Enable common options
+	_archetypes = {
+		# Use desktop profile
+		profiles.desktop.enable = true;
+		# Install software
+		collections = {
+			desktop = {
+				extraUtilities.enable = true;
+				cad.enable = true;
+				chromium.enable = true;
+				crypto.enable = true;
+				graphics.enable = true;
+				office.enable = true;
+			};
+			development = {
+				android.enable = true;
+				c.enable = true;
+				docker.enable = true;
+				lua.enable = true;
+				web = {
+					hugo = {
+						enable = true;
+						openFirewall = true;
+					};
+					node.enable = true;
+				};
+			};
+		};
+		# Setup user
+		users.primary = {
+			enable = true;
+			autologin.enable = true;
+		};
+		tjkeller = {
+			nas.enable = true;
+		};
 	};
 
-	# Install more programs
+	# Disable suspend
+	systemd._suspend.disable = true;
+
+	# Allow unfree for nvidia + others
+	nixpkgs.config.allowUnfree = true;
+
+	# Install more software
 	environment.systemPackages = with pkgs; [
 		prismlauncher
 		spotify
 		#vintagestory
 	];
 
-	# Enable network drives
-	nas.enable = true;
-
-	# Disable wifi
-	wifi.enable = false;
-
 	# Use nvidia driver
 	services.xserver.videoDrivers = [ "nvidia" ];
 	hardware.nvidia = {
@@ -42,8 +69,5 @@
 		forceFullCompositionPipeline = true;  # Enables vsync
 	};
 
-	# Disable suspend
-	suspend.enable = false;
-
 	system.stateVersion = "24.11";
 }