diff --git a/hosts/alpha/network.nix b/hosts/alpha/network.nix index ae62cc9..5e055bc 100644 --- a/hosts/alpha/network.nix +++ b/hosts/alpha/network.nix @@ -7,7 +7,7 @@ # Main interface # https://nixos.wiki/wiki/Install_NixOS_on_Hetzner_Cloud networks."10-lan" = { - name = "enp1s0"; + matchConfig.Name = "enp1s0"; address = [ "116.203.179.206/32" "2a01:4f8:c2c:71c0::/64" @@ -53,14 +53,14 @@ } ]; }; - networks."wg-sigma-public" = { - name = "wg-sigma-public"; + networks."50-wg-sigma-public" = { + matchConfig.Name = "wg-sigma-public"; }; # The following routes traffic destined for the sigma-p2p address (floating # IP) to sigma through wireguard. This allows the server to have a public # address and help others sail the high seas even though it is behind NAT. - netdevs."51-wg-sigma-p2p" = { + netdevs."50-wg-sigma-p2p" = { netdevConfig = { Name = "wg-sigma-p2p"; Kind = "wireguard"; @@ -80,8 +80,8 @@ } ]; }; - networks."wg-sigma-p2p" = { - name = "wg-sigma-p2p"; + networks."50-wg-sigma-p2p" = { + matchConfig.Name = "wg-sigma-p2p"; }; }; diff --git a/hosts/delta/network.nix b/hosts/delta/network.nix index 57d1c8a..ad58dbd 100644 --- a/hosts/delta/network.nix +++ b/hosts/delta/network.nix @@ -3,7 +3,7 @@ # Main interface # https://nixos.wiki/wiki/Install_NixOS_on_Hetzner_Cloud networks."10-lan" = { - name = "enp1s0"; + matchConfig.Name = "enp1s0"; address = [ "159.69.4.2/32" "2a01:4f8:1c0c:70d1::1/64" diff --git a/hosts/sigma/network.nix b/hosts/sigma/network.nix index d3bf945..eb949f4 100644 --- a/hosts/sigma/network.nix +++ b/hosts/sigma/network.nix @@ -46,8 +46,8 @@ } ]; }; - networks."wg-sigma-public" = { - name = "wg-sigma-public"; + networks."50-wg-sigma-public" = { + matchConfig.Name = "wg-sigma-public"; address = ["49.13.33.75/32"]; routingPolicyRules = [ { @@ -86,7 +86,7 @@ # receiving traffic destined for the sigma-p2p address. This allows the # server to have a public address and help others sail the high seas even # though it is behind NAT. - netdevs."51-wg-sigma-p2p" = { + netdevs."50-wg-sigma-p2p" = { netdevConfig = { Name = "wg-sigma-p2p"; Kind = "wireguard"; @@ -107,8 +107,8 @@ } ]; }; - networks."wg-sigma-p2p" = { - name = "wg-sigma-p2p"; + networks."50-wg-sigma-p2p" = { + matchConfig.Name = "wg-sigma-p2p"; address = ["${secrets.hosts.sigma.sigma-p2p-ip-address}/32"]; routingPolicyRules = [ { diff --git a/hosts/tor/network.nix b/hosts/tor/network.nix index f978b4c..75e6f01 100644 --- a/hosts/tor/network.nix +++ b/hosts/tor/network.nix @@ -3,7 +3,7 @@ networks."10-lan" = { # IPv4 settings are from `sudo dhcpcd --test`. # IPv6 settings are from https://www.ssdvps.dk/knowledgebase/18/IPv6-Gateway.html. - name = "ens3"; + matchConfig.Name = "ens3"; address = [ "91.210.59.57/25" "2a0d:3e83:1:b284::1/64"