From 079e1c76cfeedbdd0610fc9b50cb9583a330e77e Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Thu, 14 Apr 2016 12:38:36 +0100
Subject: [PATCH] Revert "dbus nixos module: add units for systemd user
 session"

This reverts commit 83cb6ec399e067b0d111abc39381204d1796758f.

Was breaking: nix-build '<nixos/release.nix>' -A tests.xfce.x86_64-linux
---
 nixos/modules/services/system/dbus.nix | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 3fd1ae145ff8..2e29ef6a8f53 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -139,30 +139,6 @@ in
 
     systemd.services.dbus.restartTriggers = [ configDir ];
 
-    systemd.user = {
-      services.dbus = {
-        description = "D-Bus User Message Bus";
-        requires = [ "dbus.socket" ];
-        # NixOS doesn't support "Also" so we pull it in manually
-        # As the .service is supposed to come up at the same time as
-        # the .socket, we use basic.target instead of default.target
-        wantedBy = [ "basic.target" ];
-        serviceConfig = {
-          ExecStart = "${pkgs.dbus_daemon.out}/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation";
-          ExecReload = "${pkgs.dbus_daemon.out}/bin/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig";
-        };
-      };
-
-      sockets.dbus = {
-        description = "D-Bus User Message Bus Socket";
-        socketConfig = {
-          ListenStream = "%t/bus";
-          ExecStartPost = "-${config.systemd.package}/bin/systemctl --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus";
-        };
-        wantedBy = [ "sockets.target" ];
-      };
-    };
-
     environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ];
 
   };