summary refs log tree commit diff
path: root/nixos/modules/services/x11
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-04-25 18:02:10 +0300
committerNikolay Amiantov <ab@fmap.me>2016-04-25 18:02:10 +0300
commit09f02b918ec4df875326e3addcdb99343c976a78 (patch)
tree168f27854f3f5adc6d1aaffa4adfac1b42c4ec8c /nixos/modules/services/x11
parent48195dd2becfa820353e900ba05737b4fce1b466 (diff)
parentf9e5eccb13ffbbac3381cfa85ffd1748d3dacd77 (diff)
downloadnixlib-09f02b918ec4df875326e3addcdb99343c976a78.tar
nixlib-09f02b918ec4df875326e3addcdb99343c976a78.tar.gz
nixlib-09f02b918ec4df875326e3addcdb99343c976a78.tar.bz2
nixlib-09f02b918ec4df875326e3addcdb99343c976a78.tar.lz
nixlib-09f02b918ec4df875326e3addcdb99343c976a78.tar.xz
nixlib-09f02b918ec4df875326e3addcdb99343c976a78.tar.zst
nixlib-09f02b918ec4df875326e3addcdb99343c976a78.zip
Merge branch 'master' of git://github.com/NixOS/nixpkgs into staging
Diffstat (limited to 'nixos/modules/services/x11')
-rw-r--r--nixos/modules/services/x11/redshift.nix10
1 files changed, 4 insertions, 6 deletions
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 4318a17a4fa5..8f1e317e52b0 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -94,11 +94,9 @@ in {
   };
 
   config = mkIf cfg.enable {
-    systemd.services.redshift = {
+    systemd.user.services.redshift = {
       description = "Redshift colour temperature adjuster";
-      requires = [ "display-manager.service" ];
-      after = [ "display-manager.service" ];
-      wantedBy = [ "graphical.target" ];
+      wantedBy = [ "default.target" ];
       serviceConfig = {
         ExecStart = ''
           ${cfg.package}/bin/redshift \
@@ -107,10 +105,10 @@ in {
             -b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \
             ${lib.strings.concatStringsSep " " cfg.extraOptions}
         '';
-	RestartSec = 3;
+        RestartSec = 3;
+        Restart = "always";
       };
       environment = { DISPLAY = ":0"; };
-      serviceConfig.Restart = "always";
     };
   };