treewide: rename stylix.testbed.ui.command.{useTerminal => terminal}

trueNAHO · trueNAHO · commit 0a8661c4be85 · 2025-07-30T12:47:57.000+02:00
Simplify the testbed interface by renaming
stylix.testbed.ui.command.useTerminal to
stylix.testbed.ui.command.terminal.
diff --git a/doc/src/testbeds.md b/doc/src/testbeds.md
@@ -37,11 +37,11 @@ uses.
     - `command` takes a command to be run once the graphical environment
       has loaded
       - `packages` are forwarded to `environment.systemPackages`
+      - `terminal` takes a boolean which determines whether the command
+        should be run in a terminal
       - `text` takes the string of the command, which is deduced from
         `config.stylix.testbed.ui.command.packages` when it contains one
         package.
-      - `useTerminal` takes a boolean which determines whether the command
-        should be run in a terminal
 
 ### Home Manager
 
diff --git a/modules/bat/testbeds/bat.nix b/modules/bat/testbeds/bat.nix
@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "bat flake-parts/flake.nix";
-    useTerminal = true;
   };
 
   home-manager.sharedModules = lib.singleton {
diff --git a/modules/btop/testbeds/btop.nix b/modules/btop/testbeds/btop.nix
@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "btop";
-    useTerminal = true;
   };
 
   home-manager.sharedModules = lib.singleton {
diff --git a/modules/cava/testbeds/cava-rainbow.nix b/modules/cava/testbeds/cava-rainbow.nix
@@ -2,8 +2,8 @@
 {
   stylix.testbed.ui.command = {
     packages = [ pkgs.alsa-utils ];
+    terminal = true;
     text = "aplay /dev/urandom & cava";
-    useTerminal = true;
   };
 
   home-manager.sharedModules = lib.singleton {
diff --git a/modules/cava/testbeds/cava.nix b/modules/cava/testbeds/cava.nix
@@ -2,8 +2,8 @@
 {
   stylix.testbed.ui.command = {
     packages = [ pkgs.alsa-utils ];
+    terminal = true;
     text = "aplay /dev/urandom & cava";
-    useTerminal = true;
   };
 
   home-manager.sharedModules = lib.singleton {
diff --git a/modules/fish/testbeds/fish-hm.nix b/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 {
diff --git a/modules/fish/testbeds/fish-nixos.nix b/modules/fish/testbeds/fish-nixos.nix
@@ -1,7 +1,7 @@
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "fish";
-    useTerminal = true;
   };
 
   programs.fish.enable = true;
diff --git a/modules/fzf/testbeds/fzf.nix b/modules/fzf/testbeds/fzf.nix
@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "fzf";
-    useTerminal = true;
   };
 
   home-manager.sharedModules = lib.singleton {
diff --git a/modules/helix/testbeds/helix.nix b/modules/helix/testbeds/helix.nix
@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "hx flake-parts/flake.nix";
-    useTerminal = true;
   };
 
   home-manager.sharedModules = lib.singleton {
diff --git a/modules/lazygit/testbeds/lazygit.nix b/modules/lazygit/testbeds/lazygit.nix
@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "git init && lazygit";
-    useTerminal = true;
   };
 
   home-manager.sharedModules = lib.singleton {
diff --git a/modules/micro/testbeds/micro.nix b/modules/micro/testbeds/micro.nix
@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "micro flake-parts/flake.nix";
-    useTerminal = true;
   };
 
   home-manager.sharedModules = lib.singleton {
diff --git a/modules/ncspot/testbeds/ncspot.nix b/modules/ncspot/testbeds/ncspot.nix
@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "ncspot";
-    useTerminal = true;
   };
 
   home-manager.sharedModules = lib.singleton {
diff --git a/modules/neovim/testbeds/neovim.nix b/modules/neovim/testbeds/neovim.nix
@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "nvim flake-parts/flake.nix";
-    useTerminal = true;
   };
 
   home-manager.sharedModules = lib.singleton {
diff --git a/modules/neovim/testbeds/nixvim.nix b/modules/neovim/testbeds/nixvim.nix
@@ -1,7 +1,7 @@
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "nvim flake-parts/flake.nix";
-    useTerminal = true;
   };
 
   programs.nixvim.enable = true;
diff --git a/modules/neovim/testbeds/nvf.nix b/modules/neovim/testbeds/nvf.nix
@@ -1,7 +1,7 @@
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "nvim flake-parts/flake.nix";
-    useTerminal = true;
   };
 
   programs.nvf.enable = true;
diff --git a/modules/neovim/testbeds/vim.nix b/modules/neovim/testbeds/vim.nix
@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "vim flake-parts/flake.nix";
-    useTerminal = true;
   };
 
   home-manager.sharedModules = lib.singleton {
diff --git a/modules/nushell/testbeds/nushell.nix b/modules/nushell/testbeds/nushell.nix
@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "nu";
-    useTerminal = true;
   };
 
   home-manager.sharedModules = lib.singleton {
diff --git a/modules/starship/testbeds/starship.nix b/modules/starship/testbeds/starship.nix
@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "bash";
-    useTerminal = true;
   };
 
   home-manager.sharedModules = lib.singleton {
diff --git a/modules/tmux/testbeds/tmux.nix b/modules/tmux/testbeds/tmux.nix
@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "tmux";
-    useTerminal = true;
   };
 
   home-manager.sharedModules = lib.singleton {
diff --git a/modules/zellij/testbeds/zellij.nix b/modules/zellij/testbeds/zellij.nix
@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   stylix.testbed.ui.command = {
+    terminal = true;
     text = "zellij";
-    useTerminal = true;
   };
 
   home-manager.sharedModules = lib.singleton {
diff --git a/stylix/testbed/modules/application.nix b/stylix/testbed/modules/application.nix
@@ -45,6 +45,14 @@ in
                     '';
                     default = [ ];
                   };
+                  terminal = lib.mkOption {
+                    type = lib.types.bool;
+                    description = ''
+                      Whether to spawn a terminal when running the command.
+                    '';
+                    default = false;
+                    example = true;
+                  };
                   text = lib.mkOption {
                     type = lib.types.str;
                     description = ''
@@ -55,14 +63,6 @@ in
                     '';
                     default = "";
                   };
-                  useTerminal = lib.mkOption {
-                    type = lib.types.bool;
-                    description = ''
-                      Whether to spawn a terminal when running the command.
-                    '';
-                    default = false;
-                    example = true;
-                  };
                 };
               }
             );
