diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 91938ad..7b11ade 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -33,9 +33,6 @@
 
   # 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;
@@ -56,7 +53,7 @@
 
   i18n = {
 
-    # Select internationalisation properties.
+  # Select internationalisation properties.
     defaultLocale = "C.UTF-8";
 
     extraLocaleSettings = {
@@ -174,23 +171,12 @@
 
   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 = {
@@ -221,7 +207,7 @@
       unstable.nix-your-shell
 
       amdgpu_top
-      # unstable.mangohud
+      mangohud
 
       unstable.svt-av1-psy
       unstable.ffmpeg-full
@@ -230,7 +216,7 @@
 
       vscode.fhs # .fhs version will be more compatable even if slightly less nix flavoured
 
-      # unstable.openrazer-daemon # Broken, enable again in a few days?
+      openrazer-daemon
 
       # === nix related ===
       comma
@@ -341,7 +327,6 @@
   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 50f10fe..4772e9d 100644
--- a/nixos/hardware-configuration.nix
+++ b/nixos/hardware-configuration.nix
@@ -200,14 +200,17 @@
       # === vulkan/mesa ===
 
       # === amdvlk driver ===
-    };
-    amdgpu.amdvlk = {
-      enable = true;
-      support32Bit.enable = true;
-    };
-    # === amdvlk driver ===
+      extraPackages = with pkgs; [
+        amdvlk
+      ];
+      extraPackages32 = with pkgs; [
+        driversi686Linux.amdvlk
+      ];
+      # === amdvlk driver ===
 
-    # openrazer.enable = true;
+    };
+
+    openrazer.enable = true;
 
   };
 }