From 76e8ef84289f70936a0cbdee6bfc8a91ee133822 Mon Sep 17 00:00:00 2001
From: Dominik Polakovics <dominik.polakovics@cloonar.com>
Date: Tue, 5 Dec 2023 12:34:41 +0100
Subject: [PATCH] try

---
 hosts/fw.cloonar.com/configuration.nix     |  1 -
 hosts/fw.cloonar.com/modules/staticids.nix | 35 +++-------------------
 hosts/fw.cloonar.com/modules/unbound.nix   |  9 +++---
 3 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/hosts/fw.cloonar.com/configuration.nix b/hosts/fw.cloonar.com/configuration.nix
index 30188fe..7189949 100644
--- a/hosts/fw.cloonar.com/configuration.nix
+++ b/hosts/fw.cloonar.com/configuration.nix
@@ -12,7 +12,6 @@
     ./utils/modules/netdata.nix
 
     # fw
-    ./modules/staticids.nix
     ./modules/networking.nix
     ./modules/firewall.nix
     ./modules/dhcp4.nix
diff --git a/hosts/fw.cloonar.com/modules/staticids.nix b/hosts/fw.cloonar.com/modules/staticids.nix
index 7879b97..ceb7cc4 100644
--- a/hosts/fw.cloonar.com/modules/staticids.nix
+++ b/hosts/fw.cloonar.com/modules/staticids.nix
@@ -1,35 +1,8 @@
-{ config, lib, ... }:
-with lib;
-let
-  cfg = config.cids;
-in
 {
-  
-  options.services.cids = {
-    uids = mkOption {
-      readOnly = true;
-      description = lib.mdDoc ''
-        The user IDs used for containers.
-      '';
-      type = types.attrsOf types.int;
-    };
-
-    gids = mkOption {
-      readOnly = true;
-      description = lib.mdDoc ''
-        The group IDs used for containers.
-      '';
-      type = types.attrsOf types.int;
-    };
+  uids = {
+    unbound = 10001;
   };
-  config = {
-    services.cids = {
-      uids = {
-        unbound = 10001;
-      };
-      gids = {
-        unbound = 10001;
-      };
-    };
+  gids = {
+    unbound = 10001;
   };
 }
diff --git a/hosts/fw.cloonar.com/modules/unbound.nix b/hosts/fw.cloonar.com/modules/unbound.nix
index 56420bc..03a1d4d 100644
--- a/hosts/fw.cloonar.com/modules/unbound.nix
+++ b/hosts/fw.cloonar.com/modules/unbound.nix
@@ -1,5 +1,6 @@
 { config, ... }:
 let
+  cids = import ../modules/staticids.nix;
   domain = "ns.cloonar.com";
   cfg = {
     server = {
@@ -133,10 +134,10 @@ in {
   users.users.unbound = {
     group = "unbound";
     isSystemUser = true;
-    uid = config.services.cids.uids.unbound;
+    uid = cids.uids.unbound;
   };
   users.groups.unbound = {
-    gid = config.services.cids.gids.unbound;
+    gid = cids.gids.unbound;
   };
 
   security.acme.certs."${domain}" = {
@@ -175,10 +176,10 @@ in {
       users.users.unbound = {
         group = "unbound";
         isSystemUser = true;
-        uid = config.services.cids.uids.unbound;
+        uid = cids.uids.unbound;
       };
       users.groups.unbound = {
-        gid = config.services.cids.gids.unbound;
+        gid = cids.gids.unbound;
       };
       services.unbound = {
         enable = true;