Refactor bluetooth configuration

hosts/lemp11/configuration.nix

@@ -20,7 +20,6 @@
 
   features = {
     core = {
-      bluetooth.enable = true;
       zram.enable = true;
     };
 

hosts/t480/configuration.nix

@@ -35,7 +35,6 @@
     };
 
     core = {
-      bluetooth.enable = true;
       openssh.enable = true;
       pipewire.enable = true;
       xbanish.enable = true;

hosts/t490/configuration.nix

@@ -17,7 +17,6 @@
   ];
 
   features = {
-    core.bluetooth.enable = true;
     core.zram.enable = true;
     desktop.dconf.enable = true;
   };

hosts/t490/hardware.nix

@@ -1,5 +0,0 @@
-{
-  hardware = {
-    bluetooth.enable = true;
-  };
-}

modules/nixos/bluetooth.nix

@@ -1,16 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.features.core.bluetooth;
-in
-{
-  options.features.core.bluetooth.enable = mkEnableOption "Enable bluetooth";
-
-  config = mkIf cfg.enable {
-    hardware.bluetooth.enable = true;
-
-    services.blueman.enable = true;
-  };
-}

modules/nixos/default.nix

@@ -1,7 +1,6 @@
 {
   imports = [
     ./avahi.nix
-    ./bluetooth.nix
     ./dconf.nix
     ./docker.nix
     ./dwm

modules2/bluetooth.nix

@@ -0,0 +1,7 @@
+{
+  flake.modules.nixos.pc = {
+    hardware.bluetooth.enable = true;
+
+    services.blueman.enable = true;
+  };
+}

modules2/flake-parts.nix

@@ -0,0 +1,7 @@
+{ inputs, ... }:
+
+{
+  imports = [
+    inputs.flake-parts.flakeModules.modules
+  ];
+}

modules2/hosts/t480/imports.nix

@@ -0,0 +1,7 @@
+{ config, ... }:
+
+{
+  flake.modules.nixos."hosts/t480".imports = with config.flake.modules.nixos; [
+    pc
+  ];
+}

modules2/nixos-configurations.nix

@@ -1,4 +1,4 @@
-{ inputs, self, ... }:
+{ config, inputs, self, ... }:
 
 {
   flake =
@@ -21,7 +21,11 @@
         inputs.nixpkgs.lib.nixosSystem {
           inherit system;
 
-          modules = [ "${self}/hosts/${hostname}/configuration.nix" ];
+          modules = [
+            "${self}/hosts/${hostname}/configuration.nix"
+
+            config.flake.modules.nixos."hosts/${hostname}"
+          ];
 
           specialArgs = specialArgs // {
             inherit hostname stateVersion system;