3 files changed, 17 insertions, 4 deletions
diff --git a/systems/bluetooth.nix b/systems/bluetooth.nix
new file mode 100644
index 0000000..d8eb230
--- /dev/null
+++ b/systems/bluetooth.nix
@@ -0,0 +1,16 @@
+{ inputs, outputs, config, hostname, username, lib, pkgs, stateVersion, ... }:
+{
+    hardware.bluetooth.enable = true;
+    services.blueman.enable = true;
+
+    environment.etc = {
+        "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
+bluez_monitor.properties = {
+    ["bluez5.enable-sbc-xq"] = true,
+    ["bluez5.enable-msbc"] = true,
+    ["bluez5.enable-hw-volume"] = true,
+    ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
+}
+        '';
+    };
+}
diff --git a/systems/default.nix b/systems/default.nix
index eadf5c5..c10c94e 100644
--- a/systems/default.nix
+++ b/systems/default.nix
@@ -72,7 +72,6 @@
     };
   };
 
-  sound.enable = true;
   services.pipewire = {
     enable = true;
     alsa.enable = true;
diff --git a/systems/jonbox/default.nix b/systems/jonbox/default.nix
index 0f53a7a..cf641f5 100644
--- a/systems/jonbox/default.nix
+++ b/systems/jonbox/default.nix
@@ -5,6 +5,7 @@
   [ # Include the results of the hardware scan.
     (modulesPath + "/installer/scan/not-detected.nix")
     ./filesystem.nix
+    ../bluetooth.nix
   ];
 
   nixpkgs.config.allowUnfreePredicate = pkg:
@@ -39,9 +40,6 @@
     package = config.boot.kernelPackages.nvidiaPackages.stable;
   };
 
-  hardware.bluetooth.enable = true;
-  services.blueman.enable = true;
-
   programs.light.enable = true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";