Mercurial > dotfiles.old
annotate vimrc @ 232:a7ecdf3e66bc
Fix vimrc
| author | zegervdv <zegervdv@me.com> |
|---|---|
| date | Fri, 23 Jan 2015 22:15:31 +0100 |
| parents | 49fd5ea356f0 |
| children | db3563b40222 |
| rev | line source |
|---|---|
| 27 | 1 " vim:fdm=marker |
| 232 | 2 |
| 3 " Include Vim-Plug {{{ | |
| 4 if empty(glob('~/.vim/autoload/plug.vim')) | |
| 5 silent !mkdir -p ~/.vim/autoload | |
| 6 silent !curl -fLo ~/.vim/autoload/plug.vim | |
| 7 \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim | |
| 8 autocmd VimEnter * PlugInstall | |
| 9 endif | |
| 10 " }}} | |
|
187
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
11 " Vim-Plug {{{ |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
12 let g:plug_window='topleft new' |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
13 call plug#begin('~/.vim/plugged') |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
14 " General Plugins |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
15 Plug 'tpope/vim-sensible' |
| 226 | 16 Plug 'tpope/vim-fugitive' |
| 17 Plug 'tpope/vim-repeat' | |
| 18 | |
| 19 " Spelling | |
|
187
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
20 Plug 'tpope/vim-abolish' |
| 226 | 21 |
| 22 " Brackets | |
|
187
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
23 Plug 'tpope/vim-surround' |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
24 Plug 'jiangmiao/auto-pairs' |
| 226 | 25 |
| 26 " Formatting | |
| 27 Plug 'godlygeek/tabular', { 'on' : 'Tabularize' } | |
| 28 | |
| 29 " Comments | |
|
200
a91590ba2b32
Replace tcomment with commentary
zegervdv <zegervdv@me.com>
parents:
196
diff
changeset
|
30 Plug 'tpope/vim-commentary' |
| 226 | 31 |
| 32 " Moving in files | |
| 208 | 33 Plug 'wellle/targets.vim' |
| 226 | 34 |
| 35 " Command line | |
| 36 Plug 'tpope/vim-eunuch', { 'on' : ['Remove', 'Unlink', 'Move', 'Rename', 'Mkdir', 'Chmod', 'Find', 'Locate', 'SudoEdit', 'SudoWrite']} | |
|
215
ffe47a1b75f8
Add Scratch plugin and lazyload some plugins
zegervdv <zegervdv@me.com>
parents:
214
diff
changeset
|
37 |
| 226 | 38 " Syntax and checking |
| 39 Plug 'scrooloose/syntastic' | |
| 40 | |
| 41 " Undoing | |
|
187
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
42 Plug 'sjl/gundo.vim', { 'on': 'GundoToggle' } |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
43 |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
44 " Tmux |
|
189
925861e874ec
Add vim-tmux-navigator for seamless navigation
zegervdv <zegervdv@me.com>
parents:
188
diff
changeset
|
45 Plug 'christoomey/vim-tmux-navigator' |
|
215
ffe47a1b75f8
Add Scratch plugin and lazyload some plugins
zegervdv <zegervdv@me.com>
parents:
214
diff
changeset
|
46 Plug 'tpope/vim-dispatch' |
|
187
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
47 |
| 226 | 48 " Completing and snippets |
| 229 | 49 Plug 'shougo/neocomplete.vim' |
| 50 Plug 'shougo/neosnippet.vim' | |
| 51 Plug 'shougo/neosnippet-snippets' | |
| 226 | 52 |
| 53 " Vim file navigation | |
| 54 Plug 'tpope/vim-vinegar' | |
| 55 | |
| 56 " Open and find files | |
| 57 Plug 'ctrlpvim/ctrlp.vim' | |
| 58 | |
| 59 " Don't use arrows! | |
| 60 Plug 'mrmargolis/dogmatic.vim' | |
| 61 | |
| 62 " Theme | |
| 230 | 63 Plug 'w0ng/vim-hybrid' |
|
187
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
64 |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
65 " Ruby |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
66 Plug 'tpope/vim-rails', { 'for': 'ruby' } |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
67 Plug 'vim-ruby/vim-ruby', { 'for': 'ruby' } |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
68 Plug 'tpope/vim-bundler', { 'for': 'ruby' } |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
69 Plug 'tpope/vim-rake', { 'for': 'ruby' } |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
70 Plug 'slim-template/vim-slim', { 'for': 'ruby' } |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
71 Plug 'duwanis/tomdoc.vim', { 'for': 'ruby' } |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
72 |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
73 " Markdown |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
74 Plug 'tpope/vim-markdown', { 'for': 'markdown' } |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
75 |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
76 " C |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
77 Plug 'vim-scripts/a.vim', { 'for': 'c' } |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
78 Plug 'osyo-manga/vim-reunions', { 'for': 'c' } |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
79 Plug 'osyo-manga/vim-marching', { 'for': 'c' } |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
80 |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
81 " Coffeescript |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
82 Plug 'kchmck/vim-coffee-script', { 'for': 'coffeescript' } |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
83 |
| 230 | 84 " Latex |
| 85 Plug 'lervag/vim-latex', { 'for': 'tex' } | |
| 86 | |
|
201
6de3103d47f4
Use wildignore in unite file_rec/async
zegervdv <zegervdv@me.com>
parents:
200
diff
changeset
|
87 " Git |
|
6de3103d47f4
Use wildignore in unite file_rec/async
zegervdv <zegervdv@me.com>
parents:
200
diff
changeset
|
88 Plug 'tpope/vim-git' |
|
187
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
89 call plug#end() |
|
e3639166a8ab
Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents:
183
diff
changeset
|
90 " }}} |
| 226 | 91 |
| 92 " General Settings and options {{{ | |
| 0 | 93 set nocompatible |
| 226 | 94 " Backspace over everything, like normal |
| 0 | 95 set backspace=2 |
| 96 set autowrite | |
| 97 | |
| 98 set vb | |
| 99 set guioptions-=r | |
| 100 set guioptions-=l | |
| 101 set guioptions-=R | |
| 102 set guioptions-=L | |
| 103 | |
| 104 syntax on | |
| 105 set expandtab | |
| 106 set number | |
| 107 set ruler | |
| 108 set nocursorline | |
| 109 set showmatch | |
| 110 set title | |
| 111 set wrap | |
| 112 set wrapmargin=2 | |
| 113 set linebreak | |
| 147 | 114 set breakindent |
| 0 | 115 set lbr |
| 116 set tabstop=2 shiftwidth=2 | |
| 193 | 117 |
| 226 | 118 " Theme and style |
| 193 | 119 set t_Co=256 |
| 191 | 120 set background=dark |
| 231 | 121 colorscheme Tomorrow-Night |
| 122 set guifont=Fira\ Mono:h11 | |
| 193 | 123 |
| 0 | 124 set hidden |
| 125 set hlsearch | |
| 126 set incsearch | |
| 127 set ignorecase | |
|
32
2da8d8daa033
Add remaps to vim and aliases to zsh
zegervdv <zegervdv@me.com>
parents:
29
diff
changeset
|
128 set gdefault |
| 0 | 129 set smartcase |
| 130 set smartindent | |
| 131 set autoindent | |
| 132 set scrolloff=4 | |
| 133 set textwidth=80 | |
| 134 | |
| 135 set history=100 | |
| 136 set wildmenu | |
| 19 | 137 set wildmode=full |
| 79 | 138 set ttyfast |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
139 set lazyredraw |
| 0 | 140 |
| 174 | 141 set ttimeoutlen=10 |
| 142 " Set the timeout to a minimum | |
| 0 | 143 set diffopt+=iwhite |
| 144 | |
| 79 | 145 set tags=.git/tags |
| 146 | |
| 0 | 147 set formatoptions= |
| 148 set formatoptions+=c " Format comments | |
| 149 set formatoptions+=r " Continue comments by default | |
| 150 set formatoptions+=o " Make comment when using o or O from comment line | |
| 151 set formatoptions+=q " Format comments with gq | |
| 152 set formatoptions+=n " Recognize numbered lists | |
| 153 set formatoptions+=2 " Use indent from 2nd line of a paragraph | |
| 154 set formatoptions+=l " Don't break lines that are already long | |
| 155 set formatoptions+=1 " Break before 1-letter words | |
| 156 | |
| 214 | 157 " Enable cursorline |
| 158 set cursorline | |
| 159 autocmd WinEnter * setlocal cursorline | |
| 160 autocmd WinLeave * setlocal nocursorline | |
| 182 | 161 |
| 162 set sessionoptions-=options | |
| 163 | |
| 229 | 164 " Scan files for completion |
| 165 set complete=.,w,b,u,k,kspell,t,i,d | |
| 92 | 166 |
| 0 | 167 set splitright |
| 168 set virtualedit=block | |
| 169 set conceallevel=0 | |
| 170 | |
| 171 set cryptmethod=blowfish | |
| 172 | |
| 173 filetype plugin indent on | |
| 174 | |
|
107
508b8bc6ffd5
Improve mapping for split windows
zegervdv <zegervdv@me.com>
parents:
104
diff
changeset
|
175 set pastetoggle=<F2> |
| 0 | 176 set clipboard=unnamed |
| 177 | |
|
32
2da8d8daa033
Add remaps to vim and aliases to zsh
zegervdv <zegervdv@me.com>
parents:
29
diff
changeset
|
178 set undofile |
| 16 | 179 set viminfo='10,\"100,:20,%,n~/.viminfo |
| 188 | 180 set backupdir=/tmp//,. |
| 181 set directory=/tmp//,. | |
| 182 if v:version >= 703 | |
| 183 set undodir=/tmp//,. | |
| 184 endif | |
| 229 | 185 |
|
201
6de3103d47f4
Use wildignore in unite file_rec/async
zegervdv <zegervdv@me.com>
parents:
200
diff
changeset
|
186 set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.o,*.bin,*.elf,*.hex,*.eps,.git/** |
| 80 | 187 |
| 154 | 188 " Sentences are ended with double spaces |
| 189 set cpo+=J | |
| 226 | 190 " }}} |
| 195 | 191 " Status line {{{ |
| 192 function! Status() | |
| 193 let statusline = '' | |
|
200
a91590ba2b32
Replace tcomment with commentary
zegervdv <zegervdv@me.com>
parents:
196
diff
changeset
|
194 let statusline .= "%n\ " |
| 195 | 195 let statusline .= "%f" |
| 232 | 196 let statusline .= "%m" |
| 195 | 197 let statusline .= "\ [%{strlen(&ft)?&ft:'unknown'}]" |
| 198 let statusline .= "%=" | |
| 199 let statusline .= "%P\ " | |
| 200 return statusline | |
| 201 endfunction | |
|
200
a91590ba2b32
Replace tcomment with commentary
zegervdv <zegervdv@me.com>
parents:
196
diff
changeset
|
202 set laststatus=2 |
| 195 | 203 set statusline=%!Status() |
| 204 " }}} | |
| 232 | 205 " Fix Colors in colorscheme |
| 206 highlight SpellBad ctermbg=256 ctermfg=210 | |
| 207 highlight SpellLocal ctermbg=240 ctermfg=010 | |
| 208 highlight SpellCap ctermbg=256 ctermfg=211 | |
| 101 | 209 |
| 226 | 210 " Mappings {{{ |
| 211 " Set leader to spacebar | |
| 174 | 212 map <space> <leader> |
| 40 | 213 |
| 0 | 214 " See long lines as line breaks |
| 215 map j gj | |
| 216 map k gk | |
| 217 | |
| 226 | 218 " Remap tag-search to better place |
| 219 nmap <C-$> <C-]> | |
| 0 | 220 |
| 221 " Jump to end of line in insert mode | |
| 33 | 222 inoremap <C-a> <C-o>I |
| 0 | 223 inoremap <C-e> <C-o>A |
| 224 | |
| 33 | 225 nnoremap <C-a> ^ |
| 226 nnoremap <C-e> $ | |
| 227 | |
| 92 | 228 nnoremap <C-s> <C-e> |
| 229 | |
| 33 | 230 nnoremap + <C-a> |
| 231 | |
| 205 | 232 " Move while in insert mode |
| 233 inoremap <C-f> <right> | |
| 0 | 234 |
|
4
050d4d8c6796
Vim: use double space to alternate files
zegervdv <zegervdv@me.com>
parents:
3
diff
changeset
|
235 " Switch between the last two files |
|
175
a7247b4a7e69
Fix issue with mapping where vim would hang on unmapped <leader> keys
zegervdv <zegervdv@me.com>
parents:
174
diff
changeset
|
236 nnoremap <leader><leader> <C-^> |
|
4
050d4d8c6796
Vim: use double space to alternate files
zegervdv <zegervdv@me.com>
parents:
3
diff
changeset
|
237 |
| 0 | 238 " Very Magic search patterns |
| 239 nmap / /\v | |
| 240 cmap s/ s/\v | |
| 241 | |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
242 " Keep search matches in the middle of the window. |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
243 nnoremap n nzzzv |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
244 nnoremap N Nzzzv |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
245 |
| 40 | 246 " Clear highlight |
|
177
ca5bd373473e
Add function to search for word under cursor with Ag
zegervdv <zegervdv@me.com>
parents:
176
diff
changeset
|
247 nnoremap <silent><leader>l :noh<CR> |
| 40 | 248 |
| 0 | 249 inoremap £ \ |
| 250 | |
| 226 | 251 " Highlight last inserted text |
| 33 | 252 nnoremap gV `[v`] |
| 253 | |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
254 " Highlight VCS conflict markers |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
255 match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$' |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
256 |
| 0 | 257 " Swap v and CTRL-V |
| 258 nnoremap v <C-V> | |
| 259 nnoremap <C-V> v | |
| 260 | |
| 261 vnoremap v <C-V> | |
| 262 vnoremap <C-V> v | |
| 263 | |
| 264 " Use backspace as delete in visual mode | |
| 265 vmap <BS> x | |
| 266 | |
| 267 " Keep selection when shifting | |
| 268 vmap <expr> > KeepVisualSelection(">") | |
| 269 vmap <expr> < KeepVisualSelection("<") | |
| 270 | |
| 271 function! KeepVisualSelection(cmd) | |
|
146
3333853b8bbe
Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents:
144
diff
changeset
|
272 set nosmartindent |
|
3333853b8bbe
Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents:
144
diff
changeset
|
273 if mode() ==# "V" |
|
3333853b8bbe
Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents:
144
diff
changeset
|
274 return a:cmd . ":set smartindent\<CR>gv" |
|
3333853b8bbe
Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents:
144
diff
changeset
|
275 else |
|
3333853b8bbe
Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents:
144
diff
changeset
|
276 return a:cmd . ":set smartindent\<CR>" |
|
3333853b8bbe
Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents:
144
diff
changeset
|
277 endif |
| 0 | 278 endfunction |
| 279 | |
| 226 | 280 " Some emacs behavior |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
281 cnoremap <c-a> <home> |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
282 cnoremap <c-e> <end> |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
283 |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
284 " Swap backticks and quotes |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
285 nnoremap ` ' |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
286 nnoremap ' ` |
| 227 | 287 |
| 288 " Open vimrc | |
| 289 nnoremap <leader>ev :e $MYVIMRC<CR> | |
| 226 | 290 " }}} |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
291 |
| 226 | 292 " Functions {{{ |
| 293 " When editing a file, always jump to the last known cursor position. | |
| 294 " Don't do it for commit messages, when the position is invalid, or when | |
| 295 " inside an event handler (happens when dropping a file on gvim). | |
| 296 autocmd BufReadPost * | |
| 297 \ if &ft != 'gitcommit' && line("'\"") > 0 && line("'\"") <= line("$") | | |
| 298 \ exe "normal g`\"" | | |
| 299 \ endif | |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
300 |
| 226 | 301 " Make matching parenthesis more clear |
| 302 " This is adapted from | |
| 303 " http://vim.wikia.com/wiki/Windo_and_restore_current_window | |
| 304 function! KeepWin(command) | |
| 305 let currwin=winnr() | |
| 306 execute a:command | |
| 307 execute currwin . 'wincmd w' | |
| 308 endfunction | |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
309 |
| 226 | 310 augroup insertMatch |
| 311 au! | |
| 312 au VimEnter * NoMatchParen | |
| 313 au InsertEnter * call KeepWin("DoMatchParen") | |
| 314 au InsertLeave * call KeepWin("NoMatchParen") | |
| 315 augroup END | |
|
178
899ac4d147ef
Add mapping to move visually selected lines
zegervdv <zegervdv@me.com>
parents:
177
diff
changeset
|
316 |
| 226 | 317 " Resize splits after window resize |
| 318 au VimResized * exe "normal! \<c-w>=" | |
| 319 | |
| 320 " Custom folding by Steve Losh | |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
321 function! MyFoldText() " {{{ |
|
146
3333853b8bbe
Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents:
144
diff
changeset
|
322 let line = getline(v:foldstart) |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
323 |
|
146
3333853b8bbe
Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents:
144
diff
changeset
|
324 let nucolwidth = &fdc + &number * &numberwidth |
|
3333853b8bbe
Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents:
144
diff
changeset
|
325 let windowwidth = winwidth(0) - nucolwidth - 3 |
|
3333853b8bbe
Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents:
144
diff
changeset
|
326 let foldedlinecount = v:foldend - v:foldstart |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
327 |
|
146
3333853b8bbe
Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents:
144
diff
changeset
|
328 " expand tabs into spaces |
|
3333853b8bbe
Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents:
144
diff
changeset
|
329 let onetab = strpart(' ', 0, &tabstop) |
|
3333853b8bbe
Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents:
144
diff
changeset
|
330 let line = substitute(line, '\t', onetab, 'g') |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
331 |
|
146
3333853b8bbe
Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents:
144
diff
changeset
|
332 let line = strpart(line, 0, windowwidth - 2 -len(foldedlinecount)) |
|
3333853b8bbe
Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents:
144
diff
changeset
|
333 let fillcharcount = windowwidth - len(line) - len(foldedlinecount) |
|
3333853b8bbe
Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents:
144
diff
changeset
|
334 return line . '…' . repeat(" ",fillcharcount) . foldedlinecount . '…' . ' ' |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
335 endfunction " }}} |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
336 set foldtext=MyFoldText() |
| 226 | 337 " }}} |
| 42 | 338 |
| 226 | 339 " Filetype specific settings |
| 101 | 340 " Latex {{{ |
| 341 " Open pdf | |
|
216
d216f4d5508e
Setup latex compiler for dispatch
zegervdv <zegervdv@me.com>
parents:
215
diff
changeset
|
342 nnoremap <leader>v :!open -a /Applications/TeX/TeXShop.app %:r.pdf<CR><CR> |
|
d216f4d5508e
Setup latex compiler for dispatch
zegervdv <zegervdv@me.com>
parents:
215
diff
changeset
|
343 " Set compiler to rubber |
|
219
a7355c906b3e
Change to latexmk for compiling latex
zegervdv <zegervdv@me.com>
parents:
218
diff
changeset
|
344 autocmd FileType tex setlocal makeprg=latexmk\ -pdf\ %:r |
| 226 | 345 au BufNewFile,BufRead,BufEnter *.tex setlocal spell spelllang=en_gb |
| 346 au BufNewFile,BufRead,BufEnter *.tex setlocal textwidth=0 | |
| 40 | 347 " }}} |
| 348 " Markdown {{{ | |
| 0 | 349 let g:vim_markdown_folding_disabled=1 |
| 40 | 350 " }}} |
| 226 | 351 " Text {{{ |
| 352 au BufNewFile,BufRead,BufEnter *.txt setlocal spell spelllang=en_gb | |
| 353 au BufNewFile,BufRead,BufEnter *.txt setlocal textwidth=0 | |
| 354 " }}} | |
| 355 " Git commit messages {{{ | |
| 356 au FileType gitcommit setlocal spell spelllang=en_gb | |
| 357 " }}} | |
| 358 " Ruby {{{ | |
| 359 autocmd BufRead *_spec.rb set filetype=rspec | |
| 360 " }}} | |
| 361 " Matlab {{{ | |
| 362 autocmd FileType matlab setlocal commentstring=\%\ %s | |
| 363 " }}} | |
| 364 " C {{{ | |
| 365 au FileType c setlocal foldmethod=syntax | |
| 366 " }}} | |
| 367 " VHDL {{{ | |
| 368 " VHDL ctags | |
| 369 let g:tlist_vhdl_settings = 'vhdl;d:package declarations;b:package bodies;e:entities;a:architecture specifications;t:type declarations;p:processes;f:functions;r:procedures' | |
| 370 " }}} | |
| 27 | 371 |
| 226 | 372 " Plugin settings |
| 40 | 373 " Tabular {{{ |
| 0 | 374 inoremap <silent> <Bar> <Bar><Esc>:call <SID>align()<CR>a |
| 375 | |
| 376 function! s:align() | |
| 377 let p = '^\s*|\s.*\s|\s*$' | |
| 378 if exists(':Tabularize') && getline('.') =~# '^\s*|' && (getline(line('.')-1) =~# p || getline(line('.')+1) =~# p) | |
| 379 let column = strlen(substitute(getline('.')[0:col('.')],'[^|]','','g')) | |
| 380 let position = strlen(matchstr(getline('.')[0:col('.')],'.*|\s*\zs.*')) | |
| 381 Tabularize/|/l1 | |
| 382 normal! 0 | |
| 383 call search(repeat('[^|]*|',column).'\s\{-\}'.repeat('.',position),'ce',line('.')) | |
| 384 endif | |
| 385 endfunction | |
| 386 | |
| 387 " Align Migration files | |
| 388 vmap <c-a> :Tabularize /:/l1l0l0<CR> | |
| 389 | |
| 390 nmap <Leader>a= :Tabularize /=<CR> | |
| 391 vmap <Leader>a= :Tabularize /=<CR> | |
| 392 nmap <Leader>a=> :Tabularize /=><CR> | |
| 393 vmap <Leader>a=> :Tabularize /=><CR> | |
| 394 nmap <Leader>a: :Tabularize /:\zs/l0l1<CR> | |
| 395 vmap <Leader>a: :Tabularize /:\zs/l0l1<CR> | |
| 396 nmap <Leader>a, :Tabularize /,\zs/l0l1<CR> | |
| 397 vmap <Leader>a, :Tabularize /,\zs/l0l1<CR> | |
| 398 vmap <Leader>a- :Tabularize /-<CR> | |
| 40 | 399 " }}} |
| 190 | 400 " Syntastic {{{ |
| 401 let g:syntastic_check_on_open=1 | |
| 402 " }}} | |
| 40 | 403 " Gundo tree {{{ |
| 0 | 404 nnoremap <leader>u :GundoToggle<CR> |
| 40 | 405 " }}} |
|
216
d216f4d5508e
Setup latex compiler for dispatch
zegervdv <zegervdv@me.com>
parents:
215
diff
changeset
|
406 " Dispatch {{{ |
|
d216f4d5508e
Setup latex compiler for dispatch
zegervdv <zegervdv@me.com>
parents:
215
diff
changeset
|
407 nnoremap <leader>s :Make<CR> |
| 217 | 408 autocmd FileType python setlocal makeprg=ipython\ --pdb\ % |
| 218 | 409 autocmd FileType ruby setlocal makeprg=ruby\ % |
|
189
925861e874ec
Add vim-tmux-navigator for seamless navigation
zegervdv <zegervdv@me.com>
parents:
188
diff
changeset
|
410 " }}} |
| 226 | 411 " CtrlP {{{ |
| 412 if executable('ag') | |
| 413 set grepprg=ag\ --nogroup\ --color | |
| 414 | |
| 415 let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""' | |
| 416 let g:ctrlp_use_caching = 0 | |
| 417 endif | |
| 418 " }}} | |
| 229 | 419 " Neocomplete {{{ |
| 420 let g:neocomplete#enable_at_startup=1 | |
| 421 " let g:neocomplete#data_directory=s:get_cache_dir('neocomplete') | |
| 422 " }}} | |
| 423 " Neosnippet {{{ | |
| 424 let g:neosnippet#snippets_directory='~/.vim/bundle/vim-snippets/snippets,~/.vim/snippets' | |
| 425 let g:neosnippet#enable_snipmate_compatibility=1 | |
| 426 | |
| 230 | 427 imap <expr><TAB> neosnippet#expandable() == 1 ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>" |
| 428 imap <expr><C-k> neosnippet#expandable_or_jumpable() == 1 ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>" | |
| 429 smap <expr><TAB> neosnippet#expandable() == 1 ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>" | |
| 430 inoremap <expr><C-h> neocomplete#smart_close_popup()."\<C-h>" | |
| 431 inoremap <expr><BS> neocomplete#smart_close_popup()."\<C-h>" | |
| 432 | |
| 433 if !exists('g:neocomplete#sources#omni#input_patterns') | |
| 434 let g:neocomplete#sources#omni#input_patterns = {} | |
| 435 endif | |
| 436 let g:neocomplete#sources#omni#input_patterns.tex = | |
| 437 \ '\v\\\a*(ref|cite)\a*([^]]*\])?\{([^}]*,)*[^}]*' | |
| 229 | 438 " }}} |
|
215
ffe47a1b75f8
Add Scratch plugin and lazyload some plugins
zegervdv <zegervdv@me.com>
parents:
214
diff
changeset
|
439 |
| 13 | 440 " Load local vimrc |
|
3
44d3af8838f8
Add support for local zshrc and vimrc files
zegervdv <zegervdv@me.com>
parents:
0
diff
changeset
|
441 if filereadable($HOME . "/.vimrc.local") |
|
44d3af8838f8
Add support for local zshrc and vimrc files
zegervdv <zegervdv@me.com>
parents:
0
diff
changeset
|
442 source ~/.vimrc.local |
|
44d3af8838f8
Add support for local zshrc and vimrc files
zegervdv <zegervdv@me.com>
parents:
0
diff
changeset
|
443 endif |
| 24 | 444 |
| 209 | 445 " Load project local vimrc |
| 446 if filereadable(".vimrc.local") | |
| 447 source .vimrc.local | |
| 448 endif | |
| 449 |