diff --git a/hardware/amd/amdgpu.nix b/hardware/amd/amdgpu.nix
new file mode 100644
index 0000000..66926ec
--- /dev/null
+++ b/hardware/amd/amdgpu.nix
@@ -0,0 +1,63 @@
+{ config, pkgs, lib, ... }:
+with lib;
+let
+  cfg = config.aviallon.hardware.amd;
+  devCfg = config.aviallon.developer;
+  generalCfg = config.aviallon.general;
+  myMesa = if generalCfg.unsafeOptimizations then pkgs.mesaOptimized else pkgs.mesa;
+in {
+  config = mkIf (cfg.enable && cfg.kernelDriver == "amdgpu") {
+    boot.initrd.kernelModules = [ "amdgpu" ];
+
+    aviallon.boot.cmdline = {
+      # for Southern Islands (SI ie. GCN 1) cards
+      "radeon.si_support" = 0;
+      "amdgpu.si_support" = 1;
+      # for Sea Islands (CIK ie. GCN 2) cards
+      "radeon.cik_support" = 0;
+      "amdgpu.cik_support" = 1;
+
+      "amdgpu.ppfeaturemask" = mkIf generalCfg.unsafeOptimizations "0xfff7ffff";
+      "amdgpu.freesync_video" = 1;
+      #"amdgpu.mes" = mkIf generalCfg.unsafeOptimizations 1;
+    };
+
+    environment.systemPackages = with pkgs; []
+      ++ [ rocm-smi ]
+      ++ optionals devCfg.enable [
+        rocminfo
+      ]
+    ;
+
+    services.xserver.videoDrivers = []
+    ++ optional cfg.useProprietary "amdgpu-pro"
+    ++ [
+      "amdgpu"
+    ];
+
+    hardware.opengl = {
+      enable = true;
+      extraPackages = with pkgs; mkIf (!cfg.useProprietary) (
+        [
+          rocm-opencl-icd
+          rocm-opencl-runtime
+        ]
+        ++ optional (cfg.defaultVulkanImplementation == "amdvlk") amdvlk
+      );
+      extraPackages32 = with pkgs.driversi686Linux; mkIf (!cfg.useProprietary) ([]
+        ++ optional (cfg.defaultVulkanImplementation == "amdvlk") amdvlk
+      );
+    };
+
+    environment.variables = {
+      "AMD_VULKAN_ICD" = strings.toUpper cfg.defaultVulkanImplementation;
+    };
+
+    # Make rocblas and rocfft work
+    nix.settings.extra-sandbox-paths = [
+      "/dev/kfd?"
+      "/sys/devices/virtual/kfd?"
+      "/dev/dri/renderD128?"
+    ];
+  };
+}
diff --git a/hardware/amd/default.nix b/hardware/amd/default.nix
index 8613e0a..5e5cad2 100644
--- a/hardware/amd/default.nix
+++ b/hardware/amd/default.nix
@@ -14,70 +14,31 @@ in {
       type = with types; enum [ "amdvlk" "radv" ];
       default = "radv";
     };
+    kernelDriver = mkOption {
+      description = "wether to use radeon or amdgpu kernel driver";
+      type = with types; enum [ "radeon" "amdgpu" ];
+      default = "amdgpu";
+    };
   };
 
   imports = [
     ./cpu.nix
+    ./amdgpu.nix
+    ./radeon.nix
   ];
   
-  config = mkIf (cfg.enable) {
-    boot.initrd.kernelModules = [ "amdgpu" ];
-
-    aviallon.boot.cmdline = {
-      # for Southern Islands (SI ie. GCN 1) cards
-      "radeon.si_support" = 0;
-      "amdgpu.si_support" = 1;
-      # for Sea Islands (CIK ie. GCN 2) cards
-      "radeon.cik_support" = 0;
-      "amdgpu.cik_support" = 1;
-
-      "amdgpu.ppfeaturemask" = mkIf generalCfg.unsafeOptimizations "0xfff7ffff";
-      "amdgpu.freesync_video" = 1;
-      #"amdgpu.mes" = mkIf generalCfg.unsafeOptimizations 1;
-    };
-
-    environment.systemPackages = with pkgs; []
-      ++ [
-        rocm-smi
-      ]
-      ++ optionals devCfg.enable ([]
-        ++ [ rocminfo ]
-      )
-    ;
-
-    services.xserver.videoDrivers = []
-    ++ optional cfg.useProprietary "amdgpu-pro"
-    ++ [
-      "amdgpu"
-      "radeon"
-    ];
-
+  config = mkIf cfg.enable {
     programs.corectrl.enable = mkIf generalCfg.unsafeOptimizations true;
 
     hardware.opengl = {
       enable = true;
       package = with pkgs; myMesa.drivers;
       extraPackages = with pkgs; mkIf (!cfg.useProprietary) (mkAfter [
-        rocm-opencl-icd
-        rocm-opencl-runtime
         (hiPrio myMesa)
-        amdvlk
       ]);
       extraPackages32 = with pkgs.driversi686Linux; mkIf (!cfg.useProprietary) [
-        mesa
-        amdvlk
+        (hiPrio myMesa)
       ];
     };
-
-    environment.variables = {
-      "AMD_VULKAN_ICD" = strings.toUpper cfg.defaultVulkanImplementation;
-    };
-
-    # Make rocblas and rocfft work
-    nix.settings.extra-sandbox-paths = [
-      "/dev/kfd?"
-      "/sys/devices/virtual/kfd?"
-      "/dev/dri/renderD128?"
-    ];
   };
 }
diff --git a/hardware/amd/radeon.nix b/hardware/amd/radeon.nix
new file mode 100644
index 0000000..11eb04b
--- /dev/null
+++ b/hardware/amd/radeon.nix
@@ -0,0 +1,25 @@
+{ config, pkgs, lib, ... }:
+with lib;
+let
+  cfg = config.aviallon.hardware.amd;
+  devCfg = config.aviallon.developer;
+  generalCfg = config.aviallon.general;
+  myMesa = if generalCfg.unsafeOptimizations then pkgs.mesaOptimized else pkgs.mesa;
+in {
+  config = mkIf (cfg.enable && cfg.kernelDriver == "radeon") {
+    boot.initrd.kernelModules = [ "radeon" ];
+
+    aviallon.boot.cmdline = {
+    };
+
+    environment.systemPackages = with pkgs; [
+      
+    ];
+
+    services.xserver.videoDrivers = [
+      "radeon"
+    ];
+
+    environment.variables = {};
+  };
+}