From 9aa1dd219ea2cab9ec08f64050a90b70d50f507a Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 11:46:52 -0800
Subject: [PATCH 01/52] mate.atril: move to top-level

---
 .../atril/default.nix => by-name/at/atril/package.nix} |  0
 pkgs/desktops/mate/default.nix                         | 10 ++++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 rename pkgs/{desktops/mate/atril/default.nix => by-name/at/atril/package.nix} (100%)

diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/by-name/at/atril/package.nix
similarity index 100%
rename from pkgs/desktops/mate/atril/default.nix
rename to pkgs/by-name/at/atril/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 1ba36fe6051d..f6e52fb4da8d 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -1,4 +1,8 @@
-{ pkgs, lib }:
+{
+  pkgs,
+  lib,
+  config,
+}:
 
 let
   packages =
@@ -17,7 +21,6 @@ let
           url = if url == null then "https://git.mate-desktop.org/${pname}" else url;
         };
 
-      atril = callPackage ./atril { };
       caja = callPackage ./caja { };
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
@@ -122,3 +125,6 @@ let
 
 in
 lib.makeScope pkgs.newScope packages
+// lib.optionalAttrs config.allowAliases {
+  atril = lib.warnOnInstantiate "‘mate.atril’ was moved to top-level. Please use ‘pkgs.atril’ directly" pkgs.atril; # Added on 2026-02-08
+}

From 63067859cc67df31a65b584c9a0f4d07298fc0da Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 11:51:31 -0800
Subject: [PATCH 02/52] mate.engrampa: move to top-level

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

diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/by-name/en/engrampa/package.nix
similarity index 100%
rename from pkgs/desktops/mate/engrampa/default.nix
rename to pkgs/by-name/en/engrampa/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index f6e52fb4da8d..09fb152caf33 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      engrampa = callPackage ./engrampa { };
       eom = callPackage ./eom { };
       libmatekbd = callPackage ./libmatekbd { };
       libmatemixer = callPackage ./libmatemixer { };
@@ -127,4 +126,5 @@ in
 lib.makeScope pkgs.newScope packages
 // lib.optionalAttrs config.allowAliases {
   atril = lib.warnOnInstantiate "‘mate.atril’ was moved to top-level. Please use ‘pkgs.atril’ directly" pkgs.atril; # Added on 2026-02-08
+  engrampa = lib.warnOnInstantiate "‘mate.engrampa’ was moved to top-level. Please use ‘pkgs.engrampa’ directly" pkgs.engrampa; # Added on 2026-02-08
 }

From d48f98370743a960a7eaeca54d50330289d2b01f Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 11:52:18 -0800
Subject: [PATCH 03/52] mate.eom: move to top-level

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

diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/by-name/eo/eom/package.nix
similarity index 100%
rename from pkgs/desktops/mate/eom/default.nix
rename to pkgs/by-name/eo/eom/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 09fb152caf33..7fe6d0ae443b 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      eom = callPackage ./eom { };
       libmatekbd = callPackage ./libmatekbd { };
       libmatemixer = callPackage ./libmatemixer { };
       libmateweather = callPackage ./libmateweather { };
@@ -127,4 +126,5 @@ lib.makeScope pkgs.newScope packages
 // lib.optionalAttrs config.allowAliases {
   atril = lib.warnOnInstantiate "‘mate.atril’ was moved to top-level. Please use ‘pkgs.atril’ directly" pkgs.atril; # Added on 2026-02-08
   engrampa = lib.warnOnInstantiate "‘mate.engrampa’ was moved to top-level. Please use ‘pkgs.engrampa’ directly" pkgs.engrampa; # Added on 2026-02-08
+  eom = lib.warnOnInstantiate "‘mate.eom’ was moved to top-level. Please use ‘pkgs.eom’ directly" pkgs.eom; # Added on 2026-02-08
 }

From da6c2a4b700c0d6a495294ef70bcc6f84aad089e Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 11:53:54 -0800
Subject: [PATCH 04/52] mate.libmatekbd: move to top-level

---
 .../default.nix => by-name/li/libmatekbd/package.nix}          | 0
 pkgs/desktops/mate/default.nix                                 | 3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename pkgs/{desktops/mate/libmatekbd/default.nix => by-name/li/libmatekbd/package.nix} (100%)

diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/by-name/li/libmatekbd/package.nix
similarity index 100%
rename from pkgs/desktops/mate/libmatekbd/default.nix
rename to pkgs/by-name/li/libmatekbd/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 7fe6d0ae443b..b895c64c1992 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      libmatekbd = callPackage ./libmatekbd { };
       libmatemixer = callPackage ./libmatemixer { };
       libmateweather = callPackage ./libmateweather { };
       marco = callPackage ./marco { };
@@ -53,6 +52,7 @@ let
       mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
       mate-screensaver = callPackage ./mate-screensaver { };
       mate-system-monitor = callPackage ./mate-system-monitor { };
+
       mate-terminal = callPackage ./mate-terminal { };
       mate-themes = callPackage ./mate-themes { };
       mate-tweak = callPackage ./mate-tweak { };
@@ -127,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   atril = lib.warnOnInstantiate "‘mate.atril’ was moved to top-level. Please use ‘pkgs.atril’ directly" pkgs.atril; # Added on 2026-02-08
   engrampa = lib.warnOnInstantiate "‘mate.engrampa’ was moved to top-level. Please use ‘pkgs.engrampa’ directly" pkgs.engrampa; # Added on 2026-02-08
   eom = lib.warnOnInstantiate "‘mate.eom’ was moved to top-level. Please use ‘pkgs.eom’ directly" pkgs.eom; # Added on 2026-02-08
+  libmatekbd = lib.warnOnInstantiate "‘mate.libmatekbd’ was moved to top-level. Please use ‘pkgs.libmatekbd’ directly" pkgs.libmatekbd; # Added on 2026-02-08
 }

From 1a941f2d388083257c6a669037c97abaa72b85f0 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 11:55:34 -0800
Subject: [PATCH 05/52] mate.libmatemixer: move to top-level

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

diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/by-name/li/libmatemixer/package.nix
similarity index 100%
rename from pkgs/desktops/mate/libmatemixer/default.nix
rename to pkgs/by-name/li/libmatemixer/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index b895c64c1992..dccb5ce79ae0 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      libmatemixer = callPackage ./libmatemixer { };
       libmateweather = callPackage ./libmateweather { };
       marco = callPackage ./marco { };
       mate-applets = callPackage ./mate-applets { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   engrampa = lib.warnOnInstantiate "‘mate.engrampa’ was moved to top-level. Please use ‘pkgs.engrampa’ directly" pkgs.engrampa; # Added on 2026-02-08
   eom = lib.warnOnInstantiate "‘mate.eom’ was moved to top-level. Please use ‘pkgs.eom’ directly" pkgs.eom; # Added on 2026-02-08
   libmatekbd = lib.warnOnInstantiate "‘mate.libmatekbd’ was moved to top-level. Please use ‘pkgs.libmatekbd’ directly" pkgs.libmatekbd; # Added on 2026-02-08
+  libmatemixer = lib.warnOnInstantiate "‘mate.libmatemixer’ was moved to top-level. Please use ‘pkgs.libmatemixer’ directly" pkgs.libmatemixer; # Added on 2026-02-08
 }

From 9ba3ba1678fe1ab593e08425d9c3071793f7c7b5 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 11:58:25 -0800
Subject: [PATCH 06/52] mate.libmateweather: move to top-level

---
 .../mate => by-name/li}/libmateweather/libsoup_3_support.patch  | 0
 .../default.nix => by-name/li/libmateweather/package.nix}       | 0
 pkgs/desktops/mate/default.nix                                  | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{desktops/mate => by-name/li}/libmateweather/libsoup_3_support.patch (100%)
 rename pkgs/{desktops/mate/libmateweather/default.nix => by-name/li/libmateweather/package.nix} (100%)

diff --git a/pkgs/desktops/mate/libmateweather/libsoup_3_support.patch b/pkgs/by-name/li/libmateweather/libsoup_3_support.patch
similarity index 100%
rename from pkgs/desktops/mate/libmateweather/libsoup_3_support.patch
rename to pkgs/by-name/li/libmateweather/libsoup_3_support.patch
diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/by-name/li/libmateweather/package.nix
similarity index 100%
rename from pkgs/desktops/mate/libmateweather/default.nix
rename to pkgs/by-name/li/libmateweather/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index dccb5ce79ae0..81da5e4fa019 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      libmateweather = callPackage ./libmateweather { };
       marco = callPackage ./marco { };
       mate-applets = callPackage ./mate-applets { };
       mate-backgrounds = callPackage ./mate-backgrounds { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   eom = lib.warnOnInstantiate "‘mate.eom’ was moved to top-level. Please use ‘pkgs.eom’ directly" pkgs.eom; # Added on 2026-02-08
   libmatekbd = lib.warnOnInstantiate "‘mate.libmatekbd’ was moved to top-level. Please use ‘pkgs.libmatekbd’ directly" pkgs.libmatekbd; # Added on 2026-02-08
   libmatemixer = lib.warnOnInstantiate "‘mate.libmatemixer’ was moved to top-level. Please use ‘pkgs.libmatemixer’ directly" pkgs.libmatemixer; # Added on 2026-02-08
+  libmateweather = lib.warnOnInstantiate "‘mate.libmateweather’ was moved to top-level. Please use ‘pkgs.libmateweather’ directly" pkgs.libmateweather; # Added on 2026-02-08
 }

From 05f36948dd329d10c075a0cd639163fa03758293 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 11:59:19 -0800
Subject: [PATCH 07/52] mate.marco: move to top-level

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

diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/by-name/ma/marco/package.nix
similarity index 100%
rename from pkgs/desktops/mate/marco/default.nix
rename to pkgs/by-name/ma/marco/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 81da5e4fa019..2e7b6ba9804b 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      marco = callPackage ./marco { };
       mate-applets = callPackage ./mate-applets { };
       mate-backgrounds = callPackage ./mate-backgrounds { };
       mate-calc = callPackage ./mate-calc { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   libmatekbd = lib.warnOnInstantiate "‘mate.libmatekbd’ was moved to top-level. Please use ‘pkgs.libmatekbd’ directly" pkgs.libmatekbd; # Added on 2026-02-08
   libmatemixer = lib.warnOnInstantiate "‘mate.libmatemixer’ was moved to top-level. Please use ‘pkgs.libmatemixer’ directly" pkgs.libmatemixer; # Added on 2026-02-08
   libmateweather = lib.warnOnInstantiate "‘mate.libmateweather’ was moved to top-level. Please use ‘pkgs.libmateweather’ directly" pkgs.libmateweather; # Added on 2026-02-08
+  marco = lib.warnOnInstantiate "‘mate.marco’ was moved to top-level. Please use ‘pkgs.marco’ directly" pkgs.marco; # Added on 2026-02-08
 }

From 5aac7361a992e9a7c0fb34c7aabfdfdc41ea5079 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:00:59 -0800
Subject: [PATCH 08/52] mate.mate-applets: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/by-name/ma/mate-applets/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-applets/default.nix
rename to pkgs/by-name/ma/mate-applets/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 2e7b6ba9804b..725913d208f6 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      mate-applets = callPackage ./mate-applets { };
       mate-backgrounds = callPackage ./mate-backgrounds { };
       mate-calc = callPackage ./mate-calc { };
       mate-common = callPackage ./mate-common { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   libmatemixer = lib.warnOnInstantiate "‘mate.libmatemixer’ was moved to top-level. Please use ‘pkgs.libmatemixer’ directly" pkgs.libmatemixer; # Added on 2026-02-08
   libmateweather = lib.warnOnInstantiate "‘mate.libmateweather’ was moved to top-level. Please use ‘pkgs.libmateweather’ directly" pkgs.libmateweather; # Added on 2026-02-08
   marco = lib.warnOnInstantiate "‘mate.marco’ was moved to top-level. Please use ‘pkgs.marco’ directly" pkgs.marco; # Added on 2026-02-08
+  mate-applets = lib.warnOnInstantiate "‘mate.mate-applets’ was moved to top-level. Please use ‘pkgs.mate-applets’ directly" pkgs.mate-applets; # Added on 2026-02-08
 }

From dbb61e8255dd1d6a38ed0dd2092c8703282fc115 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:01:39 -0800
Subject: [PATCH 09/52] mate.mate-backgrounds: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/by-name/ma/mate-backgrounds/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-backgrounds/default.nix
rename to pkgs/by-name/ma/mate-backgrounds/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 725913d208f6..aabe7e7f7758 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      mate-backgrounds = callPackage ./mate-backgrounds { };
       mate-calc = callPackage ./mate-calc { };
       mate-common = callPackage ./mate-common { };
       mate-control-center = callPackage ./mate-control-center { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   libmateweather = lib.warnOnInstantiate "‘mate.libmateweather’ was moved to top-level. Please use ‘pkgs.libmateweather’ directly" pkgs.libmateweather; # Added on 2026-02-08
   marco = lib.warnOnInstantiate "‘mate.marco’ was moved to top-level. Please use ‘pkgs.marco’ directly" pkgs.marco; # Added on 2026-02-08
   mate-applets = lib.warnOnInstantiate "‘mate.mate-applets’ was moved to top-level. Please use ‘pkgs.mate-applets’ directly" pkgs.mate-applets; # Added on 2026-02-08
+  mate-backgrounds = lib.warnOnInstantiate "‘mate.mate-backgrounds’ was moved to top-level. Please use ‘pkgs.mate-backgrounds’ directly" pkgs.mate-backgrounds; # Added on 2026-02-08
 }

From 0d1544b9d9a59af21b2785a1735889aa325caa7b Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:02:14 -0800
Subject: [PATCH 10/52] mate.mate-calc: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/by-name/ma/mate-calc/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-calc/default.nix
rename to pkgs/by-name/ma/mate-calc/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index aabe7e7f7758..746f74f1c396 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      mate-calc = callPackage ./mate-calc { };
       mate-common = callPackage ./mate-common { };
       mate-control-center = callPackage ./mate-control-center { };
       mate-desktop = callPackage ./mate-desktop { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   marco = lib.warnOnInstantiate "‘mate.marco’ was moved to top-level. Please use ‘pkgs.marco’ directly" pkgs.marco; # Added on 2026-02-08
   mate-applets = lib.warnOnInstantiate "‘mate.mate-applets’ was moved to top-level. Please use ‘pkgs.mate-applets’ directly" pkgs.mate-applets; # Added on 2026-02-08
   mate-backgrounds = lib.warnOnInstantiate "‘mate.mate-backgrounds’ was moved to top-level. Please use ‘pkgs.mate-backgrounds’ directly" pkgs.mate-backgrounds; # Added on 2026-02-08
+  mate-calc = lib.warnOnInstantiate "‘mate.mate-calc’ was moved to top-level. Please use ‘pkgs.mate-calc’ directly" pkgs.mate-calc; # Added on 2026-02-08
 }

