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