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.

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/uwsm: enable display manager by default #351626

Merged
merged 1 commit into from
Oct 28, 2024

Conversation

Scrumplex
Copy link
Member

@Scrumplex Scrumplex commented Oct 27, 2024

UWSM is not usable if wayland-sessions are not linked. So services.displayManager.enable should be true if UWSM is used.

services.graphical-desktop.enable is implied by services.displayManager.enable.

See nixos/modules/services/misc/graphical-desktop.nix

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Oct 27, 2024
Copy link
Contributor

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this already enabled by default? (UWSM works for me without enabling it on Hyprland)

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Oct 27, 2024
@Scrumplex
Copy link
Member Author

Isn't this already enabled by default? (UWSM works for me without enabling it on Hyprland)

Seems like this is only set to true when actually using a display manager or when enabling xserver. In my case I don't use any actual display manager and login using a TTY instead. uwsm wouldn't find any <compositor>-uwsm.desktop files generated by this module if I didn't enable this option.

@Scrumplex
Copy link
Member Author

I thought I should upstream this as some friends at NixCon faced this exact issue like I did

UWSM is not usable if wayland-sessions are not linked. So
`services.displayManager.enable` should be true if UWSM is used.

`services.graphical-desktop.enable` is implied by
`services.displayManager.enable`.

See nixos/modules/services/misc/graphical-desktop.nix

Signed-off-by: Sefa Eyeoglu <[email protected]>
@Scrumplex Scrumplex force-pushed the nixos/uwsm/display-manager branch from 00e9311 to 7d43e37 Compare October 27, 2024 19:20
Copy link
Contributor

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff LGTM

@JohnRTitor JohnRTitor merged commit c6667b3 into NixOS:master Oct 28, 2024
30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants