diff --git a/modules/system/drivers/amd.nix b/modules/system/drivers/amd.nix
new file mode 100644
index 0000000..2f5cfe7
--- /dev/null
+++ b/modules/system/drivers/amd.nix
@@ -0,0 +1,36 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.amdDrivers = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    hardware = {
+      graphics = {
+        enable = true;
+        enable32Bit = true;
+        extraPackages = with pkgs; [
+          libva-vdpau-driver
+          libvdpau-va-gl
+          rocmPackages.clr.icd
+        ];
+      };
+      amdgpu = {
+        initrd.enable = true;
+        opencl.enable = true;
+      };
+    };
+
+    boot.kernelParams = [
+      "amdgpu.ppfeaturemask=0xffffffff"
+    ];
+
+    # For rOCM
+    systemd.tmpfiles.rules = [
+      "L+ /opt/rocm - - - - ${pkgs.rocmPackages.clr}"
+    ];
+  };
+}
diff --git a/modules/system/drivers/intel.nix b/modules/system/drivers/intel.nix
new file mode 100644
index 0000000..1f7b76b
--- /dev/null
+++ b/modules/system/drivers/intel.nix
@@ -0,0 +1,19 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.intelDrivers = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    hardware.graphics = {
+      enable = true;
+      extraPackages = with pkgs; [
+        intel-vaapi-driver
+        libva-vdpau-driver
+      ];
+    };
+  };
+}