chore: update cosmic-settings

also refactors the active device handling, which didn't seem quite correct before.
This commit is contained in:
Ashley Wulber 2026-01-29 15:26:50 -05:00 committed by Michael Murphy
parent d4f62852f3
commit cbf2a82fb7
2 changed files with 173 additions and 125 deletions

213
Cargo.lock generated
View file

@ -273,9 +273,6 @@ dependencies = [
"serde_repr",
"tokio",
"url",
"wayland-backend",
"wayland-client",
"wayland-protocols",
"zbus 5.13.2",
]
@ -1515,8 +1512,8 @@ dependencies = [
[[package]]
name = "cosmic-config"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#927035809f1564674434c27cbecdc67e199db28e"
version = "1.0.0"
source = "git+https://github.com/pop-os/libcosmic#fdcba7d8ececc35c09a7871b018930f752ac784b"
dependencies = [
"atomicwrites",
"cosmic-config-derive",
@ -1526,7 +1523,7 @@ dependencies = [
"iced_futures",
"known-folders",
"notify",
"ron",
"ron 0.12.0",
"serde",
"tokio",
"tracing",
@ -1536,8 +1533,8 @@ dependencies = [
[[package]]
name = "cosmic-config-derive"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#927035809f1564674434c27cbecdc67e199db28e"
version = "1.0.0"
source = "git+https://github.com/pop-os/libcosmic#fdcba7d8ececc35c09a7871b018930f752ac784b"
dependencies = [
"quote",
"syn 2.0.114",
@ -1581,7 +1578,7 @@ dependencies = [
[[package]]
name = "cosmic-notifications-config"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-notifications#23e39eca29cf7f7c59f8ec6b80e0f847e080c240"
source = "git+https://github.com/pop-os/cosmic-notifications#970b7672cae313c1934edd922e3271e8ae651f9b"
dependencies = [
"cosmic-config",
"serde",
@ -1590,7 +1587,7 @@ dependencies = [
[[package]]
name = "cosmic-notifications-util"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-notifications#23e39eca29cf7f7c59f8ec6b80e0f847e080c240"
source = "git+https://github.com/pop-os/cosmic-notifications#970b7672cae313c1934edd922e3271e8ae651f9b"
dependencies = [
"fast_image_resize",
"libcosmic",
@ -1630,7 +1627,7 @@ dependencies = [
[[package]]
name = "cosmic-pipewire"
version = "1.0.0"
source = "git+https://github.com/pop-os/cosmic-settings#6b4a3d565cd58ee69d777c19255f8276520d4f55"
source = "git+https://github.com/pop-os/cosmic-settings#f48bcde63bb54134e21246ca0edb5bbefc453c3e"
dependencies = [
"intmap",
"libspa",
@ -1658,7 +1655,7 @@ dependencies = [
[[package]]
name = "cosmic-settings-a11y-manager-subscription"
version = "1.0.2"
source = "git+https://github.com/pop-os/cosmic-settings#6b4a3d565cd58ee69d777c19255f8276520d4f55"
source = "git+https://github.com/pop-os/cosmic-settings#f48bcde63bb54134e21246ca0edb5bbefc453c3e"
dependencies = [
"cosmic-protocols",
"iced_futures",
@ -1672,7 +1669,7 @@ dependencies = [
[[package]]
name = "cosmic-settings-accessibility-subscription"
version = "1.0.2"
source = "git+https://github.com/pop-os/cosmic-settings#6b4a3d565cd58ee69d777c19255f8276520d4f55"
source = "git+https://github.com/pop-os/cosmic-settings#f48bcde63bb54134e21246ca0edb5bbefc453c3e"
dependencies = [
"cosmic-dbus-a11y",
"futures",
@ -1685,7 +1682,7 @@ dependencies = [
[[package]]
name = "cosmic-settings-airplane-mode-subscription"
version = "1.0.2"
source = "git+https://github.com/pop-os/cosmic-settings#6b4a3d565cd58ee69d777c19255f8276520d4f55"
source = "git+https://github.com/pop-os/cosmic-settings#f48bcde63bb54134e21246ca0edb5bbefc453c3e"
dependencies = [
"futures",
"iced_futures",
@ -1700,7 +1697,7 @@ version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-settings-daemon#ef024bfd06bf9fbd57246a25c91d1fdd28153d05"
dependencies = [
"cosmic-config",
"ron",
"ron 0.11.0",
"serde",
"serde_with",
"tracing",
@ -1718,7 +1715,7 @@ dependencies = [
[[package]]
name = "cosmic-settings-daemon-subscription"
version = "1.0.2"
source = "git+https://github.com/pop-os/cosmic-settings#6b4a3d565cd58ee69d777c19255f8276520d4f55"
source = "git+https://github.com/pop-os/cosmic-settings#f48bcde63bb54134e21246ca0edb5bbefc453c3e"
dependencies = [
"futures",
"iced_futures",
@ -1731,7 +1728,7 @@ dependencies = [
[[package]]
name = "cosmic-settings-network-manager-subscription"
version = "1.0.2"
source = "git+https://github.com/pop-os/cosmic-settings#6b4a3d565cd58ee69d777c19255f8276520d4f55"
source = "git+https://github.com/pop-os/cosmic-settings#f48bcde63bb54134e21246ca0edb5bbefc453c3e"
dependencies = [
"bitflags 2.10.0",
"cosmic-dbus-networkmanager",
@ -1750,7 +1747,7 @@ dependencies = [
[[package]]
name = "cosmic-settings-sound-subscription"
version = "1.0.2"
source = "git+https://github.com/pop-os/cosmic-settings#6b4a3d565cd58ee69d777c19255f8276520d4f55"
source = "git+https://github.com/pop-os/cosmic-settings#f48bcde63bb54134e21246ca0edb5bbefc453c3e"
dependencies = [
"cosmic-pipewire",
"futures",
@ -1765,7 +1762,7 @@ dependencies = [
[[package]]
name = "cosmic-settings-upower-subscription"
version = "1.0.2"
source = "git+https://github.com/pop-os/cosmic-settings#6b4a3d565cd58ee69d777c19255f8276520d4f55"
source = "git+https://github.com/pop-os/cosmic-settings#f48bcde63bb54134e21246ca0edb5bbefc453c3e"
dependencies = [
"futures",
"iced_futures",
@ -1778,8 +1775,8 @@ dependencies = [
[[package]]
name = "cosmic-text"
version = "0.16.0"
source = "git+https://github.com/pop-os/cosmic-text.git#ee702e50901d90cd842dbd88154687bd2512b52c"
version = "0.17.0"
source = "git+https://github.com/pop-os/cosmic-text.git#bdd6657fd7268dc8882214f540a6150eb78cfae0"
dependencies = [
"bitflags 2.10.0",
"fontdb 0.23.0",
@ -1787,10 +1784,10 @@ dependencies = [
"linebender_resource_handle",
"log",
"rangemap",
"rustc-hash 1.1.0",
"rustc-hash 2.1.1",
"self_cell",
"skrifa 0.39.0",
"smol_str",
"skrifa 0.36.0",
"smol_str 0.3.5",
"swash",
"sys-locale",
"unicode-bidi",
@ -1801,15 +1798,15 @@ dependencies = [
[[package]]
name = "cosmic-theme"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#927035809f1564674434c27cbecdc67e199db28e"
version = "1.0.0"
source = "git+https://github.com/pop-os/libcosmic#fdcba7d8ececc35c09a7871b018930f752ac784b"
dependencies = [
"almost",
"cosmic-config",
"csscolorparser",
"dirs",
"palette",
"ron",
"ron 0.12.0",
"serde",
"serde_json",
"thiserror 2.0.18",
@ -1872,12 +1869,14 @@ checksum = "42aaeae719fd78ce501d77c6cdf01f7e96f26bcd5617a4903a1c2b97e388543a"
[[package]]
name = "csscolorparser"
version = "0.7.2"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fda6aace1fbef3aa217b27f4c8d7d071ef2a70a5ca51050b1f17d40299d3f16"
checksum = "02ee6eae4d99456f92dc379ba21cf08f783ef5525f193c3854b4e921ece045c5"
dependencies = [
"phf 0.11.3",
"num-traits",
"phf 0.13.1",
"serde",
"uncased",
]
[[package]]
@ -2552,6 +2551,15 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
[[package]]
name = "font-types"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02a596f5713680923a2080d86de50fe472fb290693cf0f701187a1c8b36996b7"
dependencies = [
"bytemuck",
]
[[package]]
name = "font-types"
version = "0.10.1"
@ -2974,14 +2982,14 @@ dependencies = [
[[package]]
name = "harfrust"
version = "0.4.1"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0caaee032384c10dd597af4579c67dee16650d862a9ccbe1233ff1a379abc07"
checksum = "75a4c970f1a00edc1626f1e3cc039492b15b73df28b9fff70f95404a571b4fae"
dependencies = [
"bitflags 2.10.0",
"bytemuck",
"core_maths",
"read-fonts 0.36.0",
"read-fonts 0.34.0",
"smallvec",
]
@ -3144,9 +3152,9 @@ dependencies = [
[[package]]
name = "iana-time-zone"
version = "0.1.64"
version = "0.1.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
dependencies = [
"android_system_properties",
"core-foundation-sys",
@ -3169,7 +3177,7 @@ dependencies = [
[[package]]
name = "iced"
version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#927035809f1564674434c27cbecdc67e199db28e"
source = "git+https://github.com/pop-os/libcosmic#fdcba7d8ececc35c09a7871b018930f752ac784b"
dependencies = [
"dnd",
"iced_accessibility",
@ -3187,7 +3195,7 @@ dependencies = [
[[package]]
name = "iced_accessibility"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#927035809f1564674434c27cbecdc67e199db28e"
source = "git+https://github.com/pop-os/libcosmic#fdcba7d8ececc35c09a7871b018930f752ac784b"
dependencies = [
"accesskit",
"accesskit_winit",
@ -3196,7 +3204,7 @@ dependencies = [
[[package]]
name = "iced_core"
version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#927035809f1564674434c27cbecdc67e199db28e"
source = "git+https://github.com/pop-os/libcosmic#fdcba7d8ececc35c09a7871b018930f752ac784b"
dependencies = [
"bitflags 2.10.0",
"bytes",
@ -3211,7 +3219,7 @@ dependencies = [
"raw-window-handle",
"rustc-hash 2.1.1",
"serde",
"smol_str",
"smol_str 0.2.2",
"thiserror 1.0.69",
"web-time",
"window_clipboard",
@ -3220,7 +3228,7 @@ dependencies = [
[[package]]
name = "iced_futures"
version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#927035809f1564674434c27cbecdc67e199db28e"
source = "git+https://github.com/pop-os/libcosmic#fdcba7d8ececc35c09a7871b018930f752ac784b"
dependencies = [
"futures",
"iced_core",
@ -3246,7 +3254,7 @@ dependencies = [
[[package]]
name = "iced_graphics"
version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#927035809f1564674434c27cbecdc67e199db28e"
source = "git+https://github.com/pop-os/libcosmic#fdcba7d8ececc35c09a7871b018930f752ac784b"
dependencies = [
"bitflags 2.10.0",
"bytemuck",
@ -3268,7 +3276,7 @@ dependencies = [
[[package]]
name = "iced_renderer"
version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#927035809f1564674434c27cbecdc67e199db28e"
source = "git+https://github.com/pop-os/libcosmic#fdcba7d8ececc35c09a7871b018930f752ac784b"
dependencies = [
"iced_graphics",
"iced_tiny_skia",
@ -3280,7 +3288,7 @@ dependencies = [
[[package]]
name = "iced_runtime"
version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#927035809f1564674434c27cbecdc67e199db28e"
source = "git+https://github.com/pop-os/libcosmic#fdcba7d8ececc35c09a7871b018930f752ac784b"
dependencies = [
"bytes",
"cosmic-client-toolkit",
@ -3295,7 +3303,7 @@ dependencies = [
[[package]]
name = "iced_tiny_skia"
version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#927035809f1564674434c27cbecdc67e199db28e"
source = "git+https://github.com/pop-os/libcosmic#fdcba7d8ececc35c09a7871b018930f752ac784b"
dependencies = [
"bytemuck",
"cosmic-text",
@ -3311,7 +3319,7 @@ dependencies = [
[[package]]
name = "iced_wgpu"
version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#927035809f1564674434c27cbecdc67e199db28e"
source = "git+https://github.com/pop-os/libcosmic#fdcba7d8ececc35c09a7871b018930f752ac784b"
dependencies = [
"as-raw-xcb-connection",
"bitflags 2.10.0",
@ -3342,7 +3350,7 @@ dependencies = [
[[package]]
name = "iced_widget"
version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#927035809f1564674434c27cbecdc67e199db28e"
source = "git+https://github.com/pop-os/libcosmic#fdcba7d8ececc35c09a7871b018930f752ac784b"
dependencies = [
"cosmic-client-toolkit",
"dnd",
@ -3361,7 +3369,7 @@ dependencies = [
[[package]]
name = "iced_winit"
version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#927035809f1564674434c27cbecdc67e199db28e"
source = "git+https://github.com/pop-os/libcosmic#fdcba7d8ececc35c09a7871b018930f752ac784b"
dependencies = [
"cosmic-client-toolkit",
"dnd",
@ -4124,8 +4132,8 @@ checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
[[package]]
name = "libcosmic"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#927035809f1564674434c27cbecdc67e199db28e"
version = "1.0.0"
source = "git+https://github.com/pop-os/libcosmic#fdcba7d8ececc35c09a7871b018930f752ac784b"
dependencies = [
"apply",
"ashpd 0.12.1",
@ -4160,7 +4168,7 @@ dependencies = [
"phf 0.13.1",
"raw-window-handle",
"rfd",
"ron",
"ron 0.12.0",
"rust-embed",
"rustix 1.1.3",
"serde",
@ -5332,6 +5340,7 @@ dependencies = [
"proc-macro2",
"quote",
"syn 2.0.114",
"uncased",
]
[[package]]
@ -5359,6 +5368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
dependencies = [
"siphasher",
"uncased",
]
[[package]]
@ -5738,6 +5748,17 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
[[package]]
name = "read-fonts"
version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8941f8e9d5f8ad3aebea330d01ac68c0167600eb31a86ecd86e97be4d13b51f5"
dependencies = [
"bytemuck",
"core_maths",
"font-types 0.9.0",
]
[[package]]
name = "read-fonts"
version = "0.35.0"
@ -5745,18 +5766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358"
dependencies = [
"bytemuck",
"font-types",
]
[[package]]
name = "read-fonts"
version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5eaa2941a4c05443ee3a7b26ab076a553c343ad5995230cc2b1d3e993bdc6345"
dependencies = [
"bytemuck",
"core_maths",
"font-types",
"font-types 0.10.1",
]
[[package]]
@ -5870,9 +5880,9 @@ dependencies = [
[[package]]
name = "rfd"
version = "0.15.4"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef2bee61e6cffa4635c72d7d81a84294e28f0930db0ddcb0f66d10244674ebed"
checksum = "a15ad77d9e70a92437d8f74c35d99b4e4691128df018833e99f90bcd36152672"
dependencies = [
"ashpd 0.11.1",
"block2 0.6.2",
@ -5889,7 +5899,7 @@ dependencies = [
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
"windows-sys 0.59.0",
"windows-sys 0.60.2",
]
[[package]]
@ -5914,6 +5924,20 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "ron"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd490c5b18261893f14449cbd28cb9c0b637aebf161cd77900bfdedaff21ec32"
dependencies = [
"bitflags 2.10.0",
"once_cell",
"serde",
"serde_derive",
"typeid",
"unicode-ident",
]
[[package]]
name = "roxmltree"
version = "0.20.0"
@ -6292,9 +6316,19 @@ dependencies = [
[[package]]
name = "siphasher"
version = "1.0.1"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"
[[package]]
name = "skrifa"
version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37004372610e83ee2a4c69c7d896b41f33da6a3dc1a4fe07dd9b2629a549b1dc"
dependencies = [
"bytemuck",
"read-fonts 0.34.0",
]
[[package]]
name = "skrifa"
@ -6306,16 +6340,6 @@ dependencies = [
"read-fonts 0.35.0",
]
[[package]]
name = "skrifa"
version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c9eb0b904a04d09bd68c65d946617b8ff733009999050f3b851c32fb3cfb60e"
dependencies = [
"bytemuck",
"read-fonts 0.36.0",
]
[[package]]
name = "slab"
version = "0.4.11"
@ -6412,6 +6436,12 @@ dependencies = [
"serde",
]
[[package]]
name = "smol_str"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f7a918bd2a9951d18ee6e48f076843e8e73a9a5d22cf05bcd4b7a81bdd04e17"
[[package]]
name = "socket2"
version = "0.4.10"
@ -7018,6 +7048,12 @@ dependencies = [
"rustc-hash 2.1.1",
]
[[package]]
name = "typeid"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
[[package]]
name = "typenum"
version = "1.19.0"
@ -7047,6 +7083,15 @@ dependencies = [
"winapi",
]
[[package]]
name = "uncased"
version = "0.9.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697"
dependencies = [
"version_check",
]
[[package]]
name = "unic-langid"
version = "0.9.6"
@ -8144,7 +8189,7 @@ dependencies = [
"rustix 0.38.44",
"sctk-adwaita",
"smithay-client-toolkit 0.19.2",
"smol_str",
"smol_str 0.2.2",
"tracing",
"unicode-segmentation",
"wasm-bindgen",
@ -8507,18 +8552,18 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524"
[[package]]
name = "zerocopy"
version = "0.8.34"
version = "0.8.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71ddd76bcebeed25db614f82bf31a9f4222d3fbba300e6fb6c00afa26cbd4d9d"
checksum = "dafd85c832c1b68bbb4ec0c72c7f6f4fc5179627d2bc7c26b30e4c0cc11e76cc"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
version = "0.8.34"
version = "0.8.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8187381b52e32220d50b255276aa16a084ec0a9017a0ca2152a1f55c539758d"
checksum = "7cb7e4e8436d9db52fbd6625dbf2f45243ab84994a72882ec8227b99e72b439a"
dependencies = [
"proc-macro2",
"quote",
@ -8600,9 +8645,9 @@ checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9"
[[package]]
name = "zune-jpeg"
version = "0.5.11"
version = "0.5.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2959ca473aae96a14ecedf501d20b3608d2825ba280d5adb57d651721885b0c2"
checksum = "410e9ecef634c709e3831c2cfdb8d9c32164fae1c67496d5b68fff728eec37fe"
dependencies = [
"zune-core",
]