From 0de9ddc14994bafb3d1039776f62071f3806d791 Mon Sep 17 00:00:00 2001
From: Tim Keller <tjk@tjkeller.xyz>
Date: Mon, 15 Jun 2026 15:47:10 -0500
Subject: move pipewire option module to desktop collections

---
 archetypes/collections/desktop/default.nix  |  1 +
 archetypes/collections/desktop/pipewire.nix | 14 ++++++++++++++
 archetypes/profiles/desktop/default.nix     |  2 +-
 nixos/default.nix                           |  1 -
 nixos/pipewire.nix                          | 14 --------------
 5 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 archetypes/collections/desktop/pipewire.nix
 delete mode 100644 nixos/pipewire.nix

diff --git a/archetypes/collections/desktop/default.nix b/archetypes/collections/desktop/default.nix
index 62ee472..6ac79dd 100644
--- a/archetypes/collections/desktop/default.nix
+++ b/archetypes/collections/desktop/default.nix
@@ -7,6 +7,7 @@
 		./firefox.nix
 		./graphics.nix
 		./office.nix
+		./pipewire.nix
 		./printing.nix
 		./thumbnailers.nix
 		./utilities.nix
diff --git a/archetypes/collections/desktop/pipewire.nix b/archetypes/collections/desktop/pipewire.nix
new file mode 100644
index 0000000..d80ac90
--- /dev/null
+++ b/archetypes/collections/desktop/pipewire.nix
@@ -0,0 +1,14 @@
+{ lib, config, ... }: let
+	cfg = config._archetypes.collections.desktop.pipewire;
+in {
+	options._archetypes.collections.desktop.pipewire = {
+		enable = lib.mkEnableOption "enables pipewire";
+	};
+
+	config = lib.mkIf cfg.enable {
+		services.pipewire = {
+			enable = true;
+			pulse.enable = true;
+		};
+	};
+}
diff --git a/archetypes/profiles/desktop/default.nix b/archetypes/profiles/desktop/default.nix
index 07cbd82..eb10c21 100644
--- a/archetypes/profiles/desktop/default.nix
+++ b/archetypes/profiles/desktop/default.nix
@@ -5,6 +5,7 @@
 		_archetypes.collections = {
 			desktop = {
 				firefox.enable = mkDesktop true;
+				pipewire.enable = mkDesktop true;
 				printing.enable = mkDesktop true;
 				thumbnailers.enable = mkDesktop true;
 				utilities.enable = mkDesktop true;
@@ -33,7 +34,6 @@
 
 		services = {
 			_geoclue2.enable = mkDesktop true;
-			_pipewire.enable = mkDesktop true;
 			xserver = {
 				windowManager._awesome.enable = mkDesktop true;
 				enableTearFree = mkDesktop true;
diff --git a/nixos/default.nix b/nixos/default.nix
index 6defa6b..2d70630 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -18,7 +18,6 @@
 		./hosts.nix
 		./net-iface-labels.nix
 		./nix.nix
-		./pipewire.nix
 		./polkit.nix
 		./powerkeys.nix
 		./secrets.nix
diff --git a/nixos/pipewire.nix b/nixos/pipewire.nix
deleted file mode 100644
index be3eaf4..0000000
--- a/nixos/pipewire.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ lib, config, ... }: let
-	cfg = config.services._pipewire;
-in {
-	options.services._pipewire = {
-		enable = lib.mkEnableOption "enables pipewire";
-	};
-
-	config = lib.mkIf cfg.enable {
-		services.pipewire = {
-			enable = true;
-			pulse.enable = true;
-		};
-	};
-}
-- 
cgit v1.2.3