From 02622d2b20d014ddb479365cd4d7467398dd8389 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sat, 25 Jun 2022 00:55:03 +0200 Subject: Import nixos-hardware --- flake.nix | 3 ++- system/prefect.nix | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index dff9c893..1249f2a9 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,10 @@ nixos-hardware.url = github:NixOS/nixos-hardware; }; - outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware }: { + outputs = { self, nixpkgs, ... }@attrs: { nixosConfigurations.prefect = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; + specialArgs = attrs; modules = [ ./system/prefect.nix ]; }; }; diff --git a/system/prefect.nix b/system/prefect.nix index 6c80fd10..eeac53a6 100644 --- a/system/prefect.nix +++ b/system/prefect.nix @@ -1,8 +1,8 @@ -{ config, pkgs, ... }: +{ config, pkgs, nixpkgs, nixpkgs-unstable, nixos-hardware, ... }: { imports = [ - - + (nixos-hardware + "/common/pc/ssd") + (nixos-hardware + "/common/cpu/amd") ./settings/satoshipay.nix ./settings/base.nix -- cgit 1.4.1