treewide: allow re-running test code and simplify testbeds

doc/src/testbeds.md

@@ -36,13 +36,12 @@ uses.
       graphical environments.
     - `command` takes a command to be run once the graphical environment
       has loaded
-      - `text` takes the string of the command
-      - `useTerminal` takes a boolean which determines whether the command
-        should be run in a terminal
-    - `application` takes a desktop application to be run once the graphical
-      environment has loaded. If one of its suboptions is set, all must be.
-      - `name` takes the string name of the desktop application
-      - `package` takes the package which provides the `.desktop` file
+      - `packages` are forwarded to `environment.systemPackages`
+      - `terminal` takes a boolean which determines whether the command should
+        be run in a terminal, defaulting to `false`
+      - `text` takes the string of the command, which is deduced from
+        `config.stylix.testbed.ui.command.packages` when it contains one
+        package.
 
 ### Home Manager
 

modules/alacritty/testbeds/alacritty.nix

@@ -1,17 +1,8 @@
-{ lib, pkgs, ... }:
-let
-  package = pkgs.alacritty;
-in
+{ lib, ... }:
 {
-  stylix.testbed.ui.application = {
-    name = "Alacritty";
-    inherit package;
-  };
+  stylix.testbed.ui.command.text = "alacritty";
 
   home-manager.sharedModules = lib.singleton {
-    programs.alacritty = {
-      enable = true;
-      inherit package;
-    };
+    programs.alacritty.enable = true;
   };
 }

modules/ashell/testbeds/ashell.nix

