From dc46c12ec58c9a83a484aceda4b081ba834193e7 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Mon, 23 Oct 2023 08:12:48 +0200
Subject: [PATCH] loki: Enable jack support in pipewire

---
 machines/loki/configuration.nix | 5 ++++-
 modules/sound/default.nix       | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix
index 4a63726..fe56e17 100644
--- a/machines/loki/configuration.nix
+++ b/machines/loki/configuration.nix
@@ -61,7 +61,10 @@
       cross-systems = [ "aarch64-linux" ];
     };
     tablet.enable = false;
-    sound.enable = true;
+    sound = {
+      enable = true;
+      jack = true;
+    };
     systemd.enable = true;
   };
 
diff --git a/modules/sound/default.nix b/modules/sound/default.nix
index 79ba645..f833432 100644
--- a/modules/sound/default.nix
+++ b/modules/sound/default.nix
@@ -7,7 +7,10 @@ with lib; let
   cfg = config.eboskma.sound;
 in
 {
-  options.eboskma.sound.enable = mkEnableOption "activate sound settings";
+  options.eboskma.sound = {
+    enable = mkEnableOption "activate sound settings";
+    jack = mkEnableOption "enable JACK";
+  };
 
   config = mkIf cfg.enable {
     sound.enable = true;
@@ -16,6 +19,7 @@ in
         enable = true;
         pulse.enable = true;
         alsa.enable = true;
+        jack.enable = cfg.jack;
         wireplumber.enable = true;
       };
     };
@@ -39,7 +43,7 @@ in
 
     security.rtkit.enable = true;
 
-    environment.systemPackages = with pkgs; [ pavucontrol ];
+    environment.systemPackages = with pkgs; [ pavucontrol pipewire ];
 
     users.extraUsers.${config.eboskma.var.mainUser}.extraGroups = [ "audio" ];
   };