modules: Move bluetooth, sound and wlan modules into the services namespace

hosts/desktop/default.nix

@@ -20,11 +20,10 @@
     };
     de.hyprland.enable = true;
 
-    sound.enable = true;
-
     services = {
       resolved.enable = true;
       gc.enable = true;
+      sound.enable = true;
       geoclue.enable = true;
       tailscale = {
         enable = true;

hosts/laptop/default.nix

@@ -20,13 +20,12 @@
     };
     de.hyprland.enable = true;
 
-    wifi.enable = true;
-    bluetooth.enable = true;
-    sound.enable = true;
-
     services = {
       resolved.enable = true;
       gc.enable = true;
+      wlan.enable = true;
+      bluetooth.enable = true;
+      sound.enable = true;
       geoclue.enable = true;
       tailscale = {
         enable = true;

modules/system/services/bluetooth.nix

@@ -1,8 +1,8 @@
 { config, lib, ... }:
 {
-  options.custom.bluetooth.enable = lib.mkEnableOption "";
+  options.custom.services.bluetooth.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.custom.bluetooth.enable {
+  config = lib.mkIf config.custom.services.bluetooth.enable {
     hardware = {
       bluetooth = {
         enable = true;

modules/system/services/sound.nix

@@ -1,8 +1,8 @@
 { config, lib, ... }:
 {
-  options.custom.sound.enable = lib.mkEnableOption "";
+  options.custom.services.sound.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.custom.sound.enable {
+  config = lib.mkIf config.custom.services.sound.enable {
     security.rtkit.enable = true;
     services.pipewire = {
       enable = true;

modules/system/services/wlan.nix

@@ -5,10 +5,10 @@
   ...
 }:
 let
-  cfg = config.custom.wifi;
+  cfg = config.custom.services.wlan;
 in
 {
-  options.custom.wifi = {
+  options.custom.services.wlan = {
     enable = lib.mkEnableOption "";
     networks = lib.mkOption {
       type = lib.types.listOf lib.types.nonEmptyStr;