break out some network configuration

5 files changed, 44 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" ];
     };
   };
 
diff --git a/modules/default.nix b/modules/default.nix
index 081a3d9..6c71dbb 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -8,6 +8,7 @@
   imports = [
     ./desktop.nix
     ./doas.nix
+    ./networks
     ./nonfree.nix
     ./steam.nix
   ];
diff --git a/modules/networks/default.nix b/modules/networks/default.nix
new file mode 100644
index 0000000..dfff6a4
--- /dev/null
+++ b/modules/networks/default.nix
@@ -0,0 +1,3 @@
+{
+  imports = [ ./evilvpn.nix ];
+}
diff --git a/modules/networks/evilvpn.nix b/modules/networks/evilvpn.nix
new file mode 100644
index 0000000..95e981a
--- /dev/null
+++ b/modules/networks/evilvpn.nix
@@ -0,0 +1,31 @@
+{ config, lib, ... }:
+{
+  systemd.network = {
+    netdevs."90-evilvpn" = {
+      enable = lib.mkDefault false;
+      netdevConfig = {
+        Kind = "wireguard";
+        Name = "wg0";
+      };
+
+      wireguardConfig = {
+        PrivateKeyFile = "/etc/wireguard/${config.networking.hostName}.key";
+        RouteTable = "main";
+      };
+
+      wireguardPeers = [
+        {
+          AllowedIPs = [ "10.6.6.0/24" ];
+          Endpoint = "www.eviltransgenders.club:51820";
+          PersistentKeepalive = 25;
+          PublicKey = "ChnzJG0HJcgk3OhgTzoPZ9EOyhuCH1EAknaQ9VF7N0I=";
+        }
+      ];
+    };
+
+    networks."90-evilvpn" = {
+      dns = [ "10.6.6.2" ];
+      matchConfig.Name = "wg0";
+    };
+  };
+}