From 402f513a8d59340edb0920e3d5c91241dab7bd3a Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Thu, 6 Nov 2025 12:53:00 -0600
Subject: [PATCH] test: forgejo microVM

---
 modules/config/default.nix                    |  3 -
 modules/config/instances/config/forgejo.nix   |  6 +-
 .../config/instances/config/vaultwarden.nix   |  6 +-
 modules/nixos/microvm/default.nix             | 57 -------------------
 4 files changed, 4 insertions(+), 68 deletions(-)

diff --git a/modules/config/default.nix b/modules/config/default.nix
index 15f91a3..5dca88b 100755
--- a/modules/config/default.nix
+++ b/modules/config/default.nix
@@ -274,14 +274,11 @@ in
 
         instancesFunctions =
           let
-            vm = "vm-";
             var = "/var/lib";
           in
           {
             domain0 = "cloudbert.fun";
             domain1 = "uprootnutrition.com";
-            idPrefix = vm;
-            userPrefix = "user${vm}";
             emailNoReply = "noreply";
             servicePath = "/mnt/media/NAS1";
             mntPath = "/mnt/storage";
diff --git a/modules/config/instances/config/forgejo.nix b/modules/config/instances/config/forgejo.nix
index 3342eec..fcc11d0 100755
--- a/modules/config/instances/config/forgejo.nix
+++ b/modules/config/instances/config/forgejo.nix
@@ -2,8 +2,6 @@
 let
   inherit (moduleFunctions.instancesFunctions)
     domain1
-    idPrefix
-    userPrefix
     varPath
     mntPath
     secretPath
@@ -38,9 +36,9 @@ in
     port0 = 3033;
   };
   interface = {
-    id = "${idPrefix}${name}";
+    id = "vm-${name}";
     mac = "02:00:00:00:00:50";
-    idUser = "${userPrefix}${name}";
+    idUser = "vm-${name}";
     macUser = "02:00:00:00:00:02";
     ip = "192.168.50.50";
     gate = "192.168.50.2";
diff --git a/modules/config/instances/config/vaultwarden.nix b/modules/config/instances/config/vaultwarden.nix
index 76c88c0..7f2a261 100755
--- a/modules/config/instances/config/vaultwarden.nix
+++ b/modules/config/instances/config/vaultwarden.nix
@@ -3,8 +3,6 @@ let
   inherit (moduleFunctions.instancesFunctions)
     domain0
     sslPath
-    idPrefix
-    userPrefix
     varPath
     mntPath
     secretPath
@@ -37,9 +35,9 @@ in
     port0 = 8085;
   };
   interface = {
-    id = "${idPrefix}-${name}";
+    id = "vm-${name}";
     mac = "02:00:00:00:00:51";
-    idUser = "${userPrefix}-${name}";
+    idUser = "vm-${name}";
     macUser = "02:00:00:00:00:03";
     ip = "192.168.50.51";
     gate = "192.168.50.1";
diff --git a/modules/nixos/microvm/default.nix b/modules/nixos/microvm/default.nix
index e0c46dd..80f2ea6 100755
--- a/modules/nixos/microvm/default.nix
+++ b/modules/nixos/microvm/default.nix
@@ -3,61 +3,4 @@
   imports = [
     flake.inputs.microvm.nixosModules.host
   ];
-
-  # Enable systemd-networkd for microvm networking only
-  # NetworkManager handles the main network interface
-  systemd.network = {
-    enable = true;
-    wait-online.enable = false; # Don't wait for networkd interfaces
-
-    # Create a bridge for all microvms
-    netdevs = {
-      "20-br-vms" = {
-        netdevConfig = {
-          Name = "br-vms";
-          Kind = "bridge";
-        };
-      };
-    };
-
-    networks = {
-      # Configure the bridge with an IP in your LAN
-      "20-br-vms" = {
-        matchConfig.Name = "br-vms";
-        address = [ "192.168.50.2/24" ];
-        networkConfig = {
-          ConfigureWithoutCarrier = true;
-          # VMs will use this as their gateway
-        };
-        linkConfig = {
-          RequiredForOnline = "no";
-        };
-      };
-
-      # Tap interface for forgejo VM (handles both vm-forgejo and vm--forgejo)
-      "30-vm-forgejo" = {
-        matchConfig.Name = "vm-*forgejo";
-        networkConfig = {
-          Bridge = "br-vms";
-          ConfigureWithoutCarrier = true;
-        };
-        linkConfig = {
-          RequiredForOnline = "no";
-        };
-      };
-
-      # Tap interface for vaultwarden VM (if you add it)
-      "30-vm-vaultwarden" = {
-        matchConfig.Name = "vm-*vaultwarden";
-        networkConfig = {
-          Bridge = "br-vms";
-          ConfigureWithoutCarrier = true;
-        };
-        linkConfig = {
-          RequiredForOnline = "no";
-        };
-      };
-    };
-  };
-
 }