From 4832fcea2f1db0e238fea2e6c9f74a4d20bbb2c6 Mon Sep 17 00:00:00 2001
From: Dominik Polakovics <dominik.polakovics@cloonar.com>
Date: Tue, 5 Dec 2023 11:19:28 +0100
Subject: [PATCH] try to fix ids

---
 hosts/fw.cloonar.com/configuration.nix                 |  2 +-
 .../modules/{statidids.nix => staticids.nix}           | 10 +++++-----
 hosts/fw.cloonar.com/modules/unbound.nix               |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename hosts/fw.cloonar.com/modules/{statidids.nix => staticids.nix} (70%)

diff --git a/hosts/fw.cloonar.com/configuration.nix b/hosts/fw.cloonar.com/configuration.nix
index e0c1ad4..30188fe 100644
--- a/hosts/fw.cloonar.com/configuration.nix
+++ b/hosts/fw.cloonar.com/configuration.nix
@@ -12,7 +12,7 @@
     ./utils/modules/netdata.nix
 
     # fw
-    ./modules/statidids.nix
+    ./modules/staticids.nix
     ./modules/networking.nix
     ./modules/firewall.nix
     ./modules/dhcp4.nix
diff --git a/hosts/fw.cloonar.com/modules/statidids.nix b/hosts/fw.cloonar.com/modules/staticids.nix
similarity index 70%
rename from hosts/fw.cloonar.com/modules/statidids.nix
rename to hosts/fw.cloonar.com/modules/staticids.nix
index b132039..d4c584b 100644
--- a/hosts/fw.cloonar.com/modules/statidids.nix
+++ b/hosts/fw.cloonar.com/modules/staticids.nix
@@ -4,24 +4,24 @@ let
 in
 {
   options = {
-    container-ids.uids = lib.mkOption {
+    cids.uids = lib.mkOption {
       internal = true;
       description = lib.mdDoc ''
-        The user IDs used in NixOS.
+        The user IDs used for containers.
       '';
       type = types.attrsOf types.int;
     };
 
-    container-ids.gids = lib.mkOption {
+    cids.gids = lib.mkOption {
       internal = true;
       description = lib.mdDoc ''
-        The group IDs used in NixOS.
+        The group IDs used for containers.
       '';
       type = types.attrsOf types.int;
     };
   };
   config = {
-    container-ids = {
+    cids = {
       uids = {
         unbound = 10001;
       };
diff --git a/hosts/fw.cloonar.com/modules/unbound.nix b/hosts/fw.cloonar.com/modules/unbound.nix
index 060f84b..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.container-ids.uids.unbound;
+    uid = config.cids.uids.unbound;
   };
   users.groups.unbound = {
-    gid = config.container-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.container-ids.uids.unbound;
+        uid = config.cids.uids.unbound;
       };
       users.groups.unbound = {
-        gid = config.container-ids.gids.unbound;
+        gid = config.cids.gids.unbound;
       };
       services.unbound = {
         enable = true;