diff --git a/Brewfile b/Brewfile index 754851c..0511061 100644 --- a/Brewfile +++ b/Brewfile @@ -23,7 +23,6 @@ brew "the_silver_searcher" brew "hub" brew "tmux" brew "tree" -brew "openssl@1.1" brew "wget" brew "rsync" @@ -33,6 +32,7 @@ brew "youtube-dl" brew "ffmpeg" brew "imagemagic" brew "mas" +brew "nmap" brew "p7zip" brew "dos2unix" brew "proxychains-ng" diff --git a/bootstrap.sh b/bootstrap.sh index c17760c..846c7d8 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -13,10 +13,12 @@ echo "Setup hostname" sudo scutil --set HostName mac echo "Install from brew.sh" -bash brew.sh +# bash brew.sh echo "Install with Brew Bundle" set +e +brew cleanup +brew uninstall openssl brew bundle set -e @@ -52,6 +54,9 @@ echo "Setup Tmux" ln -s $PWD/tmux/.tmux.conf $HOME/.tmux.conf ln -s $PWD/tmux/.tmux.conf.local $HOME/.tmux.conf.local +echo "Setup idea vimrc" +ln -s $PWD/idea/.ideavimrc $HOME/.ideavimrc + ls -al $HOME echo "Setup applications" @@ -66,12 +71,8 @@ sudo ln -s /Applications/Visual\ Studio\ Code.app/Contents/Resources/app/bin/cod # echo "Setup Ruby" # ./ruby/ruby -# # echo "Setup Go" # mkdir -p ~/go -# -# echo "Setup Shadowsocks" -# ./Shadowsocks/init echo "Setup macOS defaults" bash init_mac.sh diff --git a/brew.sh b/brew.sh index e5a54a8..bfd9050 100644 --- a/brew.sh +++ b/brew.sh @@ -2,22 +2,13 @@ brew update brew upgrade -# https://en.wikipedia.org/wiki/List_of_GNU_Core_Utilities_commands -brew install coreutils # Install GNU `find`, `locate`, `updatedb`, and `xargs`, `g`-prefixed. brew install findutils # Install GNU `sed`, overwriting the built-in `sed`. brew install gnu-sed --with-default-names -# Install `wget` with IRI support. -brew install wget --with-iri -# Install GnuPG to enable PGP-signing commits. -brew install gnupg - # Install more recent versions of some macOS tools. brew install vim --with-override-system-vi -brew install grep -brew install openssh # GNU multiple precision arithmetic library brew install gmp @@ -28,12 +19,9 @@ brew install gmp # brew install woff2 brew install ack -brew install git brew install git-lfs brew install imagemagick --with-webp brew install p7zip -brew install ssh-copy-id -brew install tree # Remove outdated versions from the cellar. brew cleanup