diff --git a/macos/brew.sh b/macos/brew.sh index 7962a97..2df1361 100755 --- a/macos/brew.sh +++ b/macos/brew.sh @@ -11,7 +11,7 @@ # basically just a list of everything I've installed with Homebrew. :) -# Make sure we’re using the latest Homebrew. +# Make sure we're using the latest Homebrew. brew update # Upgrade any already-installed formulae. @@ -20,7 +20,7 @@ brew upgrade # Tap casks. (Just for Android SDK here, otherwise not a fan of using casks!) brew tap caskroom/cask -# Save Homebrew’s installed location. +# Save Homebrew's installed location. BREW_PREFIX=$(brew --prefix) @@ -32,7 +32,7 @@ brew install bash brew install bash-completion # Install GNU core utilities (those that come with macOS are outdated). -# Don’t forget to add `$(brew --prefix coreutils)/libexec/gnubin` to `$PATH`. +# Don't forget to add `$(brew --prefix coreutils)/libexec/gnubin` to `$PATH`. brew install coreutils # ln -s "${BREW_PREFIX}/bin/gsha256sum" "${BREW_PREFIX}/bin/sha256sum" diff --git a/macos/defaults.sh b/macos/defaults.sh index 5ccefc0..5c2f679 100755 --- a/macos/defaults.sh +++ b/macos/defaults.sh @@ -76,7 +76,7 @@ sudo systemsetup -setrestartfreeze on # Keyboard & Input # ############################################################################### -# Disable smart quotes and dashes as they’re annoying when typing code +# Disable smart quotes and dashes as they're annoying when typing code defaults write NSGlobalDomain NSAutomaticQuoteSubstitutionEnabled -bool false defaults write NSGlobalDomain NSAutomaticDashSubstitutionEnabled -bool false @@ -273,7 +273,7 @@ defaults -currentHost write com.apple.ImageCapture disableHotPlug -bool true # Disable automatic emoji substitution (i.e. use plain text smileys) defaults write com.apple.messageshelper.MessageController SOInputLineSettings -dict-add "automaticEmojiSubstitutionEnablediMessage" -bool false -# Disable smart quotes as it’s annoying for messages that contain code +# Disable smart quotes as it's annoying for messages that contain code defaults write com.apple.messageshelper.MessageController SOInputLineSettings -dict-add "automaticQuoteSubstitutionEnabled" -bool false # Disable continuous spell checking diff --git a/setup.sh b/setup.sh index fa40abd..734616a 100755 --- a/setup.sh +++ b/setup.sh @@ -4,10 +4,10 @@ if test ! "$(uname)" = "Darwin"; then exit 0 fi -echo "👋 Deep breaths, everything will be fine!" +echo "👋 Deep breaths, everything will (probably) be fine!" # This whole thing kinda hinges on having Homebrew... -# Check for it and install it if we don't already have it +# Check for it and install from GitHub if it's not there if test ! $(which brew); then /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" fi @@ -21,7 +21,7 @@ brew bundle # Get Oh My ZSH up and running if [ ! -e ~/.oh-my-zsh ]; then - sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" + sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" fi # Make ZSH the default shell environment @@ -32,6 +32,6 @@ ln -s $HOME/.dotfiles/zsh/.zshrc $HOME/.zshrc ln -s $HOME/.dotfiles/git/.gitconfig $HOME/.gitconfig ln -s $HOME/.dotfiles/zsh/git/.gitignore_global $HOME/.gitignore_global -# Set up macOS defaults. -# Needs to be last since this will restart everything when done. +# Set macOS defaults +# Needs to be last since this will restart everything when done source ./macos/defaults.sh diff --git a/zsh/.zshrc b/zsh/.zshrc index b87aa9c..2892d7f 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -17,12 +17,7 @@ SAVEHIST=10000 ZSH_CUSTOM=$DOTFILES ZSH_THEME="agnoster" plugins=( - git -# colored-man-pages colorize - pip - python - brew osx zsh-syntax-highlighting zsh-autosuggestions diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index 8ed810d..e6e5f3e 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -44,7 +44,7 @@ alias ripdock="killall Dock" alias ripmenu="killall SystemUIServer NotificationCenter" alias finder="open ./" -alias vs="code ./" +alias vsc="code ./" alias gundo="git reset --soft HEAD~1" alias gc="git add . && git commit -m " @@ -61,4 +61,4 @@ alias watchos="open /Applications/Xcode.app/Contents/Developer/Applications/Simu alias pubkey="more ~/.ssh/id_rsa.pub | pbcopy | echo '=> Public key copied to clipboard.'" -alias weather="curl -4 http://wttr.in/Boston" +alias weather="curl -4 https://wttr.in/Boston" diff --git a/zsh/path.zsh b/zsh/path.zsh index 02c6f6d..bc1f72f 100644 --- a/zsh/path.zsh +++ b/zsh/path.zsh @@ -1,4 +1,4 @@ -# Default junk +# Default paths export PATH="$HOME/bin:/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:$PATH" # Go @@ -7,11 +7,11 @@ export GOROOT="/usr/local/opt/go/libexec" export PATH="$PATH:$GOPATH/bin" export PATH="$PATH:$GOROOT/bin" -# ruby +# Ruby export PATH="/usr/local/opt/ruby/bin:$PATH" -# metasploit -export PATH=:"/opt/metasploit-framework/bin:$PATH" +# Metasploit +export PATH="/opt/metasploit-framework/bin:$PATH" # curl export PATH="/usr/local/opt/curl/bin:$PATH"