diff --git a/hosts/kilgharrah/hardware.nix b/hosts/kilgharrah/hardware.nix
index 5bbdc2a..360029e 100644
--- a/hosts/kilgharrah/hardware.nix
+++ b/hosts/kilgharrah/hardware.nix
@@ -5,16 +5,33 @@
   hardware.cpu.intel.updateMicrocode = true;
   services.fwupd.enable = true;
 
-  # services.xserver.videoDrivers = [ "nvidia" ];
-  hardware.graphics = {
-    enable = true;
-    extraPackages = with pkgs; [
-      intel-media-driver
-      vpl-gpu-rt
-      intel-compute-runtime
-    ];
+  services.xserver.videoDrivers = [ "nvidia" ];
+  hardware.nvidia.open = false;
+  nixpkgs.config.cudaSupport = true;
+  nix.settings = {
+    # Community cache with prebuilt packages with cudaSupport enabled
+    substituters = [ "https://cache.nixos-cuda.org" ];
+    trusted-public-keys = [ "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" ];
   };
 
+  # # Downgrade to driver version 535 as 550 has problems with Wayland
+  # hardware.nvidia.package =
+  #   let
+  #     rcu_patch = pkgs.fetchpatch {
+  #       url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch";
+  #       hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg=";
+  #     };
+  #   in
+  #   config.boot.kernelPackages.nvidiaPackages.mkDriver {
+  #     version = "535.154.05";
+  #     sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg=";
+  #     sha256_aarch64 = "sha256-G0/GiObf/BZMkzzET8HQjdIcvCSqB1uhsinro2HLK9k=";
+  #     openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo=";
+  #     settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10=";
+  #     persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE=";
+  #     patches = [ rcu_patch ];
+  #   };
+
   services.printing.drivers = [ pkgs.hplip ];
 
   # enable playing from bluray drive
diff --git a/hosts/kilgharrah/networking.nix b/hosts/kilgharrah/networking.nix
index a9b647f..2db377f 100644
--- a/hosts/kilgharrah/networking.nix
+++ b/hosts/kilgharrah/networking.nix
@@ -5,7 +5,7 @@
   networking.useDHCP = false;
   
   systemd.network.networks."10-wan" = {
-    matchConfig.Name = "enp*s0";
+    matchConfig.Name = "enp2s0";
     networkConfig = {
       DHCP = "ipv4";
       IPv6AcceptRA = true;