diff --git a/flake.lock b/flake.lock index 3b249e2..e862b1b 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-cLqKFRw5I2HMWzfIolLyNVmk094KoIqt0zRdRwo7a5Y=", - "path": "/nix/store/psxky7mw7y3smgx8n4s8aj1hw2pkra93-source/home/ags", + "path": "/nix/store/rfj2sg2jdqnk1m93qqkszx4086jss2q8-source/home/ags", "type": "path" }, "original": { - "path": "/nix/store/psxky7mw7y3smgx8n4s8aj1hw2pkra93-source/home/ags", + "path": "/nix/store/rfj2sg2jdqnk1m93qqkszx4086jss2q8-source/home/ags", "type": "path" } }, diff --git a/hosts/Kell/default.nix b/hosts/Kell/default.nix index 9cc9138..9140be2 100644 --- a/hosts/Kell/default.nix +++ b/hosts/Kell/default.nix @@ -14,12 +14,9 @@ in { # boot.kernelPackages = pkgs.linuxPackages_latest; # AMD CPU - boot.blacklistedKernelModules = [ "k10temp" ]; boot.extraModulePackages = [ config.boot.kernelPackages.zenpower ]; boot.kernelModules = [ "zenpower amd_pstate=active" ]; - boot.kernelParams = ["amd_pstate=active"]; - - # AMD GPU + # boot.kernelParams = ["amd_pstate=active"]; # boot.initrd.kernelModules = [ "amdgpu" ]; services.logind.extraConfig = ''HandlePowerKey=suspend''; @@ -50,12 +47,12 @@ in { networking.bridges = { "br0" = { - interfaces = [ "enp5s0" ]; + interfaces = [ "enp6s0" ]; }; }; networking.interfaces.br0.useDHCP = lib.mkDefault true; networking.interfaces.wlan0.useDHCP = lib.mkDefault true; - boot.kernel.sysctl."net.ipv6.conf.enp5s0.disable_ipv6" = true; + boot.kernel.sysctl."net.ipv6.conf.enp6s0.disable_ipv6" = true; networking.wireless.iwd.enable = true; networking.wireless.iwd.settings = { @@ -80,4 +77,33 @@ in { enable = true; gamescopeSession.enable = true; }; + + boot.blacklistedKernelModules = [ "k10temp" "nvidia" "nouveau" ]; + boot = { + initrd.kernelModules = [ + "kvm-amd" + "vfio_pci" + "vfio" + "vfio_iommu_type1" + + "amdgpu" + "nvidia" + "nvidia_modeset" + "nvidia_uvm" + "nvidia_drm" + ]; + kernelParams = [ + "amd_pstate=active" + "amd_iommu=on" + "vfio-pci.ids=10de:1b80,10de:10f0" + ]; + postBootCommands = '' + DEVS="0000:0b:00.0 0000:0b:00.1" + for DEV in $DEVS; do + echo "vfio-pci" > /sys/bus/pci/devices/$DEV/driver_override + done + modprobe -i vfio-pci + ''; + }; + boot.extraModprobeConfig = "options vfio-pci ids=10de:1b80,10de:10f0"; } diff --git a/hosts/Kell/hardware-configuration.nix b/hosts/Kell/hardware-configuration.nix index 0cb3825..b1fbd2a 100644 --- a/hosts/Kell/hardware-configuration.nix +++ b/hosts/Kell/hardware-configuration.nix @@ -5,7 +5,6 @@ boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ];