4 files changed, 45 insertions, 6 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 61a5fdb4..84ac88a7 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -331,6 +331,13 @@ in {
           ${pkgs.systemd}/bin/systemctl --user try-restart dunst
         '';
       };
+      "wireplumber" = {
+        source = ./wireplumber;
+        recursive = true;
+        onChange = ''
+          ${pkgs.systemd}/bin/systemctl --user try-restart wireplumber
+        '';
+      };
     };
 
     fonts.fontconfig.enable = true;
diff --git a/accounts/gkleen@sif/wireplumber/bluetooth.lua.d/50-bluez-config.lua b/accounts/gkleen@sif/wireplumber/bluetooth.lua.d/50-bluez-config.lua
new file mode 100644
index 00000000..948b7dfa
--- /dev/null
+++ b/accounts/gkleen@sif/wireplumber/bluetooth.lua.d/50-bluez-config.lua
@@ -0,0 +1,20 @@
+rule = {
+  matches = {
+    {
+      { "device.name", "matches", "bluez_card.*" },
+    },
+  },
+  apply_properties = {
+     ["bluez5.auto-connect"] = "[ hfp_hf hsp_hs a2dp_sink ]",
+  },
+}
+
+table.insert(bluez_monitor.rules,rule)
+
+bluez_monitor.properties = {
+   ["bluez5.enable-msbc"] = true,
+   ["bluez5.enable-sbc-xq"] = true,
+   ["bluez5.enable-hw-volume"] = false,
+   ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]",
+   ["bluez5.codecs"] = "[ sbc sbc_xq aac ldac aptx aptx_hd aptx_ll aptx_ll_duplex faststream faststream_duplex ]",
+}
diff --git a/accounts/gkleen@sif/wireplumber/main.lua.d/51-alsa-disable.lua b/accounts/gkleen@sif/wireplumber/main.lua.d/51-alsa-disable.lua
new file mode 100644
index 00000000..eafa6184
--- /dev/null
+++ b/accounts/gkleen@sif/wireplumber/main.lua.d/51-alsa-disable.lua
@@ -0,0 +1,12 @@
+rule = {
+  matches = {
+    {
+      { "device.name", "equals", "alsa_card.pci-0000_01_00.1" },
+    },
+  },
+  apply_properties = {
+    ["device.disabled"] = true,
+  },
+}
+
+table.insert(alsa_monitor.rules,rule)
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 4e099f38..fc5bd8f6 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -342,9 +342,9 @@ in {
           "link.max-buffers" = 16;
           "log.level" = 2;
           "default.clock.rate" = 192000;
-          "default.clock.quantum" = 1024;
+          "default.clock.quantum" = 2048;
           "default.clock.min-quantum" = 32;
-          "default.clock.max-quantum" = 2048;
+          "default.clock.max-quantum" = 4096;
           "core.daemon" = true;
           "core.name" = "pipewire-0";
         };
@@ -402,16 +402,16 @@ in {
             name = "libpipewire-module-protocol-pulse";
             args = {
               "pulse.min.req" = "32/192000";
-              "pulse.default.req" = "1024/192000";
-              "pulse.max.req" = "2048/192000";
+              "pulse.default.req" = "2048/192000";
+              "pulse.max.req" = "4096/192000";
               "pulse.min.quantum" = "32/192000";
-              "pulse.max.quantum" = "2048/192000";
+              "pulse.max.quantum" = "4096/192000";
               "server.address" = [ "unix:native" ];
             };
           }
         ];
         "stream.properties" = {
-          "node.latency" = "2048/192000";
+          "node.latency" = "4096/192000";
           "resample.quality" = 1;
         };
       };