Parameterise gpu config

machines/nunotaba/configuration.nix

@@ -5,13 +5,13 @@
     [
       ./hardware-configuration.nix
       ../../modules/cpu/intel.nix
-      ../../modules/gpu/intel.nix
       ../../modules
       ../../profiles/dev.nix
       ../../users/simon
     ];
 
   sbruder = {
+    gpu.intel.enable = true;
     gui.enable = true;
     libvirt.enable = true;
     restic.enable = true;

machines/sayuri/configuration.nix

@@ -5,13 +5,13 @@
     [
       ./hardware-configuration.nix
       ../../modules/cpu/intel.nix
-      ../../modules/gpu/amd.nix
       ../../modules
       ../../profiles/dev.nix
       ../../users/simon
     ];
 
   sbruder = {
+    gpu.amd.enable = true;
     gui.enable = true;
     libvirt.enable = true;
     restic.enable = true;

modules/default.nix

@@ -14,6 +14,7 @@
     ./cups.nix
     ./docker.nix
     ./fonts.nix
+    ./gpu
     ./grub.nix
     ./libvirt.nix
     ./locales.nix

modules/gpu/amd.nix

@@ -1,6 +1,11 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
-
+let
+  cfg = config.sbruder.gpu.amd;
+in
 {
+  options.sbruder.gpu.amd.enable = lib.mkEnableOption "amd gpu configuration";
+
+  config = lib.mkIf cfg.enable {
     hardware.opengl.extraPackages = with pkgs; [
       amdvlk
       rocm-opencl-icd
@@ -23,4 +28,5 @@
     #    };
     #  }
     #];
+  };
 }

modules/gpu/default.nix

@@ -0,0 +1,7 @@
+{ lib, ... }:
+{
+  imports = [
+    ./amd.nix
+    ./intel.nix
+  ];
+}

modules/gpu/intel.nix

@@ -1,8 +1,14 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
-
+let
+  cfg = config.sbruder.gpu.intel;
+in
 {
+  options.sbruder.gpu.intel.enable = lib.mkEnableOption "intel gpu configuration";
+
+  config = lib.mkIf cfg.enable {
     hardware.opengl.extraPackages = with pkgs; [
       beignet
       vaapiIntel
     ];
+  };
 }