From cd97587f6619c2f22b7aec0e90bff0290ee330af Mon Sep 17 00:00:00 2001 From: twoneis Date: Fri, 21 Jun 2024 14:43:43 +0200 Subject: [PATCH] gnome as secondary backup for xwayland --- devices/ellaca/options.nix | 2 +- modules/gnome/default.nix | 11 ++--------- modules/home/utils/default.nix | 6 ++++++ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/devices/ellaca/options.nix b/devices/ellaca/options.nix index 4220c5c..697a042 100644 --- a/devices/ellaca/options.nix +++ b/devices/ellaca/options.nix @@ -5,7 +5,7 @@ withBluetooth = true; withNiri = true; - withGnome = false; + withGnome = true; withVM = false; withContainers = true; diff --git a/modules/gnome/default.nix b/modules/gnome/default.nix index 09faf78..3e24df3 100644 --- a/modules/gnome/default.nix +++ b/modules/gnome/default.nix @@ -1,11 +1,4 @@ { pkgs, lib, config, ... }: lib.mkIf (config.withGnome) { - services.xserver.desktopManager.gnome.enable = true; - - services.gnome.core-utilities.enable = false; - environment.gnome.excludePackages = [ pkgs.gnome-tour ]; - - environment.systemPackages = with pkgs; [ - gnomeExtensions.paperwm - gnome.gnome-characters - ]; + services.xserver.displayManager.sessionPackages = [ pkgs.gnome.gnome-session.sessions ]; + environment.systemPackages = [ pkgs.gnome.gnome-shell pkgs.gnome-randr ]; } diff --git a/modules/home/utils/default.nix b/modules/home/utils/default.nix index 7a537b4..06201fd 100644 --- a/modules/home/utils/default.nix +++ b/modules/home/utils/default.nix @@ -89,6 +89,12 @@ start = " niri-session "; + gnome-init = " + gnome-randr modify DP-1 -m 5120x2160@59.940 + "; + start-gnome = " + gnome-shell --wayland + "; }; shellAbbrs = { ga = "git add";