mirror of
https://github.com/fscotto/infra.git
synced 2026-05-30 15:39:58 +00:00
69efe18e2b
- Move start-sway to /usr/local/bin so emptty resolves it without a user PATH (it runs the launcher with an absolute path). The role copies the script as root; the user dotfile entry is removed. - Fix runtime errors / deprecations in sway/config: tiling_drag accepts only enable|disable|toggle; new_window / new_float have been superseded by default_border / default_floating_border. - Simplify workspace names to numeric only; waybar already maps them to roman numerals via format-icons. - Update cleanup-sway.sh to remove /usr/local/bin/start-sway and the emptty session entry together as system files. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
98 lines
1.9 KiB
Bash
Executable File
98 lines
1.9 KiB
Bash
Executable File
#!/usr/bin/env sh
|
|
# Remove sway session artifacts: exclusive packages, dotfiles, runtime state
|
|
# and the emptty wayland-sessions entry. Shared resources with i3 (dunst,
|
|
# rofi, alacritty, xfce4-screenshooter) are left untouched.
|
|
|
|
set -eu
|
|
|
|
SWAY_PACKAGES="
|
|
cliphist
|
|
kanshi
|
|
swayfx
|
|
swaybg
|
|
swayidle
|
|
swaylock
|
|
SwayOSD
|
|
Waybar
|
|
wl-clipboard
|
|
xdg-desktop-portal-wlr
|
|
xorg-server-xwayland
|
|
"
|
|
|
|
SWAY_DOTFILES="
|
|
$HOME/.config/sway
|
|
$HOME/.config/waybar
|
|
$HOME/.cache/cliphist
|
|
"
|
|
|
|
SWAY_SYSTEM_FILES="
|
|
/etc/emptty/wayland-sessions/sway.desktop
|
|
/usr/local/bin/start-sway
|
|
"
|
|
|
|
confirm() {
|
|
printf '%s [y/N] ' "$1"
|
|
read -r answer
|
|
case "$answer" in
|
|
y|Y|yes|YES) return 0 ;;
|
|
*) return 1 ;;
|
|
esac
|
|
}
|
|
|
|
filter_installed() {
|
|
for p in $1; do
|
|
if xbps-query -p pkgver "$p" >/dev/null 2>&1; then
|
|
printf '%s\n' "$p"
|
|
fi
|
|
done
|
|
}
|
|
|
|
if ! command -v xbps-remove >/dev/null 2>&1; then
|
|
printf 'Error: xbps-remove not found (not a Void host?)\n' >&2
|
|
exit 1
|
|
fi
|
|
|
|
installed=$(filter_installed "$SWAY_PACKAGES" | tr '\n' ' ' | sed 's/ *$//')
|
|
|
|
printf '== sway cleanup ==\n\n'
|
|
printf 'Packages to remove (installed only):\n'
|
|
if [ -n "$installed" ]; then
|
|
printf ' %s\n' $installed
|
|
else
|
|
printf ' (none)\n'
|
|
fi
|
|
printf '\nDotfiles / state to remove:\n'
|
|
for d in $SWAY_DOTFILES; do
|
|
if [ -e "$d" ] || [ -L "$d" ]; then
|
|
printf ' %s\n' "$d"
|
|
fi
|
|
done
|
|
printf '\nSystem files to remove:\n'
|
|
for f in $SWAY_SYSTEM_FILES; do
|
|
if [ -e "$f" ] || [ -L "$f" ]; then
|
|
printf ' %s\n' "$f"
|
|
fi
|
|
done
|
|
printf '\nShared (NOT removed): dunst, rofi, alacritty, xfce4-screenshooter and their configs.\n\n'
|
|
|
|
confirm 'Proceed?' || { printf 'Aborted.\n'; exit 0; }
|
|
|
|
if [ -n "$installed" ]; then
|
|
# shellcheck disable=SC2086
|
|
sudo xbps-remove -Ry $installed
|
|
fi
|
|
|
|
for d in $SWAY_DOTFILES; do
|
|
if [ -e "$d" ] || [ -L "$d" ]; then
|
|
rm -rf -- "$d"
|
|
fi
|
|
done
|
|
|
|
for f in $SWAY_SYSTEM_FILES; do
|
|
if [ -e "$f" ] || [ -L "$f" ]; then
|
|
sudo rm -f -- "$f"
|
|
fi
|
|
done
|
|
|
|
printf '\nDone.\n'
|