From e1eb3592c26b635af1e705accce2c4475b241f2f Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Mon, 5 Jan 2026 15:35:54 +0000
Subject: [PATCH] nixos/openrgb: systemd service cleanup

- Run service after lm_sensors:
  Align with upstream's systemd ordering.
- Sync service description with upstream.
- Cleanup `ExecStart` using `escapeShellArgs`:
  Avoid ad-hoc `toString` and `escapeShellArg` by wrapping the whole
  thing in `escapeShellArgs`.
---
 nixos/modules/services/hardware/openrgb.nix | 22 ++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/hardware/openrgb.nix b/nixos/modules/services/hardware/openrgb.nix
index 9d5d598db913..09b9d06201e6 100644
--- a/nixos/modules/services/hardware/openrgb.nix
+++ b/nixos/modules/services/hardware/openrgb.nix
@@ -59,16 +59,28 @@ in
     ++ lib.optionals (cfg.motherboard == "intel") [ "i2c-i801" ];
 
     systemd.services.openrgb = {
-      description = "OpenRGB server daemon";
-      after = [ "network.target" ];
+      description = "OpenRGB SDK Server";
+      after = [
+        "network.target"
+        "lm_sensors.service"
+      ];
       wants = [ "dev-usb.device" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         StateDirectory = "OpenRGB";
         WorkingDirectory = "/var/lib/OpenRGB";
-        ExecStart =
-          "${cfg.package}/bin/openrgb --server --server-port ${toString cfg.server.port}"
-          + lib.optionalString (builtins.isString cfg.startupProfile) " --profile ${lib.escapeShellArg cfg.startupProfile}";
+        ExecStart = lib.escapeShellArgs (
+          [
+            (lib.getExe cfg.package)
+            "--server"
+            "--server-port"
+            cfg.server.port
+          ]
+          ++ lib.optionals (lib.isString cfg.startupProfile) [
+            "--profile"
+            cfg.startupProfile
+          ]
+        );
         Restart = "always";
       };
     };