From 0f2c571aa5b005d747d1ca06458c209a8971bfa5 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Thu, 23 Mar 2023 19:39:57 -0400 Subject: [PATCH] switched back to prime sync --- misc/2-monitor.conf | 46 +++++++++++++++-------------------- systems/gerg-desktop/vfio.nix | 6 ++--- 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/misc/2-monitor.conf b/misc/2-monitor.conf index e18ab5b..4ca6f3c 100644 --- a/misc/2-monitor.conf +++ b/misc/2-monitor.conf @@ -9,7 +9,7 @@ EndSection Section "Monitor" - Identifier "Monitor[0]" + Identifier "Monitor" Option "DPMS" "false" EndSection @@ -34,38 +34,30 @@ EndSection Section "ServerLayout" - Identifier "Layout[all]" - Option "AllowNVIDIAGPUScreens" - - Screen "Screen-amdgpu[0]" + Identifier "layout" + Screen 0 "nvidia" + Inactive "amdgpu" EndSection Section "Device" - Identifier "Device-amdgpu[0]" - Driver "amdgpu" - - BusID "PCI:15:0:0" - + Identifier "nvidia" + Driver "nvidia" + BusID "PCI:1:0:0" EndSection - Section "Screen" - Identifier "Screen-amdgpu[0]" - Device "Device-amdgpu[0]" - + Identifier "nvidia" + Device "nvidia" + Option "AllowEmptyInitialConfiguration" + EndSection +Section "Device" + Identifier "amdgpu" + Driver "amdgpu" + BusID "PCI:15:0:0" +EndSection +Section "Screen" + Identifier "amdgpu" + Device "amdgpu" EndSection -Section "Device" - Identifier "Device-nvidia[0]" - Driver "nvidia" - - BusID "PCI:1:0:0" - -EndSection - - - - - - diff --git a/systems/gerg-desktop/vfio.nix b/systems/gerg-desktop/vfio.nix index d43886d..9e56868 100644 --- a/systems/gerg-desktop/vfio.nix +++ b/systems/gerg-desktop/vfio.nix @@ -82,9 +82,9 @@ in { services.xserver.displayManager.xserverArgs = lib.mkAfter ["-config /tmp/xorg.conf"]; services.xserver.displayManager.sessionCommands = lib.mkBefore '' if ! (test -e "/tmp/ONE_MONITOR"); then - xrandr --output DP-1-0 --auto --mode 3440x1440 --rate 120 --primary --pos 0x0 - xrandr --output HDMI-A-0 --auto --mode 1920x1080 --rate 144 --set TearFree on --pos 3440x360 - xset -dpms + xrandr --output DP-0 --auto --mode 3440x1440 --rate 120 --primary --pos 0x0 + xrandr --output HDMI-A-1-0 --auto --mode 1920x1080 --rate 144 --set TearFree on --pos 3440x360 + xset -dpms fi '';