Wed, 31 May 2017 12:17:38 -0400
simplify
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
1 | " vim: et sts=2 sw=2 |
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
2 | " vim: fdm=marker |
1 | 3 | set nocompatible |
4 | ||
466 | 5 | " on windows and not cygwin |
578
3e4703eef23d
make on_windows global
Meredith Howard <mhoward@roomag.org>
parents:
577
diff
changeset
|
6 | let g:on_windows = (has('win32') || has('win64')) |
3e4703eef23d
make on_windows global
Meredith Howard <mhoward@roomag.org>
parents:
577
diff
changeset
|
7 | let s:filename = expand('<sfile>') |
10
e753144057b8
Windows-compatible vimrc
Meredith Howard <mhoward@roomag.org>
parents:
7
diff
changeset
|
8 | |
19 | 9 | " Set up Vundle and plugins {{{ |
579
0cb7adee16fe
move begin into function too
Meredith Howard <mhoward@roomag.org>
parents:
578
diff
changeset
|
10 | call vimrc#VundleInstallAndBegin() |
10
e753144057b8
Windows-compatible vimrc
Meredith Howard <mhoward@roomag.org>
parents:
7
diff
changeset
|
11 | |
1 | 12 | Plugin 'gmarik/vundle' |
13 | ||
250
d2198d389e39
Update to new vim-airline repo and get jellybeans theme back
Meredith Howard <mhoward@roomag.org>
parents:
246
diff
changeset
|
14 | Plugin 'vim-airline/vim-airline' |
d2198d389e39
Update to new vim-airline repo and get jellybeans theme back
Meredith Howard <mhoward@roomag.org>
parents:
246
diff
changeset
|
15 | Plugin 'vim-airline/vim-airline-themes' |
200
ed0d44ce8115
Add vim-interestingwords
Meredith Howard <mhoward@roomag.org>
parents:
188
diff
changeset
|
16 | Plugin 'vasconcelloslf/vim-interestingwords' |
1 | 17 | |
167 | 18 | Plugin 'editorconfig/editorconfig-vim' |
19 | ||
1 | 20 | Plugin 'Shougo/vimproc.vim' |
21 | Plugin 'Shougo/unite.vim' | |
87 | 22 | Plugin 'Shougo/vimfiler.vim' |
232 | 23 | Plugin 'Shougo/unite-session' |
1 | 24 | Plugin 'sjl/gundo.vim' |
25 | Plugin 'majutsushi/tagbar' | |
573 | 26 | Plugin 'rking/ag.vim' |
237 | 27 | |
1 | 28 | Plugin 'godlygeek/tabular' |
29 | Plugin 'tomtom/tcomment_vim' | |
82 | 30 | Plugin 'tpope/vim-unimpaired' |
83
29dc36168071
add endwise, disable auto comment leaders on newline
Meredith Howard <mhoward@roomag.org>
parents:
82
diff
changeset
|
31 | Plugin 'tpope/vim-endwise' |
1 | 32 | |
451 | 33 | Plugin 'vimwiki/vimwiki' |
235 | 34 | |
1 | 35 | Plugin 'tpope/vim-fugitive' |
36 | Plugin 'ludovicchabant/vim-lawrencium' | |
37 | ||
536
4d01cb9a0bb1
add vinarise - hex edit helper
Meredith Howard <mhoward@roomag.org>
parents:
535
diff
changeset
|
38 | Plugin 'Shougo/vinarise.vim' |
283
c86c75c120ad
drop ri, add vim-asciidoc
Meredith Howard <mhoward@roomag.org>
parents:
259
diff
changeset
|
39 | Plugin 'asciidoc/vim-asciidoc' |
345
e0bfe67950f8
using vim-perl after all. add some new contrib stuff too
Meredith Howard <mhoward@roomag.org>
parents:
343
diff
changeset
|
40 | Plugin 'vim-perl/vim-perl' |
343
6cfbfc24ebd6
replace lang plugins with vim-polyglot
Meredith Howard <mhoward@roomag.org>
parents:
341
diff
changeset
|
41 | Plugin 'sheerun/vim-polyglot' |
126 | 42 | Plugin 'yko/mojo.vim' |
409
ef7a3edc69e9
move alchemist and beancount to main
Meredith Howard <mhoward@roomag.org>
parents:
398
diff
changeset
|
43 | Plugin 'slashmili/alchemist.vim' |
ef7a3edc69e9
move alchemist and beancount to main
Meredith Howard <mhoward@roomag.org>
parents:
398
diff
changeset
|
44 | Plugin 'nathangrigg/vim-beancount' |
551 | 45 | Plugin 'chr4/sslsecure.vim' |
86
6fb982f177b3
Get the latest vim-{perl,ruby} kits and only try to force size on windows gui
Meredith Howard <mhoward@roomag.org>
parents:
85
diff
changeset
|
46 | |
340 | 47 | Plugin 'powerman/vim-plugin-viewdoc' |
48 | Plugin 'powerman/vim-plugin-AnsiEsc' | |
49 | ||
576 | 50 | let g:no_viewdoc_maps = 1 |
51 | ||
144
46c87d5ef8bf
Add option to source vimrc.local-pre, for adding Plugins near the beginning
Meredith Howard <mhoward@roomag.org>
parents:
142
diff
changeset
|
52 | try |
466 | 53 | execute 'source ' . s:filename . '.local-pre' |
144
46c87d5ef8bf
Add option to source vimrc.local-pre, for adding Plugins near the beginning
Meredith Howard <mhoward@roomag.org>
parents:
142
diff
changeset
|
54 | catch |
46c87d5ef8bf
Add option to source vimrc.local-pre, for adding Plugins near the beginning
Meredith Howard <mhoward@roomag.org>
parents:
142
diff
changeset
|
55 | endtry |
46c87d5ef8bf
Add option to source vimrc.local-pre, for adding Plugins near the beginning
Meredith Howard <mhoward@roomag.org>
parents:
142
diff
changeset
|
56 | |
574
3874b97048b0
Move vundle install to func, switch to begin/end vundle interface
Meredith Howard <mhoward@roomag.org>
parents:
573
diff
changeset
|
57 | call vundle#end() |
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
58 | " }}} |
1 | 59 | |
60 | ||
295
33d6b9519d7e
Add mappings and default magic-free regex, also expand scrolloff
Meredith Howard <mhoward@roomag.org>
parents:
294
diff
changeset
|
61 | " Key maps {{{ |
576 | 62 | nmap <silent> <F1> :Unite buffer<CR> |
467 | 63 | nmap <silent> <C-F1> :Unite -quick-match -short-source-names window tab:no-current<CR> |
295
33d6b9519d7e
Add mappings and default magic-free regex, also expand scrolloff
Meredith Howard <mhoward@roomag.org>
parents:
294
diff
changeset
|
64 | nmap <silent> <A-F1> :Unite session<CR> |
576 | 65 | nmap <silent> <F2> :VimFilerExplorer<CR> |
467 | 66 | nmap <silent> <C-F2> :Unite -start-insert file_rec/async:!<CR> |
576 | 67 | map <silent> <F4> :noh<CR> |
68 | nmap <silent> <F5> :GundoToggle<CR> | |
69 | nmap <silent> <F8> :TagbarToggle<CR> | |
13
c061abf8217c
Be more defensive on windows, clean up and add sections
Meredith Howard <mhoward@roomag.org>
parents:
12
diff
changeset
|
70 | |
203 | 71 | " stop opening help by mistake |
201
17404b9123cd
Quit opening help by mistake, and nice up bufferbar
Meredith Howard <mhoward@roomag.org>
parents:
200
diff
changeset
|
72 | imap <F1> <ESC> |
203 | 73 | |
74 | " let F4, :noh work as-is in insert mode | |
13
c061abf8217c
Be more defensive on windows, clean up and add sections
Meredith Howard <mhoward@roomag.org>
parents:
12
diff
changeset
|
75 | imap <F4> <C-O><F4> |
c061abf8217c
Be more defensive on windows, clean up and add sections
Meredith Howard <mhoward@roomag.org>
parents:
12
diff
changeset
|
76 | |
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
77 | " chdir to the directory of the open buffer |
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
78 | map <leader>cd :cd %:p:h<cr>:pwd<cr> |
13
c061abf8217c
Be more defensive on windows, clean up and add sections
Meredith Howard <mhoward@roomag.org>
parents:
12
diff
changeset
|
79 | |
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
80 | map <leader>pp :setlocal paste!<cr> |
111
99cc7b567195
Easier window navigation, disable insert-mode F-keys except F4
Meredith Howard <mhoward@roomag.org>
parents:
109
diff
changeset
|
81 | |
99cc7b567195
Easier window navigation, disable insert-mode F-keys except F4
Meredith Howard <mhoward@roomag.org>
parents:
109
diff
changeset
|
82 | " faster window nav |
99cc7b567195
Easier window navigation, disable insert-mode F-keys except F4
Meredith Howard <mhoward@roomag.org>
parents:
109
diff
changeset
|
83 | nmap <C-h> <C-w>h |
99cc7b567195
Easier window navigation, disable insert-mode F-keys except F4
Meredith Howard <mhoward@roomag.org>
parents:
109
diff
changeset
|
84 | nmap <C-j> <C-w>j |
99cc7b567195
Easier window navigation, disable insert-mode F-keys except F4
Meredith Howard <mhoward@roomag.org>
parents:
109
diff
changeset
|
85 | nmap <C-k> <C-w>k |
99cc7b567195
Easier window navigation, disable insert-mode F-keys except F4
Meredith Howard <mhoward@roomag.org>
parents:
109
diff
changeset
|
86 | nmap <C-l> <C-w>l |
544
f8c29fb56a91
add c-\ for 'last split'
Meredith Howard <mhoward@roomag.org>
parents:
539
diff
changeset
|
87 | nmap <C-\> <C-w>p |
202
f7aa9b7b7800
configure interestingwords more
Meredith Howard <mhoward@roomag.org>
parents:
201
diff
changeset
|
88 | |
295
33d6b9519d7e
Add mappings and default magic-free regex, also expand scrolloff
Meredith Howard <mhoward@roomag.org>
parents:
294
diff
changeset
|
89 | " navigate by on-screen lines |
33d6b9519d7e
Add mappings and default magic-free regex, also expand scrolloff
Meredith Howard <mhoward@roomag.org>
parents:
294
diff
changeset
|
90 | map j gj |
33d6b9519d7e
Add mappings and default magic-free regex, also expand scrolloff
Meredith Howard <mhoward@roomag.org>
parents:
294
diff
changeset
|
91 | map k gk |
33d6b9519d7e
Add mappings and default magic-free regex, also expand scrolloff
Meredith Howard <mhoward@roomag.org>
parents:
294
diff
changeset
|
92 | |
521 | 93 | " alt buffer |
94 | nmap gb <C-^> | |
547 | 95 | nmap gB :ls<CR>:b<Space> |
521 | 96 | |
306
e3fad58ac4ac
Handy visual mode stuff
Meredith Howard <mhoward@roomag.org>
parents:
297
diff
changeset
|
97 | " Select last paste |
e3fad58ac4ac
Handy visual mode stuff
Meredith Howard <mhoward@roomag.org>
parents:
297
diff
changeset
|
98 | map gV `[v`] |
e3fad58ac4ac
Handy visual mode stuff
Meredith Howard <mhoward@roomag.org>
parents:
297
diff
changeset
|
99 | |
585 | 100 | " Use ltag over tselect |
586 | 101 | nmap g<C-]> :call vimrc#Ltag(expand('<cword>'))<CR> |
585 | 102 | |
203 | 103 | " clear all interestingwords with \\k since \K is ri.vim |
532 | 104 | nmap <silent> <leader><leader>k :call UncolorAllWords()<CR> |
105 | ||
106 | " use Ag for a recursive * | |
107 | nmap <leader>* :call ag#Ag('grep', '--literal ' . shellescape(expand("<cword>")))<CR> | |
204
f6a2f233a33b
Fix signify -- old settings were removed
Meredith Howard <mhoward@roomag.org>
parents:
203
diff
changeset
|
108 | |
340 | 109 | " K: doc, gK: Doc w/o using syntax hints, gKK: doc current filename |
466 | 110 | nmap K :call ViewDoc('doc', expand('<cword>'))<CR> |
340 | 111 | nmap gKK :call ViewDoc('doc', expand('%'))<CR> |
368
91d4fb4e0a42
improve text editing experience?
Meredith Howard <mhoward@roomag.org>
parents:
362
diff
changeset
|
112 | |
424 | 113 | " Tabular shortcuts |
460
387cbc327abb
Add tab-by-colon shortcut
Meredith Howard <mhoward@roomag.org>
parents:
458
diff
changeset
|
114 | map <leader>ta :Tabularize first_arrow<CR> |
424 | 115 | map <leader>te :Tabularize first_eq<CR> |
464
452034aff788
add first colon shortcut
Meredith Howard <mhoward@roomag.org>
parents:
462
diff
changeset
|
116 | map <leader>tc :Tabularize first_colon<CR> |
425
e23906d13a57
add method tab shortcut
Meredith Howard <mhoward@roomag.org>
parents:
424
diff
changeset
|
117 | map <leader>tm :Tabularize methods<CR> |
368
91d4fb4e0a42
improve text editing experience?
Meredith Howard <mhoward@roomag.org>
parents:
362
diff
changeset
|
118 | |
470 | 119 | map <silent> <leader>a :call vimrc#AutoFmtToggle()<CR> |
430
cac0a6e87836
lord save me from the shift key
Meredith Howard <mhoward@roomag.org>
parents:
429
diff
changeset
|
120 | |
cac0a6e87836
lord save me from the shift key
Meredith Howard <mhoward@roomag.org>
parents:
429
diff
changeset
|
121 | cabbr Q q |
cac0a6e87836
lord save me from the shift key
Meredith Howard <mhoward@roomag.org>
parents:
429
diff
changeset
|
122 | cabbr W w |
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
123 | "}}} |
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
124 | |
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
125 | |
19 | 126 | " General settings {{{ |
1 | 127 | syntax on |
128 | filetype plugin indent on | |
129 | ||
124
1be15444e144
Don't use any shorthand options
Meredith Howard <mhoward@roomag.org>
parents:
122
diff
changeset
|
130 | set encoding=utf-8 |
1 | 131 | |
418 | 132 | set incsearch |
1 | 133 | set hlsearch |
124
1be15444e144
Don't use any shorthand options
Meredith Howard <mhoward@roomag.org>
parents:
122
diff
changeset
|
134 | set ignorecase |
1be15444e144
Don't use any shorthand options
Meredith Howard <mhoward@roomag.org>
parents:
122
diff
changeset
|
135 | set smartcase |
1 | 136 | |
120
3a676c8eaafe
Set unicode stuff only if we think it's available, use better fold and vsplit chars
Meredith Howard <mhoward@roomag.org>
parents:
118
diff
changeset
|
137 | if has('gui_running') || $LANG =~ 'UTF-8' |
452
0fed20b49b89
fix troublesome trail char
Meredith Howard <mhoward@roomag.org>
parents:
451
diff
changeset
|
138 | set listchars=tab:⇥·,trail:◼,nbsp:◻ |
120
3a676c8eaafe
Set unicode stuff only if we think it's available, use better fold and vsplit chars
Meredith Howard <mhoward@roomag.org>
parents:
118
diff
changeset
|
139 | " eol:↩ not as useful as trail i think |
3a676c8eaafe
Set unicode stuff only if we think it's available, use better fold and vsplit chars
Meredith Howard <mhoward@roomag.org>
parents:
118
diff
changeset
|
140 | set fillchars=fold:∷,vert:│ |
3a676c8eaafe
Set unicode stuff only if we think it's available, use better fold and vsplit chars
Meredith Howard <mhoward@roomag.org>
parents:
118
diff
changeset
|
141 | endif |
1 | 142 | |
155
14fa06532900
Use breakindent if available
Meredith Howard <mhoward@roomag.org>
parents:
146
diff
changeset
|
143 | if exists('&breakindent') |
14fa06532900
Use breakindent if available
Meredith Howard <mhoward@roomag.org>
parents:
146
diff
changeset
|
144 | set bri |
156
0a58a576e95e
always show the break mark in the left column
Meredith Howard <mhoward@roomag.org>
parents:
155
diff
changeset
|
145 | set briopt+=sbr |
155
14fa06532900
Use breakindent if available
Meredith Howard <mhoward@roomag.org>
parents:
146
diff
changeset
|
146 | endif |
14fa06532900
Use breakindent if available
Meredith Howard <mhoward@roomag.org>
parents:
146
diff
changeset
|
147 | |
124
1be15444e144
Don't use any shorthand options
Meredith Howard <mhoward@roomag.org>
parents:
122
diff
changeset
|
148 | set virtualedit=block |
1 | 149 | |
150 | set autoindent | |
151 | set expandtab | |
152 | set shiftwidth=2 | |
153 | set softtabstop=2 | |
154 | ||
398 | 155 | set formatoptions=cqln1 |
1 | 156 | set backspace=indent,eol,start |
157 | ||
398 | 158 | if has('patch-7.3-541') |
159 | " Can unwrap this once I don't have to deal with ubuntu 12.04 | |
160 | set formatoptions+=j | |
161 | endif | |
162 | ||
455 | 163 | set splitright splitbelow |
419 | 164 | set scrolloff=15 |
450 | 165 | set sidescrolloff=10 |
1 | 166 | set ruler |
535 | 167 | set noshowmode |
1 | 168 | set showcmd |
169 | set wildmenu | |
432 | 170 | set wildignorecase |
1 | 171 | |
418 | 172 | set ttimeout |
173 | set ttimeoutlen=200 | |
174 | ||
180 | 175 | set tags+=.tags |
176 | ||
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
177 | " Ignore compiled files and repositories |
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
178 | set wildignore=*.o,*~,*.pyc |
578
3e4703eef23d
make on_windows global
Meredith Howard <mhoward@roomag.org>
parents:
577
diff
changeset
|
179 | if g:on_windows |
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
180 | set wildignore+=*/.git/*,*/.hg/*,*/.svn/*,*/.DS_Store |
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
181 | else |
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
182 | set wildignore+=.git\*,.hg\*,.svn\* |
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
183 | endif |
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
184 | |
115
6d6751c819ad
Add ag and matchit.vim to make % matching nicer
Meredith Howard <mhoward@roomag.org>
parents:
114
diff
changeset
|
185 | " Enable enhanced % matching in ruby |
6d6751c819ad
Add ag and matchit.vim to make % matching nicer
Meredith Howard <mhoward@roomag.org>
parents:
114
diff
changeset
|
186 | runtime macros/matchit.vim |
6d6751c819ad
Add ag and matchit.vim to make % matching nicer
Meredith Howard <mhoward@roomag.org>
parents:
114
diff
changeset
|
187 | |
1 | 188 | " Don't assume to scan includes when autocompleting |
124
1be15444e144
Don't use any shorthand options
Meredith Howard <mhoward@roomag.org>
parents:
122
diff
changeset
|
189 | set complete-=i |
1 | 190 | |
191 | " Never open with folds collapsed | |
192 | set nofoldenable | |
193 | ||
124
1be15444e144
Don't use any shorthand options
Meredith Howard <mhoward@roomag.org>
parents:
122
diff
changeset
|
194 | set linebreak |
1be15444e144
Don't use any shorthand options
Meredith Howard <mhoward@roomag.org>
parents:
122
diff
changeset
|
195 | set showbreak=»\ |
1 | 196 | |
208 | 197 | " keep the junk out (imo) |
198 | set sessionoptions=buffers,curdir,localoptions | |
199 | ||
13
c061abf8217c
Be more defensive on windows, clean up and add sections
Meredith Howard <mhoward@roomag.org>
parents:
12
diff
changeset
|
200 | " Superseded by vim-airline |
c061abf8217c
Be more defensive on windows, clean up and add sections
Meredith Howard <mhoward@roomag.org>
parents:
12
diff
changeset
|
201 | "set statusline=%f%m%r%h%w\ %y\ %=%l,%c\ %p%%\ %L |
14 | 202 | set laststatus=2 |
1 | 203 | |
578
3e4703eef23d
make on_windows global
Meredith Howard <mhoward@roomag.org>
parents:
577
diff
changeset
|
204 | if g:on_windows |
1 | 205 | let $MYVIM=$HOME.'/vimfiles' |
206 | ||
207 | if !filewritable( $MYVIM . '/var' ) | |
208 | silent execute '!mkdir "'.$HOME.'\vimfiles\var"' | |
209 | endif | |
210 | if !filewritable( $MYVIM. '/var/backup' ) | |
211 | silent execute '!mkdir "'.$HOME.'\vimfiles\var\backup"' | |
212 | endif | |
213 | if !filewritable( $MYVIM . '/var/tmp' ) | |
214 | silent execute '!mkdir "'.$HOME.'\vimfiles\var\tmp"' | |
215 | endif | |
216 | if !filewritable( $MYVIM . '/var/undo' ) | |
217 | silent execute '!mkdir "'.$HOME.'\vimfiles\var\undo"' | |
218 | endif | |
219 | ||
220 | else | |
221 | let $MYVIM=$HOME.'/.vim' | |
222 | ||
223 | if !filewritable( $MYVIM . '/var/backup' ) | |
224 | silent execute '!mkdir -p "'.$MYVIM.'/var/backup"' | |
225 | endif | |
226 | if !filewritable( $MYVIM . '/var/tmp' ) | |
227 | silent execute '!mkdir "'.$MYVIM.'/var/tmp"' | |
228 | endif | |
229 | if !filewritable( $MYVIM . '/var/undo' ) | |
230 | silent execute '!mkdir "'.$MYVIM.'/var/undo"' | |
231 | endif | |
232 | ||
233 | endif | |
234 | ||
578
3e4703eef23d
make on_windows global
Meredith Howard <mhoward@roomag.org>
parents:
577
diff
changeset
|
235 | if g:on_windows |
75
2b4633385693
Fuck everything Droid, use DejaVu. Droid is less unicode complete but only Xwin masks the rest in with font substitution
Meredith Howard <mhoward@roomag.org>
parents:
74
diff
changeset
|
236 | set guifont=DejaVu_Sans_Mono:h10:cDEFAULT |
124
1be15444e144
Don't use any shorthand options
Meredith Howard <mhoward@roomag.org>
parents:
122
diff
changeset
|
237 | set linespace=0 |
456
9ffd1cfe8fe2
no error on osx reload
Meredith Howard <mhoward@roomag.org>
parents:
455
diff
changeset
|
238 | elseif has('osx') |
9ffd1cfe8fe2
no error on osx reload
Meredith Howard <mhoward@roomag.org>
parents:
455
diff
changeset
|
239 | set guifont=DejaVu\ Sans\ Mono:h11 |
74
b1001f2f0523
Oops, windows font specs are different
Meredith Howard <mhoward@roomag.org>
parents:
73
diff
changeset
|
240 | else |
75
2b4633385693
Fuck everything Droid, use DejaVu. Droid is less unicode complete but only Xwin masks the rest in with font substitution
Meredith Howard <mhoward@roomag.org>
parents:
74
diff
changeset
|
241 | set guifont=DejaVu\ Sans\ Mono\ 10 |
74
b1001f2f0523
Oops, windows font specs are different
Meredith Howard <mhoward@roomag.org>
parents:
73
diff
changeset
|
242 | endif |
b1001f2f0523
Oops, windows font specs are different
Meredith Howard <mhoward@roomag.org>
parents:
73
diff
changeset
|
243 | |
462
a1901234cc42
Disable separately in case they arent all present
Meredith Howard <mhoward@roomag.org>
parents:
460
diff
changeset
|
244 | set guioptions-=T "no toolbar, menu, tearoffs |
a1901234cc42
Disable separately in case they arent all present
Meredith Howard <mhoward@roomag.org>
parents:
460
diff
changeset
|
245 | set guioptions-=m |
a1901234cc42
Disable separately in case they arent all present
Meredith Howard <mhoward@roomag.org>
parents:
460
diff
changeset
|
246 | set guioptions-=t |
72
d1ae56d8fdc4
Same guioptions on w32 and unix, and guifont
Meredith Howard <mhoward@roomag.org>
parents:
20
diff
changeset
|
247 | |
1 | 248 | set backupdir=$MYVIM/var/backup//,. |
249 | set directory=$MYVIM/var/tmp//,. | |
250 | ||
251 | set backup | |
259
3ea35d31175b
Let's try all the autowrites
Meredith Howard <mhoward@roomag.org>
parents:
252
diff
changeset
|
252 | set autowriteall |
1 | 253 | |
254 | if has('persistent_undo') | |
255 | set undofile | |
256 | set undodir=$MYVIM/var/undo//,. | |
396
2f02fa724f42
add session autoload/save when servername is set
Meredith Howard <mhoward@roomag.org>
parents:
370
diff
changeset
|
257 | endif |
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
258 | " }}} |
1 | 259 | |
260 | ||
105
f3d684572a8f
group up autocmds so they can be cleared if vimrc is reloaded
Meredith Howard <mhoward@roomag.org>
parents:
87
diff
changeset
|
261 | " Autocmds {{{ |
f3d684572a8f
group up autocmds so they can be cleared if vimrc is reloaded
Meredith Howard <mhoward@roomag.org>
parents:
87
diff
changeset
|
262 | augroup vimrc |
f3d684572a8f
group up autocmds so they can be cleared if vimrc is reloaded
Meredith Howard <mhoward@roomag.org>
parents:
87
diff
changeset
|
263 | autocmd! |
f3d684572a8f
group up autocmds so they can be cleared if vimrc is reloaded
Meredith Howard <mhoward@roomag.org>
parents:
87
diff
changeset
|
264 | |
466 | 265 | " set and load a session based on servername |
583 | 266 | autocmd VimEnter * call vimrc#AutoSessionConfig() |
259
3ea35d31175b
Let's try all the autowrites
Meredith Howard <mhoward@roomag.org>
parents:
252
diff
changeset
|
267 | |
466 | 268 | " complement to autowriteall |
269 | autocmd FocusLost * silent! wa | |
368
91d4fb4e0a42
improve text editing experience?
Meredith Howard <mhoward@roomag.org>
parents:
362
diff
changeset
|
270 | |
419 | 271 | " Jump to last known pos |
272 | autocmd BufReadPost * | |
498
238a0de521e6
Don't mess with the cursor on commit or rebase stuff either.
Meredith Howard <mhoward@roomag.org>
parents:
487
diff
changeset
|
273 | \ if &filetype !~ 'mail\|^git\|^hg' && line("'\"") >= 1 && line("'\"") <= line("$") | |
419 | 274 | \ exe "normal! g`\"" | |
275 | \ endif | |
466 | 276 | |
277 | " double-click to edit in vimfiler | |
278 | autocmd FileType vimfiler nmap <buffer> <2-LeftMouse> <Plug>(vimfiler_edit_file) | |
279 | ||
586 | 280 | " Simplify noisy ltag output |
281 | autocmd BufReadPost quickfix | |
282 | \ if w:quickfix_title =~ '^:ltag' | | |
283 | \ setl modifiable | | |
284 | \ silent exe ':%s/\^\\V\s*\|\\\$|.*//g' | | |
285 | \ setl nomodifiable | | |
286 | \ endif | |
287 | ||
288 | autocmd BufReadPost quickfix nmap <buffer> q <C-w>c | |
289 | ||
105
f3d684572a8f
group up autocmds so they can be cleared if vimrc is reloaded
Meredith Howard <mhoward@roomag.org>
parents:
87
diff
changeset
|
290 | augroup END |
414 | 291 | |
466 | 292 | " Make paths when writing, as necessary |
431 | 293 | augroup AutoMkdir |
294 | autocmd! | |
470 | 295 | autocmd BufWritePre * :call vimrc#MkNonExDir(expand('<afile>'), +expand('<abuf>')) |
431 | 296 | augroup END |
297 | ||
414 | 298 | " https://mjj.io/2015/01/27/encrypting-files-with-gpg-and-vim/ |
299 | augroup encrypted | |
300 | autocmd! | |
301 | autocmd BufReadPre,FileReadPre *.gpg set noswapfile noundofile nobackup viminfo= | |
539
911b3929f162
force tty for pinentry
Meredith Howard <mhoward@roomag.org>
parents:
538
diff
changeset
|
302 | autocmd BufReadPost *.gpg :%!GPG_TTY=/dev/tty gpg2 --decrypt 2> /dev/null |
911b3929f162
force tty for pinentry
Meredith Howard <mhoward@roomag.org>
parents:
538
diff
changeset
|
303 | autocmd BufWritePre *.gpg :%!GPG_TTY=/dev/tty gpg2 -se -a --default-recipient-self |
414 | 304 | autocmd BufWritePost *.gpg u |
305 | augroup END | |
105
f3d684572a8f
group up autocmds so they can be cleared if vimrc is reloaded
Meredith Howard <mhoward@roomag.org>
parents:
87
diff
changeset
|
306 | "}}} |
f3d684572a8f
group up autocmds so they can be cleared if vimrc is reloaded
Meredith Howard <mhoward@roomag.org>
parents:
87
diff
changeset
|
307 | |
f3d684572a8f
group up autocmds so they can be cleared if vimrc is reloaded
Meredith Howard <mhoward@roomag.org>
parents:
87
diff
changeset
|
308 | |
f3d684572a8f
group up autocmds so they can be cleared if vimrc is reloaded
Meredith Howard <mhoward@roomag.org>
parents:
87
diff
changeset
|
309 | " Perl type-specific settings {{{ |
1 | 310 | let perl_include_pod = 1 |
178
47bbb9255d78
enable signature handling and disable workaround
Meredith Howard <mhoward@roomag.org>
parents:
167
diff
changeset
|
311 | let perl_sub_signatures = 1 |
362
7c5b0e94b399
Tweak perl settings, move all into after-syntax file
Meredith Howard <mhoward@roomag.org>
parents:
345
diff
changeset
|
312 | let perl_sync_dist = 200 |
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
313 | " }}} |
1 | 314 | |
13
c061abf8217c
Be more defensive on windows, clean up and add sections
Meredith Howard <mhoward@roomag.org>
parents:
12
diff
changeset
|
315 | |
19 | 316 | " Plugin settings {{{ |
139 | 317 | |
451 | 318 | ">> Vimwiki |
454
e501f44a5885
set spideroak as 2nd wiki
Meredith Howard <mhoward@roomag.org>
parents:
453
diff
changeset
|
319 | let g:vimwiki_list = [ |
530
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
320 | \ { |
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
321 | \ 'path': '~/vimwiki/', |
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
322 | \ 'auto_tags': 1, 'auto_toc': 1, 'automatic_nested_syntaxes': 1 |
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
323 | \ }, |
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
324 | \ { |
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
325 | \ 'path': '~/Documents/SpiderOak Hive/vimwiki', |
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
326 | \ 'auto_tags': 1, 'auto_toc': 1, 'automatic_nested_syntaxes': 1 |
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
327 | \ } |
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
328 | \ ] |
451 | 329 | let g:vimwiki_use_mouse = 1 |
330 | ||
340 | 331 | ">> Viewdoc |
458 | 332 | let g:viewdoc_open = 'topleft new' |
340 | 333 | let g:viewdoc_perldoc_format = 'ansi' |
416
ef460163c246
add new viewdoc setting
Meredith Howard <mhoward@roomag.org>
parents:
414
diff
changeset
|
334 | let g:viewdoc_winwidth_max = 100 |
340 | 335 | |
109
14b6da5839f0
Add/set up perl and ruby omnicomplete
Meredith Howard <mhoward@roomag.org>
parents:
107
diff
changeset
|
336 | ">> Gundo |
139 | 337 | " I prefer python3 on windows if I have to use it. Needs a dll in path. |
578
3e4703eef23d
make on_windows global
Meredith Howard <mhoward@roomag.org>
parents:
577
diff
changeset
|
338 | if g:on_windows |
3e4703eef23d
make on_windows global
Meredith Howard <mhoward@roomag.org>
parents:
577
diff
changeset
|
339 | let g:gundo_prefer_python3 = 1 |
1 | 340 | endif |
341 | ||
109
14b6da5839f0
Add/set up perl and ruby omnicomplete
Meredith Howard <mhoward@roomag.org>
parents:
107
diff
changeset
|
342 | ">> Tagbar |
578
3e4703eef23d
make on_windows global
Meredith Howard <mhoward@roomag.org>
parents:
577
diff
changeset
|
343 | if g:on_windows |
114
599b1b279478
Windows changes -- I can cinst git + ctags + ag easily
Meredith Howard <mhoward@roomag.org>
parents:
111
diff
changeset
|
344 | if executable('ctags') == 0 |
599b1b279478
Windows changes -- I can cinst git + ctags + ag easily
Meredith Howard <mhoward@roomag.org>
parents:
111
diff
changeset
|
345 | " if i haven't installed from chocolatey... |
599b1b279478
Windows changes -- I can cinst git + ctags + ag easily
Meredith Howard <mhoward@roomag.org>
parents:
111
diff
changeset
|
346 | let g:tagbar_ctags_bin = 'C:\Users\mhoward\bin\ctags.exe' |
599b1b279478
Windows changes -- I can cinst git + ctags + ag easily
Meredith Howard <mhoward@roomag.org>
parents:
111
diff
changeset
|
347 | endif |
1 | 348 | endif |
349 | ||
350 | let g:tagbar_autoclose = 1 | |
351 | let g:tagbar_autofocus = 1 | |
352 | let g:tagbar_compact = 1 | |
142
d0d2b54e855f
Tweak unite, shrink tagbar a little
Meredith Howard <mhoward@roomag.org>
parents:
139
diff
changeset
|
353 | let g:tagbar_width = 30 |
1 | 354 | |
426
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
355 | " adapted from https://gist.github.com/jbolila/7598018 |
1 | 356 | let g:tagbar_type_perl = { |
426
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
357 | \ 'ctagstype' : 'Perl', |
1 | 358 | \ 'kinds' : [ |
359 | \ 'p:packages:1:0', | |
426
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
360 | \ 'u:uses:1:0', |
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
361 | \ 'r:requires:1:0', |
1 | 362 | \ 'e:extends', |
426
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
363 | \ 'w:roles', |
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
364 | \ 'o:ours:1:0', |
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
365 | \ 'c:constants:1:0', |
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
366 | \ 'f:formats:1:0', |
1 | 367 | \ 'a:attributes', |
230
5cd77842c623
Add ctags matches for fun and method
Meredith Howard <mhoward@roomag.org>
parents:
208
diff
changeset
|
368 | \ 'm:methods', |
1 | 369 | \ 's:subroutines', |
426
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
370 | \ 'x:around', |
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
371 | \ 'l:aliases', |
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
372 | \ 'd:pod:1:0', |
1 | 373 | \ ], |
429
0c95a57f444d
Remove stuff from general ctags that makes tag jumping harder
Meredith Howard <mhoward@roomag.org>
parents:
427
diff
changeset
|
374 | \ 'deffile' : '$MYVIM/ctags/perl.cnf' |
427
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
375 | \ } |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
376 | |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
377 | let g:tagbar_type_elixir = { |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
378 | \ 'ctagstype' : 'Elixir', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
379 | \ 'kinds' : [ |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
380 | \ 'm:modules:1:0', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
381 | \ 'r:records', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
382 | \ 'f:functions', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
383 | \ 'a:macros', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
384 | \ 'o:operators', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
385 | \ 'p:protocols', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
386 | \ 'i:implementations', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
387 | \ 'd:delegates', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
388 | \ 'c:callbacks', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
389 | \ 'e:exceptions', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
390 | \ ], |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
391 | \ } |
1 | 392 | |
109
14b6da5839f0
Add/set up perl and ruby omnicomplete
Meredith Howard <mhoward@roomag.org>
parents:
107
diff
changeset
|
393 | ">> Unite |
577
c3ecffb36fb7
quiet when unite isn't installed yet
Meredith Howard <mhoward@roomag.org>
parents:
576
diff
changeset
|
394 | try |
c3ecffb36fb7
quiet when unite isn't installed yet
Meredith Howard <mhoward@roomag.org>
parents:
576
diff
changeset
|
395 | " call unite#filters#matcher_default#use(['matcher_fuzzy']) |
c3ecffb36fb7
quiet when unite isn't installed yet
Meredith Howard <mhoward@roomag.org>
parents:
576
diff
changeset
|
396 | call unite#filters#sorter_default#use(['sorter_rank']) |
1 | 397 | |
577
c3ecffb36fb7
quiet when unite isn't installed yet
Meredith Howard <mhoward@roomag.org>
parents:
576
diff
changeset
|
398 | call unite#custom#profile('default', 'context', {'winheight': 10}) |
c3ecffb36fb7
quiet when unite isn't installed yet
Meredith Howard <mhoward@roomag.org>
parents:
576
diff
changeset
|
399 | catch |
c3ecffb36fb7
quiet when unite isn't installed yet
Meredith Howard <mhoward@roomag.org>
parents:
576
diff
changeset
|
400 | endtry |
295
33d6b9519d7e
Add mappings and default magic-free regex, also expand scrolloff
Meredith Howard <mhoward@roomag.org>
parents:
294
diff
changeset
|
401 | |
1 | 402 | if executable('ag') |
403 | let g:unite_source_grep_command = 'ag' | |
404 | let g:unite_source_grep_default_opts = '--nogroup --nocolor --column' | |
405 | let g:unite_source_grep_recursive_opt = '' | |
467 | 406 | |
407 | let g:unite_source_rec_async_command = ['ag', '-f', '--nocolor', '--nogroup', '-g', ''] | |
1 | 408 | endif |
409 | ||
109
14b6da5839f0
Add/set up perl and ruby omnicomplete
Meredith Howard <mhoward@roomag.org>
parents:
107
diff
changeset
|
410 | ">> vimfiler |
87 | 411 | let g:vimfiler_as_default_explorer = 1 |
412 | ||
109
14b6da5839f0
Add/set up perl and ruby omnicomplete
Meredith Howard <mhoward@roomag.org>
parents:
107
diff
changeset
|
413 | ">> Airline |
1 | 414 | let g:airline#extensions#whitespace#enabled = 0 |
252
e5f59db6e92a
Nice separator when not using powerline.
Meredith Howard <mhoward@roomag.org>
parents:
250
diff
changeset
|
415 | let g:airline_powerline_fonts = 0 |
85 | 416 | |
526 | 417 | let g:airline#extensions#tabline#enabled = 1 |
524
d559496f6ef3
Drop bufferline for airline builtin
Meredith Howard <mhoward@roomag.org>
parents:
521
diff
changeset
|
418 | let g:airline#extensions#tabline#buffer_min_count = 2 |
526 | 419 | let g:airline#extensions#tabline#tab_nr_type = 1 |
420 | let g:airline#extensions#tabline#buffer_nr_show = 1 | |
421 | let g:airline#extensions#tabline#formatter = 'unique_tail_improved' | |
524
d559496f6ef3
Drop bufferline for airline builtin
Meredith Howard <mhoward@roomag.org>
parents:
521
diff
changeset
|
422 | let g:airline#extensions#tabline#buffer_nr_format = '%s:' |
526 | 423 | let g:airline#extensions#tabline#buffers_label = 'BUF' |
424 | let g:airline#extensions#tabline#tabs_label = 'TAB' | |
425 | let g:airline#extensions#tabline#left_sep = ' ' | |
426 | let g:airline#extensions#tabline#left_alt_sep = ' ' | |
427 | let g:airline#extensions#tabline#right_sep = ' ' | |
428 | let g:airline#extensions#tabline#right_alt_sep = ' ' | |
429 | ||
430 | let g:airline#extensions#tabline#ignore_bufadd_pat = | |
431 | \ '\c\v^__gundo|^__tagbar|^vimfiler|^[doc\d+\]$' | |
525
147fd7a7dfc8
Get this stuff hidden from tabline
Meredith Howard <mhoward@roomag.org>
parents:
524
diff
changeset
|
432 | let g:airline#extensions#tabline#excludes = [ |
526 | 433 | \ g:airline#extensions#tabline#ignore_bufadd_pat, |
525
147fd7a7dfc8
Get this stuff hidden from tabline
Meredith Howard <mhoward@roomag.org>
parents:
524
diff
changeset
|
434 | \ ] |
203 | 435 | |
524
d559496f6ef3
Drop bufferline for airline builtin
Meredith Howard <mhoward@roomag.org>
parents:
521
diff
changeset
|
436 | let g:airline#extensions#branch#format = 2 |
129 | 437 | |
202
f7aa9b7b7800
configure interestingwords more
Meredith Howard <mhoward@roomag.org>
parents:
201
diff
changeset
|
438 | ">> interestingwords |
f7aa9b7b7800
configure interestingwords more
Meredith Howard <mhoward@roomag.org>
parents:
201
diff
changeset
|
439 | " These are jellybeans colors and some complements |
f7aa9b7b7800
configure interestingwords more
Meredith Howard <mhoward@roomag.org>
parents:
201
diff
changeset
|
440 | let g:interestingWordsGUIColors = ['#C4A258', '#D8AD4C', '#6AADA0', '#71B9F8', '#A037B0', '#CF6A4C'] |
f7aa9b7b7800
configure interestingwords more
Meredith Howard <mhoward@roomag.org>
parents:
201
diff
changeset
|
441 | let g:interestingWordsRandomiseColors = 1 |
f7aa9b7b7800
configure interestingwords more
Meredith Howard <mhoward@roomag.org>
parents:
201
diff
changeset
|
442 | |
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
443 | " }}} |
1 | 444 | |
445 | ||
419 | 446 | " {{{ Commands |
563 | 447 | " Preview markdown mail -- I edit with headers so I box them in a code block. |
564
81f1da7a57e1
move html dump stuff into one file and customize
Meredith Howard <mhoward@roomag.org>
parents:
563
diff
changeset
|
448 | command! MailPreview enew | set bt=nofile | 0r # | exe 'norm 0O```<Esc>}O```' | silent exe '%!mutt-md2html | mutt-html2txt' | 0 |
563 | 449 | command! MailPreviewHTML enew | set bt=nofile | 0r # | exe 'norm 0O```<Esc>}O```' | silent exe '%!mutt-md2html' | 0 |
562 | 450 | |
589 | 451 | " Diff unsaved buffer |
452 | command! DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis | |
453 | \ | wincmd p | diffthis | |
419 | 454 | " }}} |
455 | ||
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
456 | " Local stuff, finish up |
1 | 457 | try |
466 | 458 | execute 'source ' . s:filename . '.local' |
1 | 459 | catch |
460 | endtry | |
461 | ||
519
42e8433b8a51
assume we have unicode on guis, bring back default geometry
Meredith Howard <mhoward@roomag.org>
parents:
498
diff
changeset
|
462 | if g:airline_powerline_fonts == 0 && (has('gui_running') || $LANG =~ 'UTF-8') |
252
e5f59db6e92a
Nice separator when not using powerline.
Meredith Howard <mhoward@roomag.org>
parents:
250
diff
changeset
|
463 | let g:airline_left_sep = '▒' |
e5f59db6e92a
Nice separator when not using powerline.
Meredith Howard <mhoward@roomag.org>
parents:
250
diff
changeset
|
464 | let g:airline_right_sep = g:airline_left_sep |
e5f59db6e92a
Nice separator when not using powerline.
Meredith Howard <mhoward@roomag.org>
parents:
250
diff
changeset
|
465 | endif |
e5f59db6e92a
Nice separator when not using powerline.
Meredith Howard <mhoward@roomag.org>
parents:
250
diff
changeset
|
466 | |
7
7e6e6ff35c4d
try to normalize my colorschemes more, vimrc.local can cover $TERM weirdness
Meredith Howard <mhoward@roomag.org>
parents:
1
diff
changeset
|
467 | if has('gui_running') |
124
1be15444e144
Don't use any shorthand options
Meredith Howard <mhoward@roomag.org>
parents:
122
diff
changeset
|
468 | set number |
1be15444e144
Don't use any shorthand options
Meredith Howard <mhoward@roomag.org>
parents:
122
diff
changeset
|
469 | set background=dark |
7
7e6e6ff35c4d
try to normalize my colorschemes more, vimrc.local can cover $TERM weirdness
Meredith Howard <mhoward@roomag.org>
parents:
1
diff
changeset
|
470 | |
519
42e8433b8a51
assume we have unicode on guis, bring back default geometry
Meredith Howard <mhoward@roomag.org>
parents:
498
diff
changeset
|
471 | set columns=120 lines=40 |
42e8433b8a51
assume we have unicode on guis, bring back default geometry
Meredith Howard <mhoward@roomag.org>
parents:
498
diff
changeset
|
472 | |
145 | 473 | set guicursor+=a:blinkwait1000-blinkon1200-blinkoff250 |
474 | ||
146 | 475 | colorscheme jellybeans |
7
7e6e6ff35c4d
try to normalize my colorschemes more, vimrc.local can cover $TERM weirdness
Meredith Howard <mhoward@roomag.org>
parents:
1
diff
changeset
|
476 | else |
453
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
477 | " vertical bar in insert mode. |
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
478 | if &term =~ '^\(xterm\|screen\|rxvt\)' |
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
479 | let &t_SI = "\e[5 q" |
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
480 | let &t_EI = "\e[0 q" |
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
481 | if exists("$TMUX") |
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
482 | let &t_SI = "\ePtmux;" . substitute(&t_SI, "\e", "\e\e", 'g') . "\e\\" |
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
483 | let &t_EI = "\ePtmux;" . substitute(&t_EI, "\e", "\e\e", 'g') . "\e\\" |
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
484 | endif |
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
485 | endif |
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
486 | |
118
ffbf97e1e3eb
Add urxvt mouse handling
Meredith Howard <mhoward@roomag.org>
parents:
115
diff
changeset
|
487 | if $TERM =~ 'rxvt-unicode' |
ffbf97e1e3eb
Add urxvt mouse handling
Meredith Howard <mhoward@roomag.org>
parents:
115
diff
changeset
|
488 | set ttymouse=urxvt |
ffbf97e1e3eb
Add urxvt mouse handling
Meredith Howard <mhoward@roomag.org>
parents:
115
diff
changeset
|
489 | set mouse=a |
163
fe352f27be10
fix for home/end in mouse mode in urxvt
Meredith Howard <mhoward@roomag.org>
parents:
156
diff
changeset
|
490 | map <Esc>[7~ <Home> |
fe352f27be10
fix for home/end in mouse mode in urxvt
Meredith Howard <mhoward@roomag.org>
parents:
156
diff
changeset
|
491 | map <Esc>[8~ <End> |
118
ffbf97e1e3eb
Add urxvt mouse handling
Meredith Howard <mhoward@roomag.org>
parents:
115
diff
changeset
|
492 | endif |
122
dff13372e830
Detect 256-color capable 'screen', enable mouse support too
Meredith Howard <mhoward@roomag.org>
parents:
120
diff
changeset
|
493 | |
dff13372e830
Detect 256-color capable 'screen', enable mouse support too
Meredith Howard <mhoward@roomag.org>
parents:
120
diff
changeset
|
494 | if &t_Co == 256 |
dff13372e830
Detect 256-color capable 'screen', enable mouse support too
Meredith Howard <mhoward@roomag.org>
parents:
120
diff
changeset
|
495 | colorscheme jellybeans |
396
2f02fa724f42
add session autoload/save when servername is set
Meredith Howard <mhoward@roomag.org>
parents:
370
diff
changeset
|
496 | endif |
2f02fa724f42
add session autoload/save when servername is set
Meredith Howard <mhoward@roomag.org>
parents:
370
diff
changeset
|
497 | endif |
122
dff13372e830
Detect 256-color capable 'screen', enable mouse support too
Meredith Howard <mhoward@roomag.org>
parents:
120
diff
changeset
|
498 |