From 9f0dbb1523e5aaf686958d5e100375789ca5eaee Mon Sep 17 00:00:00 2001
From: Tim Keller <tjk@tjkeller.xyz>
Date: Mon, 15 Jun 2026 15:32:41 -0500
Subject: move printing option module to desktop collections

---
 archetypes/collections/desktop/default.nix  |  1 +
 archetypes/collections/desktop/printing.nix | 17 +++++++++++++++++
 archetypes/profiles/desktop/default.nix     |  6 +++---
 nixos/default.nix                           |  1 -
 nixos/printing.nix                          | 18 ------------------
 5 files changed, 21 insertions(+), 22 deletions(-)
 create mode 100644 archetypes/collections/desktop/printing.nix
 delete mode 100644 nixos/printing.nix

diff --git a/archetypes/collections/desktop/default.nix b/archetypes/collections/desktop/default.nix
index 418eb71..62ee472 100644
--- a/archetypes/collections/desktop/default.nix
+++ b/archetypes/collections/desktop/default.nix
@@ -7,6 +7,7 @@
 		./firefox.nix
 		./graphics.nix
 		./office.nix
+		./printing.nix
 		./thumbnailers.nix
 		./utilities.nix
 		./video.nix
diff --git a/archetypes/collections/desktop/printing.nix b/archetypes/collections/desktop/printing.nix
new file mode 100644
index 0000000..ed31048
--- /dev/null
+++ b/archetypes/collections/desktop/printing.nix
@@ -0,0 +1,17 @@
+{ lib, config, ... }: let
+	cfg = config._archetypes.collections.desktop.printing;
+in {
+	options._archetypes.collections.desktop.printing = {
+		enable = lib.mkEnableOption "enables printing and avahi service";
+	};
+
+	config = lib.mkIf cfg.enable {
+		services.printing.enable = true;
+
+		services.avahi = {
+			enable = true;
+			nssmdns4 = true;
+			openFirewall = true;
+		};
+	};
+}
diff --git a/archetypes/profiles/desktop/default.nix b/archetypes/profiles/desktop/default.nix
index 5a3443d..7cde6b2 100644
--- a/archetypes/profiles/desktop/default.nix
+++ b/archetypes/profiles/desktop/default.nix
@@ -4,9 +4,10 @@
 	nixosConfig = {
 		_archetypes.collections = {
 			desktop = {
-				utilities.enable = mkDesktop true;
-				thumbnailers.enable = mkDesktop true;
 				firefox.enable = mkDesktop true;
+				printing.enable = mkDesktop true;
+				thumbnailers.enable = mkDesktop true;
+				utilities.enable = mkDesktop true;
 				xserver = {
 					enable = mkDesktop true;
 					utilities.enable = mkDesktop true;
@@ -34,7 +35,6 @@
 		services = {
 			_geoclue2.enable = mkDesktop true;
 			_pipewire.enable = mkDesktop true;
-			_printing.enable = mkDesktop true;
 			xserver = {
 				windowManager._awesome.enable = mkDesktop true;
 				enableTearFree = mkDesktop true;
diff --git a/nixos/default.nix b/nixos/default.nix
index 8c8ad7a..ce2a417 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -22,7 +22,6 @@
 		./pipewire.nix
 		./polkit.nix
 		./powerkeys.nix
-		./printing.nix
 		./secrets.nix
 		./sudo.nix
 		./suspend.nix
diff --git a/nixos/printing.nix b/nixos/printing.nix
deleted file mode 100644
index a6df279..0000000
--- a/nixos/printing.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, config, ... }: let
-	cfg = config.services._printing;
-in {
-	options.services._printing = {
-		enable = lib.mkEnableOption "enables printing and avahi service";
-	};
-
-	config = lib.mkIf cfg.enable {
-		services.printing.enable = true;
-
-		services.avahi = {
-			enable = true;
-			nssmdns4 = true;
-			openFirewall = true;
-		};
-	};
-}
-
-- 
cgit v1.2.3