From 456ef1e40098a201bde6cf4abffc43fd1e80e740 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:03:40 -0800
Subject: [PATCH 11/52] mate.mate-common: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/by-name/ma/mate-common/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-common/default.nix
rename to pkgs/by-name/ma/mate-common/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 746f74f1c396..a0ac1919356d 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      mate-common = callPackage ./mate-common { };
       mate-control-center = callPackage ./mate-control-center { };
       mate-desktop = callPackage ./mate-desktop { };
       mate-gsettings-overrides = callPackage ./mate-gsettings-overrides { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-applets = lib.warnOnInstantiate "‘mate.mate-applets’ was moved to top-level. Please use ‘pkgs.mate-applets’ directly" pkgs.mate-applets; # Added on 2026-02-08
   mate-backgrounds = lib.warnOnInstantiate "‘mate.mate-backgrounds’ was moved to top-level. Please use ‘pkgs.mate-backgrounds’ directly" pkgs.mate-backgrounds; # Added on 2026-02-08
   mate-calc = lib.warnOnInstantiate "‘mate.mate-calc’ was moved to top-level. Please use ‘pkgs.mate-calc’ directly" pkgs.mate-calc; # Added on 2026-02-08
+  mate-common = lib.warnOnInstantiate "‘mate.mate-common’ was moved to top-level. Please use ‘pkgs.mate-common’ directly" pkgs.mate-common; # Added on 2026-02-08
 }

From 2389011e0405b3bbe81f92c4e152d02e11a1d74c Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:07:41 -0800
Subject: [PATCH 12/52] mate.mate-control-center: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/by-name/ma/mate-control-center/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-control-center/default.nix
rename to pkgs/by-name/ma/mate-control-center/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index a0ac1919356d..1a128302a422 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      mate-control-center = callPackage ./mate-control-center { };
       mate-desktop = callPackage ./mate-desktop { };
       mate-gsettings-overrides = callPackage ./mate-gsettings-overrides { };
       mate-icon-theme = callPackage ./mate-icon-theme { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-backgrounds = lib.warnOnInstantiate "‘mate.mate-backgrounds’ was moved to top-level. Please use ‘pkgs.mate-backgrounds’ directly" pkgs.mate-backgrounds; # Added on 2026-02-08
   mate-calc = lib.warnOnInstantiate "‘mate.mate-calc’ was moved to top-level. Please use ‘pkgs.mate-calc’ directly" pkgs.mate-calc; # Added on 2026-02-08
   mate-common = lib.warnOnInstantiate "‘mate.mate-common’ was moved to top-level. Please use ‘pkgs.mate-common’ directly" pkgs.mate-common; # Added on 2026-02-08
+  mate-control-center = lib.warnOnInstantiate "‘mate.mate-control-center’ was moved to top-level. Please use ‘pkgs.mate-control-center’ directly" pkgs.mate-control-center; # Added on 2026-02-08
 }

From b7913bd89e60d42756d2d72c8316b254c0fd9e91 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:09:05 -0800
Subject: [PATCH 13/52] mate.mate-desktop: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/by-name/ma/mate-desktop/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-desktop/default.nix
rename to pkgs/by-name/ma/mate-desktop/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 1a128302a422..3663afd20bfd 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      mate-desktop = callPackage ./mate-desktop { };
       mate-gsettings-overrides = callPackage ./mate-gsettings-overrides { };
       mate-icon-theme = callPackage ./mate-icon-theme { };
       mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-calc = lib.warnOnInstantiate "‘mate.mate-calc’ was moved to top-level. Please use ‘pkgs.mate-calc’ directly" pkgs.mate-calc; # Added on 2026-02-08
   mate-common = lib.warnOnInstantiate "‘mate.mate-common’ was moved to top-level. Please use ‘pkgs.mate-common’ directly" pkgs.mate-common; # Added on 2026-02-08
   mate-control-center = lib.warnOnInstantiate "‘mate.mate-control-center’ was moved to top-level. Please use ‘pkgs.mate-control-center’ directly" pkgs.mate-control-center; # Added on 2026-02-08
+  mate-desktop = lib.warnOnInstantiate "‘mate.mate-desktop’ was moved to top-level. Please use ‘pkgs.mate-desktop’ directly" pkgs.mate-desktop; # Added on 2026-02-08
 }

From 60176d67e8f1375a43f070bcaf6e1e5e76fa5713 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:09:50 -0800
Subject: [PATCH 14/52] mate.mate-gsettings-overrides: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-gsettings-overrides/default.nix b/pkgs/by-name/ma/mate-gsettings-overrides/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-gsettings-overrides/default.nix
rename to pkgs/by-name/ma/mate-gsettings-overrides/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 3663afd20bfd..0e41c941cb75 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      mate-gsettings-overrides = callPackage ./mate-gsettings-overrides { };
       mate-icon-theme = callPackage ./mate-icon-theme { };
       mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
       mate-indicator-applet = callPackage ./mate-indicator-applet { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-common = lib.warnOnInstantiate "‘mate.mate-common’ was moved to top-level. Please use ‘pkgs.mate-common’ directly" pkgs.mate-common; # Added on 2026-02-08
   mate-control-center = lib.warnOnInstantiate "‘mate.mate-control-center’ was moved to top-level. Please use ‘pkgs.mate-control-center’ directly" pkgs.mate-control-center; # Added on 2026-02-08
   mate-desktop = lib.warnOnInstantiate "‘mate.mate-desktop’ was moved to top-level. Please use ‘pkgs.mate-desktop’ directly" pkgs.mate-desktop; # Added on 2026-02-08
+  mate-gsettings-overrides = lib.warnOnInstantiate "‘mate.mate-gsettings-overrides’ was moved to top-level. Please use ‘pkgs.mate-gsettings-overrides’ directly" pkgs.mate-gsettings-overrides; # Added on 2026-02-08
 }

From e04a34e14a785d72330c5adfd843a2c1c2023241 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:10:37 -0800
Subject: [PATCH 15/52] mate.mate-icon-theme: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/by-name/ma/mate-icon-theme/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-icon-theme/default.nix
rename to pkgs/by-name/ma/mate-icon-theme/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 0e41c941cb75..dfee5c462870 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      mate-icon-theme = callPackage ./mate-icon-theme { };
       mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
       mate-indicator-applet = callPackage ./mate-indicator-applet { };
       mate-media = callPackage ./mate-media { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-control-center = lib.warnOnInstantiate "‘mate.mate-control-center’ was moved to top-level. Please use ‘pkgs.mate-control-center’ directly" pkgs.mate-control-center; # Added on 2026-02-08
   mate-desktop = lib.warnOnInstantiate "‘mate.mate-desktop’ was moved to top-level. Please use ‘pkgs.mate-desktop’ directly" pkgs.mate-desktop; # Added on 2026-02-08
   mate-gsettings-overrides = lib.warnOnInstantiate "‘mate.mate-gsettings-overrides’ was moved to top-level. Please use ‘pkgs.mate-gsettings-overrides’ directly" pkgs.mate-gsettings-overrides; # Added on 2026-02-08
+  mate-icon-theme = lib.warnOnInstantiate "‘mate.mate-icon-theme’ was moved to top-level. Please use ‘pkgs.mate-icon-theme’ directly" pkgs.mate-icon-theme; # Added on 2026-02-08
 }

From c1943646b688cdd73b79531e1fe1e4c10a0f5c7e Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:12:00 -0800
Subject: [PATCH 16/52] mate.mate-icon-theme-faenza: move to top-level

---
 .../ma/mate-icon-theme-faenza/package.nix}                      | 0
 pkgs/desktops/mate/default.nix                                  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{desktops/mate/mate-icon-theme-faenza/default.nix => by-name/ma/mate-icon-theme-faenza/package.nix} (100%)

diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/by-name/ma/mate-icon-theme-faenza/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
rename to pkgs/by-name/ma/mate-icon-theme-faenza/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index dfee5c462870..703edddbcd54 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
       mate-indicator-applet = callPackage ./mate-indicator-applet { };
       mate-media = callPackage ./mate-media { };
       mate-menus = callPackage ./mate-menus { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-desktop = lib.warnOnInstantiate "‘mate.mate-desktop’ was moved to top-level. Please use ‘pkgs.mate-desktop’ directly" pkgs.mate-desktop; # Added on 2026-02-08
   mate-gsettings-overrides = lib.warnOnInstantiate "‘mate.mate-gsettings-overrides’ was moved to top-level. Please use ‘pkgs.mate-gsettings-overrides’ directly" pkgs.mate-gsettings-overrides; # Added on 2026-02-08
   mate-icon-theme = lib.warnOnInstantiate "‘mate.mate-icon-theme’ was moved to top-level. Please use ‘pkgs.mate-icon-theme’ directly" pkgs.mate-icon-theme; # Added on 2026-02-08
+  mate-icon-theme-faenza = lib.warnOnInstantiate "‘mate.mate-icon-theme-faenza’ was moved to top-level. Please use ‘pkgs.mate-icon-theme-faenza’ directly" pkgs.mate-icon-theme-faenza; # Added on 2026-02-08
 }

From c684bfa509801b2b68fcba093915c98d03f234cc Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:13:48 -0800
Subject: [PATCH 17/52] mate.mate-indicator-applet: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/by-name/ma/mate-indicator-applet/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-indicator-applet/default.nix
rename to pkgs/by-name/ma/mate-indicator-applet/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 703edddbcd54..496bb675195a 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      mate-indicator-applet = callPackage ./mate-indicator-applet { };
       mate-media = callPackage ./mate-media { };
       mate-menus = callPackage ./mate-menus { };
       mate-netbook = callPackage ./mate-netbook { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-gsettings-overrides = lib.warnOnInstantiate "‘mate.mate-gsettings-overrides’ was moved to top-level. Please use ‘pkgs.mate-gsettings-overrides’ directly" pkgs.mate-gsettings-overrides; # Added on 2026-02-08
   mate-icon-theme = lib.warnOnInstantiate "‘mate.mate-icon-theme’ was moved to top-level. Please use ‘pkgs.mate-icon-theme’ directly" pkgs.mate-icon-theme; # Added on 2026-02-08
   mate-icon-theme-faenza = lib.warnOnInstantiate "‘mate.mate-icon-theme-faenza’ was moved to top-level. Please use ‘pkgs.mate-icon-theme-faenza’ directly" pkgs.mate-icon-theme-faenza; # Added on 2026-02-08
+  mate-indicator-applet = lib.warnOnInstantiate "‘mate.mate-indicator-applet’ was moved to top-level. Please use ‘pkgs.mate-indicator-applet’ directly" pkgs.mate-indicator-applet; # Added on 2026-02-08
 }

From 9986751e70f8f91a61b8e986b17ff82b57786ee8 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:14:43 -0800
Subject: [PATCH 18/52] mate.mate-media: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/by-name/ma/mate-media/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-media/default.nix
rename to pkgs/by-name/ma/mate-media/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 496bb675195a..58517c71f45b 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      mate-media = callPackage ./mate-media { };
       mate-menus = callPackage ./mate-menus { };
       mate-netbook = callPackage ./mate-netbook { };
       mate-notification-daemon = callPackage ./mate-notification-daemon { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-icon-theme = lib.warnOnInstantiate "‘mate.mate-icon-theme’ was moved to top-level. Please use ‘pkgs.mate-icon-theme’ directly" pkgs.mate-icon-theme; # Added on 2026-02-08
   mate-icon-theme-faenza = lib.warnOnInstantiate "‘mate.mate-icon-theme-faenza’ was moved to top-level. Please use ‘pkgs.mate-icon-theme-faenza’ directly" pkgs.mate-icon-theme-faenza; # Added on 2026-02-08
   mate-indicator-applet = lib.warnOnInstantiate "‘mate.mate-indicator-applet’ was moved to top-level. Please use ‘pkgs.mate-indicator-applet’ directly" pkgs.mate-indicator-applet; # Added on 2026-02-08
+  mate-media = lib.warnOnInstantiate "‘mate.mate-media’ was moved to top-level. Please use ‘pkgs.mate-media’ directly" pkgs.mate-media; # Added on 2026-02-08
 }

From b390451f24d6606dafc2383ad8c3d994345b52a8 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:15:10 -0800
Subject: [PATCH 19/52] mate.mate-menus: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/by-name/ma/mate-menus/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-menus/default.nix
rename to pkgs/by-name/ma/mate-menus/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 58517c71f45b..4a245086e420 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      mate-menus = callPackage ./mate-menus { };
       mate-netbook = callPackage ./mate-netbook { };
       mate-notification-daemon = callPackage ./mate-notification-daemon { };
       mate-panel = callPackage ./mate-panel { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-icon-theme-faenza = lib.warnOnInstantiate "‘mate.mate-icon-theme-faenza’ was moved to top-level. Please use ‘pkgs.mate-icon-theme-faenza’ directly" pkgs.mate-icon-theme-faenza; # Added on 2026-02-08
   mate-indicator-applet = lib.warnOnInstantiate "‘mate.mate-indicator-applet’ was moved to top-level. Please use ‘pkgs.mate-indicator-applet’ directly" pkgs.mate-indicator-applet; # Added on 2026-02-08
   mate-media = lib.warnOnInstantiate "‘mate.mate-media’ was moved to top-level. Please use ‘pkgs.mate-media’ directly" pkgs.mate-media; # Added on 2026-02-08
+  mate-menus = lib.warnOnInstantiate "‘mate.mate-menus’ was moved to top-level. Please use ‘pkgs.mate-menus’ directly" pkgs.mate-menus; # Added on 2026-02-08
 }

From 2aa03fd4665cb002b403dfe678cdd63d5cf99eb4 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:15:37 -0800
Subject: [PATCH 20/52] mate.mate-netbook: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/by-name/ma/mate-netbook/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-netbook/default.nix
rename to pkgs/by-name/ma/mate-netbook/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 4a245086e420..d93ed0c513d6 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      mate-netbook = callPackage ./mate-netbook { };
       mate-notification-daemon = callPackage ./mate-notification-daemon { };
       mate-panel = callPackage ./mate-panel { };
       mate-panel-with-applets = callPackage ./mate-panel/with-applets.nix { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-indicator-applet = lib.warnOnInstantiate "‘mate.mate-indicator-applet’ was moved to top-level. Please use ‘pkgs.mate-indicator-applet’ directly" pkgs.mate-indicator-applet; # Added on 2026-02-08
   mate-media = lib.warnOnInstantiate "‘mate.mate-media’ was moved to top-level. Please use ‘pkgs.mate-media’ directly" pkgs.mate-media; # Added on 2026-02-08
   mate-menus = lib.warnOnInstantiate "‘mate.mate-menus’ was moved to top-level. Please use ‘pkgs.mate-menus’ directly" pkgs.mate-menus; # Added on 2026-02-08
+  mate-netbook = lib.warnOnInstantiate "‘mate.mate-netbook’ was moved to top-level. Please use ‘pkgs.mate-netbook’ directly" pkgs.mate-netbook; # Added on 2026-02-08
 }

From 71aacad1aa52e57f9e92ecf0ca6da3bf25beb68a Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:16:11 -0800
Subject: [PATCH 21/52] mate.mate-notification-daemon: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/by-name/ma/mate-notification-daemon/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-notification-daemon/default.nix
rename to pkgs/by-name/ma/mate-notification-daemon/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index d93ed0c513d6..5b324e0f1883 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,7 +25,6 @@ let
       caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
-      mate-notification-daemon = callPackage ./mate-notification-daemon { };
       mate-panel = callPackage ./mate-panel { };
       mate-panel-with-applets = callPackage ./mate-panel/with-applets.nix { };
       mate-polkit = callPackage ./mate-polkit { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-media = lib.warnOnInstantiate "‘mate.mate-media’ was moved to top-level. Please use ‘pkgs.mate-media’ directly" pkgs.mate-media; # Added on 2026-02-08
   mate-menus = lib.warnOnInstantiate "‘mate.mate-menus’ was moved to top-level. Please use ‘pkgs.mate-menus’ directly" pkgs.mate-menus; # Added on 2026-02-08
   mate-netbook = lib.warnOnInstantiate "‘mate.mate-netbook’ was moved to top-level. Please use ‘pkgs.mate-netbook’ directly" pkgs.mate-netbook; # Added on 2026-02-08
+  mate-notification-daemon = lib.warnOnInstantiate "‘mate.mate-notification-daemon’ was moved to top-level. Please use ‘pkgs.mate-notification-daemon’ directly" pkgs.mate-notification-daemon; # Added on 2026-02-08
 }

From 9e818ca414b14be7fd8b9b8a053e40a9d748dc0f Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:17:21 -0800
Subject: [PATCH 22/52] mate.mate-polkit: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/by-name/ma/mate-polkit/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-polkit/default.nix
rename to pkgs/by-name/ma/mate-polkit/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 5b324e0f1883..22e75c216cac 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -27,7 +27,6 @@ let
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
       mate-panel = callPackage ./mate-panel { };
       mate-panel-with-applets = callPackage ./mate-panel/with-applets.nix { };
-      mate-polkit = callPackage ./mate-polkit { };
       mate-power-manager = callPackage ./mate-power-manager { };
       mate-sensors-applet = callPackage ./mate-sensors-applet { };
       mate-session-manager = callPackage ./mate-session-manager { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-menus = lib.warnOnInstantiate "‘mate.mate-menus’ was moved to top-level. Please use ‘pkgs.mate-menus’ directly" pkgs.mate-menus; # Added on 2026-02-08
   mate-netbook = lib.warnOnInstantiate "‘mate.mate-netbook’ was moved to top-level. Please use ‘pkgs.mate-netbook’ directly" pkgs.mate-netbook; # Added on 2026-02-08
   mate-notification-daemon = lib.warnOnInstantiate "‘mate.mate-notification-daemon’ was moved to top-level. Please use ‘pkgs.mate-notification-daemon’ directly" pkgs.mate-notification-daemon; # Added on 2026-02-08
+  mate-polkit = lib.warnOnInstantiate "‘mate.mate-polkit’ was moved to top-level. Please use ‘pkgs.mate-polkit’ directly" pkgs.mate-polkit; # Added on 2026-02-08
 }

From 11b15752416012271db25f3ac8b7d198e04e8b46 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:17:52 -0800
Subject: [PATCH 23/52] mate.mate-power-manager: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/by-name/ma/mate-power-manager/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-power-manager/default.nix
rename to pkgs/by-name/ma/mate-power-manager/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 22e75c216cac..7750b4a19e17 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -27,7 +27,6 @@ let
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
       mate-panel = callPackage ./mate-panel { };
       mate-panel-with-applets = callPackage ./mate-panel/with-applets.nix { };
-      mate-power-manager = callPackage ./mate-power-manager { };
       mate-sensors-applet = callPackage ./mate-sensors-applet { };
       mate-session-manager = callPackage ./mate-session-manager { };
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-netbook = lib.warnOnInstantiate "‘mate.mate-netbook’ was moved to top-level. Please use ‘pkgs.mate-netbook’ directly" pkgs.mate-netbook; # Added on 2026-02-08
   mate-notification-daemon = lib.warnOnInstantiate "‘mate.mate-notification-daemon’ was moved to top-level. Please use ‘pkgs.mate-notification-daemon’ directly" pkgs.mate-notification-daemon; # Added on 2026-02-08
   mate-polkit = lib.warnOnInstantiate "‘mate.mate-polkit’ was moved to top-level. Please use ‘pkgs.mate-polkit’ directly" pkgs.mate-polkit; # Added on 2026-02-08
+  mate-power-manager = lib.warnOnInstantiate "‘mate.mate-power-manager’ was moved to top-level. Please use ‘pkgs.mate-power-manager’ directly" pkgs.mate-power-manager; # Added on 2026-02-08
 }

From d89593fdf347d32077a38a786be77f4e7994fdcd Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:19:16 -0800
Subject: [PATCH 24/52] mate.mate-screensaver: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/by-name/ma/mate-screensaver/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-screensaver/default.nix
rename to pkgs/by-name/ma/mate-screensaver/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 7750b4a19e17..2716c149fb2c 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -31,7 +31,6 @@ let
       mate-session-manager = callPackage ./mate-session-manager { };
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
       mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
-      mate-screensaver = callPackage ./mate-screensaver { };
       mate-system-monitor = callPackage ./mate-system-monitor { };
 
       mate-terminal = callPackage ./mate-terminal { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-notification-daemon = lib.warnOnInstantiate "‘mate.mate-notification-daemon’ was moved to top-level. Please use ‘pkgs.mate-notification-daemon’ directly" pkgs.mate-notification-daemon; # Added on 2026-02-08
   mate-polkit = lib.warnOnInstantiate "‘mate.mate-polkit’ was moved to top-level. Please use ‘pkgs.mate-polkit’ directly" pkgs.mate-polkit; # Added on 2026-02-08
   mate-power-manager = lib.warnOnInstantiate "‘mate.mate-power-manager’ was moved to top-level. Please use ‘pkgs.mate-power-manager’ directly" pkgs.mate-power-manager; # Added on 2026-02-08
+  mate-screensaver = lib.warnOnInstantiate "‘mate.mate-screensaver’ was moved to top-level. Please use ‘pkgs.mate-screensaver’ directly" pkgs.mate-screensaver; # Added on 2026-02-08
 }

From 37c4415a341f13081c168a61e398be4e9df5aa04 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:21:21 -0800
Subject: [PATCH 25/52] mate.mate-sensors-applet: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/by-name/ma/mate-sensors-applet/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-sensors-applet/default.nix
rename to pkgs/by-name/ma/mate-sensors-applet/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 2716c149fb2c..e833700925f1 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -27,7 +27,6 @@ let
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
       mate-panel = callPackage ./mate-panel { };
       mate-panel-with-applets = callPackage ./mate-panel/with-applets.nix { };
-      mate-sensors-applet = callPackage ./mate-sensors-applet { };
       mate-session-manager = callPackage ./mate-session-manager { };
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
       mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-polkit = lib.warnOnInstantiate "‘mate.mate-polkit’ was moved to top-level. Please use ‘pkgs.mate-polkit’ directly" pkgs.mate-polkit; # Added on 2026-02-08
   mate-power-manager = lib.warnOnInstantiate "‘mate.mate-power-manager’ was moved to top-level. Please use ‘pkgs.mate-power-manager’ directly" pkgs.mate-power-manager; # Added on 2026-02-08
   mate-screensaver = lib.warnOnInstantiate "‘mate.mate-screensaver’ was moved to top-level. Please use ‘pkgs.mate-screensaver’ directly" pkgs.mate-screensaver; # Added on 2026-02-08
+  mate-sensors-applet = lib.warnOnInstantiate "‘mate.mate-sensors-applet’ was moved to top-level. Please use ‘pkgs.mate-sensors-applet’ directly" pkgs.mate-sensors-applet; # Added on 2026-02-08
 }

From 5d8fea3625edf27746032de48cadf241a0ce912d Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:22:15 -0800
Subject: [PATCH 26/52] mate.mate-session-manager: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/by-name/ma/mate-session-manager/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-session-manager/default.nix
rename to pkgs/by-name/ma/mate-session-manager/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index e833700925f1..aa6eddeda42d 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -27,7 +27,6 @@ let
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
       mate-panel = callPackage ./mate-panel { };
       mate-panel-with-applets = callPackage ./mate-panel/with-applets.nix { };
-      mate-session-manager = callPackage ./mate-session-manager { };
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
       mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
       mate-system-monitor = callPackage ./mate-system-monitor { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-power-manager = lib.warnOnInstantiate "‘mate.mate-power-manager’ was moved to top-level. Please use ‘pkgs.mate-power-manager’ directly" pkgs.mate-power-manager; # Added on 2026-02-08
   mate-screensaver = lib.warnOnInstantiate "‘mate.mate-screensaver’ was moved to top-level. Please use ‘pkgs.mate-screensaver’ directly" pkgs.mate-screensaver; # Added on 2026-02-08
   mate-sensors-applet = lib.warnOnInstantiate "‘mate.mate-sensors-applet’ was moved to top-level. Please use ‘pkgs.mate-sensors-applet’ directly" pkgs.mate-sensors-applet; # Added on 2026-02-08
+  mate-session-manager = lib.warnOnInstantiate "‘mate.mate-session-manager’ was moved to top-level. Please use ‘pkgs.mate-session-manager’ directly" pkgs.mate-session-manager; # Added on 2026-02-08
 }

From 3bcf3376e6f616cebceb62fc37868bb3c87487b3 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:23:23 -0800
Subject: [PATCH 27/52] mate.mate-system-monitor: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/by-name/ma/mate-system-monitor/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-system-monitor/default.nix
rename to pkgs/by-name/ma/mate-system-monitor/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index aa6eddeda42d..cf3da48776f9 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -29,7 +29,6 @@ let
       mate-panel-with-applets = callPackage ./mate-panel/with-applets.nix { };
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
       mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
-      mate-system-monitor = callPackage ./mate-system-monitor { };
 
       mate-terminal = callPackage ./mate-terminal { };
       mate-themes = callPackage ./mate-themes { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-screensaver = lib.warnOnInstantiate "‘mate.mate-screensaver’ was moved to top-level. Please use ‘pkgs.mate-screensaver’ directly" pkgs.mate-screensaver; # Added on 2026-02-08
   mate-sensors-applet = lib.warnOnInstantiate "‘mate.mate-sensors-applet’ was moved to top-level. Please use ‘pkgs.mate-sensors-applet’ directly" pkgs.mate-sensors-applet; # Added on 2026-02-08
   mate-session-manager = lib.warnOnInstantiate "‘mate.mate-session-manager’ was moved to top-level. Please use ‘pkgs.mate-session-manager’ directly" pkgs.mate-session-manager; # Added on 2026-02-08
+  mate-system-monitor = lib.warnOnInstantiate "‘mate.mate-system-monitor’ was moved to top-level. Please use ‘pkgs.mate-system-monitor’ directly" pkgs.mate-system-monitor; # Added on 2026-02-08
 }

From 8756eb280a7d0b744d1dfbcf1166dc7e4a832083 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:25:34 -0800
Subject: [PATCH 28/52] mate.mate-terminal: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/by-name/ma/mate-terminal/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-terminal/default.nix
rename to pkgs/by-name/ma/mate-terminal/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index cf3da48776f9..156ab7ca2cf4 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -30,7 +30,6 @@ let
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
       mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
 
-      mate-terminal = callPackage ./mate-terminal { };
       mate-themes = callPackage ./mate-themes { };
       mate-tweak = callPackage ./mate-tweak { };
       mate-user-guide = callPackage ./mate-user-guide { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-sensors-applet = lib.warnOnInstantiate "‘mate.mate-sensors-applet’ was moved to top-level. Please use ‘pkgs.mate-sensors-applet’ directly" pkgs.mate-sensors-applet; # Added on 2026-02-08
   mate-session-manager = lib.warnOnInstantiate "‘mate.mate-session-manager’ was moved to top-level. Please use ‘pkgs.mate-session-manager’ directly" pkgs.mate-session-manager; # Added on 2026-02-08
   mate-system-monitor = lib.warnOnInstantiate "‘mate.mate-system-monitor’ was moved to top-level. Please use ‘pkgs.mate-system-monitor’ directly" pkgs.mate-system-monitor; # Added on 2026-02-08
+  mate-terminal = lib.warnOnInstantiate "‘mate.mate-terminal’ was moved to top-level. Please use ‘pkgs.mate-terminal’ directly" pkgs.mate-terminal; # Added on 2026-02-08
 }

From c1714be4674f80d60235c7dc8e2cafa241ab957f Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:26:42 -0800
Subject: [PATCH 29/52] mate.mate-themes: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/by-name/ma/mate-themes/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-themes/default.nix
rename to pkgs/by-name/ma/mate-themes/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 156ab7ca2cf4..6c42706b5c28 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -30,7 +30,6 @@ let
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
       mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
 
-      mate-themes = callPackage ./mate-themes { };
       mate-tweak = callPackage ./mate-tweak { };
       mate-user-guide = callPackage ./mate-user-guide { };
       mate-user-share = callPackage ./mate-user-share { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-session-manager = lib.warnOnInstantiate "‘mate.mate-session-manager’ was moved to top-level. Please use ‘pkgs.mate-session-manager’ directly" pkgs.mate-session-manager; # Added on 2026-02-08
   mate-system-monitor = lib.warnOnInstantiate "‘mate.mate-system-monitor’ was moved to top-level. Please use ‘pkgs.mate-system-monitor’ directly" pkgs.mate-system-monitor; # Added on 2026-02-08
   mate-terminal = lib.warnOnInstantiate "‘mate.mate-terminal’ was moved to top-level. Please use ‘pkgs.mate-terminal’ directly" pkgs.mate-terminal; # Added on 2026-02-08
+  mate-themes = lib.warnOnInstantiate "‘mate.mate-themes’ was moved to top-level. Please use ‘pkgs.mate-themes’ directly" pkgs.mate-themes; # Added on 2026-02-08
 }

From 536e81d90ffa09ca3b0f48b19a89f32eff72e97e Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:28:07 -0800
Subject: [PATCH 30/52] mate.mate-tweak: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/by-name/ma/mate-tweak/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-tweak/default.nix
rename to pkgs/by-name/ma/mate-tweak/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 6c42706b5c28..466d74abddaf 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -30,7 +30,6 @@ let
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
       mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
 
-      mate-tweak = callPackage ./mate-tweak { };
       mate-user-guide = callPackage ./mate-user-guide { };
       mate-user-share = callPackage ./mate-user-share { };
       mate-utils = callPackage ./mate-utils { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-system-monitor = lib.warnOnInstantiate "‘mate.mate-system-monitor’ was moved to top-level. Please use ‘pkgs.mate-system-monitor’ directly" pkgs.mate-system-monitor; # Added on 2026-02-08
   mate-terminal = lib.warnOnInstantiate "‘mate.mate-terminal’ was moved to top-level. Please use ‘pkgs.mate-terminal’ directly" pkgs.mate-terminal; # Added on 2026-02-08
   mate-themes = lib.warnOnInstantiate "‘mate.mate-themes’ was moved to top-level. Please use ‘pkgs.mate-themes’ directly" pkgs.mate-themes; # Added on 2026-02-08
+  mate-tweak = lib.warnOnInstantiate "‘mate.mate-tweak’ was moved to top-level. Please use ‘pkgs.mate-tweak’ directly" pkgs.mate-tweak; # Added on 2026-02-08
 }

From ae610270b0a83e282028801b5b755d54273622ab Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:28:55 -0800
Subject: [PATCH 31/52] mate.mate-user-guide: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/by-name/ma/mate-user-guide/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-user-guide/default.nix
rename to pkgs/by-name/ma/mate-user-guide/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 466d74abddaf..fedd6a7d5628 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -30,7 +30,6 @@ let
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
       mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
 
