From c268cb0725f0cef8539419bc20dc956fb9ce4a30 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 7 May 2022 18:51:49 -0300
Subject: [PATCH] lxde: refactor

To be more in line with the other desktops. Indeed it is strange to look at all
those lxde packages spread over all-packages.nix.
---
 .../default.nix}                              |  0
 pkgs/desktops/lxde/default.nix                | 23 +++++++++++++++
 pkgs/top-level/all-packages.nix               | 29 +++++++------------
 3 files changed, 34 insertions(+), 18 deletions(-)
 rename pkgs/desktops/lxde/core/{lxmenu-data.nix => lxmenu-data/default.nix} (100%)
 create mode 100644 pkgs/desktops/lxde/default.nix

diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data/default.nix
similarity index 100%
rename from pkgs/desktops/lxde/core/lxmenu-data.nix
rename to pkgs/desktops/lxde/core/lxmenu-data/default.nix
diff --git a/pkgs/desktops/lxde/default.nix b/pkgs/desktops/lxde/default.nix
new file mode 100644
index 00000000000..702b4bbb67d
--- /dev/null
+++ b/pkgs/desktops/lxde/default.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs }:
+
+lib.makeScope pkgs.newScope (self: with self; {
+
+  lxappearance = callPackage ./core/lxappearance { };
+
+  lxappearance-gtk2 = callPackage ./core/lxappearance {
+    gtk2 = gtk2-x11;
+    withGtk3 = false;
+  };
+
+  lxmenu-data = callPackage ./core/lxmenu-data { };
+
+  lxpanel = callPackage ./core/lxpanel {
+    gtk2 = gtk2-x11;
+  };
+
+  lxrandr = callPackage ./core/lxrandr { };
+
+  lxsession = callPackage ./core/lxsession { };
+
+  lxtask = callPackage ./core/lxtask { };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8a7e821ba9..96f3e4a0722 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32493,24 +32493,17 @@ with pkgs;
 
   ### DESKTOPS/LXDE
 
-  lxappearance = callPackage ../desktops/lxde/core/lxappearance { };
-
-  lxappearance-gtk2 = callPackage ../desktops/lxde/core/lxappearance {
-    gtk2 = gtk2-x11;
-    withGtk3 = false;
-  };
-
-  lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };
-
-  lxpanel = callPackage ../desktops/lxde/core/lxpanel {
-    gtk2 = gtk2-x11;
-  };
-
-  lxrandr = callPackage ../desktops/lxde/core/lxrandr { };
-
-  lxsession = callPackage ../desktops/lxde/core/lxsession { };
-
-  lxtask = callPackage ../desktops/lxde/core/lxtask { };
+  lxde = recurseIntoAttrs (callPackage ../desktops/lxde { });
+  # Backwards compatibility aliases
+  inherit (lxde)
+    lxappearance
+    lxappearance-gtk2
+    lxmenu-data
+    lxpanel
+    lxrandr
+    lxsession
+    lxtask
+  ;
 
   lxqt = recurseIntoAttrs (import ../desktops/lxqt {
     inherit pkgs;