diff --git a/Brewfile b/Brewfile index ba65753..849721b 100644 --- a/Brewfile +++ b/Brewfile @@ -1,25 +1,3 @@ -############################### -# Taps # -############################### - -tap "1password/tap" -tap "adoptopenjdk/openjdk" -tap "cloudflare/cloudflare" -tap "dart-lang/dart" -tap "heroku/brew" -tap "homebrew/aliases" -tap "homebrew/autoupdate" -tap "homebrew/bundle" -tap "homebrew/cask" -tap "homebrew/cask-drivers" -tap "homebrew/cask-fonts" -tap "homebrew/cask-versions" -tap "homebrew/core" -tap "homebrew/services" -tap "homebrew/test-bot" -tap "planetscale/tap" -tap "sass/sass" -tap "wpscanteam/tap" ############################### # Binaries # @@ -140,7 +118,7 @@ brew "python@3.9" brew "python" brew "pyenv" brew "qemu" -brew "ruby" +# brew "ruby" brew "ruby-build" brew "rust" brew "rbenv" @@ -167,7 +145,7 @@ brew "yq" brew "zopfli" # Android SDK -cask "android-platform-tools" +# cask "android-platform-tools" # brew "ant" # brew "maven" # brew "gradle" @@ -205,7 +183,7 @@ brew "bettercap" brew "hashcat" brew "nikto" brew "tcpdump" -# brew "wpscanteam/tap/wpscan" # not yet compatible with M1 +brew "wpscanteam/tap/wpscan" brew "dnsx" brew "httpx" brew "naabu" @@ -219,7 +197,6 @@ brew "subfinder" cask_args appdir: "/Applications" # System Utilities -cask "osxfuse" cask "appcleaner" cask "backblaze" cask "backblaze-downloader" @@ -227,15 +204,12 @@ cask "carbon-copy-cloner" cask "coconutbattery" cask "daisydisk" cask "dropbox" -cask "duet" cask "etrecheckpro" cask "geekbench" cask "istat-menus" cask "macupdater" -cask "paragon-ntfs" cask "the-unarchiver" cask "transmission" -cask "unetbootin" cask "vnc-viewer" # Passwords, VPNs, other Security @@ -253,24 +227,17 @@ cask "adoptopenjdk/openjdk/adoptopenjdk" cask "chromedriver" cask "eclipse-java" cask "github" -cask "glyphs" cask "google-cloud-sdk" cask "imageoptim" cask "iterm2" cask "jetbrains-toolbox" -cask "mamp" cask "microsoft-office" -cask "ngrok" -cask "postman" cask "powershell" -cask "robo-3t" cask "sequel-pro" cask "sketch" cask "tower" cask "transmit" cask "visual-studio-code" -cask "visual-studio" -cask "xquartz" # Virtual Machines (& Docker) cask "docker" @@ -287,7 +254,6 @@ cask "iina" cask "plex-media-player" cask "pocket-casts" cask "spotify" -cask "vlc" # Communication/Social cask "discord" @@ -297,7 +263,6 @@ cask "whatsapp" cask "zoomus" # Gaming -cask "shadow" cask "steam" cask "minecraft" cask "nvidia-geforce-now" @@ -363,7 +328,6 @@ mas "GarageBand", id: 682658836 mas "iMovie", id: 408981434 mas "Keynote", id: 409183694 mas "Logic Pro", id: 634148309 -mas "MainStage 3", id: 634159523 mas "Motion", id: 434290957 mas "Numbers", id: 409203825 mas "Pages", id: 409201541 @@ -373,11 +337,8 @@ mas "Xcode", id: 497799835 # Third Party mas "Amphetamine", id: 937984704 -mas "Deliveries", id: 290986013 mas "Disk Speed Test", id: 425264550 mas "Microsoft Remote Desktop", id: 1295203466 -mas "Microsoft To Do", id: 1274495053 -mas "Outline", id: 1356178125 mas "Shazam", id: 897118787 mas "Silicon Info", id: 1542271266 mas "Twitter", id: 409789998 diff --git a/npm/install_globals.sh b/npm/install_globals.sh index 64aa3c4..b068cdf 100755 --- a/npm/install_globals.sh +++ b/npm/install_globals.sh @@ -25,21 +25,16 @@ packages=( @lhci/cli @vercel/ncc autoprefixer - browserify cross-env - cross-env-shell + depcheck dtslint dts-gen esbuild - eslint - express - express-generator - firebase-tools gzip-size-cli json-server netlify-cli - new-component nodemon + np npm-check-updates npm-name-cli pm2 diff --git a/ssh/.ssh/config b/ssh/.ssh/config index 2cb381a..29d8eaa 100644 --- a/ssh/.ssh/config +++ b/ssh/.ssh/config @@ -50,7 +50,7 @@ Host code Host tor # tailscale IP: - HostName 100.68.159.54 + HostName 100.118.144.19 User root #IdentityFile ~/.ssh/id_ed25519 #IdentitiesOnly yes diff --git a/zsh/.zshrc b/zsh/.zshrc index 8e39b97..00fe954 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -68,6 +68,7 @@ export GATSBY_TELEMETRY_DISABLED=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1 export SAM_CLI_TELEMETRY=0 export AZURE_CORE_COLLECT_TELEMETRY=0 +export CHECKPOINT_DISABLE=1 # prisma # TEMPORARY: fixes some breakage with node 17 #export NODE_OPTIONS=--openssl-legacy-provider diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index 57b3ce4..222ebc8 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -110,6 +110,6 @@ alias pubkey_rsa="more ~/.ssh/id_rsa.pub | pbcopy | echo '=> Public key copied t 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 weather="curl 'https://wttr.in/mht?format=v2'" alias shellcheckd="docker run --rm -v \"$PWD:/mnt\" koalaman/shellcheck:latest" diff --git a/zsh/macos.zsh b/zsh/macos.zsh index 0b96880..48c3d12 100644 --- a/zsh/macos.zsh +++ b/zsh/macos.zsh @@ -15,8 +15,8 @@ alias awk="gawk" command -v md5sum > /dev/null || alias md5sum="md5" # system python -> homebrew python3 -alias python="python3" -alias pip="pip3" +# alias python="python3" +# alias pip="pip3" # My own creation! See: https://github.com/jakejarvis/simpip alias ipv4="curl -4 simpip.com --max-time 1 --proto-default https --silent" @@ -59,7 +59,7 @@ update() { # https://stackoverflow.com/a/3452888 echo -e "${YELLOW}Updating pip packages...${NC}" - pip3 list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 pip3 install -U + pip3 list --outdated --format=json | jq -r '.[] | .name+"="+.latest_version' | cut -d = -f 1 | xargs -n1 pip3 install -U echo -e "${YELLOW}Updating MAS apps...${NC}" mas outdated diff --git a/zsh/path.zsh b/zsh/path.zsh index 009ad03..220d4f3 100644 --- a/zsh/path.zsh +++ b/zsh/path.zsh @@ -20,11 +20,11 @@ export PATH="$GOPATH/bin:$PATH" #export PATH="$GOROOT/bin:$PATH" # Ruby -export PATH="$HOME/.gem/ruby/3.0.0/bin:$PATH" -export RUBY_HOME="$HOMEBREW_PREFIX/opt/ruby/bin" -export GEM_PATH="$HOMEBREW_PREFIX/lib/ruby/gems/3.0.0/bin" -export PATH="$RUBY_HOME:$PATH" -export PATH="$GEM_PATH:$PATH" +# export PATH="$HOME/.gem/ruby/3.1.0/bin:$PATH" +# export RUBY_HOME="$HOMEBREW_PREFIX/opt/ruby/bin" +# export GEM_PATH="$HOMEBREW_PREFIX/lib/ruby/gems/3.1.0/bin" +# export PATH="$RUBY_HOME:$PATH" +# export PATH="$GEM_PATH:$PATH" # rbenv export RUBY_CONFIGURE_OPTS="--with-openssl-dir=$(brew --prefix openssl@1.1) --with-readline-dir=$(brew --prefix readline) --with-libyaml-dir=$(brew --prefix libyaml)" @@ -33,7 +33,7 @@ if command -v rbenv 1>/dev/null 2>&1; then fi # Python -export PATH="$HOME/Library/Python/3.9/bin:$PATH" +# export PATH="$HOME/Library/Python/3.9/bin:$PATH" # openjdk export PATH="$HOMEBREW_PREFIX/opt/openjdk/bin:$PATH"