Bookmarks Toolbar''
- else
- ''${escapeXML directory.name}''
- }
- ${indent indentLevel}
- ${allItemsToHTML (indentLevel + 1) directory.bookmarks}
- ${indent indentLevel}
- ${allItemsToHTML (indentLevel + 1) directory.bookmarks} - ${indent indentLevel}
''; - - itemToHTMLOrRecurse = indentLevel: item: - if item ? "url" then - bookmarkToHTML indentLevel item - else - directoryToHTML indentLevel item; - - allItemsToHTML = indentLevel: bookmarks: - lib.concatStringsSep "\n" - (map (itemToHTMLOrRecurse indentLevel) bookmarks); - - bookmarkEntries = allItemsToHTML 1 bookmarks; - in pkgs.writeText "firefox-bookmarks.html" '' - - - -
Bookmarks Menu
-- ${bookmarkEntries} -
Bookmarks Toolbar''
+ else
+ ''${escapeXML directory.name}''
+ }
+ ${indent indentLevel}
+ ${allItemsToHTML (indentLevel + 1) directory.bookmarks}
+ ${indent indentLevel}
+ ${allItemsToHTML (indentLevel + 1) directory.bookmarks} + ${indent indentLevel}
''; + + itemToHTMLOrRecurse = indentLevel: item: + if item ? "url" then + bookmarkToHTML indentLevel item + else + directoryToHTML indentLevel item; + + allItemsToHTML = indentLevel: bookmarks: + lib.concatStringsSep "\n" + (map (itemToHTMLOrRecurse indentLevel) bookmarks); + + bookmarkEntries = allItemsToHTML 1 bookmarks; + in pkgs.writeText "${packageName}-bookmarks.html" '' + + + +
Bookmarks Menu
++ ${bookmarkEntries} +
+ 
+
+
+
++ Example Flavor for Yazi +
+ +## Cooking up a new flavor + +> [!NOTE] +> Please remove this section from your README before publishing. + +1. [x] Fork this repository and rename it to `your-flavor-name.yazi`. +2. [ ] Copy the **parts you need to customize** from the [default theme.toml](https://github.com/sxyazi/yazi/blob/main/yazi-config/preset/theme.toml) as `./flavor.toml`, and change them to meet your preferences. +3. [ ] Find a `.tmTheme` file on GitHub that matches the color of your flavor, copy it and it's license file as `./tmtheme.xml`, and `LICENSE-tmtheme`. +4. [ ] Modify the content and preview image in the README to fit your flavor. + +## 👀 Preview + +
+
+## 🎨 Installation
+
+
+
+```bash
+# Linux/macOS
+git clone https://github.com/username/example.yazi.git ~/.config/yazi/flavors/example.yazi
+
+# Windows
+git clone https://github.com/username/example.yazi.git %AppData%\yazi\config\flavors\example.yazi
+```
+
+## ⚙️ Usage
+
+Add the these lines to your `theme.toml` configuration file to use it:
+
+
+
+```toml
+[flavor]
+use = "example"
+```
+
+## 📜 License
+
+The flavor is MIT-licensed, and the included tmTheme is also MIT-licensed.
+
+Check the [LICENSE](LICENSE) and [LICENSE-tmtheme](LICENSE-tmtheme) file for more details.
diff --git a/tests/modules/programs/yazi/flavor/flavor.toml b/tests/modules/programs/yazi/flavor/flavor.toml
new file mode 100644
index 000000000..35e1fe770
--- /dev/null
+++ b/tests/modules/programs/yazi/flavor/flavor.toml
@@ -0,0 +1,2 @@
+# This is a flavor.
+
diff --git a/tests/modules/programs/yazi/flavor/init.lua b/tests/modules/programs/yazi/flavor/init.lua
deleted file mode 100644
index 8d06fa7a9..000000000
--- a/tests/modules/programs/yazi/flavor/init.lua
+++ /dev/null
@@ -1 +0,0 @@
--- This is a flavor.
diff --git a/tests/modules/programs/yazi/flavor/preview.png b/tests/modules/programs/yazi/flavor/preview.png
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/modules/programs/yazi/flavor/tmtheme.xml b/tests/modules/programs/yazi/flavor/tmtheme.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/modules/programs/yazi/init-lua-string.nix b/tests/modules/programs/yazi/init-lua-string.nix
new file mode 100644
index 000000000..999dd6bc6
--- /dev/null
+++ b/tests/modules/programs/yazi/init-lua-string.nix
@@ -0,0 +1,14 @@
+{ ... }: {
+ programs.yazi = {
+ enable = true;
+
+ initLua = builtins.readFile ./init.lua;
+ };
+
+ test.stubs.yazi = { };
+
+ nmt.script = ''
+ assertFileContent home-files/.config/yazi/init.lua \
+ ${./init.lua}
+ '';
+}
diff --git a/tests/modules/programs/yazi/nushell-integration-enabled.nix b/tests/modules/programs/yazi/nushell-integration-enabled.nix
index 9adbaa982..a2de2d8b7 100644
--- a/tests/modules/programs/yazi/nushell-integration-enabled.nix
+++ b/tests/modules/programs/yazi/nushell-integration-enabled.nix
@@ -2,7 +2,7 @@
let
shellIntegration = ''
- def --env ya [...args] {
+ def --env yy [...args] {
let tmp = (mktemp -t "yazi-cwd.XXXXX")
yazi ...$args --cwd-file $tmp
let cwd = (open $tmp)
diff --git a/tests/modules/programs/yazi/settings.nix b/tests/modules/programs/yazi/settings.nix
index 4655ae8b3..2694dadec 100644
--- a/tests/modules/programs/yazi/settings.nix
+++ b/tests/modules/programs/yazi/settings.nix
@@ -70,8 +70,22 @@
};
};
initLua = ./init.lua;
- plugins = { "test.yazi" = ./plugin; };
- flavors = { "test.yazi" = ./flavor; };
+ plugins = {
+ testplugin = ./plugin;
+ ## Produces warning
+ #"plugin-with-suffix.yazi" = ./plugin;
+ ## Fails assertion
+ #single-file-plugin = ./plugin/init.lua;
+ #empty-dir-plugin = ./empty;
+ };
+ flavors = {
+ testflavor = ./flavor;
+ ## Produces warning
+ #"flavor-with-suffix.yazi" = ./flavor;
+ ## Fails assertion
+ #single-file-flavor = ./flavor/flavor.toml;
+ #empty-dir-flavor = ./empty;
+ };
};
test.stubs.yazi = { };
@@ -85,9 +99,9 @@
${./theme-expected.toml}
assertFileContent home-files/.config/yazi/init.lua \
${./init.lua}
- assertFileContent home-files/.config/yazi/plugins/test.yazi/init.lua \
+ assertFileContent home-files/.config/yazi/plugins/testplugin.yazi/init.lua \
${./plugin/init.lua}
- assertFileContent home-files/.config/yazi/flavors/test.yazi/init.lua \
- ${./flavor/init.lua}
+ assertFileContent home-files/.config/yazi/flavors/testflavor.yazi/flavor.toml \
+ ${./flavor/flavor.toml}
'';
}
diff --git a/tests/modules/programs/yazi/zsh-integration-enabled.nix b/tests/modules/programs/yazi/zsh-integration-enabled.nix
index d5090a6a8..0c0ec217f 100644
--- a/tests/modules/programs/yazi/zsh-integration-enabled.nix
+++ b/tests/modules/programs/yazi/zsh-integration-enabled.nix
@@ -2,7 +2,7 @@
let
shellIntegration = ''
- function ya() {
+ function yy() {
local tmp="$(mktemp -t "yazi-cwd.XXXXX")"
yazi "$@" --cwd-file="$tmp"
if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
diff --git a/tests/modules/services/blanket/basic-configuration.nix b/tests/modules/services/blanket/basic-configuration.nix
new file mode 100644
index 000000000..740c4d08d
--- /dev/null
+++ b/tests/modules/services/blanket/basic-configuration.nix
@@ -0,0 +1,31 @@
+{ ... }:
+
+{
+ services.blanket = { enable = true; };
+
+ test.stubs.blanket = { };
+
+ nmt.script = ''
+ clientServiceFile=home-files/.config/systemd/user/blanket.service
+
+ assertFileExists $clientServiceFile
+ assertFileContent $clientServiceFile ${
+ builtins.toFile "expected.service" ''
+ [Install]
+ WantedBy=graphical-session.target
+
+ [Service]
+ ExecStart=@blanket@/bin/blanket --gapplication-service
+ Restart=on-failure
+ RestartSec=5
+
+ [Unit]
+ After=graphical-session-pre.target
+ Description=Blanket daemon
+ PartOf=graphical-session.target
+ PartOf=pipewire.service
+ Requires=dbus.service
+ ''
+ }
+ '';
+}
diff --git a/tests/modules/services/blanket/default.nix b/tests/modules/services/blanket/default.nix
new file mode 100644
index 000000000..8a439a52a
--- /dev/null
+++ b/tests/modules/services/blanket/default.nix
@@ -0,0 +1 @@
+{ blanket-basic-configuration = ./basic-configuration.nix; }
diff --git a/tests/modules/services/glance/default-settings.nix b/tests/modules/services/glance/default-settings.nix
new file mode 100644
index 000000000..7b35db779
--- /dev/null
+++ b/tests/modules/services/glance/default-settings.nix
@@ -0,0 +1,15 @@
+{ ... }:
+
+{
+ services.glance.enable = true;
+
+ test.stubs.glance = { };
+
+ nmt.script = ''
+ configFile=home-files/.config/glance/glance.yml
+ serviceFile=home-files/.config/systemd/user/glance.service
+
+ assertFileContent $configFile ${./glance-default-config.yml}
+ assertFileContent $serviceFile ${./glance.service}
+ '';
+}
diff --git a/tests/modules/services/glance/default.nix b/tests/modules/services/glance/default.nix
new file mode 100644
index 000000000..893ba6516
--- /dev/null
+++ b/tests/modules/services/glance/default.nix
@@ -0,0 +1,4 @@
+{
+ glance-default-settings = ./default-settings.nix;
+ glance-example-settings = ./example-settings.nix;
+}
diff --git a/tests/modules/services/glance/example-settings.nix b/tests/modules/services/glance/example-settings.nix
new file mode 100644
index 000000000..9e2101d2e
--- /dev/null
+++ b/tests/modules/services/glance/example-settings.nix
@@ -0,0 +1,33 @@
+{ ... }:
+
+{
+ services.glance = {
+ enable = true;
+ settings = {
+ server.port = 5678;
+ pages = [{
+ name = "Home";
+ columns = [{
+ size = "full";
+ widgets = [
+ { type = "calendar"; }
+ {
+ type = "weather";
+ location = "London, United Kingdom";
+ }
+ ];
+ }];
+ }];
+ };
+ };
+
+ test.stubs.glance = { };
+
+ nmt.script = ''
+ configFile=home-files/.config/glance/glance.yml
+ serviceFile=home-files/.config/systemd/user/glance.service
+
+ assertFileContent $configFile ${./glance-example-config.yml}
+ assertFileContent $serviceFile ${./glance.service}
+ '';
+}
diff --git a/tests/modules/services/glance/glance-default-config.yml b/tests/modules/services/glance/glance-default-config.yml
new file mode 100644
index 000000000..024a89649
--- /dev/null
+++ b/tests/modules/services/glance/glance-default-config.yml
@@ -0,0 +1,6 @@
+pages:
+- columns:
+ - size: full
+ widgets:
+ - type: calendar
+ name: Calendar
diff --git a/tests/modules/services/glance/glance-example-config.yml b/tests/modules/services/glance/glance-example-config.yml
new file mode 100644
index 000000000..2775916ec
--- /dev/null
+++ b/tests/modules/services/glance/glance-example-config.yml
@@ -0,0 +1,10 @@
+pages:
+- columns:
+ - size: full
+ widgets:
+ - type: calendar
+ - location: London, United Kingdom
+ type: weather
+ name: Home
+server:
+ port: 5678
diff --git a/tests/modules/services/glance/glance.service b/tests/modules/services/glance/glance.service
new file mode 100644
index 000000000..07b82d1d9
--- /dev/null
+++ b/tests/modules/services/glance/glance.service
@@ -0,0 +1,9 @@
+[Install]
+WantedBy=graphical-session.target
+
+[Service]
+ExecStart=@glance@/bin/dummy --config /home/hm-user/.config/glance/glance.yml
+
+[Unit]
+Description=Glance feed dashboard server
+PartOf=graphical-session.target
diff --git a/tests/modules/services/mpd/default.nix b/tests/modules/services/mpd/default.nix
index d2fd2a292..f7919b227 100644
--- a/tests/modules/services/mpd/default.nix
+++ b/tests/modules/services/mpd/default.nix
@@ -1,5 +1,6 @@
{
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;
mpd-xdg-music-dir = ./xdg-music-dir.nix;
}
diff --git a/tests/modules/services/mpd/start-when-needed.nix b/tests/modules/services/mpd/start-when-needed.nix
new file mode 100644
index 000000000..31017c9e3
--- /dev/null
+++ b/tests/modules/services/mpd/start-when-needed.nix
@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+ services.mpd = {
+ enable = true;
+ musicDirectory = "/my/music/dir";
+ extraArgs = [ "--verbose" ];
+ network.startWhenNeeded = true;
+ };
+
+ home.stateVersion = "22.11";
+
+ test.stubs.mpd = { };
+
+ nmt.script = ''
+ serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/mpd.service)
+ assertFileContent "$serviceFile" ${./start-when-needed.service}
+
+ socketFile=home-files/.config/systemd/user/mpd.socket
+ assertFileContent "$socketFile" ${./start-when-needed.socket}
+
+ confFile=$(grep -o \
+ '/nix/store/.*-mpd.conf' \
+ $TESTED/home-files/.config/systemd/user/mpd.service)
+ assertFileContent "$confFile" ${./basic-configuration.conf}
+ '';
+}
diff --git a/tests/modules/services/mpd/start-when-needed.service b/tests/modules/services/mpd/start-when-needed.service
new file mode 100644
index 000000000..87eb4b79a
--- /dev/null
+++ b/tests/modules/services/mpd/start-when-needed.service
@@ -0,0 +1,12 @@
+[Service]
+Environment=PATH=/home/hm-user/.nix-profile/bin
+ExecStart=@mpd@/bin/mpd --no-daemon /nix/store/00000000000000000000000000000000-mpd.conf '--verbose'
+ExecStartPre=/nix/store/00000000000000000000000000000000-bash/bin/bash -c "/nix/store/00000000000000000000000000000000-coreutils/bin/mkdir -p '/home/hm-user/.local/share/mpd' '/home/hm-user/.local/share/mpd/playlists'"
+Type=notify
+
+[Unit]
+After=network.target
+After=sound.target
+After=mpd.socket
+Description=Music Player Daemon
+Requires=mpd.socket
diff --git a/tests/modules/services/mpd/start-when-needed.socket b/tests/modules/services/mpd/start-when-needed.socket
new file mode 100644
index 000000000..b5687b117
--- /dev/null
+++ b/tests/modules/services/mpd/start-when-needed.socket
@@ -0,0 +1,8 @@
+[Install]
+WantedBy=sockets.target
+
+[Socket]
+Backlog=5
+KeepAlive=true
+ListenStream=127.0.0.1:6600
+ListenStream=%t/mpd/socket
diff --git a/tests/modules/services/nix-gc/basic.nix b/tests/modules/services/nix-gc/basic.nix
index d6511a171..a06b67238 100644
--- a/tests/modules/services/nix-gc/basic.nix
+++ b/tests/modules/services/nix-gc/basic.nix
@@ -4,7 +4,7 @@
nix.gc = {
automatic = true;
frequency = "monthly";
- options = "--delete-older-than 30d";
+ options = "--delete-older-than 30d --max-freed $((64 * 1024**3))";
};
test.stubs.nix = { name = "nix"; };
@@ -25,5 +25,16 @@
timerFile=$(normalizeStorePaths $timerFile)
assertFileContent $timerFile ${./expected.timer}
+
+ nixgcScriptFile=$(grep -o \
+ '/nix/store/.*-nix-gc' \
+ $TESTED/home-files/.config/systemd/user/nix-gc.service
+ )
+
+ assertFileExists $nixgcScriptFile
+
+ nixgcScriptFile=$(normalizeStorePaths $nixgcScriptFile)
+
+ assertFileContent $nixgcScriptFile ${./nix-gc-script-expected}
'';
}
diff --git a/tests/modules/services/nix-gc/expected.service b/tests/modules/services/nix-gc/expected.service
index 4aafd6af8..47bca9895 100644
--- a/tests/modules/services/nix-gc/expected.service
+++ b/tests/modules/services/nix-gc/expected.service
@@ -1,5 +1,6 @@
[Service]
-ExecStart=@nix@/bin/nix-collect-garbage --delete-older-than 30d
+ExecStart=/nix/store/00000000000000000000000000000000-nix-gc
+Type=oneshot
[Unit]
Description=Nix Garbage Collector
diff --git a/tests/modules/services/nix-gc/nix-gc-script-expected b/tests/modules/services/nix-gc/nix-gc-script-expected
new file mode 100644
index 000000000..0ce2a4f91
--- /dev/null
+++ b/tests/modules/services/nix-gc/nix-gc-script-expected
@@ -0,0 +1,2 @@
+#!/nix/store/00000000000000000000000000000000-bash/bin/bash
+exec @nix@/bin/nix-collect-garbage --delete-older-than 30d --max-freed $((64 * 1024**3))
diff --git a/tests/modules/services/swayosd/swayosd.nix b/tests/modules/services/swayosd/swayosd.nix
index 88a7c5362..1bc7d5354 100644
--- a/tests/modules/services/swayosd/swayosd.nix
+++ b/tests/modules/services/swayosd/swayosd.nix
@@ -23,6 +23,7 @@
[Service]
ExecStart=@swayosd@/bin/swayosd-server --display DISPLAY --style '/etc/xdg/swayosd/style.css' --top-margin 0.100000
Restart=always
+ RestartSec=2s
Type=simple
[Unit]
@@ -31,6 +32,8 @@
Description=Volume/backlight OSD indicator
Documentation=man:swayosd(1)
PartOf=graphical-session.target
+ StartLimitBurst=5
+ StartLimitIntervalSec=10
''
}
'';
diff --git a/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix b/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix
index 0216681f3..fefff9904 100644
--- a/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix
+++ b/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix
@@ -7,7 +7,10 @@
enable = true;
config = {
- bars = [{ fonts = [ "FontAwesome" "Iosevka 11.500000" ]; }];
+ bars = [
+ { fonts = [ "FontAwesome" "Iosevka 11.500000" ]; }
+ { fonts = [ "FontAwesome" "Iosevka Bold Semi-Condensed 14px" ]; }
+ ];
fonts = [ "DejaVuSansMono" "Terminus Bold Semi-Condensed 13.500000" ];
};
};
@@ -21,5 +24,6 @@
test.asserts.warnings.expected = [
"Specifying i3.config.fonts as a list is deprecated. Use the attrset version instead."
"Specifying i3.config.bars[].fonts as a list is deprecated. Use the attrset version instead."
+ "Specifying i3.config.bars[].fonts as a list is deprecated. Use the attrset version instead."
];
}
diff --git a/tests/modules/services/window-managers/i3/i3-fonts-expected.conf b/tests/modules/services/window-managers/i3/i3-fonts-expected.conf
index e2606b320..9ce876874 100644
--- a/tests/modules/services/window-managers/i3/i3-fonts-expected.conf
+++ b/tests/modules/services/window-managers/i3/i3-fonts-expected.conf
@@ -94,3 +94,25 @@ bar {
}
}
+bar {
+ font pango:FontAwesome, Iosevka Bold Semi-Condensed 14px
+ mode dock
+ hidden_state hide
+ position bottom
+ status_command @i3status@/bin/i3status
+ i3bar_command @i3@/bin/i3bar
+ workspace_buttons yes
+ strip_workspace_numbers no
+ tray_output primary
+ colors {
+ background #000000
+ statusline #ffffff
+ separator #666666
+ focused_workspace #4c7899 #285577 #ffffff
+ active_workspace #333333 #5f676a #ffffff
+ inactive_workspace #333333 #222222 #888888
+ urgent_workspace #2f343a #900000 #ffffff
+ binding_mode #2f343a #900000 #ffffff
+ }
+}
+
diff --git a/tests/modules/services/window-managers/i3/i3-fonts.nix b/tests/modules/services/window-managers/i3/i3-fonts.nix
index decd9fcca..061f7a0bd 100644
--- a/tests/modules/services/window-managers/i3/i3-fonts.nix
+++ b/tests/modules/services/window-managers/i3/i3-fonts.nix
@@ -7,12 +7,21 @@
enable = true;
config = {
- bars = [{
- fonts = {
- names = [ "FontAwesome" "Iosevka" ];
- size = 11.5;
- };
- }];
+ bars = [
+ {
+ fonts = {
+ names = [ "FontAwesome" "Iosevka" ];
+ size = 11.5;
+ };
+ }
+ {
+ fonts = {
+ names = [ "FontAwesome" "Iosevka" ];
+ style = "Bold Semi-Condensed";
+ size = "14px";
+ };
+ }
+ ];
fonts = {
names = [ "DejaVuSansMono" "Terminus" ];
style = "Bold Semi-Condensed";
diff --git a/tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf b/tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf
index 448c41f47..100193192 100644
--- a/tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf
+++ b/tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf
@@ -108,4 +108,4 @@ bar {
}
}
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user start sway-session.target"
+exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.conf b/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.conf
index d11f6f2bc..28513fcd5 100644
--- a/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.conf
+++ b/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.conf
@@ -107,5 +107,5 @@ bar {
}
}
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user start sway-session.target"
+exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
exec_always pkill flashfocus; flasfocus &
diff --git a/tests/modules/services/window-managers/sway/sway-default.conf b/tests/modules/services/window-managers/sway/sway-default.conf
index 71a0b13fb..cefe4e0af 100644
--- a/tests/modules/services/window-managers/sway/sway-default.conf
+++ b/tests/modules/services/window-managers/sway/sway-default.conf
@@ -105,4 +105,4 @@ bar {
}
}
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user start sway-session.target"
+exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-followmouse-expected.conf b/tests/modules/services/window-managers/sway/sway-followmouse-expected.conf
index af259face..f4f60ddf0 100644
--- a/tests/modules/services/window-managers/sway/sway-followmouse-expected.conf
+++ b/tests/modules/services/window-managers/sway/sway-followmouse-expected.conf
@@ -83,4 +83,4 @@ mode "resize" {
bindsym l resize grow width 10 px
}
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user start sway-session.target"
+exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-followmouse-legacy-expected.conf b/tests/modules/services/window-managers/sway/sway-followmouse-legacy-expected.conf
index 1fd0003fc..c10dbd90d 100644
--- a/tests/modules/services/window-managers/sway/sway-followmouse-legacy-expected.conf
+++ b/tests/modules/services/window-managers/sway/sway-followmouse-legacy-expected.conf
@@ -83,4 +83,4 @@ mode "resize" {
bindsym l resize grow width 10 px
}
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user start sway-session.target"
+exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-modules.conf b/tests/modules/services/window-managers/sway/sway-modules.conf
index 766d61de7..d36a164ee 100644
--- a/tests/modules/services/window-managers/sway/sway-modules.conf
+++ b/tests/modules/services/window-managers/sway/sway-modules.conf
@@ -71,15 +71,15 @@ bindsym Mod1+v splitv
bindsym Mod1+w layout tabbed
input "*" {
-xkb_variant dvorak
+ xkb_variant dvorak
}
output "HDMI-A-2" {
-bg ~/path/to/background.png fill
+ bg ~/path/to/background.png fill
}
seat "*" {
-hide_cursor when-typing enable
+ hide_cursor when-typing enable
}
mode "resize" {
@@ -117,4 +117,4 @@ bar {
}
}
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user start sway-session.target"
+exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-null-package.conf b/tests/modules/services/window-managers/sway/sway-null-package.conf
index 67073371f..9df934b2f 100644
--- a/tests/modules/services/window-managers/sway/sway-null-package.conf
+++ b/tests/modules/services/window-managers/sway/sway-null-package.conf
@@ -105,4 +105,4 @@ bar {
}
}
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user start sway-session.target"
+exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-post-2003.conf b/tests/modules/services/window-managers/sway/sway-post-2003.conf
index 67073371f..9df934b2f 100644
--- a/tests/modules/services/window-managers/sway/sway-post-2003.conf
+++ b/tests/modules/services/window-managers/sway/sway-post-2003.conf
@@ -105,4 +105,4 @@ bar {
}
}
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user start sway-session.target"
+exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-systemd-variables.conf b/tests/modules/services/window-managers/sway/sway-systemd-variables.conf
index 1cbb92c32..3710c5392 100644
--- a/tests/modules/services/window-managers/sway/sway-systemd-variables.conf
+++ b/tests/modules/services/window-managers/sway/sway-systemd-variables.conf
@@ -105,4 +105,4 @@ bar {
}
}
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd XCURSOR_THEME XCURSOR_SIZE; systemctl --user start sway-session.target"
+exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf b/tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf
index 5233c0bb2..4fe872821 100644
--- a/tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf
+++ b/tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf
@@ -104,4 +104,4 @@ bar {
}
}
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user start sway-session.target"
+exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf b/tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf
index 32dfd7344..7148d0030 100644
--- a/tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf
+++ b/tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf
@@ -110,4 +110,4 @@ workspace "ABC" output "DP"
workspace "3: Test" output "HDMI"
workspace "!"§$%&/(){}[]=?\*#<>-_.:,;²³" output "DVI"
workspace "Multiple" output "DVI" "HDMI" "DP"
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user start sway-session.target"
+exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"