diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 7b11ade..91938ad 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -33,6 +33,9 @@
 
   # Use the latest linux Kernel
   boot.kernelPackages = pkgs.linuxPackages_latest;
+  # boot.kernelPackages = unstable.linuxPackages_xanmod_latest;
+  # boot.kernelPackages = pkgs.linuxPackages_6_14;
+  # boot.kernelPackages = pkgs.linuxPackages_6_13;
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
@@ -53,7 +56,7 @@
 
   i18n = {
 
-  # Select internationalisation properties.
+    # Select internationalisation properties.
     defaultLocale = "C.UTF-8";
 
     extraLocaleSettings = {
@@ -171,12 +174,23 @@
 
   programs.steam = {
     enable = true;
+    package = pkgs.steam.override {
+      extraPkgs = (pkgs: with pkgs; [
+        gamemode
+        mangohud
+        # additional packages...
+        # e.g. some games require python3
+      ]);
+    };
+
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
     dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
     localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
   };
   programs.steam.gamescopeSession.enable = true;
   programs.steam.protontricks.enable = true;
+  hardware.steam-hardware.enable = true;
+  programs.gamescope.enable = true;
   programs.gamemode.enable = true;
 
   programs.gnupg.agent = {
@@ -207,7 +221,7 @@
       unstable.nix-your-shell
 
       amdgpu_top
-      mangohud
+      # unstable.mangohud
 
       unstable.svt-av1-psy
       unstable.ffmpeg-full
@@ -216,7 +230,7 @@
 
       vscode.fhs # .fhs version will be more compatable even if slightly less nix flavoured
 
-      openrazer-daemon
+      # unstable.openrazer-daemon # Broken, enable again in a few days?
 
       # === nix related ===
       comma
@@ -327,6 +341,7 @@
   environment.sessionVariables = {
     # === Prefer RADV driver ===
     AMD_VULKAN_ICD = "RADV";
+    VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";
 
     FLAKE = "/home/buymymojo/etc/nixos/";
 
diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix
index 4772e9d..50f10fe 100644
--- a/nixos/hardware-configuration.nix
+++ b/nixos/hardware-configuration.nix
@@ -200,17 +200,14 @@
       # === vulkan/mesa ===
 
       # === amdvlk driver ===
-      extraPackages = with pkgs; [
-        amdvlk
-      ];
-      extraPackages32 = with pkgs; [
-        driversi686Linux.amdvlk
-      ];
-      # === amdvlk driver ===
-
     };
+    amdgpu.amdvlk = {
+      enable = true;
+      support32Bit.enable = true;
+    };
+    # === amdvlk driver ===
 
-    openrazer.enable = true;
+    # openrazer.enable = true;
 
   };
 }