From 537b23cd391d3ac54b4dc982b3d8854fc7d0ffcc Mon Sep 17 00:00:00 2001 From: Antoine Viallon Date: Wed, 15 Mar 2023 09:01:38 +0100 Subject: [PATCH] [Hardware] Move hardware.nix in hardware/default.nix --- default.nix | 2 +- hardware.nix => hardware/default.nix | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) rename hardware.nix => hardware/default.nix (87%) diff --git a/default.nix b/default.nix index 8107d80..7fda388 100644 --- a/default.nix +++ b/default.nix @@ -11,7 +11,7 @@ ./services.nix ./filesystems.nix ./hardening.nix - ./hardware.nix + ./hardware ./laptop.nix ./power.nix ./overlays.nix diff --git a/hardware.nix b/hardware/default.nix similarity index 87% rename from hardware.nix rename to hardware/default.nix index 6f1d870..8584000 100644 --- a/hardware.nix +++ b/hardware/default.nix @@ -9,11 +9,16 @@ in options.aviallon.hardware = { }; imports = [ - ./hardware/amd.nix - ./hardware/nvidia.nix - ./hardware/intel.nix + ./amd + ./nvidia + ./intel ]; + config = { + boot.binfmt.emulatedSystems = [ + "armv7l-linux" + ]; + environment.systemPackages = [] ++ optional (cfg.amd.enable && cfg.nvidia.enable) pkgs.nvtop ++ optional cfg.amd.enable pkgs.nvtop-amd