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

Dotfiles update 2025-12-24 18:22

Browse Source
This commit is contained in:
Aaron D. Lee
2025-12-24 18:22:34 -05:00
parent 051aabd5c7
commit fbea85e5a7
2 changed files with 71 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
bin/dotfiles-doctor.sh
View File

@@ -59,10 +59,10 @@ print_header() {
local datetime=$(date '+%a %b %d %H:%M') local datetime=$(date '+%a %b %d %H:%M')
local width=66 local width=66
local hline="" && for ((i=0; i<width; i++)); do hline+="═"; done local hline="" && for ((i=0; i<width; i++)); do hline+="═"; done
echo "" echo ""
echo -e "${DF_GREY}╒${hline}╕${DF_NC}" echo -e "${DF_GREY}╒${hline}╕${DF_NC}"
echo -e "${DF_GREY}│${DF_NC} ${DF_BOLD}${DF_LIGHT_BLUE}✦ ${user}@${hostname}${DF_NC} ${DF_DIM}dotfiles-doctor v${DOTFILES_VERSION}${DF_NC} ${datetime} ${DF_GREY}│${DF_NC}" echo -e "${DF_GREY}│${DF_NC} ${DF_BOLD}${DF_LIGHT_BLUE}✦ ${user}@${hostname}${DF_NC} ${DF_LIGHT_GREEN}dotfiles-doctor${DF_NC} ${datetime} ${DF_GREY}│${DF_NC}"
echo -e "${DF_GREY}╘${hline}╛${DF_NC}" echo -e "${DF_GREY}╘${hline}╛${DF_NC}"
echo "" echo ""
} }
@@ -104,7 +104,7 @@ check_fixed() {
check_os() { check_os() {
print_section "Operating System" print_section "Operating System"
if [[ "$OSTYPE" == "linux-gnu"* ]]; then if [[ "$OSTYPE" == "linux-gnu"* ]]; then
if grep -qi "cachyos" /etc/os-release 2>/dev/null; then if grep -qi "cachyos" /etc/os-release 2>/dev/null; then
local version=$(grep "VERSION_ID" /etc/os-release 2>/dev/null | cut -d= -f2 | tr -d '"') local version=$(grep "VERSION_ID" /etc/os-release 2>/dev/null | cut -d= -f2 | tr -d '"')
@@ -117,7 +117,7 @@ check_os() {
else else
check_fail "Not running on Linux" check_fail "Not running on Linux"
fi fi
# Kernel check # Kernel check
local kernel=$(uname -r) local kernel=$(uname -r)
if [[ "$kernel" == *"cachyos"* ]]; then if [[ "$kernel" == *"cachyos"* ]]; then
@@ -133,7 +133,7 @@ check_os() {
check_shell() { check_shell() {
print_section "Shell Configuration" print_section "Shell Configuration"
if [[ -f "$HOME/.zshrc" ]]; then if [[ -f "$HOME/.zshrc" ]]; then
check_pass "Zsh configuration exists" check_pass "Zsh configuration exists"
else else
@@ -142,7 +142,7 @@ check_shell() {
ln -sf "$DOTFILES_HOME/zsh/.zshrc" "$HOME/.zshrc" 2>/dev/null && check_fixed ".zshrc symlink created" ln -sf "$DOTFILES_HOME/zsh/.zshrc" "$HOME/.zshrc" 2>/dev/null && check_fixed ".zshrc symlink created"
fi fi
fi fi
if [[ "$SHELL" == *"zsh"* ]]; then if [[ "$SHELL" == *"zsh"* ]]; then
check_pass "Zsh is default shell" check_pass "Zsh is default shell"
else else
@@ -151,7 +151,7 @@ check_shell() {
echo " Run: chsh -s \$(which zsh)" echo " Run: chsh -s \$(which zsh)"
fi fi
fi fi
# Check if zsh is recent version # Check if zsh is recent version
if command -v zsh &>/dev/null; then if command -v zsh &>/dev/null; then
local zsh_version=$(zsh --version | awk '{print $2}') local zsh_version=$(zsh --version | awk '{print $2}')
@@ -161,10 +161,10 @@ check_shell() {
check_symlinks() { check_symlinks() {
print_section "Symlinks" print_section "Symlinks"
local symlink_count=0 local symlink_count=0
local broken_count=0 local broken_count=0
for symlink in ~/.zshrc ~/.gitconfig ~/.vimrc ~/.tmux.conf; do for symlink in ~/.zshrc ~/.gitconfig ~/.vimrc ~/.tmux.conf; do
if [[ -L "$symlink" ]]; then if [[ -L "$symlink" ]]; then
symlink_count=$((symlink_count + 1)) symlink_count=$((symlink_count + 1))
@@ -178,7 +178,7 @@ check_symlinks() {
check_warn "$(basename $symlink) is regular file (not symlink)" check_warn "$(basename $symlink) is regular file (not symlink)"
fi fi
done done
if [[ $symlink_count -eq 0 ]]; then if [[ $symlink_count -eq 0 ]]; then
check_warn "No symlinks found (may not be installed yet)" check_warn "No symlinks found (may not be installed yet)"
fi fi
@@ -186,14 +186,14 @@ check_symlinks() {
check_vim() { check_vim() {
print_section "Editor Configuration" print_section "Editor Configuration"
if command -v vim &>/dev/null; then if command -v vim &>/dev/null; then
local vim_version=$(vim --version | head -1 | awk '{print $5}') local vim_version=$(vim --version | head -1 | awk '{print $5}')
check_pass "Vim installed: $vim_version" check_pass "Vim installed: $vim_version"
else else
check_fail "Vim not installed" check_fail "Vim not installed"
fi fi
if command -v nvim &>/dev/null; then if command -v nvim &>/dev/null; then
local nvim_version=$(nvim --version | head -1 | awk '{print $2}') local nvim_version=$(nvim --version | head -1 | awk '{print $2}')
check_pass "Neovim installed: $nvim_version" check_pass "Neovim installed: $nvim_version"
@@ -204,17 +204,17 @@ check_vim() {
check_git() { check_git() {
print_section "Git Configuration" print_section "Git Configuration"
if command -v git &>/dev/null; then if command -v git &>/dev/null; then
check_pass "Git installed" check_pass "Git installed"
if git config --global user.name &>/dev/null; then if git config --global user.name &>/dev/null; then
local git_user=$(git config --global user.name) local git_user=$(git config --global user.name)
check_pass "Git user: $git_user" check_pass "Git user: $git_user"
else else
check_fail "Git user not configured" check_fail "Git user not configured"
fi fi
if git config --global user.email &>/dev/null; then if git config --global user.email &>/dev/null; then
check_pass "Git email configured" check_pass "Git email configured"
else else
@@ -231,14 +231,14 @@ check_git() {
check_pacman() { check_pacman() {
print_section "Package Manager" print_section "Package Manager"
if command -v pacman &>/dev/null; then if command -v pacman &>/dev/null; then
check_pass "Pacman available" check_pass "Pacman available"
else else
check_fail "Pacman not found" check_fail "Pacman not found"
return return
fi fi
# Check for AUR helper # Check for AUR helper
if command -v paru &>/dev/null; then if command -v paru &>/dev/null; then
check_pass "AUR helper: paru" check_pass "AUR helper: paru"
@@ -251,9 +251,9 @@ check_pacman() {
check_pacman_health() { check_pacman_health() {
[[ "$QUICK_MODE" == true ]] && return [[ "$QUICK_MODE" == true ]] && return
print_section "Pacman Health" print_section "Pacman Health"
# Check for orphaned packages # Check for orphaned packages
local orphans=$(pacman -Qtdq 2>/dev/null | wc -l) local orphans=$(pacman -Qtdq 2>/dev/null | wc -l)
if [[ $orphans -eq 0 ]]; then if [[ $orphans -eq 0 ]]; then
@@ -264,12 +264,12 @@ check_pacman_health() {
echo " Clean: pacman -Qtdq | sudo pacman -Rns -" echo " Clean: pacman -Qtdq | sudo pacman -Rns -"
fi fi
fi fi
# Check package cache size # Check package cache size
if [[ -d /var/cache/pacman/pkg ]]; then if [[ -d /var/cache/pacman/pkg ]]; then
local cache_size=$(du -sh /var/cache/pacman/pkg 2>/dev/null | cut -f1) local cache_size=$(du -sh /var/cache/pacman/pkg 2>/dev/null | cut -f1)
local pkg_count=$(ls /var/cache/pacman/pkg 2>/dev/null | wc -l) local pkg_count=$(ls /var/cache/pacman/pkg 2>/dev/null | wc -l)
if [[ $pkg_count -gt 500 ]]; then if [[ $pkg_count -gt 500 ]]; then
check_warn "Package cache: $cache_size ($pkg_count files)" check_warn "Package cache: $cache_size ($pkg_count files)"
if [[ "$DO_FIX" == true ]]; then if [[ "$DO_FIX" == true ]]; then
@@ -279,7 +279,7 @@ check_pacman_health() {
check_pass "Package cache: $cache_size" check_pass "Package cache: $cache_size"
fi fi
fi fi
# Check for available updates # Check for available updates
if command -v checkupdates &>/dev/null; then if command -v checkupdates &>/dev/null; then
local updates=$(checkupdates 2>/dev/null | wc -l) local updates=$(checkupdates 2>/dev/null | wc -l)
@@ -293,12 +293,12 @@ check_pacman_health() {
check_systemd() { check_systemd() {
[[ "$QUICK_MODE" == true ]] && return [[ "$QUICK_MODE" == true ]] && return
print_section "Systemd Services" print_section "Systemd Services"
# Check for failed services # Check for failed services
local failed_count=$(systemctl --failed --no-pager --no-legend 2>/dev/null | wc -l) local failed_count=$(systemctl --failed --no-pager --no-legend 2>/dev/null | wc -l)
if [[ $failed_count -eq 0 ]]; then if [[ $failed_count -eq 0 ]]; then
check_pass "No failed system services" check_pass "No failed system services"
else else
@@ -308,7 +308,7 @@ check_systemd() {
echo -e " ${DF_DIM}• $svc${DF_NC}" echo -e " ${DF_DIM}• $svc${DF_NC}"
done done
fi fi
# Check user services # Check user services
local user_failed=$(systemctl --user --failed --no-pager --no-legend 2>/dev/null | wc -l) local user_failed=$(systemctl --user --failed --no-pager --no-legend 2>/dev/null | wc -l)
if [[ $user_failed -eq 0 ]]; then if [[ $user_failed -eq 0 ]]; then
@@ -320,19 +320,19 @@ check_systemd() {
check_btrfs() { check_btrfs() {
[[ "$QUICK_MODE" == true ]] && return [[ "$QUICK_MODE" == true ]] && return
# Only check if root is btrfs # Only check if root is btrfs
local fstype=$(df -T / 2>/dev/null | awk 'NR==2 {print $2}') local fstype=$(df -T / 2>/dev/null | awk 'NR==2 {print $2}')
[[ "$fstype" != "btrfs" ]] && return [[ "$fstype" != "btrfs" ]] && return
print_section "Btrfs Filesystem" print_section "Btrfs Filesystem"
check_pass "Root filesystem: btrfs" check_pass "Root filesystem: btrfs"
# Check for device errors # Check for device errors
local stats=$(sudo btrfs device stats / 2>/dev/null) local stats=$(sudo btrfs device stats / 2>/dev/null)
local errors=$(echo "$stats" | grep -v " 0$" | grep -v "^$") local errors=$(echo "$stats" | grep -v " 0$" | grep -v "^$")
if [[ -z "$errors" ]]; then if [[ -z "$errors" ]]; then
check_pass "No btrfs device errors" check_pass "No btrfs device errors"
else else
@@ -341,7 +341,7 @@ check_btrfs() {
echo -e " ${DF_DIM}$line${DF_NC}" echo -e " ${DF_DIM}$line${DF_NC}"
done done
fi fi
# Check last scrub # Check last scrub
local scrub_info=$(sudo btrfs scrub status / 2>/dev/null) local scrub_info=$(sudo btrfs scrub status / 2>/dev/null)
if echo "$scrub_info" | grep -q "running"; then if echo "$scrub_info" | grep -q "running"; then
@@ -352,7 +352,7 @@ check_btrfs() {
else else
check_warn "No scrub history (recommend monthly)" check_warn "No scrub history (recommend monthly)"
fi fi
# Check snapper # Check snapper
if command -v snapper &>/dev/null && [[ -d "/.snapshots" ]]; then if command -v snapper &>/dev/null && [[ -d "/.snapshots" ]]; then
local snap_count=$(sudo snapper -c root list 2>/dev/null | tail -n +3 | wc -l) local snap_count=$(sudo snapper -c root list 2>/dev/null | tail -n +3 | wc -l)
@@ -366,31 +366,31 @@ check_btrfs() {
check_optional_tools() { check_optional_tools() {
print_section "Optional Tools" print_section "Optional Tools"
if command -v fzf &>/dev/null; then if command -v fzf &>/dev/null; then
check_pass "fzf (fuzzy finder)" check_pass "fzf (fuzzy finder)"
else else
check_warn "fzf not installed (command palette needs this)" check_warn "fzf not installed (command palette needs this)"
fi fi
if command -v bat &>/dev/null; then if command -v bat &>/dev/null; then
check_pass "bat (syntax highlighting)" check_pass "bat (syntax highlighting)"
else else
check_warn "bat not installed" check_warn "bat not installed"
fi fi
if command -v eza &>/dev/null; then if command -v eza &>/dev/null; then
check_pass "eza (modern ls)" check_pass "eza (modern ls)"
else else
check_warn "eza not installed" check_warn "eza not installed"
fi fi
if command -v tmux &>/dev/null; then if command -v tmux &>/dev/null; then
check_pass "tmux (terminal multiplexer)" check_pass "tmux (terminal multiplexer)"
else else
check_warn "tmux not installed" check_warn "tmux not installed"
fi fi
if command -v age &>/dev/null || command -v gpg &>/dev/null; then if command -v age &>/dev/null || command -v gpg &>/dev/null; then
check_pass "Encryption available (age/gpg)" check_pass "Encryption available (age/gpg)"
else else
@@ -400,7 +400,7 @@ check_optional_tools() {
check_permissions() { check_permissions() {
print_section "File Permissions" print_section "File Permissions"
if [[ -f "$DOTFILES_HOME/install.sh" ]]; then if [[ -f "$DOTFILES_HOME/install.sh" ]]; then
if [[ -x "$DOTFILES_HOME/install.sh" ]]; then if [[ -x "$DOTFILES_HOME/install.sh" ]]; then
check_pass "install.sh is executable" check_pass "install.sh is executable"
@@ -412,7 +412,7 @@ check_permissions() {
fi fi
fi fi
fi fi
if [[ -d "$DOTFILES_HOME/bin" ]]; then if [[ -d "$DOTFILES_HOME/bin" ]]; then
local non_exec=$(find "$DOTFILES_HOME/bin" -type f ! -perm /u+x 2>/dev/null | wc -l) local non_exec=$(find "$DOTFILES_HOME/bin" -type f ! -perm /u+x 2>/dev/null | wc -l)
if [[ $non_exec -eq 0 ]]; then if [[ $non_exec -eq 0 ]]; then
@@ -429,22 +429,22 @@ check_permissions() {
check_zsh_plugins() { check_zsh_plugins() {
print_section "Zsh Plugins" print_section "Zsh Plugins"
if [[ -d "$HOME/.oh-my-zsh" ]]; then if [[ -d "$HOME/.oh-my-zsh" ]]; then
check_pass "Oh My Zsh installed" check_pass "Oh My Zsh installed"
if [[ -d "$HOME/.oh-my-zsh/custom/plugins/zsh-autosuggestions" ]]; then if [[ -d "$HOME/.oh-my-zsh/custom/plugins/zsh-autosuggestions" ]]; then
check_pass "zsh-autosuggestions" check_pass "zsh-autosuggestions"
else else
check_warn "zsh-autosuggestions not installed" check_warn "zsh-autosuggestions not installed"
fi fi
if [[ -d "$HOME/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting" ]]; then if [[ -d "$HOME/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting" ]]; then
check_pass "zsh-syntax-highlighting" check_pass "zsh-syntax-highlighting"
else else
check_warn "zsh-syntax-highlighting not installed" check_warn "zsh-syntax-highlighting not installed"
fi fi
if [[ -f "$HOME/.oh-my-zsh/themes/adlee.zsh-theme" ]]; then if [[ -f "$HOME/.oh-my-zsh/themes/adlee.zsh-theme" ]]; then
check_pass "adlee theme" check_pass "adlee theme"
else else
@@ -457,23 +457,23 @@ check_zsh_plugins() {
check_dotfiles_dir() { check_dotfiles_dir() {
print_section "Dotfiles Directory" print_section "Dotfiles Directory"
if [[ -d "$DOTFILES_HOME" ]]; then if [[ -d "$DOTFILES_HOME" ]]; then
check_pass "Dotfiles: $DOTFILES_HOME" check_pass "Dotfiles: $DOTFILES_HOME"
else else
check_fail "Dotfiles not found: $DOTFILES_HOME" check_fail "Dotfiles not found: $DOTFILES_HOME"
return return
fi fi
if [[ -f "$DOTFILES_HOME/dotfiles.conf" ]]; then if [[ -f "$DOTFILES_HOME/dotfiles.conf" ]]; then
check_pass "Config file exists" check_pass "Config file exists"
else else
check_warn "Config file missing" check_warn "Config file missing"
fi fi
if [[ -d "$DOTFILES_HOME/.git" ]]; then if [[ -d "$DOTFILES_HOME/.git" ]]; then
check_pass "Git repo initialized" check_pass "Git repo initialized"
# Check for uncommitted changes # Check for uncommitted changes
local changes=$(cd "$DOTFILES_HOME" && git status --porcelain 2>/dev/null | wc -l) local changes=$(cd "$DOTFILES_HOME" && git status --porcelain 2>/dev/null | wc -l)
if [[ $changes -gt 0 ]]; then if [[ $changes -gt 0 ]]; then
@@ -491,7 +491,7 @@ check_dotfiles_dir() {
print_summary() { print_summary() {
echo "" echo ""
printf "${DF_CYAN}─%.0s${DF_NC}" {1..70}; echo "" printf "${DF_CYAN}─%.0s${DF_NC}" {1..70}; echo ""
if [[ $FAILED_CHECKS -eq 0 ]]; then if [[ $FAILED_CHECKS -eq 0 ]]; then
echo -e "${DF_GREEN}✓${DF_NC} All checks passed ($PASSED_CHECKS/$TOTAL_CHECKS)" echo -e "${DF_GREEN}✓${DF_NC} All checks passed ($PASSED_CHECKS/$TOTAL_CHECKS)"
else else
@@ -505,15 +505,15 @@ print_summary() {
echo -e " ${DF_CYAN}Fixed:${DF_NC} $FIXED_CHECKS" echo -e " ${DF_CYAN}Fixed:${DF_NC} $FIXED_CHECKS"
fi fi
fi fi
echo "" echo ""
if [[ $FAILED_CHECKS -gt 0 && "$DO_FIX" != true ]]; then if [[ $FAILED_CHECKS -gt 0 && "$DO_FIX" != true ]]; then
echo -e "${DF_YELLOW}💡${DF_NC} Run with --fix to attempt automatic fixes" echo -e "${DF_YELLOW}💡${DF_NC} Run with --fix to attempt automatic fixes"
echo "" echo ""
return 1 return 1
fi fi
if [[ $FIXED_CHECKS -gt 0 ]]; then if [[ $FIXED_CHECKS -gt 0 ]]; then
echo -e "${DF_CYAN}ℹ${DF_NC} Fixed $FIXED_CHECKS issue(s). Run again to verify." echo -e "${DF_CYAN}ℹ${DF_NC} Fixed $FIXED_CHECKS issue(s). Run again to verify."
echo "" echo ""
@@ -526,14 +526,14 @@ print_summary() {
main() { main() {
print_header print_header
# Essential checks (always run) # Essential checks (always run)
check_os check_os
check_pacman check_pacman
check_shell check_shell
check_dotfiles_dir check_dotfiles_dir
check_symlinks check_symlinks
# Additional checks (skip in quick mode) # Additional checks (skip in quick mode)
if [[ "$QUICK_MODE" != true ]]; then if [[ "$QUICK_MODE" != true ]]; then
check_vim check_vim
@@ -545,7 +545,7 @@ main() {
check_systemd check_systemd
check_btrfs check_btrfs
fi fi
print_summary print_summary
} }

31
bin/dotfiles-sync.sh
View File

@@ -6,7 +6,6 @@
set -e set -e
readonly DOTFILES_HOME="${DOTFILES_HOME:-.}" readonly DOTFILES_HOME="${DOTFILES_HOME:-.}"
readonly DOTFILES_VERSION="3.0.0"
# Color codes # Color codes
readonly RED='\033[0;31m' readonly RED='\033[0;31m'
@@ -17,11 +16,21 @@ readonly CYAN='\033[0;36m'
readonly MAGENTA='\033[0;35m' readonly MAGENTA='\033[0;35m'
readonly NC='\033[0m' readonly NC='\033[0m'
# Source shared colors
source "$DOTFILES_HOME/zsh/lib/colors.zsh" 2>/dev/null || {
DF_RED=$'\033[0;31m' DF_GREEN=$'\033[0;32m' DF_YELLOW=$'\033[1;33m'
DF_BLUE=$'\033[0;34m' DF_CYAN=$'\033[0;36m' DF_NC=$'\033[0m'
DF_GREY=$'\033[38;5;242m' DF_LIGHT_BLUE=$'\033[38;5;39m'
DF_BOLD=$'\033[1m' DF_DIM=$'\033[2m'
}
# ============================================================================ # ============================================================================
# MOTD-style header # MOTD-style header
# ============================================================================ # ============================================================================
_M_WIDTH=66 DF_WIDTH=66
print_header() { print_header() {
local user="${USER:-root}" local user="${USER:-root}"
@@ -29,19 +38,11 @@ print_header() {
local script_name="dotfiles-sync" local script_name="dotfiles-sync"
local datetime=$(date '+%a %b %d %H:%M') 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'
local _M_MAGENTA='\033[0;35m'
local _M_GREEN='\033[0;32m'
# Build horizontal line # Build horizontal line
local hline="" local hline=""
for ((i=0; i<_M_WIDTH; i++)); do hline+="═"; done for ((i=0; i<DF_WIDTH; i++)); do hline+="═"; done
local inner=$((_M_WIDTH - 2)) local inner=$((DF_WIDTH - 2))
# Header content # Header content
local h_left="✦ ${user}@${hostname}" local h_left="✦ ${user}@${hostname}"
@@ -52,9 +53,9 @@ print_header() {
for ((i=0; i<h_pad; i++)); do h_spaces+=" "; done for ((i=0; i<h_pad; i++)); do h_spaces+=" "; done
echo "" echo ""
echo -e "${_M_GREY}╒${hline}╕${_M_RESET}" echo -e "${DF_GREY}╒${hline}╕${DF_NC}"
echo -e "${_M_GREY}│${_M_RESET} ${_M_BOLD}${_M_BLUE}${h_left}${_M_RESET}${h_spaces}${_M_GREEN}${h_center}${h_spaces}${_M_RESET}${_M_BOLD}${h_right}${_M_RESET} ${_M_GREY}│${_M_RESET}" echo -e "${DF_GREY}│${DF_NC} ${DF_BOLD}${DF_BLUE}${h_left}${DF_NC}${h_spaces}${DF_LIGHT_GREEN}${h_center}${h_spaces}${DF_NC}${DF_BOLD}${h_right}${DF_NC} ${DF_GREY}│${DF_NC}"
echo -e "${_M_GREY}╘${hline}╛${_M_RESET}" echo -e "${DF_GREY}╘${hline}╛${DF_NC}"
} }
# ============================================================================ # ============================================================================