Merge 35877def72 into 6d3b6dc922

modules/services/wlsunset.nix

@@ -1,17 +1,19 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let cfg = config.services.wlsunset;
-
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.services.wlsunset;
 in {
-  meta.maintainers = [ hm.maintainers.matrss ];
+  meta.maintainers = [hm.maintainers.matrss];
 
   options.services.wlsunset = {
     enable = mkEnableOption "wlsunset";
 
     package = mkOption {
-      type = types.package;
+      type = with types; package;
       default = pkgs.wlsunset;
       defaultText = "pkgs.wlsunset";
       description = ''
@@ -20,7 +22,9 @@ in {
     };
 
     latitude = mkOption {
-      type = types.str;
+      type = with types; nullOr (either float int);
+      default = null;
+      example = -74.3;
       description = ''
         Your current latitude, between `-90.0` and
         `90.0`.
@@ -28,7 +32,9 @@ in {
     };
 
     longitude = mkOption {
-      type = types.str;
+      type = with types; nullOr (either float int);
+      default = null;
+      example = 12.5;
       description = ''
         Your current longitude, between `-180.0` and
         `180.0`.
@@ -37,7 +43,7 @@ in {
 
     temperature = {
       day = mkOption {
-        type = types.int;
+        type = with types; int;
         default = 6500;
         description = ''
           Colour temperature to use during the day, in Kelvin (K).
@@ -46,7 +52,7 @@ in {
       };
 
       night = mkOption {
-        type = types.int;
+        type = with types; int;
         default = 4000;
         description = ''
           Colour temperature to use during the night, in Kelvin (K).
@@ -56,15 +62,42 @@ in {
     };
 
     gamma = mkOption {
-      type = types.str;
-      default = "1.0";
+      type = with types; either float int;
+      default = 1.0;
+      example = 0.6;
       description = ''
         Gamma value to use.
       '';
     };
 
+    output = mkOption {
+      type = with types; nullOr str;
+      default = null;
+      description = ''
+        Name of output to use, by default all outputs are used.
+      '';
+    };
+
+    sunrise = mkOption {
+      type = with types; nullOr str;
+      default = null;
+      example = "06:30";
+      description = ''
+        The time when the sun rises (in 24 hour format).
+      '';
+    };
+
+    sunset = mkOption {
+      type = with types; nullOr str;
+      default = null;
+      example = "18:00";
+      description = ''
+        The time when the sun sets (in 24 hour format).
+      '';
+    };
+
     systemdTarget = mkOption {
-      type = types.str;
+      type = with types; str;
       default = "graphical-session.target";
       description = ''
         Systemd target to bind to.
@@ -76,27 +109,42 @@ in {
     assertions = [
       (lib.hm.assertions.assertPlatform "services.wlsunset" pkgs
         lib.platforms.linux)
+      {
+        assertion = (cfg.sunrise != null || cfg.sunset != null) != (cfg.latitude != null || cfg.longitude != null);
+        message = "Either `sunrise` and `sunset` together or `longitude` and `latitude` together must be set for wlsunset";
+      }
+      {
+        assertion = (cfg.sunrise != null) == (cfg.sunset != null);
+        message = "Both `sunset` and `sunrise` together must be set for wlsunset";
+      }
+      {
+        assertion = (cfg.latitude != null) == (cfg.longitude != null);
+        message = "Both `latitude and `longitude` together must be set for wlsunset";
+      }
     ];
 
     systemd.user.services.wlsunset = {
       Unit = {
         Description = "Day/night gamma adjustments for Wayland compositors.";
-        PartOf = [ "graphical-session.target" ];
+        PartOf = ["graphical-session.target"];
       };
 
       Service = {
         ExecStart = let
-          args = [
-            "-l ${cfg.latitude}"
-            "-L ${cfg.longitude}"
-            "-t ${toString cfg.temperature.night}"
-            "-T ${toString cfg.temperature.day}"
-            "-g ${cfg.gamma}"
-          ];
-        in "${cfg.package}/bin/wlsunset ${concatStringsSep " " args}";
+          args = cli.toGNUCommandLineShell {} {
+            t = cfg.temperature.night;
+            T = cfg.temperature.day;
+            g = cfg.gamma;
+            l = cfg.latitude;
+            L = cfg.longitude;
+            S = cfg.sunrise;
+            s = cfg.sunset;
+            o = cfg.output;
+          };
+        in "${cfg.package}/bin/wlsunset ${args}";
       };
 
-      Install = { WantedBy = [ cfg.systemdTarget ]; };
+      Install = {WantedBy = [cfg.systemdTarget];};
     };
   };
 }