☕️ brew changes

Author: juftin

Makefile

@@ -38,24 +38,6 @@ brew-cleanup-force: ## Cleanup Homebrew, remove unused packages.
 	brew bundle cleanup --force --file "$(MAKE_DIR)/macos/Brewfile"
 	@echo "Homebrew cleaned up successfully 🎉"
 
-.PHONY: xbrew-bundle
-xbrew-bundle: ## Install x86 packages from the XBrewfile.
-	@echo "Installing x86 packages from XBrewfile 📦"
-	xbrew bundle --file "$(MAKE_DIR)/macos/XBrewfile"
-	@echo "x86 packages installed successfully 🎉"
-
-.PHONY: xbrew-cleanup
-xbrew-cleanup: ## Cleanup x86 Homebrew, remove unused packages (dry-run).
-	@echo "x86 Homebrew cleanup summary 🧹"
-	xbrew bundle cleanup --file "$(MAKE_DIR)/macos/XBrewfile"
-	@echo "x86 Homebrew cleanup summary complete 🎉"
-
-.PHONY: xbrew-cleanup-force
-xbrew-cleanup-force: ## Cleanup x86 Homebrew, remove unused packages.
-	@echo "Cleaning up x86 Homebrew 🧹"
-	xbrew bundle cleanup --force --file "$(MAKE_DIR)/macos/XBrewfile"
-	@echo "x86 Homebrew cleaned up successfully 🎉"
-
 ##@ python 🐍
 
 .PHONY: python-install-all

docs/dev-setup/python.md

@@ -55,6 +55,7 @@ uv tool install <package-name>
 
 [Python]: https://python.org/
 [uv tool]: https://docs.astral.sh/uv/guides/tools/
-[uv]: https://docs.astral.sh/uv/
+[uv]: https://github.com/astral-sh/uv
 [IPython]: http://ipython.org/
 [ipython.png]: https://i.imgur.com/pu16vey.png
+[uv]: https://github.com/astral-sh/uv

docs/dev-setup/silicon.md

@@ -5,7 +5,7 @@ from Intel processors to Apple silicon in Mac computers.
 
 Software is created with specific hardware in mind. In the past, software was made
 for Macs with Intel processors, which use the `x86` instruction set. Now,
-software needs to be created for both Intel and Apple silicon (which uses the `ARM` instruction set)
+software needs to be created for both Intel and Apple Silicon (which uses the `ARM` instruction set)
 in order for the software to work efficiently and properly for each platform.
 
 ## Rosetta
@@ -20,7 +20,7 @@ ARM-based processors.
 softwareupdate --install-rosetta --agree-to-license
 ```
 
-In addition to configuring Homebrew for M1, add a second Homebrew installation for
+In addition to configuring Homebrew for Silicon, add a second Homebrew installation for
 the `x86_64` architecture.
 
 ```shell
@@ -31,7 +31,7 @@ By default, simply use the brew command when installing any brew packages,
 but add an alias to your startup files for the `x86` version of
 Homebrew, such as the following. This will allow you to easily install dependencies
 that are only supported on the `x86_64` architecture. You can add the following
-line to your `~/.zshrc` or similar file:
+line to your `~/.zshrc` or similar file to give x86 HomeBrew the alias of `xbrew`:
 
 ```shell
 alias xbrew="arch -x86_64 /usr/local/bin/brew"
@@ -46,48 +46,26 @@ modules with components written in other programming languages: like `numpy`, `p
 
 When maintainers upload a compiled package to PyPI they also will typically upload
 compiled wheel (binary) files which come with variants for your exact system:
-`MacOS x ARM x Python 3.11`. However for older versions of the packages and python versions it is
+`MacOS x ARM x Python 3.11`. However, for older versions of the packages and python versions it is
 common for these wheels to be missing for our `MacOS x ARM` machines.
 
-To fix this issue of wheel compatibility of our systems we will use [Rosetta] to
+To fix this issue of wheel compatibility of our systems we will use [Rosetta] and [uv] to
 install and use an `x86` version of Python instead. This way we can use `x86` versions
 of the wheels for packages which can be much more widely available.
 
