hardware/graphics: add AMD option

machines/thinkman/hardware-configuration.nix

@@ -17,14 +17,15 @@ in
   my.hardware = {
     bluetooth.enable = true;
     debug.enable = true;
-    drive-monitor = {
+    drive-monitor.enable = true;
-      enable = true;
-    };
     firmware = {
       enable = true;
       inherit cpuFlavor;
     };
-    graphics.cpuFlavor = cpuFlavor;
+    graphics = {
+      enable = true;
+      inherit cpuFlavor;
+    };
     id-card.enable = true;
     keychron.enable = true;
     monitor.enable = true;

modules/hardware/graphics/default.nix

@@ -9,29 +9,46 @@ let
 in
 {
   options.my.hardware.graphics = with lib; {
+    enable = mkEnableOption "graphics configuration";
     cpuFlavor = mkOption {
-      type = with types; nullOr (enum [ "intel" ]);
+      type =
+        with types;
+        nullOr (enum [
+          "amd"
+          "intel"
+        ]);
       default = null;
       example = "intel";
       description = "Which kind of GPU";
     };
   };
 
-  config = lib.mkMerge [
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      {
+        hardware.graphics.enable = true;
+      }
       # Intel GPU
       (lib.mkIf (cfg.cpuFlavor == "intel") {
         nixpkgs.config.packageOverrides = pkgs: {
           vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
         };
-      hardware.graphics = {
+        hardware.graphics.extraPackages = with pkgs; [
-        enable = true;
-        extraPackages = with pkgs; [
           intel-media-driver # LIBVA_DRIVER_NAME=iHD
           vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
           vaapiVdpau
           libvdpau-va-gl
         ];
-      };
       })
+
+      (lib.mkIf (cfg.cpuFlavor == "amd") {
+        hardware.graphics.extraPackages = with pkgs; [
+          amdvlk
         ];
+        hardware.graphics.extraPackages32 = with pkgs; [
+          driversi686Linux.amdvlk
+        ];
+      })
+    ]
+  );
 }