From d54be846e55123f5d1fc843e60fb7273701884b0 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Mon, 13 Jan 2025 19:44:54 -0500
Subject: [PATCH] gerg-desktop: remove vfio pain

---
 hosts/gerg-desktop/{vfio.nix => _vfio.nix} | 10 +++++++++
 hosts/gerg-desktop/main.nix                | 26 ++++++++++++----------
 2 files changed, 24 insertions(+), 12 deletions(-)
 rename hosts/gerg-desktop/{vfio.nix => _vfio.nix} (96%)

diff --git a/hosts/gerg-desktop/vfio.nix b/hosts/gerg-desktop/_vfio.nix
similarity index 96%
rename from hosts/gerg-desktop/vfio.nix
rename to hosts/gerg-desktop/_vfio.nix
index 9e28fa1..9b96d55 100644
--- a/hosts/gerg-desktop/vfio.nix
+++ b/hosts/gerg-desktop/_vfio.nix
@@ -26,6 +26,14 @@ let
   };
 in
 {
+  #hardware.amdgpu = {
+  #  amdvlk = {
+  #    enable = true;
+  #    support32Bit.enable = true;
+  #  };
+  #  initrd.enable = true;
+  #  opencl.enable = true;
+  #};
   environment.etc = {
     "Xorg/1_mon.conf".source = "${_dir}/1_mon.conf";
     "Xorg/2_mon.conf".source = "${_dir}/2_mon.conf";
@@ -33,6 +41,8 @@ in
 
   services.xserver = {
 
+    videoDrivers = ["amdgpu"];
+
     displayManager.setupCommands = lib.mkBefore ''
       if ! [ -e "/etc/Xorg/ONE_MONITOR" ] ; then
         ${lib.getExe cfg_monitors}
diff --git a/hosts/gerg-desktop/main.nix b/hosts/gerg-desktop/main.nix
index 9c95976..f1a1879 100644
--- a/hosts/gerg-desktop/main.nix
+++ b/hosts/gerg-desktop/main.nix
@@ -75,18 +75,20 @@
       #sync.enable = true;
     };
   };
-  services.xserver.videoDrivers = [
-    "nvidia"
-    "amdgpu"
-  ];
-
-  hardware.amdgpu = {
-    amdvlk = {
-      enable = true;
-      support32Bit.enable = true;
-    };
-    initrd.enable = true;
-    opencl.enable = true;
+  services.xserver = {
+    videoDrivers = [
+      "nvidia"
+    ];
+    displayManager.setupCommands = lib.mkBefore ''
+      ${lib.getExe pkgs.xorg.xrandr} \
+        --output DP-0 \
+        --mode 3440x1440 \
+        --rate 120 \
+        --primary \
+        --output HDMI-0 \
+        --mode 1920x1080 \
+        --rate 120
+    '';
   };
 
   programs = {