diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-22 12:01:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-22 12:01:02 +0000 |
| commit | 3431cedfe38d7fdcf35635e2f5f0ab5a984f3425 (patch) | |
| tree | 1f92bf2fe8b6e9a94c793b339113db0506e29b27 /nixos | |
| parent | 2e05346ba2a1eed0e69310d9e502dda27ce4f590 (diff) | |
| parent | 59cffc64b64165032e14af7bdbfc67e094c38718 (diff) | |
| download | nixlib-3431cedfe38d7fdcf35635e2f5f0ab5a984f3425.tar nixlib-3431cedfe38d7fdcf35635e2f5f0ab5a984f3425.tar.gz nixlib-3431cedfe38d7fdcf35635e2f5f0ab5a984f3425.tar.bz2 nixlib-3431cedfe38d7fdcf35635e2f5f0ab5a984f3425.tar.lz nixlib-3431cedfe38d7fdcf35635e2f5f0ab5a984f3425.tar.xz nixlib-3431cedfe38d7fdcf35635e2f5f0ab5a984f3425.tar.zst nixlib-3431cedfe38d7fdcf35635e2f5f0ab5a984f3425.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 15a510fd8f96..282a34f6b011 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -172,24 +172,19 @@ in (mkIf (cfg.enable || cfg.mobile.enable || cfg.bigscreen.enable) { security.wrappers = { - kscreenlocker_greet = { - setuid = true; + kwin_wayland = { owner = "root"; group = "root"; - source = "${getBin libsForQt5.kscreenlocker}/libexec/kscreenlocker_greet"; + capabilities = "cap_sys_nice+ep"; + source = "${getBin plasma5.kwin}/bin/kwin_wayland"; }; + } // mkIf (!cfg.runUsingSystemd) { start_kdeinit = { setuid = true; owner = "root"; group = "root"; source = "${getBin libsForQt5.kinit}/libexec/kf5/start_kdeinit"; }; - kwin_wayland = { - owner = "root"; - group = "root"; - capabilities = "cap_sys_nice+ep"; - source = "${getBin plasma5.kwin}/bin/kwin_wayland"; - }; }; environment.systemPackages = |