amd-workstation settings
This commit is contained in:
parent
7302cbf587
commit
c434fbe224
@ -54,10 +54,6 @@ in {
|
||||
persist = {
|
||||
enable = true;
|
||||
cache.clean.enable = true;
|
||||
# state.files = [
|
||||
# "/etc/machine-id"
|
||||
# "/etc/NIXOS"
|
||||
# ];
|
||||
};
|
||||
|
||||
fileSystems."/" = lib.mkForce {
|
||||
|
@ -16,7 +16,7 @@
|
||||
autoStart = true;
|
||||
user = config.mainuser;
|
||||
group = "libvirtd";
|
||||
xmlFile = ./win2k22.xml;
|
||||
xmlFile = ./vm/win2k22.xml;
|
||||
};
|
||||
};
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
deviceSpecific.enableVirtualisation = true;
|
||||
deviceSpecific.vpn.mullvad.enable = false;
|
||||
deviceSpecific.vpn.ivpn.enable = true;
|
||||
# hardware.firmware = [ pkgs.rtl8761b-firmware ];
|
||||
# hardware.firmware = [ pkgs.rtl8761b-firmware ];
|
||||
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
@ -56,15 +56,15 @@
|
||||
};
|
||||
|
||||
fileSystems = {
|
||||
# "/media/sys" = {
|
||||
# fsType = "ntfs";
|
||||
# device = "/dev/disk/by-partuuid/7d14b1b8-288a-4a5c-a306-6e6ba714d089";
|
||||
# options = [
|
||||
# "nofail"
|
||||
# "uid=${toString config.users.users.${config.mainuser}.uid}"
|
||||
# "gid=${toString config.users.groups.users.gid}"
|
||||
# ];
|
||||
# };
|
||||
"/media/win-sys" = {
|
||||
fsType = "ntfs";
|
||||
device = "/dev/disk/by-partuuid/5b47cea7-465c-4051-a6ba-76d0eaf42929";
|
||||
options = [
|
||||
"nofail"
|
||||
"uid=${toString config.users.users.${config.mainuser}.uid}"
|
||||
"gid=${toString config.users.groups.users.gid}"
|
||||
];
|
||||
};
|
||||
"/media/files" = {
|
||||
fsType = "ntfs";
|
||||
device = "/dev/mapper/files-veracrypt";
|
||||
@ -85,7 +85,6 @@
|
||||
home-manager.users.${config.mainuser} = {
|
||||
home.packages = lib.mkIf config.deviceSpecific.enableVirtualisation [
|
||||
inputs.nixos-generators.packages.${pkgs.hostPlatform.system}.nixos-generate
|
||||
# pkgs.looking-glass-client
|
||||
# pkgs.prismlauncher
|
||||
pkgs.piper
|
||||
pkgs.osu-lazer-bin
|
||||
@ -93,69 +92,47 @@
|
||||
pkgs.nixpkgs-review
|
||||
pkgs.anydesk
|
||||
pkgs.winbox
|
||||
pkgs.zotero
|
||||
];
|
||||
home.stateVersion = "23.05";
|
||||
};
|
||||
|
||||
persist.state.homeDirectories = [
|
||||
".local/share/winbox"
|
||||
];
|
||||
persist.state.homeDirectories = [ ".local/share/winbox" ];
|
||||
|
||||
system.stateVersion = "23.05";
|
||||
|
||||
# VFIO Passthough
|
||||
# virtualisation = {
|
||||
# sharedMemoryFiles = {
|
||||
# # scream = {
|
||||
# # user = config.mainuser;
|
||||
# # group = "qemu-libvirtd";
|
||||
# # mode = "666";
|
||||
# # };
|
||||
# looking-glass = {
|
||||
# user = config.mainuser;
|
||||
# group = "libvirtd";
|
||||
# mode = "666";
|
||||
# };
|
||||
# };
|
||||
# libvirtd = {
|
||||
# enable = true;
|
||||
# qemu = {
|
||||
# ovmf.enable = true;
|
||||
# runAsRoot = lib.mkForce true;
|
||||
# };
|
||||
#
|
||||
# onBoot = "ignore";
|
||||
# onShutdown = "shutdown";
|
||||
#
|
||||
# clearEmulationCapabilities = false;
|
||||
#
|
||||
# deviceACL = [
|
||||
# # "/dev/input/by-path/pci-0000:0b:00.3-usb-0:2.2.4:1.0-event-mouse" # Trackball
|
||||
# # "/dev/input/by-path/pci-0000:0b:00.3-usb-0:2.2.3:1.0-event-kbd" # Tastatur
|
||||
# # "/dev/input/by-path/pci-0000:0b:00.3-usb-0:2.2.3:1.1-event-mouse" # Tastatur
|
||||
# # "/dev/input/by-path/pci-0000:0b:00.3-usb-0:2.2.3:1.1-mouse" # Tastatur
|
||||
# "/dev/vfio/vfio"
|
||||
# "/dev/vfio/17"
|
||||
# "/dev/kvm"
|
||||
# # "/dev/shm/scream"
|
||||
# "/dev/shm/looking-glass"
|
||||
# ];
|
||||
# };
|
||||
# vfio = {
|
||||
# enable = true;
|
||||
# IOMMUType = "amd";
|
||||
# # group 17: 0b:00.0 and 0b:00.1
|
||||
# devices = [ "10de:1244" "10de:0bee" ];
|
||||
# blacklistNvidia = true;
|
||||
# disableEFIfb = false;
|
||||
# ignoreMSRs = true;
|
||||
# applyACSpatch = false;
|
||||
# };
|
||||
# hugepages = {
|
||||
# enable = true;
|
||||
# defaultPageSize = "1G";
|
||||
# pageSize = "1G";
|
||||
# numPages = 6;
|
||||
# };
|
||||
# systemd.services.libvirtd = {
|
||||
# path = let
|
||||
# env = pkgs.buildEnv {
|
||||
# name = "qemu-hook-env";
|
||||
# paths = with pkgs; [
|
||||
# libvirt bash util-linux pciutils ripgrep
|
||||
# procps coreutils systemd kmod gawk
|
||||
# ];
|
||||
# };
|
||||
# in [ env ];
|
||||
# };
|
||||
|
||||
# system.activationScripts.libvirt-hooks.text = ''
|
||||
# ln -Tfs /etc/libvirt/hooks /var/lib/libvirt/hooks
|
||||
# ln -Tfs /etc/libvirt/vgabios /var/lib/libvirt/vgabios
|
||||
# '';
|
||||
|
||||
# environment.etc = {
|
||||
# "libvirt/hooks/qemu".source = ./passthrough/qemu;
|
||||
# "libvirt/hooks/qemu.d/win10/vfio-script.sh".source = ./passthrough/vfio-script.sh;
|
||||
# "libvirt/vgabios/navi22.rom".source = ./passthrough/navi22.rom;
|
||||
# };
|
||||
|
||||
# systemd.services.hyprland-logout = {
|
||||
# script = "hyprctl dispatch exit";
|
||||
# serviceConfig = {
|
||||
# Type = "oneshot";
|
||||
# User = config.mainuser;
|
||||
# };
|
||||
# path = [
|
||||
# config.home-manager.users.${config.mainuser}.wayland.windowManager.hyprland.package
|
||||
# ];
|
||||
# };
|
||||
}
|
||||
|
194
machines/AMD-Workstation/vm/win10.xml
Normal file
194
machines/AMD-Workstation/vm/win10.xml
Normal file
@ -0,0 +1,194 @@
|
||||
<domain type='kvm'>
|
||||
<name>win10</name>
|
||||
<uuid>0ac8da14-3dfc-4689-b7ea-7cfc08ad1390</uuid>
|
||||
<metadata>
|
||||
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
|
||||
<libosinfo:os id="http://microsoft.com/win/10"/>
|
||||
</libosinfo:libosinfo>
|
||||
</metadata>
|
||||
<memory unit='KiB'>25165824</memory>
|
||||
<currentMemory unit='KiB'>25165824</currentMemory>
|
||||
<vcpu placement='static'>12</vcpu>
|
||||
<os>
|
||||
<type arch='x86_64' machine='pc-q35-7.2'>hvm</type>
|
||||
<loader readonly='yes' type='pflash'>/run/libvirt/nix-ovmf/OVMF_CODE.fd</loader>
|
||||
<nvram>/var/lib/libvirt/qemu/nvram/win10_VARS.fd</nvram>
|
||||
</os>
|
||||
<features>
|
||||
<acpi/>
|
||||
<apic/>
|
||||
<hyperv mode='custom'>
|
||||
<relaxed state='on'/>
|
||||
<vapic state='on'/>
|
||||
<spinlocks state='on' retries='8191'/>
|
||||
</hyperv>
|
||||
<vmport state='off'/>
|
||||
</features>
|
||||
<cpu mode='host-passthrough' check='none' migratable='on'>
|
||||
<topology sockets='1' dies='1' cores='6' threads='2'/>
|
||||
</cpu>
|
||||
<clock offset='localtime'>
|
||||
<timer name='rtc' tickpolicy='catchup'/>
|
||||
<timer name='pit' tickpolicy='delay'/>
|
||||
<timer name='hpet' present='no'/>
|
||||
<timer name='hypervclock' present='yes'/>
|
||||
</clock>
|
||||
<on_poweroff>destroy</on_poweroff>
|
||||
<on_reboot>restart</on_reboot>
|
||||
<on_crash>destroy</on_crash>
|
||||
<pm>
|
||||
<suspend-to-mem enabled='no'/>
|
||||
<suspend-to-disk enabled='no'/>
|
||||
</pm>
|
||||
<devices>
|
||||
<emulator>/run/libvirt/nix-emulators/qemu-system-x86_64</emulator>
|
||||
<disk type='file' device='disk'>
|
||||
<driver name='qemu' type='qcow2' cache='writeback' discard='unmap'/>
|
||||
<source file='/media/libvirt/images/win10.qcow2'/>
|
||||
<target dev='vda' bus='virtio'/>
|
||||
<boot order='1'/>
|
||||
<address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
|
||||
</disk>
|
||||
<disk type='file' device='cdrom'>
|
||||
<driver name='qemu' type='raw'/>
|
||||
<source file='/media/libvirt/viofs/Win10-Light-iot.iso'/>
|
||||
<target dev='sdb' bus='sata'/>
|
||||
<readonly/>
|
||||
<boot order='2'/>
|
||||
<address type='drive' controller='0' bus='0' target='0' unit='1'/>
|
||||
</disk>
|
||||
<disk type='file' device='cdrom'>
|
||||
<driver name='qemu' type='raw'/>
|
||||
<source file='/media/libvirt/viofs/virtio-win-0.1.229.iso'/>
|
||||
<target dev='sdc' bus='sata'/>
|
||||
<readonly/>
|
||||
<address type='drive' controller='0' bus='0' target='0' unit='2'/>
|
||||
</disk>
|
||||
<controller type='usb' index='0' model='qemu-xhci' ports='15'>
|
||||
<address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
|
||||
</controller>
|
||||
<controller type='pci' index='0' model='pcie-root'/>
|
||||
<controller type='pci' index='1' model='pcie-root-port'>
|
||||
<model name='pcie-root-port'/>
|
||||
<target chassis='1' port='0x10'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
|
||||
</controller>
|
||||
<controller type='pci' index='2' model='pcie-root-port'>
|
||||
<model name='pcie-root-port'/>
|
||||
<target chassis='2' port='0x11'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
|
||||
</controller>
|
||||
<controller type='pci' index='3' model='pcie-root-port'>
|
||||
<model name='pcie-root-port'/>
|
||||
<target chassis='3' port='0x12'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
|
||||
</controller>
|
||||
<controller type='pci' index='4' model='pcie-root-port'>
|
||||
<model name='pcie-root-port'/>
|
||||
<target chassis='4' port='0x13'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
|
||||
</controller>
|
||||
<controller type='pci' index='5' model='pcie-root-port'>
|
||||
<model name='pcie-root-port'/>
|
||||
<target chassis='5' port='0x14'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
|
||||
</controller>
|
||||
<controller type='pci' index='6' model='pcie-root-port'>
|
||||
<model name='pcie-root-port'/>
|
||||
<target chassis='6' port='0x15'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
|
||||
</controller>
|
||||
<controller type='pci' index='7' model='pcie-root-port'>
|
||||
<model name='pcie-root-port'/>
|
||||
<target chassis='7' port='0x16'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
|
||||
</controller>
|
||||
<controller type='pci' index='8' model='pcie-root-port'>
|
||||
<model name='pcie-root-port'/>
|
||||
<target chassis='8' port='0x17'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
|
||||
</controller>
|
||||
<controller type='pci' index='9' model='pcie-root-port'>
|
||||
<model name='pcie-root-port'/>
|
||||
<target chassis='9' port='0x18'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
|
||||
</controller>
|
||||
<controller type='pci' index='10' model='pcie-root-port'>
|
||||
<model name='pcie-root-port'/>
|
||||
<target chassis='10' port='0x19'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
|
||||
</controller>
|
||||
<controller type='pci' index='11' model='pcie-root-port'>
|
||||
<model name='pcie-root-port'/>
|
||||
<target chassis='11' port='0x1a'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
|
||||
</controller>
|
||||
<controller type='pci' index='12' model='pcie-root-port'>
|
||||
<model name='pcie-root-port'/>
|
||||
<target chassis='12' port='0x1b'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
|
||||
</controller>
|
||||
<controller type='pci' index='13' model='pcie-root-port'>
|
||||
<model name='pcie-root-port'/>
|
||||
<target chassis='13' port='0x1c'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
|
||||
</controller>
|
||||
<controller type='pci' index='14' model='pcie-root-port'>
|
||||
<model name='pcie-root-port'/>
|
||||
<target chassis='14' port='0x1d'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
|
||||
</controller>
|
||||
<controller type='sata' index='0'>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
|
||||
</controller>
|
||||
<controller type='virtio-serial' index='0'>
|
||||
<address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
|
||||
</controller>
|
||||
<interface type='network'>
|
||||
<mac address='52:54:00:22:4a:84'/>
|
||||
<source network='default'/>
|
||||
<model type='virtio'/>
|
||||
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
|
||||
</interface>
|
||||
<serial type='pty'>
|
||||
<target type='isa-serial' port='0'>
|
||||
<model name='isa-serial'/>
|
||||
</target>
|
||||
</serial>
|
||||
<console type='pty'>
|
||||
<target type='serial' port='0'/>
|
||||
</console>
|
||||
<channel type='spicevmc'>
|
||||
<target type='virtio' name='com.redhat.spice.0'/>
|
||||
<address type='virtio-serial' controller='0' bus='0' port='1'/>
|
||||
</channel>
|
||||
<input type='tablet' bus='usb'>
|
||||
<address type='usb' bus='0' port='1'/>
|
||||
</input>
|
||||
<input type='mouse' bus='ps2'/>
|
||||
<input type='keyboard' bus='ps2'/>
|
||||
<graphics type='spice' autoport='yes'>
|
||||
<listen type='address'/>
|
||||
<image compression='off'/>
|
||||
</graphics>
|
||||
<sound model='ich9'>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
|
||||
</sound>
|
||||
<audio id='1' type='spice'/>
|
||||
<video>
|
||||
<model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
|
||||
</video>
|
||||
<redirdev bus='usb' type='spicevmc'>
|
||||
<address type='usb' bus='0' port='2'/>
|
||||
</redirdev>
|
||||
<redirdev bus='usb' type='spicevmc'>
|
||||
<address type='usb' bus='0' port='3'/>
|
||||
</redirdev>
|
||||
<watchdog model='itco' action='reset'/>
|
||||
<memballoon model='virtio'>
|
||||
<address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
|
||||
</memballoon>
|
||||
</devices>
|
||||
</domain>
|
||||
|
@ -146,7 +146,6 @@
|
||||
<driver type='virtiofs' queue='1024'/>
|
||||
<binary path='/run/current-system/sw/bin/virtiofsd' xattr='on'>
|
||||
<cache mode='always'/>
|
||||
<lock posix='on' flock='on'/>
|
||||
</binary>
|
||||
<source dir='/media/libvirt/viofs'/>
|
||||
<target dir='vfio-fs'/>
|
Loading…
x
Reference in New Issue
Block a user