diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2024-03-23 10:10:01 +0400 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2024-03-23 10:10:01 +0400 |
| commit | 0f724f20116dd5b013f797521bb53649e7eeb3ed (patch) | |
| tree | 8a0168e14742db93704559eea538e41cb03ed5f7 | |
| parent | 46131c87a58a9d27f72bf52b299088b767ebe926 (diff) | |
| download | niri-0f724f20116dd5b013f797521bb53649e7eeb3ed.tar.gz niri-0f724f20116dd5b013f797521bb53649e7eeb3ed.tar.bz2 niri-0f724f20116dd5b013f797521bb53649e7eeb3ed.zip | |
Stop hardcoding "us" default layout
XKB has its own way to pick the default.
| -rw-r--r-- | niri-config/src/lib.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/niri-config/src/lib.rs b/niri-config/src/lib.rs index 7b44e96b..39b1f7f5 100644 --- a/niri-config/src/lib.rs +++ b/niri-config/src/lib.rs @@ -97,8 +97,8 @@ pub struct Xkb { pub rules: String, #[knuffel(child, unwrap(argument), default)] pub model: String, - #[knuffel(child, unwrap(argument))] - pub layout: Option<String>, + #[knuffel(child, unwrap(argument), default)] + pub layout: String, #[knuffel(child, unwrap(argument), default)] pub variant: String, #[knuffel(child, unwrap(argument))] @@ -110,7 +110,7 @@ impl Xkb { XkbConfig { rules: &self.rules, model: &self.model, - layout: self.layout.as_deref().unwrap_or("us"), + layout: &self.layout, variant: &self.variant, options: self.options.clone(), } @@ -1782,7 +1782,7 @@ mod tests { input: Input { keyboard: Keyboard { xkb: Xkb { - layout: Some("us,ru".to_owned()), + layout: "us,ru".to_owned(), options: Some("grp:win_space_toggle".to_owned()), ..Default::default() }, |