v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

nixos: invert common dependency

Browse source
This commit is contained in:
Vivian 2021-11-21 14:35:09 +01:00
parent da803f5e55
commit 738c8c0faa
11 changed files with 25 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

20
flake.nix
View file

@ -17,10 +17,12 @@
mkSystem = { host, lxc ? true }:
nixpkgs.lib.nixosSystem {
inherit system;
modules = [ ./nixos/hosts/${host}/configuration.nix ./nixos/common.nix ] ++ (if lxc then
[ "${nixpkgs}/nixos/modules/virtualisation/lxc-container.nix" ]
else
[ ]);
modules = [ ./nixos/hosts/${host}/configuration.nix ./nixos/common ]
++ (if lxc then [
"${nixpkgs}/nixos/modules/virtualisation/lxc-container.nix"
./nixos/common/generic-lxc.nix
] else
[ ./nixos/common/generic-vm.nix ]);
specialArgs.inputs = inputs;
};
mkDeploy = hostname: profile: {
@ -33,8 +35,14 @@
};
in {
# VMs
nixosConfigurations.bastion = mkSystem { host = "bastion"; lxc = false; };
nixosConfigurations.k3s = mkSystem { host = "k3s"; lxc = false; };
nixosConfigurations.bastion = mkSystem {
host = "bastion";
lxc = false;
};
nixosConfigurations.k3s = mkSystem {
host = "k3s";
lxc = false;
};
# LXCs
nixosConfigurations.vault = mkSystem { host = "vault"; };