From 47c694963e86b3e0f5d387506642a830871f331e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 28 Feb 2025 22:21:33 -0500 Subject: [PATCH] tests: move xdg to cross platform tests Has cross platform functionality, gate linux only behind separate test path. --- tests/default.nix | 3 ++- tests/modules/misc/xdg/default.nix | 7 ------- tests/modules/misc/xdg/linux.nix | 9 +++++++++ 3 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 tests/modules/misc/xdg/linux.nix diff --git a/tests/default.nix b/tests/default.nix index 682921e9..5d5bec38 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -124,6 +124,7 @@ in import nmtSrc { ./modules/misc/manual ./modules/misc/nix ./modules/misc/specialisation + ./modules/misc/xdg ./modules/programs/aerc ./modules/programs/alacritty ./modules/programs/alot @@ -269,6 +270,7 @@ in import nmtSrc { ./modules/services/yubikey-agent-darwin ./modules/targets-darwin ] ++ lib.optionals isLinux [ + ./modules/misc/xdg/linux.nix ./modules/config/home-cursor ./modules/config/i18n ./modules/i18n/input-method @@ -278,7 +280,6 @@ in import nmtSrc { ./modules/misc/numlock ./modules/misc/pam ./modules/misc/qt - ./modules/misc/xdg ./modules/misc/xsession ./modules/programs/abook ./modules/programs/autorandr diff --git a/tests/modules/misc/xdg/default.nix b/tests/modules/misc/xdg/default.nix index dde36f97..13ebb7e1 100644 --- a/tests/modules/misc/xdg/default.nix +++ b/tests/modules/misc/xdg/default.nix @@ -1,13 +1,6 @@ { - xdg-mime-apps-basics = ./mime-apps-basics.nix; - xdg-system-dirs = ./system-dirs.nix; - xdg-desktop-entries = ./desktop-entries.nix; xdg-file-gen = ./file-gen.nix; xdg-default-locations = ./default-locations.nix; - xdg-user-dirs-null = ./user-dirs-null.nix; - xdg-portal = ./portal.nix; - xdg-mime = ./mime.nix; xdg-mime-disabled = ./mime-disabled.nix; - xdg-mime-package = ./mime-packages.nix; xdg-autostart = ./autostart.nix; } diff --git a/tests/modules/misc/xdg/linux.nix b/tests/modules/misc/xdg/linux.nix new file mode 100644 index 00000000..b0a6bb04 --- /dev/null +++ b/tests/modules/misc/xdg/linux.nix @@ -0,0 +1,9 @@ +{ + xdg-mime-apps-basics = ./mime-apps-basics.nix; + xdg-system-dirs = ./system-dirs.nix; + xdg-desktop-entries = ./desktop-entries.nix; + xdg-user-dirs-null = ./user-dirs-null.nix; + xdg-portal = ./portal.nix; + xdg-mime = ./mime.nix; + xdg-mime-package = ./mime-packages.nix; +}