Fix some test issues

Former-commit-id: 89d410cb6c
This commit is contained in:
Kaare Hoff Skovgaard 2025-07-08 23:47:54 +02:00
parent 1f246337a1
commit 84818b01be
4 changed files with 6 additions and 17 deletions

View file

@ -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 ];
})
// {

View file

@ -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 = {

View file

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

View file

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