Remove ~/.local/bin/qs wrapper script, use quickshell directly

- Removed qs script creation from home-manager.nix activation
- Updated quickshell-reset.sh to not create qs script
- Updated comments to reflect direct quickshell usage
- Fixes exec-once timing issues by eliminating wrapper script
This commit is contained in:
Celes Renata
2025-08-10 16:22:00 -07:00
parent 2f3a5b85d6
commit db015cfb43
3 changed files with 9 additions and 40 deletions
Generated
+3 -16
View File
@@ -36,24 +36,11 @@
"type": "github" "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": { "quickshell": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1753595452, "lastModified": 1753595452,
+4 -12
View File
@@ -135,7 +135,7 @@ in
XDG_DATA_DIRS = "$XDG_DATA_DIRS:${pkgs.gsettings-desktop-schemas}/share"; 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" ]; home.sessionPath = [ "$HOME/.local/bin" ];
# Generate qmldir files for all modes (runs after all config is in place) # Generate qmldir files for all modes (runs after all config is in place)
@@ -149,17 +149,9 @@ in
fi fi
''; '';
# Create working qs script with Qt5Compat support # Use quickshell directly with proper environment
home.activation.createWorkingQsScript = lib.hm.dag.entryAfter ["linkGeneration"] '' home.activation.createWorkingQsScript = lib.hm.dag.entryAfter ["linkGeneration"] ''
$DRY_RUN_CMD echo "🔧 Creating working qs script with Qt5Compat support..." $DRY_RUN_CMD echo " Using quickshell directly (no wrapper script needed)"
$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"
# Also install the quickshell reset script # Also install the quickshell reset script
$DRY_RUN_CMD echo "🔧 Installing quickshell reset script..." $DRY_RUN_CMD echo "🔧 Installing quickshell reset script..."
@@ -230,7 +222,7 @@ EOF
$DRY_RUN_CMD echo " Quickshell configuration already exists" $DRY_RUN_CMD echo " Quickshell configuration already exists"
fi 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 mkdir -p "$HOME/.local/bin"
$DRY_RUN_CMD echo " Ensuring ~/.local/bin is in PATH for hybrid mode" $DRY_RUN_CMD echo " Ensuring ~/.local/bin is in PATH for hybrid mode"
''} ''}
+2 -12
View File
@@ -51,18 +51,8 @@ log "Clearing QML cache..."
rm -rf "$HOME/.cache/quickshell" 2>/dev/null || true rm -rf "$HOME/.cache/quickshell" 2>/dev/null || true
rm -rf "$HOME/.cache/qml" 2>/dev/null || true rm -rf "$HOME/.cache/qml" 2>/dev/null || true
# Ensure our working qs script exists # Using quickshell directly (no wrapper script needed)
if [[ ! -f "$HOME/.local/bin/qs" ]]; then log "Using quickshell directly"
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
log "Quickshell reset complete!" log "Quickshell reset complete!"
log "You can now start quickshell with: qs" log "You can now start quickshell with: qs"