From 0975fc9a95144ec56063aa9677ef908275e501cc Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Wed, 9 Apr 2025 20:54:42 +0200 Subject: [PATCH 1/2] intel.nix: add option to enable intel config --- modules/system/hardware/cpu/intel.nix | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/modules/system/hardware/cpu/intel.nix b/modules/system/hardware/cpu/intel.nix index ee059aa..ba82da7 100644 --- a/modules/system/hardware/cpu/intel.nix +++ b/modules/system/hardware/cpu/intel.nix @@ -4,16 +4,22 @@ pkgs, ... }: let - inherit (lib.modules) mkDefault; + inherit (lib.modules) mkDefault mkIf; + inherit (lib.options) mkEnableOption; + + cfg = config.modules.system.hardware.intel; in { - hardware = { - cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware; - graphics.extraPackages = builtins.attrValues { - inherit - (pkgs) - intel-vaapi-driver - intel-media-driver - ; + options.modules.system.hardware.intel.enable = mkEnableOption "Intel Hardware"; + config = mkIf cfg.enable { + hardware = { + cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware; + graphics.extraPackages = builtins.attrValues { + inherit + (pkgs) + intel-vaapi-driver + intel-media-driver + ; + }; }; }; } From d8fe4ce6eac86aa928950515ffad220c19275bd4 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Wed, 9 Apr 2025 20:54:42 +0200 Subject: [PATCH 2/2] hosts/{hermit, temperance}: enable intel --- hosts/hermit/configuration.nix | 1 + hosts/temperance/configuration.nix | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix index 11dce4c..82d1618 100644 --- a/hosts/hermit/configuration.nix +++ b/hosts/hermit/configuration.nix @@ -34,6 +34,7 @@ }; hardware = { nvidia.enable = true; + intel.enable = true; bluetooth = { enable = true; powerOnBoot = false; diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix index d7f255f..71af206 100644 --- a/hosts/temperance/configuration.nix +++ b/hosts/temperance/configuration.nix @@ -59,7 +59,10 @@ in { }; }; sound.enable = true; - hardware.nvidia.enable = true; + hardware = { + intel.enable = true; + nvidia.enable = true; + }; }; desktops.hyprland.enable = true;