Compare commits

..

No commits in common. "main" and "Mic92-main" have entirely different histories.

2 changed files with 9 additions and 10 deletions

View File

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

View File

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