steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

fix(keyboard,sway-desktop): gracefully handle empty xkb_options

Browse source
This commit is contained in:
steveej 2023-05-23 21:05:22 +02:00
parent 2c8f489f8b
commit bd0cfeb899
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nix/home-manager/profiles/common.nix
View file

@ -21,7 +21,8 @@
layout = "us"; layout = "us";
variant = "altgr-intl"; variant = "altgr-intl";
options = [ options = [
"nodeadkeys" # nodeadkeys doesn't make sense with us layout: see https://man.archlinux.org/man/xkeyboard-config.7 for valid options
# "nodeadkeys"
# "caps:swapescape" # "caps:swapescape"
]; ];
}; };

1
nix/home-manager/profiles/sway-desktop.nix
View file

@ -85,6 +85,7 @@ in {
"type:keyboard" = { "type:keyboard" = {
xkb_layout = config.home.keyboard.layout; xkb_layout = config.home.keyboard.layout;
xkb_variant = config.home.keyboard.variant; xkb_variant = config.home.keyboard.variant;
} // lib.attrsets.optionalAttrs (builtins.length (config.home.keyboard.options or []) > 0) {
xkb_options = builtins.concatStringsSep "," config.home.keyboard.options; xkb_options = builtins.concatStringsSep "," config.home.keyboard.options;
}; };