From d3877feacf30bfa739ad8149990c7f3f043d6c20 Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Fri, 5 Jul 2024 09:50:55 -0400
Subject: [PATCH] Gnome: move packages out of Gnome scope per
 https://github.com/NixOS/nixpkgs/pull/319659

---
 modules/ui/desktops/gnome.nix | 20 ++++++++++----------
 modules/ui/flatpak.nix        |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/ui/desktops/gnome.nix b/modules/ui/desktops/gnome.nix
index 958cb61..c6084fe 100644
--- a/modules/ui/desktops/gnome.nix
+++ b/modules/ui/desktops/gnome.nix
@@ -65,26 +65,26 @@ in
           gnomeExtensions.extension-list
           gedit # text editor
         ])
-        ++ (with pkgs.gnome; [
+        ++ (with pkgs; [
           cheese # webcam tool
-          gnome-music
+          gnome.gnome-music
           gnome-calendar
           epiphany # web browser
           geary # email reader
           evince # document viewer
-          gnome-characters
-          gnome-software
+          gnome.gnome-characters
+          gnome.gnome-software
           totem # video player
-          tali # poker game
-          iagno # go game
-          hitori # sudoku game
-          atomix # puzzle game
+          gnome.tali # poker game
+          gnome.iagno # go game
+          gnome.hitori # sudoku game
+          gnome.atomix # puzzle game
         ]);
 
       # Install additional packages
       systemPackages = with pkgs; [
         # Gnome tweak tools
-        gnome.gnome-tweaks
+        gnome-tweaks
         # Gnome extensions
         gnomeExtensions.alphabetical-app-grid
         gnomeExtensions.another-window-session-manager
@@ -93,7 +93,7 @@ in
         gnomeExtensions.forge
         gnomeExtensions.random-wallpaper
         # Themeing
-        gnome.gnome-themes-extra
+        gnome-themes-extra
         papirus-icon-theme
         qogir-icon-theme
       ];
diff --git a/modules/ui/flatpak.nix b/modules/ui/flatpak.nix
index 9a08e0e..cc346b8 100644
--- a/modules/ui/flatpak.nix
+++ b/modules/ui/flatpak.nix
@@ -71,7 +71,7 @@ with lib;
         aggregatedIcons = pkgs.buildEnv {
           name = "system-icons";
           paths = with pkgs; [
-            (lib.mkIf config.aux.system.ui.desktops.gnome.enable gnome.gnome-themes-extra)
+            (lib.mkIf config.aux.system.ui.desktops.gnome.enable gnome-themes-extra)
             (lib.mkIf config.aux.system.ui.desktops.kde.enable kdePackages.breeze-icons)
             papirus-icon-theme
             qogir-icon-theme