diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-01-05 16:44:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-05 16:44:29 +0100 |
| commit | 8a2389e4a1a5e165d9852701043f9bca62136250 (patch) | |
| tree | 4c671b66daf859009d17b726773d871fba603f97 /nixos | |
| parent | df834ee56d8c2ba5f75eae872e4dedc037874a61 (diff) | |
| parent | 2614c8a6c564d7eb5b693975b3c1ff9771f5753f (diff) | |
| download | nixlib-8a2389e4a1a5e165d9852701043f9bca62136250.tar nixlib-8a2389e4a1a5e165d9852701043f9bca62136250.tar.gz nixlib-8a2389e4a1a5e165d9852701043f9bca62136250.tar.bz2 nixlib-8a2389e4a1a5e165d9852701043f9bca62136250.tar.lz nixlib-8a2389e4a1a5e165d9852701043f9bca62136250.tar.xz nixlib-8a2389e4a1a5e165d9852701043f9bca62136250.tar.zst nixlib-8a2389e4a1a5e165d9852701043f9bca62136250.zip | |
Merge pull request #53404 from Mic92/xsslock
nixos/xss-lock: specify a default locker
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/programs/xss-lock.nix | 3 | ||||
| -rw-r--r-- | nixos/tests/xss-lock.nix | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/programs/xss-lock.nix b/nixos/modules/programs/xss-lock.nix index 49d522c604f5..c290df01b960 100644 --- a/nixos/modules/programs/xss-lock.nix +++ b/nixos/modules/programs/xss-lock.nix @@ -9,7 +9,8 @@ in options.programs.xss-lock = { enable = mkEnableOption "xss-lock"; lockerCommand = mkOption { - example = "xlock"; + default = "${pkgs.i3lock}/bin/i3lock"; + example = literalExample ''''${pkgs.i3lock-fancy}/bin/i3lock-fancy''; type = types.string; description = "Locker to be used with xsslock"; }; diff --git a/nixos/tests/xss-lock.nix b/nixos/tests/xss-lock.nix index 045667bdcdec..b46bb1a8f6e9 100644 --- a/nixos/tests/xss-lock.nix +++ b/nixos/tests/xss-lock.nix @@ -9,7 +9,6 @@ with lib; machine = { imports = [ ./common/x11.nix ./common/user-account.nix ]; programs.xss-lock.enable = true; - programs.xss-lock.lockerCommand = "${pkgs.xlockmore}/bin/xlock"; services.xserver.displayManager.auto.user = "alice"; }; @@ -20,6 +19,6 @@ with lib; $machine->fail("pgrep xlock"); $machine->succeed("su -l alice -c 'xset dpms force standby'"); - $machine->waitUntilSucceeds("pgrep xlock"); + $machine->waitUntilSucceeds("pgrep i3lock"); ''; }) |