Cross-platform reliability fixes for shell configs and git aliases

[Copilot]

Dotfiles had hard-coded paths and GNU-specific flags that broke on Intel Macs and BSD systems. Fixed shell sourcing order to prevent modern CLI tools from being shadowed by base aliases.

Shell environment

Zsh/.zprofile: Guard Homebrew eval for both Apple Silicon and Intel paths:

if [[ -x /opt/homebrew/bin/brew ]]; then
    eval "$(/opt/homebrew/bin/brew shellenv)"
elif [[ -x /usr/local/bin/brew ]]; then
    eval "$(/usr/local/bin/brew shellenv)"
fi

Zsh/.zprofile, Zsh/.zshrc: Remove duplicate EDITOR/VISUAL exports. .shell_common already handles nvim detection correctly.

Zsh/.zshrc: Move .shell_common sourcing to line 45 (before Modern CLI Replacements). Base aliases must be set before eza/bat/fzf override them.

Cross-platform compatibility

Shell/.shell_common:

• duh alias: Change --max-depth=1 → -d 1 (BSD du compatibility)
• zipr: Convert from alias to function: zipr() { zip -r "$1.zip" "$1"; }

Git modernization

Git/.gitconfig-essential:

• Push default: upstream → simple
• Discard alias: checkout -- → restore --

Bootstrap

Bootstrap/stow.sh: Skip Hammerspoon/ and TeX/ on non-Darwin systems to prevent stow errors.

README.md: Mark Zsh/ as "Both" platforms.

Original prompt

Here's a concise to-do list:

---

Dotfiles cleanup — cross-platform reliability fixes

1. Zsh/.zprofile: Guard the Homebrew eval (line 41). Replace eval "$(/opt/homebrew/bin/brew shellenv)" with:

   if [[ -x /opt/homebrew/bin/brew ]]; then
       eval "$(/opt/homebrew/bin/brew shellenv)"
   elif [[ -x /usr/local/bin/brew ]]; then
       eval "$(/usr/local/bin/brew shellenv)"
   fi

2. Zsh/.zprofile: Remove the EDITOR/VISUAL exports (lines 9–10). .shell_common already handles this correctly with nvim detection.

3. Zsh/.zshrc: Remove the EDITOR/VISUAL exports (lines 15–16) for the same reason.

4. Zsh/.zshrc: Move [[ -f "$HOME/.shell_common" ]] && source "$HOME/.shell_common" (line 326) to early in the file — right after the Environment/options section (around line 45), before the Modern CLI Replacements block. This way the base aliases from .shell_common are set first, then eza/bat/fzf override them correctly.

5. Shell/.shell_common: Fix the duh alias (line 28). Replace --max-depth=1 with -d 1 (BSD du on macOS doesn't support --max-depth).

6. Shell/.shell_common: Replace the zipr alias (line 22) with a function:

   zipr() { zip -r "$1.zip" "$1"; }

7. Git/.gitconfig-essential: Change default = upstream to default = simple in the [push] section (line 53).

8. Git/.gitconfig-essential: Change discard = checkout -- to discard = restore -- (line 39).

9. Bootstrap/stow.sh: In get_packages(), add OS-aware skipping after the existing macOS/ skip (around line 58):

   if [[ "$(uname -s)" != "Darwin" ]]; then
       [[ "$dir" == "Hammerspoon/" ]] && continue
       [[ "$dir" == "TeX/" ]] && continue
   fi

10. README.md: Update the structure table to mark Zsh/ as "Both" instead of "macOS".

---

💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

[Copilot]

Pull request overview

Improves dotfiles portability across macOS (Apple Silicon + Intel) and BSD-like environments by removing hard-coded paths/flags and adjusting shell/git defaults to avoid breakage and alias shadowing.

Changes:

• Make Homebrew initialization in Zsh/.zprofile resilient to both /opt/homebrew and /usr/local.
• Reorder Zsh startup so shared shell config is sourced earlier, and centralize editor detection in .shell_common.
• Modernize a few shared aliases/config defaults (BSD-compatible duh, zipr function, Git push/discard aliases) and avoid stow package errors on non-Darwin.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
Zsh/.zshrc	Removes duplicate editor exports and sources ~/.shell_common earlier to establish baseline aliases/env before “modern CLI” overrides.
Zsh/.zprofile	Removes editor exports and guards brew shellenv for both Apple Silicon and Intel Homebrew locations.
Shell/.shell_common	Switches zipr to a function and updates duh to use BSD-compatible du -d.
Git/.gitconfig-essential	Updates push default to simple and changes discard alias to use git restore.
Bootstrap/stow.sh	Skips Hammerspoon/ and TeX/ when not on Darwin to prevent stow failures.
README.md	Marks Zsh/ as supported on both platforms in the structure table.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[Copilot]

uname -s is executed once per directory iteration. Since the OS value is constant for the script run, compute it once (e.g., local os=$(uname -s)) before the loop (or before the if) and reuse it to reduce repeated subprocess calls and simplify the condition.

[Copilot]

The table now marks Zsh/ as "Both", but later this section still says "Platform-specific options are in .bash_aliases (Linux) and .zshrc (macOS)." That sentence looks outdated given .zshrc contains Linux paths/logic as well; consider updating it for consistency.

[Copilot]

EDITOR/VISUAL are no longer set in .zprofile, so they won't be defined for login shells that don't read .zshrc (e.g., non-interactive login shells). If you still want these variables available in that scenario, consider sourcing ~/.shell_common from .zprofile (or keeping minimal EDITOR/VISUAL exports here).

Suggested change

	# Editor
	export EDITOR='vim'
	export VISUAL="$EDITOR"

[Copilot]

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated no new comments.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.