From 1e8460c2ecaa46dddf8e10ab49c538800e41f325 Mon Sep 17 00:00:00 2001
From: Kaare Hoff Skovgaard <kaare@kaareskovgaard.net>
Date: Tue, 8 Jul 2025 12:27:00 +0200
Subject: [PATCH] Fix some issues building non finished configuration

---
 nix/modules/nixos/openstack/default.nix  | 27 +++++++++++++++++++++++-
 nix/modules/nixos/qemu-guest/default.nix |  2 +-
 nix/profiles/hetzner-server.nix          |  3 +--
 nix/profiles/khs-openstack-server.nix    |  4 ++--
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/nix/modules/nixos/openstack/default.nix b/nix/modules/nixos/openstack/default.nix
index c915eb0..46bc74a 100644
--- a/nix/modules/nixos/openstack/default.nix
+++ b/nix/modules/nixos/openstack/default.nix
@@ -1 +1,26 @@
-{ ... }: { }
+{
+  config,
+  lib,
+  ...
+}:
+let
+  cfg = config.khscodes.openstack;
+in
+{
+  options.khscodes.openstack = {
+    enable = lib.mkEnableOption "Enables the machine as a openstack machine";
+    diskName = lib.mkOption {
+      type = lib.types.str;
+      default = "nixos";
+      description = "Name of the root disk device";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    disko = lib.khscodes.disko-root-lvm {
+      device = "/dev/sda";
+      diskName = cfg.diskName;
+    };
+    khscodes.systemd-boot.enable = lib.mkDefault true;
+    khscodes.qemu-guest.enable = true;
+  };
+}
diff --git a/nix/modules/nixos/qemu-guest/default.nix b/nix/modules/nixos/qemu-guest/default.nix
index f84f00c..5f906a0 100644
--- a/nix/modules/nixos/qemu-guest/default.nix
+++ b/nix/modules/nixos/qemu-guest/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  cfg = config.khscodes.hetzner;
+  cfg = config.khscodes.qemu-guest;
 in
 {
   options.khscodes.qemu-guest = {
diff --git a/nix/profiles/hetzner-server.nix b/nix/profiles/hetzner-server.nix
index 4bd88cd..a0612e8 100644
--- a/nix/profiles/hetzner-server.nix
+++ b/nix/profiles/hetzner-server.nix
@@ -1,6 +1,5 @@
-{ modulesPath, ... }:
+{ ... }:
 {
-  imports = [ "${modulesPath}/profiles/qemu-guest.nix" ];
   config.khscodes = {
     hetzner.enable = true;
     sshd.enable = true;
diff --git a/nix/profiles/khs-openstack-server.nix b/nix/profiles/khs-openstack-server.nix
index 5511ede..acd7575 100644
--- a/nix/profiles/khs-openstack-server.nix
+++ b/nix/profiles/khs-openstack-server.nix
@@ -1,7 +1,7 @@
-{ modulesPath, ... }:
+{ ... }:
 {
-  imports = [ "${modulesPath}/profiles/qemu-guest.nix" ];
   config.khscodes = {
+    openstack.enable = true;
     sshd.enable = true;
   };
 }