refactor: glxinfo -> mesa-demos

isabelroses · Aug 31, 2024 · f1ec9b4 · f1ec9b4
1 parent 69d33ca
commit f1ec9b4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/modules/nixos/gaming/steam.nix b/modules/nixos/gaming/steam.nix
@@ -52,7 +52,6 @@ in
                   gtk3-x11
                   harfbuzz
                   icu
-                  glxinfo
                   inetutils
                   libthai
                   mono5

diff --git a/modules/nixos/hardware/media/video.nix b/modules/nixos/hardware/media/video.nix
@@ -11,7 +11,11 @@ let
   cfg = config.garden.system.video;
 in
 {
-  options.garden.system.video.enable = mkEnableOption "Does the device allow for graphical programs";
+  options.garden.system.video = {
+    enable = mkEnableOption "Does the device allow for graphical programs";
+
+    benchmarking.enable = mkEnableOption "Enable benchmarking tools";
+  };
 
   config = mkIf cfg.enable {
     hardware = {
@@ -22,6 +26,8 @@ in
     };
 
     # benchmarking tools
-    environment.systemPackages = builtins.attrValues { inherit (pkgs) glxinfo glmark2; };
+    environment.systemPackages = mkIf cfg.benchmarking.enable (
+      builtins.attrValues { inherit (pkgs) mesa-demos glmark2; }
+    );
   };
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,7 +52,6 @@ in @@
                       gtk3-x11
                       harfbuzz
                       icu
-                      glxinfo
                       inetutils
                       libthai
                       mono5
@@ Expand Down @@