@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   stylix.testbed.ui = {
-    graphicalEnvironment = "hyprland";
     command.text = "ashell";
+    graphicalEnvironment = "hyprland";
   };
 
   home-manager.sharedModules = lib.singleton {

modules/bat/testbeds/bat.nix

@@ -1,10 +1,11 @@
-{ lib, pkgs, ... }:
-let
-  package = pkgs.bat;
-in
+{ lib, ... }:
 {
-  environment = {
-    loginShellInit = "${lib.getExe package} flake-parts/flake.nix";
-    systemPackages = [ package ];
+  stylix.testbed.ui.command = {
+    terminal = true;
+    text = "bat flake-parts/flake.nix";
+  };
+
+  home-manager.sharedModules = lib.singleton {
+    programs.bat.enable = true;
   };
 }

modules/blender/testbeds/blender.nix

@@ -1,12 +1,4 @@
 { pkgs, ... }:
-let
-  package = pkgs.blender;
-in
 {
-  stylix.testbed.ui.application = {
-    name = "blender";
-    inherit package;
-  };
-
-  environment.systemPackages = [ package ];
+  stylix.testbed.ui.command.packages = [ pkgs.blender ];
 }

modules/bspwm/testbeds/bspwm.nix

@@ -1,12 +1,7 @@
 { pkgs, ... }:
 {
   stylix.testbed.ui = {
+    command.packages = [ pkgs.kitty ];
     graphicalEnvironment = "bspwm";
-
-    # We need something to open a window so that we can check the window borders
-    application = {
-      name = "kitty";
-      package = pkgs.kitty;
-    };
   };
 }

modules/btop/testbeds/btop.nix

@@ -1,8 +1,8 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 {
   stylix.testbed.ui.command = {
-    text = lib.getExe pkgs.btop;
-    useTerminal = true;
+    terminal = true;
+    text = "btop";
   };
 
   home-manager.sharedModules = lib.singleton {

modules/cava/testbeds/cava-rainbow.nix

@@ -1,11 +1,9 @@
 { lib, pkgs, ... }:
 {
   stylix.testbed.ui.command = {
-    text = ''
-      ${lib.getExe' pkgs.alsa-utils "aplay"} /dev/urandom &
-      ${lib.getExe pkgs.cava}
-    '';
-    useTerminal = true;
+    packages = [ pkgs.alsa-utils ];
+    terminal = true;
+    text = "aplay /dev/urandom & cava";
   };
 
   home-manager.sharedModules = lib.singleton {

modules/cava/testbeds/cava.nix

@@ -1,11 +1,9 @@
 { lib, pkgs, ... }:
 {
   stylix.testbed.ui.command = {
-    text = ''
-      ${lib.getExe' pkgs.alsa-utils "aplay"} /dev/urandom &
-      ${lib.getExe pkgs.cava}
-    '';
-    useTerminal = true;
+    packages = [ pkgs.alsa-utils ];
+    terminal = true;
+    text = "aplay /dev/urandom & cava";
   };
 
   home-manager.sharedModules = lib.singleton {

modules/cavalier/testbeds/cavalier.nix

@@ -1,17 +1,8 @@
 { lib, pkgs, ... }:
-let
-  package = pkgs.cavalier;
-in
 {
-  stylix.testbed.ui.application = {
-    name = "org.nickvision.cavalier";
-    inherit package;
-  };
+  stylix.testbed.ui.command.text = pkgs.cavalier.meta.mainProgram;
 
   home-manager.sharedModules = lib.singleton {
-    programs.cavalier = {
-      enable = true;
-      inherit package;
-    };
+    programs.cavalier.enable = true;
   };
 }

modules/chromium/testbeds/chromium.nix

@@ -1,12 +1,8 @@
-{ pkgs, ... }:
-let
-  package = pkgs.chromium;
-in
+{ lib, ... }:
 {
-  stylix.testbed.ui.application = {
-    name = "chromium-browser";
-    inherit package;
-  };
+  stylix.testbed.ui.command.text = "chromium";
 
-  environment.systemPackages = [ package ];
+  home-manager.sharedModules = lib.singleton {
+    programs.chromium.enable = true;
+  };
 }

modules/discord/testbeds/vencord.nix

@@ -1,24 +1,14 @@
 { lib, pkgs, ... }:
-let
-  package = pkgs.discord.override {
-    withVencord = true;
-  };
-in
 {
-  stylix.testbed = {
-    # Discord is not available on arm64.
-    enable = lib.meta.availableOn pkgs.stdenv.hostPlatform package;
-
-    ui.application = {
-      name = "discord";
-      inherit package;
+  stylix.testbed =
+    let
+      package = pkgs.discord.override { withVencord = true; };
+    in
+    {
+      enable = lib.meta.availableOn pkgs.stdenv.hostPlatform package;
+      ui.command.packages = [ package ];
     };
-  };
 
-  environment.systemPackages = [ package ];
   nixpkgs.config.allowUnfreePredicate =
-    pkg:
-    builtins.elem (lib.getName pkg) [
-      "discord"
-    ];
+    pkg: builtins.elem (lib.getName pkg) [ "discord" ];
 }

modules/discord/testbeds/vesktop.nix

@@ -1,17 +1,8 @@
-{ pkgs, lib, ... }:
-let
-  package = pkgs.vesktop;
-in
+{ lib, ... }:
 {
-  stylix.testbed.ui.application = {
-    name = "vesktop";
-    inherit package;
-  };
+  stylix.testbed.ui.command.text = "vesktop";
 
   home-manager.sharedModules = lib.singleton {
-    programs.vesktop = {
-      enable = true;
-      inherit package;
-    };
+    programs.vesktop.enable = true;
   };
 }

modules/emacs/testbeds/emacs.nix

@@ -1,11 +1,8 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 {
   stylix.testbed.ui.command.text = "emacs flake-parts/flake.nix";
 
   home-manager.sharedModules = lib.singleton {
-    programs.emacs = {
-      enable = true;
-      package = pkgs.emacs;
-    };
+    programs.emacs.enable = true;
   };
 }

modules/eog/testbeds/eog.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 {
-  stylix.testbed.ui.command.text = lib.getExe pkgs.eog;
+  stylix.testbed.ui.command.packages = [ pkgs.eog ];
 }

modules/firefox/testbeds/firefox-gnome-theme.nix

@@ -1,24 +1,20 @@
-{ lib, pkgs, ... }:
-let
-  package = pkgs.firefox;
-  profileName = "stylix";
-in
+{ lib, ... }:
 {
-  stylix.testbed.ui.application = {
-    name = "firefox";
-    inherit package;
-  };
+  stylix.testbed.ui.command.text = "firefox";
 
-  home-manager.sharedModules = lib.singleton {
-    programs.firefox = {
-      enable = true;
-      inherit package;
-      profiles.${profileName}.isDefault = true;
-    };
+  home-manager.sharedModules =
+    let
+      profileName = "stylix";
+    in
+    lib.singleton {
+      programs.firefox = {
+        enable = true;
+        profiles.${profileName}.isDefault = true;
+      };
 
-    stylix.targets.firefox = {
-      profileNames = [ profileName ];
-      firefoxGnomeTheme.enable = true;
+      stylix.targets.firefox = {
+        profileNames = [ profileName ];
+        firefoxGnomeTheme.enable = true;
+      };
     };
-  };
 }

modules/firefox/testbeds/firefox.nix

@@ -1,21 +1,17 @@
-{ lib, pkgs, ... }:
-let
-  package = pkgs.firefox;
-  profileName = "stylix";
-in
+{ lib, ... }:
 {
-  stylix.testbed.ui.application = {
-    name = "firefox";
-    inherit package;
-  };
+  stylix.testbed.ui.command.text = "firefox";
 
-  home-manager.sharedModules = lib.singleton {
-    programs.firefox = {
-      enable = true;
-      inherit package;
-      profiles.${profileName}.isDefault = true;
-    };
+  home-manager.sharedModules =
+    let
+      profileName = "stylix";
+    in
+    lib.singleton {
+      programs.firefox = {
+        enable = true;
+        profiles.${profileName}.isDefault = true;
+      };
 
-    stylix.targets.firefox.profileNames = [ profileName ];
-  };
+      stylix.targets.firefox.profileNames = [ profileName ];
+    };
 }

modules/fish/testbeds/fish-hm.nix

@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "fish";
-    useTerminal = true;
   };
 
   home-manager.sharedModules = lib.singleton {

modules/fish/testbeds/fish-nixos.nix

@@ -1,7 +1,7 @@
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "fish";
-    useTerminal = true;
   };
 
   programs.fish.enable = true;

modules/foliate/testbeds/foliate.nix

@@ -1,17 +1,8 @@
-{ lib, pkgs, ... }:
-let
-  package = pkgs.foliate;
-in
+{ lib, ... }:
 {
-  stylix.testbed.ui.application = {
-    name = "com.github.johnfactotum.Foliate";
-    inherit package;
-  };
+  stylix.testbed.ui.command.text = "foliate";
 
   home-manager.sharedModules = lib.singleton {
-    programs.foliate = {
-      enable = true;
-      inherit package;
-    };
+    programs.foliate.enable = true;
   };
 }

modules/foot/testbeds/foot.nix

@@ -1,17 +1,8 @@
-{ lib, pkgs, ... }:
-let
-  package = pkgs.foot;
-in
+{ lib, ... }:
 {
-  stylix.testbed.ui.application = {
-    name = "foot";
-    inherit package;
-  };
+  stylix.testbed.ui.command.text = "foot";
 
   home-manager.sharedModules = lib.singleton {
-    programs.foot = {
-      enable = true;
-      inherit package;
-    };
+    programs.foot.enable = true;
   };
 }

modules/fuzzel/testbeds/fuzzel.nix

@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   stylix.testbed.ui = {
-    graphicalEnvironment = "hyprland";
     command.text = "fuzzel";
+    graphicalEnvironment = "hyprland";
   };
 
   home-manager.sharedModules = lib.singleton {