Merge branch 'master' into hc
This commit is contained in:
commit
25900dc6c7
9
.vimrc
9
.vimrc
@ -7,8 +7,9 @@ call vundle#begin()
|
|||||||
" let Vundle manage Vundle, required
|
" let Vundle manage Vundle, required
|
||||||
Plugin 'gmarik/Vundle.vim'
|
Plugin 'gmarik/Vundle.vim'
|
||||||
Plugin 'vim-airline/vim-airline'
|
Plugin 'vim-airline/vim-airline'
|
||||||
|
Plugin 'kien/ctrlp.vim'
|
||||||
|
Plugin 'tpop/vim-fugitive'
|
||||||
Plugin 'scrooloose/nerdtree'
|
Plugin 'scrooloose/nerdtree'
|
||||||
Plugin 'tpope/vim-fugitive'
|
|
||||||
Plugin 'edkolev/tmuxline.vim'
|
Plugin 'edkolev/tmuxline.vim'
|
||||||
Plugin 'vim-airline/vim-airline-themes'
|
Plugin 'vim-airline/vim-airline-themes'
|
||||||
"Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
|
"Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
|
||||||
@ -45,3 +46,9 @@ map <Leader>f :bp<cr>
|
|||||||
map <Leader>d :bp<cr>:bd #<cr>
|
map <Leader>d :bp<cr>:bd #<cr>
|
||||||
"-----nerdtree--------------------
|
"-----nerdtree--------------------
|
||||||
nmap <Leader>e :NERDTreeToggle<CR>
|
nmap <Leader>e :NERDTreeToggle<CR>
|
||||||
|
" Search as you type, highlight results
|
||||||
|
set incsearch
|
||||||
|
set showmatch
|
||||||
|
set hlsearch
|
||||||
|
nnoremap \\ :noh<cr> " Clear higlighting
|
||||||
|
"nnoremap <esc> :noh<return><esc>
|
||||||
|
19
setup.sh
19
setup.sh
@ -38,7 +38,7 @@ then
|
|||||||
read -p "do you want to install golang and go-powerline?" yn
|
read -p "do you want to install golang and go-powerline?" yn
|
||||||
case $yn in
|
case $yn in
|
||||||
[Yy]* )
|
[Yy]* )
|
||||||
sudo apt-get install golang;
|
sudo apt-get install golang -y;
|
||||||
go get -u github.com/justjanne/powerline-go;
|
go get -u github.com/justjanne/powerline-go;
|
||||||
break;;
|
break;;
|
||||||
[Nn]* )
|
[Nn]* )
|
||||||
@ -48,6 +48,23 @@ then
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
#----------------------------------------------------------install go-powerline---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
if [ -z "$GOPATH" ]
|
||||||
|
then
|
||||||
|
while true; do
|
||||||
|
read -p "do you want to install golang and go-powerline?" yn
|
||||||
|
case $yn in
|
||||||
|
[Yy]* )
|
||||||
|
sudo apt-get install golang -y;
|
||||||
|
go get -u github.com/justjanne/powerline-go;
|
||||||
|
break;;
|
||||||
|
[Nn]* )
|
||||||
|
exit;;
|
||||||
|
* ) echo "Please answer yes or no.";;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
fi
|
||||||
#----------------------------------------------------------install power line fonts------------------------------------------------------------------------
|
#----------------------------------------------------------install power line fonts------------------------------------------------------------------------
|
||||||
|
|
||||||
if [ ! -d ~/fonts ]
|
if [ ! -d ~/fonts ]
|
||||||
|
Loading…
Reference in New Issue
Block a user