From aa14fc7b467fffc4dae4bcabbb1c04facdcb83b8 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 7 Jun 2026 21:15:46 -0500 Subject: [PATCH] tests: update generated TOML expectations --- .../programs/aerospace/settings-expected.toml | 8 +++- tests/modules/programs/aria2p/settings.nix | 2 +- tests/modules/programs/asciinema/settings.nix | 2 +- tests/modules/programs/comodoro/expected.toml | 1 + .../i3status-rust/with-version-02xx.nix | 1 + .../programs/lazysql/example-config.toml | 1 + .../programs/nix-search-tv/television.nix | 6 +-- .../pay-respects/general-expected.toml | 5 ++- .../programs/swayr/basic-configuration.toml | 39 ++++--------------- .../programs/television/basic-config.nix | 2 +- .../programs/wezterm/example-setting.nix | 22 +---------- .../modules/services/wayle/basic-config.toml | 1 + 12 files changed, 30 insertions(+), 60 deletions(-) diff --git a/tests/modules/programs/aerospace/settings-expected.toml b/tests/modules/programs/aerospace/settings-expected.toml index 9d3f83201..02fd0d2f1 100644 --- a/tests/modules/programs/aerospace/settings-expected.toml +++ b/tests/modules/programs/aerospace/settings-expected.toml @@ -8,7 +8,13 @@ right = 8 top = 8 [mode.main.binding] -alt-enter = "exec-and-forget osascript -e '\n tell application \"Terminal\"\n do script\n activate\n end tell'\n" +alt-enter = """ +exec-and-forget osascript -e ' + tell application "Terminal" + do script + activate + end tell' +""" alt-h = "focus left" alt-j = "focus down" alt-k = "focus up" diff --git a/tests/modules/programs/aria2p/settings.nix b/tests/modules/programs/aria2p/settings.nix index 215e7f99e..ab5fa6aaa 100644 --- a/tests/modules/programs/aria2p/settings.nix +++ b/tests/modules/programs/aria2p/settings.nix @@ -28,7 +28,7 @@ [key_bindings] AUTOCLEAR = "c" - FILTER = ["F4", "\\"] + FILTER = ["F4", '\'] ''} ''; } diff --git a/tests/modules/programs/asciinema/settings.nix b/tests/modules/programs/asciinema/settings.nix index 7c16b11f2..c63689c34 100644 --- a/tests/modules/programs/asciinema/settings.nix +++ b/tests/modules/programs/asciinema/settings.nix @@ -35,7 +35,7 @@ assertFileContent home-files/.config/asciinema/config.toml \ ${builtins.toFile "expected.asciinema_config.toml" '' [notifications] - command = "tmux display-message \"$TEXT\"" + command = 'tmux display-message "$TEXT"' enable = false [playback] diff --git a/tests/modules/programs/comodoro/expected.toml b/tests/modules/programs/comodoro/expected.toml index 9d0d4c564..b737157e7 100644 --- a/tests/modules/programs/comodoro/expected.toml +++ b/tests/modules/programs/comodoro/expected.toml @@ -4,6 +4,7 @@ on-timer-stop = "echo timer stopped" on-work-begin = "echo work cycle began" tcp-host = "localhost" tcp-port = 8080 + [[test-preset.cycles]] duration = 1500 name = "Work" diff --git a/tests/modules/programs/i3status-rust/with-version-02xx.nix b/tests/modules/programs/i3status-rust/with-version-02xx.nix index 1c0ec46ab..3838d26aa 100644 --- a/tests/modules/programs/i3status-rust/with-version-02xx.nix +++ b/tests/modules/programs/i3status-rust/with-version-02xx.nix @@ -19,6 +19,7 @@ ${pkgs.writeText "i3status-rust-expected-config" '' icons = "none" theme = "plain" + [[block]] alert = 10.0 block = "disk_space" diff --git a/tests/modules/programs/lazysql/example-config.toml b/tests/modules/programs/lazysql/example-config.toml index 75ec68bbb..b97d37fdb 100644 --- a/tests/modules/programs/lazysql/example-config.toml +++ b/tests/modules/programs/lazysql/example-config.toml @@ -8,6 +8,7 @@ DBName = "foo" Name = "Production database" Provider = "postgres" URL = "postgres://postgres:urlencodedpassword@localhost:$${port}/foo" + [[database.Commands]] Command = "ssh -tt remote-bastion -L $${port}:localhost:5432" WaitForPort = "$${port}" diff --git a/tests/modules/programs/nix-search-tv/television.nix b/tests/modules/programs/nix-search-tv/television.nix index b0e97d9b3..a496113cb 100644 --- a/tests/modules/programs/nix-search-tv/television.nix +++ b/tests/modules/programs/nix-search-tv/television.nix @@ -19,12 +19,12 @@ mode = "execute" [actions.run] - command = "nix run {replace:s/\\/ /#/g}" + command = 'nix run {replace:s/\/ /#/g}' description = "Run the package" mode = "execute" [actions.shell] - command = "nix shell {replace:s/\\/ /#/g}" + command = 'nix shell {replace:s/\/ /#/g}' description = "Enter new nix shell with this package" mode = "execute" @@ -44,7 +44,7 @@ name = "nix-search-tv" [preview] - command = "${lib.getExe pkgs.nix-search-tv} preview \"{}\"" + command = '${lib.getExe pkgs.nix-search-tv} preview "{}"' [source] command = "${lib.getExe pkgs.nix-search-tv} print" diff --git a/tests/modules/programs/pay-respects/general-expected.toml b/tests/modules/programs/pay-respects/general-expected.toml index d7809728f..3b8d58de3 100644 --- a/tests/modules/programs/pay-respects/general-expected.toml +++ b/tests/modules/programs/pay-respects/general-expected.toml @@ -1,3 +1,6 @@ [[match_err]] pattern = ["permission denied"] -suggest = ["#[executable(sudo), !cmd_contains(sudo)]\nsudo {{command}}\n"] +suggest = [""" +#[executable(sudo), !cmd_contains(sudo)] +sudo {{command}} +"""] diff --git a/tests/modules/programs/swayr/basic-configuration.toml b/tests/modules/programs/swayr/basic-configuration.toml index a7a6e68a5..0ab76f2df 100644 --- a/tests/modules/programs/swayr/basic-configuration.toml +++ b/tests/modules/programs/swayr/basic-configuration.toml @@ -2,46 +2,21 @@ lockin_delay = 750 [format] -container_format = "{indent}Container [{layout}] {marks} on workspace {workspace_name} ({id})" +container_format = '{indent}Container [{layout}] {marks} on workspace {workspace_name} ({id})' html_escape = true indent = " " -output_format = "{indent}Output {name} ({id})" +output_format = '{indent}Output {name} ({id})' urgency_end = "" -urgency_start = "" -window_format = "img:{app_icon}:text:{indent}{app_name} — {urgency_start}“{title}”{urgency_end} {marks} on workspace {workspace_name} / {output_name} ({id})" -workspace_format = "{indent}Workspace {name} [{layout}] on output {output_name} ({id})" +urgency_start = '' +window_format = 'img:{app_icon}:text:{indent}{app_name} — {urgency_start}“{title}”{urgency_end} {marks} on workspace {workspace_name} / {output_name} ({id})' +workspace_format = '{indent}Workspace {name} [{layout}] on output {output_name} ({id})' [layout] auto_tile = false -auto_tile_min_window_width_per_output_width = [ - [800, 400], - [1024, 500], - [1280, 600], - [1400, 680], - [1440, 700], - [1600, 780], - [1680, 780], - [1920, 920], - [2048, 980], - [2560, 1000], - [3440, 1200], - [3840, 1280], - [4096, 1400], - [4480, 1600], - [7680, 2400], -] +auto_tile_min_window_width_per_output_width = [[800, 400], [1024, 500], [1280, 600], [1400, 680], [1440, 700], [1600, 780], [1680, 780], [1920, 920], [2048, 980], [2560, 1000], [3440, 1200], [3840, 1280], [4096, 1400], [4480, 1600], [7680, 2400]] [menu] -args = [ - "--show=dmenu", - "--allow-markup", - "--allow-images", - "--insensitive", - "--cache-file=/dev/null", - "--parse-search", - "--height=40%", - "--prompt={prompt}", -] +args = ["--show=dmenu", "--allow-markup", "--allow-images", "--insensitive", "--cache-file=/dev/null", "--parse-search", "--height=40%", "--prompt={prompt}"] executable = "wofi" [misc] diff --git a/tests/modules/programs/television/basic-config.nix b/tests/modules/programs/television/basic-config.nix index 11a943e84..96eb71c0f 100644 --- a/tests/modules/programs/television/basic-config.nix +++ b/tests/modules/programs/television/basic-config.nix @@ -49,7 +49,7 @@ command = "git show -p --stat --pretty=fuller --color=always '{0}'" [source] - command = "git log --oneline --date=short --pretty=\"format:%h %s %an %cd\" \"$@\"" + command = 'git log --oneline --date=short --pretty="format:%h %s %an %cd" "$@"' output = "{split: :0}" ''} ''; diff --git a/tests/modules/programs/wezterm/example-setting.nix b/tests/modules/programs/wezterm/example-setting.nix index 2502511d7..afb997518 100644 --- a/tests/modules/programs/wezterm/example-setting.nix +++ b/tests/modules/programs/wezterm/example-setting.nix @@ -66,27 +66,9 @@ ''; expectedColorScheme = builtins.toFile "test.toml" '' [colors] - ansi = [ - "#222222", - "#D14949", - "#48874F", - "#AFA75A", - "#599797", - "#8F6089", - "#5C9FA8", - "#8C8C8C", - ] + ansi = ["#222222", "#D14949", "#48874F", "#AFA75A", "#599797", "#8F6089", "#5C9FA8", "#8C8C8C"] background = "#1B1B1B" - brights = [ - "#444444", - "#FF6D6D", - "#89FF95", - "#FFF484", - "#97DDFF", - "#FDAAF2", - "#85F5DA", - "#E9E9E9", - ] + brights = ["#444444", "#FF6D6D", "#89FF95", "#FFF484", "#97DDFF", "#FDAAF2", "#85F5DA", "#E9E9E9"] cursor_bg = "#BEAF8A" cursor_border = "#BEAF8A" cursor_fg = "#1B1B1B" diff --git a/tests/modules/services/wayle/basic-config.toml b/tests/modules/services/wayle/basic-config.toml index d54cac398..a1888284d 100644 --- a/tests/modules/services/wayle/basic-config.toml +++ b/tests/modules/services/wayle/basic-config.toml @@ -2,6 +2,7 @@ location = "top" rounding = "sm" scale = 1 + [[bar.layout]] center = ["media"] left = ["clock"]