Skip to content

Commit e013c54

Browse files
committed
fix(smoke): the kdl raw string survived its own "# hash, goldens re-blessed
GREETER_NIRI_KDL gained background-color "#11111B", whose quote- hash sequence terminated the r#"..."# literal at the color instead of the end of the config: the tree did not compile. r##"..."## now. Goldens re-blessed with UPDATE_GOLDENS=1; the manifest delta is exactly the three staged files this change intends to move (greeter-niri.kdl, kuma-greeter-session, kuma-greeter-tmpfiles.conf) and nothing else. Full test suite green (96 + 425 + 2).
1 parent b992d8e commit e013c54

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎src/containerfile/blocks.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ user = "greetd"
471471
/// niri exists to host the greeter, nothing else. Drift hazard: this
472472
/// is a copy, not a build-time fetch; re-sync it on every kumaUI pin
473473
/// bump that touches the file.
474-
pub(crate) const GREETER_NIRI_KDL: &str = r#"// The greeter compositor config: the smallest niri that can host
474+
pub(crate) const GREETER_NIRI_KDL: &str = r##"// The greeter compositor config: the smallest niri that can host
475475
// one greeter window. No keybinds, no gestures, no session wiring:
476476
// greetd launches this niri on the test VT, niri launches
477477
// kuma-greeter as its startup command, and GREETD_SOCK flows down
@@ -485,7 +485,7 @@ layout {
485485
}
486486
hotkey-overlay {
487487
skip-at-startup
488-
}"#;
488+
}"##;
489489

490490
/// What greetd actually runs: niri hosting kuma-greeter, with the
491491
/// greeter's cache pointed at a directory of its own. The greeter

‎src/containerfile/goldens/everything-on.manifest‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fastfetch-logo.txt 0ebbc161750f8cd839b68f97013a28211cbe669a7bd0e5539602568acb399
1313
flatpaks 0e587be7e352dd922fce12c1f091a8b7138bdcbd916d2dc47b6dbb2acdb31adb
1414
greetd-config.toml c2f586cfadd410b0504ec8acb2c1246546585a73b5b9b0b462fe637fcdcd6202
1515
greetd-restart.conf 6b635b63e93935b4ee5f1a62de073401e93b1afcc4a40bd0a0e83b4ef04f109e
16-
greeter-niri.kdl f255a2b5617c4448353a37ba3c49fd2c48c91dd2b18e5fc490f0122c33fc03e6
16+
greeter-niri.kdl 1a3b1f31752c62798d45729ea18695b13e9867381b81ec49d1d4e4ac44bbe194
1717
gtk3-settings.ini df3b2b9cd9d5bb97123c945b2462c4c0121d3acd4c1dee7ebd735f365ef23ff3
1818
gtk4-settings.ini b985284f7c75508bb0c51597236df47cfa7679ef96183eea2e43a8fced9e1056
1919
hostname 25be323556dad377abb57fe7ec8c4b99a6527f488dda28d0c9b686528659c909
@@ -49,8 +49,8 @@ kuma-fstab-sync 8d91559a751bb9871641d2295536dac4fca72da4ca6b66787f5765cc0f191021
4949
kuma-fstab-sync.service 9d865e627355d6a5abb8ca39d00e62c41ef3effffe1eb235caeb16691622925b
5050
kuma-greeter 001555c61143bba5fc71ab136eadf5444ac9e0189bf20cc7fca15a6eb0224e25
5151
kuma-greeter-check ba4ff3ab5f84f6e5623a73a5a1c6f1384522652536f797bcad7048b3514fba5a
52-
kuma-greeter-session 1998374a98624c99dbba7a6933954291647777c06d9e4aca10b5cc2ac23285ff
53-
kuma-greeter-tmpfiles.conf ac57bb5086c057d537a424cd2d36924a739ef48e8b74b00baeb14bc4f8c4477e
52+
kuma-greeter-session e9e2d5e3a6753b1180ca6d3e1e933ec7ab8aae01c6787dc08a9e12f0a4dbf388
53+
kuma-greeter-tmpfiles.conf f5358a189eada8db133043c934955c7b2a61d211620d566e922420df663413b8
5454
kuma-home-subvol b90db7dc4eabc2b9a95bdf90e7c93a432f6b818cb36c8135cde11138b39e2766
5555
kuma-home-subvol.service af9133fe3d2a930c432880a9937c71e8842e6d0fefbd75da065dc745240e4573
5656
kuma-launch 6926544d245a9739b554fe5aabdb7d025394eb44180afebda024dc80f3f35359

