diff --git a/flake.lock b/flake.lock index 8affec2..9a42556 100644 --- a/flake.lock +++ b/flake.lock @@ -118,11 +118,11 @@ "wip-pinebook-pro": { "flake": false, "locked": { - "lastModified": 1645472103, - "narHash": "sha256-HIaav1YN+jk0kx8+0Ccov2hsStAIJkB790ENZGDgeU4=", + "lastModified": 1648577588, + "narHash": "sha256-ur0wxh0hrQH2BiFBxfmm16dJtS+tGzIU9EN3EZpSCpQ=", "owner": "samueldr", "repo": "wip-pinebook-pro", - "rev": "b7de8c47fec5b96e66c615990b3c15a841a466b9", + "rev": "97751d24818f5fdc7abf4418fcfcc31fecfcc18a", "type": "github" }, "original": { diff --git a/system/starlight/default.nix b/system/starlight/default.nix index 1c2be88..3bd4307 100644 --- a/system/starlight/default.nix +++ b/system/starlight/default.nix @@ -5,7 +5,6 @@ ./boot-config.nix ./hardware-configuration.nix ./scripts.nix - ./vfio.nix ../../sets/builder.nix ../../sets/cpu/amd.nix ../../sets/fpga.nix diff --git a/system/starlight/vfio.nix b/system/starlight/vfio.nix deleted file mode 100644 index 0f2fb2f..0000000 --- a/system/starlight/vfio.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ pkgs, pkgs-unstable, ... }: - -# based on https://alexbakker.me/post/nixos-pci-passthrough-qemu-vfio.html -{ - environment.systemPackages = [ - pkgs-unstable.looking-glass-client - pkgs.scream - ]; - - boot.initrd = { - availableKernelModules = [ "amdgpu" "vfio-pci" ]; - preDeviceCommands = '' - echo vfio-pci > /sys/bus/pci/devices/0000:0b:00.0/driver_override - echo vfio-pci > /sys/bus/pci/devices/0000:0b:00.1/driver_override - modprobe -i vfio-pci - ''; - }; - - systemd.tmpfiles.rules = [ - "f /dev/shm/scream 0660 artemis qemu-libvirtd -" - "f /dev/shm/looking-glass 0660 artemis qemu-libvirtd -" - ]; - - systemd.user.services.scream-ivshmem = { - enable = true; - description = "Scream IVSHMEM"; - serviceConfig = { - ExecStart = "${pkgs.scream}/bin/scream -m /dev/shm/scream -o pulse"; - Restart = "always"; - }; - wantedBy = [ "multi-user.target" ]; - requires = [ "pulseaudio.service" ]; - }; -}