diff --git a/Brewfile b/Brewfile index b1a088c..9b3b62c 100644 --- a/Brewfile +++ b/Brewfile @@ -5,20 +5,18 @@ tap "adoptopenjdk/openjdk" tap "cloudflare/cloudflare" tap "dart-lang/dart" -tap "dopplerhq/cli" -tap "facebook/fb" tap "heroku/brew" +tap "homebrew/aliases" +tap "homebrew/autoupdate" tap "homebrew/bundle" tap "homebrew/cask" tap "homebrew/cask-drivers" -tap "homebrew/cask-versions" tap "homebrew/cask-fonts" +tap "homebrew/cask-versions" tap "homebrew/core" tap "homebrew/services" tap "homebrew/test-bot" tap "sass/sass" -tap "teamookla/speedtest" -# tap "wpengine/wpe-cli" tap "wpscanteam/tap" ############################### @@ -60,18 +58,14 @@ brew "gmp" # Other useful binaries brew "ack" -brew "gs" brew "imagemagick" #, args: ["with-webp"] brew "ffmpeg" #, args: ["with-libvpx"] brew "gawk" brew "less" brew "lua" -brew "lynx" brew "mtr" brew "nano" brew "p7zip" -brew "pigz" -brew "pv" brew "rename" brew "rlwrap" brew "ssh-copy-id", link: true @@ -94,8 +88,6 @@ brew "asciinema" brew "autoconf" brew "automake" brew "azure-cli" -brew "bat" -brew "caddy" brew "carthage" brew "certbot" brew "cloudflare/cloudflare/cloudflared" @@ -105,7 +97,6 @@ brew "dart-lang/dart/dart" brew "deno" brew "docker-credential-helper-ecr" brew "doctl" -brew "dopplerhq/cli/doppler" brew "elixir" brew "erlang" brew "fx" @@ -121,8 +112,6 @@ brew "hugo", args: ["HEAD"] brew "hydra" brew "iproute2mac" brew "jq" -brew "kubernetes-cli" -brew "kubernetes-helm" brew "libsass", args: ["HEAD"] brew "mas" brew "mcrypt" @@ -132,7 +121,6 @@ brew "mosh" brew "mariadb" brew "mysql-client" brew "ncurses" -brew "neofetch" brew "netcat" brew "openvpn" brew "optipng" @@ -160,27 +148,25 @@ brew "serverless" brew "shellcheck" brew "sqlite" brew "sub2srt" -brew "teamookla/speedtest/speedtest" +brew "svn" brew "tor" brew "torsocks" brew "whois", link: true brew "wireguard-tools" brew "wireguard-go" brew "wp-cli" -# brew "wpengine/wpe-cli/wpe-cli" brew "xz" brew "youtube-dl" brew "yq" brew "zopfli" # Android SDK -brew "ant" -brew "maven" -brew "gradle" +cask "android-platform-tools" +# brew "ant" +# brew "maven" +# brew "gradle" # cask "android-sdk" # cask "android-ndk" -cask "android-platform-tools" -# cask "android-studio" # Pentesting tools brew "aircrack-ng" @@ -329,6 +315,7 @@ cask "wireshark" cask "homebrew/cask-drivers/hp-easy-start" cask "homebrew/cask-drivers/logitech-camera-settings" +cask "homebrew/cask-drivers/razer-synapse" cask "homebrew/cask-drivers/sonos" ############################### @@ -336,25 +323,19 @@ cask "homebrew/cask-drivers/sonos" ############################### # 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-source-code-pro" 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" +cask "homebrew/cask-fonts/font-sf-mono" # iTerm/VS Code font, comes in .pkg -# Serif +# Sans/Serif +cask "homebrew/cask-fonts/font-comic-neue" 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 # diff --git a/iterm/JJ-ZSH.json b/iterm/JJ-ZSH.json index a41e6db..c3c7af0 100644 --- a/iterm/JJ-ZSH.json +++ b/iterm/JJ-ZSH.json @@ -1,5 +1,9 @@ { - "ASCII Ligatures" : true, + "Ansi 5 Color" : { + "Green Component" : 0.26314744353294373, + "Red Component" : 0.42564234137535095, + "Blue Component" : 0.65052211284637451 + }, "Working Directory" : "\/Users\/jake", "Prompt Before Closing 2" : false, "Selected Text Color" : { @@ -46,7 +50,7 @@ "telnet" ], "Scrollback Lines" : 0, - "Draw Powerline Glyphs" : false, + "Draw Powerline Glyphs" : true, "Status Bar Layout" : { "components" : [ { @@ -56,6 +60,7 @@ "base: priority" : 5, "maxwidth" : 1.7976931348623157e+308, "minwidth" : "0", + "base: compression resistance" : 1, "shared text color" : { "Red Component" : 0.59999999999999998, "Color Space" : "sRGB", @@ -63,7 +68,6 @@ "Alpha Component" : 1, "Green Component" : 0.59999999999999998 }, - "base: compression resistance" : 1, "path" : "hostname", "abbreviate-localhost" : "" }, @@ -82,14 +86,14 @@ "iTermStatusBarSpringComponentSizeMultipleKey" : 1, "base: priority" : 5, "iTermStatusBarSpringComponentSpringConstantKey" : 0.01, + "base: compression resistance" : 1, "shared text color" : { "Red Component" : 0.87515999999999994, "Color Space" : "sRGB", "Blue Component" : 0.63, "Alpha Component" : 1, "Green Component" : 0.90000000000000002 - }, - "base: compression resistance" : 1 + } }, "layout advanced configuration dictionary value" : { "remove empty components" : false, @@ -443,8 +447,8 @@ "Blue Component" : 0.058871746063232422 }, "Name" : "JJ-ZSH", - "Guid" : "EDCECF3F-4620-4117-8E79-0B8C58327F3E", "Blinking Cursor" : true, + "Guid" : "EDCECF3F-4620-4117-8E79-0B8C58327F3E", "Ansi 8 Color" : { "Green Component" : 0.26696832579185525, "Red Component" : 0.26696832579185525, @@ -473,8 +477,8 @@ }, "Session Close Undo Timeout" : 15, "Blur" : true, - "Normal Font" : "MesloLGMForPowerline-Regular 12", - "Vertical Spacing" : 1.1000000000000001, + "Normal Font" : "Menlo-Regular 12", + "Vertical Spacing" : 1.3, "Ansi 7 Color" : { "Green Component" : 1, "Red Component" : 1, @@ -520,10 +524,6 @@ "Columns" : 120, "Visual Bell" : true, "Custom Directory" : "No", - "Ansi 5 Color" : { - "Green Component" : 0.26314744353294373, - "Red Component" : 0.42564234137535095, - "Blue Component" : 0.65052211284637451 - }, - "Thin Strokes" : 4 + "Thin Strokes" : 4, + "ASCII Ligatures" : true } \ No newline at end of file diff --git a/zsh/macos.zsh b/zsh/macos.zsh index aa1da67..0b96880 100644 --- a/zsh/macos.zsh +++ b/zsh/macos.zsh @@ -32,21 +32,20 @@ alias dns-set-cloudflare="dns-set 1.1.1.1 1.0.0.1" alias dns-set-google="dns-set 8.8.8.8 8.8.4.4" alias flush="sudo killall -HUP mDNSResponder; sudo killall mDNSResponderHelper; sudo dscacheutil -flushcache" -# Update: brew, npm, gem, app store, macos +# Update: brew, npm, gems, pip, app store, macos update() { NC="\033[0m" YELLOW="\033[0;33m" echo -e "${YELLOW}Updating Homebrew formulae and casks...${NC}" brew update - # git -C "/usr/local/Homebrew/Library/Taps/homebrew/homebrew-cask" fetch --unshallow brew upgrade - brew upgrade --cask --greedy + # avoid annoying `(latest) != latest` cask updates: + brew upgrade $(brew outdated --greedy --verbose | awk '$2 !~ /(latest)/ {print $1}') brew cleanup echo -e "${YELLOW}Updating NPM/Yarn packages...${NC}" volta install node@latest - volta install npm@6 volta install npm@8 volta install yarn@1 volta run --node latest --npm 8 --no-yarn -- npm update --global