From 5685ee54461a71f35b64bff62c158b9f129dce95 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Jan 2013 13:59:41 +0100
Subject: [PATCH] Add/fix systemd unit descriptions

---
 modules/services/networking/firewall.nix | 4 +++-
 modules/services/networking/ntpd.nix     | 2 +-
 modules/services/printing/cupsd.nix      | 2 +-
 modules/services/scheduling/atd.nix      | 2 +-
 modules/services/scheduling/cron.nix     | 2 +-
 modules/services/x11/xserver.nix         | 4 +++-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index d262f1f76cbc..7bc09a7b4044 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -236,7 +236,9 @@ in
                  ];
 
     jobs.firewall =
-      { startOn = "started network-interfaces";
+      { description = "Firewall";
+
+        startOn = "started network-interfaces";
 
         path = [ pkgs.iptables ];
 
diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index e9b27268aa17..be3fcbd65433 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -66,7 +66,7 @@ in
       };
 
     jobs.ntpd =
-      { description = "NTP daemon";
+      { description = "NTP Daemon";
 
         wantedBy = [ "ip-up.target" ];
         partOf = [ "ip-up.target" ];
diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 6d31c0050aaf..5a6b85810aaa 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -118,7 +118,7 @@ in
     boot.blacklistedKernelModules = [ "usblp" ];
 
     jobs.cupsd =
-      { description = "CUPS printing daemon";
+      { description = "CUPS Printing Daemon";
 
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index 6e6eaec1db9a..66266e5b5708 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -64,7 +64,7 @@ in
       };
 
     jobs.atd =
-      { description = "at daemon (atd)";
+      { description = "Job Execution Daemon (atd)";
 
         startOn = "stopped udevtrigger";
 
diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index 350d65b476a6..cf348793a653 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -86,7 +86,7 @@ in
     environment.systemPackages = [ cronNixosPkg ];
 
     jobs.cron =
-      { description = "Cron daemon";
+      { description = "Cron Daemon";
 
         startOn = "startup";
 
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 6eec6f88b97d..599f8be226db 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -389,7 +389,9 @@ in
     boot.systemd.defaultUnit = mkIf cfg.autorun "graphical.target";
 
     boot.systemd.services."display-manager" =
-      { after = [ "systemd-udev-settle.service" "local-fs.target" ];
+      { description = "X11 Server";
+
+        after = [ "systemd-udev-settle.service" "local-fs.target" ];
 
         restartIfChanged = false;