1
mirror of https://github.com/jakejarvis/dotfiles.git synced 2025-04-25 15:35:21 -04:00

🎨 more cleanup

This commit is contained in:
Jake Jarvis 2021-03-23 10:07:57 -04:00
parent 5953542014
commit 38b8ffac14
Signed by: jake
GPG Key ID: 2B0C9CF251E69A39
16 changed files with 3098 additions and 360 deletions

View File

@ -12,7 +12,9 @@ tap "github/gh"
tap "heroku/brew"
tap "homebrew/bundle"
tap "homebrew/cask"
tap "homebrew/cask-drivers"
tap "homebrew/cask-versions"
tap "homebrew/cask-fonts"
tap "homebrew/core"
tap "homebrew/services"
tap "homebrew/test-bot"
@ -94,6 +96,8 @@ brew "node"
brew "nvm"
# Mostly ordinary binaries
brew "act"
brew "aws/tap/aws-sam-cli"
brew "aws-shell"
brew "awscli"
brew "angular-cli"
@ -101,6 +105,7 @@ brew "asciinema"
brew "autoconf"
brew "automake"
brew "azure-cli"
brew "bat"
brew "caddy"
brew "carthage"
brew "cli53"
@ -108,6 +113,8 @@ brew "cloudflare/cloudflare/cloudflared"
brew "cocoapods"
brew "composer"
brew "dart-lang/dart/dart"
brew "deno"
brew "dive"
brew "doctl"
brew "elixir"
brew "erlang"
@ -155,6 +162,7 @@ brew "ruby-build"
brew "rust"
brew "rbenv"
brew "rclone"
brew "s3cmd"
brew "s3fs"
brew "sass/sass/migrator"
brew "sass/sass/sass"
@ -193,6 +201,7 @@ cask "android-platform-tools"
# Pentesting tools
brew "aircrack-ng"
# brew "apktool"
brew "bfg"
brew "binutils"
brew "binwalk"
@ -337,6 +346,39 @@ cask "wireshark"
# * Safari
# - Preview: https://developer.apple.com/safari/technology-preview/
###############################
# Drivers #
###############################
cask "homebrew/cask-drivers/hp-easy-start"
cask "homebrew/cask-drivers/logitech-camera-settings"
cask "homebrew/cask-drivers/sonos"
###############################
# Fonts #
###############################
# Monospace
cask "homebrew/cask-fonts/font-source-code-pro" # VS Code font
cask "homebrew/cask-fonts/font-source-code-pro-for-powerline"
cask "homebrew/cask-fonts/font-hack"
cask "homebrew/cask-fonts/font-ibm-plex-mono"
cask "homebrew/cask-fonts/font-meslo-for-powerline" # iTerm font
cask "homebrew/cask-fonts/font-meslo-lg-nerd-font"
cask "homebrew/cask-fonts/font-fira-code"
cask "homebrew/cask-fonts/font-roboto-mono"
cask "homebrew/cask-fonts/font-ubuntu-mono"
cask "homebrew/cask-fonts/font-sf-mono" # comes in .pkg
cask "homebrew/cask-fonts/font-sf-mono-for-powerline"
# Serif
cask "homebrew/cask-fonts/font-inter"
cask "homebrew/cask-fonts/font-roboto"
cask "homebrew/cask-fonts/font-open-sans"
cask "homebrew/cask-fonts/font-sf-compact" # comes in .pkg
cask "homebrew/cask-fonts/font-sf-pro" # comes in .pkg
cask "homebrew/cask-fonts/font-ubuntu"
###############################
# macOS Apps via App Store #
###############################

3
aws/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
# to be safe...
credentials
shell/

3
aws/config Normal file
View File

@ -0,0 +1,3 @@
[default]
region = us-east-1
output = text

View File

@ -12,10 +12,19 @@
[init]
defaultBranch = main
[push]
default = current
default = tracking
gpgSign = if-asked
[pull]
rebase = true
[commit]
gpgsign = true
[rebase]
autoSquash = true
autoStash = true
[diff]
tool = default-difftool
[difftool "default-difftool"]
cmd = code --wait --diff $LOCAL $REMOTE
[alias]
undo = reset --soft HEAD~1
pom = push origin main
@ -27,14 +36,8 @@
aliases = config --get-regexp alias
contributors = shortlog --summary --numbered
new = !git init && git symbolic-ref HEAD refs/heads/main
[diff]
tool = default-difftool
[difftool "default-difftool"]
cmd = code --wait --diff $LOCAL $REMOTE
[credential]
helper = osxkeychain
[commit]
gpgsign = true
[gpg]
program = /usr/local/MacGPG2/bin/gpg
[github]
@ -48,3 +51,5 @@
required = true
[mergetool]
keepBackup = true
[color]
ui = auto

File diff suppressed because it is too large Load Diff

