hardware/gpu: add gpu module

hosts/Infini-DESKTOP/default.nix

@@ -8,10 +8,6 @@
     (with profiles; [
       networking.wireless
 
-      (with hardware; [
-        gpu.nvidia
-      ])
-
       btrfs
       virtualization
 
@@ -28,6 +24,7 @@
   modules = {
     boot.grub.enable = true;
     hardware = {
+      gpu.nvidia = true;
       wireless.enable = true;
       form.desktop = true;
     };

hosts/Infini-FRAMEWORK/default.nix

@@ -5,10 +5,6 @@
     (with profiles; [
       networking.wireless
 
-      (with hardware; [
-        gpu.intel
-      ])
-
       # services.privoxy
     ])
 
@@ -44,6 +40,7 @@
   modules = {
     boot.grub.enable = true;
     hardware = {
+      gpu.intel = true;
       form.laptop = true;
     };
   };

hosts/Infini-SERVER/default.nix

@@ -1,14 +1,13 @@
 { suites, profiles, pkgs, lib, ... }: {
   imports = lib.our.flattenListSet {
     suites = with suites; [ base ];
-    imports = [ ];
-    profiles = with profiles; [
-      hardware.gpu.nvidia
-    ];
   };
 
   modules = {
     boot.grub.enable = true;
-    hardware.form.server = true;
+    hardware = {
+      gpu.nvidia = true;
+      form.server = true;
+    };
   };
 }

modules/modules/hardware/form.nix

@@ -41,6 +41,11 @@ in
     })
     (mkIf cfg.portable {
       modules.hardware = {
+        gpu = {
+          nvidia = mkDefault true;
+          intel = mkDefault true;
+          amdgpu = mkDefault true;
+        };
         wireless.enable = mkDefault true;
       };
     })

modules/modules/hardware/gpu.nix

@@ -0,0 +1,48 @@
+{ config, lib, ... }:
+with lib;
+with lib.hlissner;
+let
+  cfg = config.modules.hardware.gpu;
+in
+{
+  options.modules.hardware.gpu = {
+    amdgpu = mkBoolOpt false;
+    nvidia = mkBoolOpt false;
+    intel = mkBoolOpt false;
+  };
+
+  config = mkMerge [
+    (mkIf (any (with cfg; [ amdgpu nvidia intel ])) {
+      hardware.opengl = {
+        enable = true;
+        driSupport = true;
+        driSupport32Bit = true;
+
+        extraPackages = with pkgs; [
+          vaapiVdpau
+          libvdpau-va-gl
+        ];
+      };
+    })
+
+    (mkIf cfg.amdgpu {
+      boot.initrd.kernelModules = [ "amdgpu" ];
+      services.xserver.videoDrivers = [ "amdgpu" ];
+    })
+
+    (mkIf cfg.nvidia {
+      services.xserver.videoDrivers = [ "nvidia" ];
+
+      hardware.nvidia = {
+        modesetting.enable = true;
+        powerManagement.enable = true;
+      };
+
+      virtualisation.docker.enableNvidia = true;
+    })
+
+    (mkIf cfg.intel {
+      hardware.opengl.extraPackages = with pkgs; [ intel-media-driver vaapiIntel ];
+    })
+  ];
+}

profiles/hardware/gpu/amdgpu.nix

@@ -1,7 +0,0 @@
-{ ... }: {
-  imports = [ ./common.nix ];
-
-  boot.initrd.kernelModules = [ "amdgpu" ];
-
-  services.xserver.videoDrivers = [ "amdgpu" ];
-}

profiles/hardware/gpu/common.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }: {
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
-
-    extraPackages = with pkgs; [
-      vaapiVdpau
-      libvdpau-va-gl
-    ];
-  };
-}

profiles/hardware/gpu/intel.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }: {
-  imports = [ ./common.nix ];
-
-  hardware.opengl.extraPackages = with pkgs; [
-    intel-media-driver
-    vaapiIntel
-  ];
-}

profiles/hardware/gpu/nvidia.nix

@@ -1,12 +0,0 @@
-{ ... }: {
-  imports = [ ./common.nix ];
-
-  services.xserver.videoDrivers = [ "nvidia" ];
-
-  hardware.nvidia = {
-    modesetting.enable = true;
-    powerManagement.enable = true;
-  };
-
-  virtualisation.docker.enableNvidia = true;
-}