‎src/containerfile/goldens/niri.manifest‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fastfetch-logo.txt 0ebbc161750f8cd839b68f97013a28211cbe669a7bd0e5539602568acb399
1010
flatpaks e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
1111
greetd-config.toml c2f586cfadd410b0504ec8acb2c1246546585a73b5b9b0b462fe637fcdcd6202
1212
greetd-restart.conf 6b635b63e93935b4ee5f1a62de073401e93b1afcc4a40bd0a0e83b4ef04f109e
13-
greeter-niri.kdl f255a2b5617c4448353a37ba3c49fd2c48c91dd2b18e5fc490f0122c33fc03e6
13+
greeter-niri.kdl 1a3b1f31752c62798d45729ea18695b13e9867381b81ec49d1d4e4ac44bbe194
1414
gtk3-settings.ini df3b2b9cd9d5bb97123c945b2462c4c0121d3acd4c1dee7ebd735f365ef23ff3
1515
gtk4-settings.ini b985284f7c75508bb0c51597236df47cfa7679ef96183eea2e43a8fced9e1056
1616
hostname e507e0ac17cbc04749c54ea27c5955bca0c66b325b1aeb9ef678343a476ffff8
@@ -37,8 +37,8 @@ kuma-fstab-sync 8d91559a751bb9871641d2295536dac4fca72da4ca6b66787f5765cc0f191021
3737
kuma-fstab-sync.service 9d865e627355d6a5abb8ca39d00e62c41ef3effffe1eb235caeb16691622925b
3838
kuma-greeter 001555c61143bba5fc71ab136eadf5444ac9e0189bf20cc7fca15a6eb0224e25
3939
kuma-greeter-check ba4ff3ab5f84f6e5623a73a5a1c6f1384522652536f797bcad7048b3514fba5a
40-
kuma-greeter-session 1998374a98624c99dbba7a6933954291647777c06d9e4aca10b5cc2ac23285ff
41-
kuma-greeter-tmpfiles.conf ac57bb5086c057d537a424cd2d36924a739ef48e8b74b00baeb14bc4f8c4477e
40+
kuma-greeter-session e9e2d5e3a6753b1180ca6d3e1e933ec7ab8aae01c6787dc08a9e12f0a4dbf388
41+
kuma-greeter-tmpfiles.conf f5358a189eada8db133043c934955c7b2a61d211620d566e922420df663413b8
4242
kuma-home-subvol b90db7dc4eabc2b9a95bdf90e7c93a432f6b818cb36c8135cde11138b39e2766
4343
kuma-home-subvol.service af9133fe3d2a930c432880a9937c71e8842e6d0fefbd75da065dc745240e4573
4444
kuma-launch 6926544d245a9739b554fe5aabdb7d025394eb44180afebda024dc80f3f35359

‎src/containerfile/goldens/nostr.manifest‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fastfetch-logo.txt 0ebbc161750f8cd839b68f97013a28211cbe669a7bd0e5539602568acb399
1010
flatpaks e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
1111
greetd-config.toml c2f586cfadd410b0504ec8acb2c1246546585a73b5b9b0b462fe637fcdcd6202
1212
greetd-restart.conf 6b635b63e93935b4ee5f1a62de073401e93b1afcc4a40bd0a0e83b4ef04f109e
13-
greeter-niri.kdl f255a2b5617c4448353a37ba3c49fd2c48c91dd2b18e5fc490f0122c33fc03e6
13+
greeter-niri.kdl 1a3b1f31752c62798d45729ea18695b13e9867381b81ec49d1d4e4ac44bbe194
1414
gtk3-settings.ini df3b2b9cd9d5bb97123c945b2462c4c0121d3acd4c1dee7ebd735f365ef23ff3
1515
gtk4-settings.ini b985284f7c75508bb0c51597236df47cfa7679ef96183eea2e43a8fced9e1056
1616
hostname e507e0ac17cbc04749c54ea27c5955bca0c66b325b1aeb9ef678343a476ffff8
@@ -37,8 +37,8 @@ kuma-fstab-sync 8d91559a751bb9871641d2295536dac4fca72da4ca6b66787f5765cc0f191021
3737
kuma-fstab-sync.service 9d865e627355d6a5abb8ca39d00e62c41ef3effffe1eb235caeb16691622925b
3838
kuma-greeter 001555c61143bba5fc71ab136eadf5444ac9e0189bf20cc7fca15a6eb0224e25
3939
kuma-greeter-check ba4ff3ab5f84f6e5623a73a5a1c6f1384522652536f797bcad7048b3514fba5a
40-
kuma-greeter-session 1998374a98624c99dbba7a6933954291647777c06d9e4aca10b5cc2ac23285ff
41-
kuma-greeter-tmpfiles.conf ac57bb5086c057d537a424cd2d36924a739ef48e8b74b00baeb14bc4f8c4477e
40+
kuma-greeter-session e9e2d5e3a6753b1180ca6d3e1e933ec7ab8aae01c6787dc08a9e12f0a4dbf388
41+
kuma-greeter-tmpfiles.conf f5358a189eada8db133043c934955c7b2a61d211620d566e922420df663413b8
4242
kuma-home-subvol b90db7dc4eabc2b9a95bdf90e7c93a432f6b818cb36c8135cde11138b39e2766
4343
kuma-home-subvol.service af9133fe3d2a930c432880a9937c71e8842e6d0fefbd75da065dc745240e4573
4444
kuma-launch 6926544d245a9739b554fe5aabdb7d025394eb44180afebda024dc80f3f35359

0 commit comments

Comments
 (0)