From 3fba5befb1909c9c969a62197d1ddbae5e4286a9 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 22:54:38 +0800
Subject: [PATCH 01/19] cinnamon-desktop: Move from cinnamon scope to top-level

---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix      | 2 +-
 .../default.nix => by-name/ci/cinnamon-desktop/package.nix}   | 0
 pkgs/by-name/xv/xviewer/package.nix                           | 4 ++--
 pkgs/desktops/cinnamon/default.nix                            | 2 +-
 .../development/libraries/xdg-desktop-portal-xapp/default.nix | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/{desktops/cinnamon/cinnamon-desktop/default.nix => by-name/ci/cinnamon-desktop/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index 58fed28dae18..d5d801c7461d 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -140,7 +140,7 @@ in
         # common-files
         cinnamon.cinnamon-common
         cinnamon.cinnamon-session
-        cinnamon.cinnamon-desktop
+        cinnamon-desktop
         cinnamon.cinnamon-menus
         cinnamon.cinnamon-translations
 
diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/by-name/ci/cinnamon-desktop/package.nix
similarity index 100%
rename from pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
rename to pkgs/by-name/ci/cinnamon-desktop/package.nix
diff --git a/pkgs/by-name/xv/xviewer/package.nix b/pkgs/by-name/xv/xviewer/package.nix
index 5dd4fd007ee8..365988ede268 100644
--- a/pkgs/by-name/xv/xviewer/package.nix
+++ b/pkgs/by-name/xv/xviewer/package.nix
@@ -20,7 +20,7 @@
 , pkg-config
 , python3
 , wrapGAppsHook3
-, cinnamon
+, cinnamon-desktop
 , yelp-tools
 , xapp
 }:
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    cinnamon.cinnamon-desktop
+    cinnamon-desktop
     exempi
     gdk-pixbuf
     glib
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 3c1b27f911d6..cd08384a5dec 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -3,7 +3,6 @@
 lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-common = callPackage ./cinnamon-common { };
   cinnamon-control-center = callPackage ./cinnamon-control-center { };
-  cinnamon-desktop = callPackage ./cinnamon-desktop { };
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
   cinnamon-menus = callPackage ./cinnamon-menus { };
   cinnamon-translations = callPackage ./cinnamon-translations { };
@@ -20,6 +19,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 }) // lib.optionalAttrs config.allowAliases {
   # Aliases need to be outside the scope or they will shadow the attributes from parent scope.
   bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14
+  cinnamon-desktop = lib.warn "cinnamon.cinnamon-desktop was moved to top-level. Please use pkgs.cinnamon-desktop directly." pkgs.cinnamon-desktop; # Added on 2024-07-22
   iso-flags-png-320x420 = lib.warn "cinnamon.iso-flags-png-320x420 was moved to top-level and renamed to pkgs.iso-flags-png-320x240." pkgs.iso-flags-png-320x240; # Added on 2024-07-14
   iso-flags-svg = throw "cinnamon.iso-flags-svg was removed because this is not used in Cinnamon. You can directly obtain the images from \"\${pkgs.iso-flags.src}/svg\"."; # Added on 2024-07-14
   folder-color-switcher = lib.warn "cinnamon.folder-color-switcher was moved to top-level. Please use pkgs.folder-color-switcher directly." pkgs.folder-color-switcher; # Added on 2024-07-14
diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix
index d8659de53782..a6b1dc02beb2 100644
--- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix
@@ -5,7 +5,7 @@
 , ninja
 , pkg-config
 , wrapGAppsHook3
-, cinnamon
+, cinnamon-desktop
 , glib
 , gsettings-desktop-schemas
 , gtk3
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    cinnamon.cinnamon-desktop # org.cinnamon.desktop.background
+    cinnamon-desktop # org.cinnamon.desktop.background
     glib
     gsettings-desktop-schemas # org.gnome.system.location
     gtk3

From 6f102799e71220ed7ca40c4d8c8768439c59f4e8 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 22:57:17 +0800
Subject: [PATCH 02/19] cinnamon-menus: Move from cinnamon scope to top-level

---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix        | 2 +-
 .../default.nix => by-name/ci/cinnamon-menus/package.nix}       | 0
 pkgs/desktops/cinnamon/default.nix                              | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{desktops/cinnamon/cinnamon-menus/default.nix => by-name/ci/cinnamon-menus/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index d5d801c7461d..0e2b25a0132d 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -141,7 +141,7 @@ in
         cinnamon.cinnamon-common
         cinnamon.cinnamon-session
         cinnamon-desktop
-        cinnamon.cinnamon-menus
+        cinnamon-menus
         cinnamon.cinnamon-translations
 
         # utils needed by some scripts
diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/by-name/ci/cinnamon-menus/package.nix
similarity index 100%
rename from pkgs/desktops/cinnamon/cinnamon-menus/default.nix
rename to pkgs/by-name/ci/cinnamon-menus/package.nix
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index cd08384a5dec..65754dfcb6fb 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -4,7 +4,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-common = callPackage ./cinnamon-common { };
   cinnamon-control-center = callPackage ./cinnamon-control-center { };
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
-  cinnamon-menus = callPackage ./cinnamon-menus { };
   cinnamon-translations = callPackage ./cinnamon-translations { };
   cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
   cinnamon-session = callPackage ./cinnamon-session { };
@@ -20,6 +19,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   # Aliases need to be outside the scope or they will shadow the attributes from parent scope.
   bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14
   cinnamon-desktop = lib.warn "cinnamon.cinnamon-desktop was moved to top-level. Please use pkgs.cinnamon-desktop directly." pkgs.cinnamon-desktop; # Added on 2024-07-22
+  cinnamon-menus = lib.warn "cinnamon.cinnamon-menus was moved to top-level. Please use pkgs.cinnamon-menus directly." pkgs.cinnamon-menus; # Added on 2024-07-22
   iso-flags-png-320x420 = lib.warn "cinnamon.iso-flags-png-320x420 was moved to top-level and renamed to pkgs.iso-flags-png-320x240." pkgs.iso-flags-png-320x240; # Added on 2024-07-14
   iso-flags-svg = throw "cinnamon.iso-flags-svg was removed because this is not used in Cinnamon. You can directly obtain the images from \"\${pkgs.iso-flags.src}/svg\"."; # Added on 2024-07-14
   folder-color-switcher = lib.warn "cinnamon.folder-color-switcher was moved to top-level. Please use pkgs.folder-color-switcher directly." pkgs.folder-color-switcher; # Added on 2024-07-14

From e8fd435f36db62891d6b219c6a3bbddd10f0fd99 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 23:00:01 +0800
Subject: [PATCH 03/19] cinnamon-translations: Move from cinnamon scope to
 top-level

---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix        | 2 +-
 .../ci/cinnamon-translations/package.nix}                       | 0
 pkgs/desktops/cinnamon/default.nix                              | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{desktops/cinnamon/cinnamon-translations/default.nix => by-name/ci/cinnamon-translations/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index 0e2b25a0132d..cc687648fded 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -142,7 +142,7 @@ in
         cinnamon.cinnamon-session
         cinnamon-desktop
         cinnamon-menus
-        cinnamon.cinnamon-translations
+        cinnamon-translations
 
         # utils needed by some scripts
         killall
diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/by-name/ci/cinnamon-translations/package.nix
similarity index 100%
rename from pkgs/desktops/cinnamon/cinnamon-translations/default.nix
rename to pkgs/by-name/ci/cinnamon-translations/package.nix
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 65754dfcb6fb..ce336e48aeff 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -4,7 +4,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-common = callPackage ./cinnamon-common { };
   cinnamon-control-center = callPackage ./cinnamon-control-center { };
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
-  cinnamon-translations = callPackage ./cinnamon-translations { };
   cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
   cinnamon-session = callPackage ./cinnamon-session { };
   cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { };
@@ -20,6 +19,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14
   cinnamon-desktop = lib.warn "cinnamon.cinnamon-desktop was moved to top-level. Please use pkgs.cinnamon-desktop directly." pkgs.cinnamon-desktop; # Added on 2024-07-22
   cinnamon-menus = lib.warn "cinnamon.cinnamon-menus was moved to top-level. Please use pkgs.cinnamon-menus directly." pkgs.cinnamon-menus; # Added on 2024-07-22
+  cinnamon-translations = lib.warn "cinnamon.cinnamon-translations was moved to top-level. Please use pkgs.cinnamon-translations directly." pkgs.cinnamon-translations; # Added on 2024-07-22
   iso-flags-png-320x420 = lib.warn "cinnamon.iso-flags-png-320x420 was moved to top-level and renamed to pkgs.iso-flags-png-320x240." pkgs.iso-flags-png-320x240; # Added on 2024-07-14
   iso-flags-svg = throw "cinnamon.iso-flags-svg was removed because this is not used in Cinnamon. You can directly obtain the images from \"\${pkgs.iso-flags.src}/svg\"."; # Added on 2024-07-14
   folder-color-switcher = lib.warn "cinnamon.folder-color-switcher was moved to top-level. Please use pkgs.folder-color-switcher directly." pkgs.folder-color-switcher; # Added on 2024-07-14

From 9c24fb82f9c8e3b69f6692a296a6ab8b798852e3 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 23:05:41 +0800
Subject: [PATCH 04/19] cjs: Move from cinnamon scope to top-level

---
 .../cinnamon/cjs/default.nix => by-name/cj/cjs/package.nix}     | 0
 pkgs/desktops/cinnamon/default.nix                              | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{desktops/cinnamon/cjs/default.nix => by-name/cj/cjs/package.nix} (100%)

diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/by-name/cj/cjs/package.nix
similarity index 100%
rename from pkgs/desktops/cinnamon/cjs/default.nix
rename to pkgs/by-name/cj/cjs/package.nix
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index ce336e48aeff..6d652c11a421 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -7,7 +7,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
   cinnamon-session = callPackage ./cinnamon-session { };
   cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { };
-  cjs = callPackage ./cjs { };
   nemo = callPackage ./nemo { };
   nemo-emblems = callPackage ./nemo-extensions/nemo-emblems { };
   nemo-fileroller = callPackage ./nemo-extensions/nemo-fileroller { };
@@ -20,6 +19,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-desktop = lib.warn "cinnamon.cinnamon-desktop was moved to top-level. Please use pkgs.cinnamon-desktop directly." pkgs.cinnamon-desktop; # Added on 2024-07-22
   cinnamon-menus = lib.warn "cinnamon.cinnamon-menus was moved to top-level. Please use pkgs.cinnamon-menus directly." pkgs.cinnamon-menus; # Added on 2024-07-22
   cinnamon-translations = lib.warn "cinnamon.cinnamon-translations was moved to top-level. Please use pkgs.cinnamon-translations directly." pkgs.cinnamon-translations; # Added on 2024-07-22
+  cjs = lib.warn "cinnamon.cjs was moved to top-level. Please use pkgs.cjs directly." pkgs.cjs; # Added on 2024-07-22
   iso-flags-png-320x420 = lib.warn "cinnamon.iso-flags-png-320x420 was moved to top-level and renamed to pkgs.iso-flags-png-320x240." pkgs.iso-flags-png-320x240; # Added on 2024-07-14
   iso-flags-svg = throw "cinnamon.iso-flags-svg was removed because this is not used in Cinnamon. You can directly obtain the images from \"\${pkgs.iso-flags.src}/svg\"."; # Added on 2024-07-14
   folder-color-switcher = lib.warn "cinnamon.folder-color-switcher was moved to top-level. Please use pkgs.folder-color-switcher directly." pkgs.folder-color-switcher; # Added on 2024-07-14

From e5373c3e6cd9ebd1f34d1fba82005a9dc00b30a7 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 23:08:21 +0800
Subject: [PATCH 05/19] cinnamon-settings-daemon: Move from cinnamon scope to
 top-level

