From 999e2ba4e5f5b2679c0068167c266b572026b00f Mon Sep 17 00:00:00 2001
From: leyoda <lionel@wopr.io>
Date: Thu, 23 Apr 2026 17:33:22 +0200
Subject: [PATCH 01/11] yoda: rebase onto libcosmic-yoda via path deps + macOS
 controls toggle
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fresh rewiring from upstream master (78644a3) — the previous attempt on
051f4f9 was 137 commits behind and hit API drift (cosmic::iced_futures,
Subscription::run_with_id). Upstream master uses the newer API
(cosmic::iced::stream + Subscription::run_with) which our libcosmic-yoda
already supports.

Yoda wiring:
- [workspace.dependencies.libcosmic] (git pop-os) -> libcosmic-yoda { path, wayland }
- cosmic-config + iced_winit workspace deps -> path to libcosmic-yoda submodule
- [patch.pop-os/libcosmic] redirects transitive cosmic-config + cosmic-theme +
  iced_futures + iced_winit to our local paths so the graph resolves to a
  single copy (cosmic-bg/comp/idle/panel configs unify cleanly against master)
- subscriptions/sound + page + cosmic-settings inner Cargo.toml: libcosmic ->
  libcosmic-yoda (workspace + direct variants)
- winit feature dropped from libcosmic-yoda deps (our fork is Wayland-only)

Cherry-picked from leyoda/local/window-controls-position @ 52ce463:
- cosmic-settings/src/pages/desktop/window_management.rs — macOS toggle UI
- i18n/en + fr/cosmic_settings.ftl — translations

