connor
e6644d0616
Replaces the previous repo, which had split into two histories that never met (mainframe on a dead GitLab remote, the laptops on Gitea) with 146 dirty files across three machines and the NAS never enrolled at all. Branch-per-machine is gone. One main, with host differences expressed as small files under hosts/<hostname>/ rather than as branches, so there is nothing to merge. The reconciled zsh layer reduces 15-33 line forks to 1-7 effective lines per host; distro differences (oh-my-zsh prefix, syntax-highlighting path, fd vs fdfind) are probed in common/ instead. Fresh history: the old one carried six plaintext credentials, 45 MB of mail caches, browser caches and vendored binaries. 5,096 tracked files and 144 MB become 462 files and 2.6 MB. The .gitignore is now an allowlist, which is what keeps that true. Root cause of the rot: ~/.local/bin was a symlink to scripts/ with GOPATH inside it, so every go install wrote into version control (2.2 GB on the work laptop). PATH now points at the repo instead of the reverse. Also: Hyprland replaces sway and is sourced in two halves so $browser is defined before use; singleton automations carry ConditionHost= alongside host-layer-only placement; ddns moves from cron to a guarded timer; package manifests and pkg-snapshot/pkg-restore replace the X11-era install_scripts/; networkmanager-dmenu added to system76 (the binding always existed, the package never did).
43 lines
1.4 KiB
Bash
Executable File
43 lines
1.4 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# Configuration
|
|
SSH_USER="connor.johnstone@arcfield.com"
|
|
SSH_HOST="localhost"
|
|
SSH_PORT="9000"
|
|
REMOTE="${SSH_USER}@${SSH_HOST}:${SSH_PORT}"
|
|
|
|
# Check if sshuttle is already running with this remote
|
|
SSHUTTLE_PID=$(pgrep -f "sshuttle.*${REMOTE}")
|
|
|
|
if [ -n "$SSHUTTLE_PID" ]; then
|
|
# sshuttle is running, so kill it
|
|
echo "sshuttle is running (PID: $SSHUTTLE_PID). Stopping..."
|
|
kill "$SSHUTTLE_PID"
|
|
|
|
# Wait a moment and verify it stopped
|
|
sleep 1
|
|
if pgrep -f "sshuttle.*${REMOTE}" > /dev/null; then
|
|
echo "Process didn't stop gracefully, forcing..."
|
|
kill -9 "$SSHUTTLE_PID"
|
|
fi
|
|
|
|
echo "sshuttle stopped."
|
|
else
|
|
# sshuttle is not running, check SSH connection and start it
|
|
echo "sshuttle is not running. Checking SSH connection..."
|
|
|
|
# Test SSH connection (with timeout)
|
|
if ssh -p "$SSH_PORT" -o ConnectTimeout=5 -o BatchMode=yes "$SSH_USER@$SSH_HOST" exit 2>/dev/null; then
|
|
echo "SSH connection successful. Starting sshuttle..."
|
|
sshuttle -r "$REMOTE" --dns 0/0 > /tmp/sshuttle 2>&1 &
|
|
echo "sshuttle started in background (PID: $!)."
|
|
else
|
|
echo "ERROR: Cannot establish SSH connection to $REMOTE"
|
|
echo "Please verify:"
|
|
echo " 1. SSH service is running on $SSH_HOST:$SSH_PORT"
|
|
echo " 2. You have valid SSH credentials/keys configured"
|
|
echo " 3. The host is reachable"
|
|
exit 1
|
|
fi
|
|
fi
|