From 4eed2e8ad99f64adeb863bd9fbb3277bb7fe6a8a Mon Sep 17 00:00:00 2001 From: Tom van der Lee Date: Mon, 30 Nov 2015 18:00:35 +0100 Subject: Moved vimrc to be better compatible with neovim --- vim/.vim/init.vim | 2 +- vim/.vim/vimrc | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ vim/.vimrc | 108 ------------------------------------------------------ 3 files changed, 109 insertions(+), 109 deletions(-) create mode 100644 vim/.vim/vimrc delete mode 100644 vim/.vimrc (limited to 'vim') diff --git a/vim/.vim/init.vim b/vim/.vim/init.vim index eb21de1..c9a3c9c 120000 --- a/vim/.vim/init.vim +++ b/vim/.vim/init.vim @@ -1 +1 @@ -/home/tom/.vimrc \ No newline at end of file +vimrc \ No newline at end of file diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc new file mode 100644 index 0000000..52f1be7 --- /dev/null +++ b/vim/.vim/vimrc @@ -0,0 +1,108 @@ +silent! execute pathogen#infect() + +""" DEFAULT VIM SETTINGS + +" Reload vimrc on save +augroup reload_vimrc " { + autocmd! + autocmd BufWritePost $MYVIMRC source $MYVIMRC +augroup END " } + +let mapleader=" " + +syntax on +filetype plugin indent on + +" Set colorscheme when the terminal has 256 color support +try + if (&t_Co == 256) && match($TERM, "256color") >= 0 + colorscheme Benokai + else + throw "nocolor" + endif +catch + colorscheme desert +endtry + +" Some vim settings +set number +set relativenumber +set list +set modeline +set background=dark +set foldmethod=indent +set listchars=trail:·,tab:▸\ ,eol:¬ +set scrolloff=1 +set backspace=indent,eol,start +set cursorline + +" Search-related things +set hlsearch "highlight search result +set incsearch " incremental search +set ignorecase +set smartcase " capital letters = case sensitive + +" Disable ex mode +nnoremap Q + +" Save as sudo +cnoremap w!! w !sudo tee > /dev/null % + +" Remove training spaces on save +autocmd BufWritePre * :%s/\s\+$//e + +" Switch windows with [direction] +nnoremap j +nnoremap k +nnoremap h +nnoremap l + +" Never use the arrow keys +inoremap +inoremap +inoremap +inoremap +noremap +noremap +noremap +noremap + +" Append modeline when pressing ml +function! AppendModeline() + let l:modeline = printf(" vim: set ts=%d sw=%d tw=%d %set :", + \ &tabstop, &shiftwidth, &textwidth, &expandtab ? '' : 'no') + let l:modeline = substitute(&commentstring, "%s", l:modeline, "") + call append(line("$"), l:modeline) +endfunction +nnoremap ml :call AppendModeline() + +" NeoVIM specifics +if has('nvim') + nmap h + tnoremap +endif + +""" PLUGIN SPECIFIC SETTINGS + +if exists("g:loaded_pathogen") + + " NERDTree: + " Open NERDTree when no file is specified + autocmd StdinReadPre * let s:std_in=1 + autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif + autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif + + " Airline: + " On arch linux install the following: + " otf-powerline-symbols-git + " powerline-fonts-git + let g:airline_powerline_fonts = 1 + if !exists('g:airline_symbols') + let g:airline_symbols = {} + endif + let g:airline_symbols.space = "\ua0" + set laststatus=2 + +endif + +" vim: set ts=8 sw=4 tw=0 et : diff --git a/vim/.vimrc b/vim/.vimrc deleted file mode 100644 index 52f1be7..0000000 --- a/vim/.vimrc +++ /dev/null @@ -1,108 +0,0 @@ -silent! execute pathogen#infect() - -""" DEFAULT VIM SETTINGS - -" Reload vimrc on save -augroup reload_vimrc " { - autocmd! - autocmd BufWritePost $MYVIMRC source $MYVIMRC -augroup END " } - -let mapleader=" " - -syntax on -filetype plugin indent on - -" Set colorscheme when the terminal has 256 color support -try - if (&t_Co == 256) && match($TERM, "256color") >= 0 - colorscheme Benokai - else - throw "nocolor" - endif -catch - colorscheme desert -endtry - -" Some vim settings -set number -set relativenumber -set list -set modeline -set background=dark -set foldmethod=indent -set listchars=trail:·,tab:▸\ ,eol:¬ -set scrolloff=1 -set backspace=indent,eol,start -set cursorline - -" Search-related things -set hlsearch "highlight search result -set incsearch " incremental search -set ignorecase -set smartcase " capital letters = case sensitive - -" Disable ex mode -nnoremap Q - -" Save as sudo -cnoremap w!! w !sudo tee > /dev/null % - -" Remove training spaces on save -autocmd BufWritePre * :%s/\s\+$//e - -" Switch windows with [direction] -nnoremap j -nnoremap k -nnoremap h -nnoremap l - -" Never use the arrow keys -inoremap -inoremap -inoremap -inoremap -noremap -noremap -noremap -noremap - -" Append modeline when pressing ml -function! AppendModeline() - let l:modeline = printf(" vim: set ts=%d sw=%d tw=%d %set :", - \ &tabstop, &shiftwidth, &textwidth, &expandtab ? '' : 'no') - let l:modeline = substitute(&commentstring, "%s", l:modeline, "") - call append(line("$"), l:modeline) -endfunction -nnoremap ml :call AppendModeline() - -" NeoVIM specifics -if has('nvim') - nmap h - tnoremap -endif - -""" PLUGIN SPECIFIC SETTINGS - -if exists("g:loaded_pathogen") - - " NERDTree: - " Open NERDTree when no file is specified - autocmd StdinReadPre * let s:std_in=1 - autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif - autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif - - " Airline: - " On arch linux install the following: - " otf-powerline-symbols-git - " powerline-fonts-git - let g:airline_powerline_fonts = 1 - if !exists('g:airline_symbols') - let g:airline_symbols = {} - endif - let g:airline_symbols.space = "\ua0" - set laststatus=2 - -endif - -" vim: set ts=8 sw=4 tw=0 et : -- cgit v1.2.3