Mercurial > dotfiles.old

annotate vimrc @ 193:0c8211e1c67a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update look of tmux
author zegervdv <zegervdv@me.com>
date Tue, 11 Nov 2014 17:18:32 +0100
parents 4a74a83e6e36
children f51c1b5e0891
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
187
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
2 " Vim-Plug {{{
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
3 let g:plug_window='topleft new'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
4 call plug#begin('~/.vim/plugged')
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
5 " General Plugins
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
6 Plug 'tpope/vim-sensible'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
7 Plug 'tpope/vim-abolish'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
8 Plug 'bling/vim-airline'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
9 Plug 'tomtom/tcomment_vim'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
10 Plug 'tpope/vim-fugitive'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
11 Plug 'godlygeek/tabular'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
12 Plug 'tpope/vim-endwise'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
13 Plug 'tpope/vim-surround'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
14 Plug 'jiangmiao/auto-pairs'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
15 Plug 'kshenoy/vim-signature'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
16 Plug 'tpope/vim-repeat'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
17 Plug 't9md/vim-smalls'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
18 Plug 'mhinz/vim-startify'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
19 Plug 'xolox/vim-session'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
20 Plug 'tpope/vim-eunuch'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
21 Plug 'junegunn/vim-after-object'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
22 Plug 'scrooloose/syntastic'
191
4a74a83e6e36 Fix statusline quirks
zegervdv <zegervdv@me.com>
parents: 190
diff changeset
23 Plug 'chriskempson/base16-vim'
187
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
24 " Undo
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
25 Plug 'sjl/gundo.vim', { 'on': 'GundoToggle' }
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
26
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
27 " Tmux
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
28 Plug 'benmills/vimux', { 'on': 'VimuxRunCommand' }
191
4a74a83e6e36 Fix statusline quirks
zegervdv <zegervdv@me.com>
parents: 190
diff changeset
29 Plug 'edkolev/tmuxline.vim'
189
925861e874ec Add vim-tmux-navigator for seamless navigation
zegervdv <zegervdv@me.com>
parents: 188
diff changeset
30 Plug 'christoomey/vim-tmux-navigator'
187
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
31
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
32 " Search and Complete
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
33 Plug 'Shougo/neocomplete'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
34 Plug 'Shougo/neosnippet'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
35 Plug 'Shougo/neosnippet-snippets'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
36 Plug 'Shougo/vimproc', { 'do': 'make' }
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
37 Plug 'Shougo/unite.vim'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
38 Plug 'Shougo/vimfiler.vim'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
39 Plug 'Shougo/unite-outline'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
40 Plug 'tsukkee/unite-tag'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
41
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
42 " Ruby
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
43 Plug 'tpope/vim-rails', { 'for': 'ruby' }
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
44 Plug 'vim-ruby/vim-ruby', { 'for': 'ruby' }
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
45 Plug 'tpope/vim-bundler', { 'for': 'ruby' }
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
46 Plug 'tpope/vim-rake', { 'for': 'ruby' }
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
47 Plug 'slim-template/vim-slim', { 'for': 'ruby' }
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
48 Plug 'duwanis/tomdoc.vim', { 'for': 'ruby' }
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
49
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
50 " Markdown
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
51 Plug 'tpope/vim-markdown', { 'for': 'markdown' }
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
52
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
53 " C
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
54 Plug 'vim-scripts/a.vim', { 'for': 'c' }
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
55 Plug 'osyo-manga/vim-reunions', { 'for': 'c' }
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
56 Plug 'osyo-manga/vim-marching', { 'for': 'c' }
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
57
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
58 " Python
188
51d25ca2f262 Updates to tmuxline config
zegervdv <zegervdv@me.com>
parents: 187
diff changeset
59 " Plug 'davidhalter/jedi-vim', { 'for': 'python' }
187
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
60
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
61 " Coffeescript
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
62 Plug 'kchmck/vim-coffee-script', { 'for': 'coffeescript' }
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
63
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
64 " Dependencies
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
65 Plug 'MarcWeber/vim-addon-mw-utils'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
66 Plug 'tomtom/tlib_vim'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
67
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
68 Plug 'xolox/vim-misc'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
69 Plug 'tpope/vim-git'
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
70
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
71
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
72 call plug#end()
e3639166a8ab Remove pathogen in favour of Vim-plug
zegervdv <zegervdv@me.com>
parents: 183
diff changeset
73 " }}}
27
d75ec1f32cae Add folds to vimrc
zegervdv <zegervdv@me.com>
parents: 26
diff changeset
74 " General Settings {{{
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
75 set nocompatible
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
76 set laststatus=2
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
77 set noshowmode
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
78
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
79 set backspace=2
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
80 set autowrite
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
81
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
82 set vb
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
83 set guioptions-=r
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
84 set guioptions-=l
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
85 set guioptions-=R
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
86 set guioptions-=L
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
87
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
88 syntax on
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
89 set expandtab
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
90 set number
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
91 set ruler
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
92 set nocursorline
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
93 set showmatch
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
94 set title
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
95 set wrap
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
96 set wrapmargin=2
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
97 set linebreak
147
0d420021bd5d Add breakindent
zegervdv <zegervdv@me.com>
parents: 146
diff changeset
98 set breakindent
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
99 set lbr
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
100 set tabstop=2 shiftwidth=2
193
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
101
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
102 " Layout
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
103 set t_Co=256
191
4a74a83e6e36 Fix statusline quirks
zegervdv <zegervdv@me.com>
parents: 190
diff changeset
104 set background=dark
4a74a83e6e36 Fix statusline quirks
zegervdv <zegervdv@me.com>
parents: 190
diff changeset
105 color Tomorrow-Night
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
106 set guifont=Inconsolata\ for\ Powerline:h12
193
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
107 " Make background color same as terminal ("transparent")
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
108 " hi Normal ctermbg=none
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
109
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
110 set autowrite
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
111 set hidden
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
112 set hlsearch
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
113 set incsearch
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
114 set ignorecase
32
2da8d8daa033 Add remaps to vim and aliases to zsh
zegervdv <zegervdv@me.com>
parents: 29
diff changeset
115 set gdefault
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
116 set smartcase
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
117 set smartindent
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
118 set autoindent
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
119 set scrolloff=4
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
120 set textwidth=80
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
121
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
122 set history=100
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
123 set wildmenu
19
4ee5a11d8355 Improvements
zegervdv <zegervdv@me.com>
parents: 18
diff changeset
124 set wildmode=full
79
7d3ded16eaa2 Fix git and ctags hooks
zegervdv <zegervdv@me.com>
parents: 72
diff changeset
125 set ttyfast
85
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
126 set lazyredraw
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
127
174
e4c677e2acde Fix slow mapping with space
zegervdv <zegervdv@me.com>
parents: 172
diff changeset
128 set ttimeoutlen=10
e4c677e2acde Fix slow mapping with space
zegervdv <zegervdv@me.com>
parents: 172
diff changeset
129 " Set the timeout to a minimum
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
130 set diffopt+=iwhite
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
131
79
7d3ded16eaa2 Fix git and ctags hooks
zegervdv <zegervdv@me.com>
parents: 72
diff changeset
132 set tags=.git/tags
7d3ded16eaa2 Fix git and ctags hooks
zegervdv <zegervdv@me.com>
parents: 72
diff changeset
133
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
134 set formatoptions=
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
135 set formatoptions+=c " Format comments
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
136 set formatoptions+=r " Continue comments by default
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
137 set formatoptions+=o " Make comment when using o or O from comment line
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
138 set formatoptions+=q " Format comments with gq
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
139 set formatoptions+=n " Recognize numbered lists
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
140 set formatoptions+=2 " Use indent from 2nd line of a paragraph
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
141 set formatoptions+=l " Don't break lines that are already long
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
142 set formatoptions+=1 " Break before 1-letter words
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
143
182
3dc6a4eec6ac Reload options from sessions
zegervdv <zegervdv@me.com>
parents: 180
diff changeset
144
3dc6a4eec6ac Reload options from sessions
zegervdv <zegervdv@me.com>
parents: 180
diff changeset
145 set sessionoptions-=options
3dc6a4eec6ac Reload options from sessions
zegervdv <zegervdv@me.com>
parents: 180
diff changeset
146
92
afe2d02577c2 Small fixes to vimrc
zegervdv <zegervdv@me.com>
parents: 91
diff changeset
147 set complete+=kspell
afe2d02577c2 Small fixes to vimrc
zegervdv <zegervdv@me.com>
parents: 91
diff changeset
148
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
149 set splitright
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
150 set virtualedit=block
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
151 set conceallevel=0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
152
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
153 set cryptmethod=blowfish
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
154
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
155 filetype plugin indent on
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
156 autocmd FileType ruby set tabstop=2|set shiftwidth=2
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
157
107
508b8bc6ffd5 Improve mapping for split windows
zegervdv <zegervdv@me.com>
parents: 104
diff changeset
158 set pastetoggle=<F2>
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
159 set clipboard=unnamed
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
160
32
2da8d8daa033 Add remaps to vim and aliases to zsh
zegervdv <zegervdv@me.com>
parents: 29
diff changeset
161 set undofile
16
17afab9bd228 Open vim at last known position
zegervdv <zegervdv@me.com>
parents: 14
diff changeset
162 set viminfo='10,\"100,:20,%,n~/.viminfo
188
51d25ca2f262 Updates to tmuxline config
zegervdv <zegervdv@me.com>
parents: 187
diff changeset
163 set backupdir=/tmp//,.
51d25ca2f262 Updates to tmuxline config
zegervdv <zegervdv@me.com>
parents: 187
diff changeset
164 set directory=/tmp//,.
51d25ca2f262 Updates to tmuxline config
zegervdv <zegervdv@me.com>
parents: 187
diff changeset
165 if v:version >= 703
51d25ca2f262 Updates to tmuxline config
zegervdv <zegervdv@me.com>
parents: 187
diff changeset
166 set undodir=/tmp//,.
51d25ca2f262 Updates to tmuxline config
zegervdv <zegervdv@me.com>
parents: 187
diff changeset
167 endif
80
16edf05ad21a Fix errors with prompt
zegervdv <zegervdv@me.com>
parents: 79
diff changeset
168 set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.o,*.bin,*.elf,*.hex
16edf05ad21a Fix errors with prompt
zegervdv <zegervdv@me.com>
parents: 79
diff changeset
169
154
6355d2b31b9a Add two space sentence limiting
zegervdv <zegervdv@me.com>
parents: 152
diff changeset
170 " Sentences are ended with double spaces
6355d2b31b9a Add two space sentence limiting
zegervdv <zegervdv@me.com>
parents: 152
diff changeset
171 set cpo+=J
6355d2b31b9a Add two space sentence limiting
zegervdv <zegervdv@me.com>
parents: 152
diff changeset
172
32
2da8d8daa033 Add remaps to vim and aliases to zsh
zegervdv <zegervdv@me.com>
parents: 29
diff changeset
173 " set list
91
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
174 " set listchars=tab:▸\ ,eol:¬
27
d75ec1f32cae Add folds to vimrc
zegervdv <zegervdv@me.com>
parents: 26
diff changeset
175 " }}}
d75ec1f32cae Add folds to vimrc
zegervdv <zegervdv@me.com>
parents: 26
diff changeset
176 " Custom remaps and tricks {{{
101
368f742876cf Disable Latex plugin
zegervdv <zegervdv@me.com>
parents: 100
diff changeset
177 " Enable spelling only for latex and text
368f742876cf Disable Latex plugin
zegervdv <zegervdv@me.com>
parents: 100
diff changeset
178 au BufNewFile,BufRead,BufEnter *.tex setlocal spell spelllang=en_gb
368f742876cf Disable Latex plugin
zegervdv <zegervdv@me.com>
parents: 100
diff changeset
179 au BufNewFile,BufRead,BufEnter *.tex setlocal textwidth=0
368f742876cf Disable Latex plugin
zegervdv <zegervdv@me.com>
parents: 100
diff changeset
180 au BufNewFile,BufRead,BufEnter *.txt setlocal spell spelllang=en_gb
368f742876cf Disable Latex plugin
zegervdv <zegervdv@me.com>
parents: 100
diff changeset
181 au BufNewFile,BufRead,BufEnter *.txt setlocal textwidth=0
190
35664e63555d Small fixes to vimrc
zegervdv <zegervdv@me.com>
parents: 189
diff changeset
182 au FileType gitcommit setlocal spell spelllang=en_gb
101
368f742876cf Disable Latex plugin
zegervdv <zegervdv@me.com>
parents: 100
diff changeset
183
171
1e77456c253b Fixes to vimrc
zegervdv <zegervdv@me.com>
parents: 169
diff changeset
184 autocmd BufRead *_spec.rb set filetype=rspec
1e77456c253b Fixes to vimrc
zegervdv <zegervdv@me.com>
parents: 169
diff changeset
185
140
e037d9b797eb Fix colors and clipboad in vim and tmux
zegervdv <zegervdv@me.com>
parents: 135
diff changeset
186 highlight SpellBad ctermbg=256 ctermfg=210
e037d9b797eb Fix colors and clipboad in vim and tmux
zegervdv <zegervdv@me.com>
parents: 135
diff changeset
187 highlight SpellLocal ctermbg=240 ctermfg=010
101
368f742876cf Disable Latex plugin
zegervdv <zegervdv@me.com>
parents: 100
diff changeset
188
16
17afab9bd228 Open vim at last known position
zegervdv <zegervdv@me.com>
parents: 14
diff changeset
189 " When editing a file, always jump to the last known cursor position.
17afab9bd228 Open vim at last known position
zegervdv <zegervdv@me.com>
parents: 14
diff changeset
190 " Don't do it for commit messages, when the position is invalid, or when
17afab9bd228 Open vim at last known position
zegervdv <zegervdv@me.com>
parents: 14
diff changeset
191 " inside an event handler (happens when dropping a file on gvim).
17afab9bd228 Open vim at last known position
zegervdv <zegervdv@me.com>
parents: 14
diff changeset
192 autocmd BufReadPost *
146
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
193 \ if &ft != 'gitcommit' && line("'\"") > 0 && line("'\"") <= line("$") |
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
194 \ exe "normal g`\"" |
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
195 \ endif
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
196
168
27f78c20b486 Use SPACE as mapleader
zegervdv <zegervdv@me.com>
parents: 164
diff changeset
197 " Set leader to space
174
e4c677e2acde Fix slow mapping with space
zegervdv <zegervdv@me.com>
parents: 172
diff changeset
198 " let mapleader = " "
e4c677e2acde Fix slow mapping with space
zegervdv <zegervdv@me.com>
parents: 172
diff changeset
199 map <space> <leader>
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
200
175
a7247b4a7e69 Fix issue with mapping where vim would hang on unmapped <leader> keys
zegervdv <zegervdv@me.com>
parents: 174
diff changeset
201 " Fix weird error where space n hangs vim with search
a7247b4a7e69 Fix issue with mapping where vim would hang on unmapped <leader> keys
zegervdv <zegervdv@me.com>
parents: 174
diff changeset
202 noremap <space>n <nop>
a7247b4a7e69 Fix issue with mapping where vim would hang on unmapped <leader> keys
zegervdv <zegervdv@me.com>
parents: 174
diff changeset
203
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
204 " See long lines as line breaks
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
205 map j gj
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
206 map k gk
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
207
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
208 " 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
209 " nmap <C-$> <C-]>
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
210 function! JumpToTagInSplit()
146
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
211 execute "normal! \<c-w>v\<c-]>mzzMzvzz15\<c-e>"
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
212 execute "keepjumps normal! `z"
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
213 Pulse
85
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
214 endfunction
94
c31e63aba1dd Use better colors for matching parentheses
zegervdv <zegervdv@me.com>
parents: 93
diff changeset
215 nnoremap <C-$> :silent! call JumpToTagInSplit()<CR>
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
216
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
217 " Jump to end of line in insert mode
33
3bc2e4f5cc59 Update latex template
zegervdv <zegervdv@me.com>
parents: 32
diff changeset
218 inoremap <C-a> <C-o>I
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
219 inoremap <C-e> <C-o>A
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
220
33
3bc2e4f5cc59 Update latex template
zegervdv <zegervdv@me.com>
parents: 32
diff changeset
221 nnoremap <C-a> ^
3bc2e4f5cc59 Update latex template
zegervdv <zegervdv@me.com>
parents: 32
diff changeset
222 nnoremap <C-e> $
3bc2e4f5cc59 Update latex template
zegervdv <zegervdv@me.com>
parents: 32
diff changeset
223
92
afe2d02577c2 Small fixes to vimrc
zegervdv <zegervdv@me.com>
parents: 91
diff changeset
224 nnoremap <C-s> <C-e>
afe2d02577c2 Small fixes to vimrc
zegervdv <zegervdv@me.com>
parents: 91
diff changeset
225
33
3bc2e4f5cc59 Update latex template
zegervdv <zegervdv@me.com>
parents: 32
diff changeset
226 nnoremap + <C-a>
3bc2e4f5cc59 Update latex template
zegervdv <zegervdv@me.com>
parents: 32
diff changeset
227
3bc2e4f5cc59 Update latex template
zegervdv <zegervdv@me.com>
parents: 32
diff changeset
228 " Jump out of inner bracket
3bc2e4f5cc59 Update latex template
zegervdv <zegervdv@me.com>
parents: 32
diff changeset
229 inoremap <C-f> <ESC>%%a
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
230
4
050d4d8c6796 Vim: use double space to alternate files
zegervdv <zegervdv@me.com>
parents: 3
diff changeset
231 " 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
232 nnoremap <leader><leader> <C-^>
146
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
233 " Move between buffers
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
234 nnoremap gb :bnext<CR>
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
235 nnoremap gB :bprevious<CR>
4
050d4d8c6796 Vim: use double space to alternate files
zegervdv <zegervdv@me.com>
parents: 3
diff changeset
236
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
237 " Very Magic search patterns
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
238 nmap / /\v
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
239 cmap s/ s/\v
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
240
85
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
241 " 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
242 nnoremap n nzzzv
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
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
245 " Clear highlight
177
ca5bd373473e Add function to search for word under cursor with Ag
zegervdv <zegervdv@me.com>
parents: 176
diff changeset
246 nnoremap <silent><leader>l :noh<CR>
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
247
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
248 inoremap £ \
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
249
32
2da8d8daa033 Add remaps to vim and aliases to zsh
zegervdv <zegervdv@me.com>
parents: 29
diff changeset
250 nnoremap <TAB> %
2da8d8daa033 Add remaps to vim and aliases to zsh
zegervdv <zegervdv@me.com>
parents: 29
diff changeset
251 vnoremap <TAB> %
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
252
107
508b8bc6ffd5 Improve mapping for split windows
zegervdv <zegervdv@me.com>
parents: 104
diff changeset
253 " Move between splits
189
925861e874ec Add vim-tmux-navigator for seamless navigation
zegervdv <zegervdv@me.com>
parents: 188
diff changeset
254 " map <C-j> <C-w>j
925861e874ec Add vim-tmux-navigator for seamless navigation
zegervdv <zegervdv@me.com>
parents: 188
diff changeset
255 " map <C-k> <C-w>k
925861e874ec Add vim-tmux-navigator for seamless navigation
zegervdv <zegervdv@me.com>
parents: 188
diff changeset
256 " map <C-l> <C-w>l
925861e874ec Add vim-tmux-navigator for seamless navigation
zegervdv <zegervdv@me.com>
parents: 188
diff changeset
257 " map <C-h> <C-w>h
34
3ed98613040a Add mapping to switch between tabs in vim
zegervdv <zegervdv@me.com>
parents: 33
diff changeset
258
33
3bc2e4f5cc59 Update latex template
zegervdv <zegervdv@me.com>
parents: 32
diff changeset
259 " highlight last inserted text
3bc2e4f5cc59 Update latex template
zegervdv <zegervdv@me.com>
parents: 32
diff changeset
260 nnoremap gV `[v`]
3bc2e4f5cc59 Update latex template
zegervdv <zegervdv@me.com>
parents: 32
diff changeset
261
3bc2e4f5cc59 Update latex template
zegervdv <zegervdv@me.com>
parents: 32
diff changeset
262 " Briefly change colour of last highlight
94
c31e63aba1dd Use better colors for matching parentheses
zegervdv <zegervdv@me.com>
parents: 93
diff changeset
263 " nnoremap <silent> n n:call HLNext(0.4)<cr>
c31e63aba1dd Use better colors for matching parentheses
zegervdv <zegervdv@me.com>
parents: 93
diff changeset
264 " nnoremap <silent> N N:call HLNext(0.4)<cr>
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
265
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
266 function! HLNext (blinktime)
146
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
267 highlight WhiteOnRed ctermfg=white ctermbg=red guifg=white guibg=red
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
268 let [bufnum, lnum, col, off] = getpos('.')
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
269 let matchlen = strlen(matchstr(strpart(getline('.'),col-1),@/))
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
270 let target_pat = '\c\%#'.@/
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
271 let ring = matchadd('WhiteOnRed', target_pat, 101)
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
272 redraw
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
273 exec 'sleep ' . float2nr(a:blinktime * 1000) . 'm'
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
274 call matchdelete(ring)
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
275 redraw
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
276 endfunction
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
277
94
c31e63aba1dd Use better colors for matching parentheses
zegervdv <zegervdv@me.com>
parents: 93
diff changeset
278 " Highlight matching parenthesis in different color so I don't mess up
107
508b8bc6ffd5 Improve mapping for split windows
zegervdv <zegervdv@me.com>
parents: 104
diff changeset
279 hi MatchParen cterm=underline ctermbg=none ctermfg=white gui=underline guibg=black guifg=white
94
c31e63aba1dd Use better colors for matching parentheses
zegervdv <zegervdv@me.com>
parents: 93
diff changeset
280
85
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
281 " Highlight VCS conflict markers
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
282 match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
283
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
284 " Swap v and CTRL-V
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
285 nnoremap v <C-V>
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
286 nnoremap <C-V> v
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
287
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
288 vnoremap v <C-V>
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
289 vnoremap <C-V> v
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
290
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
291 " Use backspace as delete in visual mode
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
292 vmap <BS> x
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
293
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
294 " Keep selection when shifting
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
295 vmap <expr> > KeepVisualSelection(">")
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
296 vmap <expr> < KeepVisualSelection("<")
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
297
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
298 function! KeepVisualSelection(cmd)
146
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
299 set nosmartindent
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
300 if mode() ==# "V"
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
301 return a:cmd . ":set smartindent\<CR>gv"
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
302 else
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
303 return a:cmd . ":set smartindent\<CR>"
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
304 endif
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
305 endfunction
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
306
42
4c3b25554bbb Enable smart folding
zegervdv <zegervdv@me.com>
parents: 40
diff changeset
307 au FileType c setl foldmethod=syntax
4c3b25554bbb Enable smart folding
zegervdv <zegervdv@me.com>
parents: 40
diff changeset
308
85
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
309 au VimResized * exe "normal! \<c-w>="
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
310
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
311 cnoremap <c-a> <home>
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
312 cnoremap <c-e> <end>
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
313
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
314 " Swap backticks and quotes
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
315 nnoremap ` '
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
316 nnoremap ' `
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
317
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
318 " 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
319 " 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
320 inoremap <C-u> <esc>mzgUiw`za
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
321
188
51d25ca2f262 Updates to tmuxline config
zegervdv <zegervdv@me.com>
parents: 187
diff changeset
322 nnoremap <leader>ev :split $MYVIMRC<cr>
85
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
323
178
899ac4d147ef Add mapping to move visually selected lines
zegervdv <zegervdv@me.com>
parents: 177
diff changeset
324 " Move lines from visual selection
899ac4d147ef Add mapping to move visually selected lines
zegervdv <zegervdv@me.com>
parents: 177
diff changeset
325 vnoremap <S-j> :m '>+1<CR>gv=gv
899ac4d147ef Add mapping to move visually selected lines
zegervdv <zegervdv@me.com>
parents: 177
diff changeset
326 vnoremap <S-k> :m '<-2<CR>gv=gv
899ac4d147ef Add mapping to move visually selected lines
zegervdv <zegervdv@me.com>
parents: 177
diff changeset
327
85
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
328 function! MyFoldText() " {{{
146
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
329 let line = getline(v:foldstart)
85
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
330
146
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
331 let nucolwidth = &fdc + &number * &numberwidth
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
332 let windowwidth = winwidth(0) - nucolwidth - 3
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
333 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
334
146
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
335 " expand tabs into spaces
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
336 let onetab = strpart(' ', 0, &tabstop)
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
337 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
338
146
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
339 let line = strpart(line, 0, windowwidth - 2 -len(foldedlinecount))
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
340 let fillcharcount = windowwidth - len(line) - len(foldedlinecount)
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
341 return line . '…' . repeat(" ",fillcharcount) . foldedlinecount . '…' . ' '
85
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
342 endfunction " }}}
8a5464ec3c29 Add vim mappings from https://bitbucket.org/sjl/dotfiles
zegervdv <zegervdv@me.com>
parents: 82
diff changeset
343 set foldtext=MyFoldText()
42
4c3b25554bbb Enable smart folding
zegervdv <zegervdv@me.com>
parents: 40
diff changeset
344
122
5ec9c636da2a Revert "Add targets plugin"
zegervdv <zegervdv@me.com>
parents: 121
diff changeset
345 " VHDL ctags
5ec9c636da2a Revert "Add targets plugin"
zegervdv <zegervdv@me.com>
parents: 121
diff changeset
346 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'
127
39f36bd51c23 Fix folding in vimrc
zegervdv <zegervdv@me.com>
parents: 122
diff changeset
347 " }}}
101
368f742876cf Disable Latex plugin
zegervdv <zegervdv@me.com>
parents: 100
diff changeset
348 " Latex {{{
368f742876cf Disable Latex plugin
zegervdv <zegervdv@me.com>
parents: 100
diff changeset
349 " Compile using rubber
368f742876cf Disable Latex plugin
zegervdv <zegervdv@me.com>
parents: 100
diff changeset
350 nnoremap <leader>m :w<CR>:VimProcBang rubber --pdf --warn all %<CR>
368f742876cf Disable Latex plugin
zegervdv <zegervdv@me.com>
parents: 100
diff changeset
351 " Open pdf
104
ee15a19325bb Silence output of open pdf mapping for tex
zegervdv <zegervdv@me.com>
parents: 103
diff changeset
352 nnoremap <silent> <leader>v :silent !open %:r.pdf<CR><CR>
101
368f742876cf Disable Latex plugin
zegervdv <zegervdv@me.com>
parents: 100
diff changeset
353 " }}}
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
354 " Vim Math plugin; make simple calculations {{{
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
355 vmap <expr> ++ VMATH_YankAndAnalyse()
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
356 nmap ++ vip++
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
357 " }}}
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
358 " Airline configuration {{{
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
359 let g:airline_inactive_collapse=0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
360 let g:airline_powerline_fonts=1
193
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
361 let g:airline#extensions#tmuxline#enabled = 0
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
362
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
363 let g:airline_left_sep = ''
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
364 let g:airline_right_sep = ''
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
365
131
ccee6e9f0c1d fix colors in terminal vim
zegervdv <zegervdv@me.com>
parents: 130
diff changeset
366 if has("gui_running")
ccee6e9f0c1d fix colors in terminal vim
zegervdv <zegervdv@me.com>
parents: 130
diff changeset
367 let g:airline_theme = 'base16'
ccee6e9f0c1d fix colors in terminal vim
zegervdv <zegervdv@me.com>
parents: 130
diff changeset
368 else
ccee6e9f0c1d fix colors in terminal vim
zegervdv <zegervdv@me.com>
parents: 130
diff changeset
369 let g:airline_theme = 'tomorrow'
ccee6e9f0c1d fix colors in terminal vim
zegervdv <zegervdv@me.com>
parents: 130
diff changeset
370 endif
80
16edf05ad21a Fix errors with prompt
zegervdv <zegervdv@me.com>
parents: 79
diff changeset
371 let g:airline#extensions#syntastic#enabled = 1
146
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
372 let g:airline#extensions#tabline#enabled = 1
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
373 let g:airline#extensions#tabline#fnamemod = ':t'
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
374 let g:airline#extensions#tabline#left_sep = ''
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
375 let g:airline#extensions#tabline#left_alt_sep = ''
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
376 let g:airline#extensions#tabline#right_sep = ''
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
377 let g:airline#extensions#tabline#right_alt_sep = ''
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
378 " }}}
93
8278ded5eb8c Replace ctrlp and yankring with unite
zegervdv <zegervdv@me.com>
parents: 92
diff changeset
379 " Unite {{{
171
1e77456c253b Fixes to vimrc
zegervdv <zegervdv@me.com>
parents: 169
diff changeset
380 call unite#filters#matcher_default#use(['matcher_fuzzy'])
146
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
381 call unite#filters#sorter_default#use(['sorter_rank'])
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
382 " call unite#set_profile('files', 'smartcase', 1)
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
383 call unite#custom#profile('files', 'context.smartcase', 1)
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
384 call unite#custom#source('line,outline', 'matchers', 'matcher_fuzzy')
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
385 call unite#custom#source( 'buffer', 'converters', ['converter_file_directory'])
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
386 " sort file results by length
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
387 call unite#custom#source('file', 'sorters', 'sorter_length')
172
689a19d567c7 improve performance of unite
zegervdv <zegervdv@me.com>
parents: 171
diff changeset
388 call unite#custom#source('file_rec/async', 'converters', [])
689a19d567c7 improve performance of unite
zegervdv <zegervdv@me.com>
parents: 171
diff changeset
389 call unite#custom#source('file_rec/async', 'sorters', [])
689a19d567c7 improve performance of unite
zegervdv <zegervdv@me.com>
parents: 171
diff changeset
390 call unite#custom#source('file_rec/async', 'max_candidates', 20)
146
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
391 let g:unite_enable_start_insert=0
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
392 let g:unite_source_history_yank_enable=1
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
393 let g:unite_source_rec_max_cache_files=3000
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
394 let g:unite_prompt='» '
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
395 if executable('ag')
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
396 let g:unite_source_grep_command = 'ag'
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
397 let g:unite_source_grep_default_opts =
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
398 \ '-i --line-numbers --nocolor --nogroup --hidden --ignore ' .
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
399 \ '''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
400 let g:unite_source_grep_recursive_opt = ''
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
401 let g:unite_source_rec_async_command = 'ag --nocolor --nogroup --hidden -g ""'
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
402 elseif executable('ack')
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
403 let g:unite_source_grep_command='ack'
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
404 let g:unite_source_grep_default_opts='--no-heading --no-color -C4'
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
405 let g:unite_source_grep_recursive_opt=''
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
406 endif
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
407 function! s:unite_settings()
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
408 nmap <buffer> Q <plug>(unite_exit)
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
409 nmap <buffer> <esc> <plug>(unite_exit)
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
410 imap <buffer> <C-j> <Plug>(unite_select_next_line)
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
411 imap <buffer> <C-k> <Plug>(unite_select_previous_line)
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
412 endfunction
3333853b8bbe Use airline - tabline for buffer management
zegervdv <zegervdv@me.com>
parents: 144
diff changeset
413 autocmd FileType unite call s:unite_settings()
93
8278ded5eb8c Replace ctrlp and yankring with unite
zegervdv <zegervdv@me.com>
parents: 92
diff changeset
414
168
27f78c20b486 Use SPACE as mapleader
zegervdv <zegervdv@me.com>
parents: 164
diff changeset
415 nnoremap <silent> <SPACE>k :<C-u>Unite -auto-preview -buffer-name=recent file_mru<cr>
27f78c20b486 Use SPACE as mapleader
zegervdv <zegervdv@me.com>
parents: 164
diff changeset
416 nnoremap <silent> <leader>y :<C-u>Unite -buffer-name=yanks history/yank<cr>
176
f817460f011a Remap search to f
zegervdv <zegervdv@me.com>
parents: 175
diff changeset
417 nnoremap <silent> <leader>f :<C-u>Unite -no-quit -buffer-name=search grep:.<cr>
177
ca5bd373473e Add function to search for word under cursor with Ag
zegervdv <zegervdv@me.com>
parents: 176
diff changeset
418 nnoremap <silent> <leader>g :<C-u>Unite -no-quit -buffer-name=search grep:.<CR><C-r><C-w><CR>
168
27f78c20b486 Use SPACE as mapleader
zegervdv <zegervdv@me.com>
parents: 164
diff changeset
419 nnoremap <silent> <leader>o :<C-u>Unite outline<CR>
27f78c20b486 Use SPACE as mapleader
zegervdv <zegervdv@me.com>
parents: 164
diff changeset
420 nnoremap <silent> <leader>t :<C-u>Unite tag<CR>
171
1e77456c253b Fixes to vimrc
zegervdv <zegervdv@me.com>
parents: 169
diff changeset
421 nnoremap <silent> <C-p> :<C-u>Unite -start-insert buffer file_rec/async<CR>
174
e4c677e2acde Fix slow mapping with space
zegervdv <zegervdv@me.com>
parents: 172
diff changeset
422 " nnoremap <silent> <leader>h :<C-u>Unite ssh://Hurricane/STM-Quadcopter/source<CR>
e4c677e2acde Fix slow mapping with space
zegervdv <zegervdv@me.com>
parents: 172
diff changeset
423 " nnoremap <silent> <leader>i :<C-u>Unite ssh://imac-van-zeger.local/Documents<CR>
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
424 " }}}
103
e7c5a1fffc5e Add unite-build
zegervdv <zegervdv@me.com>
parents: 102
diff changeset
425 " Unite Build {{{
e7c5a1fffc5e Add unite-build
zegervdv <zegervdv@me.com>
parents: 102
diff changeset
426 " TODO: Create builders eg Latex, Vagrant?
e7c5a1fffc5e Add unite-build
zegervdv <zegervdv@me.com>
parents: 102
diff changeset
427 " }}}
98
235b862405f4 Add vimfiler and neossh
zegervdv <zegervdv@me.com>
parents: 97
diff changeset
428 " Vimfiler {{{
235b862405f4 Add vimfiler and neossh
zegervdv <zegervdv@me.com>
parents: 97
diff changeset
429 " Use vimfiler as default
235b862405f4 Add vimfiler and neossh
zegervdv <zegervdv@me.com>
parents: 97
diff changeset
430 let g:vimfiler_as_default_explorer = 1
235b862405f4 Add vimfiler and neossh
zegervdv <zegervdv@me.com>
parents: 97
diff changeset
431 nnoremap <leader>e :VimFilerExplorer<CR>
109
f9b3b13dc44a Update plugins
zegervdv <zegervdv@me.com>
parents: 107
diff changeset
432 let g:vimfiler_ignore_pattern = '\%(.o\|.bin\|.elf\|.un\~\|.swp\)$'
98
235b862405f4 Add vimfiler and neossh
zegervdv <zegervdv@me.com>
parents: 97
diff changeset
433 " }}}
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
434 " Cucumber {{{
168
27f78c20b486 Use SPACE as mapleader
zegervdv <zegervdv@me.com>
parents: 164
diff changeset
435 " map <leader>f :call RunAllFeatures()<CR>
27f78c20b486 Use SPACE as mapleader
zegervdv <zegervdv@me.com>
parents: 164
diff changeset
436 " map <leader>k :call RunCurrentFeature()<CR>
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
437 " }}}
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
438 " Markdown {{{
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
439 let g:vim_markdown_folding_disabled=1
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
440 " }}}
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
441 " tComment {{{
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
442 nmap <leader>c <C-_><C-_>
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
443 " }}}
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
444 " Neo Complete {{{
91
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
445 let g:neocomplete#enable_at_startup = 1
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
446 let g:neocomplet#enable_smart_case = 1
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
447 let g:marching_enable_neocomplete = 1
102
a25bdb562e43 Fix zsh prompt
zegervdv <zegervdv@me.com>
parents: 101
diff changeset
448 let g:neocomplete#enable_fuzzy_completion = 1
27
d75ec1f32cae Add folds to vimrc
zegervdv <zegervdv@me.com>
parents: 26
diff changeset
449
91
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
450 inoremap <expr><s-CR> pumvisible() ? neocomplete#smart_close_popup()"\<CR>" : "\<CR>"
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
451 inoremap <expr><C-g> neocomplete#undo_completion()
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
452 inoremap <expr><C-l> neocomplete#complete_common_string()
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
453 function! CleverCr()
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
454 if pumvisible()
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
455 if neosnippet#expandable()
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
456 let exp = "\<Plug>(neosnippet_expand)"
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
457 return exp . neocomplete#smart_close_popup()
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
458 else
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
459 return neocomplete#smart_close_popup()
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
460 endif
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
461 else
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
462 return "\<CR>"
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
463 endif
97744720e080 Improved neocompleting
zegervdv <zegervdv@me.com>
parents: 90
diff changeset
464 endfunction
160
eb9ee89c7ccb Use less as git diff pager
zegervdv <zegervdv@me.com>
parents: 154
diff changeset
465 " <CR> close popup and save indent or expand snippet
eb9ee89c7ccb Use less as git diff pager
zegervdv <zegervdv@me.com>
parents: 154
diff changeset
466 imap <expr> <CR> CleverCr()
171
1e77456c253b Fixes to vimrc
zegervdv <zegervdv@me.com>
parents: 169
diff changeset
467
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
468 " }}}
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
469 " Neo Snippets {{{
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
470 imap <C-k> <Plug>(neosnippet_expand_or_jump)
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
471 smap <C-k> <Plug>(neosnippet_expand_or_jump)
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
472 xmap <C-k> <Plug>(neosnippet_expand_target)
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
473
23
4112c6eb9f47 Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents: 22
diff changeset
474 " imap <expr><TAB> neosnippet#expandable_or_jumpable() ?
4112c6eb9f47 Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents: 22
diff changeset
475 " \ "\<Plug>(neosnippet_expand_or_jump)"
4112c6eb9f47 Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents: 22
diff changeset
476 " \: pumvisible() ? "\<C-n>" : "\<TAB>"
4112c6eb9f47 Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents: 22
diff changeset
477 " smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
4112c6eb9f47 Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents: 22
diff changeset
478 " \ "\<Plug>(neosnippet_expand_or_jump)"
4112c6eb9f47 Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents: 22
diff changeset
479 " \: "\<TAB>"
4112c6eb9f47 Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents: 22
diff changeset
480
4112c6eb9f47 Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents: 22
diff changeset
481
4112c6eb9f47 Correct tab completion with snippets
zegervdv <zegervdv@me.com>
parents: 22
diff changeset
482 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
483 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
484 smap <expr><TAB> neosnippet#expandable() == 1 ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>"
90
3fdc762fe6bb Improve neocomplete behaviour
zegervdv <zegervdv@me.com>
parents: 87
diff changeset
485 " let g:neocomplete#sources#omni#input_patterns.ruby = '[^. *\t]\.\w*\|\h\w*::'
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
486
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
487 let g:neosnippet#snippets_directory='~/.vim/snippets'
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
488 " }}}
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
489 " Tabular {{{
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
490 inoremap <silent> <Bar> <Bar><Esc>:call <SID>align()<CR>a
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
491
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
492 function! s:align()
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
493 let p = '^\s*|\s.*\s|\s*$'
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
494 if exists(':Tabularize') && getline('.') =~# '^\s*|' && (getline(line('.')-1) =~# p || getline(line('.')+1) =~# p)
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
495 let column = strlen(substitute(getline('.')[0:col('.')],'[^|]','','g'))
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
496 let position = strlen(matchstr(getline('.')[0:col('.')],'.*|\s*\zs.*'))
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
497 Tabularize/|/l1
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
498 normal! 0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
499 call search(repeat('[^|]*|',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
500 endif
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
501 endfunction
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
502
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
503 " Align Migration files
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
504 vmap <c-a> :Tabularize /:/l1l0l0<CR>
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
505
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
506 nmap <Leader>a= :Tabularize /=<CR>
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
507 vmap <Leader>a= :Tabularize /=<CR>
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
508 nmap <Leader>a=> :Tabularize /=><CR>
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
509 vmap <Leader>a=> :Tabularize /=><CR>
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
510 nmap <Leader>a: :Tabularize /:\zs/l0l1<CR>
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
511 vmap <Leader>a: :Tabularize /:\zs/l0l1<CR>
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
512 nmap <Leader>a, :Tabularize /,\zs/l0l1<CR>
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
513 vmap <Leader>a, :Tabularize /,\zs/l0l1<CR>
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
514 vmap <Leader>a- :Tabularize /-<CR>
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
515 " }}}
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
516 " Tagbar {{{
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
517 nmap <F8> :TagbarToggle<CR>
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
518 " }}}
190
35664e63555d Small fixes to vimrc
zegervdv <zegervdv@me.com>
parents: 189
diff changeset
519 " Syntastic {{{
35664e63555d Small fixes to vimrc
zegervdv <zegervdv@me.com>
parents: 189
diff changeset
520 let g:syntastic_check_on_open=1
35664e63555d Small fixes to vimrc
zegervdv <zegervdv@me.com>
parents: 189
diff changeset
521 " }}}
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
522 " Gundo tree {{{
0
36a9b3a28861 Add all dotfiles
zegervdv <zegervdv@me.com>
parents:
diff changeset
523 nnoremap <leader>u :GundoToggle<CR>
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
524 " }}}
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
525 " Smalls {{{
13
dd1519fc21e3 Add vim-smalls plugin
zegervdv <zegervdv@me.com>
parents: 5
diff changeset
526 nmap s <Plug>(smalls)
dd1519fc21e3 Add vim-smalls plugin
zegervdv <zegervdv@me.com>
parents: 5
diff changeset
527 omap s <Plug>(smalls)
dd1519fc21e3 Add vim-smalls plugin
zegervdv <zegervdv@me.com>
parents: 5
diff changeset
528 xmap s <Plug>(smalls)
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
529 " }}}
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
530 " Textmanip {{{
14
09c60bc0fc38 Add vim-textmanip for visual block dragging
zegervdv <zegervdv@me.com>
parents: 13
diff changeset
531 xmap <C-j> <Plug>(textmanip-move-down)
09c60bc0fc38 Add vim-textmanip for visual block dragging
zegervdv <zegervdv@me.com>
parents: 13
diff changeset
532 xmap <C-k> <Plug>(textmanip-move-up)
09c60bc0fc38 Add vim-textmanip for visual block dragging
zegervdv <zegervdv@me.com>
parents: 13
diff changeset
533 xmap <C-h> <Plug>(textmanip-move-left)
09c60bc0fc38 Add vim-textmanip for visual block dragging
zegervdv <zegervdv@me.com>
parents: 13
diff changeset
534 xmap <C-l> <Plug>(textmanip-move-right)
09c60bc0fc38 Add vim-textmanip for visual block dragging
zegervdv <zegervdv@me.com>
parents: 13
diff changeset
535 xmap <F10> <Plug>(textmanip-toggle-mode)
40
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
536 " }}}
f79361618cac Organize vimrc
zegervdv <zegervdv@me.com>
parents: 38
diff changeset
537 " Startify {{{
27
d75ec1f32cae Add folds to vimrc
zegervdv <zegervdv@me.com>
parents: 26
diff changeset
538 let g:startify_session_dir = "~/.vim/sessions"
d75ec1f32cae Add folds to vimrc
zegervdv <zegervdv@me.com>
parents: 26
diff changeset
539 " }}}
54
fa9db4f30d79 Add vimwiki plugin
zegervdv <zegervdv@me.com>
parents: 47
diff changeset
540 " Vimwiki {{{
fa9db4f30d79 Add vimwiki plugin
zegervdv <zegervdv@me.com>
parents: 47
diff changeset
541 let g:vimwiki_list=[{'path':'$HOME/.vimwiki'}]
fa9db4f30d79 Add vimwiki plugin
zegervdv <zegervdv@me.com>
parents: 47
diff changeset
542 " }}}
58
b657d43a4fcb Stop asking to save current session
zegervdv <zegervdv@me.com>
parents: 54
diff changeset
543 " Vim Sessions {{{
b657d43a4fcb Stop asking to save current session
zegervdv <zegervdv@me.com>
parents: 54
diff changeset
544 let g:session_autosave = 'no'
b657d43a4fcb Stop asking to save current session
zegervdv <zegervdv@me.com>
parents: 54
diff changeset
545 " }}}
96
384c853303af Improve vimrc
zegervdv <zegervdv@me.com>
parents: 94
diff changeset
546 " Jedi {{{
384c853303af Improve vimrc
zegervdv <zegervdv@me.com>
parents: 94
diff changeset
547 let g:jedi#auto_vim_configuration=0
102
a25bdb562e43 Fix zsh prompt
zegervdv <zegervdv@me.com>
parents: 101
diff changeset
548 let g:jedi#completions_enabled = 0
96
384c853303af Improve vimrc
zegervdv <zegervdv@me.com>
parents: 94
diff changeset
549 " }}}
133
32bdd92feeae Add Vimux
zegervdv <zegervdv@me.com>
parents: 131
diff changeset
550 " Vimux {{{
152
884d14e94710 Updates to zsh theme
zegervdv <zegervdv@me.com>
parents: 147
diff changeset
551 let g:VimuxUseNearest = 1
174
e4c677e2acde Fix slow mapping with space
zegervdv <zegervdv@me.com>
parents: 172
diff changeset
552 nnoremap <buffer> <silent><leader>s :w<CR>
188
51d25ca2f262 Updates to tmuxline config
zegervdv <zegervdv@me.com>
parents: 187
diff changeset
553 autocmd FileType python nnoremap <buffer> <silent><leader>s :w<CR>:VimuxRunCommand('%run -i ' . expand('%'))<CR>
51d25ca2f262 Updates to tmuxline config
zegervdv <zegervdv@me.com>
parents: 187
diff changeset
554 autocmd FileType ruby nnoremap <buffer> <silent><leader>s :w<CR>:VimuxRunCommand('rake spec')<CR>
51d25ca2f262 Updates to tmuxline config
zegervdv <zegervdv@me.com>
parents: 187
diff changeset
555 autocmd FileType c nnoremap <buffer> <silent><leader>s :w<CR>:VimuxRunCommand('make')<CR>
133
32bdd92feeae Add Vimux
zegervdv <zegervdv@me.com>
parents: 131
diff changeset
556 " }}}
135
ff0f692ad70c Add tmuxline to match style of vim
zegervdv <zegervdv@me.com>
parents: 134
diff changeset
557 " Tmuxline {{{
ff0f692ad70c Add tmuxline to match style of vim
zegervdv <zegervdv@me.com>
parents: 134
diff changeset
558 let g:tmuxline_powerline_separators=0
188
51d25ca2f262 Updates to tmuxline config
zegervdv <zegervdv@me.com>
parents: 187
diff changeset
559 let g:tmuxline_preset = {
193
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
560 \ 'a': '',
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
561 \ 'b': '',
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
562 \ 'c': '',
188
51d25ca2f262 Updates to tmuxline config
zegervdv <zegervdv@me.com>
parents: 187
diff changeset
563 \ 'win': ['#I', '#W'],
51d25ca2f262 Updates to tmuxline config
zegervdv <zegervdv@me.com>
parents: 187
diff changeset
564 \ 'cwin': ['#I', '#W'],
193
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
565 \ 'y': '',
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
566 \ 'z': ''}
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
567 let g:tmuxline_theme = {
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
568 \ 'a' : [250, 109],
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
569 \ 'b': [250, 239],
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
570 \ 'c': [250, 235],
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
571 \ 'win': [241, 235],
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
572 \ 'cwin': [250, 235],
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
573 \ 'x' : [250, 235],
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
574 \ 'y': [250, 235],
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
575 \ 'z': [250, 235],
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
576 \ 'bg' : [250, 235],
0c8211e1c67a Update look of tmux
zegervdv <zegervdv@me.com>
parents: 191
diff changeset
577 \ }
135
ff0f692ad70c Add tmuxline to match style of vim
zegervdv <zegervdv@me.com>
parents: 134
diff changeset
578 " }}}
183
fca0df810041 Add after-object plugin
zegervdv <zegervdv@me.com>
parents: 182
diff changeset
579 " After-objects {{{
fca0df810041 Add after-object plugin
zegervdv <zegervdv@me.com>
parents: 182
diff changeset
580 autocmd VimEnter * call after_object#enable('=', ':', '-', '#', ' ')
fca0df810041 Add after-object plugin
zegervdv <zegervdv@me.com>
parents: 182
diff changeset
581 " }}}
189
925861e874ec Add vim-tmux-navigator for seamless navigation
zegervdv <zegervdv@me.com>
parents: 188
diff changeset
582 " Vim-tmux-navigator {{{
925861e874ec Add vim-tmux-navigator for seamless navigation
zegervdv <zegervdv@me.com>
parents: 188
diff changeset
583 " nnoremap <silent> <C-h> :TmuxNavigateLeft<CR>
925861e874ec Add vim-tmux-navigator for seamless navigation
zegervdv <zegervdv@me.com>
parents: 188
diff changeset
584 " }}}
13
dd1519fc21e3 Add vim-smalls plugin
zegervdv <zegervdv@me.com>
parents: 5
diff changeset
585 " Load local vimrc
3
44d3af8838f8 Add support for local zshrc and vimrc files
zegervdv <zegervdv@me.com>
parents: 0
diff changeset
586 if filereadable($HOME . "/.vimrc.local")
44d3af8838f8 Add support for local zshrc and vimrc files
zegervdv <zegervdv@me.com>
parents: 0
diff changeset
587 source ~/.vimrc.local
44d3af8838f8 Add support for local zshrc and vimrc files
zegervdv <zegervdv@me.com>
parents: 0
diff changeset
588 endif
24
c3bb025ed67e Update plugins
zegervdv <zegervdv@me.com>
parents: 23
diff changeset
589