---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix        | 2 +-
 .../ci}/cinnamon-settings-daemon/csd-backlight-helper-fix.patch | 0
 .../ci/cinnamon-settings-daemon/package.nix}                    | 0
 pkgs/desktops/cinnamon/default.nix                              | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{desktops/cinnamon => by-name/ci}/cinnamon-settings-daemon/csd-backlight-helper-fix.patch (100%)
 rename pkgs/{desktops/cinnamon/cinnamon-settings-daemon/default.nix => by-name/ci/cinnamon-settings-daemon/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index cc687648fded..be64c89b1a50 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -159,7 +159,7 @@ in
         cinnamon.nemo-with-extensions
         gnome-online-accounts-gtk
         cinnamon.cinnamon-control-center
-        cinnamon.cinnamon-settings-daemon
+        cinnamon-settings-daemon
         libgnomekbd
 
         # theme
diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch b/pkgs/by-name/ci/cinnamon-settings-daemon/csd-backlight-helper-fix.patch
similarity index 100%
rename from pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch
rename to pkgs/by-name/ci/cinnamon-settings-daemon/csd-backlight-helper-fix.patch
diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
similarity index 100%
rename from pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
rename to pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 6d652c11a421..ffab563f7f5b 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -6,7 +6,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
   cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
   cinnamon-session = callPackage ./cinnamon-session { };
-  cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { };
   nemo = callPackage ./nemo { };
   nemo-emblems = callPackage ./nemo-extensions/nemo-emblems { };
   nemo-fileroller = callPackage ./nemo-extensions/nemo-fileroller { };
@@ -18,6 +17,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14
   cinnamon-desktop = lib.warn "cinnamon.cinnamon-desktop was moved to top-level. Please use pkgs.cinnamon-desktop directly." pkgs.cinnamon-desktop; # Added on 2024-07-22
   cinnamon-menus = lib.warn "cinnamon.cinnamon-menus was moved to top-level. Please use pkgs.cinnamon-menus directly." pkgs.cinnamon-menus; # Added on 2024-07-22
+  cinnamon-settings-daemon = lib.warn "cinnamon.cinnamon-settings-daemon was moved to top-level. Please use pkgs.cinnamon-settings-daemon directly." pkgs.cinnamon-settings-daemon; # Added on 2024-07-22
   cinnamon-translations = lib.warn "cinnamon.cinnamon-translations was moved to top-level. Please use pkgs.cinnamon-translations directly." pkgs.cinnamon-translations; # Added on 2024-07-22
   cjs = lib.warn "cinnamon.cjs was moved to top-level. Please use pkgs.cjs directly." pkgs.cjs; # Added on 2024-07-22
   iso-flags-png-320x420 = lib.warn "cinnamon.iso-flags-png-320x420 was moved to top-level and renamed to pkgs.iso-flags-png-320x240." pkgs.iso-flags-png-320x240; # Added on 2024-07-14

From 925db507a80ee4a5a791511a4ca5ffdfacc6a566 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 23:10:30 +0800
Subject: [PATCH 06/19] nemo: Move from cinnamon scope to top-level

---
 nixos/modules/services/x11/desktop-managers/budgie.nix          | 2 +-
 .../cinnamon => by-name/ne}/nemo/load-extensions-from-env.patch | 0
 .../cinnamon/nemo/default.nix => by-name/ne/nemo/package.nix}   | 0
 pkgs/desktops/cinnamon/default.nix                              | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{desktops/cinnamon => by-name/ne}/nemo/load-extensions-from-env.patch (100%)
 rename pkgs/{desktops/cinnamon/nemo/default.nix => by-name/ne/nemo/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix
index e94a9e015935..987f114ec5e1 100644
--- a/nixos/modules/services/x11/desktop-managers/budgie.nix
+++ b/nixos/modules/services/x11/desktop-managers/budgie.nix
@@ -142,7 +142,7 @@ in {
       ]
       ++ lib.optional config.networking.networkmanager.enable pkgs.networkmanagerapplet
       ++ (utils.removePackagesByName [
-          cinnamon.nemo
+          nemo
           mate.eom
           mate.pluma
           mate.atril
diff --git a/pkgs/desktops/cinnamon/nemo/load-extensions-from-env.patch b/pkgs/by-name/ne/nemo/load-extensions-from-env.patch
similarity index 100%
rename from pkgs/desktops/cinnamon/nemo/load-extensions-from-env.patch
rename to pkgs/by-name/ne/nemo/load-extensions-from-env.patch
diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/by-name/ne/nemo/package.nix
similarity index 100%
rename from pkgs/desktops/cinnamon/nemo/default.nix
rename to pkgs/by-name/ne/nemo/package.nix
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index ffab563f7f5b..e5233484bcbe 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -6,7 +6,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
   cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
   cinnamon-session = callPackage ./cinnamon-session { };
-  nemo = callPackage ./nemo { };
   nemo-emblems = callPackage ./nemo-extensions/nemo-emblems { };
   nemo-fileroller = callPackage ./nemo-extensions/nemo-fileroller { };
   nemo-python = callPackage ./nemo-extensions/nemo-python { };
@@ -30,6 +29,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   mint-themes = lib.warn "cinnamon.mint-themes was moved to top-level. Please use pkgs.mint-themes directly." pkgs.mint-themes; # Added on 2024-07-14
   mint-x-icons = lib.warn "cinnamon.mint-x-icons was moved to top-level. Please use pkgs.mint-x-icons directly." pkgs.mint-x-icons; # Added on 2024-07-14
   mint-y-icons = lib.warn "cinnamon.mint-y-icons was moved to top-level. Please use pkgs.mint-y-icons directly." pkgs.mint-y-icons; # Added on 2024-07-14
+  nemo = lib.warn "cinnamon.nemo was moved to top-level. Please use pkgs.nemo directly." pkgs.nemo; # Added on 2024-07-22
   nemoExtensions = throw "cinnamon.nemoExtensions is no longer exposed. To modify list of selected nemo extensions please override cinnamon.nemo-with-extensions."; # Added on 2024-07-14
   pix = lib.warn "cinnamon.pix was moved to top-level. Please use pkgs.pix directly." pkgs.pix; # Added on 2024-07-14
   warpinator = lib.warn "cinnamon.warpinator was moved to top-level. Please use pkgs.warpinator directly." pkgs.warpinator; # Added on 2024-07-14

From b869e7bfc833fd7ddca99938e2d752b050219943 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 23:22:06 +0800
Subject: [PATCH 07/19] nemo-emblems: Move from cinnamon scope to top-level

---
 .../default.nix => by-name/ne/nemo-emblems/package.nix}         | 0
 pkgs/desktops/cinnamon/default.nix                              | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix => by-name/ne/nemo-emblems/package.nix} (100%)

diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix b/pkgs/by-name/ne/nemo-emblems/package.nix
similarity index 100%
rename from pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix
rename to pkgs/by-name/ne/nemo-emblems/package.nix
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index e5233484bcbe..6e3e6f6d182a 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -6,7 +6,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
   cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
   cinnamon-session = callPackage ./cinnamon-session { };
-  nemo-emblems = callPackage ./nemo-extensions/nemo-emblems { };
   nemo-fileroller = callPackage ./nemo-extensions/nemo-fileroller { };
   nemo-python = callPackage ./nemo-extensions/nemo-python { };
   nemo-with-extensions = callPackage ./nemo/wrapper.nix { };
@@ -30,6 +29,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   mint-x-icons = lib.warn "cinnamon.mint-x-icons was moved to top-level. Please use pkgs.mint-x-icons directly." pkgs.mint-x-icons; # Added on 2024-07-14
   mint-y-icons = lib.warn "cinnamon.mint-y-icons was moved to top-level. Please use pkgs.mint-y-icons directly." pkgs.mint-y-icons; # Added on 2024-07-14
   nemo = lib.warn "cinnamon.nemo was moved to top-level. Please use pkgs.nemo directly." pkgs.nemo; # Added on 2024-07-22
+  nemo-emblems = lib.warn "cinnamon.nemo-emblems was moved to top-level. Please use pkgs.nemo-emblems directly." pkgs.nemo-emblems; # Added on 2024-07-22
   nemoExtensions = throw "cinnamon.nemoExtensions is no longer exposed. To modify list of selected nemo extensions please override cinnamon.nemo-with-extensions."; # Added on 2024-07-14
   pix = lib.warn "cinnamon.pix was moved to top-level. Please use pkgs.pix directly." pkgs.pix; # Added on 2024-07-14
   warpinator = lib.warn "cinnamon.warpinator was moved to top-level. Please use pkgs.warpinator directly." pkgs.warpinator; # Added on 2024-07-14

From a46538805b2f481c0cd20a764557e01b3580848c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 23:25:06 +0800
Subject: [PATCH 08/19] nemo-fileroller: Move from cinnamon scope to top-level

---
 .../ne/nemo-fileroller/package.nix}                  | 12 ++++++++----
 pkgs/desktops/cinnamon/default.nix                   |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)
 rename pkgs/{desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix => by-name/ne/nemo-fileroller/package.nix} (82%)

diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix b/pkgs/by-name/ne/nemo-fileroller/package.nix
similarity index 82%
rename from pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix
rename to pkgs/by-name/ne/nemo-fileroller/package.nix
index 3f949c1fea5d..2a279c926fe2 100644
--- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix
+++ b/pkgs/by-name/ne/nemo-fileroller/package.nix
@@ -11,12 +11,16 @@
 , cinnamon-translations
 }:
 
-let
-  srcs = import ../srcs.nix { inherit fetchFromGitHub; };
-in
 stdenv.mkDerivation rec {
   pname = "nemo-fileroller";
-  inherit (srcs) version src;
+  version = "6.2.0";
+
+  src = fetchFromGitHub {
+    owner = "linuxmint";
+    repo = "nemo-extensions";
+    rev = version;
+    sha256 = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA=";
+  };
 
   sourceRoot = "${src.name}/nemo-fileroller";
 
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 6e3e6f6d182a..91383d68fb37 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -6,7 +6,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
   cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
   cinnamon-session = callPackage ./cinnamon-session { };
-  nemo-fileroller = callPackage ./nemo-extensions/nemo-fileroller { };
   nemo-python = callPackage ./nemo-extensions/nemo-python { };
   nemo-with-extensions = callPackage ./nemo/wrapper.nix { };
   muffin = callPackage ./muffin { };
@@ -30,6 +29,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   mint-y-icons = lib.warn "cinnamon.mint-y-icons was moved to top-level. Please use pkgs.mint-y-icons directly." pkgs.mint-y-icons; # Added on 2024-07-14
   nemo = lib.warn "cinnamon.nemo was moved to top-level. Please use pkgs.nemo directly." pkgs.nemo; # Added on 2024-07-22
   nemo-emblems = lib.warn "cinnamon.nemo-emblems was moved to top-level. Please use pkgs.nemo-emblems directly." pkgs.nemo-emblems; # Added on 2024-07-22
+  nemo-fileroller = lib.warn "cinnamon.nemo-fileroller was moved to top-level. Please use pkgs.nemo-fileroller directly." pkgs.nemo-fileroller; # Added on 2024-07-22
   nemoExtensions = throw "cinnamon.nemoExtensions is no longer exposed. To modify list of selected nemo extensions please override cinnamon.nemo-with-extensions."; # Added on 2024-07-14
   pix = lib.warn "cinnamon.pix was moved to top-level. Please use pkgs.pix directly." pkgs.pix; # Added on 2024-07-14
   warpinator = lib.warn "cinnamon.warpinator was moved to top-level. Please use pkgs.warpinator directly." pkgs.warpinator; # Added on 2024-07-14

From 0dbc48ae702514ff46ceccca496173e546db500e Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 23:28:22 +0800
Subject: [PATCH 09/19] nemo-python: Move from cinnamon scope to top-level

---
 .../nemo-python/load-extensions-from-env.patch    |  0
 .../ne/nemo-python/package.nix}                   | 12 ++++++++----
 .../ne}/nemo-python/python-path.patch             |  0
 pkgs/desktops/cinnamon/default.nix                |  2 +-
 pkgs/desktops/cinnamon/nemo-extensions/srcs.nix   | 15 ---------------
 5 files changed, 9 insertions(+), 20 deletions(-)
 rename pkgs/{desktops/cinnamon/nemo-extensions => by-name/ne}/nemo-python/load-extensions-from-env.patch (100%)
 rename pkgs/{desktops/cinnamon/nemo-extensions/nemo-python/default.nix => by-name/ne/nemo-python/package.nix} (86%)
 rename pkgs/{desktops/cinnamon/nemo-extensions => by-name/ne}/nemo-python/python-path.patch (100%)
 delete mode 100644 pkgs/desktops/cinnamon/nemo-extensions/srcs.nix

diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/load-extensions-from-env.patch b/pkgs/by-name/ne/nemo-python/load-extensions-from-env.patch
similarity index 100%
rename from pkgs/desktops/cinnamon/nemo-extensions/nemo-python/load-extensions-from-env.patch
rename to pkgs/by-name/ne/nemo-python/load-extensions-from-env.patch
diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix b/pkgs/by-name/ne/nemo-python/package.nix
similarity index 86%
rename from pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix
rename to pkgs/by-name/ne/nemo-python/package.nix
index f2a872b71e96..867000c8d71d 100644
--- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix
+++ b/pkgs/by-name/ne/nemo-python/package.nix
@@ -10,12 +10,16 @@
 , python3
 }:
 
-let
-  srcs = import ../srcs.nix { inherit fetchFromGitHub; };
-in
 stdenv.mkDerivation rec {
   pname = "nemo-python";
-  inherit (srcs) version src;
+  version = "6.2.0";
+
+  src = fetchFromGitHub {
+    owner = "linuxmint";
+    repo = "nemo-extensions";
+    rev = version;
+    sha256 = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA=";
+  };
 
   sourceRoot = "${src.name}/nemo-python";
 
diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch b/pkgs/by-name/ne/nemo-python/python-path.patch
similarity index 100%
rename from pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch
rename to pkgs/by-name/ne/nemo-python/python-path.patch
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 91383d68fb37..72ebc54624f5 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -6,7 +6,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
   cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
   cinnamon-session = callPackage ./cinnamon-session { };
-  nemo-python = callPackage ./nemo-extensions/nemo-python { };
   nemo-with-extensions = callPackage ./nemo/wrapper.nix { };
   muffin = callPackage ./muffin { };
 }) // lib.optionalAttrs config.allowAliases {
@@ -30,6 +29,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   nemo = lib.warn "cinnamon.nemo was moved to top-level. Please use pkgs.nemo directly." pkgs.nemo; # Added on 2024-07-22
   nemo-emblems = lib.warn "cinnamon.nemo-emblems was moved to top-level. Please use pkgs.nemo-emblems directly." pkgs.nemo-emblems; # Added on 2024-07-22
   nemo-fileroller = lib.warn "cinnamon.nemo-fileroller was moved to top-level. Please use pkgs.nemo-fileroller directly." pkgs.nemo-fileroller; # Added on 2024-07-22
