From c7cdc7922cae33c1c2292567c3cf5bd69b22973d Mon Sep 17 00:00:00 2001
From: Frank Lyder Bredland <fl@nyggen.com>
Date: Wed, 10 Jul 2024 12:09:18 +0200
Subject: [PATCH] cleanup: move most stuff into a Brewfile for macos setup

---
 os/macos/Brewfile       | 55 +++++++++++++++++++++++++++++++++++---
 os/macos/macos-setup.sh | 59 +----------------------------------------
 2 files changed, 52 insertions(+), 62 deletions(-)

diff --git a/os/macos/Brewfile b/os/macos/Brewfile
index 77e6a42..9696671 100644
--- a/os/macos/Brewfile
+++ b/os/macos/Brewfile
@@ -1,6 +1,53 @@
+# Terminal
+cask "kitty"
 
-# Github CLI tool
-brew "gh"
+# Enviroment
+brew "git"
 
-# tui file browser https://github.com/sxyazi/yazi
-brew "yazi"
+# Enviroment
+brew "z"
+brew "tmux"
+brew "fzf"
+brew "fd"
+brew "rg"
+brew "wget"
+brew "tree"
+brew "watch"
+brew "fswatch"
+brew "reattach-to-user-namespace"
+brew "htop"
+brew "jq"
+brew "cloc"
+brew "coreutils"
+brew "direnv"
+brew "git-annex"
+brew "bat"
+brew "eza" # Maintained fork of exa
+brew "gh" # Github CLI tool
+brew "yazi" # tui file browser https://github.com/sxyazi/yazi
+
+# Editors
+brew "neovim"
+brew "vim"
+brew "helix"
+
+# Programming
+brew "fnm" # Node package no longer needed, use fnm instead
+           # yarn / pnpm not needed, use corepack instead
+brew "cmake"
+brew "rustup-init"
+brew "rust-analyzer"
+brew "go"
+
+cask "orbstack" # Docker Desktop alternative
+
+# Cloud dev
+brew "azure-cli"
+brew "terraform"
+
+# Password manager
+cask "1password"
+cask "1password-cli"
+
+# Fonts
+cask "font-symbols-only-nerd-font"
diff --git a/os/macos/macos-setup.sh b/os/macos/macos-setup.sh
index 1f82eee..a43c521 100755
--- a/os/macos/macos-setup.sh
+++ b/os/macos/macos-setup.sh
@@ -82,61 +82,9 @@ brew_cask_check_if_installed () {
 	fi
 }
 
-
-brew install git
-brew install --cask iTerm2
-brew install kitty # The fast, feature-rich, GPU based terminal emulator
-
 brew bundle
 
-# Enviroment
-brew install \
-	z \
-	tmux \
-	fzf \
-	fd \
-	rg \
-	wget \
-	tree \
-	watch \
-	fswatch \
-	reattach-to-user-namespace \
-	htop \
-	jq \
-	cloc \
-	coreutils \
-	direnv \
-	git-annex \
-	exa \
-	bat
-
-# Editors
-brew install \
-	neovim \
-	vim \
-	helix
-
-# Programming
-brew install \
-	node \
-	yarn \
-	pnpm \
-	bun \
-	fnm \
-	cmake \
-	rustup-init \
-	rust-analyzer \
-	go
-
-brew install --cask orbstack
-
-# Cloud dev
-brew install \
-	azure-cli \
-	terraform
-
-# Password manager
-brew install 1password 1password-cli
+brew install oven-sh/bun/bun
 
 # Windows manager (and shortcut manager)
 brew install \
@@ -173,8 +121,3 @@ brew_cask_check_if_installed ticktick
 # Games
 brew_cask_check_if_installed minecraft
 brew_cask_check_if_installed steam
-
-# Font
-brew install svn # needed for cask-fonts
-brew tap homebrew/cask-fonts
-brew_cask_check_if_installed font-symbols-only-nerd-font