From 3a53eb7fe043c89e1ab2543c2416fd8231a957a4 Mon Sep 17 00:00:00 2001 From: Jake Jarvis Date: Sat, 27 Mar 2021 10:21:41 -0400 Subject: [PATCH] clean up homebrew prefix stuff --- firefox/user.js | 4 +++- install.sh | 4 ---- macos/macos.sh | 4 ++++ zsh/.zshrc | 2 +- zsh/path.zsh | 20 ++++++++++---------- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/firefox/user.js b/firefox/user.js index ce6d0dc..26fb2d6 100644 --- a/firefox/user.js +++ b/firefox/user.js @@ -300,11 +300,12 @@ user_pref("security.pki.sha1_enforcement_level", 1); user_pref("security.sri.enable", true); user_pref("security.ssl.disable_session_identifiers", true); user_pref("security.ssl.enable_ocsp_stapling", true); -user_pref("security.ssl.enable_ocsp_must_staple", true); +// user_pref("security.ssl.enable_ocsp_must_staple", true); user_pref("security.ssl.errorReporting.enabled", false); user_pref("security.ssl.errorReporting.url", ""); user_pref("security.ssl.treat_unsafe_negotiation_as_broken", true); // user_pref("security.ssl.require_safe_negotiation", true); // still breaks lots of stuff: https://github.com/pyllyukko/user.js/issues/237 +/* user_pref("security.ssl3.dhe_dss_aes_128_sha", false); user_pref("security.ssl3.dhe_dss_aes_256_sha", false); user_pref("security.ssl3.dhe_dss_camellia_128_sha", false); @@ -350,6 +351,7 @@ user_pref("security.tls.enable_0rtt_data", false); user_pref("security.tls.unrestricted_rc4_fallback", false); user_pref("security.tls.version.fallback-limit", 3); user_pref("security.tls.version.min", 3); +*/ user_pref("security.xpconnect.plugin.unrestricted", false); user_pref("security.webauth.u2f", true); user_pref("services.blocklist.update_enabled", true); diff --git a/install.sh b/install.sh index d2063db..17e481d 100755 --- a/install.sh +++ b/install.sh @@ -23,10 +23,6 @@ ln -sf "$YOU_ARE_HERE/ssh/.ssh/config" ~/.ssh/config # Suppress terminal login banners touch ~/.hushlogin -# https://github.com/ohmyzsh/ohmyzsh/issues/6835#issuecomment-390187157 -chmod 755 /opt/homebrew/share/zsh -chmod 755 /opt/homebrew/share/zsh/site-functions - # Get Oh My ZSH up and running if [ ! -e ~/.oh-my-zsh ]; then sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" diff --git a/macos/macos.sh b/macos/macos.sh index 09b4749..a8886d2 100755 --- a/macos/macos.sh +++ b/macos/macos.sh @@ -38,6 +38,10 @@ brew install zsh sudo sh -c "echo $(brew --prefix)/bin/zsh >> /etc/shells" chsh -s "$(brew --prefix)/bin/zsh" +# https://github.com/ohmyzsh/ohmyzsh/issues/6835#issuecomment-390187157 +chmod 755 $(brew --prefix)/share/zsh +chmod 755 $(brew --prefix)/share/zsh/site-functions + # Install all apps from the Brewfile, ignore errors brew tap homebrew/bundle brew bundle || true diff --git a/zsh/.zshrc b/zsh/.zshrc index 924c541..12be285 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -39,7 +39,7 @@ plugins=( # https://gist.github.com/ctechols/ca1035271ad134841284#gistcomment-2308206 autoload -Uz compinit for dump in ~/.zcompdump(N.mh+24); do - echo "reloading compinit" + # echo "reloading compinit" compinit done compinit -C diff --git a/zsh/path.zsh b/zsh/path.zsh index b66c23f..4c88cd4 100644 --- a/zsh/path.zsh +++ b/zsh/path.zsh @@ -16,8 +16,8 @@ export PATH="$GOPATH/bin:$PATH" #export PATH="$GOROOT/bin:$PATH" # Ruby -export RUBY_HOME="/opt/homebrew/opt/ruby/bin" -export GEM_PATH="/opt/homebrew/lib/ruby/gems/3.0.0/bin" +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" @@ -31,13 +31,13 @@ fi export PATH="$HOME/Library/Python/3.9/bin:$PATH" # openjdk -export PATH="/opt/homebrew/opt/openjdk/bin:$PATH" +export PATH="$HOMEBREW_PREFIX/opt/openjdk/bin:$PATH" # Metasploit export PATH="/opt/metasploit-framework/bin:$PATH" # curl -export PATH="/opt/homebrew/opt/curl/bin:$PATH" +export PATH="$HOMEBREW_PREFIX/opt/curl/bin:$PATH" # Rust/Cargo export PATH="$HOME/.cargo/bin:$PATH" @@ -47,11 +47,11 @@ export PATH="$HOME/.yarn/bin:$PATH" export PATH="$HOME/.config/yarn/global/node_modules/.bin:$PATH" # misc. -export PATH="/opt/homebrew/opt/make/libexec/gnubin:$PATH" -export PATH="/opt/homebrew/opt/whois/bin:$PATH" -export PATH="/opt/homebrew/opt/jpeg-turbo/bin:$PATH" -#export LDFLAGS="-L/opt/homebrew/opt/jpeg-turbo/lib" -#export CPPFLAGS="-I/opt/homebrew/opt/jpeg-turbo/include" +export PATH="$HOMEBREW_PREFIX/opt/make/libexec/gnubin:$PATH" +export PATH="$HOMEBREW_PREFIX/opt/whois/bin:$PATH" +export PATH="$HOMEBREW_PREFIX/opt/jpeg-turbo/bin:$PATH" +#export LDFLAGS="-L$HOMEBREW_PREFIX/opt/jpeg-turbo/lib" +#export CPPFLAGS="-I$HOMEBREW_PREFIX/opt/jpeg-turbo/include" # nvm # export NVM_DIR="$HOME/.nvm" @@ -65,4 +65,4 @@ fi # ----- Third-party additions below: ----- # Google Cloud SDK -[ -f /opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc ] && source /opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc +[ -f $HOMEBREW_PREFIX/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc ] && source $HOMEBREW_PREFIX/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc