From f292a27f442d10de4827800d064a3a8c64d05cee Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 6 Sep 2020 22:57:54 +0200
Subject: nixos/dbus: always use socket activates user session

This removes the `services.dbus.socketActivated` and
`services.xserver.startDbusSession` options. Instead the user D-Bus
session is always socket activated.
---
 nixos/modules/services/system/dbus.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'nixos/modules/services/system/dbus.nix')

diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 4a60fec1ca8..d9dd26f0f18 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -19,6 +19,12 @@ in
 
 {
 
+  imports = [
+    (mkRemovedOptionModule
+      [ "services" "dbus" "socketActivated" ]
+      "The user D-Bus session is now always socket activated and this option can safely be removed.")
+  ];
+
   ###### interface
 
   options = {
@@ -51,14 +57,6 @@ in
           <filename><replaceable>pkg</replaceable>/share/dbus-1/services</filename>
         '';
       };
-
-      socketActivated = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Make the user instance socket activated.
-        '';
-      };
     };
   };
 
@@ -108,7 +106,7 @@ in
         reloadIfChanged = true;
         restartTriggers = [ configDir ];
       };
-      sockets.dbus.wantedBy = mkIf cfg.socketActivated [ "sockets.target" ];
+      sockets.dbus.wantedBy = [ "sockets.target" ];
     };
 
     environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ];
-- 
cgit 1.4.1