Further modularization of machine

2026-03-13 20:02:47 +01:00
parent 9b94e7535c
commit 0c83b8462d
3 changed files with 383 additions and 384 deletions
@@ -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, ... }:
 {
-  # Enable dbus-broker as the D-Bus implementation
-  services.dbus-broker.enable = true;
+  services.dbus = {
+    enable = true;
+    package = pkgs.dbus-broker; # Use dbus-broker as the implementation
+  };

-  # Disable the default dbus service to avoid conflicts
-  services.dbus.enable = false;
-
-  # Configure dbus-broker via its launch configuration file
+  # Configure dbus-broker via its configuration file
  environment.etc."dbus-broker/launch.conf".text = ''
    [General]
    LogLevel=warning
    MaxConnectionsPerUser=2048
  '';
 }
+
 #+END_SRC

 ** =assets/flake/machines/traveldroid/bluetooth.nix=
@@ -1,12 +1,11 @@
 { config, pkgs, ... }:
 {
-  # Enable dbus-broker as the D-Bus implementation
-  services.dbus-broker.enable = true;
+  services.dbus = {
+    enable = true;
+    package = pkgs.dbus-broker; # Use dbus-broker as the implementation
+  };

-  # Disable the default dbus service to avoid conflicts
-  services.dbus.enable = false;
-
-  # Configure dbus-broker via its launch configuration file
+  # Configure dbus-broker via its configuration file
  environment.etc."dbus-broker/launch.conf".text = ''
    [General]
    LogLevel=warning