Mercurial > dotfiles.old
annotate vimrc @ 87:aefa231684d9
Add extra motions
| author | zegervdv <zegervdv@me.com> |
|---|---|
| date | Fri, 01 Aug 2014 07:08:40 +0200 |
| parents | 8a5464ec3c29 |
| children | 3fdc762fe6bb |
| rev | line source |
|---|---|
| 27 | 1 " vim:fdm=marker |
| 2 | |
| 3 " General Settings {{{ | |
| 0 | 4 set nocompatible |
| 5 set laststatus=2 | |
| 6 set noshowmode | |
| 7 | |
| 42 | 8 let g:pathogen_disabled = ['ack'] |
| 0 | 9 execute pathogen#infect() |
| 10 | |
| 11 set backspace=2 | |
| 12 set autowrite | |
| 13 | |
| 14 set vb | |
| 15 set guioptions-=r | |
| 16 set guioptions-=l | |
| 17 set guioptions-=R | |
| 18 set guioptions-=L | |
| 19 | |
| 20 syntax on | |
| 21 set expandtab | |
| 22 set number | |
| 23 set ruler | |
| 24 set nocursorline | |
| 25 set showmatch | |
| 26 set title | |
| 27 set wrap | |
| 28 set wrapmargin=2 | |
| 29 set linebreak | |
| 30 set lbr | |
| 31 set tabstop=2 shiftwidth=2 | |
|
21
bf5c5093bad9
Add Base16-Ocean-Dark colorscheme
zegervdv <zegervdv@me.com>
parents:
19
diff
changeset
|
32 if has("gui_running") |
|
bf5c5093bad9
Add Base16-Ocean-Dark colorscheme
zegervdv <zegervdv@me.com>
parents:
19
diff
changeset
|
33 set background=dark |
| 35 | 34 " color base16-ocean |
| 22 | 35 color hybrid |
|
21
bf5c5093bad9
Add Base16-Ocean-Dark colorscheme
zegervdv <zegervdv@me.com>
parents:
19
diff
changeset
|
36 else |
|
bf5c5093bad9
Add Base16-Ocean-Dark colorscheme
zegervdv <zegervdv@me.com>
parents:
19
diff
changeset
|
37 color hybrid |
|
bf5c5093bad9
Add Base16-Ocean-Dark colorscheme
zegervdv <zegervdv@me.com>
parents:
19
diff
changeset
|
38 endif |
| 0 | 39 set guifont=Inconsolata\ for\ Powerline:h12 |
| 40 set autowrite | |
| 41 set hidden | |
| 42 set hlsearch | |
| 43 set incsearch | |
| 44 set ignorecase | |
|
32
2da8d8daa033
Add remaps to vim and aliases to zsh
zegervdv <zegervdv@me.com>
parents:
29
diff
changeset
|
45 set gdefault |
| 0 | 46 set smartcase |
| 47 set smartindent | |
| 48 set autoindent | |
| 49 set scrolloff=4 | |
| 50 set textwidth=80 | |
| 51 | |
| 52 set history=100 | |
| 53 set wildmenu | |
| 19 | 54 set wildmode=full |
| 79 | 55 set ttyfast |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
56 set lazyredraw |
| 0 | 57 |
| 58 set diffopt+=iwhite | |
| 59 | |
| 79 | 60 set tags=.git/tags |
| 61 | |
| 0 | 62 set formatoptions= |
| 63 set formatoptions+=c " Format comments | |
| 64 set formatoptions+=r " Continue comments by default | |
| 65 set formatoptions+=o " Make comment when using o or O from comment line | |
| 66 set formatoptions+=q " Format comments with gq | |
| 67 set formatoptions+=n " Recognize numbered lists | |
| 68 set formatoptions+=2 " Use indent from 2nd line of a paragraph | |
| 69 set formatoptions+=l " Don't break lines that are already long | |
| 70 set formatoptions+=1 " Break before 1-letter words | |
| 71 | |
| 72 set splitright | |
| 73 set virtualedit=block | |
| 74 set conceallevel=0 | |
| 75 | |
| 76 set cryptmethod=blowfish | |
| 77 | |
| 78 filetype plugin indent on | |
| 79 autocmd FileType ruby set tabstop=2|set shiftwidth=2 | |
| 80 | |
| 81 set clipboard=unnamed | |
| 82 | |
|
32
2da8d8daa033
Add remaps to vim and aliases to zsh
zegervdv <zegervdv@me.com>
parents:
29
diff
changeset
|
83 set undofile |
| 16 | 84 set viminfo='10,\"100,:20,%,n~/.viminfo |
|
32
2da8d8daa033
Add remaps to vim and aliases to zsh
zegervdv <zegervdv@me.com>
parents:
29
diff
changeset
|
85 |
| 80 | 86 set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.o,*.bin,*.elf,*.hex |
| 87 | |
|
32
2da8d8daa033
Add remaps to vim and aliases to zsh
zegervdv <zegervdv@me.com>
parents:
29
diff
changeset
|
88 " set list |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
89 set listchars=tab:▸\ ,eol:¬ |
| 27 | 90 " }}} |
| 91 " Custom remaps and tricks {{{ | |
| 16 | 92 " When editing a file, always jump to the last known cursor position. |
| 93 " Don't do it for commit messages, when the position is invalid, or when | |
| 94 " inside an event handler (happens when dropping a file on gvim). | |
| 95 autocmd BufReadPost * | |
| 96 \ if &ft != 'gitcommit' && line("'\"") > 0 && line("'\"") <= line("$") | | |
| 97 \ exe "normal g`\"" | | |
| 98 \ endif | |
| 0 | 99 |
| 40 | 100 nnoremap <F5> :buffers<CR>:buffer<Space> |
| 101 | |
| 102 " Set leader to , | |
| 103 let mapleader = "," | |
| 104 | |
| 0 | 105 map <Leader>d :bp<bar>sp<bar>bn<bar>bd<CR> |
| 106 | |
| 107 " See long lines as line breaks | |
| 108 map j gj | |
| 109 map k gk | |
| 110 | |
| 111 " remap tag-search to better place | |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
112 " nmap <C-$> <C-]> |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
113 function! JumpToTagInSplit() |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
114 execute "normal! \<c-w>v\<c-]>mzzMzvzz15\<c-e>" |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
115 execute "keepjumps normal! `z" |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
116 Pulse |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
117 endfunction |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
118 nnoremap <c-$> :silent! call JumpToTag()<cr> |
| 0 | 119 |
| 120 " Jump to end of line in insert mode | |
| 33 | 121 inoremap <C-a> <C-o>I |
| 0 | 122 inoremap <C-e> <C-o>A |
| 123 | |
| 33 | 124 nnoremap <C-a> ^ |
| 125 nnoremap <C-e> $ | |
| 126 | |
| 127 nnoremap + <C-a> | |
| 128 | |
| 129 " Jump out of inner bracket | |
| 130 inoremap <C-f> <ESC>%%a | |
| 0 | 131 |
|
4
050d4d8c6796
Vim: use double space to alternate files
zegervdv <zegervdv@me.com>
parents:
3
diff
changeset
|
132 " Switch between the last two files |
|
050d4d8c6796
Vim: use double space to alternate files
zegervdv <zegervdv@me.com>
parents:
3
diff
changeset
|
133 nnoremap <SPACE><SPACE> <C-^> |
|
050d4d8c6796
Vim: use double space to alternate files
zegervdv <zegervdv@me.com>
parents:
3
diff
changeset
|
134 |
| 0 | 135 " Very Magic search patterns |
| 136 nmap / /\v | |
| 137 cmap s/ s/\v | |
| 138 | |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
139 " 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
|
140 nnoremap n nzzzv |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
141 nnoremap N Nzzzv |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
142 |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
143 " Show local search results in quickfix |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
144 nnoremap <silent> <leader>/ :execute 'vimgrep /'.@/.'/g %'<CR>:copen<CR> |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
145 nnoremap <silent> <leader>? :Ag <cword><CR> |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
146 " nnoremap <silent> <leader>? :execute "Ag! '" . substitute(substitute(substitute(@/, "\\\\<", "\\\\b", ""), "\\\\>", "\\\\b", ""), "\\\\v", "","") . "'"<CR> |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
147 |
| 40 | 148 " Clear highlight |
| 149 nnoremap <silent> <leader>n :nohlsearch<CR> | |
| 150 | |
| 0 | 151 inoremap £ \ |
| 152 | |
|
32
2da8d8daa033
Add remaps to vim and aliases to zsh
zegervdv <zegervdv@me.com>
parents:
29
diff
changeset
|
153 nnoremap <TAB> % |
|
2da8d8daa033
Add remaps to vim and aliases to zsh
zegervdv <zegervdv@me.com>
parents:
29
diff
changeset
|
154 vnoremap <TAB> % |
| 0 | 155 |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
156 " Move between tabs |
| 82 | 157 nnoremap <S-j> :tabprevious<CR> |
| 158 nnoremap <S-k> :tabnext<CR> | |
| 159 nnoremap <S-h> :tabfirst<CR> | |
| 160 nnoremap <S-l> :tablast<CR> | |
| 161 nnoremap <S-t> :tabnew<CR> | |
|
34
3ed98613040a
Add mapping to switch between tabs in vim
zegervdv <zegervdv@me.com>
parents:
33
diff
changeset
|
162 inoremap <C-S-TAB> <ESC>:tabprevious<CR> |
|
3ed98613040a
Add mapping to switch between tabs in vim
zegervdv <zegervdv@me.com>
parents:
33
diff
changeset
|
163 inoremap <C-TAB> <ESC>:tabnext<CR> |
|
3ed98613040a
Add mapping to switch between tabs in vim
zegervdv <zegervdv@me.com>
parents:
33
diff
changeset
|
164 |
| 33 | 165 " highlight last inserted text |
| 166 nnoremap gV `[v`] | |
| 167 | |
| 168 " Briefly change colour of last highlight | |
| 0 | 169 nnoremap <silent> n n:call HLNext(0.4)<cr> |
| 170 nnoremap <silent> N N:call HLNext(0.4)<cr> | |
| 171 | |
| 172 function! HLNext (blinktime) | |
| 173 highlight WhiteOnRed ctermfg=white ctermbg=red guifg=white guibg=red | |
| 174 let [bufnum, lnum, col, off] = getpos('.') | |
| 175 let matchlen = strlen(matchstr(strpart(getline('.'),col-1),@/)) | |
| 176 let target_pat = '\c\%#'.@/ | |
| 177 let ring = matchadd('WhiteOnRed', target_pat, 101) | |
| 178 redraw | |
| 179 exec 'sleep ' . float2nr(a:blinktime * 1000) . 'm' | |
| 180 call matchdelete(ring) | |
| 181 redraw | |
| 182 endfunction | |
| 183 | |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
184 " Highlight VCS conflict markers |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
185 match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$' |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
186 |
| 0 | 187 " Swap v and CTRL-V |
| 188 nnoremap v <C-V> | |
| 189 nnoremap <C-V> v | |
| 190 | |
| 191 vnoremap v <C-V> | |
| 192 vnoremap <C-V> v | |
| 193 | |
| 194 " Use backspace as delete in visual mode | |
| 195 vmap <BS> x | |
| 196 | |
| 197 " Keep selection when shifting | |
| 198 vmap <expr> > KeepVisualSelection(">") | |
| 199 vmap <expr> < KeepVisualSelection("<") | |
| 200 | |
| 201 function! KeepVisualSelection(cmd) | |
| 202 set nosmartindent | |
| 203 if mode() ==# "V" | |
| 204 return a:cmd . ":set smartindent\<CR>gv" | |
| 205 else | |
| 206 return a:cmd . ":set smartindent\<CR>" | |
| 207 endif | |
| 208 endfunction | |
| 209 | |
| 210 let g:indent_guides_auto_colors = 0 | |
| 211 let g:indent_guides_guide_size = 1 | |
| 212 highlight IndentGuidesEven guibg=background | |
| 213 highlight IndentGuidesOdd guibg='#282a2e' | |
| 214 | |
| 42 | 215 au FileType c setl foldmethod=syntax |
| 216 | |
|
85
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
217 au VimResized * exe "normal! \<c-w>=" |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
218 |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
219 cnoremap <c-a> <home> |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
220 cnoremap <c-e> <end> |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
221 |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
222 " Swap backticks and quotes |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
223 nnoremap ` ' |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
224 nnoremap ' ` |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
225 |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
226 " Note that this will overwrite the contents of the z mark. I never use it, but |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
227 " if you do you'll probably want to use another mark. |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
228 inoremap <C-u> <esc>mzgUiw`za |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
229 |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
230 nnoremap <leader>ev :vsplit $MYVIMRC<cr> |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
231 |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
232 function! MyFoldText() " {{{ |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
233 let line = getline(v:foldstart) |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
234 |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
235 let nucolwidth = &fdc + &number * &numberwidth |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
236 let windowwidth = winwidth(0) - nucolwidth - 3 |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
237 let foldedlinecount = v:foldend - v:foldstart |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
238 |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
239 " expand tabs into spaces |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
240 let onetab = strpart(' ', 0, &tabstop) |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
241 let line = substitute(line, '\t', onetab, 'g') |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
242 |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
243 let line = strpart(line, 0, windowwidth - 2 -len(foldedlinecount)) |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
244 let fillcharcount = windowwidth - len(line) - len(foldedlinecount) |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
245 return line . '…' . repeat(" ",fillcharcount) . foldedlinecount . '…' . ' ' |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
246 endfunction " }}} |
|
8a5464ec3c29
Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents:
82
diff
changeset
|
247 set foldtext=MyFoldText() |
| 42 | 248 |
| 87 | 249 " Next and Last {{{ |
| 250 " | |
| 251 " Motion for "next/last object". "Last" here means "previous", not "final". | |
| 252 " Unfortunately the "p" motion was already taken for paragraphs. | |
| 253 " | |
| 254 " Next acts on the next object of the given type, last acts on the previous | |
| 255 " object of the given type. These don't necessarily have to be in the current | |
| 256 " line. | |
| 257 " | |
| 258 " Currently works for (, [, {, and their shortcuts b, r, B. | |
| 259 " | |
| 260 " Next kind of works for ' and " as long as there are no escaped versions of | |
| 261 " them in the string (TODO: fix that). Last is currently broken for quotes | |
| 262 " (TODO: fix that). | |
| 263 " | |
| 264 " Some examples (C marks cursor positions, V means visually selected): | |
| 265 " | |
| 266 " din' -> delete in next single quotes foo = bar('spam') | |
| 267 " C | |
| 268 " foo = bar('') | |
| 269 " C | |
| 270 " | |
| 271 " canb -> change around next parens foo = bar('spam') | |
| 272 " C | |
| 273 " foo = bar | |
| 274 " C | |
| 275 " | |
| 276 " vin" -> select inside next double quotes print "hello ", name | |
| 277 " C | |
| 278 " print "hello ", name | |
| 279 " VVVVVV | |
| 280 | |
| 281 onoremap an :<c-u>call <SID>NextTextObject('a', '/')<cr> | |
| 282 xnoremap an :<c-u>call <SID>NextTextObject('a', '/')<cr> | |
| 283 onoremap in :<c-u>call <SID>NextTextObject('i', '/')<cr> | |
| 284 xnoremap in :<c-u>call <SID>NextTextObject('i', '/')<cr> | |
| 285 | |
| 286 onoremap al :<c-u>call <SID>NextTextObject('a', '?')<cr> | |
| 287 xnoremap al :<c-u>call <SID>NextTextObject('a', '?')<cr> | |
| 288 onoremap il :<c-u>call <SID>NextTextObject('i', '?')<cr> | |
| 289 xnoremap il :<c-u>call <SID>NextTextObject('i', '?')<cr> | |
| 290 | |
| 291 | |
| 292 function! s:NextTextObject(motion, dir) | |
| 293 let c = nr2char(getchar()) | |
| 294 let d = '' | |
| 295 | |
| 296 if c ==# "b" || c ==# "(" || c ==# ")" | |
| 297 let c = "(" | |
| 298 elseif c ==# "B" || c ==# "{" || c ==# "}" | |
| 299 let c = "{" | |
| 300 elseif c ==# "r" || c ==# "[" || c ==# "]" | |
| 301 let c = "[" | |
| 302 elseif c ==# "'" | |
| 303 let c = "'" | |
| 304 elseif c ==# '"' | |
| 305 let c = '"' | |
| 306 else | |
| 307 return | |
| 308 endif | |
| 309 | |
| 310 " Find the next opening-whatever. | |
| 311 execute "normal! " . a:dir . c . "\<cr>" | |
| 312 | |
| 313 if a:motion ==# 'a' | |
| 314 " If we're doing an 'around' method, we just need to select around it | |
| 315 " and we can bail out to Vim. | |
| 316 execute "normal! va" . c | |
| 317 else | |
| 318 " Otherwise we're looking at an 'inside' motion. Unfortunately these | |
| 319 " get tricky when you're dealing with an empty set of delimiters because | |
| 320 " Vim does the wrong thing when you say vi(. | |
| 321 | |
| 322 let open = '' | |
| 323 let close = '' | |
| 324 | |
| 325 if c ==# "(" | |
| 326 let open = "(" | |
| 327 let close = ")" | |
| 328 elseif c ==# "{" | |
| 329 let open = "{" | |
| 330 let close = "}" | |
| 331 elseif c ==# "[" | |
| 332 let open = "\\[" | |
| 333 let close = "\\]" | |
| 334 elseif c ==# "'" | |
| 335 let open = "'" | |
| 336 let close = "'" | |
| 337 elseif c ==# '"' | |
| 338 let open = '"' | |
| 339 let close = '"' | |
| 340 endif | |
| 341 | |
| 342 " We'll start at the current delimiter. | |
| 343 let start_pos = getpos('.') | |
| 344 let start_l = start_pos[1] | |
| 345 let start_c = start_pos[2] | |
| 346 | |
| 347 " Then we'll find it's matching end delimiter. | |
| 348 if c ==# "'" || c ==# '"' | |
| 349 " searchpairpos() doesn't work for quotes, because fuck me. | |
| 350 let end_pos = searchpos(open) | |
| 351 else | |
| 352 let end_pos = searchpairpos(open, '', close) | |
| 353 endif | |
| 354 | |
| 355 let end_l = end_pos[0] | |
| 356 let end_c = end_pos[1] | |
| 357 | |
| 358 call setpos('.', start_pos) | |
| 359 | |
| 360 if start_l == end_l && start_c == (end_c - 1) | |
| 361 " We're in an empty set of delimiters. We'll append an "x" | |
| 362 " character and select that so most Vim commands will do something | |
| 363 " sane. v is gonna be weird, and so is y. Oh well. | |
| 364 execute "normal! ax\<esc>\<left>" | |
| 365 execute "normal! vi" . c | |
| 366 elseif start_l == end_l && start_c == (end_c - 2) | |
| 367 " We're on a set of delimiters that contain a single, non-newline | |
| 368 " character. We can just select that and we're done. | |
| 369 execute "normal! vi" . c | |
| 370 else | |
| 371 " Otherwise these delimiters contain something. But we're still not | |
| 372 " sure Vim's gonna work, because if they contain nothing but | |
| 373 " newlines Vim still does the wrong thing. So we'll manually select | |
| 374 " the guts ourselves. | |
| 375 let whichwrap = &whichwrap | |
| 376 set whichwrap+=h,l | |
| 377 | |
| 378 execute "normal! va" . c . "hol" | |
| 379 | |
| 380 let &whichwrap = whichwrap | |
| 381 endif | |
| 382 endif | |
| 383 endfunction | |
| 27 | 384 " }}} |
| 87 | 385 " }}} |
| 40 | 386 " Vim Math plugin; make simple calculations {{{ |
| 0 | 387 vmap <expr> ++ VMATH_YankAndAnalyse() |
| 388 nmap ++ vip++ | |
| 40 | 389 " }}} |
| 390 " Airline configuration {{{ | |
| 0 | 391 let g:airline_inactive_collapse=0 |
| 392 let g:airline_powerline_fonts=1 | |
| 393 | |
| 394 let g:airline_left_sep = '' | |
| 395 let g:airline_right_sep = '' | |
| 396 | |
| 397 let g:airline_theme = 'tomorrow' | |
| 398 | |
| 80 | 399 let g:airline#extensions#syntastic#enabled = 1 |
| 40 | 400 " }}} |
| 401 " YankRing {{{ | |
| 0 | 402 let g:yankring_replace_n_pkey = 'cp' |
| 40 | 403 nnoremap <silent> <leader>y :YRShow<CR> |
| 404 " }}} | |
| 405 " Nerdtree {{{ | |
| 0 | 406 map <F2> :NERDTreeToggle<CR> |
| 407 map <Leader>e :NERDTreeToggle<CR> | |
| 42 | 408 let NERDTreeIgnore = ['\.aux$', '\.log$', '\.out$', '\.o$', '\.hex$', '\.bin$', '\.elf$'] |
| 40 | 409 " }}} |
| 410 " Vim - Rspec {{{ | |
| 0 | 411 map <leader>t :call RunCurrentSpecFile()<CR> |
| 412 map <leader>s :call RunNearestSpec()<CR> | |
| 413 map <leader>l :call RunLastSpec()<CR> | |
| 414 map <leader>r :call RunAllSpecs()<CR> | |
| 40 | 415 " }}} |
| 416 " Cucumber {{{ | |
| 0 | 417 map <leader>f :call RunAllFeatures()<CR> |
| 418 map <leader>k :call RunCurrentFeature()<CR> | |
| 40 | 419 " }}} |
| 80 | 420 " Ctrl P - Fuzzy file finder {{{ |
| 0 | 421 noremap <C-p> :CtrlP<CR> |
| 422 let g:ctrl_map = '<c-p>' | |
| 423 let g:ctrl_cmd = 'CtrlP' | |
| 424 | |
| 38 | 425 let g:ctrlp_working_path=0 |
| 33 | 426 nnoremap <C-o> :CtrlPBuffer<CR> |
|
32
2da8d8daa033
Add remaps to vim and aliases to zsh
zegervdv <zegervdv@me.com>
parents:
29
diff
changeset
|
427 " map <C-m> :CtrlPTag<CR> |
| 0 | 428 |
| 5 | 429 if executable('ag') |
| 430 let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""' | |
| 431 let g:ctrlp_use_caching = 0 | |
| 432 endif | |
| 433 | |
| 80 | 434 let g:ctrlp_custom_ignore = { |
| 435 \ 'dir': '\v[\/]\.(git|hg|svn)$', | |
| 436 \ 'file': '\v\.(exe|so|dll)$', | |
| 437 \ } | |
| 438 | |
| 0 | 439 " ctrl p - Commands |
| 440 map <leader>p :CtrlPCmdPalette<CR> | |
| 40 | 441 " }}} |
| 442 " Markdown {{{ | |
| 0 | 443 let g:vim_markdown_folding_disabled=1 |
| 40 | 444 " }}} |
| 445 " tComment {{{ | |
| 0 | 446 nmap <leader>c <C-_><C-_> |
| 40 | 447 " }}} |
| 448 " Neo Complete {{{ | |
| 29 | 449 let g:acp_enableAtStartup = 0 |
| 450 let g:neocomplete#enable_at_startup = 1 | |
| 451 let g:neocomplete#enable_smart_case = 1 | |
| 452 let g:neocomplete#enable_fuzzy_completion = 1 | |
| 453 let g:neocomplete#sources#syntax#min_keyword_length = 3 | |
| 454 let g:neocomplete#lock_buffer_name_pattern = '\*ku\*' | |
| 0 | 455 |
| 456 " Define dictionary. | |
| 457 let g:neocomplete#sources#dictionary#dictionaries = { | |
| 458 \ 'default' : '', | |
| 459 \ 'vimshell' : $HOME.'/.vimshell_hist', | |
| 460 \ 'scheme' : $HOME.'/.gosh_completions' | |
| 461 \ } | |
| 27 | 462 |
| 463 " Define keyword. | |
| 464 if !exists('g:neocomplete#keyword_patterns') | |
| 465 let g:neocomplete#keyword_patterns = {} | |
| 466 endif | |
| 467 | |
| 468 let g:neocomplete#keyword_patterns['default'] = '\h\w*' | |
| 0 | 469 " Recommended key-mappings. |
| 470 " <CR>: close popup and save indent. | |
| 471 inoremap <silent> <CR> <C-r>=<SID>my_cr_function()<CR> | |
| 472 function! s:my_cr_function() | |
| 29 | 473 " return neocomplete#close_popup() . "\<CR>" |
| 0 | 474 " For no inserting <CR> key. |
| 29 | 475 return pumvisible() ? neocomplete#close_popup() : "\<CR>" |
| 0 | 476 endfunction |
| 477 " <TAB>: completion. | |
| 478 inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>" | |
| 479 " <C-h>, <BS>: close popup and delete backword char. | |
| 480 inoremap <expr><C-h> neocomplete#smart_close_popup()."\<C-h>" | |
| 481 | |
| 45 | 482 if !exists('g:neocomplete#force_omni_input_patterns') |
| 483 let g:neocomplete#force_omni_input_patterns = {} | |
| 484 endif | |
| 485 let g:neocomplete#force_overwrite_completefunc = 1 | |
| 69 | 486 " let g:neocomplete#force_omni_input_patterns.c = |
| 487 " \ '[^.[:digit:] *\t]\%(\.\|->\)\w*' | |
| 45 | 488 let g:neocomplete#force_omni_input_patterns.cpp = |
| 489 \ '[^.[:digit:] *\t]\%(\.\|->\)\w*\|\h\w*::\w*' | |
| 490 let g:neocomplete#force_omni_input_patterns.objc = | |
| 491 \ '[^.[:digit:] *\t]\%(\.\|->\)\w*' | |
| 492 let g:neocomplete#force_omni_input_patterns.objcpp = | |
| 493 \ '[^.[:digit:] *\t]\%(\.\|->\)\w*\|\h\w*::\w*' | |
| 69 | 494 |
|
72
808e110f4171
Replace clang_complete with marching
zegervdv <zegervdv@me.com>
parents:
69
diff
changeset
|
495 let g:marching_enable_neocomplete = 1 |
| 28 | 496 |
| 0 | 497 autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS |
| 498 autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags | |
| 499 autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS | |
| 500 autocmd FileType python setlocal omnifunc=pythoncomplete#Complete | |
| 501 autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags | |
| 502 autocmd FileType ruby setlocal omnifunc=rubycomplete#Complete | |
| 503 if !exists('g:neocomplete#sources#omni#input_patterns') | |
| 504 let g:neocomplete#sources#omni#input_patterns = {} | |
| 505 endif | |
| 506 | |
| 26 | 507 " autocmd FileType c NeoCompleteTagMakeCache |
| 40 | 508 " }}} |
| 509 " Neo Snippets {{{ | |
| 0 | 510 imap <C-k> <Plug>(neosnippet_expand_or_jump) |
| 511 smap <C-k> <Plug>(neosnippet_expand_or_jump) | |
| 512 xmap <C-k> <Plug>(neosnippet_expand_target) | |
| 513 | |
|
23
4112c6eb9f47
Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents:
22
diff
changeset
|
514 " imap <expr><TAB> neosnippet#expandable_or_jumpable() ? |
|
4112c6eb9f47
Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents:
22
diff
changeset
|
515 " \ "\<Plug>(neosnippet_expand_or_jump)" |
|
4112c6eb9f47
Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents:
22
diff
changeset
|
516 " \: pumvisible() ? "\<C-n>" : "\<TAB>" |
|
4112c6eb9f47
Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents:
22
diff
changeset
|
517 " smap <expr><TAB> neosnippet#expandable_or_jumpable() ? |
|
4112c6eb9f47
Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents:
22
diff
changeset
|
518 " \ "\<Plug>(neosnippet_expand_or_jump)" |
|
4112c6eb9f47
Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents:
22
diff
changeset
|
519 " \: "\<TAB>" |
|
4112c6eb9f47
Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents:
22
diff
changeset
|
520 |
|
4112c6eb9f47
Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents:
22
diff
changeset
|
521 |
|
4112c6eb9f47
Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents:
22
diff
changeset
|
522 imap <expr><TAB> neosnippet#expandable() == 1 ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>" |
|
4112c6eb9f47
Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents:
22
diff
changeset
|
523 imap <expr><C-k> neosnippet#expandable_or_jumpable() == 1 ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>" |
|
4112c6eb9f47
Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents:
22
diff
changeset
|
524 smap <expr><TAB> neosnippet#expandable() == 1 ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>" |
| 0 | 525 let g:neocomplete#sources#omni#input_patterns.ruby = '[^. *\t]\.\w*\|\h\w*::' |
| 526 | |
| 527 let g:neosnippet#snippets_directory='~/.vim/snippets' | |
| 40 | 528 " }}} |
| 529 " Tabular {{{ | |
| 0 | 530 inoremap <silent> <Bar> <Bar><Esc>:call <SID>align()<CR>a |
| 531 | |
| 532 function! s:align() | |
| 533 let p = '^\s*|\s.*\s|\s*$' | |
| 534 if exists(':Tabularize') && getline('.') =~# '^\s*|' && (getline(line('.')-1) =~# p || getline(line('.')+1) =~# p) | |
| 535 let column = strlen(substitute(getline('.')[0:col('.')],'[^|]','','g')) | |
| 536 let position = strlen(matchstr(getline('.')[0:col('.')],'.*|\s*\zs.*')) | |
| 537 Tabularize/|/l1 | |
| 538 normal! 0 | |
| 539 call search(repeat('[^|]*|',column).'\s\{-\}'.repeat('.',position),'ce',line('.')) | |
| 540 endif | |
| 541 endfunction | |
| 542 | |
| 543 " Align Migration files | |
| 544 vmap <c-a> :Tabularize /:/l1l0l0<CR> | |
| 545 | |
| 546 nmap <Leader>a= :Tabularize /=<CR> | |
| 547 vmap <Leader>a= :Tabularize /=<CR> | |
| 548 nmap <Leader>a=> :Tabularize /=><CR> | |
| 549 vmap <Leader>a=> :Tabularize /=><CR> | |
| 550 nmap <Leader>a: :Tabularize /:\zs/l0l1<CR> | |
| 551 vmap <Leader>a: :Tabularize /:\zs/l0l1<CR> | |
| 552 nmap <Leader>a, :Tabularize /,\zs/l0l1<CR> | |
| 553 vmap <Leader>a, :Tabularize /,\zs/l0l1<CR> | |
| 554 vmap <Leader>a- :Tabularize /-<CR> | |
| 40 | 555 " }}} |
| 556 " Latex plugin {{{ | |
| 0 | 557 au BufNewFile,BufRead,BufEnter *.tex setlocal spell spelllang=en_gb |
| 558 au BufNewFile,BufRead,BufEnter *.tex setlocal textwidth=0 | |
| 559 au BufNewFile,BufRead,BufEnter *.txt setlocal spell spelllang=en_gb | |
| 560 au BufNewFile,BufRead,BufEnter *.txt setlocal textwidth=0 | |
| 561 | |
| 562 let g:tex_conseal = "" | |
| 563 | |
| 564 let g:tex_comment_nospell=1 | |
| 565 let g:Tex_DefaultTargetFormat = 'pdf' | |
| 566 let g:tex_flavor = 'latex' | |
| 567 let g:Tex_TreatMacViewerAsUNIX = 1 | |
| 568 let g:Tex_ExecuterUNIXViewerInForeground = 1 | |
| 47 | 569 " let g:Tex_ViewRule_pdf = 'open -a Preview' |
| 570 let g:Tex_ViewRule_pdf = 'open -a /Applications/TeX/TeXShop.app' | |
| 571 | |
| 0 | 572 let g:Tex_ViewRule_ps = 'open -a Preview' |
| 47 | 573 |
| 574 nnoremap <leader>m :w<CR>:!rubber --pdf --warn all %<CR> | |
| 40 | 575 " }}} |
| 576 " Tagbar {{{ | |
| 0 | 577 nmap <F8> :TagbarToggle<CR> |
| 40 | 578 " }}} |
| 579 " Gundo tree {{{ | |
| 0 | 580 nnoremap <leader>u :GundoToggle<CR> |
| 40 | 581 " }}} |
| 582 " Smalls {{{ | |
| 13 | 583 nmap s <Plug>(smalls) |
| 584 omap s <Plug>(smalls) | |
| 585 xmap s <Plug>(smalls) | |
| 40 | 586 " }}} |
| 587 " Textmanip {{{ | |
|
14
09c60bc0fc38
Add vim-textmanip for visual block dragging
zegervdv <zegervdv@me.com>
parents:
13
diff
changeset
|
588 xmap <C-j> <Plug>(textmanip-move-down) |
|
09c60bc0fc38
Add vim-textmanip for visual block dragging
zegervdv <zegervdv@me.com>
parents:
13
diff
changeset
|
589 xmap <C-k> <Plug>(textmanip-move-up) |
|
09c60bc0fc38
Add vim-textmanip for visual block dragging
zegervdv <zegervdv@me.com>
parents:
13
diff
changeset
|
590 xmap <C-h> <Plug>(textmanip-move-left) |
|
09c60bc0fc38
Add vim-textmanip for visual block dragging
zegervdv <zegervdv@me.com>
parents:
13
diff
changeset
|
591 xmap <C-l> <Plug>(textmanip-move-right) |
|
09c60bc0fc38
Add vim-textmanip for visual block dragging
zegervdv <zegervdv@me.com>
parents:
13
diff
changeset
|
592 xmap <F10> <Plug>(textmanip-toggle-mode) |
| 40 | 593 " }}} |
| 594 " Startify {{{ | |
| 27 | 595 let g:startify_session_dir = "~/.vim/sessions" |
| 596 " }}} | |
| 54 | 597 " Vimwiki {{{ |
| 598 let g:vimwiki_list=[{'path':'$HOME/.vimwiki'}] | |
| 599 " }}} | |
|
58
b657d43a4fcb
Stop asking to save current session
zegervdv <zegervdv@me.com>
parents:
54
diff
changeset
|
600 " Vim Sessions {{{ |
|
b657d43a4fcb
Stop asking to save current session
zegervdv <zegervdv@me.com>
parents:
54
diff
changeset
|
601 let g:session_autosave = 'no' |
|
b657d43a4fcb
Stop asking to save current session
zegervdv <zegervdv@me.com>
parents:
54
diff
changeset
|
602 " }}} |
| 27 | 603 |
| 13 | 604 " Load local vimrc |
|
3
44d3af8838f8
Add support for local zshrc and vimrc files
zegervdv <zegervdv@me.com>
parents:
0
diff
changeset
|
605 if filereadable($HOME . "/.vimrc.local") |
|
44d3af8838f8
Add support for local zshrc and vimrc files
zegervdv <zegervdv@me.com>
parents:
0
diff
changeset
|
606 source ~/.vimrc.local |
|
44d3af8838f8
Add support for local zshrc and vimrc files
zegervdv <zegervdv@me.com>
parents:
0
diff
changeset
|
607 endif |
| 24 | 608 |