@@ -0,0 +1,14 @@+{ config, pkgs, ... }:
+
+{
+  hardware = {
+    bluetooth = {
+      package = pkgs.bluezFull;
+    };
+    pulseaudio = {
+      extraModules = with pkgs; [
+        pulseaudio-modules-bt
+      ];
+    };
+  };
+}

@@ -0,0 +1,19 @@+{ config, pkgs, ... }:
+
+{
+  hardware = {
+    bluetooth = {
+      enable = true;
+      powerOnBoot = false;
+    };
+  };
+  systemd.services.bluetooth.restartIfChanged = false;
+
+  environment.systemPackages = with pkgs; [
+    bluez-tools
+  ];
+
+  services.blueman = {
+    enable = true;
+  };
+}

@@ -1,23 +1,14 @@ { config, pkgs, lib, ... }:
 
-{ boot.kernelModules = [ "coretemp" ];
+{
+  imports = [
+    ./bluetooth.nix
+    ./bluetooth-audio.nix
+  ];
 
-  hardware = {
-    bluetooth = {
-      enable = true;
-      powerOnBoot = false;
-      package = pkgs.bluezFull;
-    };
-    pulseaudio = {
-      extraModules = with pkgs; [
-        pulseaudio-modules-bt
-      ];
-    };
-  };
-  systemd.services.bluetooth.restartIfChanged = false;
+  boot.kernelModules = [ "coretemp" ];
 
   environment.systemPackages = with pkgs; [
-    bluez-tools
 
     powerstat
     powertop
@@ -65,10 +56,6 @@       SOUND_POWER_SAVE_ON_AC=60
       DEVICES_TO_DISABLE_ON_BAT_NOT_IN_USE="bluetooth wwan"
     '';
-  };
-
-  services.blueman = {
-    enable = true;
   };
 
   services.xserver = {