refactor(river): update bindings and init script

Fix layout shortcut formatting, simplify the init script, and adjust window rules.

river/init

···
 #!/bin/sh
 
-compile() {
-    notify-send -t 1000 "Compiling config..."
-    cargo build --release
-    notify-send -t 1000 "Compiled!"
-}
-
 cd "$(dirname "$0")" || exit 1
-[ "$1" == "compile" ] && compile
+cargo build --release
 exec "./target/release/river-config"

river/src/autostart.rs

···
 use crate::riverctl::spawn;
 use anyhow::Result;
-use std::env;
 use std::fs;
 use std::path::Path;
 
 pub fn run() -> Result<()> {
     let lockfile = "/tmp/river-autostart.lock";
-
-    env::set_current_dir(env::home_dir().expect("wtf is home directory?"))?;
 
     if !Path::new(lockfile).exists() {
         fs::File::create(lockfile)?;

river/src/binds.rs

···
 
     // System
     bind!(MOD, "B", "spawn", "pkill -USR1 waybar");
-    bind!(MOD, "R", "spawn", &format!("sh -c '{}/init compile'", cfg));
+    bind!(MOD, "R", "spawn", &format!("{}/init", cfg));
 
     // Voxtype
     bind!(MOD, "V", "spawn", "voxtype record start");
···
     // Notifications
     bind!(mod_shift, "D", "spawn", "makoctl dismiss");
     bind!(mod_shift, "R", "spawn", "makoctl restore");
-
-    // Open dolphin in the ~/Shared/ folder
-    bind!(MOD, "T", "spawn", "dolphin ~/Shared");
 
     // Media Controls
     let media_keys = [

river/src/layout.rs

···
     riverctl(&["default-layout", "wideriver"])?;
 
     // Ignore error if pkill fails (e.g. process not found)
-    _ = run_cmd("pkill wideriver");
+    let _ = run_cmd("pkill wideriver");
 
     let focused_color = colors.get_hex("color10");
     let unfocused_color = colors.get_hex("color0");
···
 
     // Layout binds
     let cmds = [
-        ("up", "--layout monocle"),
-        ("down", "--layout wide"),
-        ("left", "--layout left"),
-        ("right", "--layout right"),
-        ("M", "--layout-toggle"),
-        ("L", "--ratio +0.025"),
-        ("H", "--ratio -0.025"),
-        ("E", "--stack even"),
-        ("W", "--stack dwindle"),
-        ("I", "--stack diminish"),
+        (format!("{}+up", MOD), "--layout monocle"),
+        (format!("{}+down", MOD), "--layout wide"),
+        (format!("{}+left", MOD), "--layout left"),
+        (format!("{}+right", MOD), "--layout right"),
+        (format!("{}+M", MOD), "--layout-toggle"),
+        (format!("{}+L", MOD), "--ratio +0.025"),
+        (format!("{}+H", MOD), "--ratio -0.025"),
+        (format!("{}+E", MOD), "--stack even"),
+        (format!("{}+W", MOD), "--stack dwindle"),
+        (format!("{}+I", MOD), "--stack diminish"),
     ];
 
     for (combo, arg) in cmds {
-        riverctl(&["map", "normal", MOD, combo, "send-layout-cmd", "wideriver", arg])?;
+        riverctl(&["map", "normal", &combo, "send-layout-cmd", "wideriver", arg])?;
     }
 
     Ok(())

river/src/main.rs

···
 use wal::WalColors;
 
 fn main() -> Result<()> {
+    autostart::run()?;
     input::run()?;
     rules::run()?;
     binds::run()?;
     layout::run(&load_pywal_colors())?;
-    autostart::run()?;
 
     Ok(())
 }

river/src/rules.rs

···
 use anyhow::Result;
 
 pub fn run() -> Result<()> {
-    riverctl(&["rule-add", "-app-id", "zen-beta", "tags", "1"])?;
-    riverctl(&["rule-add", "-app-id", "zen-beta", "csd"])?;
-    riverctl(&["rule-add", "-app-id", "Spotify", "tags", &(1 << 4).to_string()])?;
-    riverctl(&["rule-add", "-app-id", "vesktop", "tags", &(1 << 3).to_string()])?;
+    riverctl(&["rule-add", "-app-id", "zen", "tags", "1"])?;
     Ok(())
 }