diff --git a/flake.lock b/flake.lock index 0ee5920..352b430 100644 --- a/flake.lock +++ b/flake.lock @@ -36,24 +36,11 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "quickshell": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1753595452, diff --git a/modules/home-manager.nix b/modules/home-manager.nix index 3c4204c..9940463 100644 --- a/modules/home-manager.nix +++ b/modules/home-manager.nix @@ -135,7 +135,7 @@ in XDG_DATA_DIRS = "$XDG_DATA_DIRS:${pkgs.gsettings-desktop-schemas}/share"; }; - # Ensure ~/.local/bin is in PATH for our working qs script + # Ensure ~/.local/bin is in PATH for user scripts home.sessionPath = [ "$HOME/.local/bin" ]; # Generate qmldir files for all modes (runs after all config is in place) @@ -149,17 +149,9 @@ in fi ''; - # Create working qs script with Qt5Compat support + # Use quickshell directly with proper environment home.activation.createWorkingQsScript = lib.hm.dag.entryAfter ["linkGeneration"] '' - $DRY_RUN_CMD echo "🔧 Creating working qs script with Qt5Compat support..." - $DRY_RUN_CMD mkdir -p "$HOME/.local/bin" - $DRY_RUN_CMD cat > "$HOME/.local/bin/qs" << 'EOF' -#!/usr/bin/env bash -export QML2_IMPORT_PATH="${pkgs.kdePackages.qt5compat}/lib/qt-6/qml:$HOME/.config/quickshell/ii:$HOME/.config/quickshell:$QML2_IMPORT_PATH" -exec quickshell "$@" -EOF - $DRY_RUN_CMD chmod +x "$HOME/.local/bin/qs" - $DRY_RUN_CMD echo "✅ Working qs script created successfully" + $DRY_RUN_CMD echo "✅ Using quickshell directly (no wrapper script needed)" # Also install the quickshell reset script $DRY_RUN_CMD echo "🔧 Installing quickshell reset script..." @@ -230,7 +222,7 @@ EOF $DRY_RUN_CMD echo "✅ Quickshell configuration already exists" fi - # Ensure our working qs script takes precedence over any system-managed quickshell + # Ensure quickshell uses the proper environment variables $DRY_RUN_CMD mkdir -p "$HOME/.local/bin" $DRY_RUN_CMD echo " → Ensuring ~/.local/bin is in PATH for hybrid mode" ''} diff --git a/packages/scripts/quickshell-reset.sh b/packages/scripts/quickshell-reset.sh index f9aadb6..471941a 100644 --- a/packages/scripts/quickshell-reset.sh +++ b/packages/scripts/quickshell-reset.sh @@ -51,18 +51,8 @@ log "Clearing QML cache..." rm -rf "$HOME/.cache/quickshell" 2>/dev/null || true rm -rf "$HOME/.cache/qml" 2>/dev/null || true -# Ensure our working qs script exists -if [[ ! -f "$HOME/.local/bin/qs" ]]; then - warn "Working qs script not found, creating it..." - mkdir -p "$HOME/.local/bin" - cat > "$HOME/.local/bin/qs" << 'EOF' -#!/usr/bin/env bash -export QML2_IMPORT_PATH="/nix/store/777j0jxpj9v2j3ykk70d02lph2qmr1xg-qt5compat-6.9.1/lib/qt-6/qml:$HOME/.config/quickshell/ii:$HOME/.config/quickshell:$QML2_IMPORT_PATH" -exec quickshell "$@" -EOF - chmod +x "$HOME/.local/bin/qs" - log "Working qs script created" -fi +# Using quickshell directly (no wrapper script needed) +log "Using quickshell directly" log "Quickshell reset complete!" log "You can now start quickshell with: qs"