Fri, 22 Nov 2019 05:18:11 -0600
add tig commands
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 |
642
18efa35a0837
place encoding and scriptencoding at top
Meredith Howard <mhoward@roomag.org>
parents:
641
diff
changeset
|
3 | |
18efa35a0837
place encoding and scriptencoding at top
Meredith Howard <mhoward@roomag.org>
parents:
641
diff
changeset
|
4 | set encoding=utf-8 |
18efa35a0837
place encoding and scriptencoding at top
Meredith Howard <mhoward@roomag.org>
parents:
641
diff
changeset
|
5 | scriptencoding utf-8 |
1 | 6 | |
768
7ed19a36b198
Use vim 8's defaults.vim, remove redundant settings and old feature checks
Meredith Howard <mhoward@roomag.org>
parents:
766
diff
changeset
|
7 | unlet! skip_defaults_vim |
7ed19a36b198
Use vim 8's defaults.vim, remove redundant settings and old feature checks
Meredith Howard <mhoward@roomag.org>
parents:
766
diff
changeset
|
8 | source $VIMRUNTIME/defaults.vim |
7ed19a36b198
Use vim 8's defaults.vim, remove redundant settings and old feature checks
Meredith Howard <mhoward@roomag.org>
parents:
766
diff
changeset
|
9 | |
466 | 10 | " on windows and not cygwin |
578
3e4703eef23d
make on_windows global
Meredith Howard <mhoward@roomag.org>
parents:
577
diff
changeset
|
11 | let g:on_windows = (has('win32') || has('win64')) |
603
ae87c045d04b
Simplify directory setup
Meredith Howard <mhoward@roomag.org>
parents:
602
diff
changeset
|
12 | let g:myvim = $HOME . (g:on_windows ? '/vimfiles' : '/.vim') |
610
5f49012f8242
move these into a .cache dir
Meredith Howard <mhoward@roomag.org>
parents:
604
diff
changeset
|
13 | let g:vimcache = $HOME . '/.cache/vim' |
578
3e4703eef23d
make on_windows global
Meredith Howard <mhoward@roomag.org>
parents:
577
diff
changeset
|
14 | let s:filename = expand('<sfile>') |
10
e753144057b8
Windows-compatible vimrc
Meredith Howard <mhoward@roomag.org>
parents:
7
diff
changeset
|
15 | |
725
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
16 | " Set up plug and plugins {{{ |
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
17 | call plug#begin(g:myvim . '/bundle') |
1 | 18 | |
725
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
19 | Plug 'vim-airline/vim-airline' |
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
20 | Plug 'vim-airline/vim-airline-themes' |
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
21 | Plug 'vasconcelloslf/vim-interestingwords' |
757 | 22 | Plug 'nathanaelkane/vim-indent-guides' |
1 | 23 | |
766 | 24 | Plug 'ciaranm/securemodelines' |
725
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
25 | Plug 'editorconfig/editorconfig-vim' |
167 | 26 | |
811
abdb905668f5
vimfiler and unite out, netrw and vinegar in
Meredith Howard <mhoward@roomag.org>
parents:
810
diff
changeset
|
27 | Plug 'tpope/vim-vinegar' |
810
de41d00d8344
switch from gundo to undotree
Meredith Howard <mhoward@roomag.org>
parents:
809
diff
changeset
|
28 | Plug 'mbbill/undotree', {'on': 'UndotreeToggle'} |
730
15f44658968e
Add triggers for gundo and tagbar
Meredith Howard <mhoward@roomag.org>
parents:
729
diff
changeset
|
29 | Plug 'majutsushi/tagbar', {'on': 'TagbarToggle'} |
237 | 30 | |
725
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
31 | Plug 'godlygeek/tabular' |
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
32 | Plug 'tomtom/tcomment_vim' |
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
33 | Plug 'tpope/vim-unimpaired' |
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
34 | Plug 'lifepillar/vim-mucomplete' |
735 | 35 | Plug 'tpope/vim-endwise' |
1 | 36 | |
714 | 37 | if executable('rls') |
725
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
38 | Plug 'prabirshrestha/async.vim' |
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
39 | Plug 'prabirshrestha/vim-lsp' |
714 | 40 | end |
41 | ||
725
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
42 | Plug 'vimwiki/vimwiki' |
235 | 43 | |
725
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
44 | Plug 'Shougo/vinarise.vim' |
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
45 | Plug 'asciidoc/vim-asciidoc' |
738
a1db498aea9b
fix default branch for vim-perl
Meredith Howard <mhoward@roomag.org>
parents:
735
diff
changeset
|
46 | Plug 'vim-perl/vim-perl', {'branch': 'dev'} |
725
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
47 | Plug 'sheerun/vim-polyglot' |
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
48 | Plug 'yko/mojo.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
|
49 | |
725
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
50 | Plug 'powerman/vim-plugin-viewdoc' |
340 | 51 | |
631
8e07c29f2672
fix viewdoc abbrevs and cabbrevs in general
Meredith Howard <mhoward@roomag.org>
parents:
630
diff
changeset
|
52 | let g:no_viewdoc_abbrev = 1 |
576 | 53 | |
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 | try |
466 | 55 | 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
|
56 | catch |
46c87d5ef8bf
Add option to source vimrc.local-pre, for adding Plugins near the beginning
Meredith Howard <mhoward@roomag.org>
parents:
142
diff
changeset
|
57 | endtry |
46c87d5ef8bf
Add option to source vimrc.local-pre, for adding Plugins near the beginning
Meredith Howard <mhoward@roomag.org>
parents:
142
diff
changeset
|
58 | |
725
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
59 | call plug#end() |
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
60 | " }}} |
1 | 61 | |
295
33d6b9519d7e
Add mappings and default magic-free regex, also expand scrolloff
Meredith Howard <mhoward@roomag.org>
parents:
294
diff
changeset
|
62 | " Key maps {{{ |
813 | 63 | nnoremap <silent> <F2> :20Lexplore<CR> |
814
639a3868c3da
compensate for some muscle memory
Meredith Howard <mhoward@roomag.org>
parents:
813
diff
changeset
|
64 | nnoremap <silent> <F3> n |
639a3868c3da
compensate for some muscle memory
Meredith Howard <mhoward@roomag.org>
parents:
813
diff
changeset
|
65 | nnoremap <silent> <S-F3> N |
802 | 66 | noremap <silent> <F4> :set hls!<CR> |
810
de41d00d8344
switch from gundo to undotree
Meredith Howard <mhoward@roomag.org>
parents:
809
diff
changeset
|
67 | nnoremap <silent> <F5> :UndotreeToggle<CR> |
665 | 68 | nnoremap <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
|
69 | |
203 | 70 | " 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
|
71 | 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
|
72 | |
814
639a3868c3da
compensate for some muscle memory
Meredith Howard <mhoward@roomag.org>
parents:
813
diff
changeset
|
73 | cmap <F3> <CR> |
639a3868c3da
compensate for some muscle memory
Meredith Howard <mhoward@roomag.org>
parents:
813
diff
changeset
|
74 | |
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
75 | " chdir to the directory of the open buffer |
665 | 76 | noremap <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
|
77 | |
665 | 78 | noremap <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
|
79 | |
99cc7b567195
Easier window navigation, disable insert-mode F-keys except F4
Meredith Howard <mhoward@roomag.org>
parents:
109
diff
changeset
|
80 | " faster window nav |
665 | 81 | nnoremap <C-h> <C-w>h |
82 | nnoremap <C-j> <C-w>j | |
83 | nnoremap <C-k> <C-w>k | |
84 | nnoremap <C-l> <C-w>l | |
85 | nnoremap <C-\> <C-w>p | |
202
f7aa9b7b7800
configure interestingwords more
Meredith Howard <mhoward@roomag.org>
parents:
201
diff
changeset
|
86 | |
295
33d6b9519d7e
Add mappings and default magic-free regex, also expand scrolloff
Meredith Howard <mhoward@roomag.org>
parents:
294
diff
changeset
|
87 | " navigate by on-screen lines |
601 | 88 | nnoremap <expr> j v:count ? 'j' : 'gj' |
89 | nnoremap <expr> k v:count ? 'k' : 'gk' | |
295
33d6b9519d7e
Add mappings and default magic-free regex, also expand scrolloff
Meredith Howard <mhoward@roomag.org>
parents:
294
diff
changeset
|
90 | |
521 | 91 | " alt buffer |
665 | 92 | nnoremap gb <C-^> |
93 | nnoremap gB :ls<CR>:b<Space> | |
521 | 94 | |
614
2c3afa7e900f
make gV keep register type
Meredith Howard <mhoward@roomag.org>
parents:
610
diff
changeset
|
95 | " Select last paste, in the same mode it was pasted in |
665 | 96 | nnoremap <expr> gV '`[' . strpart(getregtype(), 0, 1) . '`]' |
306
e3fad58ac4ac
Handy visual mode stuff
Meredith Howard <mhoward@roomag.org>
parents:
297
diff
changeset
|
97 | |
585 | 98 | " Use ltag over tselect |
665 | 99 | nnoremap g<C-]> :call vimrc#Ltag(expand('<cword>'))<CR> |
585 | 100 | |
203 | 101 | " clear all interestingwords with \\k since \K is ri.vim |
665 | 102 | nnoremap <silent> <leader><leader>k :call UncolorAllWords()<CR> |
532 | 103 | |
799 | 104 | " mark line |
800 | 105 | nmap <leader>l V<leader>k |
799 | 106 | |
532 | 107 | " use Ag for a recursive * |
796 | 108 | nnoremap g* :Ag <cword><CR> |
204
f6a2f233a33b
Fix signify -- old settings were removed
Meredith Howard <mhoward@roomag.org>
parents:
203
diff
changeset
|
109 | |
751
96ce87777789
Use full path for gKK doc
Meredith Howard <mhoward@roomag.org>
parents:
750
diff
changeset
|
110 | " K: doc, gKK: doc current filename |
96ce87777789
Use full path for gKK doc
Meredith Howard <mhoward@roomag.org>
parents:
750
diff
changeset
|
111 | nnoremap gKK :call ViewDoc('doc', expand('%:p'))<CR> |
368
91d4fb4e0a42
improve text editing experience?
Meredith Howard <mhoward@roomag.org>
parents:
362
diff
changeset
|
112 | |
424 | 113 | " Tabular shortcuts |
665 | 114 | noremap <leader>ta :Tabularize first_arrow<CR> |
115 | noremap <leader>te :Tabularize first_eq<CR> | |
116 | noremap <leader>tc :Tabularize first_colon<CR> | |
117 | noremap <leader>tm :Tabularize methods<CR> | |
368
91d4fb4e0a42
improve text editing experience?
Meredith Howard <mhoward@roomag.org>
parents:
362
diff
changeset
|
118 | |
665 | 119 | noremap <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 | |
728
60df63f03873
I don't really use these except for the cd shortcuts
Meredith Howard <mhoward@roomag.org>
parents:
727
diff
changeset
|
121 | " Commands & Aliases {{{ |
631
8e07c29f2672
fix viewdoc abbrevs and cabbrevs in general
Meredith Howard <mhoward@roomag.org>
parents:
630
diff
changeset
|
122 | command! -nargs=+ CAlias call vimrc#CommandAlias(<f-args>) |
805 | 123 | |
728
60df63f03873
I don't really use these except for the cd shortcuts
Meredith Howard <mhoward@roomag.org>
parents:
727
diff
changeset
|
124 | command! Gcd call vimrc#Gcd() |
60df63f03873
I don't really use these except for the cd shortcuts
Meredith Howard <mhoward@roomag.org>
parents:
727
diff
changeset
|
125 | command! Hgcd call vimrc#Hgcd() |
805 | 126 | |
785 | 127 | command! SyntaxCompleteOn setl omnifunc=syntaxcomplete#Complete |
728
60df63f03873
I don't really use these except for the cd shortcuts
Meredith Howard <mhoward@roomag.org>
parents:
727
diff
changeset
|
128 | |
812
d62e41b99428
Not working as expected
Meredith Howard <mhoward@roomag.org>
parents:
811
diff
changeset
|
129 | command! Mksession execute "mksession! " . v:this_session |
805 | 130 | |
826 | 131 | command! TigBlame term ++curwin tig blame -- % |
132 | command! Tig term ++curwin tig | |
133 | command! TigLog term ++curwin tig log | |
134 | command! TigLogThis term ++curwin tig log -- % | |
135 | ||
803
ffc6f9c140cd
Move this Ag stuff into a function, remove flickers
Meredith Howard <mhoward@roomag.org>
parents:
802
diff
changeset
|
136 | command! -nargs=+ -complete=file -bar Ag call vimrc#Ag(<q-args>) |
794
152f0c95cbb0
drop ag.vim; this seems to cover all i do (plus rg)
Meredith Howard <mhoward@roomag.org>
parents:
793
diff
changeset
|
137 | CAlias Rg Ag |
152f0c95cbb0
drop ag.vim; this seems to cover all i do (plus rg)
Meredith Howard <mhoward@roomag.org>
parents:
793
diff
changeset
|
138 | |
631
8e07c29f2672
fix viewdoc abbrevs and cabbrevs in general
Meredith Howard <mhoward@roomag.org>
parents:
630
diff
changeset
|
139 | CAlias Q q |
729
23ef12c54811
save my from this heavy pinky
Meredith Howard <mhoward@roomag.org>
parents:
728
diff
changeset
|
140 | CAlias Qa qa |
631
8e07c29f2672
fix viewdoc abbrevs and cabbrevs in general
Meredith Howard <mhoward@roomag.org>
parents:
630
diff
changeset
|
141 | CAlias W w |
8e07c29f2672
fix viewdoc abbrevs and cabbrevs in general
Meredith Howard <mhoward@roomag.org>
parents:
630
diff
changeset
|
142 | |
728
60df63f03873
I don't really use these except for the cd shortcuts
Meredith Howard <mhoward@roomag.org>
parents:
727
diff
changeset
|
143 | CAlias gcd Gcd |
60df63f03873
I don't really use these except for the cd shortcuts
Meredith Howard <mhoward@roomag.org>
parents:
727
diff
changeset
|
144 | CAlias hgcd Hgcd |
60df63f03873
I don't really use these except for the cd shortcuts
Meredith Howard <mhoward@roomag.org>
parents:
727
diff
changeset
|
145 | |
631
8e07c29f2672
fix viewdoc abbrevs and cabbrevs in general
Meredith Howard <mhoward@roomag.org>
parents:
630
diff
changeset
|
146 | " make these default to one window/buffer too |
8e07c29f2672
fix viewdoc abbrevs and cabbrevs in general
Meredith Howard <mhoward@roomag.org>
parents:
630
diff
changeset
|
147 | CAlias doc ViewDoc! |
8e07c29f2672
fix viewdoc abbrevs and cabbrevs in general
Meredith Howard <mhoward@roomag.org>
parents:
630
diff
changeset
|
148 | CAlias help ViewDocHelp! |
8e07c29f2672
fix viewdoc abbrevs and cabbrevs in general
Meredith Howard <mhoward@roomag.org>
parents:
630
diff
changeset
|
149 | CAlias man ViewDocMan! |
8e07c29f2672
fix viewdoc abbrevs and cabbrevs in general
Meredith Howard <mhoward@roomag.org>
parents:
630
diff
changeset
|
150 | CAlias perldoc ViewDocPerl! |
8e07c29f2672
fix viewdoc abbrevs and cabbrevs in general
Meredith Howard <mhoward@roomag.org>
parents:
630
diff
changeset
|
151 | "}}} |
8e07c29f2672
fix viewdoc abbrevs and cabbrevs in general
Meredith Howard <mhoward@roomag.org>
parents:
630
diff
changeset
|
152 | |
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
153 | "}}} |
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
154 | |
19 | 155 | " General settings {{{ |
1 | 156 | set hlsearch |
124
1be15444e144
Don't use any shorthand options
Meredith Howard <mhoward@roomag.org>
parents:
122
diff
changeset
|
157 | set ignorecase |
1be15444e144
Don't use any shorthand options
Meredith Howard <mhoward@roomag.org>
parents:
122
diff
changeset
|
158 | set smartcase |
1 | 159 | |
641 | 160 | if has('gui_running') || $LANG =~# 'UTF-8' |
739
5c5a80199f95
clean up list/fill chars
Meredith Howard <mhoward@roomag.org>
parents:
738
diff
changeset
|
161 | let &listchars = "tab:⇥·,trail:◼,nbsp:◻,extends:»,precedes:«" |
5c5a80199f95
clean up list/fill chars
Meredith Howard <mhoward@roomag.org>
parents:
738
diff
changeset
|
162 | let &fillchars = "fold: ,vert:│" |
624
7dff635ab5f9
add non-utf8 fallbacks
Meredith Howard <mhoward@roomag.org>
parents:
623
diff
changeset
|
163 | else |
739
5c5a80199f95
clean up list/fill chars
Meredith Howard <mhoward@roomag.org>
parents:
738
diff
changeset
|
164 | let &listchars = "tab:>-,trail:-,nbsp:%,extends:»,precedes:«" |
5c5a80199f95
clean up list/fill chars
Meredith Howard <mhoward@roomag.org>
parents:
738
diff
changeset
|
165 | let &fillchars = "fold: " |
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
|
166 | endif |
1 | 167 | |
602 | 168 | set linebreak |
739
5c5a80199f95
clean up list/fill chars
Meredith Howard <mhoward@roomag.org>
parents:
738
diff
changeset
|
169 | let &showbreak = "» " |
768
7ed19a36b198
Use vim 8's defaults.vim, remove redundant settings and old feature checks
Meredith Howard <mhoward@roomag.org>
parents:
766
diff
changeset
|
170 | set breakindent |
7ed19a36b198
Use vim 8's defaults.vim, remove redundant settings and old feature checks
Meredith Howard <mhoward@roomag.org>
parents:
766
diff
changeset
|
171 | set breakindentopt+=sbr |
155
14fa06532900
Use breakindent if available
Meredith Howard <mhoward@roomag.org>
parents:
146
diff
changeset
|
172 | |
124
1be15444e144
Don't use any shorthand options
Meredith Howard <mhoward@roomag.org>
parents:
122
diff
changeset
|
173 | set virtualedit=block |
1 | 174 | |
175 | set autoindent | |
176 | set expandtab | |
177 | set shiftwidth=2 | |
621
87c3dcbbeef3
add shiftround, drop sts
Meredith Howard <mhoward@roomag.org>
parents:
619
diff
changeset
|
178 | set shiftround |
1 | 179 | |
594
8e05f92f8cd4
Remove fo+=j feature check
Meredith Howard <mhoward@roomag.org>
parents:
590
diff
changeset
|
180 | set formatoptions=cqln1j |
1 | 181 | |
455 | 182 | set splitright splitbelow |
419 | 183 | set scrolloff=15 |
450 | 184 | set sidescrolloff=10 |
602 | 185 | set laststatus=2 |
535 | 186 | set noshowmode |
432 | 187 | set wildignorecase |
716
7ea1f4410682
no more <cr> weirdness
Meredith Howard <mhoward@roomag.org>
parents:
714
diff
changeset
|
188 | set shortmess+=c |
1 | 189 | |
636 | 190 | set noerrorbells |
768
7ed19a36b198
Use vim 8's defaults.vim, remove redundant settings and old feature checks
Meredith Howard <mhoward@roomag.org>
parents:
766
diff
changeset
|
191 | set belloff=all |
635
38be1320e6db
the incessant ringing!
Meredith Howard <mhoward@roomag.org>
parents:
634
diff
changeset
|
192 | |
602 | 193 | set autowriteall |
194 | ||
622 | 195 | set ttimeoutlen=25 |
418 | 196 | |
602 | 197 | set synmaxcol=200 |
198 | ||
180 | 199 | set tags+=.tags |
200 | ||
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
201 | " Ignore compiled files and repositories |
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
202 | set wildignore=*.o,*~,*.pyc |
578
3e4703eef23d
make on_windows global
Meredith Howard <mhoward@roomag.org>
parents:
577
diff
changeset
|
203 | if g:on_windows |
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
204 | 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
|
205 | else |
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
206 | set wildignore+=.git\*,.hg\*,.svn\* |
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
207 | endif |
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
208 | |
1 | 209 | " Don't assume to scan includes when autocompleting |
630
e5aec7abb8b5
add and configure mucomplete
Meredith Howard <mhoward@roomag.org>
parents:
627
diff
changeset
|
210 | set complete-=i complete-=t |
e5aec7abb8b5
add and configure mucomplete
Meredith Howard <mhoward@roomag.org>
parents:
627
diff
changeset
|
211 | |
634
96b0221e52c5
feature check for noinsert
Meredith Howard <mhoward@roomag.org>
parents:
631
diff
changeset
|
212 | set completeopt+=menuone |
96b0221e52c5
feature check for noinsert
Meredith Howard <mhoward@roomag.org>
parents:
631
diff
changeset
|
213 | if has('patch-7.4-775') |
96b0221e52c5
feature check for noinsert
Meredith Howard <mhoward@roomag.org>
parents:
631
diff
changeset
|
214 | set completeopt+=noinsert |
96b0221e52c5
feature check for noinsert
Meredith Howard <mhoward@roomag.org>
parents:
631
diff
changeset
|
215 | endif |
1 | 216 | |
217 | " Never open with folds collapsed | |
218 | set nofoldenable | |
219 | ||
208 | 220 | " keep the junk out (imo) |
221 | set sessionoptions=buffers,curdir,localoptions | |
222 | ||
602 | 223 | " Enable enhanced % matching in ruby |
224 | runtime macros/matchit.vim | |
1 | 225 | |
805 | 226 | for subdir in ['backup', 'tmp', 'undo', 'session'] |
610
5f49012f8242
move these into a .cache dir
Meredith Howard <mhoward@roomag.org>
parents:
604
diff
changeset
|
227 | if !filewritable(g:vimcache . '/' . subdir) |
5f49012f8242
move these into a .cache dir
Meredith Howard <mhoward@roomag.org>
parents:
604
diff
changeset
|
228 | call mkdir(g:vimcache . '/' . subdir, 'p', 0700) |
1 | 229 | endif |
603
ae87c045d04b
Simplify directory setup
Meredith Howard <mhoward@roomag.org>
parents:
602
diff
changeset
|
230 | endfor |
1 | 231 | |
603
ae87c045d04b
Simplify directory setup
Meredith Howard <mhoward@roomag.org>
parents:
602
diff
changeset
|
232 | set backup |
610
5f49012f8242
move these into a .cache dir
Meredith Howard <mhoward@roomag.org>
parents:
604
diff
changeset
|
233 | let &backupdir = g:vimcache . '/backup//,.' |
5f49012f8242
move these into a .cache dir
Meredith Howard <mhoward@roomag.org>
parents:
604
diff
changeset
|
234 | let &directory = g:vimcache . '/tmp//,.' |
1 | 235 | |
603
ae87c045d04b
Simplify directory setup
Meredith Howard <mhoward@roomag.org>
parents:
602
diff
changeset
|
236 | if has('persistent_undo') |
ae87c045d04b
Simplify directory setup
Meredith Howard <mhoward@roomag.org>
parents:
602
diff
changeset
|
237 | set undofile |
610
5f49012f8242
move these into a .cache dir
Meredith Howard <mhoward@roomag.org>
parents:
604
diff
changeset
|
238 | let &undodir = g:vimcache . '/undo//,.' |
1 | 239 | endif |
240 | ||
794
152f0c95cbb0
drop ag.vim; this seems to cover all i do (plus rg)
Meredith Howard <mhoward@roomag.org>
parents:
793
diff
changeset
|
241 | if executable('rg') |
815 | 242 | let &grepprg = "rg -S --vimgrep" |
243 | let &grepformat = "%f:%l:%c:%m,%f:%l%m,%f %l%m" | |
794
152f0c95cbb0
drop ag.vim; this seems to cover all i do (plus rg)
Meredith Howard <mhoward@roomag.org>
parents:
793
diff
changeset
|
244 | elseif executable('ag') |
815 | 245 | let &grepprg = "ag --vimgrep" |
794
152f0c95cbb0
drop ag.vim; this seems to cover all i do (plus rg)
Meredith Howard <mhoward@roomag.org>
parents:
793
diff
changeset
|
246 | set grepformat^=%f:%l:%c:%m |
152f0c95cbb0
drop ag.vim; this seems to cover all i do (plus rg)
Meredith Howard <mhoward@roomag.org>
parents:
793
diff
changeset
|
247 | endif |
152f0c95cbb0
drop ag.vim; this seems to cover all i do (plus rg)
Meredith Howard <mhoward@roomag.org>
parents:
793
diff
changeset
|
248 | |
578
3e4703eef23d
make on_windows global
Meredith Howard <mhoward@roomag.org>
parents:
577
diff
changeset
|
249 | 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
|
250 | set guifont=DejaVu_Sans_Mono:h10:cDEFAULT |
124
1be15444e144
Don't use any shorthand options
Meredith Howard <mhoward@roomag.org>
parents:
122
diff
changeset
|
251 | set linespace=0 |
456
9ffd1cfe8fe2
no error on osx reload
Meredith Howard <mhoward@roomag.org>
parents:
455
diff
changeset
|
252 | elseif has('osx') |
9ffd1cfe8fe2
no error on osx reload
Meredith Howard <mhoward@roomag.org>
parents:
455
diff
changeset
|
253 | set guifont=DejaVu\ Sans\ Mono:h11 |
74
b1001f2f0523
Oops, windows font specs are different
Meredith Howard <mhoward@roomag.org>
parents:
73
diff
changeset
|
254 | 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
|
255 | set guifont=DejaVu\ Sans\ Mono\ 10 |
74
b1001f2f0523
Oops, windows font specs are different
Meredith Howard <mhoward@roomag.org>
parents:
73
diff
changeset
|
256 | endif |
b1001f2f0523
Oops, windows font specs are different
Meredith Howard <mhoward@roomag.org>
parents:
73
diff
changeset
|
257 | |
630
e5aec7abb8b5
add and configure mucomplete
Meredith Howard <mhoward@roomag.org>
parents:
627
diff
changeset
|
258 | set go-=T go-=m go-=t "no toolbar, menu, tearoffs |
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
259 | " }}} |
1 | 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 | |
801
fed4718fee5b
no more persistent insert
Meredith Howard <mhoward@roomag.org>
parents:
800
diff
changeset
|
265 | autocmd WinLeave * stopinsert |
fed4718fee5b
no more persistent insert
Meredith Howard <mhoward@roomag.org>
parents:
800
diff
changeset
|
266 | |
466 | 267 | " set and load a session based on servername |
809 | 268 | autocmd VimEnter * nested call vimrc#AutoSessionCheck() |
259
3ea35d31175b
Let's try all the autowrites
Meredith Howard <mhoward@roomag.org>
parents:
252
diff
changeset
|
269 | |
466 | 270 | " complement to autowriteall |
271 | autocmd FocusLost * silent! wa | |
368
91d4fb4e0a42
improve text editing experience?
Meredith Howard <mhoward@roomag.org>
parents:
362
diff
changeset
|
272 | |
665 | 273 | " Make paths when writing, as necessary |
274 | autocmd BufWritePre * :call vimrc#MkNonExDir(expand('<afile>'), +expand('<abuf>')) | |
275 | ||
419 | 276 | " Jump to last known pos |
277 | autocmd BufReadPost * | |
641 | 278 | \ if &filetype !~# 'mail\|^git\|^hg' && line("'\"") >= 1 && line("'\"") <= line("$") | |
419 | 279 | \ exe "normal! g`\"" | |
280 | \ endif | |
466 | 281 | |
666
0cf4a2458e49
add conflict marker highlight
Meredith Howard <mhoward@roomag.org>
parents:
665
diff
changeset
|
282 | " Simple highlight conflict markers |
0cf4a2458e49
add conflict marker highlight
Meredith Howard <mhoward@roomag.org>
parents:
665
diff
changeset
|
283 | autocmd BufReadPost * |
0cf4a2458e49
add conflict marker highlight
Meredith Howard <mhoward@roomag.org>
parents:
665
diff
changeset
|
284 | \ syn match Error "^\(<\|>\||\)\1\{6,7}" | |
0cf4a2458e49
add conflict marker highlight
Meredith Howard <mhoward@roomag.org>
parents:
665
diff
changeset
|
285 | \ syn match Error "^=\{7,8}$" |
0cf4a2458e49
add conflict marker highlight
Meredith Howard <mhoward@roomag.org>
parents:
665
diff
changeset
|
286 | |
586 | 287 | " Simplify noisy ltag output |
288 | autocmd BufReadPost quickfix | |
641 | 289 | \ if w:quickfix_title =~# '^:ltag' | |
586 | 290 | \ setl modifiable | |
291 | \ silent exe ':%s/\^\\V\s*\|\\\$|.*//g' | | |
292 | \ setl nomodifiable | | |
293 | \ endif | |
294 | ||
295 | autocmd BufReadPost quickfix nmap <buffer> q <C-w>c | |
650
3728333503b6
quick fix for latest neomutt
Meredith Howard <mhoward@roomag.org>
parents:
642
diff
changeset
|
296 | |
3728333503b6
quick fix for latest neomutt
Meredith Howard <mhoward@roomag.org>
parents:
642
diff
changeset
|
297 | " Neomutt changed their tmpfile pattern, ugh |
3728333503b6
quick fix for latest neomutt
Meredith Howard <mhoward@roomag.org>
parents:
642
diff
changeset
|
298 | autocmd BufNewFile,BufRead neomutt-*-\w\+ setf mail |
105
f3d684572a8f
group up autocmds so they can be cleared if vimrc is reloaded
Meredith Howard <mhoward@roomag.org>
parents:
87
diff
changeset
|
299 | augroup END |
414 | 300 | |
787
fc7e6eaf6a91
Disable startup positioning from defaults.vim
Meredith Howard <mhoward@roomag.org>
parents:
785
diff
changeset
|
301 | " clear defaults.vim 'jump to last known pos' |
fc7e6eaf6a91
Disable startup positioning from defaults.vim
Meredith Howard <mhoward@roomag.org>
parents:
785
diff
changeset
|
302 | augroup vimStartup | au! | augroup END |
fc7e6eaf6a91
Disable startup positioning from defaults.vim
Meredith Howard <mhoward@roomag.org>
parents:
785
diff
changeset
|
303 | |
748
648b37626788
Backed out changeset 63fedee268a7
Meredith Howard <mhoward@roomag.org>
parents:
747
diff
changeset
|
304 | " https://mjj.io/2015/01/27/encrypting-files-with-gpg-and-vim/ |
648b37626788
Backed out changeset 63fedee268a7
Meredith Howard <mhoward@roomag.org>
parents:
747
diff
changeset
|
305 | " hacked to work with vimwiki |
648b37626788
Backed out changeset 63fedee268a7
Meredith Howard <mhoward@roomag.org>
parents:
747
diff
changeset
|
306 | augroup encrypted |
648b37626788
Backed out changeset 63fedee268a7
Meredith Howard <mhoward@roomag.org>
parents:
747
diff
changeset
|
307 | autocmd! |
749 | 308 | autocmd BufReadPre,FileReadPre *.gpg,*.gpg.* setl noswapfile noundofile nobackup viminfo= |
750
36a4da0a9863
Separate errors from filter stream
Meredith Howard <mhoward@roomag.org>
parents:
749
diff
changeset
|
309 | autocmd BufReadPost *.gpg,*.gpg.* call vimrc#SafeFilterFile('gpg2 -d') |
36a4da0a9863
Separate errors from filter stream
Meredith Howard <mhoward@roomag.org>
parents:
749
diff
changeset
|
310 | autocmd BufWritePre *.gpg,*.gpg.* call vimrc#SafeFilterFile('gpg2 -se -a --default-recipient-self') |
749 | 311 | autocmd BufWritePost *.gpg,*.gpg.* :sil undo |
748
648b37626788
Backed out changeset 63fedee268a7
Meredith Howard <mhoward@roomag.org>
parents:
747
diff
changeset
|
312 | augroup END |
648b37626788
Backed out changeset 63fedee268a7
Meredith Howard <mhoward@roomag.org>
parents:
747
diff
changeset
|
313 | "}}} |
648b37626788
Backed out changeset 63fedee268a7
Meredith Howard <mhoward@roomag.org>
parents:
747
diff
changeset
|
314 | |
105
f3d684572a8f
group up autocmds so they can be cleared if vimrc is reloaded
Meredith Howard <mhoward@roomag.org>
parents:
87
diff
changeset
|
315 | " Perl type-specific settings {{{ |
651
4a0d4c07b49e
use perltidy for equalprg if present
Meredith Howard <mhoward@roomag.org>
parents:
650
diff
changeset
|
316 | let perl_include_pod = 1 |
4a0d4c07b49e
use perltidy for equalprg if present
Meredith Howard <mhoward@roomag.org>
parents:
650
diff
changeset
|
317 | let perl_sub_signatures = 1 |
4a0d4c07b49e
use perltidy for equalprg if present
Meredith Howard <mhoward@roomag.org>
parents:
650
diff
changeset
|
318 | let perl_sync_dist = 200 |
658
69ed96c80ed0
use the perl compiler plugin, maybe i was confused
Meredith Howard <mhoward@roomag.org>
parents:
651
diff
changeset
|
319 | |
69ed96c80ed0
use the perl compiler plugin, maybe i was confused
Meredith Howard <mhoward@roomag.org>
parents:
651
diff
changeset
|
320 | let g:perl_compiler_force_warnings = 0 |
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
321 | " }}} |
1 | 322 | |
19 | 323 | " Plugin settings {{{ |
725
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
324 | let g:plug_threads = 3 |
6ff8e3f73482
switch from vundle to plug
Meredith Howard <mhoward@roomag.org>
parents:
722
diff
changeset
|
325 | |
674 | 326 | ">> vim-polyglot |
742
354f9d473a4b
Don't load perl from vim-polyglot
Meredith Howard <mhoward@roomag.org>
parents:
739
diff
changeset
|
327 | let g:polyglot_disabled = ['vifm', 'perl'] |
674 | 328 | |
630
e5aec7abb8b5
add and configure mucomplete
Meredith Howard <mhoward@roomag.org>
parents:
627
diff
changeset
|
329 | ">> mucomplete |
e5aec7abb8b5
add and configure mucomplete
Meredith Howard <mhoward@roomag.org>
parents:
627
diff
changeset
|
330 | " enable and prefer local buffer before tags |
e5aec7abb8b5
add and configure mucomplete
Meredith Howard <mhoward@roomag.org>
parents:
627
diff
changeset
|
331 | let g:mucomplete#enable_auto_at_startup = 1 |
779
0053354a8f58
fix trying to do omni on sql files
Meredith Howard <mhoward@roomag.org>
parents:
771
diff
changeset
|
332 | let g:mucomplete#chains = { |
0053354a8f58
fix trying to do omni on sql files
Meredith Howard <mhoward@roomag.org>
parents:
771
diff
changeset
|
333 | \ 'default': ['path', 'omni', 'c-n', 'tags', 'dict', 'uspl'], |
780 | 334 | \ 'sql': ['keyn', 'sqla', 'dict', 'uspl'] |
779
0053354a8f58
fix trying to do omni on sql files
Meredith Howard <mhoward@roomag.org>
parents:
771
diff
changeset
|
335 | \} |
0053354a8f58
fix trying to do omni on sql files
Meredith Howard <mhoward@roomag.org>
parents:
771
diff
changeset
|
336 | let g:mucomplete#user_mappings = {'sqla' : "\<c-c>a"} |
630
e5aec7abb8b5
add and configure mucomplete
Meredith Howard <mhoward@roomag.org>
parents:
627
diff
changeset
|
337 | |
714 | 338 | ">> vim-lsp |
339 | augroup vim-lsp | |
340 | autocmd! | |
341 | ||
342 | if executable('rls') | |
343 | autocmd FileType rust setlocal omnifunc=lsp#complete | |
718 | 344 | autocmd User lsp_setup call lsp#register_server({ |
714 | 345 | \ 'name': 'rls', |
722 | 346 | \ 'cmd': {server_info->['rustup', 'run', 'stable', 'rls']}, |
714 | 347 | \ 'whitelist': ['rust'], |
348 | \ }) | |
349 | endif | |
718 | 350 | |
351 | if executable('go-langserver') | |
352 | autocmd FileType go setlocal omnifunc=lsp#complete | |
353 | autocmd User lsp_setup call lsp#register_server({ | |
354 | \ 'name': 'go-langserver', | |
355 | \ 'cmd': {server_info->['go-langserver']}, | |
356 | \ 'whitelist': ['go'], | |
357 | \}) | |
358 | endif | |
714 | 359 | augroup END |
360 | ||
451 | 361 | ">> Vimwiki |
454
e501f44a5885
set spideroak as 2nd wiki
Meredith Howard <mhoward@roomag.org>
parents:
453
diff
changeset
|
362 | let g:vimwiki_list = [ |
530
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
363 | \ { |
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
364 | \ 'path': '~/vimwiki/', |
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
365 | \ 'auto_tags': 1, 'auto_toc': 1, 'automatic_nested_syntaxes': 1 |
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
366 | \ }, |
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
367 | \ { |
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
368 | \ 'path': '~/Documents/SpiderOak Hive/vimwiki', |
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
369 | \ 'auto_tags': 1, 'auto_toc': 1, 'automatic_nested_syntaxes': 1 |
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
370 | \ } |
64270d166434
add block highlighting
Meredith Howard <mhoward@roomag.org>
parents:
526
diff
changeset
|
371 | \ ] |
451 | 372 | |
340 | 373 | ">> Viewdoc |
458 | 374 | let g:viewdoc_open = 'topleft new' |
416
ef460163c246
add new viewdoc setting
Meredith Howard <mhoward@roomag.org>
parents:
414
diff
changeset
|
375 | let g:viewdoc_winwidth_max = 100 |
340 | 376 | |
810
de41d00d8344
switch from gundo to undotree
Meredith Howard <mhoward@roomag.org>
parents:
809
diff
changeset
|
377 | ">> Undotree |
de41d00d8344
switch from gundo to undotree
Meredith Howard <mhoward@roomag.org>
parents:
809
diff
changeset
|
378 | let g:undotree_SplitWidth = 45 |
de41d00d8344
switch from gundo to undotree
Meredith Howard <mhoward@roomag.org>
parents:
809
diff
changeset
|
379 | let g:undotree_SetFocusWhenToggle = 1 |
de41d00d8344
switch from gundo to undotree
Meredith Howard <mhoward@roomag.org>
parents:
809
diff
changeset
|
380 | let g:undotree_ShortIndicators = 1 |
de41d00d8344
switch from gundo to undotree
Meredith Howard <mhoward@roomag.org>
parents:
809
diff
changeset
|
381 | let g:undotree_DiffCommand = "diff -dp -U 1" |
1 | 382 | |
109
14b6da5839f0
Add/set up perl and ruby omnicomplete
Meredith Howard <mhoward@roomag.org>
parents:
107
diff
changeset
|
383 | ">> Tagbar |
1 | 384 | let g:tagbar_autoclose = 1 |
385 | let g:tagbar_autofocus = 1 | |
386 | let g:tagbar_compact = 1 | |
142
d0d2b54e855f
Tweak unite, shrink tagbar a little
Meredith Howard <mhoward@roomag.org>
parents:
139
diff
changeset
|
387 | let g:tagbar_width = 30 |
1 | 388 | |
426
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
389 | " adapted from https://gist.github.com/jbolila/7598018 |
1 | 390 | let g:tagbar_type_perl = { |
426
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
391 | \ 'ctagstype' : 'Perl', |
1 | 392 | \ 'kinds' : [ |
393 | \ 'p:packages:1:0', | |
426
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
394 | \ 'u:uses:1:0', |
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
395 | \ 'r:requires:1:0', |
1 | 396 | \ 'e:extends', |
426
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
397 | \ 'w:roles', |
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
398 | \ 'o:ours:1:0', |
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
399 | \ 'c:constants:1:0', |
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
400 | \ 'f:formats:1:0', |
1 | 401 | \ 'a:attributes', |
230
5cd77842c623
Add ctags matches for fun and method
Meredith Howard <mhoward@roomag.org>
parents:
208
diff
changeset
|
402 | \ 'm:methods', |
1 | 403 | \ 's:subroutines', |
426
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
404 | \ 'x:around', |
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
405 | \ 'l:aliases', |
4fcad88dbe5f
improve tagbar for perl
Meredith Howard <mhoward@roomag.org>
parents:
425
diff
changeset
|
406 | \ 'd:pod:1:0', |
1 | 407 | \ ], |
603
ae87c045d04b
Simplify directory setup
Meredith Howard <mhoward@roomag.org>
parents:
602
diff
changeset
|
408 | \ 'deffile' : g:myvim . '/ctags/perl.cnf' |
427
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
409 | \ } |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
410 | |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
411 | let g:tagbar_type_elixir = { |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
412 | \ 'ctagstype' : 'Elixir', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
413 | \ 'kinds' : [ |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
414 | \ 'm:modules:1:0', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
415 | \ 'r:records', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
416 | \ 'f:functions', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
417 | \ 'a:macros', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
418 | \ 'o:operators', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
419 | \ 'p:protocols', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
420 | \ 'i:implementations', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
421 | \ 'd:delegates', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
422 | \ 'c:callbacks', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
423 | \ 'e:exceptions', |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
424 | \ ], |
a3c0f8f6c100
quick tagbar for elixir too
Meredith Howard <mhoward@roomag.org>
parents:
426
diff
changeset
|
425 | \ } |
1 | 426 | |
109
14b6da5839f0
Add/set up perl and ruby omnicomplete
Meredith Howard <mhoward@roomag.org>
parents:
107
diff
changeset
|
427 | ">> Airline |
1 | 428 | let g:airline#extensions#whitespace#enabled = 0 |
252
e5f59db6e92a
Nice separator when not using powerline.
Meredith Howard <mhoward@roomag.org>
parents:
250
diff
changeset
|
429 | let g:airline_powerline_fonts = 0 |
85 | 430 | |
526 | 431 | let g:airline#extensions#tabline#enabled = 1 |
524
d559496f6ef3
Drop bufferline for airline builtin
Meredith Howard <mhoward@roomag.org>
parents:
521
diff
changeset
|
432 | let g:airline#extensions#tabline#buffer_min_count = 2 |
526 | 433 | let g:airline#extensions#tabline#tab_nr_type = 1 |
434 | let g:airline#extensions#tabline#buffer_nr_show = 1 | |
435 | 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
|
436 | let g:airline#extensions#tabline#buffer_nr_format = '%s:' |
526 | 437 | let g:airline#extensions#tabline#buffers_label = 'BUF' |
438 | let g:airline#extensions#tabline#tabs_label = 'TAB' | |
439 | let g:airline#extensions#tabline#left_sep = ' ' | |
440 | let g:airline#extensions#tabline#left_alt_sep = ' ' | |
441 | let g:airline#extensions#tabline#right_sep = ' ' | |
442 | let g:airline#extensions#tabline#right_alt_sep = ' ' | |
443 | ||
444 | let g:airline#extensions#tabline#ignore_bufadd_pat = | |
818 | 445 | \ '\c\v^__tagbar|^[doc\d*\]$|^diffpanel' |
203 | 446 | |
524
d559496f6ef3
Drop bufferline for airline builtin
Meredith Howard <mhoward@roomag.org>
parents:
521
diff
changeset
|
447 | let g:airline#extensions#branch#format = 2 |
129 | 448 | |
202
f7aa9b7b7800
configure interestingwords more
Meredith Howard <mhoward@roomag.org>
parents:
201
diff
changeset
|
449 | ">> interestingwords |
f7aa9b7b7800
configure interestingwords more
Meredith Howard <mhoward@roomag.org>
parents:
201
diff
changeset
|
450 | " These are jellybeans colors and some complements |
f7aa9b7b7800
configure interestingwords more
Meredith Howard <mhoward@roomag.org>
parents:
201
diff
changeset
|
451 | let g:interestingWordsGUIColors = ['#C4A258', '#D8AD4C', '#6AADA0', '#71B9F8', '#A037B0', '#CF6A4C'] |
f7aa9b7b7800
configure interestingwords more
Meredith Howard <mhoward@roomag.org>
parents:
201
diff
changeset
|
452 | let g:interestingWordsRandomiseColors = 1 |
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
453 | " }}} |
1 | 454 | |
419 | 455 | " {{{ Commands |
563 | 456 | " Preview markdown mail -- I edit with headers so I box them in a code block. |
639 | 457 | command! MailPreview enew | set bt=nofile | 0r # | exe 'norm! 0O```<Esc>}O```' | silent exe '%!mutt-md2html | mutt-html2txt' | 0 |
458 | command! MailPreviewHTML enew | set bt=nofile | setf html | 0r # | exe 'norm! 0O```<Esc>}O```' | silent exe '%!mutt-md2html' | 0 | |
419 | 459 | " }}} |
460 | ||
18
5475788810a4
maps for chdir % and paste mode, add fold marks
Meredith Howard <mhoward@roomag.org>
parents:
14
diff
changeset
|
461 | " Local stuff, finish up |
1 | 462 | try |
466 | 463 | execute 'source ' . s:filename . '.local' |
1 | 464 | catch |
465 | endtry | |
466 | ||
641 | 467 | 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
|
468 | let g:airline_left_sep = '▒' |
e5f59db6e92a
Nice separator when not using powerline.
Meredith Howard <mhoward@roomag.org>
parents:
250
diff
changeset
|
469 | 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
|
470 | endif |
e5f59db6e92a
Nice separator when not using powerline.
Meredith Howard <mhoward@roomag.org>
parents:
250
diff
changeset
|
471 | |
7
7e6e6ff35c4d
try to normalize my colorschemes more, vimrc.local can cover $TERM weirdness
Meredith Howard <mhoward@roomag.org>
parents:
1
diff
changeset
|
472 | if has('gui_running') |
124
1be15444e144
Don't use any shorthand options
Meredith Howard <mhoward@roomag.org>
parents:
122
diff
changeset
|
473 | set number |
1be15444e144
Don't use any shorthand options
Meredith Howard <mhoward@roomag.org>
parents:
122
diff
changeset
|
474 | 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
|
475 | |
519
42e8433b8a51
assume we have unicode on guis, bring back default geometry
Meredith Howard <mhoward@roomag.org>
parents:
498
diff
changeset
|
476 | 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
|
477 | |
145 | 478 | set guicursor+=a:blinkwait1000-blinkon1200-blinkoff250 |
479 | ||
146 | 480 | 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
|
481 | else |
453
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
482 | " vertical bar in insert mode. |
641 | 483 | if &term =~# '^\(xterm\|screen\|rxvt\)' |
453
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
484 | let &t_SI = "\e[5 q" |
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
485 | let &t_EI = "\e[0 q" |
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
486 | if exists("$TMUX") |
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
487 | 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
|
488 | 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
|
489 | endif |
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
490 | endif |
e7b6a870f35d
Move cursor change to vimrc
Meredith Howard <mhoward@roomag.org>
parents:
452
diff
changeset
|
491 | |
641 | 492 | if $TERM =~# 'rxvt-unicode' |
118
ffbf97e1e3eb
Add urxvt mouse handling
Meredith Howard <mhoward@roomag.org>
parents:
115
diff
changeset
|
493 | set ttymouse=urxvt |
ffbf97e1e3eb
Add urxvt mouse handling
Meredith Howard <mhoward@roomag.org>
parents:
115
diff
changeset
|
494 | set mouse=a |
163
fe352f27be10
fix for home/end in mouse mode in urxvt
Meredith Howard <mhoward@roomag.org>
parents:
156
diff
changeset
|
495 | map <Esc>[7~ <Home> |
fe352f27be10
fix for home/end in mouse mode in urxvt
Meredith Howard <mhoward@roomag.org>
parents:
156
diff
changeset
|
496 | map <Esc>[8~ <End> |
118
ffbf97e1e3eb
Add urxvt mouse handling
Meredith Howard <mhoward@roomag.org>
parents:
115
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 | |
dff13372e830
Detect 256-color capable 'screen', enable mouse support too
Meredith Howard <mhoward@roomag.org>
parents:
120
diff
changeset
|
499 | if &t_Co == 256 |
dff13372e830
Detect 256-color capable 'screen', enable mouse support too
Meredith Howard <mhoward@roomag.org>
parents:
120
diff
changeset
|
500 | colorscheme jellybeans |
396
2f02fa724f42
add session autoload/save when servername is set
Meredith Howard <mhoward@roomag.org>
parents:
370
diff
changeset
|
501 | endif |
2f02fa724f42
add session autoload/save when servername is set
Meredith Howard <mhoward@roomag.org>
parents:
370
diff
changeset
|
502 | endif |