diff --git a/hosts/architect/network.nix b/hosts/architect/network.nix index c3a8f9d..105d4e6 100644 --- a/hosts/architect/network.nix +++ b/hosts/architect/network.nix @@ -19,9 +19,9 @@ rec { proxy-wg = "10.4.0.1"; architect-wg = "10.3.0.1"; - galuminum-wg = "10.3.0.2"; - oneplus-wg = "10.3.0.3"; - ipad-wg = "10.3.0.4"; + giuliopc-wg = "10.3.0.2"; + giuliophone-wg = "10.3.0.3"; + giuliodeck-wg = "10.3.0.4"; manduria-wg = "10.3.0.5"; antonio-wg = "10.3.0.6"; gbeast-wg = "10.3.0.7"; @@ -57,14 +57,14 @@ rec { # groups gdevices-wg = - [ galuminum-wg oneplus-wg gbeast-wg peppiniell-wg kclvm-wg ] ++ routers-wg; + [ giuliopc-wg giuliophone-wg gbeast-wg peppiniell-wg kclvm-wg ] ++ routers-wg; routers-wg = [ hotpottino-wg angellane-wg dodino-wg ]; c2c-wg = [ ] ++ gdevices-wg; towan-wg = [ shield-wg parisaphone-wg parisapc-wg parina-wg parina-ipad-wg ] ++ gdevices-wg ++ routers-wg; gamenet-wg = [ andrew-wg - galuminum-wg + giuliopc-wg gbeast-wg mikey-wg andrewdesktop-wg diff --git a/hosts/architect/wireguard.nix b/hosts/architect/wireguard.nix index f8e089a..2d2be05 100644 --- a/hosts/architect/wireguard.nix +++ b/hosts/architect/wireguard.nix @@ -2,9 +2,8 @@ with import ./network.nix; { networking = { extraHosts = '' ${architect-wg} architect.devs.giugl.io - ${galuminum-wg} galuminum.devs.giugl.io - ${oneplus-wg} oneplus.devs.giugl.io - ${ipad-wg} ipad.devs.giugl.io + ${giuliopc-wg} giuliopc.devs.giugl.io + ${giuliophone-wg} giuliophone.devs.giugl.io ${manduria-wg} manduria.devs.giugl.io ${antonio-wg} antonio.devs.giugl.io ${gbeast-wg} gbeast.devs.giugl.io @@ -34,6 +33,7 @@ with import ./network.nix; { ${parina-ipad-wg} parinaipad.devs.giugl.io ${nilo-wg} nilo.devs.giugl.io ${kclvm-wg} kclvm.devs.giugl.io + ${giuliodeck-wg} giuliodeck.devs.giugl.io ''; wireguard = { @@ -55,23 +55,17 @@ with import ./network.nix; { peers = [ { - # gAluminum - allowedIPs = [ galuminum-wg ]; + # giuliopc + allowedIPs = [ giuliopc-wg ]; publicKey = "pEEgSs7xmO0cfyvoQlU8lfwqdYM1ISgmPAunPtF+0xw="; } { - # OnePlus - allowedIPs = [ oneplus-wg ]; + # giuliophone + allowedIPs = [ giuliophone-wg ]; publicKey = "zynSERy6VhxN5zBf1ih3BOAHxvigDixHB9YKnSBgYFs="; } - { - # iPad - allowedIPs = [ ipad-wg ]; - publicKey = "DPpd+P/hV1XLuvdcrCRv1sgz8BeZt1y5D6VehNuhjSQ="; - } - { # Manduria allowedIPs = [ manduria-wg ]; @@ -263,6 +257,11 @@ with import ./network.nix; { allowedIPs = [ kclvm-wg ]; publicKey = "jVBaY8AhgAA7myVjU/PJPDUCOjsCi23LT+pGZUoNEkE="; } + { + # Giulio's Deck + allowedIPs = [ giuliodeck-wg ]; + publicKey = "7TGYsYvElTLY3V7qJfggkF+kFG7Y5sUsHA88h0cYJx0="; + } ]; }; };