Installed at /usr/bin/cosmic-settings (yoda build, 78 MB).
Pre-yoda pacman version kept at /usr/bin/cosmic-settings.pre-yoda-fork.
---
 Cargo.lock                                    | 27 +++------------
 Cargo.toml                                    | 34 +++++++++----------
 cosmic-settings/Cargo.toml                    | 14 ++++----
 .../src/pages/desktop/window_management.rs    | 22 ++++++++++++
 i18n/en/cosmic_settings.ftl                   |  1 +
 i18n/fr/cosmic_settings.ftl                   |  1 +
 page/Cargo.toml                               |  2 +-
 subscriptions/sound/Cargo.toml                |  2 +-
 8 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 582fce1..5ecab30 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1391,7 +1391,6 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -1412,7 +1411,6 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
 dependencies = [
  "quote",
  "syn 2.0.117",
@@ -1588,7 +1586,7 @@ dependencies = [
  "itertools 0.14.0",
  "itoa",
  "jiff",
- "libcosmic",
+ "libcosmic-yoda",
  "locale1",
  "locales-rs",
  "mime 0.3.17",
@@ -1737,7 +1735,7 @@ version = "1.0.7"
 dependencies = [
  "derive_setters",
  "downcast-rs 2.0.2",
- "libcosmic",
+ "libcosmic-yoda",
  "regex",
  "slab",
  "slotmap",
@@ -1762,7 +1760,7 @@ dependencies = [
  "cosmic-pipewire",
  "futures",
  "intmap",
- "libcosmic",
+ "libcosmic-yoda",
  "numtoa",
  "rustix 1.1.4",
  "tokio",
@@ -1827,7 +1825,6 @@ dependencies = [
 [[package]]
 name = "cosmic-theme"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
 dependencies = [
  "almost",
  "configparser",
@@ -3250,7 +3247,6 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
 dependencies = [
  "dnd",
  "iced_accessibility",
@@ -3271,7 +3267,6 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
 dependencies = [
  "accesskit",
  "accesskit_winit",
@@ -3280,7 +3275,6 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
 dependencies = [
  "bitflags 2.11.1",
  "bytes",
@@ -3305,7 +3299,6 @@ dependencies = [
 [[package]]
 name = "iced_debug"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
 dependencies = [
  "iced_core",
  "iced_futures",
@@ -3315,7 +3308,6 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
 dependencies = [
  "futures",
  "iced_core",
@@ -3329,7 +3321,6 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
 dependencies = [
  "bitflags 2.11.1",
  "bytemuck",
@@ -3350,7 +3341,6 @@ dependencies = [
 [[package]]
 name = "iced_program"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
 dependencies = [
  "iced_graphics",
  "iced_runtime",
@@ -3359,7 +3349,6 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -3371,7 +3360,6 @@ dependencies = [
 [[package]]
 name = "iced_runtime"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
 dependencies = [
  "bytes",
  "cosmic-client-toolkit",
@@ -3387,7 +3375,6 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
 dependencies = [
  "bytemuck",
  "cosmic-text",
@@ -3404,7 +3391,6 @@ dependencies = [
 [[package]]
 name = "iced_wgpu"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
 dependencies = [
  "as-raw-xcb-connection",
  "bitflags 2.11.1",
@@ -3435,7 +3421,6 @@ dependencies = [
 [[package]]
 name = "iced_widget"
 version = "0.14.2"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
 dependencies = [
  "cosmic-client-toolkit",
  "dnd",
@@ -3455,7 +3440,6 @@ dependencies = [
 [[package]]
 name = "iced_winit"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
 dependencies = [
  "cosmic-client-toolkit",
  "cursor-icon",
@@ -4565,9 +4549,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
 
 [[package]]
-name = "libcosmic"
-version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
+name = "libcosmic-yoda"
+version = "0.1.0-yoda"
 dependencies = [
  "apply",
  "ashpd 0.12.3",
diff --git a/Cargo.toml b/Cargo.toml
index c42187c..ca0a1cd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,21 +9,23 @@ rust-version = "1.90"
 [workspace.dependencies]
 cosmic-randr = { git = "https://github.com/pop-os/cosmic-randr" }
 tokio = { version = "1.49.0", features = ["macros"] }
-iced_winit = { git = "https://github.com/pop-os/libcosmic", default-features = false }
+# Yoda fork: direct path dep on iced_winit in libcosmic-yoda's submodule.
+iced_winit = { path = "/home/lionel/Devels/libcosmic/iced/winit", default-features = false }
 
-[workspace.dependencies.libcosmic]
+# Yoda fork — libcosmic-yoda by path, replaces upstream git dep.
+[workspace.dependencies.libcosmic-yoda]
 features = [
     "dbus-config",
     "desktop",
     "multi-window",
-    "winit",
+    "wayland",
     "tokio",
     "qr_code",
 ]
-git = "https://github.com/pop-os/libcosmic"
+path = "/home/lionel/Devels/libcosmic"
 
 [workspace.dependencies.cosmic-config]
-git = "https://github.com/pop-os/libcosmic"
+path = "/home/lionel/Devels/libcosmic/cosmic-config"
 
 [workspace.dependencies.cosmic-bg-config]
 git = "https://github.com/pop-os/cosmic-bg"
@@ -69,19 +71,15 @@ cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//",
 # [patch.'https://github.com/pop-os/cosmic-settings-daemon']
 # cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon//", branch = "input_nobuild" }
 
-# For development and testing purposes
-# [patch.'https://github.com/pop-os/libcosmic']
-# libcosmic = { path = "../libcosmic" }
-# cosmic-config = { path = "../libcosmic/cosmic-config" }
-# cosmic-theme = { path = "../libcosmic/cosmic-theme" }
-# iced_futures = { path = "../libcosmic/iced/futures" }
-# iced_winit = { path = "../libcosmic/iced/winit" }
-
-# libcosmic = { git = "https://github.com/pop-os/libcosmic//" }
-# cosmic-config = { git = "https://github.com/pop-os/libcosmic//" }
-# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//" }
-# iced_futures = { git = "https://github.com/pop-os/libcosmic//" }
-# iced_winit = { git = "https://github.com/pop-os/libcosmic//" }
+# Yoda fork: redirect every transitive dep that asks for pop-os/libcosmic
+# (cosmic-bg-config, cosmic-comp-config, cosmic-idle-config, cosmic-panel-config,
+# cosmic-settings-config, cosmic-settings-daemon-config) to our local paths so
+# the whole graph resolves against a single cosmic-config / cosmic-theme / iced_*.
+[patch.'https://github.com/pop-os/libcosmic']
+cosmic-config = { path = "/home/lionel/Devels/libcosmic/cosmic-config" }
+cosmic-theme = { path = "/home/lionel/Devels/libcosmic/cosmic-theme" }
+iced_futures = { path = "/home/lionel/Devels/libcosmic/iced/futures" }
+iced_winit = { path = "/home/lionel/Devels/libcosmic/iced/winit" }
 
 # [patch.'https://github.com/pop-os/dbus-settings-bindings']
 # cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }
diff --git a/cosmic-settings/Cargo.toml b/cosmic-settings/Cargo.toml
index 03c7a70..c5e3cca 100644
--- a/cosmic-settings/Cargo.toml
+++ b/cosmic-settings/Cargo.toml
@@ -59,7 +59,7 @@ image = { version = "0.25", default-features = false, features = [
 indexmap = "2.13.0"
 itertools = "0.14.0"
 itoa = "1.0.17"
-libcosmic.workspace = true
+libcosmic-yoda.workspace = true
 iced_winit.workspace = true
 locale1 = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
 sysinfo = { version = "=0.38.0", optional = true }
@@ -187,12 +187,12 @@ page-window-management = ["cosmic-comp-config", "dep:cosmic-settings-config"]
 page-workspaces = ["cosmic-comp-config"]
 
 # Other features
-a11y = ["libcosmic/a11y"]
+a11y = ["libcosmic-yoda/a11y"]
 ashpd = ["dep:ashpd"]
 cosmic-comp-config = ["dep:cosmic-comp-config"]
-dbus-config = ["libcosmic/dbus-config", "cosmic-config/dbus"]
-single-instance = ["libcosmic/single-instance"]
+dbus-config = ["libcosmic-yoda/dbus-config", "cosmic-config/dbus"]
+single-instance = ["libcosmic-yoda/single-instance"]
 test = []
-wayland = ["libcosmic/wayland", "dep:cosmic-panel-config", "dep:cosmic-randr", "iced_winit/cctk"]
-wgpu = ["libcosmic/wgpu"]
-xdg-portal = ["ashpd", "libcosmic/xdg-portal"]
+wayland = ["libcosmic-yoda/wayland", "dep:cosmic-panel-config", "dep:cosmic-randr", "iced_winit/cctk"]
+wgpu = ["libcosmic-yoda/wgpu"]
+xdg-portal = ["ashpd", "libcosmic-yoda/xdg-portal"]
diff --git a/cosmic-settings/src/pages/desktop/window_management.rs b/cosmic-settings/src/pages/desktop/window_management.rs
index b93e0f8..7b68acc 100644
--- a/cosmic-settings/src/pages/desktop/window_management.rs
+++ b/cosmic-settings/src/pages/desktop/window_management.rs
@@ -27,6 +27,7 @@ pub enum Message {
     ShowActiveWindowHint(bool),
     ShowMaximizeButton(bool),
     ShowMinimizeButton(bool),
+    WindowControlsPositionStart(bool),
     SetEdgeSnapThreshold(u32),
     Surface(surface::Action),
 }
@@ -177,6 +178,19 @@ impl Page {
                         .set_show_minimize(&config, value);
                 }
             }
+            Message::WindowControlsPositionStart(left) => {
+                if let Ok(config) = cosmic::config::CosmicTk::config() {
+                    let position = if left {
+                        cosmic::widget::WindowControlsPosition::Start
+                    } else {
+                        cosmic::widget::WindowControlsPosition::End
+                    };
+                    let _res = cosmic::config::COSMIC_TK
+                        .write()
+                        .unwrap()
+                        .set_window_controls_position(&config, position);
+                }
+            }
             Message::ShowActiveWindowHint(value) => {
                 self.show_active_hint = value;
                 if let Err(err) = self.comp_config.set("active_hint", value) {
@@ -274,6 +288,7 @@ pub fn window_controls() -> Section<crate::pages::Message> {
         maximize = fl!("window-controls", "maximize");
         minimize = fl!("window-controls", "minimize");
         active_window_hint = fl!("window-controls", "active-window-hint");
+        position_start = fl!("window-controls", "position-start");
     });
 
     Section::default()
@@ -296,6 +311,13 @@ pub fn window_controls() -> Section<crate::pages::Message> {
                     settings::item::builder(&descriptions[minimize])
                         .toggler(cosmic::config::show_minimize(), Message::ShowMinimizeButton),
                 )
+                .add(settings::item::builder(&descriptions[position_start]).toggler(
+                    matches!(
+                        cosmic::config::window_controls_position(),
+                        cosmic::widget::WindowControlsPosition::Start
+                    ),
+                    Message::WindowControlsPositionStart,
+                ))
                 .apply(Element::from)
                 .map(crate::pages::Message::WindowManagement)
         })
diff --git a/i18n/en/cosmic_settings.ftl b/i18n/en/cosmic_settings.ftl
index 535477b..f5a614e 100644
--- a/i18n/en/cosmic_settings.ftl
+++ b/i18n/en/cosmic_settings.ftl
@@ -484,6 +484,7 @@ window-controls = Window controls
     .maximize = Show maximize button
     .minimize = Show minimize button
     .active-window-hint = Show active window hint
+    .position-start = Place buttons on the left (macOS style)
 
 focus-navigation = Focus navigation
     .focus-follows-cursor = Focus follows cursor
diff --git a/i18n/fr/cosmic_settings.ftl b/i18n/fr/cosmic_settings.ftl
index 419dc72..098a741 100644
--- a/i18n/fr/cosmic_settings.ftl
+++ b/i18n/fr/cosmic_settings.ftl
@@ -322,6 +322,7 @@ window-controls = Contrôles des fenêtres
     .maximize = Afficher le bouton maximiser
     .minimize = Afficher le bouton minimiser
     .active-window-hint = Afficher l'indice de la fenêtre active
+    .position-start = Placer les boutons à gauche (style macOS)
 focus-navigation = Navigation par le focus
     .focus-follows-cursor = Le focus suit le curseur
     .focus-follows-cursor-delay = Délai de suivi du focus en ms
diff --git a/page/Cargo.toml b/page/Cargo.toml
index 7547599..d45d828 100644
--- a/page/Cargo.toml
+++ b/page/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2024"
 derive_setters = "0.1.9"
 regex = "1.12.3"
 slotmap = "1.1.1"
-libcosmic = { workspace = true }
+libcosmic-yoda = { workspace = true }
 downcast-rs = "2.0.2"
 url = "2.5.8"
 slab = "0.4.12"
diff --git a/subscriptions/sound/Cargo.toml b/subscriptions/sound/Cargo.toml
index adf5891..e8c81e2 100644
--- a/subscriptions/sound/Cargo.toml
+++ b/subscriptions/sound/Cargo.toml
@@ -10,7 +10,7 @@ publish = true
 cosmic-pipewire = { path = "../../crates/cosmic-pipewire" }
 futures = "0.3.32"
 intmap = "3.1.3"
-libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false }
+libcosmic-yoda = { path = "/home/lionel/Devels/libcosmic", default-features = false }
 numtoa = "1.0.0-alpha1"
 rustix = "1.1.3"
 tokio = { version = "1.49.0", features = ["process", "rt", "time"] }

From 546299dbb75726455ebe33adec69f5ef54d6c8a6 Mon Sep 17 00:00:00 2001
From: leyoda <lionel@wopr.io>
Date: Thu, 23 Apr 2026 18:46:17 +0200
Subject: [PATCH 02/11] lockfile: libcosmic-yoda 0.1.0-yoda -> 0.1.0-yoda.2

Picks up the yoda-v2 libcosmic changes (color_picker Theme ref +
context_menu/menu winit ungate). Binary rebuilt and installed.
---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5ecab30..4cbc03b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4550,7 +4550,7 @@ checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
 
 [[package]]
 name = "libcosmic-yoda"
-version = "0.1.0-yoda"
+version = "0.1.0-yoda.2"
 dependencies = [
  "apply",
  "ashpd 0.12.3",

From d8a5350fee6bfabb51093565a3772bd583cf8646 Mon Sep 17 00:00:00 2001
From: leyoda <lionel@wopr.io>
Date: Fri, 24 Apr 2026 07:09:49 +0200
Subject: [PATCH 03/11] yoda wayland-v5: redirect window_clipboard +
 cosmic-text to local forks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Propagates the [patch] blocks added in cosmic-yoterm v5 to keep the
whole yoda app family on a single Wayland-only stack. Without these,
iced_winit fails to select a window_clipboard version because our
fork exposes a `wayland` feature that upstream doesn't.

- window_clipboard → /home/lionel/Devels/window_clipboard (x11 gated
  behind opt-in feature)
- cosmic-text → /home/lionel/Devels/cosmic-text (EAW terminal_cells +
  upstream PR#503 applied)
---
 Cargo.lock | 164 ++---------------------------------------------------
 Cargo.toml |  10 ++++
 2 files changed, 14 insertions(+), 160 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4cbc03b..445758b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -355,12 +355,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
-[[package]]
-name = "as-raw-xcb-connection"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
-
 [[package]]
 name = "as-slice"
 version = "0.2.1"
@@ -1135,7 +1129,6 @@ dependencies = [
 [[package]]
 name = "clipboard_macos"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
 dependencies = [
  "objc",
  "objc-foundation",
@@ -1145,22 +1138,12 @@ dependencies = [
 [[package]]
 name = "clipboard_wayland"
 version = "0.2.2"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
 dependencies = [
  "dnd",
  "mime 0.1.0",
  "smithay-clipboard",
 ]
 
-[[package]]
-name = "clipboard_x11"
-version = "0.4.2"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
-dependencies = [
- "thiserror 1.0.69",
- "x11rb",
-]
-
 [[package]]
 name = "cocoa"
 version = "0.25.0"
@@ -1937,12 +1920,6 @@ dependencies = [
  "uncased",
 ]
 
-[[package]]
-name = "ctor-lite"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e162d0c2e2068eb736b71e5597eff0b9944e6b973cd9f37b6a288ab9bf20e300"
-
 [[package]]
 name = "cursor-icon"
 version = "1.2.0"
@@ -2199,7 +2176,6 @@ dependencies = [
 [[package]]
 name = "dnd"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
 dependencies = [
  "bitflags 2.11.1",
  "mime 0.1.0",
@@ -2234,45 +2210,6 @@ name = "dpi"
 version = "0.1.2"
 source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 
-[[package]]
-name = "drm"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde"
-dependencies = [
- "bitflags 2.11.1",
- "bytemuck",
- "drm-ffi",
- "drm-fourcc",
- "rustix 0.38.44",
-]
-
-[[package]]
-name = "drm-ffi"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6"
-dependencies = [
- "drm-sys",
- "rustix 0.38.44",
-]
-
-[[package]]
-name = "drm-fourcc"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
-
-[[package]]
-name = "drm-sys"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176"
-dependencies = [
- "libc",
- "linux-raw-sys 0.6.5",
-]
-
 [[package]]
 name = "dyn-clone"
 version = "1.0.20"
@@ -2817,16 +2754,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "gethostname"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
-dependencies = [
- "rustix 1.1.4",
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.17"
@@ -3392,7 +3319,6 @@ dependencies = [
 name = "iced_wgpu"
 version = "0.14.0"
 dependencies = [
- "as-raw-xcb-connection",
  "bitflags 2.11.1",
  "bytemuck",
  "cosmic-client-toolkit",
@@ -3409,13 +3335,11 @@ dependencies = [
  "rustc-hash 2.1.2",
  "rustix 0.38.44",
  "thiserror 2.0.18",
- "tiny-xlib",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
  "wayland-sys",
  "wgpu",
- "x11rb",
 ]
 
 [[package]]
@@ -4726,12 +4650,6 @@ version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.12.1"
@@ -4964,7 +4882,6 @@ dependencies = [
 [[package]]
 name = "mime"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
 dependencies = [
  "smithay-clipboard",
 ]
@@ -6991,12 +6908,10 @@ name = "softbuffer"
 version = "0.4.1"
 source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#a3f77e251e7422803f693df6e3fc313c010c4dcb"
 dependencies = [
- "as-raw-xcb-connection",
  "bytemuck",
  "cfg_aliases 0.2.1",
  "cocoa",
  "core-graphics",
- "drm",
  "fastrand",
  "foreign-types",
  "js-sys",
@@ -7006,14 +6921,12 @@ dependencies = [
  "raw-window-handle",
  "redox_syscall 0.5.18",
  "rustix 0.38.44",
- "tiny-xlib",
  "wasm-bindgen",
  "wayland-backend",
  "wayland-client",
  "wayland-sys",
  "web-sys",
  "windows-sys 0.52.0",
- "x11rb",
 ]
 
 [[package]]
@@ -7365,19 +7278,6 @@ dependencies = [
  "strict-num",
 ]
 
-[[package]]
-name = "tiny-xlib"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0324504befd01cab6e0c994f34b2ffa257849ee019d3fb3b64fb2c858887d89e"
-dependencies = [
- "as-raw-xcb-connection",
- "ctor-lite",
- "libloading",
- "pkg-config",
- "tracing",
-]
-
 [[package]]
 name = "tinystr"
 version = "0.8.3"
@@ -8355,12 +8255,10 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 [[package]]
 name = "window_clipboard"
 version = "0.4.1"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
 dependencies = [
  "clipboard-win",
  "clipboard_macos",
  "clipboard_wayland",
- "clipboard_x11",
  "dnd",
  "mime 0.1.0",
  "raw-window-handle",
@@ -8884,7 +8782,6 @@ dependencies = [
  "winit-wayland",
  "winit-web",
  "winit-win32",
- "winit-x11",
 ]
 
 [[package]]
@@ -8935,7 +8832,6 @@ dependencies = [
  "smol_str",
  "tracing",
  "winit-core",
- "x11-dl",
  "xkbcommon-dl",
 ]
 
@@ -9053,29 +8949,6 @@ dependencies = [
  "winit-core",
 ]
 
-[[package]]
-name = "winit-x11"
-version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
-dependencies = [
- "bitflags 2.11.1",
- "bytemuck",
- "calloop",
- "cursor-icon",
- "dpi",
- "libc",
- "percent-encoding",
- "raw-window-handle",
- "rustix 1.1.4",
- "smol_str",
- "tracing",
- "winit-common",
- "winit-core",
- "x11-dl",
- "x11rb",
- "xkbcommon-dl",
-]
-
 [[package]]
 name = "winnow"
 version = "0.6.24"
@@ -9206,39 +9079,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "x11-dl"
-version = "2.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
-dependencies = [
- "libc",
- "once_cell",
- "pkg-config",
-]
-
-[[package]]
-name = "x11rb"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
-dependencies = [
- "as-raw-xcb-connection",
- "gethostname",
- "libc",
- "libloading",
- "once_cell",
- "rustix 1.1.4",
- "x11rb-protocol",
- "xcursor",
-]
-
-[[package]]
-name = "x11rb-protocol"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
-
 [[package]]
 name = "xcursor"
 version = "0.3.10"
@@ -9689,3 +9529,7 @@ dependencies = [
  "syn 2.0.117",
  "winnow 0.7.15",
 ]
+
+[[patch.unused]]
+name = "cosmic-text"
+version = "0.19.0"
diff --git a/Cargo.toml b/Cargo.toml
index ca0a1cd..395b8fd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -86,6 +86,16 @@ iced_winit = { path = "/home/lionel/Devels/libcosmic/iced/winit" }
 # upower_dbus = { path = "../dbus-settings-bindings/upower" }
 # nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings//", branch = "nm-secret-agent" }
 
+# Yoda wayland cut v5: redirect window_clipboard + cosmic-text to our local
+# forks (x11 gated behind opt-in feature + EAW/PR#503 respectively).
+[patch.'https://github.com/pop-os/window_clipboard.git']
+window_clipboard = { path = "/home/lionel/Devels/window_clipboard" }
+dnd = { path = "/home/lionel/Devels/window_clipboard/dnd" }
+mime = { path = "/home/lionel/Devels/window_clipboard/mime" }
+
+[patch.'https://github.com/pop-os/cosmic-text']
+cosmic-text = { path = "/home/lionel/Devels/cosmic-text" }
+
 [patch.crates-io]
 atspi = { git = "https://github.com/wash2/atspi" }
 atspi-common = { git = "https://github.com/wash2/atspi" }

From 16172ad5a3b0a80fb2a069ab8eef34d6457c40fc Mon Sep 17 00:00:00 2001
From: leyoda <lionel@wopr.io>
Date: Sat, 16 May 2026 18:08:59 +0200
Subject: [PATCH 04/11] yoda: relocate local fork paths from ~/Devels to
 ~/Projets/COSMIC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Mise à jour des path= absolus (libcosmic, cosmic-config, cosmic-theme,
iced_futures/winit, window_clipboard, dnd, mime, cosmic-text) après
consolidation des forks cosmic-* sous ~/Projets/COSMIC/.

Inclut subscriptions/sound/Cargo.toml (libcosmic-yoda).

Leyoda 2026 – GPLv3
---
 Cargo.toml                     | 22 +++++++++++-----------
 subscriptions/sound/Cargo.toml |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 395b8fd..0b6601c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ rust-version = "1.90"
 cosmic-randr = { git = "https://github.com/pop-os/cosmic-randr" }
 tokio = { version = "1.49.0", features = ["macros"] }
 # Yoda fork: direct path dep on iced_winit in libcosmic-yoda's submodule.
-iced_winit = { path = "/home/lionel/Devels/libcosmic/iced/winit", default-features = false }
+iced_winit = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/winit", default-features = false }
 
 # Yoda fork — libcosmic-yoda by path, replaces upstream git dep.
 [workspace.dependencies.libcosmic-yoda]
@@ -22,10 +22,10 @@ features = [
     "tokio",
     "qr_code",
 ]
-path = "/home/lionel/Devels/libcosmic"
+path = "/home/lionel/Projets/COSMIC/libcosmic"
 
 [workspace.dependencies.cosmic-config]
-path = "/home/lionel/Devels/libcosmic/cosmic-config"
+path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-config"
 
 [workspace.dependencies.cosmic-bg-config]
 git = "https://github.com/pop-os/cosmic-bg"
@@ -76,10 +76,10 @@ cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//",
 # cosmic-settings-config, cosmic-settings-daemon-config) to our local paths so
 # the whole graph resolves against a single cosmic-config / cosmic-theme / iced_*.
 [patch.'https://github.com/pop-os/libcosmic']
-cosmic-config = { path = "/home/lionel/Devels/libcosmic/cosmic-config" }
-cosmic-theme = { path = "/home/lionel/Devels/libcosmic/cosmic-theme" }
-iced_futures = { path = "/home/lionel/Devels/libcosmic/iced/futures" }
-iced_winit = { path = "/home/lionel/Devels/libcosmic/iced/winit" }
+cosmic-config = { path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-config" }
+cosmic-theme = { path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-theme" }
+iced_futures = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/futures" }
+iced_winit = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/winit" }
 
 # [patch.'https://github.com/pop-os/dbus-settings-bindings']
 # cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }
@@ -89,12 +89,12 @@ iced_winit = { path = "/home/lionel/Devels/libcosmic/iced/winit" }
 # Yoda wayland cut v5: redirect window_clipboard + cosmic-text to our local
 # forks (x11 gated behind opt-in feature + EAW/PR#503 respectively).
 [patch.'https://github.com/pop-os/window_clipboard.git']
-window_clipboard = { path = "/home/lionel/Devels/window_clipboard" }
-dnd = { path = "/home/lionel/Devels/window_clipboard/dnd" }
-mime = { path = "/home/lionel/Devels/window_clipboard/mime" }
+window_clipboard = { path = "/home/lionel/Projets/COSMIC/window_clipboard" }
+dnd = { path = "/home/lionel/Projets/COSMIC/window_clipboard/dnd" }
+mime = { path = "/home/lionel/Projets/COSMIC/window_clipboard/mime" }
 
 [patch.'https://github.com/pop-os/cosmic-text']
-cosmic-text = { path = "/home/lionel/Devels/cosmic-text" }
+cosmic-text = { path = "/home/lionel/Projets/COSMIC/cosmic-text" }
 
 [patch.crates-io]
 atspi = { git = "https://github.com/wash2/atspi" }
diff --git a/subscriptions/sound/Cargo.toml b/subscriptions/sound/Cargo.toml
index e8c81e2..0ea0154 100644
--- a/subscriptions/sound/Cargo.toml
+++ b/subscriptions/sound/Cargo.toml
@@ -10,7 +10,7 @@ publish = true
 cosmic-pipewire = { path = "../../crates/cosmic-pipewire" }
 futures = "0.3.32"
 intmap = "3.1.3"
-libcosmic-yoda = { path = "/home/lionel/Devels/libcosmic", default-features = false }
+libcosmic-yoda = { path = "/home/lionel/Projets/COSMIC/libcosmic", default-features = false }
 numtoa = "1.0.0-alpha1"
 rustix = "1.1.3"
 tokio = { version = "1.49.0", features = ["process", "rt", "time"] }

From f19473a05c0f180b7058627c1d3026978b8cc972 Mon Sep 17 00:00:00 2001
From: Lionel DARNIS <lionel@wopr.io>
Date: Sat, 23 May 2026 20:49:24 +0200
Subject: [PATCH 05/11] chore: align subscriptions with local stack

---
 Cargo.lock                                   | 25 +++++++++++++-------
 Cargo.toml                                   |  9 +++----
 subscriptions/a11y-manager/Cargo.toml        |  4 ++--
 subscriptions/accessibility/Cargo.toml       |  2 +-
 subscriptions/airplane-mode/Cargo.toml       |  2 +-
 subscriptions/network-manager/Cargo.toml     |  2 +-
 subscriptions/network-manager/src/devices.rs |  2 +-
 subscriptions/network-manager/src/lib.rs     |  2 +-
 subscriptions/pulse/Cargo.toml               |  2 +-
 subscriptions/pulse/src/lib.rs               |  4 ++--
 subscriptions/settings-daemon/Cargo.toml     |  2 +-
 subscriptions/upower/Cargo.toml              |  2 +-
 12 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 445758b..0a5240f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1352,7 +1352,7 @@ version = "0.1.0"
 source = "git+https://github.com/pop-os/cosmic-protocols//?rev=d0e95be#d0e95be25e423cfe523b11111a3666ed7aaf0dc4"
 dependencies = [
  "bitflags 2.11.1",
- "cosmic-protocols",
+ "cosmic-protocols 0.1.0",
  "libc",
  "smithay-client-toolkit",
  "wayland-client",
@@ -1495,12 +1495,25 @@ dependencies = [
  "wayland-server",
 ]
 
+[[package]]
+name = "cosmic-protocols"
+version = "0.2.0"
+dependencies = [
+ "bitflags 2.11.1",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
+ "wayland-scanner",
+ "wayland-server",
+]
+
 [[package]]
 name = "cosmic-randr"
 version = "0.1.0"
 source = "git+https://github.com/pop-os/cosmic-randr#6e8e795970fa06d434af22775e415b517f7552d3"
 dependencies = [
- "cosmic-protocols",
+ "cosmic-protocols 0.1.0",
  "indexmap 2.14.0",
  "thiserror 2.0.18",
  "tokio",
@@ -1537,7 +1550,7 @@ dependencies = [
  "cosmic-idle-config",
  "cosmic-mime-apps",
  "cosmic-panel-config",
- "cosmic-protocols",
+ "cosmic-protocols 0.1.0",
  "cosmic-randr",
  "cosmic-randr-shell",
  "cosmic-settings-a11y-manager-subscription",
@@ -1608,7 +1621,7 @@ dependencies = [
 name = "cosmic-settings-a11y-manager-subscription"
 version = "1.0.7"
 dependencies = [
- "cosmic-protocols",
+ "cosmic-protocols 0.2.0",
  "iced_futures",
  "num-derive",
  "num-traits",
@@ -9529,7 +9542,3 @@ dependencies = [
  "syn 2.0.117",
  "winnow 0.7.15",
 ]
-
-[[patch.unused]]
-name = "cosmic-text"
-version = "0.19.0"
diff --git a/Cargo.toml b/Cargo.toml
index 0b6601c..11bfb64 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -86,16 +86,13 @@ iced_winit = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/winit" }
 # upower_dbus = { path = "../dbus-settings-bindings/upower" }
 # nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings//", branch = "nm-secret-agent" }
 
-# Yoda wayland cut v5: redirect window_clipboard + cosmic-text to our local
-# forks (x11 gated behind opt-in feature + EAW/PR#503 respectively).
-[patch.'https://github.com/pop-os/window_clipboard.git']
+# Yoda wayland cut v5: redirect window_clipboard to the local fork
+# (x11 gated behind opt-in feature).
+[patch.'https://forge.aditua.com/leyoda/window_clipboard.git']
 window_clipboard = { path = "/home/lionel/Projets/COSMIC/window_clipboard" }
 dnd = { path = "/home/lionel/Projets/COSMIC/window_clipboard/dnd" }
 mime = { path = "/home/lionel/Projets/COSMIC/window_clipboard/mime" }
 
-[patch.'https://github.com/pop-os/cosmic-text']
-cosmic-text = { path = "/home/lionel/Projets/COSMIC/cosmic-text" }
-
 [patch.crates-io]
 atspi = { git = "https://github.com/wash2/atspi" }
 atspi-common = { git = "https://github.com/wash2/atspi" }
diff --git a/subscriptions/a11y-manager/Cargo.toml b/subscriptions/a11y-manager/Cargo.toml
index bfdf7c2..8bb0c2b 100644
--- a/subscriptions/a11y-manager/Cargo.toml
+++ b/subscriptions/a11y-manager/Cargo.toml
@@ -7,8 +7,8 @@ rust-version.workspace = true
 publish = true
 
 [dependencies]
-cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols" }
-iced_futures = { git = "https://github.com/pop-os/libcosmic" }
+cosmic-protocols = { path = "../../../cosmic-protocols" }
+iced_futures = { path = "../../../libcosmic/iced/futures" }
 num-derive = "0.4.2"
 num-traits = "0.2.19"
 sctk.workspace = true
diff --git a/subscriptions/accessibility/Cargo.toml b/subscriptions/accessibility/Cargo.toml
index 2a3b5e6..2491153 100644
--- a/subscriptions/accessibility/Cargo.toml
+++ b/subscriptions/accessibility/Cargo.toml
@@ -9,7 +9,7 @@ publish = true
 [dependencies]
 cosmic-dbus-a11y = { git = "https://github.com/pop-os/dbus-settings-bindings" }
 futures = "0.3.32"
-iced_futures = { git = "https://github.com/pop-os/libcosmic" }
+iced_futures = { path = "../../../libcosmic/iced/futures" }
 tokio = { version = "1.49.0", features = ["sync", "time"] }
 tracing = "0.1.44"
 zbus = "5.13"
diff --git a/subscriptions/airplane-mode/Cargo.toml b/subscriptions/airplane-mode/Cargo.toml
index 403f6fe..4fda29b 100644
--- a/subscriptions/airplane-mode/Cargo.toml
+++ b/subscriptions/airplane-mode/Cargo.toml
@@ -8,7 +8,7 @@ publish = true
 
 [dependencies]
 futures = "0.3.32"
-iced_futures = { git = "https://github.com/pop-os/libcosmic" }
+iced_futures = { path = "../../../libcosmic/iced/futures" }
 log = "0.4.29"
 rustix = "1.1.3"
 tokio = "1.49.0"
diff --git a/subscriptions/network-manager/Cargo.toml b/subscriptions/network-manager/Cargo.toml
index e40a2a8..c66a4ca 100644
--- a/subscriptions/network-manager/Cargo.toml
+++ b/subscriptions/network-manager/Cargo.toml
@@ -11,7 +11,7 @@ cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bi
 secret-service = { version = "5.1.0", features = ["rt-tokio-crypto-rust"] }
 nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings" }
 futures = "0.3.32"
-iced_futures = { git = "https://github.com/pop-os/libcosmic" }
+iced_futures = { path = "../../../libcosmic/iced/futures" }
 itertools = "0.14.0"
 secure-string = "0.3.0"
 thiserror = "2.0.18"
diff --git a/subscriptions/network-manager/src/devices.rs b/subscriptions/network-manager/src/devices.rs
index 235b0b5..e4e976f 100644
--- a/subscriptions/network-manager/src/devices.rs
+++ b/subscriptions/network-manager/src/devices.rs
@@ -185,7 +185,7 @@ pub fn subscription<I: 'static + Hash + Copy + Send + Sync + Debug>(
             conn,
         },
         |Wrapper {
-             id,
+             id: _,
              has_popup,
              conn,
          }| {
diff --git a/subscriptions/network-manager/src/lib.rs b/subscriptions/network-manager/src/lib.rs
index 631eda9..55892b1 100644
--- a/subscriptions/network-manager/src/lib.rs
+++ b/subscriptions/network-manager/src/lib.rs
@@ -141,7 +141,7 @@ pub fn subscription<I: Copy + Debug + std::hash::Hash + 'static>(
             self.id.hash(state);
         }
     }
-    Subscription::run_with(Wrapper { id, conn }, |Wrapper { id, conn }| {
+    Subscription::run_with(Wrapper { id, conn }, |Wrapper { id: _, conn }| {
         let conn = conn.clone();
         stream::channel(
             50,
diff --git a/subscriptions/pulse/Cargo.toml b/subscriptions/pulse/Cargo.toml
index cc4760b..48c2adc 100644
--- a/subscriptions/pulse/Cargo.toml
+++ b/subscriptions/pulse/Cargo.toml
@@ -7,6 +7,6 @@ rust-version.workspace = true
 [dependencies]
 libpulse-binding = { version = "2.30.1" }
 rustix = { version = "1.1.3", features = ["pipe"] }
-iced_futures = { git = "https://github.com/pop-os/libcosmic" }
+iced_futures = { path = "../../../libcosmic/iced/futures" }
 futures = "0.3.32"
 log = "0.4.27"
diff --git a/subscriptions/pulse/src/lib.rs b/subscriptions/pulse/src/lib.rs
index 4220765..ca407f7 100644
--- a/subscriptions/pulse/src/lib.rs
+++ b/subscriptions/pulse/src/lib.rs
@@ -288,7 +288,7 @@ impl PulseChannels {
     /// Set the speaker balance of the active sink.
     pub fn set_balance(&mut self, balance: f32) {
         if let Err(err) = self.tx.send(Request::Balance(self.index, balance)) {
-            log::error!("Failed to send new balance to channel");
+            log::error!("Failed to send new balance to channel: {err}");
         } else {
             self.pipe_tx
                 .write_all(&[1])
@@ -299,7 +299,7 @@ impl PulseChannels {
     /// Set the volume of the active sink.
     pub fn set_volume(&mut self, volume: f32) {
         if let Err(err) = self.tx.send(Request::Volume(self.index, volume)) {
-            log::error!("Failed to send new volume to channel");
+            log::error!("Failed to send new volume to channel: {err}");
         } else {
             self.pipe_tx
                 .write_all(&[1])
diff --git a/subscriptions/settings-daemon/Cargo.toml b/subscriptions/settings-daemon/Cargo.toml
index aa67fbe..59160d0 100644
--- a/subscriptions/settings-daemon/Cargo.toml
+++ b/subscriptions/settings-daemon/Cargo.toml
@@ -7,7 +7,7 @@ publish = true
 
 [dependencies]
 futures = "0.3.32"
-iced_futures = { git = "https://github.com/pop-os/libcosmic" }
+iced_futures = { path = "../../../libcosmic/iced/futures" }
 log = "0.4.29"
 tokio = "1.49.0"
 tokio-stream = "0.1.18"
diff --git a/subscriptions/upower/Cargo.toml b/subscriptions/upower/Cargo.toml
index 4121a10..3a468c8 100644
--- a/subscriptions/upower/Cargo.toml
+++ b/subscriptions/upower/Cargo.toml
@@ -8,7 +8,7 @@ publish = true
 
 [dependencies]
 futures = "0.3.32"
-iced_futures = { git = "https://github.com/pop-os/libcosmic" }
+iced_futures = { path = "../../../libcosmic/iced/futures" }
 log = "0.4.29"
 tokio = "1.49.0"
 tokio-stream = "0.1.18"

From 331aba9d95239b8f139aec080ef6a4b2058c6f4f Mon Sep 17 00:00:00 2001
From: Lionel DARNIS <lionel@wopr.io>
Date: Mon, 25 May 2026 09:55:11 +0200
Subject: [PATCH 06/11] yoda: use local dbus settings bindings

---
 Cargo.lock                               | 12 +-----------
 Cargo.toml                               |  5 -----
 cosmic-settings/Cargo.toml               | 16 ++++++++--------
 subscriptions/accessibility/Cargo.toml   |  2 +-
 subscriptions/bluetooth/Cargo.toml       |  2 +-
 subscriptions/network-manager/Cargo.toml |  4 ++--
 subscriptions/upower/Cargo.toml          |  2 +-
 7 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0a5240f..b4a9e4d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -104,7 +104,6 @@ dependencies = [
 [[package]]
 name = "accounts-zbus"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
 dependencies = [
  "zbus",
 ]
@@ -825,7 +824,6 @@ dependencies = [
 [[package]]
 name = "bluez-zbus"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
 dependencies = [
  "futures-channel",
  "futures-util",
@@ -1402,7 +1400,6 @@ dependencies = [
 [[package]]
 name = "cosmic-dbus-a11y"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
 dependencies = [
  "zbus",
 ]
@@ -1410,7 +1407,6 @@ dependencies = [
 [[package]]
 name = "cosmic-dbus-networkmanager"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
 dependencies = [
  "bitflags 2.11.1",
  "derive_builder",
@@ -1680,8 +1676,7 @@ dependencies = [
 
 [[package]]
 name = "cosmic-settings-daemon"
-version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
+version = "0.1.1-yoda.1"
 dependencies = [
  "zbus",
 ]
@@ -3088,7 +3083,6 @@ checksum = "f558a64ac9af88b5ba400d99b579451af0d39c6d360980045b91aac966d705e2"
 [[package]]
 name = "hostname1-zbus"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
 dependencies = [
  "zbus",
 ]
@@ -4684,7 +4678,6 @@ checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
 [[package]]
 name = "locale1"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
 dependencies = [
  "zbus",
 ]
@@ -5026,7 +5019,6 @@ dependencies = [
 [[package]]
 name = "nm-secret-agent-manager"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
 dependencies = [
  "zbus",
 ]
@@ -7260,7 +7252,6 @@ dependencies = [
 [[package]]
 name = "timedate-zbus"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
 dependencies = [
  "zbus",
 ]
@@ -7650,7 +7641,6 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 [[package]]
 name = "upower_dbus"
 version = "0.3.2"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
 dependencies = [
  "serde",
  "serde_repr",
diff --git a/Cargo.toml b/Cargo.toml
index 11bfb64..01250d4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -81,11 +81,6 @@ cosmic-theme = { path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-theme" }
 iced_futures = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/futures" }
 iced_winit = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/winit" }
 
-# [patch.'https://github.com/pop-os/dbus-settings-bindings']
-# cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }
-# upower_dbus = { path = "../dbus-settings-bindings/upower" }
-# nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings//", branch = "nm-secret-agent" }
-
 # Yoda wayland cut v5: redirect window_clipboard to the local fork
 # (x11 gated behind opt-in feature).
 [patch.'https://forge.aditua.com/leyoda/window_clipboard.git']
diff --git a/cosmic-settings/Cargo.toml b/cosmic-settings/Cargo.toml
index c5e3cca..6512e9c 100644
--- a/cosmic-settings/Cargo.toml
+++ b/cosmic-settings/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 xdgen = "0.1"
 
 [dependencies]
-accounts-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
+accounts-zbus = { path = "../../dbus-settings-bindings/accounts-zbus", optional = true }
 anyhow = "1.0"
 ashpd = { version = "0.12", default-features = false, features = [
     "tokio",
@@ -21,8 +21,8 @@ color-eyre = "0.6.5"
 cosmic-bg-config.workspace = true
 cosmic-comp-config = { workspace = true, optional = true }
 cosmic-config.workspace = true
-cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
-nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
+cosmic-dbus-networkmanager = { path = "../../dbus-settings-bindings/networkmanager", optional = true }
+nm-secret-agent-manager = { path = "../../dbus-settings-bindings/nm-secret-agent-manager", optional = true }
 cosmic-idle-config.workspace = true
 cosmic-panel-config = { workspace = true, optional = true }
 cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", optional = true }
@@ -47,7 +47,7 @@ eyre = "0.6.12"
 freedesktop-desktop-entry = "0.8.1"
 futures = "0.3.32"
 hostname-validator = "1.1.1"
-hostname1-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
+hostname1-zbus = { path = "../../dbus-settings-bindings/hostname1", optional = true }
 i18n-embed-fl = "0.10.0"
 image = { version = "0.25", default-features = false, features = [
     "jpeg",
@@ -61,7 +61,7 @@ itertools = "0.14.0"
 itoa = "1.0.17"
 libcosmic-yoda.workspace = true
 iced_winit.workspace = true
-locale1 = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
+locale1 = { path = "../../dbus-settings-bindings/locale1", optional = true }
 sysinfo = { version = "=0.38.0", optional = true }
 mime-apps = { package = "cosmic-mime-apps", git = "https://github.com/pop-os/cosmic-mime-apps", optional = true }
 notify = "8.2.0"
@@ -75,13 +75,13 @@ slab = "0.4.12"
 slotmap = "1.1.1"
 static_init = "1.0.4"
 sunrise = "3.0.0"
-timedate-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
+timedate-zbus = { path = "../../dbus-settings-bindings/timedate", optional = true }
 tokio = { workspace = true, features = ["fs", "io-util", "process", "sync"] }
 tracing = "0.1.44"
 tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
 udev = { version = "0.9.3", optional = true }
-upower_dbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
-bluez-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
+upower_dbus = { path = "../../dbus-settings-bindings/upower", optional = true }
+bluez-zbus = { path = "../../dbus-settings-bindings/bluez", optional = true }
 url = "2.5.8"
 xkb-data = "0.2.2"
 xkeysym = { version = "0.2.1", optional = true }
diff --git a/subscriptions/accessibility/Cargo.toml b/subscriptions/accessibility/Cargo.toml
index 2491153..138f539 100644
--- a/subscriptions/accessibility/Cargo.toml
+++ b/subscriptions/accessibility/Cargo.toml
@@ -7,7 +7,7 @@ rust-version.workspace = true
 publish = true
 
 [dependencies]
-cosmic-dbus-a11y = { git = "https://github.com/pop-os/dbus-settings-bindings" }
+cosmic-dbus-a11y = { path = "../../../dbus-settings-bindings/a11y" }
 futures = "0.3.32"
 iced_futures = { path = "../../../libcosmic/iced/futures" }
 tokio = { version = "1.49.0", features = ["sync", "time"] }
diff --git a/subscriptions/bluetooth/Cargo.toml b/subscriptions/bluetooth/Cargo.toml
index 0fb5a0d..b6e9967 100644
--- a/subscriptions/bluetooth/Cargo.toml
+++ b/subscriptions/bluetooth/Cargo.toml
@@ -7,7 +7,7 @@ rust-version.workspace = true
 publish = true
 
 [dependencies]
-bluez-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings" }
+bluez-zbus = { path = "../../../dbus-settings-bindings/bluez" }
 futures = "0.3.32"
 iced_futures = { git = "https://github.com/pop-os/libcosmic" }
 tokio = "1.49.0"
diff --git a/subscriptions/network-manager/Cargo.toml b/subscriptions/network-manager/Cargo.toml
index c66a4ca..d72f126 100644
--- a/subscriptions/network-manager/Cargo.toml
+++ b/subscriptions/network-manager/Cargo.toml
@@ -7,9 +7,9 @@ rust-version.workspace = true
 publish = true
 
 [dependencies]
-cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings" }
+cosmic-dbus-networkmanager = { path = "../../../dbus-settings-bindings/networkmanager" }
 secret-service = { version = "5.1.0", features = ["rt-tokio-crypto-rust"] }
-nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings" }
+nm-secret-agent-manager = { path = "../../../dbus-settings-bindings/nm-secret-agent-manager" }
 futures = "0.3.32"
 iced_futures = { path = "../../../libcosmic/iced/futures" }
 itertools = "0.14.0"
diff --git a/subscriptions/upower/Cargo.toml b/subscriptions/upower/Cargo.toml
index 3a468c8..568daee 100644
--- a/subscriptions/upower/Cargo.toml
+++ b/subscriptions/upower/Cargo.toml
@@ -12,5 +12,5 @@ iced_futures = { path = "../../../libcosmic/iced/futures" }
 log = "0.4.29"
 tokio = "1.49.0"
 tokio-stream = "0.1.18"
-upower_dbus = { git = "https://github.com/pop-os/dbus-settings-bindings" }
+upower_dbus = { path = "../../../dbus-settings-bindings/upower" }
 zbus = "5.13.2"

From 6f514db1b4c90bfc0cee6cea4635ef992cedb896 Mon Sep 17 00:00:00 2001
From: Lionel DARNIS <lionel@wopr.io>
Date: Mon, 25 May 2026 11:34:55 +0200
Subject: [PATCH 07/11] chore: use local cosmic-text checkout

---
 Cargo.lock | 4 ++--
 Cargo.toml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b4a9e4d..cb40e12 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1792,8 +1792,7 @@ dependencies = [
 
 [[package]]
 name = "cosmic-text"
-version = "0.18.2"
-source = "git+https://github.com/pop-os/cosmic-text.git#4d74f795cc771fdcc7ea0f9cacba63fcf036fad6"
+version = "0.19.0"
 dependencies = [
  "bitflags 2.11.1",
  "fontdb",
@@ -1811,6 +1810,7 @@ dependencies = [
  "unicode-linebreak",
  "unicode-script",
  "unicode-segmentation",
+ "unicode-width 0.2.2",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 01250d4..b05903c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -81,6 +81,9 @@ cosmic-theme = { path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-theme" }
 iced_futures = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/futures" }
 iced_winit = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/winit" }
 
+[patch.'https://github.com/pop-os/cosmic-text.git']
+cosmic-text = { path = "../cosmic-text" }
+
 # Yoda wayland cut v5: redirect window_clipboard to the local fork
 # (x11 gated behind opt-in feature).
 [patch.'https://forge.aditua.com/leyoda/window_clipboard.git']

From be22ac64b779649b80dabd2cf32d5b85ac374861 Mon Sep 17 00:00:00 2001
From: Lionel DARNIS <lionel@wopr.io>
Date: Mon, 25 May 2026 14:27:10 +0200
Subject: [PATCH 08/11] chore: refresh lockfile and bump rust-toolchain to 1.93
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Required to absorb the libcosmic-yoda squash rebase on 2026-05-25.
libcosmic-yoda now declares rust-version = "1.93".

Leyoda 2026 – GPLv3
---
 Cargo.lock          | 307 ++++++++++++++++++++++----------------------
 rust-toolchain.toml |   2 +-
 2 files changed, 151 insertions(+), 158 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cb40e12..3460abd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -605,9 +605,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "av-scenechange"
@@ -645,9 +645,9 @@ dependencies = [
 
 [[package]]
 name = "avif-serialize"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "375082f007bd67184fb9c0374614b29f9aaa604ec301635f72338bb65386a53d"
+checksum = "e7178fe5f7d460b13895ebb9dcb28a3a6216d2df2574a0806cb51b555d297f38"
 dependencies = [
  "arrayvec",
 ]
@@ -851,6 +851,15 @@ dependencies = [
  "alloc-stdlib",
 ]
 
+[[package]]
+name = "bs58"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
+dependencies = [
+ "tinyvec",
+]
+
 [[package]]
 name = "bstr"
 version = "1.12.1"
@@ -873,15 +882,15 @@ dependencies = [
 
 [[package]]
 name = "built"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4ad8f11f288f48ca24471bbd51ac257aaeaaa07adae295591266b792902ae64"
+checksum = "5c0e531d93d39c34eef561e929e8a7f86d77a5af08aac4f6d6e39976c51858e9"
 
 [[package]]
 name = "bumpalo"
-version = "3.20.2"
+version = "3.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "by_address"
@@ -973,9 +982,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.60"
+version = "1.2.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20"
+checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -1335,7 +1344,7 @@ dependencies = [
 [[package]]
 name = "cosmic-bg-config"
 version = "1.0.3"
-source = "git+https://github.com/pop-os/cosmic-bg#06970d5945b45a634b9ed314f5ca3a86a8502fd8"
+source = "git+https://github.com/pop-os/cosmic-bg#b1ca4c180ab29dd185472b777ab0abdb1f96ccaf"
 dependencies = [
  "cosmic-config",
  "derive_setters",
@@ -1360,7 +1369,7 @@ dependencies = [
 [[package]]
 name = "cosmic-comp-config"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/cosmic-comp#4df95190db07f7410666cec4d3bf648de90f81dd"
+source = "git+https://github.com/pop-os/cosmic-comp#28258e5a5fbe17cf714ddf5a0036d5c750545956"
 dependencies = [
  "cosmic-config",
  "input",
@@ -1419,7 +1428,7 @@ dependencies = [
 [[package]]
 name = "cosmic-freedesktop-icons"
 version = "0.4.0"
-source = "git+https://github.com/pop-os/freedesktop-icons#9c562fe3ecf03241a46a60c0078cd6ea10bd75ce"
+source = "git+https://github.com/pop-os/freedesktop-icons#739e266210d471c09af61d529d8f41dccd815b90"
 dependencies = [
  "bstr",
  "btoi",
@@ -1453,7 +1462,7 @@ dependencies = [
 [[package]]
 name = "cosmic-panel-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-panel#d518c7d25ef96f1a9696aa8cce008656bf66ece4"
+source = "git+https://github.com/pop-os/cosmic-panel#26fee6c0c310620e8b3ce3e5fbab432248a88195"
 dependencies = [
  "anyhow",
  "cosmic-config",
@@ -1664,7 +1673,7 @@ dependencies = [
 [[package]]
 name = "cosmic-settings-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-settings-daemon#716da6d6af0b252e2f78aba2ad72ee19ae0241e0"
+source = "git+https://github.com/pop-os/cosmic-settings-daemon#fa82bdf9fe7b5f5bd6008f32f393efd5e7a71c47"
 dependencies = [
  "cosmic-config",
  "ron 0.11.0",
@@ -1684,7 +1693,7 @@ dependencies = [
 [[package]]
 name = "cosmic-settings-daemon-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-settings-daemon#716da6d6af0b252e2f78aba2ad72ee19ae0241e0"
+source = "git+https://github.com/pop-os/cosmic-settings-daemon#fa82bdf9fe7b5f5bd6008f32f393efd5e7a71c47"
 dependencies = [
  "cosmic-config",
  "serde",
@@ -2226,9 +2235,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
 [[package]]
 name = "either"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
 
 [[package]]
 name = "endi"
@@ -2392,23 +2401,9 @@ checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "fax"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab"
-dependencies = [
- "fax_derive",
-]
-
-[[package]]
-name = "fax_derive"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
+checksum = "caf1079563223d5d59d83c85886a56e586cfd5c1a26292e971a0fa266531ac5a"
 
 [[package]]
 name = "fdeflate"
@@ -2941,9 +2936,9 @@ dependencies = [
 
 [[package]]
 name = "grid"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9e2d4c0a8296178d8802098410ca05d86b17a10bb5ab559b3fb404c1f948220"
+checksum = "b40ca9252762c466af32d0b1002e91e4e1bc5398f77455e55474deb466355ff5"
 
 [[package]]
 name = "guillotiere"
@@ -3006,9 +3001,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.17.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 
 [[package]]
 name = "heck"
@@ -3824,9 +3819,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -3858,9 +3853,9 @@ dependencies = [
 
 [[package]]
 name = "image-extras"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d29ba92ef6970a2685cc758b455d190842b8b9e96c865ffd31cdb9954b7548"
+checksum = "60d02eb2c9ccbbab470538fce34c7bc3be7b4e59268e65a3171367b296cdb842"
 dependencies = [
  "image",
 ]
@@ -3883,9 +3878,9 @@ checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285"
 
 [[package]]
 name = "imgref"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c5cedc30da3a610cac6b4ba17597bdf7152cf974e8aab3afb3d54455e371c8"
+checksum = "40fac9d56ed6437b198fddba683305e8e2d651aa42647f00f5ae542e7f5c94a2"
 
 [[package]]
 name = "indenter"
@@ -3911,7 +3906,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown 0.17.0",
+ "hashbrown 0.17.1",
  "serde",
  "serde_core",
 ]
@@ -3957,9 +3952,9 @@ dependencies = [
 
 [[package]]
 name = "input"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbdc09524a91f9cacd26f16734ff63d7dc650daffadd2b6f84d17a285bd875a9"
+checksum = "f9793345a65d71317763a33066b5d8351f8760dde8d4930fe9e39b5f14a7959d"
 dependencies = [
  "bitflags 2.11.1",
  "input-sys",
@@ -4059,9 +4054,9 @@ checksum = "2ceaf4c6c48465bead8cb6a0b7c4ee0c86ecbb31239032b9c66ab9a08d2f3ee1"
 
 [[package]]
 name = "jiff"
-version = "0.2.23"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359"
+checksum = "6835eea34fb6321b9b3aa7b685c2b433948c09447e389dc017fdf687d5d11e65"
 dependencies = [
  "jiff-static",
  "jiff-tzdb-platform",
@@ -4074,9 +4069,9 @@ dependencies = [
 
 [[package]]
 name = "jiff-static"
-version = "0.2.23"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4"
+checksum = "3c22e04db9c58f5136eb1757f3d5c49a7b187f49e52185228cbd2f5acdfcc08c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4168,9 +4163,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.95"
+version = "0.3.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca"
+checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11"
 dependencies = [
  "cfg-if",
  "futures-util",
@@ -4426,11 +4421,11 @@ dependencies = [
 
 [[package]]
 name = "kqueue-sys"
-version = "1.0.4"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.11.1",
  "libc",
 ]
 
@@ -4475,9 +4470,9 @@ checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8"
 
 [[package]]
 name = "libc"
-version = "0.2.185"
+version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
 name = "libcosmic-yoda"
@@ -4595,7 +4590,7 @@ dependencies = [
  "bitflags 2.11.1",
  "libc",
  "plain",
- "redox_syscall 0.7.4",
+ "redox_syscall 0.7.5",
 ]
 
 [[package]]
@@ -4717,9 +4712,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.29"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5"
 
 [[package]]
 name = "loop9"
@@ -4748,9 +4743,9 @@ dependencies = [
 
 [[package]]
 name = "lyon_algorithms"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9815fac08e6fd96733a11dce4f9d15a3f338e96a2e2311ee21e1b738efc2bc0f"
+checksum = "8575c0d003ae459399623c4def180c63b77f343b1a7fee64f249b349e7699a31"
 dependencies = [
  "lyon_path",
  "num-traits",
@@ -5025,9 +5020,9 @@ dependencies = [
 
 [[package]]
 name = "no_std_io2"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b51ed7824b6e07d354605f4abb3d9d300350701299da96642ee084f5ce631550"
+checksum = "418abd1b6d34fbf6cae440dc874771b0525a604428704c76e48b29a5e67b8003"
 dependencies = [
  "memchr",
 ]
@@ -5137,9 +5132,9 @@ dependencies = [
 
 [[package]]
 name = "num-conv"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967"
+checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
 
 [[package]]
 name = "num-derive"
@@ -5474,9 +5469,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "orbclient"
-version = "0.3.51"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59aed3b33578edcfa1bc96a321d590d31832b6ad55a26f0313362ce687e9abd6"
+checksum = "5df339f526ea9a60e371768d50efc2f2508c7203290731565d1f7a6f71d21747"
 dependencies = [
  "libc",
  "libredox",
@@ -5640,7 +5635,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
  "phf_shared 0.11.3",
- "rand 0.8.5",
+ "rand 0.8.6",
 ]
 
 [[package]]
@@ -5707,18 +5702,18 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "pin-project"
-version = "1.1.11"
+version = "1.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517"
+checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.11"
+version = "1.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6"
+checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5967,18 +5962,18 @@ dependencies = [
 
 [[package]]
 name = "profiling"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
+checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5"
 dependencies = [
  "profiling-procmacros",
 ]
 
 [[package]]
 name = "profiling-procmacros"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b"
+checksum = "4488a4a36b9a4ba6b9334a32a39971f77c1436ec82c38707bce707699cc3bbcb"
 dependencies = [
  "quote",
  "syn 2.0.117",
@@ -5994,16 +5989,16 @@ dependencies = [
  "byteorder",
  "hmac 0.10.1",
  "md-5",
- "rand 0.8.5",
+ "rand 0.8.6",
  "sha-1",
  "sha2 0.9.9",
 ]
 
 [[package]]
 name = "pxfm"
-version = "0.1.28"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a041e753da8b807c9255f28de81879c78c876392ff2469cde94799b2896b9d"
+checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f"
 
 [[package]]
 name = "qoi"
@@ -6033,16 +6028,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
 dependencies = [
  "memchr",
- "serde",
 ]
 
 [[package]]
 name = "quick-xml"
-version = "0.39.2"
+version = "0.39.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d"
+checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e"
 dependencies = [
  "memchr",
+ "serde",
 ]
 
 [[package]]
@@ -6068,9 +6063,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
 [[package]]
 name = "rand"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
@@ -6235,9 +6230,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f450ad9c3b1da563fb6948a8e0fb0fb9269711c9c73d9ea1de5058c79c8d643a"
+checksum = "4666a1a60d8412eab19d94f6d13dcc9cea0a5ef4fdf6a5db306537413c661b1b"
 dependencies = [
  "bitflags 2.11.1",
 ]
@@ -6645,9 +6640,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.149"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
  "indexmap 2.14.0",
  "itoa",
@@ -6679,11 +6674,12 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.18.0"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f"
+checksum = "e72c1c2cb7b223fafb600a619537a871c2818583d619401b785e7c0b746ccde2"
 dependencies = [
  "base64",
+ "bs58",
  "chrono",
  "hex",
  "indexmap 1.9.3",
@@ -6698,9 +6694,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.18.0"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3db8978e608f1fe7357e211969fd9abdcae80bac1ba7a3369bb7eb6b404eb65"
+checksum = "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac"
 dependencies = [
  "darling 0.23.0",
  "proc-macro2",
@@ -6812,9 +6808,9 @@ dependencies = [
 
 [[package]]
 name = "siphasher"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"
+checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
 
 [[package]]
 name = "skrifa"
@@ -6911,7 +6907,7 @@ dependencies = [
 [[package]]
 name = "softbuffer"
 version = "0.4.1"
-source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#a3f77e251e7422803f693df6e3fc313c010c4dcb"
+source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#c2b2c19ddb38ff17495643699f97cb1f2064a1be"
 dependencies = [
  "bytemuck",
  "cfg_aliases 0.2.1",
@@ -7310,9 +7306,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.52.0"
+version = "1.52.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a91135f59b1cbf38c91e73cf3386fca9bb77915c45ce2771460c9d92f0f3d776"
+checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
 dependencies = [
  "bytes",
  "libc",
@@ -7368,7 +7364,7 @@ dependencies = [
  "toml_datetime",
  "toml_parser",
  "toml_writer",
- "winnow 1.0.1",
+ "winnow 1.0.3",
 ]
 
 [[package]]
@@ -7389,7 +7385,7 @@ dependencies = [
  "indexmap 2.14.0",
  "toml_datetime",
  "toml_parser",
- "winnow 1.0.1",
+ "winnow 1.0.3",
 ]
 
 [[package]]
@@ -7398,7 +7394,7 @@ version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
- "winnow 1.0.1",
+ "winnow 1.0.3",
 ]
 
 [[package]]
@@ -7505,9 +7501,9 @@ checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
 
 [[package]]
 name = "typenum"
-version = "1.19.0"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de"
 
 [[package]]
 name = "udev"
@@ -7769,11 +7765,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
-version = "1.0.2+wasi-0.2.9"
+version = "1.0.3+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.57.1",
 ]
 
 [[package]]
@@ -7782,14 +7778,14 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.51.0",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.118"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89"
+checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -7800,9 +7796,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.68"
+version = "0.4.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8"
+checksum = "9473dbd2991ae90b6291c3c32c30c6187ac49aa32f9905d1cce280ec1e110b0f"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7810,9 +7806,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.118"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed"
+checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -7820,9 +7816,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.118"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904"
+checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -7833,9 +7829,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.118"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129"
+checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437"
 dependencies = [
  "unicode-ident",
 ]
@@ -8009,7 +8005,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c324a910fd86ebdc364a3e61ec1f11737d3b1d6c273c0239ee8ff4bc0d24b4a"
 dependencies = [
  "proc-macro2",
- "quick-xml 0.39.2",
+ "quick-xml 0.39.4",
  "quote",
 ]
 
@@ -8040,9 +8036,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.95"
+version = "0.3.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2dfbb17949fa2088e5d39408c48368947b86f7834484e87b73de55bc14d97d"
+checksum = "6d621441cfc37b84979402712047321980c178f299193a3589d05b99e8763436"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -8862,7 +8858,7 @@ dependencies = [
  "libredox",
  "orbclient",
  "raw-window-handle",
- "redox_syscall 0.7.4",
+ "redox_syscall 0.7.5",
  "smol_str",
  "tracing",
  "winit-core",
@@ -8963,18 +8959,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.15"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winnow"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5"
+checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
 dependencies = [
  "memchr",
 ]
@@ -8988,6 +8975,12 @@ dependencies = [
  "wit-bindgen-rust-macro",
 ]
 
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
 [[package]]
 name = "wit-bindgen-core"
 version = "0.51.0"
@@ -9097,7 +9090,7 @@ checksum = "2fb433233f2df9344722454bc7e96465c9d03bff9d77c248f9e7523fe79585b5"
 [[package]]
 name = "xdg-shell-wrapper-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-panel#d518c7d25ef96f1a9696aa8cce008656bf66ece4"
+source = "git+https://github.com/pop-os/cosmic-panel#26fee6c0c310620e8b3ce3e5fbab432248a88195"
 dependencies = [
  "serde",
  "wayland-protocols-wlr",
@@ -9182,9 +9175,9 @@ dependencies = [
 
 [[package]]
 name = "xml"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8aa498d22c9bbaf482329839bc5620c46be275a19a812e9a22a2b07529a642a"
+checksum = "636f85e5ca6488e96401b61eb7de54f4e44755c988af0f52cf90230c312a1a89"
 
 [[package]]
 name = "xml-rs"
@@ -9250,9 +9243,9 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "5.14.0"
+version = "5.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca82f95dbd3943a40a53cfded6c2d0a2ca26192011846a1810c4256ef92c60bc"
+checksum = "c3bcbf15c8708d7fc1be0c993622e0a5cbd5e8b52bfa40afa4c3e0cd8d724ac1"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -9278,7 +9271,7 @@ dependencies = [
  "uds_windows",
  "uuid",
  "windows-sys 0.61.2",
- "winnow 0.7.15",
+ "winnow 1.0.3",
  "zbus_macros",
  "zbus_names",
  "zvariant",
@@ -9310,9 +9303,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.14.0"
+version = "5.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897e79616e84aac4b2c46e9132a4f63b93105d54fe8c0e8f6bffc21fa8d49222"
+checksum = "51fa5406ad9175a8c825a931f8cf347116b531b3634fcb0b627c290f1f2516ff"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -9325,12 +9318,12 @@ dependencies = [
 
 [[package]]
 name = "zbus_names"
-version = "4.3.1"
+version = "4.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f"
+checksum = "7074f3e50b894eac91750142016d30d0a89be8e67dbfd9704fb875825760e52d"
 dependencies = [
  "serde",
- "winnow 0.7.15",
+ "winnow 1.0.3",
  "zvariant",
 ]
 
@@ -9349,11 +9342,11 @@ dependencies = [
 
 [[package]]
 name = "zbus_xml"
-version = "5.1.0"
+version = "5.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "441a0064125265655bccc3a6af6bef56814d9277ac83fce48b1cd7e160b80eac"
+checksum = "a8067892e940ed1727dea64690378601603b31d62dfde019a5335fbb7c0e0ed9"
 dependencies = [
- "quick-xml 0.38.4",
+ "quick-xml 0.39.4",
  "serde",
  "zbus_names",
  "zvariant",
@@ -9387,9 +9380,9 @@ dependencies = [
 
 [[package]]
 name = "zerofrom"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
 dependencies = [
  "zerofrom-derive",
 ]
@@ -9494,24 +9487,24 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "5.10.0"
+version = "5.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5708299b21903bbe348e94729f22c49c55d04720a004aa350f1f9c122fd2540b"
+checksum = "1c1567a6ec68df868cbbfde844cfc6d81649fe5109a62b116b19fabd53e618ee"
 dependencies = [
  "endi",
  "enumflags2",
  "serde",
  "url",
- "winnow 0.7.15",
+ "winnow 1.0.3",
  "zvariant_derive",
  "zvariant_utils",
 ]
 
 [[package]]
 name = "zvariant_derive"
-version = "5.10.0"
+version = "5.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b59b012ebe9c46656f9cc08d8da8b4c726510aef12559da3e5f1bf72780752c"
+checksum = "c7d5b780599bbde114e39d9a0799577fad1ced5105d38515745f7b3099d8ceda"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -9522,13 +9515,13 @@ dependencies = [
 
 [[package]]
 name = "zvariant_utils"
-version = "3.3.0"
+version = "3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9"
+checksum = "6d464f5733ffa07a3164d656f18533caace9d0638596721355d73256a410d691"
 dependencies = [
  "proc-macro2",
  "quote",
  "serde",
  "syn 2.0.117",
- "winnow 0.7.15",
+ "winnow 1.0.3",
 ]
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index f35f369..fb5449a 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.90.0"
+channel = "1.93.0"
 components = ["clippy", "rustfmt"]

From bccdc3df16beeea43611a13a1f58dabc53221e9d Mon Sep 17 00:00:00 2001
From: Lionel DARNIS <lionel@wopr.io>
Date: Mon, 25 May 2026 18:10:22 +0200
Subject: [PATCH 09/11] chore: use local COSMIC support crates

---
 Cargo.lock                 | 34 +++++-----------------------------
 Cargo.toml                 | 21 +++++++++------------
 cosmic-settings/Cargo.toml |  6 +++---
 3 files changed, 17 insertions(+), 44 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3460abd..b7ffa8d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1344,7 +1344,6 @@ dependencies = [
 [[package]]
 name = "cosmic-bg-config"
 version = "1.0.3"
-source = "git+https://github.com/pop-os/cosmic-bg#b1ca4c180ab29dd185472b777ab0abdb1f96ccaf"
 dependencies = [
  "cosmic-config",
  "derive_setters",
@@ -1355,11 +1354,10 @@ dependencies = [
 
 [[package]]
 name = "cosmic-client-toolkit"
-version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-protocols//?rev=d0e95be#d0e95be25e423cfe523b11111a3666ed7aaf0dc4"
+version = "0.2.0"
 dependencies = [
  "bitflags 2.11.1",
- "cosmic-protocols 0.1.0",
+ "cosmic-protocols",
  "libc",
  "smithay-client-toolkit",
  "wayland-client",
@@ -1369,7 +1367,6 @@ dependencies = [
 [[package]]
 name = "cosmic-comp-config"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/cosmic-comp#28258e5a5fbe17cf714ddf5a0036d5c750545956"
 dependencies = [
  "cosmic-config",
  "input",
@@ -1442,7 +1439,6 @@ dependencies = [
 [[package]]
 name = "cosmic-idle-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-idle#c95d066b5b640509a6369634b669ca60dc50e168"
 dependencies = [
  "cosmic-config",
  "serde",
@@ -1462,7 +1458,6 @@ dependencies = [
 [[package]]
 name = "cosmic-panel-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-panel#26fee6c0c310620e8b3ce3e5fbab432248a88195"
 dependencies = [
  "anyhow",
  "cosmic-config",
@@ -1486,20 +1481,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "cosmic-protocols"
-version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-protocols//?rev=d0e95be#d0e95be25e423cfe523b11111a3666ed7aaf0dc4"
-dependencies = [
- "bitflags 2.11.1",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols",
- "wayland-protocols-wlr",
- "wayland-scanner",
- "wayland-server",
-]
-
 [[package]]
 name = "cosmic-protocols"
 version = "0.2.0"
@@ -1516,9 +1497,8 @@ dependencies = [
 [[package]]
 name = "cosmic-randr"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-randr#6e8e795970fa06d434af22775e415b517f7552d3"
 dependencies = [
- "cosmic-protocols 0.1.0",
+ "cosmic-protocols",
  "indexmap 2.14.0",
  "thiserror 2.0.18",
  "tokio",
@@ -1530,7 +1510,6 @@ dependencies = [
 [[package]]
 name = "cosmic-randr-shell"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-randr#6e8e795970fa06d434af22775e415b517f7552d3"
 dependencies = [
  "kdl",
  "slotmap",
@@ -1555,7 +1534,7 @@ dependencies = [
  "cosmic-idle-config",
  "cosmic-mime-apps",
  "cosmic-panel-config",
- "cosmic-protocols 0.1.0",
+ "cosmic-protocols",
  "cosmic-randr",
  "cosmic-randr-shell",
  "cosmic-settings-a11y-manager-subscription",
@@ -1626,7 +1605,7 @@ dependencies = [
 name = "cosmic-settings-a11y-manager-subscription"
 version = "1.0.7"
 dependencies = [
- "cosmic-protocols 0.2.0",
+ "cosmic-protocols",
  "iced_futures",
  "num-derive",
  "num-traits",
@@ -1673,7 +1652,6 @@ dependencies = [
 [[package]]
 name = "cosmic-settings-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-settings-daemon#fa82bdf9fe7b5f5bd6008f32f393efd5e7a71c47"
 dependencies = [
  "cosmic-config",
  "ron 0.11.0",
@@ -1693,7 +1671,6 @@ dependencies = [
 [[package]]
 name = "cosmic-settings-daemon-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-settings-daemon#fa82bdf9fe7b5f5bd6008f32f393efd5e7a71c47"
 dependencies = [
  "cosmic-config",
  "serde",
@@ -9090,7 +9067,6 @@ checksum = "2fb433233f2df9344722454bc7e96465c9d03bff9d77c248f9e7523fe79585b5"
 [[package]]
 name = "xdg-shell-wrapper-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-panel#26fee6c0c310620e8b3ce3e5fbab432248a88195"
 dependencies = [
  "serde",
  "wayland-protocols-wlr",
diff --git a/Cargo.toml b/Cargo.toml
index b05903c..791f16f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ resolver = "3"
 rust-version = "1.90"
 
 [workspace.dependencies]
-cosmic-randr = { git = "https://github.com/pop-os/cosmic-randr" }
+cosmic-randr = { path = "../cosmic-randr/lib" }
 tokio = { version = "1.49.0", features = ["macros"] }
 # Yoda fork: direct path dep on iced_winit in libcosmic-yoda's submodule.
 iced_winit = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/winit", default-features = false }
@@ -28,20 +28,20 @@ path = "/home/lionel/Projets/COSMIC/libcosmic"
 path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-config"
 
 [workspace.dependencies.cosmic-bg-config]
-git = "https://github.com/pop-os/cosmic-bg"
+path = "../cosmic-bg/config"
 
 [workspace.dependencies.cosmic-comp-config]
-git = "https://github.com/pop-os/cosmic-comp"
+path = "../cosmic-comp/cosmic-comp-config"
 features = ["output"]
 
 [workspace.dependencies.cosmic-idle-config]
-git = "https://github.com/pop-os/cosmic-idle"
+path = "../cosmic-idle/cosmic-idle-config"
 
 [workspace.dependencies.cosmic-panel-config]
-git = "https://github.com/pop-os/cosmic-panel"
+path = "../cosmic-panel/cosmic-panel-config"
 
 [workspace.dependencies.cosmic-randr-shell]
-git = "https://github.com/pop-os/cosmic-randr"
+path = "../cosmic-randr/shell"
 
 [workspace.dependencies.sctk]
 version = "0.20"
@@ -61,15 +61,12 @@ inherits = "release"
 lto = "off"
 debug = true
 
-# [patch.'https://github.com/pop-os/cosmic-text']
-# cosmic-text = { git = "https://github.com/pop-os/cosmic-text//", rev = "b017d7c" }
-
 [patch.'https://github.com/pop-os/cosmic-protocols']
-cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d0e95be" }
-cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d0e95be" }
+cosmic-protocols = { path = "../cosmic-protocols" }
+cosmic-client-toolkit = { path = "../cosmic-protocols/client-toolkit" }
 
 # [patch.'https://github.com/pop-os/cosmic-settings-daemon']
-# cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon//", branch = "input_nobuild" }
+# cosmic-settings-config = { path = "../cosmic-settings-daemon/config" }
 
 # Yoda fork: redirect every transitive dep that asks for pop-os/libcosmic
 # (cosmic-bg-config, cosmic-comp-config, cosmic-idle-config, cosmic-panel-config,
diff --git a/cosmic-settings/Cargo.toml b/cosmic-settings/Cargo.toml
index 6512e9c..c5d672c 100644
--- a/cosmic-settings/Cargo.toml
+++ b/cosmic-settings/Cargo.toml
@@ -25,10 +25,10 @@ cosmic-dbus-networkmanager = { path = "../../dbus-settings-bindings/networkmanag
 nm-secret-agent-manager = { path = "../../dbus-settings-bindings/nm-secret-agent-manager", optional = true }
 cosmic-idle-config.workspace = true
 cosmic-panel-config = { workspace = true, optional = true }
-cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", optional = true }
+cosmic-protocols = { path = "../../cosmic-protocols", optional = true }
 cosmic-randr-shell.workspace = true
 cosmic-randr = { workspace = true, optional = true }
-cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true }
+cosmic-settings-config = { path = "../../cosmic-settings-daemon/config", optional = true }
 cosmic-settings-page = { path = "../page" }
 cosmic-settings-accessibility-subscription = { path = "../subscriptions/accessibility", optional = true }
 cosmic-settings-a11y-manager-subscription = { path = "../subscriptions/a11y-manager", optional = true }
@@ -40,7 +40,7 @@ cosmic-settings-sound-subscription = { path = "../subscriptions/sound", optional
     "auto-profile-init",
 ] }
 cosmic-settings-wallpaper = { path = "../pages/wallpapers" }
-cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true }
+cosmic-settings-daemon-config = { path = "../../cosmic-settings-daemon/cosmic-settings-daemon-config", optional = true }
 derive_setters = "0.1.9"
 dirs = "6.0.0"
 eyre = "0.6.12"

From ccfa38ad4411482fc62dacd6f2e1987417fe8db3 Mon Sep 17 00:00:00 2001
From: Lionel DARNIS <lionel@wopr.io>
Date: Mon, 25 May 2026 18:28:56 +0200
Subject: [PATCH 10/11] chore: use local glyphon lockfile

---
 Cargo.lock | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index b7ffa8d..28e8cf1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1867,7 +1867,6 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 [[package]]
 name = "cryoglyph"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/glyphon.git?tag=cosmic-0.14#c49de15bce4d8254ac136d1be9911960cc85ce12"
 dependencies = [
  "cosmic-text",
  "etagere",

From f9a442e4434637910458d4c2e16cf84a85ae5003 Mon Sep 17 00:00:00 2001
From: Lionel DARNIS <lionel@wopr.io>
Date: Mon, 25 May 2026 19:37:22 +0200
Subject: [PATCH 11/11] chore: resolve local graphics dependencies

---
 Cargo.lock | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 28e8cf1..3adeb38 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1425,7 +1425,6 @@ dependencies = [
 [[package]]
 name = "cosmic-freedesktop-icons"
 version = "0.4.0"
-source = "git+https://github.com/pop-os/freedesktop-icons#739e266210d471c09af61d529d8f41dccd815b90"
 dependencies = [
  "bstr",
  "btoi",
@@ -2201,7 +2200,6 @@ checksum = "117240f60069e65410b3ae1bb213295bd828f707b5bec6596a1afc8793ce0cbc"
 [[package]]
 name = "dpi"
 version = "0.1.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 
 [[package]]
 name = "dyn-clone"
@@ -6852,7 +6850,6 @@ dependencies = [
 [[package]]
 name = "smithay-clipboard"
 version = "0.8.0"
-source = "git+https://github.com/pop-os/smithay-clipboard?tag=sctk-0.20#859b02c88f45c554049a67c6ddeec1692ce0e20b"
 dependencies = [
  "libc",
  "raw-window-handle",
@@ -6883,7 +6880,6 @@ dependencies = [
 [[package]]
 name = "softbuffer"
 version = "0.4.1"
-source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#c2b2c19ddb38ff17495643699f97cb1f2064a1be"
 dependencies = [
  "bytemuck",
  "cfg_aliases 0.2.1",
@@ -8737,7 +8733,6 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 [[package]]
 name = "winit"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "bitflags 2.11.1",
  "cfg_aliases 0.2.1",
@@ -8762,7 +8757,6 @@ dependencies = [
 [[package]]
 name = "winit-android"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "android-activity",
  "bitflags 2.11.1",
@@ -8777,7 +8771,6 @@ dependencies = [
 [[package]]
 name = "winit-appkit"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "bitflags 2.11.1",
  "block2 0.6.2",
@@ -8799,7 +8792,6 @@ dependencies = [
 [[package]]
 name = "winit-common"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "memmap2 0.9.10",
  "objc2 0.6.4",
@@ -8813,7 +8805,6 @@ dependencies = [
 [[package]]
 name = "winit-core"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "bitflags 2.11.1",
  "cursor-icon",
@@ -8827,7 +8818,6 @@ dependencies = [
 [[package]]
 name = "winit-orbital"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "bitflags 2.11.1",
  "dpi",
@@ -8843,7 +8833,6 @@ dependencies = [
 [[package]]
 name = "winit-uikit"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "bitflags 2.11.1",
  "block2 0.6.2",
@@ -8863,7 +8852,6 @@ dependencies = [
 [[package]]
 name = "winit-wayland"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "ahash",
  "bitflags 2.11.1",
@@ -8889,7 +8877,6 @@ dependencies = [
 [[package]]
 name = "winit-web"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "atomic-waker",
  "bitflags 2.11.1",
@@ -8911,7 +8898,6 @@ dependencies = [
 [[package]]
 name = "winit-win32"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "bitflags 2.11.1",
  "cursor-icon",
@@ -9500,3 +9486,7 @@ dependencies = [
  "syn 2.0.117",
  "winnow 1.0.3",
 ]
+
+[[patch.unused]]
+name = "winit-x11"
+version = "0.31.0-beta.2"