the big gnome attrset shuffling

modules/autopatch/default.nix

@@ -29,17 +29,7 @@
           commandLineArgs = "--enable-features=OverlayScrollbar,OverlayScrollbarFlashAfterAnyScrollUpdate,OverlayScrollbarFlashWhenMouseEnter --auth-server-whitelist=*privatevoid.net";
         };
 
-        gnome = super.gnome.overrideScope (self': super': {
-          inherit (patched) nautilus;
-          gnome-control-center = patched.gnome-control-center;
-          gnome-shell = super'.gnome-shell.overrideAttrs (old: {
-            preFixup = old.preFixup + ''
-              gappsWrapperArgs+=(
-                --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
-              )
-            '';
-          });
-        });
+        inherit (patched) gnome-control-center nautilus;
       }))
   ];
 }

modules/desktop/default.nix

@@ -27,14 +27,16 @@ in {
 
   programs.adb.enable = true;
 
-  environment.gnome.excludePackages = with pkgs.gnome; [
+  environment.gnome.excludePackages = with pkgs; [
     gnome-logs
     gnome-music
-    pkgs.gnome-console
-    pkgs.gnome-photos
-    pkgs.gnome-tour
-    pkgs.orca
-    pkgs.snapshot
+    gnome-console
+    gnome-photos
+    gnome-tour
+    orca
+    snapshot
+    totem
+    yelp
   ];
 
   desktop.hiddenApps = [

modules/desktop/package-sets.nix

@@ -45,8 +45,8 @@
       gnome-firmware-updater
       gnome-podcasts
       dconf-editor
-      gnome.gnome-boxes
-      gnome.gnome-sound-recorder
+      gnome-boxes
+      gnome-sound-recorder
       gnome-tweaks
       nautilus-python
       jellyfin-media-player

packages/patched-derivations.nix

@@ -9,7 +9,7 @@ super: rec {
 
   kubo = patch super.kubo "patches/base/ipfs";
 
-  gnome-control-center = super.gnome.gnome-control-center.overrideAttrs (old: {
+  gnome-control-center = super.gnome-control-center.overrideAttrs (old: {
     postPatch = (old.postPatch or "") + ''
       echo disabling alert sound chooser
       ${super.xmlstarlet}/bin/xmlstarlet edit -L \
@@ -30,7 +30,7 @@ super: rec {
 
   fprintd = super.fprintd.override { inherit libfprint; };
 
-  nautilus = (patch' super.gnome.nautilus).overrideAttrs (attrs: {
+  nautilus = (patch' super.nautilus).overrideAttrs (attrs: {
     preFixup = with super;
       let py = (python3.withPackages (ps: with ps; [ ps.pygobject3 ]));
       in attrs.preFixup + ''