this repo has no description
Merge vimrc with work
+45
-20
+45
-20
.vimrc
+45
-20
.vimrc
···
1
+
" TODO: modularize this more
2
+
3
+
" Universal options
4
+
1
5
set tabstop=4
2
6
set shiftwidth=4
3
7
set softtabstop=4
8
+
4
9
set expandtab
5
10
set autoindent
6
-
filetype indent on
7
-
set number
11
+
set smartindent
8
12
set backspace=indent,eol,start
9
13
10
-
syntax on
14
+
set whichwrap=<,>,[,],b
11
15
set wrapmargin=0
12
-
set ruler
13
-
highlight ColorColumn ctermbg=7
14
-
set colorcolumn=80
15
-
set whichwrap=<,>,[,],b
16
16
17
-
colorscheme monokai
17
+
filetype indent on
18
18
19
-
if has('macunix')
20
-
set termguicolors
21
-
set mouse=a
22
-
endif
19
+
syntax on
23
20
24
21
if &diff
25
22
set diffopt+=iwhite
26
23
endif
27
24
28
-
syn match myTodo contained "\<\(TODO\|FIXME\):"
29
-
hi def link myTodo Todo
25
+
26
+
" Editor-specific settings
27
+
28
+
if exists('g:vscode')
29
+
" vscode-neovim specific settings
30
+
xnoremap <silent> <Esc> :<C-u>call VSCodeNotify('closeFindWidget')<CR>
31
+
nnoremap <silent> <Esc> :<C-u>call VSCodeNotify('closeFindWidget')<CR>
32
+
33
+
xmap gc <Plug>VSCodeCommentary
34
+
nmap gc <Plug>VSCodeCommentary
35
+
omap gc <Plug>VSCodeCommentary
36
+
nmap gcc <Plug>VSCodeCommentaryLine
30
37
31
-
" parse .cnf files as ini
32
-
au BufNewFile,BufRead *.cnf set filetype=dosini
38
+
xmap <C-/> <Plug>VSCodeCommentarygv
39
+
nmap <C-/> <Plug>VSCodeCommentaryLine
40
+
else
41
+
" ordinary vim/neovim settings that don't apply in VSCode
42
+
set mouse=a
33
43
34
-
" parse .repo files as ini
35
-
au BufNewFile,BufRead *.repo set filetype=dosini
44
+
highlight ColorColumn ctermbg=7
45
+
set colorcolumn=80
46
+
set ruler
36
47
37
-
" parse .init files as json
38
-
au BufNewFile,BufRead *.init set filetype=javascript
48
+
set number
39
49
50
+
let os = substitute(system('uname'), "\n", "", "")
51
+
if os == "Darwin"
52
+
set termguicolors
53
+
endif
40
54
55
+
colorscheme Monokai
56
+
endif
41
57
42
58
" Code from:
43
59
" http://stackoverflow.com/questions/5585129/pasting-code-into-terminal-window-into-vim-on-mac-os-x
···
71
87
vmap <expr> <f28> XTermPasteBegin("c")
72
88
cmap <f28> <nop>
73
89
cmap <f29> <nop>
90
+
91
+
92
+
" Augroups
93
+
94
+
augroup CustomTodo
95
+
autocmd!
96
+
autocmd Syntax * syntax match CustomTodo /\v<(TODO|FIXME|NOTE)/ containedin=.*Comment
97
+
augroup END
98
+
highlight link CustomTodo Todo