From f9f1a2147452ee3e4503c469e40f4469db80a6a6 Mon Sep 17 00:00:00 2001 From: materus Date: Sun, 17 Sep 2023 14:37:07 +0200 Subject: [PATCH] configurations: update --- configurations/host/materusPC/vm/default.nix | 1 + .../host/materusPC/vm/win10/default.nix | 24 ++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/configurations/host/materusPC/vm/default.nix b/configurations/host/materusPC/vm/default.nix index 9604975..e62de66 100644 --- a/configurations/host/materusPC/vm/default.nix +++ b/configurations/host/materusPC/vm/default.nix @@ -46,6 +46,7 @@ util-linux bindfs qemu-utils + psmisc ]; }; in diff --git a/configurations/host/materusPC/vm/win10/default.nix b/configurations/host/materusPC/vm/win10/default.nix index bd5d7bf..fa02832 100644 --- a/configurations/host/materusPC/vm/win10/default.nix +++ b/configurations/host/materusPC/vm/win10/default.nix @@ -1,17 +1,19 @@ { config, pkgs, lib, inputs, materusFlake, ... }: let - startHook = '' + startHook = /*'' # Debugging - # exec 19>/home/materus/startlogfile - # BASH_XTRACEFD=19 - # set -x - - # exec 3>&1 4>&2 - # trap 'exec 2>&4 1>&3' 0 1 2 3 - # exec 1>/home/materus/startlogfile.out 2>&1 + exec 19>/home/materus/startlogfile + BASH_XTRACEFD=19 + set -x + exec 3>&1 4>&2 + trap 'exec 2>&4 1>&3' 0 1 2 3 + exec 1>/home/materus/startlogfile.out 2>&1 + '' + +*/ + '' # Make sure nothing renders on gpu to prevent "sysfs: cannot create duplicate filename" after rebinding to amdgpu chmod 0 /dev/dri/renderD128 fuser -k /dev/dri/renderD128 @@ -27,8 +29,8 @@ let sleep 1s - echo "8" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/resource0_resize" - echo "1" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/resource2_resize" + echo "10" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/resource0_resize" + echo "8" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/resource2_resize" systemctl set-property --runtime -- user.slice AllowedCPUs=12-15,28-31 @@ -108,7 +110,7 @@ in systemd.services.mountWin10Share = { wantedBy = [ "multi-user.target" ]; - path = [ config.virtualisation.libvirtd.qemu.package pkgs.util-linux pkgs.kmod pkgs.coreutils pkgs.psmisc ]; + path = [ config.virtualisation.libvirtd.qemu.package pkgs.util-linux pkgs.kmod pkgs.coreutils ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; script = ''