Commit 43f34da0 authored by Jan Tojnar's avatar Jan Tojnar
Browse files

nixos/dbus: Clean up 

- Format the expression with nixpkgs-fmt.
- Remove `with` statement for clarity.
- Remove useless comments.
- Regroup systemd options.
parent 65ddb0ef

nixos/modules/services/system/dbus.nix

+30 −19
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 


{ config, lib, pkgs, ... }:



with lib;



let



  cfg = config.services.dbus;
@@ -16,11 +14,11 @@ let 
    serviceDirectories = cfg.packages;

  };



  inherit (lib) mkOption types;



in



{

  ###### interface



  options = {



    services.dbus = {
@@ -68,10 +66,11 @@ in 
    };

  };



  ###### implementation



  config = mkIf cfg.enable {

    environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus ];

  config = lib.mkIf cfg.enable {

    environment.systemPackages = [

      pkgs.dbus.daemon

      pkgs.dbus

    ];



    environment.etc."dbus-1".source = configDir;
@@ -84,7 +83,9 @@ in 


    users.groups.messagebus.gid = config.ids.gids.messagebus;



    systemd.packages = [ pkgs.dbus.daemon ];

    systemd.packages = [

      pkgs.dbus.daemon

    ];



    security.wrappers.dbus-daemon-launch-helper = {

      source = "${pkgs.dbus.daemon}/libexec/dbus-daemon-launch-helper";
@@ -103,19 +104,29 @@ in 
    systemd.services.dbus = {

      # Don't restart dbus-daemon. Bad things tend to happen if we do.

      reloadIfChanged = true;

      restartTriggers = [ configDir ];

      environment = { LD_LIBRARY_PATH = config.system.nssModules.path; };

      restartTriggers = [

        configDir

      ];

      environment = {

        LD_LIBRARY_PATH = config.system.nssModules.path;

      };

    };



    systemd.user = {

      services.dbus = {

    systemd.user.services.dbus = {

      # Don't restart dbus-daemon. Bad things tend to happen if we do.

      reloadIfChanged = true;

        restartTriggers = [ configDir ];

      };

      sockets.dbus.wantedBy = [ "sockets.target" ];

      restartTriggers = [

        configDir

      ];

    };



    environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ];

    systemd.user.sockets.dbus.wantedBy = [

      "sockets.target"

    ];



    environment.pathsToLink = [

      "/etc/dbus-1"

      "/share/dbus-1"

    ];

  };

}