From 06c1392ca886553e9df1c7a927e5972261cf98f8 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 22 Jun 2025 20:35:57 -0500 Subject: [PATCH] tests: implement auto importing for modules Signed-off-by: Austin Horstman --- tests/default.nix | 437 +++--------------- tests/flake.lock | 27 ++ tests/modules/programs/abook/default.nix | 4 +- tests/modules/programs/aerospace/default.nix | 6 +- tests/modules/programs/anyrun/default.nix | 6 +- tests/modules/programs/autorandr/default.nix | 4 +- tests/modules/programs/awscli/default.nix | 5 +- tests/modules/programs/beets/default.nix | 3 +- tests/modules/programs/bemenu/default.nix | 4 +- tests/modules/programs/boxxy/default.nix | 3 +- tests/modules/programs/cavalier/default.nix | 3 +- tests/modules/programs/distrobox/default.nix | 5 +- .../programs/element-desktop/darwin.nix | 1 - .../element-desktop/darwin/default.nix | 1 + .../{ => darwin}/example-config-darwin.nix | 8 +- .../programs/element-desktop/default.nix | 3 + .../programs/element-desktop/linux.nix | 1 - .../element-desktop/linux/default.nix | 3 + .../{ => linux}/example-config-linux.nix | 8 +- tests/modules/programs/eww/default.nix | 3 +- tests/modules/programs/firefox/default.nix | 7 +- tests/modules/programs/foliate/default.nix | 3 +- tests/modules/programs/foot/default.nix | 4 +- tests/modules/programs/freetube/default.nix | 5 +- tests/modules/programs/fuzzel/default.nix | 4 +- tests/modules/programs/getmail/default.nix | 5 +- .../modules/programs/gnome-shell/default.nix | 6 +- .../programs/gnome-terminal/default.nix | 4 +- tests/modules/programs/halloy/default.nix | 5 +- tests/modules/programs/hexchat/default.nix | 5 +- tests/modules/programs/hyprlock/default.nix | 4 +- .../modules/programs/i3bar-river/default.nix | 5 +- tests/modules/programs/i3blocks/default.nix | 6 +- .../programs/i3status-rust/default.nix | 4 +- tests/modules/programs/imv/default.nix | 4 +- tests/modules/programs/kickoff/default.nix | 5 +- tests/modules/programs/kodi/default.nix | 3 +- .../programs/looking-glass-client/default.nix | 3 +- tests/modules/programs/lutris/default.nix | 3 +- tests/modules/programs/mangohud/default.nix | 5 +- tests/modules/programs/mpvpaper/default.nix | 5 +- .../programs/ncmpcpp-linux/default.nix | 3 +- tests/modules/programs/nh/default.nix | 5 +- .../modules/programs/niriswitcher/default.nix | 5 +- tests/modules/programs/onagre/default.nix | 5 +- tests/modules/programs/onedrive/default.nix | 5 +- tests/modules/programs/pqiv/default.nix | 5 +- tests/modules/programs/ptyxis/default.nix | 3 +- tests/modules/programs/rbw/default.nix | 3 +- tests/modules/programs/rofi-pass/default.nix | 3 +- tests/modules/programs/rofi/default.nix | 4 +- tests/modules/programs/sketchybar/default.nix | 4 +- .../programs/sway-easyfocus/default.nix | 5 +- tests/modules/programs/swayimg/default.nix | 3 +- tests/modules/programs/swaylock/default.nix | 3 +- tests/modules/programs/swayr/default.nix | 3 +- tests/modules/programs/terminator/default.nix | 6 +- .../programs/todoman/todoman-config-expected | 1 + tests/modules/programs/tofi/default.nix | 6 +- tests/modules/programs/vesktop/default.nix | 5 +- tests/modules/programs/vinegar/default.nix | 3 +- tests/modules/programs/waybar/default.nix | 4 +- tests/modules/programs/wayprompt/default.nix | 3 +- tests/modules/programs/wlogout/default.nix | 3 +- tests/modules/programs/wofi/default.nix | 4 +- tests/modules/programs/xmobar/default.nix | 6 +- tests/modules/programs/yambar/default.nix | 3 +- tests/modules/programs/yt-dlp/default.nix | 3 +- .../services/activitywatch/default.nix | 3 +- tests/modules/services/avizo/default.nix | 4 +- tests/modules/services/barrier/default.nix | 6 +- tests/modules/services/blanket/default.nix | 6 +- .../services/borgmatic-darwin/default.nix | 4 - .../darwin}/basic-configuration.nix | 0 .../services/borgmatic/darwin/default.nix | 4 + .../darwin}/expected-agent.plist | 0 .../darwin}/frequency-assertion.nix | 0 tests/modules/services/borgmatic/default.nix | 4 +- .../{ => linux}/basic-configuration.nix | 0 .../{ => linux}/basic-configuration.service | 0 .../{ => linux}/basic-configuration.timer | 0 .../services/borgmatic/linux/default.nix | 3 + .../{window-managers => }/bspwm/bspwmrc | 0 .../bspwm/configuration.nix | 0 tests/modules/services/bspwm/default.nix | 5 + .../modules/services/cachix-agent/default.nix | 6 +- tests/modules/services/clipcat/default.nix | 6 +- tests/modules/services/cliphist/default.nix | 4 +- tests/modules/services/clipman/default.nix | 6 +- tests/modules/services/clipse/default.nix | 6 +- tests/modules/services/comodoro/default.nix | 6 +- tests/modules/services/conky/default.nix | 6 +- tests/modules/services/copyq/default.nix | 4 +- tests/modules/services/darkman/default.nix | 4 +- tests/modules/services/davmail/default.nix | 4 +- tests/modules/services/devilspie2/default.nix | 6 +- tests/modules/services/dropbox/default.nix | 6 +- .../modules/services/easyeffects/default.nix | 4 +- .../modules/services/emacs-darwin/default.nix | 6 +- tests/modules/services/emacs/default.nix | 4 +- .../services/espanso-darwin/default.nix | 6 +- tests/modules/services/espanso/default.nix | 4 +- tests/modules/services/flameshot/default.nix | 4 +- tests/modules/services/fluidsynth/default.nix | 6 +- tests/modules/services/fnott/default.nix | 4 +- tests/modules/services/fusuma/default.nix | 4 +- .../services/git-sync-darwin/default.nix | 6 +- tests/modules/services/git-sync/default.nix | 4 +- tests/modules/services/glance/default.nix | 4 +- tests/modules/services/gromit-mpx/default.nix | 4 +- .../herbstluftwm/default.nix | 4 +- .../herbstluftwm-no-tags-autostart | 0 .../herbstluftwm/herbstluftwm-no-tags.nix | 0 .../herbstluftwm-simple-config-autostart | 0 .../herbstluftwm-simple-config.nix | 0 .../default.nix | 4 +- .../home-manager-auto-expire/default.nix | 6 +- .../home-manager-auto-upgrade/default.nix | 6 +- tests/modules/services/hypridle/default.nix | 4 +- .../hyprland/default.nix | 4 +- .../hyprland/inconsistent-config.nix | 0 .../hyprland/multiple-devices-config.conf | 0 .../hyprland/multiple-devices-config.nix | 0 .../hyprland/null-all-packages-config.nix | 0 .../hyprland/null-package-config.conf | 0 .../hyprland/null-package-config.nix | 0 .../hyprland/null-portal-package-config.nix | 0 .../hyprland/simple-config.conf | 0 .../hyprland/simple-config.nix | 0 .../hyprland/sourceFirst-false-config.conf | 0 .../hyprland/sourceFirst-false-config.nix | 0 tests/modules/services/hyprpaper/default.nix | 4 +- .../services/hyprpolkitagent/default.nix | 6 +- tests/modules/services/hyprsunset/default.nix | 4 +- .../{window-managers => }/i3/default.nix | 4 +- .../i3/i3-bar-focused-colors-expected.conf | 0 .../i3/i3-bar-focused-colors.nix | 0 .../i3/i3-followmouse-expected.conf | 0 .../i3/i3-followmouse.nix | 0 .../i3/i3-fonts-deprecated.nix | 0 .../i3/i3-fonts-expected.conf | 0 .../{window-managers => }/i3/i3-fonts.nix | 0 .../i3/i3-keybindings-expected.conf | 0 .../i3/i3-keybindings.nix | 0 .../i3/i3-null-config.nix | 0 .../{window-managers => }/i3/i3-stubs.nix | 0 .../i3/i3-workspace-default-expected.conf | 0 .../i3/i3-workspace-default.nix | 0 .../i3/i3-workspace-output-expected.conf | 0 .../i3/i3-workspace-output.nix | 0 .../services/imapnotify-darwin/default.nix | 6 +- tests/modules/services/imapnotify/default.nix | 6 +- .../modules/services/jankyborders/default.nix | 6 +- .../services/jellyfin-mpv-shim/default.nix | 6 +- ...ngs => example-settings-expected-bindings} | 0 ...onfig => example-settings-expected-config} | 0 ...ngs => example-settings-expected-settings} | 0 ...mple-settings.nix => example-settings.nix} | 7 +- tests/modules/services/kanshi/default.nix | 4 +- .../{window-managers => }/labwc/autostart | 0 .../{window-managers => }/labwc/default.nix | 4 +- .../{window-managers => }/labwc/environment | 0 .../labwc/labwc-autostart.nix | 0 .../labwc/labwc-environment.nix | 0 .../labwc/labwc-menu.nix | 0 .../{window-managers => }/labwc/labwc-rc.nix | 0 .../{window-managers => }/labwc/menu.xml | 0 .../{window-managers => }/labwc/rc.xml | 0 tests/modules/services/lieer/default.nix | 6 +- .../linux-wallpaperengine/default.nix | 4 +- .../services/lxqt-policykit-agent/default.nix | 6 +- .../services/macos-remap-keys/default.nix | 6 +- tests/modules/services/mako/default.nix | 4 +- tests/modules/services/mopidy/default.nix | 4 +- tests/modules/services/mpd-mpris/default.nix | 4 +- tests/modules/services/mpd/default.nix | 4 +- tests/modules/services/mpdris2/default.nix | 4 +- .../modules/services/mpdscribble/default.nix | 6 +- .../services/nix-gc-darwin/default.nix | 4 +- tests/modules/services/nix-gc/default.nix | 6 +- .../modules/services/ollama/darwin/basic.nix | 37 +- .../services/ollama/darwin/default.nix | 4 +- tests/modules/services/ollama/default.nix | 3 + .../modules/services/ollama/linux/default.nix | 2 +- .../services/osmscout-server/default.nix | 6 +- .../modules/services/pantalaimon/default.nix | 6 +- tests/modules/services/parcellite/default.nix | 6 +- .../services/pass-secret-service/default.nix | 4 +- tests/modules/services/pasystray/default.nix | 6 +- tests/modules/services/pbgopy/default.nix | 6 +- tests/modules/services/picom/default.nix | 6 +- tests/modules/services/playerctld/default.nix | 6 +- .../modules/services/podman-linux/default.nix | 4 +- .../modules/services/polkit-gnome/default.nix | 6 +- tests/modules/services/polybar/default.nix | 4 +- tests/modules/services/recoll/default.nix | 4 +- .../services/redshift-gammastep/default.nix | 4 +- tests/modules/services/remmina/default.nix | 4 +- tests/modules/services/restic/default.nix | 6 +- .../river/configuration.nix | 0 tests/modules/services/river/default.nix | 5 + .../services/{window-managers => }/river/init | 0 .../services/screen-locker/default.nix | 4 +- tests/modules/services/shikane/default.nix | 6 +- .../modules/services/signaturepdf/default.nix | 6 +- tests/modules/services/skhd/default.nix | 6 +- tests/modules/services/snixembed/default.nix | 6 +- tests/modules/services/spectrwm/default.nix | 5 + ...ctrwm-simple-config-expected-spectrwm.conf | 0 .../spectrwm/spectrwm-simple-config.nix | 0 .../{window-managers => }/sway/default.nix | 4 +- .../sway/sway-bar-focused-colors.conf | 0 .../sway/sway-bar-focused-colors.nix | 0 ...way-bindkeys-to-code-and-extra-config.conf | 0 ...sway-bindkeys-to-code-and-extra-config.nix | 0 .../sway/sway-bindswitches.conf | 0 .../sway/sway-bindswitches.nix | 0 .../sway/sway-check-config.nix | 0 .../sway/sway-default.conf | 0 .../sway/sway-default.nix | 0 .../sway/sway-default.target | 0 .../sway/sway-followmouse-expected.conf | 0 .../sway-followmouse-legacy-expected.conf | 0 .../sway/sway-followmouse-legacy.nix | 0 .../sway/sway-followmouse.nix | 0 .../sway/sway-modules.conf | 0 .../sway/sway-modules.nix | 0 .../sway/sway-no-xwayland.nix | 0 .../sway/sway-null-config.nix | 0 .../sway/sway-null-package.conf | 0 .../sway/sway-null-package.nix | 0 .../sway/sway-post-2003.conf | 0 .../sway/sway-post-2003.nix | 0 .../sway/sway-systemd-autostart.nix | 0 .../sway/sway-systemd-autostart.target | 0 .../sway/sway-systemd-variables.conf | 0 .../sway/sway-systemd-variables.nix | 0 .../sway/sway-workspace-default-expected.conf | 0 .../sway/sway-workspace-default.nix | 0 .../sway/sway-workspace-output-expected.conf | 0 .../sway/sway-workspace-output.nix | 0 .../sway/swaynag-empty-settings.nix | 0 .../swaynag-example-settings-expected.conf | 0 .../sway/swaynag-example-settings.nix | 0 tests/modules/services/swayidle/default.nix | 6 +- tests/modules/services/swaync/default.nix | 6 +- tests/modules/services/swayosd/default.nix | 6 +- tests/modules/services/swww/default.nix | 6 +- tests/modules/services/sxhkd/default.nix | 4 +- .../services/syncthing/common/default.nix | 1 - tests/modules/services/syncthing/default.nix | 5 + .../{common => }/expected-agent.plist | 0 .../syncthing/{common => }/extra-options.nix | 0 .../modules/services/tldr-update/default.nix | 6 +- tests/modules/services/trayer/default.nix | 6 +- tests/modules/services/trayscale/default.nix | 4 +- tests/modules/services/twmn/default.nix | 6 +- tests/modules/services/udiskie/default.nix | 4 +- tests/modules/services/volnoti/default.nix | 6 +- .../modules/services/way-displays/default.nix | 4 +- .../wayfire/configuration.ini | 0 .../wayfire/configuration.nix | 0 .../{window-managers => }/wayfire/default.nix | 4 +- .../wayfire/wf-shell.ini | 0 .../wayfire/wf-shell.nix | 0 tests/modules/services/wayvnc/default.nix | 4 +- .../window-managers/bspwm/default.nix | 1 - .../window-managers/river/default.nix | 1 - .../window-managers/spectrwm/default.nix | 1 - tests/modules/services/wlsunset/default.nix | 6 +- tests/modules/services/wob/default.nix | 6 +- tests/modules/services/wpaperd/default.nix | 6 +- tests/modules/services/xsettingsd/default.nix | 6 +- .../services/yubikey-agent-darwin/default.nix | 6 +- .../services/yubikey-agent/default.nix | 6 +- 275 files changed, 752 insertions(+), 573 deletions(-) create mode 100644 tests/flake.lock delete mode 100644 tests/modules/programs/element-desktop/darwin.nix create mode 100644 tests/modules/programs/element-desktop/darwin/default.nix rename tests/modules/programs/element-desktop/{ => darwin}/example-config-darwin.nix (95%) create mode 100644 tests/modules/programs/element-desktop/default.nix delete mode 100644 tests/modules/programs/element-desktop/linux.nix create mode 100644 tests/modules/programs/element-desktop/linux/default.nix rename tests/modules/programs/element-desktop/{ => linux}/example-config-linux.nix (95%) delete mode 100644 tests/modules/services/borgmatic-darwin/default.nix rename tests/modules/services/{borgmatic-darwin => borgmatic/darwin}/basic-configuration.nix (100%) create mode 100644 tests/modules/services/borgmatic/darwin/default.nix rename tests/modules/services/{borgmatic-darwin => borgmatic/darwin}/expected-agent.plist (100%) rename tests/modules/services/{borgmatic-darwin => borgmatic/darwin}/frequency-assertion.nix (100%) rename tests/modules/services/borgmatic/{ => linux}/basic-configuration.nix (100%) rename tests/modules/services/borgmatic/{ => linux}/basic-configuration.service (100%) rename tests/modules/services/borgmatic/{ => linux}/basic-configuration.timer (100%) create mode 100644 tests/modules/services/borgmatic/linux/default.nix rename tests/modules/services/{window-managers => }/bspwm/bspwmrc (100%) rename tests/modules/services/{window-managers => }/bspwm/configuration.nix (100%) create mode 100644 tests/modules/services/bspwm/default.nix rename tests/modules/services/{window-managers => }/herbstluftwm/default.nix (61%) rename tests/modules/services/{window-managers => }/herbstluftwm/herbstluftwm-no-tags-autostart (100%) rename tests/modules/services/{window-managers => }/herbstluftwm/herbstluftwm-no-tags.nix (100%) rename tests/modules/services/{window-managers => }/herbstluftwm/herbstluftwm-simple-config-autostart (100%) rename tests/modules/services/{window-managers => }/herbstluftwm/herbstluftwm-simple-config.nix (100%) rename tests/modules/services/{window-managers => }/hyprland/default.nix (85%) rename tests/modules/services/{window-managers => }/hyprland/inconsistent-config.nix (100%) rename tests/modules/services/{window-managers => }/hyprland/multiple-devices-config.conf (100%) rename tests/modules/services/{window-managers => }/hyprland/multiple-devices-config.nix (100%) rename tests/modules/services/{window-managers => }/hyprland/null-all-packages-config.nix (100%) rename tests/modules/services/{window-managers => }/hyprland/null-package-config.conf (100%) rename tests/modules/services/{window-managers => }/hyprland/null-package-config.nix (100%) rename tests/modules/services/{window-managers => }/hyprland/null-portal-package-config.nix (100%) rename tests/modules/services/{window-managers => }/hyprland/simple-config.conf (100%) rename tests/modules/services/{window-managers => }/hyprland/simple-config.nix (100%) rename tests/modules/services/{window-managers => }/hyprland/sourceFirst-false-config.conf (100%) rename tests/modules/services/{window-managers => }/hyprland/sourceFirst-false-config.nix (100%) rename tests/modules/services/{window-managers => }/i3/default.nix (83%) rename tests/modules/services/{window-managers => }/i3/i3-bar-focused-colors-expected.conf (100%) rename tests/modules/services/{window-managers => }/i3/i3-bar-focused-colors.nix (100%) rename tests/modules/services/{window-managers => }/i3/i3-followmouse-expected.conf (100%) rename tests/modules/services/{window-managers => }/i3/i3-followmouse.nix (100%) rename tests/modules/services/{window-managers => }/i3/i3-fonts-deprecated.nix (100%) rename tests/modules/services/{window-managers => }/i3/i3-fonts-expected.conf (100%) rename tests/modules/services/{window-managers => }/i3/i3-fonts.nix (100%) rename tests/modules/services/{window-managers => }/i3/i3-keybindings-expected.conf (100%) rename tests/modules/services/{window-managers => }/i3/i3-keybindings.nix (100%) rename tests/modules/services/{window-managers => }/i3/i3-null-config.nix (100%) rename tests/modules/services/{window-managers => }/i3/i3-stubs.nix (100%) rename tests/modules/services/{window-managers => }/i3/i3-workspace-default-expected.conf (100%) rename tests/modules/services/{window-managers => }/i3/i3-workspace-default.nix (100%) rename tests/modules/services/{window-managers => }/i3/i3-workspace-output-expected.conf (100%) rename tests/modules/services/{window-managers => }/i3/i3-workspace-output.nix (100%) rename tests/modules/services/jellyfin-mpv-shim/{jellyfin-mpv-shim-example-settings-expected-bindings => example-settings-expected-bindings} (100%) rename tests/modules/services/jellyfin-mpv-shim/{jellyfin-mpv-shim-example-settings-expected-config => example-settings-expected-config} (100%) rename tests/modules/services/jellyfin-mpv-shim/{jellyfin-mpv-shim-example-settings-expected-settings => example-settings-expected-settings} (100%) rename tests/modules/services/jellyfin-mpv-shim/{jellyfin-mpv-shim-example-settings.nix => example-settings.nix} (79%) rename tests/modules/services/{window-managers => }/labwc/autostart (100%) rename tests/modules/services/{window-managers => }/labwc/default.nix (73%) rename tests/modules/services/{window-managers => }/labwc/environment (100%) rename tests/modules/services/{window-managers => }/labwc/labwc-autostart.nix (100%) rename tests/modules/services/{window-managers => }/labwc/labwc-environment.nix (100%) rename tests/modules/services/{window-managers => }/labwc/labwc-menu.nix (100%) rename tests/modules/services/{window-managers => }/labwc/labwc-rc.nix (100%) rename tests/modules/services/{window-managers => }/labwc/menu.xml (100%) rename tests/modules/services/{window-managers => }/labwc/rc.xml (100%) create mode 100644 tests/modules/services/ollama/default.nix rename tests/modules/services/{window-managers => }/river/configuration.nix (100%) create mode 100644 tests/modules/services/river/default.nix rename tests/modules/services/{window-managers => }/river/init (100%) create mode 100644 tests/modules/services/spectrwm/default.nix rename tests/modules/services/{window-managers => }/spectrwm/spectrwm-simple-config-expected-spectrwm.conf (100%) rename tests/modules/services/{window-managers => }/spectrwm/spectrwm-simple-config.nix (100%) rename tests/modules/services/{window-managers => }/sway/default.nix (92%) rename tests/modules/services/{window-managers => }/sway/sway-bar-focused-colors.conf (100%) rename tests/modules/services/{window-managers => }/sway/sway-bar-focused-colors.nix (100%) rename tests/modules/services/{window-managers => }/sway/sway-bindkeys-to-code-and-extra-config.conf (100%) rename tests/modules/services/{window-managers => }/sway/sway-bindkeys-to-code-and-extra-config.nix (100%) rename tests/modules/services/{window-managers => }/sway/sway-bindswitches.conf (100%) rename tests/modules/services/{window-managers => }/sway/sway-bindswitches.nix (100%) rename tests/modules/services/{window-managers => }/sway/sway-check-config.nix (100%) rename tests/modules/services/{window-managers => }/sway/sway-default.conf (100%) rename tests/modules/services/{window-managers => }/sway/sway-default.nix (100%) rename tests/modules/services/{window-managers => }/sway/sway-default.target (100%) rename tests/modules/services/{window-managers => }/sway/sway-followmouse-expected.conf (100%) rename tests/modules/services/{window-managers => }/sway/sway-followmouse-legacy-expected.conf (100%) rename tests/modules/services/{window-managers => }/sway/sway-followmouse-legacy.nix (100%) rename tests/modules/services/{window-managers => }/sway/sway-followmouse.nix (100%) rename tests/modules/services/{window-managers => }/sway/sway-modules.conf (100%) rename tests/modules/services/{window-managers => }/sway/sway-modules.nix (100%) rename tests/modules/services/{window-managers => }/sway/sway-no-xwayland.nix (100%) rename tests/modules/services/{window-managers => }/sway/sway-null-config.nix (100%) rename tests/modules/services/{window-managers => }/sway/sway-null-package.conf (100%) rename tests/modules/services/{window-managers => }/sway/sway-null-package.nix (100%) rename tests/modules/services/{window-managers => }/sway/sway-post-2003.conf (100%) rename tests/modules/services/{window-managers => }/sway/sway-post-2003.nix (100%) rename tests/modules/services/{window-managers => }/sway/sway-systemd-autostart.nix (100%) rename tests/modules/services/{window-managers => }/sway/sway-systemd-autostart.target (100%) rename tests/modules/services/{window-managers => }/sway/sway-systemd-variables.conf (100%) rename tests/modules/services/{window-managers => }/sway/sway-systemd-variables.nix (100%) rename tests/modules/services/{window-managers => }/sway/sway-workspace-default-expected.conf (100%) rename tests/modules/services/{window-managers => }/sway/sway-workspace-default.nix (100%) rename tests/modules/services/{window-managers => }/sway/sway-workspace-output-expected.conf (100%) rename tests/modules/services/{window-managers => }/sway/sway-workspace-output.nix (100%) rename tests/modules/services/{window-managers => }/sway/swaynag-empty-settings.nix (100%) rename tests/modules/services/{window-managers => }/sway/swaynag-example-settings-expected.conf (100%) rename tests/modules/services/{window-managers => }/sway/swaynag-example-settings.nix (100%) delete mode 100644 tests/modules/services/syncthing/common/default.nix create mode 100644 tests/modules/services/syncthing/default.nix rename tests/modules/services/syncthing/{common => }/expected-agent.plist (100%) rename tests/modules/services/syncthing/{common => }/extra-options.nix (100%) rename tests/modules/services/{window-managers => }/wayfire/configuration.ini (100%) rename tests/modules/services/{window-managers => }/wayfire/configuration.nix (100%) rename tests/modules/services/{window-managers => }/wayfire/default.nix (53%) rename tests/modules/services/{window-managers => }/wayfire/wf-shell.ini (100%) rename tests/modules/services/{window-managers => }/wayfire/wf-shell.nix (100%) delete mode 100644 tests/modules/services/window-managers/bspwm/default.nix delete mode 100644 tests/modules/services/window-managers/river/default.nix delete mode 100644 tests/modules/services/window-managers/spectrwm/default.nix diff --git a/tests/default.nix b/tests/default.nix index b1a644fd1..316433822 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -150,7 +150,6 @@ let isDarwin = pkgs.stdenv.hostPlatform.isDarwin; isLinux = pkgs.stdenv.hostPlatform.isLinux; - in import nmtSrc { inherit lib pkgs modules; @@ -158,373 +157,71 @@ import nmtSrc { "home" "activationPackage" ]; - tests = builtins.foldl' (a: b: a // (import b)) { } ( - [ - # keep-sorted start case=no numeric=yes - ./lib/generators - ./lib/types - ./modules/files - ./modules/home-environment - ./modules/misc/fontconfig - ./modules/misc/manual - ./modules/misc/nix - ./modules/misc/specialisation - ./modules/misc/xdg - ./modules/programs/aerc - ./modules/programs/aichat - ./modules/programs/alacritty - ./modules/programs/alot - ./modules/programs/antidote - ./modules/programs/aria2 - ./modules/programs/atuin - ./modules/programs/autojump - ./modules/programs/bacon - ./modules/programs/bash - ./modules/programs/bat - ./modules/programs/borgmatic - ./modules/programs/bottom - ./modules/programs/broot - ./modules/programs/browserpass - ./modules/programs/btop - ./modules/programs/carapace - ./modules/programs/cava - ./modules/programs/clock-rs - ./modules/programs/cmus - ./modules/programs/codex - ./modules/programs/comodoro - ./modules/programs/darcs - ./modules/programs/dircolors - ./modules/programs/direnv - ./modules/programs/earthly - ./modules/programs/emacs - ./modules/programs/eza - ./modules/programs/fastfetch - ./modules/programs/feh - ./modules/programs/firefox - ./modules/programs/firefox/firefox.nix - ./modules/programs/firefox/floorp.nix - ./modules/programs/firefox/librewolf.nix - ./modules/programs/fish - ./modules/programs/gallery-dl - ./modules/programs/gh - ./modules/programs/gh-dash - ./modules/programs/ghostty - ./modules/programs/git - ./modules/programs/git-cliff - ./modules/programs/git-credential-oauth - ./modules/programs/git-worktree-switcher - ./modules/programs/go - ./modules/programs/gpg - ./modules/programs/gradle - ./modules/programs/granted - ./modules/programs/helix - ./modules/programs/himalaya - ./modules/programs/htop - ./modules/programs/hwatch - ./modules/programs/hyfetch - ./modules/programs/i3status - ./modules/programs/inori - ./modules/programs/irssi - ./modules/programs/joplin-desktop - ./modules/programs/jqp - ./modules/programs/jujutsu - ./modules/programs/k9s - ./modules/programs/kakoune - ./modules/programs/keepassxc - ./modules/programs/khal - ./modules/programs/khard - ./modules/programs/kitty - ./modules/programs/kubecolor - ./modules/programs/lapce - ./modules/programs/lazydocker - ./modules/programs/lazysql - ./modules/programs/ledger - ./modules/programs/less - ./modules/programs/lesspipe - ./modules/programs/lf - ./modules/programs/lieer - ./modules/programs/lsd - ./modules/programs/man - ./modules/programs/mbsync - ./modules/programs/mc - ./modules/programs/meli - ./modules/programs/mergiraf - ./modules/programs/micro - ./modules/programs/mise - ./modules/programs/mods - ./modules/programs/mpv - ./modules/programs/mu - ./modules/programs/mujmap - ./modules/programs/ncmpcpp - ./modules/programs/ne - ./modules/programs/neomutt - ./modules/programs/neovide - ./modules/programs/neovim - ./modules/programs/newsboat - ./modules/programs/nheko - ./modules/programs/nix-index - ./modules/programs/nix-init - ./modules/programs/nix-your-shell - ./modules/programs/nnn - ./modules/programs/numbat - ./modules/programs/nushell - ./modules/programs/nyxt - ./modules/programs/oh-my-posh - ./modules/programs/onlyoffice - ./modules/programs/openstackclient - ./modules/programs/pandoc - ./modules/programs/papis - ./modules/programs/pay-respects - ./modules/programs/pet - ./modules/programs/pgcli - ./modules/programs/pistol - ./modules/programs/pls - ./modules/programs/poetry - ./modules/programs/powerline-go - ./modules/programs/pubs - ./modules/programs/pyenv - ./modules/programs/qcal - ./modules/programs/qutebrowser - ./modules/programs/ranger - ./modules/programs/readline - ./modules/programs/rio - ./modules/programs/ripgrep - ./modules/programs/ripgrep-all - ./modules/programs/rmpc - ./modules/programs/ruff - ./modules/programs/sagemath - ./modules/programs/sapling - ./modules/programs/sbt - ./modules/programs/scmpuff - ./modules/programs/senpai - ./modules/programs/sesh - ./modules/programs/sftpman - ./modules/programs/sioyek - ./modules/programs/sm64ex - ./modules/programs/smug - ./modules/programs/spotify-player - ./modules/programs/ssh - ./modules/programs/starship - ./modules/programs/streamlink - ./modules/programs/superfile - ./modules/programs/taskwarrior - ./modules/programs/tealdeer - ./modules/programs/television - ./modules/programs/tex-fmt - ./modules/programs/texlive - ./modules/programs/thefuck - ./modules/programs/thunderbird - ./modules/programs/tmate - ./modules/programs/tmux - ./modules/programs/topgrade - ./modules/programs/translate-shell - ./modules/programs/uv - ./modules/programs/vifm - ./modules/programs/vim-vint - ./modules/programs/visidata - ./modules/programs/vscode - ./modules/programs/wallust - ./modules/programs/watson - ./modules/programs/waveterm - ./modules/programs/wezterm - ./modules/programs/yazi - ./modules/programs/zed-editor - ./modules/programs/zellij - ./modules/programs/zk - ./modules/programs/zplug - ./modules/programs/zsh - ./modules/services/gpg-agent - ./modules/services/syncthing/common - ./modules/xresources - # keep-sorted end - ] - ++ lib.optionals isDarwin [ - # keep-sorted start case=no numeric=yes - ./modules/launchd - ./modules/programs/aerospace - ./modules/programs/element-desktop/darwin.nix - ./modules/programs/sketchybar - ./modules/services/borgmatic-darwin - ./modules/services/emacs-darwin - ./modules/services/espanso-darwin - ./modules/services/git-sync-darwin - ./modules/services/home-manager-auto-expire-darwin - ./modules/services/imapnotify-darwin - ./modules/services/jankyborders - ./modules/services/macos-remap-keys - ./modules/services/nix-gc-darwin - ./modules/services/ollama/darwin - ./modules/services/skhd - ./modules/services/yubikey-agent-darwin - ./modules/targets-darwin - # keep-sorted end - ] - ++ lib.optionals isLinux [ - # keep-sorted start case=no numeric=yes - ./modules/config/home-cursor - ./modules/config/i18n - ./modules/dbus - ./modules/i18n/input-method - ./modules/misc/debug - ./modules/misc/editorconfig - ./modules/misc/gtk - ./modules/misc/numlock - ./modules/misc/pam - ./modules/misc/qt - ./modules/misc/xdg/linux.nix - ./modules/misc/xsession - ./modules/programs/abook - ./modules/programs/anyrun - ./modules/programs/autorandr - ./modules/programs/awscli - ./modules/programs/beets # One test relies on services.mpd - ./modules/programs/bemenu - ./modules/programs/boxxy - ./modules/programs/cavalier - ./modules/programs/distrobox - ./modules/programs/element-desktop/linux.nix - ./modules/programs/eww - ./modules/programs/foliate - ./modules/programs/foot - ./modules/programs/freetube - ./modules/programs/fuzzel - ./modules/programs/getmail - ./modules/programs/gnome-shell - ./modules/programs/gnome-terminal - ./modules/programs/halloy - ./modules/programs/hexchat - ./modules/programs/hyprlock - ./modules/programs/i3bar-river - ./modules/programs/i3blocks - ./modules/programs/i3status-rust - ./modules/programs/imv - ./modules/programs/kickoff - ./modules/programs/kodi - ./modules/programs/looking-glass-client - ./modules/programs/lutris - ./modules/programs/mangohud - ./modules/programs/mpvpaper - ./modules/programs/ncmpcpp-linux - ./modules/programs/nh - ./modules/programs/niriswitcher - ./modules/programs/onagre - ./modules/programs/onedrive - ./modules/programs/pqiv - ./modules/programs/ptyxis - ./modules/programs/rbw - ./modules/programs/rofi - ./modules/programs/rofi-pass - ./modules/programs/sway-easyfocus - ./modules/programs/swayimg - ./modules/programs/swaylock - ./modules/programs/swayr - ./modules/programs/terminator - ./modules/programs/tofi - ./modules/programs/vesktop - ./modules/programs/vinegar - ./modules/programs/waybar - ./modules/programs/wayprompt - ./modules/programs/wlogout - ./modules/programs/wofi - ./modules/programs/xmobar - ./modules/programs/yambar - ./modules/programs/yt-dlp - ./modules/services/activitywatch - ./modules/services/avizo - ./modules/services/barrier - ./modules/services/blanket - ./modules/services/borgmatic - ./modules/services/cachix-agent - ./modules/services/clipcat - ./modules/services/cliphist - ./modules/services/clipman - ./modules/services/clipse - ./modules/services/comodoro - ./modules/services/conky - ./modules/services/copyq - ./modules/services/darkman - ./modules/services/davmail - ./modules/services/devilspie2 - ./modules/services/dropbox - ./modules/services/easyeffects - ./modules/services/emacs - ./modules/services/espanso - ./modules/services/flameshot - ./modules/services/fluidsynth - ./modules/services/fnott - ./modules/services/fusuma - ./modules/services/git-sync - ./modules/services/glance - ./modules/services/gromit-mpx - ./modules/services/home-manager-auto-expire - ./modules/services/home-manager-auto-upgrade - ./modules/services/hypridle - ./modules/services/hyprpaper - ./modules/services/hyprpolkitagent - ./modules/services/hyprsunset - ./modules/services/imapnotify - ./modules/services/kanshi - ./modules/services/lieer - ./modules/services/linux-wallpaperengine - ./modules/services/lxqt-policykit-agent - ./modules/services/mako - ./modules/services/mopidy - ./modules/services/mpd - ./modules/services/mpd-mpris - ./modules/services/mpdris2 - ./modules/services/mpdscribble - ./modules/services/nix-gc - ./modules/services/ollama/linux - ./modules/services/osmscout-server - ./modules/services/pantalaimon - ./modules/services/parcellite - ./modules/services/pass-secret-service - ./modules/services/pasystray - ./modules/services/pbgopy - ./modules/services/picom - ./modules/services/playerctld - ./modules/services/podman-linux - ./modules/services/polkit-gnome - ./modules/services/polybar - ./modules/services/recoll - ./modules/services/redshift-gammastep - ./modules/services/remmina - ./modules/services/restic - ./modules/services/screen-locker - ./modules/services/shikane - ./modules/services/signaturepdf - ./modules/services/snixembed - ./modules/services/swayidle - ./modules/services/swaync - ./modules/services/swayosd - ./modules/services/swww - ./modules/services/sxhkd - ./modules/services/syncthing/linux - ./modules/services/tldr-update - ./modules/services/trayer - ./modules/services/trayscale - ./modules/services/twmn - ./modules/services/udiskie - ./modules/services/volnoti - ./modules/services/way-displays - ./modules/services/wayvnc - ./modules/services/window-managers/bspwm - ./modules/services/window-managers/herbstluftwm - ./modules/services/window-managers/hyprland - ./modules/services/window-managers/i3 - ./modules/services/window-managers/labwc - ./modules/services/window-managers/river - ./modules/services/window-managers/spectrwm - ./modules/services/window-managers/sway - ./modules/services/window-managers/wayfire - ./modules/services/wlsunset - ./modules/services/wob - ./modules/services/wpaperd - ./modules/services/xsettingsd - ./modules/services/yubikey-agent - ./modules/systemd - ./modules/targets-linux - # keep-sorted end - ] - ); + tests = + builtins.foldl' + ( + a: b: + a + // ( + let + imported = import b; + in + if lib.isFunction imported then imported { inherit lib pkgs; } else imported + ) + ) + { } + ( + [ + # keep-sorted start case=no numeric=yes + ./lib/generators + ./lib/types + ./modules/files + ./modules/home-environment + ./modules/misc/fontconfig + ./modules/misc/manual + ./modules/misc/nix + ./modules/misc/specialisation + ./modules/misc/xdg + ./modules/xresources + # keep-sorted end + ] + ++ lib.optionals isDarwin [ + # keep-sorted start case=no numeric=yes + ./modules/launchd + ./modules/targets-darwin + # keep-sorted end + ] + ++ lib.optionals isLinux [ + # keep-sorted start case=no numeric=yes + ./modules/config/home-cursor + ./modules/config/i18n + ./modules/dbus + ./modules/i18n/input-method + ./modules/misc/debug + ./modules/misc/editorconfig + ./modules/misc/gtk + ./modules/misc/numlock + ./modules/misc/pam + ./modules/misc/qt + ./modules/misc/xdg/linux.nix + ./modules/misc/xsession + ./modules/systemd + ./modules/targets-linux + # keep-sorted end + ] + ++ (lib.concatMap + ( + dir: + lib.pipe dir [ + builtins.readDir + (lib.filterAttrs (_path: kind: kind == "directory")) + (lib.mapAttrsToList (path: _kind: lib.path.append dir path)) + ] + ) + [ + ./modules/services + ./modules/programs + ] + ) + ); } diff --git a/tests/flake.lock b/tests/flake.lock new file mode 100644 index 000000000..de56abfde --- /dev/null +++ b/tests/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1750506804, + "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/tests/modules/programs/abook/default.nix b/tests/modules/programs/abook/default.nix index 12ad238ed..fa98c1956 100644 --- a/tests/modules/programs/abook/default.nix +++ b/tests/modules/programs/abook/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { abook-no-settings = ./no-settings.nix; abook-with-settings = ./with-settings.nix; } diff --git a/tests/modules/programs/aerospace/default.nix b/tests/modules/programs/aerospace/default.nix index d77a32af6..56e5a3735 100644 --- a/tests/modules/programs/aerospace/default.nix +++ b/tests/modules/programs/aerospace/default.nix @@ -1 +1,5 @@ -{ aerospace = ./aerospace.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { + aerospace = ./aerospace.nix; +} diff --git a/tests/modules/programs/anyrun/default.nix b/tests/modules/programs/anyrun/default.nix index 823513537..263342583 100644 --- a/tests/modules/programs/anyrun/default.nix +++ b/tests/modules/programs/anyrun/default.nix @@ -1 +1,5 @@ -{ anyrun = ./basic-config.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + anyrun = ./basic-config.nix; +} diff --git a/tests/modules/programs/autorandr/default.nix b/tests/modules/programs/autorandr/default.nix index bb7b279ee..d56482e0b 100644 --- a/tests/modules/programs/autorandr/default.nix +++ b/tests/modules/programs/autorandr/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { autorandr-basic-configuration = ./basic-configuration.nix; autorandr-scale = ./scale.nix; } diff --git a/tests/modules/programs/awscli/default.nix b/tests/modules/programs/awscli/default.nix index dc1734f70..12a783940 100644 --- a/tests/modules/programs/awscli/default.nix +++ b/tests/modules/programs/awscli/default.nix @@ -1 +1,4 @@ -{ awscli = ./awscli.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + awscli = ./awscli.nix; +} diff --git a/tests/modules/programs/beets/default.nix b/tests/modules/programs/beets/default.nix index 93bf207c6..3dd3c75ea 100644 --- a/tests/modules/programs/beets/default.nix +++ b/tests/modules/programs/beets/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { beets-mpdstats = ./mpdstats.nix; beets-mpdstats-external = ./mpdstats-external.nix; beets-mpdupdate = ./mpdupdate.nix; diff --git a/tests/modules/programs/bemenu/default.nix b/tests/modules/programs/bemenu/default.nix index 8ae2849e9..8262ceba0 100644 --- a/tests/modules/programs/bemenu/default.nix +++ b/tests/modules/programs/bemenu/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { bemenu-empty-configuration = ./empty-configuration.nix; bemenu-basic-configuration = ./basic-configuration.nix; } diff --git a/tests/modules/programs/boxxy/default.nix b/tests/modules/programs/boxxy/default.nix index 52ebcacc4..66a3aa40c 100644 --- a/tests/modules/programs/boxxy/default.nix +++ b/tests/modules/programs/boxxy/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { boxxy-empty-settings = ./empty-settings.nix; boxxy-example-settings = ./example-settings.nix; } diff --git a/tests/modules/programs/cavalier/default.nix b/tests/modules/programs/cavalier/default.nix index 6f488f2fc..1796b87fb 100644 --- a/tests/modules/programs/cavalier/default.nix +++ b/tests/modules/programs/cavalier/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { cavalier-general-settings = ./cavalier-general-settings.nix; cavalier-cava-settings = ./cavalier-cava-settings.nix; } diff --git a/tests/modules/programs/distrobox/default.nix b/tests/modules/programs/distrobox/default.nix index 2dbe7e46b..6525760fb 100644 --- a/tests/modules/programs/distrobox/default.nix +++ b/tests/modules/programs/distrobox/default.nix @@ -1 +1,4 @@ -{ distrobox-example-config = ./example-config.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + distrobox-example-config = ./example-config.nix; +} diff --git a/tests/modules/programs/element-desktop/darwin.nix b/tests/modules/programs/element-desktop/darwin.nix deleted file mode 100644 index cb23edf45..000000000 --- a/tests/modules/programs/element-desktop/darwin.nix +++ /dev/null @@ -1 +0,0 @@ -{ element-desktop-darwin = ./example-config-darwin.nix; } diff --git a/tests/modules/programs/element-desktop/darwin/default.nix b/tests/modules/programs/element-desktop/darwin/default.nix new file mode 100644 index 000000000..123b7c835 --- /dev/null +++ b/tests/modules/programs/element-desktop/darwin/default.nix @@ -0,0 +1 @@ +{ element-desktop = ./example-config-darwin.nix; } diff --git a/tests/modules/programs/element-desktop/example-config-darwin.nix b/tests/modules/programs/element-desktop/darwin/example-config-darwin.nix similarity index 95% rename from tests/modules/programs/element-desktop/example-config-darwin.nix rename to tests/modules/programs/element-desktop/darwin/example-config-darwin.nix index 9ec3374af..2f22aab25 100644 --- a/tests/modules/programs/element-desktop/example-config-darwin.nix +++ b/tests/modules/programs/element-desktop/darwin/example-config-darwin.nix @@ -54,15 +54,15 @@ assertFileExists "home-files/Library/Application Support/Element-other/config.json" assertFileContent "home-files/Library/Application Support/Element/config.json" \ - ${./cfg/default.json} + ${../cfg/default.json} assertFileContent "home-files/Library/Application Support/Element-work/config.json" \ - ${./cfg/work.json} + ${../cfg/work.json} assertFileContent "home-files/Library/Application Support/Element-home/config.json" \ - ${./cfg/home.json} + ${../cfg/home.json} assertFileContent "home-files/Library/Application Support/Element-other/config.json" \ - ${./cfg/other.json} + ${../cfg/other.json} ''; } diff --git a/tests/modules/programs/element-desktop/default.nix b/tests/modules/programs/element-desktop/default.nix new file mode 100644 index 000000000..4b1206a22 --- /dev/null +++ b/tests/modules/programs/element-desktop/default.nix @@ -0,0 +1,3 @@ +{ lib, pkgs, ... }: +(lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin (import ./darwin/default.nix)) +// (lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux (import ./linux/default.nix)) diff --git a/tests/modules/programs/element-desktop/linux.nix b/tests/modules/programs/element-desktop/linux.nix deleted file mode 100644 index 6f4541ad2..000000000 --- a/tests/modules/programs/element-desktop/linux.nix +++ /dev/null @@ -1 +0,0 @@ -{ element-desktop-linux = ./example-config-linux.nix; } diff --git a/tests/modules/programs/element-desktop/linux/default.nix b/tests/modules/programs/element-desktop/linux/default.nix new file mode 100644 index 000000000..56bade216 --- /dev/null +++ b/tests/modules/programs/element-desktop/linux/default.nix @@ -0,0 +1,3 @@ +{ + element-desktop = ./example-config-linux.nix; +} diff --git a/tests/modules/programs/element-desktop/example-config-linux.nix b/tests/modules/programs/element-desktop/linux/example-config-linux.nix similarity index 95% rename from tests/modules/programs/element-desktop/example-config-linux.nix rename to tests/modules/programs/element-desktop/linux/example-config-linux.nix index 649930282..c485c59ad 100644 --- a/tests/modules/programs/element-desktop/example-config-linux.nix +++ b/tests/modules/programs/element-desktop/linux/example-config-linux.nix @@ -54,15 +54,15 @@ assertFileExists home-files/.config/Element-other/config.json assertFileContent home-files/.config/Element/config.json \ - ${./cfg/default.json} + ${../cfg/default.json} assertFileContent home-files/.config/Element-work/config.json \ - ${./cfg/work.json} + ${../cfg/work.json} assertFileContent home-files/.config/Element-home/config.json \ - ${./cfg/home.json} + ${../cfg/home.json} assertFileContent home-files/.config/Element-other/config.json \ - ${./cfg/other.json} + ${../cfg/other.json} ''; } diff --git a/tests/modules/programs/eww/default.nix b/tests/modules/programs/eww/default.nix index b87014079..7161a78f4 100644 --- a/tests/modules/programs/eww/default.nix +++ b/tests/modules/programs/eww/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { eww-basic-config = ./basic-config.nix; eww-null-config = ./null-config.nix; } diff --git a/tests/modules/programs/firefox/default.nix b/tests/modules/programs/firefox/default.nix index 4e7b93c69..492afda56 100644 --- a/tests/modules/programs/firefox/default.nix +++ b/tests/modules/programs/firefox/default.nix @@ -1 +1,6 @@ -{ "firefox-multiple-derivatives" = ./multiple-derivatives.nix; } +{ + "firefox-multiple-derivatives" = ./multiple-derivatives.nix; +} +// (import ./firefox.nix) +// (import ./floorp.nix) +// (import ./librewolf.nix) diff --git a/tests/modules/programs/foliate/default.nix b/tests/modules/programs/foliate/default.nix index 8f535d3f3..f876dc494 100644 --- a/tests/modules/programs/foliate/default.nix +++ b/tests/modules/programs/foliate/default.nix @@ -1,3 +1,4 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { foliate-basic-theme = ./basic-theme.nix; } diff --git a/tests/modules/programs/foot/default.nix b/tests/modules/programs/foot/default.nix index cb813ffaf..6714bd50a 100644 --- a/tests/modules/programs/foot/default.nix +++ b/tests/modules/programs/foot/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { foot-example-settings = ./example-settings.nix; foot-empty-settings = ./empty-settings.nix; foot-systemd-user-service = ./systemd-user-service.nix; diff --git a/tests/modules/programs/freetube/default.nix b/tests/modules/programs/freetube/default.nix index cb6fd4d2f..1e1961b06 100644 --- a/tests/modules/programs/freetube/default.nix +++ b/tests/modules/programs/freetube/default.nix @@ -1 +1,4 @@ -{ freetube-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + freetube-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/programs/fuzzel/default.nix b/tests/modules/programs/fuzzel/default.nix index 702bd0d67..9215b1820 100644 --- a/tests/modules/programs/fuzzel/default.nix +++ b/tests/modules/programs/fuzzel/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { fuzzel-example-settings = ./example-settings.nix; fuzzel-empty-settings = ./empty-settings.nix; } diff --git a/tests/modules/programs/getmail/default.nix b/tests/modules/programs/getmail/default.nix index cb789a90d..282e5429a 100644 --- a/tests/modules/programs/getmail/default.nix +++ b/tests/modules/programs/getmail/default.nix @@ -1 +1,4 @@ -{ getmail = ./getmail.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + getmail = ./getmail.nix; +} diff --git a/tests/modules/programs/gnome-shell/default.nix b/tests/modules/programs/gnome-shell/default.nix index 58e4598f8..f6a570b84 100644 --- a/tests/modules/programs/gnome-shell/default.nix +++ b/tests/modules/programs/gnome-shell/default.nix @@ -1 +1,5 @@ -{ gnome-shell = ./gnome-shell.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + gnome-shell = ./gnome-shell.nix; +} diff --git a/tests/modules/programs/gnome-terminal/default.nix b/tests/modules/programs/gnome-terminal/default.nix index d4a224272..411e141d3 100644 --- a/tests/modules/programs/gnome-terminal/default.nix +++ b/tests/modules/programs/gnome-terminal/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { gnome-terminal-1 = ./gnome-terminal-1.nix; gnome-terminal-bad-profile-name = ./bad-profile-name.nix; } diff --git a/tests/modules/programs/halloy/default.nix b/tests/modules/programs/halloy/default.nix index 2d65b55da..34891708d 100644 --- a/tests/modules/programs/halloy/default.nix +++ b/tests/modules/programs/halloy/default.nix @@ -1 +1,4 @@ -{ halloy-example-config = ./example-config.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + halloy-example-config = ./example-config.nix; +} diff --git a/tests/modules/programs/hexchat/default.nix b/tests/modules/programs/hexchat/default.nix index e70c4610c..f18631727 100644 --- a/tests/modules/programs/hexchat/default.nix +++ b/tests/modules/programs/hexchat/default.nix @@ -1 +1,4 @@ -{ hexchat-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + hexchat-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/programs/hyprlock/default.nix b/tests/modules/programs/hyprlock/default.nix index 3ea18c021..3549fbd98 100644 --- a/tests/modules/programs/hyprlock/default.nix +++ b/tests/modules/programs/hyprlock/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { hyprlock-basic-configuration = ./basic-configuration.nix; hyprlock-complex-configuration = ./complex-configuration.nix; } diff --git a/tests/modules/programs/i3bar-river/default.nix b/tests/modules/programs/i3bar-river/default.nix index 9bfd5f8fc..c9a410a8c 100644 --- a/tests/modules/programs/i3bar-river/default.nix +++ b/tests/modules/programs/i3bar-river/default.nix @@ -1 +1,4 @@ -{ i3bar-river-example-config = ./example-config.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + i3bar-river-example-config = ./example-config.nix; +} diff --git a/tests/modules/programs/i3blocks/default.nix b/tests/modules/programs/i3blocks/default.nix index f03eb3909..2b4bf1768 100644 --- a/tests/modules/programs/i3blocks/default.nix +++ b/tests/modules/programs/i3blocks/default.nix @@ -1 +1,5 @@ -{ i3blocks-with-ordered-blocks = ./with-ordered-blocks.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + i3blocks-with-ordered-blocks = ./with-ordered-blocks.nix; +} diff --git a/tests/modules/programs/i3status-rust/default.nix b/tests/modules/programs/i3status-rust/default.nix index d99b0156a..df0c40aa0 100644 --- a/tests/modules/programs/i3status-rust/default.nix +++ b/tests/modules/programs/i3status-rust/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { i3status-rust-with-default = ./with-default.nix; i3status-rust-with-custom = ./with-custom.nix; i3status-rust-with-extra-settings = ./with-extra-settings.nix; diff --git a/tests/modules/programs/imv/default.nix b/tests/modules/programs/imv/default.nix index b035c7278..28c3cfa8c 100644 --- a/tests/modules/programs/imv/default.nix +++ b/tests/modules/programs/imv/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { imv-basic-configuration = ./basic-configuration.nix; imv-empty-configuration = ./empty-configuration.nix; } diff --git a/tests/modules/programs/kickoff/default.nix b/tests/modules/programs/kickoff/default.nix index 742e1c5cd..86069a759 100644 --- a/tests/modules/programs/kickoff/default.nix +++ b/tests/modules/programs/kickoff/default.nix @@ -1 +1,4 @@ -{ kickoff-example-config = ./example-config.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + kickoff-example-config = ./example-config.nix; +} diff --git a/tests/modules/programs/kodi/default.nix b/tests/modules/programs/kodi/default.nix index 1902645c4..da672e7b3 100644 --- a/tests/modules/programs/kodi/default.nix +++ b/tests/modules/programs/kodi/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { kodi-example-addon-settings = ./example-addon-settings.nix; kodi-example-settings = ./example-settings.nix; kodi-example-sources = ./example-sources.nix; diff --git a/tests/modules/programs/looking-glass-client/default.nix b/tests/modules/programs/looking-glass-client/default.nix index fdbbb25a6..11aec9c7c 100644 --- a/tests/modules/programs/looking-glass-client/default.nix +++ b/tests/modules/programs/looking-glass-client/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { looking-glass-client-example-settings = ./example-settings.nix; looking-glass-client-empty-settings = ./empty-settings.nix; } diff --git a/tests/modules/programs/lutris/default.nix b/tests/modules/programs/lutris/default.nix index 27865e2b0..e8d3c62c3 100644 --- a/tests/modules/programs/lutris/default.nix +++ b/tests/modules/programs/lutris/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { lutris-runners = ./runners-configuration.nix; # lutris-wine = ./wine-configuration.nix; lutris-empty = ./empty.nix; diff --git a/tests/modules/programs/mangohud/default.nix b/tests/modules/programs/mangohud/default.nix index 87db32ed7..c7fb1ea5a 100644 --- a/tests/modules/programs/mangohud/default.nix +++ b/tests/modules/programs/mangohud/default.nix @@ -1 +1,4 @@ -{ mangohud-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + mangohud-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/programs/mpvpaper/default.nix b/tests/modules/programs/mpvpaper/default.nix index 3069c64d0..1f8266e5d 100644 --- a/tests/modules/programs/mpvpaper/default.nix +++ b/tests/modules/programs/mpvpaper/default.nix @@ -1 +1,4 @@ -{ mpvpaper-example-config = ./example-config.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + mpvpaper-example-config = ./example-config.nix; +} diff --git a/tests/modules/programs/ncmpcpp-linux/default.nix b/tests/modules/programs/ncmpcpp-linux/default.nix index 419339278..2592f5a64 100644 --- a/tests/modules/programs/ncmpcpp-linux/default.nix +++ b/tests/modules/programs/ncmpcpp-linux/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { ncmpcpp-use-mpd-config = ./ncmpcpp-use-mpd-config.nix; ncmpcpp-issue-3560 = ./ncmpcpp-issue-3560.nix; } diff --git a/tests/modules/programs/nh/default.nix b/tests/modules/programs/nh/default.nix index 77607ab99..557f4c056 100644 --- a/tests/modules/programs/nh/default.nix +++ b/tests/modules/programs/nh/default.nix @@ -1 +1,4 @@ -{ nh = ./nh.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + nh = ./nh.nix; +} diff --git a/tests/modules/programs/niriswitcher/default.nix b/tests/modules/programs/niriswitcher/default.nix index 4f1def362..42cf668f7 100644 --- a/tests/modules/programs/niriswitcher/default.nix +++ b/tests/modules/programs/niriswitcher/default.nix @@ -1 +1,4 @@ -{ niriswitcher-program = ./niriswitcher.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + niriswitcher-program = ./niriswitcher.nix; +} diff --git a/tests/modules/programs/onagre/default.nix b/tests/modules/programs/onagre/default.nix index eb796f4fb..bab953b40 100644 --- a/tests/modules/programs/onagre/default.nix +++ b/tests/modules/programs/onagre/default.nix @@ -1 +1,4 @@ -{ onagre-example-config = ./example-config.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + onagre-example-config = ./example-config.nix; +} diff --git a/tests/modules/programs/onedrive/default.nix b/tests/modules/programs/onedrive/default.nix index 2d9bd981f..8d49446a4 100644 --- a/tests/modules/programs/onedrive/default.nix +++ b/tests/modules/programs/onedrive/default.nix @@ -1 +1,4 @@ -{ onedrive-example-config = ./example-config.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + onedrive-example-config = ./example-config.nix; +} diff --git a/tests/modules/programs/pqiv/default.nix b/tests/modules/programs/pqiv/default.nix index 24798b354..8ea63a5b2 100644 --- a/tests/modules/programs/pqiv/default.nix +++ b/tests/modules/programs/pqiv/default.nix @@ -1 +1,4 @@ -{ pqiv-settings = ./settings.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + pqiv-settings = ./settings.nix; +} diff --git a/tests/modules/programs/ptyxis/default.nix b/tests/modules/programs/ptyxis/default.nix index d59fc2269..b40c0c667 100644 --- a/tests/modules/programs/ptyxis/default.nix +++ b/tests/modules/programs/ptyxis/default.nix @@ -1,3 +1,4 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { ptyxis-basic-palette = ./palette.nix; } diff --git a/tests/modules/programs/rbw/default.nix b/tests/modules/programs/rbw/default.nix index 99f36f314..8438dbb1c 100644 --- a/tests/modules/programs/rbw/default.nix +++ b/tests/modules/programs/rbw/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { rbw-empty-settings = ./empty-settings.nix; rbw-simple-settings = ./simple-settings.nix; rbw-settings = ./settings.nix; diff --git a/tests/modules/programs/rofi-pass/default.nix b/tests/modules/programs/rofi-pass/default.nix index 181aef4e1..081f08d6c 100644 --- a/tests/modules/programs/rofi-pass/default.nix +++ b/tests/modules/programs/rofi-pass/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { rofi-pass-root = ./rofi-pass-root.nix; rofi-pass-config = ./rofi-pass-config.nix; } diff --git a/tests/modules/programs/rofi/default.nix b/tests/modules/programs/rofi/default.nix index 2f8c0a95f..8fcf678ed 100644 --- a/tests/modules/programs/rofi/default.nix +++ b/tests/modules/programs/rofi/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { rofi-valid-config = ./valid-config.nix; rofi-custom-theme = ./custom-theme.nix; rofi-config-with-deprecated-options = ./config-with-deprecated-options.nix; diff --git a/tests/modules/programs/sketchybar/default.nix b/tests/modules/programs/sketchybar/default.nix index 64efb79a3..5e49946ce 100644 --- a/tests/modules/programs/sketchybar/default.nix +++ b/tests/modules/programs/sketchybar/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { sketchybar = ./sketchybar.nix; sketchybar-directory-config = ./sketchybar-directory-config.nix; sketchybar-invalid-lua-config = ./sketchybar-invalid-lua-config.nix; diff --git a/tests/modules/programs/sway-easyfocus/default.nix b/tests/modules/programs/sway-easyfocus/default.nix index 3474e8a03..def09313f 100644 --- a/tests/modules/programs/sway-easyfocus/default.nix +++ b/tests/modules/programs/sway-easyfocus/default.nix @@ -1 +1,4 @@ -{ sway-easyfocus-example-config = ./example-config.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + sway-easyfocus-example-config = ./example-config.nix; +} diff --git a/tests/modules/programs/swayimg/default.nix b/tests/modules/programs/swayimg/default.nix index b2c3dfa9b..a90fbffa4 100644 --- a/tests/modules/programs/swayimg/default.nix +++ b/tests/modules/programs/swayimg/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { swayimg-empty-settings = ./empty-settings.nix; swayimg-example-settings = ./example-settings.nix; } diff --git a/tests/modules/programs/swaylock/default.nix b/tests/modules/programs/swaylock/default.nix index 65434be25..a1da39c11 100644 --- a/tests/modules/programs/swaylock/default.nix +++ b/tests/modules/programs/swaylock/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { swaylock-disabled = import ./disabled.nix; swaylock-settings = import ./settings.nix; swaylock-enabled = import ./enabled.nix; diff --git a/tests/modules/programs/swayr/default.nix b/tests/modules/programs/swayr/default.nix index ed2908e90..e4f8228ee 100644 --- a/tests/modules/programs/swayr/default.nix +++ b/tests/modules/programs/swayr/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { swayr-basic-configuration = ./basic-configuration.nix; swayr-empty-configuration = ./empty-configuration.nix; } diff --git a/tests/modules/programs/terminator/default.nix b/tests/modules/programs/terminator/default.nix index 4d53e534c..30a4c2f5d 100644 --- a/tests/modules/programs/terminator/default.nix +++ b/tests/modules/programs/terminator/default.nix @@ -1 +1,5 @@ -{ terminator-config-file = ./config-file.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + terminator-config-file = ./config-file.nix; +} diff --git a/tests/modules/programs/todoman/todoman-config-expected b/tests/modules/programs/todoman/todoman-config-expected index 00da13e1a..563812e88 100644 --- a/tests/modules/programs/todoman/todoman-config-expected +++ b/tests/modules/programs/todoman/todoman-config-expected @@ -1,3 +1,4 @@ path = "/home/hm-user/base/path/calendar/*/*" date_format = "%d.%m.%Y" default_list = "test" + diff --git a/tests/modules/programs/tofi/default.nix b/tests/modules/programs/tofi/default.nix index 22b89d809..9fb159099 100644 --- a/tests/modules/programs/tofi/default.nix +++ b/tests/modules/programs/tofi/default.nix @@ -1 +1,5 @@ -{ tofi-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + tofi-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/programs/vesktop/default.nix b/tests/modules/programs/vesktop/default.nix index 5e3129407..a3fbf9c53 100644 --- a/tests/modules/programs/vesktop/default.nix +++ b/tests/modules/programs/vesktop/default.nix @@ -1 +1,4 @@ -{ vesktop-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + vesktop-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/programs/vinegar/default.nix b/tests/modules/programs/vinegar/default.nix index 0916c04ae..77ba8d59c 100644 --- a/tests/modules/programs/vinegar/default.nix +++ b/tests/modules/programs/vinegar/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { vinegar-empty-settings = ./empty-settings.nix; vinegar-example-settings = ./example-settings.nix; } diff --git a/tests/modules/programs/waybar/default.nix b/tests/modules/programs/waybar/default.nix index 20d4ecad3..bf0339968 100644 --- a/tests/modules/programs/waybar/default.nix +++ b/tests/modules/programs/waybar/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { waybar-systemd-with-graphical-session-target = ./systemd-with-graphical-session-target.nix; waybar-styling = ./styling.nix; waybar-settings-complex = ./settings-complex.nix; diff --git a/tests/modules/programs/wayprompt/default.nix b/tests/modules/programs/wayprompt/default.nix index 477cb57f4..989ccc96e 100644 --- a/tests/modules/programs/wayprompt/default.nix +++ b/tests/modules/programs/wayprompt/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { wayprompt-empty-settings = ./empty-settings.nix; wayprompt-example-settings = ./example-settings.nix; } diff --git a/tests/modules/programs/wlogout/default.nix b/tests/modules/programs/wlogout/default.nix index 294772e74..633f73eb4 100644 --- a/tests/modules/programs/wlogout/default.nix +++ b/tests/modules/programs/wlogout/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { wlogout-styling = ./styling.nix; wlogout-layout-single = ./layout-single.nix; wlogout-layout-multiple = ./layout-multiple.nix; diff --git a/tests/modules/programs/wofi/default.nix b/tests/modules/programs/wofi/default.nix index c37a62b5f..77bdc95e8 100644 --- a/tests/modules/programs/wofi/default.nix +++ b/tests/modules/programs/wofi/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { wofi-basic-configuration = ./basic-configuration.nix; wofi-empty-configuration = ./empty-configuration.nix; wofi-style-local-file = ./style-local-file.nix; diff --git a/tests/modules/programs/xmobar/default.nix b/tests/modules/programs/xmobar/default.nix index f1a314890..d83264ea3 100644 --- a/tests/modules/programs/xmobar/default.nix +++ b/tests/modules/programs/xmobar/default.nix @@ -1 +1,5 @@ -{ xmobar-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + xmobar-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/programs/yambar/default.nix b/tests/modules/programs/yambar/default.nix index 26de56732..e8afc19aa 100644 --- a/tests/modules/programs/yambar/default.nix +++ b/tests/modules/programs/yambar/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { yambar-empty-settings = ./empty-settings.nix; yambar-example-settings = ./example-settings.nix; } diff --git a/tests/modules/programs/yt-dlp/default.nix b/tests/modules/programs/yt-dlp/default.nix index 74a664edc..7702ec0fd 100644 --- a/tests/modules/programs/yt-dlp/default.nix +++ b/tests/modules/programs/yt-dlp/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { yt-dlp-simple-config = ./yt-dlp-simple-config.nix; yt-dlp-extraConfig = ./yt-dlp-extraConfig.nix; } diff --git a/tests/modules/services/activitywatch/default.nix b/tests/modules/services/activitywatch/default.nix index 3b3f43217..f3564d025 100644 --- a/tests/modules/services/activitywatch/default.nix +++ b/tests/modules/services/activitywatch/default.nix @@ -1,4 +1,5 @@ -{ +{ lib, pkgs, ... }: +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { activitywatch-basic-setup = ./basic-setup.nix; activitywatch-empty-server-settings = ./empty-server-settings.nix; } diff --git a/tests/modules/services/avizo/default.nix b/tests/modules/services/avizo/default.nix index 598f1cc51..458014923 100644 --- a/tests/modules/services/avizo/default.nix +++ b/tests/modules/services/avizo/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { avizo-with-settings = ./with-settings.nix; avizo-without-settings = ./without-settings.nix; } diff --git a/tests/modules/services/barrier/default.nix b/tests/modules/services/barrier/default.nix index d36f79532..6ad82e470 100644 --- a/tests/modules/services/barrier/default.nix +++ b/tests/modules/services/barrier/default.nix @@ -1 +1,5 @@ -{ barrier-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + barrier-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/blanket/default.nix b/tests/modules/services/blanket/default.nix index 8a439a52a..1eb132465 100644 --- a/tests/modules/services/blanket/default.nix +++ b/tests/modules/services/blanket/default.nix @@ -1 +1,5 @@ -{ blanket-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + blanket-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/borgmatic-darwin/default.nix b/tests/modules/services/borgmatic-darwin/default.nix deleted file mode 100644 index 60481767f..000000000 --- a/tests/modules/services/borgmatic-darwin/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - darwin-borgmatic-service-basic-configuration = ./basic-configuration.nix; - darwin-borgmatic-frequency-assertion = ./frequency-assertion.nix; -} diff --git a/tests/modules/services/borgmatic-darwin/basic-configuration.nix b/tests/modules/services/borgmatic/darwin/basic-configuration.nix similarity index 100% rename from tests/modules/services/borgmatic-darwin/basic-configuration.nix rename to tests/modules/services/borgmatic/darwin/basic-configuration.nix diff --git a/tests/modules/services/borgmatic/darwin/default.nix b/tests/modules/services/borgmatic/darwin/default.nix new file mode 100644 index 000000000..b10897fec --- /dev/null +++ b/tests/modules/services/borgmatic/darwin/default.nix @@ -0,0 +1,4 @@ +{ + borgmatic-service-basic-configuration = ./basic-configuration.nix; + borgmatic-frequency-assertion = ./frequency-assertion.nix; +} diff --git a/tests/modules/services/borgmatic-darwin/expected-agent.plist b/tests/modules/services/borgmatic/darwin/expected-agent.plist similarity index 100% rename from tests/modules/services/borgmatic-darwin/expected-agent.plist rename to tests/modules/services/borgmatic/darwin/expected-agent.plist diff --git a/tests/modules/services/borgmatic-darwin/frequency-assertion.nix b/tests/modules/services/borgmatic/darwin/frequency-assertion.nix similarity index 100% rename from tests/modules/services/borgmatic-darwin/frequency-assertion.nix rename to tests/modules/services/borgmatic/darwin/frequency-assertion.nix diff --git a/tests/modules/services/borgmatic/default.nix b/tests/modules/services/borgmatic/default.nix index 802e7d0cc..4b1206a22 100644 --- a/tests/modules/services/borgmatic/default.nix +++ b/tests/modules/services/borgmatic/default.nix @@ -1 +1,3 @@ -{ borgmatic-service-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: +(lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin (import ./darwin/default.nix)) +// (lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux (import ./linux/default.nix)) diff --git a/tests/modules/services/borgmatic/basic-configuration.nix b/tests/modules/services/borgmatic/linux/basic-configuration.nix similarity index 100% rename from tests/modules/services/borgmatic/basic-configuration.nix rename to tests/modules/services/borgmatic/linux/basic-configuration.nix diff --git a/tests/modules/services/borgmatic/basic-configuration.service b/tests/modules/services/borgmatic/linux/basic-configuration.service similarity index 100% rename from tests/modules/services/borgmatic/basic-configuration.service rename to tests/modules/services/borgmatic/linux/basic-configuration.service diff --git a/tests/modules/services/borgmatic/basic-configuration.timer b/tests/modules/services/borgmatic/linux/basic-configuration.timer similarity index 100% rename from tests/modules/services/borgmatic/basic-configuration.timer rename to tests/modules/services/borgmatic/linux/basic-configuration.timer diff --git a/tests/modules/services/borgmatic/linux/default.nix b/tests/modules/services/borgmatic/linux/default.nix new file mode 100644 index 000000000..bb1378a45 --- /dev/null +++ b/tests/modules/services/borgmatic/linux/default.nix @@ -0,0 +1,3 @@ +{ + borgmatic-service-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/window-managers/bspwm/bspwmrc b/tests/modules/services/bspwm/bspwmrc similarity index 100% rename from tests/modules/services/window-managers/bspwm/bspwmrc rename to tests/modules/services/bspwm/bspwmrc diff --git a/tests/modules/services/window-managers/bspwm/configuration.nix b/tests/modules/services/bspwm/configuration.nix similarity index 100% rename from tests/modules/services/window-managers/bspwm/configuration.nix rename to tests/modules/services/bspwm/configuration.nix diff --git a/tests/modules/services/bspwm/default.nix b/tests/modules/services/bspwm/default.nix new file mode 100644 index 000000000..1e06c2919 --- /dev/null +++ b/tests/modules/services/bspwm/default.nix @@ -0,0 +1,5 @@ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + bspwm-configuration = ./configuration.nix; +} diff --git a/tests/modules/services/cachix-agent/default.nix b/tests/modules/services/cachix-agent/default.nix index 48f88e0ae..5fc2e72b4 100644 --- a/tests/modules/services/cachix-agent/default.nix +++ b/tests/modules/services/cachix-agent/default.nix @@ -1 +1,5 @@ -{ cachix = ./basic-setup.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + cachix = ./basic-setup.nix; +} diff --git a/tests/modules/services/clipcat/default.nix b/tests/modules/services/clipcat/default.nix index 74202d0d6..021a5a1ef 100644 --- a/tests/modules/services/clipcat/default.nix +++ b/tests/modules/services/clipcat/default.nix @@ -1 +1,5 @@ -{ clipcat-example-config = ./example-config.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + clipcat-example-config = ./example-config.nix; +} diff --git a/tests/modules/services/cliphist/default.nix b/tests/modules/services/cliphist/default.nix index de05e0d00..dfa880423 100644 --- a/tests/modules/services/cliphist/default.nix +++ b/tests/modules/services/cliphist/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { cliphist-sway-session-target = ./cliphist-sway-session-target.nix; cliphist-extra-options = ./cliphist-extra-options.nix; cliphist-multiple-session-targets = ./cliphist-multiple-session-targets.nix; diff --git a/tests/modules/services/clipman/default.nix b/tests/modules/services/clipman/default.nix index abca59c09..639fccb79 100644 --- a/tests/modules/services/clipman/default.nix +++ b/tests/modules/services/clipman/default.nix @@ -1 +1,5 @@ -{ clipman-sway-session-target = ./clipman-sway-session-target.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + clipman-sway-session-target = ./clipman-sway-session-target.nix; +} diff --git a/tests/modules/services/clipse/default.nix b/tests/modules/services/clipse/default.nix index f92f1b679..e9e3e47c9 100644 --- a/tests/modules/services/clipse/default.nix +++ b/tests/modules/services/clipse/default.nix @@ -1 +1,5 @@ -{ clipse-sway-session-target = ./clipse-sway-session-target.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + clipse-sway-session-target = ./clipse-sway-session-target.nix; +} diff --git a/tests/modules/services/comodoro/default.nix b/tests/modules/services/comodoro/default.nix index 84281f3a4..fc12744f0 100644 --- a/tests/modules/services/comodoro/default.nix +++ b/tests/modules/services/comodoro/default.nix @@ -1 +1,5 @@ -{ comodoro-service = ./comodoro.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + comodoro-service = ./comodoro.nix; +} diff --git a/tests/modules/services/conky/default.nix b/tests/modules/services/conky/default.nix index e4ca38e06..5a1969630 100644 --- a/tests/modules/services/conky/default.nix +++ b/tests/modules/services/conky/default.nix @@ -1 +1,5 @@ -{ conky-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + conky-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/copyq/default.nix b/tests/modules/services/copyq/default.nix index 816fa880b..066a44638 100644 --- a/tests/modules/services/copyq/default.nix +++ b/tests/modules/services/copyq/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { copyq-basic-configuration = ./basic-configuration.nix; copyq-dont-force-x = ./dont-force-x-configuration.nix; } diff --git a/tests/modules/services/darkman/default.nix b/tests/modules/services/darkman/default.nix index d14067b04..b3f2afd0e 100644 --- a/tests/modules/services/darkman/default.nix +++ b/tests/modules/services/darkman/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { darkman-basic-configuration = ./basic-configuration.nix; darkman-no-configuration = ./no-configuration.nix; } diff --git a/tests/modules/services/davmail/default.nix b/tests/modules/services/davmail/default.nix index 764571e10..5f665104c 100644 --- a/tests/modules/services/davmail/default.nix +++ b/tests/modules/services/davmail/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { davmail-custom-settings = ./custom-settings.nix; davmail-imitateOutlook = ./imitateOutlook.nix; } diff --git a/tests/modules/services/devilspie2/default.nix b/tests/modules/services/devilspie2/default.nix index b62380ee6..89ef87525 100644 --- a/tests/modules/services/devilspie2/default.nix +++ b/tests/modules/services/devilspie2/default.nix @@ -1 +1,5 @@ -{ devilspie2-configuration = ./configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + devilspie2-configuration = ./configuration.nix; +} diff --git a/tests/modules/services/dropbox/default.nix b/tests/modules/services/dropbox/default.nix index ad5197903..b256476e1 100644 --- a/tests/modules/services/dropbox/default.nix +++ b/tests/modules/services/dropbox/default.nix @@ -1 +1,5 @@ -{ dropbox-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + dropbox-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/easyeffects/default.nix b/tests/modules/services/easyeffects/default.nix index 3994344bb..882b5aa48 100644 --- a/tests/modules/services/easyeffects/default.nix +++ b/tests/modules/services/easyeffects/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { easyeffects-service = ./service.nix; easyeffects-example-preset = ./example-preset.nix; } diff --git a/tests/modules/services/emacs-darwin/default.nix b/tests/modules/services/emacs-darwin/default.nix index 11de5fc79..1c56a656f 100644 --- a/tests/modules/services/emacs-darwin/default.nix +++ b/tests/modules/services/emacs-darwin/default.nix @@ -1 +1,5 @@ -{ emacs-service-basic = ./basic.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { + emacs-service-basic = ./basic.nix; +} diff --git a/tests/modules/services/emacs/default.nix b/tests/modules/services/emacs/default.nix index da2b8748c..9673459e2 100644 --- a/tests/modules/services/emacs/default.nix +++ b/tests/modules/services/emacs/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { emacs-service-27 = ./emacs-service-27.nix; emacs-service-28 = ./emacs-service-28.nix; emacs-service-28-after-graphical-session-target = ./emacs-service-28-after-graphical-session-target.nix; diff --git a/tests/modules/services/espanso-darwin/default.nix b/tests/modules/services/espanso-darwin/default.nix index 6acb2f8d4..8b3de04e0 100644 --- a/tests/modules/services/espanso-darwin/default.nix +++ b/tests/modules/services/espanso-darwin/default.nix @@ -1 +1,5 @@ -{ espanso-darwin-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { + espanso-darwin-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/espanso/default.nix b/tests/modules/services/espanso/default.nix index 81a6c7909..25e61176f 100644 --- a/tests/modules/services/espanso/default.nix +++ b/tests/modules/services/espanso/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { espanso-basic-configuration = import ./basic-configuration.nix { }; espanso-basic-configuration-wayland = import ./basic-configuration.nix { waylandSupport = true; diff --git a/tests/modules/services/flameshot/default.nix b/tests/modules/services/flameshot/default.nix index 826051f30..417411c3c 100644 --- a/tests/modules/services/flameshot/default.nix +++ b/tests/modules/services/flameshot/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { flameshot-empty-settings = ./empty-settings.nix; flameshot-example-settings = ./example-settings.nix; } diff --git a/tests/modules/services/fluidsynth/default.nix b/tests/modules/services/fluidsynth/default.nix index 58e9c5dcc..682cbdae8 100644 --- a/tests/modules/services/fluidsynth/default.nix +++ b/tests/modules/services/fluidsynth/default.nix @@ -1 +1,5 @@ -{ fluidsynth = import ./service.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + fluidsynth = import ./service.nix; +} diff --git a/tests/modules/services/fnott/default.nix b/tests/modules/services/fnott/default.nix index e28250a48..6a6522506 100644 --- a/tests/modules/services/fnott/default.nix +++ b/tests/modules/services/fnott/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { fnott-example-settings = ./example-settings.nix; fnott-systemd-user-service = ./systemd-user-service.nix; } diff --git a/tests/modules/services/fusuma/default.nix b/tests/modules/services/fusuma/default.nix index 74024b8b9..a847441d0 100644 --- a/tests/modules/services/fusuma/default.nix +++ b/tests/modules/services/fusuma/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { fusuma-example-settings = ./settings.nix; fusuma-systemd-user-service = ./service.nix; } diff --git a/tests/modules/services/git-sync-darwin/default.nix b/tests/modules/services/git-sync-darwin/default.nix index 0e9db79d0..eadd4defa 100644 --- a/tests/modules/services/git-sync-darwin/default.nix +++ b/tests/modules/services/git-sync-darwin/default.nix @@ -1 +1,5 @@ -{ git-sync = ./basic.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { + git-sync = ./basic.nix; +} diff --git a/tests/modules/services/git-sync/default.nix b/tests/modules/services/git-sync/default.nix index 7a2000a3e..bb39a12c2 100644 --- a/tests/modules/services/git-sync/default.nix +++ b/tests/modules/services/git-sync/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { git-sync = ./basic.nix; git-sync-with-whitespace = ./whitespace.nix; } diff --git a/tests/modules/services/glance/default.nix b/tests/modules/services/glance/default.nix index 893ba6516..52e49f541 100644 --- a/tests/modules/services/glance/default.nix +++ b/tests/modules/services/glance/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { glance-default-settings = ./default-settings.nix; glance-example-settings = ./example-settings.nix; } diff --git a/tests/modules/services/gromit-mpx/default.nix b/tests/modules/services/gromit-mpx/default.nix index d2a43841f..92cfe4cdc 100644 --- a/tests/modules/services/gromit-mpx/default.nix +++ b/tests/modules/services/gromit-mpx/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { gromit-mpx-default-configuration = ./default-configuration.nix; gromit-mpx-basic-configuration = ./basic-configuration.nix; } diff --git a/tests/modules/services/window-managers/herbstluftwm/default.nix b/tests/modules/services/herbstluftwm/default.nix similarity index 61% rename from tests/modules/services/window-managers/herbstluftwm/default.nix rename to tests/modules/services/herbstluftwm/default.nix index 31e73365f..52d344978 100644 --- a/tests/modules/services/window-managers/herbstluftwm/default.nix +++ b/tests/modules/services/herbstluftwm/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { herbstluftwm-simple-config = ./herbstluftwm-simple-config.nix; herbstluftwm-no-tags = ./herbstluftwm-no-tags.nix; } diff --git a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-no-tags-autostart b/tests/modules/services/herbstluftwm/herbstluftwm-no-tags-autostart similarity index 100% rename from tests/modules/services/window-managers/herbstluftwm/herbstluftwm-no-tags-autostart rename to tests/modules/services/herbstluftwm/herbstluftwm-no-tags-autostart diff --git a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-no-tags.nix b/tests/modules/services/herbstluftwm/herbstluftwm-no-tags.nix similarity index 100% rename from tests/modules/services/window-managers/herbstluftwm/herbstluftwm-no-tags.nix rename to tests/modules/services/herbstluftwm/herbstluftwm-no-tags.nix diff --git a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-simple-config-autostart b/tests/modules/services/herbstluftwm/herbstluftwm-simple-config-autostart similarity index 100% rename from tests/modules/services/window-managers/herbstluftwm/herbstluftwm-simple-config-autostart rename to tests/modules/services/herbstluftwm/herbstluftwm-simple-config-autostart diff --git a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-simple-config.nix b/tests/modules/services/herbstluftwm/herbstluftwm-simple-config.nix similarity index 100% rename from tests/modules/services/window-managers/herbstluftwm/herbstluftwm-simple-config.nix rename to tests/modules/services/herbstluftwm/herbstluftwm-simple-config.nix diff --git a/tests/modules/services/home-manager-auto-expire-darwin/default.nix b/tests/modules/services/home-manager-auto-expire-darwin/default.nix index 1f42ebfeb..2724369ad 100644 --- a/tests/modules/services/home-manager-auto-expire-darwin/default.nix +++ b/tests/modules/services/home-manager-auto-expire-darwin/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { darwin-home-manager-autoExpire-service-basic-configuration = ./basic-configuration.nix; darwin-home-manager-autoExpire-frequency-assertion = ./frequency-assertion.nix; } diff --git a/tests/modules/services/home-manager-auto-expire/default.nix b/tests/modules/services/home-manager-auto-expire/default.nix index 3913849ef..036e12132 100644 --- a/tests/modules/services/home-manager-auto-expire/default.nix +++ b/tests/modules/services/home-manager-auto-expire/default.nix @@ -1 +1,5 @@ -{ home-manager-auto-expire-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + home-manager-auto-expire-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/home-manager-auto-upgrade/default.nix b/tests/modules/services/home-manager-auto-upgrade/default.nix index fb09ebc38..f6bdb6c0e 100644 --- a/tests/modules/services/home-manager-auto-upgrade/default.nix +++ b/tests/modules/services/home-manager-auto-upgrade/default.nix @@ -1 +1,5 @@ -{ home-manager-auto-upgrade-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + home-manager-auto-upgrade-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/hypridle/default.nix b/tests/modules/services/hypridle/default.nix index b351f1c00..b7a85723a 100644 --- a/tests/modules/services/hypridle/default.nix +++ b/tests/modules/services/hypridle/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { hypridle-basic-configuration = ./basic-configuration.nix; hypridle-no-configuration = ./no-configuration.nix; } diff --git a/tests/modules/services/window-managers/hyprland/default.nix b/tests/modules/services/hyprland/default.nix similarity index 85% rename from tests/modules/services/window-managers/hyprland/default.nix rename to tests/modules/services/hyprland/default.nix index 4d6ba1f1a..2a3315888 100644 --- a/tests/modules/services/window-managers/hyprland/default.nix +++ b/tests/modules/services/hyprland/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { hyprland-simple-config = ./simple-config.nix; hyprland-multiple-devices-config = ./multiple-devices-config.nix; hyprland-null-all-packages-config = ./null-all-packages-config.nix; diff --git a/tests/modules/services/window-managers/hyprland/inconsistent-config.nix b/tests/modules/services/hyprland/inconsistent-config.nix similarity index 100% rename from tests/modules/services/window-managers/hyprland/inconsistent-config.nix rename to tests/modules/services/hyprland/inconsistent-config.nix diff --git a/tests/modules/services/window-managers/hyprland/multiple-devices-config.conf b/tests/modules/services/hyprland/multiple-devices-config.conf similarity index 100% rename from tests/modules/services/window-managers/hyprland/multiple-devices-config.conf rename to tests/modules/services/hyprland/multiple-devices-config.conf diff --git a/tests/modules/services/window-managers/hyprland/multiple-devices-config.nix b/tests/modules/services/hyprland/multiple-devices-config.nix similarity index 100% rename from tests/modules/services/window-managers/hyprland/multiple-devices-config.nix rename to tests/modules/services/hyprland/multiple-devices-config.nix diff --git a/tests/modules/services/window-managers/hyprland/null-all-packages-config.nix b/tests/modules/services/hyprland/null-all-packages-config.nix similarity index 100% rename from tests/modules/services/window-managers/hyprland/null-all-packages-config.nix rename to tests/modules/services/hyprland/null-all-packages-config.nix diff --git a/tests/modules/services/window-managers/hyprland/null-package-config.conf b/tests/modules/services/hyprland/null-package-config.conf similarity index 100% rename from tests/modules/services/window-managers/hyprland/null-package-config.conf rename to tests/modules/services/hyprland/null-package-config.conf diff --git a/tests/modules/services/window-managers/hyprland/null-package-config.nix b/tests/modules/services/hyprland/null-package-config.nix similarity index 100% rename from tests/modules/services/window-managers/hyprland/null-package-config.nix rename to tests/modules/services/hyprland/null-package-config.nix diff --git a/tests/modules/services/window-managers/hyprland/null-portal-package-config.nix b/tests/modules/services/hyprland/null-portal-package-config.nix similarity index 100% rename from tests/modules/services/window-managers/hyprland/null-portal-package-config.nix rename to tests/modules/services/hyprland/null-portal-package-config.nix diff --git a/tests/modules/services/window-managers/hyprland/simple-config.conf b/tests/modules/services/hyprland/simple-config.conf similarity index 100% rename from tests/modules/services/window-managers/hyprland/simple-config.conf rename to tests/modules/services/hyprland/simple-config.conf diff --git a/tests/modules/services/window-managers/hyprland/simple-config.nix b/tests/modules/services/hyprland/simple-config.nix similarity index 100% rename from tests/modules/services/window-managers/hyprland/simple-config.nix rename to tests/modules/services/hyprland/simple-config.nix diff --git a/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.conf b/tests/modules/services/hyprland/sourceFirst-false-config.conf similarity index 100% rename from tests/modules/services/window-managers/hyprland/sourceFirst-false-config.conf rename to tests/modules/services/hyprland/sourceFirst-false-config.conf diff --git a/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.nix b/tests/modules/services/hyprland/sourceFirst-false-config.nix similarity index 100% rename from tests/modules/services/window-managers/hyprland/sourceFirst-false-config.nix rename to tests/modules/services/hyprland/sourceFirst-false-config.nix diff --git a/tests/modules/services/hyprpaper/default.nix b/tests/modules/services/hyprpaper/default.nix index d3e87df43..8e0619325 100644 --- a/tests/modules/services/hyprpaper/default.nix +++ b/tests/modules/services/hyprpaper/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { hyprpaper-basic-configuration = ./basic-configuration.nix; hyprpaper-no-configuration = ./no-configuration.nix; } diff --git a/tests/modules/services/hyprpolkitagent/default.nix b/tests/modules/services/hyprpolkitagent/default.nix index 87aca6dc4..81ae84d23 100644 --- a/tests/modules/services/hyprpolkitagent/default.nix +++ b/tests/modules/services/hyprpolkitagent/default.nix @@ -1 +1,5 @@ -{ hyprpolkitagent-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + hyprpolkitagent-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/hyprsunset/default.nix b/tests/modules/services/hyprsunset/default.nix index 50d3c2a63..c6ee370dc 100644 --- a/tests/modules/services/hyprsunset/default.nix +++ b/tests/modules/services/hyprsunset/default.nix @@ -1,3 +1,5 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { hyprsunset-basic-configuration = ./basic-configuration.nix; } diff --git a/tests/modules/services/window-managers/i3/default.nix b/tests/modules/services/i3/default.nix similarity index 83% rename from tests/modules/services/window-managers/i3/default.nix rename to tests/modules/services/i3/default.nix index 28631a1a5..c672c3b92 100644 --- a/tests/modules/services/window-managers/i3/default.nix +++ b/tests/modules/services/i3/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { i3-bar-focused-colors = ./i3-bar-focused-colors.nix; i3-followmouse = ./i3-followmouse.nix; i3-fonts = ./i3-fonts.nix; diff --git a/tests/modules/services/window-managers/i3/i3-bar-focused-colors-expected.conf b/tests/modules/services/i3/i3-bar-focused-colors-expected.conf similarity index 100% rename from tests/modules/services/window-managers/i3/i3-bar-focused-colors-expected.conf rename to tests/modules/services/i3/i3-bar-focused-colors-expected.conf diff --git a/tests/modules/services/window-managers/i3/i3-bar-focused-colors.nix b/tests/modules/services/i3/i3-bar-focused-colors.nix similarity index 100% rename from tests/modules/services/window-managers/i3/i3-bar-focused-colors.nix rename to tests/modules/services/i3/i3-bar-focused-colors.nix diff --git a/tests/modules/services/window-managers/i3/i3-followmouse-expected.conf b/tests/modules/services/i3/i3-followmouse-expected.conf similarity index 100% rename from tests/modules/services/window-managers/i3/i3-followmouse-expected.conf rename to tests/modules/services/i3/i3-followmouse-expected.conf diff --git a/tests/modules/services/window-managers/i3/i3-followmouse.nix b/tests/modules/services/i3/i3-followmouse.nix similarity index 100% rename from tests/modules/services/window-managers/i3/i3-followmouse.nix rename to tests/modules/services/i3/i3-followmouse.nix diff --git a/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix b/tests/modules/services/i3/i3-fonts-deprecated.nix similarity index 100% rename from tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix rename to tests/modules/services/i3/i3-fonts-deprecated.nix diff --git a/tests/modules/services/window-managers/i3/i3-fonts-expected.conf b/tests/modules/services/i3/i3-fonts-expected.conf similarity index 100% rename from tests/modules/services/window-managers/i3/i3-fonts-expected.conf rename to tests/modules/services/i3/i3-fonts-expected.conf diff --git a/tests/modules/services/window-managers/i3/i3-fonts.nix b/tests/modules/services/i3/i3-fonts.nix similarity index 100% rename from tests/modules/services/window-managers/i3/i3-fonts.nix rename to tests/modules/services/i3/i3-fonts.nix diff --git a/tests/modules/services/window-managers/i3/i3-keybindings-expected.conf b/tests/modules/services/i3/i3-keybindings-expected.conf similarity index 100% rename from tests/modules/services/window-managers/i3/i3-keybindings-expected.conf rename to tests/modules/services/i3/i3-keybindings-expected.conf diff --git a/tests/modules/services/window-managers/i3/i3-keybindings.nix b/tests/modules/services/i3/i3-keybindings.nix similarity index 100% rename from tests/modules/services/window-managers/i3/i3-keybindings.nix rename to tests/modules/services/i3/i3-keybindings.nix diff --git a/tests/modules/services/window-managers/i3/i3-null-config.nix b/tests/modules/services/i3/i3-null-config.nix similarity index 100% rename from tests/modules/services/window-managers/i3/i3-null-config.nix rename to tests/modules/services/i3/i3-null-config.nix diff --git a/tests/modules/services/window-managers/i3/i3-stubs.nix b/tests/modules/services/i3/i3-stubs.nix similarity index 100% rename from tests/modules/services/window-managers/i3/i3-stubs.nix rename to tests/modules/services/i3/i3-stubs.nix diff --git a/tests/modules/services/window-managers/i3/i3-workspace-default-expected.conf b/tests/modules/services/i3/i3-workspace-default-expected.conf similarity index 100% rename from tests/modules/services/window-managers/i3/i3-workspace-default-expected.conf rename to tests/modules/services/i3/i3-workspace-default-expected.conf diff --git a/tests/modules/services/window-managers/i3/i3-workspace-default.nix b/tests/modules/services/i3/i3-workspace-default.nix similarity index 100% rename from tests/modules/services/window-managers/i3/i3-workspace-default.nix rename to tests/modules/services/i3/i3-workspace-default.nix diff --git a/tests/modules/services/window-managers/i3/i3-workspace-output-expected.conf b/tests/modules/services/i3/i3-workspace-output-expected.conf similarity index 100% rename from tests/modules/services/window-managers/i3/i3-workspace-output-expected.conf rename to tests/modules/services/i3/i3-workspace-output-expected.conf diff --git a/tests/modules/services/window-managers/i3/i3-workspace-output.nix b/tests/modules/services/i3/i3-workspace-output.nix similarity index 100% rename from tests/modules/services/window-managers/i3/i3-workspace-output.nix rename to tests/modules/services/i3/i3-workspace-output.nix diff --git a/tests/modules/services/imapnotify-darwin/default.nix b/tests/modules/services/imapnotify-darwin/default.nix index a722604d7..0ff49fd4b 100644 --- a/tests/modules/services/imapnotify-darwin/default.nix +++ b/tests/modules/services/imapnotify-darwin/default.nix @@ -1 +1,5 @@ -{ imapnotify-launchd = ./launchd.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { + imapnotify-launchd = ./launchd.nix; +} diff --git a/tests/modules/services/imapnotify/default.nix b/tests/modules/services/imapnotify/default.nix index f3a725dd0..ecb463d3d 100644 --- a/tests/modules/services/imapnotify/default.nix +++ b/tests/modules/services/imapnotify/default.nix @@ -1 +1,5 @@ -{ imapnotify = ./imapnotify.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + imapnotify = ./imapnotify.nix; +} diff --git a/tests/modules/services/jankyborders/default.nix b/tests/modules/services/jankyborders/default.nix index 014e4bc42..196513b85 100644 --- a/tests/modules/services/jankyborders/default.nix +++ b/tests/modules/services/jankyborders/default.nix @@ -1 +1,5 @@ -{ jankyborders-basic-config = ./config.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { + jankyborders-basic-config = ./config.nix; +} diff --git a/tests/modules/services/jellyfin-mpv-shim/default.nix b/tests/modules/services/jellyfin-mpv-shim/default.nix index 3b9717c81..5f3713d67 100644 --- a/tests/modules/services/jellyfin-mpv-shim/default.nix +++ b/tests/modules/services/jellyfin-mpv-shim/default.nix @@ -1,3 +1,5 @@ -{ - jellyfin-mpv-shim-example-settings = ./jellyfin-mpv-shim-example-settings.nix; +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + jellyfin-mpv-shim-example-settings = ./example-settings.nix; } diff --git a/tests/modules/services/jellyfin-mpv-shim/jellyfin-mpv-shim-example-settings-expected-bindings b/tests/modules/services/jellyfin-mpv-shim/example-settings-expected-bindings similarity index 100% rename from tests/modules/services/jellyfin-mpv-shim/jellyfin-mpv-shim-example-settings-expected-bindings rename to tests/modules/services/jellyfin-mpv-shim/example-settings-expected-bindings diff --git a/tests/modules/services/jellyfin-mpv-shim/jellyfin-mpv-shim-example-settings-expected-config b/tests/modules/services/jellyfin-mpv-shim/example-settings-expected-config similarity index 100% rename from tests/modules/services/jellyfin-mpv-shim/jellyfin-mpv-shim-example-settings-expected-config rename to tests/modules/services/jellyfin-mpv-shim/example-settings-expected-config diff --git a/tests/modules/services/jellyfin-mpv-shim/jellyfin-mpv-shim-example-settings-expected-settings b/tests/modules/services/jellyfin-mpv-shim/example-settings-expected-settings similarity index 100% rename from tests/modules/services/jellyfin-mpv-shim/jellyfin-mpv-shim-example-settings-expected-settings rename to tests/modules/services/jellyfin-mpv-shim/example-settings-expected-settings diff --git a/tests/modules/services/jellyfin-mpv-shim/jellyfin-mpv-shim-example-settings.nix b/tests/modules/services/jellyfin-mpv-shim/example-settings.nix similarity index 79% rename from tests/modules/services/jellyfin-mpv-shim/jellyfin-mpv-shim-example-settings.nix rename to tests/modules/services/jellyfin-mpv-shim/example-settings.nix index e9a8e918b..790e5332c 100644 --- a/tests/modules/services/jellyfin-mpv-shim/jellyfin-mpv-shim-example-settings.nix +++ b/tests/modules/services/jellyfin-mpv-shim/example-settings.nix @@ -1,4 +1,3 @@ -{ ... }: { services.jellyfin-mpv-shim = { enable = true; @@ -28,12 +27,12 @@ nmt.script = '' assertFileContent \ home-files/.config/jellyfin-mpv-shim/conf.json \ - ${./jellyfin-mpv-shim-example-settings-expected-settings} + ${./example-settings-expected-settings} assertFileContent \ home-files/.config/jellyfin-mpv-shim/mpv.conf \ - ${./jellyfin-mpv-shim-example-settings-expected-config} + ${./example-settings-expected-config} assertFileContent \ home-files/.config/jellyfin-mpv-shim/input.conf \ - ${./jellyfin-mpv-shim-example-settings-expected-bindings} + ${./example-settings-expected-bindings} ''; } diff --git a/tests/modules/services/kanshi/default.nix b/tests/modules/services/kanshi/default.nix index 05e224aaa..c20a4b8b2 100644 --- a/tests/modules/services/kanshi/default.nix +++ b/tests/modules/services/kanshi/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { kanshi-basic-configuration = ./basic-configuration.nix; kanshi-new-configuration = ./new-configuration.nix; kanshi-alias-assertion = ./alias-assertion.nix; diff --git a/tests/modules/services/window-managers/labwc/autostart b/tests/modules/services/labwc/autostart similarity index 100% rename from tests/modules/services/window-managers/labwc/autostart rename to tests/modules/services/labwc/autostart diff --git a/tests/modules/services/window-managers/labwc/default.nix b/tests/modules/services/labwc/default.nix similarity index 73% rename from tests/modules/services/window-managers/labwc/default.nix rename to tests/modules/services/labwc/default.nix index 41aa025d7..d047ba724 100644 --- a/tests/modules/services/window-managers/labwc/default.nix +++ b/tests/modules/services/labwc/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { labwc-rc-configuration = ./labwc-rc.nix; labwc-menu-configuration = ./labwc-menu.nix; labwc-autostart-configuration = ./labwc-autostart.nix; diff --git a/tests/modules/services/window-managers/labwc/environment b/tests/modules/services/labwc/environment similarity index 100% rename from tests/modules/services/window-managers/labwc/environment rename to tests/modules/services/labwc/environment diff --git a/tests/modules/services/window-managers/labwc/labwc-autostart.nix b/tests/modules/services/labwc/labwc-autostart.nix similarity index 100% rename from tests/modules/services/window-managers/labwc/labwc-autostart.nix rename to tests/modules/services/labwc/labwc-autostart.nix diff --git a/tests/modules/services/window-managers/labwc/labwc-environment.nix b/tests/modules/services/labwc/labwc-environment.nix similarity index 100% rename from tests/modules/services/window-managers/labwc/labwc-environment.nix rename to tests/modules/services/labwc/labwc-environment.nix diff --git a/tests/modules/services/window-managers/labwc/labwc-menu.nix b/tests/modules/services/labwc/labwc-menu.nix similarity index 100% rename from tests/modules/services/window-managers/labwc/labwc-menu.nix rename to tests/modules/services/labwc/labwc-menu.nix diff --git a/tests/modules/services/window-managers/labwc/labwc-rc.nix b/tests/modules/services/labwc/labwc-rc.nix similarity index 100% rename from tests/modules/services/window-managers/labwc/labwc-rc.nix rename to tests/modules/services/labwc/labwc-rc.nix diff --git a/tests/modules/services/window-managers/labwc/menu.xml b/tests/modules/services/labwc/menu.xml similarity index 100% rename from tests/modules/services/window-managers/labwc/menu.xml rename to tests/modules/services/labwc/menu.xml diff --git a/tests/modules/services/window-managers/labwc/rc.xml b/tests/modules/services/labwc/rc.xml similarity index 100% rename from tests/modules/services/window-managers/labwc/rc.xml rename to tests/modules/services/labwc/rc.xml diff --git a/tests/modules/services/lieer/default.nix b/tests/modules/services/lieer/default.nix index 1d6b435a1..8cec51e4a 100644 --- a/tests/modules/services/lieer/default.nix +++ b/tests/modules/services/lieer/default.nix @@ -1 +1,5 @@ -{ lieer-service = ./lieer-service.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + lieer-service = ./lieer-service.nix; +} diff --git a/tests/modules/services/linux-wallpaperengine/default.nix b/tests/modules/services/linux-wallpaperengine/default.nix index 41c58a4c2..c0d188831 100644 --- a/tests/modules/services/linux-wallpaperengine/default.nix +++ b/tests/modules/services/linux-wallpaperengine/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { linux-wallpaperengine-basic-configuration = ./basic-configuration.nix; linux-wallpaperengine-null-options = ./null-options.nix; } diff --git a/tests/modules/services/lxqt-policykit-agent/default.nix b/tests/modules/services/lxqt-policykit-agent/default.nix index 1d2d2b8fd..cdc0603e0 100644 --- a/tests/modules/services/lxqt-policykit-agent/default.nix +++ b/tests/modules/services/lxqt-policykit-agent/default.nix @@ -1 +1,5 @@ -{ lxqt-policykit-agent-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + lxqt-policykit-agent-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/macos-remap-keys/default.nix b/tests/modules/services/macos-remap-keys/default.nix index 796110f76..c6431ee4b 100644 --- a/tests/modules/services/macos-remap-keys/default.nix +++ b/tests/modules/services/macos-remap-keys/default.nix @@ -1 +1,5 @@ -{ macos-remap-keys-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { + macos-remap-keys-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/mako/default.nix b/tests/modules/services/mako/default.nix index eab99cc5a..22efac754 100644 --- a/tests/modules/services/mako/default.nix +++ b/tests/modules/services/mako/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { mako-example-config = ./example-config.nix; mako-renamed-options = ./renamed-options.nix; } diff --git a/tests/modules/services/mopidy/default.nix b/tests/modules/services/mopidy/default.nix index 6c6a901d4..36b765fc9 100644 --- a/tests/modules/services/mopidy/default.nix +++ b/tests/modules/services/mopidy/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { mopidy-basic-configuration = ./basic-configuration.nix; mopidy-scan = ./mopidy-scan.nix; } diff --git a/tests/modules/services/mpd-mpris/default.nix b/tests/modules/services/mpd-mpris/default.nix index ffcd04b17..fc3ee63c2 100644 --- a/tests/modules/services/mpd-mpris/default.nix +++ b/tests/modules/services/mpd-mpris/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { mpd-mpris-configuration-basic = ./configuration-basic.nix; mpd-mpris-configuration-with-local-mpd = ./configuration-with-local-mpd.nix; mpd-mpris-configuration-with-password = ./configuration-with-password.nix; diff --git a/tests/modules/services/mpd/default.nix b/tests/modules/services/mpd/default.nix index f7919b227..1e10acfc6 100644 --- a/tests/modules/services/mpd/default.nix +++ b/tests/modules/services/mpd/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { mpd-basic-configuration = ./basic-configuration.nix; mpd-before-state-version-22_11 = ./before-state-version-22_11.nix; mpd-start-when-needed = ./start-when-needed.nix; diff --git a/tests/modules/services/mpdris2/default.nix b/tests/modules/services/mpdris2/default.nix index eaf6be337..99b915885 100644 --- a/tests/modules/services/mpdris2/default.nix +++ b/tests/modules/services/mpdris2/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { mpdris2-basic-configuration = ./basic-configuration.nix; mpdris2-with-password = ./with-password.nix; } diff --git a/tests/modules/services/mpdscribble/default.nix b/tests/modules/services/mpdscribble/default.nix index b44dae9dd..286da84e3 100644 --- a/tests/modules/services/mpdscribble/default.nix +++ b/tests/modules/services/mpdscribble/default.nix @@ -1 +1,5 @@ -{ mpdscribble-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + mpdscribble-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/nix-gc-darwin/default.nix b/tests/modules/services/nix-gc-darwin/default.nix index 251e0d23a..c629b1d35 100644 --- a/tests/modules/services/nix-gc-darwin/default.nix +++ b/tests/modules/services/nix-gc-darwin/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { nix-gc = ./basic.nix; darwin-nix-gc-interval-assertion = ./darwin-nix-gc-interval-assertion.nix; } diff --git a/tests/modules/services/nix-gc/default.nix b/tests/modules/services/nix-gc/default.nix index f2fc20aa7..5dbe2da92 100644 --- a/tests/modules/services/nix-gc/default.nix +++ b/tests/modules/services/nix-gc/default.nix @@ -1 +1,5 @@ -{ nix-gc = ./basic.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + nix-gc = ./basic.nix; +} diff --git a/tests/modules/services/ollama/darwin/basic.nix b/tests/modules/services/ollama/darwin/basic.nix index bb072a977..22a4190d1 100644 --- a/tests/modules/services/ollama/darwin/basic.nix +++ b/tests/modules/services/ollama/darwin/basic.nix @@ -1,22 +1,17 @@ -{ lib, pkgs, ... }: - -lib.mkMerge [ - { - services.ollama = { - enable = true; - host = "localhost"; - port = 11111; - environmentVariables = { - OLLAMA_LLM_LIBRARY = "cpu"; - HIP_VISIBLE_DEVICES = "0,1"; - }; +{ + services.ollama = { + enable = true; + host = "localhost"; + port = 11111; + environmentVariables = { + OLLAMA_LLM_LIBRARY = "cpu"; + HIP_VISIBLE_DEVICES = "0,1"; }; - } - (lib.mkIf pkgs.stdenv.isDarwin { - nmt.script = '' - serviceFile=LaunchAgents/org.nix-community.home.ollama.plist - assertFileExists "$serviceFile" - assertFileContent "$serviceFile" ${./expected-agent.plist} - ''; - }) -] + }; + + nmt.script = '' + serviceFile=LaunchAgents/org.nix-community.home.ollama.plist + assertFileExists "$serviceFile" + assertFileContent "$serviceFile" ${./expected-agent.plist} + ''; +} diff --git a/tests/modules/services/ollama/darwin/default.nix b/tests/modules/services/ollama/darwin/default.nix index 418446cd6..706dac2b3 100644 --- a/tests/modules/services/ollama/darwin/default.nix +++ b/tests/modules/services/ollama/darwin/default.nix @@ -1 +1,3 @@ -{ ollama-darwin = ./basic.nix; } +{ + ollama-basic = ./basic.nix; +} diff --git a/tests/modules/services/ollama/default.nix b/tests/modules/services/ollama/default.nix new file mode 100644 index 000000000..4b1206a22 --- /dev/null +++ b/tests/modules/services/ollama/default.nix @@ -0,0 +1,3 @@ +{ lib, pkgs, ... }: +(lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin (import ./darwin/default.nix)) +// (lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux (import ./linux/default.nix)) diff --git a/tests/modules/services/ollama/linux/default.nix b/tests/modules/services/ollama/linux/default.nix index a0c82ae86..84ad2c99e 100644 --- a/tests/modules/services/ollama/linux/default.nix +++ b/tests/modules/services/ollama/linux/default.nix @@ -1,4 +1,4 @@ { - ollama-linux = ./basic.nix; + ollama-basic = ./basic.nix; ollama-set-environment-variables = ./set-environment-variables.nix; } diff --git a/tests/modules/services/osmscout-server/default.nix b/tests/modules/services/osmscout-server/default.nix index 1acee0b88..0d5656c07 100644 --- a/tests/modules/services/osmscout-server/default.nix +++ b/tests/modules/services/osmscout-server/default.nix @@ -1 +1,5 @@ -{ osmscout-server = ./basic-setup.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + osmscout-server = ./basic-setup.nix; +} diff --git a/tests/modules/services/pantalaimon/default.nix b/tests/modules/services/pantalaimon/default.nix index 8c29efb40..cc0e0242f 100644 --- a/tests/modules/services/pantalaimon/default.nix +++ b/tests/modules/services/pantalaimon/default.nix @@ -1 +1,5 @@ -{ pantalaimon-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + pantalaimon-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/parcellite/default.nix b/tests/modules/services/parcellite/default.nix index 5cf326b14..ceff43598 100644 --- a/tests/modules/services/parcellite/default.nix +++ b/tests/modules/services/parcellite/default.nix @@ -1 +1,5 @@ -{ parcellite = ./parcellite.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + parcellite = ./parcellite.nix; +} diff --git a/tests/modules/services/pass-secret-service/default.nix b/tests/modules/services/pass-secret-service/default.nix index d841c97eb..dba745f3b 100644 --- a/tests/modules/services/pass-secret-service/default.nix +++ b/tests/modules/services/pass-secret-service/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { pass-secret-service-default-configuration = ./default-configuration.nix; pass-secret-service-basic-configuration = ./basic-configuration.nix; } diff --git a/tests/modules/services/pasystray/default.nix b/tests/modules/services/pasystray/default.nix index 0c0f31c5f..351e887b1 100644 --- a/tests/modules/services/pasystray/default.nix +++ b/tests/modules/services/pasystray/default.nix @@ -1 +1,5 @@ -{ pasystray-service = ./service.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + pasystray-service = ./service.nix; +} diff --git a/tests/modules/services/pbgopy/default.nix b/tests/modules/services/pbgopy/default.nix index c2c9d485d..882140c37 100644 --- a/tests/modules/services/pbgopy/default.nix +++ b/tests/modules/services/pbgopy/default.nix @@ -1 +1,5 @@ -{ pbgopy = import ./service.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + pbgopy = import ./service.nix; +} diff --git a/tests/modules/services/picom/default.nix b/tests/modules/services/picom/default.nix index 643701314..a6a492716 100644 --- a/tests/modules/services/picom/default.nix +++ b/tests/modules/services/picom/default.nix @@ -1 +1,5 @@ -{ picom-basic-configuration = ./picom-basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + picom-basic-configuration = ./picom-basic-configuration.nix; +} diff --git a/tests/modules/services/playerctld/default.nix b/tests/modules/services/playerctld/default.nix index 93ed10aaf..4a4fcfaff 100644 --- a/tests/modules/services/playerctld/default.nix +++ b/tests/modules/services/playerctld/default.nix @@ -1 +1,5 @@ -{ playerctld-basic = ./basic.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + playerctld-basic = ./basic.nix; +} diff --git a/tests/modules/services/podman-linux/default.nix b/tests/modules/services/podman-linux/default.nix index c7f04bdaf..c4d832d4d 100644 --- a/tests/modules/services/podman-linux/default.nix +++ b/tests/modules/services/podman-linux/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { podman-configuration = ./configuration.nix; podman-container = ./container.nix; podman-build = ./build.nix; diff --git a/tests/modules/services/polkit-gnome/default.nix b/tests/modules/services/polkit-gnome/default.nix index 7028eb98b..5a9dc9bc6 100644 --- a/tests/modules/services/polkit-gnome/default.nix +++ b/tests/modules/services/polkit-gnome/default.nix @@ -1 +1,5 @@ -{ polkit-gnome-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + polkit-gnome-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/polybar/default.nix b/tests/modules/services/polybar/default.nix index b5594d247..fbea9293b 100644 --- a/tests/modules/services/polybar/default.nix +++ b/tests/modules/services/polybar/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { polybar-basic-configuration = ./basic-configuration.nix; polybar-empty-configuration = ./empty-configuration.nix; } diff --git a/tests/modules/services/recoll/default.nix b/tests/modules/services/recoll/default.nix index 3b0e560f1..7870f6bee 100644 --- a/tests/modules/services/recoll/default.nix +++ b/tests/modules/services/recoll/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { recoll-basic-configuration = ./basic-configuration.nix; recoll-config-format-order = ./config-format-order.nix; } diff --git a/tests/modules/services/redshift-gammastep/default.nix b/tests/modules/services/redshift-gammastep/default.nix index c6db8a8aa..752fbb43e 100644 --- a/tests/modules/services/redshift-gammastep/default.nix +++ b/tests/modules/services/redshift-gammastep/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { gammastep-basic-configuration = ./gammastep-basic-configuration.nix; gammastep-tray-configuration = ./gammastep-tray-configuration.nix; redshift-basic-configuration = ./redshift-basic-configuration.nix; diff --git a/tests/modules/services/remmina/default.nix b/tests/modules/services/remmina/default.nix index 43fa48940..b23360f00 100644 --- a/tests/modules/services/remmina/default.nix +++ b/tests/modules/services/remmina/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { remmina-default-config = ./default-config.nix; remmina-basic-config = ./basic-config.nix; } diff --git a/tests/modules/services/restic/default.nix b/tests/modules/services/restic/default.nix index 434b3ba5f..751d23378 100644 --- a/tests/modules/services/restic/default.nix +++ b/tests/modules/services/restic/default.nix @@ -1 +1,5 @@ -{ restic-unit-files = ./unit-files.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + restic-unit-files = ./unit-files.nix; +} diff --git a/tests/modules/services/window-managers/river/configuration.nix b/tests/modules/services/river/configuration.nix similarity index 100% rename from tests/modules/services/window-managers/river/configuration.nix rename to tests/modules/services/river/configuration.nix diff --git a/tests/modules/services/river/default.nix b/tests/modules/services/river/default.nix new file mode 100644 index 000000000..bea79f4e5 --- /dev/null +++ b/tests/modules/services/river/default.nix @@ -0,0 +1,5 @@ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + river-configuration = ./configuration.nix; +} diff --git a/tests/modules/services/window-managers/river/init b/tests/modules/services/river/init similarity index 100% rename from tests/modules/services/window-managers/river/init rename to tests/modules/services/river/init diff --git a/tests/modules/services/screen-locker/default.nix b/tests/modules/services/screen-locker/default.nix index 667defc51..2982e3fb2 100644 --- a/tests/modules/services/screen-locker/default.nix +++ b/tests/modules/services/screen-locker/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { screen-locker-basic-configuration = ./basic-configuration.nix; screen-locker-no-xautolock = ./no-xautolock.nix; screen-locker-moved-options = ./moved-options.nix; diff --git a/tests/modules/services/shikane/default.nix b/tests/modules/services/shikane/default.nix index 9047cd9b5..71906c700 100644 --- a/tests/modules/services/shikane/default.nix +++ b/tests/modules/services/shikane/default.nix @@ -1 +1,5 @@ -{ shikane-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + shikane-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/signaturepdf/default.nix b/tests/modules/services/signaturepdf/default.nix index a887f1242..5e0c3f9ed 100644 --- a/tests/modules/services/signaturepdf/default.nix +++ b/tests/modules/services/signaturepdf/default.nix @@ -1 +1,5 @@ -{ signaturepdf-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + signaturepdf-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/skhd/default.nix b/tests/modules/services/skhd/default.nix index ad5b46096..47a43cd1d 100644 --- a/tests/modules/services/skhd/default.nix +++ b/tests/modules/services/skhd/default.nix @@ -1 +1,5 @@ -{ skhd-basic-config = ./config.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { + skhd-basic-config = ./config.nix; +} diff --git a/tests/modules/services/snixembed/default.nix b/tests/modules/services/snixembed/default.nix index b49917197..5b6136269 100644 --- a/tests/modules/services/snixembed/default.nix +++ b/tests/modules/services/snixembed/default.nix @@ -1 +1,5 @@ -{ snixembed-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + snixembed-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/spectrwm/default.nix b/tests/modules/services/spectrwm/default.nix new file mode 100644 index 000000000..1e36ff667 --- /dev/null +++ b/tests/modules/services/spectrwm/default.nix @@ -0,0 +1,5 @@ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + spectrwm-simple-config = ./spectrwm-simple-config.nix; +} diff --git a/tests/modules/services/window-managers/spectrwm/spectrwm-simple-config-expected-spectrwm.conf b/tests/modules/services/spectrwm/spectrwm-simple-config-expected-spectrwm.conf similarity index 100% rename from tests/modules/services/window-managers/spectrwm/spectrwm-simple-config-expected-spectrwm.conf rename to tests/modules/services/spectrwm/spectrwm-simple-config-expected-spectrwm.conf diff --git a/tests/modules/services/window-managers/spectrwm/spectrwm-simple-config.nix b/tests/modules/services/spectrwm/spectrwm-simple-config.nix similarity index 100% rename from tests/modules/services/window-managers/spectrwm/spectrwm-simple-config.nix rename to tests/modules/services/spectrwm/spectrwm-simple-config.nix diff --git a/tests/modules/services/window-managers/sway/default.nix b/tests/modules/services/sway/default.nix similarity index 92% rename from tests/modules/services/window-managers/sway/default.nix rename to tests/modules/services/sway/default.nix index ad6745b36..520251c7c 100644 --- a/tests/modules/services/window-managers/sway/default.nix +++ b/tests/modules/services/sway/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { sway-bar-focused-colors = ./sway-bar-focused-colors.nix; sway-bindkeys-to-code-and-extra-config = ./sway-bindkeys-to-code-and-extra-config.nix; sway-bindswitches = ./sway-bindswitches.nix; diff --git a/tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf b/tests/modules/services/sway/sway-bar-focused-colors.conf similarity index 100% rename from tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf rename to tests/modules/services/sway/sway-bar-focused-colors.conf diff --git a/tests/modules/services/window-managers/sway/sway-bar-focused-colors.nix b/tests/modules/services/sway/sway-bar-focused-colors.nix similarity index 100% rename from tests/modules/services/window-managers/sway/sway-bar-focused-colors.nix rename to tests/modules/services/sway/sway-bar-focused-colors.nix diff --git a/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.conf b/tests/modules/services/sway/sway-bindkeys-to-code-and-extra-config.conf similarity index 100% rename from tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.conf rename to tests/modules/services/sway/sway-bindkeys-to-code-and-extra-config.conf diff --git a/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.nix b/tests/modules/services/sway/sway-bindkeys-to-code-and-extra-config.nix similarity index 100% rename from tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.nix rename to tests/modules/services/sway/sway-bindkeys-to-code-and-extra-config.nix diff --git a/tests/modules/services/window-managers/sway/sway-bindswitches.conf b/tests/modules/services/sway/sway-bindswitches.conf similarity index 100% rename from tests/modules/services/window-managers/sway/sway-bindswitches.conf rename to tests/modules/services/sway/sway-bindswitches.conf diff --git a/tests/modules/services/window-managers/sway/sway-bindswitches.nix b/tests/modules/services/sway/sway-bindswitches.nix similarity index 100% rename from tests/modules/services/window-managers/sway/sway-bindswitches.nix rename to tests/modules/services/sway/sway-bindswitches.nix diff --git a/tests/modules/services/window-managers/sway/sway-check-config.nix b/tests/modules/services/sway/sway-check-config.nix similarity index 100% rename from tests/modules/services/window-managers/sway/sway-check-config.nix rename to tests/modules/services/sway/sway-check-config.nix diff --git a/tests/modules/services/window-managers/sway/sway-default.conf b/tests/modules/services/sway/sway-default.conf similarity index 100% rename from tests/modules/services/window-managers/sway/sway-default.conf rename to tests/modules/services/sway/sway-default.conf diff --git a/tests/modules/services/window-managers/sway/sway-default.nix b/tests/modules/services/sway/sway-default.nix similarity index 100% rename from tests/modules/services/window-managers/sway/sway-default.nix rename to tests/modules/services/sway/sway-default.nix diff --git a/tests/modules/services/window-managers/sway/sway-default.target b/tests/modules/services/sway/sway-default.target similarity index 100% rename from tests/modules/services/window-managers/sway/sway-default.target rename to tests/modules/services/sway/sway-default.target diff --git a/tests/modules/services/window-managers/sway/sway-followmouse-expected.conf b/tests/modules/services/sway/sway-followmouse-expected.conf similarity index 100% rename from tests/modules/services/window-managers/sway/sway-followmouse-expected.conf rename to tests/modules/services/sway/sway-followmouse-expected.conf diff --git a/tests/modules/services/window-managers/sway/sway-followmouse-legacy-expected.conf b/tests/modules/services/sway/sway-followmouse-legacy-expected.conf similarity index 100% rename from tests/modules/services/window-managers/sway/sway-followmouse-legacy-expected.conf rename to tests/modules/services/sway/sway-followmouse-legacy-expected.conf diff --git a/tests/modules/services/window-managers/sway/sway-followmouse-legacy.nix b/tests/modules/services/sway/sway-followmouse-legacy.nix similarity index 100% rename from tests/modules/services/window-managers/sway/sway-followmouse-legacy.nix rename to tests/modules/services/sway/sway-followmouse-legacy.nix diff --git a/tests/modules/services/window-managers/sway/sway-followmouse.nix b/tests/modules/services/sway/sway-followmouse.nix similarity index 100% rename from tests/modules/services/window-managers/sway/sway-followmouse.nix rename to tests/modules/services/sway/sway-followmouse.nix diff --git a/tests/modules/services/window-managers/sway/sway-modules.conf b/tests/modules/services/sway/sway-modules.conf similarity index 100% rename from tests/modules/services/window-managers/sway/sway-modules.conf rename to tests/modules/services/sway/sway-modules.conf diff --git a/tests/modules/services/window-managers/sway/sway-modules.nix b/tests/modules/services/sway/sway-modules.nix similarity index 100% rename from tests/modules/services/window-managers/sway/sway-modules.nix rename to tests/modules/services/sway/sway-modules.nix diff --git a/tests/modules/services/window-managers/sway/sway-no-xwayland.nix b/tests/modules/services/sway/sway-no-xwayland.nix similarity index 100% rename from tests/modules/services/window-managers/sway/sway-no-xwayland.nix rename to tests/modules/services/sway/sway-no-xwayland.nix diff --git a/tests/modules/services/window-managers/sway/sway-null-config.nix b/tests/modules/services/sway/sway-null-config.nix similarity index 100% rename from tests/modules/services/window-managers/sway/sway-null-config.nix rename to tests/modules/services/sway/sway-null-config.nix diff --git a/tests/modules/services/window-managers/sway/sway-null-package.conf b/tests/modules/services/sway/sway-null-package.conf similarity index 100% rename from tests/modules/services/window-managers/sway/sway-null-package.conf rename to tests/modules/services/sway/sway-null-package.conf diff --git a/tests/modules/services/window-managers/sway/sway-null-package.nix b/tests/modules/services/sway/sway-null-package.nix similarity index 100% rename from tests/modules/services/window-managers/sway/sway-null-package.nix rename to tests/modules/services/sway/sway-null-package.nix diff --git a/tests/modules/services/window-managers/sway/sway-post-2003.conf b/tests/modules/services/sway/sway-post-2003.conf similarity index 100% rename from tests/modules/services/window-managers/sway/sway-post-2003.conf rename to tests/modules/services/sway/sway-post-2003.conf diff --git a/tests/modules/services/window-managers/sway/sway-post-2003.nix b/tests/modules/services/sway/sway-post-2003.nix similarity index 100% rename from tests/modules/services/window-managers/sway/sway-post-2003.nix rename to tests/modules/services/sway/sway-post-2003.nix diff --git a/tests/modules/services/window-managers/sway/sway-systemd-autostart.nix b/tests/modules/services/sway/sway-systemd-autostart.nix similarity index 100% rename from tests/modules/services/window-managers/sway/sway-systemd-autostart.nix rename to tests/modules/services/sway/sway-systemd-autostart.nix diff --git a/tests/modules/services/window-managers/sway/sway-systemd-autostart.target b/tests/modules/services/sway/sway-systemd-autostart.target similarity index 100% rename from tests/modules/services/window-managers/sway/sway-systemd-autostart.target rename to tests/modules/services/sway/sway-systemd-autostart.target diff --git a/tests/modules/services/window-managers/sway/sway-systemd-variables.conf b/tests/modules/services/sway/sway-systemd-variables.conf similarity index 100% rename from tests/modules/services/window-managers/sway/sway-systemd-variables.conf rename to tests/modules/services/sway/sway-systemd-variables.conf diff --git a/tests/modules/services/window-managers/sway/sway-systemd-variables.nix b/tests/modules/services/sway/sway-systemd-variables.nix similarity index 100% rename from tests/modules/services/window-managers/sway/sway-systemd-variables.nix rename to tests/modules/services/sway/sway-systemd-variables.nix diff --git a/tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf b/tests/modules/services/sway/sway-workspace-default-expected.conf similarity index 100% rename from tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf rename to tests/modules/services/sway/sway-workspace-default-expected.conf diff --git a/tests/modules/services/window-managers/sway/sway-workspace-default.nix b/tests/modules/services/sway/sway-workspace-default.nix similarity index 100% rename from tests/modules/services/window-managers/sway/sway-workspace-default.nix rename to tests/modules/services/sway/sway-workspace-default.nix diff --git a/tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf b/tests/modules/services/sway/sway-workspace-output-expected.conf similarity index 100% rename from tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf rename to tests/modules/services/sway/sway-workspace-output-expected.conf diff --git a/tests/modules/services/window-managers/sway/sway-workspace-output.nix b/tests/modules/services/sway/sway-workspace-output.nix similarity index 100% rename from tests/modules/services/window-managers/sway/sway-workspace-output.nix rename to tests/modules/services/sway/sway-workspace-output.nix diff --git a/tests/modules/services/window-managers/sway/swaynag-empty-settings.nix b/tests/modules/services/sway/swaynag-empty-settings.nix similarity index 100% rename from tests/modules/services/window-managers/sway/swaynag-empty-settings.nix rename to tests/modules/services/sway/swaynag-empty-settings.nix diff --git a/tests/modules/services/window-managers/sway/swaynag-example-settings-expected.conf b/tests/modules/services/sway/swaynag-example-settings-expected.conf similarity index 100% rename from tests/modules/services/window-managers/sway/swaynag-example-settings-expected.conf rename to tests/modules/services/sway/swaynag-example-settings-expected.conf diff --git a/tests/modules/services/window-managers/sway/swaynag-example-settings.nix b/tests/modules/services/sway/swaynag-example-settings.nix similarity index 100% rename from tests/modules/services/window-managers/sway/swaynag-example-settings.nix rename to tests/modules/services/sway/swaynag-example-settings.nix diff --git a/tests/modules/services/swayidle/default.nix b/tests/modules/services/swayidle/default.nix index 124fe1d7d..62db035ba 100644 --- a/tests/modules/services/swayidle/default.nix +++ b/tests/modules/services/swayidle/default.nix @@ -1 +1,5 @@ -{ swayidle-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + swayidle-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/swaync/default.nix b/tests/modules/services/swaync/default.nix index d5682daa3..739a8a76a 100644 --- a/tests/modules/services/swaync/default.nix +++ b/tests/modules/services/swaync/default.nix @@ -1 +1,5 @@ -{ swaync = ./swaync.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + swaync = ./swaync.nix; +} diff --git a/tests/modules/services/swayosd/default.nix b/tests/modules/services/swayosd/default.nix index c327610a9..e1e2e7635 100644 --- a/tests/modules/services/swayosd/default.nix +++ b/tests/modules/services/swayosd/default.nix @@ -1 +1,5 @@ -{ swayosd = ./swayosd.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + swayosd = ./swayosd.nix; +} diff --git a/tests/modules/services/swww/default.nix b/tests/modules/services/swww/default.nix index ce316acbc..abd39783a 100644 --- a/tests/modules/services/swww/default.nix +++ b/tests/modules/services/swww/default.nix @@ -1 +1,5 @@ -{ swww-graphical-session-target = ./swww-graphical-session-target.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + swww-graphical-session-target = ./swww-graphical-session-target.nix; +} diff --git a/tests/modules/services/sxhkd/default.nix b/tests/modules/services/sxhkd/default.nix index ec25252ce..fa9d2fd91 100644 --- a/tests/modules/services/sxhkd/default.nix +++ b/tests/modules/services/sxhkd/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { sxhkd-configuration = ./configuration.nix; sxhkd-service = ./service.nix; } diff --git a/tests/modules/services/syncthing/common/default.nix b/tests/modules/services/syncthing/common/default.nix deleted file mode 100644 index 2cdef6ff1..000000000 --- a/tests/modules/services/syncthing/common/default.nix +++ /dev/null @@ -1 +0,0 @@ -{ syncthing-extra-options = ./extra-options.nix; } diff --git a/tests/modules/services/syncthing/default.nix b/tests/modules/services/syncthing/default.nix new file mode 100644 index 000000000..7c9937744 --- /dev/null +++ b/tests/modules/services/syncthing/default.nix @@ -0,0 +1,5 @@ +{ lib, pkgs, ... }: +{ + syncthing-extra-options = ./extra-options.nix; +} +// (lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux (import ./linux/default.nix)) diff --git a/tests/modules/services/syncthing/common/expected-agent.plist b/tests/modules/services/syncthing/expected-agent.plist similarity index 100% rename from tests/modules/services/syncthing/common/expected-agent.plist rename to tests/modules/services/syncthing/expected-agent.plist diff --git a/tests/modules/services/syncthing/common/extra-options.nix b/tests/modules/services/syncthing/extra-options.nix similarity index 100% rename from tests/modules/services/syncthing/common/extra-options.nix rename to tests/modules/services/syncthing/extra-options.nix diff --git a/tests/modules/services/tldr-update/default.nix b/tests/modules/services/tldr-update/default.nix index f67047037..4554da640 100644 --- a/tests/modules/services/tldr-update/default.nix +++ b/tests/modules/services/tldr-update/default.nix @@ -1 +1,5 @@ -{ tldr-update = ./tldr-update.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + tldr-update = ./tldr-update.nix; +} diff --git a/tests/modules/services/trayer/default.nix b/tests/modules/services/trayer/default.nix index f8672b59e..afdb45a7a 100644 --- a/tests/modules/services/trayer/default.nix +++ b/tests/modules/services/trayer/default.nix @@ -1 +1,5 @@ -{ trayer-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + trayer-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/trayscale/default.nix b/tests/modules/services/trayscale/default.nix index 9702b1c7c..1a84ad246 100644 --- a/tests/modules/services/trayscale/default.nix +++ b/tests/modules/services/trayscale/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { trayscale-show-window = ./show-window.nix; trayscale-hide-window = ./hide-window.nix; } diff --git a/tests/modules/services/twmn/default.nix b/tests/modules/services/twmn/default.nix index 8a021ba38..58c99f4ea 100644 --- a/tests/modules/services/twmn/default.nix +++ b/tests/modules/services/twmn/default.nix @@ -1 +1,5 @@ -{ twmn-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + twmn-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/udiskie/default.nix b/tests/modules/services/udiskie/default.nix index b79be5a9c..365cc4e80 100644 --- a/tests/modules/services/udiskie/default.nix +++ b/tests/modules/services/udiskie/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { udiskie-basic = ./basic.nix; udiskie-no-tray = ./no-tray.nix; } diff --git a/tests/modules/services/volnoti/default.nix b/tests/modules/services/volnoti/default.nix index d4621e62f..4af677612 100644 --- a/tests/modules/services/volnoti/default.nix +++ b/tests/modules/services/volnoti/default.nix @@ -1 +1,5 @@ -{ volnoti-package-option = ./package-option.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + volnoti-package-option = ./package-option.nix; +} diff --git a/tests/modules/services/way-displays/default.nix b/tests/modules/services/way-displays/default.nix index 88e53c4c0..1c7dfed10 100644 --- a/tests/modules/services/way-displays/default.nix +++ b/tests/modules/services/way-displays/default.nix @@ -1,3 +1,5 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { way-displays-configuration = ./configuration.nix; } diff --git a/tests/modules/services/window-managers/wayfire/configuration.ini b/tests/modules/services/wayfire/configuration.ini similarity index 100% rename from tests/modules/services/window-managers/wayfire/configuration.ini rename to tests/modules/services/wayfire/configuration.ini diff --git a/tests/modules/services/window-managers/wayfire/configuration.nix b/tests/modules/services/wayfire/configuration.nix similarity index 100% rename from tests/modules/services/window-managers/wayfire/configuration.nix rename to tests/modules/services/wayfire/configuration.nix diff --git a/tests/modules/services/window-managers/wayfire/default.nix b/tests/modules/services/wayfire/default.nix similarity index 53% rename from tests/modules/services/window-managers/wayfire/default.nix rename to tests/modules/services/wayfire/default.nix index 0e252bb19..abe9d2ef5 100644 --- a/tests/modules/services/window-managers/wayfire/default.nix +++ b/tests/modules/services/wayfire/default.nix @@ -1,4 +1,6 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { wayfire-configuration = ./configuration.nix; wayfire-wf-shell = ./wf-shell.nix; } diff --git a/tests/modules/services/window-managers/wayfire/wf-shell.ini b/tests/modules/services/wayfire/wf-shell.ini similarity index 100% rename from tests/modules/services/window-managers/wayfire/wf-shell.ini rename to tests/modules/services/wayfire/wf-shell.ini diff --git a/tests/modules/services/window-managers/wayfire/wf-shell.nix b/tests/modules/services/wayfire/wf-shell.nix similarity index 100% rename from tests/modules/services/window-managers/wayfire/wf-shell.nix rename to tests/modules/services/wayfire/wf-shell.nix diff --git a/tests/modules/services/wayvnc/default.nix b/tests/modules/services/wayvnc/default.nix index 144fd8fb9..7f1f15eb7 100644 --- a/tests/modules/services/wayvnc/default.nix +++ b/tests/modules/services/wayvnc/default.nix @@ -1,3 +1,5 @@ -{ +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { wayvnc-simple = ./simple.nix; } diff --git a/tests/modules/services/window-managers/bspwm/default.nix b/tests/modules/services/window-managers/bspwm/default.nix deleted file mode 100644 index 45b5e2ae8..000000000 --- a/tests/modules/services/window-managers/bspwm/default.nix +++ /dev/null @@ -1 +0,0 @@ -{ bspwm-configuration = ./configuration.nix; } diff --git a/tests/modules/services/window-managers/river/default.nix b/tests/modules/services/window-managers/river/default.nix deleted file mode 100644 index 5d17f3f11..000000000 --- a/tests/modules/services/window-managers/river/default.nix +++ /dev/null @@ -1 +0,0 @@ -{ river-configuration = ./configuration.nix; } diff --git a/tests/modules/services/window-managers/spectrwm/default.nix b/tests/modules/services/window-managers/spectrwm/default.nix deleted file mode 100644 index be53aa1b6..000000000 --- a/tests/modules/services/window-managers/spectrwm/default.nix +++ /dev/null @@ -1 +0,0 @@ -{ spectrwm-simple-config = ./spectrwm-simple-config.nix; } diff --git a/tests/modules/services/wlsunset/default.nix b/tests/modules/services/wlsunset/default.nix index d59af7015..6ff787843 100644 --- a/tests/modules/services/wlsunset/default.nix +++ b/tests/modules/services/wlsunset/default.nix @@ -1 +1,5 @@ -{ wlsunset-service = ./wlsunset-service.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + wlsunset-service = ./wlsunset-service.nix; +} diff --git a/tests/modules/services/wob/default.nix b/tests/modules/services/wob/default.nix index 22ed60358..bef4042a6 100644 --- a/tests/modules/services/wob/default.nix +++ b/tests/modules/services/wob/default.nix @@ -1 +1,5 @@ -{ wob-service = ./wob-service.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + wob-service = ./wob-service.nix; +} diff --git a/tests/modules/services/wpaperd/default.nix b/tests/modules/services/wpaperd/default.nix index dfd4b041d..59e82d1f9 100644 --- a/tests/modules/services/wpaperd/default.nix +++ b/tests/modules/services/wpaperd/default.nix @@ -1 +1,5 @@ -{ wpaperd-example-settings = ./wpaperd-example-settings.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + wpaperd-example-settings = ./wpaperd-example-settings.nix; +} diff --git a/tests/modules/services/xsettingsd/default.nix b/tests/modules/services/xsettingsd/default.nix index 98c99f4c8..a01905b5e 100644 --- a/tests/modules/services/xsettingsd/default.nix +++ b/tests/modules/services/xsettingsd/default.nix @@ -1 +1,5 @@ -{ xsettingsd-basic-configuration = ./basic-configuration.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + xsettingsd-basic-configuration = ./basic-configuration.nix; +} diff --git a/tests/modules/services/yubikey-agent-darwin/default.nix b/tests/modules/services/yubikey-agent-darwin/default.nix index 5594aa8e8..7afa694c2 100644 --- a/tests/modules/services/yubikey-agent-darwin/default.nix +++ b/tests/modules/services/yubikey-agent-darwin/default.nix @@ -1 +1,5 @@ -{ yubikey-agent-darwin = ./service.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { + yubikey-agent-darwin = ./service.nix; +} diff --git a/tests/modules/services/yubikey-agent/default.nix b/tests/modules/services/yubikey-agent/default.nix index d2ff5a353..6f0003151 100644 --- a/tests/modules/services/yubikey-agent/default.nix +++ b/tests/modules/services/yubikey-agent/default.nix @@ -1 +1,5 @@ -{ yubikey-agent = ./service.nix; } +{ lib, pkgs, ... }: + +lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + yubikey-agent = ./service.nix; +}