Compare commits
3 Commits
f1a0806dbb
...
d308af7454
| Author | SHA1 | Date | |
|---|---|---|---|
|
d308af7454 | ||
|
|
c419eb5f92 | ||
|
|
de49d03182 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -8,3 +8,4 @@ pi/.pi/agent/usage-cache.json
|
||||
pi/.pi/agent/mcp-cache.json
|
||||
pi/.pi/agent/auth.json.current
|
||||
pi/.pi/agent/run-history.jsonl
|
||||
pi/.pi/context.md
|
||||
|
||||
115
install.sh
115
install.sh
@@ -25,6 +25,22 @@ DISTRO=$(detect_distro)
|
||||
# Dependencies
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
COMMON_PACKAGES=(
|
||||
stow
|
||||
swayidle
|
||||
mako
|
||||
libnotify
|
||||
fuzzel
|
||||
wireplumber
|
||||
brightnessctl
|
||||
alsa-utils
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
jq
|
||||
firefox
|
||||
zoxide
|
||||
)
|
||||
# On Arch-based systems, partial upgrades are unsupported — installing a
|
||||
# package that pulls in a newer library breaks packages built against the old
|
||||
# one. The right fix is 'sudo pacman -Syu', but doing that over SSH risks
|
||||
@@ -45,99 +61,28 @@ check_arch_updates() {
|
||||
}
|
||||
|
||||
case "$DISTRO" in
|
||||
endeavouros)
|
||||
# EndeavourOS is Arch-based, use pacman
|
||||
PACMAN_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-pulse # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
endeavouros|arch)
|
||||
# Keep distro-specific packages clearly listed
|
||||
DISTRO_PACKAGES=(
|
||||
pipewire-pulse # Arch-specific
|
||||
ffmpeg # Available in official repos
|
||||
)
|
||||
|
||||
check_arch_updates
|
||||
echo "Installing packages for EndeavourOS..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
PACKAGES=("${COMMON_PACKAGES[@]}" "${DISTRO_PACKAGES[@]}")
|
||||
echo "Installing packages for Arch/EndeavourOS..."
|
||||
sudo pacman -S --noconfirm "${PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
fedora)
|
||||
DNF_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-utils # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg # needs RPM Fusion: https://rpmfusion.org
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
fedora|fedora-asahi-remix)
|
||||
DISTRO_PACKAGES=(
|
||||
pipewire-utils # Fedora's package name
|
||||
ffmpeg # Requires RPM Fusion
|
||||
)
|
||||
|
||||
PACKAGES=("${COMMON_PACKAGES[@]}" "${DISTRO_PACKAGES[@]}")
|
||||
echo "Installing packages for Fedora..."
|
||||
sudo dnf install -y "${DNF_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
arch)
|
||||
PACMAN_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-pulse # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
check_arch_updates
|
||||
echo "Installing packages for Arch Linux..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
sudo dnf install -y "${PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "ERROR: Unsupported distribution: $DISTRO"
|
||||
echo "Supported distributions: fedora, arch, endeavouros"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
291
install_BACKUP_19815.sh
Executable file
291
install_BACKUP_19815.sh
Executable file
@@ -0,0 +1,291 @@
|
||||
#!/usr/bin/env bash
|
||||
# install.sh: Install dependencies and stow all packages.
|
||||
# Run this after cloning on a new machine.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
DOTFILES_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Detect Linux distribution
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
detect_distro() {
|
||||
if [[ -f /etc/os-release ]]; then
|
||||
. /etc/os-release
|
||||
echo "$ID"
|
||||
else
|
||||
echo "unknown"
|
||||
fi
|
||||
}
|
||||
|
||||
DISTRO=$(detect_distro)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Dependencies
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
<<<<<<< HEAD
|
||||
COMMON_PACKAGES=(
|
||||
stow
|
||||
swayidle
|
||||
mako
|
||||
libnotify
|
||||
fuzzel
|
||||
wireplumber
|
||||
brightnessctl
|
||||
alsa-utils
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
jq
|
||||
firefox
|
||||
zoxide
|
||||
)
|
||||
||||||| 870dc6a
|
||||
=======
|
||||
# On Arch-based systems, partial upgrades are unsupported — installing a
|
||||
# package that pulls in a newer library breaks packages built against the old
|
||||
# one. The right fix is 'sudo pacman -Syu', but doing that over SSH risks
|
||||
# a dropped connection mid-kernel-upgrade. So we just warn and let the user
|
||||
# decide.
|
||||
check_arch_updates() {
|
||||
sudo pacman -Sy --noconfirm # refresh databases only, no upgrade
|
||||
local updates
|
||||
updates=$(pacman -Qu 2>/dev/null | wc -l)
|
||||
if [[ "$updates" -gt 0 ]]; then
|
||||
echo ""
|
||||
echo "WARNING: $updates system package(s) are out of date."
|
||||
echo " If pacman fails with dependency conflicts, run 'sudo pacman -Syu'"
|
||||
echo " locally (not over SSH, to avoid kernel upgrade risks), then re-run"
|
||||
echo " this script."
|
||||
echo ""
|
||||
fi
|
||||
}
|
||||
>>>>>>> f1a0806dbbc33d2d1f918cebc9db85a168ccdab6
|
||||
|
||||
case "$DISTRO" in
|
||||
endeavouros|arch)
|
||||
# Keep distro-specific packages clearly listed
|
||||
DISTRO_PACKAGES=(
|
||||
pipewire-pulse # Arch-specific
|
||||
ffmpeg # Available in official repos
|
||||
)
|
||||
<<<<<<< HEAD
|
||||
PACKAGES=("${COMMON_PACKAGES[@]}" "${DISTRO_PACKAGES[@]}")
|
||||
echo "Installing packages for Arch/EndeavourOS..."
|
||||
sudo pacman -S --noconfirm "${PACKAGES[@]}"
|
||||
||||||| 870dc6a
|
||||
|
||||
echo "Installing packages for EndeavourOS..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
=======
|
||||
|
||||
check_arch_updates
|
||||
echo "Installing packages for EndeavourOS..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
>>>>>>> f1a0806dbbc33d2d1f918cebc9db85a168ccdab6
|
||||
;;
|
||||
fedora|fedora-asahi-remix)
|
||||
DISTRO_PACKAGES=(
|
||||
pipewire-utils # Fedora's package name
|
||||
ffmpeg # Requires RPM Fusion
|
||||
)
|
||||
PACKAGES=("${COMMON_PACKAGES[@]}" "${DISTRO_PACKAGES[@]}")
|
||||
echo "Installing packages for Fedora..."
|
||||
sudo dnf install -y "${PACKAGES[@]}"
|
||||
;;
|
||||
<<<<<<< HEAD
|
||||
||||||| 870dc6a
|
||||
|
||||
arch)
|
||||
PACMAN_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-pulse # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
echo "Installing packages for Arch Linux..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
=======
|
||||
|
||||
arch)
|
||||
PACMAN_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-pulse # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
check_arch_updates
|
||||
echo "Installing packages for Arch Linux..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
>>>>>>> f1a0806dbbc33d2d1f918cebc9db85a168ccdab6
|
||||
*)
|
||||
echo "ERROR: Unsupported distribution: $DISTRO"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Packages not in Fedora repos - install manually if missing
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
warn_missing() {
|
||||
local cmd="$1" msg="$2"
|
||||
if ! command -v "$cmd" &>/dev/null; then
|
||||
echo "WARNING: '$cmd' not found - $msg"
|
||||
fi
|
||||
}
|
||||
|
||||
warn_missing autotiling "install via pip: pip install --user autotiling"
|
||||
warn_missing eww "install from https://github.com/elkowar/eww/releases"
|
||||
warn_missing wezterm "install from https://wezfurlong.org/wezterm/install/linux.html"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Starship
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
if ! command -v starship &>/dev/null; then
|
||||
echo ""
|
||||
echo "Installing Starship..."
|
||||
curl -sS https://starship.rs/install.sh | sh
|
||||
else
|
||||
echo ""
|
||||
echo "Starship already installed, skipping."
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# NPM packages
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Installing npm packages..."
|
||||
npm install -g @mariozechner/pi-coding-agent
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Fonts
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
FONT_DIR="$HOME/.local/share/fonts/JetBrainsMono"
|
||||
if [[ ! -d "$FONT_DIR" ]]; then
|
||||
echo ""
|
||||
echo "Installing JetBrains Mono Nerd Font..."
|
||||
TMP="$(mktemp -d)"
|
||||
curl -fLo "$TMP/JetBrainsMono.zip" \
|
||||
"https://github.com/ryanoasis/nerd-fonts/releases/latest/download/JetBrainsMono.zip"
|
||||
mkdir -p "$FONT_DIR"
|
||||
unzip -q "$TMP/JetBrainsMono.zip" -d "$FONT_DIR"
|
||||
rm -rf "$TMP"
|
||||
fc-cache -f "$FONT_DIR"
|
||||
echo "Font installed."
|
||||
else
|
||||
echo "JetBrains Mono Nerd Font already installed, skipping."
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Stow all packages
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Stowing dotfiles..."
|
||||
|
||||
# Check for conflicts before stowing
|
||||
CONFLICTS=()
|
||||
for PACKAGE in "$DOTFILES_DIR"/*/; do
|
||||
PACKAGE="$(basename "$PACKAGE")"
|
||||
|
||||
# Skip hidden directories and .git
|
||||
[[ "$PACKAGE" == .* ]] && continue
|
||||
|
||||
# Check if package has files that would conflict
|
||||
while IFS= read -r -d '' dotfile; do
|
||||
# Get the target path this would create
|
||||
TARGET_PATH="${HOME}/${dotfile#$DOTFILES_DIR/$PACKAGE/}"
|
||||
|
||||
# If target exists and is NOT a symlink to the correct location, it's a conflict
|
||||
if [[ -e "$TARGET_PATH" ]] && [[ ! -L "$TARGET_PATH" ]]; then
|
||||
CONFLICTS+=("$PACKAGE (file: $TARGET_PATH)")
|
||||
fi
|
||||
done < <(find "$DOTFILES_DIR/$PACKAGE" -type f -print0 2>/dev/null || true)
|
||||
done
|
||||
|
||||
if [[ ${#CONFLICTS[@]} -gt 0 ]]; then
|
||||
echo "WARNING: Found conflicts with existing configs:"
|
||||
for conflict in "${CONFLICTS[@]}"; do
|
||||
echo " ✗ $conflict"
|
||||
done
|
||||
echo ""
|
||||
fi
|
||||
|
||||
# Stow all packages
|
||||
for PACKAGE in "$DOTFILES_DIR"/*/; do
|
||||
PACKAGE="$(basename "$PACKAGE")"
|
||||
|
||||
# Skip hidden directories
|
||||
[[ "$PACKAGE" == .* ]] && continue
|
||||
|
||||
echo " $PACKAGE"
|
||||
stow --dir="$DOTFILES_DIR" --target="$HOME" --restow "$PACKAGE"
|
||||
done
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Configure shell (after stowing)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Configuring zsh..."
|
||||
|
||||
# Ensure .zshrc exists (stow should have created it via symlink)
|
||||
if [[ ! -f "$HOME/.zshrc" ]]; then
|
||||
touch "$HOME/.zshrc"
|
||||
fi
|
||||
|
||||
# Ensure starship is initialized in .zshrc
|
||||
if ! grep -q 'eval "$(starship init zsh)"' "$HOME/.zshrc"; then
|
||||
echo 'eval "$(starship init zsh)"' >> "$HOME/.zshrc"
|
||||
echo " Added starship initialization to ~/.zshrc"
|
||||
else
|
||||
echo " Starship already configured in ~/.zshrc"
|
||||
fi
|
||||
|
||||
echo "Done."
|
||||
291
install_BACKUP_20337.sh
Executable file
291
install_BACKUP_20337.sh
Executable file
@@ -0,0 +1,291 @@
|
||||
#!/usr/bin/env bash
|
||||
# install.sh: Install dependencies and stow all packages.
|
||||
# Run this after cloning on a new machine.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
DOTFILES_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Detect Linux distribution
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
detect_distro() {
|
||||
if [[ -f /etc/os-release ]]; then
|
||||
. /etc/os-release
|
||||
echo "$ID"
|
||||
else
|
||||
echo "unknown"
|
||||
fi
|
||||
}
|
||||
|
||||
DISTRO=$(detect_distro)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Dependencies
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
<<<<<<< HEAD
|
||||
COMMON_PACKAGES=(
|
||||
stow
|
||||
swayidle
|
||||
mako
|
||||
libnotify
|
||||
fuzzel
|
||||
wireplumber
|
||||
brightnessctl
|
||||
alsa-utils
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
jq
|
||||
firefox
|
||||
zoxide
|
||||
)
|
||||
||||||| 870dc6a
|
||||
=======
|
||||
# On Arch-based systems, partial upgrades are unsupported — installing a
|
||||
# package that pulls in a newer library breaks packages built against the old
|
||||
# one. The right fix is 'sudo pacman -Syu', but doing that over SSH risks
|
||||
# a dropped connection mid-kernel-upgrade. So we just warn and let the user
|
||||
# decide.
|
||||
check_arch_updates() {
|
||||
sudo pacman -Sy --noconfirm # refresh databases only, no upgrade
|
||||
local updates
|
||||
updates=$(pacman -Qu 2>/dev/null | wc -l)
|
||||
if [[ "$updates" -gt 0 ]]; then
|
||||
echo ""
|
||||
echo "WARNING: $updates system package(s) are out of date."
|
||||
echo " If pacman fails with dependency conflicts, run 'sudo pacman -Syu'"
|
||||
echo " locally (not over SSH, to avoid kernel upgrade risks), then re-run"
|
||||
echo " this script."
|
||||
echo ""
|
||||
fi
|
||||
}
|
||||
>>>>>>> f1a0806dbbc33d2d1f918cebc9db85a168ccdab6
|
||||
|
||||
case "$DISTRO" in
|
||||
endeavouros|arch)
|
||||
# Keep distro-specific packages clearly listed
|
||||
DISTRO_PACKAGES=(
|
||||
pipewire-pulse # Arch-specific
|
||||
ffmpeg # Available in official repos
|
||||
)
|
||||
<<<<<<< HEAD
|
||||
PACKAGES=("${COMMON_PACKAGES[@]}" "${DISTRO_PACKAGES[@]}")
|
||||
echo "Installing packages for Arch/EndeavourOS..."
|
||||
sudo pacman -S --noconfirm "${PACKAGES[@]}"
|
||||
||||||| 870dc6a
|
||||
|
||||
echo "Installing packages for EndeavourOS..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
=======
|
||||
|
||||
check_arch_updates
|
||||
echo "Installing packages for EndeavourOS..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
>>>>>>> f1a0806dbbc33d2d1f918cebc9db85a168ccdab6
|
||||
;;
|
||||
fedora|fedora-asahi-remix)
|
||||
DISTRO_PACKAGES=(
|
||||
pipewire-utils # Fedora's package name
|
||||
ffmpeg # Requires RPM Fusion
|
||||
)
|
||||
PACKAGES=("${COMMON_PACKAGES[@]}" "${DISTRO_PACKAGES[@]}")
|
||||
echo "Installing packages for Fedora..."
|
||||
sudo dnf install -y "${PACKAGES[@]}"
|
||||
;;
|
||||
<<<<<<< HEAD
|
||||
||||||| 870dc6a
|
||||
|
||||
arch)
|
||||
PACMAN_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-pulse # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
echo "Installing packages for Arch Linux..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
=======
|
||||
|
||||
arch)
|
||||
PACMAN_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-pulse # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
check_arch_updates
|
||||
echo "Installing packages for Arch Linux..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
>>>>>>> f1a0806dbbc33d2d1f918cebc9db85a168ccdab6
|
||||
*)
|
||||
echo "ERROR: Unsupported distribution: $DISTRO"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Packages not in Fedora repos - install manually if missing
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
warn_missing() {
|
||||
local cmd="$1" msg="$2"
|
||||
if ! command -v "$cmd" &>/dev/null; then
|
||||
echo "WARNING: '$cmd' not found - $msg"
|
||||
fi
|
||||
}
|
||||
|
||||
warn_missing autotiling "install via pip: pip install --user autotiling"
|
||||
warn_missing eww "install from https://github.com/elkowar/eww/releases"
|
||||
warn_missing wezterm "install from https://wezfurlong.org/wezterm/install/linux.html"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Starship
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
if ! command -v starship &>/dev/null; then
|
||||
echo ""
|
||||
echo "Installing Starship..."
|
||||
curl -sS https://starship.rs/install.sh | sh
|
||||
else
|
||||
echo ""
|
||||
echo "Starship already installed, skipping."
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# NPM packages
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Installing npm packages..."
|
||||
npm install -g @mariozechner/pi-coding-agent
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Fonts
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
FONT_DIR="$HOME/.local/share/fonts/JetBrainsMono"
|
||||
if [[ ! -d "$FONT_DIR" ]]; then
|
||||
echo ""
|
||||
echo "Installing JetBrains Mono Nerd Font..."
|
||||
TMP="$(mktemp -d)"
|
||||
curl -fLo "$TMP/JetBrainsMono.zip" \
|
||||
"https://github.com/ryanoasis/nerd-fonts/releases/latest/download/JetBrainsMono.zip"
|
||||
mkdir -p "$FONT_DIR"
|
||||
unzip -q "$TMP/JetBrainsMono.zip" -d "$FONT_DIR"
|
||||
rm -rf "$TMP"
|
||||
fc-cache -f "$FONT_DIR"
|
||||
echo "Font installed."
|
||||
else
|
||||
echo "JetBrains Mono Nerd Font already installed, skipping."
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Stow all packages
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Stowing dotfiles..."
|
||||
|
||||
# Check for conflicts before stowing
|
||||
CONFLICTS=()
|
||||
for PACKAGE in "$DOTFILES_DIR"/*/; do
|
||||
PACKAGE="$(basename "$PACKAGE")"
|
||||
|
||||
# Skip hidden directories and .git
|
||||
[[ "$PACKAGE" == .* ]] && continue
|
||||
|
||||
# Check if package has files that would conflict
|
||||
while IFS= read -r -d '' dotfile; do
|
||||
# Get the target path this would create
|
||||
TARGET_PATH="${HOME}/${dotfile#$DOTFILES_DIR/$PACKAGE/}"
|
||||
|
||||
# If target exists and is NOT a symlink to the correct location, it's a conflict
|
||||
if [[ -e "$TARGET_PATH" ]] && [[ ! -L "$TARGET_PATH" ]]; then
|
||||
CONFLICTS+=("$PACKAGE (file: $TARGET_PATH)")
|
||||
fi
|
||||
done < <(find "$DOTFILES_DIR/$PACKAGE" -type f -print0 2>/dev/null || true)
|
||||
done
|
||||
|
||||
if [[ ${#CONFLICTS[@]} -gt 0 ]]; then
|
||||
echo "WARNING: Found conflicts with existing configs:"
|
||||
for conflict in "${CONFLICTS[@]}"; do
|
||||
echo " ✗ $conflict"
|
||||
done
|
||||
echo ""
|
||||
fi
|
||||
|
||||
# Stow all packages
|
||||
for PACKAGE in "$DOTFILES_DIR"/*/; do
|
||||
PACKAGE="$(basename "$PACKAGE")"
|
||||
|
||||
# Skip hidden directories
|
||||
[[ "$PACKAGE" == .* ]] && continue
|
||||
|
||||
echo " $PACKAGE"
|
||||
stow --dir="$DOTFILES_DIR" --target="$HOME" --restow "$PACKAGE"
|
||||
done
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Configure shell (after stowing)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Configuring zsh..."
|
||||
|
||||
# Ensure .zshrc exists (stow should have created it via symlink)
|
||||
if [[ ! -f "$HOME/.zshrc" ]]; then
|
||||
touch "$HOME/.zshrc"
|
||||
fi
|
||||
|
||||
# Ensure starship is initialized in .zshrc
|
||||
if ! grep -q 'eval "$(starship init zsh)"' "$HOME/.zshrc"; then
|
||||
echo 'eval "$(starship init zsh)"' >> "$HOME/.zshrc"
|
||||
echo " Added starship initialization to ~/.zshrc"
|
||||
else
|
||||
echo " Starship already configured in ~/.zshrc"
|
||||
fi
|
||||
|
||||
echo "Done."
|
||||
246
install_BASE_19815.sh
Normal file
246
install_BASE_19815.sh
Normal file
@@ -0,0 +1,246 @@
|
||||
#!/usr/bin/env bash
|
||||
# install.sh: Install dependencies and stow all packages.
|
||||
# Run this after cloning on a new machine.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
DOTFILES_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Detect Linux distribution
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
detect_distro() {
|
||||
if [[ -f /etc/os-release ]]; then
|
||||
. /etc/os-release
|
||||
echo "$ID"
|
||||
else
|
||||
echo "unknown"
|
||||
fi
|
||||
}
|
||||
|
||||
DISTRO=$(detect_distro)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Dependencies
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
case "$DISTRO" in
|
||||
endeavouros)
|
||||
# EndeavourOS is Arch-based, use pacman
|
||||
PACMAN_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-pulse # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
echo "Installing packages for EndeavourOS..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
fedora)
|
||||
DNF_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-utils # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg # needs RPM Fusion: https://rpmfusion.org
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
echo "Installing packages for Fedora..."
|
||||
sudo dnf install -y "${DNF_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
arch)
|
||||
PACMAN_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-pulse # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
echo "Installing packages for Arch Linux..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "ERROR: Unsupported distribution: $DISTRO"
|
||||
echo "Supported distributions: fedora, arch, endeavouros"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Packages not in Fedora repos - install manually if missing
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
warn_missing() {
|
||||
local cmd="$1" msg="$2"
|
||||
if ! command -v "$cmd" &>/dev/null; then
|
||||
echo "WARNING: '$cmd' not found - $msg"
|
||||
fi
|
||||
}
|
||||
|
||||
warn_missing autotiling "install via pip: pip install --user autotiling"
|
||||
warn_missing eww "install from https://github.com/elkowar/eww/releases"
|
||||
warn_missing wezterm "install from https://wezfurlong.org/wezterm/install/linux.html"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Starship
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
if ! command -v starship &>/dev/null; then
|
||||
echo ""
|
||||
echo "Installing Starship..."
|
||||
curl -sS https://starship.rs/install.sh | sh
|
||||
else
|
||||
echo ""
|
||||
echo "Starship already installed, skipping."
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# NPM packages
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Installing npm packages..."
|
||||
npm install -g @mariozechner/pi-coding-agent
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Fonts
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
FONT_DIR="$HOME/.local/share/fonts/JetBrainsMono"
|
||||
if [[ ! -d "$FONT_DIR" ]]; then
|
||||
echo ""
|
||||
echo "Installing JetBrains Mono Nerd Font..."
|
||||
TMP="$(mktemp -d)"
|
||||
curl -fLo "$TMP/JetBrainsMono.zip" \
|
||||
"https://github.com/ryanoasis/nerd-fonts/releases/latest/download/JetBrainsMono.zip"
|
||||
mkdir -p "$FONT_DIR"
|
||||
unzip -q "$TMP/JetBrainsMono.zip" -d "$FONT_DIR"
|
||||
rm -rf "$TMP"
|
||||
fc-cache -f "$FONT_DIR"
|
||||
echo "Font installed."
|
||||
else
|
||||
echo "JetBrains Mono Nerd Font already installed, skipping."
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Stow all packages
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Stowing dotfiles..."
|
||||
|
||||
# Check for conflicts before stowing
|
||||
CONFLICTS=()
|
||||
for PACKAGE in "$DOTFILES_DIR"/*/; do
|
||||
PACKAGE="$(basename "$PACKAGE")"
|
||||
|
||||
# Skip hidden directories and .git
|
||||
[[ "$PACKAGE" == .* ]] && continue
|
||||
|
||||
# Check if package has files that would conflict
|
||||
while IFS= read -r -d '' dotfile; do
|
||||
# Get the target path this would create
|
||||
TARGET_PATH="${HOME}/${dotfile#$DOTFILES_DIR/$PACKAGE/}"
|
||||
|
||||
# If target exists and is NOT a symlink to the correct location, it's a conflict
|
||||
if [[ -e "$TARGET_PATH" ]] && [[ ! -L "$TARGET_PATH" ]]; then
|
||||
CONFLICTS+=("$PACKAGE (file: $TARGET_PATH)")
|
||||
fi
|
||||
done < <(find "$DOTFILES_DIR/$PACKAGE" -type f -print0 2>/dev/null || true)
|
||||
done
|
||||
|
||||
if [[ ${#CONFLICTS[@]} -gt 0 ]]; then
|
||||
echo "WARNING: Found conflicts with existing configs:"
|
||||
for conflict in "${CONFLICTS[@]}"; do
|
||||
echo " ✗ $conflict"
|
||||
done
|
||||
echo ""
|
||||
fi
|
||||
|
||||
# Stow all packages
|
||||
for PACKAGE in "$DOTFILES_DIR"/*/; do
|
||||
PACKAGE="$(basename "$PACKAGE")"
|
||||
|
||||
# Skip hidden directories
|
||||
[[ "$PACKAGE" == .* ]] && continue
|
||||
|
||||
echo " $PACKAGE"
|
||||
stow --dir="$DOTFILES_DIR" --target="$HOME" --restow "$PACKAGE"
|
||||
done
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Configure shell (after stowing)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Configuring zsh..."
|
||||
|
||||
# Ensure .zshrc exists (stow should have created it via symlink)
|
||||
if [[ ! -f "$HOME/.zshrc" ]]; then
|
||||
touch "$HOME/.zshrc"
|
||||
fi
|
||||
|
||||
# Ensure starship is initialized in .zshrc
|
||||
if ! grep -q 'eval "$(starship init zsh)"' "$HOME/.zshrc"; then
|
||||
echo 'eval "$(starship init zsh)"' >> "$HOME/.zshrc"
|
||||
echo " Added starship initialization to ~/.zshrc"
|
||||
else
|
||||
echo " Starship already configured in ~/.zshrc"
|
||||
fi
|
||||
|
||||
echo "Done."
|
||||
246
install_BASE_20337.sh
Normal file
246
install_BASE_20337.sh
Normal file
@@ -0,0 +1,246 @@
|
||||
#!/usr/bin/env bash
|
||||
# install.sh: Install dependencies and stow all packages.
|
||||
# Run this after cloning on a new machine.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
DOTFILES_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Detect Linux distribution
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
detect_distro() {
|
||||
if [[ -f /etc/os-release ]]; then
|
||||
. /etc/os-release
|
||||
echo "$ID"
|
||||
else
|
||||
echo "unknown"
|
||||
fi
|
||||
}
|
||||
|
||||
DISTRO=$(detect_distro)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Dependencies
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
case "$DISTRO" in
|
||||
endeavouros)
|
||||
# EndeavourOS is Arch-based, use pacman
|
||||
PACMAN_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-pulse # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
echo "Installing packages for EndeavourOS..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
fedora)
|
||||
DNF_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-utils # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg # needs RPM Fusion: https://rpmfusion.org
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
echo "Installing packages for Fedora..."
|
||||
sudo dnf install -y "${DNF_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
arch)
|
||||
PACMAN_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-pulse # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
echo "Installing packages for Arch Linux..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "ERROR: Unsupported distribution: $DISTRO"
|
||||
echo "Supported distributions: fedora, arch, endeavouros"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Packages not in Fedora repos - install manually if missing
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
warn_missing() {
|
||||
local cmd="$1" msg="$2"
|
||||
if ! command -v "$cmd" &>/dev/null; then
|
||||
echo "WARNING: '$cmd' not found - $msg"
|
||||
fi
|
||||
}
|
||||
|
||||
warn_missing autotiling "install via pip: pip install --user autotiling"
|
||||
warn_missing eww "install from https://github.com/elkowar/eww/releases"
|
||||
warn_missing wezterm "install from https://wezfurlong.org/wezterm/install/linux.html"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Starship
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
if ! command -v starship &>/dev/null; then
|
||||
echo ""
|
||||
echo "Installing Starship..."
|
||||
curl -sS https://starship.rs/install.sh | sh
|
||||
else
|
||||
echo ""
|
||||
echo "Starship already installed, skipping."
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# NPM packages
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Installing npm packages..."
|
||||
npm install -g @mariozechner/pi-coding-agent
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Fonts
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
FONT_DIR="$HOME/.local/share/fonts/JetBrainsMono"
|
||||
if [[ ! -d "$FONT_DIR" ]]; then
|
||||
echo ""
|
||||
echo "Installing JetBrains Mono Nerd Font..."
|
||||
TMP="$(mktemp -d)"
|
||||
curl -fLo "$TMP/JetBrainsMono.zip" \
|
||||
"https://github.com/ryanoasis/nerd-fonts/releases/latest/download/JetBrainsMono.zip"
|
||||
mkdir -p "$FONT_DIR"
|
||||
unzip -q "$TMP/JetBrainsMono.zip" -d "$FONT_DIR"
|
||||
rm -rf "$TMP"
|
||||
fc-cache -f "$FONT_DIR"
|
||||
echo "Font installed."
|
||||
else
|
||||
echo "JetBrains Mono Nerd Font already installed, skipping."
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Stow all packages
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Stowing dotfiles..."
|
||||
|
||||
# Check for conflicts before stowing
|
||||
CONFLICTS=()
|
||||
for PACKAGE in "$DOTFILES_DIR"/*/; do
|
||||
PACKAGE="$(basename "$PACKAGE")"
|
||||
|
||||
# Skip hidden directories and .git
|
||||
[[ "$PACKAGE" == .* ]] && continue
|
||||
|
||||
# Check if package has files that would conflict
|
||||
while IFS= read -r -d '' dotfile; do
|
||||
# Get the target path this would create
|
||||
TARGET_PATH="${HOME}/${dotfile#$DOTFILES_DIR/$PACKAGE/}"
|
||||
|
||||
# If target exists and is NOT a symlink to the correct location, it's a conflict
|
||||
if [[ -e "$TARGET_PATH" ]] && [[ ! -L "$TARGET_PATH" ]]; then
|
||||
CONFLICTS+=("$PACKAGE (file: $TARGET_PATH)")
|
||||
fi
|
||||
done < <(find "$DOTFILES_DIR/$PACKAGE" -type f -print0 2>/dev/null || true)
|
||||
done
|
||||
|
||||
if [[ ${#CONFLICTS[@]} -gt 0 ]]; then
|
||||
echo "WARNING: Found conflicts with existing configs:"
|
||||
for conflict in "${CONFLICTS[@]}"; do
|
||||
echo " ✗ $conflict"
|
||||
done
|
||||
echo ""
|
||||
fi
|
||||
|
||||
# Stow all packages
|
||||
for PACKAGE in "$DOTFILES_DIR"/*/; do
|
||||
PACKAGE="$(basename "$PACKAGE")"
|
||||
|
||||
# Skip hidden directories
|
||||
[[ "$PACKAGE" == .* ]] && continue
|
||||
|
||||
echo " $PACKAGE"
|
||||
stow --dir="$DOTFILES_DIR" --target="$HOME" --restow "$PACKAGE"
|
||||
done
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Configure shell (after stowing)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Configuring zsh..."
|
||||
|
||||
# Ensure .zshrc exists (stow should have created it via symlink)
|
||||
if [[ ! -f "$HOME/.zshrc" ]]; then
|
||||
touch "$HOME/.zshrc"
|
||||
fi
|
||||
|
||||
# Ensure starship is initialized in .zshrc
|
||||
if ! grep -q 'eval "$(starship init zsh)"' "$HOME/.zshrc"; then
|
||||
echo 'eval "$(starship init zsh)"' >> "$HOME/.zshrc"
|
||||
echo " Added starship initialization to ~/.zshrc"
|
||||
else
|
||||
echo " Starship already configured in ~/.zshrc"
|
||||
fi
|
||||
|
||||
echo "Done."
|
||||
193
install_LOCAL_19815.sh
Normal file
193
install_LOCAL_19815.sh
Normal file
@@ -0,0 +1,193 @@
|
||||
#!/usr/bin/env bash
|
||||
# install.sh: Install dependencies and stow all packages.
|
||||
# Run this after cloning on a new machine.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
DOTFILES_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Detect Linux distribution
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
detect_distro() {
|
||||
if [[ -f /etc/os-release ]]; then
|
||||
. /etc/os-release
|
||||
echo "$ID"
|
||||
else
|
||||
echo "unknown"
|
||||
fi
|
||||
}
|
||||
|
||||
DISTRO=$(detect_distro)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Dependencies
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
COMMON_PACKAGES=(
|
||||
stow
|
||||
swayidle
|
||||
mako
|
||||
libnotify
|
||||
fuzzel
|
||||
wireplumber
|
||||
brightnessctl
|
||||
alsa-utils
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
jq
|
||||
firefox
|
||||
zoxide
|
||||
)
|
||||
|
||||
case "$DISTRO" in
|
||||
endeavouros|arch)
|
||||
# Keep distro-specific packages clearly listed
|
||||
DISTRO_PACKAGES=(
|
||||
pipewire-pulse # Arch-specific
|
||||
ffmpeg # Available in official repos
|
||||
)
|
||||
PACKAGES=("${COMMON_PACKAGES[@]}" "${DISTRO_PACKAGES[@]}")
|
||||
echo "Installing packages for Arch/EndeavourOS..."
|
||||
sudo pacman -S --noconfirm "${PACKAGES[@]}"
|
||||
;;
|
||||
fedora|fedora-asahi-remix)
|
||||
DISTRO_PACKAGES=(
|
||||
pipewire-utils # Fedora's package name
|
||||
ffmpeg # Requires RPM Fusion
|
||||
)
|
||||
PACKAGES=("${COMMON_PACKAGES[@]}" "${DISTRO_PACKAGES[@]}")
|
||||
echo "Installing packages for Fedora..."
|
||||
sudo dnf install -y "${PACKAGES[@]}"
|
||||
;;
|
||||
*)
|
||||
echo "ERROR: Unsupported distribution: $DISTRO"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Packages not in Fedora repos - install manually if missing
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
warn_missing() {
|
||||
local cmd="$1" msg="$2"
|
||||
if ! command -v "$cmd" &>/dev/null; then
|
||||
echo "WARNING: '$cmd' not found - $msg"
|
||||
fi
|
||||
}
|
||||
|
||||
warn_missing autotiling "install via pip: pip install --user autotiling"
|
||||
warn_missing eww "install from https://github.com/elkowar/eww/releases"
|
||||
warn_missing wezterm "install from https://wezfurlong.org/wezterm/install/linux.html"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Starship
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
if ! command -v starship &>/dev/null; then
|
||||
echo ""
|
||||
echo "Installing Starship..."
|
||||
curl -sS https://starship.rs/install.sh | sh
|
||||
else
|
||||
echo ""
|
||||
echo "Starship already installed, skipping."
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# NPM packages
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Installing npm packages..."
|
||||
npm install -g @mariozechner/pi-coding-agent
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Fonts
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
FONT_DIR="$HOME/.local/share/fonts/JetBrainsMono"
|
||||
if [[ ! -d "$FONT_DIR" ]]; then
|
||||
echo ""
|
||||
echo "Installing JetBrains Mono Nerd Font..."
|
||||
TMP="$(mktemp -d)"
|
||||
curl -fLo "$TMP/JetBrainsMono.zip" \
|
||||
"https://github.com/ryanoasis/nerd-fonts/releases/latest/download/JetBrainsMono.zip"
|
||||
mkdir -p "$FONT_DIR"
|
||||
unzip -q "$TMP/JetBrainsMono.zip" -d "$FONT_DIR"
|
||||
rm -rf "$TMP"
|
||||
fc-cache -f "$FONT_DIR"
|
||||
echo "Font installed."
|
||||
else
|
||||
echo "JetBrains Mono Nerd Font already installed, skipping."
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Stow all packages
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Stowing dotfiles..."
|
||||
|
||||
# Check for conflicts before stowing
|
||||
CONFLICTS=()
|
||||
for PACKAGE in "$DOTFILES_DIR"/*/; do
|
||||
PACKAGE="$(basename "$PACKAGE")"
|
||||
|
||||
# Skip hidden directories and .git
|
||||
[[ "$PACKAGE" == .* ]] && continue
|
||||
|
||||
# Check if package has files that would conflict
|
||||
while IFS= read -r -d '' dotfile; do
|
||||
# Get the target path this would create
|
||||
TARGET_PATH="${HOME}/${dotfile#$DOTFILES_DIR/$PACKAGE/}"
|
||||
|
||||
# If target exists and is NOT a symlink to the correct location, it's a conflict
|
||||
if [[ -e "$TARGET_PATH" ]] && [[ ! -L "$TARGET_PATH" ]]; then
|
||||
CONFLICTS+=("$PACKAGE (file: $TARGET_PATH)")
|
||||
fi
|
||||
done < <(find "$DOTFILES_DIR/$PACKAGE" -type f -print0 2>/dev/null || true)
|
||||
done
|
||||
|
||||
if [[ ${#CONFLICTS[@]} -gt 0 ]]; then
|
||||
echo "WARNING: Found conflicts with existing configs:"
|
||||
for conflict in "${CONFLICTS[@]}"; do
|
||||
echo " ✗ $conflict"
|
||||
done
|
||||
echo ""
|
||||
fi
|
||||
|
||||
# Stow all packages
|
||||
for PACKAGE in "$DOTFILES_DIR"/*/; do
|
||||
PACKAGE="$(basename "$PACKAGE")"
|
||||
|
||||
# Skip hidden directories
|
||||
[[ "$PACKAGE" == .* ]] && continue
|
||||
|
||||
echo " $PACKAGE"
|
||||
stow --dir="$DOTFILES_DIR" --target="$HOME" --restow "$PACKAGE"
|
||||
done
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Configure shell (after stowing)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Configuring zsh..."
|
||||
|
||||
# Ensure .zshrc exists (stow should have created it via symlink)
|
||||
if [[ ! -f "$HOME/.zshrc" ]]; then
|
||||
touch "$HOME/.zshrc"
|
||||
fi
|
||||
|
||||
# Ensure starship is initialized in .zshrc
|
||||
if ! grep -q 'eval "$(starship init zsh)"' "$HOME/.zshrc"; then
|
||||
echo 'eval "$(starship init zsh)"' >> "$HOME/.zshrc"
|
||||
echo " Added starship initialization to ~/.zshrc"
|
||||
else
|
||||
echo " Starship already configured in ~/.zshrc"
|
||||
fi
|
||||
|
||||
echo "Done."
|
||||
193
install_LOCAL_20337.sh
Normal file
193
install_LOCAL_20337.sh
Normal file
@@ -0,0 +1,193 @@
|
||||
#!/usr/bin/env bash
|
||||
# install.sh: Install dependencies and stow all packages.
|
||||
# Run this after cloning on a new machine.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
DOTFILES_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Detect Linux distribution
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
detect_distro() {
|
||||
if [[ -f /etc/os-release ]]; then
|
||||
. /etc/os-release
|
||||
echo "$ID"
|
||||
else
|
||||
echo "unknown"
|
||||
fi
|
||||
}
|
||||
|
||||
DISTRO=$(detect_distro)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Dependencies
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
COMMON_PACKAGES=(
|
||||
stow
|
||||
swayidle
|
||||
mako
|
||||
libnotify
|
||||
fuzzel
|
||||
wireplumber
|
||||
brightnessctl
|
||||
alsa-utils
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
jq
|
||||
firefox
|
||||
zoxide
|
||||
)
|
||||
|
||||
case "$DISTRO" in
|
||||
endeavouros|arch)
|
||||
# Keep distro-specific packages clearly listed
|
||||
DISTRO_PACKAGES=(
|
||||
pipewire-pulse # Arch-specific
|
||||
ffmpeg # Available in official repos
|
||||
)
|
||||
PACKAGES=("${COMMON_PACKAGES[@]}" "${DISTRO_PACKAGES[@]}")
|
||||
echo "Installing packages for Arch/EndeavourOS..."
|
||||
sudo pacman -S --noconfirm "${PACKAGES[@]}"
|
||||
;;
|
||||
fedora|fedora-asahi-remix)
|
||||
DISTRO_PACKAGES=(
|
||||
pipewire-utils # Fedora's package name
|
||||
ffmpeg # Requires RPM Fusion
|
||||
)
|
||||
PACKAGES=("${COMMON_PACKAGES[@]}" "${DISTRO_PACKAGES[@]}")
|
||||
echo "Installing packages for Fedora..."
|
||||
sudo dnf install -y "${PACKAGES[@]}"
|
||||
;;
|
||||
*)
|
||||
echo "ERROR: Unsupported distribution: $DISTRO"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Packages not in Fedora repos - install manually if missing
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
warn_missing() {
|
||||
local cmd="$1" msg="$2"
|
||||
if ! command -v "$cmd" &>/dev/null; then
|
||||
echo "WARNING: '$cmd' not found - $msg"
|
||||
fi
|
||||
}
|
||||
|
||||
warn_missing autotiling "install via pip: pip install --user autotiling"
|
||||
warn_missing eww "install from https://github.com/elkowar/eww/releases"
|
||||
warn_missing wezterm "install from https://wezfurlong.org/wezterm/install/linux.html"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Starship
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
if ! command -v starship &>/dev/null; then
|
||||
echo ""
|
||||
echo "Installing Starship..."
|
||||
curl -sS https://starship.rs/install.sh | sh
|
||||
else
|
||||
echo ""
|
||||
echo "Starship already installed, skipping."
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# NPM packages
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Installing npm packages..."
|
||||
npm install -g @mariozechner/pi-coding-agent
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Fonts
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
FONT_DIR="$HOME/.local/share/fonts/JetBrainsMono"
|
||||
if [[ ! -d "$FONT_DIR" ]]; then
|
||||
echo ""
|
||||
echo "Installing JetBrains Mono Nerd Font..."
|
||||
TMP="$(mktemp -d)"
|
||||
curl -fLo "$TMP/JetBrainsMono.zip" \
|
||||
"https://github.com/ryanoasis/nerd-fonts/releases/latest/download/JetBrainsMono.zip"
|
||||
mkdir -p "$FONT_DIR"
|
||||
unzip -q "$TMP/JetBrainsMono.zip" -d "$FONT_DIR"
|
||||
rm -rf "$TMP"
|
||||
fc-cache -f "$FONT_DIR"
|
||||
echo "Font installed."
|
||||
else
|
||||
echo "JetBrains Mono Nerd Font already installed, skipping."
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Stow all packages
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Stowing dotfiles..."
|
||||
|
||||
# Check for conflicts before stowing
|
||||
CONFLICTS=()
|
||||
for PACKAGE in "$DOTFILES_DIR"/*/; do
|
||||
PACKAGE="$(basename "$PACKAGE")"
|
||||
|
||||
# Skip hidden directories and .git
|
||||
[[ "$PACKAGE" == .* ]] && continue
|
||||
|
||||
# Check if package has files that would conflict
|
||||
while IFS= read -r -d '' dotfile; do
|
||||
# Get the target path this would create
|
||||
TARGET_PATH="${HOME}/${dotfile#$DOTFILES_DIR/$PACKAGE/}"
|
||||
|
||||
# If target exists and is NOT a symlink to the correct location, it's a conflict
|
||||
if [[ -e "$TARGET_PATH" ]] && [[ ! -L "$TARGET_PATH" ]]; then
|
||||
CONFLICTS+=("$PACKAGE (file: $TARGET_PATH)")
|
||||
fi
|
||||
done < <(find "$DOTFILES_DIR/$PACKAGE" -type f -print0 2>/dev/null || true)
|
||||
done
|
||||
|
||||
if [[ ${#CONFLICTS[@]} -gt 0 ]]; then
|
||||
echo "WARNING: Found conflicts with existing configs:"
|
||||
for conflict in "${CONFLICTS[@]}"; do
|
||||
echo " ✗ $conflict"
|
||||
done
|
||||
echo ""
|
||||
fi
|
||||
|
||||
# Stow all packages
|
||||
for PACKAGE in "$DOTFILES_DIR"/*/; do
|
||||
PACKAGE="$(basename "$PACKAGE")"
|
||||
|
||||
# Skip hidden directories
|
||||
[[ "$PACKAGE" == .* ]] && continue
|
||||
|
||||
echo " $PACKAGE"
|
||||
stow --dir="$DOTFILES_DIR" --target="$HOME" --restow "$PACKAGE"
|
||||
done
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Configure shell (after stowing)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Configuring zsh..."
|
||||
|
||||
# Ensure .zshrc exists (stow should have created it via symlink)
|
||||
if [[ ! -f "$HOME/.zshrc" ]]; then
|
||||
touch "$HOME/.zshrc"
|
||||
fi
|
||||
|
||||
# Ensure starship is initialized in .zshrc
|
||||
if ! grep -q 'eval "$(starship init zsh)"' "$HOME/.zshrc"; then
|
||||
echo 'eval "$(starship init zsh)"' >> "$HOME/.zshrc"
|
||||
echo " Added starship initialization to ~/.zshrc"
|
||||
else
|
||||
echo " Starship already configured in ~/.zshrc"
|
||||
fi
|
||||
|
||||
echo "Done."
|
||||
267
install_REMOTE_19815.sh
Normal file
267
install_REMOTE_19815.sh
Normal file
@@ -0,0 +1,267 @@
|
||||
#!/usr/bin/env bash
|
||||
# install.sh: Install dependencies and stow all packages.
|
||||
# Run this after cloning on a new machine.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
DOTFILES_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Detect Linux distribution
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
detect_distro() {
|
||||
if [[ -f /etc/os-release ]]; then
|
||||
. /etc/os-release
|
||||
echo "$ID"
|
||||
else
|
||||
echo "unknown"
|
||||
fi
|
||||
}
|
||||
|
||||
DISTRO=$(detect_distro)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Dependencies
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
# On Arch-based systems, partial upgrades are unsupported — installing a
|
||||
# package that pulls in a newer library breaks packages built against the old
|
||||
# one. The right fix is 'sudo pacman -Syu', but doing that over SSH risks
|
||||
# a dropped connection mid-kernel-upgrade. So we just warn and let the user
|
||||
# decide.
|
||||
check_arch_updates() {
|
||||
sudo pacman -Sy --noconfirm # refresh databases only, no upgrade
|
||||
local updates
|
||||
updates=$(pacman -Qu 2>/dev/null | wc -l)
|
||||
if [[ "$updates" -gt 0 ]]; then
|
||||
echo ""
|
||||
echo "WARNING: $updates system package(s) are out of date."
|
||||
echo " If pacman fails with dependency conflicts, run 'sudo pacman -Syu'"
|
||||
echo " locally (not over SSH, to avoid kernel upgrade risks), then re-run"
|
||||
echo " this script."
|
||||
echo ""
|
||||
fi
|
||||
}
|
||||
|
||||
case "$DISTRO" in
|
||||
endeavouros)
|
||||
# EndeavourOS is Arch-based, use pacman
|
||||
PACMAN_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-pulse # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
check_arch_updates
|
||||
echo "Installing packages for EndeavourOS..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
fedora)
|
||||
DNF_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-utils # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg # needs RPM Fusion: https://rpmfusion.org
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
echo "Installing packages for Fedora..."
|
||||
sudo dnf install -y "${DNF_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
arch)
|
||||
PACMAN_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-pulse # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
check_arch_updates
|
||||
echo "Installing packages for Arch Linux..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "ERROR: Unsupported distribution: $DISTRO"
|
||||
echo "Supported distributions: fedora, arch, endeavouros"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Packages not in Fedora repos - install manually if missing
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
warn_missing() {
|
||||
local cmd="$1" msg="$2"
|
||||
if ! command -v "$cmd" &>/dev/null; then
|
||||
echo "WARNING: '$cmd' not found - $msg"
|
||||
fi
|
||||
}
|
||||
|
||||
warn_missing autotiling "install via pip: pip install --user autotiling"
|
||||
warn_missing eww "install from https://github.com/elkowar/eww/releases"
|
||||
warn_missing wezterm "install from https://wezfurlong.org/wezterm/install/linux.html"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Starship
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
if ! command -v starship &>/dev/null; then
|
||||
echo ""
|
||||
echo "Installing Starship..."
|
||||
curl -sS https://starship.rs/install.sh | sh
|
||||
else
|
||||
echo ""
|
||||
echo "Starship already installed, skipping."
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# NPM packages
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Installing npm packages..."
|
||||
npm install -g @mariozechner/pi-coding-agent
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Fonts
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
FONT_DIR="$HOME/.local/share/fonts/JetBrainsMono"
|
||||
if [[ ! -d "$FONT_DIR" ]]; then
|
||||
echo ""
|
||||
echo "Installing JetBrains Mono Nerd Font..."
|
||||
TMP="$(mktemp -d)"
|
||||
curl -fLo "$TMP/JetBrainsMono.zip" \
|
||||
"https://github.com/ryanoasis/nerd-fonts/releases/latest/download/JetBrainsMono.zip"
|
||||
mkdir -p "$FONT_DIR"
|
||||
unzip -q "$TMP/JetBrainsMono.zip" -d "$FONT_DIR"
|
||||
rm -rf "$TMP"
|
||||
fc-cache -f "$FONT_DIR"
|
||||
echo "Font installed."
|
||||
else
|
||||
echo "JetBrains Mono Nerd Font already installed, skipping."
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Stow all packages
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Stowing dotfiles..."
|
||||
|
||||
# Check for conflicts before stowing
|
||||
CONFLICTS=()
|
||||
for PACKAGE in "$DOTFILES_DIR"/*/; do
|
||||
PACKAGE="$(basename "$PACKAGE")"
|
||||
|
||||
# Skip hidden directories and .git
|
||||
[[ "$PACKAGE" == .* ]] && continue
|
||||
|
||||
# Check if package has files that would conflict
|
||||
while IFS= read -r -d '' dotfile; do
|
||||
# Get the target path this would create
|
||||
TARGET_PATH="${HOME}/${dotfile#$DOTFILES_DIR/$PACKAGE/}"
|
||||
|
||||
# If target exists and is NOT a symlink to the correct location, it's a conflict
|
||||
if [[ -e "$TARGET_PATH" ]] && [[ ! -L "$TARGET_PATH" ]]; then
|
||||
CONFLICTS+=("$PACKAGE (file: $TARGET_PATH)")
|
||||
fi
|
||||
done < <(find "$DOTFILES_DIR/$PACKAGE" -type f -print0 2>/dev/null || true)
|
||||
done
|
||||
|
||||
if [[ ${#CONFLICTS[@]} -gt 0 ]]; then
|
||||
echo "WARNING: Found conflicts with existing configs:"
|
||||
for conflict in "${CONFLICTS[@]}"; do
|
||||
echo " ✗ $conflict"
|
||||
done
|
||||
echo ""
|
||||
fi
|
||||
|
||||
# Stow all packages
|
||||
for PACKAGE in "$DOTFILES_DIR"/*/; do
|
||||
PACKAGE="$(basename "$PACKAGE")"
|
||||
|
||||
# Skip hidden directories
|
||||
[[ "$PACKAGE" == .* ]] && continue
|
||||
|
||||
echo " $PACKAGE"
|
||||
stow --dir="$DOTFILES_DIR" --target="$HOME" --restow "$PACKAGE"
|
||||
done
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Configure shell (after stowing)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Configuring zsh..."
|
||||
|
||||
# Ensure .zshrc exists (stow should have created it via symlink)
|
||||
if [[ ! -f "$HOME/.zshrc" ]]; then
|
||||
touch "$HOME/.zshrc"
|
||||
fi
|
||||
|
||||
# Ensure starship is initialized in .zshrc
|
||||
if ! grep -q 'eval "$(starship init zsh)"' "$HOME/.zshrc"; then
|
||||
echo 'eval "$(starship init zsh)"' >> "$HOME/.zshrc"
|
||||
echo " Added starship initialization to ~/.zshrc"
|
||||
else
|
||||
echo " Starship already configured in ~/.zshrc"
|
||||
fi
|
||||
|
||||
echo "Done."
|
||||
267
install_REMOTE_20337.sh
Normal file
267
install_REMOTE_20337.sh
Normal file
@@ -0,0 +1,267 @@
|
||||
#!/usr/bin/env bash
|
||||
# install.sh: Install dependencies and stow all packages.
|
||||
# Run this after cloning on a new machine.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
DOTFILES_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Detect Linux distribution
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
detect_distro() {
|
||||
if [[ -f /etc/os-release ]]; then
|
||||
. /etc/os-release
|
||||
echo "$ID"
|
||||
else
|
||||
echo "unknown"
|
||||
fi
|
||||
}
|
||||
|
||||
DISTRO=$(detect_distro)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Dependencies
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
# On Arch-based systems, partial upgrades are unsupported — installing a
|
||||
# package that pulls in a newer library breaks packages built against the old
|
||||
# one. The right fix is 'sudo pacman -Syu', but doing that over SSH risks
|
||||
# a dropped connection mid-kernel-upgrade. So we just warn and let the user
|
||||
# decide.
|
||||
check_arch_updates() {
|
||||
sudo pacman -Sy --noconfirm # refresh databases only, no upgrade
|
||||
local updates
|
||||
updates=$(pacman -Qu 2>/dev/null | wc -l)
|
||||
if [[ "$updates" -gt 0 ]]; then
|
||||
echo ""
|
||||
echo "WARNING: $updates system package(s) are out of date."
|
||||
echo " If pacman fails with dependency conflicts, run 'sudo pacman -Syu'"
|
||||
echo " locally (not over SSH, to avoid kernel upgrade risks), then re-run"
|
||||
echo " this script."
|
||||
echo ""
|
||||
fi
|
||||
}
|
||||
|
||||
case "$DISTRO" in
|
||||
endeavouros)
|
||||
# EndeavourOS is Arch-based, use pacman
|
||||
PACMAN_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-pulse # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
check_arch_updates
|
||||
echo "Installing packages for EndeavourOS..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
fedora)
|
||||
DNF_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-utils # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg # needs RPM Fusion: https://rpmfusion.org
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
echo "Installing packages for Fedora..."
|
||||
sudo dnf install -y "${DNF_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
arch)
|
||||
PACMAN_PACKAGES=(
|
||||
stow
|
||||
# sway ecosystem
|
||||
swayidle
|
||||
# bar & notifications
|
||||
mako
|
||||
libnotify # notify-send
|
||||
# terminal & launcher
|
||||
fuzzel
|
||||
# audio & display
|
||||
wireplumber # wpctl
|
||||
pipewire-pulse # pactl
|
||||
brightnessctl
|
||||
alsa-utils # speaker-test
|
||||
# screen recording
|
||||
wf-recorder
|
||||
slurp
|
||||
zenity
|
||||
ffmpeg
|
||||
# misc
|
||||
jq
|
||||
firefox
|
||||
)
|
||||
|
||||
check_arch_updates
|
||||
echo "Installing packages for Arch Linux..."
|
||||
sudo pacman -S --noconfirm "${PACMAN_PACKAGES[@]}"
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "ERROR: Unsupported distribution: $DISTRO"
|
||||
echo "Supported distributions: fedora, arch, endeavouros"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Packages not in Fedora repos - install manually if missing
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
warn_missing() {
|
||||
local cmd="$1" msg="$2"
|
||||
if ! command -v "$cmd" &>/dev/null; then
|
||||
echo "WARNING: '$cmd' not found - $msg"
|
||||
fi
|
||||
}
|
||||
|
||||
warn_missing autotiling "install via pip: pip install --user autotiling"
|
||||
warn_missing eww "install from https://github.com/elkowar/eww/releases"
|
||||
warn_missing wezterm "install from https://wezfurlong.org/wezterm/install/linux.html"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Starship
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
if ! command -v starship &>/dev/null; then
|
||||
echo ""
|
||||
echo "Installing Starship..."
|
||||
curl -sS https://starship.rs/install.sh | sh
|
||||
else
|
||||
echo ""
|
||||
echo "Starship already installed, skipping."
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# NPM packages
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Installing npm packages..."
|
||||
npm install -g @mariozechner/pi-coding-agent
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Fonts
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
FONT_DIR="$HOME/.local/share/fonts/JetBrainsMono"
|
||||
if [[ ! -d "$FONT_DIR" ]]; then
|
||||
echo ""
|
||||
echo "Installing JetBrains Mono Nerd Font..."
|
||||
TMP="$(mktemp -d)"
|
||||
curl -fLo "$TMP/JetBrainsMono.zip" \
|
||||
"https://github.com/ryanoasis/nerd-fonts/releases/latest/download/JetBrainsMono.zip"
|
||||
mkdir -p "$FONT_DIR"
|
||||
unzip -q "$TMP/JetBrainsMono.zip" -d "$FONT_DIR"
|
||||
rm -rf "$TMP"
|
||||
fc-cache -f "$FONT_DIR"
|
||||
echo "Font installed."
|
||||
else
|
||||
echo "JetBrains Mono Nerd Font already installed, skipping."
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Stow all packages
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Stowing dotfiles..."
|
||||
|
||||
# Check for conflicts before stowing
|
||||
CONFLICTS=()
|
||||
for PACKAGE in "$DOTFILES_DIR"/*/; do
|
||||
PACKAGE="$(basename "$PACKAGE")"
|
||||
|
||||
# Skip hidden directories and .git
|
||||
[[ "$PACKAGE" == .* ]] && continue
|
||||
|
||||
# Check if package has files that would conflict
|
||||
while IFS= read -r -d '' dotfile; do
|
||||
# Get the target path this would create
|
||||
TARGET_PATH="${HOME}/${dotfile#$DOTFILES_DIR/$PACKAGE/}"
|
||||
|
||||
# If target exists and is NOT a symlink to the correct location, it's a conflict
|
||||
if [[ -e "$TARGET_PATH" ]] && [[ ! -L "$TARGET_PATH" ]]; then
|
||||
CONFLICTS+=("$PACKAGE (file: $TARGET_PATH)")
|
||||
fi
|
||||
done < <(find "$DOTFILES_DIR/$PACKAGE" -type f -print0 2>/dev/null || true)
|
||||
done
|
||||
|
||||
if [[ ${#CONFLICTS[@]} -gt 0 ]]; then
|
||||
echo "WARNING: Found conflicts with existing configs:"
|
||||
for conflict in "${CONFLICTS[@]}"; do
|
||||
echo " ✗ $conflict"
|
||||
done
|
||||
echo ""
|
||||
fi
|
||||
|
||||
# Stow all packages
|
||||
for PACKAGE in "$DOTFILES_DIR"/*/; do
|
||||
PACKAGE="$(basename "$PACKAGE")"
|
||||
|
||||
# Skip hidden directories
|
||||
[[ "$PACKAGE" == .* ]] && continue
|
||||
|
||||
echo " $PACKAGE"
|
||||
stow --dir="$DOTFILES_DIR" --target="$HOME" --restow "$PACKAGE"
|
||||
done
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Configure shell (after stowing)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
echo ""
|
||||
echo "Configuring zsh..."
|
||||
|
||||
# Ensure .zshrc exists (stow should have created it via symlink)
|
||||
if [[ ! -f "$HOME/.zshrc" ]]; then
|
||||
touch "$HOME/.zshrc"
|
||||
fi
|
||||
|
||||
# Ensure starship is initialized in .zshrc
|
||||
if ! grep -q 'eval "$(starship init zsh)"' "$HOME/.zshrc"; then
|
||||
echo 'eval "$(starship init zsh)"' >> "$HOME/.zshrc"
|
||||
echo " Added starship initialization to ~/.zshrc"
|
||||
else
|
||||
echo " Starship already configured in ~/.zshrc"
|
||||
fi
|
||||
|
||||
echo "Done."
|
||||
@@ -1,9 +1,9 @@
|
||||
---
|
||||
name: explorer
|
||||
description: Deep codebase and knowledge-base explorer using Claude Haiku with semantic search (QMD) and HDC-indexed context retrieval (opty). Use for thorough exploration, cross-cutting queries across docs and code, or when the local scout's Qwen model isn't cutting it.
|
||||
description: Comprehensive codebase and knowledge-base explorer. Maps architecture, traces dependencies, synthesizes cross-cutting context with full code snippets and rationale. Use for deep refactoring, architectural decisions, or understanding complex subsystems.
|
||||
tools: read, bash, write, mcp:qmd, mcp:opty
|
||||
model: anthropic/claude-haiku-4-5
|
||||
output: context.md
|
||||
output: /home/jonas/.pi/context.md
|
||||
defaultProgress: true
|
||||
---
|
||||
|
||||
@@ -42,7 +42,11 @@ You are an explorer. Thoroughly investigate a codebase or knowledge base and ret
|
||||
- Medium: follow the most important cross-references, read critical sections
|
||||
- Thorough: trace all dependencies, check related files, synthesize a full picture
|
||||
|
||||
## Output format (context.md)
|
||||
## Output format (/home/jonas/.pi/context.md)
|
||||
|
||||
Write your report to **/home/jonas/.pi/context.md**. End your text response with:
|
||||
|
||||
> Report saved to: /home/jonas/.pi/context.md
|
||||
|
||||
# Exploration Context
|
||||
|
||||
|
||||
@@ -1,9 +1,16 @@
|
||||
/**
|
||||
* Claude Account Switch Extension
|
||||
*
|
||||
* Switches between two Claude Pro accounts (personal and work).
|
||||
* Tokens are saved from pi's own OAuth sessions (not Claude CLI),
|
||||
* so token refresh works correctly.
|
||||
* Switches between two Claude Pro accounts (personal and work) **without
|
||||
* restarting pi**. Works by swapping auth.json files at the filesystem level,
|
||||
* then reloading the auth storage and forcing an immediate token refresh to
|
||||
* validate the switch.
|
||||
*
|
||||
* Why file-level swaps? Anthropic's OAuth rotates refresh tokens on every
|
||||
* refresh. Calling authStorage.set() can appear to work, but the next
|
||||
* getApiKey() call triggers refreshOAuthTokenWithLock(), which re-reads
|
||||
* auth.json from disk — overwriting in-memory changes if persistence
|
||||
* silently failed. Working at the file level avoids this entirely.
|
||||
*
|
||||
* Setup (one-time per account):
|
||||
* 1. /login → authenticate with personal account
|
||||
@@ -20,15 +27,17 @@ import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
|
||||
import * as fs from "node:fs";
|
||||
import * as os from "node:os";
|
||||
import * as path from "node:path";
|
||||
import { execSync } from "node:child_process";
|
||||
|
||||
const HOME = os.homedir();
|
||||
const AUTH_FILE = path.join(HOME, ".pi/agent/auth.json");
|
||||
const AGENT_DIR = path.join(HOME, ".pi/agent");
|
||||
const AUTH_JSON = path.join(HOME, ".pi/agent/auth.json");
|
||||
const MARKER_FILE = path.join(HOME, ".pi/agent/auth.json.current");
|
||||
const PROFILES_DIR = path.join(HOME, ".pi/agent/profiles");
|
||||
|
||||
type Account = "personal" | "work";
|
||||
|
||||
// ── Profile helpers ────────────────────────────────────────────────────────
|
||||
|
||||
function profilePath(account: Account): string {
|
||||
return path.join(PROFILES_DIR, `auth-${account}.json`);
|
||||
}
|
||||
@@ -37,17 +46,30 @@ function hasProfile(account: Account): boolean {
|
||||
return fs.existsSync(profilePath(account));
|
||||
}
|
||||
|
||||
function saveProfile(account: Account): void {
|
||||
/**
|
||||
* Save auth.json content directly to a profile file.
|
||||
* This captures the exact on-disk state, including any tokens that were
|
||||
* refreshed behind our back by the auth system.
|
||||
*/
|
||||
function saveCurrentAuthToProfile(account: Account): void {
|
||||
fs.mkdirSync(PROFILES_DIR, { recursive: true });
|
||||
fs.copyFileSync(AUTH_FILE, profilePath(account));
|
||||
if (fs.existsSync(AUTH_JSON)) {
|
||||
fs.copyFileSync(AUTH_JSON, profilePath(account));
|
||||
fs.chmodSync(profilePath(account), 0o600);
|
||||
fs.writeFileSync(MARKER_FILE, account);
|
||||
}
|
||||
}
|
||||
|
||||
function loadProfile(account: Account): void {
|
||||
fs.copyFileSync(profilePath(account), AUTH_FILE);
|
||||
fs.chmodSync(AUTH_FILE, 0o600);
|
||||
fs.writeFileSync(MARKER_FILE, account);
|
||||
/**
|
||||
* Copy a profile file to auth.json. This is an atomic-ish swap that
|
||||
* replaces the entire file rather than merging per-provider.
|
||||
*/
|
||||
function restoreProfileToAuth(account: Account): void {
|
||||
fs.copyFileSync(profilePath(account), AUTH_JSON);
|
||||
fs.chmodSync(AUTH_JSON, 0o600);
|
||||
}
|
||||
|
||||
function setMarker(account: Account): void {
|
||||
fs.writeFileSync(MARKER_FILE, account, "utf-8");
|
||||
}
|
||||
|
||||
function getCurrentAccount(): Account | "unknown" {
|
||||
@@ -58,132 +80,223 @@ function getCurrentAccount(): Account | "unknown" {
|
||||
return "unknown";
|
||||
}
|
||||
|
||||
// ── Other session detection ────────────────────────────────────────────────
|
||||
|
||||
function otherPiSessions(): number[] {
|
||||
try {
|
||||
const myPid = process.pid;
|
||||
// Use a character class [c] trick so pgrep doesn't match its own process
|
||||
const out = execSync("pgrep -f 'pi-[c]oding-agent' 2>/dev/null || true", {
|
||||
encoding: "utf-8",
|
||||
});
|
||||
const pids = out
|
||||
.trim()
|
||||
.split("\n")
|
||||
.map(Number)
|
||||
.filter((p) => p && p !== myPid && !isNaN(p));
|
||||
return pids;
|
||||
} catch {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
function killOtherSessions(pids: number[]): number {
|
||||
let killed = 0;
|
||||
for (const pid of pids) {
|
||||
try {
|
||||
process.kill(pid);
|
||||
killed++;
|
||||
} catch {
|
||||
// already dead or permission denied
|
||||
}
|
||||
}
|
||||
return killed;
|
||||
}
|
||||
|
||||
// ── UI helpers ─────────────────────────────────────────────────────────────
|
||||
|
||||
function statusLabel(account: Account | "unknown"): string {
|
||||
switch (account) {
|
||||
case "personal": return "🏠 personal";
|
||||
case "work": return "💼 work";
|
||||
default: return "❓ claude";
|
||||
case "personal":
|
||||
return "🏠 personal";
|
||||
case "work":
|
||||
return "💼 work";
|
||||
default:
|
||||
return "❓ claude";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sync auth.json into the active profile file whenever pi rotates tokens.
|
||||
*
|
||||
* Pi writes fresh OAuth tokens to auth.json (via direct write or atomic
|
||||
* rename). Without this watcher the profile file would keep the original
|
||||
* snapshot token, which Anthropic invalidates after its first use as a
|
||||
* refresh-token rotation. The next /switch-claude would restore the dead
|
||||
* refresh token and force a full re-login.
|
||||
*
|
||||
* We watch the agent directory (more reliable than watching the file
|
||||
* directly across atomic renames) and copy auth.json → active profile
|
||||
* on every change, debounced to avoid duplicate writes.
|
||||
*/
|
||||
function startProfileSyncer(getAccount: () => Account | "unknown"): fs.FSWatcher | null {
|
||||
let debounceTimer: ReturnType<typeof setTimeout> | null = null;
|
||||
|
||||
const syncNow = () => {
|
||||
const account = getAccount();
|
||||
if (account === "unknown") return;
|
||||
if (!fs.existsSync(AUTH_FILE)) return;
|
||||
try {
|
||||
const content = fs.readFileSync(AUTH_FILE, "utf8");
|
||||
JSON.parse(content); // only sync valid JSON
|
||||
const dest = profilePath(account);
|
||||
fs.mkdirSync(PROFILES_DIR, { recursive: true });
|
||||
fs.writeFileSync(dest, content, "utf8");
|
||||
fs.chmodSync(dest, 0o600);
|
||||
} catch {
|
||||
// ignore transient read errors (file mid-write, etc.)
|
||||
}
|
||||
};
|
||||
|
||||
try {
|
||||
return fs.watch(AGENT_DIR, { persistent: false }, (_event, filename) => {
|
||||
if (filename !== "auth.json") return;
|
||||
if (debounceTimer) clearTimeout(debounceTimer);
|
||||
debounceTimer = setTimeout(syncNow, 200);
|
||||
});
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
// ── Extension ──────────────────────────────────────────────────────────────
|
||||
|
||||
export default function (pi: ExtensionAPI) {
|
||||
let currentAccount: Account | "unknown" = "unknown";
|
||||
let syncer: fs.FSWatcher | null = null;
|
||||
|
||||
pi.on("session_start", async (_event, ctx) => {
|
||||
currentAccount = getCurrentAccount();
|
||||
ctx.ui.setStatus("claude-account", statusLabel(currentAccount));
|
||||
|
||||
// Start watching auth.json so token refreshes are mirrored into
|
||||
// the active profile file. Only one watcher is needed per session.
|
||||
if (!syncer) {
|
||||
syncer = startProfileSyncer(() => currentAccount);
|
||||
}
|
||||
});
|
||||
|
||||
pi.on("session_shutdown", async () => {
|
||||
if (syncer) {
|
||||
syncer.close();
|
||||
syncer = null;
|
||||
}
|
||||
});
|
||||
|
||||
pi.registerCommand("switch-claude", {
|
||||
description: "Switch between personal (🏠) and work (💼) Claude accounts. Use 'save <name>' to save current login as a profile.",
|
||||
description:
|
||||
"Switch between personal (🏠) and work (💼) Claude accounts. Use 'save <name>' to save current login as a profile.",
|
||||
handler: async (args, ctx) => {
|
||||
const authStorage = ctx.modelRegistry.authStorage;
|
||||
const trimmed = args?.trim() ?? "";
|
||||
|
||||
// Save current auth.json as a named profile
|
||||
// ── Save current auth state as a named profile ──────────────────
|
||||
if (trimmed.startsWith("save ")) {
|
||||
const name = trimmed.slice(5).trim();
|
||||
if (name !== "personal" && name !== "work") {
|
||||
ctx.ui.notify("Usage: /switch-claude save personal|work", "warning");
|
||||
return;
|
||||
}
|
||||
saveProfile(name as Account);
|
||||
currentAccount = name as Account;
|
||||
ctx.ui.setStatus("claude-account", statusLabel(currentAccount));
|
||||
ctx.ui.notify(`Saved current login as ${statusLabel(name as Account)} profile`, "info");
|
||||
ctx.ui.notify(
|
||||
"Usage: /switch-claude save personal|work",
|
||||
"warning",
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
// Switch between profiles
|
||||
if (!authStorage.has("anthropic")) {
|
||||
ctx.ui.notify(
|
||||
"No Anthropic credentials found. Run /login first.",
|
||||
"warning",
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
saveCurrentAuthToProfile(name as Account);
|
||||
currentAccount = name as Account;
|
||||
setMarker(currentAccount);
|
||||
ctx.ui.setStatus("claude-account", statusLabel(currentAccount));
|
||||
ctx.ui.notify(
|
||||
`Saved current login as ${statusLabel(name as Account)} profile`,
|
||||
"info",
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
// ── Resolve target account (direct arg or interactive) ──────────
|
||||
let newAccount: Account;
|
||||
if (trimmed === "personal" || trimmed === "work") {
|
||||
newAccount = trimmed;
|
||||
} else if (trimmed === "") {
|
||||
const personalLabel = `🏠 personal${currentAccount === "personal" ? " ← current" : ""}${!hasProfile("personal") ? " (no profile saved)" : ""}`;
|
||||
const workLabel = `💼 work${currentAccount === "work" ? " ← current" : ""}${!hasProfile("work") ? " (no profile saved)" : ""}`;
|
||||
|
||||
const choice = await ctx.ui.select("Switch Claude account:", [personalLabel, workLabel]);
|
||||
if (choice === undefined) return;
|
||||
|
||||
const newAccount: Account = choice.startsWith("🏠") ? "personal" : "work";
|
||||
const accountChoice = await ctx.ui.select(
|
||||
"Switch Claude account:",
|
||||
[personalLabel, workLabel],
|
||||
);
|
||||
if (accountChoice === undefined) return;
|
||||
newAccount = accountChoice.startsWith("🏠") ? "personal" : "work";
|
||||
} else {
|
||||
ctx.ui.notify(
|
||||
"Usage: /switch-claude [personal|work|save <name>]",
|
||||
"warning",
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
if (newAccount === currentAccount) {
|
||||
ctx.ui.notify(`Already using ${statusLabel(newAccount)}`, "info");
|
||||
ctx.ui.notify(
|
||||
`Already using ${statusLabel(newAccount)}`,
|
||||
"info",
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
// ── Warn about other sessions ───────────────────────────────────
|
||||
const otherPids = otherPiSessions();
|
||||
if (otherPids.length > 0) {
|
||||
const sessionChoice = await ctx.ui.select(
|
||||
`⚠️ ${otherPids.length} other pi session(s) detected`,
|
||||
[
|
||||
"Continue anyway",
|
||||
`Kill ${otherPids.length} other instance(s) and continue`,
|
||||
"Cancel",
|
||||
],
|
||||
);
|
||||
if (sessionChoice === undefined || sessionChoice.includes("Cancel"))
|
||||
return;
|
||||
|
||||
if (sessionChoice.includes("Kill")) {
|
||||
const killed = killOtherSessions(otherPids);
|
||||
ctx.ui.notify(`Killed ${killed} pi session(s)`, "info");
|
||||
}
|
||||
}
|
||||
|
||||
if (!hasProfile(newAccount)) {
|
||||
ctx.ui.notify(
|
||||
`No profile saved for ${newAccount}. Run /login then /switch-claude save ${newAccount}`,
|
||||
"warning"
|
||||
"warning",
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
// ── Perform the switch ──────────────────────────────────────────
|
||||
try {
|
||||
// Persist any token refreshes pi made since the last save so
|
||||
// we don't restore a stale refresh token when we come back.
|
||||
if (currentAccount !== "unknown") saveProfile(currentAccount);
|
||||
loadProfile(newAccount);
|
||||
// 1. Snapshot current auth.json → outgoing profile.
|
||||
// This captures any tokens that were silently refreshed
|
||||
// since the last save (the file is the source of truth,
|
||||
// not the in-memory snapshot from getAll()).
|
||||
if (currentAccount !== "unknown") {
|
||||
saveCurrentAuthToProfile(currentAccount);
|
||||
}
|
||||
|
||||
// 2. Copy incoming profile → auth.json (full file replace).
|
||||
restoreProfileToAuth(newAccount);
|
||||
|
||||
// 3. Tell AuthStorage to re-read the file. This updates
|
||||
// the in-memory credential cache from the new auth.json.
|
||||
authStorage.reload();
|
||||
|
||||
// 4. Force an immediate token refresh to validate the switch.
|
||||
// If the stored refresh token is stale, this will fail now
|
||||
// rather than on the next chat message.
|
||||
const apiKey = await authStorage.getApiKey("anthropic");
|
||||
|
||||
if (!apiKey) {
|
||||
// Refresh failed → roll back to the previous account.
|
||||
if (currentAccount !== "unknown") {
|
||||
restoreProfileToAuth(currentAccount);
|
||||
authStorage.reload();
|
||||
}
|
||||
ctx.ui.notify(
|
||||
`❌ Switch failed: could not authenticate as ${newAccount}. ` +
|
||||
`The saved refresh token may have expired. ` +
|
||||
`Run /login then /switch-claude save ${newAccount} to re-save.`,
|
||||
"error",
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
// 5. Success — the refresh worked, auth.json now has fresh
|
||||
// tokens. Save them back to the profile so next switch
|
||||
// has the latest refresh token.
|
||||
saveCurrentAuthToProfile(newAccount);
|
||||
|
||||
currentAccount = newAccount;
|
||||
setMarker(currentAccount);
|
||||
ctx.ui.setStatus("claude-account", statusLabel(currentAccount));
|
||||
pi.events.emit("claude-account:switched", { account: newAccount });
|
||||
ctx.ui.notify(`Switched to ${statusLabel(newAccount)} — restart pi to apply`, "info");
|
||||
ctx.ui.notify(
|
||||
`Switched to ${statusLabel(newAccount)} ✓`,
|
||||
"info",
|
||||
);
|
||||
} catch (e: unknown) {
|
||||
// Something went wrong → try to roll back.
|
||||
try {
|
||||
if (currentAccount !== "unknown" && hasProfile(currentAccount)) {
|
||||
restoreProfileToAuth(currentAccount);
|
||||
authStorage.reload();
|
||||
}
|
||||
} catch {
|
||||
// rollback failed too — nothing more we can do
|
||||
}
|
||||
|
||||
const msg = e instanceof Error ? e.message : String(e);
|
||||
ctx.ui.notify(`Failed to switch: ${msg}`, "error");
|
||||
ctx.ui.notify(
|
||||
`❌ Switch failed: ${msg}. Rolled back to ${statusLabel(currentAccount)}. ` +
|
||||
`You may need to /login and /switch-claude save ${newAccount}.`,
|
||||
"error",
|
||||
);
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
@@ -37,7 +37,17 @@ import {
|
||||
type UsageData,
|
||||
} from "./core";
|
||||
|
||||
const CACHE_TTL_MS = 15 * 60 * 1000; // reuse cached data for 15 min
|
||||
// Disk cache TTL for idle/background reads (session start, etc.)
|
||||
const CACHE_TTL_MS = 15 * 60 * 1000;
|
||||
// Shorter TTL for event-driven polls (after prompt submit / after turn end).
|
||||
// With the shared disk cache, only one pi instance per ACTIVE_CACHE_TTL_MS window
|
||||
// will actually hit the API — the rest will read from the cached result.
|
||||
const ACTIVE_CACHE_TTL_MS = 3 * 60 * 1000;
|
||||
// How often to re-poll while the model is actively streaming / running tools.
|
||||
// Combined with the shared disk cache this means at most one HTTP request per
|
||||
// STREAMING_POLL_INTERVAL_MS regardless of how many pi sessions are open.
|
||||
const STREAMING_POLL_INTERVAL_MS = 2 * 60 * 1000;
|
||||
|
||||
const RATE_LIMITED_BACKOFF_MS = 60 * 60 * 1000; // 1 hour back-off after 429
|
||||
const STATUS_KEY = "usage-bars";
|
||||
|
||||
@@ -297,6 +307,17 @@ interface UsageState extends UsageByProvider {
|
||||
activeProvider: ProviderKey | null;
|
||||
}
|
||||
|
||||
interface PollOptions {
|
||||
/** Override the disk-cache TTL for this poll (default: CACHE_TTL_MS). */
|
||||
cacheTtl?: number;
|
||||
/**
|
||||
* Skip the shared disk-cache TTL check entirely and always fetch from the
|
||||
* API. Used after an account switch where the cached data belongs to a
|
||||
* different account.
|
||||
*/
|
||||
forceFresh?: boolean;
|
||||
}
|
||||
|
||||
export default function (pi: ExtensionAPI) {
|
||||
const endpoints = resolveUsageEndpoints();
|
||||
const state: UsageState = {
|
||||
@@ -311,6 +332,8 @@ export default function (pi: ExtensionAPI) {
|
||||
|
||||
let pollInFlight: Promise<void> | null = null;
|
||||
let pollQueued = false;
|
||||
/** Timer running during an active agent loop to refresh usage periodically. */
|
||||
let streamingTimer: ReturnType<typeof setInterval> | null = null;
|
||||
let ctx: any = null;
|
||||
|
||||
function renderPercent(theme: any, value: number): string {
|
||||
@@ -410,7 +433,7 @@ export default function (pi: ExtensionAPI) {
|
||||
return false;
|
||||
}
|
||||
|
||||
async function runPoll() {
|
||||
async function runPoll(options: PollOptions = {}) {
|
||||
const auth = readAuth();
|
||||
const active = state.activeProvider;
|
||||
|
||||
@@ -420,25 +443,21 @@ export default function (pi: ExtensionAPI) {
|
||||
return;
|
||||
}
|
||||
|
||||
// --- Shared disk cache check ---
|
||||
// All pi sessions read and write the same cache file so that only one
|
||||
// process hits the API per CACHE_TTL_MS window, no matter how many
|
||||
// sessions are open at once.
|
||||
const cache = readUsageCache();
|
||||
const now = Date.now();
|
||||
const cacheTtl = options.cacheTtl ?? CACHE_TTL_MS;
|
||||
|
||||
// Respect cross-session rate-limit back-off written by any session.
|
||||
const blockedUntil = cache?.rateLimitedUntil?.[active] ?? 0;
|
||||
if (now < blockedUntil) {
|
||||
// Use whatever data is in the cache so the bar still shows something.
|
||||
if (cache?.data?.[active]) state[active] = cache.data[active]!;
|
||||
state.lastPoll = now;
|
||||
updateStatus();
|
||||
return;
|
||||
}
|
||||
|
||||
// If another session already polled recently, use their result.
|
||||
if (cache && now - cache.timestamp < CACHE_TTL_MS && cache.data?.[active]) {
|
||||
// Use shared disk cache unless forceFresh is set (e.g. after account switch).
|
||||
if (!options.forceFresh && cache && now - cache.timestamp < cacheTtl && cache.data?.[active]) {
|
||||
state[active] = cache.data[active]!;
|
||||
state.lastPoll = now;
|
||||
updateStatus();
|
||||
@@ -446,13 +465,6 @@ export default function (pi: ExtensionAPI) {
|
||||
}
|
||||
|
||||
// --- Proactive token refresh ---
|
||||
// Before hitting the API, check whether the stored access token is expired.
|
||||
// This is the main cause of HTTP 401 errors: switching accounts via
|
||||
// /switch-claude restores a profile whose access token has since expired
|
||||
// (the refresh token is still valid). We use pi's own OAuth resolver so
|
||||
// the new tokens are written back to auth.json and the profile stays in
|
||||
// sync. This is safe at turn_start / session_start because pi hasn't made
|
||||
// any Claude API calls yet, so there's no parallel refresh to conflict with.
|
||||
const oauthId = providerToOAuthProviderId(active);
|
||||
let effectiveAuth = auth;
|
||||
if (oauthId && active !== "zai") {
|
||||
@@ -506,16 +518,8 @@ export default function (pi: ExtensionAPI) {
|
||||
|
||||
state[active] = result;
|
||||
|
||||
// Write result + rate-limit state to shared cache so other sessions
|
||||
// don't need to re-hit the API within CACHE_TTL_MS.
|
||||
//
|
||||
// Error results (other than 429) are NOT cached: they should be retried
|
||||
// on the next input instead of being replayed from cache for 15 minutes.
|
||||
// The most common error is HTTP 401 (expired token after an account switch)
|
||||
// which resolves on the very next poll once the token is refreshed above.
|
||||
if (result.error) {
|
||||
if (result.error === "HTTP 429") {
|
||||
// Write rate-limit backoff but preserve the last good data in cache.
|
||||
const nextCache: import("./core").UsageCache = {
|
||||
timestamp: cache?.timestamp ?? now,
|
||||
data: { ...(cache?.data ?? {}) },
|
||||
@@ -541,7 +545,7 @@ export default function (pi: ExtensionAPI) {
|
||||
updateStatus();
|
||||
}
|
||||
|
||||
async function poll() {
|
||||
async function poll(options: PollOptions = {}) {
|
||||
if (pollInFlight) {
|
||||
pollQueued = true;
|
||||
await pollInFlight;
|
||||
@@ -550,7 +554,7 @@ export default function (pi: ExtensionAPI) {
|
||||
|
||||
do {
|
||||
pollQueued = false;
|
||||
pollInFlight = runPoll()
|
||||
pollInFlight = runPoll(options)
|
||||
.catch(() => {
|
||||
// Never crash extension event handlers on transient polling errors.
|
||||
})
|
||||
@@ -562,6 +566,22 @@ export default function (pi: ExtensionAPI) {
|
||||
} while (pollQueued);
|
||||
}
|
||||
|
||||
function startStreamingTimer() {
|
||||
if (streamingTimer !== null) return; // already running
|
||||
streamingTimer = setInterval(() => {
|
||||
void poll({ cacheTtl: ACTIVE_CACHE_TTL_MS });
|
||||
}, STREAMING_POLL_INTERVAL_MS);
|
||||
}
|
||||
|
||||
function stopStreamingTimer() {
|
||||
if (streamingTimer !== null) {
|
||||
clearInterval(streamingTimer);
|
||||
streamingTimer = null;
|
||||
}
|
||||
}
|
||||
|
||||
// ── Session lifecycle ────────────────────────────────────────────────────
|
||||
|
||||
pi.on("session_start", async (_event, _ctx) => {
|
||||
ctx = _ctx;
|
||||
updateProviderFrom(_ctx.model);
|
||||
@@ -569,19 +589,13 @@ export default function (pi: ExtensionAPI) {
|
||||
});
|
||||
|
||||
pi.on("session_shutdown", async (_event, _ctx) => {
|
||||
stopStreamingTimer();
|
||||
if (_ctx?.hasUI) {
|
||||
_ctx.ui.setStatus(STATUS_KEY, undefined);
|
||||
}
|
||||
});
|
||||
|
||||
// Refresh usage on every turn (like claude-pulse's UserPromptSubmit hook).
|
||||
// The disk cache means the API is only hit at most once per CACHE_TTL_MS
|
||||
// regardless of how many turns or sessions are active.
|
||||
pi.on("turn_start", async (_event, _ctx) => {
|
||||
ctx = _ctx;
|
||||
updateProviderFrom(_ctx.model);
|
||||
await poll();
|
||||
});
|
||||
// ── Model change ─────────────────────────────────────────────────────────
|
||||
|
||||
pi.on("model_select", async (event, _ctx) => {
|
||||
ctx = _ctx;
|
||||
@@ -589,6 +603,58 @@ export default function (pi: ExtensionAPI) {
|
||||
if (changed) await poll();
|
||||
});
|
||||
|
||||
// Keep provider detection up-to-date across turns (cheap, no API call unless
|
||||
// the provider changed).
|
||||
pi.on("turn_start", (_event, _ctx) => {
|
||||
ctx = _ctx;
|
||||
updateProviderFrom(_ctx.model);
|
||||
});
|
||||
|
||||
// ── Agent loop ───────────────────────────────────────────────────────────
|
||||
|
||||
// Poll when the user submits a prompt — captures usage right before the
|
||||
// new turn (useful to see current state before tokens are consumed).
|
||||
pi.on("before_agent_start", async (_event, _ctx) => {
|
||||
ctx = _ctx;
|
||||
await poll({ cacheTtl: ACTIVE_CACHE_TTL_MS });
|
||||
});
|
||||
|
||||
// Start interval timer so usage stays fresh during long-running agents
|
||||
// (lots of tool calls, extended thinking, etc.).
|
||||
pi.on("agent_start", (_event, _ctx) => {
|
||||
ctx = _ctx;
|
||||
startStreamingTimer();
|
||||
});
|
||||
|
||||
// When the agent finishes, stop the timer and do a final fresh poll to
|
||||
// capture the usage that was just consumed.
|
||||
pi.on("agent_end", async (_event, _ctx) => {
|
||||
ctx = _ctx;
|
||||
stopStreamingTimer();
|
||||
await poll({ cacheTtl: ACTIVE_CACHE_TTL_MS });
|
||||
});
|
||||
|
||||
// ── Account switch ───────────────────────────────────────────────────────
|
||||
|
||||
// Re-poll immediately when the Claude account is switched via /switch-claude.
|
||||
// We must invalidate the claude entry in the shared disk cache first —
|
||||
// otherwise poll() would serve the previous account's data which is still
|
||||
// within CACHE_TTL_MS.
|
||||
pi.events.on("claude-account:switched", () => {
|
||||
const cache = readUsageCache();
|
||||
if (cache?.data?.claude) {
|
||||
const nextCache: import("./core").UsageCache = {
|
||||
...cache,
|
||||
data: { ...cache.data },
|
||||
};
|
||||
delete nextCache.data.claude;
|
||||
writeUsageCache(nextCache);
|
||||
}
|
||||
void poll({ forceFresh: true });
|
||||
});
|
||||
|
||||
// ── /usage command ───────────────────────────────────────────────────────
|
||||
|
||||
pi.registerCommand("usage", {
|
||||
description: "Show API usage for all subscriptions",
|
||||
handler: async (_args, _ctx) => {
|
||||
@@ -609,13 +675,8 @@ export default function (pi: ExtensionAPI) {
|
||||
});
|
||||
}
|
||||
} finally {
|
||||
await poll();
|
||||
await poll({ cacheTtl: ACTIVE_CACHE_TTL_MS });
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
// Re-poll immediately when the Claude account is switched via /switch-claude
|
||||
pi.events.on("claude-account:switched", () => {
|
||||
void poll();
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user