Skip to content

gnome: fix xserver option renames #1429

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

Merged
danth merged 1 commit into from
Jun 1, 2025
Merged

gnome: fix xserver option renames #1429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions modules/gnome/nixos.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ in
config.stylix.enable
&& config.stylix.targets.gnome.enable
&& (
config.services.xserver.desktopManager.gnome.enable
|| config.services.xserver.displayManager.gdm.enable
config.services.desktopManager.gnome.enable
|| config.services.displayManager.gdm.enable
)
)
{
Expand Down
3 changes: 1 addition & 2 deletions modules/gnome/testbeds/gnome.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
services.xserver = {
enable = true;
services = {
desktopManager.gnome.enable = true;
displayManager.gdm.enable = true;
};
Expand Down
4 changes: 2 additions & 2 deletions modules/qt/nixos.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ in

config =
let
inherit (config.services.xserver.desktopManager) gnome plasma5 lxqt;
inherit (config.services.desktopManager) plasma6;
inherit (config.services.xserver.desktopManager) plasma5 lxqt;
inherit (config.services.desktopManager) gnome plasma6;
in
lib.mkIf (config.stylix.enable && config.stylix.targets.qt.enable) {
stylix.targets.qt.platform =
Expand Down
6 changes: 0 additions & 6 deletions stylix/maintainers.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@
{ fingerprint = "3C97 1C61 0E9E BE35 3259 C1D3 2CA7 0354 EA17 07B9"; }
];
};
repparw = {
email = "ubritos@gmail.com";
name = "Ulises Britos";
github = "repparw";
githubId = 45952970;
};
skoove = {
email = "zie@sturges.com.au";
name = "Zie Sturges";
Expand Down
3 changes: 1 addition & 2 deletions stylix/testbed/modules/application.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ in
};

config = lib.mkIf (config.stylix.testbed.ui != null) {
services.xserver = {
enable = true;
services = {
displayManager.gdm.enable = true;
desktopManager.gnome.enable = true;
};
Expand Down