diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2015-04-21 21:08:44 +0100 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2015-04-21 21:08:44 +0100 |
| commit | 39a0905be4d3e1e6b28a96c6bbdd6e095e7ce82e (patch) | |
| tree | aec4d5f8abe7e76602cb50f7742b0c16df6bc0dc /vim/vimrc | |
| parent | 17fe9bee5a15173996ee07c4b4bb0c2db5106c4c (diff) | |
| parent | 0ec233f671ee4e2dee05bd7ccb7e797bc81d9626 (diff) | |
Merge branch 'master' of github.com:uvaes/dotfiles
Diffstat (limited to 'vim/vimrc')
| -rw-r--r-- | vim/vimrc | 34 |
1 files changed, 18 insertions, 16 deletions
@@ -6,26 +6,26 @@ set rtp+=~/.vim/bundle/vundle/ call vundle#rc() "" Plugins -Plugin 'tpope/vim-fugitive' -Plugin 'tpope/vim-surround' -Plugin 'tpope/vim-obsession' -Plugin 'tpope/vim-sensible' -Plugin 'tpope/vim-scriptease' -Plugin 'tpope/vim-repeat' -Plugin 'tpope/vim-commentary' Plugin 'gmarik/vundle' Plugin 'LaTeX-Box-Team/latex-box' +Plugin 'SirVer/ultisnips' +Plugin 'altercation/vim-colors-solarized' +Plugin 'christoomey/vim-tmux-navigator' +Plugin 'godlygeek/tabular' Plugin 'gregsexton/gitv' -Plugin 'UltiSnips' +Plugin 'honza/vim-snippets' Plugin 'kien/ctrlp.vim' Plugin 'scrooloose/nerdtree' +Plugin 'sjl/Gundo.vim' Plugin 'tommcdo/vim-exchange' -Plugin 'unimpaired.vim' -Plugin 'Tabular' -Plugin 'Gundo' -Plugin 'altercation/vim-colors-solarized' -Plugin 'honza/vim-snippets' -Plugin 'Valloric/YouCompleteMe' +Plugin 'tpope/vim-commentary' +Plugin 'tpope/vim-fugitive' +Plugin 'tpope/vim-obsession' +Plugin 'tpope/vim-repeat' +Plugin 'tpope/vim-scriptease' +Plugin 'tpope/vim-sensible' +Plugin 'tpope/vim-surround' +Plugin 'tpope/vim-unimpaired' filetype plugin indent on syntax on @@ -94,7 +94,7 @@ set foldmethod=expr set foldlevel=0 " Search -set hlsearch +set nohlsearch " Back up files set noswapfile @@ -106,7 +106,7 @@ set undodir=/home/urbain/.vim/vimundo/ set nonumber set listchars=tab:▸\ ,eol:¬,trail:- set fillchars=fold:\ ,vert:\ , -set showbreak=\ \ \ \ \ \ ... +set showbreak=... set colorcolumn=0 set scrolloff=0 set t_Co=256 @@ -132,6 +132,7 @@ set ignorecase set noautochdir set cpoptions+=I set encoding=utf-8 +set mouse=a "" Colorscheme try | colorscheme solarized | catch | endtry @@ -159,6 +160,7 @@ nnoremap <Leader>w :w<cr> nnoremap <Leader>q :q!<cr> nnoremap <Leader>h :set hlsearch!<cr> nnoremap <Leader>n :set relativenumber!<cr> +nnoremap <Leader>sp :set paste! nnoremap <Leader>sv :source ~/.vim/vimrc<cr> nnoremap <Leader>sc :source %<cr> nnoremap <Leader>es :UltiSnipsEdit<Return> |