diff --git a/systems/x86_64-linux/drivebystation-nix/hardware/graphics/intel.nix b/systems/x86_64-linux/drivebystation-nix/hardware/graphics/intel.nix
index 447d607..9180568 100644
--- a/systems/x86_64-linux/drivebystation-nix/hardware/graphics/intel.nix
+++ b/systems/x86_64-linux/drivebystation-nix/hardware/graphics/intel.nix
@@ -17,8 +17,8 @@
   # boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.kernelParams = [
     "console=tty0"
-    "efifb=off"
-    "xe.force_probe=*"
+    # "efifb=off"
+    # "xe.force_probe=*"
     "module_blacklist=nouveau,nvidia,nvidia_drm,nvidia_modeset,nvidia_uvm"
   ];
 
@@ -32,11 +32,12 @@
       intel-media-driver     # Intel VAAPI
       vpl-gpu-rt             # oneVPL runtime
       intel-vaapi-driver     # fallback
+      intel-compute-runtime # OpenCL/Level Zero
     ];
   };
 
   # Ensure Arc driver is available (usually auto-loaded)
-  boot.kernelModules = [ "xe" ];
+  boot.kernelModules = [ "xe" "i915" ];
   # Blacklist everything for nvidia
   boot.blacklistedKernelModules = [
     "nouveau"
@@ -55,6 +56,24 @@
   ############################
   ## X / Wayland GPU Drivers
   ############################
+  
+  # Enable modesetting driver for X11 (required for Intel Xe)
+  services.xserver.videoDrivers = [ 
+    "modesetting"
+    #"intel"
+  ];
+
+  services.xserver.enable = true;
+  services.xserver.autorun = false;
+  services.xserver.displayManager.startx.enable = true;
+
+  # Xorg configuration for Intel Arc Battlemage (xe driver)
+  # Based on: https://www.reddit.com/r/crtgaming/comments/1knom2t/guide_intel_arc_b580_arch_linux_xorg/
+  # Intel Arc B-series at PCI 0000:03:00.0
+  #services.xserver.deviceSection = ''
+  #  Option "AccelMethod" "glamor"
+  #  BusID "PCI:3:0:0"
+  #'';
 
   ############################
   ## User Access