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, 50 insertions, 21 deletions

diff --git a/modules/hosts/T495/configuration.nix b/modules/hosts/T495/configuration.nix
index 6ee62e9..171f746 100644
--- a/modules/hosts/T495/configuration.nix
+++ b/modules/hosts/T495/configuration.nix
@@ -1,35 +1,64 @@
 { config, lib, pkgs, ... }: {
 	imports = [
 		./hardware-configuration.nix
-		./games.nix
-		#./input-leap.nix
 		./wg.nix
+		../../nixos/archetypes/tjkeller
 	];
-	bootloader.mode = "efi";
 
-	# 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;
+	# Setup bootloader
+	boot._loader.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;
+				};
+			};
+			bluetooth.enable = true;
+		};
+		# Setup user
+		users.primary = {
+			enable = true;
+			autologin.enable = true;
+		};
+		# Enable network drives
+		tjkeller = {
+			nas = {
+				enable = true;
+				office.enable = true;
+			};
+		};
 	};
 
-	# Enable network drives
-	nas.enable = true;
-	nas.office.enable = true;
-	nas.office.automount = false;
+	# Install spotify
+	nixpkgs.config.allowUnfree = true;
+	environment.systemPackages = with pkgs; [
+		spotify
+	];
 
 	# Use amdgpu driver for x11
 	services.xserver.videoDrivers = [ "amdgpu" ];
 
-	# Enable bluetooth
-	bluetooth.enable = true;
-
 	system.stateVersion = "24.05";
 }