From 04ef22593a5d062b5da4985fec49d42dccb6647e Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Sun, 1 Dec 2024 10:03:30 +0100 Subject: [PATCH] update intel graphics config --- flake.lock | 18 +++++++++--------- home/vinzenz/zsh.nix | 7 +++---- hosts/vinzenz-lpt2/hardware.nix | 5 ++++- modules/intel-graphics.nix | 12 +++++------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 2f92a2f..a196a08 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1732319136, - "narHash": "sha256-wpmPl6FkAF9Jj5C/rzANgpUjfzQrUYOn267LnzKU2uI=", + "lastModified": 1732466619, + "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8831cc700030e11fc91da9ef6270593e6440edc", + "rev": "f3111f62a23451114433888902a55cf0692b408d", "type": "github" }, "original": { @@ -182,11 +182,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", + "lastModified": 1732350895, + "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3", "type": "github" }, "original": { @@ -214,11 +214,11 @@ }, "nixpkgs-droid": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1732749044, + "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", "type": "github" }, "original": { diff --git a/home/vinzenz/zsh.nix b/home/vinzenz/zsh.nix index 5aa3fcb..fd252a2 100644 --- a/home/vinzenz/zsh.nix +++ b/home/vinzenz/zsh.nix @@ -6,9 +6,9 @@ ''; shellAliases = { - my-apply = "sudo nixos-rebuild boot"; - my-switch = "sudo nixos-rebuild switch"; - my-update = "sudo nixos-rebuild boot --upgrade"; + my-apply = "sudo nixos-rebuild boot --flake"; + my-switch = "sudo nixos-rebuild switch --flake"; + my-update = "sudo nixos-rebuild boot --upgrade --flake"; my-pull = "git -C ~/Repos/nixos-configuration pull --rebase"; my-fmt = "alejandra ."; my-test = "sudo nixos-rebuild test"; @@ -16,7 +16,6 @@ my-ip4 = "ip addr show | grep 192"; deadnix = "nix run github:astro/deadnix -- "; statix = "nix run git+https://git.peppe.rs/languages/statix -- "; - my-nix-fixup = "deadnix -e && statix fix"; }; history = { diff --git a/hosts/vinzenz-lpt2/hardware.nix b/hosts/vinzenz-lpt2/hardware.nix index 82dd975..f51ccd1 100644 --- a/hosts/vinzenz-lpt2/hardware.nix +++ b/hosts/vinzenz-lpt2/hardware.nix @@ -3,7 +3,10 @@ imports = [ ../../modules/intel-graphics.nix ]; config = { # intel cpu - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ + "kvm-intel" + "xe" + ]; hardware.cpu.intel.updateMicrocode = true; boot.loader = { diff --git a/modules/intel-graphics.nix b/modules/intel-graphics.nix index 3e36301..f23b357 100644 --- a/modules/intel-graphics.nix +++ b/modules/intel-graphics.nix @@ -4,16 +4,14 @@ hardware.graphics = { extraPackages = with pkgs; [ intel-media-driver - vaapiIntel - vaapiVdpau - libvdpau-va-gl + intel-vaapi-driver intel-ocl + intel-compute-runtime + vpl-gpu-rt ]; - extraPackages32 = with pkgs.pkgsi686Linux; [ + extraPackages32 = with pkgs.driversi686Linux; [ + intel-vaapi-driver intel-media-driver - vaapiIntel - vaapiVdpau - libvdpau-va-gl ]; }; environment.systemPackages = with pkgs; [ nvtopPackages.intel ];