-      mate-user-guide = callPackage ./mate-user-guide { };
       mate-user-share = callPackage ./mate-user-share { };
       mate-utils = callPackage ./mate-utils { };
       mate-wayland-session = callPackage ./mate-wayland-session { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-terminal = lib.warnOnInstantiate "‘mate.mate-terminal’ was moved to top-level. Please use ‘pkgs.mate-terminal’ directly" pkgs.mate-terminal; # Added on 2026-02-08
   mate-themes = lib.warnOnInstantiate "‘mate.mate-themes’ was moved to top-level. Please use ‘pkgs.mate-themes’ directly" pkgs.mate-themes; # Added on 2026-02-08
   mate-tweak = lib.warnOnInstantiate "‘mate.mate-tweak’ was moved to top-level. Please use ‘pkgs.mate-tweak’ directly" pkgs.mate-tweak; # Added on 2026-02-08
+  mate-user-guide = lib.warnOnInstantiate "‘mate.mate-user-guide’ was moved to top-level. Please use ‘pkgs.mate-user-guide’ directly" pkgs.mate-user-guide; # Added on 2026-02-08
 }

From be2dc3a25dd700f54202bb9005a4e45bb91e27e3 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:29:26 -0800
Subject: [PATCH 32/52] mate.mate-user-share: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/by-name/ma/mate-user-share/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-user-share/default.nix
rename to pkgs/by-name/ma/mate-user-share/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index fedd6a7d5628..aaaa5a2cca25 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -30,7 +30,6 @@ let
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
       mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
 
-      mate-user-share = callPackage ./mate-user-share { };
       mate-utils = callPackage ./mate-utils { };
       mate-wayland-session = callPackage ./mate-wayland-session { };
       mozo = callPackage ./mozo { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-themes = lib.warnOnInstantiate "‘mate.mate-themes’ was moved to top-level. Please use ‘pkgs.mate-themes’ directly" pkgs.mate-themes; # Added on 2026-02-08
   mate-tweak = lib.warnOnInstantiate "‘mate.mate-tweak’ was moved to top-level. Please use ‘pkgs.mate-tweak’ directly" pkgs.mate-tweak; # Added on 2026-02-08
   mate-user-guide = lib.warnOnInstantiate "‘mate.mate-user-guide’ was moved to top-level. Please use ‘pkgs.mate-user-guide’ directly" pkgs.mate-user-guide; # Added on 2026-02-08
+  mate-user-share = lib.warnOnInstantiate "‘mate.mate-user-share’ was moved to top-level. Please use ‘pkgs.mate-user-share’ directly" pkgs.mate-user-share; # Added on 2026-02-08
 }

From d02749fd0fb4b0d41fdcba48ab56b065b177f6e3 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:30:05 -0800
Subject: [PATCH 33/52] mate.mate-utils: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/by-name/ma/mate-utils/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-utils/default.nix
rename to pkgs/by-name/ma/mate-utils/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index aaaa5a2cca25..f91feb7cf5bc 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -30,7 +30,6 @@ let
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
       mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
 
-      mate-utils = callPackage ./mate-utils { };
       mate-wayland-session = callPackage ./mate-wayland-session { };
       mozo = callPackage ./mozo { };
       pluma = callPackage ./pluma { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-tweak = lib.warnOnInstantiate "‘mate.mate-tweak’ was moved to top-level. Please use ‘pkgs.mate-tweak’ directly" pkgs.mate-tweak; # Added on 2026-02-08
   mate-user-guide = lib.warnOnInstantiate "‘mate.mate-user-guide’ was moved to top-level. Please use ‘pkgs.mate-user-guide’ directly" pkgs.mate-user-guide; # Added on 2026-02-08
   mate-user-share = lib.warnOnInstantiate "‘mate.mate-user-share’ was moved to top-level. Please use ‘pkgs.mate-user-share’ directly" pkgs.mate-user-share; # Added on 2026-02-08
+  mate-utils = lib.warnOnInstantiate "‘mate.mate-utils’ was moved to top-level. Please use ‘pkgs.mate-utils’ directly" pkgs.mate-utils; # Added on 2026-02-08
 }

From 429c04e13750155e7f7ea262db478bcfa80f28d1 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:30:57 -0800
Subject: [PATCH 34/52] mate.mate-wayland-session: move to top-level

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

diff --git a/pkgs/desktops/mate/mate-wayland-session/default.nix b/pkgs/by-name/ma/mate-wayland-session/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-wayland-session/default.nix
rename to pkgs/by-name/ma/mate-wayland-session/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index f91feb7cf5bc..80c43633997d 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -30,7 +30,6 @@ let
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
       mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
 
-      mate-wayland-session = callPackage ./mate-wayland-session { };
       mozo = callPackage ./mozo { };
       pluma = callPackage ./pluma { };
       python-caja = callPackage ./python-caja { };
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-user-guide = lib.warnOnInstantiate "‘mate.mate-user-guide’ was moved to top-level. Please use ‘pkgs.mate-user-guide’ directly" pkgs.mate-user-guide; # Added on 2026-02-08
   mate-user-share = lib.warnOnInstantiate "‘mate.mate-user-share’ was moved to top-level. Please use ‘pkgs.mate-user-share’ directly" pkgs.mate-user-share; # Added on 2026-02-08
   mate-utils = lib.warnOnInstantiate "‘mate.mate-utils’ was moved to top-level. Please use ‘pkgs.mate-utils’ directly" pkgs.mate-utils; # Added on 2026-02-08
+  mate-wayland-session = lib.warnOnInstantiate "‘mate.mate-wayland-session’ was moved to top-level. Please use ‘pkgs.mate-wayland-session’ directly" pkgs.mate-wayland-session; # Added on 2026-02-08
 }

From a064ee094c16ccf32e7316e506adf3a21fe6f1cb Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:31:56 -0800
Subject: [PATCH 35/52] mate.mozo: move to top-level

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

diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/by-name/mo/mozo/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mozo/default.nix
rename to pkgs/by-name/mo/mozo/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 80c43633997d..b6de083d8ca6 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -30,7 +30,6 @@ let
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
       mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
 
-      mozo = callPackage ./mozo { };
       pluma = callPackage ./pluma { };
       python-caja = callPackage ./python-caja { };
 
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-user-share = lib.warnOnInstantiate "‘mate.mate-user-share’ was moved to top-level. Please use ‘pkgs.mate-user-share’ directly" pkgs.mate-user-share; # Added on 2026-02-08
   mate-utils = lib.warnOnInstantiate "‘mate.mate-utils’ was moved to top-level. Please use ‘pkgs.mate-utils’ directly" pkgs.mate-utils; # Added on 2026-02-08
   mate-wayland-session = lib.warnOnInstantiate "‘mate.mate-wayland-session’ was moved to top-level. Please use ‘pkgs.mate-wayland-session’ directly" pkgs.mate-wayland-session; # Added on 2026-02-08
+  mozo = lib.warnOnInstantiate "‘mate.mozo’ was moved to top-level. Please use ‘pkgs.mozo’ directly" pkgs.mozo; # Added on 2026-02-08
 }

From 07a822baba8b68da87cdd87a5757cb2d320941a0 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:32:27 -0800
Subject: [PATCH 36/52] mate.pluma: move to top-level

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

diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/by-name/pl/pluma/package.nix
similarity index 100%
rename from pkgs/desktops/mate/pluma/default.nix
rename to pkgs/by-name/pl/pluma/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index b6de083d8ca6..ceb96c744687 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -30,7 +30,6 @@ let
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
       mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
 
-      pluma = callPackage ./pluma { };
       python-caja = callPackage ./python-caja { };
 
       # Caja and mate-panel are managed in NixOS module.
@@ -128,4 +127,5 @@ lib.makeScope pkgs.newScope packages
   mate-utils = lib.warnOnInstantiate "‘mate.mate-utils’ was moved to top-level. Please use ‘pkgs.mate-utils’ directly" pkgs.mate-utils; # Added on 2026-02-08
   mate-wayland-session = lib.warnOnInstantiate "‘mate.mate-wayland-session’ was moved to top-level. Please use ‘pkgs.mate-wayland-session’ directly" pkgs.mate-wayland-session; # Added on 2026-02-08
   mozo = lib.warnOnInstantiate "‘mate.mozo’ was moved to top-level. Please use ‘pkgs.mozo’ directly" pkgs.mozo; # Added on 2026-02-08
+  pluma = lib.warnOnInstantiate "‘mate.pluma’ was moved to top-level. Please use ‘pkgs.pluma’ directly" pkgs.pluma; # Added on 2026-02-08
 }

From 298eafcfd1a5b35dfab09cf86ecea715f16d6a38 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:33:29 -0800
Subject: [PATCH 37/52] mate.python-caja: move to top-level

---
 .../default.nix => by-name/py/python-caja/package.nix}         | 0
 pkgs/desktops/mate/default.nix                                 | 3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{desktops/mate/python-caja/default.nix => by-name/py/python-caja/package.nix} (100%)

diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/by-name/py/python-caja/package.nix
similarity index 100%
rename from pkgs/desktops/mate/python-caja/default.nix
rename to pkgs/by-name/py/python-caja/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index ceb96c744687..52a55880c9fa 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -30,8 +30,6 @@ let
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
       mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
 
-      python-caja = callPackage ./python-caja { };
-
       # Caja and mate-panel are managed in NixOS module.
       basePackages = [
         libmatekbd
@@ -128,4 +126,5 @@ lib.makeScope pkgs.newScope packages
   mate-wayland-session = lib.warnOnInstantiate "‘mate.mate-wayland-session’ was moved to top-level. Please use ‘pkgs.mate-wayland-session’ directly" pkgs.mate-wayland-session; # Added on 2026-02-08
   mozo = lib.warnOnInstantiate "‘mate.mozo’ was moved to top-level. Please use ‘pkgs.mozo’ directly" pkgs.mozo; # Added on 2026-02-08
   pluma = lib.warnOnInstantiate "‘mate.pluma’ was moved to top-level. Please use ‘pkgs.pluma’ directly" pkgs.pluma; # Added on 2026-02-08
+  python-caja = lib.warnOnInstantiate "‘mate.python-caja’ was moved to top-level. Please use ‘pkgs.python-caja’ directly" pkgs.python-caja; # Added on 2026-02-08
 }

From 1d9e1f5049b80e705974a6cd900114dfcbb971ec Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:34:28 -0800
Subject: [PATCH 38/52] mate.caja-dropbox: move to top-level

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

diff --git a/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch b/pkgs/by-name/ca/caja-dropbox/fix-cli-paths.patch
similarity index 100%
rename from pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch
rename to pkgs/by-name/ca/caja-dropbox/fix-cli-paths.patch
diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/by-name/ca/caja-dropbox/package.nix
similarity index 100%
rename from pkgs/desktops/mate/caja-dropbox/default.nix
rename to pkgs/by-name/ca/caja-dropbox/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 52a55880c9fa..d80422f66777 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -22,7 +22,6 @@ let
         };
 
       caja = callPackage ./caja { };
-      caja-dropbox = callPackage ./caja-dropbox { };
       caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
       mate-panel = callPackage ./mate-panel { };
@@ -127,4 +126,5 @@ lib.makeScope pkgs.newScope packages
   mozo = lib.warnOnInstantiate "‘mate.mozo’ was moved to top-level. Please use ‘pkgs.mozo’ directly" pkgs.mozo; # Added on 2026-02-08
   pluma = lib.warnOnInstantiate "‘mate.pluma’ was moved to top-level. Please use ‘pkgs.pluma’ directly" pkgs.pluma; # Added on 2026-02-08
   python-caja = lib.warnOnInstantiate "‘mate.python-caja’ was moved to top-level. Please use ‘pkgs.python-caja’ directly" pkgs.python-caja; # Added on 2026-02-08
+  caja-dropbox = lib.warnOnInstantiate "‘mate.caja-dropbox’ was moved to top-level. Please use ‘pkgs.caja-dropbox’ directly" pkgs.caja-dropbox; # Added on 2026-02-08
 }

From ee7e77731fed3ee5207436fa809e24eb0c16340c Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:35:14 -0800
Subject: [PATCH 39/52] mate.caja-extensions: move to top-level

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

diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/by-name/ca/caja-extensions/package.nix
similarity index 100%
rename from pkgs/desktops/mate/caja-extensions/default.nix
rename to pkgs/by-name/ca/caja-extensions/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index d80422f66777..0aeb0cd23f70 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -22,7 +22,6 @@ let
         };
 
       caja = callPackage ./caja { };
-      caja-extensions = callPackage ./caja-extensions { };
       caja-with-extensions = callPackage ./caja/with-extensions.nix { };
       mate-panel = callPackage ./mate-panel { };
       mate-panel-with-applets = callPackage ./mate-panel/with-applets.nix { };
@@ -127,4 +126,5 @@ lib.makeScope pkgs.newScope packages
   pluma = lib.warnOnInstantiate "‘mate.pluma’ was moved to top-level. Please use ‘pkgs.pluma’ directly" pkgs.pluma; # Added on 2026-02-08
   python-caja = lib.warnOnInstantiate "‘mate.python-caja’ was moved to top-level. Please use ‘pkgs.python-caja’ directly" pkgs.python-caja; # Added on 2026-02-08
   caja-dropbox = lib.warnOnInstantiate "‘mate.caja-dropbox’ was moved to top-level. Please use ‘pkgs.caja-dropbox’ directly" pkgs.caja-dropbox; # Added on 2026-02-08
+  caja-extensions = lib.warnOnInstantiate "‘mate.caja-extensions’ was moved to top-level. Please use ‘pkgs.caja-extensions’ directly" pkgs.caja-extensions; # Added on 2026-02-08
 }

From 4a2cbd772b9e55522bf742989640d10834cfc0f8 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:42:27 -0800
Subject: [PATCH 40/52] mate.caja{,-with-extensions}: move to top-level

---
 .../ca/caja-with-extensions/package.nix}                      | 0
 .../mate/caja/default.nix => by-name/ca/caja/package.nix}     | 0
 pkgs/desktops/mate/default.nix                                | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{desktops/mate/caja/with-extensions.nix => by-name/ca/caja-with-extensions/package.nix} (100%)
 rename pkgs/{desktops/mate/caja/default.nix => by-name/ca/caja/package.nix} (100%)

diff --git a/pkgs/desktops/mate/caja/with-extensions.nix b/pkgs/by-name/ca/caja-with-extensions/package.nix
similarity index 100%
rename from pkgs/desktops/mate/caja/with-extensions.nix
rename to pkgs/by-name/ca/caja-with-extensions/package.nix
diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/by-name/ca/caja/package.nix
similarity index 100%
rename from pkgs/desktops/mate/caja/default.nix
rename to pkgs/by-name/ca/caja/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 0aeb0cd23f70..88a9375640fb 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -21,8 +21,6 @@ let
           url = if url == null then "https://git.mate-desktop.org/${pname}" else url;
         };
 
-      caja = callPackage ./caja { };
-      caja-with-extensions = callPackage ./caja/with-extensions.nix { };
       mate-panel = callPackage ./mate-panel { };
       mate-panel-with-applets = callPackage ./mate-panel/with-applets.nix { };
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
@@ -127,4 +125,6 @@ lib.makeScope pkgs.newScope packages
   python-caja = lib.warnOnInstantiate "‘mate.python-caja’ was moved to top-level. Please use ‘pkgs.python-caja’ directly" pkgs.python-caja; # Added on 2026-02-08
   caja-dropbox = lib.warnOnInstantiate "‘mate.caja-dropbox’ was moved to top-level. Please use ‘pkgs.caja-dropbox’ directly" pkgs.caja-dropbox; # Added on 2026-02-08
   caja-extensions = lib.warnOnInstantiate "‘mate.caja-extensions’ was moved to top-level. Please use ‘pkgs.caja-extensions’ directly" pkgs.caja-extensions; # Added on 2026-02-08
