diff options
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/meowbook/default.nix | 37 | ||||
| -rw-r--r-- | hosts/the-meowchine/default.nix | 27 |
2 files changed, 9 insertions, 55 deletions
diff --git a/hosts/meowbook/default.nix b/hosts/meowbook/default.nix index 7c93476..095adea 100644 --- a/hosts/meowbook/default.nix +++ b/hosts/meowbook/default.nix @@ -25,12 +25,12 @@ }; networking = { - networkmanager = { - enable = true; - wifi.macAddress = "random"; - }; + networkmanager = { + enable = true; + wifi.macAddress = "random"; + }; - useNetworkd = true; + useNetworkd = true; }; programs.sway.enable = true; @@ -42,31 +42,8 @@ }; systemd.network = { - netdevs."90-evilvpn" = { - netdevConfig = { - Kind = "wireguard"; - Name = "wg0"; - }; - - wireguardConfig = { - PrivateKeyFile = "/etc/wireguard/meowbook.key"; - RouteTable = "main"; - }; - - wireguardPeers = [ - { - AllowedIPs = [ "10.6.6.0/24" ]; - Endpoint = "51.79.54.109:51820"; - PersistentKeepalive = 25; - PublicKey = "ChnzJG0HJcgk3OhgTzoPZ9EOyhuCH1EAknaQ9VF7N0I="; - } - ]; - }; - - networks."90-evilvpn" = { - address = [ "10.6.6.4/24" ]; - matchConfig.Name = "wg0"; - }; + netdevs."90-evilvpn".enable = true; + networks."90-evilvpn".address = [ "10.6.6.4/24" ]; }; users.users.rosa.enable = true; diff --git a/hosts/the-meowchine/default.nix b/hosts/the-meowchine/default.nix index cef28f1..d00c2fe 100644 --- a/hosts/the-meowchine/default.nix +++ b/hosts/the-meowchine/default.nix @@ -54,27 +54,7 @@ systemd.network = { enable = true; - netdevs."90-wg0" = { - enable = true; - netdevConfig = { - Kind = "wireguard"; - Name = "wg0"; - }; - - wireguardConfig = { - PrivateKeyFile = "/etc/wireguard/the-meowchine.key"; - RouteTable = "main"; - }; - - wireguardPeers = [ - { - AllowedIPs = [ "10.6.6.0/24" ]; - Endpoint = "51.79.54.109:51820"; - PersistentKeepalive = 25; - PublicKey = "ChnzJG0HJcgk3OhgTzoPZ9EOyhuCH1EAknaQ9VF7N0I="; - } - ]; - }; + netdevs."90-evilvpn".enable = true; networks = { "89-wireless" = { @@ -83,10 +63,7 @@ networkConfig.IgnoreCarrierLoss = "3s"; }; - "90-wg0" = { - address = [ "10.6.6.3/24" ]; - matchConfig.Name = "wg0"; - }; + "90-evilvpn".address = [ "10.6.6.3/24" ]; }; }; |