diff --git a/.zshrc b/.zshrc index ccc711d..f5dc06f 100644 --- a/.zshrc +++ b/.zshrc @@ -92,16 +92,11 @@ fi # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=( - git - pip - tmux - tmuxinator -) #source $ZSH/oh-my-zsh.sh -source $HOME/antigen.zsh +# you need to git clone git@github.com:zsh-users/antigen.git to $HOME +source $HOME/antigen/antigen.zsh # Load the oh-my-zsh's library. antigen use oh-my-zsh @@ -109,6 +104,7 @@ antigen use oh-my-zsh # Bundles from the default repo (robbyrussell's oh-my-zsh). antigen bundle git antigen bundle git-extras +antigen bundle mvn antigen bundle tig antigen bundle heroku antigen bundle pip @@ -116,6 +112,8 @@ antigen bundle lein antigen bundle command-not-found antigen bundle tmux antigen bundle tmuxinator +antigen bundle docker +antigen bundle docker-compose # Syntax highlighting bundle. antigen bundle zsh-users/zsh-syntax-highlighting diff --git a/init_install.sh b/init_install.sh index 5aabde3..d18829a 100644 --- a/init_install.sh +++ b/init_install.sh @@ -32,3 +32,5 @@ sudo apt-get install -y make build-essential libssl-dev zlib1g-dev libbz2-dev \ libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \ xz-utils tk-dev libffi-dev liblzma-dev python-openssl +# zeal +sudo add-apt-repository -y ppa:zeal-developers/ppa diff --git a/init_server.sh b/init_server.sh new file mode 100644 index 0000000..e3d4cea --- /dev/null +++ b/init_server.sh @@ -0,0 +1,13 @@ +#!/bin/bash - + +set -o nounset # Treat unset variables as an error + +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)" +echo "Are you sure to install vim for server" +read -n 1 is_server +if [ "$is_server" == "Y" ] || [ "$is_server" == "y" ]; then + curl $VIM_SERVER > $HOME/.vimrc + exit +fi + diff --git a/install.sh b/install.sh index 4fa0634..65465bc 100755 --- a/install.sh +++ b/install.sh @@ -7,13 +7,6 @@ chsh -s $(which zsh) sudo apt-get install -y exuberant-ctags sudo apt-get install -y 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" @@ -40,7 +33,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 +#curl -L git.io/antigen > $VIMDIR/antigen.zsh + git clone git@github.com:zsh-users/antigen.git $HOME/antigen fi git submodule init && git submodule update