6 files changed, 35 insertions(+), 25 deletions(-)

M hosts/alice/default.nix
M hosts/arwen/default.nix
M roles/default.nix
A roles/graphics/amd.nix
R roles/{amdgpu.nix => graphics/default.nix}
R roles/{nvidia.nix => graphics/nvidia.nix}

@@ 33,7 33,10 @@
   roles.zellij.enable = true;
   roles.kitty.enable = true;
 
-  roles.nvidia.enable = true;
+  roles.graphics = {
+    enable = true;
+    nvidia.enable = true;
+  };
   roles.plasma.enable = true;
 
   roles.gaming = {

@@ 37,7 37,10 @@
   roles.zellij.enable = true;
   roles.kitty.enable = true;
 
-  roles.amdgpu.enable = true;
+  roles.graphics = {
+    enable = true;
+    amd.enable = true;
+  };
   roles.hyprland.enable = true;
 
   roles.gaming = {

@@ 1,9 1,9 @@
 {...}: {
   imports = [
     ./gaming
+    ./graphics
     ./shell
 
-    ./amdgpu.nix # FIXME: merge with nvidia.nix to graphics/ role
     ./audio.nix
     ./bluetooth.nix
     ./base.nix


@@ 11,7 11,6 @@
     ./hyprland.nix
     ./kitty.nix
     ./nix.nix
-    ./nvidia.nix
     ./plasma.nix
     ./qutebrowser.nix
     ./zellij.nix

@@ 0,0 1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.roles.graphics;
+in {
+  config = lib.mkIf cfg.amd.enable {
+    boot.initrd.kernelModules = ["amdgpu"];
+
+    services.xserver.videoDrivers = ["amdgpu"];
+  };
+}

@@ 3,22 3,24 @@
   lib,
   ...
 }: let
-  cfg = config.roles.amdgpu;
+  cfg = config.roles.graphics;
 in {
-  options.roles.amdgpu = {
-    enable = lib.mkEnableOption "AMDGPU drivers";
-  };
+  imports = [
+    ./amd.nix
+    ./nvidia.nix
+  ];
 
+  options.roles.graphics = {
+    enable = lib.mkEnableOption "graphics drivers";
+    amd.enable = lib.mkEnableOption "AMDGPU drivers";
+    nvidia.enable = lib.mkEnableOption "NVIDIA drivers";
+  };
 
   config = lib.mkIf cfg.enable {
-    boot.initrd.kernelModules = ["amdgpu"];
-
-    services.xserver.videoDrivers = ["amdgpu"];
-
     hardware.opengl = {
       enable = true;
       driSupport = true;
       driSupport32Bit = true;
     };
   };
-}
+ }

@@ 3,23 3,13 @@
   lib,
   ...
 }: let
-  cfg = config.roles.nvidia;
+  cfg = config.roles.graphics;
 in {
-  options.roles.nvidia = {
-    enable = lib.mkEnableOption "NVIDIA drivers";
-  };
-
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf cfg.nvidia.enable {
     arta.unfree.allow = ["nvidia-x11"];
 
     services.xserver.videoDrivers = ["nvidia"];
 
-    hardware.opengl = {
-      enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
-    };
-
     hardware.nvidia = {
       modesetting.enable = true;
       powerManagement.enable = true;