xss-locker: improve options passing
- allow locker options without hacks - add extraOptions
This commit is contained in:
parent
bc94dcf500
commit
7fef2e38ea
@ -8,12 +8,23 @@ in
|
|||||||
{
|
{
|
||||||
options.programs.xss-lock = {
|
options.programs.xss-lock = {
|
||||||
enable = mkEnableOption "xss-lock";
|
enable = mkEnableOption "xss-lock";
|
||||||
|
|
||||||
lockerCommand = mkOption {
|
lockerCommand = mkOption {
|
||||||
default = "${pkgs.i3lock}/bin/i3lock";
|
default = "${pkgs.i3lock}/bin/i3lock";
|
||||||
example = literalExample ''''${pkgs.i3lock-fancy}/bin/i3lock-fancy'';
|
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";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extraOptions = mkOption {
|
||||||
|
default = [ ];
|
||||||
|
example = literalExample [ "--ignore-sleep" ];
|
||||||
|
type = types.listOf types.str;
|
||||||
|
description = ''
|
||||||
|
Additional command-line arguments to pass to
|
||||||
|
<command>xss-lock</command>.
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
@ -21,7 +32,13 @@ in
|
|||||||
description = "XSS Lock Daemon";
|
description = "XSS Lock Daemon";
|
||||||
wantedBy = [ "graphical-session.target" ];
|
wantedBy = [ "graphical-session.target" ];
|
||||||
partOf = [ "graphical-session.target" ];
|
partOf = [ "graphical-session.target" ];
|
||||||
serviceConfig.ExecStart = "${pkgs.xss-lock}/bin/xss-lock ${cfg.lockerCommand}";
|
serviceConfig.ExecStart = with lib;
|
||||||
|
strings.concatStringsSep " " ([
|
||||||
|
"${pkgs.xss-lock}/bin/xss-lock"
|
||||||
|
] ++ cfg.extraOptions ++ [
|
||||||
|
"--"
|
||||||
|
cfg.lockerCommand
|
||||||
|
]);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user