From e61a058395cccef1372eb0065789ce383d4a0d0a Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 2 Jun 2021 00:02:00 +0200
Subject: [PATCH] Rename gnome3 -> gnome

---
 home-manager/roles/laptop.nix           | 4 ++--
 nixos/machines/apollo/configuration.nix | 4 ++--
 overlays/pkgSets.nix                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

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
       ;