Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Plasma5: Use upstream xsession/wayland-session files #56988

Closed
wants to merge 3 commits into from
Closed

Plasma5: Use upstream xsession/wayland-session files #56988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
763b75b
Plasma5: Use upstream xsession/wayland-session files
bkchr Mar 6, 2019
4eb2631
Update plasma5 test
pasqui23 Nov 1, 2019
e162b44
Merge pull request #1 from pasqui23/patch-1
bkchr Nov 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 1 addition & 26 deletions nixos/modules/services/x11/desktop-managers/plasma5.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,32 +37,6 @@ in

config = mkMerge [
(mkIf cfg.enable {
services.xserver.desktopManager.session = singleton {
name = "plasma5";
bgSupport = true;
start = ''
# Load PulseAudio module for routing support.
# See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
${optionalString config.hardware.pulseaudio.enable ''
worldofpeace marked this conversation as resolved.
Show resolved Hide resolved
${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
''}

if [ -f "$HOME/.config/kdeglobals" ]
then
# Remove extraneous font style names.
# See also: https://phabricator.kde.org/D9070
${getBin pkgs.gnused}/bin/sed -i "$HOME/.config/kdeglobals" \
-e '/^fixed=/ s/,Regular$//' \
-e '/^font=/ s/,Regular$//' \
-e '/^menuFont=/ s/,Regular$//' \
-e '/^smallestReadableFont=/ s/,Regular$//' \
-e '/^toolBarFont=/ s/,Regular$//'
fi

exec "${getBin plasma5.plasma-workspace}/bin/startkde"
'';
};

security.wrappers = {
kcheckpass.source = "${lib.getBin plasma5.kscreenlocker}/lib/libexec/kcheckpass";
"start_kdeinit".source = "${lib.getBin pkgs.kinit}/lib/libexec/kf5/start_kdeinit";
Expand Down Expand Up @@ -213,6 +187,7 @@ in
services.xserver.displayManager.sddm = {
theme = mkDefault "breeze";
};
services.xserver.displayManager.extraSessionFilePackages = [ plasma5.plasma-workspace ];

security.pam.services.kde = { allowNullPassword = true; };

Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/plasma5.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import ./make-test.nix ({ pkgs, ...} :
services.xserver.displayManager.sddm.enable = true;
services.xserver.displayManager.sddm.theme = "breeze-ocr-theme";
services.xserver.desktopManager.plasma5.enable = true;
services.xserver.desktopManager.default = "plasma5";
services.xserver.desktopManager.default = "plasma";
services.xserver.displayManager.sddm.autoLogin = {
enable = true;
user = "alice";
Expand Down