tohru, orm: tidy up vestigial wireguard config

hosts/orm/configuration.nix

@@ -4,11 +4,17 @@
   imports = [
     ./hardware-configuration.nix
     ./home.nix
-    ./wireguard.nix
   ];
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
+  age.secrets.wireguard-peer-orm.file = ../../secrets/wireguard-peer-orm.age;
+
+  birdsong.peer = {
+    enable = true;
+    privateKeyFile = config.age.secrets.wireguard-peer-orm.path;
+  };
+
   system.stateVersion = "23.11";
 }

hosts/orm/wireguard.nix

@@ -1,10 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  age.secrets.wireguard-hub.file = ../../secrets/wireguard-hub.age;
-
-  birdsong.peer = {
-    enable = true;
-    privateKeyFile = config.age.secrets.wireguard-hub.path;
-  };
-}

hosts/tohru/configuration.nix

@@ -8,13 +8,20 @@
       ../../services/fonts.nix
       ../../services/steam.nix
       ./syncthing.nix
-      ./wireguard.nix
     ];
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.systemd-boot.editor = false;
 
+  age.secrets.wireguard-peer-tohru.file = ../../secrets/wireguard-peer-tohru.age;
+
+  birdsong.peer = {
+    enable = true;
+    privateKeyFile = config.age.secrets.wireguard-peer-tohru.path;
+    persistentKeepalive = 23;
+  };
+
   programs.evolution.enable = true;
   qenya.services.fonts.enable = true;
   qenya.services.steam.enable = true;

hosts/tohru/wireguard.nix

@@ -1,11 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  age.secrets.wireguard-peer-tohru.file = ../../secrets/wireguard-peer-tohru.age;
-
-  birdsong.peer = {
-    enable = true;
-    privateKeyFile = config.age.secrets.wireguard-peer-tohru.path;
-    persistentKeepalive = 23;
-  };
-}

secrets.nix

@@ -4,7 +4,7 @@ let
   commonKeys = keys.users.qenya;
 
   secrets = with keys; {
-    wireguard-hub = [ machines.orm ];
+    wireguard-peer-orm = [ machines.orm ];
     wireguard-peer-tohru = [ machines.tohru ];
     wireguard-peer-yevaud = [ machines.yevaud ];
   };