gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

switched qemu backed to pipewire

Browse source
This commit is contained in:
Gerg-L 2023-09-06 22:30:59 -04:00
parent b77331c4cb
commit 7c6273f20c
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
4 changed files with 175 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

24
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1693905783, "lastModified": 1694049918,
"narHash": "sha256-ALIQLAzTJ6iy46U7tL62Nxd7247683kOR6TlSU6PXhU=", "narHash": "sha256-PlsVo8j4laweixtwKXaG9woN7t0ewNBrgAmyVtKbm5w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "b2ea7d62581fa50d3e19a949b85fe04c1e8d7384", "rev": "ec8b802c2d69bd70480ae8dd0df33befb1476d92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,11 +106,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1693974859, "lastModified": 1694049830,
"narHash": "sha256-55/+HNSESBc2rYP+1xHAD67CnRcStFvQiWIZhXiZNiw=", "narHash": "sha256-F+A9zNwudClQk1ujZBgzGadxL4eQcJhznN6kWS9D3pY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8fa0d873d4b40b7fb919632d258170d22c503e28", "rev": "eb05c5bf0da6a3016f3c5db7a68fab3246b57ac7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -322,11 +322,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1693771906, "lastModified": 1693953029,
"narHash": "sha256-32EnPCaVjOiEERZ+o/2Ir7JH9pkfwJZJ27SKHNvt4yk=", "narHash": "sha256-1+28KQl4YC4IBzKo/epvEyK5KH4MlgoYueJ8YwLGbOc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "da5adce0ffaff10f6d0fee72a02a5ed9d01b52fc", "rev": "4077a0e4ac3356222bc1f0a070af7939c3098535",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -358,11 +358,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1693663421, "lastModified": 1693844670,
"narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=", "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e56990880811a451abd32515698c712788be5720", "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1",
"type": "github" "type": "github"
}, },
"original": { "original": {

318
hosts/gerg-desktop/Windows.xml
View file

@ -1,215 +1,215 @@
<domain xmlns:qemu="http://libvirt.org/schemas/domain/qemu/1.0" type="kvm"> <domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
<name>Windows</name> <name>Windows</name>
<uuid>035e02d8-04d3-05e5-4706-900700080009</uuid> <uuid>035e02d8-04d3-05e5-4706-900700080009</uuid>
<memory unit="KiB">16777216</memory> <memory unit='KiB'>16777216</memory>
<currentMemory unit="KiB">16777216</currentMemory> <currentMemory unit='KiB'>16777216</currentMemory>
<vcpu placement="static" cpuset="0-7,16-23">16</vcpu> <vcpu placement='static' cpuset='0-7,16-23'>16</vcpu>
<cputune> <cputune>
<vcpupin vcpu="0" cpuset="0"/> <vcpupin vcpu='0' cpuset='0'/>
<vcpupin vcpu="1" cpuset="16"/> <vcpupin vcpu='1' cpuset='16'/>
<vcpupin vcpu="2" cpuset="1"/> <vcpupin vcpu='2' cpuset='1'/>
<vcpupin vcpu="3" cpuset="17"/> <vcpupin vcpu='3' cpuset='17'/>
<vcpupin vcpu="4" cpuset="2"/> <vcpupin vcpu='4' cpuset='2'/>
<vcpupin vcpu="5" cpuset="18"/> <vcpupin vcpu='5' cpuset='18'/>
<vcpupin vcpu="6" cpuset="3"/> <vcpupin vcpu='6' cpuset='3'/>
<vcpupin vcpu="7" cpuset="19"/> <vcpupin vcpu='7' cpuset='19'/>
<vcpupin vcpu="8" cpuset="4"/> <vcpupin vcpu='8' cpuset='4'/>
<vcpupin vcpu="9" cpuset="20"/> <vcpupin vcpu='9' cpuset='20'/>
<vcpupin vcpu="10" cpuset="5"/> <vcpupin vcpu='10' cpuset='5'/>
<vcpupin vcpu="11" cpuset="21"/> <vcpupin vcpu='11' cpuset='21'/>
<vcpupin vcpu="12" cpuset="6"/> <vcpupin vcpu='12' cpuset='6'/>
<vcpupin vcpu="13" cpuset="22"/> <vcpupin vcpu='13' cpuset='22'/>
<vcpupin vcpu="14" cpuset="7"/> <vcpupin vcpu='14' cpuset='7'/>
<vcpupin vcpu="15" cpuset="23"/> <vcpupin vcpu='15' cpuset='23'/>
<emulatorpin cpuset="8-15,24-31"/> <emulatorpin cpuset='8-15,24-31'/>
</cputune> </cputune>
<os> <os>
<type arch="x86_64" machine="pc-q35-8.0">hvm</type> <type arch='x86_64' machine='pc-q35-8.0'>hvm</type>
<loader readonly="yes" type="pflash">/run/libvirt/nix-ovmf/OVMF_CODE.fd</loader> <loader readonly='yes' type='pflash'>/run/libvirt/nix-ovmf/OVMF_CODE.fd</loader>
<nvram>/var/lib/libvirt/qemu/nvram/Windows_VARS.fd</nvram> <nvram template='/run/libvirt/nix-ovmf/OVMF_VARS.fd'>/var/lib/libvirt/qemu/nvram/Windows_VARS.fd</nvram>
<boot dev="hd"/> <boot dev='hd'/>
<bootmenu enable="no"/> <bootmenu enable='no'/>
<smbios mode='host'/> <smbios mode='host'/>
</os> </os>
<features> <features>
<acpi/> <acpi/>
<apic/> <apic/>
<hyperv mode="custom"> <hyperv mode='custom'>
<relaxed state="on"/> <relaxed state='on'/>
<vapic state="on"/> <vapic state='on'/>
<spinlocks state="on" retries="8191"/> <spinlocks state='on' retries='8191'/>
<vpindex state="on"/> <vpindex state='on'/>
<runtime state="on"/> <runtime state='on'/>
<synic state="on"/> <synic state='on'/>
<stimer state="on"/> <stimer state='on'/>
<reset state="off"/> <reset state='off'/>
<vendor_id state="on" value="abcdefghijkl"/> <vendor_id state='on' value='abcdefghijkl'/>
<frequencies state="on"/> <frequencies state='on'/>
<reenlightenment state="off"/> <reenlightenment state='off'/>
<tlbflush state="on"/> <tlbflush state='on'/>
<ipi state="on"/> <ipi state='on'/>
<evmcs state="off"/> <evmcs state='off'/>
</hyperv> </hyperv>
<kvm> <kvm>
<hidden state="on"/> <hidden state='on'/>
</kvm> </kvm>
<vmport state="off"/> <vmport state='off'/>
<ioapic driver="kvm"/> <ioapic driver='kvm'/>
</features> </features>
<cpu mode="host-passthrough" check="none" migratable="off"> <cpu mode='host-passthrough' check='none' migratable='off'>
<topology sockets="1" dies="1" cores="8" threads="2"/> <topology sockets='1' dies='1' cores='8' threads='2'/>
<cache mode="passthrough"/> <cache mode='passthrough'/>
<feature policy="require" name="topoext"/> <feature policy='require' name='topoext'/>
</cpu> </cpu>
<clock offset="localtime"> <clock offset='localtime'>
<timer name="rtc" present="no" tickpolicy="catchup"/> <timer name='rtc' present='no' tickpolicy='catchup'/>
<timer name="pit" tickpolicy="delay"/> <timer name='pit' tickpolicy='delay'/>
<timer name="hpet" present="no"/> <timer name='hpet' present='no'/>
<timer name="hypervclock" present="yes"/> <timer name='hypervclock' present='yes'/>
<timer name="tsc" present="yes" mode="native"/> <timer name='tsc' present='yes' mode='native'/>
</clock> </clock>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<pm> <pm>
<suspend-to-mem enabled="no"/> <suspend-to-mem enabled='no'/>
<suspend-to-disk enabled="no"/> <suspend-to-disk enabled='no'/>
</pm> </pm>
<devices> <devices>
<emulator>/run/libvirt/nix-emulators/qemu-system-x86_64</emulator> <emulator>/run/libvirt/nix-emulators/qemu-system-x86_64</emulator>
<disk type="block" device="disk"> <disk type='block' device='disk'>
<driver name="qemu" type="raw" cache="none" io="native" discard="unmap"/> <driver name='qemu' type='raw' cache='none' io='native' discard='unmap'/>
<source dev="/dev/disk/by-id/ata-Samsung_SSD_870_EVO_500GB_S6PXNM0T402828A"/> <source dev='/dev/disk/by-id/ata-Samsung_SSD_870_EVO_500GB_S6PXNM0T402828A'/>
<target dev="sda" bus="sata"/> <target dev='sda' bus='sata'/>
<address type="drive" controller="0" bus="0" target="0" unit="0"/> <address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk> </disk>
<disk type="block" device="disk"> <disk type='block' device='disk'>
<driver name="qemu" type="raw" cache="none" io="native" discard="unmap"/> <driver name='qemu' type='raw' cache='none' io='native' discard='unmap'/>
<source dev="/dev/disk/by-id/ata-WDC_WD10EZEX-75WN4A0_WD-WCC6Y7FCSH2U"/> <source dev='/dev/disk/by-id/ata-WDC_WD10EZEX-75WN4A0_WD-WCC6Y7FCSH2U'/>
<target dev="sdb" bus="sata"/> <target dev='sdb' bus='sata'/>
<address type="drive" controller="0" bus="0" target="0" unit="1"/> <address type='drive' controller='0' bus='0' target='0' unit='1'/>
</disk> </disk>
<controller type="pci" index="0" model="pcie-root"/> <controller type='pci' index='0' model='pcie-root'/>
<controller type="pci" index="1" model="pcie-root-port"> <controller type='pci' index='1' model='pcie-root-port'>
<model name="pcie-root-port"/> <model name='pcie-root-port'/>
<target chassis="1" port="0x8"/> <target chassis='1' port='0x8'/>
<address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x0" multifunction="on"/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type="pci" index="2" model="pcie-root-port"> <controller type='pci' index='2' model='pcie-root-port'>
<model name="pcie-root-port"/> <model name='pcie-root-port'/>
<target chassis="2" port="0x9"/> <target chassis='2' port='0x9'/>
<address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x1"/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
</controller> </controller>
<controller type="pci" index="3" model="pcie-root-port"> <controller type='pci' index='3' model='pcie-root-port'>
<model name="pcie-root-port"/> <model name='pcie-root-port'/>
<target chassis="3" port="0xa"/> <target chassis='3' port='0xa'/>
<address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x2"/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller> </controller>
<controller type="pci" index="4" model="pcie-root-port"> <controller type='pci' index='4' model='pcie-root-port'>
<model name="pcie-root-port"/> <model name='pcie-root-port'/>
<target chassis="4" port="0xb"/> <target chassis='4' port='0xb'/>
<address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x3"/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x3'/>
</controller> </controller>
<controller type="pci" index="5" model="pcie-root-port"> <controller type='pci' index='5' model='pcie-root-port'>
<model name="pcie-root-port"/> <model name='pcie-root-port'/>
<target chassis="5" port="0xc"/> <target chassis='5' port='0xc'/>
<address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x4"/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x4'/>
</controller> </controller>
<controller type="pci" index="6" model="pcie-root-port"> <controller type='pci' index='6' model='pcie-root-port'>
<model name="pcie-root-port"/> <model name='pcie-root-port'/>
<target chassis="6" port="0xd"/> <target chassis='6' port='0xd'/>
<address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x5"/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x5'/>
</controller> </controller>
<controller type="pci" index="7" model="pcie-root-port"> <controller type='pci' index='7' model='pcie-root-port'>
<model name="pcie-root-port"/> <model name='pcie-root-port'/>
<target chassis="7" port="0xe"/> <target chassis='7' port='0xe'/>
<address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x6"/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x6'/>
</controller> </controller>
<controller type="pci" index="8" model="pcie-root-port"> <controller type='pci' index='8' model='pcie-root-port'>
<model name="pcie-root-port"/> <model name='pcie-root-port'/>
<target chassis="8" port="0xf"/> <target chassis='8' port='0xf'/>
<address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x7"/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x7'/>
</controller> </controller>
<controller type="pci" index="9" model="pcie-root-port"> <controller type='pci' index='9' model='pcie-root-port'>
<model name="pcie-root-port"/> <model name='pcie-root-port'/>
<target chassis="9" port="0x10"/> <target chassis='9' port='0x10'/>
<address type="pci" domain="0x0000" bus="0x00" slot="0x02" function="0x0" multifunction="on"/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type="pci" index="10" model="pcie-root-port"> <controller type='pci' index='10' model='pcie-root-port'>
<model name="pcie-root-port"/> <model name='pcie-root-port'/>
<target chassis="10" port="0x11"/> <target chassis='10' port='0x11'/>
<address type="pci" domain="0x0000" bus="0x00" slot="0x02" function="0x1"/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
</controller> </controller>
<controller type="pci" index="11" model="pcie-root-port"> <controller type='pci' index='11' model='pcie-root-port'>
<model name="pcie-root-port"/> <model name='pcie-root-port'/>
<target chassis="11" port="0x12"/> <target chassis='11' port='0x12'/>
<address type="pci" domain="0x0000" bus="0x00" slot="0x02" function="0x2"/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
</controller> </controller>
<controller type="pci" index="12" model="pcie-root-port"> <controller type='pci' index='12' model='pcie-root-port'>
<model name="pcie-root-port"/> <model name='pcie-root-port'/>
<target chassis="12" port="0x13"/> <target chassis='12' port='0x13'/>
<address type="pci" domain="0x0000" bus="0x00" slot="0x02" function="0x3"/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
</controller> </controller>
<controller type="pci" index="13" model="pcie-root-port"> <controller type='pci' index='13' model='pcie-root-port'>
<model name="pcie-root-port"/> <model name='pcie-root-port'/>
<target chassis="13" port="0x14"/> <target chassis='13' port='0x14'/>
<address type="pci" domain="0x0000" bus="0x00" slot="0x02" function="0x4"/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
</controller> </controller>
<controller type="pci" index="14" model="pcie-root-port"> <controller type='pci' index='14' model='pcie-root-port'>
<model name="pcie-root-port"/> <model name='pcie-root-port'/>
<target chassis="14" port="0x15"/> <target chassis='14' port='0x15'/>
<address type="pci" domain="0x0000" bus="0x00" slot="0x02" function="0x5"/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
</controller> </controller>
<controller type="sata" index="0"> <controller type='sata' index='0'>
<address type="pci" domain="0x0000" bus="0x00" slot="0x1f" function="0x2"/> <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
</controller> </controller>
<controller type="usb" index="0" model="qemu-xhci"> <controller type='usb' index='0' model='qemu-xhci'>
<address type="pci" domain="0x0000" bus="0x02" slot="0x00" function="0x0"/> <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
</controller> </controller>
<interface type="bridge"> <interface type='bridge'>
<mac address="52:54:00:05:03:2d"/> <mac address='52:54:00:05:03:2d'/>
<source bridge="br0"/> <source bridge='br0'/>
<model type="virtio"/> <model type='virtio'/>
<link state="up"/> <link state='up'/>
<address type="pci" domain="0x0000" bus="0x01" slot="0x00" function="0x0"/> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
</interface> </interface>
<input type="evdev"> <input type='evdev'>
<source dev="/dev/input/by-id/usb-Logitech_G502_HERO_Gaming_Mouse_1974396F3638-event-mouse"/> <source dev='/dev/input/by-id/usb-Logitech_G502_HERO_Gaming_Mouse_1974396F3638-event-mouse'/>
</input> </input>
<input type="evdev"> <input type='evdev'>
<source dev="/dev/input/by-id/usb-Logitech_Gaming_Keyboard_G610_067A397A3637-event-kbd" grab="all" repeat="on"/> <source dev='/dev/input/by-id/usb-Logitech_Gaming_Keyboard_G610_067A397A3637-event-kbd' grab='all' repeat='on'/>
</input> </input>
<input type="evdev"> <input type='evdev'>
<source dev="/dev/input/by-id/usb-Logitech_G502_HERO_Gaming_Mouse_1974396F3638-if01-event-kbd"/> <source dev='/dev/input/by-id/usb-Logitech_G502_HERO_Gaming_Mouse_1974396F3638-if01-event-kbd'/>
</input> </input>
<input type="mouse" bus="ps2"/> <input type='mouse' bus='ps2'/>
<input type="keyboard" bus="ps2"/> <input type='keyboard' bus='ps2'/>
<sound model="ich9"> <audio id='1' type='none'/>
<audio id="1"/> <hostdev mode='subsystem' type='pci' managed='yes'>
<address type="pci" domain="0x0000" bus="0x00" slot="0x1b" function="0x0"/>
</sound>
<audio id="1" type="jack">
<input clientName="win10" connectPorts="Family 17h/19h HD Audio Controller Analog Stereo:capture_F[LR]"/>
<output clientName="win10" connectPorts="Family 17h/19h HD Audio Controller Analog Stereo:playback_F[LR]"/>
</audio>
<hostdev mode="subsystem" type="pci" managed="yes">
<source> <source>
<address domain="0x0000" bus="0x01" slot="0x00" function="0x0"/> <address domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
</source> </source>
<address type="pci" domain="0x0000" bus="0x03" slot="0x00" function="0x0"/> <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
</hostdev> </hostdev>
<hostdev mode="subsystem" type="pci" managed="yes"> <hostdev mode='subsystem' type='pci' managed='yes'>
<source> <source>
<address domain="0x0000" bus="0x01" slot="0x00" function="0x1"/> <address domain='0x0000' bus='0x01' slot='0x00' function='0x1'/>
</source> </source>
<address type="pci" domain="0x0000" bus="0x04" slot="0x00" function="0x0"/> <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
</hostdev> </hostdev>
<memballoon model="none"/> <watchdog model='itco' action='reset'/>
<memballoon model='none'/>
</devices> </devices>
<qemu:commandline> <qemu:commandline>
<qemu:env name="PIPEWIRE_RUNTIME_DIR" value="/run/user/1000"/> <qemu:arg value='-audiodev'/>
<qemu:env name="PIPEWIRE_LATENCY" value="512/48000"/> <qemu:arg value='pipewire,id=audio0'/>
<qemu:env name="LD_LIBRARY_PATH" value="$LD_LIBRARY_PATH:/run/current-system/sw/lib/pipewire"/> <qemu:arg value='-device'/>
<qemu:arg value='intel-hda,addr=0x1b'/>
<qemu:arg value='-device'/>
<qemu:arg value='hda-duplex,audiodev=audio0'/>
<qemu:env name='PIPEWIRE_RUNTIME_DIR' value='/run/user/1000'/>
<qemu:env name='PIPEWIRE_LATENCY' value='512/48000'/>
<qemu:env name='LD_LIBRARY_PATH' value='$LD_LIBRARY_PATH:/run/current-system/sw/lib/pipewire'/>
</qemu:commandline> </qemu:commandline>
</domain> </domain>

4
hosts/gerg-desktop/vfio.nix
View file

@ -64,7 +64,7 @@ in {
enable = true; enable = true;
qemu = { qemu = {
#don't hook evdev at vm start #don't hook evdev at vm start
package = pkgs.qemu.overrideAttrs (old: { package = pkgs.qemu_kvm.overrideAttrs (old: {
patches = patches =
old.patches old.patches
++ [ ++ [
@ -88,6 +88,8 @@ in {
return; return;
'') '')
]; ];
buildInputs = old.buildInputs ++ [pkgs.pipewire];
configureFlags = old.configureFlags ++ ["--enable-pipewire"];
}); });
runAsRoot = true; runAsRoot = true;
ovmf.enable = true; ovmf.enable = true;

2
modules/hardware.nix
View file

@ -30,7 +30,7 @@ in {
support32Bit = true; support32Bit = true;
}; };
pulse.enable = true; pulse.enable = true;
jack.enable = true; jack.enable = false;
}; };
}) })