From 89d410cb6cd0c09e7b2dac685450d571097bf606 Mon Sep 17 00:00:00 2001
From: Kaare Hoff Skovgaard <kaare@kaareskovgaard.net>
Date: Tue, 8 Jul 2025 23:47:54 +0200
Subject: [PATCH] Fix some test issues

---
 flake.nix                                          | 14 --------------
 nix/checks/hetzner-sets-ipv6/default.nix           |  5 ++++-
 nix/systems/aarch64-linux/khs.codes/default.nix    |  2 +-
 .../test.kaareskovgaard.net/default.nix            |  2 +-
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/flake.nix b/flake.nix
index afa64e3..83f07df 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,8 +65,6 @@
           dirs = inputs.nixpkgs.lib.filterAttrs (name: kind: kind == "directory") files;
         in
         builtins.attrNames dirs;
-      nixosModules = dirsInPath ./nix/modules/nixos;
-      homeModules = dirsInPath ./nix/modules/home;
       inputNixosModules = [
         inputs.disko.nixosModules.disko
         inputs.stylix.nixosModules.stylix
@@ -95,18 +93,6 @@
           name = "Machines";
         };
       };
-      modules = {
-        nixos = {
-          default = {
-            imports = (builtins.map (m: self.nixosModules.${m}) nixosModules) ++ inputNixosModules;
-          };
-        };
-        home = {
-          default = {
-            imports = (builtins.map (m: self.homeModules.${m}) homeModules) ++ inputHomeModules;
-          };
-        };
-      };
       overlays = [ inputs.rust-overlay.overlays.default ];
     })
     // {
diff --git a/nix/checks/hetzner-sets-ipv6/default.nix b/nix/checks/hetzner-sets-ipv6/default.nix
index 68ce8ce..b4db636 100644
--- a/nix/checks/hetzner-sets-ipv6/default.nix
+++ b/nix/checks/hetzner-sets-ipv6/default.nix
@@ -12,7 +12,10 @@ pkgs.nixosTest {
       { ... }:
       {
         imports = [
-          inputs.self.nixosModules.default
+          inputs.self.nixosModules.hetzner
+          inputs.self.nixosModules.systemd-boot
+          inputs.self.nixosModules."virtualisation/qemu-guest"
+          inputs.disko.nixosModules.disko
           sharedModule
         ];
         khscodes.hetzner = {
diff --git a/nix/systems/aarch64-linux/khs.codes/default.nix b/nix/systems/aarch64-linux/khs.codes/default.nix
index 6b2fe88..aed4c34 100644
--- a/nix/systems/aarch64-linux/khs.codes/default.nix
+++ b/nix/systems/aarch64-linux/khs.codes/default.nix
@@ -3,7 +3,7 @@
   ...
 }:
 {
-  imports = [ "${inputs.self}/nix/profiles/hetzner-server.nix" ];
+  imports = [ "${inputs.self}/nix/profiles/nixos/hetzner-server.nix" ];
   khscodes.infrastructure.hetzner-instance = {
     enable = true;
     mapRdns = true;
diff --git a/nix/systems/x86_64-linux/test.kaareskovgaard.net/default.nix b/nix/systems/x86_64-linux/test.kaareskovgaard.net/default.nix
index 5d50c30..c6f0b6a 100644
--- a/nix/systems/x86_64-linux/test.kaareskovgaard.net/default.nix
+++ b/nix/systems/x86_64-linux/test.kaareskovgaard.net/default.nix
@@ -3,7 +3,7 @@
   ...
 }:
 {
-  imports = [ "${inputs.self}/nix/profiles/khs-openstack-server.nix" ];
+  imports = [ "${inputs.self}/nix/profiles/nixos/khs-openstack-server.nix" ];
   khscodes.infrastructure.khs-openstack-instance = {
     enable = true;
     flavor = "m.medium";