From 63fc72eeb0d3ad090e136a4e9e66c5c4b3de68df Mon Sep 17 00:00:00 2001 From: Jimbo Date: Wed, 19 Feb 2025 01:04:35 -0500 Subject: [PATCH] More misc changes to Midas --- hosts/midas/boot/default.nix | 4 ---- hosts/midas/default.nix | 24 +++++++++++++++++++++--- 2 files changed, 21 insertions(+), 7 deletions(-) delete mode 100644 hosts/midas/boot/default.nix diff --git a/hosts/midas/boot/default.nix b/hosts/midas/boot/default.nix deleted file mode 100644 index 0fe2462..0000000 --- a/hosts/midas/boot/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - boot.kernelParams = [ "i915.force_probe=1912" ]; -} diff --git a/hosts/midas/default.nix b/hosts/midas/default.nix index 876a739..a6acbb7 100644 --- a/hosts/midas/default.nix +++ b/hosts/midas/default.nix @@ -1,7 +1,6 @@ -{ pkgs, ... }: +{ lib, pkgs, ... }: { imports = [ - ./boot ./disko ./filesystems ./hardware @@ -22,5 +21,24 @@ stateVersion = "24.11"; }; - services.xserver.videoDrivers = [ "intel" ]; + hardware.graphics = { + extraPackages = with pkgs; [ + intel-media-driver + intel-ocl + intel-vaapi-driver + ]; + extraPackages32 = with pkgs.driversi686Linux; [ + intel-media-driver + intel-vaapi-driver + ]; + }; + + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "intel-ocl" + ]; + + services.xserver.videoDrivers = [ + "intel" + "i915" + ]; }