+  nemo-python = lib.warn "cinnamon.nemo-python was moved to top-level. Please use pkgs.nemo-python directly." pkgs.nemo-python; # Added on 2024-07-22
   nemoExtensions = throw "cinnamon.nemoExtensions is no longer exposed. To modify list of selected nemo extensions please override cinnamon.nemo-with-extensions."; # Added on 2024-07-14
   pix = lib.warn "cinnamon.pix was moved to top-level. Please use pkgs.pix directly." pkgs.pix; # Added on 2024-07-14
   warpinator = lib.warn "cinnamon.warpinator was moved to top-level. Please use pkgs.warpinator directly." pkgs.warpinator; # Added on 2024-07-14
diff --git a/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix b/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix
deleted file mode 100644
index 3629b84b4a59..000000000000
--- a/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ fetchFromGitHub }:
-
-rec {
-  # When you bump this, you should make sure all nemo-extensions
-  # are actually using this file since we try to deal with tags
-  # like nemo-fileroller-5.6.1 according to upstream's wishes.
-  version = "6.2.0";
-
-  src = fetchFromGitHub {
-    owner = "linuxmint";
-    repo = "nemo-extensions";
-    rev = version;
-    sha256 = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA=";
-  };
-}

From f3d0454e4acbcda623a6262d17a6d61f67dc66ad Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 23:35:24 +0800
Subject: [PATCH 10/19] nemo-with-extensions: Move from cinnamon scope to
 top-level

---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix      | 4 ++--
 .../ne/nemo-with-extensions/package.nix}                      | 2 +-
 pkgs/desktops/cinnamon/default.nix                            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/{desktops/cinnamon/nemo/wrapper.nix => by-name/ne/nemo-with-extensions/package.nix} (94%)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index be64c89b1a50..00533b840bf4 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -104,7 +104,7 @@ in
       services.dbus.packages = with pkgs; [
         cinnamon.cinnamon-common
         cinnamon.cinnamon-screensaver
-        cinnamon.nemo-with-extensions
+        nemo-with-extensions
         xapp
       ];
       services.cinnamon.apps.enable = mkDefault true;
@@ -156,7 +156,7 @@ in
         polkit_gnome
 
         # packages
-        cinnamon.nemo-with-extensions
+        nemo-with-extensions
         gnome-online-accounts-gtk
         cinnamon.cinnamon-control-center
         cinnamon-settings-daemon
diff --git a/pkgs/desktops/cinnamon/nemo/wrapper.nix b/pkgs/by-name/ne/nemo-with-extensions/package.nix
similarity index 94%
rename from pkgs/desktops/cinnamon/nemo/wrapper.nix
rename to pkgs/by-name/ne/nemo-with-extensions/package.nix
index 2f7216251d20..2c97367695ee 100644
--- a/pkgs/desktops/cinnamon/nemo/wrapper.nix
+++ b/pkgs/by-name/ne/nemo-with-extensions/package.nix
@@ -51,5 +51,5 @@ symlinkJoin {
     done
   '';
 
-  inherit (nemo) meta;
+  meta = builtins.removeAttrs nemo.meta [ "name" "outputsToInstall" "position" ];
 }
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 72ebc54624f5..69193426f29b 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -6,7 +6,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
   cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
   cinnamon-session = callPackage ./cinnamon-session { };
-  nemo-with-extensions = callPackage ./nemo/wrapper.nix { };
   muffin = callPackage ./muffin { };
 }) // lib.optionalAttrs config.allowAliases {
   # Aliases need to be outside the scope or they will shadow the attributes from parent scope.
@@ -30,7 +29,8 @@ lib.makeScope pkgs.newScope (self: with self; {
   nemo-emblems = lib.warn "cinnamon.nemo-emblems was moved to top-level. Please use pkgs.nemo-emblems directly." pkgs.nemo-emblems; # Added on 2024-07-22
   nemo-fileroller = lib.warn "cinnamon.nemo-fileroller was moved to top-level. Please use pkgs.nemo-fileroller directly." pkgs.nemo-fileroller; # Added on 2024-07-22
   nemo-python = lib.warn "cinnamon.nemo-python was moved to top-level. Please use pkgs.nemo-python directly." pkgs.nemo-python; # Added on 2024-07-22
-  nemoExtensions = throw "cinnamon.nemoExtensions is no longer exposed. To modify list of selected nemo extensions please override cinnamon.nemo-with-extensions."; # Added on 2024-07-14
+  nemo-with-extensions = lib.warn "cinnamon.nemo-with-extensions was moved to top-level. Please use pkgs.nemo-with-extensions directly." pkgs.nemo-with-extensions; # Added on 2024-07-22
+  nemoExtensions = throw "cinnamon.nemoExtensions is no longer exposed. To modify list of selected nemo extensions please override pkgs.nemo-with-extensions."; # Added on 2024-07-14
   pix = lib.warn "cinnamon.pix was moved to top-level. Please use pkgs.pix directly." pkgs.pix; # Added on 2024-07-14
   warpinator = lib.warn "cinnamon.warpinator was moved to top-level. Please use pkgs.warpinator directly." pkgs.warpinator; # Added on 2024-07-14
   xapp = lib.warn "cinnamon.xapp was moved to top-level. Please use pkgs.xapp directly." pkgs.xapp; # Added on 2024-07-14

From 07afe74768d63091d61f6aed524a60558001f4b3 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 23:37:58 +0800
Subject: [PATCH 11/19] muffin: Move from cinnamon scope to top-level

---
 pkgs/{desktops/cinnamon => by-name/mu}/muffin/fix-paths.patch   | 0
 .../muffin/default.nix => by-name/mu/muffin/package.nix}        | 0
 pkgs/desktops/cinnamon/default.nix                              | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{desktops/cinnamon => by-name/mu}/muffin/fix-paths.patch (100%)
 rename pkgs/{desktops/cinnamon/muffin/default.nix => by-name/mu/muffin/package.nix} (100%)

diff --git a/pkgs/desktops/cinnamon/muffin/fix-paths.patch b/pkgs/by-name/mu/muffin/fix-paths.patch
similarity index 100%
rename from pkgs/desktops/cinnamon/muffin/fix-paths.patch
rename to pkgs/by-name/mu/muffin/fix-paths.patch
diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/by-name/mu/muffin/package.nix
similarity index 100%
rename from pkgs/desktops/cinnamon/muffin/default.nix
rename to pkgs/by-name/mu/muffin/package.nix
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 69193426f29b..13eae69e640a 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -6,7 +6,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
   cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
   cinnamon-session = callPackage ./cinnamon-session { };
-  muffin = callPackage ./muffin { };
 }) // lib.optionalAttrs config.allowAliases {
   # Aliases need to be outside the scope or they will shadow the attributes from parent scope.
   bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14
@@ -25,6 +24,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   mint-themes = lib.warn "cinnamon.mint-themes was moved to top-level. Please use pkgs.mint-themes directly." pkgs.mint-themes; # Added on 2024-07-14
   mint-x-icons = lib.warn "cinnamon.mint-x-icons was moved to top-level. Please use pkgs.mint-x-icons directly." pkgs.mint-x-icons; # Added on 2024-07-14
   mint-y-icons = lib.warn "cinnamon.mint-y-icons was moved to top-level. Please use pkgs.mint-y-icons directly." pkgs.mint-y-icons; # Added on 2024-07-14
