diff options
| author | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2017-04-19 18:40:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-19 18:40:43 +0200 |
| commit | 149656581df421eb4773bb5719652cd19cdabb00 (patch) | |
| tree | 5a44976281fe3a4d9ee99b369875c32c49385daf /nixos | |
| parent | 12a3590cc7771bb8f5a48ae4aec16e056d17aa56 (diff) | |
| parent | c91c3209f3dbaf9dacef69395e071a9dee59bbee (diff) | |
| download | nixpkgs-149656581df421eb4773bb5719652cd19cdabb00.tar nixpkgs-149656581df421eb4773bb5719652cd19cdabb00.tar.gz nixpkgs-149656581df421eb4773bb5719652cd19cdabb00.tar.bz2 nixpkgs-149656581df421eb4773bb5719652cd19cdabb00.tar.lz nixpkgs-149656581df421eb4773bb5719652cd19cdabb00.tar.xz nixpkgs-149656581df421eb4773bb5719652cd19cdabb00.tar.zst nixpkgs-149656581df421eb4773bb5719652cd19cdabb00.zip | |
Merge pull request #24601 from pbogdan/unclutter
unclutter: Fix default value of $DISPLAY
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/unclutter.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix index 6c789b7578f..a22e5ac2c95 100644 --- a/nixos/modules/services/x11/unclutter.nix +++ b/nixos/modules/services/x11/unclutter.nix @@ -60,7 +60,10 @@ in { serviceConfig.ExecStart = '' ${cfg.package}/bin/unclutter \ -idle ${toString cfg.timeout} \ - -display :${toString config.services.xserver.display} \ + -display :${toString ( + let display = config.services.xserver.display; + in if display != null then display else 0 + )} \ -jitter ${toString (cfg.threeshold - 1)} \ ${optionalString cfg.keystroke "-keystroke"} \ ${concatMapStrings (x: " -"+x) cfg.extraOptions} \ |