monolith

public

Star0

Fork 0

Watch0

14 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `fe835aed6c8d`

tarball

atagen <boss@atagen.co>2026-10-16 10:14 UTC

7 files changed+796-0

ipc, config: add the command protocol and TOML config

Commands have one word grammar shared by keybinds and the CLI, and travel as versioned JSONL on the socket, so scripts, binds and bars cannot drift apart. A broken config on reload is rejected whole and the running one is kept.

Modified file: Cargo.lock+81 additions@@ -314,6 +314,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
 name = "lazy_static"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -389,7 +395,12 @@ name = "monolith"
 version = "0.0.0"
 dependencies = [
  "calloop-wayland-source",
+ "monolith-config",
+ "monolith-ipc",
+ "monolith-layout",
  "monolith-render-vk",
+ "serde_json",
+ "slotmap",
  "smithay",
  "tracing",
  "tracing-subscriber",
@@ -401,10 +412,19 @@ dependencies = [
 [[package]]
 name = "monolith-config"
 version = "0.0.0"
+dependencies = [
+ "monolith-ipc",
+ "regex",
+ "serde",
+ "toml",
+]
 
 [[package]]
 name = "monolith-ipc"
 version = "0.0.0"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "monolith-layout"
@@ -631,6 +651,18 @@ dependencies = [
 ]
 
 [[package]]
+name = "regex"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
 name = "regex-automata"
 version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -727,6 +759,28 @@ dependencies = [
 ]
 
 [[package]]
+name = "serde_json"
+version = "1.0.154"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6"
+dependencies = [
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
 name = "sharded-slab"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -879,6 +933,21 @@ dependencies = [
 ]
 
 [[package]]
+name = "toml"
+version = "1.1.8+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20489e00e4d8741d6be680764cc12e270655e375a20d1011e844a9c3379e678d"
+dependencies = [
+ "indexmap",
+ "serde_core",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_parser",
+ "toml_writer",
+ "winnow",
+]
+
+[[package]]
 name = "toml_datetime"
 version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -909,6 +978,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "toml_writer"
+version = "1.1.3+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770"
+
+[[package]]
 name = "tracing"
 version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1234,3 +1309,9 @@ name = "xkeysym"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
+
+[[package]]
+name = "zmij"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"

Modified file: Cargo.toml+3 additions@@ -19,6 +19,9 @@ monolith-render-vk = { path = "crates/render-vk" }
 monolith-testkit = { path = "crates/testkit" }
 
 smithay = { git = "https://github.com/Smithay/smithay", rev = "023b78b1c5a05ca512767cacc07efca55fae8be4", default-features = false, features = ["wayland_frontend"] }
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+slotmap = "1"
 tracy-client = { version = "0.19", default-features = false }
 proptest = "1"
 

Modified file: crates/config/Cargo.toml+5

@@ -8,3 +8,8 @@ publish.workspace = true

88 [lints]

99 workspace = true

1010

11+[dependencies]

12+monolith-ipc.workspace = true

13+regex = "1"

14+serde.workspace = true

15+toml = "1"

Added file: crates/config/default.toml+90 additions@@ -0,0 +1,90 @@
+# monolith's built-in config, used when ~/.config/monolith/config.toml is
+# missing. Copy it there to change anything.
+
+# Programs started with the compositor, each an argv list.
+startup = []
+
+[general]
+# What Mod means in binds. Use alt when nesting inside a compositor that
+# keeps super for itself.
+mod = "super"
+gaps = { inner = 8, outer = 8 }
+
+[keyboard]
+layout = ""
+repeat_delay = 200
+repeat_rate = 25
+
+# Each value is a command in word form, or an argv-style list.
+[binds]
+"Mod+Return" = "spawn foot"
+"Mod+q" = "close"
+"Mod+Shift+e" = "quit"
+"Mod+Shift+r" = "reload"
+
+"Mod+h" = "focus left"
+"Mod+j" = "focus down"
+"Mod+k" = "focus up"
+"Mod+l" = "focus right"
+"Mod+Shift+h" = "move left"
+"Mod+Shift+j" = "move down"
+"Mod+Shift+k" = "move up"
+"Mod+Shift+l" = "move right"
+"Mod+Ctrl+h" = "move-block left"
+"Mod+Ctrl+j" = "move-block down"
+"Mod+Ctrl+k" = "move-block up"
+"Mod+Ctrl+l" = "move-block right"
+"Mod+Alt+h" = "resize horizontal -0.05"
+"Mod+Alt+l" = "resize horizontal 0.05"
+"Mod+Alt+k" = "resize vertical -0.05"
+"Mod+Alt+j" = "resize vertical 0.05"
+
+"Mod+e" = "expand window"
+"Mod+Shift+w" = "expand block"
+"Mod+w" = "expand all"
+"Mod+o" = "flip"
+"Mod+f" = "fullscreen"
+"Mod+Shift+space" = "float"
+"Mod+s" = "sticky"
+
+"Mod+comma" = "focus-output left"
+"Mod+period" = "focus-output right"
+"Mod+Shift+comma" = "send-to-output left"
+"Mod+Shift+period" = "send-to-output right"
+
+"Mod+grave" = "summon term"
+"Mod+Shift+grave" = "scratchpad term"
+"Mod+Escape" = "dismiss"
+
+"Mod+1" = "view 1"
+"Mod+2" = "view 2"
+"Mod+3" = "view 3"
+"Mod+4" = "view 4"
+"Mod+5" = "view 5"
+"Mod+6" = "view 6"
+"Mod+7" = "view 7"
+"Mod+8" = "view 8"
+"Mod+9" = "view 9"
+"Mod+Ctrl+1" = "toggle-view 1"
+"Mod+Ctrl+2" = "toggle-view 2"
+"Mod+Ctrl+3" = "toggle-view 3"
+"Mod+Ctrl+4" = "toggle-view 4"
+"Mod+Ctrl+5" = "toggle-view 5"
+"Mod+Ctrl+6" = "toggle-view 6"
+"Mod+Ctrl+7" = "toggle-view 7"
+"Mod+Ctrl+8" = "toggle-view 8"
+"Mod+Ctrl+9" = "toggle-view 9"
+"Mod+Shift+1" = "tag 1"
+"Mod+Shift+2" = "tag 2"
+"Mod+Shift+3" = "tag 3"
+"Mod+Shift+4" = "tag 4"
+"Mod+Shift+5" = "tag 5"
+"Mod+Shift+6" = "tag 6"
+"Mod+Shift+7" = "tag 7"
+"Mod+Shift+8" = "tag 8"
+"Mod+Shift+9" = "tag 9"
+
+# Rules match app_id and title by regex, later rules overriding earlier ones.
+# [[rules]]
+# app_id = "^pavucontrol$"
+# floating = true

Modified file: crates/config/src/lib.rs+306 additions@@ -1 +1,307 @@
+//! The TOML config. Parsing and validation only, the compositor applies it.
 
+use monolith_ipc::Command;
+use regex::Regex;
+use serde::Deserialize;
+use std::collections::BTreeMap;
+use std::fmt;
+use std::path::{Path, PathBuf};
+
+pub const DEFAULT: &str = include_str!("../default.toml");
+
+#[derive(Debug, Clone)]
+pub struct Config {
+    pub general: General,
+    pub keyboard: Keyboard,
+    pub binds: Vec<Bind>,
+    pub rules: Vec<Rule>,
+    pub startup: Vec<Vec<String>>,
+}
+
+#[derive(Deserialize, Debug, Clone, PartialEq)]
+#[serde(default, deny_unknown_fields)]
+pub struct General {
+    /// What `Mod` means in binds.
+    #[serde(rename = "mod")]
+    pub mod_key: Modifier,
+    pub gaps: Gaps,
+}
+
+impl Default for General {
+    fn default() -> Self {
+        Self {
+            mod_key: Modifier::Super,
+            gaps: Gaps::default(),
+        }
+    }
+}
+
+#[derive(Deserialize, Debug, Clone, Copy, PartialEq)]
+#[serde(default, deny_unknown_fields)]
+pub struct Gaps {
+    pub inner: f64,
+    pub outer: f64,
+}
+
+impl Default for Gaps {
+    fn default() -> Self {
+        Self {
+            inner: 8.0,
+            outer: 8.0,
+        }
+    }
+}
+
+#[derive(Deserialize, Debug, Clone, PartialEq)]
+#[serde(default, deny_unknown_fields)]
+pub struct Keyboard {
+    pub rules: String,
+    pub model: String,
+    pub layout: String,
+    pub variant: String,
+    pub options: Option<String>,
+    pub repeat_delay: i32,
+    pub repeat_rate: i32,
+}
+
+impl Default for Keyboard {
+    fn default() -> Self {
+        Self {
+            rules: String::new(),
+            model: String::new(),
+            layout: String::new(),
+            variant: String::new(),
+            options: None,
+            repeat_delay: 200,
+            repeat_rate: 25,
+        }
+    }
+}
+
+#[derive(Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum Modifier {
+    Super,
+    Alt,
+    Ctrl,
+    Shift,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Hash)]
+pub struct Mods {
+    pub logo: bool,
+    pub alt: bool,
+    pub ctrl: bool,
+    pub shift: bool,
+}
+
+impl Mods {
+    fn set(&mut self, m: Modifier) {
+        match m {
+            Modifier::Super => self.logo = true,
+            Modifier::Alt => self.alt = true,
+            Modifier::Ctrl => self.ctrl = true,
+            Modifier::Shift => self.shift = true,
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct Bind {
+    pub mods: Mods,
+    /// An xkb keysym name, resolved by the compositor.
+    pub key: String,
+    pub command: Command,
+}
+
+#[derive(Debug, Clone)]
+pub struct Rule {
+    pub app_id: Option<Regex>,
+    pub title: Option<Regex>,
+    pub tag: Option<String>,
+    pub output: Option<String>,
+    pub floating: Option<bool>,
+    pub sticky: Option<bool>,
+    pub scratchpad: Option<String>,
+}
+
+/// Everything the matching rules say about a window, later rules winning.
+#[derive(Debug, Clone, Default, PartialEq)]
+pub struct Placement {
+    pub tag: Option<String>,
+    pub output: Option<String>,
+    pub floating: Option<bool>,
+    pub sticky: Option<bool>,
+    pub scratchpad: Option<String>,
+}
+
+#[derive(Debug)]
+pub enum Error {
+    Io(PathBuf, std::io::Error),
+    Toml(toml::de::Error),
+    Bind(String, String),
+    Regex(String, regex::Error),
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Error::Io(p, e) => write!(f, "{}: {e}", p.display()),
+            Error::Toml(e) => write!(f, "{e}"),
+            Error::Bind(k, e) => write!(f, "bind {k:?}: {e}"),
+            Error::Regex(r, e) => write!(f, "rule pattern {r:?}: {e}"),
+        }
+    }
+}
+
+impl std::error::Error for Error {}
+
+#[derive(Deserialize)]
+#[serde(deny_unknown_fields)]
+struct Raw {
+    #[serde(default)]
+    startup: Vec<Vec<String>>,
+    #[serde(default)]
+    general: General,
+    #[serde(default)]
+    keyboard: Keyboard,
+    #[serde(default)]
+    binds: BTreeMap<String, Words>,
+    #[serde(default)]
+    rules: Vec<RawRule>,
+}
+
+#[derive(Deserialize)]
+#[serde(untagged)]
+enum Words {
+    Line(String),
+    List(Vec<String>),
+}
+
+#[derive(Deserialize)]
+#[serde(deny_unknown_fields)]
+struct RawRule {
+    app_id: Option<String>,
+    title: Option<String>,
+    tag: Option<String>,
+    output: Option<String>,
+    floating: Option<bool>,
+    sticky: Option<bool>,
+    scratchpad: Option<String>,
+}
+
+impl Config {
+    /// `$MONOLITH_CONFIG`, else `$XDG_CONFIG_HOME/monolith/config.toml`.
+    pub fn path() -> Option<PathBuf> {
+        if let Some(p) = std::env::var_os("MONOLITH_CONFIG") {
+            return Some(p.into());
+        }
+        let base = std::env::var_os("XDG_CONFIG_HOME")
+            .map(PathBuf::from)
+            .or_else(|| std::env::var_os("HOME").map(|h| PathBuf::from(h).join(".config")))?;
+        Some(base.join("monolith/config.toml"))
+    }
+
+    /// Loads `path`, or the built-in default when it does not exist.
+    pub fn load(path: Option<&Path>) -> Result<Self, Error> {
+        match path {
+            Some(p) => match std::fs::read_to_string(p) {
+                Ok(text) => Self::parse(&text),
+                Err(e) if e.kind() == std::io::ErrorKind::NotFound => Self::parse(DEFAULT),
+                Err(e) => Err(Error::Io(p.to_owned(), e)),
+            },
+            None => Self::parse(DEFAULT),
+        }
+    }
+
+    pub fn parse(text: &str) -> Result<Self, Error> {
+        let raw: Raw = toml::from_str(text).map_err(Error::Toml)?;
+        let mod_key = raw.general.mod_key;
+        let binds = raw
+            .binds
+            .into_iter()
+            .map(|(combo, words)| parse_bind(&combo, words, mod_key))
+            .collect::<Result<_, _>>()?;
+        let regex = |p: Option<String>| {
+            p.map(|p| Regex::new(&p).map_err(|e| Error::Regex(p, e)))
+                .transpose()
+        };
+        let rules = raw
+            .rules
+            .into_iter()
+            .map(|r| {
+                Ok(Rule {
+                    app_id: regex(r.app_id)?,
+                    title: regex(r.title)?,
+                    tag: r.tag,
+                    output: r.output,
+                    floating: r.floating,
+                    sticky: r.sticky,
+                    scratchpad: r.scratchpad,
+                })
+            })
+            .collect::<Result<_, Error>>()?;
+        Ok(Self {
+            general: raw.general,
+            keyboard: raw.keyboard,
+            binds,
+            rules,
+            startup: raw.startup,
+        })
+    }
+
+    pub fn placement(&self, app_id: &str, title: &str) -> Placement {
+        let mut p = Placement::default();
+        let hit = |re: &Option<Regex>, s: &str| re.as_ref().is_none_or(|re| re.is_match(s));
+        for r in &self.rules {
+            if !hit(&r.app_id, app_id) || !hit(&r.title, title) {
+                continue;
+            }
+            p.tag = r.tag.clone().or(p.tag);
+            p.output = r.output.clone().or(p.output);
+            p.floating = r.floating.or(p.floating);
+            p.sticky = r.sticky.or(p.sticky);
+            p.scratchpad = r.scratchpad.clone().or(p.scratchpad);
+        }
+        p
+    }
+}
+
+fn parse_bind(combo: &str, words: Words, mod_key: Modifier) -> Result<Bind, Error> {
+    let bad = |m: String| Error::Bind(combo.to_owned(), m);
+    let parts: Vec<&str> = combo.split('+').map(str::trim).collect();
+    let Some((&key, mods)) = parts.split_last().filter(|(k, _)| !k.is_empty()) else {
+        return Err(bad("no key".into()));
+    };
+    let mut set = Mods::default();
+    for m in mods {
+        let m = match m.to_ascii_lowercase().as_str() {
+            "mod" => mod_key,
+            "super" | "logo" | "win" => Modifier::Super,
+            "alt" => Modifier::Alt,
+            "ctrl" | "control" => Modifier::Ctrl,
+            "shift" => Modifier::Shift,
+            other => return Err(bad(format!("unknown modifier {other}"))),
+        };
+        set.set(m);
+    }
+    let words: Vec<String> = match words {
+        Words::Line(s) => s.split_whitespace().map(str::to_owned).collect(),
+        Words::List(v) => v,
+    };
+    let command = Command::parse(&words).map_err(|e| bad(e.0))?;
+    Ok(Bind {
+        mods: set,
+        key: key.to_owned(),
+        command,
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn the_default_config_parses() {
+        let c = super::Config::parse(super::DEFAULT).unwrap();
+        assert!(c.binds.len() > 40);
+    }
+}

Modified file: crates/ipc/Cargo.toml+2

@@ -8,3 +8,5 @@ publish.workspace = true