Merge pull request 'fix: don't add options to clan.core' (#209) from DavHau/clan-infra:DavHau-dave into main

Reviewed-on: #208

modules/initrd-networking.nix

@@ -1,21 +1,21 @@
 { config, lib, ... }:
 let
-  cfg = config.clan.networking;
+  cfg = config.clan-infra.networking;
 in
 {
   options = {
-    clan.networking.ipv4.address = lib.mkOption { type = lib.types.str; };
+    clan-infra.networking.ipv4.address = lib.mkOption { type = lib.types.str; };
 
-    clan.networking.ipv4.cidr = lib.mkOption {
+    clan-infra.networking.ipv4.cidr = lib.mkOption {
       type = lib.types.str;
       default = "26";
     };
 
-    clan.networking.ipv4.gateway = lib.mkOption { type = lib.types.str; };
+    clan-infra.networking.ipv4.gateway = lib.mkOption { type = lib.types.str; };
 
-    clan.networking.ipv6.address = lib.mkOption { type = lib.types.str; };
+    clan-infra.networking.ipv6.address = lib.mkOption { type = lib.types.str; };
 
-    clan.networking.ipv6.cidr = lib.mkOption {
+    clan-infra.networking.ipv6.cidr = lib.mkOption {
       type = lib.types.str;
       default = "64";
     };

targets/web01/configuration.nix

@@ -8,9 +8,10 @@
   systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f9:3080:418b::1";
 
   clan.networking.targetHost = "root@clan.lol";
-  clan.networking.ipv4.address = "65.21.12.51";
+  clan-infra.networking.ipv4.address = "65.21.12.51";
-  clan.networking.ipv4.gateway = "65.21.12.1";
+  clan-infra.networking.ipv4.gateway = "65.21.12.1";
-  clan.networking.ipv6.address = config.systemd.network.networks."10-uplink".networkConfig.Address;
+  clan-infra.networking.ipv6.address =
+    config.systemd.network.networks."10-uplink".networkConfig.Address;
 
   system.stateVersion = "23.05";
 }