nixos/sddm: add support for kwin_wayland #295839
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I think upstream will is looking to make a call on a specific compositor setup. I'll have to ask around. |
|
I think upstream will is looking to make a call on a specific compositor setup. I'll have to ask around.
|
|
tested pr on my desktop setup and its working fine. It also seems that the switch of sddm (kwin) -> plasma (kwin) is faster on my machine that the sddm (weston) -> plasma (kwin), so that it does not feel so of anymore. |
|
sddm (kwin) -> plasma (kwin) is faster on my machine
I haven't done any measurements myself, but I haven't seen any problems either and I have been using kwin with sddm since plasma6 hit unstable.
|
what i mean is, when using the weston setup it took about ~3s and i was dropped to tty inbetween (so saw the logs from startup again), switch now is maybe 1-2s and i just have a short time a black screen until the black / white plasma loading screen appears, and that feels kind of "more correct" |
Shawn8901
approved these changes
Mar 17, 2024
There was a problem hiding this comment.
Can we merge #291913 first to avoid merge conflicts in the older PR and allow us to properly test this wayland only?
| }; | ||
| }; | ||
| in | ||
| "${pkgs.weston}/bin/weston --shell=kiosk -c ${westonIni}"; |
There was a problem hiding this comment.
Suggested change
| "${pkgs.weston}/bin/weston --shell=kiosk -c ${westonIni}"; | |
| "${lib.getExe pkgs.weston}--shell=kiosk -c ${westonIni}"; |
|
Using kwin in SDDM fixes #294260 for me, so I'd say it should be the default when plasma is used. Also it might be a breeze theme issue but at least for me I need to set both services.xserver.displayManager.sddm = {
...
settings = {
Theme = {
# Both of these are nessecary otherwise the cursor isn't shown at all
CursorTheme = "breeze_cursors";
CursorSize = 24;
};
};
}; |
Good catch, I hadn't noticed that. Fixed. |
|
Seems to work fine here. Let's try it. |
I feel really ignored here, no one even cared to answer. |
|
Sorry, missed that :( |
|
Wow, I am really impressed by git. I thought I needed now to recreate half of my PR but it could resolve all things by its own except one hunk. It probably detected the move and then just re-applied my diff on top of it. |
|
Yeah, it can track things across moves, the conflicts should be pretty minimal. |
|
but more importantly: after cherry-picking this into my fork of nixos-unstable I can no longer login and the resolution looks like 640x480. I tested this on nixos-unstable...SuperSandro2000:nixpkgs:nixos-unstable Filtered logs I can still log into the device via another tty and the startup delay from ksmcon doesn't seem to have changed from weston. |
|
Mär 20 10:14:44 magnesium unix_chkpwd[2034]: password check failed for user (sandro) That's a PAM thing 100% |
Whilst agreeing with you on that in overall I can at least report so far that I was running both prs yesterday together on my desktop and did not notice errors that had been super obvious, but was also just very short testing. |
|
@peterhoeg do we need to set the input method from https://invent.kde.org/plasma/plasma-workspace/-/blob/master/sddm-wayland-session/plasma-wayland.conf#L7 ? Also we should link that for documentation purposes. |
13 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
This avoids having to pull in weston. I on purpose didn't change the default from weston to kwin.
Also
with lib;cleanups as well as addressed a number of warnings.Cc: @K900
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.