| 
									
										
										
										
											2014-04-14 16:26:48 +02:00
										 |  |  | { config, lib, pkgs, ... }: | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2014-04-14 16:26:48 +02:00
										 |  |  | with lib; | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-10-21 17:08:42 +01:00
										 |  |  | let | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-10-21 17:08:42 +01:00
										 |  |  |   cfg = config.services.redshift; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | in { | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  | 
 | 
					
						
							|  |  |  |   options.services.redshift = { | 
					
						
							|  |  |  |     enable = mkOption { | 
					
						
							| 
									
										
										
										
											2013-10-21 17:08:42 +01:00
										 |  |  |       type = types.bool; | 
					
						
							|  |  |  |       default = false; | 
					
						
							|  |  |  |       example = true; | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |       description = ''
 | 
					
						
							|  |  |  |         Enable Redshift to change your screen's colour temperature depending on | 
					
						
							|  |  |  |         the time of day. | 
					
						
							|  |  |  |       '';
 | 
					
						
							| 
									
										
										
										
											2013-10-21 17:08:42 +01:00
										 |  |  |     }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |     latitude = mkOption { | 
					
						
							| 
									
										
										
										
											2015-06-15 17:42:55 +02:00
										 |  |  |       type = types.str; | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |       description = ''
 | 
					
						
							| 
									
										
										
										
											2015-11-10 22:28:37 -08:00
										 |  |  |         Your current latitude, between | 
					
						
							|  |  |  |         <literal>-90.0</literal> and <literal>90.0</literal>. | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |       '';
 | 
					
						
							| 
									
										
										
										
											2013-10-21 17:08:42 +01:00
										 |  |  |     }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |     longitude = mkOption { | 
					
						
							| 
									
										
										
										
											2015-06-15 17:42:55 +02:00
										 |  |  |       type = types.str; | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |       description = ''
 | 
					
						
							| 
									
										
										
										
											2015-11-10 22:28:37 -08:00
										 |  |  |         Your current longitude, between | 
					
						
							|  |  |  |         between <literal>-180.0</literal> and <literal>180.0</literal>. | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |       '';
 | 
					
						
							| 
									
										
										
										
											2013-10-21 17:08:42 +01:00
										 |  |  |     }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |     temperature = { | 
					
						
							| 
									
										
										
										
											2013-10-21 17:08:42 +01:00
										 |  |  |       day = mkOption { | 
					
						
							| 
									
										
										
										
											2015-06-15 18:11:32 +02:00
										 |  |  |         type = types.int; | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |         default = 5500; | 
					
						
							|  |  |  |         description = ''
 | 
					
						
							| 
									
										
										
										
											2015-11-10 22:28:37 -08:00
										 |  |  |           Colour temperature to use during the day, between | 
					
						
							|  |  |  |           <literal>1000</literal> and <literal>25000</literal> K. | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |         '';
 | 
					
						
							| 
									
										
										
										
											2013-10-21 17:08:42 +01:00
										 |  |  |       }; | 
					
						
							|  |  |  |       night = mkOption { | 
					
						
							| 
									
										
										
										
											2015-06-15 18:11:32 +02:00
										 |  |  |         type = types.int; | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |         default = 3700; | 
					
						
							|  |  |  |         description = ''
 | 
					
						
							| 
									
										
										
										
											2015-11-10 22:28:37 -08:00
										 |  |  |           Colour temperature to use at night, between | 
					
						
							|  |  |  |           <literal>1000</literal> and <literal>25000</literal> K. | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |         '';
 | 
					
						
							| 
									
										
										
										
											2014-02-13 11:11:14 -05:00
										 |  |  |       }; | 
					
						
							|  |  |  |     }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |     brightness = { | 
					
						
							| 
									
										
										
										
											2014-02-13 11:11:14 -05:00
										 |  |  |       day = mkOption { | 
					
						
							| 
									
										
										
										
											2015-06-15 17:42:55 +02:00
										 |  |  |         type = types.str; | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |         default = "1"; | 
					
						
							|  |  |  |         description = ''
 | 
					
						
							|  |  |  |           Screen brightness to apply during the day, | 
					
						
							|  |  |  |           between <literal>0.1</literal> and <literal>1.0</literal>. | 
					
						
							|  |  |  |         '';
 | 
					
						
							| 
									
										
										
										
											2014-02-13 11:11:14 -05:00
										 |  |  |       }; | 
					
						
							|  |  |  |       night = mkOption { | 
					
						
							| 
									
										
										
										
											2015-06-15 17:42:55 +02:00
										 |  |  |         type = types.str; | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |         default = "1"; | 
					
						
							|  |  |  |         description = ''
 | 
					
						
							|  |  |  |           Screen brightness to apply during the night, | 
					
						
							|  |  |  |           between <literal>0.1</literal> and <literal>1.0</literal>. | 
					
						
							|  |  |  |         '';
 | 
					
						
							| 
									
										
										
										
											2013-10-21 17:08:42 +01:00
										 |  |  |       }; | 
					
						
							|  |  |  |     }; | 
					
						
							| 
									
										
										
										
											2015-07-26 23:32:43 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |     package = mkOption { | 
					
						
							|  |  |  |       type = types.package; | 
					
						
							|  |  |  |       default = pkgs.redshift; | 
					
						
							| 
									
										
										
										
											2016-01-17 19:34:55 +01:00
										 |  |  |       defaultText = "pkgs.redshift"; | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |       description = ''
 | 
					
						
							|  |  |  |         redshift derivation to use. | 
					
						
							|  |  |  |       '';
 | 
					
						
							|  |  |  |     }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     extraOptions = mkOption { | 
					
						
							| 
									
										
										
										
											2015-07-26 23:32:43 +02:00
										 |  |  |       type = types.listOf types.str; | 
					
						
							|  |  |  |       default = []; | 
					
						
							|  |  |  |       example = [ "-v" "-m randr" ]; | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  |       description = ''
 | 
					
						
							|  |  |  |         Additional command-line arguments to pass to | 
					
						
							|  |  |  |         <command>redshift</command>. | 
					
						
							|  |  |  |       '';
 | 
					
						
							| 
									
										
										
										
											2015-07-26 23:32:43 +02:00
										 |  |  |     }; | 
					
						
							| 
									
										
										
										
											2013-10-21 17:08:42 +01:00
										 |  |  |   }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   config = mkIf cfg.enable { | 
					
						
							| 
									
										
										
										
											2016-04-24 19:44:01 +02:00
										 |  |  |     systemd.user.services.redshift = { | 
					
						
							| 
									
										
										
										
											2013-10-21 17:08:42 +01:00
										 |  |  |       description = "Redshift colour temperature adjuster"; | 
					
						
							| 
									
										
										
										
											2016-04-24 19:44:01 +02:00
										 |  |  |       wantedBy = [ "default.target" ]; | 
					
						
							| 
									
										
										
										
											2015-12-21 03:13:18 +01:00
										 |  |  |       serviceConfig = { | 
					
						
							|  |  |  |         ExecStart = ''
 | 
					
						
							|  |  |  |           ${cfg.package}/bin/redshift \ | 
					
						
							|  |  |  |             -l ${cfg.latitude}:${cfg.longitude} \ | 
					
						
							|  |  |  |             -t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \ | 
					
						
							|  |  |  |             -b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \ | 
					
						
							|  |  |  |             ${lib.strings.concatStringsSep " " cfg.extraOptions} | 
					
						
							|  |  |  |         '';
 | 
					
						
							| 
									
										
										
										
											2016-04-24 19:44:01 +02:00
										 |  |  |         RestartSec = 3; | 
					
						
							|  |  |  |         Restart = "always"; | 
					
						
							| 
									
										
										
										
											2015-12-21 03:13:18 +01:00
										 |  |  |       }; | 
					
						
							| 
									
										
											  
											
												redshift: Fix default value of $DISPLAY (#17746)
Before commit 54fa0cfe4eef7e54e23380704af70ee7b65473ce, the `redshift`
service was run with the environment variable `DISPLAY` set to `:0`.
Commit 54fa0cfe4eef7e54e23380704af70ee7b65473ce changed this to
instead use the value of the `services.xserver.display` configuration
option in the value of the `DISPLAY` variable. In so doing, no default
value was provided for the case where `services.xserver.display` is
`null`.
While the default value of `services.xserver.display` is `0`, use of
which by the `redshift` module would result in `DISPLAY` again being
set to `:0`, `services.xserver.display` may also be `null`, to which
value it is set by, e.g., the `lightdm` module.
In the case that `services.xserver.display` is `null`, with the change
made in commit 54fa0cfe4eef7e54e23380704af70ee7b65473ce, the `DISPLAY`
variable in the environment of the `redshift` service would be set to
`:` (a single colon), which, according to my personal experience,
would result in —
  - the `redshift` service failing to start; and
  - systemd repeatedly attempting to restart the `redshift` service,
    looping indefinitely, while the hapless `redshift` spews error
    messages into the journal.
It can be observed that the malformed value of `DISPLAY` is likely at
fault for this issue by executing the following commands in an
ordinary shell, with a suitable `redshift` executable, and the X11
display not already tinted:
  - `redshift -O 2500` — This command should reduce the color
    temperature of the display (making it more reddish).
  - `DISPLAY=':' redshift -O 6500` — This command should raise the
    color temperature back up, were it not for the `DISPLAY`
    environment variable being set to `:` for it, which should cause
    it to, instead, fail with several error messages.
This commit attempts to fix this issue by having the `DISPLAY`
environment variable for the `redshift` service default to its old
value of `:0` in the case that `services.xserver.display` is `null`.
I have tested this solution on NixOS, albeit without the benefit of a
system with multiple displays.
											
										 
											2016-08-17 11:34:26 +00:00
										 |  |  |       environment = { | 
					
						
							|  |  |  |         DISPLAY = ":${toString ( | 
					
						
							|  |  |  |           let display = config.services.xserver.display; | 
					
						
							|  |  |  |           in if display != null then display else 0 | 
					
						
							|  |  |  |         )}";
 | 
					
						
							|  |  |  |       }; | 
					
						
							| 
									
										
										
										
											2013-10-21 17:08:42 +01:00
										 |  |  |     }; | 
					
						
							|  |  |  |   }; | 
					
						
							| 
									
										
										
										
											2015-09-06 03:57:00 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-10-21 17:08:42 +01:00
										 |  |  | } |