diff --git a/flake.nix b/flake.nix
index 641e5b8..7e8ff13 100644
--- a/flake.nix
+++ b/flake.nix
@@ -161,6 +161,7 @@
             home-manager.nixosModules.home-manager
             niri.nixosModules.niri
             nixos-hardware.nixosModules.common-gpu-amd
+            nixos-hardware.nixosModules.common-cpu-amd
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 915e3be..f75c07c 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -240,7 +240,7 @@ in
     WLR_RENDERER = "vulkan";
     XDG_SESSION_TYPE = "wayland";
     # Remember that this causes issues in some games use "unset SDL_VIDEODRIVER &&"
-    SDL_VIDEODRIVER = "wayland";
+    SDL_VIDEODRIVER = "wayland,x11";
     CLUTTER_BACKEND = "wayland";
     WLR_NO_HARDWARE_CURSORS = "1";
   };
diff --git a/modules/gaming.nix b/modules/gaming.nix
index e865b3b..7930909 100644
--- a/modules/gaming.nix
+++ b/modules/gaming.nix
@@ -95,7 +95,7 @@ with lib;
       # Warning: GPU optimisations have the potential to damage hardware
       gpu = {
         apply_gpu_optimisations = "accept-responsibility";
-        gpu_device = 0;
+        gpu_device = 1;
         amd_performance_level = "high";
       };
 
diff --git a/systems/kaladin/configuration.nix b/systems/kaladin/configuration.nix
index 58a8ccf..72842b7 100644
--- a/systems/kaladin/configuration.nix
+++ b/systems/kaladin/configuration.nix
@@ -15,16 +15,21 @@
 
   networking.hostName = "kaladin"; # Define your hostname.
 
-  networking.interfaces.enp0s31f6.useDHCP = true;
+  networking.interfaces.enp8s0.useDHCP = true;
   networking.interfaces.wlp9s0.useDHCP = true;
 
   # NVIDIA
   # services.xserver.videoDrivers = [ "nvidia" ];
   hardware = {
+    amdgpu = {
+      opencl.enable = true;
+      initrd.enable = true;
+    };
     graphics = {
       enable = true;
       extraPackages = with pkgs; [
         mesa
+        vulkan-extension-layer
         libva-vdpau-driver
         libvdpau-va-gl
       ];
diff --git a/systems/kaladin/hardware-configuration.nix b/systems/kaladin/hardware-configuration.nix
index c7d1097..f43186f 100644
--- a/systems/kaladin/hardware-configuration.nix
+++ b/systems/kaladin/hardware-configuration.nix
@@ -7,7 +7,7 @@
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
 
@@ -57,5 +57,5 @@
   # networking.interfaces.wlp7s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }