fix: Correctly detect all keyboard layouts

Closes: #1160 See these for more info: * pop-os/cosmic-applets#725 * lilyinstarlight/nixos-cosmic#484 * lilyinstarlight/nixos-cosmic#74 Also, thanks to @Thatoo for all of the help in figuring this out!
joshuamegnauth54 · Nov 22, 2024 · ae3586f · ae3586f
1 parent 39de757
commit ae3586f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ pam-client = "0.5.0"
 pwd.workspace = true
 ron.workspace = true
 shlex = "1.3.0"
-xkb-data = "0.1"
+xkb-data = "0.2"
 xdg = "2.5.2"
 #TODO: reduce features
 tokio = { workspace = true, features = ["full"] }

diff --git a/src/greeter.rs b/src/greeter.rs
@@ -282,7 +282,7 @@ pub fn main() -> Result<(), Box<dyn Error>> {
         sessions
     };
 
-    let layouts_opt = match xkb_data::keyboard_layouts() {
+    let layouts_opt = match xkb_data::all_keyboard_layouts() {
         Ok(ok) => Some(Arc::new(ok)),
         Err(err) => {
             log::warn!("failed to load keyboard layouts: {}", err);