@@ -144,11 +144,10 @@ in
         )
         [
           {
-            inherit (config.stylix.testbed.ui.command) packages text;
+            inherit (config.stylix.testbed.ui.command) packages terminal text;
 
             condition = config.stylix.testbed.ui.command != null;
             name = "";
-            terminal = config.stylix.testbed.ui.command.useTerminal;
           }
           {
             condition = config.stylix.testbed.ui.sendNotifications;

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{ lib, ... }:`
`2`	`2`	`{`
`3`	`3`	`stylix.testbed.ui.command = {`
	`4`	`+ terminal = true;`
`4`	`5`	`text = "bat flake-parts/flake.nix";`
`5`		`- useTerminal = true;`
`6`	`6`	`};`
`7`	`7`
`8`	`8`	`home-manager.sharedModules = lib.singleton {`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`{`
`3`	`3`	`stylix.testbed.ui.command = {`
`4`	`4`	`packages = [ pkgs.alsa-utils ];`
	`5`	`+ terminal = true;`
`5`	`6`	`text = "aplay /dev/urandom & cava";`
`6`		`- useTerminal = true;`
`7`	`7`	`};`
`8`	`8`
`9`	`9`	`home-manager.sharedModules = lib.singleton {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`stylix.testbed.ui.command = {`
	`3`	`+ terminal = true;`
`3`	`4`	`text = "fish";`
`4`		`- useTerminal = true;`
`5`	`5`	`};`
`6`	`6`
`7`	`7`	`programs.fish.enable = true;`