diff --git a/systems/x86_64-linux/drivebystation-nix/hardware/graphics/nvidia.nix b/systems/x86_64-linux/drivebystation-nix/hardware/graphics/nvidia.nix
index b851325..9fef385 100644
--- a/systems/x86_64-linux/drivebystation-nix/hardware/graphics/nvidia.nix
+++ b/systems/x86_64-linux/drivebystation-nix/hardware/graphics/nvidia.nix
@@ -9,20 +9,20 @@
 
   # Load nvidia driver for Xorg and Wayland
   # boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
-  boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11_production ];
+  boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11_beta ];
   # boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
 
 
   boot.loader.systemd-boot.consoleMode = "max";
 
   boot.kernelParams = [
-   "nvidia-drm.fbdev=1"
-   "nvidia-drm.modeset=1"
+    "amdgpu.modeset=1"
+    "nvidia-drm.fbdev=1"
+    "nvidia-drm.modeset=0"
   #  "nvidia.NVreg_PreserveVideoMemoryAllocations=0"
     "amd_iommu=on"
-    "amdgpu.modeset=1"
     # "vfio-pci.ids=\"10de:2489,10de:228b\""
-  #  "nomodeset"
+    # "nomodeset"
   #  "nvidia_drm.modeset=1"
   ];
   boot.blacklistedKernelModules = [ 
@@ -51,7 +51,7 @@
     options nouveau modeset=0
   '';
   # services.xserver.videoDrivers = [ "nvidia" ];
-  services.xserver.videoDrivers = [ "amdgpu" ];
+  services.xserver.videoDrivers = [ "amdgpu" "nvidia" ];
 
   # services.udev.extraRules = ''
   #   # Remove NVIDIA USB xHCI Host Controller devices, if present
@@ -66,18 +66,16 @@
 
   boot.initrd.kernelModules = [ 
     "amdgpu"
-    "nvidia_uvm"
-    "nvidia_drm"
     "nvidia"  
-    "nvidia-drm"
+    # "nvidia-drm"
     "nvidiafb"
-    "nvidia-modeset"
-    "nvidia-uvm"
-    # "i2c-nvidia_gpu"
+    # "nvidia-uvm"
+    # "nvidia-modeset"
+    # "i2c-nvidia_gpu"    
   ];  
   hardware.nvidia = {
     # Modesetting is required.
-    modesetting.enable = false;
+    modesetting.enable = true;
 
     # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
     # Enable this if you have graphical corruption issues or application crashes after waking
@@ -99,14 +97,27 @@
     open = false;
 
     # Enable the Nvidia settings menu,
-	# accessible via `nvidia-settings`.
+	  # accessible via `nvidia-settings`.
     nvidiaSettings = true;
 
     # Optionally, you may need to select the appropriate driver version for your specific GPU.
-    # package = config.boot.kernelPackages.nvidiaPackages.stable;
+    package = config.boot.kernelPackages.nvidiaPackages.beta;
     # package = config.boot.kernelPackages.nvidiaPackages.none;
-    package = config.boot.kernelPackages.nvidiaPackages.production;
+    # package = config.boot.kernelPackages.nvidiaPackages.production;
+    
+    forceFullCompositionPipeline = false;
 
+    prime = {
+      offload = {
+        enable = true;
+        enableOffloadCmd = true;
+      };
+      reverseSync.enable = false;
+      # Make sure to use the correct Bus ID values for your system!
+      # intelBusId = "PCI:0:2:0";
+      nvidiaBusId = "PCI:01:0:0";
+      amdgpuBusId = "PCI:50:0:0"; #For AMD GPU
+    };
 
   };
   users.users.andreas = {