Skip to content

Commit

Permalink
Fix README steps (#2)
Browse files Browse the repository at this point in the history 
* Fix directory for cloning dotfiles

* Add step to get `brew` in PATH when trying to run `brew bundle`

* Add Rosetta 2 step for M1 Macs

Some apps in Brewfile require Rosetta 2 (logitech-options failed first time)

* Add a step to re-run `brew bundle` for Mac App Store apps

`mas` requires you to be signed into App Store, but I can't do that until 1Password is set up, which happens after brew bundle is run once (chicken and egg here)

I'm just gonna run it again after iCloud sign-in step

* Fix Krypton sections

They renamed their thing since I made this, I guess (they also got acquired by Akamai, so I hope this thing doesn't disappear in the future)

Additionally, their installer is broken so I fixed it for myself in https://github.com/expandrew/www/commit/de610620f391106014a6bef16e51ff82baa1db91

To install, I used:
`% curl https://raw.githubusercontent.com/expandrew/www/fix-macOS-11.2/kr | sh`

(instead of their `% curl https://krypt.co/kr | sh`)

* Update pyenv step

Python 3.6.8 didn't seem to install on M1 so I am bumping this to the latest version of Python

* Add zprofile to mackup

I had to run a command to add this to .zprofile after I installed Homebrew

The output from Homebrew installer was:
==> Next steps:
- Add Homebrew to your PATH in /Users/amw/.zprofile:
    echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> /Users/amw/.zprofile
    eval "$(/opt/homebrew/bin/brew shellenv)"

zsh doesn't seem to work without this, so I added it and it worked

* Update .gitconfig

This came out different after I set up Krypton so I am gonna go with it

* Commit Brewfile.lock

Fine I guess I'll commit a lock file 😩

* Refactor zshrc

- Move that Homebrew shellenv command to .zshrc like everything else
- Add some conditionals so it won't throw errors on Intel

* Turn off gpg in gitconfig

Krypton turns this on by default but the gpg program is at a different path on each platform so I get errors on one or the other depending on how this is set

I looked into [includeIf] conditionals within gitconfig but it only works for specific paths or branches so I can't really use it

I'm turning it off because it's not explicitly necessary

* Add eqMac to control monitor volume

MonitorControl doesn't work with M1 Macs yet so I'm using eqMac in the meantime to control the output volume to my LG 27QN880-B over USB-C

Related: MonitorControl/MonitorControl#323
  • Loading branch information
@andrewwestling
andrewwestling authored Apr 10, 2021
1 parent 5138205 commit 1b4cac8
Show file tree
Hide file tree
Showing 6 changed files with 383 additions and 13 deletions.
1 change: 1 addition & 0 deletions Brewfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ cask "authy"
cask "bartender"
cask "discord"
cask "docker"
cask "eqmac"
cask "firefox"
cask "github"
cask "google-chrome"
Expand Down
355 changes: 355 additions & 0 deletions Brewfile.lock.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,355 @@
{
"entries": {
"tap": {
"homebrew/bundle": {
"revision": "0df097ca87d3bcf762d0f8cbe30eed8c37c35786"
},
"homebrew/cask": {
"revision": "aeb5bae5a30724bca4c7437d5d1502f3b5c58827"
},
"homebrew/cask-drivers": {
"revision": "d578d89895c8cadbf6fc6ca60a180fa507140ce1"
},
"homebrew/cask-versions": {
"revision": "9d2f19357c2a94e3debe601122dba2c3d8272cda"
},
"homebrew/core": {
"revision": "fc37369307f5bbaf7da4dcc77c96c5c7e7fcef6d"
}
},
"brew": {
"awscli": {
"version": "2.1.35",
"bottle": {
"rebuild": 0,
"cellar": ":any",
"prefix": "/opt/homebrew",
"root_url": "https://homebrew.bintray.com/bottles",
"files": {
"arm64_big_sur": {
"url": "https://homebrew.bintray.com/bottles/awscli-2.1.35.arm64_big_sur.bottle.tar.gz",
"sha256": "100c5a7c32810df6a60e8bcc388464421a0c1f4b9f91658525d32867f88805d0"
},
"big_sur": {
"url": "https://homebrew.bintray.com/bottles/awscli-2.1.35.big_sur.bottle.tar.gz",
"sha256": "fa8aeae61cc9ce6f03ff25860f0bccb472d0dbc193c17658b9f768086ae90fc2"
},
"catalina": {
"url": "https://homebrew.bintray.com/bottles/awscli-2.1.35.catalina.bottle.tar.gz",
"sha256": "a4c7d4d7bf12447b8c3e807985e86cbb378a246b8b6d16c2c49178f783b203aa"
},
"mojave": {
"url": "https://homebrew.bintray.com/bottles/awscli-2.1.35.mojave.bottle.tar.gz",
"sha256": "ef5bfd5f9bc54ed90c0b23a81cf0fedef5640422a7dca2b00256797b5c1b7486"
}
}
}
},
"mackup": {
"version": "0.8.32",
"bottle": {
"rebuild": 0,
"cellar": ":any_skip_relocation",
"prefix": "/opt/homebrew",
"root_url": "https://homebrew.bintray.com/bottles",
"files": {
"arm64_big_sur": {
"url": "https://homebrew.bintray.com/bottles/mackup-0.8.32.arm64_big_sur.bottle.tar.gz",
"sha256": "be968ec450c3e2c28255f2c6e7928404e24498c907a05aed69e5a87e6ae8612e"
},
"big_sur": {
"url": "https://homebrew.bintray.com/bottles/mackup-0.8.32.big_sur.bottle.tar.gz",
"sha256": "24dca4cbc991aad8990c672e7a88fd975f33fefcdb0dbb70f9e6e0b10a19841d"
},
"catalina": {
"url": "https://homebrew.bintray.com/bottles/mackup-0.8.32.catalina.bottle.tar.gz",
"sha256": "df736bcc51887e9621c00d2948c989db4f1d4b5234ab7e702b49933fc212705e"
},
"mojave": {
"url": "https://homebrew.bintray.com/bottles/mackup-0.8.32.mojave.bottle.tar.gz",
"sha256": "5f413d937d26828065204eaf532ab280c9d642448a0ee4f280fc667cb03fc9e6"
}
}
}
},
"mas": {
"version": "1.8.1",
"bottle": {
"rebuild": 0,
"cellar": ":any",
"prefix": "/opt/homebrew",
"root_url": "https://homebrew.bintray.com/bottles",
"files": {
"arm64_big_sur": {
"url": "https://homebrew.bintray.com/bottles/mas-1.8.1.arm64_big_sur.bottle.tar.gz",
"sha256": "f5ef4f44057f43ecc14f970687d832bd152bc6142c0ad848977f0a6527aa934f"
},
"big_sur": {
"url": "https://homebrew.bintray.com/bottles/mas-1.8.1.big_sur.bottle.tar.gz",
"sha256": "d92cfc734e730fde87b29c6bf4a50ce63a78b9e505f464dc557eee128aa06d05"
},
"catalina": {
"url": "https://homebrew.bintray.com/bottles/mas-1.8.1.catalina.bottle.tar.gz",
"sha256": "163eb9cfdfed3d8fbda133b4079d104ad687f1ddb71d70d5661d02b22f562e76"
}
}
}
},
"nvm": {
"version": "0.38.0",
"bottle": false
},
"postgresql": {
"version": "13.2_1",
"bottle": {
"rebuild": 0,
"cellar": "/opt/homebrew/Cellar",
"prefix": "/opt/homebrew",
"root_url": "https://homebrew.bintray.com/bottles",
"files": {
"arm64_big_sur": {
"url": "https://homebrew.bintray.com/bottles/postgresql-13.2_1.arm64_big_sur.bottle.tar.gz",
"sha256": "299babccbbf29b9769ab402aca01c4a0c4bc173a19a928e09fe1edabe7461c88"
},
"big_sur": {
"url": "https://homebrew.bintray.com/bottles/postgresql-13.2_1.big_sur.bottle.tar.gz",
"sha256": "67a547842ae49911d301d490e70b5fff1ee27a65cea403abeff3a25d1806e8d6"
},
"catalina": {
"url": "https://homebrew.bintray.com/bottles/postgresql-13.2_1.catalina.bottle.tar.gz",
"sha256": "02af915cc2b5291c5a15b59a74dff255e918e7a6af34dbef53cf6ad264627628"
},
"mojave": {
"url": "https://homebrew.bintray.com/bottles/postgresql-13.2_1.mojave.bottle.tar.gz",
"sha256": "37f0b76c0f034d8a6837805eb27da3787c39cf895516a193ad298ea96f68e98a"
}
}
}
},
"pyenv": {
"version": "1.2.26",
"bottle": {
"rebuild": 0,
"cellar": ":any",
"prefix": "/opt/homebrew",
"root_url": "https://homebrew.bintray.com/bottles",
"files": {
"arm64_big_sur": {
"url": "https://homebrew.bintray.com/bottles/pyenv-1.2.26.arm64_big_sur.bottle.tar.gz",
"sha256": "ecef415150807040a663a2303de95243c9da49f746cdc7208ab7314edb9d3d75"
},
"big_sur": {
"url": "https://homebrew.bintray.com/bottles/pyenv-1.2.26.big_sur.bottle.tar.gz",
"sha256": "5c2c4b253c069c7461f9f657fdf8a526a6aedac5fed2263c65bb9aaf66efd805"
},
"catalina": {
"url": "https://homebrew.bintray.com/bottles/pyenv-1.2.26.catalina.bottle.tar.gz",
"sha256": "6a5736817f87bfbf97f355975a71ce99c72cff0afb8f5e29920c8eaac003f0ca"
},
"mojave": {
"url": "https://homebrew.bintray.com/bottles/pyenv-1.2.26.mojave.bottle.tar.gz",
"sha256": "8da46fc892af22ed501f9ff4fd96a06e9fa185653ada1a0887847e61787980e0"
}
}
}
},
"ruby-build": {
"version": "20210405",
"bottle": false
},
"rbenv": {
"version": "1.1.2",
"bottle": {
"rebuild": 0,
"cellar": ":any",
"prefix": "/opt/homebrew",
"root_url": "https://homebrew.bintray.com/bottles",
"files": {
"arm64_big_sur": {
"url": "https://homebrew.bintray.com/bottles/rbenv-1.1.2.arm64_big_sur.bottle.tar.gz",
"sha256": "19d0b9e3b11bcacdf692e78248c1b5764f7d3f4b58f2b83ad7b39562863ba82e"
},
"big_sur": {
"url": "https://homebrew.bintray.com/bottles/rbenv-1.1.2.big_sur.bottle.tar.gz",
"sha256": "60b045c8843745c45d01616ee3f71b91f6a16ee09c47e23a7817a3edabeaccfd"
},
"catalina": {
"url": "https://homebrew.bintray.com/bottles/rbenv-1.1.2.catalina.bottle.tar.gz",
"sha256": "503ed6d818502f00f031b9f49461934e252b9bfba2876e90a326fc27bb1052d6"
},
"mojave": {
"url": "https://homebrew.bintray.com/bottles/rbenv-1.1.2.mojave.bottle.tar.gz",
"sha256": "d1019098dee8d037587069398e5ad04e6d736f834dc44ae73943bec46b10b260"
},
"high_sierra": {
"url": "https://homebrew.bintray.com/bottles/rbenv-1.1.2.high_sierra.bottle.tar.gz",
"sha256": "b5984102794a9d39388ca1f6ec77965aeea29b971cc00cb5af8ede8ee6c926d6"
},
"sierra": {
"url": "https://homebrew.bintray.com/bottles/rbenv-1.1.2.sierra.bottle.tar.gz",
"sha256": "873175a851e5aa4f5b3438072030b945c252f08a9a07760c64dc045e2cce4724"
}
}
}
},
"yarn": {
"version": "1.22.10",
"bottle": false
},
"zsh-git-prompt": {
"version": "0.5",
"bottle": false
}
},
"cask": {
"1password": {
"version": "7.8",
"options": {
"full_name": "1password"
}
},
"authy": {
"version": "1.8.3",
"options": {
"full_name": "authy"
}
},
"bartender": {
"version": "4.0.44,40044",
"options": {
"full_name": "bartender"
}
},
"discord": {
"version": "0.0.262",
"options": {
"full_name": "discord"
}
},
"docker": {
"version": "3.2.2,61853",
"options": {
"full_name": "docker"
}
},
"firefox": {
"version": "87.0",
"options": {
"full_name": "firefox"
}
},
"github": {
"version": "2.7.2-5b94c877",
"options": {
"full_name": "github"
}
},
"google-chrome": {
"version": "89.0.4389.114",
"options": {
"full_name": "google-chrome"
}
},
"iterm2": {
"version": "3.4.4",
"options": {
"full_name": "iterm2"
}
},
"keycastr": {
"version": "0.9.10",
"options": {
"full_name": "keycastr"
}
},
"logitech-options": {
"version": "8.50.210",
"options": {
"full_name": "logitech-options"
}
},
"menumeters": {
"version": "2.1.4",
"options": {
"full_name": "menumeters"
}
},
"monitorcontrol": {
"version": "2.1.0",
"options": {
"full_name": "monitorcontrol"
}
},
"moom": {
"version": "3.2.21",
"options": {
"full_name": "moom"
}
},
"rectangle": {
"version": "0.44,49",
"options": {
"full_name": "rectangle"
}
},
"rocket": {
"version": "1.8.2,79",
"options": {
"full_name": "rocket"
}
},
"slack": {
"version": "4.14.0",
"options": {
"full_name": "slack"
}
},
"spotify": {
"version": "1.1.56.595.g2d2da0de,1.1.56.595.g2d2da0de-24",
"options": {
"full_name": "spotify"
}
},
"visual-studio-code": {
"version": "1.55.0",
"options": {
"full_name": "visual-studio-code"
}
},
"whatsapp": {
"version": "2.2110.12",
"options": {
"full_name": "whatsapp"
}
},
"zoom": {
"version": "5.6.1.560",
"options": {
"full_name": "zoom"
}
}
},
"mas": {
"Bear": {
"id": "1091189122",
"version": "1.8.2"
},
"Hand Mirror": {
"id": "1502839586",
"version": "1.5"
}
}
},
"system": {
"macos": {
"big_sur": {
"HOMEBREW_VERSION": "3.0.11-68-g53e35d2",
"HOMEBREW_PREFIX": "/opt/homebrew",
"Homebrew/homebrew-core": "fc37369307f5bbaf7da4dcc77c96c5c7e7fcef6d",
"CLT": "12.4.0.0.1.1610135815",
"Xcode": "12.0",
"macOS": "11.2.3"
}
}
}
}
Loading

0 comments on commit 1b4cac8

Please sign in to comment.