From 6108e3ee2c51d1dcd87bd38af2b9fc621c6c872e Mon Sep 17 00:00:00 2001 From: DavHau Date: Fri, 5 Jul 2024 17:18:42 +0700 Subject: [PATCH] fix: don't add options to clan.core --- modules/initrd-networking.nix | 12 ++++++------ targets/web01/configuration.nix | 7 ++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/initrd-networking.nix b/modules/initrd-networking.nix index 3c5a8d3..b5c3a8d 100644 --- a/modules/initrd-networking.nix +++ b/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"; }; diff --git a/targets/web01/configuration.nix b/targets/web01/configuration.nix index fc0568d..615684e 100644 --- a/targets/web01/configuration.nix +++ b/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.networking.ipv4.gateway = "65.21.12.1"; - clan.networking.ipv6.address = config.systemd.network.networks."10-uplink".networkConfig.Address; + clan-infra.networking.ipv4.address = "65.21.12.51"; + clan-infra.networking.ipv4.gateway = "65.21.12.1"; + clan-infra.networking.ipv6.address = + config.systemd.network.networks."10-uplink".networkConfig.Address; system.stateVersion = "23.05"; } -- 2.45.2