From 3649c233b73d03370779a8f58c6613a412979e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Mon, 8 Aug 2022 10:13:19 +0200 Subject: Improve devices and few more machines --- flake.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index de9c59f..f4652d2 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,6 @@ self.nixosModules.default self.nixosModules."machine-${hostname}" shellrc.nixosModules.default - nixturris.nixosModules.turris-crossbuild (personal-secret.lib.personalSecrets hostname) { networking.hostName = hostname; @@ -39,15 +38,18 @@ } ]; - genericSystem = system: hostname: { + genericSystem = {system, extra_modules ? []}: hostname: { ${hostname} = nixpkgs.lib.nixosSystem { system = system; - modules = modules hostname; + modules = (modules hostname) ++ extra_modules; }; }; - amd64System = genericSystem "x86_64-linux"; - armv7lSystem = genericSystem "armv7l-linux"; - aarch64System = genericSystem "aarch64-linux"; + amd64System = genericSystem {system = "x86_64-linux";}; + armv7lSystem = genericSystem {system = "armv7l-linux"; extra_modules = [ + nixturris.nixosModules.turris-crossbuild + nixturris.nixosModules.armv7l-overlay + ];}; + aarch64System = genericSystem {system = "aarch64-linux";}; turrisSystem = board: hostname: { ${hostname} = nixturris.lib.nixturrisSystem { -- cgit v1.2.3