Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

keyboard: make the model option optional

Browse source 
Also, actually use it in the call to setxkbmap.
This commit is contained in:
Robert Helgesson 2019-09-05 01:56:14 +02:00
parent 824d31a21c
commit d6b36f12ff
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/home-environment.nix
View file

@ -71,8 +71,8 @@ let
}; };
model = mkOption { model = mkOption {
type = types.str; type = with types; nullOr str;
default = "pc104"; default = null;
example = "presario"; example = "presario";
description = '' description = ''
Keyboard model. Keyboard model.

1
modules/xsession.nix
View file

@ -109,6 +109,7 @@ in
args = args =
optional (layout != null) "-layout '${layout}'" optional (layout != null) "-layout '${layout}'"
++ optional (variant != null) "-variant '${variant}'" ++ optional (variant != null) "-variant '${variant}'"
++ optional (model != null) "-model '${model}'"
++ map (v: "-option '${v}'") options; ++ map (v: "-option '${v}'") options;
in in
"${pkgs.xorg.setxkbmap}/bin/setxkbmap ${toString args}"; "${pkgs.xorg.setxkbmap}/bin/setxkbmap ${toString args}";