binhapp · binhapp · Apr 23, 2019 · Apr 23, 2019 · Apr 23, 2019 · Apr 23, 2019
diff --git a/.config/brew_cask_list.txt b/.config/brew_cask_list.txt
@@ -0,0 +1,11 @@
+alfred
+android-studio
+calibre
+google-chrome
+iterm2
+skype
+slack
+sourcetree
+spectacle
+spotify
+visual-studio-code
diff --git a/powerline-shell/config.json → .config/powerline-shell/config.json b/powerline-shell/config.json → .config/powerline-shell/config.json
diff --git a/.config/vscode_extensions.txt b/.config/vscode_extensions.txt
@@ -0,0 +1,7 @@
+dbaeumer.vscode-eslint
+eamodio.gitlens
+Orta.vscode-jest
+ryanluker.vscode-coverage-gutters
+shd101wyy.markdown-preview-enhanced
+vscodevim.vim
+vsmobile.vscode-react-native
diff --git a/.functions/backup_brew_cask_list.sh b/.functions/backup_brew_cask_list.sh
@@ -0,0 +1,3 @@
+backup_brew_cask_list() {
+  brew cask list > $DOTFILES_DIR/.config/brew_cask_list.txt
+}
diff --git a/.functions/backup_vscode_extensions.sh b/.functions/backup_vscode_extensions.sh
@@ -0,0 +1,3 @@
+backup_vscode_extensions() {
+  code --list-extensions > $DOTFILES_DIR/.config/vscode_extensions.txt
+}
diff --git a/.functions/brew_install.sh b/.functions/brew_install.sh
@@ -0,0 +1,10 @@
+brew_install() {
+  brew install carthage
+  brew install python
+  brew install rbenv
+  brew install tree
+  brew install watchman
+  brew install zsh-autosuggestions
+  brew install zsh-completions
+  brew install zsh-syntax-highlighting
+}
diff --git a/.functions/clone_z.sh b/.functions/clone_z.sh
@@ -0,0 +1,6 @@
+clone_z() {
+  if [ -d ~/.zrupa ]; then
+    return
+  fi
+  git clone https://github.com/rupa/z ~/.zrupa
+}
diff --git a/.functions/download_fonts.sh b/.functions/download_fonts.sh
@@ -0,0 +1,7 @@
+download_fonts() {
+  FONT_PATH="$HOME/Library/Fonts/Meslo LG M Regular for Powerline.ttf"
+  if [ -f "$FONT_PATH" ]; then
+    return
+  fi  
+  curl https://raw.githubusercontent.com/powerline/fonts/master/Meslo%20Slashed/Meslo%20LG%20M%20Regular%20for%20Powerline.ttf --output "$FONT_PATH"
+}
diff --git a/.functions/gem_install.sh b/.functions/gem_install.sh
@@ -0,0 +1,7 @@
+gem_install() {
+  echo N | rbenv install $(cat ~/.ruby-version)
+  rbenv local $(cat ~/.ruby-version)
+  gem install cocoapods
+  gem install fastlane
+  gem install xcode-install
+}
diff --git a/.functions/install_dotfiles.sh b/.functions/install_dotfiles.sh
@@ -0,0 +1,17 @@
+install_dotfiles() {
+  clone_z
+  download_fonts
+  link_dotfiles
+  install_oh_my_zsh
+  install_homebrew
+  install_rbenv
+  install_nvm
+  source ~/.zshrc
+  brew_install
+  pip3_install && source ~/.zshrc
+  gem_install
+  npm_install
+  sync_brew_cask_list
+  sync_vscode_extensions
+  macos
+}
diff --git a/.functions/install_homebrew.sh b/.functions/install_homebrew.sh
@@ -0,0 +1,6 @@
+install_homebrew() {
+  if type brew >/dev/null 2>&1; then
+    return
+  fi
+  mkdir ~/.homebrew && curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C ~/.homebrew
+}
diff --git a/.functions/install_nvm.sh b/.functions/install_nvm.sh
@@ -0,0 +1,6 @@
+install_nvm() {
+  if type nvm >/dev/null 2>&1; then
+    return
+  fi
+  curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | bash
+}
diff --git a/.functions/install_oh_my_zsh.sh b/.functions/install_oh_my_zsh.sh
@@ -0,0 +1,7 @@
+install_oh_my_zsh() {
+  if [ -d ~/.oh-my-zsh ]; then
+    return
+  fi
+  git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
+  sudo chsh -s /bin/zsh "$USER"
+}
diff --git a/.functions/install_rbenv.sh b/.functions/install_rbenv.sh
@@ -0,0 +1,3 @@
+install_rbenv() {
+  brew install rbenv
+}
diff --git a/.functions/link_dotfiles.sh b/.functions/link_dotfiles.sh
@@ -0,0 +1,14 @@
+link_dotfiles() {
+  link_file .zshrc
+  link_file .vimrc
+  link_file .ruby-version
+  link_file .gemrc
+  link_file .nvmrc
+  link_file .vmdrc
+  link_file .gitignore_global
+  link_file .config/powerline-shell/config.json
+  link_file Library/Application\ Support/Spectacle/Shortcuts.json
+  link_file Library/Application\ Support/Code/User/settings.json
+  link_file Library/Application\ Support/Code/User/keybindings.json
+  link_file Library/Preferences/com.googlecode.iterm2.plist
+}
diff --git a/.functions/link_file.sh b/.functions/link_file.sh
@@ -0,0 +1,7 @@
+link_file() {
+  file="$1"
+  srcfile="$DOTFILES_DIR/$file"
+  desfile="$HOME/$file"
+  mkdir -p "$(dirname "$desfile")"
+  ln -f -s "$srcfile" "$desfile"
+}
diff --git a/.functions/load_android_sdk.sh b/.functions/load_android_sdk.sh
@@ -0,0 +1,12 @@
+load_android_sdk() {
+  export ANDROID_HOME=$HOME/Library/Android/sdk
+  if [ ! -d "$ANDROID_HOME" ]; then
+    unset ANDROID_HOME
+    return
+  fi
+  export PATH=$ANDROID_HOME/tools:$PATH
+  export PATH=$ANDROID_HOME/tools/bin:$PATH
+  export PATH=$ANDROID_HOME/platform-tools:$PATH
+  alias emulator=$ANDROID_HOME/tools/emulator
+}
+load_android_sdk
diff --git a/.functions/load_java.sh b/.functions/load_java.sh
@@ -0,0 +1,4 @@
+load_java() {
+  export JAVA_HOME=`/usr/libexec/java_home --request`
+  export PATH=$JAVA_HOME/bin:$PATH
+}
diff --git a/.functions/load_nvm.sh b/.functions/load_nvm.sh
@@ -0,0 +1,8 @@
+load_nvm() {
+  if [ ! -d ~/.nvm ]; then
+    return
+  fi
+  export NVM_DIR="$HOME/.nvm"
+  [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+  [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+}
diff --git a/.functions/load_powerline_shell.sh b/.functions/load_powerline_shell.sh
@@ -0,0 +1,17 @@
+load_powerline_shell() {
+  if ! type powerline-shell >/dev/null 2>&1; then
+    return
+  fi
+  function powerline_precmd() {
+    PS1="$(powerline-shell --shell zsh $?)"
+  }
+  function install_powerline_precmd() {
+    for s in "${precmd_functions[@]}"; do
+      if [ "$s" = "powerline_precmd" ]; then
+        return
+      fi
+    done
+    precmd_functions+=(powerline_precmd)
+  }
+  install_powerline_precmd
+}
diff --git a/.functions/load_rbenv.sh b/.functions/load_rbenv.sh
@@ -0,0 +1,6 @@
+load_rbenv() {
+  if ! type rbenv >/dev/null 2>&1; then
+    return
+  fi
+  eval "$(rbenv init -)"
+}
diff --git a/.functions/load_z.sh b/.functions/load_z.sh
@@ -0,0 +1,3 @@
+load_z() {
+  [ -d ~/.zrupa ] && . ~/.zrupa/z.sh
+}
diff --git a/.functions/load_zsh_plugins.sh b/.functions/load_zsh_plugins.sh
@@ -0,0 +1,10 @@
+function load_zsh_plugins() {
+  if ! type brew >/dev/null 2>&1; then
+    return
+  fi
+  brew_dir=$(brew --prefix)
+  source $brew_dir/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+  source $brew_dir/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+  fpath=($brew_dir/share/zsh-completions $fpath)
+}
+load_zsh_plugins
diff --git a/.functions/macos.sh b/.functions/macos.sh
@@ -0,0 +1,3 @@
+macos() {
+  defaults write com.microsoft.VSCode ApplePressAndHoldEnabled -bool false
+}
diff --git a/.functions/npm_install.sh b/.functions/npm_install.sh
@@ -0,0 +1,6 @@
+npm_install() {
+  nvm install $(cat ~/.nvmrc)
+  nvm alias default $(cat ~/.nvmrc)
+  npm install -g yarn
+  npm install -g vmd
+}
diff --git a/.functions/pip3_install.sh b/.functions/pip3_install.sh
@@ -0,0 +1,3 @@
+pip3_install() {
+  pip3 install powerline-shell
+}
diff --git a/.functions/sync_brew_cask_list.sh b/.functions/sync_brew_cask_list.sh
@@ -0,0 +1,6 @@
+sync_brew_cask_list() {
+  casks=(`cat $DOTFILES_DIR/.config/brew_cask_list.txt`)
+  for cask in "${casks[@]}"; do
+    brew cask install $cask || brew cask install $cask --force
+  done
+}
diff --git a/.functions/sync_vscode_extensions.sh b/.functions/sync_vscode_extensions.sh
@@ -0,0 +1,3 @@
+sync_vscode_extensions() {
+  cat $DOTFILES_DIR/.config/vscode_extensions.txt | xargs -L1 code --install-extension
+}
diff --git a/.functions/uninstal_rbenv.sh b/.functions/uninstal_rbenv.sh
@@ -0,0 +1,4 @@
+uninstall_rbenv() {
+  rm -rf `rbenv root`
+  brew uninstall rbenv
+}
diff --git a/.functions/uninstall_homebrew.sh b/.functions/uninstall_homebrew.sh
@@ -0,0 +1,4 @@
+uninstall_homebrew() {
+  echo y | ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall)"
+  for d in /usr/local/*; do sudo rm -rf $d; done
+}
diff --git a/.functions/uninstall_nvm.sh b/.functions/uninstall_nvm.sh
@@ -0,0 +1,3 @@
+uninstall_nvm() {
+  rm -rf ~/.nvm
+}
diff --git a/.functions/uninstall_rvm.sh b/.functions/uninstall_rvm.sh
@@ -0,0 +1,4 @@
+uninstall_rvm() {
+  echo yes | rvm implode
+  rm -rf ~/.rvm
+}
diff --git a/.functions/upgrade_dotfiles.sh b/.functions/upgrade_dotfiles.sh
@@ -0,0 +1,7 @@
+upgrade_dotfiles() {
+  DOTFILES_DIR=~/.dotfiles
+  if [ -d "$DOTFILES_DIR" ]; then
+    (cd "$DOTFILES_DIR"; git add . && git stash && git pull)
+  fi
+  install_dotfiles
+}
diff --git a/.gemrc b/.gemrc
@@ -1 +1 @@
-echo "gem: --no-document"
+gem: --no-document
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v8.11.3
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+2.4.3
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,10 @@
-os: osx
+sudo: true
 language: objective-c
+os:
+  - osx
 install:
-  - curl https://raw.githubusercontent.com/blcsntb/mac-setup/master/mac-setup | bash -s all
+  - curl https://raw.githubusercontent.com/blcsntb/mac-setup/dotfiles/dotfiles.sh | bash
+  - source ~/.dotfiles/dotfiles.sh
+  - install_dotfiles
 script:
-  - ~/mac-setup/mac-setup all
+  - upgrade_dotfiles
diff --git a/.zshrc b/.zshrc
@@ -1,54 +1,20 @@
-ZSH_THEME="robbyrussell"
-
-export ZSH=~/.oh-my-zsh
-
-export LC_ALL=en_US.UTF-8
-export LANG=en_US.UTF-8
-
-export PATH=$HOME/.homebrew/bin:$PATH
-
-export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
-export PATH=$JAVA_HOME/bin:$PATH
-
-export ANDROID_HOME=$HOME/Library/Android/sdk
-export PATH=$ANDROID_HOME/tools:$PATH
-export PATH=$ANDROID_HOME/tools/bin:$PATH
-export PATH=$ANDROID_HOME/platform-tools:$PATH
-
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-
-export MAC_SETUP_DIR="$HOME/mac-setup"
-
-alias mac='~/mac-setup/mac-setup'
-alias mac-update='mac all && source ~/.zshrc'
-alias emulator=$ANDROID_HOME/tools/emulator
 alias showFiles='defaults write com.apple.finder AppleShowAllFiles YES && killall Finder'
 alias hideFiles='defaults write com.apple.finder AppleShowAllFiles NO && killall Finder'
 alias xcode='open -a Xcode'
-alias stree='open -a SourceTree'
-alias restree='killall Sourcetree && stree'
-alias gff='git flow feature'
+alias sourcetree='open -a SourceTree'
 
-function powerline_precmd() {
-  PS1="$(powerline-shell --shell zsh $?)"
-}
-function install_powerline_precmd() {
-  for s in "${precmd_functions[@]}"; do
-    if [ "$s" = "powerline_precmd" ]; then
-      return
-    fi
-  done
-  precmd_functions+=(powerline_precmd)
-}
-install_powerline_precmd
+ZSH_THEME="robbyrussell"
+export ZSH=~/.oh-my-zsh
+export REACT_EDITOR=code
+export PATH=$HOME/.homebrew/bin:$PATH
+export PATH=/Applications/Visual\ Studio\ Code.app/Contents/Resources/app/bin:$PATH
 
 source $ZSH/oh-my-zsh.sh
-source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
-source $MAC_SETUP_DIR/vscode/.vscode
-
-# Note the source command must be at the end of ~/.zshrc.
-source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-
-eval "$(rbenv init -)"
+source ~/.dotfiles/dotfiles.sh
+load_zsh_plugins
+load_powerline_shell
+load_z
+load_rbenv
+load_nvm
+load_java
+load_android_sdk