diff --git a/home/modules/firefox.nix b/home/modules/firefox.nix
index 1eb49703..7aaa8793 100644
--- a/home/modules/firefox.nix
+++ b/home/modules/firefox.nix
@@ -20,10 +20,9 @@ in {
     home.packages = with pkgs; builtins.concatLists [
       # TODO: I don't think vaapi works yet
       (optionals cfg.vaapi [
-        libva
-        libva-utils
-        # nvidia-vaapi-driver # Nvidia is gone :)
-        vulkan-tools
+        # NOTE: I put these into hardware.opengl.extrapackages, don't know if they belong there...
+        # libva
+        # libvdpau
       ])
 
       (optionals cfg.gnomeTheme [ firefox-gnome-theme ])
@@ -40,7 +39,7 @@ in {
       })
 
       (optionalAttrs cfg.vaapi {
-        LIBVA_DRIVER_NAME = "nvidia";
+        LIBVA_DRIVER_NAME = "radeonsi"; # "nvidia" for Nvidia card
         MOZ_DISABLE_RDD_SANDBOX = 1;
       })
     ];
diff --git a/system/nixinator/hardware-configuration.nix b/system/nixinator/hardware-configuration.nix
index d28ce095..5d6379ac 100644
--- a/system/nixinator/hardware-configuration.nix
+++ b/system/nixinator/hardware-configuration.nix
@@ -76,10 +76,22 @@
     opengl.driSupport = true;
     opengl.driSupport32Bit = true;
 
-    # OpenCL
+    # AMD: https://nixos.wiki/wiki/AMD_GPU
     opengl.extraPackages = with pkgs; [
+      # amdvlk # RADV (mesa) and AMDVLK (amd) can be used simultaneously
+
+      # OpenCL
       rocm-opencl-icd
       rocm-opencl-runtime
+      # rocm-runtime # Wiki doesn't mention this, but it exists...
+
+      # VAAPI/VDPAU: https://nixos.wiki/wiki/Accelerated_Video_Playback
+      vaapiVdpau # Taken from wiki
+      libvdpau-va-gl # Taken from wiki
+
+      # TODO: Figure this out (vainfo), it works this way but I still don't know if this is completely correct
+      libvdpau # NOTE: Don't know if needed/where it belongs...
+      libva # NOTE: Don't know if needed/where it belongs...
     ];
 
     sane.enable = true; # Scanning
@@ -87,5 +99,7 @@
     xpadneo.enable = true;  # Xbox Controller
   };
 
+  environment.variables.AMD_VULKAN_ICD = "RADV"; # Choose mesa driver by default
+
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }