summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vim/vimrc20
1 files changed, 17 insertions, 3 deletions
diff --git a/vim/vimrc b/vim/vimrc
index f9079d7..974f1af 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -86,23 +86,30 @@ call vundle#begin()
" Plugin 'dracula/vim'
" Plugin 'git://ex40.softwarefools.com/vim-potion.git'
" Plugin 'git://ex40.softwarefools.com/vim-colortune.git'
+" Plugin 'terryma/vim-multiple-cursors'
Plugin 'gmarik/Vundle.vim'
+
Plugin 'scrooloose/nerdtree'
Plugin 'altercation/vim-colors-solarized'
Plugin 'fholgado/minibufexpl.vim'
Plugin 'majutsushi/tagbar'
+
Plugin 'tpope/vim-fugitive'
Plugin 'tpope/vim-sensible'
+Plugin 'tpope/vim-surround'
+
Plugin 'MarcWeber/vim-addon-mw-utils'
Plugin 'tomtom/tlib_vim'
+
Plugin 'garbas/vim-snipmate'
Plugin 'honza/vim-snippets'
-Plugin 'ndmitchell/ghcid', { 'rtp': 'plugins/nvim' } " added at work
+
+Plugin 'ndmitchell/ghcid', { 'rtp': 'plugins/nvim' }
Plugin 'neomake/neomake'
Plugin 'parsonsmatt/intero-neovim'
-Plugin 'mileszs/ack.vim'
Plugin 'neovimhaskell/haskell-vim'
+Plugin 'mileszs/ack.vim'
call vundle#end()
filetype plugin indent on
@@ -181,6 +188,8 @@ nnoremap <C-H> <C-W><C-H>
" {{{ statusline
set statusline=%f " Path to the file
+set statusline+=%m " modified flag
+set statusline+=[%n] " buffer number
set statusline+=%= " Switch to the right side
set statusline+=%l,%c " Current line,column
set statusline+=\ (%L,%P) " Percentage
@@ -326,8 +335,13 @@ nnoremap <leader>lm :MBEToggle<cr>
noremap <leader>a :Ack!<Space>
" stylish-haskell
-noremap <leader>sh :!stylish-haskell
+" noremap <leader>sh :!stylish-haskell
+
+" ctrl-space auto complete in insert mode
+inoremap <C-Space> <C-N>
+" show list if multiple ctrl-] matches
+nnoremap <C-]> g<C-]>
" }}}
" {{{ FILETYPES