+  caja = lib.warnOnInstantiate "‘mate.caja’ was moved to top-level. Please use ‘pkgs.caja’ directly" pkgs.caja; # Added on 2026-02-08
+  caja-with-extensions = lib.warnOnInstantiate "‘mate.caja-with-extensions’ was moved to top-level. Please use ‘pkgs.caja-with-extensions’ directly" pkgs.caja-with-extensions; # Added on 2026-02-08
 }

From b558b7a520af677dbb70cc045679c525870c5dd2 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:50:12 -0800
Subject: [PATCH 41/52] mate.panel{,-with-applets}: move to top-level

---
 .../ma/mate-panel-with-applets/package.nix}                   | 0
 .../default.nix => by-name/ma/mate-panel/package.nix}         | 0
 pkgs/desktops/mate/default.nix                                | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{desktops/mate/mate-panel/with-applets.nix => by-name/ma/mate-panel-with-applets/package.nix} (100%)
 rename pkgs/{desktops/mate/mate-panel/default.nix => by-name/ma/mate-panel/package.nix} (100%)

diff --git a/pkgs/desktops/mate/mate-panel/with-applets.nix b/pkgs/by-name/ma/mate-panel-with-applets/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-panel/with-applets.nix
rename to pkgs/by-name/ma/mate-panel-with-applets/package.nix
diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/by-name/ma/mate-panel/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-panel/default.nix
rename to pkgs/by-name/ma/mate-panel/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 88a9375640fb..7501da0d515a 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -21,8 +21,6 @@ let
           url = if url == null then "https://git.mate-desktop.org/${pname}" else url;
         };
 
-      mate-panel = callPackage ./mate-panel { };
-      mate-panel-with-applets = callPackage ./mate-panel/with-applets.nix { };
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
       mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
 
@@ -127,4 +125,6 @@ lib.makeScope pkgs.newScope packages
   caja-extensions = lib.warnOnInstantiate "‘mate.caja-extensions’ was moved to top-level. Please use ‘pkgs.caja-extensions’ directly" pkgs.caja-extensions; # Added on 2026-02-08
   caja = lib.warnOnInstantiate "‘mate.caja’ was moved to top-level. Please use ‘pkgs.caja’ directly" pkgs.caja; # Added on 2026-02-08
   caja-with-extensions = lib.warnOnInstantiate "‘mate.caja-with-extensions’ was moved to top-level. Please use ‘pkgs.caja-with-extensions’ directly" pkgs.caja-with-extensions; # Added on 2026-02-08
+  mate-panel = lib.warnOnInstantiate "‘mate.mate-panel’ was moved to top-level. Please use ‘pkgs.mate-panel’ directly" pkgs.mate-panel; # Added on 2026-02-08
+  mate-panel-with-applets = lib.warnOnInstantiate "‘mate.mate-panel-with-applets’ was moved to top-level. Please use ‘pkgs.mate-panel-with-applets’ directly" pkgs.mate-panel-with-applets; # Added on 2026-02-08
 }

From 969736214f6120c406b760fa1ec7ee1801a7751f Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:59:57 -0800
Subject: [PATCH 42/52] mate.mate-settings-daemon{,-wrapped}: move to top-level

---
 .../ma/mate-settings-daemon-wrapped/package.nix}             | 0
 .../ma/mate-settings-daemon/package.nix}                     | 0
 pkgs/desktops/mate/default.nix                               | 5 ++---
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename pkgs/{desktops/mate/mate-settings-daemon/wrapped.nix => by-name/ma/mate-settings-daemon-wrapped/package.nix} (100%)
 rename pkgs/{desktops/mate/mate-settings-daemon/default.nix => by-name/ma/mate-settings-daemon/package.nix} (100%)

diff --git a/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix b/pkgs/by-name/ma/mate-settings-daemon-wrapped/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-settings-daemon/wrapped.nix
rename to pkgs/by-name/ma/mate-settings-daemon-wrapped/package.nix
diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/by-name/ma/mate-settings-daemon/package.nix
similarity index 100%
rename from pkgs/desktops/mate/mate-settings-daemon/default.nix
rename to pkgs/by-name/ma/mate-settings-daemon/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 7501da0d515a..7448637f8cf5 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -21,9 +21,6 @@ let
           url = if url == null then "https://git.mate-desktop.org/${pname}" else url;
         };
 
-      mate-settings-daemon = callPackage ./mate-settings-daemon { };
-      mate-settings-daemon-wrapped = callPackage ./mate-settings-daemon/wrapped.nix { };
-
       # Caja and mate-panel are managed in NixOS module.
       basePackages = [
         libmatekbd
@@ -127,4 +124,6 @@ lib.makeScope pkgs.newScope packages
   caja-with-extensions = lib.warnOnInstantiate "‘mate.caja-with-extensions’ was moved to top-level. Please use ‘pkgs.caja-with-extensions’ directly" pkgs.caja-with-extensions; # Added on 2026-02-08
   mate-panel = lib.warnOnInstantiate "‘mate.mate-panel’ was moved to top-level. Please use ‘pkgs.mate-panel’ directly" pkgs.mate-panel; # Added on 2026-02-08
   mate-panel-with-applets = lib.warnOnInstantiate "‘mate.mate-panel-with-applets’ was moved to top-level. Please use ‘pkgs.mate-panel-with-applets’ directly" pkgs.mate-panel-with-applets; # Added on 2026-02-08
+  mate-settings-daemon = lib.warnOnInstantiate "‘mate.mate-settings-daemon’ was moved to top-level. Please use ‘pkgs.mate-settings-daemon’ directly" pkgs.mate-settings-daemon; # Added on 2026-02-08
+  mate-settings-daemon-wrapped = lib.warnOnInstantiate "‘mate.mate-settings-daemon-wrapped’ was moved to top-level. Please use ‘pkgs.mate-settings-daemon-wrapped’ directly" pkgs.mate-settings-daemon-wrapped; # Added on 2026-02-08
 }

From fdf5f18d10aec9c2b3b8916bbd6efed7725a0cde Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 13:20:05 -0800
Subject: [PATCH 43/52] various: remove references to mate scope

---
 .../services/desktop-managers/budgie.nix      | 12 +++++-----
 .../services/x11/desktop-managers/mate.nix    | 22 +++++++++----------
 nixos/tests/mate-wayland.nix                  |  2 +-
 nixos/tests/mate.nix                          |  2 +-
 nixos/tests/terminal-emulators.nix            |  2 +-
 .../ay/ayatana-indicator-display/package.nix  |  7 +++---
 .../ay/ayatana-indicator-session/package.nix  |  4 ++--
 .../ma/mate-icon-theme-faenza/package.nix     |  4 ++--
 pkgs/by-name/ma/mate-netbook/package.nix      |  4 ++--
 .../mate-settings-daemon-wrapped/package.nix  | 19 ++++++++--------
 pkgs/by-name/ma/mate-tweak/package.nix        | 16 +++++++++-----
 pkgs/by-name/ma/mate-user-share/package.nix   |  1 -
 pkgs/by-name/pl/plata-theme/package.nix       |  4 ++--
 pkgs/by-name/th/themechanger/package.nix      |  7 +++---
 pkgs/by-name/xa/xapp/package.nix              |  4 ++--
 .../xd/xdg-desktop-portal-xapp/package.nix    |  4 ++--
 pkgs/by-name/xm/xmonad_log_applet/package.nix |  4 ++--
 17 files changed, 62 insertions(+), 56 deletions(-)

