alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/xss-lock: specify a default locker

Browse source 
Having a default locker is less error-prone and more convenient.
Incorrect values might leave the machine vulnerable since there is no
fallback.
This commit is contained in:
Jörg Thalheim 2019-01-04 15:41:51 +01:00
parent 82e204382f
commit 2614c8a6c5
No known key found for this signature in database
GPG key ID: CA4106B8D7CC79FA
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 = {
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";
};

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

@ -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");
'';
})