alee/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dotfiles update 2025-12-22 00:42

Browse Source
This commit is contained in:
Aaron D. Lee
2025-12-22 00:42:20 -05:00
parent ee1805a978
commit a8d9204b04
1 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
bin/dotfiles-sync.sh
View File

@@ -28,19 +28,19 @@ print_header() {
local hostname="${HOSTNAME:-$(hostname -s 2>/dev/null)}"
local script_name="dotfiles-sync"
local datetime=$(date '+%a %b %d %H:%M')
# Colors
local _M_RESET=$'\033[0m'
local _M_BOLD=$'\033[1m'
local _M_DIM=$'\033[2m'
local _M_BLUE=$'\033[38;5;39m'
local _M_GREY=$'\033[38;5;242m'
# Build horizontal line
local hline=""
for ((i=0; i<_M_WIDTH; i++)); do hline+="═"; done
local inner=$((_M_WIDTH - 2))
# Header content
local h_left="✦ ${user}@${hostname}"
local h_center="${script_name}"
@@ -48,7 +48,7 @@ print_header() {
local h_pad=$(((inner - ${#h_left} - ${#h_center} - ${#h_right}) / 2))
local h_spaces=""
for ((i=0; i<h_pad; i++)); do h_spaces+=" "; done
echo ""
echo -e "${_M_GREY}╒${hline}╕${_M_RESET}"
echo -e "${_M_GREY}│${_M_RESET} ${_M_BOLD}${_M_BLUE}${h_left}${_M_RESET}${h_spaces}${_M_DIM}${h_center}${h_spaces}${h_right}${_M_RESET} ${_M_GREY}│${_M_RESET}"
@@ -98,7 +98,7 @@ check_git_config() {
print_error "Git user.name not configured"
exit 1
fi
if ! git config --global user.email > /dev/null 2>&1; then
print_error "Git user.email not configured"
exit 1
@@ -107,35 +107,35 @@ check_git_config() {
get_sync_status() {
cd "$DOTFILES_HOME"
local local_commits=$(git rev-list --count @{u}..HEAD 2>/dev/null || echo 0)
local remote_commits=$(git rev-list --count HEAD..@{u} 2>/dev/null || echo 0)
echo "$local_commits:$remote_commits"
}
show_status() {
print_section "Sync Status"
cd "$DOTFILES_HOME"
print_status "Local branch: $(git rev-parse --abbrev-ref HEAD)"
print_status "Last commit: $(git log -1 --pretty=format:'%h - %s' 2>/dev/null || echo 'N/A')"
print_status "Last update: $(git log -1 --pretty=format:'%ar' 2>/dev/null || echo 'N/A')"
local status=$(get_sync_status)
local local_commits="${status%:*}"
local remote_commits="${status#*:}"
echo ""
if [[ $local_commits -gt 0 ]]; then
print_warning "$local_commits commit(s) ahead of remote"
fi
if [[ $remote_commits -gt 0 ]]; then
print_warning "$remote_commits commit(s) behind remote"
fi
if [[ $local_commits -eq 0 ]] && [[ $remote_commits -eq 0 ]]; then
print_success "In sync with remote"
fi
@@ -143,34 +143,34 @@ show_status() {
show_status_short() {
cd "$DOTFILES_HOME"
# Count local changes
local changes=$(git status --porcelain | wc -l)
# Check commits ahead/behind
local status=$(get_sync_status)
local local_commits="${status%:*}"
local remote_commits="${status#*:}"
if [[ $changes -gt 0 ]]; then
echo -e "${YELLOW}⚠${NC} Dotfiles: ${changes} local change(s) not pushed"
echo -e " Run: ${CYAN}dfpush${NC} or ${CYAN}dotfiles-sync.sh push${NC}"
echo -e " ${YELLOW}⚠${NC} Dotfiles: ${changes} local change(s) not pushed"
echo -e " Run: ${CYAN}dfpush${NC} or ${CYAN}dotfiles-sync.sh push${NC}"
elif [[ $local_commits -gt 0 ]]; then
echo -e "${YELLOW}⚠${NC} Dotfiles: ${local_commits} commit(s) not pushed"
echo -e " Run: ${CYAN}git push${NC} in ~/.dotfiles"
echo -e " ${YELLOW}⚠${NC} Dotfiles: ${local_commits} commit(s) not pushed"
echo -e " Run: ${CYAN}git push${NC} in ~/.dotfiles"
elif [[ $remote_commits -gt 0 ]]; then
echo -e "${YELLOW}⚠${NC} Dotfiles: ${remote_commits} commit(s) behind remote"
echo -e " Run: ${CYAN}dfpull${NC} or ${CYAN}dotfiles-sync.sh pull${NC}"
echo -e " ${YELLOW}⚠${NC} Dotfiles: ${remote_commits} commit(s) behind remote"
echo -e " Run: ${CYAN}dfpull${NC} or ${CYAN}dotfiles-sync.sh pull${NC}"
else
echo -e "${GREEN}✓${NC} Dotfiles: in sync"
echo -e " ${GREEN}✓${NC} Dotfiles: in sync"
fi
}
show_diff() {
print_section "Local Changes"
cd "$DOTFILES_HOME"
if git status --porcelain | grep -q .; then
print_status "Modified files:"
git status --porcelain | sed 's/^/ /'
@@ -181,15 +181,15 @@ show_diff() {
pull_changes() {
print_section "Pulling Changes"
cd "$DOTFILES_HOME"
print_status "Fetching from remote..."
git fetch origin
local status=$(get_sync_status)
local remote_commits="${status#*:}"
if [[ $remote_commits -gt 0 ]]; then
print_status "Pulling $remote_commits remote commit(s)..."
git pull origin
@@ -201,65 +201,65 @@ pull_changes() {
push_changes() {
local commit_msg="$1"
print_section "Pushing Changes"
cd "$DOTFILES_HOME"
if ! git status --porcelain | grep -q .; then
print_warning "No local changes to push"
return
fi
print_status "Staging changes..."
git add -A
# If no commit message provided, prompt for one
if [[ -z "$commit_msg" ]]; then
print_status "Enter commit message (or press Ctrl+C to cancel):"
read -p " > " commit_msg
if [[ -z "$commit_msg" ]]; then
print_error "Commit cancelled"
return 1
fi
fi
print_status "Committing: $commit_msg"
git commit -m "$commit_msg"
print_status "Pushing to remote..."
git push origin
print_success "Changes pushed"
}
auto_sync() {
print_section "Auto-Sync"
cd "$DOTFILES_HOME"
# Pull remote changes
print_status "Pulling from remote..."
git fetch origin
if git status --porcelain | grep -q .; then
print_status "Resolving conflicts automatically..."
git pull --strategy=ours
else
git pull origin
fi
print_success "Auto-sync complete"
}
watch_sync() {
local interval="${1:-300}"
print_section "Watch Mode"
print_status "Auto-syncing every $interval seconds"
print_status "Press Ctrl+C to stop"
while true; do
auto_sync
sleep "$interval"
@@ -273,7 +273,7 @@ watch_sync() {
main() {
check_git_repo
check_git_config
case "${1:-status}" in
status)
if [[ "$2" == "-s" || "$2" == "--short" ]]; then