commit f163122618aee5af23c46a9f794173c821d778d3
parent 63517ad2640057d619f93b6ec4941395adee3437
Author: Damian Myrda <damian@prime8.dev>
Date: Tue, 17 Feb 2026 08:23:08 -0600
clean up macos setup scripts
Diffstat:
2 files changed, 10 insertions(+), 29 deletions(-)
diff --git a/macos/link.sh b/macos/link.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -euo pipefail
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd .. && pwd)"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROGRAMS_DIR="$SCRIPT_DIR/programs"
CONFIG_DIR="$HOME/.config"
-echo "🔗 Symlinking config files for macOS..."
+echo "🔗 Symlinking config files..."
link_config() {
local src="$1"
@@ -43,20 +43,20 @@ link_config "$PROGRAMS_DIR/git/config" "$HOME/.gitconfig"
# GitHub CLI
link_config "$PROGRAMS_DIR/gh/config.yml" "$CONFIG_DIR/gh/config.yml"
+# SSH
+link_config "$PROGRAMS_DIR/ssh/config" "$HOME/.ssh/config"
+
# OpenCode
link_config "$PROGRAMS_DIR/opencode/opencode.json" "$CONFIG_DIR/opencode/opencode.json"
link_config "$PROGRAMS_DIR/opencode/command" "$CONFIG_DIR/opencode/command"
link_config "$PROGRAMS_DIR/opencode/plugin" "$CONFIG_DIR/opencode/plugin"
-# SSH
-link_config "$PROGRAMS_DIR/ssh/config" "$HOME/.ssh/config"
-
# Karabiner
link_config "$PROGRAMS_DIR/karabiner/karabiner.json" "$CONFIG_DIR/karabiner/karabiner.json"
link_config "$PROGRAMS_DIR/karabiner/assets" "$CONFIG_DIR/karabiner/assets"
-# Zed (macOS native path)
+# Zed
link_config "$PROGRAMS_DIR/zed/settings.jsonc" "$CONFIG_DIR/zed/settings.json"
link_config "$PROGRAMS_DIR/zed/keymap.jsonc" "$CONFIG_DIR/zed/keymap.json"
-echo "✅ macOS config symlinks complete!"
+echo "✅ Config symlinks complete!"
diff --git a/macos/setup.sh b/macos/setup.sh
@@ -3,26 +3,6 @@ set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-echo "🔧 Starting macOS setup..."
-
-# Hostname
-HOSTNAME="macbox"
-echo "🖥️ Setting system hostname to '$HOSTNAME'..."
-sudo scutil --set HostName "$HOSTNAME" && echo "✅ HostName set"
-sudo scutil --set ComputerName "$HOSTNAME" && echo "✅ ComputerName set"
-sudo scutil --set LocalHostName "$HOSTNAME" && echo "✅ LocalHostName set"
-
-# Dock
-echo "📦 Configuring Dock preferences..."
-defaults write com.apple.dock orientation -string "left" && echo "✅ Dock position set to left"
-defaults write com.apple.dock autohide -bool true && echo "✅ Dock autohide enabled"
-defaults write com.apple.dock autohide-delay -float 0 && echo "✅ Dock autohide delay set"
-defaults write com.apple.dock no-bouncing -bool true && echo "✅ Dock bounce disabled"
-killall Dock 2>/dev/null && echo "🔄 Dock restarted" || true
-
-# Windows
-defaults write -g NSWindowShouldDragOnGesture -bool true && echo "✅ Window drag by gesture enabled"
-
# Homebrew
echo "🍺 Installing Homebrew packages with Brewfile..."
if ! command -v brew >/dev/null 2>&1; then
@@ -31,9 +11,10 @@ if ! command -v brew >/dev/null 2>&1; then
fi
brew update && echo "✅ Homebrew updated"
brew upgrade && echo "✅ Homebrew upgraded"
-BREWFILE_PATH="$SCRIPT_DIR/Brewfile"
+BREWFILE_PATH="${SCRIPT_DIR}/Brewfile"
if [ -f "$BREWFILE_PATH" ]; then
brew bundle --file="$BREWFILE_PATH" && echo "✅ Brewfile installed successfully"
+ brew bundle check --file="$BREWFILE_PATH" && echo "✅ Brewfile verification passed" || echo "⚠️ Brewfile verification issues"
else
echo "❌ Brewfile not found at $BREWFILE_PATH"
exit 1
@@ -43,4 +24,4 @@ brew cleanup && echo "✅ Homebrew cleanup completed"
# Symlink configs
"$SCRIPT_DIR/link.sh"
-echo "✅ macOS setup complete!"
+echo "✅ Setup script completed!"
