mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-27 08:04:14 +00:00
4f0dadbf38
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build a08b3a4d19.tar.gz \
--argstr baseRev b32a094368
result/bin/apply-formatting $NIXPKGS_PATH
59 lines
1.3 KiB
Nix
59 lines
1.3 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
...
|
|
}:
|
|
|
|
let
|
|
|
|
cfg = config.programs.i3lock;
|
|
|
|
in
|
|
{
|
|
|
|
###### interface
|
|
|
|
options = {
|
|
programs.i3lock = {
|
|
enable = lib.mkEnableOption "i3lock";
|
|
package = lib.mkPackageOption pkgs "i3lock" {
|
|
example = "i3lock-color";
|
|
extraDescription = ''
|
|
::: {.note}
|
|
The i3lock package must include a i3lock file or link in its out directory in order for the u2fSupport option to work correctly.
|
|
:::
|
|
'';
|
|
};
|
|
u2fSupport = lib.mkOption {
|
|
type = lib.types.bool;
|
|
default = false;
|
|
example = true;
|
|
description = ''
|
|
Whether to enable U2F support in the i3lock program.
|
|
U2F enables authentication using a hardware device, such as a security key.
|
|
When U2F support is enabled, the i3lock program will set the setuid bit on the i3lock binary and enable the pam u2fAuth service,
|
|
'';
|
|
};
|
|
};
|
|
};
|
|
|
|
###### implementation
|
|
|
|
config = lib.mkIf cfg.enable {
|
|
|
|
environment.systemPackages = [ cfg.package ];
|
|
|
|
security.wrappers.i3lock = lib.mkIf cfg.u2fSupport {
|
|
setuid = true;
|
|
owner = "root";
|
|
group = "root";
|
|
source = "${cfg.package.out}/bin/i3lock";
|
|
};
|
|
|
|
security.pam.services.i3lock.u2fAuth = cfg.u2fSupport;
|
|
|
|
};
|
|
|
|
}
|