From 3281b84379c432b2325175c2d5cdf788303d33c7 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Fri, 18 Oct 2024 19:41:34 +0200 Subject: [PATCH] mimir: Remove microvm --- machines/mimir/configuration.nix | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/machines/mimir/configuration.nix b/machines/mimir/configuration.nix index d6a7bd1..df285ba 100644 --- a/machines/mimir/configuration.nix +++ b/machines/mimir/configuration.nix @@ -1,6 +1,5 @@ { nixos-hardware, - microvm, attic, ... }: @@ -12,7 +11,6 @@ nixos-hardware.nixosModules.common-cpu-amd-pstate nixos-hardware.nixosModules.common-pc-ssd - microvm.nixosModules.host attic.nixosModules.atticd ../../users/erwin @@ -213,6 +211,7 @@ trustedInterfaces = [ "lo" "tailscale0" + "enp5s0f1" ]; allowedTCPPorts = [ @@ -231,7 +230,6 @@ nat = { enable = true; - internalInterfaces = [ "microvm" ]; externalInterface = "enp4s0"; }; @@ -245,8 +243,6 @@ }; }; - microvm.autostart = [ "miniflux" ]; - powerManagement = { cpuFreqGovernor = "ondemand"; }; @@ -286,15 +282,6 @@ }; }; - netdevs = { - "10-microvm" = { - netdevConfig = { - Kind = "bridge"; - Name = "microvm"; - }; - }; - }; - networks = { "40-enp4s0" = { enable = true; @@ -322,23 +309,8 @@ matchConfig = { Name = "enp5s0f1"; }; - }; - "10-microvm" = { - matchConfig = { - Name = "microvm"; - }; - - addresses = [ { Address = "172.16.0.1/24"; } ]; - }; - - "11-microvm" = { - matchConfig = { - Name = "vm-*"; - }; - networkConfig = { - Bridge = "microvm"; - }; + addresses = [ { Address = "10.42.0.1/24"; } ]; }; }; };