Move the rest of MacOS deps into the Brewfile

os/macos/Brewfile

@@ -1,5 +1,6 @@
 # Terminal
 cask "kitty"
+cask "wezterm"
 
 # Enviroment
 brew "git"
@@ -35,16 +36,21 @@ brew "helix"
 brew "fnm" # Node package no longer needed, use fnm instead
            # yarn / pnpm not needed, use corepack instead
 brew "cmake"
-brew "rustup-init"
+brew "rustup"
 brew "rust-analyzer"
 brew "go"
+brew "oven-sh/bun/bun"
 
 cask "orbstack" # Docker Desktop alternative
 
 # Cloud dev
 brew "azure-cli"
 brew "terraform"
 
+# Windows manager (and shortcut manager)
+brew "koekeishiya/formulae/yabai"
+brew "koekeishiya/formulae/skhd"
+
 # Password manager
 cask "1password"
 cask "1password-cli"
@@ -54,3 +60,34 @@ cask "font-symbols-only-nerd-font"
 
 # AI
 brew "ollama"
+
+# Browsers
+cask "google-chrome"
+#cask "arc" # comment out for now since it was installed manually
+
+# General casks
+cask "dropbox"
+cask "raycast"
+cask "spotify"
+cask "discord"
+cask "vlc"
+cask "disk-inventory-x"
+cask "webtorrent"
+cask "the-unarchiver"
+cask "blender"
+cask "obsidian"
+cask "notion"
+
+# Webdev casks
+cask "forklift"
+cask "postman"
+cask "visual-studio-code"
+
+# Work
+cask "slack"
+cask "microsoft-teams"
+cask "ticktick"
+
+# Games
+cask "minecraft"
+cask "steam"

os/macos/macos-setup.sh

@@ -68,56 +68,4 @@ command -v brew >/dev/null 2>&1 || { \
 	/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"; \
 }
 
-brew_cask_check_if_installed () {
-	if brew ls --cask --versions $1 > /dev/null; then
-		echo "$1 allready installed"
-	else
-		echo "$1 is not installed with brew cask"
-		read -p "Install it? [yN] " -n 1 -r
-		if [[ $REPLY =~ ^[Yy]$ ]]; then
-			echo
-			echo "Installing $1"
-			brew install --cask $1
-		fi
-	fi
-}
-
 brew bundle
-
-brew install oven-sh/bun/bun
-
-# Windows manager (and shortcut manager)
-brew install \
-	koekeishiya/formulae/yabai \
-	koekeishiya/formulae/skhd
-
-# Browsers
-brew_cask_check_if_installed google-chrome
-brew_cask_check_if_installed arc
-
-# General Casks
-brew_cask_check_if_installed dropbox
-brew_cask_check_if_installed raycast
-brew_cask_check_if_installed spotify
-brew_cask_check_if_installed discord
-brew_cask_check_if_installed vlc
-brew_cask_check_if_installed disk-inventory-x
-brew_cask_check_if_installed webtorrent
-brew_cask_check_if_installed the-unarchiver
-brew_cask_check_if_installed blender
-brew_cask_check_if_installed obsidian
-brew_cask_check_if_installed notion
-
-# Webdev casks
-brew_cask_check_if_installed forklift
-brew_cask_check_if_installed postman
-brew_cask_check_if_installed visual-studio-code
-
-# Work
-brew_cask_check_if_installed slack
-brew_cask_check_if_installed microsoft-teams
-brew_cask_check_if_installed ticktick
-
-# Games
-brew_cask_check_if_installed minecraft
-brew_cask_check_if_installed steam