-
-
Notifications
You must be signed in to change notification settings - Fork 13.8k
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.
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
nixos/plasma: use upstream xsession/wayland files #100057
Conversation
start = startplasma; | ||
}; | ||
services.xserver.displayManager.sessionPackages = [ (plasma5.plasma-workspace.overrideAttrs(old:{ | ||
passthru.providedSessions=["plasma" "plasmawayland"]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you can just add this to plasma-workspace
, or does libsForQt5.mkDerivation make it so you cant?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will,after making it work on wayland
environment.systemPackages = | ||
with qt5; with libsForQt5; | ||
with plasma5; with kdeApplications; with kdeFrameworks; | ||
environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this looks like something from the rebase. please revert
@@ -274,7 +268,6 @@ in | |||
plasma-browser-integration | |||
plasma-integration | |||
polkit-kde-agent | |||
spectacle |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -298,21 +291,21 @@ in | |||
|
|||
qtvirtualkeyboard | |||
|
|||
pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
] | ||
|
||
# Phonon audio backend | ||
++ lib.optional (cfg.phononBackend == "gstreamer") libsForQt5.phonon-backend-gstreamer | ||
++ lib.optional (cfg.phononBackend == "vlc") libsForQt5.phonon-backend-vlc | ||
|
||
# Optional hardware support features | ||
++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt pkgs.openobex pkgs.obexftp ] | ||
++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt openobex obexftp ] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
++ lib.optional config.networking.networkmanager.enable plasma-nm | ||
++ lib.optional config.hardware.pulseaudio.enable plasma-pa | ||
++ lib.optional config.powerManagement.enable powerdevil | ||
++ lib.optional config.services.colord.enable pkgs.colord-kde | ||
++ lib.optional config.services.colord.enable colord-kde |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ] | ||
++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet; | ||
++ lib.optional config.services.xserver.wacom.enable wacomtablet; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -326,7 +319,7 @@ in | |||
|
|||
fonts.fonts = with pkgs; [ noto-fonts hack-font ]; | |||
fonts.fontconfig.defaultFonts = { | |||
monospace = [ "Hack" "Noto Sans Mono" ]; | |||
monospace = [ "Hack" "Noto Mono" ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -363,7 +356,7 @@ in | |||
|
|||
# Update the start menu for each user that is currently logged in | |||
system.userActivationScripts.plasmaSetup = activationScript; | |||
|
|||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
trailing whitespace
inherit (pkgs) kdeApplications kdeFrameworks plasma5; | ||
libsForQt5 = pkgs.libsForQt514; | ||
qt5 = pkgs.qt514; | ||
inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this being qt514 is intentional. guessing rebase artifact
8a4a311
to
a48695f
Compare
So the wayland session still quit on startup,but now it does not seem to leave any traces,whether in the journal nor in ~/.local/share/sddm/wayland-session.log `. @worldofpeace any ideas why? |
Maybe the description of #44139 will help? |
The wayland entry is present in sddm,but does not work. |
Also need to check for |
@hameerabbasi Checked with the suggested patch,still not working,got in
|
@pasqui23 see #43757 (comment) Specifically, |
@matklad adding said variable to |
For anyone wondering: plasma on wayland is not quite stable on NixOS, screenshots can't be taken because of Kwin even can't find desktop files for anything, because of wrappers?
See #107595 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also waiting for the merge.
This change wasn't converted from markdown to docbook and broke eval on staging-next. This was already visible on the CI changes on this pull request. |
fixed in #141818 |
I believe this regressed the clock widget of plasma on Xorg. Can somebody verify please? I bisected to this particular PR. Will test a revert of it shortly. Edit: Confirmed. Specifically I reverted 763a001 and 4832352 |
@pasqui23 @peterhoeg @oxalica What do you think? |
I am wondering why this is never happening on Debian. I was rocking Debian Unstable for quite a while and never needed to delete the .cache directory.
You are sure that sddm did not switch you to wayland? There the clock is missing for me, not Xorg. |
I fixed the clock widget issue by adding |
That might not be enough to check... the terminal may be using a login shell. I think snooping around /proc/ and the PID of some components of the graphical session may be necessary to validate. |
klauncher does not have Well, that is not working for bash.
|
Should've read release notes... |
So the only issue remaining is the missing clock on wayland with bash for me. That's probably not a regression though. Would be nice to get a fix as then I may even try wayland for my non-critical stuff. Any idea how to fix that. Home managers bash.enable didn't seem to work. |
@mohe2015 |
Can someone clarify: was the intention here to make Wayland the default for users who were not ever specifying a) you've got b) you've got no value for I'm in case (b), saw the release note, looked at some of the remaining issues (incl. the missing clock issue), and didn't see anything in this issue or elsewhere explicitly saying the default was changing to Wayland. So I assumed that if I left Now I've got a missing clock. :-/ Took me a while to circle back to even look at whether I was on X11 or Wayland, but sure enough, I'm on Wayland without intending to be. (In many ways that's a positive -- the switch was almost seamless, and if it hadn't been for the missing clock I probably never would've noticed!) |
wayland because it comes before x11 in when alphabetically sorting. |
@SuperSandro2000 "plasmawayland" comes before "plasma"? |
I am talking about the desktop selection in sddm. |
No, it doesn't. I have only this in my config:
|
Is there a final fix for missing clock on Wayland? I am using 'fish' as my shell, with 'prgrams.fish.enable = true' already in config, and it hasn't made any difference. Running kwriteconfig5 command mentioned above hasn't worked either. The clock widget is there as far as I can tell, it just doesn't render correctly. |
@e3bc54b2
It's introduced again by plasma5 5.23.1 #139657 (comment) |
Motivation for this change
An updated version of #56988
Wayland still does not work and
~/.local/share/sddm/wayland-session.log
is empty after a failed Wayland login,asjournalctl -u display-manager
.I will fix the override after making Wayland work
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)