diff --git a/flake.nix b/flake.nix index 7ee76c46..95676e3c 100644 --- a/flake.nix +++ b/flake.nix @@ -52,16 +52,15 @@ } @ inputs: let inherit (nixpkgs) lib; - systemFromHardwareConf = { + systemFromHardwareConf = hostname: let hardware = import ./hosts/${hostname}/hardware-configuration.nix; args = builtins.functionArgs hardware // { lib.mkdefault = lib.id; }; in (hardware args).nixpkgs.hostPlatform; - }; - importNixpks = system: nixpkgs: + importNixpkgs = system: nixpkgs: let config.allowUnfreePredicate = pkg: @@ -88,7 +87,7 @@ builtins.readDir (lib.filterAttrs (_: type: type == "directory")) # (lib.filterAttrs (name: _: builtins.pathExists ./hosts/${name}/default.nix && builtins.pathExists ./hosts/${name}/hardware.nix && builtins.pathExists ./hosts/${name}/config.nix)) - (builtins.mapAttrs (name: _: makeHost name (systemFromHardwareConf name)) + (builtins.mapAttrs (name: _: makeHost name (systemFromHardwareConf name))) ]; }; } diff --git a/default.nix b/home/default.nix similarity index 100% rename from default.nix rename to home/default.nix