+  muffin = lib.warn "cinnamon.muffin was moved to top-level. Please use pkgs.muffin directly." pkgs.muffin; # Added on 2024-07-22
   nemo = lib.warn "cinnamon.nemo was moved to top-level. Please use pkgs.nemo directly." pkgs.nemo; # Added on 2024-07-22
   nemo-emblems = lib.warn "cinnamon.nemo-emblems was moved to top-level. Please use pkgs.nemo-emblems directly." pkgs.nemo-emblems; # Added on 2024-07-22
   nemo-fileroller = lib.warn "cinnamon.nemo-fileroller was moved to top-level. Please use pkgs.nemo-fileroller directly." pkgs.nemo-fileroller; # Added on 2024-07-22

From bf4ffb38d0df614779617b8469d004867b51402c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 23:41:29 +0800
Subject: [PATCH 12/19] cinnamon-session: Move from cinnamon scope to top-level

---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix        | 2 +-
 .../0001-Use-dbus_glib-instead-of-elogind.patch                 | 0
 .../default.nix => by-name/ci/cinnamon-session/package.nix}     | 0
 pkgs/desktops/cinnamon/default.nix                              | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{desktops/cinnamon => by-name/ci}/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch (100%)
 rename pkgs/{desktops/cinnamon/cinnamon-session/default.nix => by-name/ci/cinnamon-session/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index 00533b840bf4..cb84ece8f821 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -139,7 +139,7 @@ in
 
         # common-files
         cinnamon.cinnamon-common
-        cinnamon.cinnamon-session
+        cinnamon-session
         cinnamon-desktop
         cinnamon-menus
         cinnamon-translations
diff --git a/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch b/pkgs/by-name/ci/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch
similarity index 100%
rename from pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch
rename to pkgs/by-name/ci/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch
diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/by-name/ci/cinnamon-session/package.nix
similarity index 100%
rename from pkgs/desktops/cinnamon/cinnamon-session/default.nix
rename to pkgs/by-name/ci/cinnamon-session/package.nix
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 13eae69e640a..325e12fd59fb 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -5,12 +5,12 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-control-center = callPackage ./cinnamon-control-center { };
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
   cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
-  cinnamon-session = callPackage ./cinnamon-session { };
 }) // lib.optionalAttrs config.allowAliases {
   # Aliases need to be outside the scope or they will shadow the attributes from parent scope.
   bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14
   cinnamon-desktop = lib.warn "cinnamon.cinnamon-desktop was moved to top-level. Please use pkgs.cinnamon-desktop directly." pkgs.cinnamon-desktop; # Added on 2024-07-22
   cinnamon-menus = lib.warn "cinnamon.cinnamon-menus was moved to top-level. Please use pkgs.cinnamon-menus directly." pkgs.cinnamon-menus; # Added on 2024-07-22
+  cinnamon-session = lib.warn "cinnamon.cinnamon-session was moved to top-level. Please use pkgs.cinnamon-session directly." pkgs.cinnamon-session; # Added on 2024-07-22
   cinnamon-settings-daemon = lib.warn "cinnamon.cinnamon-settings-daemon was moved to top-level. Please use pkgs.cinnamon-settings-daemon directly." pkgs.cinnamon-settings-daemon; # Added on 2024-07-22
   cinnamon-translations = lib.warn "cinnamon.cinnamon-translations was moved to top-level. Please use pkgs.cinnamon-translations directly." pkgs.cinnamon-translations; # Added on 2024-07-22
   cjs = lib.warn "cinnamon.cjs was moved to top-level. Please use pkgs.cjs directly." pkgs.cjs; # Added on 2024-07-22

From 6fd4a53e3e7644d1d10b9838db84ca6941c1de66 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 23:45:08 +0800
Subject: [PATCH 13/19] cinnamon-control-center: Move from cinnamon scope to
 top-level

---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix        | 2 +-
 .../ci/cinnamon-control-center/package.nix}                     | 0
 pkgs/desktops/cinnamon/default.nix                              | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{desktops/cinnamon/cinnamon-control-center/default.nix => by-name/ci/cinnamon-control-center/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index cb84ece8f821..6d36ba6ec1ed 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -158,7 +158,7 @@ in
         # packages
         nemo-with-extensions
         gnome-online-accounts-gtk
-        cinnamon.cinnamon-control-center
+        cinnamon-control-center
         cinnamon-settings-daemon
         libgnomekbd
 
diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/by-name/ci/cinnamon-control-center/package.nix
similarity index 100%
rename from pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
rename to pkgs/by-name/ci/cinnamon-control-center/package.nix
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 325e12fd59fb..ea7810ce907a 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -2,12 +2,12 @@
 
 lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-common = callPackage ./cinnamon-common { };
-  cinnamon-control-center = callPackage ./cinnamon-control-center { };
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
   cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
 }) // lib.optionalAttrs config.allowAliases {
   # Aliases need to be outside the scope or they will shadow the attributes from parent scope.
   bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14
+  cinnamon-control-center = lib.warn "cinnamon.cinnamon-control-center was moved to top-level. Please use pkgs.cinnamon-control-center directly." pkgs.cinnamon-control-center; # Added on 2024-07-22
   cinnamon-desktop = lib.warn "cinnamon.cinnamon-desktop was moved to top-level. Please use pkgs.cinnamon-desktop directly." pkgs.cinnamon-desktop; # Added on 2024-07-22
   cinnamon-menus = lib.warn "cinnamon.cinnamon-menus was moved to top-level. Please use pkgs.cinnamon-menus directly." pkgs.cinnamon-menus; # Added on 2024-07-22
   cinnamon-session = lib.warn "cinnamon.cinnamon-session was moved to top-level. Please use pkgs.cinnamon-session directly." pkgs.cinnamon-session; # Added on 2024-07-22

From d1a7acfc47077e33f768ceed8d14f026d05fdafd Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 23:48:14 +0800
Subject: [PATCH 14/19] cinnamon-common: Move from cinnamon scope to top-level