View File

@ -35,8 +35,8 @@ brew update
# Install more current ZSH and set as default shell
# https://stackoverflow.com/a/44549662/1438024
brew install zsh
sudo sh -c "echo $(brew --prefix zsh)/bin/zsh >> /etc/shells"
chsh -s "$(brew --prefix zsh)/bin/zsh"
sudo sh -c "echo $(brew --prefix)/bin/zsh >> /etc/shells"
chsh -s "$(brew --prefix)/bin/zsh"
# Install all apps from the Brewfile, ignore errors
brew tap homebrew/bundle

36
npm/install_globals.sh Executable file
View File

@ -0,0 +1,36 @@
#!/usr/bin/env bash
set -euo pipefail
# npm ls --global --parseable --depth=0 | awk '{gsub(/\/.*\//,"",$1); print}' | sort -u
packages=(
@babel/cli
@babel/core
@lhci/cli
autoprefixer
eslint
express-generator
express
firebase-tools
gatsby-cli
gitmoji-cli
gulp
json-server
netlify-cli
newman
nodemon
npm-check
postcss-cli
postcss
prettier
standard
stylelint
superstatic
vercel
webtorrent-cli
yo
)
for p in "${packages[@]}"; do
npm install --global "$p" || echo "$p not found"
done

View File

