diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2019-01-04 15:41:51 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2019-01-05 16:42:30 +0100 |
| commit | 2614c8a6c564d7eb5b693975b3c1ff9771f5753f (patch) | |
| tree | 22974853c8b13d09d4dba47d45844457a83f8b4b /nixos | |
| parent | 82e204382f79a363dd7c858cd5a4f50ade08f5b1 (diff) | |
| download | nixlib-2614c8a6c564d7eb5b693975b3c1ff9771f5753f.tar nixlib-2614c8a6c564d7eb5b693975b3c1ff9771f5753f.tar.gz nixlib-2614c8a6c564d7eb5b693975b3c1ff9771f5753f.tar.bz2 nixlib-2614c8a6c564d7eb5b693975b3c1ff9771f5753f.tar.lz nixlib-2614c8a6c564d7eb5b693975b3c1ff9771f5753f.tar.xz nixlib-2614c8a6c564d7eb5b693975b3c1ff9771f5753f.tar.zst nixlib-2614c8a6c564d7eb5b693975b3c1ff9771f5753f.zip | |
nixos/xss-lock: specify a default locker
Having a default locker is less error-prone and more convenient. Incorrect values might leave the machine vulnerable since there is no fallback.
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"); ''; }) |