diff --git a/nixos/modules/services/desktop-managers/budgie.nix b/nixos/modules/services/desktop-managers/budgie.nix
index a32caa838779..160ac04ecd6d 100644
--- a/nixos/modules/services/desktop-managers/budgie.nix
+++ b/nixos/modules/services/desktop-managers/budgie.nix
@@ -186,12 +186,12 @@ in
       ++ lib.optional config.networking.networkmanager.enable pkgs.networkmanagerapplet
       ++ (utils.removePackagesByName [
         nemo
-        mate.eom
-        mate.pluma
-        mate.atril
-        mate.engrampa
-        mate.mate-calc
-        mate.mate-system-monitor
+        eom
+        pluma
+        atril
+        engrampa
+        mate-calc
+        mate-system-monitor
         vlc
 
         # Supplemental tooling.
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index b72461a75938..2e658cb83c66 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -29,14 +29,14 @@ in
 
       extraPanelApplets = mkOption {
         default = [ ];
-        example = literalExpression "with pkgs.mate; [ mate-applets ]";
+        example = literalExpression "with pkgs; [ mate-applets ]";
         type = types.listOf types.package;
         description = "Extra applets to add to mate-panel.";
       };
 
       extraCajaExtensions = mkOption {
         default = [ ];
-        example = lib.literalExpression "with pkgs.mate; [ caja-extensions ]";
+        example = lib.literalExpression "with pkgs; [ caja-extensions ]";
         type = types.listOf types.package;
         description = "Extra extensions to add to caja.";
       };
@@ -46,7 +46,7 @@ in
 
     environment.mate.excludePackages = mkOption {
       default = [ ];
-      example = literalExpression "[ pkgs.mate.mate-terminal pkgs.mate.pluma ]";
+      example = literalExpression "[ pkgs.mate-terminal pkgs.pluma ]";
       type = types.listOf types.package;
       description = "Which MATE packages to exclude from the default environment";
     };
@@ -56,7 +56,7 @@ in
   config = mkMerge [
     (mkIf (cfg.enable || cfg.enableWaylandSession) {
       services.displayManager.sessionPackages = [
-        pkgs.mate.mate-session-manager
+        pkgs.mate-session-manager
       ];
 
       environment.extraInit = lib.optionalString config.services.gnome.gcr-ssh-agent.enable ''
@@ -74,10 +74,10 @@ in
         pkgs.mate.basePackages
         ++ pkgs.mate.extraPackages
         ++ [
-          (pkgs.mate.caja-with-extensions.override {
+          (pkgs.caja-with-extensions.override {
             extensions = cfg.extraCajaExtensions;
           })
-          (pkgs.mate.mate-panel-with-applets.override {
+          (pkgs.mate-panel-with-applets.override {
             applets = cfg.extraPanelApplets;
           })
           pkgs.desktop-file-utils
@@ -101,24 +101,24 @@ in
       services.gnome.glib-networking.enable = true;
       services.gnome.gnome-keyring.enable = true;
       services.gnome.gcr-ssh-agent.enable = mkDefault true;
-      services.udev.packages = [ pkgs.mate.mate-settings-daemon ];
+      services.udev.packages = [ pkgs.mate-settings-daemon ];
       services.gvfs.enable = true;
       services.upower.enable = config.powerManagement.enable;
       services.libinput.enable = mkDefault true;
 
       security.pam.services.mate-screensaver.unixAuth = true;
 
-      xdg.portal.configPackages = mkDefault [ pkgs.mate.mate-desktop ];
+      xdg.portal.configPackages = mkDefault [ pkgs.mate-desktop ];
 
       environment.pathsToLink = [ "/share" ];
     })
     (mkIf cfg.enableWaylandSession {
       programs.wayfire.enable = true;
 
-      environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${pkgs.mate.mate-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
+      environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${pkgs.mate-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
 
-      environment.systemPackages = [ pkgs.mate.mate-wayland-session ];
-      services.displayManager.sessionPackages = [ pkgs.mate.mate-wayland-session ];
+      environment.systemPackages = [ pkgs.mate-wayland-session ];
+      services.displayManager.sessionPackages = [ pkgs.mate-wayland-session ];
     })
   ];
 }
diff --git a/nixos/tests/mate-wayland.nix b/nixos/tests/mate-wayland.nix
index b5856facd2ac..ad293cef9e9d 100644
--- a/nixos/tests/mate-wayland.nix
+++ b/nixos/tests/mate-wayland.nix
@@ -51,7 +51,7 @@
           cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ"
           machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'wayland'")
           machine.succeed(f"{cmd} | grep 'XDG_SESSION_DESKTOP' | grep 'MATE'")
-          machine.succeed(f"{cmd} | grep 'MATE_PANEL_APPLETS_DIR' | grep '${pkgs.mate.mate-panel-with-applets.pname}'")
+          machine.succeed(f"{cmd} | grep 'MATE_PANEL_APPLETS_DIR' | grep '${pkgs.mate-panel-with-applets.pname}'")
           # From the nixos/mate module
           machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
 
diff --git a/nixos/tests/mate.nix b/nixos/tests/mate.nix
index 81948d5a1ae1..f25dda0b92d6 100644
--- a/nixos/tests/mate.nix
+++ b/nixos/tests/mate.nix
@@ -58,7 +58,7 @@
       with subtest("Check if various environment variables are set"):
           machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf marco)/environ | grep 'XDG_CURRENT_DESKTOP' | grep 'MATE'")
           # From mate-panel-with-applets packaging
-          machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ | grep 'MATE_PANEL_APPLETS_DIR' | grep '${pkgs.mate.mate-panel-with-applets.pname}'")
+          machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ | grep 'MATE_PANEL_APPLETS_DIR' | grep '${pkgs.mate-panel-with-applets.pname}'")
           # From the nixos/mate module
           machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
 
diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix
index 2af1cbe518ba..68f265fa0286 100644
--- a/nixos/tests/terminal-emulators.nix
+++ b/nixos/tests/terminal-emulators.nix
@@ -61,7 +61,7 @@ let
 
     lxterminal.pkg = p: p.lxterminal;
 
-    mate-terminal.pkg = p: p.mate.mate-terminal;
+    mate-terminal.pkg = p: p.mate-terminal;
     mate-terminal.cmd = "SHELL=$command mate-terminal --disable-factory"; # factory mode uses dbus, and we don't have a proper dbus session set up
 
     mlterm.pkg = p: p.mlterm;
diff --git a/pkgs/by-name/ay/ayatana-indicator-display/package.nix b/pkgs/by-name/ay/ayatana-indicator-display/package.nix
index 18afb05894a3..83adddf1ae61 100644
--- a/pkgs/by-name/ay/ayatana-indicator-display/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-display/package.nix
@@ -20,7 +20,8 @@
   librda,
   libsForQt5,
   lomiri,
-  mate,
+  marco,
+  mate-settings-daemon,
   pkg-config,
   properties-cpp,
   python3,
@@ -78,8 +79,8 @@ stdenv.mkDerivation (finalAttrs: {
     lomiri-schemas # lomiri schema
   ])
   ++ [
-    mate.marco # marco schema
-    mate.mate-settings-daemon # mate mouse schema
+    marco # marco schema
+    mate-settings-daemon # mate mouse schema
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix
index d674cf3b76cb..39a05c6e5d03 100644
--- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix
@@ -14,7 +14,7 @@
   libayatana-common,
   librda,
   lomiri,
-  mate,
+  mate-settings-daemon,
   pkg-config,
   systemd,
   wrapGAppsHook3,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     # is there a better way to give it access to DE-specific schemas as needed?
     # https://github.com/AyatanaIndicators/ayatana-indicator-session/blob/88846bad7ee0aa8e0bb122816d06f9bc887eb464/src/service.c#L1387-L1413
     gnome-settings-daemon
-    mate.mate-settings-daemon
+    mate-settings-daemon
   ];
 
   nativeCheckInputs = [ dbus ];
diff --git a/pkgs/by-name/ma/mate-icon-theme-faenza/package.nix b/pkgs/by-name/ma/mate-icon-theme-faenza/package.nix
index 8e87c6fc1c88..db4db4b498b1 100644
--- a/pkgs/by-name/ma/mate-icon-theme-faenza/package.nix
+++ b/pkgs/by-name/ma/mate-icon-theme-faenza/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   autoreconfHook,
   gtk3,
-  mate,
+  mate-icon-theme,
   hicolor-icon-theme,
   gitUpdater,
 }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   propagatedBuildInputs = [
-    mate.mate-icon-theme
+    mate-icon-theme
     hicolor-icon-theme
   ];
 
diff --git a/pkgs/by-name/ma/mate-netbook/package.nix b/pkgs/by-name/ma/mate-netbook/package.nix
index 19d330f53c6c..af7d45dee75f 100644
--- a/pkgs/by-name/ma/mate-netbook/package.nix
+++ b/pkgs/by-name/ma/mate-netbook/package.nix
@@ -8,7 +8,7 @@
   libwnck,
   libfakekey,
   libxtst,
-  mate,
+  mate-panel,
   wrapGAppsHook3,
   gitUpdater,
 }:
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     libwnck
     libfakekey
     libxtst
-    mate.mate-panel
+    mate-panel
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ma/mate-settings-daemon-wrapped/package.nix b/pkgs/by-name/ma/mate-settings-daemon-wrapped/package.nix
index 097f429460c2..7ae3080c5416 100644
--- a/pkgs/by-name/ma/mate-settings-daemon-wrapped/package.nix
+++ b/pkgs/by-name/ma/mate-settings-daemon-wrapped/package.nix
@@ -1,13 +1,14 @@
 {
   stdenv,
-  mate,
+  mate-control-center,
+  mate-settings-daemon,
   glib,
   wrapGAppsHook3,
 }:
 
 stdenv.mkDerivation {
-  pname = "${mate.mate-settings-daemon.pname}-wrapped";
-  inherit (mate.mate-settings-daemon) version outputs;
+  pname = "${mate-settings-daemon.pname}-wrapped";
+  inherit (mate-settings-daemon) version outputs;
 
   nativeBuildInputs = [
     wrapGAppsHook3
@@ -15,7 +16,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     glib
-    mate.mate-control-center
+    mate-control-center
   ];
 
   dontWrapGApps = true;
@@ -24,21 +25,21 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/etc/xdg/autostart
-    cp ${mate.mate-settings-daemon}/etc/xdg/autostart/mate-settings-daemon.desktop $out/etc/xdg/autostart
+    cp ${mate-settings-daemon}/etc/xdg/autostart/mate-settings-daemon.desktop $out/etc/xdg/autostart
 
     mkdir -p $out/share/man
-    cp -r ${mate.mate-settings-daemon.man}/share/man/* $out/share/man/
+    cp -r ${mate-settings-daemon.man}/share/man/* $out/share/man/
   '';
 
   postFixup = ''
     mkdir -p $out/libexec
-    makeWrapper ${mate.mate-settings-daemon}/libexec/mate-settings-daemon $out/libexec/mate-settings-daemon \
+    makeWrapper ${mate-settings-daemon}/libexec/mate-settings-daemon $out/libexec/mate-settings-daemon \
       "''${gappsWrapperArgs[@]}"
     substituteInPlace $out/etc/xdg/autostart/mate-settings-daemon.desktop \
-      --replace-fail "${mate.mate-settings-daemon}/libexec/mate-settings-daemon" "$out/libexec/mate-settings-daemon"
+      --replace-fail "${mate-settings-daemon}/libexec/mate-settings-daemon" "$out/libexec/mate-settings-daemon"
   '';
 
-  meta = mate.mate-settings-daemon.meta // {
+  meta = mate-settings-daemon.meta // {
     priority = -10;
   };
 }
diff --git a/pkgs/by-name/ma/mate-tweak/package.nix b/pkgs/by-name/ma/mate-tweak/package.nix
index f7225cf363d0..63cc32afbd25 100644
--- a/pkgs/by-name/ma/mate-tweak/package.nix
+++ b/pkgs/by-name/ma/mate-tweak/package.nix
@@ -3,7 +3,11 @@
   fetchFromGitHub,
   python3Packages,
   intltool,
-  mate,
+  mate-applets,
+  mate-panel,
+  marco,
+  libmatekbd,
+  mate-session-manager,
   libnotify,
   gtk3,
   gdk-pixbuf,
@@ -37,11 +41,11 @@ python3Packages.buildPythonApplication rec {
     gdk-pixbuf
     libnotify
     glib
-    mate.mate-applets
-    mate.mate-panel
-    mate.marco
-    mate.libmatekbd
-    mate.mate-session-manager
+    mate-applets
+    mate-panel
+    marco
+    libmatekbd
+    mate-session-manager
   ];
 
   propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/by-name/ma/mate-user-share/package.nix b/pkgs/by-name/ma/mate-user-share/package.nix
index 3df42a10b273..f3e0b3846e5d 100644
--- a/pkgs/by-name/ma/mate-user-share/package.nix
+++ b/pkgs/by-name/ma/mate-user-share/package.nix
@@ -13,7 +13,6 @@
   libcanberra-gtk3,
   apacheHttpdPackages,
   hicolor-icon-theme,
-  mate,
   wrapGAppsHook3,
   gitUpdater,
 }:
diff --git a/pkgs/by-name/pl/plata-theme/package.nix b/pkgs/by-name/pl/plata-theme/package.nix
index 23a82e148f61..fb7d678b14f9 100644
--- a/pkgs/by-name/pl/plata-theme/package.nix
+++ b/pkgs/by-name/pl/plata-theme/package.nix
@@ -18,7 +18,7 @@
   xfceSupport ? true,
   mateSupport ? true,
   gtk3,
-  mate,
+  marco,
   gtkNextSupport ? false,
   plankSupport ? false,
   steamSupport ? false,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals mateSupport [
     gtk3
-    mate.marco
+    marco
   ]
   ++ lib.optional telegramSupport zip;
 
diff --git a/pkgs/by-name/th/themechanger/package.nix b/pkgs/by-name/th/themechanger/package.nix
index 130bb9ef0ff3..9f35e962288a 100644
--- a/pkgs/by-name/th/themechanger/package.nix
+++ b/pkgs/by-name/th/themechanger/package.nix
@@ -10,7 +10,8 @@
   glib,
   gnome,
   gtk3,
-  mate,
+  mate-desktop,
+  mate-settings-daemon,
   python3,
   gsettings-desktop-schemas,
   python3Packages,
@@ -44,8 +45,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
     glib
     gnome.nixos-gsettings-overrides
     gtk3
-    mate.mate-desktop
-    mate.mate-settings-daemon
+    mate-desktop
+    mate-settings-daemon
     python3
     gsettings-desktop-schemas
   ];
diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix
index c18b94a9f468..f22a5048769f 100644
--- a/pkgs/by-name/xa/xapp/package.nix
+++ b/pkgs/by-name/xa/xapp/package.nix
@@ -17,7 +17,7 @@
   wrapGAppsHook3,
   file,
   inxi,
-  mate,
+  mate-panel,
   dbus,
   libdbusmenu-gtk3,
 }:
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     gdk-pixbuf
     libxkbfile
     python3.pkgs.pygobject3 # for .pc file
-    mate.mate-panel # for gobject-introspection
+    mate-panel # for gobject-introspection
     dbus
     libdbusmenu-gtk3
   ];
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
index ca9dc42fcfce..5fcaf5502746 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
@@ -10,7 +10,7 @@
   glib,
   gtk3,
   gsettings-desktop-schemas,
-  mate,
+  mate-desktop,
   xapp,
   xdg-desktop-portal,
 }:
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk3
     gsettings-desktop-schemas # org.gnome.system.location
-    mate.mate-desktop # org.mate.background
+    mate-desktop # org.mate.background
     xapp # org.x.apps.portal
     xdg-desktop-portal
   ];
diff --git a/pkgs/by-name/xm/xmonad_log_applet/package.nix b/pkgs/by-name/xm/xmonad_log_applet/package.nix
index 35ee0988a8f2..6a134e91ebe5 100644
--- a/pkgs/by-name/xm/xmonad_log_applet/package.nix
+++ b/pkgs/by-name/xm/xmonad_log_applet/package.nix
@@ -11,7 +11,7 @@
   gtk2,
   gtk3,
   gnome-panel,
-  mate,
+  mate-panel,
   libxfce4util,
   xfce4-panel,
 }:
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals (desktopSupport == "mate") [
     gtk3
-    mate.mate-panel
+    mate-panel
   ]
   ++ lib.optionals (desktopSupport == "xfce4") [
     gtk2

From 86683adb502c85fa434ecba82a3970572019a93c Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 13:34:14 -0800
Subject: [PATCH 44/52] caja-with-extensions: fix inputs

---
 pkgs/by-name/ca/caja-with-extensions/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ca/caja-with-extensions/package.nix b/pkgs/by-name/ca/caja-with-extensions/package.nix
index 30724613c9d3..991880e57784 100644
--- a/pkgs/by-name/ca/caja-with-extensions/package.nix
+++ b/pkgs/by-name/ca/caja-with-extensions/package.nix
@@ -5,13 +5,13 @@
   wrapGAppsHook3,
   lndir,
   caja,
-  cajaExtensions,
+  mate,
   extensions ? [ ],
   useDefaultExtensions ? true,
 }:
 
 let
-  selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions cajaExtensions);
+  selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions mate.cajaExtensions);
 in
 stdenv.mkDerivation {
   pname = "${caja.pname}-with-extensions";

From 6222a5e31c6b25ad8dec54ef2662688e2a2ac2a3 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 13:37:58 -0800
Subject: [PATCH 45/52] mate-panel-with-applets: fix inputs

---
 pkgs/by-name/ma/mate-panel-with-applets/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/mate-panel-with-applets/package.nix b/pkgs/by-name/ma/mate-panel-with-applets/package.nix
index b63e6d7a886b..ba0ee5298705 100644
--- a/pkgs/by-name/ma/mate-panel-with-applets/package.nix
+++ b/pkgs/by-name/ma/mate-panel-with-applets/package.nix
@@ -6,13 +6,13 @@
   lndir,
   marco,
   mate-panel,
-  panelApplets,
+  mate,
   applets ? [ ],
   useDefaultApplets ? true,
 }:
 
 let
-  selectedApplets = applets ++ (lib.optionals useDefaultApplets panelApplets);
+  selectedApplets = applets ++ (lib.optionals useDefaultApplets mate.panelApplets);
 in
 stdenv.mkDerivation {
   pname = "${mate-panel.pname}-with-applets";

From 91b635e07f0e48049da0a2a9d39c316821c923e5 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 13:52:31 -0800
Subject: [PATCH 46/52] pkgs/desktops/mate: fix package groupings

---
 pkgs/desktops/mate/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 7448637f8cf5..f4b59506712f 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -22,7 +22,7 @@ let
         };
 
       # Caja and mate-panel are managed in NixOS module.
-      basePackages = [
+      basePackages = with pkgs; [
         libmatekbd
         libmatemixer
         libmateweather
@@ -40,7 +40,7 @@ let
         mate-themes
       ];
 
-      extraPackages = [
+      extraPackages = with pkgs; [
         atril
         caja-extensions # for caja-sendto
         engrampa
@@ -62,11 +62,9 @@ let
         pluma
       ];
 
-      cajaExtensions = [
-        caja-extensions
-      ];
+      cajaExtensions = [ pkgs.caja-extensions ];
 
-      panelApplets = [
+      panelApplets = with pkgs; [
         mate-applets
         mate-indicator-applet
         mate-netbook

From f9d53a87265f1728590b546ec106293dd9cc1825 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 15:09:09 -0800
Subject: [PATCH 47/52] doc/release-notes: mention mate scope

---
 nixos/doc/manual/release-notes/rl-2605.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index 2396dcef6fa3..a457c53e84e5 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -94,6 +94,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh
 
 - `services.desktopManager.gnome` no longer installs the Geary e-mail client since it is not part of the GNOME [core applications](https://apps.gnome.org/) list. Geary's position in the default favorite apps section has been replaced by GNOME Text Editor. To keep it installed, add `programs.geary.enable = true;` to your configuration.
 
+- MATE packages have been moved to top level (e.g. if you previously added `pkgs.mate.caja` to `environment.systemPackages`, you will need to change it to `pkgs.caja`).
+
 - `walker` has been updated to 2.0.0+, which is a complete rewrite in rust.
 
   It now requires a running `elephant` application launcher backend service, which can be enabled using the new `services.elephpant.enable`.

From 5dc27a087f6d80e51dcb1a2198fee54edfbd3945 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 14 Feb 2026 14:18:17 +0800
Subject: [PATCH 48/52] mate.{base,extra}Packages: drop

Moved to nixos module.
---
 .../services/x11/desktop-managers/mate.nix    | 70 ++++++++++++++-----
 pkgs/desktops/mate/default.nix                | 44 +-----------
 2 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index 2e658cb83c66..764e903cc2c5 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -70,24 +70,58 @@ in
       # Debugging
       environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1";
 
-      environment.systemPackages = utils.removePackagesByName (
-        pkgs.mate.basePackages
-        ++ pkgs.mate.extraPackages
-        ++ [
-          (pkgs.caja-with-extensions.override {
-            extensions = cfg.extraCajaExtensions;
-          })
-          (pkgs.mate-panel-with-applets.override {
-            applets = cfg.extraPanelApplets;
-          })
-          pkgs.desktop-file-utils
-          pkgs.glib
-          pkgs.gtk3.out
-          pkgs.shared-mime-info
-          pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
-          pkgs.yelp # for 'Contents' in 'Help' menus
-        ]
-      ) config.environment.mate.excludePackages;
+      environment.systemPackages = utils.removePackagesByName (with pkgs; [
+        # Base packages.
+        libmatekbd
+        libmatemixer
+        libmateweather
+        marco
+        mate-common
+        mate-control-center
+        mate-desktop
+        mate-icon-theme
+        mate-menus
+        mate-notification-daemon
+        mate-polkit
+        mate-session-manager
+        mate-settings-daemon
+        mate-settings-daemon-wrapped
+        mate-themes
+
+        # Extra packages.
+        atril
+        caja-extensions # for caja-sendto
+        engrampa
+        eom
+        mate-applets
+        mate-backgrounds
+        mate-calc
+        mate-indicator-applet
+        mate-media
+        mate-netbook
+        mate-power-manager
+        mate-screensaver
+        mate-system-monitor
+        mate-terminal
+        mate-user-guide
+        # mate-user-share
+        mate-utils
+        mozo
+        pluma
+
+        (caja-with-extensions.override {
+          extensions = cfg.extraCajaExtensions;
+        })
+        (mate-panel-with-applets.override {
+          applets = cfg.extraPanelApplets;
+        })
+        desktop-file-utils
+        glib
+        gtk3.out
+        shared-mime-info
+        xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
+        yelp # for 'Contents' in 'Help' menus
+      ]) config.environment.mate.excludePackages;
 
       programs.dconf.enable = true;
       # Shell integration for VTE terminals
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index f4b59506712f..7d4ab54139a9 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -21,47 +21,6 @@ let
           url = if url == null then "https://git.mate-desktop.org/${pname}" else url;
         };
 
-      # Caja and mate-panel are managed in NixOS module.
-      basePackages = with pkgs; [
-        libmatekbd
-        libmatemixer
-        libmateweather
-        marco
-        mate-common
-        mate-control-center
-        mate-desktop
-        mate-icon-theme
-        mate-menus
-        mate-notification-daemon
-        mate-polkit
-        mate-session-manager
-        mate-settings-daemon
-        mate-settings-daemon-wrapped
-        mate-themes
-      ];
-
-      extraPackages = with pkgs; [
-        atril
-        caja-extensions # for caja-sendto
-        engrampa
-        eom
-        mate-applets
-        mate-backgrounds
-        mate-calc
-        mate-indicator-applet
-        mate-media
-        mate-netbook
-        mate-power-manager
-        mate-screensaver
-        mate-system-monitor
-        mate-terminal
-        mate-user-guide
-        # mate-user-share
-        mate-utils
-        mozo
-        pluma
-      ];
-
       cajaExtensions = [ pkgs.caja-extensions ];
 
       panelApplets = with pkgs; [
@@ -79,6 +38,9 @@ let
 in
 lib.makeScope pkgs.newScope packages
 // lib.optionalAttrs config.allowAliases {
+  basePackages = throw "‘mate.basePackages’ was removed. Please list the packages you need explicitly"; # Added on 2026-02-14
+  extraPackages = throw "‘mate.extraPackages’ was removed. Please list the packages you need explicitly"; # Added on 2026-02-14
+
   atril = lib.warnOnInstantiate "‘mate.atril’ was moved to top-level. Please use ‘pkgs.atril’ directly" pkgs.atril; # Added on 2026-02-08
   engrampa = lib.warnOnInstantiate "‘mate.engrampa’ was moved to top-level. Please use ‘pkgs.engrampa’ directly" pkgs.engrampa; # Added on 2026-02-08
   eom = lib.warnOnInstantiate "‘mate.eom’ was moved to top-level. Please use ‘pkgs.eom’ directly" pkgs.eom; # Added on 2026-02-08

From 565e31ff9e131c28f810533d7485943180c8ce8f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 14 Feb 2026 14:22:21 +0800
Subject: [PATCH 49/52] mate.mateUpdateScript: drop

Not used.
---
 pkgs/desktops/mate/default.nix | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 7d4ab54139a9..792c7f082922 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -7,20 +7,6 @@
 let
   packages =
     self: with self; {
-
-      # Update script tailored to mate packages from git repository
-      mateUpdateScript =
-        {
-          pname,
-          odd-unstable ? true,
-          rev-prefix ? "v",
-          url ? null,
-        }:
-        pkgs.gitUpdater {
-          inherit odd-unstable rev-prefix;
-          url = if url == null then "https://git.mate-desktop.org/${pname}" else url;
-        };
-
       cajaExtensions = [ pkgs.caja-extensions ];
 
       panelApplets = with pkgs; [
@@ -40,6 +26,7 @@ lib.makeScope pkgs.newScope packages
 // lib.optionalAttrs config.allowAliases {
   basePackages = throw "‘mate.basePackages’ was removed. Please list the packages you need explicitly"; # Added on 2026-02-14
   extraPackages = throw "‘mate.extraPackages’ was removed. Please list the packages you need explicitly"; # Added on 2026-02-14
+  mateUpdateScript = throw "‘mate.mateUpdateScript’ was removed. Please use ‘pkgs.gitUpdater’ directly"; # Added on 2026-02-14
 
   atril = lib.warnOnInstantiate "‘mate.atril’ was moved to top-level. Please use ‘pkgs.atril’ directly" pkgs.atril; # Added on 2026-02-08
   engrampa = lib.warnOnInstantiate "‘mate.engrampa’ was moved to top-level. Please use ‘pkgs.engrampa’ directly" pkgs.engrampa; # Added on 2026-02-08

From ffe8b46fecdc1cb6f87ee814d784a1ddc4e3bda5 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 14 Feb 2026 14:29:09 +0800
Subject: [PATCH 50/52] mate.{cajaExtensions,panelApplets}: drop

Moved to corresponding packages.
---
 .../ca/caja-with-extensions/package.nix       |  4 ++--
 .../ma/mate-panel-with-applets/package.nix    | 22 +++++++++++++++++--
 pkgs/desktops/mate/default.nix                | 22 +++----------------
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/ca/caja-with-extensions/package.nix b/pkgs/by-name/ca/caja-with-extensions/package.nix
index 991880e57784..43034921a6de 100644
--- a/pkgs/by-name/ca/caja-with-extensions/package.nix
+++ b/pkgs/by-name/ca/caja-with-extensions/package.nix
@@ -5,13 +5,13 @@
   wrapGAppsHook3,
   lndir,
   caja,
-  mate,
+  caja-extensions,
   extensions ? [ ],
   useDefaultExtensions ? true,
 }:
 
 let
-  selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions mate.cajaExtensions);
+  selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions [ caja-extensions ]);
 in
 stdenv.mkDerivation {
   pname = "${caja.pname}-with-extensions";
diff --git a/pkgs/by-name/ma/mate-panel-with-applets/package.nix b/pkgs/by-name/ma/mate-panel-with-applets/package.nix
index ba0ee5298705..f82cecaef779 100644
--- a/pkgs/by-name/ma/mate-panel-with-applets/package.nix
+++ b/pkgs/by-name/ma/mate-panel-with-applets/package.nix
@@ -5,14 +5,32 @@
   wrapGAppsHook3,
   lndir,
   marco,
+  mate-applets,
+  mate-indicator-applet,
+  mate-netbook,
+  mate-notification-daemon,
+  mate-media,
   mate-panel,
-  mate,
+  mate-power-manager,
+  mate-sensors-applet,
+  mate-utils,
   applets ? [ ],
   useDefaultApplets ? true,
 }:
 
 let
-  selectedApplets = applets ++ (lib.optionals useDefaultApplets mate.panelApplets);
+  selectedApplets =
+    applets
+    ++ (lib.optionals useDefaultApplets [
+      mate-applets
+      mate-indicator-applet
+      mate-netbook
+      mate-notification-daemon
+      mate-media
+      mate-power-manager
+      mate-sensors-applet
+      mate-utils
+    ]);
 in
 stdenv.mkDerivation {
   pname = "${mate-panel.pname}-with-applets";
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 792c7f082922..910af1b27c00 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -4,29 +4,13 @@
   config,
 }:
 
-let
-  packages =
-    self: with self; {
-      cajaExtensions = [ pkgs.caja-extensions ];
-
-      panelApplets = with pkgs; [
-        mate-applets
-        mate-indicator-applet
-        mate-netbook
-        mate-notification-daemon
-        mate-media
-        mate-power-manager
-        mate-sensors-applet
-        mate-utils
-      ];
-    };
-
-in
-lib.makeScope pkgs.newScope packages
+lib.makeScope pkgs.newScope (self: { })
 // lib.optionalAttrs config.allowAliases {
   basePackages = throw "‘mate.basePackages’ was removed. Please list the packages you need explicitly"; # Added on 2026-02-14
+  cajaExtensions = throw "‘mate.cajaExtensions’ was removed. Please list the extensions you need explicitly"; # Added on 2026-02-14
   extraPackages = throw "‘mate.extraPackages’ was removed. Please list the packages you need explicitly"; # Added on 2026-02-14
   mateUpdateScript = throw "‘mate.mateUpdateScript’ was removed. Please use ‘pkgs.gitUpdater’ directly"; # Added on 2026-02-14
+  panelApplets = throw "‘mate.panelApplets’ was removed. Please list the applets you need explicitly"; # Added on 2026-02-14
 
   atril = lib.warnOnInstantiate "‘mate.atril’ was moved to top-level. Please use ‘pkgs.atril’ directly" pkgs.atril; # Added on 2026-02-08
   engrampa = lib.warnOnInstantiate "‘mate.engrampa’ was moved to top-level. Please use ‘pkgs.engrampa’ directly" pkgs.engrampa; # Added on 2026-02-08

From 4797e6471b4d62cf913f4eba8d115183a2eec79b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 14 Feb 2026 14:32:47 +0800
Subject: [PATCH 51/52] mate: move aliases back to scope

Ensure the warnings are shown on `nixos-rebuild`s.
---
 pkgs/desktops/mate/default.nix | 109 +++++++++++++++++----------------
 1 file changed, 56 insertions(+), 53 deletions(-)

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 910af1b27c00..c3c23f04600b 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -4,57 +4,60 @@
   config,
 }:
 
-lib.makeScope pkgs.newScope (self: { })
-// lib.optionalAttrs config.allowAliases {
-  basePackages = throw "‘mate.basePackages’ was removed. Please list the packages you need explicitly"; # Added on 2026-02-14
-  cajaExtensions = throw "‘mate.cajaExtensions’ was removed. Please list the extensions you need explicitly"; # Added on 2026-02-14
-  extraPackages = throw "‘mate.extraPackages’ was removed. Please list the packages you need explicitly"; # Added on 2026-02-14
-  mateUpdateScript = throw "‘mate.mateUpdateScript’ was removed. Please use ‘pkgs.gitUpdater’ directly"; # Added on 2026-02-14
-  panelApplets = throw "‘mate.panelApplets’ was removed. Please list the applets you need explicitly"; # Added on 2026-02-14
+lib.makeScope pkgs.newScope (
+  self:
+  { }
+  // lib.optionalAttrs config.allowAliases {
+    basePackages = throw "‘mate.basePackages’ was removed. Please list the packages you need explicitly"; # Added on 2026-02-14
+    cajaExtensions = throw "‘mate.cajaExtensions’ was removed. Please list the extensions you need explicitly"; # Added on 2026-02-14
+    extraPackages = throw "‘mate.extraPackages’ was removed. Please list the packages you need explicitly"; # Added on 2026-02-14
+    mateUpdateScript = throw "‘mate.mateUpdateScript’ was removed. Please use ‘pkgs.gitUpdater’ directly"; # Added on 2026-02-14
+    panelApplets = throw "‘mate.panelApplets’ was removed. Please list the applets you need explicitly"; # Added on 2026-02-14
 
-  atril = lib.warnOnInstantiate "‘mate.atril’ was moved to top-level. Please use ‘pkgs.atril’ directly" pkgs.atril; # Added on 2026-02-08
-  engrampa = lib.warnOnInstantiate "‘mate.engrampa’ was moved to top-level. Please use ‘pkgs.engrampa’ directly" pkgs.engrampa; # Added on 2026-02-08
-  eom = lib.warnOnInstantiate "‘mate.eom’ was moved to top-level. Please use ‘pkgs.eom’ directly" pkgs.eom; # Added on 2026-02-08
-  libmatekbd = lib.warnOnInstantiate "‘mate.libmatekbd’ was moved to top-level. Please use ‘pkgs.libmatekbd’ directly" pkgs.libmatekbd; # Added on 2026-02-08
-  libmatemixer = lib.warnOnInstantiate "‘mate.libmatemixer’ was moved to top-level. Please use ‘pkgs.libmatemixer’ directly" pkgs.libmatemixer; # Added on 2026-02-08
-  libmateweather = lib.warnOnInstantiate "‘mate.libmateweather’ was moved to top-level. Please use ‘pkgs.libmateweather’ directly" pkgs.libmateweather; # Added on 2026-02-08
-  marco = lib.warnOnInstantiate "‘mate.marco’ was moved to top-level. Please use ‘pkgs.marco’ directly" pkgs.marco; # Added on 2026-02-08
-  mate-applets = lib.warnOnInstantiate "‘mate.mate-applets’ was moved to top-level. Please use ‘pkgs.mate-applets’ directly" pkgs.mate-applets; # Added on 2026-02-08
-  mate-backgrounds = lib.warnOnInstantiate "‘mate.mate-backgrounds’ was moved to top-level. Please use ‘pkgs.mate-backgrounds’ directly" pkgs.mate-backgrounds; # Added on 2026-02-08
-  mate-calc = lib.warnOnInstantiate "‘mate.mate-calc’ was moved to top-level. Please use ‘pkgs.mate-calc’ directly" pkgs.mate-calc; # Added on 2026-02-08
-  mate-common = lib.warnOnInstantiate "‘mate.mate-common’ was moved to top-level. Please use ‘pkgs.mate-common’ directly" pkgs.mate-common; # Added on 2026-02-08
-  mate-control-center = lib.warnOnInstantiate "‘mate.mate-control-center’ was moved to top-level. Please use ‘pkgs.mate-control-center’ directly" pkgs.mate-control-center; # Added on 2026-02-08
-  mate-desktop = lib.warnOnInstantiate "‘mate.mate-desktop’ was moved to top-level. Please use ‘pkgs.mate-desktop’ directly" pkgs.mate-desktop; # Added on 2026-02-08
-  mate-gsettings-overrides = lib.warnOnInstantiate "‘mate.mate-gsettings-overrides’ was moved to top-level. Please use ‘pkgs.mate-gsettings-overrides’ directly" pkgs.mate-gsettings-overrides; # Added on 2026-02-08
-  mate-icon-theme = lib.warnOnInstantiate "‘mate.mate-icon-theme’ was moved to top-level. Please use ‘pkgs.mate-icon-theme’ directly" pkgs.mate-icon-theme; # Added on 2026-02-08
-  mate-icon-theme-faenza = lib.warnOnInstantiate "‘mate.mate-icon-theme-faenza’ was moved to top-level. Please use ‘pkgs.mate-icon-theme-faenza’ directly" pkgs.mate-icon-theme-faenza; # Added on 2026-02-08
-  mate-indicator-applet = lib.warnOnInstantiate "‘mate.mate-indicator-applet’ was moved to top-level. Please use ‘pkgs.mate-indicator-applet’ directly" pkgs.mate-indicator-applet; # Added on 2026-02-08
-  mate-media = lib.warnOnInstantiate "‘mate.mate-media’ was moved to top-level. Please use ‘pkgs.mate-media’ directly" pkgs.mate-media; # Added on 2026-02-08
-  mate-menus = lib.warnOnInstantiate "‘mate.mate-menus’ was moved to top-level. Please use ‘pkgs.mate-menus’ directly" pkgs.mate-menus; # Added on 2026-02-08
-  mate-netbook = lib.warnOnInstantiate "‘mate.mate-netbook’ was moved to top-level. Please use ‘pkgs.mate-netbook’ directly" pkgs.mate-netbook; # Added on 2026-02-08
-  mate-notification-daemon = lib.warnOnInstantiate "‘mate.mate-notification-daemon’ was moved to top-level. Please use ‘pkgs.mate-notification-daemon’ directly" pkgs.mate-notification-daemon; # Added on 2026-02-08
-  mate-polkit = lib.warnOnInstantiate "‘mate.mate-polkit’ was moved to top-level. Please use ‘pkgs.mate-polkit’ directly" pkgs.mate-polkit; # Added on 2026-02-08
-  mate-power-manager = lib.warnOnInstantiate "‘mate.mate-power-manager’ was moved to top-level. Please use ‘pkgs.mate-power-manager’ directly" pkgs.mate-power-manager; # Added on 2026-02-08
-  mate-screensaver = lib.warnOnInstantiate "‘mate.mate-screensaver’ was moved to top-level. Please use ‘pkgs.mate-screensaver’ directly" pkgs.mate-screensaver; # Added on 2026-02-08
-  mate-sensors-applet = lib.warnOnInstantiate "‘mate.mate-sensors-applet’ was moved to top-level. Please use ‘pkgs.mate-sensors-applet’ directly" pkgs.mate-sensors-applet; # Added on 2026-02-08
-  mate-session-manager = lib.warnOnInstantiate "‘mate.mate-session-manager’ was moved to top-level. Please use ‘pkgs.mate-session-manager’ directly" pkgs.mate-session-manager; # Added on 2026-02-08
-  mate-system-monitor = lib.warnOnInstantiate "‘mate.mate-system-monitor’ was moved to top-level. Please use ‘pkgs.mate-system-monitor’ directly" pkgs.mate-system-monitor; # Added on 2026-02-08
-  mate-terminal = lib.warnOnInstantiate "‘mate.mate-terminal’ was moved to top-level. Please use ‘pkgs.mate-terminal’ directly" pkgs.mate-terminal; # Added on 2026-02-08
-  mate-themes = lib.warnOnInstantiate "‘mate.mate-themes’ was moved to top-level. Please use ‘pkgs.mate-themes’ directly" pkgs.mate-themes; # Added on 2026-02-08
-  mate-tweak = lib.warnOnInstantiate "‘mate.mate-tweak’ was moved to top-level. Please use ‘pkgs.mate-tweak’ directly" pkgs.mate-tweak; # Added on 2026-02-08
-  mate-user-guide = lib.warnOnInstantiate "‘mate.mate-user-guide’ was moved to top-level. Please use ‘pkgs.mate-user-guide’ directly" pkgs.mate-user-guide; # Added on 2026-02-08
-  mate-user-share = lib.warnOnInstantiate "‘mate.mate-user-share’ was moved to top-level. Please use ‘pkgs.mate-user-share’ directly" pkgs.mate-user-share; # Added on 2026-02-08
-  mate-utils = lib.warnOnInstantiate "‘mate.mate-utils’ was moved to top-level. Please use ‘pkgs.mate-utils’ directly" pkgs.mate-utils; # Added on 2026-02-08
-  mate-wayland-session = lib.warnOnInstantiate "‘mate.mate-wayland-session’ was moved to top-level. Please use ‘pkgs.mate-wayland-session’ directly" pkgs.mate-wayland-session; # Added on 2026-02-08
-  mozo = lib.warnOnInstantiate "‘mate.mozo’ was moved to top-level. Please use ‘pkgs.mozo’ directly" pkgs.mozo; # Added on 2026-02-08
-  pluma = lib.warnOnInstantiate "‘mate.pluma’ was moved to top-level. Please use ‘pkgs.pluma’ directly" pkgs.pluma; # Added on 2026-02-08
-  python-caja = lib.warnOnInstantiate "‘mate.python-caja’ was moved to top-level. Please use ‘pkgs.python-caja’ directly" pkgs.python-caja; # Added on 2026-02-08
-  caja-dropbox = lib.warnOnInstantiate "‘mate.caja-dropbox’ was moved to top-level. Please use ‘pkgs.caja-dropbox’ directly" pkgs.caja-dropbox; # Added on 2026-02-08
-  caja-extensions = lib.warnOnInstantiate "‘mate.caja-extensions’ was moved to top-level. Please use ‘pkgs.caja-extensions’ directly" pkgs.caja-extensions; # Added on 2026-02-08
-  caja = lib.warnOnInstantiate "‘mate.caja’ was moved to top-level. Please use ‘pkgs.caja’ directly" pkgs.caja; # Added on 2026-02-08
-  caja-with-extensions = lib.warnOnInstantiate "‘mate.caja-with-extensions’ was moved to top-level. Please use ‘pkgs.caja-with-extensions’ directly" pkgs.caja-with-extensions; # Added on 2026-02-08
-  mate-panel = lib.warnOnInstantiate "‘mate.mate-panel’ was moved to top-level. Please use ‘pkgs.mate-panel’ directly" pkgs.mate-panel; # Added on 2026-02-08
-  mate-panel-with-applets = lib.warnOnInstantiate "‘mate.mate-panel-with-applets’ was moved to top-level. Please use ‘pkgs.mate-panel-with-applets’ directly" pkgs.mate-panel-with-applets; # Added on 2026-02-08
-  mate-settings-daemon = lib.warnOnInstantiate "‘mate.mate-settings-daemon’ was moved to top-level. Please use ‘pkgs.mate-settings-daemon’ directly" pkgs.mate-settings-daemon; # Added on 2026-02-08
-  mate-settings-daemon-wrapped = lib.warnOnInstantiate "‘mate.mate-settings-daemon-wrapped’ was moved to top-level. Please use ‘pkgs.mate-settings-daemon-wrapped’ directly" pkgs.mate-settings-daemon-wrapped; # Added on 2026-02-08
-}
+    atril = lib.warnOnInstantiate "‘mate.atril’ was moved to top-level. Please use ‘pkgs.atril’ directly" pkgs.atril; # Added on 2026-02-08
+    engrampa = lib.warnOnInstantiate "‘mate.engrampa’ was moved to top-level. Please use ‘pkgs.engrampa’ directly" pkgs.engrampa; # Added on 2026-02-08
+    eom = lib.warnOnInstantiate "‘mate.eom’ was moved to top-level. Please use ‘pkgs.eom’ directly" pkgs.eom; # Added on 2026-02-08
+    libmatekbd = lib.warnOnInstantiate "‘mate.libmatekbd’ was moved to top-level. Please use ‘pkgs.libmatekbd’ directly" pkgs.libmatekbd; # Added on 2026-02-08
+    libmatemixer = lib.warnOnInstantiate "‘mate.libmatemixer’ was moved to top-level. Please use ‘pkgs.libmatemixer’ directly" pkgs.libmatemixer; # Added on 2026-02-08
+    libmateweather = lib.warnOnInstantiate "‘mate.libmateweather’ was moved to top-level. Please use ‘pkgs.libmateweather’ directly" pkgs.libmateweather; # Added on 2026-02-08
+    marco = lib.warnOnInstantiate "‘mate.marco’ was moved to top-level. Please use ‘pkgs.marco’ directly" pkgs.marco; # Added on 2026-02-08
+    mate-applets = lib.warnOnInstantiate "‘mate.mate-applets’ was moved to top-level. Please use ‘pkgs.mate-applets’ directly" pkgs.mate-applets; # Added on 2026-02-08
+    mate-backgrounds = lib.warnOnInstantiate "‘mate.mate-backgrounds’ was moved to top-level. Please use ‘pkgs.mate-backgrounds’ directly" pkgs.mate-backgrounds; # Added on 2026-02-08
+    mate-calc = lib.warnOnInstantiate "‘mate.mate-calc’ was moved to top-level. Please use ‘pkgs.mate-calc’ directly" pkgs.mate-calc; # Added on 2026-02-08
+    mate-common = lib.warnOnInstantiate "‘mate.mate-common’ was moved to top-level. Please use ‘pkgs.mate-common’ directly" pkgs.mate-common; # Added on 2026-02-08
+    mate-control-center = lib.warnOnInstantiate "‘mate.mate-control-center’ was moved to top-level. Please use ‘pkgs.mate-control-center’ directly" pkgs.mate-control-center; # Added on 2026-02-08
+    mate-desktop = lib.warnOnInstantiate "‘mate.mate-desktop’ was moved to top-level. Please use ‘pkgs.mate-desktop’ directly" pkgs.mate-desktop; # Added on 2026-02-08
+    mate-gsettings-overrides = lib.warnOnInstantiate "‘mate.mate-gsettings-overrides’ was moved to top-level. Please use ‘pkgs.mate-gsettings-overrides’ directly" pkgs.mate-gsettings-overrides; # Added on 2026-02-08
+    mate-icon-theme = lib.warnOnInstantiate "‘mate.mate-icon-theme’ was moved to top-level. Please use ‘pkgs.mate-icon-theme’ directly" pkgs.mate-icon-theme; # Added on 2026-02-08
+    mate-icon-theme-faenza = lib.warnOnInstantiate "‘mate.mate-icon-theme-faenza’ was moved to top-level. Please use ‘pkgs.mate-icon-theme-faenza’ directly" pkgs.mate-icon-theme-faenza; # Added on 2026-02-08
+    mate-indicator-applet = lib.warnOnInstantiate "‘mate.mate-indicator-applet’ was moved to top-level. Please use ‘pkgs.mate-indicator-applet’ directly" pkgs.mate-indicator-applet; # Added on 2026-02-08
+    mate-media = lib.warnOnInstantiate "‘mate.mate-media’ was moved to top-level. Please use ‘pkgs.mate-media’ directly" pkgs.mate-media; # Added on 2026-02-08
+    mate-menus = lib.warnOnInstantiate "‘mate.mate-menus’ was moved to top-level. Please use ‘pkgs.mate-menus’ directly" pkgs.mate-menus; # Added on 2026-02-08
+    mate-netbook = lib.warnOnInstantiate "‘mate.mate-netbook’ was moved to top-level. Please use ‘pkgs.mate-netbook’ directly" pkgs.mate-netbook; # Added on 2026-02-08
+    mate-notification-daemon = lib.warnOnInstantiate "‘mate.mate-notification-daemon’ was moved to top-level. Please use ‘pkgs.mate-notification-daemon’ directly" pkgs.mate-notification-daemon; # Added on 2026-02-08
+    mate-polkit = lib.warnOnInstantiate "‘mate.mate-polkit’ was moved to top-level. Please use ‘pkgs.mate-polkit’ directly" pkgs.mate-polkit; # Added on 2026-02-08
+    mate-power-manager = lib.warnOnInstantiate "‘mate.mate-power-manager’ was moved to top-level. Please use ‘pkgs.mate-power-manager’ directly" pkgs.mate-power-manager; # Added on 2026-02-08
+    mate-screensaver = lib.warnOnInstantiate "‘mate.mate-screensaver’ was moved to top-level. Please use ‘pkgs.mate-screensaver’ directly" pkgs.mate-screensaver; # Added on 2026-02-08
+    mate-sensors-applet = lib.warnOnInstantiate "‘mate.mate-sensors-applet’ was moved to top-level. Please use ‘pkgs.mate-sensors-applet’ directly" pkgs.mate-sensors-applet; # Added on 2026-02-08
+    mate-session-manager = lib.warnOnInstantiate "‘mate.mate-session-manager’ was moved to top-level. Please use ‘pkgs.mate-session-manager’ directly" pkgs.mate-session-manager; # Added on 2026-02-08
+    mate-system-monitor = lib.warnOnInstantiate "‘mate.mate-system-monitor’ was moved to top-level. Please use ‘pkgs.mate-system-monitor’ directly" pkgs.mate-system-monitor; # Added on 2026-02-08
+    mate-terminal = lib.warnOnInstantiate "‘mate.mate-terminal’ was moved to top-level. Please use ‘pkgs.mate-terminal’ directly" pkgs.mate-terminal; # Added on 2026-02-08
+    mate-themes = lib.warnOnInstantiate "‘mate.mate-themes’ was moved to top-level. Please use ‘pkgs.mate-themes’ directly" pkgs.mate-themes; # Added on 2026-02-08
+    mate-tweak = lib.warnOnInstantiate "‘mate.mate-tweak’ was moved to top-level. Please use ‘pkgs.mate-tweak’ directly" pkgs.mate-tweak; # Added on 2026-02-08
+    mate-user-guide = lib.warnOnInstantiate "‘mate.mate-user-guide’ was moved to top-level. Please use ‘pkgs.mate-user-guide’ directly" pkgs.mate-user-guide; # Added on 2026-02-08
+    mate-user-share = lib.warnOnInstantiate "‘mate.mate-user-share’ was moved to top-level. Please use ‘pkgs.mate-user-share’ directly" pkgs.mate-user-share; # Added on 2026-02-08
+    mate-utils = lib.warnOnInstantiate "‘mate.mate-utils’ was moved to top-level. Please use ‘pkgs.mate-utils’ directly" pkgs.mate-utils; # Added on 2026-02-08
+    mate-wayland-session = lib.warnOnInstantiate "‘mate.mate-wayland-session’ was moved to top-level. Please use ‘pkgs.mate-wayland-session’ directly" pkgs.mate-wayland-session; # Added on 2026-02-08
+    mozo = lib.warnOnInstantiate "‘mate.mozo’ was moved to top-level. Please use ‘pkgs.mozo’ directly" pkgs.mozo; # Added on 2026-02-08
+    pluma = lib.warnOnInstantiate "‘mate.pluma’ was moved to top-level. Please use ‘pkgs.pluma’ directly" pkgs.pluma; # Added on 2026-02-08
+    python-caja = lib.warnOnInstantiate "‘mate.python-caja’ was moved to top-level. Please use ‘pkgs.python-caja’ directly" pkgs.python-caja; # Added on 2026-02-08
+    caja-dropbox = lib.warnOnInstantiate "‘mate.caja-dropbox’ was moved to top-level. Please use ‘pkgs.caja-dropbox’ directly" pkgs.caja-dropbox; # Added on 2026-02-08
+    caja-extensions = lib.warnOnInstantiate "‘mate.caja-extensions’ was moved to top-level. Please use ‘pkgs.caja-extensions’ directly" pkgs.caja-extensions; # Added on 2026-02-08
+    caja = lib.warnOnInstantiate "‘mate.caja’ was moved to top-level. Please use ‘pkgs.caja’ directly" pkgs.caja; # Added on 2026-02-08
+    caja-with-extensions = lib.warnOnInstantiate "‘mate.caja-with-extensions’ was moved to top-level. Please use ‘pkgs.caja-with-extensions’ directly" pkgs.caja-with-extensions; # Added on 2026-02-08
+    mate-panel = lib.warnOnInstantiate "‘mate.mate-panel’ was moved to top-level. Please use ‘pkgs.mate-panel’ directly" pkgs.mate-panel; # Added on 2026-02-08
+    mate-panel-with-applets = lib.warnOnInstantiate "‘mate.mate-panel-with-applets’ was moved to top-level. Please use ‘pkgs.mate-panel-with-applets’ directly" pkgs.mate-panel-with-applets; # Added on 2026-02-08
+    mate-settings-daemon = lib.warnOnInstantiate "‘mate.mate-settings-daemon’ was moved to top-level. Please use ‘pkgs.mate-settings-daemon’ directly" pkgs.mate-settings-daemon; # Added on 2026-02-08
+    mate-settings-daemon-wrapped = lib.warnOnInstantiate "‘mate.mate-settings-daemon-wrapped’ was moved to top-level. Please use ‘pkgs.mate-settings-daemon-wrapped’ directly" pkgs.mate-settings-daemon-wrapped; # Added on 2026-02-08
+  }
+)

From d14afe8009f1488b739dd912f936e2455fc283c8 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 14 Feb 2026 15:05:02 +0800
Subject: [PATCH 52/52] .github/labeler.yml: update mate package paths

To not bloat the list only core packages for now.
---
 .github/labeler.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 8ddf598bc52b..522492fd174f 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -316,6 +316,13 @@
               - nixos/modules/services/x11/desktop-managers/mate.nix
               - nixos/tests/mate.nix
               - pkgs/desktops/mate/**/*
+              - pkgs/by-name/ca/caja/**/*
+              - pkgs/by-name/ca/caja-*/**/*
+              - pkgs/by-name/li/libmatekbd/**/*
+              - pkgs/by-name/li/libmatemixer/**/*
+              - pkgs/by-name/li/libmateweather/**/*
+              - pkgs/by-name/ma/marco/**/*
+              - pkgs/by-name/ma/mate-*/**/*
 
 "6.topic: module system":
   - any: