diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-03-21 13:04:37 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-03-21 13:04:37 +0100 |
| commit | 94eb74eaade1f98361187b3c90738e41b184584e (patch) | |
| tree | 694db9fcfca62827cc85dbf6867144e1ae037fa0 /nixos/modules/services/x11 | |
| parent | 3760c8c7fde6e8b15d19b063579d05018fc2d8b3 (diff) | |
| parent | 4263c53f668058e0f1a16ddc3703c2e3c72805fc (diff) | |
| download | nixpkgs-94eb74eaade1f98361187b3c90738e41b184584e.tar nixpkgs-94eb74eaade1f98361187b3c90738e41b184584e.tar.gz nixpkgs-94eb74eaade1f98361187b3c90738e41b184584e.tar.bz2 nixpkgs-94eb74eaade1f98361187b3c90738e41b184584e.tar.lz nixpkgs-94eb74eaade1f98361187b3c90738e41b184584e.tar.xz nixpkgs-94eb74eaade1f98361187b3c90738e41b184584e.tar.zst nixpkgs-94eb74eaade1f98361187b3c90738e41b184584e.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'nixos/modules/services/x11')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/lumina.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix index ed5ad4a2a00..ec5fbb13b32 100644 --- a/nixos/modules/services/x11/desktop-managers/lumina.nix +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -32,8 +32,8 @@ in environment.systemPackages = [ pkgs.fluxbox - pkgs.qt5.kwindowsystem - pkgs.qt5.oxygen-icons5 + pkgs.libsForQt5.kwindowsystem + pkgs.kdeFrameworks.oxygen-icons5 pkgs.lumina pkgs.numlockx pkgs.qt5.qtsvg diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index bc6e728169b..f923d86265f 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -225,11 +225,6 @@ in security.pam.services.sddm.enableKwallet = true; security.pam.services.slim.enableKwallet = true; - # use kimpanel as the default IBus panel - i18n.inputMethod.ibus.panel = - lib.mkDefault - "${plasma5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel"; - }) ]; |