diff --git a/modules/features/system/packages.nix b/modules/features/system/packages.nix
index ff00fc8..b411c07 100644
--- a/modules/features/system/packages.nix
+++ b/modules/features/system/packages.nix
@@ -18,8 +18,9 @@
 
       zip
       unzip
-
-      (pkgs.callPackage (custom.cage-xtmapper {}) {})
+    ]
+    ++ [
+      (lib.mkIf config.virtualisation.waydroid.enable (pkgs.callPackage (custom.cage-xtmapper {}) {}))
 
       (lib.mkIf config.programs.ffmpeg.enable config.programs.ffmpeg.package)
       (lib.mkIf config.programs.nodejs.enable config.programs.nodejs.package)
@@ -33,12 +34,14 @@
       (lib.mkIf config.programs.quickshell.enable config.programs.quickshell.package)
       (lib.mkIf config.programs.papirus-icons.enable config.programs.papirus-icons.package)
     ]
-    ++ (lib.optionals config.programs.gcc.enable config.programs.gcc.packages)
-    ++ (lib.optionals config.programs.winepackages.enable config.programs.winepackages.packages)
-    ++ (lib.optionals config.programs.kde-packages.enable config.programs.kde-packages.packages)
-    ++ (lib.optionals config.programs.r-tensorflow.enable [config.programs.r-tensorflow.package])
-    ++ (lib.optionals (
-        config.programs.hyprland-portals.enable && config.device.wm.hyprland.enable
-      )
-      config.programs.hyprland-portals.packages);
+    ++ lib.concatLists [
+      (lib.optionals config.programs.gcc.enable config.programs.gcc.packages)
+      (lib.optionals config.programs.winepackages.enable config.programs.winepackages.packages)
+      (lib.optionals config.programs.kde-packages.enable config.programs.kde-packages.packages)
+      (lib.optionals config.programs.r-tensorflow.enable [config.programs.r-tensorflow.package])
+      (lib.optionals (
+          config.programs.hyprland-portals.enable && config.device.wm.hyprland.enablez
+        )
+        config.programs.hyprland-portals.packages)
+    ];
 }