From 5b651ca0321c1672fd649d3f81f5844f7450a8d7 Mon Sep 17 00:00:00 2001 From: Sebastian Pietras Date: Tue, 19 May 2026 22:54:41 +0200 Subject: [PATCH] Cleaned up configuration --- .../hosts/dummy/modules/constants/default.nix | 50 ++++++++++--------- src/src/hosts/dummy/modules/vm/default.nix | 6 +-- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/src/hosts/dummy/modules/constants/default.nix b/src/src/hosts/dummy/modules/constants/default.nix index 2fc5655..3412f33 100644 --- a/src/src/hosts/dummy/modules/constants/default.nix +++ b/src/src/hosts/dummy/modules/constants/default.nix @@ -49,30 +49,6 @@ }; vm = { - cpu = { - cores = lib.mkOption { - default = 4; - description = "Number of CPU cores"; - type = lib.types.int; - }; - }; - - disk = { - size = lib.mkOption { - default = 8192; - description = "Size of the disk in MB"; - type = lib.types.int; - }; - }; - - memory = { - size = lib.mkOption { - default = 4096; - description = "Size of the memory in MB"; - type = lib.types.int; - }; - }; - name = lib.mkOption { default = "dummy-vm"; description = "Name of the virtual machine"; @@ -86,6 +62,32 @@ type = lib.types.str; }; }; + + resources = { + cpu = { + cores = lib.mkOption { + default = 4; + description = "Number of CPU cores"; + type = lib.types.int; + }; + }; + + disk = { + size = lib.mkOption { + default = 8192; + description = "Size of the disk in MB"; + type = lib.types.int; + }; + }; + + memory = { + size = lib.mkOption { + default = 4096; + description = "Size of the memory in MB"; + type = lib.types.int; + }; + }; + }; }; }; }; diff --git a/src/src/hosts/dummy/modules/vm/default.nix b/src/src/hosts/dummy/modules/vm/default.nix index fdbb661..90e4f78 100644 --- a/src/src/hosts/dummy/modules/vm/default.nix +++ b/src/src/hosts/dummy/modules/vm/default.nix @@ -14,16 +14,16 @@ virtualisation = { # CPU cores for the virtual machine - cores = config.virtualisation.vmVariant.constants.vm.cpu.cores; + cores = config.virtualisation.vmVariant.constants.vm.resources.cpu.cores; # Path to the disk image diskImage = "./bin/${config.virtualisation.vmVariant.constants.vm.name}.qcow2"; # Size of the disk image - diskSize = config.virtualisation.vmVariant.constants.vm.disk.size; + diskSize = config.virtualisation.vmVariant.constants.vm.resources.disk.size; # Memory size for the virtual machine - memorySize = config.virtualisation.vmVariant.constants.vm.memory.size; + memorySize = config.virtualisation.vmVariant.constants.vm.resources.memory.size; # Shared directories between the virtual machine and your development machine sharedDirectories = {