c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Combine microvm-defaults.nix to microvm.nix

This commit is contained in:
Sandro - 2023-05-19 21:05:00 +02:00
parent 20a3ce5ad8
commit 04350a3faf
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
3 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flake.nix
View File

@ -381,7 +381,6 @@
gnunet = nixosSystem' { gnunet = nixosSystem' {
modules = [ modules = [
self.nixosModules.cluster-options self.nixosModules.cluster-options
self.nixosModules.microvm-defaults
./hosts/gnunet ./hosts/gnunet
]; ];
}; };
@ -429,7 +428,6 @@
leon = nixosSystem' { leon = nixosSystem' {
modules = [ modules = [
self.nixosModules.cluster-options self.nixosModules.cluster-options
self.nixosModules.microvm-defaults
./hosts/leon ./hosts/leon
]; ];
}; };
@ -437,7 +435,6 @@
leoncloud = nixosSystem' { leoncloud = nixosSystem' {
modules = [ modules = [
self.nixosModules.cluster-options self.nixosModules.cluster-options
self.nixosModules.microvm-defaults
./hosts/leoncloud ./hosts/leoncloud
]; ];
}; };
@ -500,7 +497,6 @@
} }
./hosts/mucbot ./hosts/mucbot
self.nixosModules.cluster-options self.nixosModules.cluster-options
self.nixosModules.microvm-defaults
]; ];
}; };
@ -544,7 +540,6 @@
owncast = nixosSystem' { owncast = nixosSystem' {
modules = [ modules = [
self.nixosModules.cluster-options self.nixosModules.cluster-options
self.nixosModules.microvm-defaults
./hosts/owncast ./hosts/owncast
]; ];
}; };
@ -552,7 +547,6 @@
oxigraph = nixosSystem' { oxigraph = nixosSystem' {
modules = [ modules = [
self.nixosModules.cluster-options self.nixosModules.cluster-options
self.nixosModules.microvm-defaults
./hosts/oxigraph ./hosts/oxigraph
]; ];
}; };
@ -650,7 +644,6 @@
sdrweb = nixosSystem' { sdrweb = nixosSystem' {
modules = [ modules = [
self.nixosModules.cluster-options self.nixosModules.cluster-options
self.nixosModules.microvm-defaults
{ {
# TODO: migrate to sops # TODO: migrate to sops
nixpkgs.overlays = [ secrets.overlays.mucbot ]; nixpkgs.overlays = [ secrets.overlays.mucbot ];
@ -715,7 +708,6 @@
sshlog = nixosSystem' { sshlog = nixosSystem' {
modules = [ modules = [
self.nixosModules.cluster-options self.nixosModules.cluster-options
self.nixosModules.microvm-defaults
sshlogd.nixosModule sshlogd.nixosModule
./hosts/sshlog ./hosts/sshlog
]; ];
@ -724,7 +716,6 @@
stream = nixosSystem' { stream = nixosSystem' {
modules = [ modules = [
self.nixosModules.cluster-options self.nixosModules.cluster-options
self.nixosModules.microvm-defaults
./hosts/stream ./hosts/stream
]; ];
}; };
@ -740,7 +731,6 @@
tmppleroma = nixosSystem' { tmppleroma = nixosSystem' {
modules = [ modules = [
self.nixosModules.cluster-options self.nixosModules.cluster-options
self.nixosModules.microvm-defaults
sshlogd.nixosModule sshlogd.nixosModule
./hosts/tmppleroma ./hosts/tmppleroma
]; ];
@ -765,7 +755,6 @@
cluster = ./modules/cluster; cluster = ./modules/cluster;
cluster-options = deployment.nixosModules.deployment-options; cluster-options = deployment.nixosModules.deployment-options;
cluster-network = ./modules/cluster/network.nix; cluster-network = ./modules/cluster/network.nix;
microvm-defaults = ./modules/microvm-defaults.nix;
microvm.imports = [ microvm.imports = [
microvm.nixosModules.microvm microvm.nixosModules.microvm
./modules/microvm.nix ./modules/microvm.nix

12
modules/microvm-defaults.nix
View File

@ -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;
}

6
modules/microvm.nix
View File

@ -69,6 +69,8 @@ in
}; };
config = { config = {
boot.loader.grub.enable = false;
# autoupdates do not make sense inside MicroVMs with read-only /nix/store # autoupdates do not make sense inside MicroVMs with read-only /nix/store
c3d2.autoUpdate = false; c3d2.autoUpdate = false;
@ -85,6 +87,10 @@ in
]; ];
}; };
fileSystems."/" = lib.mkDefault {
fsType = "tmpfs";
};
hardware.enableRedistributableFirmware = false; hardware.enableRedistributableFirmware = false;
microvm = { microvm = {