From 70526d0968ab78fb93fd4a4777e4839b05cd0e24 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Mon, 31 Oct 2022 14:27:58 -0400
Subject: [PATCH] move pipewire

---
 modules/pipewire.nix         | 19 -------------------
 modules/profiles/desktop.nix | 12 +++++++++++-
 2 files changed, 11 insertions(+), 20 deletions(-)
 delete mode 100644 modules/pipewire.nix

diff --git a/modules/pipewire.nix b/modules/pipewire.nix
deleted file mode 100644
index 886b45e..0000000
--- a/modules/pipewire.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.sconfig.pipewire;
-in
-{
-  options.sconfig.pipewire = lib.mkEnableOption "Enable Pipewire";
-
-  config = lib.mkIf cfg {
-    sound.enable = true;
-    hardware.pulseaudio.enable = false;
-    security.rtkit.enable = true;
-    services.pipewire = {
-      enable = true;
-      pulse.enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-    };
-  };
-}
diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix
index 8375956..eaa1cde 100644
--- a/modules/profiles/desktop.nix
+++ b/modules/profiles/desktop.nix
@@ -4,10 +4,20 @@ with lib;
   config = mkIf (config.sconfig.profile == "desktop") {
     services.pcscd.enable = true;
 
+    # Pipewire
+    sound.enable = true;
+    hardware.pulseaudio.enable = false;
+    security.rtkit.enable = true;
+    services.pipewire = {
+      enable = true;
+      pulse.enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+    };
+
     sconfig = {
       alacritty.enable = true;
       security-tools = true;
-      pipewire = true;
     };
 
     services.udev.extraHwdb = ''