Skip to content

Commit

Permalink
🔀️ Merge branch 'ladislas/feature/fix-installation'
Browse files Browse the repository at this point in the history
  • Loading branch information
ladislas committed Jul 1, 2024
2 parents 02b09b7 + 8031adf commit 38d8bb5
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 7 deletions.
26 changes: 25 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,44 @@ The rest is detailed here:

> <https://github.com/ladislas/dotfiles/blob/master/bootstrap.sh>
### Recommended Order

```bash
# check if things work
zsh bootstrap.sh --hello

# start with brew + apps
zsh boostrap.sh --brew --apps-install

# then zsh + git
zsh bootstrap.sh --zsh --git

# finally macos
zsh bootstrap.sh --macos --computer_name=xxx

# the rest is only needed if you are me
zsh bootstrap.sh --apps-config --dev --data --nvim
```

## Brew casks/formulae

I've removed some of the heavy casks & formulae from the script as they were taking way too much time...

To instatll them, run the following:

```bash
# swiftlint needs xcode installed
brew install swiftlint

# mandatory for signing commits
brew install --no-quarantine gpg-suite-no-mail

# Formulae
brew install imagemagick

# Casks
brew install --no-quarantine adoptopenjdk
brew install --no-quarantine mactex-no-gui
brew install --no-quarantine gpg-suite-no-mail
```

## Apps Settings
Expand Down
2 changes: 2 additions & 0 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@ fi
if args_contain "--zsh" ; then
print_section "Starting zsh configuration script"

ask_for_sudo

# Switch to using brew-installed zsh as default shell
if ! fgrep -q "${BREW_PREFIX}/bin/zsh" /etc/shells ; then
print_action "Setting brew zsh as default shell"
Expand Down
6 changes: 1 addition & 5 deletions scripts/apps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ if ! is_ci ; then
try brew upgrade
fi

print_action "Tap homebrew/cask"
try brew tap homebrew/cask

# List already available casks
print_action "List casks already installed"
available_casks=$(brew list --cask)

Expand All @@ -29,7 +25,7 @@ casks=(
# fantastical
# glance
# google-chrome
gpg-suite-no-mail
# gpg-suite-no-mail
iterm2
macdown
rectangle
Expand Down
1 change: 0 additions & 1 deletion scripts/brew.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ formulae=(
ccache
fastlane
open-ocd
swiftlint
swiftformat
clang-format
)
Expand Down

0 comments on commit 38d8bb5

Please sign in to comment.