eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2025-01-06 00:59:48 +01:00
Code Issues Releases Wiki Activity

setxkbmap: reset options before setting new ones (#2160)

Browse source 
(cherry picked from commit 4971b9cad0)
This commit is contained in:
Naïm Favier 2021-07-12 03:15:18 +02:00 committed by Robert Helgesson
parent 88de11327c
commit 03db229cc2
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/xsession.nix
View file

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

2
tests/modules/misc/xsession/basic-setxkbmap-expected.service
View file

@ -2,7 +2,7 @@
WantedBy=graphical-session.target
[Service]
ExecStart=@setxkbmap@/bin/setxkbmap -layout 'us' -variant ''
ExecStart=@setxkbmap@/bin/setxkbmap -layout 'us' -variant '' -option ''
RemainAfterExit=true
Type=oneshot

2
tests/modules/misc/xsession/keyboard-without-layout-expected.service
View file

@ -2,7 +2,7 @@
WantedBy=graphical-session.target
[Service]
ExecStart=@setxkbmap@/bin/setxkbmap -option 'ctrl:nocaps' -option 'altwin:no_win'
ExecStart=@setxkbmap@/bin/setxkbmap -option '' -option 'ctrl:nocaps' -option 'altwin:no_win'
RemainAfterExit=true
Type=oneshot