fix(inputs): Use env vars and extra layouts

Closes: pop-os#725 The inputs applet uses an outdated `xkb-data` which causes some configs to fail which in turn leads to an empty list. See: lilyinstarlight/nixos-cosmic#74 (comment)
joshuamegnauth54 · Nov 22, 2024 · 0250046 · 0250046
1 parent 1e99f2c
commit 0250046
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cosmic-applet-input-sources/Cargo.toml b/cosmic-applet-input-sources/Cargo.toml
@@ -18,4 +18,4 @@ tracing-subscriber.workspace = true
 tracing.workspace = true
 serde = { version = "1.0.197", features = ["derive"] }
 once_cell = "1.19.0"
-xkb-data = "0.1.0"
+xkb-data = "0.2"
diff --git a/cosmic-applet-input-sources/src/lib.rs b/cosmic-applet-input-sources/src/lib.rs
@@ -12,7 +12,7 @@ mod window;
 pub fn run() -> cosmic::iced::Result {
     localize::localize();
 
-    let layouts = match xkb_data::keyboard_layouts() {
+    let layouts = match xkb_data::all_keyboard_layouts() {
         Ok(layouts) => layouts,
         Err(why) => {
             tracing::error!("could not get keyboard layouts data: {:?}", why);

diff --git a/cosmic-applet-tiling/Cargo.toml b/cosmic-applet-tiling/Cargo.toml
@@ -19,4 +19,4 @@ tokio = { version = "1.36.0", features = ["sync", "rt"] }
 tracing-log.workspace = true
 tracing-subscriber.workspace = true
 tracing.workspace = true
-xkb-data = "0.1.0"
+xkb-data = "0.2"