diff --git a/flake.nix b/flake.nix
index fd7e75e..9770434 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,22 +25,8 @@
     in
     {
       overlays.default = final: prev: {
-        # Enhanced quickshell wrapper with Qt5Compat support for dots-hyprland
-        # Wraps the quickshell from nixpkgs (which must already be in prev)
-        quickshell = if prev ? quickshell then 
-          final.symlinkJoin {
-            name = "quickshell-wrapped";
-            paths = [ prev.quickshell ];
-            buildInputs = [ final.makeWrapper ];
-            postBuild = ''
-              wrapProgram $out/bin/quickshell \
-                --prefix QML2_IMPORT_PATH : "${final.kdePackages.qt5compat}/lib/qt-6/qml:${final.kdePackages.qtpositioning}/lib/qt-6/qml:${final.kdePackages.qtlocation}/lib/qt-6/qml:$HOME/.config/quickshell/ii:$HOME/.config/quickshell" \
-                --set ILLOGICAL_IMPULSE_VIRTUAL_ENV "$HOME/.local/state/quickshell/.venv" \
-                --prefix XDG_DATA_DIRS : "${final.gsettings-desktop-schemas}/share" \
-                --prefix LD_LIBRARY_PATH : "${final.stdenv.cc.cc.lib}/lib:${final.glibc}/lib:${final.zlib}/lib:${final.libffi}/lib:${final.openssl}/lib:${final.bzip2.out}/lib:${final.xz.out}/lib:${final.ncurses}/lib:${final.readline}/lib:${final.sqlite.out}/lib"
-            '';
-          }
-        else prev.quickshell;
+        # No quickshell override needed - nixpkgs 25.11+ provides it
+        # Environment setup is handled by the quickshell-startup script
       };
 
       packages = forAllSystems (system: 
diff --git a/modules/components/quickshell-service.nix b/modules/components/quickshell-service.nix
index 3725cf0..85dba13 100644
--- a/modules/components/quickshell-service.nix
+++ b/modules/components/quickshell-service.nix
@@ -119,6 +119,11 @@ EOF
     log "🐍 Python venv: $ILLOGICAL_IMPULSE_VIRTUAL_ENV"
     log "🚀 App launcher: $LAUNCHER_WRAPPER"
     
+    # Set up Qt environment for dots-hyprland
+    export QML2_IMPORT_PATH="${pkgs.kdePackages.qt5compat}/lib/qt-6/qml:${pkgs.kdePackages.qtpositioning}/lib/qt-6/qml:${pkgs.kdePackages.qtlocation}/lib/qt-6/qml:$HOME/.config/quickshell/ii:$HOME/.config/quickshell:$QML2_IMPORT_PATH"
+    export XDG_DATA_DIRS="$XDG_DATA_DIRS:${pkgs.gsettings-desktop-schemas}/share"
+    export LD_LIBRARY_PATH="${pkgs.stdenv.cc.cc.lib}/lib:${pkgs.glibc}/lib:${pkgs.zlib}/lib:${pkgs.libffi}/lib:${pkgs.openssl}/lib:${pkgs.bzip2.out}/lib:${pkgs.xz.out}/lib:${pkgs.ncurses}/lib:${pkgs.readline}/lib:${pkgs.sqlite.out}/lib:$LD_LIBRARY_PATH"
+    
     # Start quickshell
     exec ${workingQuickshell}/bin/quickshell -p "$CONFIG_DIR/quickshell/ii/shell.qml"
   '';