diff --git a/legacy/modules/bluetooth-audio.nix b/legacy/modules/bluetooth-audio.nix
deleted file mode 100644
index e3b2aaa..0000000
--- a/legacy/modules/bluetooth-audio.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  hardware.bluetooth = {
-    enable = true;
-    package = pkgs.bluezFull;
-    settings = {
-      General = {
-        Enable = "Source,Sink,Media,Socket";
-      };
-    };
-  };
-  services.blueman.enable = true;
-  environment.systemPackages = with pkgs; [
-    sony-headphones-client
-  ];
-}
diff --git a/machines/thinkman/configuration.nix b/machines/thinkman/configuration.nix
index a4cf5ea..60e6a66 100644
--- a/machines/thinkman/configuration.nix
+++ b/machines/thinkman/configuration.nix
@@ -7,7 +7,6 @@
     ./services.nix
     ./profiles.nix
     ./system.nix
-    ../../legacy/modules/bluetooth-audio.nix
     ../../legacy/modules/desktop-default.nix
     ../../legacy/modules/desktop-development.nix
     ../../legacy/modules/development.nix
diff --git a/machines/thinkman/hardware-configuration.nix b/machines/thinkman/hardware-configuration.nix
index fc24650..7f56ba0 100644
--- a/machines/thinkman/hardware-configuration.nix
+++ b/machines/thinkman/hardware-configuration.nix
@@ -7,6 +7,7 @@
   services.tlp.enable = true;
 
   my.hardware = {
+    bluetooth.enable = true;
     keychron.enable = true;
     nitrokey.enable = true;
     sound.enable = true;
diff --git a/modules/hardware/bluetooth/default.nix b/modules/hardware/bluetooth/default.nix
new file mode 100644
index 0000000..737d49b
--- /dev/null
+++ b/modules/hardware/bluetooth/default.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.hardware.bluetooth;
+in
+{
+  options.my.hardware.bluetooth = with lib; {
+    enable = mkEnableOption "bluetooth configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    hardware.bluetooth = {
+      enable = true;
+      package = pkgs.bluezFull;
+      settings = {
+        General = {
+          Enable = "Source,Sink,Media,Socket";
+        };
+      };
+    };
+    services.blueman.enable = true;
+    environment.systemPackages = with pkgs; [
+      sony-headphones-client
+    ];
+  };
+}
diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix
index fae9928..9bf5b03 100644
--- a/modules/hardware/default.nix
+++ b/modules/hardware/default.nix
@@ -3,6 +3,7 @@
 
 {
   imports = [
+    ./bluetooth
     ./firmware
     ./keychron
     ./nitrokey