From 279f0aba1dca289a4066e47e1fb4f4246a22ca5d Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Wed, 20 Nov 2024 00:03:09 -0600
Subject: [PATCH] Setup vm-matrix better

---
 hosts/genesis/net/hosts     | 11 ++++++-----
 hosts/isaiah/default.nix    | 16 +---------------
 hosts/vm-matrix/default.nix |  6 +++++-
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/hosts/genesis/net/hosts b/hosts/genesis/net/hosts
index e686446..1b44492 100644
--- a/hosts/genesis/net/hosts
+++ b/hosts/genesis/net/hosts
@@ -22,16 +22,17 @@
 10.42.100.6 isaiahbmc isaiahbmc.thehellings.lan
 
 # Tailscale hosts
-100.90.74.19 jude.home
-100.88.91.27 dns.home
 100.119.228.115 chronicles.home nas.home chronicles.shire-zebra.ts.net
-100.115.57.8 linode.home
+100.88.91.27 dns.home
+100.80.99.48 exodus.home
 100.88.91.27 genesis.home jellyfin.home smart.home zwave.home nixcache.home gitcache.home
-100.84.183.79 isaiah.home isaiah.shire-zebra.ts.net
 100.78.226.76 gitlab.home gitlab.shire-zebra.ts.net gitlab.thehellings.lan registry.thehellings.lan git.thehellings.lan
 100.68.203.1 hosea.home hosea.shire-zebra.ts.net
+100.84.183.79 isaiah.home isaiah.shire-zebra.ts.net
 100.102.186.39 jeremiah.home jeremiah.shire-zebra.ts.net
-100.80.99.48 exodus.home
+100.90.74.19 jude.home
+100.115.57.8 linode.home
+100.65.5.38 matrix.home matrix.shire-zebra.ts.net
 
 # Dev hosts
 10.42.101.1 icdm.lan wiki.icdm.lan *.icdm.lan
diff --git a/hosts/isaiah/default.nix b/hosts/isaiah/default.nix
index fc2dea3..ae12d29 100644
--- a/hosts/isaiah/default.nix
+++ b/hosts/isaiah/default.nix
@@ -14,10 +14,7 @@
 
   virtualisation.libvirtd = {
     enable = true;
-    allowedBridges = [
-      "virbr0"
-      "br0"
-    ];
+    allowedBridges = [ "virbr0" ];
     onBoot = "ignore"; # only restart VMs labeled 'autostart'
     qemu.ovmf.enable = true;
   };
@@ -35,9 +32,6 @@
       address = " 10.42.1.1";
       interface = "enp38s0";
     };
-    bridges = {
-      br0.interfaces = [ "enp39s0" ];
-    };
     interfaces = {
       enp38s0 = {
         ipv4.addresses = [
@@ -47,14 +41,6 @@
           }
         ];
       };
-      br0 = {
-        ipv4.addresses = [
-          {
-            address = "10.42.90.1";
-            prefixLength = 16;
-          }
-        ];
-      };
     };
     nameservers = [ "10.42.1.5" ];
     firewall.checkReversePath = lib.mkForce false;
diff --git a/hosts/vm-matrix/default.nix b/hosts/vm-matrix/default.nix
index a98ca5e..f9af6ac 100644
--- a/hosts/vm-matrix/default.nix
+++ b/hosts/vm-matrix/default.nix
@@ -8,7 +8,11 @@ in
   greg = {
     tailscale.enable = true;
   };
-  networking.firewall.allowedTCPPorts = [ config.services.dendrite.httpPort ];
+  networking = {
+    hostName = "vm-matrix";
+    domain = "thehellings.lan";
+    firewall.allowedTCPPorts = [ config.services.dendrite.httpPort ];
+  };
 
   # Environment secrets
   age = {