From f30a439bcd6aa97fac0f99cdd94381ae025aa64d Mon Sep 17 00:00:00 2001
From: Ophestra <cat@gensokyo.uk>
Date: Fri, 16 May 2025 04:38:08 +0900
Subject: nix: improve common usability

Signed-off-by: Ophestra <cat@gensokyo.uk>
---
 test/configuration.nix | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

(limited to 'test/configuration.nix')

diff --git a/test/configuration.nix b/test/configuration.nix
index 8afe0cac..6b3090cb 100644
--- a/test/configuration.nix
+++ b/test/configuration.nix
@@ -30,13 +30,9 @@
 
   environment = {
     systemPackages = with pkgs; [
-      # For glinfo and wayland-info:
-      mesa-demos
-      wayland-utils
-
       # For D-Bus tests:
-      libnotify
       mako
+      libnotify
     ];
 
     variables = {
@@ -99,14 +95,21 @@
     stateDir = "/var/lib/fortify";
     users.alice = 0;
 
-    home-manager = _: _: { home.stateVersion = "23.05"; };
+    extraHomeConfig = {
+      home.stateVersion = "23.05";
+    };
 
     apps = [
       {
         name = "ne-foot";
         verbose = true;
         share = pkgs.foot;
-        packages = [ pkgs.foot ];
+        packages = with pkgs; [
+          foot
+
+          # For wayland-info:
+          wayland-utils
+        ];
         command = "foot";
         capability = {
           dbus = false;
@@ -125,7 +128,13 @@
         name = "x11-alacritty";
         verbose = true;
         share = pkgs.alacritty;
-        packages = [ pkgs.alacritty ];
+        packages = with pkgs; [
+          # For X11 terminal emulator:
+          alacritty
+
+          # For glinfo:
+          mesa-demos
+        ];
         command = "alacritty";
         capability = {
           wayland = false;
@@ -139,7 +148,12 @@
         verbose = true;
         insecureWayland = true;
         share = pkgs.foot;
-        packages = [ pkgs.foot ];
+        packages = with pkgs; [
+          foot
+
+          # For wayland-info:
+          wayland-utils
+        ];
         command = "foot";
         capability = {
           dbus = false;
-- 
cgit v1.3.1