---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix  | 8 ++++----
 .../cinnamon => by-name/ci}/cinnamon-common/libdir.patch  | 0
 .../ci/cinnamon-common/package.nix}                       | 0
 .../ci}/cinnamon-common/use-sane-install-dir.patch        | 0
 pkgs/data/themes/arc/default.nix                          | 4 ++--
 pkgs/desktops/cinnamon/default.nix                        | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/{desktops/cinnamon => by-name/ci}/cinnamon-common/libdir.patch (100%)
 rename pkgs/{desktops/cinnamon/cinnamon-common/default.nix => by-name/ci/cinnamon-common/package.nix} (100%)
 rename pkgs/{desktops/cinnamon => by-name/ci}/cinnamon-common/use-sane-install-dir.patch (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index 6d36ba6ec1ed..075832a1c716 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -60,7 +60,7 @@ in
 
   config = mkMerge [
     (mkIf cfg.enable {
-      services.displayManager.sessionPackages = [ pkgs.cinnamon.cinnamon-common ];
+      services.displayManager.sessionPackages = [ pkgs.cinnamon-common ];
 
       services.xserver.displayManager.lightdm.greeters.slick = {
         enable = mkDefault true;
@@ -102,7 +102,7 @@ in
       services.accounts-daemon.enable = true;
       services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
       services.dbus.packages = with pkgs; [
-        cinnamon.cinnamon-common
+        cinnamon-common
         cinnamon.cinnamon-screensaver
         nemo-with-extensions
         xapp
@@ -138,7 +138,7 @@ in
         desktop-file-utils
 
         # common-files
-        cinnamon.cinnamon-common
+        cinnamon-common
         cinnamon-session
         cinnamon-desktop
         cinnamon-menus
@@ -200,7 +200,7 @@ in
         })
       ];
 
-      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon.cinnamon-common ];
+      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ];
 
       # Override GSettings schemas
       environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/libdir.patch b/pkgs/by-name/ci/cinnamon-common/libdir.patch
similarity index 100%
rename from pkgs/desktops/cinnamon/cinnamon-common/libdir.patch
rename to pkgs/by-name/ci/cinnamon-common/libdir.patch
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/by-name/ci/cinnamon-common/package.nix
similarity index 100%
rename from pkgs/desktops/cinnamon/cinnamon-common/default.nix
rename to pkgs/by-name/ci/cinnamon-common/package.nix
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/use-sane-install-dir.patch b/pkgs/by-name/ci/cinnamon-common/use-sane-install-dir.patch
similarity index 100%
rename from pkgs/desktops/cinnamon/cinnamon-common/use-sane-install-dir.patch
rename to pkgs/by-name/ci/cinnamon-common/use-sane-install-dir.patch
diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix
index 2a737d677b0e..b3625858ec98 100644
--- a/pkgs/data/themes/arc/default.nix
+++ b/pkgs/data/themes/arc/default.nix
@@ -8,7 +8,7 @@
 , gnome-themes-extra
 , gtk-engine-murrine
 , inkscape
-, cinnamon
+, cinnamon-common
 , makeFontsConf
 , python3
 }:
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     # "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity"
     # "-Dvariants=light,darker,dark,lighter"
-    "-Dcinnamon_version=${cinnamon.cinnamon-common.version}"
+    "-Dcinnamon_version=${cinnamon-common.version}"
     "-Dgnome_shell_version=${gnome.gnome-shell.version}"
     # You will need to patch gdm to make use of this.
     "-Dgnome_shell_gresource=true"
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index ea7810ce907a..48e450fcc629 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -1,12 +1,12 @@
 { config, pkgs, lib }:
 
 lib.makeScope pkgs.newScope (self: with self; {
-  cinnamon-common = callPackage ./cinnamon-common { };
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
   cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
 }) // lib.optionalAttrs config.allowAliases {
   # Aliases need to be outside the scope or they will shadow the attributes from parent scope.
   bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14
+  cinnamon-common = lib.warn "cinnamon.cinnamon-common was moved to top-level. Please use pkgs.cinnamon-common directly." pkgs.cinnamon-common; # Added on 2024-07-22
   cinnamon-control-center = lib.warn "cinnamon.cinnamon-control-center was moved to top-level. Please use pkgs.cinnamon-control-center directly." pkgs.cinnamon-control-center; # Added on 2024-07-22
   cinnamon-desktop = lib.warn "cinnamon.cinnamon-desktop was moved to top-level. Please use pkgs.cinnamon-desktop directly." pkgs.cinnamon-desktop; # Added on 2024-07-22
   cinnamon-menus = lib.warn "cinnamon.cinnamon-menus was moved to top-level. Please use pkgs.cinnamon-menus directly." pkgs.cinnamon-menus; # Added on 2024-07-22

From ab6606dfb87112339e6914d27fff621f07365de2 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 23:51:10 +0800
Subject: [PATCH 15/19] cinnamon-screensaver: Move from cinnamon scope to
 top-level

---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix      | 4 ++--
 .../ci/cinnamon-screensaver/package.nix}                      | 0
 pkgs/desktops/cinnamon/default.nix                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/{desktops/cinnamon/cinnamon-screensaver/default.nix => by-name/ci/cinnamon-screensaver/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index 075832a1c716..67a7d64080d5 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -103,7 +103,7 @@ in
       services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
       services.dbus.packages = with pkgs; [
         cinnamon-common
-        cinnamon.cinnamon-screensaver
+        cinnamon-screensaver
         nemo-with-extensions
         xapp
       ];
@@ -148,7 +148,7 @@ in
         killall
 
         # session requirements
-        cinnamon.cinnamon-screensaver
+        cinnamon-screensaver
         # cinnamon-killer-daemon: provided by cinnamon-common
         networkmanagerapplet # session requirement - also nm-applet not needed
 
diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix
similarity index 100%
rename from pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
rename to pkgs/by-name/ci/cinnamon-screensaver/package.nix
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 48e450fcc629..3a40e31b1387 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -2,7 +2,6 @@
 
 lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
-  cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
 }) // lib.optionalAttrs config.allowAliases {
   # Aliases need to be outside the scope or they will shadow the attributes from parent scope.
   bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14
@@ -10,6 +9,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-control-center = lib.warn "cinnamon.cinnamon-control-center was moved to top-level. Please use pkgs.cinnamon-control-center directly." pkgs.cinnamon-control-center; # Added on 2024-07-22
   cinnamon-desktop = lib.warn "cinnamon.cinnamon-desktop was moved to top-level. Please use pkgs.cinnamon-desktop directly." pkgs.cinnamon-desktop; # Added on 2024-07-22
   cinnamon-menus = lib.warn "cinnamon.cinnamon-menus was moved to top-level. Please use pkgs.cinnamon-menus directly." pkgs.cinnamon-menus; # Added on 2024-07-22
+  cinnamon-screensaver = lib.warn "cinnamon.cinnamon-screensaver was moved to top-level. Please use pkgs.cinnamon-screensaver directly." pkgs.cinnamon-screensaver; # Added on 2024-07-22
   cinnamon-session = lib.warn "cinnamon.cinnamon-session was moved to top-level. Please use pkgs.cinnamon-session directly." pkgs.cinnamon-session; # Added on 2024-07-22
   cinnamon-settings-daemon = lib.warn "cinnamon.cinnamon-settings-daemon was moved to top-level. Please use pkgs.cinnamon-settings-daemon directly." pkgs.cinnamon-settings-daemon; # Added on 2024-07-22
   cinnamon-translations = lib.warn "cinnamon.cinnamon-translations was moved to top-level. Please use pkgs.cinnamon-translations directly." pkgs.cinnamon-translations; # Added on 2024-07-22