@ -1,24 +0,0 @@
#!/usr/bin/env bash
### Install global npm packages listed in npm-globals.txt
# https://github.com/br3ndonland/dotfiles/blob/main/script/npm-globals.sh
set -euo pipefail
package_dir="$(npm config get prefix)/lib"
packages=$(npm ls -g --parseable --depth=0)
packages=${packages//$package_dir\/node_modules\//}
echo "* Installing global npm packages..."
while read -r p; do
installed=$(echo "$packages" | grep -ce "^$p\$")
if [ "$installed" == "0" ]; then
echo "Installing $p..."
npm install -g "$p" || echo "!! Error: package $p not found in npm."
else
echo "$p is already installed."
fi
done <~/.dotfiles/npm/npm-globals.txt
echo "* Done installing npm packages."

View File

@ -1,23 +0,0 @@
@babel/cli
@babel/core
@lhci/cli
autoprefixer
eslint
express-generator
express
firebase-tools
gatsby-cli
gulp
json-server
netlify-cli
newman
nodemon
npm-check
postcss-cli
postcss
prettier
standard
stylelint
vercel
webtorrent-cli
yo

View File

@ -1,302 +0,0 @@
[
{
"metadata": {
"id": "ac5787df-9b2d-441c-abf0-977d62bc66f0",
"publisherId": "amazonwebservices.aws-toolkit-vscode",
"publisherDisplayName": "amazonwebservices"
},
"name": "aws-toolkit-vscode",
"publisher": "amazonwebservices",
"version": "1.11.0"
},
{
"metadata": {
"id": "819a23e1-b6c6-41cf-9029-e653b537d996",
"publisherId": "ms-vscode.azure-account",
"publisherDisplayName": "ms-vscode"
},
"name": "azure-account",
"publisher": "ms-vscode",
"version": "0.8.11"
},
{
"metadata": {
"id": "464f4ac7-af65-4aa9-9907-4ba7fa419085",
"publisherId": "bungcip.better-toml",
"publisherDisplayName": "bungcip"
},
"name": "better-toml",
"publisher": "bungcip",
"version": "0.3.2"
},
{
"metadata": {
"id": "e337c67b-55c2-4fef-8949-eb260e7fb7fd",
"publisherId": "Shan.code-settings-sync",
"publisherDisplayName": "Shan"
},
"name": "code-settings-sync",
"publisher": "Shan",
"version": "3.4.3"
},
{
"metadata": {
"id": "690b692e-e8a9-493f-b802-8089d50ac1b2",
"publisherId": "ms-vscode.cpptools",
"publisherDisplayName": "ms-vscode"
},
"name": "cpptools",
"publisher": "ms-vscode",
"version": "0.29.0"
},
{
"metadata": {
"id": "1ec62ca5-d7f9-4ddb-a882-e8d018c0aefd",
"publisherId": "msjsdiag.debugger-for-chrome",
"publisherDisplayName": "msjsdiag"
},
"name": "debugger-for-chrome",
"publisher": "msjsdiag",
"version": "4.12.9"
},
{
"metadata": {
"id": "f60a60a6-95ba-42d4-b41c-3d24c1b89588",
"publisherId": "EditorConfig.EditorConfig",
"publisherDisplayName": "EditorConfig"
},
"name": "EditorConfig",
"publisher": "EditorConfig",
"version": "0.15.1"
},
{
"metadata": {
"id": "7328a705-91fc-49e6-8293-da6f112e482d",
"publisherId": "GitHub.github-vscode-theme",
"publisherDisplayName": "GitHub"
},
"name": "github-vscode-theme",
"publisher": "GitHub",
"version": "1.1.3"
},
{
"metadata": {
"id": "d6f6cfea-4b6f-41f4-b571-6ad2ab7918da",
"publisherId": "golang.go",
"publisherDisplayName": "golang"
},
"name": "go",
"publisher": "golang",
"version": "0.15.2"
},
{
"metadata": {
"id": "0e22bd0e-8a8d-424d-b5bd-29aaf21800eb",
"publisherId": "budparr.language-hugo-vscode",
"publisherDisplayName": "budparr"
},
"name": "language-hugo-vscode",
"publisher": "budparr",
"version": "1.2.0"
},
{
"metadata": {
"id": "5db78037-f674-459f-a236-db622c427c5b",
"publisherId": "PKief.material-icon-theme",
"publisherDisplayName": "PKief"
},
"name": "material-icon-theme",
"publisher": "PKief",
"version": "4.2.0"
},
{
"metadata": {
"id": "96fa4707-6983-4489-b7c5-d5ffdfdcce90",
"publisherId": "esbenp.prettier-vscode",
"publisherDisplayName": "esbenp"
},
"name": "prettier-vscode",
"publisher": "esbenp",
"version": "5.1.3"
},
{
"metadata": {
"id": "f1f59ae4-9318-4f3c-a9b5-81b2eaa5f8a5",
"publisherId": "ms-python.python",
"publisherDisplayName": "ms-python"
},
"name": "python",
"publisher": "ms-python",
"version": "2020.7.96456"
},
{
"metadata": {
"id": "93ce222b-5f6f-49b7-9ab1-a0463c6238df",
"publisherId": "ms-vscode-remote.remote-containers",
"publisherDisplayName": "ms-vscode-remote"
},
"name": "remote-containers",
"publisher": "ms-vscode-remote",
"version": "0.128.0"
},
{
"metadata": {
"id": "607fd052-be03-4363-b657-2bd62b83d28a",
"publisherId": "ms-vscode-remote.remote-ssh",
"publisherDisplayName": "ms-vscode-remote"
},
"name": "remote-ssh",
"publisher": "ms-vscode-remote",
"version": "0.51.0"
},
{
"metadata": {
"id": "bfeaf631-bcff-4908-93ed-fda4ef9a0c5c",
"publisherId": "ms-vscode-remote.remote-ssh-edit",
"publisherDisplayName": "ms-vscode-remote"
},
"name": "remote-ssh-edit",
"publisher": "ms-vscode-remote",
"version": "0.51.0"
},
{
"metadata": {
"id": "f0c5397b-d357-4197-99f0-cb4202f22818",
"publisherId": "ms-vscode-remote.remote-wsl",
"publisherDisplayName": "ms-vscode-remote"
},
"name": "remote-wsl",
"publisher": "ms-vscode-remote",
"version": "0.44.4"
},
{
"metadata": {
"id": "735af542-944f-4b07-b336-9df27d7b8d84",
"publisherId": "smlombardi.slime",
"publisherDisplayName": "smlombardi"
},
"name": "slime",
"publisher": "smlombardi",
"version": "3.2.1"
},
{
"metadata": {
"id": "56d1e1f8-892a-4abc-b402-c473b832e324",
"publisherId": "GitHub.vscode-codeql",
"publisherDisplayName": "GitHub"
},
"name": "vscode-codeql",
"publisher": "GitHub",
"version": "1.3.1"
},
{
"metadata": {
"id": "0479fc1c-3d67-49f9-b087-fb9069afe48f",
"publisherId": "ms-azuretools.vscode-docker",
"publisherDisplayName": "ms-azuretools"
},
"name": "vscode-docker",
"publisher": "ms-azuretools",
"version": "1.4.1"
},
{
"metadata": {
"id": "03944bdc-9bcb-4ac2-b9b3-fdb050dd43e4",
"publisherId": "mrmlnc.vscode-duplicate",
"publisherDisplayName": "mrmlnc"
},
"name": "vscode-duplicate",
"publisher": "mrmlnc",
"version": "1.2.1"
},
{
"metadata": {
"id": "583b2b34-2c1e-4634-8c0b-0b82e283ea3a",
"publisherId": "dbaeumer.vscode-eslint",
"publisherDisplayName": "dbaeumer"
},
"name": "vscode-eslint",
"publisher": "dbaeumer",
"version": "2.1.8"
},
{
"metadata": {
"id": "c5f4d87f-a524-462c-ac01-923eb19cf3e9",
"publisherId": "firefox-devtools.vscode-firefox-debug",
"publisherDisplayName": "firefox-devtools"
},
"name": "vscode-firefox-debug",
"publisher": "firefox-devtools",
"version": "2.9.0"
},
{
"metadata": {
"id": "9ccc1dd7-7ec4-4a46-bd4f-7d7b8b9d322a",
"publisherId": "vscode-icons-team.vscode-icons",
"publisherDisplayName": "vscode-icons-team"
},
"name": "vscode-icons",
"publisher": "vscode-icons-team",
"version": "10.2.0"
},
{
"metadata": {
"id": "69ddd764-339a-4ecc-97c1-9c4ece58e36d",
"publisherId": "GitHub.vscode-pull-request-github",
"publisherDisplayName": "GitHub"
},
"name": "vscode-pull-request-github",
"publisher": "GitHub",
"version": "0.18.0"
},
{
"metadata": {
"id": "23d72dfc-8dd1-4e30-926e-8783b4378f13",
"publisherId": "ms-vscode-remote.vscode-remote-extensionpack",
"publisherDisplayName": "ms-vscode-remote"
},
"name": "vscode-remote-extensionpack",
"publisher": "ms-vscode-remote",
"version": "0.20.0"
},
{
"metadata": {
"id": "ec35b5a3-9802-4c68-b5ff-e85f19ec0977",
"publisherId": "stylelint.vscode-stylelint",
"publisherDisplayName": "stylelint"
},
"name": "vscode-stylelint",
"publisher": "stylelint",
"version": "0.84.0"
},
{
"metadata": {
"id": "ff96f1b4-a4b8-45ef-8ecf-c232c0cb75c8",
"publisherId": "hbenl.vscode-test-explorer",
"publisherDisplayName": "hbenl"
},
"name": "vscode-test-explorer",
"publisher": "hbenl",
"version": "2.19.1"
},
{
"metadata": {
"id": "5a6dc0d5-dc02-4121-8e24-cad33a2ff0af",
"publisherId": "ms-vsliveshare.vsliveshare",
"publisherDisplayName": "ms-vsliveshare"
},
"name": "vsliveshare",
"publisher": "ms-vsliveshare",
"version": "1.0.2478"
},
{
"metadata": {
"id": "03bcac69-2a42-4fd3-ac6e-928090766003",
"publisherId": "ms-vscode.wordcount",
"publisherDisplayName": "ms-vscode"
},
"name": "wordcount",
"publisher": "ms-vscode",
"version": "0.1.0"
}
]

34
vscode/install_extensions.sh Executable file
View File

@ -0,0 +1,34 @@
#!/usr/bin/env bash
set -euo pipefail
extensions=(
amazonwebservices.aws-toolkit-vscode
bungcip.better-toml
DavidAnson.vscode-markdownlint
dbaeumer.vscode-eslint
EditorConfig.EditorConfig
eg2.vscode-npm-script
esbenp.prettier-vscode
firefox-devtools.vscode-firefox-debug
GitHub.github-vscode-theme
GitHub.vscode-pull-request-github
golang.go
mrmlnc.vscode-duplicate
ms-azuretools.vscode-docker
ms-vscode-remote.remote-containers
ms-vscode-remote.remote-ssh
ms-vscode-remote.remote-ssh-edit
ms-vscode-remote.vscode-remote-extensionpack
ms-vscode.azure-account
ms-vscode.wordcount
ms-vsliveshare.vsliveshare
ms-vsonline.vsonline
msjsdiag.debugger-for-chrome
PKief.material-icon-theme
stylelint.vscode-stylelint
)
for e in "${extensions[@]}"; do
code --install-extension "$e"
done

View File

@ -60,6 +60,11 @@ export LSCOLORS=ExFxBxDxCxegedabagacad
export HOMEBREW_NO_ANALYTICS=1
export HOMEBREW_NO_INSECURE_REDIRECT=1
# export HOMEBREW_CASK_OPTS=--require-sha
export NEXT_TELEMETRY_DISABLED=1
export GATSBY_TELEMETRY_DISABLED=1
export DOTNET_CLI_TELEMETRY_OPTOUT=1
export SAM_CLI_TELEMETRY=0
export AZURE_CORE_COLLECT_TELEMETRY=0
# iTerm2
test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"

View File

@ -108,3 +108,5 @@ alias ytdl="youtube-dl -f bestvideo+bestaudio"
alias ytmp3="youtube-dl -f bestaudio -x --audio-format mp3 --audio-quality 320K"
alias weather="curl -4 https://wttr.in/Boston"
alias shellcheckd="docker run --rm -v \"$PWD:/mnt\" koalaman/shellcheck:latest"

View File

@ -65,8 +65,8 @@ update() {
echo -e "${YELLOW}Updating Oh-My-ZSH...${NC}"
omz update
echo -e "${YELLOW}Updating MAS apps...${NC}"
mas upgrade
# echo -e "${YELLOW}Updating MAS apps...${NC}"
# mas upgrade
echo -e "${YELLOW}Check for macOS system updates...${NC}"
softwareupdate --list