annotate vim/vimrc @ 426:67f14a8c2304

Improve Vim configuration.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 28 Mar 2018 20:07:30 -0700
parents d8086f81b9c8
children 71a080d4d83c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
1 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
2 "
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
3 " Ludovic Chabant's ~/.vimrc
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
4 "
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
5 " http://ludovic.chabant.com
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
6 "
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
7 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
8
59
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
9 " Global Setup {{{
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
10
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
11 " Use Vim settings, rather then Vi settings (much better!).
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
12 " This must be first, because it changes other options as a side effect.
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
13 set nocompatible
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
14
45
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
15 " Set a variable that says we already sourced this file, for those few
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
16 " settings we don't want to re-apply.
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
17 if exists('g:sourced_vimrc')
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
18 let g:resourcing_vimrc = 1
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
19 endif
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
20 let g:sourced_vimrc = 1
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
21
83
a54180045075 Vimrc changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 80
diff changeset
22 " Get the platform we're running on.
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
23 if has("win32") || has("win64") || has("dos32")
83
a54180045075 Vimrc changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 80
diff changeset
24 let s:vim_platform = "windows"
286
a29080fb35d9 Add support for local Vim bundle.
Ludovic Chabant <ludovic@chabant.com>
parents: 284
diff changeset
25 let s:path_sep = "\\"
426
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
26 elseif has("mac")
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
27 let s:vim_platform = "mac"
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
28 let s:path_sep = '/'
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
29 else
83
a54180045075 Vimrc changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 80
diff changeset
30 let s:vim_platform = "unix"
286
a29080fb35d9 Add support for local Vim bundle.
Ludovic Chabant <ludovic@chabant.com>
parents: 284
diff changeset
31 let s:path_sep = '/'
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
32 endif
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
33
83
a54180045075 Vimrc changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 80
diff changeset
34 " Get our vim directory.
95
b96ff0dd0137 Fixed the generated vimrc's runtimepath.
Ludovic Chabant <ludovic@chabant.com>
parents: 83
diff changeset
35 let s:vim_home = expand("<sfile>:h")
83
a54180045075 Vimrc changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 80
diff changeset
36
386
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
37 " Local pre-override.
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
38 let s:local_vimrc_pre = s:vim_home.'/vimrc-local-pre'
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
39 if filereadable(s:local_vimrc_pre)
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
40 execute 'source' s:local_vimrc_pre
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
41 endif
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
42
127
1f709d7e03c6 Better Python dev in Vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
43 " Make sure `filetype` stuff is turned off before loading Pathogen.
1f709d7e03c6 Better Python dev in Vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
44 syntax off
1f709d7e03c6 Better Python dev in Vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
45 filetype off
1f709d7e03c6 Better Python dev in Vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
46
18
cec2213f938c Removed some MiniBufExplorer mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
47 " Disable some plugins.
386
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
48 let g:pathogen_disabled = get(g:, 'pathogen_disabled', [])
424
d8086f81b9c8 Pathogen config files.
Ludovic Chabant <ludovic@chabant.com>
parents: 420
diff changeset
49 call ludo#setup_pathogen([s:vim_home.'/bundle', s:vim_home.'/local'])
18
cec2213f938c Removed some MiniBufExplorer mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
50
347
4d73159f56ca Use pathogen as a sub-repo, plus a few Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 332
diff changeset
51 " Load pathogen.
349
8d68547c3660 Fix pathogen initialization.
Ludovic Chabant <ludovic@chabant.com>
parents: 347
diff changeset
52 runtime bundle/pathogen/autoload/pathogen.vim
352
9580765366a4 Fix some python indenting stuff in vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 349
diff changeset
53 " Add the bundle directory, and potentially add the local one if it exists.
9580765366a4 Fix some python indenting stuff in vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 349
diff changeset
54 " Note that we pass absolute paths to make pathogen prepend stuff before Vim's
9580765366a4 Fix some python indenting stuff in vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 349
diff changeset
55 " system files otherwise stuff like indent plugins don't work.
9580765366a4 Fix some python indenting stuff in vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 349
diff changeset
56 let s:pathogen_bundles = [s:vim_home.s:path_sep.'bundle'.s:path_sep.'{}']
286
a29080fb35d9 Add support for local Vim bundle.
Ludovic Chabant <ludovic@chabant.com>
parents: 284
diff changeset
57 if isdirectory(s:vim_home.s:path_sep.'local')
352
9580765366a4 Fix some python indenting stuff in vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 349
diff changeset
58 call add(s:pathogen_bundles, s:vim_home.s:path_sep.'local'.s:path_sep.'{}')
286
a29080fb35d9 Add support for local Vim bundle.
Ludovic Chabant <ludovic@chabant.com>
parents: 284
diff changeset
59 endif
347
4d73159f56ca Use pathogen as a sub-repo, plus a few Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 332
diff changeset
60 call call('pathogen#infect', s:pathogen_bundles)
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
61
10
00cac5ebf546 Added default window size. Added buffer keyboard shortcuts.
ludovicchabant
parents: 6
diff changeset
62 " Hide the toolbar in MacVim/gVIM, and set a nice window size.
45
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
63 if has("gui_running") && !exists('g:resourcing_vimrc')
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
64 set guioptions=-t
235
ceb3f44fa2fc Update sub-repos, make Vim maximized by default.
Ludovic Chabant <ludovic@chabant.com>
parents: 233
diff changeset
65 set lines=999
ceb3f44fa2fc Update sub-repos, make Vim maximized by default.
Ludovic Chabant <ludovic@chabant.com>
parents: 233
diff changeset
66 set columns=999
323
e2d944ecda66 Maximize on startup on Windows.
Ludovic Chabant <ludovic@chabant.com>
parents: 320
diff changeset
67 if has("win32")
e2d944ecda66 Maximize on startup on Windows.
Ludovic Chabant <ludovic@chabant.com>
parents: 320
diff changeset
68 au GUIEnter * simalt ~x
e2d944ecda66 Maximize on startup on Windows.
Ludovic Chabant <ludovic@chabant.com>
parents: 320
diff changeset
69 endif
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
70 endif
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
71
420
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
72 function! s:HasPlugin(plugname) abort
426
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
73 return globpath(&runtimepath, 'plugin/'.a:plugname.'.vim') !=# ''
420
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
74 endfunction
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
75
59
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
76 " }}}
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
77
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
78 " General Settings {{{
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
79
135
db9d5fe86723 Enable modelines.
Ludovic Chabant <ludovic@chabant.com>
parents: 131
diff changeset
80 " Restrict modelines.
db9d5fe86723 Enable modelines.
Ludovic Chabant <ludovic@chabant.com>
parents: 131
diff changeset
81 set modelines=1
18
cec2213f938c Removed some MiniBufExplorer mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
82
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
83 " Don't unload abandoned buffers.
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
84 set hidden
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
85
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
86 " Show line numbers.
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
87 set number
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
88
18
cec2213f938c Removed some MiniBufExplorer mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
89 " Show what mode we're in, and what command we're typing.
cec2213f938c Removed some MiniBufExplorer mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
90 set showmode
cec2213f938c Removed some MiniBufExplorer mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
91 set showcmd
cec2213f938c Removed some MiniBufExplorer mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
92
cec2213f938c Removed some MiniBufExplorer mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
93 " Keep the cursor off the top/bottom edges.
cec2213f938c Removed some MiniBufExplorer mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
94 set scrolloff=3
cec2213f938c Removed some MiniBufExplorer mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
95
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
96 " Smart auto-indenting.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
97 set autoindent
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
98 set smartindent
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
99
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
100 " Use confirmation dialog.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
101 set confirm
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
102
76
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
103 " Don't use annoying sounds.
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
104 set visualbell
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
105
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
106 " Remember lots of commands.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
107 set history=1000
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
108
76
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
109 " Try to reduce flickering.
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
110 set lazyredraw
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
111
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
112 " Show matching braces but not for too long.
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
113 set showmatch
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
114 set matchtime=2
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
115
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
116 " Show soft-broken/wrapped lines with a prefix.
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
117 set showbreak=→
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
118
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
119 " Use incremental search, with highlighting,
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
120 " case-insensitive unless we actually type some
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
121 " mixed-case stuff.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
122 set incsearch
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
123 set hlsearch
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
124 set ignorecase
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
125 set smartcase
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
126
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
127 " Always show window status lines.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
128 set laststatus=2
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
129
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
130 " Enable using the mouse like some everyday guy.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
131 set mouse=a
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
132
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
133 " Show interesting stuff at the bottom of the window.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
134 set showcmd
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
135 set ruler
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
136
76
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
137 " Make sure splitting windows is done in a way that makes sense.
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
138 set splitbelow
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
139 set splitright
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
140
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
141 " Don't pollute the hard-drive with *~ files. Only
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
142 " create them in hidden backup/temp directories while
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
143 " we edit the file, and then get rid of it.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
144 set nobackup
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
145 set writebackup
83
a54180045075 Vimrc changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 80
diff changeset
146 execute('set backupdir='.s:vim_home.'/backup')
a54180045075 Vimrc changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 80
diff changeset
147 execute('set directory='.s:vim_home.'/temp')
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
148
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
149 " Better command-line completion, but don't show some
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
150 " stuff we don't care about.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
151 set wildmenu
317
b0b868bb0d44 More vim changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 316
diff changeset
152 set wildmode=list:longest
b0b868bb0d44 More vim changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 316
diff changeset
153 set wildignore+=.DS_Store,Thumbs.db
b0b868bb0d44 More vim changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 316
diff changeset
154 set wildignore+=*.so,*.dll,*.exe,*.lib,*.pdb
b0b868bb0d44 More vim changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 316
diff changeset
155 set wildignore+=*.pyc,*.pyo
b0b868bb0d44 More vim changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 316
diff changeset
156 set wildignore+=*.swp
b0b868bb0d44 More vim changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 316
diff changeset
157
b0b868bb0d44 More vim changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 316
diff changeset
158 set formatoptions=croqn1
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
159
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
160 " Always display the tab-page line.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
161 set showtabline=2
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
162
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
163 " Set the file-formats.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
164 set ffs=unix,mac,dos
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
165
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
166 " Tabs and indenting are 4 characters, and tabs behave like
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
167 " spaces during editing. They're smart, too, and when you
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
168 " press <TAB> it actually inserts a soft-tab so everything's
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
169 " indented the same.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
170 set tabstop=4
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
171 set shiftwidth=4
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
172 set softtabstop=4
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
173 set smarttab
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
174 set expandtab
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
175
18
cec2213f938c Removed some MiniBufExplorer mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
176 " Default encoding
cec2213f938c Removed some MiniBufExplorer mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
177 set encoding=utf-8
cec2213f938c Removed some MiniBufExplorer mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
178
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
179 " Clipboard buffer.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
180 set clipboard=unnamed
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
181
352
9580765366a4 Fix some python indenting stuff in vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 349
diff changeset
182 " Smooth terminal experience.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
183 set ttyfast
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
184
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
185 " Allow backspacing over anything.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
186 set backspace=indent,eol,start
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
187
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
188 " Going left and right let you go to other lines.
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
189 set whichwrap+=<,>,h,l
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
190
93
822fc8b4405f Invisible characters in vimrc.
Ludovic Chabant <ludovic@chabant.com>
parents: 92
diff changeset
191 " How to show invisible characters
822fc8b4405f Invisible characters in vimrc.
Ludovic Chabant <ludovic@chabant.com>
parents: 92
diff changeset
192 set listchars=eol:$,tab:>-,trail:-,extends:>,precedes:<,nbsp:%,conceal:.
822fc8b4405f Invisible characters in vimrc.
Ludovic Chabant <ludovic@chabant.com>
parents: 92
diff changeset
193
80
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
194 " Nice auto-complete menu.
410
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
195 set complete=.,w,b
80
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
196 set completeopt=longest,menuone,preview
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
197
121
c6f0172aac8d Add nice column indicators in Vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 119
diff changeset
198 " Column indicators.
c6f0172aac8d Add nice column indicators in Vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 119
diff changeset
199 set colorcolumn=72,79
c6f0172aac8d Add nice column indicators in Vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 119
diff changeset
200
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
201 " And now, for some system-dependent settings:
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
202 " - font to use
83
a54180045075 Vimrc changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 80
diff changeset
203 if s:vim_platform == "windows"
419
c4077384f55f Use `InputMono` or `Hack` if they're installed.
Ludovic Chabant <ludovic@chabant.com>
parents: 414
diff changeset
204 set guifont=InputMono:h11,Hack:h12,Consolas:h12
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
205 else
419
c4077384f55f Use `InputMono` or `Hack` if they're installed.
Ludovic Chabant <ludovic@chabant.com>
parents: 414
diff changeset
206 set guifont=InputMono:h11,Hack:h12,Monaco:h12
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
207 endif
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
208
45
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
209 " Syntax highlighting.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
210 syntax on
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
211
18
cec2213f938c Removed some MiniBufExplorer mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
212 " Change the current directory to the home directory.
45
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
213 if !exists('g:resourcing_vimrc')
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
214 cd ~/
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
215 endif
18
cec2213f938c Removed some MiniBufExplorer mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
216
45
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
217 " Default color scheme.
47
ee3d235ca3fb Added solarized.
Ludovic Chabant <ludovic@chabant.com>
parents: 45
diff changeset
218 if has('gui_running')
217
6ee245fa8a3d Proper colors in iTerm2, and now using solarized for a change.
Ludovic Chabant <ludovic@chabant.com>
parents: 213
diff changeset
219 set background=dark
47
ee3d235ca3fb Added solarized.
Ludovic Chabant <ludovic@chabant.com>
parents: 45
diff changeset
220 else
ee3d235ca3fb Added solarized.
Ludovic Chabant <ludovic@chabant.com>
parents: 45
diff changeset
221 set background=dark
314
5f9d52300aaa Vim tweaks:
Ludovic Chabant <ludovic@chabant.com>
parents: 313
diff changeset
222 let g:solarized_termcolors = 256
5f9d52300aaa Vim tweaks:
Ludovic Chabant <ludovic@chabant.com>
parents: 313
diff changeset
223 let g:solarized_termtrans = 1
47
ee3d235ca3fb Added solarized.
Ludovic Chabant <ludovic@chabant.com>
parents: 45
diff changeset
224 endif
217
6ee245fa8a3d Proper colors in iTerm2, and now using solarized for a change.
Ludovic Chabant <ludovic@chabant.com>
parents: 213
diff changeset
225 colorscheme solarized
6
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
226
f8792d288397 Big vimrc update.
ludovicchabant
parents: 0
diff changeset
227 " Enable file type detection.
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
228 filetype indent plugin on
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
229
59
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
230 " }}}
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
231
76
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
232 " Auto-Commands {{{
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
233
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
234 " Only show the highlighted cursor line in the current window.
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
235 augroup CursorLine
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
236 au!
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
237 au WinLeave * set nocursorline
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
238 au WinEnter * set cursorline
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
239 augroup END
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
240
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
241 " }}}
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
242
59
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
243 " Plugin Settings {{{
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
244
309
5b7acab16766 Make NERDTree ignore stuff, and other Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 303
diff changeset
245 " NERDTree {{{
5b7acab16766 Make NERDTree ignore stuff, and other Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 303
diff changeset
246
320
f95b6f36049b More vim stuff.
Ludovic Chabant <ludovic@chabant.com>
parents: 317
diff changeset
247 let NERDTreeRespectWildIgnore = 1
309
5b7acab16766 Make NERDTree ignore stuff, and other Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 303
diff changeset
248
5b7acab16766 Make NERDTree ignore stuff, and other Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 303
diff changeset
249 " }}}
5b7acab16766 Make NERDTree ignore stuff, and other Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 303
diff changeset
250
178
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
251 " Ctrl-P {{{
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
252
80
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
253 " We'll set our own mappings.
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
254 let g:ctrlp_map = ''
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
255
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
256 " Ctrl-P should manage the working directory.
173
393449253540 Use the new notation for `ctrlp` setting.
Ludovic Chabant <ludovic@chabant.com>
parents: 171
diff changeset
257 let g:ctrlp_working_path_mode = 'ra'
80
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
258
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
259 " Ctrl-P should however ignore some stuff.
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
260 let g:ctrlp_custom_ignore = {
426
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
261 \ 'dir': '\v[\/](\.git|\.hg|\.svn|venv|static|node_modules|_cache|_counter)$'
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
262 \ }
80
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
263
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
264 " Make Ctrl-P cache stuff in our temp directory.
83
a54180045075 Vimrc changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 80
diff changeset
265 let g:ctrlp_cache_dir = s:vim_home.'/cache'
10
00cac5ebf546 Added default window size. Added buffer keyboard shortcuts.
ludovicchabant
parents: 6
diff changeset
266
197
4d34bf15a478 Don't clear CtrlP cache on exit, fix Windows issues.
Ludovic Chabant <ludovic@chabant.com>
parents: 193
diff changeset
267 " Remember things.
386
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
268 let g:ctrlp_clear_cache_on_exit = 0
197
4d34bf15a478 Don't clear CtrlP cache on exit, fix Windows issues.
Ludovic Chabant <ludovic@chabant.com>
parents: 193
diff changeset
269
317
b0b868bb0d44 More vim changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 316
diff changeset
270 " Don't include some stuff in the most recently used list.
b0b868bb0d44 More vim changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 316
diff changeset
271 let g:ctrlp_mruf_exclude = 'hg\-editor\-\d+\.txt'
b0b868bb0d44 More vim changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 316
diff changeset
272
193
ae53d68033d9 Enable fugitive and some CtrlP extensions, include a new one of my own.
Ludovic Chabant <ludovic@chabant.com>
parents: 191
diff changeset
273 " Enable some cool extensions.
240
3a6b11d16a2a Simpler registration for CtrlP extensions.
Ludovic Chabant <ludovic@chabant.com>
parents: 235
diff changeset
274 let g:ctrlp_extensions = [
266
de3ef7fbcfc1 Add CtrlP's bookmarkdir extension.
Ludovic Chabant <ludovic@chabant.com>
parents: 252
diff changeset
275 \'tag', 'buffertag', 'quickfix', 'mixed', 'bookmarkdir',
288
25b672f0f6bd Remove `projectjump` CtrlP plugin, just use the bookmarks.
Ludovic Chabant <ludovic@chabant.com>
parents: 287
diff changeset
276 \'autoignore'
240
3a6b11d16a2a Simpler registration for CtrlP extensions.
Ludovic Chabant <ludovic@chabant.com>
parents: 235
diff changeset
277 \]
193
ae53d68033d9 Enable fugitive and some CtrlP extensions, include a new one of my own.
Ludovic Chabant <ludovic@chabant.com>
parents: 191
diff changeset
278
367
d8ae3de7de06 More Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 356
diff changeset
279 " Use PyMatch to go faster.
426
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
280 if (has('python3') || has('python')) && s:HasPlugin('ctrlp-py-matcher')
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
281 let g:ctrlp_match_func = {'match': 'pymatcher#PyMatch'}
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
282 let g:ctrlp_max_files = 0
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
283 let g:ctrlp_lazy_update = 350
367
d8ae3de7de06 More Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 356
diff changeset
284 endif
d8ae3de7de06 More Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 356
diff changeset
285
178
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
286 " }}}
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
287
410
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
288 " FZF {{{
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
289
426
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
290 if s:vim_platform == 'mac'
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
291 if filereadable('/usr/local/opt/fzf/plugin/fzf.vim')
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
292 " FZF installed via Homebrew.
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
293 source /usr/local/opt/fzf/plugin/fzf.vim
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
294 endif
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
295 endif
410
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
296
426
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
297 let g:fzf_action = {
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
298 \'ctrl-t': 'tab split',
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
299 \'ctrl-v': 'vsplit',
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
300 \'ctrl-x': 'split',
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
301 \}
410
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
302
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
303 " }}}
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
304
213
769869e61101 Renamed autotags to gutentags.
Ludovic Chabant <ludovic@chabant.com>
parents: 212
diff changeset
305 " Gutentags {{{
206
dae926f52b9a Some Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
306
213
769869e61101 Renamed autotags to gutentags.
Ludovic Chabant <ludovic@chabant.com>
parents: 212
diff changeset
307 let g:gutentags_cache_dir = s:vim_home.'/tags'
373
083360925deb Tweaks for tags
Ludovic Chabant <ludovic@chabant.com>
parents: 369
diff changeset
308 let g:gutentags_ctags_exclude = ['venv', 'build', 'static', 'node_modules']
369
b87c358bd0ca Fix/improve ctagsrc for gutentags.
Ludovic Chabant <ludovic@chabant.com>
parents: 367
diff changeset
309 let g:gutentags_ctags_extra_args = ['--options='.s:vim_home.'/ctagsrc']
420
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
310 let g:gutentags_ctags_exclude_wildignore = 0
206
dae926f52b9a Some Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
311
dae926f52b9a Some Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
312 " }}}
dae926f52b9a Some Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
313
178
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
314 " Syntastic {{{
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
315
314
5f9d52300aaa Vim tweaks:
Ludovic Chabant <ludovic@chabant.com>
parents: 313
diff changeset
316 let g:syntastic_auto_loc_list = 2
305
a333541a5c74 Syntastic config changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 304
diff changeset
317 let g:syntastic_check_on_open = 1
a333541a5c74 Syntastic config changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 304
diff changeset
318 let g:syntastic_check_on_wq = 0
a333541a5c74 Syntastic config changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 304
diff changeset
319
219
738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab.
Ludovic Chabant <ludovic@chabant.com>
parents: 218
diff changeset
320 " flake8 includes pyflakes, pep8, and mccabe
738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab.
Ludovic Chabant <ludovic@chabant.com>
parents: 218
diff changeset
321 " I could maybe replace pyflakes with frosted?
252
a2e31e166cb9 Just keep flake8 for Python checking in Vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 240
diff changeset
322 let g:syntastic_python_checkers = ['flake8'] ", 'pylint']
219
738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab.
Ludovic Chabant <ludovic@chabant.com>
parents: 218
diff changeset
323 let g:syntastic_python_python_exec = 'python3'
397
c32b9b172314 Specify YCM/OmniSharp mappings only for specific file types.
Ludovic Chabant <ludovic@chabant.com>
parents: 392
diff changeset
324 let g:syntastic_python_flake8_args='--ignore=W191,W391'
219
738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab.
Ludovic Chabant <ludovic@chabant.com>
parents: 218
diff changeset
325
738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab.
Ludovic Chabant <ludovic@chabant.com>
parents: 218
diff changeset
326 " }}}
738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab.
Ludovic Chabant <ludovic@chabant.com>
parents: 218
diff changeset
327
738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab.
Ludovic Chabant <ludovic@chabant.com>
parents: 218
diff changeset
328 " Supertab {{{
738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab.
Ludovic Chabant <ludovic@chabant.com>
parents: 218
diff changeset
329
308
52d4d0fa195b Vim config changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 307
diff changeset
330 let g:SuperTabDefaultCompletionType = "context"
52d4d0fa195b Vim config changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 307
diff changeset
331 let g:SuperTabLongestEnhanced = 1
52d4d0fa195b Vim config changes.
Ludovic Chabant <ludovic@chabant.com>
parents: 307
diff changeset
332 let g:SuperTabLongestHighlight = 0
219
738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab.
Ludovic Chabant <ludovic@chabant.com>
parents: 218
diff changeset
333 let g:SuperTabCrMapping = 1
178
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
334
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
335 " }}}
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
336
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
337 " Lawrencium {{{
118
c1ff96232138 New settings for Lawrencium.
Ludovic Chabant <ludovic@chabant.com>
parents: 114
diff changeset
338
127
1f709d7e03c6 Better Python dev in Vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
339 " Custom Mercurial commands highlighting in Lawrencium.
118
c1ff96232138 New settings for Lawrencium.
Ludovic Chabant <ludovic@chabant.com>
parents: 114
diff changeset
340 let g:lawrencium_hg_commands_file_types = {
c1ff96232138 New settings for Lawrencium.
Ludovic Chabant <ludovic@chabant.com>
parents: 114
diff changeset
341 \'clog': 'hggraphlog'
c1ff96232138 New settings for Lawrencium.
Ludovic Chabant <ludovic@chabant.com>
parents: 114
diff changeset
342 \}
c1ff96232138 New settings for Lawrencium.
Ludovic Chabant <ludovic@chabant.com>
parents: 114
diff changeset
343
127
1f709d7e03c6 Better Python dev in Vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
344 " Make the annotate window better in Lawrencium.
206
dae926f52b9a Some Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
345 let g:lawrencium_annotate_width_offset = 1
127
1f709d7e03c6 Better Python dev in Vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
346
59
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
347 " }}}
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
348
178
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
349 " Gundo {{{
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
350
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
351 let g:gundo_map_move_older = '<Down>'
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
352 let g:gundo_map_move_newer = '<Up>'
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
353
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
354 " }}}
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
355
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
356 " YankRing {{{
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
357
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
358 let g:yankring_replace_n_pkey = '<C-K>'
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
359 let g:yankring_replace_p_pkey = '<C-J>'
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
360
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
361 " }}}
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
362
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
363 " Python-Mode {{{
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
364
419
c4077384f55f Use `InputMono` or `Hack` if they're installed.
Ludovic Chabant <ludovic@chabant.com>
parents: 414
diff changeset
365 let g:pymode = 0
352
9580765366a4 Fix some python indenting stuff in vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 349
diff changeset
366 let g:pymode_python = 'python3'
307
b09d451f3516 Okay let's try PythonMode again.
Ludovic Chabant <ludovic@chabant.com>
parents: 306
diff changeset
367
314
5f9d52300aaa Vim tweaks:
Ludovic Chabant <ludovic@chabant.com>
parents: 313
diff changeset
368 let g:pymode_syntax = 0
307
b09d451f3516 Okay let's try PythonMode again.
Ludovic Chabant <ludovic@chabant.com>
parents: 306
diff changeset
369 let g:pymode_syntax_all = 0
b09d451f3516 Okay let's try PythonMode again.
Ludovic Chabant <ludovic@chabant.com>
parents: 306
diff changeset
370 let g:pymode_syntax_builtin_objs = 1
204
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
371 let g:pymode_syntax_print_as_function = 1
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
372 let g:pymode_syntax_space_errors = 1
307
b09d451f3516 Okay let's try PythonMode again.
Ludovic Chabant <ludovic@chabant.com>
parents: 306
diff changeset
373
352
9580765366a4 Fix some python indenting stuff in vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 349
diff changeset
374 let g:pymode_indent = 0
9580765366a4 Fix some python indenting stuff in vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 349
diff changeset
375
204
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
376 let g:pymode_run = 0
307
b09d451f3516 Okay let's try PythonMode again.
Ludovic Chabant <ludovic@chabant.com>
parents: 306
diff changeset
377
204
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
378 let g:pymode_lint = 0
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
379 let g:pymode_trim_whitespaces = 0
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
380 let g:pymode_folding = 1
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
381
307
b09d451f3516 Okay let's try PythonMode again.
Ludovic Chabant <ludovic@chabant.com>
parents: 306
diff changeset
382 let g:pymode_doc = 1
b09d451f3516 Okay let's try PythonMode again.
Ludovic Chabant <ludovic@chabant.com>
parents: 306
diff changeset
383 let g:pymode_doc_bind = 'K'
b09d451f3516 Okay let's try PythonMode again.
Ludovic Chabant <ludovic@chabant.com>
parents: 306
diff changeset
384
b09d451f3516 Okay let's try PythonMode again.
Ludovic Chabant <ludovic@chabant.com>
parents: 306
diff changeset
385 let g:pymode_virtualenv = 0
178
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
386
314
5f9d52300aaa Vim tweaks:
Ludovic Chabant <ludovic@chabant.com>
parents: 313
diff changeset
387 let g:pymode_rope = 0
5f9d52300aaa Vim tweaks:
Ludovic Chabant <ludovic@chabant.com>
parents: 313
diff changeset
388
178
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
389 " }}}
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
390
379
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
391 " Lightline {{{
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
392 let g:lightline = {
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
393 \'colorscheme': 'solarized',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
394 \'active': {
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
395 \ 'left': [ ['mode', 'paste'],
386
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
396 \ ['fugitive', 'lawrencium', 'readonly', 'relativepath', 'modified'],
379
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
397 \ ['ctrlpmark'] ],
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
398 \ 'right': [ ['lineinfo'],
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
399 \ ['percent'],
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
400 \ ['fileformat', 'fileencoding', 'filetype'],
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
401 \ ['gutentags', 'syntastic', 'ycm_errs', 'ycm_warns'] ]
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
402 \ },
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
403 \'component_function': {
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
404 \ 'fugitive': '_LightlineFugitive',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
405 \ 'lawrencium': '_LightlineLawrencium',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
406 \ 'ctrlpmark': '_LightlineCtrlPMark',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
407 \ },
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
408 \'component_expand': {
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
409 \ 'syntastic': '_LightlineSyntastic',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
410 \ 'ycm_errs': '_LightlineYcmErrors',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
411 \ 'ycm_warns': '_LightlineYcmWarnings',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
412 \ 'gutentags': '_LightlineGutentags',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
413 \ },
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
414 \'component_type': {
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
415 \ 'syntastic': 'error',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
416 \ 'ycm_errs': 'error',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
417 \ 'ycm_warns': 'warning',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
418 \ 'gutentags': 'warning',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
419 \ },
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
420 \}
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
421
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
422 function! _LightlineFugitive()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
423 return fugitive#head()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
424 endfunction
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
425
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
426 function! _LightlineLawrencium()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
427 return lawrencium#statusline()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
428 endfunction
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
429
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
430 function! _LightlineCtrlPMark()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
431 if expand('%:t') =~ 'ControlP' && has_key(g:lightline, 'ctrlp_item')
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
432 call lightline#link('iR'[g:lightline.ctrlp_regex])
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
433 return lightline#concatenate(
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
434 \['WAT?', g:lightline.ctrlp_prev,
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
435 \ g:lightline.ctrlp_item,
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
436 \ g:lightline.ctrlp_next],
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
437 \0)
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
438 else
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
439 return ''
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
440 endif
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
441 endfunction
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
442
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
443 function! _LightlineGutentags()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
444 return gutentags#statusline()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
445 endfunction
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
446
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
447 function! _LightlineSyntastic()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
448 return SyntasticStatuslineFlag()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
449 endfunction
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
450
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
451 function! _LightlineYcmErrors()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
452 let l:cnt = youcompleteme#GetErrorCount()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
453 return l:cnt > 0 ? string(l:cnt) : ''
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
454 endfunction
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
455
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
456 function! _LightlineYcmWarnings()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
457 let l:cnt = youcompleteme#GetWarningCount()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
458 return l:cnt > 0 ? string(l:cnt) : ''
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
459 endfunction
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
460 " }}}
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
461
386
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
462 " YouCompleteMe {{{
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
463
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
464 let g:ycm_always_populate_location_list = 1
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
465
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
466 " }}}
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
467
178
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
468 " }}}
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
469
73
39a7e05637d8 Added 80 chars limit to text/markdown files.
Ludovic Chabant <ludovic@chabant.com>
parents: 67
diff changeset
470 " File-Specific Settings {{{
39a7e05637d8 Added 80 chars limit to text/markdown files.
Ludovic Chabant <ludovic@chabant.com>
parents: 67
diff changeset
471
204
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
472 augroup VimRCFileType_markdown
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
473 au!
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
474 autocmd FileType text,markdown setlocal textwidth=80
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
475 autocmd FileType markdown nnoremap <buffer> <localleader>1 yypVr=:redraw<cr>
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
476 autocmd FileType markdown nnoremap <buffer> <localleader>2 yypVr-:redraw<cr>
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
477 autocmd FileType markdown nnoremap <buffer> <localleader>3 mzI###<space><esc>`z4l
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
478 autocmd FileType markdown nnoremap <buffer> <localleader>4 mzI####<space><esc>`z5l
176
c6a072353606 Vim config changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 173
diff changeset
479
204
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
480 autocmd BufRead,BufNewfile */Dropbox/Personal/SimpleNote/* set ft=markdown
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
481 autocmd BufRead,BufNewFile */_content/**/*.html set ft=piecrustmarkdown
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
482 augroup END
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
483
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
484 augroup VimRCFileType_php
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
485 au!
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
486 " Who the hell changes my matchpairs?
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
487 autocmd FileType php setlocal matchpairs-=<:>
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
488 augroup END
83
a54180045075 Vimrc changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 80
diff changeset
489
204
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
490 augroup VimRCFileType_c
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
491 au!
410
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
492 autocmd FileType c,c++,cpp setlocal foldmethod=syntax
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
493 autocmd FileType c,c++,cpp setlocal colorcolumn=120
413
4a2468f72e44 Optimize C++ file editing with some folding tricks.
Ludovic Chabant <ludovic@chabant.com>
parents: 410
diff changeset
494 autocmd FileType c,c++,cpp setlocal synmaxcol=200
4a2468f72e44 Optimize C++ file editing with some folding tricks.
Ludovic Chabant <ludovic@chabant.com>
parents: 410
diff changeset
495 autocmd FileType c,c++,cpp nnoremap <buffer> <localleader>z :call <SID>ToggleCppFolding()<CR>
410
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
496 augroup END
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
497
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
498 augroup VimRCFileType_csharp
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
499 au!
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
500 autocmd BufNewFile,BufRead *.xaml setlocal filetype=xml
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
501 autocmd FileType cs setlocal foldmethod=syntax
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
502 autocmd FileType cs setlocal colorcolumn=120
413
4a2468f72e44 Optimize C++ file editing with some folding tricks.
Ludovic Chabant <ludovic@chabant.com>
parents: 410
diff changeset
503 autocmd FileType cs setlocal synmaxcol=200
204
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
504 augroup END
83
a54180045075 Vimrc changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 80
diff changeset
505
204
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
506 augroup VimRCFileType_css
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
507 au!
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
508 autocmd BufNewFile,BufRead *.less setlocal filetype=less
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
509 autocmd Filetype less,css setlocal foldmethod=marker
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
510 autocmd Filetype less,css setlocal foldmarker={,}
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
511 autocmd Filetype less,css setlocal iskeyword+=-
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
512 autocmd Filetype less,css setlocal omnifunc=csscomplete#CompleteCSS
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
513 augroup END
160
5997455e475b Whitespace cleaning.
Ludovic Chabant <ludovic@chabant.com>
parents: 157
diff changeset
514
204
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
515 augroup VimRCTrailingWhitespaces
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
516 au!
287
44c9d65cfa74 Readjust some Vim config stuff around folding.
Ludovic Chabant <ludovic@chabant.com>
parents: 286
diff changeset
517 autocmd FileType php,ruby,python,js,css,less autocmd BufWritePre <buffer> :call <SID>StripTrailingWhitespaces()
204
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
518 augroup END
73
39a7e05637d8 Added 80 chars limit to text/markdown files.
Ludovic Chabant <ludovic@chabant.com>
parents: 67
diff changeset
519
39a7e05637d8 Added 80 chars limit to text/markdown files.
Ludovic Chabant <ludovic@chabant.com>
parents: 67
diff changeset
520 " }}}
39a7e05637d8 Added 80 chars limit to text/markdown files.
Ludovic Chabant <ludovic@chabant.com>
parents: 67
diff changeset
521
59
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
522 " Mappings {{{
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
523
42
6b831735c092 Added french keymap support.
Ludovic Chabant <ludovic@chabant.com>
parents: 18
diff changeset
524 let mapleader=","
43
25e8b2fffd50 Changed some mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 42
diff changeset
525
76
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
526 " Visual line navigation
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
527 noremap <up> g<up>
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
528 noremap <down> g<down>
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
529 noremap <home> g<home>
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
530 noremap <end> g<end>
990968329a9b Disabled minibufexpl for a while.
Ludovic Chabant <ludovic@chabant.com>
parents: 73
diff changeset
531
367
d8ae3de7de06 More Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 356
diff changeset
532 noremap <S-up> 20<up>
d8ae3de7de06 More Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 356
diff changeset
533 noremap <S-down> 20<down>
d8ae3de7de06 More Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 356
diff changeset
534
169
4947d1f99b72 Better tab/buffer navigation.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
535 " Tab navigation
178
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
536 noremap <C-Tab> :tabnext<cr>
94bf0bd0a788 Updated sub-repos.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
537 noremap <C-S-Tab> :tabprevious<cr>
304
50fbd059a6a1 More Vim customizations.
Ludovic Chabant <ludovic@chabant.com>
parents: 303
diff changeset
538 nnoremap <leader>t :tabnew<cr>
169
4947d1f99b72 Better tab/buffer navigation.
Ludovic Chabant <ludovic@chabant.com>
parents: 163
diff changeset
539
80
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
540 " Window navigation
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
541 nnoremap <C-up> :wincmd k<cr>
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
542 nnoremap <C-down> :wincmd j<cr>
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
543 nnoremap <C-left> :wincmd h<cr>
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
544 nnoremap <C-right> :wincmd l<cr>
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
545
176
c6a072353606 Vim config changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 173
diff changeset
546 " Switch buffers.
420
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
547 nnoremap <F1> :execute ("buffer " . bufname("#"))<cr>
83
a54180045075 Vimrc changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 80
diff changeset
548
176
c6a072353606 Vim config changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 173
diff changeset
549 " NERDTree.
420
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
550 nnoremap <F2> :call <SID>ToggleNERDTree()<cr>
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
551 nnoremap <C-F2> :call <SID>FindInNERDTree()<cr>
83
a54180045075 Vimrc changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 80
diff changeset
552
157
7fd22eb11789 Added `tagbar` for Vim, with keyboard shortcut.
Ludovic Chabant <ludovic@chabant.com>
parents: 155
diff changeset
553 " Tagbar.
420
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
554 nnoremap <F3> :TagbarToggle<cr>
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
555 nnoremap <C-F3> :TagbarOpenAutoClose<cr>
157
7fd22eb11789 Added `tagbar` for Vim, with keyboard shortcut.
Ludovic Chabant <ludovic@chabant.com>
parents: 155
diff changeset
556
186
01304e9b4c19 Re-add Gundo mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 185
diff changeset
557 " Gundo.
420
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
558 nnoremap <F4> :GundoToggle<cr>
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
559
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
560 " F5 to F8 are available for context-dependent mappings.
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
561
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
562 " Jump to tags by keeping things better in view. Option for jumping to a tag
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
563 " in a split window where everything is folded except what you need to see.
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
564 " Note that if a tag search yield multiple possible results, we will still run
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
565 " some of that `zvzz` stuff, but that's OK, the main point is to not mess up
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
566 " the result selection window either.
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
567 "
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
568 " Go back after checking out a tag.
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
569 nnoremap <F9> :pop<CR>
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
570 " Go check out a tag.
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
571 nnoremap <F10> g<C-]>zvzz
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
572 " Go check out a tag in a split window.
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
573 nnoremap <S-F10> <C-W>vg<C-]>zMzvzz
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
574 " Move to previous matching tag.
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
575 nnoremap <C-F9> :tprevious<CR>
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
576 " Move to next matching tag.
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
577 nnoremap <C-F10> :tnext<CR>
186
01304e9b4c19 Re-add Gundo mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 185
diff changeset
578
83
a54180045075 Vimrc changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 80
diff changeset
579 " Common typos.
a54180045075 Vimrc changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 80
diff changeset
580 nnoremap ; :
a54180045075 Vimrc changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 80
diff changeset
581
80
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
582 " Split windows
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
583 nnoremap <leader>s :split<cr>
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
584 nnoremap <leader>v :vsplit<cr>
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
585
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
586 " Easier things to type
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
587 nnoremap <leader>w :w<cr>
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
588 nnoremap <leader>q :q<cr>
119
6dbbf36a523d VIM changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
589 nnoremap <leader>hh :Hg
6dbbf36a523d VIM changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
590 nnoremap <leader>hg :Hg!
112
9495034e7dc4 New mappings in Vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 103
diff changeset
591 nnoremap <leader>hs :Hgstatus<cr>
9495034e7dc4 New mappings in Vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 103
diff changeset
592 nnoremap <leader>hv :Hgvdiff<cr>
80
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
593
114
ccc3902408d2 Fix the hash key in Vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 113
diff changeset
594 " Make the hash-key not suck.
ccc3902408d2 Fix the hash key in Vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 113
diff changeset
595 inoremap # X<BS>#
ccc3902408d2 Fix the hash key in Vim.
Ludovic Chabant <ludovic@chabant.com>
parents: 113
diff changeset
596
80
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
597 " Toggle invisible characters
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
598 nnoremap <leader>i :set list!<cr>
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
599
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
600 " Clear search matches
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline).
Ludovic Chabant <ludovic@chabant.com>
parents: 76
diff changeset
601 nnoremap <leader><space> :noh<cr>:call clearmatches()<cr>
43
25e8b2fffd50 Changed some mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 42
diff changeset
602
45
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
603 " Switch between FR and US keyboard layouts.
119
6dbbf36a523d VIM changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
604 nnoremap <C-l>f :setlocal keymap=french<cr>
6dbbf36a523d VIM changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
605 nnoremap <C-l>u :setlocal keymap=<cr>
45
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
606
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
607 " Toggle spell check according to current keyboard layout.
119
6dbbf36a523d VIM changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
608 nnoremap <C-l>s :call <SID>ToggleSpellCheck()<cr>
45
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
609
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
610 " Simple way to close a buffer without closing the window.
347
4d73159f56ca Use pathogen as a sub-repo, plus a few Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 332
diff changeset
611 nnoremap <leader>d :bprevious<cr>:bdelete #<cr>
43
25e8b2fffd50 Changed some mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 42
diff changeset
612
119
6dbbf36a523d VIM changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
613 " Use sane regexes.
6dbbf36a523d VIM changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
614 nnoremap / /\v
6dbbf36a523d VIM changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
615 vnoremap / /\v
6dbbf36a523d VIM changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
616
289
8b6ca7e40f37 Making jumping around in Vim nicer.
Ludovic Chabant <ludovic@chabant.com>
parents: 288
diff changeset
617 " Next/previous quickfix and location messages.
303
01ec865443b6 Update NERDTree macros and tweak more Vim stuff.
Ludovic Chabant <ludovic@chabant.com>
parents: 294
diff changeset
618 " This is meant to be similar to ]c and [c for the diff navigation.
289
8b6ca7e40f37 Making jumping around in Vim nicer.
Ludovic Chabant <ludovic@chabant.com>
parents: 288
diff changeset
619 nnoremap ]q :cnext<cr>zvzz
8b6ca7e40f37 Making jumping around in Vim nicer.
Ludovic Chabant <ludovic@chabant.com>
parents: 288
diff changeset
620 nnoremap [q :cprevious<cr>zvzz
8b6ca7e40f37 Making jumping around in Vim nicer.
Ludovic Chabant <ludovic@chabant.com>
parents: 288
diff changeset
621 nnoremap ]l :lnext<cr>zvzz
8b6ca7e40f37 Making jumping around in Vim nicer.
Ludovic Chabant <ludovic@chabant.com>
parents: 288
diff changeset
622 nnoremap [l :lprevious<cr>zvzz
8b6ca7e40f37 Making jumping around in Vim nicer.
Ludovic Chabant <ludovic@chabant.com>
parents: 288
diff changeset
623
304
50fbd059a6a1 More Vim customizations.
Ludovic Chabant <ludovic@chabant.com>
parents: 303
diff changeset
624 " Same with change and jump lists.
367
d8ae3de7de06 More Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 356
diff changeset
625 nnoremap ]e g,zz
d8ae3de7de06 More Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 356
diff changeset
626 nnoremap [e g;zz
304
50fbd059a6a1 More Vim customizations.
Ludovic Chabant <ludovic@chabant.com>
parents: 303
diff changeset
627 nnoremap ]j <C-I>
50fbd059a6a1 More Vim customizations.
Ludovic Chabant <ludovic@chabant.com>
parents: 303
diff changeset
628 nnoremap [j <C-O>
289
8b6ca7e40f37 Making jumping around in Vim nicer.
Ludovic Chabant <ludovic@chabant.com>
parents: 288
diff changeset
629
367
d8ae3de7de06 More Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 356
diff changeset
630 " Copy the current buffer's info.
386
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
631 nnoremap <leader>cp :let @+ = expand('%:p')<cr>:echo @+<cr>
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
632 nnoremap <leader>cf :let @+ = expand('%:h')<cr>:echo @+<cr>
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 381
diff changeset
633 nnoremap <leader>cw :let @+ = getcwd()<cr>:echo @+<cr>
367
d8ae3de7de06 More Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 356
diff changeset
634
303
01ec865443b6 Update NERDTree macros and tweak more Vim stuff.
Ludovic Chabant <ludovic@chabant.com>
parents: 294
diff changeset
635 " Make the diff navigation also center things.
289
8b6ca7e40f37 Making jumping around in Vim nicer.
Ludovic Chabant <ludovic@chabant.com>
parents: 288
diff changeset
636 nnoremap ]c ]czvzz
8b6ca7e40f37 Making jumping around in Vim nicer.
Ludovic Chabant <ludovic@chabant.com>
parents: 288
diff changeset
637 nnoremap [c [czvzz
8b6ca7e40f37 Making jumping around in Vim nicer.
Ludovic Chabant <ludovic@chabant.com>
parents: 288
diff changeset
638
103
a755319f124e Added mappings for substitutions.
Ludovic Chabant <ludovic@chabant.com>
parents: 101
diff changeset
639 " Quick search and replace.
119
6dbbf36a523d VIM changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
640 function! s:VSetSearch()
294
8bc056d80c39 Remove unused stuff, add grepping, shorter status line.
Ludovic Chabant <ludovic@chabant.com>
parents: 291
diff changeset
641 let temp = @@
8bc056d80c39 Remove unused stuff, add grepping, shorter status line.
Ludovic Chabant <ludovic@chabant.com>
parents: 291
diff changeset
642 norm! gvy
8bc056d80c39 Remove unused stuff, add grepping, shorter status line.
Ludovic Chabant <ludovic@chabant.com>
parents: 291
diff changeset
643 let @/ = '\V' . substitute(escape(@@, '\'), '\n', '\\n', 'g')
8bc056d80c39 Remove unused stuff, add grepping, shorter status line.
Ludovic Chabant <ludovic@chabant.com>
parents: 291
diff changeset
644 let @@ = temp
119
6dbbf36a523d VIM changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
645 endfunction
6dbbf36a523d VIM changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
646 vnoremap * :<C-u>call <SID>VSetSearch()<CR>//<CR><c-o>
6dbbf36a523d VIM changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 118
diff changeset
647 vnoremap # :<C-u>call <SID>VSetSearch()<CR>??<CR><c-o>
118
c1ff96232138 New settings for Lawrencium.
Ludovic Chabant <ludovic@chabant.com>
parents: 114
diff changeset
648
294
8bc056d80c39 Remove unused stuff, add grepping, shorter status line.
Ludovic Chabant <ludovic@chabant.com>
parents: 291
diff changeset
649 nnoremap <leader>fa :vimgrep /<C-R><C-W>/
8bc056d80c39 Remove unused stuff, add grepping, shorter status line.
Ludovic Chabant <ludovic@chabant.com>
parents: 291
diff changeset
650 vnoremap <leader>fa "zy:vimgrep /<C-R>z/
8bc056d80c39 Remove unused stuff, add grepping, shorter status line.
Ludovic Chabant <ludovic@chabant.com>
parents: 291
diff changeset
651
206
dae926f52b9a Some Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
652 " Keep search matches in the middle of the window.
289
8b6ca7e40f37 Making jumping around in Vim nicer.
Ludovic Chabant <ludovic@chabant.com>
parents: 288
diff changeset
653 nnoremap n nzvzz
8b6ca7e40f37 Making jumping around in Vim nicer.
Ludovic Chabant <ludovic@chabant.com>
parents: 288
diff changeset
654 nnoremap N Nzvzz
206
dae926f52b9a Some Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
655
379
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
656 " YCM mappings.
420
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
657 if s:HasPlugin('youcompleteme')
426
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
658 augroup VimRC_YouCompleteMe
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
659 autocmd!
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
660 autocmd FileType cpp nnoremap <Leader>jj :YcmCompleter GoToImprecise<cr>zv
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
661 autocmd FileType cpp nnoremap <Leader>jd :YcmCompleter GoToDefinition<cr>zv
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
662 autocmd FileType cpp nnoremap <Leader>jh :YcmCompleter GoToDeclaration<cr>zv
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
663 autocmd FileType cpp nnoremap <Leader>ji :YcmCompleter GoToInclude<cr>
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
664 autocmd FileType cpp nnoremap <Leader>jc :YcmCompleter GetDoc<cr>
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
665 autocmd FileType cpp nnoremap <Leader>je :YcmShowDetailedDiagnostic<cr>
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
666 augroup END
420
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
667 endif
397
c32b9b172314 Specify YCM/OmniSharp mappings only for specific file types.
Ludovic Chabant <ludovic@chabant.com>
parents: 392
diff changeset
668
c32b9b172314 Specify YCM/OmniSharp mappings only for specific file types.
Ludovic Chabant <ludovic@chabant.com>
parents: 392
diff changeset
669 " OmniSharp mappings
420
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
670 if s:HasPlugin('OmniSharp')
426
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
671 augroup VimRC_OmniSharp
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
672 autocmd!
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
673 autocmd FileType cs setlocal omnifunc=OmniSharp#Complete
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
674 autocmd BufEnter,TextChanged,InsertLeave *.cs SyntasticCheck
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
675 autocmd CursorHold *.cs call OmniSharp#TypeLookupWithoutDocumentation()
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
676 autocmd FileType cs nnoremap <Leader>jj :OmniSharpGotoDefinition<cr>
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
677 autocmd FileType cs nnoremap <Leader>x :OmniSharpFixIssue<cr>
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
678 autocmd FileType cs nnoremap <Leader>fx :OmniSharpFixUsings<cr>
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
679 autocmd FileType cs nnoremap <Leader>tt :OmniSharpTypeLookup<cr>
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
680 autocmd FileType cs nnoremap <Leader>dc :OmniSharpDocumentation<cr>
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
681 augroup END
420
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
682 endif
379
58410650ce36 Add lightline and remove old scratch. Customize Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 373
diff changeset
683
410
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
684 " ProjectRoot mappings
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
685 let s:no_auto_projectroot_buftypes = [
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
686 \'help', 'nofile', 'quickfix']
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
687
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
688 function! s:AutoProjectRootCD() abort
426
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
689 try
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
690 if index(s:no_auto_projectroot_buftypes, &buftype) == -1
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
691 ProjectRootCD
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
692 endif
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
693 catch
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
694 " Silently ignore invalid buffers
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
695 endtry
410
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
696 endfunction
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
697
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
698 augroup VimRC_ProjectRoot
426
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
699 autocmd!
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
700 autocmd BufEnter * call <SID>AutoProjectRootCD()
410
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
701 augroup END
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
702
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
703 nnoremap <leader>cd :ProjectRootCD<cr>
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
704
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
705 " Ctrl-P mappings.
420
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
706 if s:HasPlugin('ctrlp')
426
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
707 nnoremap <silent> <C-p> :CtrlP<cr>
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
708 nnoremap <silent> <C-o> :CtrlPBuffer<cr>
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
709 nnoremap <silent> <C-u> :CtrlPTag<cr>
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
710 nnoremap <silent> <C-y> :CtrlPBufTag<cr>
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
711 nnoremap <silent> <Tab> :CtrlPMRUFiles<cr>
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
712 nnoremap <silent> <F8> :CtrlPBookmarkDir<cr>
410
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
713 endif
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
714
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
715 " FZF mappings.
420
e6b3048980c4 Vim tweaks
Ludovic Chabant <ludovic@chabant.com>
parents: 419
diff changeset
716 if s:HasPlugin('fzf')
426
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
717 if exists('*fzf#run')
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
718 nnoremap <silent> <C-p> :Files<cr>
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
719 nnoremap <silent> <C-o> :Buffers<cr>
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
720 nnoremap <Tab> :History<cr>
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
721 else
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
722 call ludo#error(
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
723 \"FZF is installed and enabled, but the Vim plugin ".
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
724 \"isn't loaded... add it to your `vimrc-local-pre`.")
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
725 endif
410
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
726 endif
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
727
59
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
728 " }}}
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
729
204
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
730 " Folding {{{
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
731
367
d8ae3de7de06 More Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 356
diff changeset
732 " Start with one level of open.
d8ae3de7de06 More Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 356
diff changeset
733 set foldlevel=1
d8ae3de7de06 More Vim tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 356
diff changeset
734
385
d367df6afcad Don't fold too much.
Ludovic Chabant <ludovic@chabant.com>
parents: 379
diff changeset
735 " Don't fold too much.
d367df6afcad Don't fold too much.
Ludovic Chabant <ludovic@chabant.com>
parents: 379
diff changeset
736 set foldnestmax=2
d367df6afcad Don't fold too much.
Ludovic Chabant <ludovic@chabant.com>
parents: 379
diff changeset
737
287
44c9d65cfa74 Readjust some Vim config stuff around folding.
Ludovic Chabant <ludovic@chabant.com>
parents: 286
diff changeset
738 " Folds are defined by markers in the text.
410
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
739 set foldmethod=marker"{{{"}}}
204
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
740
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
741 " Toggle folds with <space>.
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
742 nnoremap <space> za
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
743
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
744 " Create folds with <space> (in visual mode).
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
745 vnoremap <space> zf
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
746
413
4a2468f72e44 Optimize C++ file editing with some folding tricks.
Ludovic Chabant <ludovic@chabant.com>
parents: 410
diff changeset
747 " See http://vim.wikia.com/wiki/Keep_folds_closed_while_inserting_text
4a2468f72e44 Optimize C++ file editing with some folding tricks.
Ludovic Chabant <ludovic@chabant.com>
parents: 410
diff changeset
748 " Don't screw up folds when inserting text that might affect them, until
4a2468f72e44 Optimize C++ file editing with some folding tricks.
Ludovic Chabant <ludovic@chabant.com>
parents: 410
diff changeset
749 " leaving insert mode. Foldmethod is local to the window. Protect against
4a2468f72e44 Optimize C++ file editing with some folding tricks.
Ludovic Chabant <ludovic@chabant.com>
parents: 410
diff changeset
750 " screwing up folding when switching between windows.
4a2468f72e44 Optimize C++ file editing with some folding tricks.
Ludovic Chabant <ludovic@chabant.com>
parents: 410
diff changeset
751 autocmd InsertEnter * if !exists('w:last_fdm') | let w:last_fdm=&foldmethod | setlocal foldmethod=manual | endif
4a2468f72e44 Optimize C++ file editing with some folding tricks.
Ludovic Chabant <ludovic@chabant.com>
parents: 410
diff changeset
752 autocmd InsertLeave,WinLeave * if exists('w:last_fdm') | let &l:foldmethod=w:last_fdm | unlet w:last_fdm | endif
4a2468f72e44 Optimize C++ file editing with some folding tricks.
Ludovic Chabant <ludovic@chabant.com>
parents: 410
diff changeset
753
204
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
754 " }}}
4bd15b5afcfc Some cleanup and improvements to `vimrc`.
Ludovic Chabant <ludovic@chabant.com>
parents: 201
diff changeset
755
59
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
756 " Abbreviations {{{
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
757
43
25e8b2fffd50 Changed some mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 42
diff changeset
758 iabbrev @@ ludovic@chabant.com
25e8b2fffd50 Changed some mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 42
diff changeset
759 iabbrev ccopy Copyright &copy;2011 Ludovic Chabant, all rights reserved.
25e8b2fffd50 Changed some mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 42
diff changeset
760 iabbrev ssig --<cr>l u d o .<cr>. 8 0 17 80
0
9dbf340c7956 Initial commit
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
761
59
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
762 " }}}
6df571869f4a Added statusline and fold-related mappings.
Ludovic Chabant <ludovic@chabant.com>
parents: 55
diff changeset
763
45
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
764 " Functions {{{
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
765
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
766 function! s:ToggleSpellCheck() abort
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
767 if &spell ==? 'nospell'
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
768 if &keymap ==? 'french'
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
769 setlocal spell spelllang=fr_fr
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
770 else
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
771 setlocal spell spelllang=en_us,en_ca
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
772 endif
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
773 else
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
774 setlocal spell nospell
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
775 endif
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
776 endfunction
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
777
160
5997455e475b Whitespace cleaning.
Ludovic Chabant <ludovic@chabant.com>
parents: 157
diff changeset
778 function! s:StripTrailingWhitespaces() abort
5997455e475b Whitespace cleaning.
Ludovic Chabant <ludovic@chabant.com>
parents: 157
diff changeset
779 let l = line(".")
5997455e475b Whitespace cleaning.
Ludovic Chabant <ludovic@chabant.com>
parents: 157
diff changeset
780 let c = col(".")
5997455e475b Whitespace cleaning.
Ludovic Chabant <ludovic@chabant.com>
parents: 157
diff changeset
781 %s/\s\+$//e
5997455e475b Whitespace cleaning.
Ludovic Chabant <ludovic@chabant.com>
parents: 157
diff changeset
782 call cursor(l, c)
5997455e475b Whitespace cleaning.
Ludovic Chabant <ludovic@chabant.com>
parents: 157
diff changeset
783 endfunction
5997455e475b Whitespace cleaning.
Ludovic Chabant <ludovic@chabant.com>
parents: 157
diff changeset
784
176
c6a072353606 Vim config changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 173
diff changeset
785 function! s:ToggleNERDTree() abort
c6a072353606 Vim config changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 173
diff changeset
786 NERDTreeToggle
c6a072353606 Vim config changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 173
diff changeset
787 endfunction
c6a072353606 Vim config changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 173
diff changeset
788
c6a072353606 Vim config changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 173
diff changeset
789 function! s:FindInNERDTree() abort
410
5bbd5963591c Some Vim config tweaks.
Ludovic Chabant <ludovic@chabant.com>
parents: 397
diff changeset
790 ProjectRootExe NERDTreeFind
332
c44641ca37e2 Fix NERDTree stuff.
Ludovic Chabant <ludovic@chabant.com>
parents: 323
diff changeset
791 normal zz
176
c6a072353606 Vim config changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 173
diff changeset
792 endfunction
c6a072353606 Vim config changes:
Ludovic Chabant <ludovic@chabant.com>
parents: 173
diff changeset
793
413
4a2468f72e44 Optimize C++ file editing with some folding tricks.
Ludovic Chabant <ludovic@chabant.com>
parents: 410
diff changeset
794 function! s:ToggleCppFolding() abort
426
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
795 if (&foldmethod == "syntax")
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
796 setlocal foldmethod=manual
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
797 setlocal nofoldenable
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
798 else
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
799 setlocal foldmethod=syntax
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
800 setlocal foldenable
67f14a8c2304 Improve Vim configuration.
Ludovic Chabant <ludovic@chabant.com>
parents: 424
diff changeset
801 endif
413
4a2468f72e44 Optimize C++ file editing with some folding tricks.
Ludovic Chabant <ludovic@chabant.com>
parents: 410
diff changeset
802 endfunction
4a2468f72e44 Optimize C++ file editing with some folding tricks.
Ludovic Chabant <ludovic@chabant.com>
parents: 410
diff changeset
803
45
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
804 " }}}
aac6188ab4d6 Added vimroom plugin (disabled by default).
Ludovic Chabant <ludovic@chabant.com>
parents: 43
diff changeset
805
171
7559d8bc39bb Added local override of Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 169
diff changeset
806 " Local override {{{
7559d8bc39bb Added local override of Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 169
diff changeset
807
191
896acf280e7a Make local Vim config consistent with Mercurial local config.
Ludovic Chabant <ludovic@chabant.com>
parents: 186
diff changeset
808 let s:local_vimrc = s:vim_home.'/vimrc-local'
171
7559d8bc39bb Added local override of Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 169
diff changeset
809 if filereadable(s:local_vimrc)
7559d8bc39bb Added local override of Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 169
diff changeset
810 execute 'source' s:local_vimrc
7559d8bc39bb Added local override of Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 169
diff changeset
811 endif
7559d8bc39bb Added local override of Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 169
diff changeset
812
7559d8bc39bb Added local override of Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 169
diff changeset
813 " }}}
7559d8bc39bb Added local override of Vim settings.
Ludovic Chabant <ludovic@chabant.com>
parents: 169
diff changeset
814