From 22b54a6e7fe1c96069c0f73faa78d70be73ca6ef Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 23:56:26 +0800
Subject: [PATCH 16/19] cinnamon-gsettings-overrides: Move from cinnamon scope
 to top-level

---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix     | 2 +-
 .../ci/cinnamon-gsettings-overrides/package.nix}             | 0
 pkgs/desktops/cinnamon/default.nix                           | 5 ++---
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename pkgs/{desktops/cinnamon/cinnamon-gsettings-overrides/default.nix => by-name/ci/cinnamon-gsettings-overrides/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index 67a7d64080d5..b83580e741eb 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -7,7 +7,7 @@ let
   cfg = config.services.xserver.desktopManager.cinnamon;
   serviceCfg = config.services.cinnamon;
 
-  nixos-gsettings-overrides = pkgs.cinnamon.cinnamon-gsettings-overrides.override {
+  nixos-gsettings-overrides = pkgs.cinnamon-gsettings-overrides.override {
     extraGSettingsOverridePackages = cfg.extraGSettingsOverridePackages;
     extraGSettingsOverrides = cfg.extraGSettingsOverrides;
   };
diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix
similarity index 100%
rename from pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix
rename to pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 3a40e31b1387..8209f83d43df 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -1,13 +1,12 @@
 { config, pkgs, lib }:
 
-lib.makeScope pkgs.newScope (self: with self; {
-  cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
-}) // lib.optionalAttrs config.allowAliases {
+lib.makeScope pkgs.newScope (self: { }) // lib.optionalAttrs config.allowAliases {
   # Aliases need to be outside the scope or they will shadow the attributes from parent scope.
   bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14
   cinnamon-common = lib.warn "cinnamon.cinnamon-common was moved to top-level. Please use pkgs.cinnamon-common directly." pkgs.cinnamon-common; # Added on 2024-07-22
   cinnamon-control-center = lib.warn "cinnamon.cinnamon-control-center was moved to top-level. Please use pkgs.cinnamon-control-center directly." pkgs.cinnamon-control-center; # Added on 2024-07-22
   cinnamon-desktop = lib.warn "cinnamon.cinnamon-desktop was moved to top-level. Please use pkgs.cinnamon-desktop directly." pkgs.cinnamon-desktop; # Added on 2024-07-22
+  cinnamon-gsettings-overrides = lib.warn "cinnamon.cinnamon-gsettings-overrides was moved to top-level. Please use pkgs.cinnamon-gsettings-overrides directly." pkgs.cinnamon-gsettings-overrides; # Added on 2024-07-22
   cinnamon-menus = lib.warn "cinnamon.cinnamon-menus was moved to top-level. Please use pkgs.cinnamon-menus directly." pkgs.cinnamon-menus; # Added on 2024-07-22
   cinnamon-screensaver = lib.warn "cinnamon.cinnamon-screensaver was moved to top-level. Please use pkgs.cinnamon-screensaver directly." pkgs.cinnamon-screensaver; # Added on 2024-07-22
   cinnamon-session = lib.warn "cinnamon.cinnamon-session was moved to top-level. Please use pkgs.cinnamon-session directly." pkgs.cinnamon-session; # Added on 2024-07-22

From d2ec434026a831b84d81aaf4e81bed0cc58c4895 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 23:57:25 +0800
Subject: [PATCH 17/19] nixos/cinnamon: Fix excludePackages example

We don't ship blueberry and blueberry is in top-level.
---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index b83580e741eb..70fa4f0f3a5a 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -51,7 +51,7 @@ in
 
     environment.cinnamon.excludePackages = mkOption {
       default = [];
-      example = literalExpression "[ pkgs.cinnamon.blueberry ]";
+      example = literalExpression "[ pkgs.blueman ]";
       type = types.listOf types.package;
       description = "Which packages cinnamon should exclude from the default environment";
     };

From ede20d78de5958b9ad6dfade6949b71d1a035b6b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 23 Jul 2024 00:07:28 +0800
Subject: [PATCH 18/19] .github: Update Cinnamon file paths

---
 .github/CODEOWNERS  | 6 +++++-
 .github/labeler.yml | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5b19f29f2611..fa4603806b2f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -305,7 +305,11 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/build-support/make-hardcode-gsettings-patch @jtojnar
 
 # Cinnamon
-/pkgs/desktops/cinnamon @mkg20001
+/pkgs/by-name/ci/cinnamon-*    @mkg20001
+/pkgs/by-name/cj/cjs           @mkg20001
+/pkgs/by-name/mu/muffin        @mkg20001
+/pkgs/by-name/ne/nemo          @mkg20001
+/pkgs/by-name/ne/nemo-*        @mkg20001
 
 # nim
 /pkgs/development/compilers/nim   @ehmry
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 2e7ad654d79b..9ef1ec30b6e9 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -12,9 +12,14 @@
   - any:
     - changed-files:
       - any-glob-to-any-file:
-        - pkgs/desktops/cinnamon/**/*
         - nixos/modules/services/x11/desktop-managers/cinnamon.nix
         - nixos/tests/cinnamon.nix
+        - nixos/tests/cinnamon-wayland.nix
+        - pkgs/by-name/ci/cinnamon-*/**/*
+        - pkgs/by-name/cj/cjs/**/*
+        - pkgs/by-name/mu/muffin/**/*
+        - pkgs/by-name/ne/nemo/**/*
+        - pkgs/by-name/ne/nemo-*/**/*
 
 "6.topic: dotnet":
   - any:

From be722f046d3ae6606f51e4ceea232588ef3afa4d Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 23 Jul 2024 00:25:58 +0800
Subject: [PATCH 19/19] cinnamon: Document scope deprecation

---
 nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++
 pkgs/desktops/cinnamon/default.nix                | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 1c3865b5f834..e8c7fa26bebc 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -107,6 +107,8 @@
   moved into the top level scope (i.e., `budgie.budgie-desktop` is now
   `budgie-desktop`)
 
+- All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`).
+
 - `services.cgit` now runs as the cgit user by default instead of root.
   This change requires granting access to the repositories to this user or
   setting the appropriate one through `services.cgit.some-instance.user`.
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 8209f83d43df..08bbbe48ceb6 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -1,5 +1,10 @@
 { config, pkgs, lib }:
 
+# The cinnamon scope is deprecated and no package additions should be done here.
+#
+# TODO (after 24.11 branch-off): Remove this scope entirely.
+# TODO (after 25.05 branch-off): Rename pkgs.cinnamon-common to pkgs.cinnamon.
+
 lib.makeScope pkgs.newScope (self: { }) // lib.optionalAttrs config.allowAliases {
   # Aliases need to be outside the scope or they will shadow the attributes from parent scope.
   bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14