From fd03c30d52cd2e1631bf2353a2b9e108e744e0d9 Mon Sep 17 00:00:00 2001
From: Silas Schöffel <sils@sils.li>
Date: Fri, 21 Feb 2025 11:14:22 +0100
Subject: sound: init module

---
 modules/nixos/sils/default.nix |  1 +
 modules/nixos/sils/roles.nix   |  3 +++
 modules/nixos/sils/sound.nix   | 20 ++++++++++++++++++++
 sys/default.nix                |  1 -
 sys/sound/default.nix          | 11 -----------
 5 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 modules/nixos/sils/sound.nix
 delete mode 100644 sys/sound/default.nix

diff --git a/modules/nixos/sils/default.nix b/modules/nixos/sils/default.nix
index 0f714f7..89aa111 100644
--- a/modules/nixos/sils/default.nix
+++ b/modules/nixos/sils/default.nix
@@ -19,6 +19,7 @@
     ./plymouth.nix
     ./printing.nix
     ./roles.nix
+    ./sound.nix
     ./sudo.nix
     ./sway.nix
     ./theming
diff --git a/modules/nixos/sils/roles.nix b/modules/nixos/sils/roles.nix
index cca3cf6..346149c 100644
--- a/modules/nixos/sils/roles.nix
+++ b/modules/nixos/sils/roles.nix
@@ -24,6 +24,7 @@ in {
       pamconfig.enable = lib.mkDefault true;
       plymouth.enable = lib.mkDefault true;
       printing.enable = lib.mkDefault true;
+      sound.enable = lib.mkDefault true;
       sway.enable = lib.mkDefault false;
       theming.enable = lib.mkDefault true;
     }
@@ -45,6 +46,7 @@ in {
       pamconfig.enable = lib.mkDefault true;
       plymouth.enable = lib.mkDefault false;
       printing.enable = lib.mkDefault true;
+      sound.enable = lib.mkDefault true;
       sway.enable = lib.mkDefault false;
       theming.enable = lib.mkDefault true;
     }
@@ -68,6 +70,7 @@ in {
       pamconfig.enable = lib.mkDefault true;
       plymouth.enable = lib.mkDefault false;
       printing.enable = lib.mkDefault true;
+      sound.enable = lib.mkDefault true;
       sway.enable = lib.mkDefault false;
       theming.enable = lib.mkDefault true;
     }
diff --git a/modules/nixos/sils/sound.nix b/modules/nixos/sils/sound.nix
new file mode 100644
index 0000000..3ad26fb
--- /dev/null
+++ b/modules/nixos/sils/sound.nix
@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.sils.sound;
+in {
+  options.sils.sound.enable = lib.mkEnableOption "sound config";
+  config = lib.mkIf cfg.enable {
+    services.pipewire = {
+      enable = true;
+      alsa = {
+        enable = true;
+        support32Bit = true;
+      };
+      pulse.enable = true;
+      jack.enable = true;
+    };
+  };
+}
diff --git a/sys/default.nix b/sys/default.nix
index 0eeeb35..ac71548 100644
--- a/sys/default.nix
+++ b/sys/default.nix
@@ -2,7 +2,6 @@
   imports = [
     ./packages
     ./services
-    ./sound
     ./systemd
     ./users
     ./virtualisation
diff --git a/sys/sound/default.nix b/sys/sound/default.nix
deleted file mode 100644
index 3007098..0000000
--- a/sys/sound/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{...}: {
-  services.pipewire = {
-    enable = true;
-    alsa = {
-      enable = true;
-      support32Bit = true;
-    };
-    pulse.enable = true;
-    jack.enable = true;
-  };
-}
-- 
cgit 1.4.1