From 079654ef48b6c4563cbbe30fbc8eaf56ff8984ca Mon Sep 17 00:00:00 2001 From: unexplrd Date: Sun, 30 Mar 2025 00:31:26 +0200 Subject: [PATCH] flake.nix: add nixos-hardware hosts/dunamis/hardware.nix: add nixos-hardware Signed-off-by: unexplrd --- flake.nix | 3 ++- hosts/dunamis/hardware.nix | 26 +++++++++++--------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index 0fd30d2..5ba0f37 100644 --- a/flake.nix +++ b/flake.nix @@ -16,8 +16,9 @@ nix-flatpak.url = "github:gmodena/nix-flatpak"; nix-index-database.url = "github:nix-community/nix-index-database"; # nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; - nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; # nixvim.url = "github:nix-community/nixvim"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; sops-nix.url = "github:mic92/sops-nix"; stylix.url = "github:danth/stylix"; way-edges.url = "github:way-edges/way-edges"; diff --git a/hosts/dunamis/hardware.nix b/hosts/dunamis/hardware.nix index 76cd780..c0ce340 100644 --- a/hosts/dunamis/hardware.nix +++ b/hosts/dunamis/hardware.nix @@ -1,23 +1,19 @@ { - config, - lib, - pkgs, + inputs, modulesPath, ... }: { - imports = [ + imports = with inputs.nixos-hardware.nixosModules; [ (modulesPath + "/installer/scan/not-detected.nix") + common-amd-cpu-pstate + common-intel-gpu + common-pc-ssd ]; - - hardware.graphics = { - enable = true; - extraPackages = with pkgs; [ - intel-media-driver - vaapiIntel - vpl-gpu-rt - ]; + hardware = { + enableRedistributableFirmware = true; + intelgpu = { + vaapiDriver = "intel-media-driver"; + useIntelMediaDriver = true; + }; }; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }