kalipso/infrastructure
1
1
Fork 1
Code Issues 43 Pull Requests 3 Actions Projects 2 Releases Wiki Activity

[modules] fix microvm.host 'leak'

Browse Source 
including the malobeo module caused microvm to include microvm.host
which caused super annoying trouble and 2 days of debugging because
microvm.host.enable defaults to true...
This commit is contained in:
kalipso
2024-12-19 15:21:58 +01:00
parent 7b53639208
commit 6e4e35fcdf
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
machines/configuration.nix
View File

@@ -137,7 +137,7 @@ in
specialArgs.inputs = inputs; specialArgs.inputs = inputs;
specialArgs.self = self; specialArgs.self = self;
modules = makeMicroVM "vpn" "10.0.0.10" "D0:E5:CA:F0:D7:E6" [ modules = makeMicroVM "vpn" "10.0.0.10" "D0:E5:CA:F0:D7:E6" [
self.nixosModules.malobeo self.nixosModules.malobeo.vpn
./vpn/configuration.nix ./vpn/configuration.nix
]; ];
}; };

9
outputs.nix
View File

@@ -112,12 +112,15 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
self = self; self = self;
}); });
nixosModules.malobeo.imports = [ nixosModules.malobeo = {
imports = [
./machines/durruti/host_config.nix ./machines/durruti/host_config.nix
./machines/modules/malobeo/microvm_host.nix
./machines/modules/malobeo/wireguard.nix
]; ];
microvm.imports = [ ./machines/modules/malobeo/microvm_host.nix ];
vpn.imports = [ ./machines/modules/malobeo/wireguard.nix ];
};
hydraJobs = nixpkgs.lib.mapAttrs (_: nixpkgs.lib.hydraJob) ( hydraJobs = nixpkgs.lib.mapAttrs (_: nixpkgs.lib.hydraJob) (
let let
getBuildEntry = name: nixosSystem: getBuildEntry = name: nixosSystem: