diff --git a/home-manager/roles/laptop.nix b/home-manager/roles/laptop.nix index 6db90710..c25f25a6 100644 --- a/home-manager/roles/laptop.nix +++ b/home-manager/roles/laptop.nix @@ -68,7 +68,7 @@ in activateMode pkgs.ncurses pkgs.sway - pkgs.gnome3.gnome-session + pkgs.gnome.gnome-session ]; } '' main = do @@ -82,7 +82,7 @@ in ignoreFailure $ gnome_session_quit "--no-prompt" ''; - inherit (pkgs.gnome3) nautilus; + inherit (pkgs.gnome) nautilus; inherit (pkgs.xorg) xbacklight; inherit (pkgs) # web diff --git a/nixos/machines/apollo/configuration.nix b/nixos/machines/apollo/configuration.nix index eb8c361f..093a0a6a 100644 --- a/nixos/machines/apollo/configuration.nix +++ b/nixos/machines/apollo/configuration.nix @@ -127,9 +127,9 @@ in }; gdm.enable = true; }; - desktopManager.gnome3.enable = true; + desktopManager.gnome.enable = true; }; - gnome3 = { + gnome = { evolution-data-server.enable = lib.mkForce false; gnome-keyring.enable = lib.mkForce false; at-spi2-core.enable = lib.mkForce false; diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix index 051c5c9f..ca95e4b2 100644 --- a/overlays/pkgSets.nix +++ b/overlays/pkgSets.nix @@ -39,7 +39,7 @@ self: super: { nheko ; inherit (self.gnomeExtensions) appindicator system-monitor clipboard-indicator emoji-selector sound-output-device-chooser window-is-ready-remover; - inherit (self.gnome3) + inherit (self.gnome) dconf dconf-editor gnome-tweaks gnome-shell-extensions adwaita-icon-theme gnome-session ;