-> [!IMPORTANT] dotfiles
-> If you're using the dotfiles from this project, this process can be streamlined
-> as long as you have the `x86` version of Homebrew installed (described above).
-> The `xbrew` and `xpython` aliases are already included in the dotfiles - and there
-> is an `XBrewfile` in the `macos` directory that can be used to install all the current
-> Python versions:
->
-> ```shell
-> xbrew bundle --file ~/.dotfiles/macos/XBrewfile
-> xpython3.8 -m venv .venv
-> source .venv/bin/activate
-> ```
-
-1. Install your base `x86` Version of Python
-
-    - The example above is for `Python 3.8` but it’s good to have one
-      installed for all major versions.
-
-    ```shell
-    xbrew install "[email protected]"
-    ```
-
-2. Create a Virtual Environment in your repository’s `.venv` directory using that `x86` Python
+1. Create a Virtual Environment in your repository’s `.venv` directory using an `x86` Python
 
     ```shell
-    "$(xbrew --prefix [email protected])/bin/python3.8" -m venv .venv
+    UV_PYTHON=3.11-x86_64 uv venv
     ```
 
-3. Activate the `x86` Python Virtual Environment you just created.
+2. Activate the `x86` Python Virtual Environment you just created.
 
     ```shell
     source .venv/bin/activate
     ```
 
-4. Install any tools or requirements you might need
+3. Install any tools or requirements you might need
 
     - Using `x86` python versions to run tools like `tox`, which
       creates its own virtual environments, can be especially important

docs/dotfiles/dependencies.md

@@ -100,23 +100,6 @@ packages.
     dotfiles brew-cleanup-force
     ```
 
-#### x86 macOS
-
-This project uses x86 emulation via [Rosetta 2](https://support.apple.com/en-us/HT211861)
-on Apple Silicon Macs. Any x86 specific dependencies will be installed via the `XBrewfile`:
-
-=== "xbrew"
-
-    ```shell
-    xbrew bundle --file ~/.dotfiles/macos/XBrewfile
-    ```
-
-=== "dotfiles"
-
-    ```shell
-    dotfiles xbrew-bundle
-    ```
-
 ### Python
 
 This project uses [uv tool](https://docs.astral.sh/uv/concepts/tools/) to install Python CLI

macos/Brewfile

@@ -34,12 +34,14 @@ brew "kind"
 brew "kustomize"
 brew "libomp"
 brew "make"
+brew "mise"
 brew "multi-gitter"
 brew "nano"
 brew "neovim"
 brew "node"
 brew "nvm"
 brew "openjdk"
+brew "opentofu"
 brew "ripgrep"
 brew "rich-cli"
 brew "sops"
@@ -57,7 +59,7 @@ brew "zoxide"
 ######################### CASKS ##########################
 ##########################################################
 
-cask "1password", greedy: true
+cask "1password", greedy: true, args: { appdir: "/Applications" }
 cask "1password-cli", greedy: true
 cask "amazon-q", greedy: true
 cask "caffeine", greedy: true

macos/XBrewfile

@@ -14,18 +14,6 @@ alias status="git status --verbose --ahead-behind --branch --find-renames"
 ##################### MAC ALIASES ########################
 ##########################################################
 
-if [[ ${OSTYPE} == "darwin"* ]]; then
-	######################################################
-	################### X86 ALIASES ######################
-	######################################################
-	alias xpython3.12="\$(xbrew --prefix [email protected])/bin/python3.12"
-	alias xpython3.11="\$(xbrew --prefix [email protected])/bin/python3.11"
-	alias xpython3.10="\$(xbrew --prefix [email protected])/bin/python3.10"
-	alias xpython3.9="\$(xbrew --prefix [email protected])/bin/python3.9"
-	alias xpython3.8="\$(xbrew --prefix [email protected])/bin/python3.8"
-	######################################################
-fi
-
 ##########################################################
 ##################### APPLICATIONS #######################
 ##########################################################

shell/.shell_aliases

@@ -20,6 +20,7 @@ if [[ $(uname) == "Darwin" ]]; then
 	elif [[ $(uname -m) == "x86_64" && -f /usr/local/bin/brew ]]; then
 		eval "$(/usr/local/bin/brew shellenv)"
 	fi
+	export HOMEBREW_CASK_OPTS="--appdir=${HOME}/Applications"
 fi
 
 # ~/.local/bin