diff --git a/.zshrc b/.zshrc index 1090352..4060b55 100644 --- a/.zshrc +++ b/.zshrc @@ -91,18 +91,18 @@ antigen use oh-my-zsh antigen bundle git antigen bundle heroku antigen bundle pip -#antigen bundle lein +antigen bundle lein antigen bundle command-not-found # Syntax highlighting bundle. antigen bundle zsh-users/zsh-syntax-highlighting antigen bundle zsh-users/zsh-autosuggestions antigen bundle Tarrasch/zsh-autoenv -#antigen bundle supercrabtree/k -#antigen bundle zsh-users/zsh-history-substring-search +antigen bundle supercrabtree/k +antigen bundle zsh-users/zsh-history-substring-search #antigen bundle tylerreckart/hyperzsh #antigen bundle extract -#antigen bundle z +antigen bundle z #antigen bundle mafredri/zsh-async #antigen bundle sindresorhus/pure diff --git a/install.sh b/install.sh index 7f16a5c..1942730 100755 --- a/install.sh +++ b/install.sh @@ -2,14 +2,18 @@ VIMDIR=${1:-$HOME} # install ctags to solve "Exuberant ctags not found in PATH" error -sudo apt-get install -y zsh zsh-antigen +sudo apt-get install -y git zsh zsh-antigen vim vim-gtk tmux chsh -s $(which zsh) sudo apt-get install -y exuberant-ctags -sudo apt-get install -y vim vim-gtk tmux -sudo apt-get install htop tree zip wget - -sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" +sudo apt-get install -y sudo apt-get install htop tree zip unzip wget nethogs +VIM_SERVER="https://raw.githubusercontent.com/wklken/vim-for-server/master/vimrc" +# sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" +read -n 1 is_server +if [ "$is_server" == "Y" ] || [ "$is_server" == "y" ]; then + curl $VIM_SERVER > $HOME/.vimrc + exit +fi echo "start install, all of your old .vimrc and .vim will be overwritten." echo "all your old vim settings will be mv to .vimrc.old & .vim.old" @@ -36,8 +40,8 @@ if [ "$use_vim_configs" == "Y" ] || [ "$use_vim_configs" == "y" ]; then # link zshrc ln -rsf $PWD/.zshrc $VIMDIR/.zshrc 2> /dev/null + curl -L git.io/antigen > $VIMDIR/antigen.zsh fi -sudo apt-get install -y git git submodule init && git submodule update