Further modularization of machine

Droidnix/README.org

@@ -597,14 +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-broker = {
+  services.dbus = {
     enable = true;
-    settings = {
+    package = pkgs.dbus-broker; # Use dbus-broker instead of the reference dbus
-      MaxConnectionsPerUser = 2048; # Increase if you have many D-Bus clients
-      LogLevel = "warning"; # Reduce verbosity
-    };
   };
+
+  # Optional: Configure dbus-broker settings via environment variables
+  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,10 +1,14 @@
 { config, pkgs, ... }:
 {
-  services.dbus-broker = {
+  services.dbus = {
     enable = true;
-    settings = {
+    package = pkgs.dbus-broker; # Use dbus-broker instead of the reference dbus
-      MaxConnectionsPerUser = 2048; # Increase if you have many D-Bus clients
-      LogLevel = "warning"; # Reduce verbosity
-    };
   };
+
+  # Optional: Configure dbus-broker settings via environment variables
+  environment.etc."dbus-broker/launch.conf".text = ''
+    [General]
+    LogLevel=warning
+    MaxConnectionsPerUser=2048
+  '';
 }