diff --git a/mac_os/.circleci/config.yml b/.circleci/config.yml similarity index 100% rename from mac_os/.circleci/config.yml rename to .circleci/config.yml diff --git a/mac_os/.config/rubocop/config.yml b/.config/rubocop/config.yml similarity index 100% rename from mac_os/.config/rubocop/config.yml rename to .config/rubocop/config.yml diff --git a/mac_os/.github/FUNDING.yml b/.github/FUNDING.yml similarity index 100% rename from mac_os/.github/FUNDING.yml rename to .github/FUNDING.yml diff --git a/mac_os/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml similarity index 100% rename from mac_os/.github/ISSUE_TEMPLATE/config.yml rename to .github/ISSUE_TEMPLATE/config.yml diff --git a/mac_os/.github/ISSUE_TEMPLATE/issue.md b/.github/ISSUE_TEMPLATE/issue.md similarity index 100% rename from mac_os/.github/ISSUE_TEMPLATE/issue.md rename to .github/ISSUE_TEMPLATE/issue.md diff --git a/mac_os/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from mac_os/.github/PULL_REQUEST_TEMPLATE.md rename to .github/PULL_REQUEST_TEMPLATE.md diff --git a/mac_os/.gitignore b/.gitignore similarity index 100% rename from mac_os/.gitignore rename to .gitignore diff --git a/mac_os/.ruby-version b/.ruby-version similarity index 100% rename from mac_os/.ruby-version rename to .ruby-version diff --git a/mac_os/CITATION.cff b/CITATION.cff similarity index 100% rename from mac_os/CITATION.cff rename to CITATION.cff diff --git a/mac_os/Gemfile b/Gemfile similarity index 100% rename from mac_os/Gemfile rename to Gemfile diff --git a/mac_os/LICENSE.adoc b/LICENSE.adoc similarity index 100% rename from mac_os/LICENSE.adoc rename to LICENSE.adoc diff --git a/mac_os/QUICK_INSTALL.md b/QUICK_INSTALL.md similarity index 84% rename from mac_os/QUICK_INSTALL.md rename to QUICK_INSTALL.md index 319d189..d9b9fa3 100644 --- a/mac_os/QUICK_INSTALL.md +++ b/QUICK_INSTALL.md @@ -11,10 +11,10 @@ curl -fsSL https://static.due.ren/install.sh | bash That's it! The script will: 1. Install Xcode Command Line Tools 2. Install Homebrew -3. Install all CLI tools (atuin, bash, gemini-cli, node, ffmpeg, mas, mole, rename, ykman) -4. Install all GUI apps (Chromium, DeepL, Element, Signal, Nextcloud, Proton apps, Codex, Nova, Transmit) +3. Install all CLI tools (atuin, bash, bash-completion, claude-cli, gemini-cli, node, ffmpeg, mas, mole, rename, ykman) +4. Install all GUI apps (Chromium, DeepL, Element, Signal, Nextcloud, Proton apps, Codex, CodexBar, Nova, Transmit, Trimmy) 5. Install Mac App Store apps (Bitwarden, Invoice Ninja, Numbers, Pages, PastePal, xSearch) -6. Download and install Google Fonts (Barlow, Poppins) +6. Download and install Google Fonts (Barlow, Barlow Semi Condensed, Poppins) ## Notes @@ -43,9 +43,10 @@ To host on static.due.ren: ## What's Installed ### Homebrew Formulas (CLI) -- atuin - Shell history +- atuin - Shell history manager - bash - Updated bash shell - bash-completion - Bash completions +- claude-cli - Claude AI CLI - gemini-cli - Gemini AI CLI - node - Node.js - ffmpeg - Media processing @@ -64,8 +65,10 @@ To host on static.due.ren: - proton-mail - Proton Mail - protonvpn - Proton VPN - codex - AI coding assistant +- codexbar - AI assistant menu bar (via steipete/tap) - nova - Nova editor - transmit - FTP client +- trimmy - Video trimming tool ### Mac App Store - Bitwarden - Password manager diff --git a/README.adoc b/README.adoc new file mode 100644 index 0000000..7e2f49f --- /dev/null +++ b/README.adoc @@ -0,0 +1,158 @@ += macOS Installer + +Opinionated shell scripts for automated macOS machine setup via Homebrew and Mac App Store. + +== Features + +* Installs link:https://developer.apple.com/xcode[Xcode Command Line Tools] +* Installs link:http://brew.sh[Homebrew] with proper PATH configuration +* Installs Homebrew formulas (CLI tools) +* Installs Homebrew casks (GUI applications) +* Installs link:http://www.apple.com/macosx/whats-new/app-store.html[App Store] software via mas +* Installs Google Fonts (Barlow, Barlow Semi Condensed, Poppins) +* Provides interactive CLI for step-by-step installation +* Includes web-based installer generator at https://install.due.ren + +== Quick Install + +For a fresh macOS machine, run: + +[source,bash] +---- +curl -fsSL https://static.due.ren/install.sh | bash +---- + +This single command installs everything automatically. See link:QUICK_INSTALL.md[Quick Install Guide] for details. + +== Requirements + +* macOS (tested on Apple Silicon and Intel) +* Internet connection +* Mac App Store account (for App Store installations) + +== Manual Installation + +Clone and run interactively: + +[source,bash] +---- +git clone https://git.due.ren/andreas/mac_os.git +cd mac_os +bin/run +---- + +You will be presented with the following options: + +.... +Install: + b: Install basics (fonts). + t: Install development tools (Xcode CLI). + hf: Install Homebrew Formulas. + hc: Install Homebrew Casks. + m: Install Mac App Store software. + i: Install all (executes all install options in order). +Manage: + c: Check status of installed software. + C: Caffeinate machine (prevent sleep during installation). + w: Clean work (temp) directory. + q: Quit/Exit. +.... + +Choose option `i` to run a full install or select a specific option to run a single action. Each option is designed to be re-run if necessary. + +Pass the option directly to skip the prompt: `bin/run i` + +== Web Generator + +Visit https://install.due.ren to build a custom installer with your preferred software selections. The generator creates a standalone bash script you can download and run on any Mac. + +== What's Installed + +=== Homebrew Formulas (CLI Tools) +* atuin - Shell history manager +* bash - Updated bash shell +* bash-completion - Bash completions +* claude-cli - Claude AI CLI +* gemini-cli - Gemini AI CLI +* node - Node.js runtime +* ffmpeg - Media processing +* mas - Mac App Store CLI +* mole - SSH tunneling +* rename - Rename utility +* ykman - YubiKey manager + +=== Homebrew Casks (GUI Applications) +* eloston-chromium - Ungoogled Chromium browser +* deepl - DeepL translator +* element - Matrix client +* signal - Signal messenger +* nextcloud - Nextcloud sync client +* proton-drive - Proton Drive +* proton-mail - Proton Mail +* protonvpn - Proton VPN +* codex - AI coding assistant +* codexbar - AI assistant menu bar (steipete/tap) +* nova - Nova text editor +* transmit - FTP/SFTP client +* trimmy - Video trimming tool + +=== Mac App Store Applications +* Bitwarden (1352778147) - Password manager +* Invoice Ninja (1503970375) - Invoicing +* Numbers (409203825) - Spreadsheets +* Pages (409201541) - Word processor +* PastePal (1503446680) - Clipboard manager +* xSearch (1579902068) - Search tool + +=== Fonts +* Barlow - Google Font (full family) +* Barlow Semi Condensed - Google Font (full family) +* Poppins - Google Font (full family) +* Berkeley Mono - Commercial font (must purchase separately) + +== Customization + +All installation scripts are in the `bin` folder: + +* `bin/install_basics` - Installs custom fonts +* `bin/install_dev_tools` - Installs Xcode Command Line Tools +* `bin/install_homebrew_formulas` - Installs CLI tools via Homebrew +* `bin/install_homebrew_casks` - Installs GUI apps via Homebrew +* `bin/install_app_store` - Installs Mac App Store applications +* `bin/run` - Main CLI interface + +Edit these files to customize your installation. The `lib` folder provides helper functions for Homebrew installation, verification, and system utilities. + +== Project Structure + +---- +mac_os/ +├── bin/ # Installation scripts +├── lib/ # Helper libraries +├── fonts/ # Custom fonts to install +├── website/ # Web-based installer generator +├── install.sh # Single-file installer for hosting +└── README.adoc # This file +---- + +== Development + +To contribute: + +[source,bash] +---- +git clone https://git.due.ren/andreas/mac_os.git +cd mac_os +---- + +Make your changes and submit a pull request. + +== License + +MIT License + +== Credits + +Forked and simplified from link:https://github.com/bkuhlmann/mac_os[bkuhlmann/mac_os]. + +Customized by link:https://due.ren[Andreas Dünnebacke]. diff --git a/mac_os/Rakefile b/Rakefile similarity index 100% rename from mac_os/Rakefile rename to Rakefile diff --git a/mac_os/bin/install_app_store b/bin/install_app_store similarity index 100% rename from mac_os/bin/install_app_store rename to bin/install_app_store diff --git a/mac_os/bin/install_basics b/bin/install_basics similarity index 100% rename from mac_os/bin/install_basics rename to bin/install_basics diff --git a/mac_os/bin/install_defaults b/bin/install_defaults similarity index 100% rename from mac_os/bin/install_defaults rename to bin/install_defaults diff --git a/mac_os/bin/install_dev_tools b/bin/install_dev_tools similarity index 100% rename from mac_os/bin/install_dev_tools rename to bin/install_dev_tools diff --git a/mac_os/bin/install_homebrew_casks b/bin/install_homebrew_casks similarity index 100% rename from mac_os/bin/install_homebrew_casks rename to bin/install_homebrew_casks diff --git a/mac_os/bin/install_homebrew_formulas b/bin/install_homebrew_formulas similarity index 95% rename from mac_os/bin/install_homebrew_formulas rename to bin/install_homebrew_formulas index 5bbbe24..bef7b29 100755 --- a/mac_os/bin/install_homebrew_formulas +++ b/bin/install_homebrew_formulas @@ -16,6 +16,7 @@ brew install bash brew install bash-completion # AI +brew install claude-cli brew install gemini-cli # Development diff --git a/mac_os/bin/install_shell b/bin/install_shell similarity index 100% rename from mac_os/bin/install_shell rename to bin/install_shell diff --git a/mac_os/bin/run b/bin/run similarity index 100% rename from mac_os/bin/run rename to bin/run diff --git a/mac_os/fonts/Barlow-Black.ttf b/fonts/Barlow-Black.ttf similarity index 100% rename from mac_os/fonts/Barlow-Black.ttf rename to fonts/Barlow-Black.ttf diff --git a/mac_os/fonts/Barlow-BlackItalic.ttf b/fonts/Barlow-BlackItalic.ttf similarity index 100% rename from mac_os/fonts/Barlow-BlackItalic.ttf rename to fonts/Barlow-BlackItalic.ttf diff --git a/mac_os/fonts/Barlow-Bold.ttf b/fonts/Barlow-Bold.ttf similarity index 100% rename from mac_os/fonts/Barlow-Bold.ttf rename to fonts/Barlow-Bold.ttf diff --git a/mac_os/fonts/Barlow-BoldItalic.ttf b/fonts/Barlow-BoldItalic.ttf similarity index 100% rename from mac_os/fonts/Barlow-BoldItalic.ttf rename to fonts/Barlow-BoldItalic.ttf diff --git a/mac_os/fonts/Barlow-ExtraBold.ttf b/fonts/Barlow-ExtraBold.ttf similarity index 100% rename from mac_os/fonts/Barlow-ExtraBold.ttf rename to fonts/Barlow-ExtraBold.ttf diff --git a/mac_os/fonts/Barlow-ExtraBoldItalic.ttf b/fonts/Barlow-ExtraBoldItalic.ttf similarity index 100% rename from mac_os/fonts/Barlow-ExtraBoldItalic.ttf rename to fonts/Barlow-ExtraBoldItalic.ttf diff --git a/mac_os/fonts/Barlow-ExtraLight.ttf b/fonts/Barlow-ExtraLight.ttf similarity index 100% rename from mac_os/fonts/Barlow-ExtraLight.ttf rename to fonts/Barlow-ExtraLight.ttf diff --git a/mac_os/fonts/Barlow-ExtraLightItalic.ttf b/fonts/Barlow-ExtraLightItalic.ttf similarity index 100% rename from mac_os/fonts/Barlow-ExtraLightItalic.ttf rename to fonts/Barlow-ExtraLightItalic.ttf diff --git a/mac_os/fonts/Barlow-Italic.ttf b/fonts/Barlow-Italic.ttf similarity index 100% rename from mac_os/fonts/Barlow-Italic.ttf rename to fonts/Barlow-Italic.ttf diff --git a/mac_os/fonts/Barlow-Light.ttf b/fonts/Barlow-Light.ttf similarity index 100% rename from mac_os/fonts/Barlow-Light.ttf rename to fonts/Barlow-Light.ttf diff --git a/mac_os/fonts/Barlow-LightItalic.ttf b/fonts/Barlow-LightItalic.ttf similarity index 100% rename from mac_os/fonts/Barlow-LightItalic.ttf rename to fonts/Barlow-LightItalic.ttf diff --git a/mac_os/fonts/Barlow-Medium.ttf b/fonts/Barlow-Medium.ttf similarity index 100% rename from mac_os/fonts/Barlow-Medium.ttf rename to fonts/Barlow-Medium.ttf diff --git a/mac_os/fonts/Barlow-MediumItalic.ttf b/fonts/Barlow-MediumItalic.ttf similarity index 100% rename from mac_os/fonts/Barlow-MediumItalic.ttf rename to fonts/Barlow-MediumItalic.ttf diff --git a/mac_os/fonts/Barlow-Regular.ttf b/fonts/Barlow-Regular.ttf similarity index 100% rename from mac_os/fonts/Barlow-Regular.ttf rename to fonts/Barlow-Regular.ttf diff --git a/mac_os/fonts/Barlow-SemiBold.ttf b/fonts/Barlow-SemiBold.ttf similarity index 100% rename from mac_os/fonts/Barlow-SemiBold.ttf rename to fonts/Barlow-SemiBold.ttf diff --git a/mac_os/fonts/Barlow-SemiBoldItalic.ttf b/fonts/Barlow-SemiBoldItalic.ttf similarity index 100% rename from mac_os/fonts/Barlow-SemiBoldItalic.ttf rename to fonts/Barlow-SemiBoldItalic.ttf diff --git a/mac_os/fonts/Barlow-Thin.ttf b/fonts/Barlow-Thin.ttf similarity index 100% rename from mac_os/fonts/Barlow-Thin.ttf rename to fonts/Barlow-Thin.ttf diff --git a/mac_os/fonts/Barlow-ThinItalic.ttf b/fonts/Barlow-ThinItalic.ttf similarity index 100% rename from mac_os/fonts/Barlow-ThinItalic.ttf rename to fonts/Barlow-ThinItalic.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-Black.ttf b/fonts/BarlowSemiCondensed-Black.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-Black.ttf rename to fonts/BarlowSemiCondensed-Black.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-BlackItalic.ttf b/fonts/BarlowSemiCondensed-BlackItalic.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-BlackItalic.ttf rename to fonts/BarlowSemiCondensed-BlackItalic.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-Bold.ttf b/fonts/BarlowSemiCondensed-Bold.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-Bold.ttf rename to fonts/BarlowSemiCondensed-Bold.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-BoldItalic.ttf b/fonts/BarlowSemiCondensed-BoldItalic.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-BoldItalic.ttf rename to fonts/BarlowSemiCondensed-BoldItalic.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-ExtraBold.ttf b/fonts/BarlowSemiCondensed-ExtraBold.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-ExtraBold.ttf rename to fonts/BarlowSemiCondensed-ExtraBold.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-ExtraBoldItalic.ttf b/fonts/BarlowSemiCondensed-ExtraBoldItalic.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-ExtraBoldItalic.ttf rename to fonts/BarlowSemiCondensed-ExtraBoldItalic.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-ExtraLight.ttf b/fonts/BarlowSemiCondensed-ExtraLight.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-ExtraLight.ttf rename to fonts/BarlowSemiCondensed-ExtraLight.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-ExtraLightItalic.ttf b/fonts/BarlowSemiCondensed-ExtraLightItalic.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-ExtraLightItalic.ttf rename to fonts/BarlowSemiCondensed-ExtraLightItalic.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-Light.ttf b/fonts/BarlowSemiCondensed-Light.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-Light.ttf rename to fonts/BarlowSemiCondensed-Light.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-LightItalic.ttf b/fonts/BarlowSemiCondensed-LightItalic.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-LightItalic.ttf rename to fonts/BarlowSemiCondensed-LightItalic.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-Medium.ttf b/fonts/BarlowSemiCondensed-Medium.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-Medium.ttf rename to fonts/BarlowSemiCondensed-Medium.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-MediumItalic.ttf b/fonts/BarlowSemiCondensed-MediumItalic.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-MediumItalic.ttf rename to fonts/BarlowSemiCondensed-MediumItalic.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-Regular.ttf b/fonts/BarlowSemiCondensed-Regular.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-Regular.ttf rename to fonts/BarlowSemiCondensed-Regular.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-RegularItalic.ttf b/fonts/BarlowSemiCondensed-RegularItalic.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-RegularItalic.ttf rename to fonts/BarlowSemiCondensed-RegularItalic.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-SemiBold.ttf b/fonts/BarlowSemiCondensed-SemiBold.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-SemiBold.ttf rename to fonts/BarlowSemiCondensed-SemiBold.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-SemiBoldItalic.ttf b/fonts/BarlowSemiCondensed-SemiBoldItalic.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-SemiBoldItalic.ttf rename to fonts/BarlowSemiCondensed-SemiBoldItalic.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-Thin.ttf b/fonts/BarlowSemiCondensed-Thin.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-Thin.ttf rename to fonts/BarlowSemiCondensed-Thin.ttf diff --git a/mac_os/fonts/BarlowSemiCondensed-ThinItalic.ttf b/fonts/BarlowSemiCondensed-ThinItalic.ttf similarity index 100% rename from mac_os/fonts/BarlowSemiCondensed-ThinItalic.ttf rename to fonts/BarlowSemiCondensed-ThinItalic.ttf diff --git a/mac_os/fonts/BerkeleyMono-Bold-Oblique.otf b/fonts/BerkeleyMono-Bold-Oblique.otf similarity index 100% rename from mac_os/fonts/BerkeleyMono-Bold-Oblique.otf rename to fonts/BerkeleyMono-Bold-Oblique.otf diff --git a/mac_os/fonts/BerkeleyMono-Bold.otf b/fonts/BerkeleyMono-Bold.otf similarity index 100% rename from mac_os/fonts/BerkeleyMono-Bold.otf rename to fonts/BerkeleyMono-Bold.otf diff --git a/mac_os/fonts/BerkeleyMono-Oblique.otf b/fonts/BerkeleyMono-Oblique.otf similarity index 100% rename from mac_os/fonts/BerkeleyMono-Oblique.otf rename to fonts/BerkeleyMono-Oblique.otf diff --git a/mac_os/fonts/BerkeleyMono-Regular.otf b/fonts/BerkeleyMono-Regular.otf similarity index 100% rename from mac_os/fonts/BerkeleyMono-Regular.otf rename to fonts/BerkeleyMono-Regular.otf diff --git a/mac_os/fonts/Poppins-Black.ttf b/fonts/Poppins-Black.ttf similarity index 100% rename from mac_os/fonts/Poppins-Black.ttf rename to fonts/Poppins-Black.ttf diff --git a/mac_os/fonts/Poppins-BlackItalic.ttf b/fonts/Poppins-BlackItalic.ttf similarity index 100% rename from mac_os/fonts/Poppins-BlackItalic.ttf rename to fonts/Poppins-BlackItalic.ttf diff --git a/mac_os/fonts/Poppins-Bold.ttf b/fonts/Poppins-Bold.ttf similarity index 100% rename from mac_os/fonts/Poppins-Bold.ttf rename to fonts/Poppins-Bold.ttf diff --git a/mac_os/fonts/Poppins-BoldItalic.ttf b/fonts/Poppins-BoldItalic.ttf similarity index 100% rename from mac_os/fonts/Poppins-BoldItalic.ttf rename to fonts/Poppins-BoldItalic.ttf diff --git a/mac_os/fonts/Poppins-ExtraBold.ttf b/fonts/Poppins-ExtraBold.ttf similarity index 100% rename from mac_os/fonts/Poppins-ExtraBold.ttf rename to fonts/Poppins-ExtraBold.ttf diff --git a/mac_os/fonts/Poppins-ExtraBoldItalic.ttf b/fonts/Poppins-ExtraBoldItalic.ttf similarity index 100% rename from mac_os/fonts/Poppins-ExtraBoldItalic.ttf rename to fonts/Poppins-ExtraBoldItalic.ttf diff --git a/mac_os/fonts/Poppins-ExtraLight.ttf b/fonts/Poppins-ExtraLight.ttf similarity index 100% rename from mac_os/fonts/Poppins-ExtraLight.ttf rename to fonts/Poppins-ExtraLight.ttf diff --git a/mac_os/fonts/Poppins-ExtraLightItalic.ttf b/fonts/Poppins-ExtraLightItalic.ttf similarity index 100% rename from mac_os/fonts/Poppins-ExtraLightItalic.ttf rename to fonts/Poppins-ExtraLightItalic.ttf diff --git a/mac_os/fonts/Poppins-Italic.ttf b/fonts/Poppins-Italic.ttf similarity index 100% rename from mac_os/fonts/Poppins-Italic.ttf rename to fonts/Poppins-Italic.ttf diff --git a/mac_os/fonts/Poppins-Light.ttf b/fonts/Poppins-Light.ttf similarity index 100% rename from mac_os/fonts/Poppins-Light.ttf rename to fonts/Poppins-Light.ttf diff --git a/mac_os/fonts/Poppins-LightItalic.ttf b/fonts/Poppins-LightItalic.ttf similarity index 100% rename from mac_os/fonts/Poppins-LightItalic.ttf rename to fonts/Poppins-LightItalic.ttf diff --git a/mac_os/fonts/Poppins-Medium.ttf b/fonts/Poppins-Medium.ttf similarity index 100% rename from mac_os/fonts/Poppins-Medium.ttf rename to fonts/Poppins-Medium.ttf diff --git a/mac_os/fonts/Poppins-MediumItalic.ttf b/fonts/Poppins-MediumItalic.ttf similarity index 100% rename from mac_os/fonts/Poppins-MediumItalic.ttf rename to fonts/Poppins-MediumItalic.ttf diff --git a/mac_os/fonts/Poppins-Regular.ttf b/fonts/Poppins-Regular.ttf similarity index 100% rename from mac_os/fonts/Poppins-Regular.ttf rename to fonts/Poppins-Regular.ttf diff --git a/mac_os/fonts/Poppins-SemiBold.ttf b/fonts/Poppins-SemiBold.ttf similarity index 100% rename from mac_os/fonts/Poppins-SemiBold.ttf rename to fonts/Poppins-SemiBold.ttf diff --git a/mac_os/fonts/Poppins-SemiBoldItalic.ttf b/fonts/Poppins-SemiBoldItalic.ttf similarity index 100% rename from mac_os/fonts/Poppins-SemiBoldItalic.ttf rename to fonts/Poppins-SemiBoldItalic.ttf diff --git a/mac_os/fonts/Poppins-Thin.ttf b/fonts/Poppins-Thin.ttf similarity index 100% rename from mac_os/fonts/Poppins-Thin.ttf rename to fonts/Poppins-Thin.ttf diff --git a/mac_os/fonts/Poppins-ThinItalic.ttf b/fonts/Poppins-ThinItalic.ttf similarity index 100% rename from mac_os/fonts/Poppins-ThinItalic.ttf rename to fonts/Poppins-ThinItalic.ttf diff --git a/mac_os/install.sh b/install.sh similarity index 99% rename from mac_os/install.sh rename to install.sh index 625047b..a2cf8b2 100755 --- a/mac_os/install.sh +++ b/install.sh @@ -99,6 +99,7 @@ FORMULAS=( "atuin" # Shell history "bash" # Updated bash "bash-completion" # Bash completions + "claude-cli" # Claude AI CLI "gemini-cli" # Gemini AI CLI "node" # Node.js "ffmpeg" # Media processing diff --git a/mac_os/lib/installers.sh b/lib/installers.sh similarity index 100% rename from mac_os/lib/installers.sh rename to lib/installers.sh diff --git a/mac_os/lib/options.sh b/lib/options.sh similarity index 100% rename from mac_os/lib/options.sh rename to lib/options.sh diff --git a/mac_os/lib/settings.sh b/lib/settings.sh similarity index 100% rename from mac_os/lib/settings.sh rename to lib/settings.sh diff --git a/mac_os/lib/utilities.sh b/lib/utilities.sh similarity index 100% rename from mac_os/lib/utilities.sh rename to lib/utilities.sh diff --git a/mac_os/lib/verifiers.sh b/lib/verifiers.sh similarity index 100% rename from mac_os/lib/verifiers.sh rename to lib/verifiers.sh diff --git a/mac_os/README.adoc b/mac_os/README.adoc deleted file mode 100644 index f5e2bbe..0000000 --- a/mac_os/README.adoc +++ /dev/null @@ -1,245 +0,0 @@ -:toc: macro -:toclevels: 5 -:figure-caption!: - -:mac_os_defaults_link: link:https://macos-defaults.com[macOS Defaults] - -= macOS - -Shell scripts for automated macOS machine setup. - -This project is a framework for automating the setup of a macOS machine. In order to illustrate the -potential of what this project can do, please see the companion -link:https://alchemists.io/projects/mac_os-config[macOS Config] project for details. The _macOS -Config_ project is an opinionated configuration which meets the needs of my development environment -but is also meant to serve as an example and guide for building your own personalized setup. Here is -how the two projects are meant to be used: - -* *macOS* (this project) - The foundational framework for building custom macOS machine setups. -* *link:https://alchemists.io/projects/mac_os-config[macOS Configuration]* - The layer on top of - this _macOS_ project which defines a custom machine implementation. The project is meant to be - forked for as many custom machine setups as needed. - -toc::[] - -== Features - -* Provides a command line interface, written in Bash, with no additional dependencies for - installation and management of a macOS machine. -* Supports macOS boot disk creation for fresh install of operating system. -* Installs link:https://developer.apple.com/xcode[Xcode Command Line Tools]. -* Installs link:http://brew.sh[Homebrew] formulas and casks. -* Installs link:http://www.apple.com/macosx/whats-new/app-store.html[App Store] software. -* Installs non-App Store software applications. -* Installs software application extensions. -* Installs dotfiles. -* Installs link:https://nodejs.org[Node] link:https://www.npmjs.com[packages]. -* Installs link:https://www.ruby-lang.org[Ruby] link:https://rubygems.org[gems]. -* Installs link:https://www.rust-lang.org[Rust] link:https://crates.io[crates]. -* Applies {mac_os_defaults_link}. -* Configures installed software. -* Supports restoration of machine backups. - -== Requirements - -. link:https://www.apple.com/os/macos[macOS 26.0.0 (Tahoe)] -. link:https://developer.apple.com/xcode[Xcode] - -== Setup - -To install, run: - -[source,bash] ----- -git clone https://github.com/bkuhlmann/mac_os.git -cd mac_os -git checkout 22.0.0 ----- - -== Usage - -Run the following: - -[source,bash] ----- -bin/run ----- - -You will be presented with the following options (listed in order of -use): - -.... -Boot: - B: Create boot disk. -Install: - b: Apply basic settings. - t: Install development tools. - hf: Install Homebrew Formulas. - hc: Install Homebrew Casks. - m: Install Mac App Store software. - a: Install application software. - x: Install application software extensions. - df: Install dotfiles. - np: Install Node packages. - rg: Install Ruby gems. - rc: Install Rust crates. - d: Apply default settings. - cs: Configure installed software. - i: Install everything (i.e. executes all install options in order listed). -Restore: - R: Restore settings from backup. -Manage: - c: Check status of managed software. - C: Caffeinate machine. - ua: Uninstall application software. - ux: Uninstall application software extension. - ra: Reinstall application software. - rx: Reinstall application software extension. - w: Clean work (temp) directory. - q: Quit/Exit. -.... - -Choose option `i` to run a full install or select a specific option to run a single action. Each -option is designed to be re-run if necessary. This can also be handy for performing upgrades, -re-running a missing/failed install, etc. - -The option prompt can be skipped by passing the desired option directly to the `bin/run` script. For -example, executing `bin/run i` will execute the full install process. - -The machine should be rebooted after all install tasks have completed to ensure all settings have -been loaded. - -It is recommended that the `mac_os` project directory not be deleted and kept on the local machine -in order to manage installed software and benefit from future upgrades. - -=== Boot Disk - -When attempting to create a boot disk via `bin/run B`, you’ll be presented with the following -documentation (provided here for reference): - -.... -macOS Boot Disk Setup - 1. Insert a USB drive (8GB or higher). - 2. Use Disk Utility to format as "Mac OS Extended (Journaled)". - 3. Use Disk Utility to set the schema, if available, as "GUID Partition Map". - 4. Use Disk Utility to label as "Untitled". - 5. Run this script to install the OS and create a bootable USB drive. - -macOS Boot Disk Usage: - 1. Insert the USB drive, created above, into the machine to be upgraded. - 2. Reboot the machine. - 3. Press and hold the POWER key before the Apple logo appears. - 4. Select the USB boot disk from the menu. - 5. Use Disk Utility to delete and/or erase the hard drive including associated partitions. - 6. Use Disk Utility to create a single "APFS" drive. - 7. Install the new operating system. - -macOS Boot Disk Recovery: - 1. Start/restart the machine. - 2. Press and hold the POWER key before the Apple logo appears. - 3. Wait for the macOS installer to load from the recovery partition. - 4. Use the dialog options to launch Disk Utility, reinstall the system, etc. -.... - -💡 You can ensure the right installer is downloaded and available for Boot Disk creation by running the following commands: - -[source,bash] ----- -# Show which installers are available. -softwareupdate --list-full-installers - -# Download desired version. -sudo softwareupdate --fetch-full-installer --full-installer-version 26.0 ----- - -=== Customization - -All executable scripts can be found in the `bin` folder: - -* `bin/apply_basic_settings` (optional, customizable): Applies basic and initial settings for - setting up a machine. -* `bin/apply_default_settings` (optional, customizable): Applies {mac_os_defaults_link}. -* `bin/configure_software` (optional, customizable): Configures installed software as part of the - post install process. -* `bin/create_boot_disk` (optional): Creates a macOS boot disk. -* `bin/install_app_store` (optional, customizable): Installs macOS, GUI-based, App Store - applications. -* `bin/install_applications` (optional, customizable): Installs macOS, GUI-based, non-App Store - applications. -* `bin/install_dev_tools` (required): Installs macOS development tools required by Homebrew. -* `bin/install_dotfiles` (optional, customizable): Installs personal dotfiles so the system is - tailored to your workflow. -* `bin/install_extensions` (optional, customizable): Installs macOS application extensions and - add-ons. -* `bin/install_homebrew_casks` (optional, customizable): Installs Homebrew Formulas. -* `bin/install_homebrew_formulas` (optional, customizable): Installs Homebrew Casks. -* `bin/install_node_packages` (optional, customizable): Installs Node packages. -* `bin/install_ruby_gems` (optional, customizable): Installs Ruby gems. -* `bin/install_rust_crates` (optional, customizable): Installs Rust crates. -* `bin/restore_backup` (optional, customizable): Restores system/application settings from backup - image. -* `bin/run` (required): The main script and interface for macOS setup. - -The `lib` folder provides the base framework for installing, re-installing, and uninstalling -software. Everything provided via the link:https://alchemists.io/projects/mac_os-config[macOS -Config] project is built upon the functions found in the `lib` folder. See the -link:https://alchemists.io/projects/mac_os-config[macOS Config] project for further details. - -* `lib/settings.sh`: Defines global settings for software applications, extensions, etc. - -=== Troubleshooting - -* *Pi-hole*: When using link:https://pi-hole.net[Pi-hole], you might need to temporarily disable - prior to upgrading as you might experience various errors with Apple not being able to detect an - internet connection which prevents the installer from working. -* *Recovery Mode*: When using the boot disk and the installer fails in some catastrophic manner, - reboot the machine into recovery mode -- pass:[POWER] (Silicon) or - pass:[COMMAND] + pass:[r] (Intel) buttons -- to download and install the - last operating system used. Alternatively, you can also use pass:[COMMAND] + - pass:[OPTION] + pass:[r] (Intel) to attempt to download the latest operating - system. -* *NVRAM/PRAM Reset*: When using the boot disk, you might experience a situation where you see a - black screen with a white circle and diagonal line running through it. This means macOS lost or - can't find the boot disk for some reason. To correct this, shut down and boot up the system again - while holding down pass:[OPTION] + pass:[COMMAND] + pass:[r] + - pass:[p] (Intel) keys simultaneously. You might want to wait for the system boot sound - to happen a few times before releasing the keys. This will clear the system NVRAM/PRAM. At this - point you can shut down and restart the system following the boot disk instructions (the boot disk - will be recognized now). -* *System Management Controller (SMC) Reset*: Sometimes it can help to reset the SMC to improve - system speed. To fix, follow these steps: -** Shut down your Mac. -** Hold down pass:[CONTROL] + pass:[OPTION] on the left side of the keyboard - and pass:[SHIFT] on the right side of the keyboard. -** After seven seconds, hold down the Power button as well. -** Release all keys after another seven seconds. -** Turn on your Mac. -** For more troubleshooting tips, check out The Eclectic Light Company's link:https://eclecticlight.co/mac-troubleshooting-summary/[Mac Troubleshooting Summary]. - -== Development - -To contribute, run: - -[source,bash] ----- -git clone https://github.com/bkuhlmann/mac_os.git -cd mac_os ----- - -== link:https://alchemists.io/policies/license[License] - -== link:https://alchemists.io/policies/security[Security] - -== link:https://alchemists.io/policies/code_of_conduct[Code of Conduct] - -== link:https://alchemists.io/policies/contributions[Contributions] - -== link:https://alchemists.io/policies/developer_certificate_of_origin[Developer Certificate of Origin] - -== link:https://alchemists.io/projects/mac_os/versions[Versions] - -== link:https://alchemists.io/community[Community] - -== Credits - -Engineered by link:https://alchemists.io/team/brooke_kuhlmann[Brooke Kuhlmann]. diff --git a/mac_os/website/README.md b/website/README.md similarity index 100% rename from mac_os/website/README.md rename to website/README.md diff --git a/mac_os/website/index.html b/website/index.html similarity index 100% rename from mac_os/website/index.html rename to website/index.html