Further modularization of machine

Droidnix/README.org

@@ -597,19 +597,19 @@ This sets the dbus implementation
 #+BEGIN_SRC nix :tangle assets/flake/machines/traveldroid/dbus.nix :noweb tangle :mkdirp yes :eval never-html
 { config, pkgs, ... }:
 {
-  services.dbus = {
+  # Enable dbus-broker as the D-Bus implementation
-    enable = true;
+  services.dbus-broker.enable = true;
-    package = pkgs.dbus-broker; # Use dbus-broker instead of the reference dbus
-  };
 
-  # Optional: Configure dbus-broker settings via environment variables
+  # Disable the default dbus service to avoid conflicts
+  services.dbus.enable = false;
+
+  # Configure dbus-broker via its launch configuration file
   environment.etc."dbus-broker/launch.conf".text = ''
     [General]
     LogLevel=warning
     MaxConnectionsPerUser=2048
   '';
 }
-
 #+END_SRC
 
 ** =assets/flake/machines/traveldroid/bluetooth.nix=

Droidnix/assets/flake/machines/traveldroid/dbus.nix

@@ -1,11 +1,12 @@
 { config, pkgs, ... }:
 {
-  services.dbus = {
+  # Enable dbus-broker as the D-Bus implementation
-    enable = true;
+  services.dbus-broker.enable = true;
-    package = pkgs.dbus-broker; # Use dbus-broker instead of the reference dbus
-  };
 
-  # Optional: Configure dbus-broker settings via environment variables
+  # Disable the default dbus service to avoid conflicts
+  services.dbus.enable = false;
+
+  # Configure dbus-broker via its launch configuration file
   environment.etc."dbus-broker/launch.conf".text = ''
     [General]
     LogLevel=warning