From 70247124a692d8e58a8792591cef7c0b53585f39 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Thu, 25 Jul 2024 08:05:34 +0100
Subject: [PATCH] tohru, orm: tidy up vestigial wireguard config

---
 hosts/orm/configuration.nix                           |  8 +++++++-
 hosts/orm/wireguard.nix                               | 10 ----------
 hosts/tohru/configuration.nix                         |  9 ++++++++-
 hosts/tohru/wireguard.nix                             | 11 -----------
 secrets.nix                                           |  2 +-
 secrets/{wireguard-hub.age => wireguard-peer-orm.age} |  0
 secrets/{wireguard-hub.pub => wireguard-peer-orm.pub} |  0
 7 files changed, 16 insertions(+), 24 deletions(-)
 delete mode 100644 hosts/orm/wireguard.nix
 delete mode 100644 hosts/tohru/wireguard.nix
 rename secrets/{wireguard-hub.age => wireguard-peer-orm.age} (100%)
 rename secrets/{wireguard-hub.pub => wireguard-peer-orm.pub} (100%)

diff --git a/hosts/orm/configuration.nix b/hosts/orm/configuration.nix
index a1063ad..cd96237 100644
--- a/hosts/orm/configuration.nix
+++ b/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";
 }
diff --git a/hosts/orm/wireguard.nix b/hosts/orm/wireguard.nix
deleted file mode 100644
index 38ef0da..0000000
--- a/hosts/orm/wireguard.nix
+++ /dev/null
@@ -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;
-  };
-}
diff --git a/hosts/tohru/configuration.nix b/hosts/tohru/configuration.nix
index 64d293a..4218f5d 100644
--- a/hosts/tohru/configuration.nix
+++ b/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;
diff --git a/hosts/tohru/wireguard.nix b/hosts/tohru/wireguard.nix
deleted file mode 100644
index eb7d6d2..0000000
--- a/hosts/tohru/wireguard.nix
+++ /dev/null
@@ -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;
-  };
-}
diff --git a/secrets.nix b/secrets.nix
index 0e3f84f..e6dd703 100644
--- a/secrets.nix
+++ b/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 ];
   };
diff --git a/secrets/wireguard-hub.age b/secrets/wireguard-peer-orm.age
similarity index 100%
rename from secrets/wireguard-hub.age
rename to secrets/wireguard-peer-orm.age
diff --git a/secrets/wireguard-hub.pub b/secrets/wireguard-peer-orm.pub
similarity index 100%
rename from secrets/wireguard-hub.pub
rename to secrets/wireguard-peer-orm.pub