nixos/doas: add package option (#444629)
This commit is contained in:
@@ -7,8 +7,6 @@
|
|||||||
let
|
let
|
||||||
cfg = config.security.doas;
|
cfg = config.security.doas;
|
||||||
|
|
||||||
inherit (pkgs) doas;
|
|
||||||
|
|
||||||
mkUsrString = user: toString user;
|
mkUsrString = user: toString user;
|
||||||
|
|
||||||
mkGrpString = group: ":${toString group}";
|
mkGrpString = group: ":${toString group}";
|
||||||
@@ -67,6 +65,8 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
package = lib.mkPackageOption pkgs "doas" { };
|
||||||
|
|
||||||
wheelNeedsPassword = lib.mkOption {
|
wheelNeedsPassword = lib.mkOption {
|
||||||
type = with lib.types; bool;
|
type = with lib.types; bool;
|
||||||
default = true;
|
default = true;
|
||||||
@@ -256,11 +256,11 @@ in
|
|||||||
setuid = true;
|
setuid = true;
|
||||||
owner = "root";
|
owner = "root";
|
||||||
group = "root";
|
group = "root";
|
||||||
source = "${doas}/bin/doas";
|
source = lib.getExe cfg.package;
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
doas
|
cfg.package
|
||||||
];
|
];
|
||||||
|
|
||||||
security.pam.services.doas = {
|
security.pam.services.doas = {
|
||||||
|
|||||||
Reference in New Issue
Block a user