diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-01-26 16:49:41 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-01-26 16:49:41 +0100 |
| commit | 6973c7739ea1581595931e8c8b3b76241083b2df (patch) | |
| tree | f56826492e0e260f24aeeedd2e47d36785ba3519 /nixos/modules/services/x11 | |
| parent | 5dacc53af3f4537fab693952b5f13b6cafcde6d4 (diff) | |
| parent | bca9bcb3c3dd3b2e46f8e07db9a8326de01697c7 (diff) | |
| download | nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar.gz nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar.bz2 nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar.lz nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar.xz nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar.zst nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.zip | |
Merge branch 'master' into staging
There were some larger rebuilds because of security.
Diffstat (limited to 'nixos/modules/services/x11')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index ee4ec0fc819f..8f081a1e9d2a 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -249,6 +249,11 @@ in security.pam.services.kde = { allowNullPassword = true; }; + # use kimpanel as the default IBus panel + i18n.inputMethod.ibus.panel = + lib.mkDefault + "${pkgs.kde5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel"; + }) ]; |