move printing option module to desktop collections

3 files changed, 21 insertions, 3 deletions

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;