From 280dea226c8ed4844e4226fd77e322dfa44b141f Mon Sep 17 00:00:00 2001
From: Dominik Polakovics <dominik.polakovics@cloonar.com>
Date: Tue, 5 Dec 2023 11:42:08 +0100
Subject: [PATCH] fix staticids

---
 hosts/fw.cloonar.com/modules/staticids.nix | 6 ++----
 hosts/fw.cloonar.com/modules/unbound.nix   | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/hosts/fw.cloonar.com/modules/staticids.nix b/hosts/fw.cloonar.com/modules/staticids.nix
index 72a21a3..38a545c 100644
--- a/hosts/fw.cloonar.com/modules/staticids.nix
+++ b/hosts/fw.cloonar.com/modules/staticids.nix
@@ -3,9 +3,8 @@ let
   inherit (lib) types;
 in
 {
-  options.services.ids = {
+  options.cids = {
     uids = lib.mkOption {
-      internal = true;
       description = lib.mdDoc ''
         The user IDs used for containers.
       '';
@@ -13,7 +12,6 @@ in
     };
 
     gids = lib.mkOption {
-      internal = true;
       description = lib.mdDoc ''
         The group IDs used for containers.
       '';
@@ -21,7 +19,7 @@ in
     };
   };
   config = {
-    services.ids = {
+    cids = {
       uids = {
         unbound = 10001;
       };
diff --git a/hosts/fw.cloonar.com/modules/unbound.nix b/hosts/fw.cloonar.com/modules/unbound.nix
index 4a94ce6..0ee655e 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.services.ids.uids.unbound;
+    uid = config.cids.uids.unbound;
   };
   users.groups.unbound = {
-    gid = config.services.ids.gids.unbound;
+    gid = config.cids.gids.unbound;
   };
 
   security.acme.certs."${domain}" = {
@@ -175,10 +175,10 @@ in {
       users.users.unbound = {
         group = "unbound";
         isSystemUser = true;
-        uid = config.services.ids.uids.unbound;
+        uid = config.cids.uids.unbound;
       };
       users.groups.unbound = {
-        gid = config.services.ids.gids.unbound;
+        gid = config.cids.gids.unbound;
       };
       services.unbound = {
         enable = true;