refactor: use settings subscriptions and nm secret agent

This commit is contained in:
Ashley Wulber 2025-12-19 12:02:48 -05:00 committed by Michael Murphy
parent 6534939ba6
commit 10e4f84d3f
14 changed files with 1184 additions and 1742 deletions

210
Cargo.lock generated
View file

@ -104,6 +104,17 @@ version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
[[package]]
name = "aes"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
dependencies = [
"cfg-if",
"cipher",
"cpufeatures",
]
[[package]]
name = "ahash"
version = "0.8.12"
@ -336,6 +347,17 @@ dependencies = [
"slab",
]
[[package]]
name = "async-fn-stream"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4ba0c4baf81a0d8ab31618ffa3ae29ceeb970a6d0d82f76130753462e39d0ea"
dependencies = [
"futures-util",
"pin-project-lite",
"smallvec",
]
[[package]]
name = "async-io"
version = "1.13.0"
@ -582,7 +604,7 @@ dependencies = [
"bitflags 2.10.0",
"cexpr",
"clang-sys",
"itertools",
"itertools 0.13.0",
"proc-macro2",
"quote",
"regex",
@ -636,6 +658,15 @@ dependencies = [
"generic-array",
]
[[package]]
name = "block-padding"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
dependencies = [
"generic-array",
]
[[package]]
name = "block2"
version = "0.5.1"
@ -827,6 +858,15 @@ dependencies = [
"wayland-client",
]
[[package]]
name = "cbc"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
dependencies = [
"cipher",
]
[[package]]
name = "cc"
version = "1.2.51"
@ -906,6 +946,16 @@ dependencies = [
"phf 0.12.1",
]
[[package]]
name = "cipher"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
dependencies = [
"crypto-common",
"inout",
]
[[package]]
name = "clang-sys"
version = "1.8.1"
@ -1273,19 +1323,26 @@ name = "cosmic-applet-network"
version = "1.0.0"
dependencies = [
"anyhow",
"async-fn-stream",
"cosmic-dbus-networkmanager",
"cosmic-settings-airplane-mode-subscription",
"cosmic-settings-network-manager-subscription",
"cosmic-time",
"futures",
"futures-util",
"i18n-embed",
"i18n-embed-fl",
"indexmap 2.12.1",
"libcosmic",
"nm-secret-agent-manager",
"rust-embed",
"rustc-hash 2.1.1",
"secure-string",
"tokio",
"tracing",
"tracing-log",
"tracing-subscriber",
"uuid",
"zbus 5.12.0",
]
@ -1625,6 +1682,18 @@ dependencies = [
"zbus 5.12.0",
]
[[package]]
name = "cosmic-settings-airplane-mode-subscription"
version = "1.0.0-beta6"
source = "git+https://github.com/pop-os/cosmic-settings/?branch=nm-secret-agent#8bcec57132e0610cd7630b04c9be5e0661863b73"
dependencies = [
"futures",
"iced_futures",
"log",
"rustix 1.1.3",
"tokio",
]
[[package]]
name = "cosmic-settings-config"
version = "0.1.0"
@ -1659,6 +1728,25 @@ dependencies = [
"zbus 5.12.0",
]
[[package]]
name = "cosmic-settings-network-manager-subscription"
version = "1.0.0-beta6"
source = "git+https://github.com/pop-os/cosmic-settings/?branch=nm-secret-agent#8bcec57132e0610cd7630b04c9be5e0661863b73"
dependencies = [
"bitflags 2.10.0",
"cosmic-dbus-networkmanager",
"futures",
"iced_futures",
"itertools 0.14.0",
"nm-secret-agent-manager",
"secret-service",
"secure-string",
"thiserror 2.0.17",
"tokio",
"tracing",
"zbus 5.12.0",
]
[[package]]
name = "cosmic-settings-sound-subscription"
version = "1.0.0-beta6"
@ -2029,6 +2117,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer",
"crypto-common",
"subtle",
]
[[package]]
@ -2968,6 +3057,24 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
[[package]]
name = "hkdf"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
dependencies = [
"hmac",
]
[[package]]
name = "hmac"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
dependencies = [
"digest",
]
[[package]]
name = "i18n-config"
version = "0.4.8"
@ -3775,6 +3882,16 @@ dependencies = [
"libc",
]
[[package]]
name = "inout"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
dependencies = [
"block-padding",
"generic-array",
]
[[package]]
name = "input"
version = "0.9.1"
@ -3848,6 +3965,15 @@ dependencies = [
"either",
]
[[package]]
name = "itertools"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
dependencies = [
"either",
]
[[package]]
name = "itoa"
version = "1.0.16"
@ -4510,6 +4636,13 @@ dependencies = [
"memoffset 0.9.1",
]
[[package]]
name = "nm-secret-agent-manager"
version = "0.1.0"
dependencies = [
"zbus 5.12.0",
]
[[package]]
name = "nom"
version = "7.1.3"
@ -4562,6 +4695,20 @@ dependencies = [
"windows-sys 0.61.2",
]
[[package]]
name = "num"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
dependencies = [
"num-bigint",
"num-complex",
"num-integer",
"num-iter",
"num-rational",
"num-traits",
]
[[package]]
name = "num-bigint"
version = "0.4.6"
@ -4572,6 +4719,15 @@ dependencies = [
"num-traits",
]
[[package]]
name = "num-complex"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
dependencies = [
"num-traits",
]
[[package]]
name = "num-conv"
version = "0.1.0"
@ -4598,6 +4754,17 @@ dependencies = [
"num-traits",
]
[[package]]
name = "num-iter"
version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
dependencies = [
"autocfg",
"num-integer",
"num-traits",
]
[[package]]
name = "num-rational"
version = "0.4.2"
@ -5915,6 +6082,35 @@ dependencies = [
"tiny-skia",
]
[[package]]
name = "secret-service"
version = "5.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a62d7f86047af0077255a29494136b9aaaf697c76ff70b8e49cded4e2623c14"
dependencies = [
"aes",
"cbc",
"futures-util",
"generic-array",
"getrandom 0.2.16",
"hkdf",
"num",
"once_cell",
"serde",
"sha2",
"zbus 5.12.0",
]
[[package]]
name = "secure-string"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "548ba8c9ff631f7bb3a64de1e8ad73fe20f6d04090724f2b496ed45314ad7488"
dependencies = [
"libc",
"zeroize",
]
[[package]]
name = "self_cell"
version = "1.2.1"
@ -6320,6 +6516,12 @@ dependencies = [
"syn 2.0.111",
]
[[package]]
name = "subtle"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "svg_fmt"
version = "0.4.5"
@ -8337,6 +8539,12 @@ dependencies = [
"synstructure",
]
[[package]]
name = "zeroize"
version = "1.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
[[package]]
name = "zerotrie"
version = "0.2.3"