diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2016-07-16 13:26:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-16 13:26:39 +0200 |
| commit | 8f43f111c08221ba2e46e7986a1c17a22f12a0d8 (patch) | |
| tree | aa6dc68ec8bdc2f750772f314312a97f43e135b4 /nixos | |
| parent | 0fdd63096581c9fa6825448c53867c4b21eac893 (diff) | |
| parent | 49879fa96b91d64e3c1a77ffe9665c65df24e332 (diff) | |
| download | nixlib-8f43f111c08221ba2e46e7986a1c17a22f12a0d8.tar nixlib-8f43f111c08221ba2e46e7986a1c17a22f12a0d8.tar.gz nixlib-8f43f111c08221ba2e46e7986a1c17a22f12a0d8.tar.bz2 nixlib-8f43f111c08221ba2e46e7986a1c17a22f12a0d8.tar.lz nixlib-8f43f111c08221ba2e46e7986a1c17a22f12a0d8.tar.xz nixlib-8f43f111c08221ba2e46e7986a1c17a22f12a0d8.tar.zst nixlib-8f43f111c08221ba2e46e7986a1c17a22f12a0d8.zip | |
Merge pull request #15840 from anderspapitto/pulse-jack
pulseaudio service: set DISPLAY
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/config/pulseaudio.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/misc/cgminer.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/redshift.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/unclutter.nix | 8 |
4 files changed, 4 insertions, 9 deletions
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index a964e04531c1..6984e85603f6 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -161,6 +161,7 @@ in { ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no"; Restart = "on-failure"; }; + environment = { DISPLAY = ":${toString config.services.xserver.display}"; }; }; sockets.pulseaudio = { diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix index 868dc87f7238..5f97cc034148 100644 --- a/nixos/modules/services/misc/cgminer.nix +++ b/nixos/modules/services/misc/cgminer.nix @@ -126,7 +126,7 @@ in environment = { LD_LIBRARY_PATH = ''/run/opengl-driver/lib:/run/opengl-driver-32/lib''; - DISPLAY = ":0"; + DISPLAY = ":${toString config.services.xserver.display}"; GPU_MAX_ALLOC_PERCENT = "100"; GPU_USE_SYNC_OBJECTS = "1"; }; diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 8f1e317e52b0..63ffa29c1997 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -108,7 +108,7 @@ in { RestartSec = 3; Restart = "always"; }; - environment = { DISPLAY = ":0"; }; + environment = { DISPLAY = ":${toString config.services.xserver.display}"; }; }; }; diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix index 3260fdb3d54d..ebc195d108d0 100644 --- a/nixos/modules/services/x11/unclutter.nix +++ b/nixos/modules/services/x11/unclutter.nix @@ -39,12 +39,6 @@ in { default = 1; }; - displayName = mkOption { - description = "Name of the X11 display"; - type = types.str; - default = ":0"; - }; - excluded = mkOption { description = "Names of windows where unclutter should not apply"; type = types.listOf types.str; @@ -67,7 +61,7 @@ in { serviceConfig.ExecStart = '' ${cfg.package}/bin/unclutter \ -idle ${toString cfg.timeout} \ - -display ${cfg.displayName} \ + -display :${toString config.services.xserver.display} \ -jitter ${toString (cfg.threeshold - 1)} \ ${optionalString cfg.keystroke "-keystroke"} \ ${concatMapStrings (x: " -"+x) cfg.extraOptions} \ |