Skip to content

Add macos config; refactor #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
vikdotdev wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Add macos config; refactor #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
63429ff
Add macos config
vikdotdev Dec 29, 2025
fff74de
Add os-specific git config
vikdotdev Dec 30, 2025
ab1b484
Restructure
vikdotdev Dec 30, 2025
043133d
Fix kanata
vikdotdev Dec 30, 2025
dabf338
Configure Amethyst
vikdotdev Dec 30, 2025
6b91aa6
Fix dired & vterm
vikdotdev Dec 30, 2025
e7abdd5
fix f-keys on mac
vikdotdev Dec 30, 2025
2be4878
fix fonts in emacs
vikdotdev Dec 30, 2025
9c2c776
fix mise in emacs
vikdotdev Dec 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
253 changes: 158 additions & 95 deletions bin/dot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,47 +88,36 @@ get_system_dir() {
echo "$DOT_HOME/$installed_system"
}

# Resolve module name (handles numeric prefixes like 00-, 01-)
resolve_module_path() {
# Resolve script name (handles numeric prefixes like 01-50-mise)
resolve_script_name() {
local module="$1"
local command="$2"
local system_dir="$(get_system_dir)"

# First, try the module as-is
if [[ -d "$system_dir/$module" ]]; then
local command_dir="$system_dir/$command"

# First, try the module name as-is
if [[ -f "$command_dir/$module" && -x "$command_dir/$module" ]]; then
echo "$module"
return 0
fi

# If module contains /, handle each part
if [[ "$module" == */* ]]; then
local parent="${module%/*}"
local child="${module##*/}"

# Try with numeric prefix on child
for prefix in {00..99}; do
if [[ -d "$system_dir/$parent/${prefix}-${child}" ]]; then
echo "$parent/${prefix}-${child}"
return 0
fi
done

# Try with numeric prefix on parent
for prefix in {00..99}; do
if [[ -d "$system_dir/${prefix}-${parent}/$child" ]]; then
echo "${prefix}-${parent}/$child"
return 0
fi
done
else
# Try with numeric prefixes for top-level modules
for prefix in {00..99}; do
if [[ -d "$system_dir/${prefix}-${module}" ]]; then
echo "${prefix}-${module}"
return 0
fi
done

# Try to find a script that ends with the module name (e.g., "mise" -> "01-50-mise")
local found_script=""
for script in "$command_dir"/*; do
[[ ! -f "$script" || ! -x "$script" ]] && continue
local script_name=$(basename "$script")
# Check if script ends with -$module
if [[ "$script_name" == *-"$module" ]]; then
found_script="$script_name"
break
fi
done

if [[ -n "$found_script" ]]; then
echo "$found_script"
return 0
fi

# Return original if no match found
echo "$module"
return 1
Expand All @@ -151,7 +140,7 @@ check_system_for_list() {
get_available_modules() {
local command="$1"
local modules=()

# Get the installed system type
local installed_system
if [[ -n "${INSTALLATION:-}" ]]; then
Expand All @@ -160,153 +149,227 @@ get_available_modules() {
installed_system=$(head -n1 "$INSTALLATION_MARKER")
fi
local system_dir="$DOT_HOME/$installed_system"

# Check if system directory exists
if [[ ! -d "$system_dir" ]]; then
local command_dir="$system_dir/$command"

# Check if command directory exists
if [[ ! -d "$command_dir" ]]; then
return
fi

# Find all modules with the given command script

# Find all executable files in the command directory
# Use -perm for BSD find compatibility (macOS)
while IFS= read -r -d '' script; do
local module_path=$(dirname "$script")
# Get the full relative path from system_dir
local module_name="${module_path#$system_dir/}"
modules+=("$module_name")
done < <(find "$system_dir" -name "$command" -type f -executable -print0)

printf '%s\n' "${modules[@]}" | sort
local script_name=$(basename "$script")
modules+=("$script_name")
done < <(find "$command_dir" -maxdepth 1 -type f -perm +111 -print0 2>/dev/null)

# Handle empty array to avoid unbound variable error
if [[ ${#modules[@]} -gt 0 ]]; then
printf '%s\n' "${modules[@]}" | sort
fi
}

# Run install command
cmd_install() {
local module="${1:-all}"

# Handle --list option
if [[ "$module" == "--list" ]]; then
check_system_for_list
echo "Available modules for install:"
get_available_modules "install"
return 0
fi

check_system_setup
init_logging "install"

log_header "Installing: $module"


# Export common variables for scripts
export DOT_HOME="$DOT_HOME"
export SYSTEM_DIR="$(get_system_dir)"
export SHARED_DIR="$DOT_HOME/shared"

if [[ "$module" == "all" ]]; then
log_info "Installing all modules"

# Get all available install scripts
local available_modules
mapfile -t available_modules < <(get_available_modules "install")

for mod in "${available_modules[@]}"; do
log_step "Running install for module: $mod"
"$(get_system_dir)/$mod/install"
local available_modules=()
while IFS= read -r line; do
[[ -n "$line" ]] && available_modules+=("$line")
done < <(get_available_modules "install")

for script_name in "${available_modules[@]}"; do
# Extract module name from script filename (e.g., "01-50-mise" -> "mise")
export MODULE_NAME="$(basename "$script_name" | sed 's/^[0-9]*-[0-9]*-//')"

init_module_logging "$MODULE_NAME"
if "$SYSTEM_DIR/install/$script_name"; then
finalize_module_logging "success"
else
finalize_module_logging "failed"
exit 1
fi
done
else
# Install specific module
local resolved_module=$(resolve_module_path "$module")
if [[ -x "$(get_system_dir)/$resolved_module/install" ]]; then
"$(get_system_dir)/$resolved_module/install"
local script_name=$(resolve_script_name "$module" "install")
if [[ -x "$SYSTEM_DIR/install/$script_name" ]]; then
# Extract module name from script filename
export MODULE_NAME="$(basename "$script_name" | sed 's/^[0-9]*-[0-9]*-//')"

init_module_logging "$MODULE_NAME"
if "$SYSTEM_DIR/install/$script_name"; then
finalize_module_logging "success"
else
finalize_module_logging "failed"
exit 1
fi
else
log_error "Module $module does not have an install script"
exit 1
fi
fi

finalize_logging "success"
}

# Run build command
cmd_build() {
local module="${1:-all}"

# Handle --list option
if [[ "$module" == "--list" ]]; then
check_system_for_list
echo "Available modules for build:"
get_available_modules "build"
return 0
fi

check_system_setup
init_logging "build"

log_header "Building: $module"


# Export common variables for scripts
export DOT_HOME="$DOT_HOME"
export SYSTEM_DIR="$(get_system_dir)"
export SHARED_DIR="$DOT_HOME/shared"

if [[ "$module" == "all" ]]; then
log_info "Building all modules"

# Get all available build scripts
local available_modules
mapfile -t available_modules < <(get_available_modules "build")

for mod in "${available_modules[@]}"; do
log_step "Running build for module: $mod"
"$(get_system_dir)/$mod/build"
local available_modules=()
while IFS= read -r line; do
[[ -n "$line" ]] && available_modules+=("$line")
done < <(get_available_modules "build")

for script_name in "${available_modules[@]}"; do
# Extract module name from script filename (e.g., "03-00-git" -> "git")
export MODULE_NAME="$(basename "$script_name" | sed 's/^[0-9]*-[0-9]*-//')"

init_module_logging "$MODULE_NAME"
if "$SYSTEM_DIR/build/$script_name"; then
finalize_module_logging "success"
else
finalize_module_logging "failed"
exit 1
fi
done
else
# Build specific module
local resolved_module=$(resolve_module_path "$module")
if [[ -x "$(get_system_dir)/$resolved_module/build" ]]; then
"$(get_system_dir)/$resolved_module/build"
local script_name=$(resolve_script_name "$module" "build")
if [[ -x "$SYSTEM_DIR/build/$script_name" ]]; then
# Extract module name from script filename
export MODULE_NAME="$(basename "$script_name" | sed 's/^[0-9]*-[0-9]*-//')"

init_module_logging "$MODULE_NAME"
if "$SYSTEM_DIR/build/$script_name"; then
finalize_module_logging "success"
else
finalize_module_logging "failed"
exit 1
fi
else
log_error "Module $module does not have a build script"
exit 1
fi
fi

finalize_logging "success"
}

# Run upgrade command
cmd_upgrade() {
local module="${1:-all}"

# Handle --list option
if [[ "$module" == "--list" ]]; then
check_system_for_list
echo "Available modules for upgrade:"
get_available_modules "upgrade"
return 0
fi

check_system_setup
init_logging "upgrade"

log_header "Upgrading: $module"


# Export common variables for scripts
export DOT_HOME="$DOT_HOME"
export SYSTEM_DIR="$(get_system_dir)"
export SHARED_DIR="$DOT_HOME/shared"

if [[ "$module" == "all" ]]; then
log_info "Upgrading all modules"

# Get all available upgrade scripts
local available_modules
mapfile -t available_modules < <(get_available_modules "upgrade")

local available_modules=()
while IFS= read -r line; do
[[ -n "$line" ]] && available_modules+=("$line")
done < <(get_available_modules "upgrade")

if [[ ${#available_modules[@]} -eq 0 ]]; then
log_info "No modules have upgrade scripts"
finalize_logging "success"
return
fi

for mod in "${available_modules[@]}"; do
log_step "Running upgrade for module: $mod"
"$(get_system_dir)/$mod/upgrade"

for script_name in "${available_modules[@]}"; do
# Extract module name from script filename
export MODULE_NAME="$(basename "$script_name" | sed 's/^[0-9]*-[0-9]*-//')"

init_module_logging "$MODULE_NAME"
if "$SYSTEM_DIR/upgrade/$script_name"; then
finalize_module_logging "success"
else
finalize_module_logging "failed"
exit 1
fi
done
else
# Upgrade specific module
local resolved_module=$(resolve_module_path "$module")
if [[ -x "$(get_system_dir)/$resolved_module/upgrade" ]]; then
"$(get_system_dir)/$resolved_module/upgrade"
local script_name=$(resolve_script_name "$module" "upgrade")
if [[ -x "$SYSTEM_DIR/upgrade/$script_name" ]]; then
# Extract module name from script filename
export MODULE_NAME="$(basename "$script_name" | sed 's/^[0-9]*-[0-9]*-//')"

init_module_logging "$MODULE_NAME"
if "$SYSTEM_DIR/upgrade/$script_name"; then
finalize_module_logging "success"
else
finalize_module_logging "failed"
exit 1
fi
else
log_error "Module $module does not have an upgrade script"
exit 1
fi
fi

finalize_logging "success"
}

Expand Down
Loading