diff --git a/hosts/fw.cloonar.com/modules/staticids.nix b/hosts/fw.cloonar.com/modules/staticids.nix index d4c584b..b2b0d9c 100644 --- a/hosts/fw.cloonar.com/modules/staticids.nix +++ b/hosts/fw.cloonar.com/modules/staticids.nix @@ -3,8 +3,8 @@ let inherit (lib) types; in { - options = { - cids.uids = lib.mkOption { + options.containers = { + ids.uids = lib.mkOption { internal = true; description = lib.mdDoc '' The user IDs used for containers. @@ -12,7 +12,7 @@ in type = types.attrsOf types.int; }; - cids.gids = lib.mkOption { + ids.gids = lib.mkOption { internal = true; description = lib.mdDoc '' The group IDs used for containers. @@ -21,7 +21,7 @@ in }; }; config = { - cids = { + containers.ids = { uids = { unbound = 10001; }; diff --git a/hosts/fw.cloonar.com/modules/unbound.nix b/hosts/fw.cloonar.com/modules/unbound.nix index 0ee655e..9e07b82 100644 --- a/hosts/fw.cloonar.com/modules/unbound.nix +++ b/hosts/fw.cloonar.com/modules/unbound.nix @@ -133,10 +133,10 @@ in { users.users.unbound = { group = "unbound"; isSystemUser = true; - uid = config.cids.uids.unbound; + uid = config.containers.ids.uids.unbound; }; users.groups.unbound = { - gid = config.cids.gids.unbound; + gid = config.containers.ids.gids.unbound; }; security.acme.certs."${domain}" = { @@ -175,10 +175,10 @@ in { users.users.unbound = { group = "unbound"; isSystemUser = true; - uid = config.cids.uids.unbound; + uid = config.containers.ids.uids.unbound; }; users.groups.unbound = { - gid = config.cids.gids.unbound; + gid = config.containers.ids.gids.unbound; }; services.unbound = { enable = true;