public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #53404 from Mic92/xsslock 

nixos/xss-lock: specify a default locker
This commit is contained in:
Jörg Thalheim 2019-01-05 16:44:29 +01:00 committed by GitHub
parent df834ee56d 2614c8a6c5
commit 8a2389e4a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/programs/xss-lock.nix
View File

@ -9,7 +9,8 @@ in
options.programs.xss-lock = { options.programs.xss-lock = {
enable = mkEnableOption "xss-lock"; enable = mkEnableOption "xss-lock";
lockerCommand = mkOption { lockerCommand = mkOption {
example = "xlock"; default = "${pkgs.i3lock}/bin/i3lock";
example = literalExample ''''${pkgs.i3lock-fancy}/bin/i3lock-fancy'';
type = types.string; type = types.string;
description = "Locker to be used with xsslock"; description = "Locker to be used with xsslock";
}; };

3
nixos/tests/xss-lock.nix
View File

@ -9,7 +9,6 @@ with lib;
machine = { machine = {
imports = [ ./common/x11.nix ./common/user-account.nix ]; imports = [ ./common/x11.nix ./common/user-account.nix ];
programs.xss-lock.enable = true; programs.xss-lock.enable = true;
programs.xss-lock.lockerCommand = "${pkgs.xlockmore}/bin/xlock";
services.xserver.displayManager.auto.user = "alice"; services.xserver.displayManager.auto.user = "alice";
}; };
@ -20,6 +19,6 @@ with lib;
$machine->fail("pgrep xlock"); $machine->fail("pgrep xlock");
$machine->succeed("su -l alice -c 'xset dpms force standby'"); $machine->succeed("su -l alice -c 'xset dpms force standby'");
$machine->waitUntilSucceeds("pgrep xlock"); $machine->waitUntilSucceeds("pgrep i3lock");
''; '';
}) })