Skip to content

Commit

Permalink
Giant update that really should have been many smaller updates
Browse files Browse the repository at this point in the history
  • Loading branch information
eels committed Aug 23, 2024
1 parent 30fc66d commit ef6c302
Show file tree
Hide file tree
Showing 17 changed files with 499 additions and 341 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
# OS generated files
# -----------------------------------------------

._*
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Expand All @@ -26,6 +26,11 @@ Thumbs.db
*.lock
*.lock.json

# Plugins
# -----------------------------------------------

tmux/plugins

# Local secrets
# -----------------------------------------------

Expand Down
2 changes: 2 additions & 0 deletions asdf/.asdfrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
always_keep_download = no
legacy_version_file = yes
4 changes: 4 additions & 0 deletions asdf/.tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
nodejs 22.6.0
rust 1.80.1
terraform 1.9.4
yarn 1.22.22
33 changes: 11 additions & 22 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
# 1. HOMEBREW
# 2. SYMLINKS
# 3. NODE
# 4. COMPOSER & YARN GLOBALS
# 4. YARN GLOBALS
# 5. DIRECTORIES
# 6. APPLICATION ICONS
# 7. CLEANUP
# 6. CLEANUP
# -----------------------------------------------

# -----------------------------------------------
Expand Down Expand Up @@ -58,8 +57,9 @@ if [ "$IS_UPDATING" == false ]; then
[ -s "$PWD" ] && ln -sf "$PWD" "$HOME/dotfiles"
fi

## Symlink global composer.json to default location
ln -sf "$PWD/composer/composer.json" "$HOME/.composer/composer.json"
## Symlink `asdf` .asdfrc && .tool-versions to default location
ln -sf "$PWD/asdf/.asdfrc" "$HOME/.asdfrc"
ln -sf "$PWD/asdf/.tool-versions" "$HOME/.tool-versions"

## Symlink global package.json to default location
ln -sf "$PWD/yarn/package.json" "$HOME/.config/yarn/global/package.json"
Expand All @@ -80,6 +80,10 @@ done
[ ! -d "$HOME/.config/sheldon" ] && mkdir "$HOME/.config/sheldon"
ln -sf "$PWD/sheldon/plugins.toml" "$HOME/.config/sheldon/plugins.toml"

## Symlink tmux configuration to default location
[ ! -d "$HOME/.config/tmux" ] && mkdir "$HOME/.config/tmux"
ln -sf "$PWD/tmux/tmux.conf" "$HOME/.config/tmux/tmux.conf"

# -----------------------------------------------
# 3. NODE
# -----------------------------------------------
Expand All @@ -90,14 +94,9 @@ if [ "$IS_UPDATING" == false ]; then
fi

# -----------------------------------------------
# 4. COMPOSER & YARN GLOBALS
# 4. YARN GLOBALS
# -----------------------------------------------

## Install globals for Composer
if [ "$IS_UPDATING" == false ]; then
composer global upgrade
fi

## Install globals for Yarn
if [ "$IS_UPDATING" == false ]; then
yarn global upgrade
Expand All @@ -113,17 +112,7 @@ for directory in "Projects" "Sites"; do
done

# -----------------------------------------------
# 6. APPLICATION ICONS
# -----------------------------------------------

## Execute Application icon setter then kill/refresh Finder and Dock
if [ "$IS_UPDATING" == false ]; then
node ./macos/application_icons
killall Finder && killall Dock
fi

# -----------------------------------------------
# 7. CLEANUP
# 6. CLEANUP
# -----------------------------------------------

## Reload the shell
Expand Down
9 changes: 0 additions & 9 deletions composer/composer.json

This file was deleted.

20 changes: 6 additions & 14 deletions homebrew/brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,17 @@ tap 'buo/cask-upgrade'
tap 'ferdium/ferdium'
tap 'homebrew/aliases'
tap 'homebrew/bundle'
tap 'homebrew/cask-fonts'
tap 'homebrew/cask-versions'
tap 'homebrew/cask'
tap 'homebrew/core'
tap 'homebrew/services'
tap 'shivammathur/php'
tap 'wilmoore/formulae'

brew 'composer'
brew 'fnm'
brew 'gh'
brew 'asdf'
brew 'git'
brew 'httpie'
brew 'gnupg'
brew 'imagemagick'
brew 'mas'
brew 'p7zip'
brew 'php-version'
brew 'php'
brew 'pnpm'
brew 'sheldon'
brew 'starship'
brew 'yarn'
brew 'tmux'
brew 'zsh'

cask 'beekeeper-studio'
Expand All @@ -38,7 +27,10 @@ cask 'docker'
cask 'ferdium'
cask 'figma'
cask 'firefox'
cask 'handbrake'
cask 'hyper'
cask 'imageoptim'
cask 'latest'
cask 'maccy'
cask 'mockoon'
cask 'notion'
Expand Down
Loading

0 comments on commit ef6c302

Please sign in to comment.