From 0c4173ceaf2efbc53c10b06f1b9307ce646a0f7a Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 10 Nov 2025 21:58:41 -0600 Subject: [PATCH] test: trying to get microVMs to work --- modules/nixos/guests/default.nix | 11 +++++++++++ .../{microvm => guests}/firefly-iii/default.nix | 0 .../nixos/{microvm => guests}/forgejo/default.nix | 0 .../nixos/{microvm => guests}/jellyfin/default.nix | 0 .../{microvm => guests}/vaultwarden/default.nix | 0 modules/nixos/microvm/default.nix | 14 ++------------ 6 files changed, 13 insertions(+), 12 deletions(-) create mode 100755 modules/nixos/guests/default.nix rename modules/nixos/{microvm => guests}/firefly-iii/default.nix (100%) rename modules/nixos/{microvm => guests}/forgejo/default.nix (100%) rename modules/nixos/{microvm => guests}/jellyfin/default.nix (100%) rename modules/nixos/{microvm => guests}/vaultwarden/default.nix (100%) mode change 100755 => 100644 modules/nixos/microvm/default.nix diff --git a/modules/nixos/guests/default.nix b/modules/nixos/guests/default.nix new file mode 100755 index 0000000..da65bd2 --- /dev/null +++ b/modules/nixos/guests/default.nix @@ -0,0 +1,11 @@ +let + importList = + let + content = builtins.readDir ./.; + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + in + map (name: ./. + "/${name}") dirContent; +in +{ + imports = importList; +} diff --git a/modules/nixos/microvm/firefly-iii/default.nix b/modules/nixos/guests/firefly-iii/default.nix similarity index 100% rename from modules/nixos/microvm/firefly-iii/default.nix rename to modules/nixos/guests/firefly-iii/default.nix diff --git a/modules/nixos/microvm/forgejo/default.nix b/modules/nixos/guests/forgejo/default.nix similarity index 100% rename from modules/nixos/microvm/forgejo/default.nix rename to modules/nixos/guests/forgejo/default.nix diff --git a/modules/nixos/microvm/jellyfin/default.nix b/modules/nixos/guests/jellyfin/default.nix similarity index 100% rename from modules/nixos/microvm/jellyfin/default.nix rename to modules/nixos/guests/jellyfin/default.nix diff --git a/modules/nixos/microvm/vaultwarden/default.nix b/modules/nixos/guests/vaultwarden/default.nix similarity index 100% rename from modules/nixos/microvm/vaultwarden/default.nix rename to modules/nixos/guests/vaultwarden/default.nix diff --git a/modules/nixos/microvm/default.nix b/modules/nixos/microvm/default.nix old mode 100755 new mode 100644 index 9191619..f2b7ac8 --- a/modules/nixos/microvm/default.nix +++ b/modules/nixos/microvm/default.nix @@ -1,17 +1,7 @@ { flake, ... }: -let - importList = - let - content = builtins.readDir ./.; - dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); - in - map (name: ./. + "/${name}") dirContent; - - microVMImport = [ +{ + imports = [ flake.inputs.microvm.nixosModules.host ]; -in -{ - imports = importList ++ microVMImport; }