nixos/_1password-gui: cleanup
* Change groupId to gid to align with the rest of NixOS modules * Add a check to the gid option to ensure it is greater than or equal to 1000 * Use the overridden package for the wrappers
This commit is contained in:
parent
83a8390791
commit
6e6558711f
|
@ -3,67 +3,66 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
cfg = config.programs._1password-gui;
|
cfg = config.programs._1password-gui;
|
||||||
|
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options = {
|
options = {
|
||||||
programs._1password-gui = {
|
programs._1password-gui = {
|
||||||
enable = mkEnableOption "The 1Password Desktop application with browser integration";
|
enable = mkEnableOption "the 1Password GUI application";
|
||||||
|
|
||||||
groupId = mkOption {
|
gid = mkOption {
|
||||||
type = types.int;
|
type = types.addCheck types.int (x: x >= 1000);
|
||||||
example = literalExpression "5000";
|
example = literalExpression "5000";
|
||||||
description = ''
|
description = ''
|
||||||
The GroupID to assign to the onepassword group, which is needed for browser integration. The group ID must be 1000 or greater.
|
The gid to assign to the onepassword group, which is needed for browser integration.
|
||||||
'';
|
It must be 1000 or greater.
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
polkitPolicyOwners = mkOption {
|
polkitPolicyOwners = mkOption {
|
||||||
type = types.listOf types.str;
|
type = types.listOf types.str;
|
||||||
default = [];
|
default = [ ];
|
||||||
example = literalExpression "[\"user1\" \"user2\" \"user3\"]";
|
example = literalExpression ''["user1" "user2" "user3"]'';
|
||||||
description = ''
|
description = ''
|
||||||
A list of users who should be able to integrate 1Password with polkit-based authentication mechanisms. By default, no users will have such access.
|
A list of users who should be able to integrate 1Password with polkit-based authentication mechanisms.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
package = mkOption {
|
package = mkPackageOption pkgs "1Password GUI" {
|
||||||
type = types.package;
|
default = [ "_1password-gui" ];
|
||||||
default = pkgs._1password-gui;
|
|
||||||
defaultText = literalExpression "pkgs._1password-gui";
|
|
||||||
example = literalExpression "pkgs._1password-gui";
|
|
||||||
description = ''
|
|
||||||
The 1Password derivation to use. This can be used to upgrade from the stable release that we keep in nixpkgs to the betas.
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = let
|
config =
|
||||||
package = cfg.package.override {
|
let
|
||||||
polkitPolicyOwners = cfg.polkitPolicyOwners;
|
package = cfg.package.override {
|
||||||
};
|
polkitPolicyOwners = cfg.polkitPolicyOwners;
|
||||||
in mkIf cfg.enable {
|
};
|
||||||
environment.systemPackages = [ package ];
|
in
|
||||||
users.groups.onepassword.gid = cfg.groupId;
|
mkIf cfg.enable {
|
||||||
|
environment.systemPackages = [ package ];
|
||||||
|
users.groups.onepassword.gid = cfg.gid;
|
||||||
|
|
||||||
security.wrappers = {
|
security.wrappers = {
|
||||||
"1Password-BrowserSupport" =
|
"1Password-BrowserSupport" = {
|
||||||
{ source = "${cfg.package}/share/1password/1Password-BrowserSupport";
|
source = "${package}/share/1password/1Password-BrowserSupport";
|
||||||
owner = "root";
|
owner = "root";
|
||||||
group = "onepassword";
|
group = "onepassword";
|
||||||
setuid = false;
|
setuid = false;
|
||||||
setgid = true;
|
setgid = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
"1Password-KeyringHelper" =
|
"1Password-KeyringHelper" = {
|
||||||
{ source = "${cfg.package}/share/1password/1Password-KeyringHelper";
|
source = "${package}/share/1password/1Password-KeyringHelper";
|
||||||
owner = "root";
|
owner = "root";
|
||||||
group = "onepassword";
|
group = "onepassword";
|
||||||
setuid = true;
|
setuid = true;
|
||||||
setgid = true;
|
setgid = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue