Add conflict handling for home-manager symlinks

- Handle conflicting symlinks for icons, konsole, and fish directories
- Backup existing directories before home-manager creates new ones
- Run conflict handling before linkGeneration phase

packages/scripts/quickshell-reset.sh

@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+# Quickshell reset script for end-4-flakes
+# This script resets quickshell and regenerates qmldir files
+
+set -e
+
+# Colors for output
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+RED='\033[0;31m'
+NC='\033[0m'
+
+log() {
+    echo -e "${GREEN}[quickshell-reset]${NC} $1"
+}
+
+warn() {
+    echo -e "${YELLOW}[quickshell-reset]${NC} WARNING: $1"
+}
+
+error() {
+    echo -e "${RED}[quickshell-reset]${NC} ERROR: $1"
+}
+
+log "Starting quickshell reset..."
+
+# Kill any running quickshell processes
+log "Stopping quickshell processes..."
+pkill -f quickshell || true
+pkill -f qs || true
+
+# Wait a moment for processes to stop
+sleep 1
+
+# Regenerate qmldir files if the generator exists
+if command -v generate-qmldir >/dev/null 2>&1; then
+    if [[ -d "$HOME/.config/quickshell/ii" ]]; then
+        log "Regenerating qmldir files..."
+        generate-qmldir "$HOME/.config/quickshell/ii"
+        log "qmldir files regenerated successfully"
+    else
+        warn "Quickshell config directory not found, skipping qmldir generation"
+    fi
+else
+    warn "qmldir generator not found in PATH, skipping regeneration"
+fi
+
+# Clear any cached QML modules
+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
+
+log "Quickshell reset complete!"
+log "You can now start quickshell with: qs"