Skip to content

Commit df26f16

Browse files
authored
🗄 chore: Move all brewfiles (#77)
See #40.
1 parent 8454936 commit df26f16

27 files changed

Lines changed: 70 additions & 29 deletions

brewfiles/app-essential.Brewfile

Lines changed: 0 additions & 4 deletions
This file was deleted.

makefiles/macos.mk

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,23 @@ macos-clean:
1414
# App Suite #
1515
###############################################################################
1616

17-
macos-app-private: macos-brew macos-app-dev macos-one-password macos-appcleaner macos-alfred macos-dropbox macos-popclip macos-markedit
18-
brew bundle --file brewfiles/app-essential.Brewfile
19-
brew bundle --file brewfiles/app-design.Brewfile
20-
brew bundle --file brewfiles/app-multimedia.Brewfile
21-
brew bundle --file brewfiles/app-productivity.Brewfile
22-
brew bundle --file brewfiles/app-social.Brewfile
23-
brew bundle --file brewfiles/app-utility.Brewfile
17+
macos-app-private: macos-brew macos-app-dev macos-app-work macos-one-password macos-appcleaner macos-alfred macos-dropbox macos-popclip macos-markedit
18+
run "pkg/macos-app-private/macos-app-private.sh"
2419

2520
macos-app-work: macos-brew macos-app-dev macos-appcleaner macos-alfred macos-popclip
26-
brew bundle --file brewfiles/app-essential.Brewfile
2721

2822
macos-app-dev: git macos-brew macos-iterm macos-sublime macos-terminal macos-vscode macos-xcode
29-
brew bundle --file brewfiles/app-dev.Brewfile
23+
run "pkg/macos-app-dev/macos-app-dev.sh"
3024

3125
###############################################################################
3226
# CLI Suite #
3327
###############################################################################
3428

3529
macos-cli-network: macos-brew
36-
brew bundle --file brewfiles/cli-network.Brewfile
30+
run "pkg/cli-network/macos-cli-network.sh"
3731

3832
macos-cli-useful: macos-brew
39-
brew bundle --file brewfiles/cli-useful.Brewfile
33+
run "pkg/cli-useful/macos-cli-useful.sh"
4034

4135
###############################################################################
4236
# Apps #
@@ -70,7 +64,7 @@ macos-markedit: macos-brew
7064
run "pkg/macos-markedit/macos-markedit.sh"
7165

7266
macos-one-password: macos-brew
73-
brew bundle --file brewfiles/one-password.Brewfile
67+
run "pkg/one-password/macos-one-password.sh"
7468

7569
macos-popclip: macos-brew
7670
run "pkg/macos-popclip/macos-popclip.sh"
@@ -91,14 +85,14 @@ macos-vscode: macos-brew
9185
run "pkg/vscode/macos-vscode.sh"
9286

9387
macos-xcode: macos-brew
94-
brew bundle --file brewfiles/xcode.Brewfile
88+
run "pkg/macos-xcode/macos-xcode.sh"
9589

9690
###############################################################################
9791
# CLIs #
9892
###############################################################################
9993

10094
macos-docker: macos-brew
101-
brew bundle --file brewfiles/docker.Brewfile
95+
run "pkg/docker/macos-docker.sh"
10296

10397
macos-duti: macos-brew
10498
run "pkg/macos-duti/macos-duti.sh"
@@ -123,7 +117,7 @@ macos-stow: macos-brew macos-clean
123117

124118
macos-zsh: macos-brew macos-stow
125119
$(eval BREW_BIN := $(shell bin/brew_bin))
126-
${BREW_BIN}/brew bundle --file brewfiles/zsh.Brewfile
120+
${BREW_BIN}/brew bundle --file pkg/zsh/zsh.Brewfile
127121
run "scripts/macos-zsh.sh"
128122

129123
###############################################################################
@@ -148,17 +142,16 @@ macos-file-handler: macos-duti
148142
run "scripts/macos-file-handler.sh"
149143

150144
macos-font: macos-brew
151-
brew bundle --file pkg/macos-font/macos-font.Brewfile
152-
cp -r pkg/macos-font/collection/ "${HOME}/Library/FontCollections"
145+
run "pkg/macos-font/macos-font.sh"
153146

154147
macos-icon: macos-cli-useful
155148
run "scripts/macos-icons.sh"
156149

157150
macos-quicklook: macos-brew
158-
brew bundle --file brewfiles/ext-quicklook.Brewfile
151+
run "pkg/macos-quicklook/macos-quicklook.sh"
159152

160153
macos-screensaver: macos-brew
161-
brew bundle --file brewfiles/ext-screensaver.Brewfile
154+
run "pkg/macos-screensaver/macos-screensaver.sh"
162155

163156
macos-service-workflow: macos-stow
164157
stow --dir 'pkg' --target "${HOME}/Library/Services" 'macos-services'
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
4+
# Install CLIs
5+
brew bundle --file pkg/cli-network/cli-network.Brewfile

pkg/cli-useful/macos-cli-useful.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
4+
# Install CLIs
5+
brew bundle --file pkg/cli-useful/cli-useful.Brewfile

pkg/docker/macos-docker.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
4+
# Install Docker
5+
brew bundle --file pkg/docker/docker.Brewfile
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
# macos-iterm
2-
# macos-sublime
3-
# macos-tower
4-
# macos-vscode
5-
# macos-xcode
61
cask "hex-fiend"
72
cask "jupyter-notebook-viewer"
83
cask "kaleidoscope"

pkg/macos-app-dev/macos-app-dev.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
4+
# Install apps
5+
brew bundle --file pkg/macos-app-dev/app-dev.Brewfile

0 commit comments

Comments
 (0)