From cc12240ed82ae7d2e7df60c7ff97e7105a152945 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Wed, 5 Jun 2024 22:53:42 -0400
Subject: [PATCH] Make vm stuff better

---
 hosts/gerg-desktop/main.nix | 16 ++++++++++------
 hosts/gerg-desktop/vfio.nix | 17 ++++++++++++++---
 hosts/gerg-desktop/zfs.nix  |  5 -----
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/hosts/gerg-desktop/main.nix b/hosts/gerg-desktop/main.nix
index 9a91af3..9a3d628 100644
--- a/hosts/gerg-desktop/main.nix
+++ b/hosts/gerg-desktop/main.nix
@@ -31,13 +31,17 @@
     nvidiaSettings = false;
     modesetting.enable = true;
     open = false;
+    prime = {
+      nvidiaBusId = "PCI:1:0:0";
+      amdgpuBusId = "PCI:15:0:0";
+      #sync.enable = true;
+    };
   };
-  services.xserver = {
-    videoDrivers = [
-      "nvidia"
-      "amdgpu"
-    ];
-  };
+  services.xserver.videoDrivers = [
+    "nvidia"
+    "amdgpu"
+  ];
+
   services.gnome.gnome-keyring.enable = true;
 
   programs.steam.enable = true;
diff --git a/hosts/gerg-desktop/vfio.nix b/hosts/gerg-desktop/vfio.nix
index 75d5b56..06f4bb6 100644
--- a/hosts/gerg-desktop/vfio.nix
+++ b/hosts/gerg-desktop/vfio.nix
@@ -19,8 +19,13 @@ let
       pkgs.gnugrep
     ];
     text = ''
-      xrandr --output DP-0 --auto --mode 3440x1440 --rate 120 --primary --pos 0x0
-      xrandr --output "$(xrandr | grep -e 'HDMI.* connected.*'| awk '{ print$1 }')" --auto --mode 1920x1080 --rate 144 --set TearFree on --pos 3440x360
+      xrandr --setprovideroutputsource \
+        "$(xrandr --listproviders | grep -i AMD | sed -n 's/^.*name://p')" NVIDIA-0 \
+        --output DP-0 \
+        --mode 3440x1440 --rate 120 --primary --pos 0x0 \
+        --output "$(xrandr | grep -e 'HDMI.* connected.*'| awk '{ print$1 }')" \
+        --mode 1920x1080 --rate 144 --set TearFree on --pos 3440x360
+
       xset -dpms
     '';
   };
@@ -34,13 +39,19 @@ in
   services.xserver = {
     config = lib.mkForce "";
 
-    displayManager.sessionCommands = lib.mkBefore ''
+    displayManager.setupCommands = lib.mkBefore ''
       if ! [ -e "/etc/Xorg/ONE_MONITOR" ] ; then
         ${lib.getExe cfg_monitors}
       fi
     '';
   };
 
+  boot.kernelPatches = lib.singleton {
+    name = "fix_amd_mem_access";
+    patch = null;
+    extraStructuredConfig.HSA_AMD_SVM = lib.kernel.yes;
+  };
+
   systemd.tmpfiles.rules = [
     "L  /etc/X11/xorg.conf.d/99-custom.conf  - - - - /etc/Xorg/2_mon.conf"
 
diff --git a/hosts/gerg-desktop/zfs.nix b/hosts/gerg-desktop/zfs.nix
index d6e573f..27960e9 100644
--- a/hosts/gerg-desktop/zfs.nix
+++ b/hosts/gerg-desktop/zfs.nix
@@ -46,11 +46,6 @@
   };
 
   boot = {
-    kernelPatches = lib.singleton {
-      name = "fix_amd_mem_access";
-      patch = null;
-      extraStructuredConfig.HSA_AMD_SVM = lib.kernel.yes;
-    };
     zfs = {
       package = pkgs.zfs_unstable;
       devNodes = "/dev/disk/by-id/";