mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00
Code Activity

fix: dont use types.cidr* on host cidr because it zeroes the last part

Browse source
This commit is contained in:
oddlama 2024-06-10 17:20:41 +02:00
parent 7b9f5254c8
commit 461f651e26
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/ward/net.nix
View file

@ -110,7 +110,7 @@
# Provide a DNS resolver # Provide a DNS resolver
ipv6SendRAConfig = { ipv6SendRAConfig = {
EmitDNS = true; EmitDNS = true;
DNS = globals.net.home-lan.hosts.ward-adguardhome.ipv4; DNS = globals.net.home-lan.hosts.ward-adguardhome.ipv6;
}; };
linkConfig.RequiredForOnline = "routable"; linkConfig.RequiredForOnline = "routable";
}; };

8
modules/globals.nix
View file

@ -38,7 +38,7 @@ in {
}; };
ipv4 = mkOption { ipv4 = mkOption {
type = types.net.ipv4; type = types.nullOr types.net.ipv4;
description = "The IPv4 of this host"; description = "The IPv4 of this host";
readOnly = true; readOnly = true;
default = default =
@ -48,7 +48,7 @@ in {
}; };
ipv6 = mkOption { ipv6 = mkOption {
type = types.net.ipv6; type = types.nullOr types.net.ipv6;
description = "The IPv6 of this host"; description = "The IPv6 of this host";
readOnly = true; readOnly = true;
default = default =
@ -58,7 +58,7 @@ in {
}; };
cidrv4 = mkOption { cidrv4 = mkOption {
type = types.net.cidrv4; type = types.nullOr types.str; # FIXME: this is not types.net.cidr because it would zero out the host part
description = "The IPv4 of this host including CIDR mask"; description = "The IPv4 of this host including CIDR mask";
readOnly = true; readOnly = true;
default = default =
@ -68,7 +68,7 @@ in {
}; };
cidrv6 = mkOption { cidrv6 = mkOption {
type = types.net.cidrv6; type = types.nullOr types.str; # FIXME: this is not types.net.cidr because it would zero out the host part
description = "The IPv6 of this host including CIDR mask"; description = "The IPv6 of this host including CIDR mask";
readOnly = true; readOnly = true;
default = default =