From b770c5a9fc7cb7799b66837a606798eab039ce74 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Wed, 1 Nov 2023 19:16:52 +0300 Subject: [PATCH] Don't specify platform on every machine --- flake.nix | 11 +++++++---- machines/enka/platform.nix | 1 - 2 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 machines/enka/platform.nix diff --git a/flake.nix b/flake.nix index 00d387b..22c45eb 100644 --- a/flake.nix +++ b/flake.nix @@ -30,14 +30,17 @@ ./machines/enka ]; + architectures = [ + "x86_64-linux" + ]; + nixosSystem = arguments: modules: nixpkgs.lib.nixosSystem { specialArgs = arguments; modules = modules; }; - importConfiguration = configurationDirectory: let - hostName = builtins.baseNameOf configurationDirectory; - hostPlatform = import (configurationDirectory + "/platform.nix"); + importConfiguration = configurationDirectory: hostPlatform: let + hostName = builtins.baseNameOf configurationDirectory; in { nixosConfigurations.${hostName} = nixosSystem { lib = nixpkgs.lib // { @@ -103,5 +106,5 @@ } ]; }; - in builtins.foldl' nixpkgs.lib.recursiveUpdate {} (builtins.map importConfiguration machines); + in builtins.foldl' nixpkgs.lib.recursiveUpdate {} (builtins.map (builtins.map importConfiguration machines) architectures); } diff --git a/machines/enka/platform.nix b/machines/enka/platform.nix deleted file mode 100644 index 132026a..0000000 --- a/machines/enka/platform.nix +++ /dev/null @@ -1 +0,0 @@ -"x86_64-linux"