rekey a bunch of secrets, other stuff

3 files changed, 14 insertions, 21 deletions

diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index 4fe5756..02d4b96 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -37,6 +37,12 @@
     ''
   ];
 
+  # get perl out of my closure
+  system = {
+    etc.overlay.enable = true;
+    nixos-init.enable = true;
+  };
+
   # required for vm testing
   virtualisation.vmVariant.virtualisation.diskSize = 8192;
 }
diff --git a/hosts/mercury/secrets/wg-privkey.age b/hosts/mercury/secrets/wg-privkey.age
index 767692f..2481e9d 100644
--- a/hosts/mercury/secrets/wg-privkey.age
+++ b/hosts/mercury/secrets/wg-privkey.age
@@ -1,9 +1,9 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGF6QmlsZyA0L2Ry
-ZXZFOUxvL25CemdScnhEc3Ewb0NVUnBCNHZ5WjlNaDgwMVQxL0VzCmFoWTlQM0N6
-aFBSK05qZ3pKazF1a1BhRDBudkUwQmVpOHNsemUzazV4REkKLT4gbTtrJiw4Qy1n
-cmVhc2UKazJ3UW9zQmh6RlBlTmpmekduUlpMSHl4TGgvcUJKTnB6aE43YTJDR2Vm
-SHZVMGsKLS0tIFpnV21lOE9ZYUtwUFBVeGFWRDVMNFpkSStsSmpIaWZ3MHJVL29G
-dzA2SXMKuuAvweyyyuIFVJftn6tNANBkHp0NGxJZ0LXTj+daziYleOUFn3R1KTVu
-0UMQIZM/WsfesWXkvN1E4+LZKTdNdJOsEJv9ahYnk8btBgU=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGF6QmlsZyBLUTBt
+akJEZ0ZVckVBcEZaTDVWVkFxamdiKzJ2YzNmUXdQeDVxMjU5dW1vCnRvbk5pYlN4
+RElqb2ZBWXAvZExrUnJMSUhYWmg3cVhUeW5kcnBiWTZDL1UKLT4gPW9TLWdyZWFz
+ZSB5LUQwfWB8SiAxQ1ImWVh+YApub2lGeXFYcQotLS0gbE1CeDdLY2MrTmxsVk1M
+d215U1NxZU9rREd1Q1ZxcnhOU0Y1aWQ4VXg3WQp7WxGRBQEKrLBaSLoT/scxELxz
+JCVXaaQxbpaYO+uMh5pSxmDmvZHXJiFKydwOJbaLLG6wlD+Y4mG5aThXDHXU+itJ
+aYhvR8ptpYGY8A==
 -----END AGE ENCRYPTED FILE-----
diff --git a/hosts/mercury/wireguard.nix b/hosts/mercury/wireguard.nix
index 105d10b..1035a0e 100644
--- a/hosts/mercury/wireguard.nix
+++ b/hosts/mercury/wireguard.nix
@@ -7,19 +7,6 @@
 }: {
   environment.systemPackages = [pkgs.wireguard-tools];
 
-  systemd.services.udp2raw-client = {
-    description = "udp2raw WireGuard transport";
-    wantedBy = ["multi-user.target"];
-    after = ["network-online.target"];
-    wants = ["network-online.target"];
-
-    serviceConfig = {
-      ExecStart = "${lib.getExe pkgs.udp2raw} -c -l 127.0.0.1:51820 -r 70.130.121.193:51843 -k shared-secret -a";
-      Restart = "on-failure";
-      RestartSec = "2s";
-    };
-  };
-
   systemd.network.netdevs."10-wg" = {
     netdevConfig = {
       Kind = "wireguard";
@@ -34,7 +21,7 @@
       {
         PublicKey = hosts.ganymede.wg_pubkey;
         AllowedIPs = ["10.100.0.0/24"];
-        Endpoint = "127.0.0.1:51820";
+        Endpoint = "williamsfam.us.com:51820";
       }
     ];
   };