From 04350a3faf1a669c8365cbfba9584d4a1ed3c7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 19 May 2023 21:05:00 +0200
Subject: [PATCH] Combine microvm-defaults.nix to microvm.nix

---
 flake.nix                    | 11 -----------
 modules/microvm-defaults.nix | 12 ------------
 modules/microvm.nix          |  6 ++++++
 3 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 modules/microvm-defaults.nix

diff --git a/flake.nix b/flake.nix
index 85314ba4..a6393d98 100644
--- a/flake.nix
+++ b/flake.nix
@@ -381,7 +381,6 @@
         gnunet = nixosSystem' {
           modules = [
             self.nixosModules.cluster-options
-            self.nixosModules.microvm-defaults
             ./hosts/gnunet
           ];
         };
@@ -429,7 +428,6 @@
         leon = nixosSystem' {
           modules = [
             self.nixosModules.cluster-options
-            self.nixosModules.microvm-defaults
             ./hosts/leon
           ];
         };
@@ -437,7 +435,6 @@
         leoncloud = nixosSystem' {
           modules = [
             self.nixosModules.cluster-options
-            self.nixosModules.microvm-defaults
             ./hosts/leoncloud
           ];
         };
@@ -500,7 +497,6 @@
             }
             ./hosts/mucbot
             self.nixosModules.cluster-options
-            self.nixosModules.microvm-defaults
           ];
         };
 
@@ -544,7 +540,6 @@
         owncast = nixosSystem' {
           modules = [
             self.nixosModules.cluster-options
-            self.nixosModules.microvm-defaults
             ./hosts/owncast
           ];
         };
@@ -552,7 +547,6 @@
         oxigraph = nixosSystem' {
           modules = [
             self.nixosModules.cluster-options
-            self.nixosModules.microvm-defaults
             ./hosts/oxigraph
           ];
         };
@@ -650,7 +644,6 @@
         sdrweb = nixosSystem' {
           modules = [
             self.nixosModules.cluster-options
-            self.nixosModules.microvm-defaults
             {
               # TODO: migrate to sops
               nixpkgs.overlays = [ secrets.overlays.mucbot ];
@@ -715,7 +708,6 @@
         sshlog = nixosSystem' {
           modules = [
             self.nixosModules.cluster-options
-            self.nixosModules.microvm-defaults
             sshlogd.nixosModule
             ./hosts/sshlog
           ];
@@ -724,7 +716,6 @@
         stream = nixosSystem' {
           modules = [
             self.nixosModules.cluster-options
-            self.nixosModules.microvm-defaults
             ./hosts/stream
           ];
         };
@@ -740,7 +731,6 @@
         tmppleroma = nixosSystem' {
           modules = [
             self.nixosModules.cluster-options
-            self.nixosModules.microvm-defaults
             sshlogd.nixosModule
             ./hosts/tmppleroma
           ];
@@ -765,7 +755,6 @@
         cluster = ./modules/cluster;
         cluster-options = deployment.nixosModules.deployment-options;
         cluster-network = ./modules/cluster/network.nix;
-        microvm-defaults = ./modules/microvm-defaults.nix;
         microvm.imports = [
           microvm.nixosModules.microvm
           ./modules/microvm.nix
diff --git a/modules/microvm-defaults.nix b/modules/microvm-defaults.nix
deleted file mode 100644
index 585118e5..00000000
--- a/modules/microvm-defaults.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# No MicroVM settings but some defaults that enable evaulating NixOS
-# configurations that are destined to be used on Skyflake
-
-{ lib, ... }:
-
-{
-  fileSystems."/" = lib.mkDefault {
-    fsType = "tmpfs";
-  };
-
-  boot.loader.grub.enable = false;
-}
diff --git a/modules/microvm.nix b/modules/microvm.nix
index a48dd3e7..ff4d1af6 100644
--- a/modules/microvm.nix
+++ b/modules/microvm.nix
@@ -69,6 +69,8 @@ in
   };
 
   config = {
+    boot.loader.grub.enable = false;
+
     # autoupdates do not make sense inside MicroVMs with read-only /nix/store
     c3d2.autoUpdate = false;
 
@@ -85,6 +87,10 @@ in
       ];
     };
 
+    fileSystems."/" = lib.mkDefault {
+      fsType = "tmpfs";
+    };
+
     hardware.enableRedistributableFirmware = false;
 
     microvm = {