From efb65becb1d5753d29bb8f6333afc728e0ff6bc8 Mon Sep 17 00:00:00 2001 From: Frank LoTurco Date: Mon, 27 Jul 2026 13:43:23 -0400 Subject: [PATCH] pdw-frankiel: remove i915-sriov-dkms --- flake.lock | 85 ++++++++-------------------- flake.nix | 4 -- hosts/pdw-frankiel/configuration.nix | 22 ------- 3 files changed, 25 insertions(+), 86 deletions(-) diff --git a/flake.lock b/flake.lock index 105cd50..0e0066d 100644 --- a/flake.lock +++ b/flake.lock @@ -314,28 +314,10 @@ "type": "github" } }, - "i915-sriov-dkms": { - "inputs": { - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1778038228, - "narHash": "sha256-hnZSTWgGRYRXoYWB/r4ViQ4OMJlNEj2SDH8jxxn1vso=", - "owner": "strongtz", - "repo": "i915-sriov-dkms", - "rev": "2421d3ff8c27a967ffc2c6a1d19e0f3790ace5a0", - "type": "github" - }, - "original": { - "owner": "strongtz", - "repo": "i915-sriov-dkms", - "type": "github" - } - }, "lazyvim": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1780594829, @@ -355,7 +337,7 @@ "millennium": { "inputs": { "millennium-src": "millennium-src", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "dir": "packages/nix", @@ -432,7 +414,7 @@ "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks_2", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1785123476, @@ -530,7 +512,7 @@ "inputs": { "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "nvfetcher": "nvfetcher", "systems": "systems_2", "treefmt-nix": "treefmt-nix_2" @@ -550,22 +532,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1784356753, - "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1784497964, "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", @@ -630,22 +596,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1760038930, - "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1752480373, "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", @@ -661,7 +611,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1781577229, "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", @@ -677,7 +627,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1784872115, "narHash": "sha256-THPEF2po0fsoH8gNtp+Ae0XFDJH3N/ol7xO3v6VMTJU=", @@ -693,7 +643,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1784432872, "narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=", @@ -709,6 +659,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1784356753, + "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nvfetcher": { "inputs": { "flake-compat": [ @@ -778,13 +744,12 @@ "affinity-thumbnailer-kde": "affinity-thumbnailer-kde", "appimage-manager": "appimage-manager", "home-manager": "home-manager", - "i915-sriov-dkms": "i915-sriov-dkms", "lazyvim": "lazyvim", "millennium": "millennium", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-xr": "nixpkgs-xr", "scopebuddy": "scopebuddy" @@ -809,7 +774,7 @@ }, "scopebuddy": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1772751261, diff --git a/flake.nix b/flake.nix index c597fb2..cf848a1 100644 --- a/flake.nix +++ b/flake.nix @@ -16,8 +16,6 @@ nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.7.0"; appimage-manager.url = "github:kem-a/AppManager"; - i915-sriov-dkms.url = "github:strongtz/i915-sriov-dkms"; - lazyvim.url = "github:pfassina/lazyvim-nix/v16.0.0"; affinity-nix.url = "github:mrshmllow/affinity-nix"; @@ -43,7 +41,6 @@ nix-flatpak, affinity-nix, affinity-thumbnailer-kde, - i915-sriov-dkms, millennium, ... }: @@ -84,7 +81,6 @@ nix-flatpak.nixosModules.nix-flatpak affinity-thumbnailer-kde.nixosModules.default - i915-sriov-dkms.nixosModules.default ./hosts/pdw-frankiel/hardware.nix ./hosts/pdw-frankiel/configuration.nix diff --git a/hosts/pdw-frankiel/configuration.nix b/hosts/pdw-frankiel/configuration.nix index 9ba4bc2..486850c 100644 --- a/hosts/pdw-frankiel/configuration.nix +++ b/hosts/pdw-frankiel/configuration.nix @@ -14,37 +14,15 @@ in ]; boot = { - extraModulePackages = [ - pkgs.i915-sriov - ]; - kernelParams = [ "intel_iommu=on" "i915-enable_guc=3" - "i915.max_vfs=1" - "module_blacklist=xe" ]; }; - systemd.tmpfiles.rules = [ - "w /sys/devices/pci0000:00/0000:00:02.0/sriov_numvfs - - - - 1" - ]; - networking.hostName = "pdw-frankiel"; services = { - udev.packages = [ - (pkgs.writeTextFile { - name = "i915-sriov"; - - text = '' - ACTION=="add", SUBSYSTEM=="pci", KERNEL=="0000:00:02.[1-7]", ATTR{vendor}=="0x8086", ATTR{device}=="0xa7a0", DRIVER!="vfio-pci", RUN+="/bin/sh -c 'echo \$kernel > /sys/bus/pci/devices/\$kernel/driver/unbind; echo vfio-pci > /sys/bus/pci/devices/\$kernel/driver_override; modprobe vfio-pci; echo \$kernel > /sys/bus/pci/drivers/vfio-pci/bind'" - ''; - - destination = "/etc/udev/rules.d/80-i915-sriov.rules"; - }) - ]; - printing.enable = true; keyd = {