monolith

public

Star0

Fork 0

Watch0

51 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `14c8fedad3a3`

tarball

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

5 files changed+43-1

monolith: export the session for portals and display managers

xdg-desktop-portal only routes screenshots and screencasts to the wlr backend when XDG_CURRENT_DESKTOP names a desktop with a portals.conf, and its D-Bus activated services never see the compositor's environment otherwise. Only bare-metal sessions export, so a nested monolith leaves its host's activation environment alone.

Modified file: crates/monolith/src/commands.rs+4 additions@@ -173,6 +173,10 @@ impl State {
         if let Some(sock) = &self.ipc.path {
             cmd.env("MONOLITH_SOCKET", sock);
         }
+        if self.drm.is_some() {
+            cmd.env("XDG_CURRENT_DESKTOP", "monolith")
+                .env("XDG_SESSION_TYPE", "wayland");
+        }
         let token = self.launch_token();
         cmd.env("XDG_ACTIVATION_TOKEN", &token)
             .env("DESKTOP_STARTUP_ID", &token);

Modified file: crates/monolith/src/main.rs+24 additions@@ -129,6 +129,27 @@ fn main() -> ExitCode {
     }
 }
 
+/// Hands the session's variables to D-Bus and systemd activated services,
+/// which portals need to find the compositor and pick monolith-portals.conf.
+fn export_session(state: &State) {
+    let result = std::process::Command::new("dbus-update-activation-environment")
+        .arg("--systemd")
+        .arg(format!(
+            "WAYLAND_DISPLAY={}",
+            state.socket_name.to_string_lossy()
+        ))
+        .arg("XDG_CURRENT_DESKTOP=monolith")
+        .arg("XDG_SESSION_TYPE=wayland")
+        .stdin(std::process::Stdio::null())
+        .spawn();
+    match result {
+        Ok(mut child) => {
+            std::thread::spawn(move || child.wait());
+        }
+        Err(e) => tracing::warn!("cannot export the session to D-Bus: {e}"),
+    }
+}
+
 fn run(
     config: Option<PathBuf>,
     backend: Backend,
@@ -153,6 +174,9 @@ fn run(
     ipc::init(&event_loop, &mut state)?;
     tracing::info!(socket = ?state.socket_name, device = state.renderer.device_name(), "monolith running");
 
+    if gpu.is_some() {
+        export_session(&state);
+    }
     let mut startup = state.config.startup.clone();
     if !program.is_empty() {
         startup.push(program.to_vec());

Modified file: flake.nix+5 additions−1 deletions@@ -24,7 +24,7 @@
           craneLib = crane.mkLib pkgs;
           src = lib.cleanSourceWith {
             src = ./.;
-            filter = path: type: (craneLib.filterCargoSources path type) || lib.hasInfix "/shaders" path;
+            filter = path: type: (craneLib.filterCargoSources path type) || lib.hasInfix "/shaders" path || lib.hasInfix "/res" path;
             name = "source";
           };
           lavapipeIcd = "${pkgs.mesa}/share/vulkan/icd.d/lvp_icd.${pkgs.stdenv.hostPlatform.parsed.cpu.name}.json";
@@ -57,6 +57,10 @@
             // {
               inherit cargoArtifacts;
               doCheck = false;
+              postInstall = ''
+                install -Dm644 res/monolith-portals.conf -t $out/share/xdg-desktop-portal
+                install -Dm644 res/monolith.desktop -t $out/share/wayland-sessions
+              '';
             }
           );
 

Added file: res/monolith-portals.conf+4

@@ -0,0 +1,4 @@

1+[preferred]

2+default=gtk

3+org.freedesktop.impl.portal.Screenshot=wlr

4+org.freedesktop.impl.portal.ScreenCast=wlr

Added file: res/monolith.desktop+6

@@ -0,0 +1,6 @@

1+[Desktop Entry]

2+Name=monolith

3+Comment=A tiling Wayland compositor

4+Exec=monolith run

5+Type=Application

6+DesktopNames=monolith

monolith

Commit 14c8fedad3a3

Commit `14c8fedad3a3`