Rename spawn-at-startup-sh => spawn-sh-at-startup

Makes a bit more sense

docs/wiki/Configuration:-Miscellaneous.md

@@ -5,7 +5,7 @@ Here are all of these options at a glance:
 ```kdl
 spawn-at-startup "waybar"
 spawn-at-startup "alacritty"
-spawn-at-startup-sh "qs -c ~/source/qs/MyAwesomeShell"
+spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell"
 
 prefer-no-csd
 
@@ -72,7 +72,7 @@ spawn-at-startup "alacritty"
 Note that running niri as a systemd session supports xdg-desktop-autostart out of the box, which may be more convenient to use.
 Thanks to this, apps that you configured to autostart in GNOME will also "just work" in niri, without any manual `spawn-at-startup` configuration.
 
-### `spawn-at-startup-sh`
+### `spawn-sh-at-startup`
 
 <sup>Since: next release</sup>
 
@@ -85,7 +85,7 @@ See detailed description in the docs for the [`spawn-sh` key binding action](./C
 
 ```kdl
 // Pass all arguments in the same string.
-spawn-at-startup-sh "qs -c ~/source/qs/MyAwesomeShell"
+spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell"
 ```
 
 ### `prefer-no-csd`

niri-config/src/lib.rs

@@ -41,8 +41,8 @@ pub struct Config {
     pub outputs: Outputs,
     #[knuffel(children(name = "spawn-at-startup"))]
     pub spawn_at_startup: Vec<SpawnAtStartup>,
-    #[knuffel(children(name = "spawn-at-startup-sh"))]
-    pub spawn_at_startup_sh: Vec<SpawnAtStartupSh>,
+    #[knuffel(children(name = "spawn-sh-at-startup"))]
+    pub spawn_sh_at_startup: Vec<SpawnShAtStartup>,
     #[knuffel(child, default)]
     pub layout: Layout,
     #[knuffel(child, default)]
@@ -609,7 +609,7 @@ pub struct SpawnAtStartup {
 }
 
 #[derive(knuffel::Decode, Debug, Clone, PartialEq, Eq)]
-pub struct SpawnAtStartupSh {
+pub struct SpawnShAtStartup {
     #[knuffel(argument)]
     pub command: String,
 }
@@ -4463,7 +4463,7 @@ mod tests {
             }
 
             spawn-at-startup "alacritty" "-e" "fish"
-            spawn-at-startup-sh "qs -c ~/source/qs/MyAwesomeShell"
+            spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell"
 
             prefer-no-csd
 
@@ -4806,8 +4806,8 @@ mod tests {
                     ],
                 },
             ],
-            spawn_at_startup_sh: [
-                SpawnAtStartupSh {
+            spawn_sh_at_startup: [
+                SpawnShAtStartup {
                     command: "qs -c ~/source/qs/MyAwesomeShell",
                 },
             ],

resources/default-config.kdl

@@ -270,8 +270,8 @@ layout {
 // This line starts waybar, a commonly used bar for Wayland compositors.
 spawn-at-startup "waybar"
 
-// To run a shell command (with variables, pipes, etc.), use spawn-at-startup-sh:
-// spawn-at-startup-sh "qs -c ~/source/qs/MyAwesomeShell"
+// To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup:
+// spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell"
 
 hotkey-overlay {
     // Uncomment this line to disable the "Important Hotkeys" pop-up at startup.

src/main.rs

@@ -151,7 +151,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .unwrap_or_default();
 
     let spawn_at_startup = mem::take(&mut config.spawn_at_startup);
-    let spawn_at_startup_sh = mem::take(&mut config.spawn_at_startup_sh);
+    let spawn_sh_at_startup = mem::take(&mut config.spawn_sh_at_startup);
     *CHILD_ENV.write().unwrap() = mem::take(&mut config.environment);
 
     store_and_increase_nofile_rlimit();
@@ -238,7 +238,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     for elem in spawn_at_startup {
         spawn(elem.command, None);
     }
-    for elem in spawn_at_startup_sh {
+    for elem in spawn_sh_at_startup {
         spawn_sh(elem.command, None);
     }