From 32d10077ddfd0aea0297a76f76300f47d51d9afe Mon Sep 17 00:00:00 2001
From: Asaki Yuki <vantrong2007vn@gmail.com>
Date: Mon, 13 Apr 2026 11:31:43 +0700
Subject: [PATCH] fix some AI bugs

---
 modules/features/home/packages.nix   | 35 ++++++++++++++--------------
 modules/features/system/packages.nix |  3 +--
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/modules/features/home/packages.nix b/modules/features/home/packages.nix
index 7701bdb..dbea11e 100644
--- a/modules/features/home/packages.nix
+++ b/modules/features/home/packages.nix
@@ -10,25 +10,24 @@
   home.packages = [
     (lib.mkIf config.programs.catppuccin.enable config.programs.catppuccin.package)
 
-    (lib.mkIf config.programs.packages.antigravity.enable config.programs.packages.antigravity.package)
-    (lib.mkIf config.programs.packages.prismlauncher.enable config.programs.packages.prismlauncher.package)
-    (lib.optionals config.programs.proton-ge.enable config.programs.proton-ge.packages)
-    (lib.mkIf config.programs.packages.vlc.enable config.programs.packages.vlc.package)
-    (lib.mkIf config.programs.packages.gimp.enable config.programs.packages.gimp.package)
-    (lib.mkIf config.programs.packages.libreoffice.enable config.programs.packages.libreoffice.package)
-    (lib.mkIf config.programs.packages.osu.enable config.programs.packages.osu.package)
-    (lib.mkIf config.programs.packages.lmstudio.enable config.programs.packages.lmstudio.package)
-    (lib.mkIf config.programs.packages.blender.enable config.programs.packages.blender.package)
-    (lib.mkIf config.programs.packages.xprop.enable config.programs.packages.xprop.package)
+    (lib.mkIf config.programs.antigravity.enable config.programs.antigravity.package)
+    (lib.mkIf config.programs.prismlauncher.enable config.programs.prismlauncher.package)
+    (lib.mkIf config.programs.vlc.enable config.programs.vlc.package)
+    (lib.mkIf config.programs.gimp.enable config.programs.gimp.package)
+    (lib.mkIf config.programs.libreoffice.enable config.programs.libreoffice.package)
+    (lib.mkIf config.programs.osu.enable config.programs.osu.package)
+    (lib.mkIf config.programs.lmstudio.enable config.programs.lmstudio.package)
+    (lib.mkIf config.programs.blender.enable config.programs.blender.package)
+    (lib.mkIf config.programs.xprop.enable config.programs.xprop.package)
 
-    (lib.mkIf config.programs.packages.pavucontrol.enable config.programs.packages.pavucontrol.package)
-    (lib.mkIf config.programs.packages.nwg-look.enable config.programs.packages.nwg-look.package)
+    (lib.mkIf config.programs.pavucontrol.enable config.programs.pavucontrol.package)
+    (lib.mkIf config.programs.nwg-look.enable config.programs.nwg-look.package)
 
-    (lib.optionals config.programs.proton-apps.enable config.programs.proton-apps.packages)
-
-    (lib.mkIf config.programs.packages.hytale.enable config.programs.packages.hytale.package)
+    (lib.mkIf config.programs.hytale.enable config.programs.hytale.package)
     (lib.mkIf (
-      config.programs.packages.cider.enable && osconfig.device.programs.cider-2.enable
-    ) config.programs.packages.cider.package)
-  ];
+      config.programs.cider.enable && osconfig.device.programs.cider-2.enable
+    ) config.programs.cider.package)
+  ]
+  ++ (lib.optionals config.programs.proton-ge.enable config.programs.proton-ge.packages)
+  ++ (lib.optionals config.programs.proton-apps.enable config.programs.proton-apps.packages);
 }
diff --git a/modules/features/system/packages.nix b/modules/features/system/packages.nix
index 3a310f7..0072458 100644
--- a/modules/features/system/packages.nix
+++ b/modules/features/system/packages.nix
@@ -27,11 +27,10 @@
       (lib.mkIf config.programs.jdk.enable config.programs.jdk.package)
       (lib.mkIf config.programs.nixfmt.enable config.programs.nixfmt.package)
 
-      (lib.optionals config.programs.winepackages.enable config.programs.winepackages.packages)
-
       (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.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 (