annotate vimrc @ 235:d29157c632c0

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