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