Merge master into staging-next

2019-01-06 09:36:23 +01:00
parent d84a33d85b 7d864c6bd6
commit e5381cdece
55 changed files with 500 additions and 1342 deletions
--- 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";
    };